Author: jue Date: 2006-07-02 12:07:45 +0200 (Sun, 02 Jul 2006) New Revision: 1571 Added: crux-2.2/ports/core/ppp/ppp-makefile.patch crux-2.2/ports/core/ppp/ppp-nofilter.patch Removed: crux-2.2/ports/core/ppp/ppp-2.4.3-makefile.patch crux-2.2/ports/core/ppp/ppp-2.4.3-nofilter.patch Modified: crux-2.2/ports/core/ppp/.footprint crux-2.2/ports/core/ppp/.md5sum crux-2.2/ports/core/ppp/Pkgfile Log: ppp: update to 2.4.4 Modified: crux-2.2/ports/core/ppp/.footprint =================================================================== --- crux-2.2/ports/core/ppp/.footprint 2006-07-02 09:57:31 UTC (rev 1570) +++ crux-2.2/ports/core/ppp/.footprint 2006-07-02 10:07:45 UTC (rev 1571) @@ -28,16 +28,16 @@ -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.3/ --rwxr-xr-x root/root usr/lib/pppd/2.4.3/minconn.so --rwxr-xr-x root/root usr/lib/pppd/2.4.3/passprompt.so --rwxr-xr-x root/root usr/lib/pppd/2.4.3/passwordfd.so --rwsr-x--- root/root usr/lib/pppd/2.4.3/pppoatm.so --rwxr-xr-x root/root usr/lib/pppd/2.4.3/radattr.so --rwxr-xr-x root/root usr/lib/pppd/2.4.3/radius.so --rwxr-xr-x root/root usr/lib/pppd/2.4.3/radrealms.so --rwsr-x--- root/root usr/lib/pppd/2.4.3/rp-pppoe.so --rwxr-xr-x root/root usr/lib/pppd/2.4.3/winbind.so +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/man/ drwxr-xr-x root/root usr/man/man8/ -rw-r--r-- root/root usr/man/man8/chat.8.gz Modified: crux-2.2/ports/core/ppp/.md5sum =================================================================== --- crux-2.2/ports/core/ppp/.md5sum 2006-07-02 09:57:31 UTC (rev 1570) +++ crux-2.2/ports/core/ppp/.md5sum 2006-07-02 10:07:45 UTC (rev 1571) @@ -1,3 +1,3 @@ -96ac0fcd1eb444b09c6aaf1da057ed12 ppp-2.4.3-makefile.patch -24867da3561a2ba62f555ac717af77cb ppp-2.4.3-nofilter.patch -848f6c3cafeb6074ffeb293c3af79b7c ppp-2.4.3.tar.gz +183800762e266132218b204dfb428d29 ppp-2.4.4.tar.gz +a8068242d7a8833574c345200a0ced2f ppp-makefile.patch +24867da3561a2ba62f555ac717af77cb ppp-nofilter.patch Modified: crux-2.2/ports/core/ppp/Pkgfile =================================================================== --- crux-2.2/ports/core/ppp/Pkgfile 2006-07-02 09:57:31 UTC (rev 1570) +++ crux-2.2/ports/core/ppp/Pkgfile 2006-07-02 10:07:45 UTC (rev 1571) @@ -4,18 +4,19 @@ # Depends on: zlib, openssl name=ppp -version=2.4.3 +version=2.4.4 release=1 source=(ftp://ftp.samba.org/pub/ppp/$name-$version.tar.gz \ - $name-$version-nofilter.patch \ - $name-$version-makefile.patch) + $name-nofilter.patch \ + $name-makefile.patch) build () { cd $name-$version - patch -p1 < ../$name-$version-nofilter.patch - patch -p1 < ../$name-$version-makefile.patch - ./configure --prefix=$PKG + patch -p1 < $SRC/$name-nofilter.patch + patch -p1 < $SRC/$name-makefile.patch + ./configure --prefix=/usr --sysconfdir=/etc make - make install + make INSTROOT=$PKG install install-etcppp + mv $PKG/usr/{share/man,man} && rm -r $PKG/usr/share chmod +w -R $PKG } Deleted: crux-2.2/ports/core/ppp/ppp-2.4.3-makefile.patch =================================================================== --- crux-2.2/ports/core/ppp/ppp-2.4.3-makefile.patch 2006-07-02 09:57:31 UTC (rev 1570) +++ crux-2.2/ports/core/ppp/ppp-2.4.3-makefile.patch 2006-07-02 10:07:45 UTC (rev 1571) @@ -1,139 +0,0 @@ -diff -ru ppp-2.4.3/chat/Makefile.linux ppp-2.4.3-new/chat/Makefile.linux ---- ppp-2.4.3/chat/Makefile.linux 2004-11-03 12:51:47.000000000 +0100 -+++ ppp-2.4.3-new/chat/Makefile.linux 2005-01-06 15:49:47.828712944 +0100 -@@ -1,8 +1,8 @@ - # $Id: Makefile.linux,v 1.13 2004/11/03 11:51:47 paulus Exp $ - - DESTDIR = @DESTDIR@ --BINDIR = $(DESTDIR)/sbin --MANDIR = $(DESTDIR)/share/man/man8 -+BINDIR = $(DESTDIR)/usr/sbin -+MANDIR = $(DESTDIR)/usr/man/man8 - - CDEF1= -DTERMIOS # Use the termios structure - CDEF2= -DSIGTYPE=void # Standard definition -diff -ru ppp-2.4.3/linux/Makefile.top ppp-2.4.3-new/linux/Makefile.top ---- ppp-2.4.3/linux/Makefile.top 2004-10-31 23:25:16.000000000 +0100 -+++ ppp-2.4.3-new/linux/Makefile.top 2005-01-06 15:53:32.479560824 +0100 -@@ -1,10 +1,10 @@ - # PPP top-level Makefile for Linux. - - DESTDIR = @DESTDIR@ --BINDIR = $(DESTDIR)/sbin --INCDIR = $(DESTDIR)/include --MANDIR = $(DESTDIR)/share/man --ETCDIR = @SYSCONF@/ppp -+BINDIR = $(DESTDIR)/usr/sbin -+INCDIR = $(DESTDIR)/usr/include -+MANDIR = $(DESTDIR)/usr/man -+ETCDIR = $(DESTDIR)/etc/ppp - - # uid 0 = root - INSTALL= install -@@ -16,7 +16,7 @@ - cd pppstats; $(MAKE) $(MFLAGS) all - cd pppdump; $(MAKE) $(MFLAGS) all - --install: $(BINDIR) $(MANDIR)/man8 install-progs install-devel -+install: $(BINDIR) $(MANDIR)/man8 install-progs install-devel install-etcppp - - install-progs: - cd chat; $(MAKE) $(MFLAGS) install -diff -ru ppp-2.4.3/pppd/Makefile.linux ppp-2.4.3-new/pppd/Makefile.linux ---- ppp-2.4.3/pppd/Makefile.linux 2004-11-13 13:02:22.000000000 +0100 -+++ ppp-2.4.3-new/pppd/Makefile.linux 2005-01-06 15:48:06.497117688 +0100 -@@ -5,9 +5,9 @@ - - # Default installation locations - DESTDIR = @DESTDIR@ --BINDIR = $(DESTDIR)/sbin --MANDIR = $(DESTDIR)/share/man/man8 --INCDIR = $(DESTDIR)/include -+BINDIR = $(DESTDIR)/usr/sbin -+MANDIR = $(DESTDIR)/usr/man/man8 -+INCDIR = $(DESTDIR)/usr/include - - TARGETS = pppd - -diff -ru ppp-2.4.3/pppd/plugins/Makefile.linux ppp-2.4.3-new/pppd/plugins/Makefile.linux ---- ppp-2.4.3/pppd/plugins/Makefile.linux 2004-11-14 08:57:35.000000000 +0100 -+++ ppp-2.4.3-new/pppd/plugins/Makefile.linux 2005-01-06 15:48:42.183692504 +0100 -@@ -5,9 +5,9 @@ - INSTALL = install - - DESTDIR = @DESTDIR@ --BINDIR = $(DESTDIR)/sbin --MANDIR = $(DESTDIR)/share/man/man8 --LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION) -+BINDIR = $(DESTDIR)/usr/sbin -+MANDIR = $(DESTDIR)/usr/man/man8 -+LIBDIR = $(DESTDIR)/usr/lib/pppd/$(VERSION) - - SUBDIRS := rp-pppoe pppoatm radius - # Uncomment the next line to include the radius authentication plugin -diff -ru ppp-2.4.3/pppd/plugins/pppoatm/Makefile.linux ppp-2.4.3-new/pppd/plugins/pppoatm/Makefile.linux ---- ppp-2.4.3/pppd/plugins/pppoatm/Makefile.linux 2004-11-14 02:12:10.000000000 +0100 -+++ ppp-2.4.3-new/pppd/plugins/pppoatm/Makefile.linux 2005-01-06 15:48:24.970309336 +0100 -@@ -7,7 +7,7 @@ - #*********************************************************************** - - DESTDIR = @DESTDIR@ --LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION) -+LIBDIR = $(DESTDIR)/usr/lib/pppd/$(VERSION) - - VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h) - -diff -ru ppp-2.4.3/pppd/plugins/radius/Makefile.linux ppp-2.4.3-new/pppd/plugins/radius/Makefile.linux ---- ppp-2.4.3/pppd/plugins/radius/Makefile.linux 2004-11-14 08:02:31.000000000 +0100 -+++ ppp-2.4.3-new/pppd/plugins/radius/Makefile.linux 2005-01-06 15:49:03.502451560 +0100 -@@ -4,8 +4,8 @@ - # - - DESTDIR = @DESTDIR@ --MANDIR = $(DESTDIR)/share/man/man8 --LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION) -+MANDIR = $(DESTDIR)/usr/man/man8 -+LIBDIR = $(DESTDIR)/usr/lib/pppd/$(VERSION) - - VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h) - -diff -ru ppp-2.4.3/pppd/plugins/rp-pppoe/Makefile.linux ppp-2.4.3-new/pppd/plugins/rp-pppoe/Makefile.linux ---- ppp-2.4.3/pppd/plugins/rp-pppoe/Makefile.linux 2004-11-14 08:58:37.000000000 +0100 -+++ ppp-2.4.3-new/pppd/plugins/rp-pppoe/Makefile.linux 2005-01-06 15:48:52.662099544 +0100 -@@ -14,8 +14,8 @@ - #*********************************************************************** - - DESTDIR = @DESTDIR@ --BINDIR = $(DESTDIR)/sbin --LIBDIR = $(DESTDIR)/lib/pppd/$(PPPDVERSION) -+BINDIR = $(DESTDIR)/usr/sbin -+LIBDIR = $(DESTDIR)/usr/lib/pppd/$(PPPDVERSION) - - PPPDVERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h) - -diff -ru ppp-2.4.3/pppdump/Makefile.linux ppp-2.4.3-new/pppdump/Makefile.linux ---- ppp-2.4.3/pppdump/Makefile.linux 2004-10-31 02:36:52.000000000 +0200 -+++ ppp-2.4.3-new/pppdump/Makefile.linux 2005-01-06 15:47:56.096698792 +0100 -@@ -1,6 +1,6 @@ - DESTDIR = @DESTDIR@ --BINDIR = $(DESTDIR)/sbin --MANDIR = $(DESTDIR)/share/man/man8 -+BINDIR = $(DESTDIR)/usr/sbin -+MANDIR = $(DESTDIR)/usr/man/man8 - - CFLAGS= -O -I../include/net - OBJS = pppdump.o bsd-comp.o deflate.o zlib.o -diff -ru ppp-2.4.3/pppstats/Makefile.linux ppp-2.4.3-new/pppstats/Makefile.linux ---- ppp-2.4.3/pppstats/Makefile.linux 2004-10-31 23:09:03.000000000 +0100 -+++ ppp-2.4.3-new/pppstats/Makefile.linux 2005-01-06 15:47:44.935395568 +0100 -@@ -3,8 +3,8 @@ - # $Id: Makefile.linux,v 1.8 2004/10/31 22:09:03 paulus Exp $ - # - DESTDIR = @DESTDIR@ --BINDIR = $(DESTDIR)/sbin --MANDIR = $(DESTDIR)/share/man/man8 -+BINDIR = $(DESTDIR)/usr/sbin -+MANDIR = $(DESTDIR)/usr/man/man8 - - PPPSTATSRCS = pppstats.c - PPPSTATOBJS = pppstats.o Deleted: crux-2.2/ports/core/ppp/ppp-2.4.3-nofilter.patch =================================================================== --- crux-2.2/ports/core/ppp/ppp-2.4.3-nofilter.patch 2006-07-02 09:57:31 UTC (rev 1570) +++ crux-2.2/ports/core/ppp/ppp-2.4.3-nofilter.patch 2006-07-02 10:07:45 UTC (rev 1571) @@ -1,12 +0,0 @@ -diff -ru ppp-2.4.3/pppd/Makefile.linux ppp-2.4.3-new/pppd/Makefile.linux ---- ppp-2.4.3/pppd/Makefile.linux 2004-11-13 13:02:22.000000000 +0100 -+++ ppp-2.4.3-new/pppd/Makefile.linux 2004-12-12 00:05:13.582252968 +0100 -@@ -48,7 +48,7 @@ - # Uncomment the next line to include support for PPP packet filtering. - # This requires that the libpcap library and headers be installed - # and that the kernel driver support PPP packet filtering. --FILTER=y -+#FILTER=y - - # Uncomment the next line to enable multilink PPP (enabled by default) - # Linux distributions: Please leave multilink ENABLED in your builds Added: crux-2.2/ports/core/ppp/ppp-makefile.patch =================================================================== --- crux-2.2/ports/core/ppp/ppp-makefile.patch (rev 0) +++ crux-2.2/ports/core/ppp/ppp-makefile.patch 2006-07-02 10:07:45 UTC (rev 1571) @@ -0,0 +1,12 @@ +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) Added: crux-2.2/ports/core/ppp/ppp-nofilter.patch =================================================================== --- crux-2.2/ports/core/ppp/ppp-nofilter.patch (rev 0) +++ crux-2.2/ports/core/ppp/ppp-nofilter.patch 2006-07-02 10:07:45 UTC (rev 1571) @@ -0,0 +1,12 @@ +diff -ru ppp-2.4.3/pppd/Makefile.linux ppp-2.4.3-new/pppd/Makefile.linux +--- ppp-2.4.3/pppd/Makefile.linux 2004-11-13 13:02:22.000000000 +0100 ++++ ppp-2.4.3-new/pppd/Makefile.linux 2004-12-12 00:05:13.582252968 +0100 +@@ -48,7 +48,7 @@ + # Uncomment the next line to include support for PPP packet filtering. + # This requires that the libpcap library and headers be installed + # and that the kernel driver support PPP packet filtering. +-FILTER=y ++#FILTER=y + + # Uncomment the next line to enable multilink PPP (enabled by default) + # Linux distributions: Please leave multilink ENABLED in your builds