use setup macro lzma support, remove unimplemented option --changes from
chcon
This commit is contained in:
parent
680b5e35f9
commit
0beb80a141
59
coreutils-463883-chcon-changes.patch
Normal file
59
coreutils-463883-chcon-changes.patch
Normal file
@ -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)
|
@ -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.
|
With \fB\-\-reference\fR, change the security context of each FILE to that of RFILE.
|
||||||
.TP
|
.TP
|
||||||
\fB\-c\fR, \fB\-\-changes\fR
|
\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 <https://bugzilla.redhat.com/bugzilla>.
|
|
||||||
.SH "SEE ALSO"
|
|
||||||
The full documentation for
|
|
||||||
.B chcon
|
|
||||||
diff -urp coreutils-6.10-orig/man/id.1 coreutils-6.10/man/id.1
|
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-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
|
+++ coreutils-6.10/man/id.1 2008-01-25 14:40:22.000000000 +0100
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
Summary: The GNU core utilities: a set of tools commonly used in shell scripts
|
Summary: The GNU core utilities: a set of tools commonly used in shell scripts
|
||||||
Name: coreutils
|
Name: coreutils
|
||||||
Version: 6.12
|
Version: 6.12
|
||||||
Release: 12%{?dist}
|
Release: 13%{?dist}
|
||||||
License: GPLv3+
|
License: GPLv3+
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
Url: http://www.gnu.org/software/coreutils/
|
Url: http://www.gnu.org/software/coreutils/
|
||||||
@ -57,6 +57,7 @@ Patch916: coreutils-getfacl-exit-code.patch
|
|||||||
#(upstream did some SELinux implementation unlike with RedHat patch)
|
#(upstream did some SELinux implementation unlike with RedHat patch)
|
||||||
Patch950: coreutils-selinux.patch
|
Patch950: coreutils-selinux.patch
|
||||||
Patch951: coreutils-selinuxmanpages.patch
|
Patch951: coreutils-selinuxmanpages.patch
|
||||||
|
Patch952: coreutils-463883-chcon-changes.patch
|
||||||
|
|
||||||
# ls enhancements (must be applied after SELINUX patches)
|
# ls enhancements (must be applied after SELINUX patches)
|
||||||
Patch954: coreutils-6.12-ls-libcap.patch
|
Patch954: coreutils-6.12-ls-libcap.patch
|
||||||
@ -104,11 +105,7 @@ These are the GNU core utilities. This package is the combination of
|
|||||||
the old GNU fileutils, sh-utils, and textutils packages.
|
the old GNU fileutils, sh-utils, and textutils packages.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
#do not unpack in setup because of lzma is not yet supported in setup macro
|
%setup -q
|
||||||
%setup -q -c -T
|
|
||||||
cd ..
|
|
||||||
lzma -dc %SOURCE0 | tar xf -
|
|
||||||
cd %name-%version
|
|
||||||
|
|
||||||
# From upstream
|
# From upstream
|
||||||
%patch1 -p1 -b .kojifutimensat
|
%patch1 -p1 -b .kojifutimensat
|
||||||
@ -147,6 +144,7 @@ cd %name-%version
|
|||||||
#SELinux
|
#SELinux
|
||||||
%patch950 -p1 -b .selinux
|
%patch950 -p1 -b .selinux
|
||||||
%patch951 -p1 -b .selinuxman
|
%patch951 -p1 -b .selinuxman
|
||||||
|
%patch952 -p1 -b .changeonly
|
||||||
|
|
||||||
# ls enhancements (must be applied after SELINUX patches)
|
# ls enhancements (must be applied after SELINUX patches)
|
||||||
%patch954 -p1 -b .ls-libcap
|
%patch954 -p1 -b .ls-libcap
|
||||||
@ -335,6 +333,12 @@ fi
|
|||||||
/sbin/runuser
|
/sbin/runuser
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Oct 08 2008 Ondrej Vasik <ovasik@redhat.com> - 6.12-13
|
||||||
|
- remove unimplemented (never accepted by upstream) option
|
||||||
|
for chcon changes only. Removed from help and man.
|
||||||
|
- remove ugly lzma hack as lzma is now supported by setup
|
||||||
|
macro
|
||||||
|
|
||||||
* Mon Oct 06 2008 Jarod Wilson <jarod@redhat.com> - 6.12-12
|
* Mon Oct 06 2008 Jarod Wilson <jarod@redhat.com> - 6.12-12
|
||||||
- fix up potential test failures when building in certain
|
- fix up potential test failures when building in certain
|
||||||
slightly quirky environments (part of bz#442352)
|
slightly quirky environments (part of bz#442352)
|
||||||
|
Loading…
Reference in New Issue
Block a user