Revision: 7406
http://sourceforge.net/p/ipcop/svn/7406
Author: owes
Date: 2014-04-04 15:08:48 +0000 (Fri, 04 Apr 2014)
Log Message:
-----------
Update ppp to 2.4.6. Must be tested on DSL connection.
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/ppp
ipcop/trunk/lfs/ppp
ipcop/trunk/updates/2.1.4/ROOTFILES.i486-2.1.4
ipcop/trunk/updates/2.1.4/information.xml
ipcop/trunk/updates/2.1.4/setup
Added Paths:
-----------
ipcop/trunk/src/patches/ppp-2.4.6_fix-sifvjcomp-undefined.patch
Modified: ipcop/trunk/config/rootfiles/common/ppp
===================================================================
--- ipcop/trunk/config/rootfiles/common/ppp 2014-04-04 13:16:15 UTC (rev
7405)
+++ ipcop/trunk/config/rootfiles/common/ppp 2014-04-04 15:08:48 UTC (rev
7406)
@@ -1,4 +1,4 @@
-## ppp-2.4.5
+## ppp-2.4.6
##
#etc/ppp
etc/ppp/chap-secrets
@@ -16,8 +16,10 @@
#usr/include/pppd/chap_ms.h
#usr/include/pppd/eap.h
#usr/include/pppd/ecp.h
+#usr/include/pppd/eui64.h
#usr/include/pppd/fsm.h
#usr/include/pppd/ipcp.h
+#usr/include/pppd/ipv6cp.h
#usr/include/pppd/ipxcp.h
#usr/include/pppd/lcp.h
#usr/include/pppd/magic.h
@@ -33,18 +35,18 @@
#usr/include/pppd/tdb.h
#usr/include/pppd/upap.h
#usr/lib/pppd
-#usr/lib/pppd/2.4.5
-usr/lib/pppd/2.4.5/minconn.so
-usr/lib/pppd/2.4.5/openl2tp.so
-usr/lib/pppd/2.4.5/passprompt.so
-usr/lib/pppd/2.4.5/passwordfd.so
-usr/lib/pppd/2.4.5/pppoatm.so
-usr/lib/pppd/2.4.5/pppol2tp.so
-usr/lib/pppd/2.4.5/radattr.so
-usr/lib/pppd/2.4.5/radius.so
-usr/lib/pppd/2.4.5/radrealms.so
-usr/lib/pppd/2.4.5/rp-pppoe.so
-usr/lib/pppd/2.4.5/winbind.so
+#usr/lib/pppd/2.4.6
+usr/lib/pppd/2.4.6/minconn.so
+usr/lib/pppd/2.4.6/openl2tp.so
+usr/lib/pppd/2.4.6/passprompt.so
+usr/lib/pppd/2.4.6/passwordfd.so
+usr/lib/pppd/2.4.6/pppoatm.so
+usr/lib/pppd/2.4.6/pppol2tp.so
+usr/lib/pppd/2.4.6/radattr.so
+usr/lib/pppd/2.4.6/radius.so
+usr/lib/pppd/2.4.6/radrealms.so
+usr/lib/pppd/2.4.6/rp-pppoe.so
+usr/lib/pppd/2.4.6/winbind.so
usr/sbin/chat
usr/sbin/pppd
#usr/sbin/pppdump
Modified: ipcop/trunk/lfs/ppp
===================================================================
--- ipcop/trunk/lfs/ppp 2014-04-04 13:16:15 UTC (rev 7405)
+++ ipcop/trunk/lfs/ppp 2014-04-04 15:08:48 UTC (rev 7406)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = ppp
-VER = 2.4.5
+VER = 2.4.6
HOST_ARCH = all
OTHER_SRC = yes
@@ -45,7 +45,7 @@
CFLAGS += -Wall -fno-strict-aliasing
-PATCH1 := $(PKG_NAME)_$(VER)-5.1.diff.gz
+PATCH1 := $(PKG_NAME)_2.4.5-5.1.diff.gz
$(PATCH1) := $(URL_DEBIAN)/i/$(PKG_NAME)/$(PATCH1)
###############################################################################
@@ -57,7 +57,7 @@
$(DL_FILE):= $(DL_FROM)/$(DL_FILE)
$(PATCH1) := $(URL_DEBIAN)/p/$(PKG_NAME)/$(PATCH1)
-$(DL_FILE)_MD5:= 4621bc56167b6953ec4071043fe0ec57
+$(DL_FILE)_MD5:= 3434d2cc9327167a0723aaaa8670083b
$(PATCH1)_MD5 := 0c8767343ed46e79c74d7b1e45286b35
install : $(TARGET)
@@ -91,7 +91,7 @@
# Apply patches on debian order
cd $(DIR_APP) && gzip -dc $(DIR_DL)/$(PATCH1) | patch -p1
# Hack the list of patches, remove rejected and later patches (debian
specific), blank lines and comments.
- cd $(DIR_APP) && sed -i -e '/rejected/,$$d' -e '/^$$/d' -e '/#.*/d'
debian/patches/series
+ cd $(DIR_APP) && sed -i -e '/rejected/,$$d' -e '/^$$/d' -e '/#.*/d'
debian/patches/series
cd $(DIR_APP) && for patch in `cat debian/patches/series` ; do patch
-p1 -i debian/patches/$$patch; done
# logwtmp patch need this added as we skipped zzz_config patch in end
of series
cd $(DIR_APP) && sed -i 's/LIBS =$$/LIBS = -lutil/' pppd/Makefile.linux
@@ -101,9 +101,7 @@
# Fix 'call to __builtin___strncat_chk might overflow destination
buffer'
cd $(DIR_APP) && sed -i -e 's/strncat/strlcat/'
pppd/plugins/radius/clientid.c
- # As Makefiles are in not so nice state, with linux-3.0 headers,
compilation error twice, break plugins build but not overall build!
- # Using kernel supplied header instead fix
/usr/include/linux/if_pppox.h:85: error field 'pppol2tp' has incomplete type
- cd $(DIR_APP) && rm -f include/linux/if_pppol2tp.h
+ cd $(DIR_APP) && patch -p1 -i
$(DIR_PATCHES)/$(THISAPP)_fix-sifvjcomp-undefined.patch
cd $(DIR_APP) && ./configure --prefix=/usr
cd $(DIR_APP) && sed -i -e 's/-O2/$(CFLAGS)/' chat/Makefile
Added: ipcop/trunk/src/patches/ppp-2.4.6_fix-sifvjcomp-undefined.patch
===================================================================
--- ipcop/trunk/src/patches/ppp-2.4.6_fix-sifvjcomp-undefined.patch
(rev 0)
+++ ipcop/trunk/src/patches/ppp-2.4.6_fix-sifvjcomp-undefined.patch
2014-04-04 15:08:48 UTC (rev 7406)
@@ -0,0 +1,18 @@
+--- a/pppd/sys-linux.c 2014-03-12 08:15:38.057972274 +0100
++++ b/pppd/sys-linux.c 2014-03-12 08:16:12.000000000 +0100
+@@ -2281,6 +2281,7 @@
+ }
+ #endif
+ }
++#endif /* ifndef linux */
+ #endif /* HAVE_LOGWTMP */
+
+ /********************************************************************
+@@ -2304,7 +2305,6 @@
+
+ return 1;
+ }
+-#endif
+
+ /********************************************************************
+ *
Modified: ipcop/trunk/updates/2.1.4/ROOTFILES.i486-2.1.4
===================================================================
--- ipcop/trunk/updates/2.1.4/ROOTFILES.i486-2.1.4 2014-04-04 13:16:15 UTC
(rev 7405)
+++ ipcop/trunk/updates/2.1.4/ROOTFILES.i486-2.1.4 2014-04-04 15:08:48 UTC
(rev 7406)
@@ -11,6 +11,22 @@
/lib/modules/3.4-2/extra/solos-pci.ko.gz
/lib/modules/3.4-2/kernel
##
+## ppp-2.4.6
+/usr/sbin/chat
+/usr/sbin/pppd
+/usr/sbin/pppstats
+/usr/lib/pppd/2.4.6/minconn.so
+/usr/lib/pppd/2.4.6/openl2tp.so
+/usr/lib/pppd/2.4.6/passprompt.so
+/usr/lib/pppd/2.4.6/passwordfd.so
+/usr/lib/pppd/2.4.6/pppoatm.so
+/usr/lib/pppd/2.4.6/pppol2tp.so
+/usr/lib/pppd/2.4.6/radattr.so
+/usr/lib/pppd/2.4.6/radius.so
+/usr/lib/pppd/2.4.6/radrealms.so
+/usr/lib/pppd/2.4.6/rp-pppoe.so
+/usr/lib/pppd/2.4.6/winbind.so
+##
## rrdtool-1.4.8
/usr/bin/rrdtool
/usr/lib/perl5/site_perl/5.14.2/i486-linux/RRDs.pm
Modified: ipcop/trunk/updates/2.1.4/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.4/information.xml 2014-04-04 13:16:15 UTC (rev
7405)
+++ ipcop/trunk/updates/2.1.4/information.xml 2014-04-04 15:08:48 UTC (rev
7406)
@@ -5,7 +5,7 @@
<size>0</size>
<isoimages>yes</isoimages>
<description>Upgrade e1000e network driver to 3.0.4.1, igb network
driver to 5.2.5, linux kernel to 3.4.86,
- rrdtool to 1.4.8.
+ ppp to 2.4.6, rrdtool to 1.4.8.
<br />
<b>Mandatory reboot after upgrade.</b>
</description>
Modified: ipcop/trunk/updates/2.1.4/setup
===================================================================
--- ipcop/trunk/updates/2.1.4/setup 2014-04-04 13:16:15 UTC (rev 7405)
+++ ipcop/trunk/updates/2.1.4/setup 2014-04-04 15:08:48 UTC (rev 7406)
@@ -63,6 +63,8 @@
# Remove old libraries (version specific)
# /bin/rm -f .....
+# ppp
+/bin/rm -rf /usr/lib/pppd/2.4.5
# rrdtool
/bin/rm -f /usr/lib/librrd.so.4
/bin/rm -f /usr/lib/librrd.so.4.2.0
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
