Revision: 7638
http://sourceforge.net/p/ipcop/svn/7638
Author: owes
Date: 2014-08-25 10:39:56 +0000 (Mon, 25 Aug 2014)
Log Message:
-----------
Update ppp to 2.4.7, without Debian patches for now. Needs testing.
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/ppp
ipcop/trunk/lfs/ppp
ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6
ipcop/trunk/updates/2.1.6/information.xml
ipcop/trunk/updates/2.1.6/setup
Removed 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-08-24 21:21:20 UTC (rev
7637)
+++ ipcop/trunk/config/rootfiles/common/ppp 2014-08-25 10:39:56 UTC (rev
7638)
@@ -35,18 +35,18 @@
#usr/include/pppd/tdb.h
#usr/include/pppd/upap.h
#usr/lib/pppd
-#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/lib/pppd/2.4.7
+usr/lib/pppd/2.4.7/minconn.so
+usr/lib/pppd/2.4.7/openl2tp.so
+usr/lib/pppd/2.4.7/passprompt.so
+usr/lib/pppd/2.4.7/passwordfd.so
+usr/lib/pppd/2.4.7/pppoatm.so
+usr/lib/pppd/2.4.7/pppol2tp.so
+usr/lib/pppd/2.4.7/radattr.so
+usr/lib/pppd/2.4.7/radius.so
+usr/lib/pppd/2.4.7/radrealms.so
+usr/lib/pppd/2.4.7/rp-pppoe.so
+usr/lib/pppd/2.4.7/winbind.so
usr/sbin/chat
usr/sbin/pppd
#usr/sbin/pppdump
Modified: ipcop/trunk/lfs/ppp
===================================================================
--- ipcop/trunk/lfs/ppp 2014-08-24 21:21:20 UTC (rev 7637)
+++ ipcop/trunk/lfs/ppp 2014-08-25 10:39:56 UTC (rev 7638)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = ppp
-VER = 2.4.6
+VER = 2.4.7
HOST_ARCH = all
OTHER_SRC = yes
@@ -45,7 +45,7 @@
CFLAGS += -Wall -fno-strict-aliasing
-PATCH1 := $(PKG_NAME)_2.4.5-5.1.diff.gz
+PATCH1 = $(PKG_NAME)_2.4.6-2.debian.tar.xz
$(PATCH1) := $(URL_DEBIAN)/i/$(PKG_NAME)/$(PATCH1)
###############################################################################
@@ -54,11 +54,11 @@
objects = $(DL_FILE) $(PATCH1)
-$(DL_FILE):= $(DL_FROM)/$(DL_FILE)
-$(PATCH1) := $(URL_DEBIAN)/p/$(PKG_NAME)/$(PATCH1)
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+$(PATCH1) = $(URL_DEBIAN)/p/$(PKG_NAME)/$(PATCH1)
-$(DL_FILE)_MD5:= 3434d2cc9327167a0723aaaa8670083b
-$(PATCH1)_MD5 := 0c8767343ed46e79c74d7b1e45286b35
+$(DL_FILE)_MD5 = 78818f40e6d33a1d1de68a1551f6595a
+$(PATCH1)_MD5 = 033ad4705526812eb4f194c563ac0615
install : $(TARGET)
@@ -88,21 +88,20 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+
# Apply patches on debian order
- cd $(DIR_APP) && gzip -dc $(DIR_DL)/$(PATCH1) | patch -p1
+ #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) && for patch in `cat debian/patches/series` ; do patch
-p1 -i debian/patches/$$patch; done
+ #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
+ #cd $(DIR_APP) && sed -i 's/LIBS =$$/LIBS = -lutil/' pppd/Makefile.linux
# needed now or pppdump fail to build
- cd $(DIR_APP) && sed -i -e '/DO_DEFLATE=y/d' pppdump/Makefile.linux
+ #cd $(DIR_APP) && sed -i -e '/DO_DEFLATE=y/d' pppdump/Makefile.linux
# Fix 'call to __builtin___strncat_chk might overflow destination
buffer'
cd $(DIR_APP) && sed -i -e 's/strncat/strlcat/'
pppd/plugins/radius/clientid.c
- 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
cd $(DIR_APP) && sed -i -e 's/-O2/$(CFLAGS)/' pppd/plugins/Makefile
Deleted: ipcop/trunk/src/patches/ppp-2.4.6_fix-sifvjcomp-undefined.patch
===================================================================
--- ipcop/trunk/src/patches/ppp-2.4.6_fix-sifvjcomp-undefined.patch
2014-08-24 21:21:20 UTC (rev 7637)
+++ ipcop/trunk/src/patches/ppp-2.4.6_fix-sifvjcomp-undefined.patch
2014-08-25 10:39:56 UTC (rev 7638)
@@ -1,18 +0,0 @@
---- 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.6/ROOTFILES.i486-2.1.6
===================================================================
--- ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6 2014-08-24 21:21:20 UTC
(rev 7637)
+++ ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6 2014-08-25 10:39:56 UTC
(rev 7638)
@@ -306,6 +306,22 @@
/usr/lib/perl5/site_perl/5.14.2/i486-linux/auto/Net/SSLeay/want_read.al
/usr/lib/perl5/site_perl/5.14.2/i486-linux/auto/Net/SSLeay/want_write.al
##
+## ppp-2.4.7
+/usr/sbin/chat
+/usr/sbin/pppd
+/usr/sbin/pppstats
+/usr/lib/pppd/2.4.7/minconn.so
+/usr/lib/pppd/2.4.7/openl2tp.so
+/usr/lib/pppd/2.4.7/passprompt.so
+/usr/lib/pppd/2.4.7/passwordfd.so
+/usr/lib/pppd/2.4.7/pppoatm.so
+/usr/lib/pppd/2.4.7/pppol2tp.so
+/usr/lib/pppd/2.4.7/radattr.so
+/usr/lib/pppd/2.4.7/radius.so
+/usr/lib/pppd/2.4.7/radrealms.so
+/usr/lib/pppd/2.4.7/rp-pppoe.so
+/usr/lib/pppd/2.4.7/winbind.so
+##
## rsyslog-7.6.3
/usr/lib/rsyslog/imklog.so
/usr/lib/rsyslog/imuxsock.so
Modified: ipcop/trunk/updates/2.1.6/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.6/information.xml 2014-08-24 21:21:20 UTC (rev
7637)
+++ ipcop/trunk/updates/2.1.6/information.xml 2014-08-25 10:39:56 UTC (rev
7638)
@@ -9,7 +9,8 @@
Upgrade linux kernel to 3.4-3 (3.4.103).<br />
Upgrade bind to 9.9.5-P1, dhcpcd to 6.4.2, dnsmasq to 2.71, e2fsprogs
to 1.42.11, fcron to 3.2.0,
gnupg to 1.4.18, grep to 2.20, iproute2 to 3.15.0, libgcrypt to 1.6.2,
mdadm to 3.3.1,
- openssl to 1.0.1i, openvpn to 2.3.4, rsyslog to 7.6.3, squid to 3.4.6,
squid-langpack to 20140506, syslinux to 6.02,
+ openssl to 1.0.1i, openvpn to 2.3.4, ppp to 2.4.7, rsyslog to 7.6.3,
+ squid to 3.4.6, squid-langpack to 20140506, syslinux to 6.02,
tzdata to 2014f, util-linux to 2.24.2.
Upgrade Perl modules IO-Socket-SSL to 1.988, NetAddr-IP to 4.075,
Net-DNS to 0.75, Net-SSLeay to 1.63.
<br />
Modified: ipcop/trunk/updates/2.1.6/setup
===================================================================
--- ipcop/trunk/updates/2.1.6/setup 2014-08-24 21:21:20 UTC (rev 7637)
+++ ipcop/trunk/updates/2.1.6/setup 2014-08-25 10:39:56 UTC (rev 7638)
@@ -88,6 +88,9 @@
/bin/rm -f /usr/lib/perl5/site_perl/5.14.2/i486-linux/Net/DNS/RR/NIMLOC.pm
/bin/rm -f /usr/lib/perl5/site_perl/5.14.2/i486-linux/Net/DNS/RR/NSAP.pm
+# ppp
+/bin/rm -rf /usr/lib/pppd/2.4.6
+
# squid helpers that have disappeared over time
/bin/rm -f /usr/lib/squid/digest_edirectory_auth
/bin/rm -f /usr/lib/squid/diskd-daemon
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Slashdot TV.
Video for Nerds. Stuff that matters.
http://tv.slashdot.org/
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
