SliTaz Repositories

     1.1 --- a/ppp-pam/receipt	Mon Jun 01 11:31:30 2015 +0200
     1.2 +++ b/ppp-pam/receipt	Mon Jun 01 12:15:40 2015 +0200
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="ppp-pam"
     1.7 -VERSION="2.4.5"
     1.8 +VERSION="2.4.7"
     1.9  CATEGORY="network"
    1.10  SHORT_DESC="Implements the Point-to-Point Protocol (PPP) with PAM support."
    1.11  MAINTAINER="pascal.bellard@slitaz.org"
    1.12 @@ -9,35 +9,19 @@
    1.13  SOURCE="ppp"
    1.14  TARBALL="$SOURCE-$VERSION.tar.gz"
    1.15  WEB_SITE="http://ppp.samba.org/"
    1.16 -WGET_URL="ftp://ftp.samba.org/pub/ppp/$TARBALL"
    1.17 +WGET_URL="https://github.com/paulusmack/ppp/archive/$TARBALL"
    1.18 +CONFIG_FILES="/etc/ppp"
    1.19 +
    1.20  DEPENDS="pam"
    1.21 -BUILD_DEPENDS="pam pam-dev"
    1.22 -CONFIG_FILES="/etc/ppp"
    1.23 +BUILD_DEPENDS="wget pam pam-dev"
    1.24  PROVIDE="ppp:pam"
    1.25  
    1.26  # Rules to configure and make the package.
    1.27  compile_rules()
    1.28  {
    1.29 -	cd $src
    1.30 -	if ! grep -qs pppol2tpv3_addr include/linux/if_pppol2tp.h ; then
    1.31 -		sed -i /#endif/d include/linux/if_pppol2tp.h
    1.32 -		cat >> include/linux/if_pppol2tp.h <<EOT
    1.33 -/* The L2TPv3 protocol changes tunnel and session ids from 16 to 32
    1.34 - * bits. So we need a different sockaddr structure.
    1.35 - */
    1.36 -struct pppol2tpv3_addr {
    1.37 -	pid_t	pid;			/* pid that owns the fd. 0 => current */
    1.38 -	int	fd;			/* FD of UDP or IP socket to use */
    1.39 -	struct sockaddr_in addr;	/* IP address and port to send to */
    1.40 -	__u32 s_tunnel, s_session;	/* For matching incoming packets */
    1.41 -	__u32 d_tunnel, d_session;	/* For sending outgoing packets */
    1.42 -};
    1.43 -#endif
    1.44 -EOT
    1.45 -	fi
    1.46  	sed -i 's/#USE_PAM/USE_PAM/' pppd/Makefile.linux
    1.47 -	./configure --prefix=/usr --mandir=/usr/share/man \
    1.48 -	$CONFIGURE_ARGS &&
    1.49 +	./configure --prefix=/usr \
    1.50 +		$CONFIGURE_ARGS &&
    1.51  	make &&
    1.52  	make DESTDIR=$DESTDIR/usr install
    1.53  }
    1.54 @@ -47,24 +31,7 @@
    1.55  {
    1.56  	mkdir -p $fs/usr
    1.57  	cp -a $install/usr/sbin $fs/usr
    1.58 -	cp -a $install/usr/lib $fs/usr
    1.59 -	# Config files.
    1.60 -	mkdir -p $fs/etc/ppp/scripts
    1.61 -	cp ../$SOURCE/stuff/README.scripts $fs/etc/ppp
    1.62 -	cp -a $src/etc.ppp/* $fs/etc/ppp
    1.63 -	# PPP scripts.
    1.64 -	cp -a $src/scripts/ppp-on $fs/etc/ppp/scripts
    1.65 -	cp -a $src/scripts/ppp-on-dialer $fs/etc/ppp/scripts
    1.66 -	sed -i 's,ppp/ppp-on-dialer,ppp/script/ppp-on-dialer,' $fs/etc/ppp/scripts/ppp-on-dialer
    1.67 -	cp -a $src/scripts/ppp-off $fs/etc/ppp/scripts
    1.68 -	cp -a $src/scripts/callback $fs/etc/ppp/scripts
    1.69 -	cp -a $src/scripts/redialer $fs/etc/ppp/scripts
    1.70 -	
    1.71 -	cp -a $src/scripts/ip-up.local.add $fs/etc/ppp/scripts/ip-up
    1.72 -	cp -a $src/scripts/ip-down.local.add $fs/etc/ppp/scripts/ip-down
    1.73 -	chmod +x $fs/etc/ppp/scripts/ip*
    1.74 -	# insert #!/bin/sh  on top line in ip* scripts
    1.75 -	sed -i '1i\#!/bin/sh' $fs/etc/ppp/scripts/ip*
    1.76 +	[ -d "$install/usr/lib" ] && cp -a $install/usr/lib $fs/usr
    1.77  }
    1.78  
    1.79  pre_remove()