diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2013-12-18 17:23:11 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2013-12-18 17:23:11 +0000 |
| commit | a1260bcc1f82fab029c81a041e0638b44a2f0139 (patch) | |
| tree | 40feedf97f21790222e747bd294d082975e2cf4c /main | |
| parent | 033138b6148fb33035ef097cc8c16e435a17fd8e (diff) | |
| download | aports-a1260bcc1f82fab029c81a041e0638b44a2f0139.tar.bz2 aports-a1260bcc1f82fab029c81a041e0638b44a2f0139.tar.xz | |
main/conntrack-tools: fix musl build
Diffstat (limited to 'main')
| -rw-r--r-- | main/conntrack-tools/APKBUILD | 21 | ||||
| -rw-r--r-- | main/conntrack-tools/musl-fix-includes.patch | 51 |
2 files changed, 70 insertions, 2 deletions
diff --git a/main/conntrack-tools/APKBUILD b/main/conntrack-tools/APKBUILD index 28aa68ee56..54e3a881e1 100644 --- a/main/conntrack-tools/APKBUILD +++ b/main/conntrack-tools/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=conntrack-tools pkgver=1.4.2 -pkgrel=0 +pkgrel=1 pkgdesc="Connection tracking userspace tools" url="http://conntrack-tools.netfilter.org" arch="all" @@ -10,15 +10,29 @@ subpackages="$pkgname-doc" depends= makedepends="pkgconfig libnfnetlink-dev libnetfilter_conntrack-dev bison flex libmnl-dev libnetfilter_cttimeout-dev libnetfilter_cthelper-dev - libnetfilter_queue-dev" + libnetfilter_queue-dev libtirpc-dev" source="http://www.netfilter.org/projects/conntrack-tools/files/$pkgname-$pkgver.tar.bz2 + musl-fix-includes.patch conntrackd.initd conntrackd.confd " _builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + update_config_sub || return 1 + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} + build() { cd "$_builddir" + export CFLAGS="$CFLAGS -D_GNU_SOURCE `pkgconf --cflags libtirpc`" + export LDFLAGS="$LDFLAGS `pkgconf --libs libtirpc`" + ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -39,11 +53,14 @@ package() { } md5sums="b1f9d006e7bf000a77395ff7cd3fac16 conntrack-tools-1.4.2.tar.bz2 +3054920c89481b6cb78199ee3d99c1a8 musl-fix-includes.patch a97e0b7f1339d93caf929fb4767141e1 conntrackd.initd 8ebf3838b69d20e6bb4a173844502039 conntrackd.confd" sha256sums="e5c423dc077f9ca8767eaa6cf40446943905711c6a8fe27f9cc1977d4d6aa11e conntrack-tools-1.4.2.tar.bz2 +72dbbe2188f2a47123327c2ee37e41fefc60bab6c3f0e678ff55ee697414dc4d musl-fix-includes.patch 290b25d9947d02b4b3d79a57af2818a5c18ff3e13e50b6507ce6346326bbe730 conntrackd.initd 6171121881f824bccc2709d6e74e2d5955391fbb9c591afcca741a3239fd3ed7 conntrackd.confd" sha512sums="1fed742593caf8bbac96a58df8f7e806d1c0f1dfea8fc601d65aa89b4243b1022949a2bf03ab0ca25994a13e50b3b1ee43a31827e0dc4da1399801ddac623d56 conntrack-tools-1.4.2.tar.bz2 +c4e8f8336a0c27bdecfb41c3f98a174fa6781b6e1098eb969010c2d85fec4d45193077c30c86c25cde85459505d43be35fac6f7fcd2795a8e5f1f60062846127 musl-fix-includes.patch 7eabe6fed8030a7fb18409795fe179a030d3210743d2b4bb1e9ff370c50cb53d2cff0f60f6f99db3e7e382c473594de617969e674e99d449239d1e7ec4cfec09 conntrackd.initd fd8cfab207867844db6671a8395efadca792d6085c3436381e574dc52f3b4e41d9526b3db6114dd98e534a5419ca19f291d21c091f8cf0426024d73d18133e6f conntrackd.confd" diff --git a/main/conntrack-tools/musl-fix-includes.patch b/main/conntrack-tools/musl-fix-includes.patch new file mode 100644 index 0000000000..ca5feb1b72 --- /dev/null +++ b/main/conntrack-tools/musl-fix-includes.patch @@ -0,0 +1,51 @@ +--- conntrack-tools-1.4.2.orig/include/bitops.h ++++ conntrack-tools-1.4.2/include/bitops.h +@@ -1,7 +1,7 @@ + #ifndef _BITOPS_H_ + #define _BITOPS_H_ + +-#include <stdlib.h> ++#include <sys/types.h> + + static inline void set_bit_u32(int nr, u_int32_t *addr) + { +--- conntrack-tools-1.4.2.orig/include/conntrackd.h ++++ conntrack-tools-1.4.2/include/conntrackd.h +@@ -12,6 +12,7 @@ + #include <stdio.h> + #include <libnetfilter_conntrack/libnetfilter_conntrack.h> + #include <syslog.h> ++#include <sys/select.h> + + /* UNIX facilities */ + #define CT_FLUSH_MASTER 0 /* flush kernel conntrack table */ +--- conntrack-tools-1.4.2.orig/include/mcast.h ++++ conntrack-tools-1.4.2/include/mcast.h +@@ -2,6 +2,7 @@ + #define _MCAST_H_ + + #include <stdint.h> ++#include <sys/select.h> + #include <netinet/in.h> + #include <net/if.h> + +--- conntrack-tools-1.4.2.orig/include/tcp.h ++++ conntrack-tools-1.4.2/include/tcp.h +@@ -2,6 +2,7 @@ + #define _TCP_H_ + + #include <stdint.h> ++#include <sys/select.h> + #include <netinet/in.h> + + struct tcp_conf { +--- conntrack-tools-1.4.2.orig/include/udp.h ++++ conntrack-tools-1.4.2/include/udp.h +@@ -2,6 +2,7 @@ + #define _UDP_H_ + + #include <stdint.h> ++#include <sys/select.h> + #include <netinet/in.h> + + struct udp_conf { |