Changeset 988 for vendor/current/packaging/Solaris/makepkg.sh

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/packaging/Solaris/makepkg.sh (modified) (9 diffs)

vendor/current/packaging/Solaris/makepkg.sh

@@ -1 @@
-#!/bin/sh
+#!/bin/sh -e
 #
 # Copyright (C) Shirish A Kalele 2000
@@ -13 +13 @@
 MSGFILES="de.msg en.msg fi.msg fr.msg it.msg ja.msg nl.msg pl.msg tr.msg"
 VFSLIBS="audit.so default_quota.so extd_audit.so full_audit.so readonly.so shadow_copy.so cap.so expand_msdfs.so fake_perms.so netatalk.so recycle.so"
-DATFILES="lowcase.dat upcase.dat valid.dat"
 CHARSETLIBS="CP437.so CP850.so"
 AUTHLIBS="script.so"
@@ -36 +35 @@
                 echo f none lib/$file 0644 root other
         done
-        for file in $DATFILES; do
-                echo f none lib/$file 0644 root other
-        done
         for file in $VFSLIBS; do
                 echo f none lib/vfs/$file 0755 root other
@@ -51 +47 @@
         echo "#\n# libsmbclient\n#"
         echo f none lib/libsmbclient.so 0755 root other
-        echo f none lib/libsmbclient.a 0755 root other
         echo f none include/libsmbclient.h 0644 root other
 
         echo "#\n# libmsrpc\n#"
-        echo f none lib/libmsrpc.so 0755 root other
-        echo f none lib/libmsrpc.a 0755 root other
-        echo f none include/libmsrpc.h 0644 root other
 
         if [ -f lib/smbwrapper.so -a -f bin/smbsh ]; then
@@ -77 +69 @@
 
         # Create directories for man page sections if nonexistent
-        cd man
+        cd share/man
         for i in 1 2 3 4 5 6 7 8 9; do
+                set +e
                 manpages=`ls man$i 2>/dev/null`
+                set -e
                 if [ $? -eq 0 ]; then
-                        echo d none man/man${i} ? ? ?
+                        echo d none share/man/man${i} ? ? ?
                         for manpage in $manpages; do
-                                echo f none man/man${i}/${manpage} 0644 root other
+                                echo f none share/man/man${i}/${manpage} 0644 root other
                         done
                 fi
         done
-        cd ..
+        cd ../..
 
         echo "#\n# SWAT \n#"
@@ -129 +123 @@
 cd $DISTR_BASE/source
 
-if test "x$1" = "xbuild" ]; then
+if test "x$1" = "xbuild" -o ! -f bin/smbd ]; then
         ./configure --prefix=$INSTALL_BASE \
                 --localstatedir=/var/lib/samba \
@@ -137 +131 @@
                 --with-configdir=/etc/samba \
                 --with-lockdir=/var/lib/samba \
+                --with-mandir=/usr/share/man \
                 --with-pam --with-acl-support \
                 --with-quotas --with-included-popt \
@@ -147 +142 @@
 fi
         
-mkdir $TMPINSTALLDIR
+rm -rf $TMPINSTALLDIR
+mkdir -p $TMPINSTALLDIR
 make DESTDIR=$TMPINSTALLDIR install
 
@@ -156 +152 @@
 ## Now get the install locations
 ##
+LD_LIBRARY_PATH=$DISTR_BASE/source/bin
+export LD_LIBRARY_PATH
 SBINDIR=`bin/smbd -b | grep SBINDIR | awk '{print $2}'`
 BINDIR=`bin/smbd -b | grep BINDIR | grep -v SBINDIR |  awk '{print $2}'`