[Ipcop-svn] SF.net SVN: ipcop:[6708] ipcop/trunk

gespinasse Wed, 18 Jul 2012 10:56:51 -0700

Revision: 6708
          http://ipcop.svn.sourceforge.net/ipcop/?rev=6708&view=rev
Author:   gespinasse
Date:     2012-07-18 17:56:40 +0000 (Wed, 18 Jul 2012)
Log Message:
-----------
Unsure this package is still required or usable, maybe misdn could replace. I 
don't know frankly.


Anyway, clean the compilation log by disabling unused code and tweaking the 
Makefiles to use our CFLAG

Add the missing menuconfig change for ippp-filter.
That allow me to run make menuconfig and generate a .config with unused parts 
disabled : divalog, {eicon,hisax,icn,pcbit}ctrl

Modified Paths:
--------------
    ipcop/trunk/config/rootfiles/common/isdn4k-utils
    ipcop/trunk/lfs/isdn4k-utils
    ipcop/trunk/src/patches/isdn4k-utils-v3.2p1-config.patch
    ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
    ipcop/trunk/updates/2.1.0/information.xml

Modified: ipcop/trunk/config/rootfiles/common/isdn4k-utils
===================================================================
--- ipcop/trunk/config/rootfiles/common/isdn4k-utils    2012-07-17 19:06:06 UTC 
(rev 6707)
+++ ipcop/trunk/config/rootfiles/common/isdn4k-utils    2012-07-18 17:56:40 UTC 
(rev 6708)
@@ -1,42 +1,10 @@
-## isdn4k-utils.v3.2p1
-##
-#usr/lib/isdn
-#usr/lib/isdn/ISAR.BIN
-#usr/lib/isdn/dnload.bin
-#usr/lib/isdn/ds4bri.bit
-#usr/lib/isdn/dspdload.bin
-#usr/lib/isdn/loadpg.bin
-#usr/lib/isdn/pc_1t_ca.bin
-#usr/lib/isdn/pc_eu_ca.bin
-#usr/lib/isdn/prload.bin
-#usr/lib/isdn/te_dmlt.pm
-#usr/lib/isdn/te_etsi.p
-#usr/lib/isdn/te_etsi.qm0
-#usr/lib/isdn/te_etsi.qm1
-#usr/lib/isdn/te_etsi.qm2
-#usr/lib/isdn/te_etsi.qm3
-#usr/lib/isdn/te_etsi.sm
-#usr/lib/isdn/te_etsi.sq
-#usr/lib/isdn/te_etsi.sx
-#usr/lib/isdn/te_etsi.sy
-#usr/sbin/divaload
-#usr/sbin/divalog
-#usr/sbin/divalogd
-#usr/sbin/eiconctrl
-#usr/sbin/hisaxctrl
-#usr/sbin/icnctrl
 usr/sbin/ipppd
 usr/sbin/isdnctrl
-#usr/sbin/pcbitctl
 #usr/share/man/man4/isdn_audio.4
 #usr/share/man/man4/isdnctrl.4
 #usr/share/man/man4/isdninfo.4
 #usr/share/man/man4/ttyI.4
 #usr/share/man/man7/isdn_cause.7
 #usr/share/man/man8/.isdnctrl_conf.8
-#usr/share/man/man8/eiconctrl.8
-#usr/share/man/man8/hisaxctrl.8
-#usr/share/man/man8/icnctrl.8
 #usr/share/man/man8/ipppd.8
 #usr/share/man/man8/isdnctrl.8
-#usr/share/man/man8/pcbitctl.8

Modified: ipcop/trunk/lfs/isdn4k-utils
===================================================================
--- ipcop/trunk/lfs/isdn4k-utils        2012-07-17 19:06:06 UTC (rev 6707)
+++ ipcop/trunk/lfs/isdn4k-utils        2012-07-18 17:56:40 UTC (rev 6708)
@@ -45,6 +45,8 @@
 
 PATCH1     = $(PKG_NAME)_ippp-filter.diff
 
+CFLAGS += -fno-strict-aliasing
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -87,32 +89,29 @@
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 
        cd $(DIR_APP) && patch -Np1 -i $(DIR_DL)/$(PATCH1)
-       cd $(DIR_APP) && patch -Np1 -i 
$(DIR_PATCHES)/isdn4k-utils-v3.2p1-c89.patch
-       cd $(DIR_APP) && patch -Np1 -i 
$(DIR_PATCHES)/isdn4k-utils-v3.2p1-config.patch
-       cd $(DIR_APP) && patch -Np0 -i 
$(DIR_PATCHES)/isdn4k-utils-v3.2p1-gcc34.patch
-       cd $(DIR_APP) && patch -Np0 -i $(DIR_PATCHES)/isdn4k-utils-gcc4.patch
+       # ippp-filter.diff miss the menuconfig part Add that line, so make 
menuconfig could be run with that option
+       cd $(DIR_APP) && sed -i "/CONFIG_IPPPD_MSCHAP/abool 'Support for PPP 
filtering (need kernel patch)' CONFIG_IPPP_FILTER" ipppd/.Config.in
+
+       # --with-ippp-filter is not given to configure as all sub configure are 
run in a loop
+       # That explain why IPPP_FILTER is hacked later for ipppd
+       cd $(DIR_APP) && patch -p1 -i 
$(DIR_PATCHES)/isdn4k-utils-v3.2p1-c89.patch
+       cd $(DIR_APP) && patch -p1 -i 
$(DIR_PATCHES)/isdn4k-utils-v3.2p1-config.patch
+       cd $(DIR_APP) && patch -p0 -i 
$(DIR_PATCHES)/isdn4k-utils-v3.2p1-gcc34.patch
+       cd $(DIR_APP) && patch -p0 -i $(DIR_PATCHES)/isdn4k-utils-gcc4.patch
        cd $(DIR_APP) && sed -i 's%-lt 64%-lt 16%' scripts/makedev.sh
-       cd $(DIR_APP)/capi20 && rm -f lt* aclocal.m4 
-       cd $(DIR_APP)/capi20 && aclocal
-       cd $(DIR_APP)/capi20 && libtoolize --force --automake
-       cd $(DIR_APP)/capi20 && automake --add-missing
-       cd $(DIR_APP)/capi20 && autoconf
-       cd $(DIR_APP)/capiinfo && rm -f aclocal.m4
-       cd $(DIR_APP)/capiinfo && aclocal
-       cd $(DIR_APP)/capiinfo && libtoolize --force --automake
-       cd $(DIR_APP)/capiinfo && automake --add-missing
-       cd $(DIR_APP)/capiinfo && autoconf
-       cd $(DIR_APP)/capiinit && rm -f aclocal.m4
-       cd $(DIR_APP)/capiinit && aclocal
-       cd $(DIR_APP)/capiinit && libtoolize --force --automake
-       cd $(DIR_APP)/capiinit && automake --add-missing
-       cd $(DIR_APP)/capiinit && autoconf
+       for d in capi20 capiinfo capiinit; do \
+               cd $(DIR_APP)/$$d && rm -f lt* aclocal.m4 && aclocal && 
libtoolize -f --automake && automake --add-missing && autoconf; \
+       done
        cd $(DIR_APP)/ipppd && autoconf
-       cd $(DIR_APP)/ipppd && sed -i -e 's/net\/bpf/pcap/' sys-linux.c
-       cd $(DIR_APP)/ipppd && sed -i -e 's/net\/bpf/pcap/' ipppd.h
-       cd $(DIR_APP) && make subconfig
-       cd $(DIR_APP)/ipppd && sed -i 's/^IPPP_FILTER.*$$/IPPP_FILTER := 1/' 
Makefile
-       cd $(DIR_APP) && patch -Np1 -i 
$(DIR_PATCHES)/isdn4k-utils-parallel-build.patch
+       cd $(DIR_APP)/ipppd && sed -i -e 's/net\/bpf/pcap/' sys-linux.c ipppd.h
+       cd $(DIR_APP) && make subconfig         # run sub configure when 
available
+       # Use CFLAGS value set, particulary strict-aliasing disabled for ipppd
+       cd $(DIR_APP)/lib && sed -i "s/^CFLAGS.*$$/CFLAGS = $$CFLAGS/" Makefile
+       cd $(DIR_APP)/isdnctrl && sed -i "s/^CFLAGS.*$$/CFLAGS = $$CFLAGS/" 
Makefile
+       cd $(DIR_APP)/ipppd && sed -i -e 's/^IPPP_FILTER.*$$/IPPP_FILTER := 1/' 
-e "s/\-O2.*/$$CFLAGS/" Makefile
+       # As eicon code is disabled in .config, eicon/Makefile is not created, 
so patch don't apply
+       #cd $(DIR_APP) && patch -Np1 -i 
$(DIR_PATCHES)/isdn4k-utils-parallel-build.patch
+
        cd $(DIR_APP) && make -j $(PARALLELISM)
        cd $(DIR_APP) && make install
 

Modified: ipcop/trunk/src/patches/isdn4k-utils-v3.2p1-config.patch
===================================================================
--- ipcop/trunk/src/patches/isdn4k-utils-v3.2p1-config.patch    2012-07-17 
19:06:06 UTC (rev 6707)
+++ ipcop/trunk/src/patches/isdn4k-utils-v3.2p1-config.patch    2012-07-18 
17:56:40 UTC (rev 6708)
@@ -1,7 +1,6 @@
-diff -ruN isdn4k-utils.old/.config isdn4k-utils/.config
---- isdn4k-utils.old/.config   Thu Jan  1 01:00:00 1970
-+++ isdn4k-utils/.config       Mon Dec  1 13:47:00 2003
-@@ -0,0 +1,92 @@
+--- /dev/null  2012-07-09 07:59:47.793200066 +0200
++++ isdn4k-utils/.config       2012-07-18 08:24:40.000000000 +0200
+@@ -0,0 +1,91 @@
 +#
 +# Automatically generated by make menuconfig: don't edit
 +#
@@ -45,12 +44,11 @@
 +#
 +# Card configuration tools
 +#
-+CONFIG_HISAXCTRL=y
-+CONFIG_ICNCTRL=y
-+# CONFIG_ICNCTRL_DEBUG is not set
-+CONFIG_PCBITCTL=y
-+#CONFIG_AVMCAPICTRL is not set
-+CONFIG_EICONCTRL=y
++# CONFIG_HISAXCTRL is not set
++# CONFIG_ICNCTRL is not set
++# CONFIG_PCBITCTL is not set
++# CONFIG_AVMCAPICTRL is not set
++# CONFIG_EICONCTRL is not set
 +# CONFIG_LOOPCTRL is not set
 +
 +#

Modified: ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
===================================================================
--- ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0      2012-07-17 19:06:06 UTC 
(rev 6707)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0      2012-07-18 17:56:40 UTC 
(rev 6708)
@@ -359,6 +359,10 @@
 /bin/ping
 /bin/ping6
 ##
+## isdn4k-utils-v3.2p1 with -Os -fno-strict-aliasing
+/usr/sbin/ipppd
+/usr/sbin/isdnctrl
+##
 ## iw-3.4
 /usr/sbin/iw
 ##

Modified: ipcop/trunk/updates/2.1.0/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.0/information.xml   2012-07-17 19:06:06 UTC (rev 
6707)
+++ ipcop/trunk/updates/2.1.0/information.xml   2012-07-18 17:56:40 UTC (rev 
6708)
@@ -4,7 +4,7 @@
         <releasedate>2012-04-dd</releasedate>
         <size>0</size>
         <description>httpd, iputils, gettext, setserial, pcmciautils 
patched&lt;br /&gt;
-            cairo recompiled with -O3&lt;br /&gt;
+            cairo recompiled with -O3, isdn4k-utils with -Os 
-fno-strict-aliasing&lt;br /&gt;
             Add URL filter, xz-5.0.4&lt;br /&gt;
             Language updates.&lt;br /&gt;
             Upgrade acpid to 2.0.16, arping to 2.12, bash to 4.2.36, bind to 
9.8.3-P1, conntrack-tools to 1.2.1, coreutils to 8.17,

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
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn

[Ipcop-svn] SF.net SVN: ipcop:[6708] ipcop/trunk

Reply via email to