Revision: 6277
http://ipcop.svn.sourceforge.net/ipcop/?rev=6277&view=rev
Author: owes
Date: 2012-01-29 09:15:39 +0000 (Sun, 29 Jan 2012)
Log Message:
-----------
Upgrade iw to 3.3
Modified Paths:
--------------
ipcop/trunk/lfs/iw
ipcop/trunk/updates/2.0.3/information.xml
Removed Paths:
-------------
ipcop/trunk/src/patches/iw-3.2_libnl32.patch
Modified: ipcop/trunk/lfs/iw
===================================================================
--- ipcop/trunk/lfs/iw 2012-01-29 00:12:25 UTC (rev 6276)
+++ ipcop/trunk/lfs/iw 2012-01-29 09:15:39 UTC (rev 6277)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = iw
-VER = 3.2
+VER = 3.3
HOST_ARCH = all
OTHER_SRC = yes
@@ -51,7 +51,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 80615c972a287dcd50890735469b0d1c
+$(DL_FILE)_MD5 = 146ad14cdeb39fb88b21efdbb28787d1
install : $(TARGET)
@@ -81,8 +81,6 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
- # Patch Makefile to be able to compile with newer libnl versions
- cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)_libnl32.patch
cd $(DIR_APP) && make
cd $(DIR_APP) && make install
Deleted: ipcop/trunk/src/patches/iw-3.2_libnl32.patch
===================================================================
--- ipcop/trunk/src/patches/iw-3.2_libnl32.patch 2012-01-29 00:12:25 UTC
(rev 6276)
+++ ipcop/trunk/src/patches/iw-3.2_libnl32.patch 2012-01-29 09:15:39 UTC
(rev 6277)
@@ -1,64 +0,0 @@
-Makefile patches from upstream git to compile with libnl-3.2
-
---- a/Makefile 2011-11-04 11:53:29.000000000 +0100
-+++ b/Makefile 2012-01-03 16:24:04.000000000 +0100
-@@ -25,6 +25,8 @@
- NL1FOUND := $(shell $(PKG_CONFIG) --atleast-version=1 libnl-1 && echo Y)
- NL2FOUND := $(shell $(PKG_CONFIG) --atleast-version=2 libnl-2.0 && echo Y)
- NL3FOUND := $(shell $(PKG_CONFIG) --atleast-version=3 libnl-3.0 && echo Y)
-+NL31FOUND := $(shell $(PKG_CONFIG) --exact-version=3.1 libnl-3.1 && echo Y)
-+NL3xFOUND := $(shell $(PKG_CONFIG) --atleast-version=3.2 libnl-3.0 && echo Y)
-
- ifeq ($(NL1FOUND),Y)
- NLLIBNAME = libnl-1
-@@ -36,12 +38,28 @@
- NLLIBNAME = libnl-2.0
- endif
-
-+ifeq ($(NL3xFOUND),Y)
-+# libnl 3.2 might be found as 3.2 and 3.0
-+NL3FOUND = N
-+CFLAGS += -DCONFIG_LIBNL30
-+LIBS += -lnl-genl-3
-+NLLIBNAME = libnl-3.0
-+endif
-+
- ifeq ($(NL3FOUND),Y)
- CFLAGS += -DCONFIG_LIBNL30
- LIBS += -lnl-genl
- NLLIBNAME = libnl-3.0
- endif
-
-+# nl-3.1 has a broken libnl-gnl-3.1.pc file
-+# as show by pkg-config --debug --libs --cflags --exact-version=3.1
libnl-genl-3.1;echo $?
-+ifeq ($(NL31FOUND),Y)
-+CFLAGS += -DCONFIG_LIBNL30
-+LIBS += -lnl-genl
-+NLLIBNAME = libnl-3.1
-+endif
-+
- ifeq ($(NLLIBNAME),)
- $(error Cannot find development files for any supported version of libnl)
- endif
-@@ -57,20 +75,7 @@
- NQ=echo
- endif
-
--all: version_check $(ALL)
--
--version_check:
--ifeq ($(NL3FOUND),Y)
--else
--ifeq ($(NL2FOUND),Y)
--else
--ifeq ($(NL1FOUND),Y)
--else
-- $(error No libnl found)
--endif
--endif
--endif
--
-+all: $(ALL)
-
- VERSION_OBJS := $(filter-out version.o, $(OBJS))
-
Modified: ipcop/trunk/updates/2.0.3/information.xml
===================================================================
--- ipcop/trunk/updates/2.0.3/information.xml 2012-01-29 00:12:25 UTC (rev
6276)
+++ ipcop/trunk/updates/2.0.3/information.xml 2012-01-29 09:15:39 UTC (rev
6277)
@@ -10,7 +10,7 @@
Language updates.<br />
Upgrade acpid to 2.0.13, bash to 4.2.20, coreutils to 8.15,
conntrack-tools to 1.0.1, DBD-SQLite to 1.35, diffutils to 3.2,
- freetype to 2.4.8, gmp to 5.0.3, grep to 2.10, iproute2 to 3.2.0,
iptables to 1.4.12.2, iw to 3.2,
+ freetype to 2.4.8, gmp to 5.0.3, grep to 2.10, iproute2 to 3.2.0,
iptables to 1.4.12.2, iw to 3.3,
kbd to 1.15.3, kernel to 2.6.32.55, libnetfilter_conntrack to
1.0.0, libnl to 3.2.3, libpcap to 1.2.1, ntp to 4.2.6p5,
openssl to 1.0.0g, openvpn to 2.2.2, rrdtool to 1.4.7,
smartmontools to 5.42, Solos PCI to 1.03,
sqlite to 3.7.9, squid to 3.1.18, tcpdump to 4.2.1, usbutils to
004, usb-modeswitch to 1.2.1.
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
