Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (223ac034dd972e5be10adaac29a16465f27e8d11)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (223ac034dd972e5be10adaac29a16465f27e8d11)
  • Date: Mon, 16 May 2011 18:10:11 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

archive/cabextract/DETAILS | 7
archive/cabextract/HISTORY | 5
archive/cabextract/PRE_BUILD | 5
archive/cabextract/cabextract-1.4.tar.gz.sig |binary
archive/cabextract/cabextract_autoconf.patch | 197
---------------------------
utils/findutils/DETAILS | 4
utils/findutils/HISTORY | 2
7 files changed, 12 insertions(+), 208 deletions(-)

New commits:
commit 223ac034dd972e5be10adaac29a16465f27e8d11
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

findutils: Cleanup whitespace

commit 2678e776f682ffe68b98fb8ab691bf9f2301107b
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

cabextract: Remove extra whitespace

commit 411968259f9da2141a01db5d93a11a2ec14a0209
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

cabextract: Updated to 1.4
Removed cabextract_autoconf.patch, no longer needed

diff --git a/archive/cabextract/DETAILS b/archive/cabextract/DETAILS
index 6f481d9..941f8f6 100755
--- a/archive/cabextract/DETAILS
+++ b/archive/cabextract/DETAILS
@@ -1,15 +1,16 @@
SPELL=cabextract
- VERSION=1.2
+ VERSION=1.4
SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.cabextract.org.uk/${SOURCE}
-
SOURCE_HASH=sha512:ff64cb744314422e17b8bdd0c9428682033f17af6ec10cad3a84725f861dee10a9a510109ee0f84a2e0f2c046cfd222f193b88c95055f023cbdb46d26e419f9a
+#
SOURCE_HASH=sha512:ff64cb744314422e17b8bdd0c9428682033f17af6ec10cad3a84725f861dee10a9a510109ee0f84a2e0f2c046cfd222f193b88c95055f023cbdb46d26e419f9a
WEB_SITE=http://www.cabextract.org.uk/
ENTERED=20020818
LICENSE[0]=GPL
KEYWORDS="microsoft archive"
SHORT="Extract Microsoft cabinet (.CAB) files"
cat << EOF
-Cabextract is a program to extract Microsoft cabinet (.CAB) files.
+Cabextract is a program to extract Microsoft cabinet (.CAB) files.
This makes it of use to install MS TTF.
EOF
diff --git a/archive/cabextract/HISTORY b/archive/cabextract/HISTORY
index 61159e7..589edb3 100644
--- a/archive/cabextract/HISTORY
+++ b/archive/cabextract/HISTORY
@@ -1,3 +1,8 @@
+2011-05-16 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.4
+ * PRE_BUILD: No longer apply cabextract_autoconf.patch
+ * cabextract_autoconf.patch: Removed, no longer needed
+
2008-12-06 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* PRE_BUILD, autoconf.patch: fixed mktime/autoconf slowness #14635

diff --git a/archive/cabextract/PRE_BUILD b/archive/cabextract/PRE_BUILD
deleted file mode 100755
index d0bd0f1..0000000
--- a/archive/cabextract/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-if grep -q "# Generated by GNU Autoconf 2.59" configure; then
- patch -Np1 < $SCRIPT_DIRECTORY/cabextract_autoconf.patch
-fi
diff --git a/archive/cabextract/cabextract-1.4.tar.gz.sig
b/archive/cabextract/cabextract-1.4.tar.gz.sig
new file mode 100644
index 0000000..992ecc6
Binary files /dev/null and b/archive/cabextract/cabextract-1.4.tar.gz.sig
differ
diff --git a/archive/cabextract/cabextract_autoconf.patch
b/archive/cabextract/cabextract_autoconf.patch
deleted file mode 100644
index 77cc335..0000000
--- a/archive/cabextract/cabextract_autoconf.patch
+++ /dev/null
@@ -1,197 +0,0 @@
-diff -Naur cabextract-1.2.orig/configure cabextract-1.2/configure
---- cabextract-1.2.orig/configure 2006-09-21 01:13:24.000000000 +0200
-+++ cabextract-1.2/configure 2008-10-23 21:23:56.000000000 +0200
-@@ -5299,26 +5299,25 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- /* Test program from Paul Eggert and Tony Leneis. */
--#if TIME_WITH_SYS_TIME
-+#ifdef TIME_WITH_SYS_TIME
- # include <sys/time.h>
- # include <time.h>
- #else
--# if HAVE_SYS_TIME_H
-+# ifdef HAVE_SYS_TIME_H
- # include <sys/time.h>
- # else
- # include <time.h>
- # endif
- #endif
-
--#if HAVE_STDLIB_H
--# include <stdlib.h>
--#endif
-+#include <limits.h>
-+#include <stdlib.h>
-
--#if HAVE_UNISTD_H
-+#ifdef HAVE_UNISTD_H
- # include <unistd.h>
- #endif
-
--#if !HAVE_ALARM
-+#ifndef HAVE_ALARM
- # define alarm(X) /* empty */
- #endif
-
-@@ -5335,9 +5334,9 @@
- };
- #define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0]))
-
--/* Fail if mktime fails to convert a date in the spring-forward gap.
-+/* Return 0 if mktime fails to convert a date in the spring-forward gap.
- Based on a problem report from Andreas Jaeger. */
--static void
-+static int
- spring_forward_gap ()
- {
- /* glibc (up to about 1998-10-07) failed this test. */
-@@ -5356,29 +5355,27 @@
- tm.tm_min = 0;
- tm.tm_sec = 0;
- tm.tm_isdst = -1;
-- if (mktime (&tm) == (time_t)-1)
-- exit (1);
-+ return mktime (&tm) != (time_t) -1;
- }
-
--static void
-+static int
- mktime_test1 (now)
- time_t now;
- {
- struct tm *lt;
-- if ((lt = localtime (&now)) && mktime (lt) != now)
-- exit (1);
-+ return ! (lt = localtime (&now)) || mktime (lt) == now;
- }
-
--static void
-+static int
- mktime_test (now)
- time_t now;
- {
-- mktime_test1 (now);
-- mktime_test1 ((time_t) (time_t_max - now));
-- mktime_test1 ((time_t) (time_t_min + now));
-+ return (mktime_test1 (now)
-+ && mktime_test1 ((time_t) (time_t_max - now))
-+ && mktime_test1 ((time_t) (time_t_min + now)));
- }
-
--static void
-+static int
- irix_6_4_bug ()
- {
- /* Based on code from Ariel Faigon. */
-@@ -5391,11 +5388,10 @@
- tm.tm_sec = 0;
- tm.tm_isdst = -1;
- mktime (&tm);
-- if (tm.tm_mon != 2 || tm.tm_mday != 31)
-- exit (1);
-+ return tm.tm_mon == 2 && tm.tm_mday == 31;
- }
-
--static void
-+static int
- bigtime_test (j)
- int j;
- {
-@@ -5417,8 +5413,39 @@
- && lt->tm_wday == tm.tm_wday
- && ((lt->tm_isdst < 0 ? -1 : 0 < lt->tm_isdst)
- == (tm.tm_isdst < 0 ? -1 : 0 < tm.tm_isdst))))
-- exit (1);
-+ return 0;
- }
-+ return 1;
-+}
-+
-+static int
-+year_2050_test ()
-+{
-+ /* The correct answer for 2050-02-01 00:00:00 in Pacific time,
-+ ignoring leap seconds. */
-+ unsigned long int answer = 2527315200UL;
-+
-+ struct tm tm;
-+ time_t t;
-+ tm.tm_year = 2050 - 1900;
-+ tm.tm_mon = 2 - 1;
-+ tm.tm_mday = 1;
-+ tm.tm_hour = tm.tm_min = tm.tm_sec = 0;
-+ tm.tm_isdst = -1;
-+
-+ /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0"
-+ instead of "TZ=America/Vancouver" in order to detect the bug even
-+ on systems that don't support the Olson extension, or don't have the
-+ full zoneinfo tables installed. */
-+ putenv ("TZ=PST8PDT,M4.1.0,M10.5.0");
-+
-+ t = mktime (&tm);
-+
-+ /* Check that the result is either a failure, or close enough
-+ to the correct answer that we can assume the discrepancy is
-+ due to leap seconds. */
-+ return (t == (time_t) -1
-+ || (0 < t && answer - 120 <= t && t <= answer + 120));
- }
-
- int
-@@ -5432,12 +5459,15 @@
- isn't worth using anyway. */
- alarm (60);
-
-- for (time_t_max = 1; 0 < time_t_max; time_t_max *= 2)
-- continue;
-- time_t_max--;
-- if ((time_t) -1 < 0)
-- for (time_t_min = -1; (time_t) (time_t_min * 2) < 0; time_t_min *= 2)
-- continue;
-+ for (;;)
-+ {
-+ t = (time_t_max << 1) + 1;
-+ if (t <= time_t_max)
-+ break;
-+ time_t_max = t;
-+ }
-+ time_t_min = - ((time_t) ~ (time_t) 0 == (time_t) -1) - time_t_max;
-+
- delta = time_t_max / 997; /* a suitable prime number */
- for (i = 0; i < N_STRINGS; i++)
- {
-@@ -5445,18 +5475,22 @@
- putenv (tz_strings[i]);
-
- for (t = 0; t <= time_t_max - delta; t += delta)
-- mktime_test (t);
-- mktime_test ((time_t) 1);
-- mktime_test ((time_t) (60 * 60));
-- mktime_test ((time_t) (60 * 60 * 24));
--
-- for (j = 1; 0 < j; j *= 2)
-- bigtime_test (j);
-- bigtime_test (j - 1);
-+ if (! mktime_test (t))
-+ return 1;
-+ if (! (mktime_test ((time_t) 1)
-+ && mktime_test ((time_t) (60 * 60))
-+ && mktime_test ((time_t) (60 * 60 * 24))))
-+ return 1;
-+
-+ for (j = 1; ; j <<= 1)
-+ if (! bigtime_test (j))
-+ return 1;
-+ else if (INT_MAX / 2 < j)
-+ break;
-+ if (! bigtime_test (INT_MAX))
-+ return 1;
- }
-- irix_6_4_bug ();
-- spring_forward_gap ();
-- exit (0);
-+ return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ());
- }
- _ACEOF
- rm -f conftest$ac_exeext
diff --git a/utils/findutils/DETAILS b/utils/findutils/DETAILS
index 6139d81..748e23d 100755
--- a/utils/findutils/DETAILS
+++ b/utils/findutils/DETAILS
@@ -18,13 +18,13 @@ findutils - Finds and then operates on files
The program includes:
bigram - used together with code to produce older-style locate databases
code - the ancestor of frcode. It was used in older-style locate
databases
-find - finds files that match certain criteria performs
+find - finds files that match certain criteria performs
arbitrary operations on them interactively and
in shell scripts
frcode - called by updatedb to compress the list of file names using
front-compression, which reduces the database size by a factor
of 4 to 5
-locate - scans a database for file names that match a pattern
+locate - scans a database for file names that match a pattern
updatedb - update a file name database
xargs - applies a command to a list of files
EOF
diff --git a/utils/findutils/HISTORY b/utils/findutils/HISTORY
index f5f505f..561618c 100644
--- a/utils/findutils/HISTORY
+++ b/utils/findutils/HISTORY
@@ -7,7 +7,7 @@
2009-01-16 George Sherwood <gsherwood AT sourcemage.org>
* PRE_REMOVE: Added to remove info files
* POST_REMOVE: Deleted.
- * REPAIR^2443eb77b720407d3e1deda8a517a8f9^POST_REMOVE: Added to
+ * REPAIR^2443eb77b720407d3e1deda8a517a8f9^POST_REMOVE: Added to
fix tabet entry

2008-03-15 Treeve Jelbert <treeve AT sourcemage.org>



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (223ac034dd972e5be10adaac29a16465f27e8d11), Eric Sandall, 05/16/2011

Archive powered by MHonArc 2.6.24.

Top of Page