From 36f6a89e36338d79a8272ef7a2bb50e74492bd05 Mon Sep 17 00:00:00 2001 From: Ondrej Vasik Date: Oct 10 2008 07:33:23 +0000 Subject: cumulative update for F-9, fixes for bugzillas #463883, #465569, 463556, #450505 and others --- diff --git a/coreutils-463883-chcon-changes.patch b/coreutils-463883-chcon-changes.patch new file mode 100644 index 0000000..885363a --- /dev/null +++ b/coreutils-463883-chcon-changes.patch @@ -0,0 +1,59 @@ +diff -urNp coreutils-6.12-orig/man/chcon.1 coreutils-6.12/man/chcon.1 +--- coreutils-6.12-orig/man/chcon.1 2008-10-08 14:45:59.000000000 +0200 ++++ coreutils-6.12/man/chcon.1 2008-10-08 16:35:55.000000000 +0200 +@@ -17,9 +17,6 @@ chcon \- change file SELinux security co + Change the SELinux security context of each FILE to CONTEXT. + With \fB\-\-reference\fR, change the security context of each FILE to that of RFILE. + .TP +-\fB\-c\fR, \fB\-\-changes\fR +-like verbose but report only when a change is made +-.TP + \fB\-h\fR, \fB\-\-no\-dereference\fR + affect symbolic links instead of any referenced file + .TP +diff -urNp coreutils-6.12-orig/src/chcon.c coreutils-6.12/src/chcon.c +--- coreutils-6.12-orig/src/chcon.c 2008-10-08 14:45:59.000000000 +0200 ++++ coreutils-6.12/src/chcon.c 2008-10-08 16:28:36.000000000 +0200 +@@ -35,25 +35,6 @@ + proper_name ("Russell Coker"), \ + proper_name ("Jim Meyering") + +-enum Change_status +-{ +- CH_NOT_APPLIED, +- CH_SUCCEEDED, +- CH_FAILED, +- CH_NO_CHANGE_REQUESTED +-}; +- +-enum Verbosity +-{ +- /* Print a message for each file that is processed. */ +- V_high, +- +- /* Print a message for each file whose attributes we change. */ +- V_changes_only, +- +- /* Do not be verbose. This is the default. */ +- V_off +-}; + + /* The name the program was run with. */ + char *program_name; +@@ -374,7 +355,6 @@ Usage: %s [OPTION]... CONTEXT FILE...\n\ + Change the security context of each FILE to CONTEXT.\n\ + With --reference, change the security context of each FILE to that of RFILE.\n\ + \n\ +- -c, --changes like verbose but report only when a change is made\n\ + -h, --no-dereference affect symbolic links instead of any referenced file\n\ + "), stdout); + fputs (_("\ +@@ -435,7 +415,7 @@ main (int argc, char **argv) + + atexit (close_stdout); + +- while ((optc = getopt_long (argc, argv, "HLPRchvu:r:t:l:", long_options, NULL)) ++ while ((optc = getopt_long (argc, argv, "HLPRhvu:r:t:l:", long_options, NULL)) + != -1) + { + switch (optc) diff --git a/coreutils-6.12-seqdecimalutf8.patch b/coreutils-6.12-seqdecimalutf8.patch new file mode 100644 index 0000000..1436acf --- /dev/null +++ b/coreutils-6.12-seqdecimalutf8.patch @@ -0,0 +1,15 @@ +diff -urNp coreutils-6.12-orig/src/seq.c coreutils-6.12/src/seq.c +--- coreutils-6.12-orig/src/seq.c 2008-05-26 08:40:32.000000000 +0200 ++++ coreutils-6.12/src/seq.c 2008-09-29 22:09:21.000000000 +0200 +@@ -304,7 +304,10 @@ print_numbers (char const *fmt, struct l + bool print_extra_number = false; + long double x_val; + char *x_str; +- int x_strlen = asprintf (&x_str, fmt, x); ++ int x_strlen; ++ setlocale (LC_NUMERIC, "C"); ++ x_strlen = asprintf (&x_str, fmt, x); ++ setlocale (LC_NUMERIC, ""); + if (x_strlen < 0) + xalloc_die (); + x_str[x_strlen - layout.suffix_len] = '\0'; diff --git a/coreutils-pam.patch b/coreutils-pam.patch index 8593ecc..7774cf6 100644 --- a/coreutils-pam.patch +++ b/coreutils-pam.patch @@ -361,6 +361,15 @@ The program accepts the following options. Also see @ref{Common options}. +@@ -12815,6 +12815,8 @@ + @env{PATH} to a compiled-in default value. Change to @var{user}'s home + directory. Prepend @samp{-} to the shell's name, intended to make it + read its login startup file(s). ++Additionaly @env{DISPLAY} and @env{XAUTHORITY} environment variables ++are preserved as well for PAM functionality. + + @item -m + @itemx -p @@ -13477,33 +13480,6 @@ the exit status of the subshell otherwise @end display diff --git a/coreutils-selinux.patch b/coreutils-selinux.patch index 322d2bc..39bf7d3 100644 --- a/coreutils-selinux.patch +++ b/coreutils-selinux.patch @@ -89,15 +89,6 @@ diff -urp coreutils-6.10-orig/man/chcon.1 coreutils-6.10/man/chcon.1 With \fB\-\-reference\fR, change the security context of each FILE to that of RFILE. .TP \fB\-c\fR, \fB\-\-changes\fR -@@ -74,6 +74,8 @@ License GPLv3+: GNU GPL version 3 or lat - .br - This is free software: you are free to change and redistribute it. - There is NO WARRANTY, to the extent permitted by law. -+.SH "REPORTING BUGS" -+Report bugs to . - .SH "SEE ALSO" - The full documentation for - .B chcon diff -urp coreutils-6.10-orig/man/id.1 coreutils-6.10/man/id.1 --- coreutils-6.10-orig/man/id.1 2008-01-25 12:34:24.000000000 +0100 +++ coreutils-6.10/man/id.1 2008-01-25 14:40:22.000000000 +0100 diff --git a/coreutils.spec b/coreutils.spec index 5307783..ba0e099 100644 --- a/coreutils.spec +++ b/coreutils.spec @@ -1,7 +1,7 @@ Summary: The GNU core utilities: a set of tools commonly used in shell scripts Name: coreutils Version: 6.10 -Release: 30%{?dist} +Release: 31%{?dist} License: GPLv3+ Group: System Environment/Base Url: http://www.gnu.org/software/coreutils/ @@ -27,6 +27,7 @@ Patch6: coreutils-6.10-md5sha1sum.patch Patch7: coreutils-6.11-matchpathconinstall.patch Patch8: coreutils-authors.patch Patch9: coreutils-6.10-whorunlevel.patch +Patch10: coreutils-6.12-seqdecimalutf8.patch # Our patches Patch100: coreutils-chgrp.patch @@ -60,8 +61,9 @@ Patch916: coreutils-getfacl-exit-code.patch #(upstream did some SELinux implementation unlike with RedHat patch) Patch950: coreutils-selinux.patch Patch951: coreutils-selinuxmanpages.patch +Patch952: coreutils-463883-chcon-changes.patch -#Patch954: coreutils-6.12-ls-libcap.patch +Patch954: coreutils-6.12-ls-libcap.patch BuildRequires: libselinux-devel >= 1.25.6-1 BuildRequires: libacl-devel @@ -74,6 +76,7 @@ BuildRequires: automake >= 1.10.1 %{?!nopam:BuildRequires: pam-devel} BuildRequires: libcap-devel >= 2.0.6 +Requires: libattr Requires(post): libselinux >= 1.25.6-1 Requires(pre): /sbin/install-info Requires(preun): /sbin/install-info @@ -120,6 +123,8 @@ cd %name-%version %patch7 -p1 -b .matchpathcon %patch8 -p1 -b .authors %patch9 -p1 -b .whorunlevel +%patch10 -p1 -b .sequtf8 + # Our patches %patch100 -p1 -b .chgrp @@ -150,12 +155,13 @@ cd %name-%version #SELinux %patch950 -p1 -b .selinux %patch951 -p1 -b .selinuxman +%patch952 -p1 -b .chconchanges -#%patch954 -p1 -b .ls-libcap +%patch954 -p1 -b .ls-libcap chmod a+x tests/sort/sort-mb-tests chmod a+x tests/mkdir/selinux -#chmod a+x tests/ls/capability +chmod a+x tests/ls/capability #fix typos/mistakes in localized documentation(#439410, #440056) for pofile in $(find ./po/*.p*) @@ -334,6 +340,19 @@ fi /sbin/runuser %changelog +* Thu Oct 09 2008 Ondrej Vasik - 6.10-31 +- do not double bugreport page in chcon +- do not mention --change chcon option in help and man + (never accepted by upstream, can't be reliable), code + not exists in F-9 (#463883) +- added capability support to ls, but not to DIRCOLORS* + files +- added requires for libattr (#465569) +- seq should no longer fail to display final number of some + float usages of seq with utf8 locales(#463556) +- mention that DISPLAY and XAUTHORITY envvars are preserved + for pam_xauth in su -l (#450505) + * Fri Aug 01 2008 Kamil Dudka - 6.10-30 - removed CAPABILITY color from DIR_COLORS