[prev in list] [next in list] [prev in thread] [next in thread]
List: ipcop-svn
Subject: [Ipcop-svn] SF.net SVN: ipcop:[6927] ipcop/trunk
From: gespinasse () users ! sourceforge ! net
Date: 2013-02-16 8:24:15
Message-ID: E1U6d4B-0000xK-C4 () sfp-svn-4 ! v30 ! ch3 ! sourceforge ! com
[Download RAW message or body]
Revision: 6927
http://ipcop.svn.sourceforge.net/ipcop/?revi27&view=rev
Author: gespinasse
Date: 2013-02-16 08:24:14 +0000 (Sat, 16 Feb 2013)
Log Message:
-----------
Upgrade coreutils from 8.20 to 8.21
There is fixes mostly for cut and seq (and for the test suite)
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/coreutils
ipcop/trunk/lfs/coreutils
ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
ipcop/trunk/updates/2.1.0/information.xml
Removed Paths:
-------------
ipcop/trunk/src/patches/coreutils-8.20_mountlist.patch
ipcop/trunk/src/patches/coreutils-8.20_tests-getlogin.patch
Modified: ipcop/trunk/config/rootfiles/common/coreutils
==================================================================--- \
ipcop/trunk/config/rootfiles/common/coreutils 2013-02-15 16:57:11 UTC \
(rev 6926)
+++ ipcop/trunk/config/rootfiles/common/coreutils 2013-02-16 08:24:14 UTC (rev 6927)
@@ -55,6 +55,7 @@
#usr/bin/nl
usr/bin/nohup
#usr/bin/nproc
+#usr/bin/numfmt
#usr/bin/od
usr/bin/paste
#usr/bin/pathchk
Modified: ipcop/trunk/lfs/coreutils
==================================================================--- \
ipcop/trunk/lfs/coreutils 2013-02-15 16:57:11 UTC (rev 6926)
+++ ipcop/trunk/lfs/coreutils 2013-02-16 08:24:14 UTC (rev 6927)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = coreutils
-VER = 8.20
+VER = 8.21
HOST_ARCH = all
OTHER_SRC = yes
@@ -50,7 +50,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 3d69af8f561fce512538a9fe85f147ff
+$(DL_FILE)_MD5 = 065ba41828644eca5dd8163446de5d64
install : $(TARGET)
@@ -81,10 +81,6 @@
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xf $(DIR_DL)/$(DL_FILE)
- # Apply upstream fixes, remove after 8.20
- cd $(DIR_APP) && patch -p1 -i $(DIR_PATCHES)/$(THISAPP)_mountlist.patch
- cd $(DIR_APP)/gnulib-tests && patch -p2 -i \
$(DIR_PATCHES)/$(THISAPP)_tests-getlogin.patch
-
ifeq "$(STAGE)" "toolchain"
# hostname is used on base stage by coreutils configure and perl base tests
# use --disable-nls just to be smaller
@@ -115,8 +111,7 @@
# Commented for now. Never certain to restore permission if you stop during tests \
and restart the tests from another tty. #chmod o+r `tty`
- # Add SUBDIRS= for 8.20 to avoid undue recursion in gnulib directory that create \
errors
- -cd $(DIR_APP) && make -j 1 NON_ROOT_USERNAME=nobody SUBDIRS= check-root &> \
$(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log + -cd $(DIR_APP) && make -j 1 \
NON_ROOT_USERNAME=nobody check-root &> $(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
# To be able to run non-root tests as nobody
chown -R nobody $(DIR_APP)
Deleted: ipcop/trunk/src/patches/coreutils-8.20_mountlist.patch
==================================================================--- \
ipcop/trunk/src/patches/coreutils-8.20_mountlist.patch 2013-02-15 16:57:11 UTC (rev \
6926)
+++ ipcop/trunk/src/patches/coreutils-8.20_mountlist.patch 2013-02-16 08:24:14 UTC \
(rev 6927) @@ -1,53 +0,0 @@
-# from gnulib tree, git diff 51e801f2f297e45a24004ee6256dd1a6c7389074..
-
-diff --git a/lib/mountlist.c b/lib/mountlist.c
-index 67154b8..d0fe1b2 100644
---- a/lib/mountlist.c
-+++ b/lib/mountlist.c
-@@ -149,16 +149,27 @@
- #undef opendir
- #undef closedir
-
--#ifndef ME_DUMMY
--# define ME_DUMMY(Fs_name, Fs_type) \
-- (strcmp (Fs_type, "autofs") == 0 \
-- || strcmp (Fs_type, "none") == 0 \
-- || strcmp (Fs_type, "proc") == 0 \
-- || strcmp (Fs_type, "subfs") == 0 \
-- /* for NetBSD 3.0 */ \
-- || strcmp (Fs_type, "kernfs") == 0 \
-- /* for Irix 6.5 */ \
-- || strcmp (Fs_type, "ignore") == 0)
-+#define ME_DUMMY_0(Fs_name, Fs_type) \
-+ (strcmp (Fs_type, "autofs") == 0 \
-+ || strcmp (Fs_type, "proc") == 0 \
-+ || strcmp (Fs_type, "subfs") == 0 \
-+ /* for NetBSD 3.0 */ \
-+ || strcmp (Fs_type, "kernfs") == 0 \
-+ /* for Irix 6.5 */ \
-+ || strcmp (Fs_type, "ignore") == 0)
-+
-+/* Historically, we have marked as "dummy" any file system of type "none",
-+ but now that programs like du need to know about bind-mounted directories,
-+ we grant an exception to any with "bind" in its list of mount options.
-+ I.e., those are *not* dummy entries. */
-+#ifdef MOUNTED_GETMNTENT1
-+# define ME_DUMMY(Fs_name, Fs_type, Fs_ent) \
-+ (ME_DUMMY_0 (Fs_name, Fs_type) \
-+ || (strcmp (Fs_type, "none") == 0 \
-+ && !hasmntopt (Fs_ent, "bind")))
-+#else
-+# define ME_DUMMY(Fs_name, Fs_type) \
-+ (ME_DUMMY_0 (Fs_name, Fs_type) || strcmp (Fs_type, "none") == 0)
- #endif
-
- #ifdef __CYGWIN__
-@@ -419,7 +430,7 @@ read_file_system_list (bool need_fs_type)
- me->me_mountdir = xstrdup (mnt->mnt_dir);
- me->me_type = xstrdup (mnt->mnt_type);
- me->me_type_malloced = 1;
-- me->me_dummy = ME_DUMMY (me->me_devname, me->me_type);
-+ me->me_dummy = ME_DUMMY (me->me_devname, me->me_type, mnt);
- me->me_remote = ME_REMOTE (me->me_devname, me->me_type);
- me->me_dev = dev_from_mount_options (mnt->mnt_opts);
-
Deleted: ipcop/trunk/src/patches/coreutils-8.20_tests-getlogin.patch
==================================================================--- \
ipcop/trunk/src/patches/coreutils-8.20_tests-getlogin.patch 2013-02-15 16:57:11 UTC \
(rev 6926)
+++ ipcop/trunk/src/patches/coreutils-8.20_tests-getlogin.patch 2013-02-16 08:24:14 \
UTC (rev 6927) @@ -1,96 +0,0 @@
-From 4f81aa5778dc88b99d21ad8d04a4bc9401366311 Mon Sep 17 00:00:00 2001
-From: Paul Eggert <eggert@cs.ucla.edu>
-Date: Fri, 9 Nov 2012 01:03:33 -0800
-Subject: [PATCH] getlogin-tests: allow errno == ENOENT
-
-* tests/test-getlogin.c (main): Skip tests if getlogin fails
-with errno == ENOENT. This happened to me on Ubuntu 12.04.1 x86,
-when running a test in an Emacs shell buffer.
----
- ChangeLog | 7 +++++++
- tests/test-getlogin.c | 7 +++++++
- 2 files changed, 14 insertions(+), 0 deletions(-)
-
-#diff --git a/ChangeLog b/ChangeLog
-#index 7e0129e..cca6c07 100644
-#--- a/ChangeLog
-#+++ b/ChangeLog
-#@@ -1,3 +1,10 @@
-#+2012-11-09 Paul Eggert <eggert@cs.ucla.edu>
-#+
-#+ getlogin-tests: allow errno == ENOENT
-#+ * tests/test-getlogin.c (main): Skip tests if getlogin fails
-#+ with errno == ENOENT. This happened to me on Ubuntu 12.04.1 x86,
-#+ when running a test in an Emacs shell buffer.
-#+
- 2012-11-08 Jim Meyering <jim@meyering.net>
-
- tests/nap.h: avoid warning about unused variable
-diff --git a/tests/test-getlogin.c b/tests/test-getlogin.c
-index 449ceaa..d86fec2 100644
---- a/tests/test-getlogin.c
-+++ b/tests/test-getlogin.c
-@@ -39,6 +39,13 @@ main (void)
- buf = getlogin ();
- if (buf == NULL)
- {
-+ if (errno == ENOENT)
-+ {
-+ /* This can happen on GNU/Linux. */
-+ fprintf (stderr, "Skipping test: no entry in utmp file.\n");
-+ return 77;
-+ }
-+
- /* getlogin() fails when stdin is not connected to a tty. */
- ASSERT (errno == ENOTTY
- || errno == EINVAL /* seen on Linux/SPARC */
---
-
-From bfe5b0dfd062fb9ffbc61b27a0d750c41abc1a8e Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Pádraig Brady?= <P@draigBrady.com>
-Date: Fri, 9 Nov 2012 11:55:25 +0000
-Subject: [PATCH] getlogin_r-tests: allow errno == ENXIO or ENOENT
-
-* tests/test-getlogin.c (main): Skip tests if getlogin fails
-with errno == ENXIO (No controlling tty).
-* tests/test-getlogin_r.c (main): Skip tests if getlogin_r fails
-with errno == ENOENT. This was reported to happen in various
-situations on GNU/Linux.
----
- ChangeLog | 10 ++++++++++
- tests/test-getlogin.c | 1 +
- tests/test-getlogin_r.c | 8 ++++++++
- 3 files changed, 19 insertions(+), 0 deletions(-)
-
-#diff --git a/ChangeLog b/ChangeLog
-#index cca6c07..67e0342 100644
-#--- a/ChangeLog
-#+++ b/ChangeLog
-#@@ -1,3 +1,13 @@
-#+2012-11-09 Pádraig Brady <P@draigBrady.com>
-#+
-#+ getlogin-tests: allow errno == ENXIO
-#+ * tests/test-getlogin.c (main): Skip tests if getlogin fails
-#+ with errno == ENXIO (No controlling tty).
-#+ getlogin_r-tests: Likewise. Also allow errno == ENOENT
-#+ * tests/test-getlogin_r.c (main): Skip tests if getlogin_r fails
-#+ with errno == ENOENT. This was reported to happen in various
-#+ situations on GNU/Linux.
-#+
-# 2012-11-09 Paul Eggert <eggert@cs.ucla.edu>
-#
-# getlogin-tests: allow errno == ENOENT
-diff --git a/tests/test-getlogin.c b/tests/test-getlogin.c
-index d86fec2..f7903ae 100644
---- a/tests/test-getlogin.c
-+++ b/tests/test-getlogin.c
-@@ -49,6 +49,7 @@ main (void)
- /* getlogin() fails when stdin is not connected to a tty. */
- ASSERT (errno == ENOTTY
- || errno == EINVAL /* seen on Linux/SPARC */
-+ || errno == ENXIO
- );
- #if !defined __hpux /* On HP-UX 11.11 it fails anyway. */
- ASSERT (! isatty (0));
-
-# troncated to the only part (test-getlogin.c) that apply in coreutils
Modified: ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
==================================================================--- \
ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2013-02-15 16:57:11 \
UTC (rev 6926)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2013-02-16 08:24:14 UTC (rev 6927)
@@ -136,7 +136,7 @@
/usr/sbin/conntrack
/usr/sbin/nfct
##
-## coreutils-8.20
+## coreutils-8.21
/bin/cat
/bin/chgrp
/bin/chmod
Modified: ipcop/trunk/updates/2.1.0/information.xml
==================================================================--- \
ipcop/trunk/updates/2.1.0/information.xml 2013-02-15 16:57:11 UTC \
(rev 6926)
+++ ipcop/trunk/updates/2.1.0/information.xml 2013-02-16 08:24:14 UTC (rev 6927)
@@ -8,7 +8,7 @@
Add xz-5.0.4<br />
Language updates.<br />
Upgrade acpid to 2.0.17, arping to 2.13, bash to 4.2.42, bind to 9.8.4, \
CnxADSL to ..PIM-2.6-2.7
- conntrack-tools to 1.2.2, coreutils to 8.20, dhcpcd to 5.6.7, dnsmasq to \
2.65, + conntrack-tools to 1.2.2, coreutils to 8.21, dhcpcd to 5.6.7, \
dnsmasq to 2.65,
e2fsprogs to 1.42.6, ethtool to 3.6, expat to 2.1.0, freetype to 2.4.11, \
fontconfig to 2.9,
gawk to 4.0.2, gettext to 0.18.2, glib to 2.30.3, gmp to 5.0.5, gnupg to \
1.4.13, grep to 2.14, gzip to 1.5,
iproute2 to 3.7.0, iptables to 1.4.17, iptstate to 2.2.5, iputils to \
s20121221, iw to 3.8,
This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.
------------------------------------------------------------------------------
The Go Parallel Website, sponsored by Intel - in partnership with Geeknet,
is your hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials, tech docs,
whitepapers, evaluation guides, and opinion stories. Check out the most
recent posts - join the conversation now. http://goparallel.sourceforge.net/
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic