Changes in npl/fileserver/samba/samba.SlackBuild.orig [80c0fb9:c5c522c]

File:

• npl/fileserver/samba/samba.SlackBuild.orig (modified) (8 diffs)

npl/fileserver/samba/samba.SlackBuild.orig

@@ -1 +1 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010, 2012, 2013, 2015, 2016, 2017  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2012, 2013, 2015, 2016  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
@@ -24 +24 @@
 
 
-VERSION=${VERSION:-$(echo samba-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-$(echo samba-*.tar.gz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-3}
 
 if [ -e $CWD/machine.conf ]; then
@@ -68 +68 @@
 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.?z || exit 1
+tar xvf $CWD/samba-$VERSION.tar.gz || 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
@@ -121 +133 @@
   --with-ads \
   --without-pam \
-  --build=$TARGET || exit 1
+  --build=$TARGET
   # Gives errors:
   #--builtin-libraries=replace,ccan \
@@ -127 +139 @@
 
 # -j options don't seem to work... [Yes they do!  At least try to use -j below...]
-JOBS=6
-MAXJOBS=6
+JOBS=1
+MAXJOBS=20
 export JOBS MAXJOBS
 make -j $MAXJOBS || make || exit 1
@@ -162 +174 @@
 chmod 644 $PKG/etc/rc.d/rc.samba.new
 
-# mv $PKG/usr/share/man $PKG/usr
-# gzip -9 $PKG/usr/man/man?/*.?
+#mv $PKG/usr/share/man $PKG/usr
+#gzip -9 $PKG/usr/man/man?/*.?
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
@@ -169 +181 @@
 
 # PAM related stuff we don't use:
-# rm -r $PKG/usr/share/locale
+#rm -r $PKG/usr/share/locale
 rm -f $PKG/usr/man/man8/pam*
 
 cp -a \
-  COPYING* MAINTAINERS Manifest PFIF.txt README* \
-  Read-Manifest-Now Roadmap WHATSNEW.txt docs examples \
-  $PKG/usr/doc/samba-$VERSION || true
+  COPYING* PFIF.txt README* \
+  Roadmap WHATSNEW.txt docs examples \
+  $PKG/usr/doc/samba-$VERSION
 # These are installed elsewhere:
 rm -rf $PKG/usr/doc/samba-$VERSION/docs/htmldocs \
@@ -204 +216 @@
 cd $PKG
 /sbin/makepkg -l y -c n $TMP/samba-$VERSION-$ARCH-$BUILD.txz
+