wok-next diff samba/receipt @ rev 20529

Up libblockdev (2.16), nspr (4.18), openssh (7.6p1), udisks2 (2.7.6).
author Aleksej Bobylev <al.bobylev@gmail.com>
date Sat Mar 24 15:55:55 2018 +0200 (2018-03-24)
parents da6f77539069
children 757d032c55c7
line diff
     1.1 --- a/samba/receipt	Thu Mar 15 12:17:34 2018 +0100
     1.2 +++ b/samba/receipt	Sat Mar 24 15:55:55 2018 +0200
     1.3 @@ -7,8 +7,7 @@
     1.4  MAINTAINER="pascal.bellard@slitaz.org"
     1.5  LICENSE="GPL3"
     1.6  WEB_SITE="https://www.samba.org/"
     1.7 -BUGS="Open directory needs MIT kerberos support (krb5)"
     1.8 -COOKOPTS="!menus"
     1.9 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/basicnet/samba.html"
    1.10  
    1.11  TARBALL="$PACKAGE-$VERSION.tar.gz"
    1.12  WGET_URL="https://download.samba.org/pub/samba/stable/$TARBALL"
    1.13 @@ -16,19 +15,22 @@
    1.14  BUILD_DEPENDS="python-dev perl acl-dev docbook-xsl openldap-dev   \
    1.15  gnutls-dev krb5-dev cyrus-sasl-dev zlib-dev popt-dev libtdb-dev talloc-dev \
    1.16  libgcrypt-dev nss-dev cups-dev dbus-dev pam pam-dev"
    1.17 -SPLIT="samba samba-pam samba-dev" # TODO: swat
    1.18 +SPLIT="samba samba-dev samba-pam:pam" # TODO: swat
    1.19 +
    1.20 +BUGS="Open directory needs MIT kerberos support (krb5)"
    1.21 +COOKOPTS="!menus"
    1.22  
    1.23  version() {
    1.24  	wget -O- -q https://download.samba.org/pub/samba/ | \
    1.25  	sed '/LATEST-IS-SAMBA/!d; s|.*SAMBA-\([^<]*\).*|\1|'
    1.26  }
    1.27  
    1.28 -# Rules to configure and make the package.
    1.29 -compile_rules()
    1.30 -{
    1.31 -	# http://www.linuxfromscratch.org/blfs/view/stable/basicnet/samba.html
    1.32 +compile_rules() {
    1.33 +	case $SET in
    1.34 +		'')  SET_ARGS='--without-pam';;
    1.35 +		pam) SET_ARGS='--with-pam';;
    1.36 +	esac
    1.37  
    1.38 -	cp -a $src $src-pam
    1.39  	./configure \
    1.40  		--prefix=/usr \
    1.41  		--sysconfdir=/etc \
    1.42 @@ -36,69 +38,44 @@
    1.43  		--with-piddir=/run/samba \
    1.44  		--with-pammodulesdir=/lib/security \
    1.45  		--enable-fhs \
    1.46 -		--without-pam \
    1.47  		--without-ad-dc \
    1.48  		--without-systemd \
    1.49  		--enable-selftest \
    1.50 +		$SET_ARGS \
    1.51  		$CONFIGURE_ARGS &&
    1.52  	make && make install || return 1
    1.53  
    1.54 -	cd $src-pam
    1.55 -	./configure \
    1.56 -		--prefix=/usr \
    1.57 -		--sysconfdir=/etc \
    1.58 -		--localstatedir=/var \
    1.59 -		--with-piddir=/run/samba \
    1.60 -		--with-pammodulesdir=/lib/security \
    1.61 -		--enable-fhs \
    1.62 -		--with-pam \
    1.63 -		--without-ad-dc \
    1.64 -		--without-systemd \
    1.65 -		--enable-selftest \
    1.66 -		$CONFIGURE_ARGS &&
    1.67 -	make && make DESTDIR=$DESTDIR-pam install || return 1
    1.68 +	mkdir -p $instsll/lib/
    1.69 +	mv $install/usr/lib/libnss_wins.so*  $install/usr/lib/libnss_winbind.so* \
    1.70 +		$install/lib
    1.71 +	ln -sf ../../lib/libnss_winbind.so.2 $install/usr/lib/libnss_winbind.so
    1.72 +	ln -sf ../../lib/libnss_wins.so.2    $install/usr/lib/libnss_wins.so
    1.73  
    1.74 -	for inst in $install $install-pam ; do
    1.75 -		mkdir -p $inst/lib
    1.76 -		mv $inst/usr/lib/libnss_wins.so* $inst/usr/lib/libnss_winbind.so* \
    1.77 -			$inst/lib
    1.78 -		ln -sf ../../lib/libnss_winbind.so.2 $inst/usr/lib/libnss_winbind.so
    1.79 -		ln -sf ../../lib/libnss_wins.so.2    $inst/usr/lib/libnss_wins.so
    1.80 +	install -m644 examples/smb.conf.default $install/etc/samba
    1.81  
    1.82 -		install -m644 examples/smb.conf.default $inst/etc/samba
    1.83 +	mkdir -pv                                  $install/etc/openldap/schema
    1.84 +	cp examples/LDAP/README                    $install/etc/openldap/schema/README.LDAP
    1.85 +	cp examples/LDAP/samba*                    $install/etc/openldap/schema
    1.86 +	cp -r examples/LDAP/get* examples/LDAP/ol* $install/etc/openldap/schema
    1.87  
    1.88 -		mkdir -pv $inst/etc/openldap/schema
    1.89 -		cp examples/LDAP/README $inst/etc/openldap/schema/README.LDAP
    1.90 -		cp examples/LDAP/samba* $inst/etc/openldap/schema
    1.91 -		cp -r examples/LDAP/get* examples/LDAP/ol* $inst/etc/openldap/schema
    1.92 +	cp -a $stuff/etc $install
    1.93  
    1.94 -		cp -a $stuff/etc $inst
    1.95 +	# Symlink smbspool to cups backend
    1.96 +	mkdir -p                 $install/usr/lib/cups/backend/
    1.97 +	ln -sf /usr/bin/smbspool $install/usr/lib/cups/backend/smb
    1.98  
    1.99 -		# Symlink smbspool to cups backend
   1.100 -		mkdir -p $inst/usr/lib/cups/backend
   1.101 -		ln -sf /usr/bin/smbspool $inst/usr/lib/cups/backend/smb
   1.102 +	# for swat package
   1.103 +#	icodir="$inst/usr/share/icons/hicolor/48x48/apps"
   1.104 +#	mkdir -p $icodir
   1.105 +#	cp $stuff/swat.png $icodir
   1.106  
   1.107 -		# for swat package
   1.108 -#		icodir="$inst/usr/share/icons/hicolor/48x48/apps"
   1.109 -#		mkdir -p $icodir
   1.110 -#		cp $stuff/swat.png $icodir
   1.111 -
   1.112 -		chown -R root:root $inst
   1.113 -	done
   1.114 +	chown -R root:root $install
   1.115  }
   1.116  
   1.117 -# Rules to gen a SliTaz package suitable for Tazpkg.
   1.118 -genpkg_rules()
   1.119 -{
   1.120 +genpkg_rules() {
   1.121  	# Note, packages samba-common, smbclient was removed due to circular dependencies:
   1.122  	# smbclient <--> samba <--> samba-common
   1.123  	case $PACKAGE in
   1.124 -#		smbclient)
   1.125 -#			copy smbclient smbspool smbget smbtree smbcacls smbcquotas smbtar \
   1.126 -#			rpcclient net nmblookup libnetapi.so* libsmbclient.so* smb
   1.127 -#			CAT="network|client"
   1.128 -#			DEPENDS="samba libldap libtdb popt talloc"
   1.129 -#			;;
   1.130  #		swat)
   1.131  #			copy swat/ swat.desktop swat.png
   1.132  #			CAT="development|Samba Web Administration Tool"
   1.133 @@ -106,7 +83,6 @@
   1.134  #			;;
   1.135  		samba)
   1.136  			copy @std
   1.137 -#			remove_already_packed
   1.138  			DEPENDS="acl attr dbus libcups libgnutls libldap libtdb ncurses \
   1.139  			ncurses-libform ncurses-libpanel perl popt python talloc \
   1.140  			talloc-python zlib"
   1.141 @@ -115,9 +91,8 @@
   1.142  			CONFIG_FILES="/etc/samba/smb.conf"
   1.143  			;;
   1.144  		samba-pam)
   1.145 +			copy @std
   1.146  			CAT="system-tools|using PAM"
   1.147 -			install=$install-pam copy @std
   1.148 -#			remove by hand already packed files...
   1.149  			DEPENDS="acl attr dbus libcups libgnutls libldap libtdb ncurses \
   1.150  			ncurses-libform ncurses-libpanel perl popt python talloc \
   1.151  			talloc-python zlib pam"
   1.152 @@ -132,7 +107,6 @@
   1.153  	esac
   1.154  }
   1.155  
   1.156 -# Pre and post install commands for Tazpkg.
   1.157  post_install_samba() {
   1.158  	[ -n "$quiet" ] || cat <<EOT
   1.159