From 4f27599338ba48b49e2cc586190100e12c2d1cb4 Mon Sep 17 00:00:00 2001 From: Juergen Daubert Date: Thu, 19 Nov 2009 11:41:15 +0100 Subject: [PATCH] ppp: update to 2.4.5 --- ppp/.footprint | 21 +++++++++++---------- ppp/.md5sum | 3 +-- ppp/Pkgfile | 8 +++----- ppp/ppp-makefile.patch | 12 ------------ 4 files changed, 15 insertions(+), 29 deletions(-) delete mode 100644 ppp/ppp-makefile.patch diff --git a/ppp/.footprint b/ppp/.footprint index 2eed5a28..bbeca65d 100644 --- a/ppp/.footprint +++ b/ppp/.footprint @@ -22,22 +22,23 @@ drwxr-xr-x root/root usr/include/pppd/ -rw-r--r-- root/root usr/include/pppd/pathnames.h -rw-r--r-- root/root usr/include/pppd/pppcrypt.h -rw-r--r-- root/root usr/include/pppd/pppd.h +-rw-r--r-- root/root usr/include/pppd/session.h -rw-r--r-- root/root usr/include/pppd/sha1.h -rw-r--r-- root/root usr/include/pppd/spinlock.h -rw-r--r-- root/root usr/include/pppd/tdb.h -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.4/ --rwxr-xr-x root/root usr/lib/pppd/2.4.4/minconn.so --rwxr-xr-x root/root usr/lib/pppd/2.4.4/passprompt.so --rwxr-xr-x root/root usr/lib/pppd/2.4.4/passwordfd.so --rwsr-x--- root/root usr/lib/pppd/2.4.4/pppoatm.so --rwxr-xr-x root/root usr/lib/pppd/2.4.4/radattr.so --rwxr-xr-x root/root usr/lib/pppd/2.4.4/radius.so --rwxr-xr-x root/root usr/lib/pppd/2.4.4/radrealms.so --rwsr-x--- root/root usr/lib/pppd/2.4.4/rp-pppoe.so --rwxr-xr-x root/root usr/lib/pppd/2.4.4/winbind.so +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/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 b6feac62..73e268af 100644 --- a/ppp/.md5sum +++ b/ppp/.md5sum @@ -1,3 +1,2 @@ -183800762e266132218b204dfb428d29 ppp-2.4.4.tar.gz -a8068242d7a8833574c345200a0ced2f ppp-makefile.patch +4621bc56167b6953ec4071043fe0ec57 ppp-2.4.5.tar.gz 24867da3561a2ba62f555ac717af77cb ppp-nofilter.patch diff --git a/ppp/Pkgfile b/ppp/Pkgfile index 13071087..1a42a8a8 100644 --- a/ppp/Pkgfile +++ b/ppp/Pkgfile @@ -4,16 +4,14 @@ # Depends on: zlib, openssl name=ppp -version=2.4.4 +version=2.4.5 release=1 source=(http://ppp.samba.org/ftp/ppp/$name-$version.tar.gz \ - $name-nofilter.patch \ - $name-makefile.patch) + $name-nofilter.patch) build () { cd $name-$version - patch -p1 < $SRC/$name-nofilter.patch - patch -p1 < $SRC/$name-makefile.patch + patch -p1 -i $SRC/$name-nofilter.patch ./configure --prefix=/usr --sysconfdir=/etc make make INSTROOT=$PKG install install-etcppp diff --git a/ppp/ppp-makefile.patch b/ppp/ppp-makefile.patch deleted file mode 100644 index 2b92fd01..00000000 --- a/ppp/ppp-makefile.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nru ppp-2.4.4.orig/pppd/plugins/pppoatm/Makefile.linux ppp-2.4.4/pppd/plugins/pppoatm/Makefile.linux ---- ppp-2.4.4.orig/pppd/plugins/pppoatm/Makefile.linux 2006-06-28 17:19:31.000000000 +0200 -+++ ppp-2.4.4/pppd/plugins/pppoatm/Makefile.linux 2006-06-28 17:53:14.000000000 +0200 -@@ -6,7 +6,7 @@ - - #*********************************************************************** - --DESTDIR = @DESTDIR@ -+DESTDIR = $(INSTROOT)@DESTDIR@ - LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION) - - VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)