[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. clfs-2.0.0-561-g8abef99
git
git at cross-lfs.org
Sat Dec 14 06:03:17 PST 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".
The branch, master has been updated
via 8abef998507cb53cc331cd113a96765cac7fca17 (commit)
via fa085850a921def15ee378358b24f6e572b697fb (commit)
via e643ae3465d6362b32e0d0861de987d7f6d8078f (commit)
via 8eacec6d2a082bfcac9638283520b7b7e997712d (commit)
via ae98e9932632beedb9d95d9d6459a55ede6b0507 (commit)
via b8777094fc9ff8abedee70a7ae6df95324e02e68 (commit)
via be39a743f2f42205cd2ebe144d7b775b231a9e56 (commit)
via e68058761383092b9e121fc068d4bcacba737073 (commit)
from 686839b2795fdf7b4909119c5e2fce7501a97c2d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 8abef998507cb53cc331cd113a96765cac7fca17
Author: William Harrington <kb0iic at berzerkula.org>
Date: Sat Dec 14 08:01:26 2013 -0600
Add man-pages update entry to master changelog for 3.55.
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 0b6ccd9..2c52251 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -42,6 +42,9 @@
<listitem>
<para>[William Harrington] - Update Coreutils to 8.22.</para>
</listitem>
+ <listitem>
+ <para>[William Harrington] - Update Man-pages to 3.55.</para>
+ </listitem>
</itemizedlist>
</listitem>
commit fa085850a921def15ee378358b24f6e572b697fb
Author: William Harrington <kb0iic at berzerkula.org>
Date: Sat Dec 14 08:00:24 2013 -0600
Update man-pages version, size, and md5 hash entries for update to 3.55.
diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index 2b01e6b..e12c30d 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -306,10 +306,10 @@
<!ENTITY man-md5 "ba154d5796928b841c9c69f0ae376660">
<!ENTITY man-home "http://primates.ximian.com/~flucifredi/man">
-<!ENTITY man-pages-version "3.54">
-<!ENTITY man-pages-size "1,172 KB">
+<!ENTITY man-pages-version "3.55">
+<!ENTITY man-pages-size "1,177 KB">
<!ENTITY man-pages-url "&kernel;linux/docs/man-pages/man-pages-&man-pages-version;.tar.xz">
-<!ENTITY man-pages-md5 "382f83e670ecbe1d97fc58e03da0b026">
+<!ENTITY man-pages-md5 "443b13defb23df578aa11c6c768f2c7d">
<!ENTITY man-pages-home "http://www.win.tue.nl/~aeb/linux/man">
<!ENTITY mpc-version "1.0.1">
commit e643ae3465d6362b32e0d0861de987d7f6d8078f
Author: William Harrington <kb0iic at berzerkula.org>
Date: Sat Dec 14 07:57:54 2013 -0600
Rename coreutils 8.21 uname patch to coreutils 8.22 and add entry into patch header for rename.
diff --git a/patches/coreutils-8.22-uname-1.patch b/patches/coreutils-8.22-uname-1.patch
new file mode 100644
index 0000000..9f6fd30
--- /dev/null
+++ b/patches/coreutils-8.22-uname-1.patch
@@ -0,0 +1,180 @@
+Submitted By: Jim Gifford <jim at cross-lfs dot org>
+Date: 2010-07-26
+Initial Package Version: 5.97
+Upstream Status: Not Accepted
+Origin: Gentoo - http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/coreutils
+Description: Display CPU Information from /proc/cpuinfo or /proc/sysinfo
+
+Rediffed for 7.1 by Jim Gifford
+Rediffed for 7.5 by Jim Gifford
+Rediffed for 8.4 by Joe Ciccone
+Rediffed for 8.9 by Joe Ciccone
+Rediffed for 8.16 by Jonathan Norman - 2012-06-10
+Rediffed for 8.19 by William Harrington - 2012-08-27
+Renamed for 8.20 by William Harrington - 2012-11-01
+Rediffed for 8.21 by William Harrington 2013-05-31
+Renamed for 8.22 by William Harrington - 2013-12-14
+
+diff -Naur coreutils-8.21.orig/src/uname.c coreutils-8.21/src/uname.c
+--- coreutils-8.21.orig/src/uname.c 2013-01-31 00:46:24.000000000 +0000
++++ coreutils-8.21/src/uname.c 2013-05-31 13:41:32.683326834 +0000
+@@ -49,6 +49,11 @@
+ # include <mach-o/arch.h>
+ #endif
+
++#if defined (__linux__)
++# define USE_PROCINFO
++# define UNAME_HARDWARE_PLATFORM
++#endif
++
+ #include "system.h"
+ #include "error.h"
+ #include "quote.h"
+@@ -153,6 +158,117 @@
+ exit (status);
+ }
+
++#if defined(USE_PROCINFO)
++
++# if defined(__s390__) || defined(__s390x__)
++# define CPUINFO_FILE "/proc/sysinfo"
++# define CPUINFO_FORMAT "%64[^\t :]%*[ :]%256[^\n]%c"
++# else
++# define CPUINFO_FILE "/proc/cpuinfo"
++# define CPUINFO_FORMAT "%64[^\t:]\t:%256[^\n]%c"
++# endif
++
++# define PROCINFO_PROCESSOR 0
++# define PROCINFO_HARDWARE_PLATFORM 1
++
++static void __eat_cpuinfo_space(char *buf)
++{
++ /* first eat trailing space */
++ char *tmp = buf + strlen(buf) - 1;
++ while (tmp > buf && isspace(*tmp))
++ *tmp-- = '\0';
++ /* then eat leading space */
++ tmp = buf;
++ while (*tmp && isspace(*tmp))
++ tmp++;
++ if (tmp != buf)
++ memmove(buf, tmp, strlen(tmp)+1);
++ /* finally collapse whitespace */
++ tmp = buf;
++ while (tmp[0] && tmp[1]) {
++ if (isspace(tmp[0]) && isspace(tmp[1])) {
++ memmove(tmp, tmp+1, strlen(tmp));
++ continue;
++ }
++ ++tmp;
++ }
++}
++
++static int __linux_procinfo (int x, char *fstr, size_t s)
++{
++ FILE *fp;
++
++ char *procinfo_keys[] = {
++ /* --processor --hardware-platform */
++ #if defined(__alpha__)
++ "cpu model", "system type"
++ #elif defined(__arm__)
++ "Processor", "Hardware"
++ #elif defined(__avr32__)
++ "processor", "cpu family"
++ #elif defined(__bfin__)
++ "CPU", "BOARD Name"
++ #elif defined(__cris__)
++ "cpu", "cpu model"
++ #elif defined(__frv__)
++ "CPU-Core", "System"
++ #elif defined(__i386__) || defined(__x86_64__)
++ "model name", "vendor_id"
++ #elif defined(__ia64__)
++ "family", "vendor"
++ #elif defined(__hppa__)
++ "cpu", "model"
++ #elif defined(__m68k__)
++ "CPU", "MMU"
++ #elif defined(__mips__)
++ "cpu model", "system type"
++ #elif defined(__powerpc__) || defined(__powerpc64__)
++ "cpu", "machine"
++ #elif defined(__s390__) || defined(__s390x__)
++ "Type", "Manufacturer"
++ #elif defined(__sh__)
++ "cpu type", "machine"
++ #elif defined(sparc) || defined(__sparc__)
++ "type", "cpu"
++ #elif defined(__vax__)
++ "cpu type", "cpu"
++ #else
++ "unknown", "unknown"
++ #endif
++ };
++
++ if ((fp = fopen(CPUINFO_FILE, "r")) != NULL) {
++ char key[65], value[257], eol, *ret = NULL;
++
++ while (fscanf(fp, CPUINFO_FORMAT, key, value, &eol) != EOF) {
++ __eat_cpuinfo_space(key);
++ if (!strcmp(key, procinfo_keys[x])) {
++ __eat_cpuinfo_space(value);
++ ret = value;
++ break;
++ }
++ if (eol != '\n') {
++ /* we need two fscanf's here in case the previous
++ * length limit caused us to read right up to the
++ * newline ... doing "%*[^\n]\n" wont eat the newline
++ */
++ fscanf(fp, "%*[^\n]");
++ fscanf(fp, "\n");
++ }
++ }
++ fclose(fp);
++
++ if (ret) {
++ strncpy(fstr, ret, s);
++ return 0;
++ }
++ }
++
++ return -1;
++}
++
++#endif
++
+ /* Print ELEMENT, preceded by a space if something has already been
+ printed. */
+
+@@ -300,10 +416,14 @@
+ if (toprint & PRINT_PROCESSOR)
+ {
+ char const *element = unknown;
+-#if HAVE_SYSINFO && defined SI_ARCHITECTURE
++#if ( HAVE_SYSINFO && defined SI_ARCHITECTURE ) || defined(USE_PROCINFO)
+ {
+ static char processor[257];
++#if defined(USE_PROCINFO)
++ if (0 <= __linux_procinfo (PROCINFO_PROCESSOR, processor, sizeof processor))
++#else
+ if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor))
++#endif
+ element = processor;
+ }
+ #endif
+@@ -356,9 +476,13 @@
+ if (element == unknown)
+ {
+ static char hardware_platform[257];
++#if defined(USE_PROCINFO)
++ if (0 <= __linux_procinfo (PROCINFO_HARDWARE_PLATFORM, hardware_platform, sizeof hardware_platform))
++#else
+ size_t s = sizeof hardware_platform;
+ static int mib[] = { CTL_HW, UNAME_HARDWARE_PLATFORM };
+ if (sysctl (mib, 2, hardware_platform, &s, 0, 0) >= 0)
++#endif
+ element = hardware_platform;
+ }
+ #endif
commit 8eacec6d2a082bfcac9638283520b7b7e997712d
Author: William Harrington <kb0iic at berzerkula.org>
Date: Sat Dec 14 07:56:50 2013 -0600
Remove coreutils 8.21 uname patch.
diff --git a/patches/coreutils-8.21-uname-1.patch b/patches/coreutils-8.21-uname-1.patch
deleted file mode 100644
index 7b4428c..0000000
--- a/patches/coreutils-8.21-uname-1.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-Submitted By: Jim Gifford <jim at cross-lfs dot org>
-Date: 2010-07-26
-Initial Package Version: 5.97
-Upstream Status: Not Accepted
-Origin: Gentoo - http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/coreutils
-Description: Display CPU Information from /proc/cpuinfo or /proc/sysinfo
-
-Rediffed for 7.1 by Jim Gifford
-Rediffed for 7.5 by Jim Gifford
-Rediffed for 8.4 by Joe Ciccone
-Rediffed for 8.9 by Joe Ciccone
-Rediffed for 8.16 by Jonathan Norman - 2012-06-10
-Rediffed for 8.19 by William Harrington - 2012-08-27
-Renamed for 8.20 by William Harrington - 2012-11-01
-Rediffed for 8.21 by William Harrington 2013-05-31
-
-diff -Naur coreutils-8.21.orig/src/uname.c coreutils-8.21/src/uname.c
---- coreutils-8.21.orig/src/uname.c 2013-01-31 00:46:24.000000000 +0000
-+++ coreutils-8.21/src/uname.c 2013-05-31 13:41:32.683326834 +0000
-@@ -49,6 +49,11 @@
- # include <mach-o/arch.h>
- #endif
-
-+#if defined (__linux__)
-+# define USE_PROCINFO
-+# define UNAME_HARDWARE_PLATFORM
-+#endif
-+
- #include "system.h"
- #include "error.h"
- #include "quote.h"
-@@ -153,6 +158,117 @@
- exit (status);
- }
-
-+#if defined(USE_PROCINFO)
-+
-+# if defined(__s390__) || defined(__s390x__)
-+# define CPUINFO_FILE "/proc/sysinfo"
-+# define CPUINFO_FORMAT "%64[^\t :]%*[ :]%256[^\n]%c"
-+# else
-+# define CPUINFO_FILE "/proc/cpuinfo"
-+# define CPUINFO_FORMAT "%64[^\t:]\t:%256[^\n]%c"
-+# endif
-+
-+# define PROCINFO_PROCESSOR 0
-+# define PROCINFO_HARDWARE_PLATFORM 1
-+
-+static void __eat_cpuinfo_space(char *buf)
-+{
-+ /* first eat trailing space */
-+ char *tmp = buf + strlen(buf) - 1;
-+ while (tmp > buf && isspace(*tmp))
-+ *tmp-- = '\0';
-+ /* then eat leading space */
-+ tmp = buf;
-+ while (*tmp && isspace(*tmp))
-+ tmp++;
-+ if (tmp != buf)
-+ memmove(buf, tmp, strlen(tmp)+1);
-+ /* finally collapse whitespace */
-+ tmp = buf;
-+ while (tmp[0] && tmp[1]) {
-+ if (isspace(tmp[0]) && isspace(tmp[1])) {
-+ memmove(tmp, tmp+1, strlen(tmp));
-+ continue;
-+ }
-+ ++tmp;
-+ }
-+}
-+
-+static int __linux_procinfo (int x, char *fstr, size_t s)
-+{
-+ FILE *fp;
-+
-+ char *procinfo_keys[] = {
-+ /* --processor --hardware-platform */
-+ #if defined(__alpha__)
-+ "cpu model", "system type"
-+ #elif defined(__arm__)
-+ "Processor", "Hardware"
-+ #elif defined(__avr32__)
-+ "processor", "cpu family"
-+ #elif defined(__bfin__)
-+ "CPU", "BOARD Name"
-+ #elif defined(__cris__)
-+ "cpu", "cpu model"
-+ #elif defined(__frv__)
-+ "CPU-Core", "System"
-+ #elif defined(__i386__) || defined(__x86_64__)
-+ "model name", "vendor_id"
-+ #elif defined(__ia64__)
-+ "family", "vendor"
-+ #elif defined(__hppa__)
-+ "cpu", "model"
-+ #elif defined(__m68k__)
-+ "CPU", "MMU"
-+ #elif defined(__mips__)
-+ "cpu model", "system type"
-+ #elif defined(__powerpc__) || defined(__powerpc64__)
-+ "cpu", "machine"
-+ #elif defined(__s390__) || defined(__s390x__)
-+ "Type", "Manufacturer"
-+ #elif defined(__sh__)
-+ "cpu type", "machine"
-+ #elif defined(sparc) || defined(__sparc__)
-+ "type", "cpu"
-+ #elif defined(__vax__)
-+ "cpu type", "cpu"
-+ #else
-+ "unknown", "unknown"
-+ #endif
-+ };
-+
-+ if ((fp = fopen(CPUINFO_FILE, "r")) != NULL) {
-+ char key[65], value[257], eol, *ret = NULL;
-+
-+ while (fscanf(fp, CPUINFO_FORMAT, key, value, &eol) != EOF) {
-+ __eat_cpuinfo_space(key);
-+ if (!strcmp(key, procinfo_keys[x])) {
-+ __eat_cpuinfo_space(value);
-+ ret = value;
-+ break;
-+ }
-+ if (eol != '\n') {
-+ /* we need two fscanf's here in case the previous
-+ * length limit caused us to read right up to the
-+ * newline ... doing "%*[^\n]\n" wont eat the newline
-+ */
-+ fscanf(fp, "%*[^\n]");
-+ fscanf(fp, "\n");
-+ }
-+ }
-+ fclose(fp);
-+
-+ if (ret) {
-+ strncpy(fstr, ret, s);
-+ return 0;
-+ }
-+ }
-+
-+ return -1;
-+}
-+
-+#endif
-+
- /* Print ELEMENT, preceded by a space if something has already been
- printed. */
-
-@@ -300,10 +416,14 @@
- if (toprint & PRINT_PROCESSOR)
- {
- char const *element = unknown;
--#if HAVE_SYSINFO && defined SI_ARCHITECTURE
-+#if ( HAVE_SYSINFO && defined SI_ARCHITECTURE ) || defined(USE_PROCINFO)
- {
- static char processor[257];
-+#if defined(USE_PROCINFO)
-+ if (0 <= __linux_procinfo (PROCINFO_PROCESSOR, processor, sizeof processor))
-+#else
- if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor))
-+#endif
- element = processor;
- }
- #endif
-@@ -356,9 +476,13 @@
- if (element == unknown)
- {
- static char hardware_platform[257];
-+#if defined(USE_PROCINFO)
-+ if (0 <= __linux_procinfo (PROCINFO_HARDWARE_PLATFORM, hardware_platform, sizeof hardware_platform))
-+#else
- size_t s = sizeof hardware_platform;
- static int mib[] = { CTL_HW, UNAME_HARDWARE_PLATFORM };
- if (sysctl (mib, 2, hardware_platform, &s, 0, 0) >= 0)
-+#endif
- element = hardware_platform;
- }
- #endif
commit ae98e9932632beedb9d95d9d6459a55ede6b0507
Author: William Harrington <kb0iic at berzerkula.org>
Date: Sat Dec 14 07:56:16 2013 -0600
Update size and md5 hash entry for coreutils uname patch.
diff --git a/BOOK/patches.ent b/BOOK/patches.ent
index d15a637..9d63e3c 100644
--- a/BOOK/patches.ent
+++ b/BOOK/patches.ent
@@ -15,8 +15,8 @@
-->
<!ENTITY coreutils-uname-patch "coreutils-&coreutils-version;-uname-1.patch">
-<!ENTITY coreutils-uname-patch-md5 "5d3a1f7196c9c07033bbd2853885fda2">
-<!ENTITY coreutils-uname-patch-size "4.8 KB">
+<!ENTITY coreutils-uname-patch-md5 "6eeba217c88ec83b807e305e594fe13d">
+<!ENTITY coreutils-uname-patch-size "4.9 KB">
<!ENTITY gcc-specs-patch "gcc-&gcc-version;-specs-1.patch">
<!ENTITY gcc-specs-patch-md5 "14aa064a113f2cae0f877039bb4a6357">
commit b8777094fc9ff8abedee70a7ae6df95324e02e68
Author: William Harrington <kb0iic at berzerkula.org>
Date: Sat Dec 14 07:55:22 2013 -0600
Add entry to master changelog for coreutils 8.22 update.
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index c76f20f..0b6ccd9 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -37,6 +37,15 @@
-->
<listitem>
+ <para>14 December 2013</para>
+ <itemizedlist>
+ <listitem>
+ <para>[William Harrington] - Update Coreutils to 8.22.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>08 December 2013</para>
<itemizedlist>
<listitem>
commit be39a743f2f42205cd2ebe144d7b775b231a9e56
Author: William Harrington <kb0iic at berzerkula.org>
Date: Sat Dec 14 07:54:07 2013 -0600
Update coreutils version, size, md5 hash entry for upgrade to 8.22.
diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index 4ffeeb4..2b01e6b 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -87,10 +87,10 @@
<!ENTITY colo-md5 "52c16ad31f3b88f710f0fdb5abed0457">
<!ENTITY colo-home "http://www.colonel-panic.org/cobalt-mips">
-<!ENTITY coreutils-version "8.21">
-<!ENTITY coreutils-size "5,236 KB">
+<!ENTITY coreutils-version "8.22">
+<!ENTITY coreutils-size "5,335 KB">
<!ENTITY coreutils-url "&gnu;coreutils/coreutils-&coreutils-version;.tar.xz">
-<!ENTITY coreutils-md5 "065ba41828644eca5dd8163446de5d64">
+<!ENTITY coreutils-md5 "8fb0ae2267aa6e728958adc38f8163a2">
<!ENTITY coreutils-home "&gnu-software;coreutils">
<!ENTITY dejagnu-version "1.5.1">
commit e68058761383092b9e121fc068d4bcacba737073
Author: William Harrington <kb0iic at berzerkula.org>
Date: Sat Dec 14 07:52:46 2013 -0600
Update date.
diff --git a/BOOK/general.ent b/BOOK/general.ent
index 69e4d90..56569f6 100644
--- a/BOOK/general.ent
+++ b/BOOK/general.ent
@@ -2,7 +2,7 @@
<!ENTITY month "12"> <!-- Use two digits -->
<!ENTITY month_name "December">
-<!ENTITY day "12"> <!-- Use two digits -->
+<!ENTITY day "14"> <!-- Use two digits -->
<!ENTITY year "2013"> <!-- Use four digits -->
<!ENTITY releasedate "&month_name; &day;, &year;">
-----------------------------------------------------------------------
Summary of changes:
BOOK/general.ent | 2 +-
BOOK/introduction/common/changelog.xml | 12 ++++++++++++
BOOK/packages.ent | 12 ++++++------
BOOK/patches.ent | 4 ++--
...-uname-1.patch => coreutils-8.22-uname-1.patch} | 1 +
5 files changed, 22 insertions(+), 9 deletions(-)
rename patches/{coreutils-8.21-uname-1.patch => coreutils-8.22-uname-1.patch} (98%)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list