diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-02-13 09:31:02 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-02-13 09:31:02 +0000 |
| commit | 8c2ef4a3ef2367031a88ce3f0c5af59b4e37ab23 (patch) | |
| tree | 573a7fcd64de77fdbae6e7c0330f176f578dac6b /main/rtapd | |
| parent | 3818e78e2f50d122bb07aea84544b2c690e734f9 (diff) | |
| download | aports-8c2ef4a3ef2367031a88ce3f0c5af59b4e37ab23.tar.bz2 aports-8c2ef4a3ef2367031a88ce3f0c5af59b4e37ab23.tar.xz | |
main/rtapd: build fix for musl
Diffstat (limited to 'main/rtapd')
| -rw-r--r-- | main/rtapd/APKBUILD | 31 | ||||
| -rw-r--r-- | main/rtapd/musl-strtoq.patch | 20 |
2 files changed, 45 insertions, 6 deletions
diff --git a/main/rtapd/APKBUILD b/main/rtapd/APKBUILD index 2c406249e3..6b20b429f8 100644 --- a/main/rtapd/APKBUILD +++ b/main/rtapd/APKBUILD @@ -2,9 +2,8 @@ # Maintainer: Michael Mason <ms13sp@gmail.com> pkgname=rtapd _altpkgname="rtnppd" -_builddir="$pkgname" pkgver=1.7 -pkgrel=3 +pkgrel=4 pkgdesc="daemon for routing packets to rtnppd" url="http://sourceforge.net/projects/rtnppd/" arch="all" @@ -14,18 +13,27 @@ makedepends="postgresql-dev" install= subpackages="" source="http://downloads.sourceforge.net/$_altpkgname/$pkgname-$pkgver.tar.gz + musl-strtoq.patch Makefile.patch $pkgname.initd $pkgname.confd" +_builddir="$srcdir"/$pkgname +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 "$srcdir"/"$_builddir" - echo "Applying Patch" - patch -p1 < ../Makefile.patch || return 1 + cd "$_builddir" make || return 1 } package() { - cd "$srcdir"/"$_builddir" + cd "$_builddir" #make DESTDIR="$pkgdir" install install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname @@ -37,6 +45,17 @@ package() { } md5sums="f3354efde507d29813754c8f4af7fa02 rtapd-1.7.tar.gz +a60d2cfb9019dc611929d4efca05b19c musl-strtoq.patch 7ea62a8bb13e2069164d8639b8c02aad Makefile.patch bd5aa6b7477064be5966962b90be55b5 rtapd.initd 4378fc49b27dcc6ab7f2316ea2453338 rtapd.confd" +sha256sums="cb10617032d7e3da23b3e7fe153aeb1751ac6a559fc43725b9ba5fe91296ddd7 rtapd-1.7.tar.gz +2c96d3960eb4784f3f42e0e7034d9033f44d46c113e426050e682d829e16b229 musl-strtoq.patch +689b37aea7ba1971cd4ea1bae734e8cc90115f16efa5bbdb60823331ae0ac5c1 Makefile.patch +89cf242aca9ed05f81c22ade462c8df25bfd14e2633e8e11439379441ae9e485 rtapd.initd +eda5613846494c36a0620e4cb7847e62a3cd381140f7629870b1d09ea325e833 rtapd.confd" +sha512sums="a4759b5af9710e8658f38494f88cfd727e6697b4793655fd80555405dd7fd04e69aaef63692991653f75ff7e2702ec068547d82778bf1cb51c3aa3d8a1178f63 rtapd-1.7.tar.gz +57d7c6fe5530bcd6c2c27dfa8c2cf473d27cc6cde4e8eb50e302b5c13ffec180523ba93179586cf031a50abb8274383245c41dc20beb35765f7ce42300845e10 musl-strtoq.patch +29b6575e571369ef00579cf6a2f73a799e93521a29a9b6fee13bf043ccfb220e1a428005cb4d1229ae9a0a9b7cc8a27b77d04096017f32eda29b938a45a13879 Makefile.patch +7e9b2763144c61fd26cdf4e80011cc00ea9066ea4e7ddc4eba3bebff4ea286a86abf61615de6d8760f6824ec63556283d839f653b42d59a810d2672b1d264af0 rtapd.initd +77c3c5bb295b2f3a8c7271ec52a9d4c02bdebc45d7830cb3b0b64b100a2b2649fb28a3e6b615385f9c50f5c847c12064caf981b1dcca2f78432d230649b326fd rtapd.confd" diff --git a/main/rtapd/musl-strtoq.patch b/main/rtapd/musl-strtoq.patch new file mode 100644 index 0000000000..2fd19012fc --- /dev/null +++ b/main/rtapd/musl-strtoq.patch @@ -0,0 +1,20 @@ +--- ./rtapd.c.orig ++++ ./rtapd.c +@@ -466,7 +466,7 @@ + funct = *(pblock + 5); + memcpy(id, pblock + 6, 8); + id[8] = '\0'; +- pagenum = strtoq(id, NULL, 16); ++ pagenum = strtoll(id, NULL, 16); + sprintf(id, "!%qX", pagenum); + pxend = strchr(id, '\0'); + pblock = pblock + 13; +@@ -527,7 +527,7 @@ + } + memcpy(id, pblock + 7, usedlen); + id[usedlen] = '\0'; +- pagenum = strtoq(id, NULL, 16); ++ pagenum = strtoll(id, NULL, 16); + sprintf(id, "!%qX", pagenum); + pxend = strchr(id, '\0'); + pblock = pblock + 6 + caplen + msnlen; |