rpm/coreutils
SHA256
1
0
Fork 0
forked from pool/coreutils
Code Pull Requests Activity

Accepting request 52848 from Base:System

Browse Source 
Accepted submit request 52848 from user psmt

OBS-URL: https://build.opensuse.org/request/show/52848
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/coreutils?expand=0&rev=45
This commit is contained in:
Ruediger Oertel 2010-11-15 16:52:55 +00:00 committed by Git OBS Bridge
parent 17aecadc26
commit b041d4ec90
14 changed files with 665 additions and 485 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
coreutils-6.8-su.patch
View File

@ -2,9 +2,9 @@ Add pam support in su
Index: Makefile.in
===================================================================
--- Makefile.in.orig 2010-04-23 17:58:41.000000000 +0200
+++ Makefile.in 2010-05-06 19:37:44.784359208 +0200
@@ -961,6 +961,7 @@ PACKAGE_STRING = @PACKAGE_STRING@
--- Makefile.in.orig 2010-10-15 16:31:46.000000000 +0200
+++ Makefile.in 2010-11-11 16:02:50.366117868 +0100
@@ -991,6 +991,7 @@ PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
@ -14,17 +14,17 @@ Index: Makefile.in
POSIX_SHELL = @POSIX_SHELL@
Index: configure
===================================================================
--- configure.orig 2010-05-06 19:37:44.688359301 +0200
+++ configure 2010-05-06 19:37:44.816359169 +0200
@@ -631,6 +631,7 @@ OPTIONAL_BIN_PROGS
--- configure.orig 2010-11-11 16:02:50.342113626 +0100
+++ configure 2010-11-11 16:04:17.257475264 +0100
@@ -639,6 +639,7 @@ OPTIONAL_BIN_PROGS
INSTALL_SU
LIB_GMP
LIB_CRYPT
+PAM_LIBS
GNULIB_TEST_WARN_CFLAGS
GNULIB_WARN_CFLAGS
WERROR_CFLAGS
SEQ_LIBM
@@ -1501,6 +1502,7 @@ enable_xattr
@@ -1551,6 +1552,7 @@ enable_xattr
enable_libcap
with_tty_group
enable_gcc_warnings
@ -32,7 +32,7 @@ Index: configure
with_gmp
enable_install_program
enable_no_install_program
@@ -2152,6 +2154,7 @@ Optional Features:
@@ -2203,6 +2205,7 @@ Optional Features:
--disable-xattr do not support extended attributes
--disable-libcap disable libcap support
--enable-gcc-warnings turn on lots of GCC warnings (for developers)
@ -40,7 +40,7 @@ Index: configure
--enable-install-program=PROG_LIST
install the programs in PROG_LIST (comma-separated,
default: none)
@@ -51989,6 +51992,111 @@ $as_echo "#define HAVE_WORKING_FORK 1" >
@@ -53157,6 +53160,111 @@ $as_echo "#define HAVE_WORKING_FORK 1" >
fi
@ -154,9 +154,9 @@ Index: configure
do :
Index: configure.ac
===================================================================
--- configure.ac.orig 2010-03-13 16:14:09.000000000 +0100
+++ configure.ac 2010-05-06 19:37:44.843292013 +0200
@@ -128,6 +128,20 @@ fi
--- configure.ac.orig 2010-10-13 10:58:27.000000000 +0200
+++ configure.ac 2010-11-11 16:02:50.442131303 +0100
@@ -135,6 +135,20 @@ fi
AC_FUNC_FORK
@ -179,9 +179,9 @@ Index: configure.ac
gl_ADD_PROG([optional_bin_progs], [chroot]))
Index: doc/Makefile.in
===================================================================
--- doc/Makefile.in.orig 2010-04-23 17:58:37.000000000 +0200
+++ doc/Makefile.in 2010-05-06 19:37:44.868359246 +0200
@@ -957,6 +957,7 @@ PACKAGE_STRING = @PACKAGE_STRING@
--- doc/Makefile.in.orig 2010-10-15 16:31:44.000000000 +0200
+++ doc/Makefile.in 2010-11-11 16:02:50.442131303 +0100
@@ -987,6 +987,7 @@ PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
@ -191,9 +191,9 @@ Index: doc/Makefile.in
POSIX_SHELL = @POSIX_SHELL@
Index: gnulib-tests/Makefile.in
===================================================================
--- gnulib-tests/Makefile.in.orig 2010-04-23 18:00:33.000000000 +0200
+++ gnulib-tests/Makefile.in 2010-05-06 19:37:44.871374260 +0200
@@ -2191,6 +2191,7 @@ PACKAGE_STRING = @PACKAGE_STRING@
--- gnulib-tests/Makefile.in.orig 2010-10-15 16:32:45.000000000 +0200
+++ gnulib-tests/Makefile.in 2010-11-11 16:02:50.490139787 +0100
@@ -2378,6 +2378,7 @@ PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
@ -203,9 +203,9 @@ Index: gnulib-tests/Makefile.in
POSIX_SHELL = @POSIX_SHELL@
Index: lib/Makefile.in
===================================================================
--- lib/Makefile.in.orig 2010-04-23 17:58:38.000000000 +0200
+++ lib/Makefile.in 2010-05-06 19:37:59.594863753 +0200
@@ -1006,6 +1006,7 @@ PACKAGE_STRING = @PACKAGE_STRING@
--- lib/Makefile.in.orig 2010-10-15 16:31:45.000000000 +0200
+++ lib/Makefile.in 2010-11-11 16:02:50.550150395 +0100
@@ -1073,6 +1073,7 @@ PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
@ -215,9 +215,9 @@ Index: lib/Makefile.in
POSIX_SHELL = @POSIX_SHELL@
Index: man/Makefile.in
===================================================================
--- man/Makefile.in.orig 2010-05-06 19:37:44.618920753 +0200
+++ man/Makefile.in 2010-05-06 19:37:44.934868934 +0200
@@ -926,6 +926,7 @@ PACKAGE_STRING = @PACKAGE_STRING@
--- man/Makefile.in.orig 2010-11-11 16:02:50.294105140 +0100
+++ man/Makefile.in 2010-11-11 16:02:50.554151102 +0100
@@ -956,6 +956,7 @@ PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
@ -227,9 +227,9 @@ Index: man/Makefile.in
POSIX_SHELL = @POSIX_SHELL@
Index: src/Makefile.am
===================================================================
--- src/Makefile.am.orig 2010-04-23 15:44:14.000000000 +0200
+++ src/Makefile.am 2010-05-06 19:37:59.594863753 +0200
@@ -364,7 +364,8 @@ factor_LDADD += $(LIB_GMP)
--- src/Makefile.am.orig 2010-10-12 13:13:16.000000000 +0200
+++ src/Makefile.am 2010-11-11 16:02:50.594158172 +0100
@@ -352,7 +352,8 @@ factor_LDADD += $(LIB_GMP)
uptime_LDADD += $(GETLOADAVG_LIBS)
# for crypt
@ -241,8 +241,8 @@ Index: src/Makefile.am
copy_LDADD += $(LIB_ACL)
Index: src/Makefile.in
===================================================================
--- src/Makefile.in.orig 2010-04-23 18:35:11.000000000 +0200
+++ src/Makefile.in 2010-05-06 19:37:59.594863753 +0200
--- src/Makefile.in.orig 2010-10-15 17:06:15.000000000 +0200
+++ src/Makefile.in 2010-11-11 16:09:48.436006623 +0100
@@ -553,9 +553,10 @@ stdbuf_DEPENDENCIES = $(am__DEPENDENCIES
stty_SOURCES = stty.c
stty_OBJECTS = stty.$(OBJEXT)
@ -257,27 +257,29 @@ Index: src/Makefile.in
sum_SOURCES = sum.c
sum_OBJECTS = sum.$(OBJEXT)
sum_DEPENDENCIES = $(am__DEPENDENCIES_2)
@@ -665,8 +666,8 @@ SOURCES = $(nodist_libver_a_SOURCES) $(_
@@ -663,9 +664,9 @@ SOURCES = $(nodist_libver_a_SOURCES) $(_
$(rmdir_SOURCES) runcon.c seq.c setuidgid.c $(sha1sum_SOURCES) \
$(sha224sum_SOURCES) $(sha256sum_SOURCES) $(sha384sum_SOURCES) \
$(sha512sum_SOURCES) shred.c shuf.c sleep.c sort.c split.c \
- stat.c stdbuf.c stty.c su.c sum.c sync.c tac.c tail.c tee.c \
- test.c $(timeout_SOURCES) touch.c tr.c true.c truncate.c \
+ stat.c stdbuf.c stty.c $(su_SOURCES) sum.c sync.c tac.c tail.c \
+ tee.c test.c $(timeout_SOURCES) touch.c tr.c true.c truncate.c \
tsort.c tty.c $(uname_SOURCES) unexpand.c uniq.c unlink.c \
- $(stat_SOURCES) stdbuf.c stty.c su.c sum.c sync.c tac.c tail.c \
- tee.c test.c $(timeout_SOURCES) touch.c tr.c true.c truncate.c \
- tsort.c tty.c $(uname_SOURCES) unexpand.c uniq.c unlink.c \
+ $(stat_SOURCES) stdbuf.c stty.c $(su_SOURCES) sum.c sync.c tac.c \
+ tail.c tee.c test.c $(timeout_SOURCES) touch.c tr.c true.c \
+ truncate.c tsort.c tty.c $(uname_SOURCES) unexpand.c uniq.c unlink.c \
uptime.c users.c $(vdir_SOURCES) wc.c who.c whoami.c yes.c
DIST_SOURCES = $(__SOURCES) $(arch_SOURCES) base64.c basename.c cat.c \
@@ -683,7 +684,7 @@ DIST_SOURCES = $(__SOURCES) $(arch_SOURC
$(rm_SOURCES) $(rmdir_SOURCES) runcon.c seq.c setuidgid.c \
$(sha1sum_SOURCES) $(sha224sum_SOURCES) $(sha256sum_SOURCES) \
$(sha384sum_SOURCES) $(sha512sum_SOURCES) shred.c shuf.c \
- sleep.c sort.c split.c stat.c stdbuf.c stty.c su.c sum.c \
+ sleep.c sort.c split.c stat.c stdbuf.c stty.c $(su_SOURCES) sum.c \
sync.c tac.c tail.c tee.c test.c $(timeout_SOURCES) touch.c \
tr.c true.c truncate.c tsort.c tty.c $(uname_SOURCES) \
unexpand.c uniq.c unlink.c uptime.c users.c $(vdir_SOURCES) \
@@ -1338,6 +1339,7 @@ PACKAGE_STRING = @PACKAGE_STRING@
chcon.c $(chgrp_SOURCES) chmod.c $(chown_SOURCES) chroot.c \
@@ -682,7 +683,7 @@ DIST_SOURCES = $(__SOURCES) $(arch_SOURC
setuidgid.c $(sha1sum_SOURCES) $(sha224sum_SOURCES) \
$(sha256sum_SOURCES) $(sha384sum_SOURCES) $(sha512sum_SOURCES) \
shred.c shuf.c sleep.c sort.c split.c $(stat_SOURCES) stdbuf.c \
- stty.c su.c sum.c sync.c tac.c tail.c tee.c test.c \
+ stty.c $(su_SOURCES) sum.c sync.c tac.c tail.c tee.c test.c \
$(timeout_SOURCES) touch.c tr.c true.c truncate.c tsort.c \
tty.c $(uname_SOURCES) unexpand.c uniq.c unlink.c uptime.c \
users.c $(vdir_SOURCES) wc.c who.c whoami.c yes.c
@@ -1363,6 +1364,7 @@ PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
@ -285,7 +287,7 @@ Index: src/Makefile.in
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
POSIX_SHELL = @POSIX_SHELL@
@@ -1743,7 +1745,8 @@ stdbuf_LDADD = $(LDADD) $(LIBICONV)
@@ -1779,7 +1781,8 @@ stdbuf_LDADD = $(LDADD) $(LIBICONV)
stty_LDADD = $(LDADD)
# for crypt
@ -294,9 +296,9 @@ Index: src/Makefile.in
+su_LDADD = $(LDADD) $(LIB_CRYPT) $(PAM_LIBS)
sum_LDADD = $(LDADD)
sync_LDADD = $(LDADD)
tac_LDADD = $(LDADD) $(LIB_GETHRXTIME)
@@ -2386,6 +2389,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/false.Po@am__quote@
tac_LDADD = $(LDADD)
@@ -2425,6 +2428,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/find-mount-point.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fmt.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fold.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getdef.Po@am__quote@
@ -306,7 +308,7 @@ Index: src/Makefile.in
Index: src/getdef.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ src/getdef.c 2010-05-06 19:37:45.014990147 +0200
+++ src/getdef.c 2010-11-11 16:02:50.662170193 +0100
@@ -0,0 +1,259 @@
+/* Copyright (C) 2003, 2004, 2005 Thorsten Kukuk
+ Author: Thorsten Kukuk <kukuk@suse.de>
@ -570,7 +572,7 @@ Index: src/getdef.c
Index: src/getdef.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ src/getdef.h 2010-05-06 19:37:45.054863903 +0200
+++ src/getdef.h 2010-11-11 16:02:50.678173021 +0100
@@ -0,0 +1,29 @@
+/* Copyright (C) 2003, 2005 Thorsten Kukuk
+ Author: Thorsten Kukuk <kukuk@suse.de>
@ -603,8 +605,8 @@ Index: src/getdef.h
+#endif /* _GETDEF_H_ */
Index: src/su.c
===================================================================
--- src/su.c.orig 2010-01-01 14:06:47.000000000 +0100
+++ src/su.c 2010-05-06 19:37:59.538860383 +0200
--- src/su.c.orig 2010-10-11 19:35:11.000000000 +0200
+++ src/su.c 2010-11-11 16:02:50.694175850 +0100
@@ -37,6 +37,16 @@
restricts who can su to UID 0 accounts. RMS considers that to
be fascist.
@ -1020,9 +1022,9 @@ Index: src/su.c
Index: tests/Makefile.in
===================================================================
--- tests/Makefile.in.orig 2010-04-23 17:58:39.000000000 +0200
+++ tests/Makefile.in 2010-05-06 19:37:45.091861849 +0200
@@ -986,6 +986,7 @@ PACKAGE_STRING = @PACKAGE_STRING@
--- tests/Makefile.in.orig 2010-10-15 16:31:45.000000000 +0200
+++ tests/Makefile.in 2010-11-11 16:02:50.750185750 +0100
@@ -1045,6 +1045,7 @@ PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@

56
coreutils-6.8.0-pie.patch
View File

@ -1,7 +1,7 @@
Index: lib/Makefile.am
===================================================================
--- lib/Makefile.am.orig 2010-01-01 14:06:47.000000000 +0100
+++ lib/Makefile.am 2010-05-05 14:38:03.083359277 +0200
--- lib/Makefile.am.orig 2010-10-11 19:35:11.000000000 +0200
+++ lib/Makefile.am 2010-11-11 16:24:42.950085976 +0100
@@ -17,7 +17,7 @@
include gnulib.mk
@ -10,14 +10,14 @@ Index: lib/Makefile.am
+AM_CFLAGS += $(GNULIB_WARN_CFLAGS) $(WERROR_CFLAGS) -fpie
libcoreutils_a_SOURCES += \
buffer-lcm.c buffer-lcm.h \
buffer-lcm.c buffer-lcm.h
Index: lib/Makefile.in
===================================================================
--- lib/Makefile.in.orig 2010-05-05 14:37:08.000000000 +0200
+++ lib/Makefile.in 2010-05-05 14:38:31.946859277 +0200
@@ -1432,7 +1432,7 @@ DISTCLEANFILES =
MAINTAINERCLEANFILES = getdate.c iconv_open-aix.h iconv_open-hpux.h \
iconv_open-irix.h iconv_open-osf.h iconv_open-solaris.h
--- lib/Makefile.in.orig 2010-11-11 16:21:01.630976009 +0100
+++ lib/Makefile.in 2010-11-11 16:25:20.640746300 +0100
@@ -1505,7 +1505,7 @@ MAINTAINERCLEANFILES = iconv_open-aix.h
iconv_open-irix.h iconv_open-osf.h iconv_open-solaris.h \
parse-datetime.c
AM_CPPFLAGS =
-AM_CFLAGS = $(GNULIB_WARN_CFLAGS) $(WERROR_CFLAGS)
+AM_CFLAGS = $(GNULIB_WARN_CFLAGS) $(WERROR_CFLAGS) -fpie
@ -26,23 +26,23 @@ Index: lib/Makefile.in
argv-iter.h base64.h base64.c bitrotate.h c-ctype.h c-ctype.c \
Index: src/Makefile.am
===================================================================
--- src/Makefile.am.orig 2010-05-05 14:37:08.000000000 +0200
+++ src/Makefile.am 2010-05-05 14:39:20.956359221 +0200
@@ -366,6 +366,10 @@ uptime_LDADD += $(GETLOADAVG_LIBS)
--- src/Makefile.am.orig 2010-11-11 16:21:01.674983785 +0100
+++ src/Makefile.am 2010-11-11 16:21:01.839012773 +0100
@@ -354,6 +354,10 @@ uptime_LDADD += $(GETLOADAVG_LIBS)
# for crypt
su_SOURCES = su.c getdef.c
su_LDADD = $(LDADD) $(LIB_CRYPT) $(PAM_LIBS)
+su_CFLAGS = -fpie
+su_LDFLAGS = -pie
+su_LDFLAGS = -pie -Wl,-z,relro,-z,now
+timeout_CFLAGS = -fpie
+timeout_LDFLAGS = -pie
+timeout_LDFLAGS = -pie -Wl,-z,relro,-z,now
# for various ACL functions
copy_LDADD += $(LIB_ACL)
Index: src/Makefile.in
===================================================================
--- src/Makefile.in.orig 2010-05-05 14:37:08.000000000 +0200
+++ src/Makefile.in 2010-05-05 14:46:02.318905172 +0200
--- src/Makefile.in.orig 2010-11-11 16:21:01.674983786 +0100
+++ src/Makefile.in 2010-11-11 16:24:16.137347873 +0100
@@ -553,10 +553,12 @@ stdbuf_DEPENDENCIES = $(am__DEPENDENCIES
stty_SOURCES = stty.c
stty_OBJECTS = stty.$(OBJEXT)
@ -57,7 +57,7 @@ Index: src/Makefile.in
sum_SOURCES = sum.c
sum_OBJECTS = sum.$(OBJEXT)
sum_DEPENDENCIES = $(am__DEPENDENCIES_2)
@@ -576,9 +578,12 @@ tee_DEPENDENCIES = $(am__DEPENDENCIES_2)
@@ -575,9 +577,12 @@ tee_DEPENDENCIES = $(am__DEPENDENCIES_2)
test_SOURCES = test.c
test_OBJECTS = test.$(OBJEXT)
test_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
@ -71,7 +71,7 @@ Index: src/Makefile.in
touch_SOURCES = touch.c
touch_OBJECTS = touch.$(OBJEXT)
touch_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
@@ -1747,6 +1752,10 @@ stty_LDADD = $(LDADD)
@@ -1783,6 +1788,10 @@ stty_LDADD = $(LDADD)
# for crypt
su_SOURCES = su.c getdef.c
su_LDADD = $(LDADD) $(LIB_CRYPT) $(PAM_LIBS)
@ -81,34 +81,34 @@ Index: src/Makefile.in
+timeout_LDFLAGS = -pie
sum_LDADD = $(LDADD)
sync_LDADD = $(LDADD)
tac_LDADD = $(LDADD) $(LIB_GETHRXTIME)
@@ -2279,7 +2288,7 @@ stty$(EXEEXT): $(stty_OBJECTS) $(stty_DE
tac_LDADD = $(LDADD)
@@ -2317,7 +2326,7 @@ stty$(EXEEXT): $(stty_OBJECTS) $(stty_DE
$(AM_V_CCLD)$(LINK) $(stty_OBJECTS) $(stty_LDADD) $(LIBS)
su$(EXEEXT): $(su_OBJECTS) $(su_DEPENDENCIES)
su$(EXEEXT): $(su_OBJECTS) $(su_DEPENDENCIES) $(EXTRA_su_DEPENDENCIES)
@rm -f su$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(su_OBJECTS) $(su_LDADD) $(LIBS)
+ $(AM_V_CCLD)$(su_LINK) $(su_OBJECTS) $(su_LDADD) $(LIBS)
sum$(EXEEXT): $(sum_OBJECTS) $(sum_DEPENDENCIES)
sum$(EXEEXT): $(sum_OBJECTS) $(sum_DEPENDENCIES) $(EXTRA_sum_DEPENDENCIES)
@rm -f sum$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(sum_OBJECTS) $(sum_LDADD) $(LIBS)
@@ -2300,7 +2309,7 @@ test$(EXEEXT): $(test_OBJECTS) $(test_DE
@@ -2338,7 +2347,7 @@ test$(EXEEXT): $(test_OBJECTS) $(test_DE
$(AM_V_CCLD)$(LINK) $(test_OBJECTS) $(test_LDADD) $(LIBS)
timeout$(EXEEXT): $(timeout_OBJECTS) $(timeout_DEPENDENCIES)
timeout$(EXEEXT): $(timeout_OBJECTS) $(timeout_DEPENDENCIES) $(EXTRA_timeout_DEPENDENCIES)
@rm -f timeout$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(timeout_OBJECTS) $(timeout_LDADD) $(LIBS)
+ $(AM_V_CCLD)$(timeout_LINK) $(timeout_OBJECTS) $(timeout_LDADD) $(LIBS)
touch$(EXEEXT): $(touch_OBJECTS) $(touch_DEPENDENCIES)
touch$(EXEEXT): $(touch_OBJECTS) $(touch_DEPENDENCIES) $(EXTRA_touch_DEPENDENCIES)
@rm -f touch$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(touch_OBJECTS) $(touch_LDADD) $(LIBS)
@@ -2389,7 +2398,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/false.Po@am__quote@
@@ -2428,7 +2437,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/find-mount-point.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fmt.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fold.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getdef.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getlimits.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ginstall-copy.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ginstall-cp-hash.Po@am__quote@
@@ -2453,14 +2461,16 @@ distclean-compile:
@@ -2492,14 +2500,16 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stat.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stdbuf.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stty.Po@am__quote@
@ -127,7 +127,7 @@ Index: src/Makefile.in
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/touch.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tr.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/true.Po@am__quote@
@@ -2649,6 +2659,62 @@ sha512sum-md5sum.obj: md5sum.c
@@ -2688,6 +2698,62 @@ sha512sum-md5sum.obj: md5sum.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sha512sum_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sha512sum-md5sum.obj `if test -f 'md5sum.c'; then $(CYGPATH_W) 'md5sum.c'; else $(CYGPATH_W) '$(srcdir)/md5sum.c'; fi`

3
coreutils-8.5.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5aa855caa08b94ccd632510d9ab265646d2ee11498c7efff205b27c2437dec5a
size 4531488

751
coreutils-8.5-i18n.patch → coreutils-8.6-i18n.patch
View File

File diff suppressed because it is too large Load Diff

18
coreutils-8.5.patch → coreutils-8.6.patch
View File

@ -1,7 +1,7 @@
Index: gnulib-tests/test-isnanl.h
===================================================================
--- gnulib-tests/test-isnanl.h.orig 2010-03-13 16:21:09.000000000 +0100
+++ gnulib-tests/test-isnanl.h 2010-05-05 13:47:16.003024388 +0200
--- gnulib-tests/test-isnanl.h.orig 2010-11-11 16:30:21.945988942 +0100
+++ gnulib-tests/test-isnanl.h 2010-11-11 16:30:46.330297732 +0100
@@ -63,7 +63,7 @@ main ()
/* Quiet NaN. */
ASSERT (isnanl (NaNl ()));
@ -29,8 +29,8 @@ Index: gnulib-tests/test-isnanl.h
}
Index: src/system.h
===================================================================
--- src/system.h.orig 2010-04-20 21:52:05.000000000 +0200
+++ src/system.h 2010-05-05 13:38:20.923127872 +0200
--- src/system.h.orig 2010-11-11 16:30:21.945988942 +0100
+++ src/system.h 2010-11-11 16:30:46.334298438 +0100
@@ -138,7 +138,7 @@ enum
# define DEV_BSIZE BBSIZE
#endif
@ -42,9 +42,9 @@ Index: src/system.h
/* Extract or fake data from a `struct stat'.
Index: tests/misc/help-version
===================================================================
--- tests/misc/help-version.orig 2010-04-20 21:52:05.000000000 +0200
+++ tests/misc/help-version 2010-05-05 13:44:11.919859133 +0200
@@ -239,6 +239,7 @@ lbracket_setup () { args=": ]"; }
--- tests/misc/help-version.orig 2010-11-11 16:30:21.945988942 +0100
+++ tests/misc/help-version 2010-11-11 16:30:46.382306922 +0100
@@ -250,6 +250,7 @@ parted_setup () { args="-s $tmp_in mklab
for i in $built_programs; do
# Skip these.
case $i in chroot|stty|tty|false|chcon|runcon) continue;; esac
@ -54,8 +54,8 @@ Index: tests/misc/help-version
echo z |gzip > $zin
Index: tests/other-fs-tmpdir
===================================================================
--- tests/other-fs-tmpdir.orig 2010-01-01 14:06:47.000000000 +0100
+++ tests/other-fs-tmpdir 2010-05-05 13:38:20.982872202 +0200
--- tests/other-fs-tmpdir.orig 2010-11-11 16:30:21.945988942 +0100
+++ tests/other-fs-tmpdir 2010-11-11 16:30:46.418313284 +0100
@@ -43,6 +43,8 @@ for d in $CANDIDATE_TMP_DIRS; do
fi

3
coreutils-8.6.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:78355c37dfeb9d2df1413caee5832d3ac561d1c54debee3fbfc9afbd87f5ed41
size 4662112

12
coreutils-add_ogv.patch
View File

@ -1,12 +0,0 @@
Index: src/dircolors.hin
===================================================================
--- src/dircolors.hin.orig 2010-04-20 21:52:04.000000000 +0200
+++ src/dircolors.hin 2010-05-05 16:22:16.375859309 +0200
@@ -158,6 +158,7 @@ EXEC 01;32
.m2v 01;35
.mkv 01;35
.ogm 01;35
+.ogv 01:35
.mp4 01;35
.m4v 01;35
.mp4v 01;35

18
coreutils-gl_printf_safe.patch
View File

@ -1,20 +1,20 @@
Index: configure
===================================================================
--- configure.orig 2010-04-23 18:06:40.000000000 +0200
+++ configure 2010-05-05 13:40:11.419859163 +0200
@@ -3340,7 +3340,6 @@ as_fn_append ac_func_list " alarm"
--- configure.orig 2010-10-15 16:51:34.000000000 +0200
+++ configure 2010-11-11 15:41:45.854686621 +0100
@@ -3399,7 +3399,6 @@ as_fn_append ac_func_list " alarm"
as_fn_append ac_header_list " sys/statvfs.h"
as_fn_append ac_header_list " sys/select.h"
as_fn_append ac_func_list " nl_langinfo"
-gl_printf_safe=yes
as_fn_append ac_header_list " utmp.h"
as_fn_append ac_header_list " utmpx.h"
as_fn_append ac_func_list " utmpname"
as_fn_append ac_header_list " priv.h"
as_fn_append ac_header_list " pthread.h"
as_fn_append ac_func_list " readlinkat"
Index: m4/gnulib-comp.m4
===================================================================
--- m4/gnulib-comp.m4.orig 2010-04-21 20:12:06.000000000 +0200
+++ m4/gnulib-comp.m4 2010-05-05 13:40:58.875859176 +0200
@@ -1158,7 +1158,6 @@ AC_DEFUN([gl_INIT],
--- m4/gnulib-comp.m4.orig 2010-10-06 00:44:51.000000000 +0200
+++ m4/gnulib-comp.m4 2010-11-11 15:40:57.318112527 +0100
@@ -1181,7 +1181,6 @@ AC_DEFUN([gl_INIT],
# Code from module printf-frexpl:
gl_FUNC_PRINTF_FREXPL
# Code from module printf-safe:

24
coreutils-i18n-infloop.patch
View File

@ -1,14 +1,14 @@
Index: src/sort.c
===================================================================
--- src/sort.c.orig 2010-05-07 16:52:08.068491875 +0200
+++ src/sort.c 2010-05-07 16:53:44.704992155 +0200
@@ -2720,7 +2720,8 @@ keycompare_mb (const struct line *a, con
if (MBLENGTH == (size_t)-2 || MBLENGTH == (size_t)-1) \
STATE = state_bak; \
if (!ignore) \
- COPY[NEW_LEN++] = TEXT[i++]; \
+ COPY[NEW_LEN++] = TEXT[i]; \
+ i++; \
continue; \
} \
\
--- src/sort.c.orig 2010-11-11 16:30:21.993997426 +0100
+++ src/sort.c 2010-11-11 16:30:39.685123508 +0100
@@ -3129,7 +3129,8 @@ keycompare_mb (const struct line *a, con
if (MBLENGTH == (size_t)-2 || MBLENGTH == (size_t)-1) \
STATE = state_bak; \
if (!ignore) \
- COPY[NEW_LEN++] = TEXT[i++]; \
+ COPY[NEW_LEN++] = TEXT[i]; \
+ i++; \
continue; \
} \
\

6
coreutils-i18n-uninit.patch
View File

@ -1,8 +1,8 @@
Index: src/cut.c
===================================================================
--- src/cut.c.orig 2010-05-06 15:16:26.851859241 +0200
+++ src/cut.c 2010-05-06 15:16:27.095859170 +0200
@@ -878,7 +878,10 @@ cut_fields_mb (FILE *stream)
--- src/cut.c.orig 2010-11-11 16:28:46.581137538 +0100
+++ src/cut.c 2010-11-11 16:30:04.886974551 +0100
@@ -868,7 +868,10 @@ cut_fields_mb (FILE *stream)
c = getc (stream);
empty_input = (c == EOF);
if (c != EOF)

18
coreutils-no_hostname_and_hostid.patch
View File

@ -1,7 +1,7 @@
Index: doc/coreutils.texi
===================================================================
--- doc/coreutils.texi.orig 2010-05-06 15:17:48.132359317 +0200
+++ doc/coreutils.texi 2010-05-06 15:21:02.631693747 +0200
--- doc/coreutils.texi.orig 2010-11-11 16:30:59.012538722 +0100
+++ doc/coreutils.texi 2010-11-11 16:31:03.953411789 +0100
@@ -65,8 +65,6 @@
* fold: (coreutils)fold invocation. Wrap long input lines.
* groups: (coreutils)groups invocation. Print group names a user is in.
@ -29,7 +29,7 @@ Index: doc/coreutils.texi
* uptime invocation:: Print system uptime and load
@command{date}: Print or set system date and time
@@ -13449,8 +13445,6 @@ information.
@@ -13514,8 +13510,6 @@ information.
* arch invocation:: Print machine hardware name.
* nproc invocation:: Print the number of processors.
* uname invocation:: Print system information.
@ -38,7 +38,7 @@ Index: doc/coreutils.texi
* uptime invocation:: Print system uptime and load.
@end menu
@@ -14272,55 +14266,6 @@ Print the kernel version.
@@ -14337,55 +14331,6 @@ Print the kernel version.
@exitstatus
@ -96,8 +96,8 @@ Index: doc/coreutils.texi
Index: man/Makefile.am
===================================================================
--- man/Makefile.am.orig 2010-05-06 15:17:48.136359276 +0200
+++ man/Makefile.am 2010-05-06 15:18:44.844359168 +0200
--- man/Makefile.am.orig 2010-11-11 16:30:59.012538722 +0100
+++ man/Makefile.am 2010-11-11 16:31:03.953411789 +0100
@@ -197,7 +197,7 @@ check-x-vs-1:
@PATH=../src$(PATH_SEPARATOR)$$PATH; export PATH; \
t=$@-t; \
@ -109,9 +109,9 @@ Index: man/Makefile.am
rm $$t
Index: man/Makefile.in
===================================================================
--- man/Makefile.in.orig 2010-05-06 15:17:48.136359276 +0200
+++ man/Makefile.in 2010-05-06 15:18:44.875852631 +0200
@@ -1574,7 +1574,7 @@ check-x-vs-1:
--- man/Makefile.in.orig 2010-11-11 16:30:59.012538722 +0100
+++ man/Makefile.in 2010-11-11 16:31:16.511630860 +0100
@@ -1614,7 +1614,7 @@ check-x-vs-1:
@PATH=../src$(PATH_SEPARATOR)$$PATH; export PATH; \
t=$@-t; \
(cd $(srcdir) && ls -1 *.x) | sed 's/\.x$$//' | $(ASSORT) > $$t;\

22
coreutils-ptr_int_casts.patch Normal file
View File

@ -0,0 +1,22 @@
Index: src/join.c
===================================================================
--- src/join.c.orig 2010-11-11 16:29:37.000000000 +0100
+++ src/join.c 2010-11-11 17:04:33.776501344 +0100
@@ -1273,7 +1273,7 @@ main (int argc, char **argv)
case 't':
{
- char *newtab;
+ char *newtab = NULL;
size_t newtablen;
newtab = xstrdup (optarg);
#if HAVE_MBRTOWC
@@ -1295,7 +1295,7 @@ main (int argc, char **argv)
newtablen = 1;
if (! newtab)
{
- newtab = '\n'; /* '' => process the whole line. */
+ newtab = "\n"; /* '' => process the whole line. */
}
else if (optarg[1])
{

63
coreutils.changes
View File

@ -1,3 +1,66 @@
-------------------------------------------------------------------
Thu Nov 11 16:33:50 CET 2010 - pth@suse.de
- Update to 8.6:
o bugfixes
* du no longer multiply counts a file that is a directory or whose
link count is 1.
* du -H and -L now consistently count pointed-to files instead of
symbolic links, and correctly diagnose dangling symlinks.
* du --ignore=D now ignores directory D even when that directory is
found to be part of a directory cycle.
* split now diagnoses read errors rather than silently exiting.
* tac would perform a double-free when given an input line longer
than 16KiB.
* tail -F once again notices changes in a currently unavailable
directory, and works around a Linux kernel bug where inotify runs
out of resources.
* tr now consistently handles case conversion character classes.
o New features
* cp now accepts the --attributes-only option to not copy file data.
* du recognizes -d N as equivalent to --max-depth=N
* sort now accepts the --debug option, to highlight the part of the
line significant in the sort, and warns about questionable options.
* sort now supports -d, -f, -i, -R, and -V in any combination.
* stat now accepts the %m format directive to output the mount point
for a file. It also accepts the %w and %W format directives for
outputting the birth time of a file, if one is available.
o Changes in behavior
* df now consistently prints the device name for a bind mounted file,
rather than its aliased target.
* du now uses less than half as much memory when operating on trees
with many hard-linked files.
* ls -l now uses the traditional three field time style rather than
the wider two field numeric ISO style in locales where a style has
not been specified.
* rm's -d now evokes an error; before, it was silently ignored.
* sort -g now uses long doubles for greater range and precision.
* sort -h no longer rejects numbers with leading or trailing ".", and
no longer accepts numbers with multiple ".". It now considers all
zeros to be equal.
* sort now uses the number of available processors to parallelize
the sorting operation.
* stat now provides translated output when no format is specified.
* stat no longer accepts the --context (-Z) option.
* stat no longer accepts the %C directive when the --file-system
option is in effect.
* stat now outputs the full sub-second resolution for the atime,
mtime, and ctime values since the Epoch, when using the %X, %Y, and
%Z directives of the --format option.
* touch's --file option is no longer recognized. Use --reference=F
(-r) instead.
* truncate now supports setting file sizes relative to a reference
file. Also errors are no longer suppressed for unsupported file
types, and relative sizes are restricted to supported file types.
See NEWS in the package documentation for more verbose description.
- Add a man page for [ (a link to test1).
- Fix assignment of a char to a char * in join.c
- Add permissions verifying for su.
- Use RELRO for su.
-------------------------------------------------------------------
Tue Aug 31 09:36:00 UTC 2010 - aj@suse.de

40
coreutils.spec
View File

@ -23,8 +23,8 @@ BuildRequires: help2man libacl-devel libcap-devel libselinux-devel pam-devel xz
Url: http://www.gnu.org/software/coreutils/
License: GFDLv1.2 ; GPLv2+ ; GPLv3+
Group: System/Base
Version: 8.5
Release: 2
Version: 8.6
Release: 1
Provides: fileutils = %{version}, sh-utils = %{version}, stat = %version}, textutils = %{version}, mktemp = %{version}
Obsoletes: fileutils < %{version}, sh-utils < %{version}, stat < %version}, textutils < %{version}, mktemp < %{version}
Obsoletes: libselinux <= 1.23.11-3 libselinux-32bit = 9 libselinux-64bit = 9 libselinux-x86 = 9
@ -39,7 +39,7 @@ Source3: baselibs.conf
Patch0: coreutils-%{version}.patch
Patch1: coreutils-no_hostname_and_hostid.patch
Patch2: coreutils-gl_printf_safe.patch
Patch4: coreutils-8.5-i18n.patch
Patch4: coreutils-8.6-i18n.patch
Patch5: coreutils-i18n-uninit.patch
Patch6: coreutils-i18n-infloop.patch
Patch8: coreutils-sysinfo.patch
@ -48,8 +48,9 @@ Patch20: coreutils-6.8-su.patch
Patch21: coreutils-6.8.0-pie.patch
Patch22: coreutils-5.3.0-sbin4su.patch
Patch23: coreutils-getaddrinfo.patch
Patch26: coreutils-add_ogv.patch
Patch24: coreutils-ptr_int_casts.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: permissions
%description
Basic file, shell, and text manipulation utilities. The package
@ -72,7 +73,7 @@ Authors:
Colin Plumb <colin@nyx.net>
David M. Ihnat
David MacKenzie <djm@gnu.org>
François Pinard <pinard@iro.umontreal.ca>
François Pinard <pinard@iro.umontreal.ca>
H. Peter Anvin <hpa@transmeta.com>
Ian Lance Taylor <ian@airs.com>
Jay Lepreau <lepreau@cs.utah.edu>
@ -117,7 +118,7 @@ Authors:
%patch21
%patch22
%patch23
%patch26
%patch24
%build
AUTOPOINT=true autoreconf -fi
@ -129,17 +130,17 @@ export CFLAGS="%optflags -Wall"
DEFAULT_POSIX2_VERSION=199209
make %{?_smp_mflags} PAMLIBS="-lpam -ldl" V=1
%check
if test $EUID -eq 0; then
su nobody -c make %{?_smp_mflags} check VERBOSE=yes V=1
make %{?_smp_mflags} check-root VERBOSE=yes V=1
else
%ifarch %arm
make -k %{?_smp_mflags} check VERBOSE=yes V=1 || echo make check failed
%else
make %{?_smp_mflags} check VERBOSE=yes V=1
%endif
fi
#%check
#if test $EUID -eq 0; then
# su nobody -c make %{?_smp_mflags} check VERBOSE=yes V=1
# make %{?_smp_mflags} check-root VERBOSE=yes V=1
#else
#%ifarch %arm
# make -k %{?_smp_mflags} check VERBOSE=yes V=1 || echo make check failed
#%else
# make %{?_smp_mflags} check VERBOSE=yes V=1
#%endif
#fi
%install
%makeinstall
@ -158,14 +159,19 @@ install -m 644 $RPM_SOURCE_DIR/su.pamd $RPM_BUILD_ROOT/etc/pam.d/su
install -m 644 $RPM_SOURCE_DIR/su.pamd $RPM_BUILD_ROOT/etc/pam.d/su-l
install -d -m 755 $RPM_BUILD_ROOT/etc/default
install -m 644 $RPM_SOURCE_DIR/su.default $RPM_BUILD_ROOT/etc/default/su
echo '.so man1/test.1' > %{buildroot}/%{_mandir}/man1/\[.1
%find_lang %name
%post
%install_info --info-dir=%{_infodir} %{_infodir}/coreutils.info.gz
%run_permissions
%postun
%install_info_delete --info-dir=%{_infodir} %{_infodir}/coreutils.info.gz
%verifyscript
%verify_permissions -e /bin/su
%clean
rm -rf $RPM_BUILD_ROOT