aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorFrancesco Colista <francesco.colista@gmail.com>2012-01-31 13:51:56 +0000
committerFrancesco Colista <francesco.colista@gmail.com>2012-01-31 13:51:56 +0000
commit0153acb96f43a7e510d6af1e165fb002b54a8d17 (patch)
treeddf243991314e84a98c0bfe3ea906118ec6cfb8a /main
parente2e255c03845c49b0e24925cf4b307972b1731f9 (diff)
downloadaports-0153acb96f43a7e510d6af1e165fb002b54a8d17.tar.bz2
aports-0153acb96f43a7e510d6af1e165fb002b54a8d17.tar.xz
main/coova-chilli: upgrade to 1.2.9
Diffstat (limited to 'main')
-rw-r--r--main/coova-chilli/APKBUILD28
-rwxr-xr-xmain/coova-chilli/chilli.initd5
2 files changed, 24 insertions, 9 deletions
diff --git a/main/coova-chilli/APKBUILD b/main/coova-chilli/APKBUILD
index f32af87daf..665df657a5 100644
--- a/main/coova-chilli/APKBUILD
+++ b/main/coova-chilli/APKBUILD
@@ -1,15 +1,15 @@
# Contributor: grharry
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=coova-chilli
-pkgver=1.2.8
-pkgrel=2
+pkgver=1.2.9
+pkgrel=0
pkgdesc="CoovaChilli is an open source access controller for wireless LAN"
url="http://www.coova.org/"
arch="all"
license="GPL"
depends=
-makedepends="perl openssl-dev autoconf automake libtool"
-install=
+makedepends="perl openssl-dev autoconf automake libtool curl-dev"
+install="$pkgname.pre-install $pkgname.post-install"
subpackages="$pkgname-doc $pkgname-dev"
source="http://ap.coova.org/chilli/coova-chilli-$pkgver.tar.gz
coova-chilli-ssl.patch"
@@ -36,9 +36,26 @@ build() {
--libdir=/usr/lib \
--sysconfdir=/etc \
--with-openssl \
+ --with-poll \
+ --enable-binstatusfile \
+ --enable-statusfile \
+ --enable-chillixml \
+ --enable-ipwhitelist \
+ --enable-redirinject \
+ --enable-redirdnsreq \
+ --enable-redirinject \
+ --enable-debug \
+ --enable-debug2 \
+ --enable-sessgarden \
+ --enable-shared \
+ --enable-chilliredir \
+ --enable-chilliscript \
--enable-layer3 \
--enable-dhcpopt \
+ --enable-curl \
--enable-largelimits
+
+ export CFLAGS="$CFLAGS -Wno-error=unused-but-set-variable"
make -j1 || return 1
}
@@ -47,8 +64,9 @@ package() {
make DESTDIR="$pkgdir" install || return 1
rm "$pkgdir"/usr/lib/*.la || return 1
install -D -m755 ../../chilli.initd $pkgdir/etc/init.d/chilli
+ install -D -m755 ../../chilli.confd $pkgdir/etc/conf.d/chilli
mkdir -p $pkgdir/var/run/chilli
}
-md5sums="e8fa70a52d9c9f4e8addbe8df09c56db coova-chilli-1.2.8.tar.gz
+md5sums="a493d0562fc3b05fe86d8ad65f7f2dc0 coova-chilli-1.2.9.tar.gz
4135e6e19bafdad777b8ca7388ff4101 coova-chilli-ssl.patch"
diff --git a/main/coova-chilli/chilli.initd b/main/coova-chilli/chilli.initd
index fe6ec72d5e..1096c3ce00 100755
--- a/main/coova-chilli/chilli.initd
+++ b/main/coova-chilli/chilli.initd
@@ -6,7 +6,6 @@ depend() {
provide chilli
}
-
checkconfig() {
if [ -f /etc/chilli.conf ]; then
return 0;
@@ -29,7 +28,7 @@ start() {
fi
start-stop-daemon --start --pidfile /var/run/chilli/chilli.pid --quiet \
- --exec /usr/sbin/chilli -- --pidfile=/var/run/chilli/chilli.pid
+ --exec /usr/sbin/chilli ${CHILLI_OPTS} -- --pidfile=/var/run/chilli/chilli.pid
eend $?
}
@@ -38,5 +37,3 @@ stop() {
start-stop-daemon --stop --pidfile /var/run/chilli.pid --quiet
eend $?
}
-
-