Revision: 6731
http://ipcop.svn.sourceforge.net/ipcop/?rev=6731&view=rev
Author: gespinasse
Date: 2012-08-04 06:59:48 +0000 (Sat, 04 Aug 2012)
Log Message:
-----------
Recompile ppp-2.4.5
- using most of debian patches
- using CFLAGS += -Wall -fno-strict-aliasing to solve aliasing warning and see
other issue
- fix 'call to __builtin___strncat_chk might overflow destination buffer' in
pppd/plugins/radius/clientid.c
- support IPv6 (and CBCP like everyone do)
- support linux-3.0 headers
Modified Paths:
--------------
ipcop/trunk/lfs/ppp
ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
ipcop/trunk/updates/2.1.0/information.xml
Modified: ipcop/trunk/lfs/ppp
===================================================================
--- ipcop/trunk/lfs/ppp 2012-08-04 06:43:45 UTC (rev 6730)
+++ ipcop/trunk/lfs/ppp 2012-08-04 06:59:48 UTC (rev 6731)
@@ -43,15 +43,22 @@
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
+CFLAGS += -Wall -fno-strict-aliasing
+
+PATCH1 := $(PKG_NAME)_$(VER)-5.1.diff.gz
+
+$(PATCH1) := $(URL_DEBIAN)/i/$(PKG_NAME)/$(PATCH1)
###############################################################################
# Top-level Rules
###############################################################################
-objects = $(DL_FILE)
+objects = $(DL_FILE) $(PATCH1)
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+$(DL_FILE):= $(DL_FROM)/$(DL_FILE)
+$(PATCH1) := $(URL_DEBIAN)/p/$(PKG_NAME)/$(PATCH1)
-$(DL_FILE)_MD5 = 4621bc56167b6953ec4071043fe0ec57
+$(DL_FILE)_MD5:= 4621bc56167b6953ec4071043fe0ec57
+$(PATCH1)_MD5 := 0c8767343ed46e79c74d7b1e45286b35
install : $(TARGET)
@@ -81,13 +88,23 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- # Logging should go to /var/log not /etc/*
- cd $(DIR_APP) && sed -i -e
"s+/etc/ppp/connect-errors+/var/log/connect-errors+" \
- -e
"s+/etc/ppp/resolv\.conf+/var/log/resolv\.conf+" pppd/pathnames.h
+ # Apply patches on debian order
+ cd $(DIR_APP) && gzip -dc $(DIR_DL)/$(PATCH1) | patch -p1
+ # Hack the list of patches, remove rejected and 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
+ # 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
+ # needed now or pppdump fail to build
+ cd $(DIR_APP) && sed -i -e '/DO_DEFLATE=y/d' pppdump/Makefile.linux
- # TODO: do we still need/want this patch?
- #cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/ppp-2.4.1-oedod.patch
+ # 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) && ./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
@@ -95,7 +112,7 @@
cd $(DIR_APP) && sed -i -e 's/-O2/$(CFLAGS)/'
pppd/plugins/pppoatm/Makefile
cd $(DIR_APP) && sed -i -e 's/-O2/$(CFLAGS)/'
pppd/plugins/radius/Makefile
cd $(DIR_APP) && sed -i -e 's/-O2/$(CFLAGS)/' pppd/Makefile
- cd $(DIR_APP) && make -j $(PARALLELISM)
+ cd $(DIR_APP) && make -j $(PARALLELISM) HAVE_INET6=y CBCP=y
cd $(DIR_APP) && make install
touch /var/log/connect-errors
Modified: ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
===================================================================
--- ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-08-04 06:43:45 UTC
(rev 6730)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-08-04 06:59:48 UTC
(rev 6731)
@@ -655,6 +655,22 @@
/usr/lib/libpixman-1.so.0
/usr/lib/libpixman-1.so.0.24.4
##
+## ppp-2.4.5 recompiled
+/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/sbin/chat
+/usr/sbin/pppd
+/usr/sbin/pppstats
+##
## procps-3.3.3
/bin/kill
/bin/ps
Modified: ipcop/trunk/updates/2.1.0/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.0/information.xml 2012-08-04 06:43:45 UTC (rev
6730)
+++ ipcop/trunk/updates/2.1.0/information.xml 2012-08-04 06:59:48 UTC (rev
6731)
@@ -3,7 +3,7 @@
<version>2.1.0</version>
<releasedate>2012-04-dd</releasedate>
<size>0</size>
- <description>httpd, iputils, gettext, setserial, pcmciautils
patched<br />
+ <description>httpd, iputils, gettext, setserial, pcmciautils, ppp
patched<br />
cairo recompiled with -O3, isdn4k-utils with -Os
-fno-strict-aliasing<br />
Add URL filter, xz-5.0.4<br />
Language updates.<br />
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
