diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2011-04-17 12:21:51 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-04-17 12:21:51 +0000 |
| commit | 06cf03b8b13a2435ba17d4c47511071f50a07a11 (patch) | |
| tree | 58a13bfa735557c280b014ea45531628285753a0 /testing/openvcp | |
| parent | 84cfe7b5e1b3089521087fccb45d3a21bbb230c9 (diff) | |
| download | aports-06cf03b8b13a2435ba17d4c47511071f50a07a11.tar.bz2 aports-06cf03b8b13a2435ba17d4c47511071f50a07a11.tar.xz | |
testing/openvcp: use system libiptc
Diffstat (limited to 'testing/openvcp')
| -rw-r--r-- | testing/openvcp/APKBUILD | 18 | ||||
| -rw-r--r-- | testing/openvcp/system-libiptc.patch | 27 |
2 files changed, 42 insertions, 3 deletions
diff --git a/testing/openvcp/APKBUILD b/testing/openvcp/APKBUILD index ed2ab667f..f1703ccc7 100644 --- a/testing/openvcp/APKBUILD +++ b/testing/openvcp/APKBUILD @@ -4,21 +4,32 @@ pkgname=openvcp _pkgname=openvcpd pkgver=0.5 _pkgver=0.5rc3 -pkgrel=0 +pkgrel=2 pkgdesc="Control Panel for VServer instances" url="http://www.openvcp.org" arch="all" license="GPL" depends= depends_dev= -makedepends="gnutls-dev util-vserver-dev libxml2-dev libpcap-dev libtool sqlite-dev rsync" +makedepends="gnutls-dev util-vserver-dev libxml2-dev libpcap-dev libtool + sqlite-dev rsync iptables-dev" install= subpackages= source="http://files.openvcp.org/$_pkgname-$_pkgver.tar.gz + system-libiptc.patch $pkgname.initd" _builddir="$srcdir"/$_pkgname-$_pkgver +prepare() { + 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 \ @@ -33,4 +44,5 @@ package() { } md5sums="9c65d706133ea48553c90236997f1b8b openvcpd-0.5rc3.tar.gz -08cef22e3abc5824133733e17aa4e607 openvcp.initd" +bf034b4507f79f635596f1c78f5f7e3f system-libiptc.patch +db8efb9c086673fd2e3e2532294c7a2f openvcp.initd" diff --git a/testing/openvcp/system-libiptc.patch b/testing/openvcp/system-libiptc.patch new file mode 100644 index 000000000..cfbe7296e --- /dev/null +++ b/testing/openvcp/system-libiptc.patch @@ -0,0 +1,27 @@ +--- ./Makefile.in.orig ++++ ./Makefile.in +@@ -7,9 +7,9 @@ + CC=@CC@ + CFLAGS=@CFLAGS@ @DEFS@ -DOPENVCP_CONFIG=\"$(sysconfdir)/openvcpd.conf\" -DOPENVCP_DATA=\"$(datadir)/openvcpd\" -Ilib/ -Isrc/ -rdynamic -DREVISION=\"$(REV)\" `python-config --cflags` + LDFLAGS=@LDFLAGS@ +-LIBS=@LIBS@ `python-config --ldflags` ++LIBS=@LIBS@ `python-config --ldflags` -liptc + +-OBJECTS = lib/libiptc/libip6tc.o lib/libiptc/libip4tc.o src/modules.o src/misc.o src/node.o src/traffic.o src/logtraffic.o src/setup.o src/set.o src/parseconfig.o src/get.o src/request.o lib/fs.o lib/strings.o lib/ovcpxml.o src/filter.o src/bandwidth.o src/trafficlimit.o src/userbackup.o src/task.o ++OBJECTS = src/modules.o src/misc.o src/node.o src/traffic.o src/logtraffic.o src/setup.o src/set.o src/parseconfig.o src/get.o src/request.o lib/fs.o lib/strings.o lib/ovcpxml.o src/filter.o src/bandwidth.o src/trafficlimit.o src/userbackup.o src/task.o + + all: openvcpd lib/pyovcp/ovcp.so + openvcpd: src/main.c $(OBJECTS) lib/pyovcp/pyovcp.a +@@ -35,12 +35,6 @@ + + lib/ovcpxml.o: lib/ovcpxml.c + $(CC) $(CFLAGS) -fPIC -c lib/ovcpxml.c -o lib/ovcpxml.o +- +-lib/libiptc/libip4tc.o: +- cd lib/libiptc/; make libip4tc.o; +- +-lib/libiptc/libip6tc.o: +- cd lib/libiptc/; make libip6tc.o; + + lib/pyovcp/ovcp.so: + cd lib/pyovcp/; make ovcp.so; |