Slackware 14.2slackware-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!  :-)

3 files changed, 61 insertions, 10 deletions

diff --git a/source/xap/xscreensaver/dump.osx.sources.sh b/source/xap/xscreensaver/dump.android.osx.sources.sh
index fc3c5f461..3993f510b 100755
--- a/source/xap/xscreensaver/dump.osx.sources.sh
+++ b/source/xap/xscreensaver/dump.android.osx.sources.sh
@@ -6,6 +6,7 @@ VERSION=${VERSION:-$(echo xscreensaver-*.tar.?z* | rev | cut -f 3- -d . | cut -f
 tar xf xscreensaver-${VERSION}.tar.xz || exit 1
 mv xscreensaver-${VERSION}.tar.xz xscreensaver-${VERSION}.tar.xz.orig
 rm -r xscreensaver-${VERSION}/OSX/*
+rm -r xscreensaver-${VERSION}/android/*
 tar cf xscreensaver-${VERSION}.tar xscreensaver-${VERSION}
 rm -r xscreensaver-${VERSION}
 xz -9 xscreensaver-${VERSION}.tar
diff --git a/source/xap/xscreensaver/xscreensaver.SlackBuild b/source/xap/xscreensaver/xscreensaver.SlackBuild
index b7ca3799b..43d7995a1 100755
--- a/source/xap/xscreensaver/xscreensaver.SlackBuild
+++ b/source/xap/xscreensaver/xscreensaver.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010, 2012, 2013  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2012, 2013, 2014, 2016  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -27,7 +27,7 @@ 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 ) ;;
@@ -36,8 +36,8 @@ fi
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
@@ -69,6 +69,12 @@ zcat $CWD/xscreensaver.setuid.diff.gz | patch -p1 --verbose --backup --suffix=.o
 # Add support for the electricsheep distributed screensaver:
 zcat $CWD/xscreensaver.electricsheep.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
 
+# Remove a feature that pops up a nag screen claiming the version is old
+# after one year.  Just don't send in bug reports on an old version, OK folks?
+# I hate to swim against upstream, but with all respect this feature is not
+# helpful to distributions.
+zcat $CWD/xscreensaver.no.expiration.date.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
+
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -84,17 +90,17 @@ CXXFLAGS="$SLKCFLAGS" \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
   --with-x-app-defaults=/etc/X11/app-defaults \
+  --with-text-file=/usr/doc/netdate/COPYRIGHT \
   --with-shadow \
   --with-jpeg \
   --with-gl \
-  --build=$ARCH-slackware-linux
-
-# We use '-i' because xscreensaver's NLS support has always been horribly broken
-make -i $NUMJOBS || make -i
-make -i install_prefix=$PKG install-strip
+  --build=$ARCH-slackware-linux || exit 1
 
-gzip -9 $PKG/usr/man/man?/*
+# Build:
+make $NUMJOBS || make || exit 1
+make install_prefix=$PKG install-strip || exit 1
 
+# Needed for password unlock:
 chown root:shadow $PKG/usr/bin/xscreensaver
 chmod 2751 $PKG/usr/bin/xscreensaver
 
@@ -106,6 +112,21 @@ cp -a \
   README* \
   $PKG/usr/doc/xscreensaver-$VERSION
 
+# 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
+
 # Insert an older version of xscreensaver-getimage-file to avoid depending
 # on libwww-perl.  Maybe we'll eventually add this, but bundling 14 perl
 # modules is a lot of maintainance just to get slidescreen working again.
diff --git a/source/xap/xscreensaver/xscreensaver.no.expiration.date.diff b/source/xap/xscreensaver/xscreensaver.no.expiration.date.diff
new file mode 100644
index 000000000..bdbcbe1d1
--- /dev/null
+++ b/source/xap/xscreensaver/xscreensaver.no.expiration.date.diff
@@ -0,0 +1,29 @@
+--- ./driver/prefs.c.orig	2016-05-23 22:08:27.000000000 -0500
++++ ./driver/prefs.c	2016-05-30 15:29:36.446721679 -0500
+@@ -1734,6 +1734,17 @@
+      shipping the last version with the old license and then never
+      upgrading it again -- which would be the worst possible outcome for
+      everyone involved, most especially the users.
++
++     ---
++
++     NOTE:  This feature is disabled by Slackware...  we do not ship multi-year
++     old versions, nor do we think it is a good idea to include nag screens
++     that activate when an expiration date is reached.  In this case, the
++     nag screen was activated after only one year, which practically insures
++     that this will be seen before the next stable Slackware release.
++     If there's a problem that needs fixing, we'll issue a fix.
++     No nag screens please.  Thanks for possibly reconsidering this!
++
+   */
+ 
+   time_t now = time ((time_t *) 0);				/*       */
+@@ -1766,5 +1777,7 @@
+   months = ((((tm->tm_year + 1900) * 12) + tm->tm_mon) -	/*   h   */
+             (y * 12 + m));					/*   p   */
+ 							  	/*   .   */
+-  return (months >= 17);					/*       */
++  /* Disable date checking for Slackware:  */                   /*  \ö/  */
++  /* return (months >= 17); */					/*       */
++  return ( 0 );
+ }