commit 989bb6c87fa48334c3e102e4e456bb9e874d0f39 Author: Juergen Daubert <jue@jue.li> Date: Thu Feb 20 17:39:50 2014 +0100 ppp: update to 2.4.6 diff --git a/ppp/.footprint b/ppp/.footprint index bbeca65..146c2d7 100644 --- a/ppp/.footprint +++ b/ppp/.footprint @@ -11,8 +11,10 @@ drwxr-xr-x root/root usr/include/pppd/ -rw-r--r-- root/root usr/include/pppd/chap_ms.h -rw-r--r-- root/root usr/include/pppd/eap.h -rw-r--r-- root/root usr/include/pppd/ecp.h +-rw-r--r-- root/root usr/include/pppd/eui64.h -rw-r--r-- root/root usr/include/pppd/fsm.h -rw-r--r-- root/root usr/include/pppd/ipcp.h +-rw-r--r-- root/root usr/include/pppd/ipv6cp.h -rw-r--r-- root/root usr/include/pppd/ipxcp.h -rw-r--r-- root/root usr/include/pppd/lcp.h -rw-r--r-- root/root usr/include/pppd/magic.h @@ -29,16 +31,16 @@ drwxr-xr-x root/root usr/include/pppd/ -rw-r--r-- root/root usr/include/pppd/upap.h drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/pppd/ -drwxr-xr-x root/root usr/lib/pppd/2.4.5/ --rwxr-xr-x root/root usr/lib/pppd/2.4.5/minconn.so --rwxr-xr-x root/root usr/lib/pppd/2.4.5/passprompt.so --rwxr-xr-x root/root usr/lib/pppd/2.4.5/passwordfd.so --rwsr-x--- root/root usr/lib/pppd/2.4.5/pppoatm.so --rwxr-xr-x root/root usr/lib/pppd/2.4.5/radattr.so --rwxr-xr-x root/root usr/lib/pppd/2.4.5/radius.so --rwxr-xr-x root/root usr/lib/pppd/2.4.5/radrealms.so --rwsr-x--- root/root usr/lib/pppd/2.4.5/rp-pppoe.so --rwxr-xr-x root/root usr/lib/pppd/2.4.5/winbind.so +drwxr-xr-x root/root usr/lib/pppd/2.4.6/ +-rwxr-xr-x root/root usr/lib/pppd/2.4.6/minconn.so +-rwxr-xr-x root/root usr/lib/pppd/2.4.6/passprompt.so +-rwxr-xr-x root/root usr/lib/pppd/2.4.6/passwordfd.so +-rwsr-x--- root/root usr/lib/pppd/2.4.6/pppoatm.so +-rwxr-xr-x root/root usr/lib/pppd/2.4.6/radattr.so +-rwxr-xr-x root/root usr/lib/pppd/2.4.6/radius.so +-rwxr-xr-x root/root usr/lib/pppd/2.4.6/radrealms.so +-rwsr-x--- root/root usr/lib/pppd/2.4.6/rp-pppoe.so +-rwxr-xr-x root/root usr/lib/pppd/2.4.6/winbind.so drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man8/ -rw-r--r-- root/root usr/man/man8/chat.8.gz diff --git a/ppp/.md5sum b/ppp/.md5sum index b307a7f..e0fc339 100644 --- a/ppp/.md5sum +++ b/ppp/.md5sum @@ -1,3 +1,2 @@ -2176942344ec44bc42390e1a4b73317c ppp-2.4.5-pppol2tp.patch -4621bc56167b6953ec4071043fe0ec57 ppp-2.4.5.tar.gz +3434d2cc9327167a0723aaaa8670083b ppp-2.4.6.tar.gz 24867da3561a2ba62f555ac717af77cb ppp-nofilter.patch diff --git a/ppp/Pkgfile b/ppp/Pkgfile index c9e0a35..5785640 100644 --- a/ppp/Pkgfile +++ b/ppp/Pkgfile @@ -4,15 +4,14 @@ # Depends on: zlib, openssl name=ppp -version=2.4.5 -release=2 +version=2.4.6 +release=1 source=(http://ppp.samba.org/ftp/ppp/$name-$version.tar.gz \ - $name-nofilter.patch $name-$version-pppol2tp.patch) + $name-nofilter.patch) build () { cd $name-$version patch -p1 -i $SRC/$name-nofilter.patch - patch -p1 -i $SRC/$name-$version-pppol2tp.patch ./configure --prefix=/usr --sysconfdir=/etc make make -j1 INSTROOT=$PKG install install-etcppp diff --git a/ppp/ppp-2.4.5-pppol2tp.patch b/ppp/ppp-2.4.5-pppol2tp.patch deleted file mode 100644 index b683acf..0000000 --- a/ppp/ppp-2.4.5-pppol2tp.patch +++ /dev/null @@ -1,25 +0,0 @@ -# https://bugzilla.redhat.com/show_bug.cgi?id=617625 - ---- ppp-2.4.5/include/linux/if_pppol2tp.h 2009-11-16 22:26:07.000000000 +0000 -+++ ppp-2.4.5/include/linux/if_pppol2tp.h 2010-07-16 22:35:22.000000000 +0100 -@@ -32,6 +32,20 @@ - __u16 d_tunnel, d_session; /* For sending outgoing packets */ - }; - -+/* 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 */ -+}; -+ - /* Socket options: - * DEBUG - bitmask of debug message categories - * SENDSEQ - 0 => don't send packets with sequence numbers