From d31c50870d0bee042ce660e445c9294a59a3a65b Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Thu, 30 Jun 2016 20:26:57 +0000
Subject: Slackware 14.2

Thu Jun 30 20:26:57 UTC 2016
Slackware 14.2 x86_64 stable is released!

The long development cycle (the Linux community has lately been living in
"interesting times", as they say) is finally behind us, and we're proud to
announce the release of Slackware 14.2.  The new release brings many updates
and modern tools, has switched from udev to eudev (no systemd), and adds
well over a hundred new packages to the system.  Thanks to the team, the
upstream developers, the dedicated Slackware community, and everyone else
who pitched in to help make this release a reality.

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.

Have fun!  :-)
---
 source/a/utempter/utempter.SlackBuild | 74 ++++++++++++++++++++++++-----------
 1 file changed, 52 insertions(+), 22 deletions(-)

(limited to 'source/a/utempter/utempter.SlackBuild')

diff --git a/source/a/utempter/utempter.SlackBuild b/source/a/utempter/utempter.SlackBuild
index 5d6f054f0..d21c33128 100755
--- a/source/a/utempter/utempter.SlackBuild
+++ b/source/a/utempter/utempter.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008-2010, 2015, 2016  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,67 +20,97 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# The original package name was "utempter", but this new version
+# calls itself "libutempter".  We'll keep the same old package name
+# to avoid confusing upgrades.
 
-VERSION=1.1.5
-BUILD=${BUILD:-1}
+VERSION=1.1.6
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
+    i?86) export ARCH=i586 ;;
     arm*) export ARCH=arm ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
        *) export ARCH=$( uname -m ) ;;
   esac
 fi
 
-if [ "$ARCH" = "x86_64" ]; then
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
 else
+  SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
 fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-utempter
+
 rm -rf $PKG
 mkdir -p $TMP $PKG/usr
-
 cd $TMP
-# The original package name was "utempter", but this new version
-# calls itself "libutempter".  We'll keep the same old package name
-# to avoid confusing upgrades.
 rm -rf libutempter-$VERSION
-tar xjvf $CWD/libutempter-$VERSION.tar.bz2
+tar xvf $CWD/libutempter-$VERSION.tar.bz2
 cd libutempter-$VERSION
 chown -R root:root .
-## I see no reason to use different paths than in utempter-0.5.2:
-#zcat $CWD/libutempter.slack.diff.gz | patch -p1 --verbose || exit 1
-find . -perm 664 -exec chmod 644 {} \;
-find . -perm 775 -exec chmod 755 {} \;
+find . \
+  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+  -exec chmod 755 {} \; -o \
+  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+  -exec chmod 644 {} \;
+
+# Fix libdir for x86_64:
 sed -i -e "s#/usr/lib#/usr/lib${LIBDIRSUFFIX}#g" Makefile
-make
-make install DESTDIR=$PKG
-# A static libutempter seems like a bad idea, since it wouldn't work
-# without the making utempter binary.  That and the shared lib are a
-# closely matched set.
+
+make RPM_OPT_FLAGS="$SLKCFLAGS" mandir=/usr/man
+make install mandir=/usr/man DESTDIR=$PKG
+
+# A static libutempter seems like a bad idea, since it wouldn't work without
+# the making utempter binary. That and the shared lib are a closely matched set.
 rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libutempter.a
-# Set proper permissions:
+
+# Ensure proper ownership and permissions:
 chown root:utmp $PKG/usr/lib${LIBDIRSUFFIX}/utempter/utempter
 chmod 2755 $PKG/usr/lib${LIBDIRSUFFIX}/utempter/utempter
-chmod 644 $PKG/usr/include/utempter.h
+
+# Compress and link manpages, if any:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1 | grep -v '\.gz$') ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
+
 mkdir -p $PKG/usr/doc/utempter-$VERSION
 cp -a \
   COPYING README \
   $PKG/usr/doc/utempter-$VERSION
+
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 )
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 zcat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-makepkg -l y -c n $TMP/utempter-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/utempter-$VERSION-$ARCH-$BUILD.txz
 
-- 
cgit v1.2.3