wok-current rev 11799

ppp: build rp-pppoe.so (again)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sat Feb 25 11:15:26 2012 +0100 (2012-02-25)
parents b3b80062dbe9
children 7a293959a3fa
files ppp-pam/receipt ppp/receipt
line diff
     1.1 --- a/ppp-pam/receipt	Sat Feb 25 10:55:20 2012 +0100
     1.2 +++ b/ppp-pam/receipt	Sat Feb 25 11:15:26 2012 +0100
     1.3 @@ -18,8 +18,9 @@
     1.4  compile_rules()
     1.5  {
     1.6  	cd $src
     1.7 -	grep -qs pppol2tpv3_addr include/linux/if_pppol2tp.h ||
     1.8 -	cat >> include/linux/if_pppol2tp.h <<EOT
     1.9 +	if ! grep -qs pppol2tpv3_addr include/linux/if_pppol2tp.h ; then
    1.10 +		sed -i /#endif/d include/linux/if_pppol2tp.h
    1.11 +		cat >> include/linux/if_pppol2tp.h <<EOT
    1.12  #ifndef __LINUX_IF_PPPOL2TP_H
    1.13  /* The L2TPv3 protocol changes tunnel and session ids from 16 to 32
    1.14   * bits. So we need a different sockaddr structure.
    1.15 @@ -33,6 +34,7 @@
    1.16  };
    1.17  #endif
    1.18  EOT
    1.19 +	fi
    1.20  	sed -i 's/#USE_PAM/USE_PAM/' pppd/Makefile.linux
    1.21  	./configure --prefix=/usr --mandir=/usr/share/man \
    1.22  	$CONFIGURE_ARGS &&
     2.1 --- a/ppp/receipt	Sat Feb 25 10:55:20 2012 +0100
     2.2 +++ b/ppp/receipt	Sat Feb 25 11:15:26 2012 +0100
     2.3 @@ -14,8 +14,9 @@
     2.4  compile_rules()
     2.5  {
     2.6  	cd $src
     2.7 -	grep -qs pppol2tpv3_addr include/linux/if_pppol2tp.h ||
     2.8 -	cat >> include/linux/if_pppol2tp.h <<EOT
     2.9 +	if ! grep -qs pppol2tpv3_addr include/linux/if_pppol2tp.h ; then
    2.10 +		sed -i /#endif/d include/linux/if_pppol2tp.h
    2.11 +		cat >> include/linux/if_pppol2tp.h <<EOT
    2.12  #ifndef __LINUX_IF_PPPOL2TP_H
    2.13  /* The L2TPv3 protocol changes tunnel and session ids from 16 to 32
    2.14   * bits. So we need a different sockaddr structure.
    2.15 @@ -29,6 +30,7 @@
    2.16  };
    2.17  #endif
    2.18  EOT
    2.19 +	fi
    2.20  	./configure --prefix=/usr --mandir=/usr/share/man \
    2.21  	$CONFIGURE_ARGS &&
    2.22  	make &&