wok-6.x diff ppp/receipt @ rev 16283

Up: tazweb (1.8.1) Bug fix
author Christophe Lincoln <pankso@slitaz.org>
date Sun Apr 06 17:03:00 2014 +0200 (2014-04-06)
parents 86575a4745f4
children 22d242cf69af
line diff
     1.1 --- a/ppp/receipt	Mon Feb 24 21:03:12 2014 +0000
     1.2 +++ b/ppp/receipt	Sun Apr 06 17:03:00 2014 +0200
     1.3 @@ -10,11 +10,11 @@
     1.4  WEB_SITE="http://ppp.samba.org/"
     1.5  WGET_URL="ftp://ftp.samba.org/pub/ppp/$TARBALL"
     1.6  CONFIG_FILES="/etc/ppp"
     1.7 +HOST_ARCH="i486 arm"
     1.8  
     1.9  # Rules to configure and make the package.
    1.10  compile_rules()
    1.11  {
    1.12 -	cd $src
    1.13  	if ! grep -qs pppol2tpv3_addr include/linux/if_pppol2tp.h ; then
    1.14  		sed -i /#endif/d include/linux/if_pppol2tp.h
    1.15  		cat >> include/linux/if_pppol2tp.h <<EOT
    1.16 @@ -31,7 +31,7 @@
    1.17  #endif
    1.18  EOT
    1.19  	fi
    1.20 -	./configure --prefix=/usr --mandir=/usr/share/man \
    1.21 +	./configure --prefix=/usr \
    1.22  	$CONFIGURE_ARGS &&
    1.23  	make &&
    1.24  	make DESTDIR=$DESTDIR/usr install
    1.25 @@ -42,7 +42,7 @@
    1.26  {
    1.27  	mkdir -p $fs/usr
    1.28  	cp -a $install/usr/sbin $fs/usr
    1.29 -	cp -a $install/usr/lib $fs/usr
    1.30 +	[ -d "$install/usr/lib" ] && cp -a $install/usr/lib $fs/usr
    1.31  	cp -a $stuff/pppnc-server $fs/usr/sbin
    1.32  	ln $fs/usr/sbin/pppnc-server $fs/usr/sbin/pppnc-client
    1.33  	# Config files.
    1.34 @@ -53,7 +53,8 @@
    1.35  	# PPP scripts.
    1.36  	cp -a $src/scripts/ppp-on $fs/etc/ppp/scripts
    1.37  	cp -a $src/scripts/ppp-on-dialer $fs/etc/ppp/scripts
    1.38 -	sed -i 's:ppp/ppp-on-dialer:ppp/scripts/ppp-on-dialer:' $fs/etc/ppp/scripts/ppp-on
    1.39 +	sed -i 's:ppp/ppp-on-dialer:ppp/scripts/ppp-on-dialer:' \
    1.40 +		$fs/etc/ppp/scripts/ppp-on
    1.41  	
    1.42  	cp -a $src/scripts/ppp-off $fs/etc/ppp/scripts
    1.43  	cp -a $src/scripts/callback $fs/etc/ppp/scripts
    1.44 @@ -96,7 +97,7 @@
    1.45  	chmod 711 $fs/etc/ppp/ip-up $fs/etc/ppp/ip-down
    1.46  
    1.47  	# insert #!/bin/sh  on top line in ip* scripts
    1.48 -	sed -i '1i\#!/bin/sh' $fs/etc/ppp/ip*	
    1.49 +	sed -i '1i\#!/bin/sh' $fs/etc/ppp/ip* 2>/dev/null	
    1.50  	# add empty peers dir
    1.51  	mkdir -p $fs/etc/ppp/peers
    1.52  	# hide login/pass from regular users