From 68998b64e2d81f7e77184b7f23ee141da1d0e2ff Mon Sep 17 00:00:00 2001 From: Parabola Date: Fri, 17 Feb 2012 19:21:14 +0000 Subject: Fri Feb 17 19:21:14 UTC 2012 --- staging/bluez/PKGBUILD | 86 ----- staging/bluez/bluetooth.conf.d | 30 -- staging/bluez/fix-a2dp.patch | 68 ---- staging/bluez/rc.bluetooth | 100 ----- staging/crda/PKGBUILD | 41 --- staging/crda/crda.install | 18 - staging/crda/crda.rc | 26 -- staging/crda/libnl32.patch | 12 - staging/iw/PKGBUILD | 24 -- staging/kismet/PKGBUILD | 57 --- staging/kismet/kismet.changelog | 29 -- staging/kismet/kismet.install | 34 -- staging/libnl/PKGBUILD | 31 -- staging/libnl1/PKGBUILD | 28 -- staging/libnl1/fix-compilation.patch | 10 - staging/libnova/PKGBUILD | 27 -- staging/libpcap/PKGBUILD | 41 --- staging/libpcap/libnl32.patch | 19 - staging/net-snmp/PKGBUILD | 58 --- staging/net-snmp/libnl32.patch | 80 ---- staging/net-snmp/snmpd.confd | 5 - staging/net-snmp/snmpd.rc | 39 -- staging/networkmanager/NetworkManager.conf | 2 - staging/networkmanager/PKGBUILD | 63 ---- staging/networkmanager/disable_set_hostname.patch | 19 - staging/networkmanager/networkmanager.install | 9 - staging/ntrack/PKGBUILD | 33 -- staging/ntrack/libnl3.patch | 99 ----- staging/wpa_supplicant/PKGBUILD | 49 --- staging/wpa_supplicant/config | 406 --------------------- staging/wpa_supplicant/dbus.patch | 61 ---- .../hostap_allow-linking-with-libnl-3.2.patch | 42 --- 32 files changed, 1646 deletions(-) delete mode 100644 staging/bluez/PKGBUILD delete mode 100644 staging/bluez/bluetooth.conf.d delete mode 100644 staging/bluez/fix-a2dp.patch delete mode 100644 staging/bluez/rc.bluetooth delete mode 100644 staging/crda/PKGBUILD delete mode 100644 staging/crda/crda.install delete mode 100755 staging/crda/crda.rc delete mode 100644 staging/crda/libnl32.patch delete mode 100644 staging/iw/PKGBUILD delete mode 100644 staging/kismet/PKGBUILD delete mode 100644 staging/kismet/kismet.changelog delete mode 100644 staging/kismet/kismet.install delete mode 100644 staging/libnl/PKGBUILD delete mode 100644 staging/libnl1/PKGBUILD delete mode 100644 staging/libnl1/fix-compilation.patch delete mode 100644 staging/libnova/PKGBUILD delete mode 100644 staging/libpcap/PKGBUILD delete mode 100644 staging/libpcap/libnl32.patch delete mode 100644 staging/net-snmp/PKGBUILD delete mode 100644 staging/net-snmp/libnl32.patch delete mode 100644 staging/net-snmp/snmpd.confd delete mode 100644 staging/net-snmp/snmpd.rc delete mode 100644 staging/networkmanager/NetworkManager.conf delete mode 100644 staging/networkmanager/PKGBUILD delete mode 100644 staging/networkmanager/disable_set_hostname.patch delete mode 100644 staging/networkmanager/networkmanager.install delete mode 100644 staging/ntrack/PKGBUILD delete mode 100644 staging/ntrack/libnl3.patch delete mode 100644 staging/wpa_supplicant/PKGBUILD delete mode 100644 staging/wpa_supplicant/config delete mode 100644 staging/wpa_supplicant/dbus.patch delete mode 100644 staging/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch (limited to 'staging') diff --git a/staging/bluez/PKGBUILD b/staging/bluez/PKGBUILD deleted file mode 100644 index e54c8da73..000000000 --- a/staging/bluez/PKGBUILD +++ /dev/null @@ -1,86 +0,0 @@ -# $Id: PKGBUILD 149719 2012-02-09 18:45:25Z heftig $ -# Maintainer: -# Contributor: Andrea Scarpino -# Contributor: Geoffroy Carrier - -pkgname=bluez -pkgver=4.98 -pkgrel=3 -pkgdesc="Libraries and tools for the Bluetooth protocol stack" -url="http://www.bluez.org/" -arch=('i686' 'x86_64') -license=('GPL2') -depends=('dbus-core') -makedepends=('gstreamer0.10-base' 'libusb-compat' 'libsndfile') -optdepends=("gstreamer0.10-base: bluetooth GStreamer support" - "alsa-lib: Audio bluetooth devices support" - "dbus-python: to run bluez-simple-agent" - "pygobject: to run bluez-simple-agent" - "libusb-compat: USB adapters support" - "cups: CUPS backend") -conflicts=('bluez-libs' 'bluez-utils') -provides=('bluez-libs' 'bluez-utils') -replaces=('bluez-libs' 'bluez-utils') -options=('!libtool' 'emptydirs') -backup=(etc/bluetooth/{main,rfcomm,audio,network,input,serial}.conf - 'etc/conf.d/bluetooth' 'etc/dbus-1/system.d/bluetooth.conf') -source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2" - 'bluetooth.conf.d' 'rc.bluetooth' 'fix-a2dp.patch') -md5sums=('4aca8a0929250212e9a75fb60dd75b05' - '7412982b440f29fa7f76a41a87fef985' - '8f9498707f809506928b2e480d3b6789' - 'd6a34317e56b7c2bd990791d89d6c3cb') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -Np1 -i "${srcdir}/fix-a2dp.patch" - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/lib \ - --enable-gstreamer \ - --enable-alsa \ - --enable-usb \ - --enable-tools \ - --enable-bccmd \ - --enable-dfutool \ - --enable-hid2hci \ - --enable-hidd \ - --enable-pand \ - --enable-dund \ - --enable-cups \ - --enable-wiimote \ - --disable-test - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - - install -Dm755 ${srcdir}/rc.bluetooth ${pkgdir}/etc/rc.d/bluetooth - - install -d ${pkgdir}/etc/bluetooth - install -m644 network/network.conf \ - input/input.conf \ - audio/audio.conf \ - serial/serial.conf \ - ${pkgdir}/etc/bluetooth/ - - install -Dm644 ${srcdir}/bluetooth.conf.d \ - ${pkgdir}/etc/conf.d/bluetooth - - # FS#27630 - install -Dm755 test/simple-agent "${pkgdir}"/usr/bin/bluez-simple-agent - install -Dm755 test/test-device "${pkgdir}"/usr/bin/bluez-test-device - install -Dm755 test/test-input "${pkgdir}"/usr/bin/bluez-test-input - sed -i 's#/usr/bin/python#/usr/bin/python2#' \ - "${pkgdir}"/usr/bin/bluez-simple-agent \ - "${pkgdir}"/usr/bin/bluez-test-device \ - "${pkgdir}"/usr/bin/bluez-test-input - - # http://mailman.archlinux.org/pipermail/arch-general/2011-April/019787.html - rm "${pkgdir}"/lib/udev/rules.d/97-bluetooth.rules -} diff --git a/staging/bluez/bluetooth.conf.d b/staging/bluez/bluetooth.conf.d deleted file mode 100644 index 1c1e02589..000000000 --- a/staging/bluez/bluetooth.conf.d +++ /dev/null @@ -1,30 +0,0 @@ -# Bluetooth configuraton file - -# Bluetooth services (allowed values are "true" and "false") - -# Run the bluetoothd daemon (default: true) -#DAEMON_ENABLE="false" - -# Run the sdp daemon (default: false) -# If this is disabled, hcid's internal sdp daemon will be used -#SDPD_ENABLE="true" - -# Run the bluetooth HID daemon (default: false) -#HIDD_ENABLE="true" - -# Activate rfcomm ports (default: false) -#RFCOMM_ENABLE="true" - -# Run bluetooth dial-up networking daemon (default: false) -#DUND_ENABLE="true" - -# Run bluetooth PAN daemon (default: false) -#PAND_ENABLE="true" - -# rfcomm configuration file (default: /etc/bluetooth/rfcomm.conf) -#RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf" - -# Options for hidd, dund and pand (default: none) -HIDD_OPTIONS="--server" -#DUND_OPTIONS="" -#PAND_OPTIONS="" diff --git a/staging/bluez/fix-a2dp.patch b/staging/bluez/fix-a2dp.patch deleted file mode 100644 index e4bb1372a..000000000 --- a/staging/bluez/fix-a2dp.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 0109fa0b6fa731c00b4c6b78d5694b2aaa088862 Mon Sep 17 00:00:00 2001 -From: Luiz Augusto von Dentz -Date: Thu, 26 Jan 2012 23:39:02 +0200 -Subject: [PATCH] audio: Fix disabling local A2DP endpoints when UNIX socket - is disabled - -Local endpoints can only be used when UNIX socket API is available. ---- - audio/a2dp.c | 15 +++++++-------- - 1 files changed, 7 insertions(+), 8 deletions(-) - -diff --git a/audio/a2dp.c b/audio/a2dp.c -index 5ca105c..bbb91ce 100644 ---- a/audio/a2dp.c -+++ b/audio/a2dp.c -@@ -1388,9 +1388,9 @@ static struct a2dp_server *find_server(GSList *list, const bdaddr_t *src) - - int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config) - { -- int sbc_srcs = 1, sbc_sinks = 1; -+ int sbc_srcs = 0, sbc_sinks = 0; - int mpeg12_srcs = 0, mpeg12_sinks = 0; -- gboolean source = TRUE, sink = FALSE, socket = TRUE; -+ gboolean source = TRUE, sink = FALSE, socket = FALSE; - gboolean delay_reporting = FALSE; - char *str; - GError *err = NULL; -@@ -1410,6 +1410,8 @@ int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config) - source = TRUE; - if (strstr(str, "Source")) - sink = TRUE; -+ if (strstr(str, "Socket")) -+ socket = TRUE; - g_free(str); - } - -@@ -1429,18 +1431,14 @@ int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config) - } - - /* Don't register any local sep if Socket is disabled */ -- if (socket == FALSE) { -- sbc_srcs = 0; -- sbc_sinks = 0; -- mpeg12_srcs = 0; -- mpeg12_sinks = 0; -+ if (socket == FALSE) - goto proceed; -- } - - str = g_key_file_get_string(config, "A2DP", "SBCSources", &err); - if (err) { - DBG("audio.conf: %s", err->message); - g_clear_error(&err); -+ sbc_srcs = 1; - } else { - sbc_srcs = atoi(str); - g_free(str); -@@ -1459,6 +1457,7 @@ int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config) - if (err) { - DBG("audio.conf: %s", err->message); - g_clear_error(&err); -+ sbc_sinks = 1; - } else { - sbc_sinks = atoi(str); - g_free(str); --- -1.7.6.5 - diff --git a/staging/bluez/rc.bluetooth b/staging/bluez/rc.bluetooth deleted file mode 100644 index a46ee2abb..000000000 --- a/staging/bluez/rc.bluetooth +++ /dev/null @@ -1,100 +0,0 @@ -#!/bin/bash -# -# Start/stop the Bluetooth daemons -# - -. /etc/rc.conf -. /etc/rc.d/functions - -DAEMON_NAME="bluetoothd" -HIDD_NAME="hidd" -RFCOMM_NAME="rfcomm" -PAND_NAME="pand" -DUND_NAME="dund" - -DAEMON_EXEC="/usr/sbin/bluetoothd" -HIDD_EXEC="/usr/bin/hidd" -RFCOMM_EXEC="/usr/bin/rfcomm" -PAND_EXEC="/usr/bin/pand" -DUND_EXEC="/usr/bin/dund" - -DAEMON_ENABLE="true" -HIDD_ENABLE="false" -RFCOMM_ENABLE="false" -DUND_ENABLE="false" -PAND_ENABLE="false" - -RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf" - -HIDD_OPTIONS="" -DUND_OPTIONS="" -PAND_OPTIONS="" - -[ -f /etc/conf.d/bluetooth ] && . /etc/conf.d/bluetooth - -case "$1" in - start) - stat_busy "Starting bluetooth subsystem:" - if [ "$DAEMON_ENABLE" = "true" -a -x "$DAEMON_EXEC" ] ; then - stat_append " $DAEMON_NAME" - $DAEMON_EXEC - sleep 1 - fi - if [ "$SDPD_ENABLE" = "true" -a -x "$SDPD_EXEC" ] ; then - stat_append " $SDPD_NAME" - $SDPD_EXEC - fi - if [ "$HIDD_ENABLE" = "true" -a -x "$HIDD_EXEC" ]; then - stat_append " $HIDD_NAME" - $HIDD_EXEC $HIDD_OPTIONS - fi - if [ "$RFCOMM_ENABLE" = "true" -a -x "$RFCOMM_EXEC" -a -f "$RFCOMM_CONFIG" ]; then - stat_append " $RFCOMM_NAME" - $RFCOMM_EXEC -f $RFCOMM_CONFIG bind all - fi - if [ "$DUND_ENABLE" = "true" -a -x "$DUND_EXEC" -a -n "$DUND_OPTIONS" ]; then - stat_append " $DUND_NAME" - $DUND_EXEC $DUND_OPTIONS - fi - if [ "$PAND_ENABLE" = "true" -a -x "$PAND_EXEC" -a -n "$PAND_OPTIONS" ]; then - stat_append " $PAND_NAME" - $PAND_EXEC $PAND_OPTIONS - fi - add_daemon bluetooth - stat_done - ;; - stop) - stat_busy "Stopping bluetooth subsystem:" - - stat_append " $PAND_NAME" - killall $PAND_NAME >/dev/null 2>&1 - - stat_append " $DUND_NAME" - killall $DUND_NAME >/dev/null 2>&1 - - if [ -x "$RFCOMM_EXEC" ]; then - stat_append " $RFCOMM_NAME" - $RFCOMM_EXEC release all >/dev/null 2>&1 - fi - - stat_append " $HIDD_NAME" - killall $HIDD_NAME >/dev/null 2>&1 - - stat_append " $SDPD_NAME" - killall $SDPD_NAME >/dev/null 2>&1 - - stat_append " $DAEMON_NAME" - killall $DAEMON_NAME >/dev/null 2>&1 - - rm_daemon bluetooth - stat_done - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/staging/crda/PKGBUILD b/staging/crda/PKGBUILD deleted file mode 100644 index 163872220..000000000 --- a/staging/crda/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 149713 2012-02-09 17:56:54Z heftig $ -# Maintainer: Thomas Bächler - -pkgname=crda -pkgver=1.1.2 -pkgrel=2 -pkgdesc="Central Regulatory Domain Agent for wireless networks" -arch=(i686 x86_64) -url="http://wireless.kernel.org/en/developers/Regulatory/CRDA" -license=('custom') -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 libnl32.patch) -md5sums=('5226f65aebacf94baaf820f8b4e06df4' - '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 -} - -package() { - # Install crda, regdbdump and udev rules - msg "Installing crda ..." - cd "${srcdir}"/${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install - # This rule automatically sets the regulatory domain when cfg80211 is loaded - echo 'ACTION=="add" SUBSYSTEM=="module", DEVPATH=="/module/cfg80211", RUN+="/etc/rc.d/wireless-regdom start >/dev/null"' >> "${pkgdir}"/lib/udev/rules.d/85-regulatory.rules - - msg "Installing license ..." - install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/LICENSE "${pkgdir}"/usr/share/licenses/crda/LICENSE - - msg "Installing boot script ..." - install -D -m755 "${srcdir}"/crda.rc "${pkgdir}"/etc/rc.d/wireless-regdom -} diff --git a/staging/crda/crda.install b/staging/crda/crda.install deleted file mode 100644 index c18e15f71..000000000 --- a/staging/crda/crda.install +++ /dev/null @@ -1,18 +0,0 @@ -## arg 1: the new package version -post_install() { - echo "Uncomment the right regulatory domain in /etc/conf.d/wireless-regdom." - echo "It will automatically be set when necessary." -} - -## arg 1: the new package version -## arg 2: the old package version -post_upgrade() { - # In an upgrade from 1.0.1-1 or older, the wireless-regdom file moves from the crda package - # to the new wireless-regdb package. If the user changed the file, it is save to overwrite the one - # from wireless-regdb by the user-defined one - if [ $(vercmp $2 1.0.1-2) -lt 0 ]; then - if [ -f /etc/conf.d/wireless-regdom.pacorig -a -n "$(grep -v ^# /etc/conf.d/wireless-regdom.pacorig 2>/dev/null | grep -v ^$)" ]; then - mv /etc/conf.d/wireless-regdom.pacorig /etc/conf.d/wireless-regdom - fi - fi -} diff --git a/staging/crda/crda.rc b/staging/crda/crda.rc deleted file mode 100755 index 13dbd870e..000000000 --- a/staging/crda/crda.rc +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/wireless-regdom - -case "$1" in - start) - if [ -n "${WIRELESS_REGDOM}" ]; then - stat_busy "Setting wireless regulatory domain: ${WIRELESS_REGDOM}" - if iw reg set ${WIRELESS_REGDOM}; then - stat_done - else - stat_fail - fi - fi - ;; - stop) - ;; - restart) - $0 start - ;; - *) - echo "usage: $0 start" -esac -exit 0 diff --git a/staging/crda/libnl32.patch b/staging/crda/libnl32.patch deleted file mode 100644 index 682b6c5de..000000000 --- a/staging/crda/libnl32.patch +++ /dev/null @@ -1,12 +0,0 @@ -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/staging/iw/PKGBUILD b/staging/iw/PKGBUILD deleted file mode 100644 index c2b7b1dc9..000000000 --- a/staging/iw/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 149711 2012-02-09 17:33:21Z heftig $ -# Maintainer: Thomas Bächler - -pkgname=iw -pkgver=3.3 -pkgrel=2 -pkgdesc="nl80211 based CLI configuration utility for wireless devices" -arch=("i686" "x86_64") -url="http://wireless.kernel.org/en/users/Documentation/iw" -license=("GPL") -depends=("libnl") -makedepends=("kernel-headers") -source=(http://wireless.kernel.org/download/$pkgname/$pkgname-$pkgver.tar.bz2) -sha256sums=('567f0d389dd7c9919832101aaa8e3863a463cb505545534eb46b4ddab4400e60') - -build() { - cd "$srcdir"/$pkgname-$pkgver - make -} - -package() { - cd "$srcdir"/$pkgname-$pkgver - make DESTDIR="$pkgdir" install -} diff --git a/staging/kismet/PKGBUILD b/staging/kismet/PKGBUILD deleted file mode 100644 index 0357b6294..000000000 --- a/staging/kismet/PKGBUILD +++ /dev/null @@ -1,57 +0,0 @@ -# $Id: PKGBUILD 149761 2012-02-10 10:39:40Z eric $ -# Maintainer: Angel Velasquez -# Contributor: Jason Chu -# Contributor: Juergen Hoetzel - -pkgname=kismet -pkgver=2011_03_R2 -_realver="${pkgver//_/-}" -pkgrel=4 -pkgdesc="802.11 layer2 wireless network detector, sniffer, and intrusion detection system" -arch=('i686' 'x86_64') -url="http://www.kismetwireless.net/" -license=('GPL') -depends=('libcap' 'libnl1' 'pcre' 'ncurses' 'libpcap>=1.0.0' 'bluez' 'openssl') # already in core: ('linux-api-headers' 'glibc' 'libusb' 'libusb-compat') -makedepends=() # already in core: ('grep' 'gcc-libs') -optdepends=('gpsd: log coordinates of detected networks' - 'wireshark-cli: provide OUI files used to determine device manufacturer' - 'wireshark-cli: mergecap, to merge multiple capture files' - 'sox: provide the default kismet sound playback binary' - 'festival: text-to-speech support' - 'flite: alternative/lightweight text-to-speech support' - 'mac80211-driver: full rfmon support' - 'ruby: ruby interface') -backup=('etc/kismet.conf' 'etc/kismet_drone.conf') -install=kismet.install -changelog=kismet.changelog -source=("http://www.kismetwireless.net/code/${pkgname}-${_realver}.tar.gz") -md5sums=('8bf077e8111e6dc8c12cadefdf40aadd') - -build() { - cd "${srcdir}/${pkgname}-${_realver}" - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var - make dep - make - - # Include plugins bundled with kismet - make plugins -} - -package() { - cd "${srcdir}/${pkgname}-${_realver}" - - # Install kismet - make DESTDIR="$pkgdir" install - - # Install plugins - make plugins-install DESTDIR="$pkgdir" - - # the README is very comprehensive, a good idea to include it - install -D -m 644 "${srcdir}/kismet-${_realver}/README" "${pkgdir}/usr/share/kismet/README" - - # Our own suid-install, first half (see kismet.install) - install -o "root" -g "root" -m 4550 kismet_capture "${pkgdir}/usr/bin/" -} diff --git a/staging/kismet/kismet.changelog b/staging/kismet/kismet.changelog deleted file mode 100644 index 3078d0625..000000000 --- a/staging/kismet/kismet.changelog +++ /dev/null @@ -1,29 +0,0 @@ -2012-02-10 Eric Bélanger - * Change libnl depends to libnl1 - -2010-05-07 Angel Velasquez - * ChangeLog added - - * Removed old patches from SVN - - * Applied changes from FS#15746 thanks to people who worked on it. - - * Files that are no longer shipped and so should not be backed up: - backup=('etc/ap_manuf' 'etc/client_manuf' 'etc/kismet_ui.conf') - - * No longer needed; gpsmap is deprecated and being replaced with a tile-based - mapper, as of yet incomplete - optdepends=('perl-libwww: fetch maps for gpsmap') - - * Configuration has completely changed, no longer containing - references to either prism2 or wlanng - sed -i 's/prism2/wlanng/g' conf/kismet.conf - - * Ownership of man pages now defaults to "root" if the group "man" does not exist - chown root:root "$pkgdir"/usr/share/man/man{1,5}/* - - * Dependencies no longer needed - depends=('gmp' 'imagemagick' 'dbus' 'libjpeg>=7') - - * Options no longer needed - options=('!makeflags') diff --git a/staging/kismet/kismet.install b/staging/kismet/kismet.install deleted file mode 100644 index 0bc806034..000000000 --- a/staging/kismet/kismet.install +++ /dev/null @@ -1,34 +0,0 @@ -## arg 1: the new package version -post_install() { - post_upgrade - - cat << EOP - If you have not done so already, read the README file and the FAQ file. - You MUST edit /etc/kismet.conf and configure Kismet for your system, or - it will NOT run properly!" - - Kismet has been installed with a SUID ROOT CAPTURE HELPER executeable by - users in the group ' kismet '. This WILL ALLOW USERS IN THIS GROUP - TO ALTER YOUR NETWORK INTERACE STATES, but is more secure than running - all of Kismet as root. ONLY users in this group will be able to - run Kismet and capture from physical network devices. -EOP -} - -## arg 1: the new package version -## arg 2: the old package version -post_upgrade() { - # Add the group needed to use the limited-functionality binary "kismet_capture" - # Change group ownership of "kismet_capture" to this new group - # Preserve the file mode bits of "kismet_capture" - getent group "kismet" &>/dev/null || /usr/sbin/groupadd -r -g 315 kismet &>/dev/null - chown root:kismet "/usr/bin/kismet_capture" - chmod 4550 "/usr/bin/kismet_capture" -} - -## arg 1: the old package version -post_remove() { - getent group "kismet" &>/dev/null && /usr/sbin/groupdel kismet &>/dev/null -} - -# vim:set ts=2 sw=2 et: diff --git a/staging/libnl/PKGBUILD b/staging/libnl/PKGBUILD deleted file mode 100644 index 835062bfb..000000000 --- a/staging/libnl/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 149708 2012-02-09 17:20:44Z heftig $ -# Maintainer: Jan de Groot -# Contributor: William Rea - -pkgname=libnl -pkgver=3.2.7 -pkgrel=1 -pkgdesc="Library for applications dealing with netlink sockets" -arch=(i686 x86_64) -url="http://www.infradead.org/~tgr/libnl/" -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/$pkgname-$pkgver" - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --sbindir=/usr/bin \ - --disable-static - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/staging/libnl1/PKGBUILD b/staging/libnl1/PKGBUILD deleted file mode 100644 index 15c0c45c1..000000000 --- a/staging/libnl1/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 149709 2012-02-09 17:21:50Z heftig $ -# Maintainer: Jan de Groot -# Contributor: William Rea - -pkgname=libnl1 -pkgver=1.1 -pkgrel=1 -pkgdesc="Library for applications dealing with netlink sockets (Legacy version)" -arch=('i686' 'x86_64') -url="http://www.infradead.org/~tgr/libnl/" -license=('GPL') -depends=('glibc') -source=("http://www.infradead.org/~tgr/libnl/files/libnl-${pkgver}.tar.gz" - 'fix-compilation.patch') -md5sums=('ae970ccd9144e132b68664f98e7ceeb1' - 'e1f5e82c8aa1b3ad025c7b588178de1e') - -build() { - cd ${srcdir}/libnl-${pkgver} - patch -Np1 -i ${srcdir}/fix-compilation.patch - ./configure --prefix=/usr - make -} - -package() { - cd ${srcdir}/libnl-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/staging/libnl1/fix-compilation.patch b/staging/libnl1/fix-compilation.patch deleted file mode 100644 index 891562a39..000000000 --- a/staging/libnl1/fix-compilation.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- libnl-1.1.orig/include/netlink-local.h 2008-01-14 16:48:45.000000000 +0100 -+++ libnl-1.1/include/netlink-local.h 2009-06-26 11:15:33.186011844 +0200 -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - - #include - #include diff --git a/staging/libnova/PKGBUILD b/staging/libnova/PKGBUILD deleted file mode 100644 index 27c98df9d..000000000 --- a/staging/libnova/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 150152 2012-02-13 15:39:56Z ronald $ -# Maintainer: Ronald van Haren -# Contributor: Tobias Powalowski - -pkgname=libnova -pkgver=0.14.0 -pkgrel=1 -pkgdesc="A general purpose, double precision, celestial mechanics, astrometry and astrodynamics library." -url="http://libnova.sourceforge.net/" -license=('GPL2') -arch=('i686' 'x86_64') -depends=('glibc') -makedepends=('pkgconfig') -source=(http://downloads.sourceforge.net/sourceforge/libnova/$pkgname-$pkgver.tar.gz) -options=(!libtool) -sha1sums=('4ea7034a907d0578646b0d12fc4a095de8b23f51') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/staging/libpcap/PKGBUILD b/staging/libpcap/PKGBUILD deleted file mode 100644 index ada9d9021..000000000 --- a/staging/libpcap/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 149717 2012-02-09 18:32:50Z heftig $ -# Maintainer: Thomas Bächler - -pkgname=libpcap -pkgver=1.2.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{,.sig} - libnl32.patch) -sha256sums=('a135a6ef7e539729a57c7ed345bdb9b64159e13404174006a7972eb33f00debd' - 'dc82ca7e7f737885969af0f78ad0f0eef8206062087e0261ca2799ef26d569b4' - '7d0cbd49e55405cb2b55852223cd4965526e518cfb4f547ab9cc9b95b8f9c9e6') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 -i "${srcdir}/libnl32.patch" - autoreconf -f -i - ./configure --prefix=/usr --enable-ipv6 --with-libnl - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - install -d -m755 ${pkgdir}/usr/bin - make DESTDIR=${pkgdir} install - # remove static library - rm -rf ${pkgdir}/usr/lib/libpcap.a - - # backwards compatibility, programs often look for net/bpf.h - mkdir -p ${pkgdir}/usr/include/net - cd ${pkgdir}/usr/include/net - ln -s ../pcap-bpf.h bpf.h - - #install the license - install -D -m644 ${srcdir}/$pkgname-$pkgver/LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE -} diff --git a/staging/libpcap/libnl32.patch b/staging/libpcap/libnl32.patch deleted file mode 100644 index 633fd003e..000000000 --- a/staging/libpcap/libnl32.patch +++ /dev/null @@ -1,19 +0,0 @@ -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/staging/net-snmp/PKGBUILD b/staging/net-snmp/PKGBUILD deleted file mode 100644 index e7120f95b..000000000 --- a/staging/net-snmp/PKGBUILD +++ /dev/null @@ -1,58 +0,0 @@ -# $Id: PKGBUILD 149723 2012-02-09 19:22:22Z heftig $ -# Maintainer: -# Contributor: Dale Blount - -pkgname=net-snmp -pkgver=5.7.1 -pkgrel=2 -pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6" -arch=('i686' 'x86_64') -url="http://www.net-snmp.org/" -license=('BSD') -depends=('openssl' 'libnl' 'pciutils') -makedepends=('python2-distribute') -optdepends=('perl-term-readkey: for snmpcheck application' - 'perl-tk: for snmpcheck and tkmib applications' - 'python2: for the python modules') -provides=('ucd-snmp') -backup=('etc/conf.d/snmpd') -options=('!libtool' '!makeflags' '!emptydirs') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc} - snmpd.confd snmpd.rc libnl32.patch) -sha1sums=('ddb82ce1112ef0642869d3c8d7c7e585f151849a' - '2bdc2839ce09d7daa608cd54687fa8beb47ed907' - 'cf811da9e57bbca34d8e2a3c358bb3bfc0c2b33b' - '90600c0141eed10d6e3ca3ccc97ad8dda15c2112' - '74a9848b95f63378eb1753fc309d2b74de5afb0f') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # http://sourceforge.net/tracker/index.php?func=detail&aid=3250304&group_id=12694&atid=112694 - patch -Np1 -i "$srcdir/libnl32.patch" - autoreconf -f -i - - sed -i -e "s:\(install --basedir=\$\$dir\):\1 --root='${pkgdir}':" Makefile.in - PYTHONPROG=/usr/bin/python2 ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --enable-ucd-snmp-compatibility \ - --enable-ipv6 \ - --with-python-modules \ - --with-default-snmp-version="3" \ - --with-sys-contact="root@localhost" \ - --with-sys-location="Unknown" \ - --with-logfile="/var/log/snmpd.log" \ - --with-mib-modules="host misc/ipfwacc ucd-snmp/diskio tunnel ucd-snmp/dlmod" \ - --with-persistent-directory="/var/net-snmp" \ - --disable-static - make NETSNMP_DONT_CHECK_VERSION=1 -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" INSTALL_PREFIX="${pkgdir}" INSTALLDIRS=vendor install - install -D -m755 "${srcdir}/snmpd.rc" "${pkgdir}/etc/rc.d/snmpd" - install -D -m644 "${srcdir}/snmpd.confd" "${pkgdir}/etc/conf.d/snmpd" - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/staging/net-snmp/libnl32.patch b/staging/net-snmp/libnl32.patch deleted file mode 100644 index d93d7ef67..000000000 --- a/staging/net-snmp/libnl32.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff -u -r net-snmp-5.7.1/agent/mibgroup/mibII/tcpTable.c net-snmp-5.7.1-libnl32/agent/mibgroup/mibII/tcpTable.c ---- net-snmp-5.7.1/agent/mibgroup/mibII/tcpTable.c 2011-09-28 06:53:47.000000000 +0200 -+++ net-snmp-5.7.1-libnl32/agent/mibgroup/mibII/tcpTable.c 2012-02-09 20:02:49.136022132 +0100 -@@ -566,8 +566,9 @@ - static int - tcpTable_load_netlink(void) - { -+ int err; - /* TODO: perhaps use permanent nl handle? */ -- struct nl_handle *nl = nl_handle_alloc(); -+ struct nl_sock *nl = nl_socket_alloc(); - - if (nl == NULL) { - DEBUGMSGTL(("mibII/tcpTable", "Failed to allocate netlink handle\n")); -@@ -575,10 +576,10 @@ - return -1; - } - -- if (nl_connect(nl, NETLINK_INET_DIAG) < 0) { -- DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink: %s\n", nl_geterror())); -- snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n", nl_geterror()); -- nl_handle_destroy(nl); -+ if ((err = nl_connect(nl, NETLINK_INET_DIAG)) < 0) { -+ DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink: %s\n", nl_geterror(err))); -+ snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n", nl_geterror(err)); -+ nl_socket_free(nl); - return -1; - } - -@@ -590,10 +591,10 @@ - struct nl_msg *nm = nlmsg_alloc_simple(TCPDIAG_GETSOCK, NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST); - nlmsg_append(nm, &req, sizeof(struct inet_diag_req), 0); - -- if (nl_send_auto_complete(nl, nm) < 0) { -- DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n", nl_geterror())); -- snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n", nl_geterror()); -- nl_handle_destroy(nl); -+ if ((err = nl_send_auto_complete(nl, nm)) < 0) { -+ DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n", nl_geterror(err))); -+ snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n", nl_geterror(err)); -+ nl_socket_free(nl); - return -1; - } - nlmsg_free(nm); -@@ -604,9 +605,9 @@ - - while (running) { - if ((len = nl_recv(nl, &peer, &buf, NULL)) <= 0) { -- DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n", nl_geterror())); -- snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n", nl_geterror()); -- nl_handle_destroy(nl); -+ DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n", nl_geterror(len))); -+ snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n", nl_geterror(len)); -+ nl_socket_free(nl); - return -1; - } - -@@ -655,7 +656,7 @@ - free(buf); - } - -- nl_handle_destroy(nl); -+ nl_socket_free(nl); - - if (tcp_head) { - DEBUGMSGTL(("mibII/tcpTable", "Loaded TCP Table using netlink\n")); -diff -u -r net-snmp-5.7.1/configure.d/config_os_libs2 net-snmp-5.7.1-libnl32/configure.d/config_os_libs2 ---- net-snmp-5.7.1/configure.d/config_os_libs2 2011-09-28 06:53:47.000000000 +0200 -+++ net-snmp-5.7.1-libnl32/configure.d/config_os_libs2 2012-02-09 20:10:44.282165275 +0100 -@@ -224,8 +224,9 @@ - if test "x$with_nl" != "xno"; then - case $target_os in - linux*) # Check for libnl (linux) -+ CPPFLAGS="$CPPFLAGS $(pkg-config --cflags-only-I libnl-3.0)" - NETSNMP_SEARCH_LIBS( -- nl_connect, nl, -+ nl_connect, nl-3, - [AC_CHECK_HEADERS(netlink/netlink.h)],,, LMIBLIBS) - ;; - esac diff --git a/staging/net-snmp/snmpd.confd b/staging/net-snmp/snmpd.confd deleted file mode 100644 index 926b09bbf..000000000 --- a/staging/net-snmp/snmpd.confd +++ /dev/null @@ -1,5 +0,0 @@ -# -# Parameters to be passed to snmpd -# -SNMPD_ARGS="" - diff --git a/staging/net-snmp/snmpd.rc b/staging/net-snmp/snmpd.rc deleted file mode 100644 index b00c09f4f..000000000 --- a/staging/net-snmp/snmpd.rc +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/snmpd - -PID=`pidof -o %PPID /usr/sbin/snmpd` -case "$1" in - start) - stat_busy "Starting Net-SNMP" - [ -z "$PID" ] && /usr/sbin/snmpd $SNMPD_ARGS - if [ $? -gt 0 ]; then - stat_fail - else - echo $PID > /var/run/snmpd.pid - add_daemon snmpd - stat_done - fi - ;; - stop) - stat_busy "Stopping Net-SNMP" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm /var/run/snmpd.pid - rm_daemon snmpd - stat_done - fi - ;; - restart) - $0 stop - sleep 2 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/staging/networkmanager/NetworkManager.conf b/staging/networkmanager/NetworkManager.conf deleted file mode 100644 index c37b59680..000000000 --- a/staging/networkmanager/NetworkManager.conf +++ /dev/null @@ -1,2 +0,0 @@ -[main] -plugins=keyfile diff --git a/staging/networkmanager/PKGBUILD b/staging/networkmanager/PKGBUILD deleted file mode 100644 index dd4713872..000000000 --- a/staging/networkmanager/PKGBUILD +++ /dev/null @@ -1,63 +0,0 @@ -# $Id: PKGBUILD 149721 2012-02-09 18:49:54Z heftig $ -# Maintainer: Jan de Groot -# Contri-butor: Wael Nasreddine -# Contributor: Tor Krill -# Contributor: Will Rea -# Contributor: Valentine Sinitsyn - -pkgname=networkmanager -pkgver=0.9.2.0 -pkgrel=2 -pkgdesc="Network Management daemon" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.gnome.org/projects/NetworkManager/" -depends=('dbus-glib' 'iproute2' 'libnl' 'nss' 'polkit' 'udev' 'wireless_tools' 'wpa_supplicant' 'ppp' 'dhcpcd') -makedepends=('intltool' 'dhclient' 'iptables' 'gobject-introspection') -optdepends=('modemmanager: for modem management service' - 'dhclient: alternative DHCP/DHCPv6 client' - 'iptables: Connection sharing' - 'dnsmasq: Connection sharing' - 'bluez: Bluetooth support' - 'openresolv: openresolv support') -options=('!libtool') -backup=('etc/NetworkManager/NetworkManager.conf') -install=networkmanager.install -source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.9/NetworkManager-${pkgver}.tar.xz - NetworkManager.conf disable_set_hostname.patch) -sha256sums=('437af9132a6fe1ff603cd981c0cfaa4557592b34782f9705e708d61365226ddf' - '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21' - '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460') - -build() { - cd "${srcdir}/NetworkManager-${pkgver}" - - patch -Np1 -i "${srcdir}/disable_set_hostname.patch" - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/usr/lib/networkmanager \ - --with-crypto=nss \ - --with-distro=arch \ - --with-dhclient=/usr/sbin/dhclient \ - --with-dhcpcd=/sbin/dhcpcd \ - --with-iptables=/usr/sbin/iptables \ - --with-systemdsystemunitdir=/lib/systemd/system \ - --with-resolvconf=/usr/sbin/resolvconf \ - --disable-static \ - --enable-more-warnings=no \ - --disable-wimax - - make -} - -package() { - cd "${srcdir}/NetworkManager-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -m644 "${srcdir}/NetworkManager.conf" "${pkgdir}/etc/NetworkManager/" - - rm -rf "${pkgdir}/var/run/" -} diff --git a/staging/networkmanager/disable_set_hostname.patch b/staging/networkmanager/disable_set_hostname.patch deleted file mode 100644 index ee95dd0e1..000000000 --- a/staging/networkmanager/disable_set_hostname.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Nur NetworkManager-0.9.0.orig/src/nm-policy.c NetworkManager-0.9.0/src/nm-policy.c ---- NetworkManager-0.9.0.orig/src/nm-policy.c 2011-08-23 06:41:02.099686450 +0000 -+++ NetworkManager-0.9.0/src/nm-policy.c 2011-08-23 06:43:38.227791737 +0000 -@@ -302,6 +302,7 @@ - return; - } - -+#if 0 - /* Try automatically determined hostname from the best device's IP config */ - if (!best4) - best4 = get_best_ip4_device (policy->manager, &best_req4); -@@ -356,6 +357,7 @@ - } - } - -+#endif - /* If no automatically-configured hostname, try using the hostname from - * when NM started up. - */ diff --git a/staging/networkmanager/networkmanager.install b/staging/networkmanager/networkmanager.install deleted file mode 100644 index de40c17ed..000000000 --- a/staging/networkmanager/networkmanager.install +++ /dev/null @@ -1,9 +0,0 @@ -post_upgrade() { - (( $(vercmp 0.8.3 $2) > 0 )) && cat < - -pkgname=ntrack -pkgver=16 -pkgrel=2 -epoch=1 -pkgdesc="A network connectivity tracking library" -arch=('i686' 'x86_64') -url="http://launchpad.net/ntrack/" -license=('LGPL') -depends=('qt' 'libnl') -makedepends=('python2') -options=('!libtool' '!emptydirs') -source=("http://launchpad.net/${pkgname}/main/0${pkgver}/+download/${pkgname}-0${pkgver}.tar.gz" - 'libnl3.patch') -md5sums=('21691dac43460a6791cba3decbc68242' - '0a1f6b7f9a01c323e81d6da95cad93cd') - -build() { - cd "${srcdir}/${pkgname}-0${pkgver}" - patch -p1 -i "${srcdir}"/libnl3.patch - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var - make -} - -package() { - cd "${srcdir}/${pkgname}-0${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/ntrack/libnl3.patch b/staging/ntrack/libnl3.patch deleted file mode 100644 index 879b52c8c..000000000 --- a/staging/ntrack/libnl3.patch +++ /dev/null @@ -1,99 +0,0 @@ -From: Mathieu Trudel-Lapierre -Subject: Disable -pedantic, it makes ntrack fail to build against libnl3 3.2 and glib. - -Index: ntrack/glib/Makefile.am -=================================================================== ---- ntrack.orig/glib/Makefile.am 2011-12-22 19:25:13.137470000 -0500 -+++ ntrack/glib/Makefile.am 2011-12-22 20:07:10.243344976 -0500 -@@ -26,7 +26,6 @@ - AM_CFLAGS = \ - -Wall \ - -Werror \ -- -pedantic \ - -I$(srcdir)/../common/ - - AM_LDFLAGS = -Index: ntrack/glib/Makefile.in -=================================================================== ---- ntrack.orig/glib/Makefile.in 2011-12-22 20:05:46.243208000 -0500 -+++ ntrack/glib/Makefile.in 2011-12-22 20:07:14.871344769 -0500 -@@ -325,7 +325,6 @@ - AM_CFLAGS = \ - -Wall \ - -Werror \ -- -pedantic \ - -I$(srcdir)/../common/ - - AM_LDFLAGS = -Index: ntrack/glib/test/Makefile.am -=================================================================== ---- ntrack.orig/glib/test/Makefile.am 2011-12-22 19:25:13.137470000 -0500 -+++ ntrack/glib/test/Makefile.am 2011-12-22 20:07:19.451344565 -0500 -@@ -27,7 +27,6 @@ - ../../common/libntrack.la - - AM_CFLAGS = \ -- -pedantic \ - -Wall \ - -Werror \ - -I$(srcdir)/.. \ -Index: ntrack/glib/test/Makefile.in -=================================================================== ---- ntrack.orig/glib/test/Makefile.in 2011-12-22 20:05:46.243208000 -0500 -+++ ntrack/glib/test/Makefile.in 2011-12-22 20:07:23.903344367 -0500 -@@ -260,7 +260,6 @@ - ../../common/libntrack.la - - AM_CFLAGS = \ -- -pedantic \ - -Wall \ - -Werror \ - -I$(srcdir)/.. \ -Index: ntrack/gobject/Makefile.am -=================================================================== ---- ntrack.orig/gobject/Makefile.am 2011-12-22 20:05:46.243208000 -0500 -+++ ntrack/gobject/Makefile.am 2011-12-22 20:07:27.515344206 -0500 -@@ -26,7 +26,6 @@ - AM_CFLAGS = \ - -Wall \ - -Werror \ -- -pedantic \ - -I$(srcdir)/../common/ \ - -I$(srcdir)/../glib/ - -Index: ntrack/gobject/Makefile.in -=================================================================== ---- ntrack.orig/gobject/Makefile.in 2011-12-22 20:05:46.243208000 -0500 -+++ ntrack/gobject/Makefile.in 2011-12-22 20:07:31.519344028 -0500 -@@ -347,7 +347,6 @@ - AM_CFLAGS = \ - -Wall \ - -Werror \ -- -pedantic \ - -I$(srcdir)/../common/ \ - -I$(srcdir)/../glib/ - -Index: ntrack/modules/Makefile.am -=================================================================== ---- ntrack.orig/modules/Makefile.am 2011-12-22 20:05:46.243208000 -0500 -+++ ntrack/modules/Makefile.am 2011-12-22 20:07:35.519343851 -0500 -@@ -26,7 +26,6 @@ - -Wall \ - -Werror \ - -Wno-variadic-macros \ -- -pedantic \ - -I$(top_srcdir)/common/ - - AM_LDFLAGS = -Index: ntrack/modules/Makefile.in -=================================================================== ---- ntrack.orig/modules/Makefile.in 2011-12-22 20:05:46.243208000 -0500 -+++ ntrack/modules/Makefile.in 2011-12-22 20:07:39.391343676 -0500 -@@ -352,7 +352,6 @@ - -Wall \ - -Werror \ - -Wno-variadic-macros \ -- -pedantic \ - -I$(top_srcdir)/common/ - - AM_LDFLAGS = diff --git a/staging/wpa_supplicant/PKGBUILD b/staging/wpa_supplicant/PKGBUILD deleted file mode 100644 index da34d9dc0..000000000 --- a/staging/wpa_supplicant/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 149715 2012-02-09 18:09:11Z heftig $ -# Maintainer: Thomas Bächler - -pkgname=wpa_supplicant -pkgver=0.7.3 -pkgrel=5 -pkgdesc="A utility providing key negotiation for WPA wireless networks" -url="http://hostap.epitest.fi/wpa_supplicant" -arch=('i686' 'x86_64') -depends=('openssl' 'dbus-core>=1.2.4' 'readline>=6.0' 'libnl') -optdepends=('wpa_supplicant_gui: wpa_gui program') -license=('GPL') -groups=('base') -backup=('etc/wpa_supplicant.conf') -source=(http://hostap.epitest.fi/releases/wpa_supplicant-$pkgver.tar.gz - config dbus.patch hostap_allow-linking-with-libnl-3.2.patch) -sha256sums=('d0cd50caa85346ccc376dcda5ed3c258eef19a93b3cade39d25760118ad59443' - 'd00f306e53c22cc0d7352a0d4ed701fd77b9ff20e3a2422d81ac1fddcc11dff4' - '13effa9ed6a1bb940ffc056a3eabcf64c8cc057069eca5cc1822b98ed769812a' - 'ac805bf6e5aaec733dfc2c333417e519239cd58663a6e1cb34a54fd0f2bcc3c5') - -build() { - 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 - sed -i 's@/usr/local@$(PREFIX)@g' Makefile - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}" - make PREFIX=/usr DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/etc" - install -m644 wpa_supplicant.conf "${pkgdir}/etc/wpa_supplicant.conf" - install -d -m755 "${pkgdir}/usr/share/man/man"{5,8} - install -m644 doc/docbook/*.5 "${pkgdir}/usr/share/man/man5/" - install -m644 doc/docbook/*.8 "${pkgdir}/usr/share/man/man8/" - rm -f "${pkgdir}/usr/share/man/man8/wpa_"{priv,gui}.8 - - install -m755 -d "${pkgdir}/usr/share/dbus-1/system-services" - install -m644 dbus/{fi.epitest.hostap.WPASupplicant.service,fi.w1.wpa_supplicant1.service} "${pkgdir}/usr/share/dbus-1/system-services/" - sed -e 's/sbin/usr\/sbin/' -i "${pkgdir}/usr/share/dbus-1/system-services/"*.service - install -m755 -d "${pkgdir}/etc/dbus-1/system.d" - install -m644 dbus/dbus-wpa_supplicant.conf "${pkgdir}/etc/dbus-1/system.d/wpa_supplicant.conf" -} diff --git a/staging/wpa_supplicant/config b/staging/wpa_supplicant/config deleted file mode 100644 index eef35d045..000000000 --- a/staging/wpa_supplicant/config +++ /dev/null @@ -1,406 +0,0 @@ -# Example wpa_supplicant build time configuration -# -# This file lists the configuration options that are used when building the -# hostapd binary. All lines starting with # are ignored. Configuration option -# lines must be commented out complete, if they are not to be included, i.e., -# just setting VARIABLE=n is not disabling that variable. -# -# This file is included in Makefile, so variables like CFLAGS and LIBS can also -# be modified from here. In most cases, these lines should use += in order not -# to override previous values of the variables. - - -# Uncomment following two lines and fix the paths if you have installed OpenSSL -# or GnuTLS in non-default location -#CFLAGS += -I/usr/local/openssl/include -#LIBS += -L/usr/local/openssl/lib - -# Some Red Hat versions seem to include kerberos header files from OpenSSL, but -# the kerberos files are not in the default include path. Following line can be -# used to fix build issues on such systems (krb5.h not found). -#CFLAGS += -I/usr/include/kerberos - -# Example configuration for various cross-compilation platforms - -#### sveasoft (e.g., for Linksys WRT54G) ###################################### -#CC=mipsel-uclibc-gcc -#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc -#CFLAGS += -Os -#CPPFLAGS += -I../src/include -I../../src/router/openssl/include -#LIBS += -L/opt/brcm/hndtools-mipsel-uclibc-0.9.19/lib -lssl -############################################################################### - -#### openwrt (e.g., for Linksys WRT54G) ####################################### -#CC=mipsel-uclibc-gcc -#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc -#CFLAGS += -Os -#CPPFLAGS=-I../src/include -I../openssl-0.9.7d/include \ -# -I../WRT54GS/release/src/include -#LIBS = -lssl -############################################################################### - - -# Driver interface for Host AP driver -#CONFIG_DRIVER_HOSTAP=y - -# Driver interface for Agere driver -#CONFIG_DRIVER_HERMES=y -# Change include directories to match with the local setup -#CFLAGS += -I../../hcf -I../../include -I../../include/hcf -#CFLAGS += -I../../include/wireless - -# Driver interface for madwifi driver -# Deprecated; use CONFIG_DRIVER_WEXT=y instead. -#CONFIG_DRIVER_MADWIFI=y -# Set include directory to the madwifi source tree -#CFLAGS += -I../../madwifi - -# Driver interface for ndiswrapper -# Deprecated; use CONFIG_DRIVER_WEXT=y instead. -#CONFIG_DRIVER_NDISWRAPPER=y - -# Driver interface for Atmel driver -#CONFIG_DRIVER_ATMEL=y - -# Driver interface for old Broadcom driver -# Please note that the newer Broadcom driver ("hybrid Linux driver") supports -# Linux wireless extensions and does not need (or even work) with the old -# driver wrapper. Use CONFIG_DRIVER_WEXT=y with that driver. -#CONFIG_DRIVER_BROADCOM=y -# Example path for wlioctl.h; change to match your configuration -#CFLAGS += -I/opt/WRT54GS/release/src/include - -# Driver interface for Intel ipw2100/2200 driver -# Deprecated; use CONFIG_DRIVER_WEXT=y instead. -#CONFIG_DRIVER_IPW=y - -# Driver interface for Ralink driver -#CONFIG_DRIVER_RALINK=y - -# Driver interface for generic Linux wireless extensions -CONFIG_DRIVER_WEXT=y - -# Driver interface for Linux drivers using the nl80211 kernel interface -CONFIG_DRIVER_NL80211=y - -# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver) -#CONFIG_DRIVER_BSD=y -#CFLAGS += -I/usr/local/include -#LIBS += -L/usr/local/lib -#LIBS_p += -L/usr/local/lib -#LIBS_c += -L/usr/local/lib - -# Driver interface for Windows NDIS -#CONFIG_DRIVER_NDIS=y -#CFLAGS += -I/usr/include/w32api/ddk -#LIBS += -L/usr/local/lib -# For native build using mingw -#CONFIG_NATIVE_WINDOWS=y -# Additional directories for cross-compilation on Linux host for mingw target -#CFLAGS += -I/opt/mingw/mingw32/include/ddk -#LIBS += -L/opt/mingw/mingw32/lib -#CC=mingw32-gcc -# By default, driver_ndis uses WinPcap for low-level operations. This can be -# replaced with the following option which replaces WinPcap calls with NDISUIO. -# However, this requires that WZC is disabled (net stop wzcsvc) before starting -# wpa_supplicant. -# CONFIG_USE_NDISUIO=y - -# Driver interface for development testing -#CONFIG_DRIVER_TEST=y - -# Include client MLME (management frame processing) for test driver -# This can be used to test MLME operations in hostapd with the test interface. -# space. -#CONFIG_CLIENT_MLME=y - -# Driver interface for wired Ethernet drivers -CONFIG_DRIVER_WIRED=y - -# Driver interface for the Broadcom RoboSwitch family -#CONFIG_DRIVER_ROBOSWITCH=y - -# Driver interface for no driver (e.g., WPS ER only) -#CONFIG_DRIVER_NONE=y - -# Enable IEEE 802.1X Supplicant (automatically included if any EAP method is -# included) -CONFIG_IEEE8021X_EAPOL=y - -# EAP-MD5 -CONFIG_EAP_MD5=y - -# EAP-MSCHAPv2 -CONFIG_EAP_MSCHAPV2=y - -# EAP-TLS -CONFIG_EAP_TLS=y - -# EAL-PEAP -CONFIG_EAP_PEAP=y - -# EAP-TTLS -CONFIG_EAP_TTLS=y - -# EAP-FAST -# Note: Default OpenSSL package does not include support for all the -# functionality needed for EAP-FAST. If EAP-FAST is enabled with OpenSSL, -# the OpenSSL library must be patched (openssl-0.9.8d-tls-extensions.patch) -# to add the needed functions. -#CONFIG_EAP_FAST=y - -# EAP-GTC -CONFIG_EAP_GTC=y - -# EAP-OTP -CONFIG_EAP_OTP=y - -# EAP-SIM (enable CONFIG_PCSC, if EAP-SIM is used) -#CONFIG_EAP_SIM=y - -# EAP-PSK (experimental; this is _not_ needed for WPA-PSK) -#CONFIG_EAP_PSK=y - -# EAP-PAX -#CONFIG_EAP_PAX=y - -# LEAP -CONFIG_EAP_LEAP=y - -# EAP-AKA (enable CONFIG_PCSC, if EAP-AKA is used) -#CONFIG_EAP_AKA=y - -# EAP-AKA' (enable CONFIG_PCSC, if EAP-AKA' is used). -# This requires CONFIG_EAP_AKA to be enabled, too. -#CONFIG_EAP_AKA_PRIME=y - -# Enable USIM simulator (Milenage) for EAP-AKA -#CONFIG_USIM_SIMULATOR=y - -# EAP-SAKE -#CONFIG_EAP_SAKE=y - -# EAP-GPSK -#CONFIG_EAP_GPSK=y -# Include support for optional SHA256 cipher suite in EAP-GPSK -#CONFIG_EAP_GPSK_SHA256=y - -# EAP-TNC and related Trusted Network Connect support (experimental) -#CONFIG_EAP_TNC=y - -# Wi-Fi Protected Setup (WPS) -CONFIG_WPS=y - -# EAP-IKEv2 -#CONFIG_EAP_IKEV2=y - -# PKCS#12 (PFX) support (used to read private key and certificate file from -# a file that usually has extension .p12 or .pfx) -CONFIG_PKCS12=y - -# Smartcard support (i.e., private key on a smartcard), e.g., with openssl -# engine. -CONFIG_SMARTCARD=y - -# PC/SC interface for smartcards (USIM, GSM SIM) -# Enable this if EAP-SIM or EAP-AKA is included -#CONFIG_PCSC=y - -# Development testing -#CONFIG_EAPOL_TEST=y - -# Select control interface backend for external programs, e.g, wpa_cli: -# unix = UNIX domain sockets (default for Linux/*BSD) -# udp = UDP sockets using localhost (127.0.0.1) -# named_pipe = Windows Named Pipe (default for Windows) -# y = use default (backwards compatibility) -# If this option is commented out, control interface is not included in the -# build. -CONFIG_CTRL_IFACE=y - -# Include support for GNU Readline and History Libraries in wpa_cli. -# When building a wpa_cli binary for distribution, please note that these -# libraries are licensed under GPL and as such, BSD license may not apply for -# the resulting binary. -CONFIG_READLINE=y - -# Remove debugging code that is printing out debug message to stdout. -# This can be used to reduce the size of the wpa_supplicant considerably -# if debugging code is not needed. The size reduction can be around 35% -# (e.g., 90 kB). -#CONFIG_NO_STDOUT_DEBUG=y - -# Remove WPA support, e.g., for wired-only IEEE 802.1X supplicant, to save -# 35-50 kB in code size. -#CONFIG_NO_WPA=y - -# Remove WPA2 support. This allows WPA to be used, but removes WPA2 code to -# save about 1 kB in code size when building only WPA-Personal (no EAP support) -# or 6 kB if building for WPA-Enterprise. -#CONFIG_NO_WPA2=y - -# Remove IEEE 802.11i/WPA-Personal ASCII passphrase support -# This option can be used to reduce code size by removing support for -# converting ASCII passphrases into PSK. If this functionality is removed, the -# PSK can only be configured as the 64-octet hexstring (e.g., from -# wpa_passphrase). This saves about 0.5 kB in code size. -#CONFIG_NO_WPA_PASSPHRASE=y - -# Disable scan result processing (ap_mode=1) to save code size by about 1 kB. -# This can be used if ap_scan=1 mode is never enabled. -#CONFIG_NO_SCAN_PROCESSING=y - -# Select configuration backend: -# file = text file (e.g., wpa_supplicant.conf; note: the configuration file -# path is given on command line, not here; this option is just used to -# select the backend that allows configuration files to be used) -# winreg = Windows registry (see win_example.reg for an example) -CONFIG_BACKEND=file - -# Remove configuration write functionality (i.e., to allow the configuration -# file to be updated based on runtime configuration changes). The runtime -# configuration can still be changed, the changes are just not going to be -# persistent over restarts. This option can be used to reduce code size by -# about 3.5 kB. -#CONFIG_NO_CONFIG_WRITE=y - -# Remove support for configuration blobs to reduce code size by about 1.5 kB. -#CONFIG_NO_CONFIG_BLOBS=y - -# Select program entry point implementation: -# main = UNIX/POSIX like main() function (default) -# main_winsvc = Windows service (read parameters from registry) -# main_none = Very basic example (development use only) -#CONFIG_MAIN=main - -# Select wrapper for operatins system and C library specific functions -# unix = UNIX/POSIX like systems (default) -# win32 = Windows systems -# none = Empty template -#CONFIG_OS=unix - -# Select event loop implementation -# eloop = select() loop (default) -# eloop_win = Windows events and WaitForMultipleObject() loop -# eloop_none = Empty template -#CONFIG_ELOOP=eloop - -# Select layer 2 packet implementation -# linux = Linux packet socket (default) -# pcap = libpcap/libdnet/WinPcap -# freebsd = FreeBSD libpcap -# winpcap = WinPcap with receive thread -# ndis = Windows NDISUIO (note: requires CONFIG_USE_NDISUIO=y) -# none = Empty template -#CONFIG_L2_PACKET=linux - -# PeerKey handshake for Station to Station Link (IEEE 802.11e DLS) -CONFIG_PEERKEY=y - -# IEEE 802.11w (management frame protection) -# This version is an experimental implementation based on IEEE 802.11w/D1.0 -# draft and is subject to change since the standard has not yet been finalized. -# Driver support is also needed for IEEE 802.11w. -#CONFIG_IEEE80211W=y - -# Select TLS implementation -# openssl = OpenSSL (default) -# gnutls = GnuTLS (needed for TLS/IA, see also CONFIG_GNUTLS_EXTRA) -# internal = Internal TLSv1 implementation (experimental) -# none = Empty template -#CONFIG_TLS=openssl - -# Whether to enable TLS/IA support, which is required for EAP-TTLSv1. -# You need CONFIG_TLS=gnutls for this to have any effect. Please note that -# even though the core GnuTLS library is released under LGPL, this extra -# library uses GPL and as such, the terms of GPL apply to the combination -# of wpa_supplicant and GnuTLS if this option is enabled. BSD license may not -# apply for distribution of the resulting binary. -#CONFIG_GNUTLS_EXTRA=y - -# If CONFIG_TLS=internal is used, additional library and include paths are -# needed for LibTomMath. Alternatively, an integrated, minimal version of -# LibTomMath can be used. See beginning of libtommath.c for details on benefits -# and drawbacks of this option. -#CONFIG_INTERNAL_LIBTOMMATH=y -#ifndef CONFIG_INTERNAL_LIBTOMMATH -#LTM_PATH=/usr/src/libtommath-0.39 -#CFLAGS += -I$(LTM_PATH) -#LIBS += -L$(LTM_PATH) -#LIBS_p += -L$(LTM_PATH) -#endif -# At the cost of about 4 kB of additional binary size, the internal LibTomMath -# can be configured to include faster routines for exptmod, sqr, and div to -# speed up DH and RSA calculation considerably -#CONFIG_INTERNAL_LIBTOMMATH_FAST=y - -# Include NDIS event processing through WMI into wpa_supplicant/wpasvc. -# This is only for Windows builds and requires WMI-related header files and -# WbemUuid.Lib from Platform SDK even when building with MinGW. -#CONFIG_NDIS_EVENTS_INTEGRATED=y -#PLATFORMSDKLIB="/opt/Program Files/Microsoft Platform SDK/Lib" - -# Add support for old DBus control interface -# (fi.epitest.hostap.WPASupplicant) -CONFIG_CTRL_IFACE_DBUS=y - -# Add support for new DBus control interface -# (fi.w1.hostap.wpa_supplicant1) -CONFIG_CTRL_IFACE_DBUS_NEW=y - -# Add introspection support for new DBus control interface -CONFIG_CTRL_IFACE_DBUS_INTRO=y - -# Add support for loading EAP methods dynamically as shared libraries. -# When this option is enabled, each EAP method can be either included -# statically (CONFIG_EAP_=y) or dynamically (CONFIG_EAP_=dyn). -# Dynamic EAP methods are build as shared objects (eap_*.so) and they need to -# be loaded in the beginning of the wpa_supplicant configuration file -# (see load_dynamic_eap parameter in the example file) before being used in -# the network blocks. -# -# Note that some shared parts of EAP methods are included in the main program -# and in order to be able to use dynamic EAP methods using these parts, the -# main program must have been build with the EAP method enabled (=y or =dyn). -# This means that EAP-TLS/PEAP/TTLS/FAST cannot be added as dynamic libraries -# unless at least one of them was included in the main build to force inclusion -# of the shared code. Similarly, at least one of EAP-SIM/AKA must be included -# in the main build to be able to load these methods dynamically. -# -# Please also note that using dynamic libraries will increase the total binary -# size. Thus, it may not be the best option for targets that have limited -# amount of memory/flash. -#CONFIG_DYNAMIC_EAP_METHODS=y - -# IEEE Std 802.11r-2008 (Fast BSS Transition) -#CONFIG_IEEE80211R=y - -# Add support for writing debug log to a file (/tmp/wpa_supplicant-log-#.txt) -CONFIG_DEBUG_FILE=y - -# Enable privilege separation (see README 'Privilege separation' for details) -#CONFIG_PRIVSEP=y - -# Enable mitigation against certain attacks against TKIP by delaying Michael -# MIC error reports by a random amount of time between 0 and 60 seconds -#CONFIG_DELAYED_MIC_ERROR_REPORT=y - -# Enable tracing code for developer debugging -# This tracks use of memory allocations and other registrations and reports -# incorrect use with a backtrace of call (or allocation) location. -#CONFIG_WPA_TRACE=y -# For BSD, comment out these. -#LIBS += -lexecinfo -#LIBS_p += -lexecinfo -#LIBS_c += -lexecinfo - -# Use libbfd to get more details for developer debugging -# This enables use of libbfd to get more detailed symbols for the backtraces -# generated by CONFIG_WPA_TRACE=y. -#CONFIG_WPA_TRACE_BFD=y -# For BSD, comment out these. -#LIBS += -lbfd -liberty -lz -#LIBS_p += -lbfd -liberty -lz -#LIBS_c += -lbfd -liberty -lz - -CONFIG_LIBNL32=y diff --git a/staging/wpa_supplicant/dbus.patch b/staging/wpa_supplicant/dbus.patch deleted file mode 100644 index 4c5002003..000000000 --- a/staging/wpa_supplicant/dbus.patch +++ /dev/null @@ -1,61 +0,0 @@ -From b80b5639935d37b95d00f86b57f2844a9c775f57 Mon Sep 17 00:00:00 2001 -From: Dan Williams -Date: Fri, 17 Dec 2010 15:56:01 +0200 -Subject: [PATCH] dbus: Emit property changed events when adding/removing BSSes - -The supplicant was not emitting property changed events when the BSSs -property changed. - -Signed-off-by: Dan Williams -(cherry picked from commit 1e6288df6b07a353a9246b77e0de2a840b5f2c72) ---- - wpa_supplicant/dbus/dbus_new.c | 6 ++++++ - wpa_supplicant/dbus/dbus_new.h | 1 + - 2 files changed, 7 insertions(+), 0 deletions(-) - -diff --git a/wpa_supplicant/dbus/dbus_new.c b/wpa_supplicant/dbus/dbus_new.c -index bdfbbac..c66640a 100644 ---- a/wpa_supplicant/dbus/dbus_new.c -+++ b/wpa_supplicant/dbus/dbus_new.c -@@ -691,6 +691,10 @@ void wpas_dbus_signal_prop_changed(struct wpa_supplicant *wpa_s, - wpas_dbus_getter_current_network; - prop = "CurrentNetwork"; - break; -+ case WPAS_DBUS_PROP_BSSS: -+ getter = (WPADBusPropertyAccessor) wpas_dbus_getter_bsss; -+ prop = "BSSs"; -+ break; - default: - wpa_printf(MSG_ERROR, "dbus: %s: Unknown Property value %d", - __func__, property); -@@ -1199,6 +1203,7 @@ int wpas_dbus_unregister_bss(struct wpa_supplicant *wpa_s, - } - - wpas_dbus_signal_bss_removed(wpa_s, bss_obj_path); -+ wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_BSSS); - - return 0; - } -@@ -1263,6 +1268,7 @@ int wpas_dbus_register_bss(struct wpa_supplicant *wpa_s, - } - - wpas_dbus_signal_bss_added(wpa_s, bss_obj_path); -+ wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_BSSS); - - return 0; - -diff --git a/wpa_supplicant/dbus/dbus_new.h b/wpa_supplicant/dbus/dbus_new.h -index 80ea98c..9cdefcb 100644 ---- a/wpa_supplicant/dbus/dbus_new.h -+++ b/wpa_supplicant/dbus/dbus_new.h -@@ -30,6 +30,7 @@ enum wpas_dbus_prop { - WPAS_DBUS_PROP_STATE, - WPAS_DBUS_PROP_CURRENT_BSS, - WPAS_DBUS_PROP_CURRENT_NETWORK, -+ WPAS_DBUS_PROP_BSSS, - }; - - enum wpas_dbus_bss_prop { --- -1.7.4-rc1 - diff --git a/staging/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch b/staging/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch deleted file mode 100644 index 8e7cd9a97..000000000 --- a/staging/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch +++ /dev/null @@ -1,42 +0,0 @@ -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