Mon May 28 19:12:29 UTC 201820180528191229

a/pkgtools-15.0-noarch-13.txz:  Rebuilt.
  installpkg: default line length for --terselength is the number of columns.
  removepkg: added --terse mode.
  upgradepkg: default line length for --terselength is the number of columns.
  upgradepkg: accept -option in addition to --option.
ap/vim-8.1.0026-x86_64-1.txz:  Upgraded.
d/bison-3.0.5-x86_64-1.txz:  Upgraded.
e/emacs-26.1-x86_64-1.txz:  Upgraded.
kde/kopete-4.14.3-x86_64-8.txz:  Rebuilt.
  Recompiled against libidn-1.35.
n/conntrack-tools-1.4.5-x86_64-1.txz:  Upgraded.
n/libnetfilter_conntrack-1.0.7-x86_64-1.txz:  Upgraded.
n/libnftnl-1.1.0-x86_64-1.txz:  Upgraded.
n/links-2.16-x86_64-2.txz:  Rebuilt.
  Rebuilt to enable X driver for -g mode.
n/lynx-2.8.9dev.19-x86_64-1.txz:  Upgraded.
n/nftables-0.8.5-x86_64-1.txz:  Upgraded.
n/p11-kit-0.23.11-x86_64-1.txz:  Upgraded.
n/ulogd-2.0.7-x86_64-1.txz:  Upgraded.
n/whois-5.3.1-x86_64-1.txz:  Upgraded.
xap/network-manager-applet-1.8.12-x86_64-1.txz:  Upgraded.
xap/vim-gvim-8.1.0026-x86_64-1.txz:  Upgraded.

3 files changed, 99 insertions, 90 deletions

diff --git a/source/d/python/python.SlackBuild b/source/d/python/python.SlackBuild
index 09a27a21e..c4948fcd0 100755
--- a/source/d/python/python.SlackBuild
+++ b/source/d/python/python.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2008, 2009, 2012, 2013  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2012, 2013, 2016, 2018  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,6 +20,7 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=python
 SRCNAM=Python
@@ -39,7 +40,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
 rm -rf $PKG
@@ -67,7 +75,7 @@ TOOLSDIR=/usr/lib${LIBDIRSUFFIX}/${PKGNAM}${BRANCH_VERSION}/site-packages
 cd $TMP
 rm -rf $SRCNAM-$VERSION
 tar xf $CWD/$SRCNAM-$VERSION.tar.xz || exit 1
-cd $SRCNAM-$VERSION
+cd $SRCNAM-$VERSION || exit 1
 
 zcat $CWD/python.readline.set_pre_input_hook.diff.gz | patch -p1 --verbose || exit 1
 # We don't want a large libpython*.a:
@@ -86,6 +94,9 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# Enable built-in SQLite module to load extensions
+sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py
+
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -94,10 +105,14 @@ find . \
   --with-threads \
   --enable-ipv6 \
   --enable-shared \
-  --build=$ARCH-slackware-linux
+  --enable-unicode=ucs4 \
+  --with-system-expat \
+  --with-system-ffi \
+  --without-ensurepip \
+  --build=$ARCH-slackware-linux || exit 1
 
 make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG
+make install DESTDIR=$PKG || exit 1
 
 # Install some python-demo files:
 mkdir -p $PKG/usr/doc/python-$VERSION
@@ -112,6 +127,7 @@ mv $SITEPK/README $PKG/usr/doc/python-$VERSION/README.python-tools
 ( cd $PKG/usr/doc/python-$VERSION
   ln -sf $TOOLSDIR Tools
 )
+
 # Make a few useful symlinks:
 mkdir -p $PKG/usr/bin
 ( cd $PKG/usr/bin
diff --git a/source/d/python/python.x86_64.diff b/source/d/python/python.x86_64.diff
index e3a2af8ea..55cdf4996 100644
--- a/source/d/python/python.x86_64.diff
+++ b/source/d/python/python.x86_64.diff
@@ -1,61 +1,16 @@
-diff -Nur Python-2.7.9.orig/Lib/distutils/command/install.py Python-2.7.9/Lib/distutils/command/install.py
---- Python-2.7.9.orig/Lib/distutils/command/install.py	2014-12-10 09:59:34.000000000 -0600
-+++ Python-2.7.9/Lib/distutils/command/install.py	2014-12-11 21:14:11.560186033 -0600
-@@ -41,15 +41,15 @@
- 
- INSTALL_SCHEMES = {
-     'unix_prefix': {
--        'purelib': '$base/lib/python$py_version_short/site-packages',
--        'platlib': '$platbase/lib/python$py_version_short/site-packages',
-+        'purelib': '$base/lib64/python$py_version_short/site-packages',
-+        'platlib': '$platbase/lib64/python$py_version_short/site-packages',
-         'headers': '$base/include/python$py_version_short/$dist_name',
-         'scripts': '$base/bin',
-         'data'   : '$base',
-         },
-     'unix_home': {
--        'purelib': '$base/lib/python',
--        'platlib': '$base/lib/python',
-+        'purelib': '$base/lib64/python',
-+        'platlib': '$base/lib64/python',
-         'headers': '$base/include/python/$dist_name',
-         'scripts': '$base/bin',
-         'data'   : '$base',
-diff -Nur Python-2.7.9.orig/Lib/distutils/sysconfig.py Python-2.7.9/Lib/distutils/sysconfig.py
---- Python-2.7.9.orig/Lib/distutils/sysconfig.py	2014-12-10 09:59:34.000000000 -0600
-+++ Python-2.7.9/Lib/distutils/sysconfig.py	2014-12-11 21:14:45.394770718 -0600
-@@ -120,7 +120,7 @@
+--- ./Makefile.pre.in.orig	2016-12-17 14:05:06.000000000 -0600
++++ ./Makefile.pre.in	2016-12-28 13:17:09.089663880 -0600
+@@ -111,7 +111,7 @@
+ MANDIR=		@mandir@
+ INCLUDEDIR=	@includedir@
+ CONFINCLUDEDIR=	$(exec_prefix)/include
+-SCRIPTDIR=	$(prefix)/lib
++SCRIPTDIR=	$(prefix)/lib64
  
-     if os.name == "posix":
-         libpython = os.path.join(prefix,
--                                 "lib", "python" + get_python_version())
-+                                 "lib64", "python" + get_python_version())
-         if standard_lib:
-             return libpython
-         else:
-diff -Nur Python-2.7.9.orig/Lib/site.py Python-2.7.9/Lib/site.py
---- Python-2.7.9.orig/Lib/site.py	2014-12-10 09:59:40.000000000 -0600
-+++ Python-2.7.9/Lib/site.py	2014-12-11 21:15:39.365108237 -0600
-@@ -288,13 +288,13 @@
-         if sys.platform in ('os2emx', 'riscos'):
-             sitepackages.append(os.path.join(prefix, "Lib", "site-packages"))
-         elif os.sep == '/':
--            sitepackages.append(os.path.join(prefix, "lib",
-+            sitepackages.append(os.path.join(prefix, "lib64",
-                                         "python" + sys.version[:3],
-                                         "site-packages"))
--            sitepackages.append(os.path.join(prefix, "lib", "site-python"))
-+            sitepackages.append(os.path.join(prefix, "lib64", "site-python"))
-         else:
-             sitepackages.append(prefix)
--            sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
-+            sitepackages.append(os.path.join(prefix, "lib64", "site-packages"))
-         if sys.platform == "darwin":
-             # for framework builds *only* we add the standard Apple
-             # locations.
-diff -Nur Python-2.7.9.orig/Lib/sysconfig.py Python-2.7.9/Lib/sysconfig.py
---- Python-2.7.9.orig/Lib/sysconfig.py	2014-12-10 09:59:40.000000000 -0600
-+++ Python-2.7.9/Lib/sysconfig.py	2014-12-11 21:16:44.487308865 -0600
+ # Detailed destination directories
+ BINLIBDEST=	$(LIBDIR)/python$(VERSION)
+--- ./Lib/sysconfig.py.orig	2016-12-17 14:05:06.000000000 -0600
++++ ./Lib/sysconfig.py	2016-12-28 13:17:09.086663880 -0600
 @@ -7,20 +7,20 @@
  
  _INSTALL_SCHEMES = {
@@ -100,22 +55,61 @@ diff -Nur Python-2.7.9.orig/Lib/sysconfig.py Python-2.7.9/Lib/sysconfig.py
          'include': '{userbase}/include/python{py_version_short}',
          'scripts': '{userbase}/bin',
          'data'   : '{userbase}',
-diff -Nur Python-2.7.9.orig/Makefile.pre.in Python-2.7.9/Makefile.pre.in
---- Python-2.7.9.orig/Makefile.pre.in	2014-12-10 09:59:50.000000000 -0600
-+++ Python-2.7.9/Makefile.pre.in	2014-12-11 21:16:59.515124398 -0600
-@@ -106,7 +106,7 @@
- MANDIR=		@mandir@
- INCLUDEDIR=	@includedir@
- CONFINCLUDEDIR=	$(exec_prefix)/include
--SCRIPTDIR=	$(prefix)/lib
-+SCRIPTDIR=	$(prefix)/lib64
+--- ./Lib/site.py.orig	2016-12-17 14:05:06.000000000 -0600
++++ ./Lib/site.py	2016-12-28 13:19:06.612662631 -0600
+@@ -288,13 +288,13 @@
+         if sys.platform in ('os2emx', 'riscos'):
+             sitepackages.append(os.path.join(prefix, "Lib", "site-packages"))
+         elif os.sep == '/':
+-            sitepackages.append(os.path.join(prefix, "lib",
++            sitepackages.append(os.path.join(prefix, "lib64",
+                                         "python" + sys.version[:3],
+                                         "site-packages"))
+-            sitepackages.append(os.path.join(prefix, "lib", "site-python"))
++            sitepackages.append(os.path.join(prefix, "lib64", "site-python"))
+         else:
+             sitepackages.append(prefix)
+-            sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
++            sitepackages.append(os.path.join(prefix, "lib64", "site-packages"))
+     return sitepackages
  
- # Detailed destination directories
- BINLIBDEST=	$(LIBDIR)/python$(VERSION)
-diff -Nur Python-2.7.9.orig/Modules/getpath.c Python-2.7.9/Modules/getpath.c
---- Python-2.7.9.orig/Modules/getpath.c	2014-12-10 09:59:55.000000000 -0600
-+++ Python-2.7.9/Modules/getpath.c	2014-12-11 21:18:16.840175232 -0600
-@@ -129,7 +129,7 @@
+ def addsitepackages(known_paths):
+--- ./Lib/distutils/command/install.py.orig	2016-12-17 14:05:05.000000000 -0600
++++ ./Lib/distutils/command/install.py	2016-12-28 13:17:09.079663880 -0600
+@@ -41,15 +41,15 @@
+ 
+ INSTALL_SCHEMES = {
+     'unix_prefix': {
+-        'purelib': '$base/lib/python$py_version_short/site-packages',
+-        'platlib': '$platbase/lib/python$py_version_short/site-packages',
++        'purelib': '$base/lib64/python$py_version_short/site-packages',
++        'platlib': '$platbase/lib64/python$py_version_short/site-packages',
+         'headers': '$base/include/python$py_version_short/$dist_name',
+         'scripts': '$base/bin',
+         'data'   : '$base',
+         },
+     'unix_home': {
+-        'purelib': '$base/lib/python',
+-        'platlib': '$base/lib/python',
++        'purelib': '$base/lib64/python',
++        'platlib': '$base/lib64/python',
+         'headers': '$base/include/python/$dist_name',
+         'scripts': '$base/bin',
+         'data'   : '$base',
+--- ./Lib/distutils/sysconfig.py.orig	2016-12-17 14:05:05.000000000 -0600
++++ ./Lib/distutils/sysconfig.py	2016-12-28 13:17:09.081663880 -0600
+@@ -120,7 +120,7 @@
+ 
+     if os.name == "posix":
+         libpython = os.path.join(prefix,
+-                                 "lib", "python" + get_python_version())
++                                 "lib64", "python" + get_python_version())
+         if standard_lib:
+             return libpython
+         else:
+--- ./Modules/getpath.c.orig	2016-12-17 14:05:07.000000000 -0600
++++ ./Modules/getpath.c	2016-12-28 13:17:09.093663880 -0600
+@@ -108,7 +108,7 @@
  static char exec_prefix[MAXPATHLEN+1];
  static char progpath[MAXPATHLEN+1];
  static char *module_search_path = NULL;
@@ -124,7 +118,7 @@ diff -Nur Python-2.7.9.orig/Modules/getpath.c Python-2.7.9/Modules/getpath.c
  
  static void
  reduce(char *dir)
-@@ -543,7 +543,7 @@
+@@ -520,7 +520,7 @@
      }
      else
          strncpy(zip_path, PREFIX, MAXPATHLEN);
@@ -133,7 +127,7 @@ diff -Nur Python-2.7.9.orig/Modules/getpath.c Python-2.7.9/Modules/getpath.c
      bufsz = strlen(zip_path);   /* Replace "00" with version */
      zip_path[bufsz - 6] = VERSION[0];
      zip_path[bufsz - 5] = VERSION[2];
-@@ -553,7 +553,7 @@
+@@ -530,7 +530,7 @@
              fprintf(stderr,
                  "Could not find platform dependent libraries <exec_prefix>\n");
          strncpy(exec_prefix, EXEC_PREFIX, MAXPATHLEN);
@@ -142,10 +136,9 @@ diff -Nur Python-2.7.9.orig/Modules/getpath.c Python-2.7.9/Modules/getpath.c
      }
      /* If we found EXEC_PREFIX do *not* reduce it!  (Yet.) */
  
-diff -Nur Python-2.7.9.orig/setup.py Python-2.7.9/setup.py
---- Python-2.7.9.orig/setup.py	2014-12-10 10:00:01.000000000 -0600
-+++ Python-2.7.9/setup.py	2014-12-11 21:19:37.094190107 -0600
-@@ -440,7 +440,7 @@
+--- ./setup.py.orig	2016-12-17 14:05:07.000000000 -0600
++++ ./setup.py	2016-12-28 13:17:09.097663880 -0600
+@@ -456,7 +456,7 @@
      def detect_modules(self):
          # Ensure that /usr/local is always used
          if not cross_compiling:
@@ -154,7 +147,7 @@ diff -Nur Python-2.7.9.orig/setup.py Python-2.7.9/setup.py
              add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
          if cross_compiling:
              self.add_gcc_paths()
-@@ -762,11 +762,11 @@
+@@ -782,11 +782,11 @@
              elif curses_library:
                  readline_libs.append(curses_library)
              elif self.compiler.find_library_file(lib_dirs +
@@ -168,7 +161,7 @@ diff -Nur Python-2.7.9.orig/setup.py Python-2.7.9/setup.py
                                     extra_link_args=readline_extra_link_args,
                                     libraries=readline_libs) )
          else:
-@@ -801,8 +801,8 @@
+@@ -821,8 +821,8 @@
              if krb5_h:
                  ssl_incs += krb5_h
          ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
diff --git a/source/d/python/slack-desc b/source/d/python/slack-desc
index 569c3c5b3..d7db551f0 100644
--- a/source/d/python/slack-desc
+++ b/source/d/python/slack-desc
@@ -1,17 +1,17 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
+# The "handy ruler" below makes it easier to edit a package description. Line
 # up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
 # customary to leave one space after the ':'.
 
       |-----handy-ruler------------------------------------------------------|
 python: python (object-oriented interpreted programming language)
 python:
 python: Python is an interpreted, interactive, object-oriented programming
-python: language that combines remarkable power with very clear syntax.  
+python: language that combines remarkable power with very clear syntax. 
 python: Python's basic power can be extended with your own modules written in
-python: C or C++.  Python is also adaptable as an extension language for
+python: C or C++. Python is also adaptable as an extension language for
 python: existing applications. 
 python:
 python: