Merge git://git.alpinelinux.org/fcolista/aports-fcolista into fcolista

4 files changed, 76 insertions, 13 deletions

diff --git a/main/coova-chilli/APKBUILD b/main/coova-chilli/APKBUILD
index c93d5a860e..f32af87daf 100644
--- a/main/coova-chilli/APKBUILD
+++ b/main/coova-chilli/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=coova-chilli
 pkgver=1.2.8
-pkgrel=1
+pkgrel=2
 pkgdesc="CoovaChilli is an open source access controller for wireless LAN"
 url="http://www.coova.org/"
 arch="all"
@@ -37,7 +37,8 @@ build() {
 		--sysconfdir=/etc \
 		--with-openssl \
 		--enable-layer3 \
-		--enable-dhcpopt
+		--enable-dhcpopt \
+		--enable-largelimits 
 	make -j1  || return 1
 }
 
diff --git a/main/v4l-utils/APKBUILD b/main/v4l-utils/APKBUILD
index 62ef1acb3a..67db16a7ff 100644
--- a/main/v4l-utils/APKBUILD
+++ b/main/v4l-utils/APKBUILD
@@ -2,31 +2,27 @@
 # Maintainer: Francesco Colista <francesco.colista@gmail.com>
 pkgname=v4l-utils
 pkgver=0.8.5
-pkgrel=0
+pkgrel=1
 pkgdesc="Userspace tools and conversion library for Video 4 Linux"
 url="http://freshmeat.net/projects/libv4l"
 arch="all"
 license="LGPL"
 depends=""
-makedepends="qt-dev jpeg-dev"
+makedepends="qt-dev jpeg-dev argp-standalone"
 install=""
 subpackages="$pkgname-dev qv4l2"
 source="http://linuxtv.org/downloads/v4l-utils/$pkgname-$pkgver.tar.bz2
 	qv4l2.svg
-	qv4l2.desktop"
-
+	qv4l2.desktop
+	"
 _builddir="$srcdir"/$pkgname-$pkgver
 
 prepare() {
         cd "$_builddir"
         sed -i 's|CFLAGS :=|CFLAGS ?=|' Make.rules
-	# TODO: make a proper patch insted of this hugly hack
-	# uclibc does not have argp.h
-	# http://www.spinics.net/lists/linux-media/msg28619.html
-	rm -rf utils/decode_tm6000 utils/keytable
-	sed -i 's/decode_tm6000 //g' utils/Makefile
-	sed -i 's/keytable //g' utils/Makefile
-	sed -i 's/v4l2-sysfs-path //g' utils/Makefile
+	sed -ie 's/\$\^/$\^\ -largp/' utils/decode_tm6000/Makefile
+	sed -ie 's/\$\^/$\^\ -largp/' utils/keytable/Makefile
+	sed -ie 's/\$\^/$\^\ -largp/' utils/v4l2-sysfs-path/Makefile
 }
 
 build() {
diff --git a/testing/arpalert/APKBUILD b/testing/arpalert/APKBUILD
new file mode 100644
index 0000000000..bc23f5e79f
--- /dev/null
+++ b/testing/arpalert/APKBUILD
@@ -0,0 +1,48 @@
+# Contributor: Francesco Colista <francesco.colista@gmail.com>
+# Maintainer: Francesco Colista <francesco.colista@gmail.com>
+pkgname=arpalert
+pkgver=2.0.11
+pkgrel=0
+pkgdesc="Monitor ARP changes in ethernet networks"
+url="http://www.arpalert.org"
+arch="all"
+license="GPL"
+depends=""
+depends_dev="libpcap-dev"
+makedepends="$depends_dev"
+install=""
+subpackages="$pkgname-dev $pkgname-doc"
+source="http://www.arpalert.org/src/$pkgname-$pkgver.tar.gz
+	$pkgname.initd"
+_builddir="$srcdir"/$pkgname-$pkgver
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--exec-prefix=/usr \
+		--sysconfdir=/etc \
+		--sharedstatedir=/usr/share \
+		--localstatedir=/var \
+		--includedir=/usr/include \
+		--datarootdir=/usr/share
+		      
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install
+	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
+}
+
+md5sums="4b2b7682b27c7f260716f59ecfa50ecc  arpalert-2.0.11.tar.gz
+da046bdcd1dde63930a3353b37e35ddd  arpalert.initd"
diff --git a/testing/arpalert/arpalert.initd b/testing/arpalert/arpalert.initd
new file mode 100755
index 0000000000..2567dbab1b
--- /dev/null
+++ b/testing/arpalert/arpalert.initd
@@ -0,0 +1,18 @@
+#!/sbin/runscript
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting arpalert"
+	start-stop-daemon --quiet --start --pidfile /var/run/arpalert.lock --exec /usr/sbin/arpalert -- -d
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping arpalert"
+	start-stop-daemon --quiet --stop --pidfile /var/run/arpalert.lock
+	eend $?
+}
+