# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1433153740 -7200
# Node ID 44b43b66e908193f58250e8ac3c023760ab105cb
# Parent  60f944d082a0c452aed9e0398e441f02445149fe
Up ppp-pam (2.4.7)

diff -r 60f944d082a0 -r 44b43b66e908 ppp-pam/receipt
--- a/ppp-pam/receipt	Mon Jun 01 11:31:30 2015 +0200
+++ b/ppp-pam/receipt	Mon Jun 01 12:15:40 2015 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="ppp-pam"
-VERSION="2.4.5"
+VERSION="2.4.7"
 CATEGORY="network"
 SHORT_DESC="Implements the Point-to-Point Protocol (PPP) with PAM support."
 MAINTAINER="pascal.bellard@slitaz.org"
@@ -9,35 +9,19 @@
 SOURCE="ppp"
 TARBALL="$SOURCE-$VERSION.tar.gz"
 WEB_SITE="http://ppp.samba.org/"
-WGET_URL="ftp://ftp.samba.org/pub/ppp/$TARBALL"
+WGET_URL="https://github.com/paulusmack/ppp/archive/$TARBALL"
+CONFIG_FILES="/etc/ppp"
+
 DEPENDS="pam"
-BUILD_DEPENDS="pam pam-dev"
-CONFIG_FILES="/etc/ppp"
+BUILD_DEPENDS="wget pam pam-dev"
 PROVIDE="ppp:pam"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
-	if ! grep -qs pppol2tpv3_addr include/linux/if_pppol2tp.h ; then
-		sed -i /#endif/d include/linux/if_pppol2tp.h
-		cat >> include/linux/if_pppol2tp.h <<EOT
-/* The L2TPv3 protocol changes tunnel and session ids from 16 to 32
- * bits. So we need a different sockaddr structure.
- */
-struct pppol2tpv3_addr {
-	pid_t	pid;			/* pid that owns the fd. 0 => current */
-	int	fd;			/* FD of UDP or IP socket to use */
-	struct sockaddr_in addr;	/* IP address and port to send to */
-	__u32 s_tunnel, s_session;	/* For matching incoming packets */
-	__u32 d_tunnel, d_session;	/* For sending outgoing packets */
-};
-#endif
-EOT
-	fi
 	sed -i 's/#USE_PAM/USE_PAM/' pppd/Makefile.linux
-	./configure --prefix=/usr --mandir=/usr/share/man \
-	$CONFIGURE_ARGS &&
+	./configure --prefix=/usr \
+		$CONFIGURE_ARGS &&
 	make &&
 	make DESTDIR=$DESTDIR/usr install
 }
@@ -47,24 +31,7 @@
 {
 	mkdir -p $fs/usr
 	cp -a $install/usr/sbin $fs/usr
-	cp -a $install/usr/lib $fs/usr
-	# Config files.
-	mkdir -p $fs/etc/ppp/scripts
-	cp ../$SOURCE/stuff/README.scripts $fs/etc/ppp
-	cp -a $src/etc.ppp/* $fs/etc/ppp
-	# PPP scripts.
-	cp -a $src/scripts/ppp-on $fs/etc/ppp/scripts
-	cp -a $src/scripts/ppp-on-dialer $fs/etc/ppp/scripts
-	sed -i 's,ppp/ppp-on-dialer,ppp/script/ppp-on-dialer,' $fs/etc/ppp/scripts/ppp-on-dialer
-	cp -a $src/scripts/ppp-off $fs/etc/ppp/scripts
-	cp -a $src/scripts/callback $fs/etc/ppp/scripts
-	cp -a $src/scripts/redialer $fs/etc/ppp/scripts
-	
-	cp -a $src/scripts/ip-up.local.add $fs/etc/ppp/scripts/ip-up
-	cp -a $src/scripts/ip-down.local.add $fs/etc/ppp/scripts/ip-down
-	chmod +x $fs/etc/ppp/scripts/ip*
-	# insert #!/bin/sh  on top line in ip* scripts
-	sed -i '1i\#!/bin/sh' $fs/etc/ppp/scripts/ip*
+	[ -d "$install/usr/lib" ] && cp -a $install/usr/lib $fs/usr
 }
 
 pre_remove()