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!  :-)

6 files changed, 34 insertions, 35 deletions

diff --git a/source/n/php/doinst.sh b/source/n/php/doinst.sh
index bf1b2170..a6f584ed 100644
--- a/source/n/php/doinst.sh
+++ b/source/n/php/doinst.sh
@@ -22,7 +22,9 @@ if [ -e etc/rc.d/rc.php-fpm ]; then
   mv etc/rc.d/rc.php-fpm.new.incoming etc/rc.d/rc.php-fpm.new
 fi
 config etc/rc.d/rc.php-fpm.new
-cp -a etc/httpd/php.ini-production etc/httpd/php.ini.new
-config etc/httpd/php.ini.new
-cp -a etc/php-fpm/php-fpm.conf.default etc/php-fpm/php-fpm.conf.new
-config etc/php-fpm/php-fpm.conf.new
+cp -a etc/php.ini-production etc/php.ini.new
+config etc/php.ini.new
+cp -a etc/php-fpm.conf.default etc/php-fpm.conf.new
+config etc/php-fpm.conf.new
+cp -a etc/php-fpm.conf.default etc/php-fpm.conf.new
+config etc/php-fpm.conf.new
diff --git a/source/n/php/fetch-php.sh b/source/n/php/fetch-php.sh
index 522214cc..a44015ed 100755
--- a/source/n/php/fetch-php.sh
+++ b/source/n/php/fetch-php.sh
@@ -1 +1 @@
-lftpget http://us.php.net/distributions/php-5.4.20.tar.bz2 
+lftpget http://us.php.net/distributions/php-5.6.23.tar.xz
diff --git a/source/n/php/init.d.php-fpm.in.diff b/source/n/php/init.d.php-fpm.in.diff
deleted file mode 100644
index 00f88778..00000000
--- a/source/n/php/init.d.php-fpm.in.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./sapi/fpm/init.d.php-fpm.in.orig	2013-05-08 00:41:20.000000000 -0500
-+++ ./sapi/fpm/init.d.php-fpm.in	2013-05-19 14:52:33.952089160 -0500
-@@ -14,7 +14,7 @@
- exec_prefix=@exec_prefix@
- 
- php_fpm_BIN=@sbindir@/php-fpm
--php_fpm_CONF=@sysconfdir@/php-fpm.conf
-+php_fpm_CONF=@sysconfdir@/php-fpm/php-fpm.conf
- php_fpm_PID=@localstatedir@/run/php-fpm.pid
- 
- 
diff --git a/source/n/php/php-fpm.conf.diff b/source/n/php/php-fpm.conf.diff
index e749185b..38d0f9c6 100644
--- a/source/n/php/php-fpm.conf.diff
+++ b/source/n/php/php-fpm.conf.diff
@@ -5,8 +5,8 @@
  ;  - the global prefix if it's been set (-p arguement)
  ;  - @prefix@ otherwise
 -;include=etc/fpm.d/*.conf
-+;include=etc/php-fpm/*.conf
- 
++;include=etc/php-fpm.d/*.conf
+
  ;;;;;;;;;;;;;;;;;;
  ; Global Options ;
 @@ -22,14 +22,14 @@
@@ -15,7 +15,7 @@
  ; Default Value: none
 -;pid = run/php-fpm.pid
 +pid = run/php-fpm.pid
- 
+
  ; Error log file
  ; If it's set to "syslog", log is sent to syslogd instead of being written
  ; in a local file.
@@ -23,6 +23,6 @@
  ; Default Value: log/php-fpm.log
 -;error_log = log/php-fpm.log
 +error_log = log/php-fpm.log
- 
+
  ; syslog_facility is used to specify what type of program is logging the
  ; message. This lets syslogd specify that messages from different facilities
diff --git a/source/n/php/php.SlackBuild b/source/n/php/php.SlackBuild
index 9e263230..2e8748ce 100755
--- a/source/n/php/php.SlackBuild
+++ b/source/n/php/php.SlackBuild
@@ -3,7 +3,7 @@
 # Build and package mod_php on Slackware.
 # by:  David Cantrell <david@slackware.com>
 # Modified for PHP 4-5 by volkerdi@slackware.com
-# Copyright 2007, 2008, 2009, 2010, 2011, 2012, 2013  Patrick Volkerding, Sebeka, MN, USA
+# Copyright 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2015  Patrick Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,13 +25,13 @@
 
 
 VERSION=${VERSION:-$(echo php-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-ALPINE=2.11
+ALPINE=2.20
 BUILD=${BUILD:-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 ) ;;
@@ -52,6 +52,9 @@ if [ "$ARCH" = "i386" ]; then
 elif [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
@@ -75,14 +78,13 @@ else
     strip -g c-client.a
     mkdir -p $IMAPLIBDIR/lib${LIBDIRSUFFIX}
     cp c-client.a $IMAPLIBDIR/lib${LIBDIRSUFFIX}
-    ( cd $IMAPLIBDIR/lib${LIBDIRSUFFIX} ; ln -sf c-client.a libc-client.a )
     mkdir -p $IMAPLIBDIR/include
     cp *.h $IMAPLIBDIR/include
   )
 fi
 
 mkdir -p $PKG/etc/httpd
-mkdir -p $PKG/etc/php
+mkdir -p $PKG/etc/php.d
 # A trick from DaMouse to enable building php into $PKG.
 # We'll remove this later on.
 cat /etc/httpd/original/httpd.conf > $PKG/etc/httpd/httpd.conf
@@ -96,8 +98,6 @@ rm -rf php-$VERSION
 tar xvf $CWD/php-$VERSION.tar.?z* || exit 1
 cd php-$VERSION
 
-zcat $CWD/init.d.php-fpm.in.diff.gz | patch -p1 --verbose || exit 1
-
 # cleanup:
 find . -name "*.orig" -delete
 
@@ -158,8 +158,8 @@ CFLAGS="$SLKCFLAGS" \
   --enable-pcntl \
   --enable-mbregex \
   --enable-tokenizer=shared \
-  --with-config-file-scan-dir=/etc/php \
-  --with-config-file-path=/etc/httpd \
+  --with-config-file-scan-dir=/etc/php.d \
+  --with-config-file-path=/etc \
   --enable-mod_charset \
   --with-layout=PHP \
   --disable-sigchild \
@@ -178,7 +178,6 @@ CFLAGS="$SLKCFLAGS" \
   --enable-calendar=shared \
   --enable-ctype=shared \
   --with-curl=shared \
-  --with-curlwrappers \
   --with-mcrypt=/usr \
   --enable-dba=shared \
   --with-gdbm=/usr \
@@ -188,6 +187,7 @@ CFLAGS="$SLKCFLAGS" \
   --with-gd=shared \
   --with-jpeg-dir=/usr \
   --with-png-dir=/usr \
+  --with-vpx-dir=/usr \
   --with-zlib-dir=/usr \
   --with-xpm-dir=/usr \
   --with-freetype-dir=/usr \
@@ -204,9 +204,11 @@ CFLAGS="$SLKCFLAGS" \
   --with-mysql=shared,mysqlnd \
   --with-mysqli=shared,mysqlnd \
   --with-mysql-sock=/var/run/mysql/mysql.sock \
+  --with-iodbc=shared,/usr \
   --enable-pdo=shared \
   --with-pdo-mysql=shared,mysqlnd \
   --with-pdo-sqlite=shared,/usr \
+  --with-pdo-odbc=shared,iODBC,/usr \
   --with-pspell=shared,/usr \
   --with-enchant=shared,/usr \
   --enable-shmop=shared \
@@ -223,10 +225,12 @@ CFLAGS="$SLKCFLAGS" \
   --enable-zip=shared \
   --with-tsrm-pthreads \
   --enable-intl=shared \
+  --enable-opcache \
   --enable-shared=yes \
   --enable-static=no \
   --with-gnu-ld \
   --with-pic \
+  --enable-phpdbg \
   --build=$ARCH-slackware-linux
 
 # I am told this option is worse than nothing.  :-)
@@ -238,11 +242,9 @@ CFLAGS="$SLKCFLAGS" \
 make $NUMJOBS || make || exit 1
 make install INSTALL_ROOT=$PKG || exit 1
 
-mkdir -p $PKG/etc/{rc.d,php-fpm}
+mkdir -p $PKG/etc/{rc.d,php-fpm.d}
 cp sapi/fpm/init.d.php-fpm $PKG/etc/rc.d/rc.php-fpm.new
 chmod 644 $PKG/etc/rc.d/rc.php-fpm.new
-mv $PKG/etc/php-fpm.conf.default $PKG/etc/php-fpm
-chmod 644 $PKG/etc/php-fpm/php-fpm.conf.default
 
 # PHP (used to) install Pear with some strange permissions.
 chmod 755 $PKG/usr/bin/pear
@@ -273,12 +275,15 @@ chown -R root:root $PKG/usr/doc/php-$VERSION
 chmod 644 $PKG/usr/doc/php-$VERSION/UPGRADING*
 
 mkdir -p $PKG/etc/httpd
-cp -a php.ini-development php.ini-production $PKG/etc/httpd
 cat $CWD/mod_php.conf.example | sed -e "s#lib/httpd#lib${LIBDIRSUFFIX}/httpd#" \
   > $PKG/etc/httpd/mod_php.conf.example
 chmod 644 $PKG/etc/httpd/*
 chown root:root $PKG/etc/httpd/*
 
+cp -a php.ini-development php.ini-production $PKG/etc
+chmod 755 $PKG/etc/php.d $PKG/etc/php-fpm.d $PKG/etc/httpd
+chown root:root $PKG/etc/*
+
 # This can go now.
 rm -f $PKG/etc/httpd/httpd*
 
diff --git a/source/n/php/php.ini-development.diff b/source/n/php/php.ini-development.diff
index 8c582e4d..ffa7c0c9 100644
--- a/source/n/php/php.ini-development.diff
+++ b/source/n/php/php.ini-development.diff
@@ -1,6 +1,6 @@
 --- ./php.ini-development.orig	2012-07-18 01:19:16.000000000 -0500
 +++ ./php.ini-development	2012-08-08 20:06:33.512546116 -0500
-@@ -859,6 +859,46 @@
+@@ -859,6 +859,49 @@
  ; If you only provide the name of the extension, PHP will look for it in its
  ; default extension directory.
  ;
@@ -28,10 +28,13 @@
 +extension=mbstring.so
 +extension=mysql.so
 +extension=mysqli.so
++extension=odbc.so
 +extension=openssl.so
++zend_extension=opcache.so
 +extension=pdo.so
 +extension=pdo_mysql.so
 +extension=pdo_sqlite.so
++extension=pdo_odbc.so
 +extension=pspell.so
 +extension=shmop.so
 +extension=snmp.so