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.

9 files changed, 42 insertions, 157 deletions

diff --git a/source/n/samba/pytalloc-util.pc b/source/n/samba/pytalloc-util.pc
deleted file mode 100644
index 800a9a81..00000000
--- a/source/n/samba/pytalloc-util.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${prefix}/lib
-includedir=${prefix}/include
-
-Name: pytalloc-util
-Description: Utility functions for using talloc objects with Python
-Version: 2.0.8
-Libs: -L${libdir} -lpytalloc-util
-Cflags: -Wl,-rpath,/usr/lib -I${includedir}
-URL: http://talloc.samba.org/
diff --git a/source/n/samba/samba.SlackBuild b/source/n/samba/samba.SlackBuild
index a7406724..caaa4d19 100755
--- a/source/n/samba/samba.SlackBuild
+++ b/source/n/samba/samba.SlackBuild
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2012, 2013, 2015, 2016  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2012, 2013, 2015, 2016, 2017, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,11 @@
 
 # Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
 
+cd $(dirname $0) ; CWD=$(pwd)
 
-VERSION=${VERSION:-$(echo samba-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+PKGNAM=samba
+VERSION=${VERSION:-$(echo samba-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
 
 if [ -e $CWD/machine.conf ]; then
   . $CWD/machine.conf ]
@@ -56,34 +58,31 @@ else
   fi
 fi
 
+# 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
+
 case "$ARCH" in
     arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
     *)    TARGET=$ARCH-slackware-linux ;;
 esac
 
-CWD=$(pwd)
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-samba
 rm -rf $PKG
 mkdir -p $TMP $PKG
 
-if [ -r /usr/lib${LIBDIRSUFFIX}/libtalloc.so.? -a ! -r /var/log/packages/talloc* ]; then
-  echo "The Samba package needs to be removed before building to ensure that"
-  echo "talloc (and possibly other bundled libraries) are included in the build."
-  echo
-  echo "Removing the Samba package in 15 seconds, and then continuing with the build."
-  sleep 15
-  removepkg samba
-fi
-
 cd $TMP
 rm -rf samba-$VERSION
-tar xvf $CWD/samba-$VERSION.tar.xz || exit 1
+tar xvf $CWD/samba-$VERSION.tar.?z || exit 1
 cd samba-$VERSION || exit 1
 
-# Patch to install talloc/tevent/tdb libraries and includes:
-zcat $CWD/samba.install.talloc.tevent.tdb.diff.gz | patch -p1 --verbose || exit 1
-
 if [ ! -d source3/lib/cmdline ]; then
   ( cd source3/lib
     mkdir cmdline
@@ -132,16 +131,24 @@ CFLAGS="$SLKCFLAGS" \
   --with-ldap \
   --with-ads \
   --without-pam \
-  --build=$TARGET
+  --build=$TARGET || exit 1
   # Gives errors:
   #--builtin-libraries=replace,ccan \
   #--bundled-libraries=heimdal \
 
-# -j options don't seem to work... [Yes they do!  At least try to use -j below...]
-JOBS=6
-MAXJOBS=6
-export JOBS MAXJOBS
-make -j $MAXJOBS || make || exit 1
+# Build with waf directly so that multiple jobs work.
+# Script lifted from "./configure".
+PREVPATH=`dirname $0`
+WAF=./buildtools/bin/waf
+# using JOBS=1 gives maximum compatibility with
+# systems like AIX which have broken threading in python
+JOBS=$(echo $NUMJOBS | tr -dc '0-9')
+export JOBS
+# Make sure we don't have any library preloaded.
+unset LD_PRELOAD
+cd . || exit 1
+${PYTHON:=python} $WAF build "$@" || exit 1
+cd $PREVPATH
 
 mkdir -p \
          $PKG/usr/doc/samba-$VERSION \
diff --git a/source/n/samba/samba.install.talloc.tevent.tdb.diff b/source/n/samba/samba.install.talloc.tevent.tdb.diff
deleted file mode 100644
index 9410f2b7..00000000
--- a/source/n/samba/samba.install.talloc.tevent.tdb.diff
+++ /dev/null
@@ -1,102 +0,0 @@
---- ./lib/tevent/wscript.orig	2016-03-08 05:07:45.000000000 -0600
-+++ ./lib/tevent/wscript	2016-04-11 12:45:14.299532166 -0500
-@@ -92,11 +92,8 @@
-     if bld.CONFIG_SET('HAVE_SOLARIS_PORTS'):
-         SRC += ' tevent_port.c'
- 
--    if bld.env.standalone_tevent:
--        bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
--        private_library = False
--    else:
--        private_library = True
-+    bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
-+    private_library = False
- 
-     if not bld.CONFIG_SET('USING_SYSTEM_TEVENT'):
-         bld.SAMBA_LIBRARY('tevent',
---- ./lib/tdb/wscript.orig	2016-01-26 05:45:46.000000000 -0600
-+++ ./lib/tdb/wscript	2016-04-11 12:45:14.301532166 -0500
-@@ -117,11 +117,8 @@
- 
-     COMMON_SRC = bld.SUBDIR('common', COMMON_FILES)
- 
--    if bld.env.standalone_tdb:
--        bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
--        private_library = False
--    else:
--        private_library = True
-+    bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
-+    private_library = False
- 
-     if not bld.CONFIG_SET('USING_SYSTEM_TDB'):
- 
---- ./lib/talloc/wscript.orig	2016-04-11 12:45:14.295532166 -0500
-+++ ./lib/talloc/wscript	2016-04-11 12:45:26.761531768 -0500
-@@ -77,41 +77,39 @@
- def build(bld):
-     bld.RECURSE('lib/replace')
- 
--    if bld.env.standalone_talloc:
--        bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
--        bld.env.TALLOC_VERSION = VERSION
--        private_library = False
--
--        # should we also install the symlink to libtalloc1.so here?
--        bld.SAMBA_LIBRARY('talloc-compat1-%s' % (VERSION),
--                          'compat/talloc_compat1.c',
--                          public_deps='talloc',
--                          soname='libtalloc.so.1',
--                          pc_files=[],
--                          public_headers=[],
--                          enabled=bld.env.TALLOC_COMPAT1)
--
--        testsuite_deps = 'talloc'
--        if bld.CONFIG_SET('HAVE_PTHREAD'):
--            testsuite_deps += ' pthread'
--
--        bld.SAMBA_BINARY('talloc_testsuite',
--                         'testsuite_main.c testsuite.c',
--                         testsuite_deps,
--                         install=False)
--
--        bld.SAMBA_BINARY('talloc_test_magic_differs_helper',
--                         'test_magic_differs_helper.c',
--                         'talloc', install=False)
-+    bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
-+    bld.env.TALLOC_VERSION = VERSION
-+    private_library = False
-+
-+    # should we also install the symlink to libtalloc1.so here?
-+    bld.SAMBA_LIBRARY('talloc-compat1-%s' % (VERSION),
-+                      'compat/talloc_compat1.c',
-+                      public_deps='talloc',
-+                      soname='libtalloc.so.1',
-+                      pc_files=[],
-+                      public_headers=[],
-+                      enabled=bld.env.TALLOC_COMPAT1)
-+
-+    testsuite_deps = 'talloc'
-+    if bld.CONFIG_SET('HAVE_PTHREAD'):
-+        testsuite_deps += ' pthread'
-+
-+    bld.SAMBA_BINARY('talloc_testsuite',
-+                     'testsuite_main.c testsuite.c',
-+                     testsuite_deps,
-+                     install=False)
-+
-+    bld.SAMBA_BINARY('talloc_test_magic_differs_helper',
-+                     'test_magic_differs_helper.c',
-+                     'talloc', install=False)
- 
--    else:
--        private_library = True
- 
-     if not bld.CONFIG_SET('USING_SYSTEM_TALLOC'):
- 
-         bld.SAMBA_LIBRARY('talloc',
-                           'talloc.c',
-                           deps='replace',
-+                          includes='.',
-                           abi_directory='ABI',
-                           abi_match='talloc* _talloc*',
-                           hide_symbols=True,
diff --git a/source/n/samba/samba.url b/source/n/samba/samba.url
new file mode 100644
index 00000000..ab8fd514
--- /dev/null
+++ b/source/n/samba/samba.url
@@ -0,0 +1,2 @@
+https://download.samba.org/pub/samba/stable/samba-4.8.2.tar.gz
+https://download.samba.org/pub/samba/stable/samba-4.8.2.tar.asc
diff --git a/source/n/samba/slack-desc b/source/n/samba/slack-desc
index f4352c60..5080fd6c 100644
--- a/source/n/samba/slack-desc
+++ b/source/n/samba/slack-desc
@@ -1,19 +1,19 @@
 # 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------------------------------------------------------|
 samba: samba (CIFS file and print server)
 samba:
-samba: Samba is a CIFS file and print server for CIFS clients.  It allows
+samba: Samba is a CIFS file and print server for CIFS clients. It allows
 samba: you to make file space or printers on a Samba host available to CIFS
 samba: clients (such as PCs running Windows).
 samba:
 samba: If you have any Windows file servers, you may be able to replace them
-samba: or supplement them with Samba.  One of Samba's big strengths is
+samba: or supplement them with Samba. One of Samba's big strengths is
 samba: integration, so you can use it to tie together your Linux hosts and
 samba: Windows PC clients.
 samba:
diff --git a/source/n/samba/smb.conf.default b/source/n/samba/smb.conf.default
index c41cfff6..45d6f10f 100644
--- a/source/n/samba/smb.conf.default
+++ b/source/n/samba/smb.conf.default
@@ -33,7 +33,7 @@
 # domain controller", "classic backup domain controller", "active
 # directory domain controller".
 #
-# Most people will want "standalone sever" or "member server".
+# Most people will want "standalone server" or "member server".
 # Running as "active directory domain controller" will require first
 # running "samba-tool domain provision" to wipe databases and create a
 # new domain.
diff --git a/source/n/samba/smb.conf.default.orig b/source/n/samba/smb.conf.default.orig
index bb9c2e25..2f207209 100644
--- a/source/n/samba/smb.conf.default.orig
+++ b/source/n/samba/smb.conf.default.orig
@@ -33,7 +33,7 @@
 # domain controller", "classic backup domain controller", "active
 # directory domain controller".
 #
-# Most people will want "standalone sever" or "member server".
+# Most people will want "standalone server" or "member server".
 # Running as "active directory domain controller" will require first
 # running "samba-tool domain provision" to wipe databases and create a
 # new domain.
diff --git a/source/n/samba/smb.conf.diff b/source/n/samba/smb.conf.diff
index b08d2b12..73688a8a 100644
--- a/source/n/samba/smb.conf.diff
+++ b/source/n/samba/smb.conf.diff
@@ -1,5 +1,5 @@
---- smb.conf.default.orig	2013-06-13 04:21:02.000000000 -0500
-+++ smb.conf.default	2013-10-15 20:02:31.684043875 -0500
+--- smb.conf.default.orig	2017-01-11 01:55:14.000000000 -0600
++++ smb.conf.default	2017-03-23 14:18:05.114503416 -0500
 @@ -22,7 +22,7 @@
  #======================= Global Settings =====================================
  [global]
diff --git a/source/n/samba/talloc.pc b/source/n/samba/talloc.pc
deleted file mode 100644
index 125977d1..00000000
--- a/source/n/samba/talloc.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${prefix}/lib
-includedir=${prefix}/include
-
-Name: talloc 
-Description: A hierarchical pool based memory system with destructors
-Version: 2.0.8
-Libs: -Wl,-rpath,/usr/lib -L${libdir} -ltalloc
-Cflags: -I${includedir} 
-URL: http://talloc.samba.org/