diff options
| author | Leonardo Arena <rnalrd@gmail.com> | 2010-06-14 06:19:57 +0000 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@gmail.com> | 2010-06-14 06:20:05 +0000 |
| commit | 6522b8796fd9925d93d4df46aae86e3c72f7e375 (patch) | |
| tree | 28d1798f2d1df94e8c3ddd52c17a6c92b82f777f | |
| parent | f9871f6bd04439077b71d0129279379677cd3043 (diff) | |
| download | aports-6522b8796fd9925d93d4df46aae86e3c72f7e375.tar.bz2 aports-6522b8796fd9925d93d4df46aae86e3c72f7e375.tar.xz | |
testing/coova-chilli: upgrade to 1.2.2
| -rw-r--r-- | testing/coova-chilli/APKBUILD | 24 | ||||
| -rw-r--r-- | testing/coova-chilli/coova-chilli-ssl.patch | 26 |
2 files changed, 29 insertions, 21 deletions
diff --git a/testing/coova-chilli/APKBUILD b/testing/coova-chilli/APKBUILD index ab84e37318..047c6fbf10 100644 --- a/testing/coova-chilli/APKBUILD +++ b/testing/coova-chilli/APKBUILD @@ -4,24 +4,28 @@ # TODO: fix init.d script pkgname=coova-chilli -pkgver=1.0.14 -pkgrel=2 +pkgver=1.2.2 +pkgrel=0 pkgdesc="CoovaChilli is an open source access controller for wireless LAN" url="http://www.coova.org/" license="GPL" depends= makedepends="perl openssl-dev autoconf automake libtool" -install= #"coova-chilli.install" +install= subpackages="$pkgname-doc $pkgname-dev" source="http://ap.coova.org/chilli/coova-chilli-$pkgver.tar.gz - coova-chilli-ssl.patch - " + coova-chilli-ssl.patch" -build() { - cd "$srcdir/$pkgname-$pkgver" +_builddir="$srcdir/$pkgname-$pkgver" + +prepare() { + cd $_builddir patch -p1 -i ../coova-chilli-ssl.patch || return 1 aclocal && autoconf && automake && libtoolize || return 1 +} +build() { + cd $_builddir ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ @@ -34,9 +38,9 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $_builddir make DESTDIR="$pkgdir" install } -md5sums="88774ec55f9943d174ea7dd26e85fd8a coova-chilli-1.0.14.tar.gz -e4e94b06540c10caa750a590f3ec9ec6 coova-chilli-ssl.patch" +md5sums="44042e26c3b3c6e64a9a8769328b437d coova-chilli-1.2.2.tar.gz +4135e6e19bafdad777b8ca7388ff4101 coova-chilli-ssl.patch" diff --git a/testing/coova-chilli/coova-chilli-ssl.patch b/testing/coova-chilli/coova-chilli-ssl.patch index 618b90a60a..1567c96cb3 100644 --- a/testing/coova-chilli/coova-chilli-ssl.patch +++ b/testing/coova-chilli/coova-chilli-ssl.patch @@ -1,17 +1,21 @@ -diff -ru a/src/Makefile.am b/src/Makefile.am ---- a/src/Makefile.am 2009-10-15 09:15:00.000000000 +0000 -+++ b/src/Makefile.am 2009-10-15 09:17:20.000000000 +0000 -@@ -20,6 +20,7 @@ - chilli.h options.h util.c garden.c garden.h \ +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -13,7 +13,8 @@ + chilli.h options.h util.c garden.c garden.h ssl.h ssl.c \ dns.c dns.h session.c session.h limits.h pkt.h pkt.c \ - chksum.c net.h net.c ms_chap.c options.c + chksum.c net.h net.c ms_chap.c options.c statusfile.c \ +-conn.h conn.c ++conn.h conn.c +libchilli_la_LIBADD = $(LIBOPENSSL) - # AM_LDFLAGS = -lchilli - -@@ -32,4 +33,4 @@ - chilli_dog_SOURCES = main-dog.c + AM_CFLAGS = -D_GNU_SOURCE -Wall -fno-builtin -fno-strict-aliasing \ + -O2 -fomit-frame-pointer -funroll-loops -pipe \ +@@ -33,7 +34,7 @@ #test_radius_SOURCES = test-radius.c + #test_dhcp_SOURCES = test-dhcp.c --LDADD = libchilli.la $(top_builddir)/bstring/libbstring.la +-LDADD = libchilli.la $(top_builddir)/bstring/libbstring.la ${LIBRT} +LDADD = libchilli.la $(top_builddir)/bstring/libbstring.la $(LIBOPENSSL) + + if WITH_OPENSSL + LDADD += ${LIBSSL} |