From: <ow...@us...> - 2008-02-27 20:00:38
|
Revision: 1151 http://ipcop.svn.sourceforge.net/ipcop/?rev=1151&view=rev Author: owes Date: 2008-02-27 12:00:44 -0800 (Wed, 27 Feb 2008) Log Message: ----------- Update ppp to 2.4.4 Need testing and verifying which patches are no longer required. Breaks capi4k-utils, which seems unmaintained atm. Modified Paths: -------------- ipcop/trunk/config/rootfiles/common/ppp ipcop/trunk/lfs/ppp ipcop/trunk/make.sh Added Paths: ----------- ipcop/trunk/config/rootfiles/common/capi4k-utils_SKIP Removed Paths: ------------- ipcop/trunk/config/rootfiles/common/capi4k-utils Deleted: ipcop/trunk/config/rootfiles/common/capi4k-utils =================================================================== --- ipcop/trunk/config/rootfiles/common/capi4k-utils 2008-02-27 18:14:48 UTC (rev 1150) +++ ipcop/trunk/config/rootfiles/common/capi4k-utils 2008-02-27 20:00:44 UTC (rev 1151) @@ -1,26 +0,0 @@ -## capi4k-utils-2005-07-18 -## -#etc/drdsl/adsl.conf -#etc/ppp/peers -#etc/ppp/peers/isdn -#etc/ppp/peers/isdn/arcor -#etc/ppp/peers/isdn/avm -#etc/ppp/peers/isdn/avm-ml -#etc/ppp/peers/isdn/leased -#etc/ppp/peers/isdn/otelo -#etc/ppp/peers/isdn/talkline -#sbin/avmcapictrl -#sbin/capiinit -#usr/include/capi20.h -#usr/include/capicmd.h -#usr/include/capiutils.h -#usr/lib/libcapi20.a -#usr/lib/libcapi20.la -#usr/lib/libcapi20.so -#usr/lib/libcapi20.so.3 -#usr/lib/libcapi20.so.3.0.4 -#usr/lib/libcapi20dyn.a -usr/lib/pppd/2.4.3/capiplugin.so -usr/lib/pppd/2.4.3/userpass.so -#usr/share/man/man8/avmcapictrl.8 -#usr/share/man/man8/capiplugin.8 Copied: ipcop/trunk/config/rootfiles/common/capi4k-utils_SKIP (from rev 1148, ipcop/trunk/config/rootfiles/common/capi4k-utils) =================================================================== --- ipcop/trunk/config/rootfiles/common/capi4k-utils_SKIP (rev 0) +++ ipcop/trunk/config/rootfiles/common/capi4k-utils_SKIP 2008-02-27 20:00:44 UTC (rev 1151) @@ -0,0 +1,26 @@ +## capi4k-utils-2005-07-18 +## +#etc/drdsl/adsl.conf +#etc/ppp/peers +#etc/ppp/peers/isdn +#etc/ppp/peers/isdn/arcor +#etc/ppp/peers/isdn/avm +#etc/ppp/peers/isdn/avm-ml +#etc/ppp/peers/isdn/leased +#etc/ppp/peers/isdn/otelo +#etc/ppp/peers/isdn/talkline +#sbin/avmcapictrl +#sbin/capiinit +#usr/include/capi20.h +#usr/include/capicmd.h +#usr/include/capiutils.h +#usr/lib/libcapi20.a +#usr/lib/libcapi20.la +#usr/lib/libcapi20.so +#usr/lib/libcapi20.so.3 +#usr/lib/libcapi20.so.3.0.4 +#usr/lib/libcapi20dyn.a +usr/lib/pppd/2.4.3/capiplugin.so +usr/lib/pppd/2.4.3/userpass.so +#usr/share/man/man8/avmcapictrl.8 +#usr/share/man/man8/capiplugin.8 Modified: ipcop/trunk/config/rootfiles/common/ppp =================================================================== --- ipcop/trunk/config/rootfiles/common/ppp 2008-02-27 18:14:48 UTC (rev 1150) +++ ipcop/trunk/config/rootfiles/common/ppp 2008-02-27 20:00:44 UTC (rev 1151) @@ -1,4 +1,4 @@ -## ppp-2.4.3 +## ppp-2.4.4 ## #etc/ppp etc/ppp/chap-secrets @@ -32,16 +32,16 @@ #usr/include/pppd/tdb.h #usr/include/pppd/upap.h #usr/lib/pppd -#usr/lib/pppd/2.4.3 -usr/lib/pppd/2.4.3/minconn.so -usr/lib/pppd/2.4.3/passprompt.so -usr/lib/pppd/2.4.3/passwordfd.so -usr/lib/pppd/2.4.3/pppoatm.so -usr/lib/pppd/2.4.3/radattr.so -usr/lib/pppd/2.4.3/radius.so -usr/lib/pppd/2.4.3/radrealms.so -usr/lib/pppd/2.4.3/rp-pppoe.so -usr/lib/pppd/2.4.3/winbind.so +#usr/lib/pppd/2.4.4 +usr/lib/pppd/2.4.4/minconn.so +usr/lib/pppd/2.4.4/passprompt.so +usr/lib/pppd/2.4.4/passwordfd.so +usr/lib/pppd/2.4.4/pppoatm.so +usr/lib/pppd/2.4.4/radattr.so +usr/lib/pppd/2.4.4/radius.so +usr/lib/pppd/2.4.4/radrealms.so +usr/lib/pppd/2.4.4/rp-pppoe.so +usr/lib/pppd/2.4.4/winbind.so usr/sbin/chat usr/sbin/pppd #usr/sbin/pppdump Modified: ipcop/trunk/lfs/ppp =================================================================== --- ipcop/trunk/lfs/ppp 2008-02-27 18:14:48 UTC (rev 1150) +++ ipcop/trunk/lfs/ppp 2008-02-27 20:00:44 UTC (rev 1151) @@ -33,7 +33,7 @@ include Config PKG_NAME = ppp -VER = 2.4.3 +VER = 2.4.4 HOST_ARCH = all OTHER_SRC = yes @@ -51,7 +51,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 848f6c3cafeb6074ffeb293c3af79b7c +$(DL_FILE)_MD5 = 183800762e266132218b204dfb428d29 install : $(TARGET) @@ -82,12 +82,12 @@ @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && rm -f include/pcap-int.h - cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/ppp-2.4.2-pppoatm.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/ppp-2.4.2-pppoatm-persist.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/ppp-2.4.1-oedod.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/ppp-2.4.2-pppoatm-modprobe.patch - cd $(DIR_APP) && sed -i -e "s+/etc/ppp/connect-errors+/var/log/connect-errors+" pppd/pathnames.h + #cd $(DIR_APP) && rm -f include/pcap-int.h + #cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/ppp-2.4.2-pppoatm.patch + #cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/ppp-2.4.2-pppoatm-persist.patch + #cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/ppp-2.4.1-oedod.patch + #cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/ppp-2.4.2-pppoatm-modprobe.patch + #cd $(DIR_APP) && sed -i -e "s+/etc/ppp/connect-errors+/var/log/connect-errors+" pppd/pathnames.h cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && sed -i -e 's/-O2/$(CFLAGS)/' chat/Makefile cd $(DIR_APP) && sed -i -e 's/-O2/$(CFLAGS)/' pppd/plugins/Makefile Modified: ipcop/trunk/make.sh =================================================================== --- ipcop/trunk/make.sh 2008-02-27 18:14:48 UTC (rev 1150) +++ ipcop/trunk/make.sh 2008-02-27 20:00:44 UTC (rev 1151) @@ -1740,7 +1740,7 @@ chroot_make arping chroot_make beep chroot_make bind - chroot_make capi4k-utils + #chroot_make capi4k-utils # DEBUG -- broken with ppp 2.4.4 chroot_make dnsmasq chroot_make dosfstools chroot_make ethtool This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |