Revision: 6860
http://ipcop.svn.sourceforge.net/ipcop/?rev=6860&view=rev
Author: gespinasse
Date: 2012-12-06 07:13:48 +0000 (Thu, 06 Dec 2012)
Log Message:
-----------
Upgrade libnl to 3.2.16
There is at least a few fixes in the code, at least for asprintf warnings
Half-add the tests.
make check compilation is broken in 3.2.16 when using --disable-cli. I sedn the
fix to upstream, that will appear after 3.2.16.
Anyway tests are not ready to run, make check just compile them. So there is no
loss keeping 'make check' commented out for now.
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/libnl
ipcop/trunk/lfs/libnl
ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
ipcop/trunk/updates/2.1.0/information.xml
ipcop/trunk/updates/2.1.0/setup
Modified: ipcop/trunk/config/rootfiles/common/libnl
===================================================================
--- ipcop/trunk/config/rootfiles/common/libnl 2012-11-23 22:36:20 UTC (rev
6859)
+++ ipcop/trunk/config/rootfiles/common/libnl 2012-12-06 07:13:48 UTC (rev
6860)
@@ -1,5 +1,3 @@
-## libnl-3.2.11
-##
#etc/libnl
#etc/libnl/classid
#etc/libnl/pktloc
@@ -20,10 +18,13 @@
#usr/include/libnl3/netlink/genl/genl.h
#usr/include/libnl3/netlink/genl/mngt.h
#usr/include/libnl3/netlink/handlers.h
+#usr/include/libnl3/netlink/hash.h
+#usr/include/libnl3/netlink/hashtable.h
#usr/include/libnl3/netlink/list.h
#usr/include/libnl3/netlink/msg.h
#usr/include/libnl3/netlink/netfilter
#usr/include/libnl3/netlink/netfilter/ct.h
+#usr/include/libnl3/netlink/netfilter/exp.h
#usr/include/libnl3/netlink/netfilter/log.h
#usr/include/libnl3/netlink/netfilter/log_msg.h
#usr/include/libnl3/netlink/netfilter/netfilter.h
@@ -83,23 +84,18 @@
#usr/include/libnl3/netlink/types.h
#usr/include/libnl3/netlink/utils.h
#usr/include/libnl3/netlink/version.h
-#usr/lib/libnl
-#usr/lib/libnl-3.la
#usr/lib/libnl-3.so
usr/lib/libnl-3.so.200
-usr/lib/libnl-3.so.200.9.0
-#usr/lib/libnl-genl-3.la
+usr/lib/libnl-3.so.200.12.1
#usr/lib/libnl-genl-3.so
usr/lib/libnl-genl-3.so.200
-usr/lib/libnl-genl-3.so.200.9.0
-#usr/lib/libnl-nf-3.la
+usr/lib/libnl-genl-3.so.200.12.1
#usr/lib/libnl-nf-3.so
#usr/lib/libnl-nf-3.so.200
-#usr/lib/libnl-nf-3.so.200.9.0
-#usr/lib/libnl-route-3.la
+#usr/lib/libnl-nf-3.so.200.12.1
#usr/lib/libnl-route-3.so
#usr/lib/libnl-route-3.so.200
-#usr/lib/libnl-route-3.so.200.9.0
+#usr/lib/libnl-route-3.so.200.12.1
#usr/lib/pkgconfig/libnl-3.0.pc
#usr/lib/pkgconfig/libnl-genl-3.0.pc
#usr/lib/pkgconfig/libnl-nf-3.0.pc
Modified: ipcop/trunk/lfs/libnl
===================================================================
--- ipcop/trunk/lfs/libnl 2012-11-23 22:36:20 UTC (rev 6859)
+++ ipcop/trunk/lfs/libnl 2012-12-06 07:13:48 UTC (rev 6860)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = libnl
-VER = 3.2.11
+VER = 3.2.16
HOST_ARCH = all
OTHER_SRC = yes
@@ -52,7 +52,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 7a35f3a17b52f41ee120dceb99b2ef72
+$(DL_FILE)_MD5 = f06e6de102abb2cef71ed671957ee099
install : $(TARGET)
@@ -82,13 +82,21 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ # Remove after 3.2.16
+ # Derived from an upstream fix or compilation fail with
+ # flex: Can't use --reentrant or --bison-bridge with -l option
+ cd $(DIR_APP) && sed -i 's/(LEX/(FLEX/g' lib/Makefile.*
- # disable-doc is documented, but currently breaks configure
- cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
- --disable-cli --disable-static
+ cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc
--disable-cli --disable-static
cd $(DIR_APP) && make
+ifeq "$(RUNNING_TEST)" "yes"
+ # Compilation is broken using --disable-cli, fixed after 3.2.16
+ # A bit useless for now as program are compiled but not run,
+ #-cd $(DIR_APP) && make check &>
$(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
+endif
cd $(DIR_APP) && make install
+ rm /usr/lib//libnl-*.la
rm -f $(DIR_INFO)/*/iw-*
@rm -rf $(DIR_APP)
@$(POSTBUILD)
Modified: ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
===================================================================
--- ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-11-23 22:36:20 UTC
(rev 6859)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-12-06 07:13:48 UTC
(rev 6860)
@@ -418,11 +418,11 @@
/usr/lib/libnetfilter_conntrack.so.3
/usr/lib/libnetfilter_conntrack.so.3.3.0
##
-## libnl-3.2.11
+## libnl-3.2.16
/usr/lib/libnl-3.so.200
-/usr/lib/libnl-3.so.200.9.0
+/usr/lib/libnl-3.so.200.12.1
/usr/lib/libnl-genl-3.so.200
-/usr/lib/libnl-genl-3.so.200.9.0
+/usr/lib/libnl-genl-3.so.200.12.1
##
## libpcap-1.3.0
/usr/lib/libpcap.so.1
Modified: ipcop/trunk/updates/2.1.0/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.0/information.xml 2012-11-23 22:36:20 UTC (rev
6859)
+++ ipcop/trunk/updates/2.1.0/information.xml 2012-12-06 07:13:48 UTC (rev
6860)
@@ -14,7 +14,7 @@
iproute2 to 3.6.0, iptables to 1.4.16.3, iptstate to 2.2.5,
iputils to s20121011, iw to 3.7,
hdparm to 9.39, httpd to 2.2.23, krb5 to 1.10.3,
less to 451, libffi to 3.0.11, libgd to 2.0.36~rc1, libgcrypt to
1.5.0, libnet to 1.1.6,
- libnetfiltercontrack to 1.0.1, libnl to 3.2.11, libpcap to 1.3.0,
libpng to 1.5.12,
+ libnetfiltercontrack to 1.0.1, libnl to 3.2.16, libpcap to 1.3.0,
libpng to 1.5.12,
libusb to 1.0.9, libusb-compat to 0.1.4, libtool to 2.4.2, libxml2
to 2.8.0, logrotate to 3.8.1, lsof to 4.86,
mdadm to 3.2.6, net-tools to 1.60-p20120127084908, openldap to
2.4.33, openssh to 6.1, openssl to 1.0.1c, openswan to 2.6.38,
parted to 3.1, pciutils to 3.1.10, pcre to 8.30, pixman to 0.24.4,
procps to 3.3.4, psmisc to 22.20,
Modified: ipcop/trunk/updates/2.1.0/setup
===================================================================
--- ipcop/trunk/updates/2.1.0/setup 2012-11-23 22:36:20 UTC (rev 6859)
+++ ipcop/trunk/updates/2.1.0/setup 2012-12-06 07:13:48 UTC (rev 6860)
@@ -135,8 +135,8 @@
/bin/rm -f /usr/lib/liblzma.so.5.0.3
/bin/rm -f /usr/lib/libnet-1.6.0
/bin/rm -f /usr/lib/libnetfilter_conntrack.so.3.2.0
-/bin/rm -f /usr/lib/libnl-3.so.200.5.2
-/bin/rm -f /usr/lib/libnl-genl-3.so.200.5.2
+/bin/rm -f /usr/lib/libnl-3.so.200.{5.2,9.0}
+/bin/rm -f /usr/lib/libnl-genl-3.so.200.{5.2,9.0}
/bin/rm -f /usr/lib/libparted.so.1.0.0
/bin/rm -f /usr/lib/libpcap.so.1.2.1
/bin/rm -f /usr/lib/libpci.so.3.1.9
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
