From 299e917c17619f800f0c21cf43209065b608223f Mon Sep 17 00:00:00 2001 From: root Date: Fri, 24 Feb 2012 23:15:21 +0000 Subject: Fri Feb 24 23:15:21 UTC 2012 --- core/crda/PKGBUILD | 10 +++--- core/crda/libnl32.patch | 12 +++++++ core/iw/PKGBUILD | 4 +-- core/libnl/PKGBUILD | 33 +++++++++-------- core/libpcap/PKGBUILD | 15 ++++---- core/libpcap/libnl32.patch | 19 ++++++++++ core/man-db/PKGBUILD | 13 +++---- core/wpa_supplicant/PKGBUILD | 16 +++++---- core/wpa_supplicant/config | 2 ++ .../hostap_allow-linking-with-libnl-3.2.patch | 42 ++++++++++++++++++++++ 10 files changed, 124 insertions(+), 42 deletions(-) create mode 100644 core/crda/libnl32.patch create mode 100644 core/libpcap/libnl32.patch create mode 100644 core/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch (limited to 'core') diff --git a/core/crda/PKGBUILD b/core/crda/PKGBUILD index f5264bb73..ce6144e17 100644 --- a/core/crda/PKGBUILD +++ b/core/crda/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 141968 2011-11-03 18:52:56Z thomas $ +# $Id: PKGBUILD 150888 2012-02-23 13:53:54Z allan $ # Maintainer: Thomas Bächler pkgname=crda pkgver=1.1.2 -pkgrel=1 +pkgrel=2 pkgdesc="Central Regulatory Domain Agent for wireless networks" arch=(i686 x86_64) url="http://wireless.kernel.org/en/developers/Regulatory/CRDA" @@ -12,13 +12,15 @@ depends=('wireless-regdb' 'libnl' 'libgcrypt' 'udev' 'iw') makedepends=('python-m2crypto') install=crda.install source=(http://wireless.kernel.org/download/crda/${pkgname}-${pkgver}.tar.bz2 - crda.rc) + crda.rc libnl32.patch) md5sums=('5226f65aebacf94baaf820f8b4e06df4' - '014eef3f8655e9a130064ec6891317fc') + '014eef3f8655e9a130064ec6891317fc' + 'c1f7aff29f15a0364ae6f7905a1d4ae6') build() { msg "Compiling crda ..." cd "${srcdir}"/${pkgname}-${pkgver} + patch -Np1 -i "$srcdir/libnl32.patch" sed 's|^#!/usr/bin/env python|#!/usr/bin/python2|' -i utils/key2pub.py make crda regdbdump } diff --git a/core/crda/libnl32.patch b/core/crda/libnl32.patch new file mode 100644 index 000000000..682b6c5de --- /dev/null +++ b/core/crda/libnl32.patch @@ -0,0 +1,12 @@ +diff -u -r crda-1.1.2/Makefile crda-1.1.2-libnl32/Makefile +--- crda-1.1.2/Makefile 2011-08-10 01:36:19.000000000 +0200 ++++ crda-1.1.2-libnl32/Makefile 2012-02-09 18:53:33.376430180 +0100 +@@ -51,7 +51,7 @@ + + ifeq ($(NL3FOUND),Y) + CFLAGS += -DCONFIG_LIBNL30 +-NLLIBS += -lnl-genl ++NLLIBS += $(shell pkg-config --libs libnl-genl-3.0) + NLLIBNAME = libnl-3.0 + else + ifeq ($(NL2FOUND),Y) diff --git a/core/iw/PKGBUILD b/core/iw/PKGBUILD index cd622ddb6..e237e1b01 100644 --- a/core/iw/PKGBUILD +++ b/core/iw/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 149926 2012-02-11 23:08:41Z thomas $ +# $Id: PKGBUILD 150890 2012-02-23 13:53:57Z allan $ # Maintainer: Thomas Bächler pkgname=iw pkgver=3.3 -pkgrel=1 +pkgrel=2 pkgdesc="nl80211 based CLI configuration utility for wireless devices" arch=("i686" "x86_64") url="http://wireless.kernel.org/en/users/Documentation/iw" diff --git a/core/libnl/PKGBUILD b/core/libnl/PKGBUILD index 18803a30f..7893a115f 100644 --- a/core/libnl/PKGBUILD +++ b/core/libnl/PKGBUILD @@ -1,28 +1,31 @@ -# $Id: PKGBUILD 137795 2011-09-11 08:35:21Z pierre $ +# $Id: PKGBUILD 150892 2012-02-23 13:54:02Z allan $ # Maintainer: Jan de Groot # Contributor: William Rea pkgname=libnl -pkgver=1.1 -pkgrel=3 +pkgver=3.2.7 +pkgrel=1 pkgdesc="Library for applications dealing with netlink sockets" -arch=('i686' 'x86_64') +arch=(i686 x86_64) url="http://www.infradead.org/~tgr/libnl/" -license=('GPL') -depends=('glibc') -source=("http://www.infradead.org/~tgr/libnl/files/${pkgname}-${pkgver}.tar.gz" - 'fix-compilation.patch') -md5sums=('ae970ccd9144e132b68664f98e7ceeb1' - 'e1f5e82c8aa1b3ad025c7b588178de1e') +license=(GPL) +depends=(glibc) +backup=(etc/libnl/classid etc/libnl/pktloc) +options=(!libtool) +source=("$url/files/$pkgname-$pkgver.tar.gz") +md5sums=('6a233a9dffa0ee3a7f6110c95c5410ab') build() { - cd ${srcdir}/libnl-${pkgver} - patch -Np1 -i ${srcdir}/fix-compilation.patch - ./configure --prefix=/usr + cd "$srcdir/$pkgname-$pkgver" + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --sbindir=/usr/bin \ + --disable-static make } package() { - cd ${srcdir}/libnl-${pkgver} - make DESTDIR=${pkgdir} install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/core/libpcap/PKGBUILD b/core/libpcap/PKGBUILD index 0cddb1358..a528954b0 100644 --- a/core/libpcap/PKGBUILD +++ b/core/libpcap/PKGBUILD @@ -1,23 +1,26 @@ -# $Id: PKGBUILD 146220 2012-01-06 09:21:20Z thomas $ +# $Id: PKGBUILD 150894 2012-02-23 13:54:08Z allan $ # Maintainer: Thomas Bächler pkgname=libpcap pkgver=1.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="A system-independent interface for user-level packet capture" arch=('i686' 'x86_64') url="http://www.tcpdump.org/" license=('BSD') depends=('glibc' 'libnl' 'sh') makedepends=('flex') -source=(http://www.tcpdump.org/release/libpcap-${pkgver}.tar.gz - http://www.tcpdump.org/release/libpcap-1.2.1.tar.gz.sig) +source=(http://www.tcpdump.org/release/libpcap-${pkgver}.tar.gz{,.sig} + libnl32.patch) sha256sums=('a135a6ef7e539729a57c7ed345bdb9b64159e13404174006a7972eb33f00debd' - 'dc82ca7e7f737885969af0f78ad0f0eef8206062087e0261ca2799ef26d569b4') + 'dc82ca7e7f737885969af0f78ad0f0eef8206062087e0261ca2799ef26d569b4' + '7d0cbd49e55405cb2b55852223cd4965526e518cfb4f547ab9cc9b95b8f9c9e6') build() { cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --enable-ipv6 + patch -Np1 -i "${srcdir}/libnl32.patch" + autoreconf -f -i + ./configure --prefix=/usr --enable-ipv6 --with-libnl make } diff --git a/core/libpcap/libnl32.patch b/core/libpcap/libnl32.patch new file mode 100644 index 000000000..633fd003e --- /dev/null +++ b/core/libpcap/libnl32.patch @@ -0,0 +1,19 @@ +diff -u -r libpcap-1.2.1/configure.in libpcap-1.2.1-libnl32/configure.in +--- libpcap-1.2.1/configure.in 2012-01-02 01:47:37.000000000 +0100 ++++ libpcap-1.2.1-libnl32/configure.in 2012-02-09 19:29:29.405603749 +0100 +@@ -433,12 +433,13 @@ + # + # Try libnl 2.x first. + # +- AC_CHECK_LIB(nl, nl_socket_alloc, ++ AC_CHECK_LIB(nl-3, nl_socket_alloc, + [ + # + # Yes, we have libnl 2.x. + # +- LIBS="-lnl-genl -lnl $LIBS" ++ LIBS="$(pkg-config --libs libnl-genl-3.0 libnl-3.0) $LIBS" ++ V_INCLS="$V_INCLS $(pkg-config --cflags libnl-genl-3.0 libnl-3.0)" + AC_DEFINE(HAVE_LIBNL,1,[if libnl exists]) + AC_DEFINE(HAVE_LIBNL_2_x,1,[if libnl exists and is version 2.x]) + ], diff --git a/core/man-db/PKGBUILD b/core/man-db/PKGBUILD index ca050cef0..830a0f4cf 100644 --- a/core/man-db/PKGBUILD +++ b/core/man-db/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 143802 2011-11-29 13:32:56Z stephane $ +# $Id: PKGBUILD 150921 2012-02-23 15:44:07Z andyrtr $ # Maintainer: Andreas Radke # Contributor: Sergej Pupykin pkgname=man-db -pkgver=2.6.0.2 -pkgrel=3 +pkgver=2.6.1 +pkgrel=1 pkgdesc="A utility for reading man pages" arch=('i686' 'x86_64') url="http://www.nongnu.org/man-db/" @@ -19,19 +19,14 @@ provides=('man') replaces=('man') install=${pkgname}.install source=(http://savannah.nongnu.org/download/man-db/$pkgname-$pkgver.tar.gz - 1361_1360.diff - #http://launchpad.net/man-db/main/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz convert-mans man-db.cron.daily) options=('!libtool') -md5sums=('2b41c96efec032d2b74ccbf2e401f93e' - '08b76b1f924c5493a280b79fc0aebde4' +md5sums=('79658e8695c7b9b3be1ee340d78a4692' '2b7662a7d5b33fe91f9f3e034361a2f6' 'd30c39ae47560304471b5461719e0f03') build() { cd ${srcdir}/${pkgname}-${pkgver} - # https://bugs.archlinux.org/task/18722 - patch -Np0 -i $srcdir/1361_1360.diff ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ --with-db=gdbm --disable-setuid --enable-mandirs=GNU \ --with-sections="1 n l 8 3 0 2 5 4 9 6 7" diff --git a/core/wpa_supplicant/PKGBUILD b/core/wpa_supplicant/PKGBUILD index 493dbf5f3..b8f264e29 100644 --- a/core/wpa_supplicant/PKGBUILD +++ b/core/wpa_supplicant/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 142217 2011-11-06 10:21:29Z thomas $ +# $Id: PKGBUILD 150896 2012-02-23 13:54:14Z allan $ # Maintainer: Thomas Bächler pkgname=wpa_supplicant pkgver=0.7.3 -pkgrel=4 +pkgrel=5 pkgdesc="A utility providing key negotiation for WPA wireless networks" url="http://hostap.epitest.fi/wpa_supplicant" arch=('i686' 'x86_64') @@ -13,13 +13,17 @@ license=('GPL') groups=('base') backup=('etc/wpa_supplicant.conf') source=(http://hostap.epitest.fi/releases/wpa_supplicant-$pkgver.tar.gz - config dbus.patch) + config dbus.patch hostap_allow-linking-with-libnl-3.2.patch) sha256sums=('d0cd50caa85346ccc376dcda5ed3c258eef19a93b3cade39d25760118ad59443' - '6a0837f18e5ff179ccd6954f7952dfc2e6aa69f353194ee4cb29c1ed2ef68c5d' - '13effa9ed6a1bb940ffc056a3eabcf64c8cc057069eca5cc1822b98ed769812a') + 'd00f306e53c22cc0d7352a0d4ed701fd77b9ff20e3a2422d81ac1fddcc11dff4' + '13effa9ed6a1bb940ffc056a3eabcf64c8cc057069eca5cc1822b98ed769812a' + 'ac805bf6e5aaec733dfc2c333417e519239cd58663a6e1cb34a54fd0f2bcc3c5') build() { - cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}" + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "$srcdir/hostap_allow-linking-with-libnl-3.2.patch" + + cd ${pkgname} # Required by NetworkManager 0.8.995 patch -Np2 -i "$srcdir/dbus.patch" cp "${srcdir}/config" ./.config diff --git a/core/wpa_supplicant/config b/core/wpa_supplicant/config index 192e338f2..eef35d045 100644 --- a/core/wpa_supplicant/config +++ b/core/wpa_supplicant/config @@ -402,3 +402,5 @@ CONFIG_DEBUG_FILE=y #LIBS += -lbfd -liberty -lz #LIBS_p += -lbfd -liberty -lz #LIBS_c += -lbfd -liberty -lz + +CONFIG_LIBNL32=y diff --git a/core/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch b/core/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch new file mode 100644 index 000000000..8e7cd9a97 --- /dev/null +++ b/core/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch @@ -0,0 +1,42 @@ +Subject: [RFC] hostap: Allow linking with libnl-3. +Date: Tue, 15 Nov 2011 14:30:04 -0000 +From: Ben Greear + +I needed this patch to compile against the latest +libnl code. I added this to my config file: + +CONFIG_LIBNL32=y + +Signed-hostap: Ben Greear +rediffed against 0.7.3 by Stefan Lippers-Hollmann + +--- +:100644 100644 5caeec5... 0cc81f9... M src/drivers/drivers.mak + src/drivers/drivers.mak | 21 ++++++++++++++------- + 2 files changed, 29 insertions(+), 14 deletions(-) + +--- a/src/drivers/drivers.mak ++++ b/src/drivers/drivers.mak +@@ -31,11 +31,18 @@ NEED_SME=y + NEED_AP_MLME=y + NEED_NETLINK=y + NEED_LINUX_IOCTL=y +-DRV_LIBS += -lnl ++ifdef CONFIG_LIBNL32 ++ DRV_LIBS += -lnl-3 ++ DRV_LIBS += -lnl-genl-3 ++ DRV_CFLAGS += -DCONFIG_LIBNL20 ++ DRV_CFLAGS += -I/usr/include/libnl3/ ++else ++ DRV_LIBS += -lnl + +-ifdef CONFIG_LIBNL20 +-DRV_LIBS += -lnl-genl +-DRV_CFLAGS += -DCONFIG_LIBNL20 ++ ifdef CONFIG_LIBNL20 ++ DRV_LIBS += -lnl-genl ++ DRV_CFLAGS += -DCONFIG_LIBNL20 ++ endif + endif + endif + -- cgit v1.2.3-54-g00ecf