diffstat of debian/ for coreutils_8.20-3 coreutils_8.21-SprezzOS1 changelog | 12 +++ control | 5 - patches/00list | 2 patches/61_whoips.dpatch | 145 ------------------------------------- patches/99_factor_long_long.dpatch | 19 ---- 5 files changed, 15 insertions(+), 168 deletions(-) --- coreutils-8.20/debian/changelog 2013-02-16 00:08:37.000000000 +0000 +++ coreutils-8.21/debian/changelog 2013-02-15 02:35:53.000000000 +0000 @@ -1,3 +1,15 @@ +coreutils (8.21-SprezzOS1) unstable; urgency=low + + * New upstream + + -- Nick Black Thu, 14 Feb 2013 21:34:04 -0500 + +coreutils (8.20-SprezzOS1) unstable; urgency=low + + * SprezzOS build + + -- Nick Black Sat, 29 Dec 2012 05:40:38 -0500 + coreutils (8.20-3) unstable; urgency=low * actually include autopkgtest changes --- coreutils-8.20/debian/control 2013-02-16 00:08:37.000000000 +0000 +++ coreutils-8.21/debian/control 2013-02-15 02:35:53.000000000 +0000 @@ -1,8 +1,9 @@ Source: coreutils -Maintainer: Michael Stone +Maintainer: Nick Black +XSBC-Original-Maintainer: Michael Stone Section: utils Priority: required -Standards-Version: 3.9.4.0 +Standards-Version: 3.9.4 Build-Depends: gettext (>= 0.10.37), debhelper (>= 5.0.0), dh-buildinfo, texinfo (>= 4.2), groff, dpatch, libattr1-dev [linux-any], libacl1-dev [linux-any], libselinux1-dev (>= 1.32) [linux-any], gperf, bison XS-Testsuite: autopkgtest --- coreutils-8.20/debian/patches/00list 2013-02-16 00:08:37.000000000 +0000 +++ coreutils-8.21/debian/patches/00list 2013-02-15 02:35:53.000000000 +0000 @@ -1,4 +1,3 @@ -61_whoips 63_dd-appenderrors 72_id_checkngroups 85_timer_settime @@ -6,4 +5,3 @@ 99_kill_test-xvasprintf_empty_arg 99_kill_df_total-unprocessed_test 99_hppa_longlong -99_factor_long_long --- coreutils-8.20/debian/patches/61_whoips.dpatch 2013-02-16 00:08:37.000000000 +0000 +++ coreutils-8.21/debian/patches/61_whoips.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,145 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run - -@DPATCH@ -diff -urNad coreutils-8.0~/src/who.c coreutils-8.0/src/who.c ---- coreutils-8.0~/src/who.c 2009-09-23 04:25:44.000000000 -0400 -+++ coreutils-8.0/src/who.c 2009-11-14 17:16:07.581713057 -0500 -@@ -28,6 +28,8 @@ - #include - - #include -+#include -+#include - #include "system.h" - - #include "c-ctype.h" -@@ -101,6 +103,9 @@ - /* If true, attempt to canonicalize hostnames via a DNS lookup. */ - static bool do_lookup; - -+/* If true, display ips instead of hostnames */ -+static bool do_ips; -+ - /* If true, display only a list of usernames and count of - the users logged on. - Ignored for `who am i'. */ -@@ -156,7 +161,8 @@ - /* for long options with no corresponding short option, use enum */ - enum - { -- LOOKUP_OPTION = CHAR_MAX + 1 -+ LOOKUP_OPTION = CHAR_MAX + 1, -+ IPS_OPTION = CHAR_MAX + 2 - }; - - static struct option const longopts[] = -@@ -166,6 +172,7 @@ - {"count", no_argument, NULL, 'q'}, - {"dead", no_argument, NULL, 'd'}, - {"heading", no_argument, NULL, 'H'}, -+ {"ips", no_argument, NULL, IPS_OPTION}, - {"login", no_argument, NULL, 'l'}, - {"lookup", no_argument, NULL, LOOKUP_OPTION}, - {"message", no_argument, NULL, 'T'}, -@@ -418,6 +425,63 @@ - } - #endif - -+ /* Needs configure check for ut_addr_v6, etc */ -+ if (do_ips && -+ memcmp(utmp_ent->ut_addr_v6, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 16)) -+ { -+ /* Following code is from sysvinit-2.87dsf -+ (GPL Copyright 1991-2004 Miquel van Smoorenburg) */ -+ struct sockaddr_in sin; -+ struct sockaddr_in6 sin6; -+ struct sockaddr *sa; -+ int salen, flags; -+ unsigned int azero=0; -+ unsigned int glblunicast=0, linklocal=0, localunicast=0; -+ int mapped = 0; -+ int *a = utmp_ent->ut_addr_v6; -+ -+ hoststr = xrealloc(hoststr, 256); -+ -+ flags = do_lookup ? 0 : NI_NUMERICHOST; -+ -+ /* -+ * IPv4 or IPv6 ? We use 2 heuristics: -+ * 1. Current IPv6 range uses 2000-3fff or fc00-fdff or fec0-feff. -+ * Outside of that is illegal and must be IPv4. -+ * 2. If last 3 bytes are 0, must be IPv4 -+ * 3. If IPv6 in IPv4, handle as IPv4 -+ * -+ * Ugly. -+ */ -+ if (a[0] == 0 && a[1] == 0 && a[2] == htonl (0xffff)) -+ mapped = 1; -+ -+ azero = ntohl((unsigned int)a[0]) >> 16; -+ glblunicast = (azero >= 0x2000 && azero <= 0x3fff) ? 1 : 0; -+ localunicast = (azero >= 0xfc00 && azero <= 0xfdff) ? 1 : 0; -+ linklocal = (azero >= 0xfec0 && azero <= 0xfeff) ? 1 : 0; -+ -+ if (!(glblunicast || linklocal || localunicast) || mapped || -+ (a[1] == 0 && a[2] == 0 && a[3] == 0)) { -+ /* IPv4 */ -+ sin.sin_family = AF_INET; -+ sin.sin_port = 0; -+ sin.sin_addr.s_addr = mapped ? a[3] : a[0]; -+ sa = (struct sockaddr *)&sin; -+ salen = sizeof(sin); -+ } else { -+ /* IPv6 */ -+ memset(&sin6, 0, sizeof(sin6)); -+ sin6.sin6_family = AF_INET6; -+ sin6.sin6_port = 0; -+ memcpy(sin6.sin6_addr.s6_addr, a, 16); -+ sa = (struct sockaddr *)&sin6; -+ salen = sizeof(sin6); -+ } -+ -+ getnameinfo(sa, salen, hoststr, 256, NULL, 0, flags); -+ } -+ - print_line (sizeof UT_USER (utmp_ent), UT_USER (utmp_ent), mesg, - sizeof utmp_ent->ut_line, utmp_ent->ut_line, - time_string (utmp_ent), idlestr, pidstr, -@@ -640,6 +704,11 @@ - -H, --heading print line of column headings\n\ - "), stdout); - fputs (_("\ -+ --ips print ips instead of hostnames. with --lookup,\n\ -+ canonicalizes based on stored IP, if available,\n\ -+ rather than stored hostname\n\ -+"), stdout); -+ fputs (_("\ - -l, --login print system login processes\n\ - "), stdout); - fputs (_("\ -@@ -857,6 +857,10 @@ - do_lookup = true; - break; - -+ case IPS_OPTION: -+ do_ips = true; -+ break; -+ - case_GETOPT_HELP_CHAR; - - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); ---- coreutils-8.13/man/who.1 2011-09-08 10:29:17.000000000 -0400 -+++ - 2011-09-12 13:35:55.454592819 -0400 -@@ -22,6 +22,11 @@ - \fB\-H\fR, \fB\-\-heading\fR - print line of column headings - .TP -+\fB\-\-ips\fR -+print ips instead of hostnames. with \fB\-\-lookup\fR, -+canonicalizes based on stored IP, if available, -+rather than stored hostname -+.TP - \fB\-l\fR, \fB\-\-login\fR - print system login processes - .TP - --- coreutils-8.20/debian/patches/99_factor_long_long.dpatch 2013-02-16 00:08:37.000000000 +0000 +++ coreutils-8.21/debian/patches/99_factor_long_long.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 99_factor_long_long.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' coreutils-8.20~/src/factor.c coreutils-8.20/src/factor.c ---- coreutils-8.20~/src/factor.c 2012-10-23 10:14:12.000000000 -0400 -+++ coreutils-8.20/src/factor.c 2012-11-18 09:32:47.226066980 -0500 -@@ -138,7 +138,7 @@ - typedef unsigned char UQItype; - typedef long SItype; - typedef unsigned long int USItype; --# if HAVE_LONG_LONG -+# if HAVE_LONG_LONG_INT - typedef long long int DItype; - typedef unsigned long long int UDItype; - # else /* Assume `long' gives us a wide enough type. Needed for hppa2.0w. */