libnl: update to 1.1.4.

diff --git a/config/rootfiles/common/libnl b/config/rootfiles/common/libnl
index 2beb80010f517086882c74b813772162df2ce7a7..960e1c82738c7b2f92c32330a0b8e7b56dcc053d 100644 (file)
--- a/config/rootfiles/common/libnl
+++ b/config/rootfiles/common/libnl
@@ -53,7 +53,8 @@
 #usr/include/netlink/socket.h
 #usr/include/netlink/types.h
 #usr/include/netlink/utils.h
+#usr/lib/libnl.a
 usr/lib/libnl.so
 usr/lib/libnl.so.1
-usr/lib/libnl.so.1.1
+usr/lib/libnl.so.1.1.4
 #usr/lib/pkgconfig/libnl-1.pc

diff --git a/lfs/libnl b/lfs/libnl
index ea557d9132f5c2b6dace8842d514f715ae4e0cd1..a357935140c3f6d753b6b21d4a37db0fa2a17433 100644 (file)
--- a/lfs/libnl
+++ b/lfs/libnl
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.1
+VER        = 1.1.4
 
 THISAPP    = libnl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ae970ccd9144e132b68664f98e7ceeb1
+$(DL_FILE)_MD5 = 580cb878be536804daca87fb75ae46cc
 
 install : $(TARGET)
 
@@ -73,13 +73,6 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libnl-1.1-ULONG_MAX.patch
-       cd $(DIR_APP) && ln -s /usr/src/linux/include/linux/if_vlan.h \
-                                             include/linux/if_vlan.h
-       cd $(DIR_APP) && ln -s /usr/src/linux/include/linux/netfilter/nf_conntrack_common.h \
-                                             include/linux/netfilter/nf_conntrack_common.h
-       cd $(DIR_APP) && ln -s /usr/src/linux/include/linux/netfilter/nf_conntrack_tcp.h \
-                                             include/linux/netfilter/nf_conntrack_tcp.h
        cd $(DIR_APP) && ./configure --prefix=/usr
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install