# HG changeset patch # User Christophe Lincoln # Date 1397610161 -7200 # Node ID fa39e0a3612e2a50f1d2a2a5d0a8a323a7c38301 # Parent 345481aca32f2020e9d586eafdaf0ed5b9423549 UP: hostapd (2.1), fix libnl missing pkgconfig file and add to ARM with rfkill diff -r 345481aca32f -r fa39e0a3612e hostapd/receipt --- a/hostapd/receipt Tue Apr 15 18:32:55 2014 +0200 +++ b/hostapd/receipt Wed Apr 16 03:02:41 2014 +0200 @@ -1,14 +1,15 @@ # SliTaz package receipt. PACKAGE="hostapd" -VERSION="1.0" +VERSION="2.1" CATEGORY="network" SHORT_DESC="Daemon for wireless software access points." -MAINTAINER="gokhlayeh@slitaz.org" +MAINTAINER="pankso@slitaz.org" LICENSE="GPL2" TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://hostap.epitest.fi/hostapd/" WGET_URL="http://hostap.epitest.fi/releases/$TARBALL" +HOST_ARCH="i486 arm" DEPENDS="openssl libnl" BUILD_DEPENDS="openssl-dev libnl-dev" @@ -16,12 +17,9 @@ # Rules to configure and make the package. compile_rules() { - patch -Np1 -i $stuff/hostap_allow-linking-with-libnl-3.2.patch || return 1 - cp -a $stuff/config $src/hostapd/.config - mkdir -p $DESTDIR/usr/bin - cd $src/hostapd - sed -i "s|/usr/local/bin|/usr/bin|" Makefile - export CFLAGS="$CFLAGS $(pkg-config --cflags libnl-3.0)" + cd $src/hostapd && + cp -a $stuff/config .config && + sed -i "s|/usr/local/bin|/usr/bin|" Makefile && make && make DESTDIR=$DESTDIR install } diff -r 345481aca32f -r fa39e0a3612e hostapd/stuff/hostap_allow-linking-with-libnl-3.2.patch --- a/hostapd/stuff/hostap_allow-linking-with-libnl-3.2.patch Tue Apr 15 18:32:55 2014 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -diff -up wpa_supplicant-1.0-rc2/src/drivers/drivers.mak.foo wpa_supplicant-1.0-rc2/src/drivers/drivers.mak ---- wpa_supplicant-1.0-rc2/src/drivers/drivers.mak.foo 2012-03-02 16:11:43.176448714 -0600 -+++ wpa_supplicant-1.0-rc2/src/drivers/drivers.mak 2012-03-02 16:12:29.759866341 -0600 -@@ -48,7 +48,7 @@ NEED_RFKILL=y - ifdef CONFIG_LIBNL32 - DRV_LIBS += -lnl-3 - DRV_LIBS += -lnl-genl-3 -- DRV_CFLAGS += -DCONFIG_LIBNL20 -+ DRV_CFLAGS += -DCONFIG_LIBNL20 `pkg-config --cflags libnl-3.0` - else - ifdef CONFIG_LIBNL_TINY - DRV_LIBS += -lnl-tiny diff -r 345481aca32f -r fa39e0a3612e libnl-dev/receipt --- a/libnl-dev/receipt Tue Apr 15 18:32:55 2014 +0200 +++ b/libnl-dev/receipt Wed Apr 16 03:02:41 2014 +0200 @@ -19,6 +19,7 @@ cp -a $install/usr/include $fs/usr cp -a $install/usr/lib/*.*a $fs/usr/lib cp -a $install/usr/lib/libnl $fs/usr/lib + cp -a $install/usr/lib/pkgconfig $fs/usr/lib find $fs/usr/lib -type f -name "*.so" -exec rm -f {} \; } diff -r 345481aca32f -r fa39e0a3612e libnl-tools/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libnl-tools/receipt Wed Apr 16 03:02:41 2014 +0200 @@ -0,0 +1,20 @@ +# SliTaz package receipt. + +PACKAGE="libnl-tools" +VERSION="3.2.13" +CATEGORY="network" +SHORT_DESC="The netlink tiny tools." +MAINTAINER="pascal.bellard@slitaz.org" +LICENSE="LGPL2.1" +WEB_SITE="http://people.suug.ch/~tgr/libnl" +HOST_ARCH="i486 arm" + +WANTED="libnl" +DEPENDS="libnl" + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + mkdir -p $fs/usr + cp -a $install/usr/sbin $fs/usr +} diff -r 345481aca32f -r fa39e0a3612e libnl/receipt --- a/libnl/receipt Tue Apr 15 18:32:55 2014 +0200 +++ b/libnl/receipt Wed Apr 16 03:02:41 2014 +0200 @@ -17,7 +17,9 @@ # Rules to configure and make the package. compile_rules() { - ./configure $CONFIGURE_ARGS && + ./configure \ + --sysconfdir=/etc \ + $CONFIGURE_ARGS && make && make install } @@ -25,6 +27,7 @@ genpkg_rules() { mkdir -p $fs/usr/lib + cp -a $install/etc $fs cp -a $install/usr/lib/*.so* $fs/usr/lib cp -a $install/usr/lib/libnl $fs/usr/lib find $fs/usr/lib -type f -name "*.a*" -exec rm -f {} \; diff -r 345481aca32f -r fa39e0a3612e rfkill/receipt --- a/rfkill/receipt Tue Apr 15 18:32:55 2014 +0200 +++ b/rfkill/receipt Wed Apr 16 03:02:41 2014 +0200 @@ -1,20 +1,22 @@ # SliTaz package receipt. PACKAGE="rfkill" -VERSION="0.4" +VERSION="0.5" CATEGORY="system-tools" SHORT_DESC="Utility to query the state of the rfkill switches" MAINTAINER="slaxemulator@gmail.com" LICENSE="MIT" -TARBALL="$PACKAGE-$VERSION.tar.bz2" +TARBALL="$PACKAGE-$VERSION.tar.xz" WEB_SITE="http://linuxwireless.org/en/users/Documentation/rfkill" -WGET_URL="http://wireless.kernel.org/download/$PACKAGE/$TARBALL" +WGET_URL="https://www.kernel.org/pub/software/network/rfkill/$TARBALL" TAGS="kernel" +HOST_ARCH="i486 arm" + +BUILD_DEPENDS="wget" # Rules to configure and make the package. compile_rules() { - cd $src sed -i 's/BINDIR) rfkill/BINDIR)/' Makefile sed -i 's/-m 755 -t/-m 755 rfkill/' Makefile sed -i 's/man8\/ rfkill\.8\.gz/man8\//' Makefile