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/n/yptools/yp-tools-2.14-glibc217-crypt.diff |  2 +-
 source/n/yptools/yptools.SlackBuild                | 21 ++++++++++++---------
 2 files changed, 13 insertions(+), 10 deletions(-)

(limited to 'source/n/yptools')

diff --git a/source/n/yptools/yp-tools-2.14-glibc217-crypt.diff b/source/n/yptools/yp-tools-2.14-glibc217-crypt.diff
index cce3ad44a..148b06632 100644
--- a/source/n/yptools/yp-tools-2.14-glibc217-crypt.diff
+++ b/source/n/yptools/yp-tools-2.14-glibc217-crypt.diff
@@ -74,7 +74,7 @@ Author: mancha
  
 -      yppwd.newpw.pw_passwd = strdup (crypt (buf, salt));
 +      crypted_pass = crypt (buf, salt);
-+      if (crypted_pass == NULL);
++      if (crypted_pass == NULL)
 +        {
 +	  printf (_("crypt() call failed - password unchanged.\n"));
 +	  return 1;
diff --git a/source/n/yptools/yptools.SlackBuild b/source/n/yptools/yptools.SlackBuild
index 7baeeb619..3b876935a 100755
--- a/source/n/yptools/yptools.SlackBuild
+++ b/source/n/yptools/yptools.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010, 2011, 2012, 2013  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2016  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,25 +23,25 @@
 
 # Package version number:
 VERSION=2.14
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-7}
 
 YPTOOLS=$VERSION
-YPBINDMT=1.37.1
+YPBINDMT=1.38
 #YPMAKE=0.11
-YPSERV=2.31
+YPSERV=2.32.1
 
 # 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" = "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"
@@ -196,12 +196,14 @@ cd ypserv-$YPSERV || exit 1
 # --enable-tcp-wrapper
 ./configure \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --libexecdir=/usr/lib${LIBDIRSUFFIX}/yp \
   --enable-fqdn \
   --enable-yppasswd \
   $ARCH-slackware-linux
 make clean
 ./configure \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --libexecdir=/usr/lib${LIBDIRSUFFIX}/yp \
   --enable-fqdn \
   --enable-yppasswd \
   $ARCH-slackware-linux
@@ -229,7 +231,7 @@ for FILE in ypserv rpc.yppasswdd rpc.ypxfrd yppush ; do
     cat ${FILE}.8 | gzip -9c > $PKG/usr/man/man8/${FILE}.8.gz )
 done
 cat rpc.yppasswdd/yppasswdd.8 | gzip -9c > $PKG/usr/man/man8/yppasswdd.8.gz
-cat scripts/ypMakefile > $PKG/var/yp/Makefile.new
+cat scripts/ypMakefile | sed "s,/usr/lib/yp,/usr/lib$LIBDIRSUFFIX/yp,g" > $PKG/var/yp/Makefile.new
 cat etc/securenets > $PKG/var/yp/securenets.new
 echo "# This file is part of the YP server package -- see 'man netgroup'" \
  > $PKG/etc/netgroup.new
@@ -281,7 +283,8 @@ config etc/rc.d/rc.yp.new
 config var/yp/nicknames.new
 config var/yp/Makefile.new
 config var/yp/securenets.new
-rm -f etc/nsswitch.conf.new etc/nsswitch.conf-nis.new etc/netgroup.new etc/yp.conf.new var/yp/nicknames.new var/yp/Makefile.new var/yp/securenets.new
+# No, don't delete these.  They might have a few changes that need to be merged.
+#rm -f etc/nsswitch.conf-nis.new etc/netgroup.new etc/yp.conf.new var/yp/nicknames.new var/yp/Makefile.new var/yp/securenets.new
 EOF
 
 cat $CWD/slack-desc > $PKG/install/slack-desc
-- 
cgit v1.2.3