From 75a4a592e5ccda30715f93563d741b83e0dcf39e Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Mon, 25 Apr 2011 13:37:00 +0000
Subject: Slackware 13.37

Mon Apr 25 13:37:00 UTC 2011
Slackware 13.37 x86_64 stable is released!

Thanks to everyone who pitched in on this release: the Slackware team,
the folks producing upstream code, and linuxquestions.org for providing
a great forum for collaboration and testing.

The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a
dual-sided
32-bit/64-bit x86/x86_64 DVD.  Please consider supporting the Slackware
project by picking up a copy from store.slackware.com.  We're taking
pre-orders now, and offer a discount if you sign up for a subscription.

As always, thanks to the Slackware community for testing, suggestions,
and feedback.  :-)

Have fun!
---
 source/a/cpio/cpio-2.9.gcc43.diff | 30 ------------------------------
 source/a/cpio/cpio.SlackBuild     | 31 ++++++++++++++++++++++++-------
 2 files changed, 24 insertions(+), 37 deletions(-)
 delete mode 100644 source/a/cpio/cpio-2.9.gcc43.diff

(limited to 'source/a/cpio')

diff --git a/source/a/cpio/cpio-2.9.gcc43.diff b/source/a/cpio/cpio-2.9.gcc43.diff
deleted file mode 100644
index cfe02d7f0..000000000
--- a/source/a/cpio/cpio-2.9.gcc43.diff
+++ /dev/null
@@ -1,30 +0,0 @@
---- ./lib/argp-fmtstream.h.orig	2006-01-21 04:37:18.000000000 -0600
-+++ ./lib/argp-fmtstream.h	2009-03-15 15:17:22.000000000 -0500
-@@ -198,8 +198,12 @@
- #endif
- 
- #ifndef ARGP_FS_EI
-+#ifdef __GNUC_STDC_INLINE__
-+#define ARGP_FS_EI extern inline __attribute__((__gnu_inline__))
-+#else
- #define ARGP_FS_EI extern inline
- #endif
-+#endif
- 
- ARGP_FS_EI size_t
- __argp_fmtstream_write (argp_fmtstream_t __fs,
---- ./lib/argp.h.orig	2007-03-30 11:20:19.000000000 -0500
-+++ ./lib/argp.h	2009-03-15 15:16:34.000000000 -0500
-@@ -580,7 +580,11 @@
- # endif
- 
- # ifndef ARGP_EI
--#  define ARGP_EI extern __inline__
-+#  if defined __GNUC_STDC_INLINE__
-+#   define ARGP_EI extern __inline__ __attribute__((__gnu_inline__))
-+#  else
-+#   define ARGP_EI extern __inline__
-+#  endif
- # endif
- 
- ARGP_EI void
diff --git a/source/a/cpio/cpio.SlackBuild b/source/a/cpio/cpio.SlackBuild
index 9cb6054bc..b078d0677 100755
--- a/source/a/cpio/cpio.SlackBuild
+++ b/source/a/cpio/cpio.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,9 +21,18 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PKGNAM=cpio
-VERSION=${VERSION:-2.9}
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-2}
+VERSION=$(ls $PKGNAM-*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
@@ -50,10 +59,10 @@ fi
 
 cd $TMP
 rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
 cd ${PKGNAM}-$VERSION || exit 1
 
-zcat $CWD/cpio-2.9.gcc43.diff.gz | patch -p1 --verbose || exit 1
+#zcat $CWD/cpio-2.9.gcc43.diff.gz | patch -p1 --verbose || exit 1
 
 # Make sure ownerships and permissions are sane:
 chown -R root:root .
@@ -114,10 +123,18 @@ gzip -9f $PKG/usr/info/*
 # Add a documentation directory:
 mkdir -p $PKG/usr/doc/cpio-$VERSION
 cp -a \
-  ABOUT-NLS AUTHORS COPYING ChangeLog NEWS README THANKS TODO \
+  ABOUT-NLS AUTHORS COPYING* NEWS README* THANKS TODO \
   $PKG/usr/doc/cpio-$VERSION
 chmod 644 $PKG/usr/doc/cpio-$VERSION/*
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
-- 
cgit v1.2.3-65-gdbad