wok-next rev 20720

pam_ssh: use openssl-1.0; pam_mount: up (2.16)
author Aleksej Bobylev <al.bobylev@gmail.com>
date Sun May 27 17:20:18 2018 +0300 (2018-05-27)
parents 599c2faa5148
children 941563a49009
files pam_mount/receipt pam_ssh/receipt
line diff
     1.1 --- a/pam_mount/receipt	Sun May 27 15:45:14 2018 +0300
     1.2 +++ b/pam_mount/receipt	Sun May 27 17:20:18 2018 +0300
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt v2.
     1.5  
     1.6  PACKAGE="pam_mount"
     1.7 -VERSION="2.15"
     1.8 +VERSION="2.16"
     1.9  CATEGORY="system-tools"
    1.10  SHORT_DESC="PAM Module that can mount volumes for a user session"
    1.11  MAINTAINER="pascal.bellard@slitaz.org"
    1.12 @@ -11,16 +11,32 @@
    1.13  TARBALL="$PACKAGE-$VERSION.tar.xz"
    1.14  WGET_URL="$SF_MIRROR/pam-mount/$TARBALL"
    1.15  
    1.16 -BUILD_DEPENDS="pam-dev libhx libhx-dev openssl-dev libxml2-dev \
    1.17 -util-linux-mount-dev util-linux-blkid-dev util-linux-uuid-dev pcre-dev perl"
    1.18 +BUILD_DEPENDS="automake libtool libhx-dev util-linux-mount-dev libxml2-dev \
    1.19 +pcre-dev openssl-dev cryptsetup-dev pam-dev"
    1.20 +SPLIT="pam_mount-dev"
    1.21  
    1.22  compile_rules() {
    1.23 +	aclocal
    1.24 +	libtoolize
    1.25 +	automake --add-missing
    1.26 +	autoreconf
    1.27 +
    1.28  	./configure $CONFIGURE_ARGS &&
    1.29 +	fix libtool &&
    1.30  	make &&
    1.31 -	make DESTDIR=$DESTDIR install
    1.32 +	make install
    1.33  }
    1.34  
    1.35  genpkg_rules() {
    1.36 -	copy @std
    1.37 -	DEPENDS="pam openssl libxml2 libhx zlib"
    1.38 +	case $PACKAGE in
    1.39 +		pam_mount)
    1.40 +			copy @std
    1.41 +			DEPENDS="cryptsetup libhx libpcre libxml2 openssl pam \
    1.42 +			util-linux-mount"
    1.43 +			;;
    1.44 +		*-dev)
    1.45 +			copy @dev
    1.46 +			DEPENDS="pam_mount libhx-dev"
    1.47 +			;;
    1.48 +	esac
    1.49  }
     2.1 --- a/pam_ssh/receipt	Sun May 27 15:45:14 2018 +0300
     2.2 +++ b/pam_ssh/receipt	Sun May 27 17:20:18 2018 +0300
     2.3 @@ -1,30 +1,32 @@
     2.4 -# SliTaz package receipt.
     2.5 +# SliTaz package receipt v2.
     2.6  
     2.7  PACKAGE="pam_ssh"
     2.8  VERSION="2.1"
     2.9  CATEGORY="system-tools"
    2.10 -SHORT_DESC="PAM Module that provides single sign-on behavior with ssh-agent."
    2.11 +SHORT_DESC="PAM Module that provides single sign-on behavior with ssh-agent"
    2.12  MAINTAINER="pascal.bellard@slitaz.org"
    2.13  LICENSE="BSD"
    2.14 +WEB_SITE="http://pam-ssh.sourceforge.net/"
    2.15 +
    2.16  TARBALL="$PACKAGE-$VERSION.tar.xz"
    2.17 -WEB_SITE="http://pam-ssh.sourceforge.net/"
    2.18  WGET_URL="$SF_MIRROR/pam-ssh/$TARBALL"
    2.19 -TAGS="ssh"
    2.20  
    2.21 -DEPENDS="pam openssl openssh-pam"
    2.22 -BUILD_DEPENDS="pam-dev file openssl-dev openssh-pam automake"
    2.23 +BUILD_DEPENDS="openssh-pam openssl10-dev pam-dev"
    2.24  
    2.25 -# Rules to configure and make the package.
    2.26 -compile_rules()
    2.27 -{
    2.28 -	./configure --prefix=/usr \
    2.29 -	--mandir=/usr/share/man $CONFIGURE_ARGS &&
    2.30 +compile_rules() {
    2.31 +	export CPPFLAGS="$CPPFLAGS -I /usr/include/openssl-1.0"
    2.32 +
    2.33 +	./configure \
    2.34 +		--with-pam-dir=/lib/security \
    2.35 +		--with-ssl-dir=/usr/lib/openssl-1.0 \
    2.36 +		$CONFIGURE_ARGS &&
    2.37 +	fix libtool &&
    2.38  	make &&
    2.39 -	make DESTDIR=$DESTDIR install
    2.40 +	make install
    2.41  }
    2.42  
    2.43 -# Rules to gen a SliTaz package suitable for Tazpkg.
    2.44 -genpkg_rules()
    2.45 -{
    2.46 -	cp -a $install/lib $fs
    2.47 +genpkg_rules() {
    2.48 +	copy @std
    2.49 +	DEPENDS="openssl10 pam   openssh-pam"
    2.50 +	TAGS="ssh"
    2.51  }