# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1330164926 -3600
# Node ID 52597570257511e22897cd9973cf8a6b02d015d1
# Parent  b3b80062dbe9324946aa39fb2d2be249cd1a8c55
ppp: build rp-pppoe.so (again)

diff -r b3b80062dbe9 -r 525975702575 ppp-pam/receipt
--- a/ppp-pam/receipt	Sat Feb 25 10:55:20 2012 +0100
+++ b/ppp-pam/receipt	Sat Feb 25 11:15:26 2012 +0100
@@ -18,8 +18,9 @@
 compile_rules()
 {
 	cd $src
-	grep -qs pppol2tpv3_addr include/linux/if_pppol2tp.h ||
-	cat >> include/linux/if_pppol2tp.h <<EOT
+	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
 #ifndef __LINUX_IF_PPPOL2TP_H
 /* The L2TPv3 protocol changes tunnel and session ids from 16 to 32
  * bits. So we need a different sockaddr structure.
@@ -33,6 +34,7 @@
 };
 #endif
 EOT
+	fi
 	sed -i 's/#USE_PAM/USE_PAM/' pppd/Makefile.linux
 	./configure --prefix=/usr --mandir=/usr/share/man \
 	$CONFIGURE_ARGS &&
diff -r b3b80062dbe9 -r 525975702575 ppp/receipt
--- a/ppp/receipt	Sat Feb 25 10:55:20 2012 +0100
+++ b/ppp/receipt	Sat Feb 25 11:15:26 2012 +0100
@@ -14,8 +14,9 @@
 compile_rules()
 {
 	cd $src
-	grep -qs pppol2tpv3_addr include/linux/if_pppol2tp.h ||
-	cat >> include/linux/if_pppol2tp.h <<EOT
+	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
 #ifndef __LINUX_IF_PPPOL2TP_H
 /* The L2TPv3 protocol changes tunnel and session ids from 16 to 32
  * bits. So we need a different sockaddr structure.
@@ -29,6 +30,7 @@
 };
 #endif
 EOT
+	fi
 	./configure --prefix=/usr --mandir=/usr/share/man \
 	$CONFIGURE_ARGS &&
 	make &&