diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2018-10-30 16:02:44 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-11-07 16:46:11 +0000 |
| commit | 921b19a85202d8ee7826659d256577e1533202a9 (patch) | |
| tree | ddd84929810396abfdfe317d15fc5d3a4b8563d2 | |
| parent | 9e8bd998faeb5bb649eff158cb3578ee72aa48b0 (diff) | |
| download | aports-921b19a85202d8ee7826659d256577e1533202a9.tar.bz2 aports-921b19a85202d8ee7826659d256577e1533202a9.tar.xz | |
main/sipsak: rebuild against openssl 1.1
| -rw-r--r-- | main/sipsak/APKBUILD | 41 | ||||
| -rw-r--r-- | main/sipsak/fix-inline.patch | 13 |
2 files changed, 25 insertions, 29 deletions
diff --git a/main/sipsak/APKBUILD b/main/sipsak/APKBUILD index 6758c78fbc..8b4dfe391d 100644 --- a/main/sipsak/APKBUILD +++ b/main/sipsak/APKBUILD @@ -2,13 +2,13 @@ # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=sipsak pkgver=0.9.6 -pkgrel=10 +pkgrel=11 pkgdesc="SIP swiss army knife" url="http://sipsak.org/" arch="all" license="GPL-2.0-or-later" depends="" -makedepends="libressl-dev c-ares-dev" +makedepends="openssl-dev c-ares-dev" install="" subpackages="$pkgname-dbg $pkgname-doc" source="https://downloads.sourceforge.net/project/sipsak.berlios/${pkgname}-${pkgver}-1.tar.gz @@ -19,51 +19,34 @@ source="https://downloads.sourceforge.net/project/sipsak.berlios/${pkgname}-${pk fix-inline.patch " -_builddir="$srcdir"/$pkgname-$pkgver +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 + cd "$builddir" + default_prepare + update_config_sub } build() { - cd "$_builddir" + cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - || return 1 - make || return 1 + --infodir=/usr/share/info + make } package() { - cd "$_builddir" - make DESTDIR="$pkgdir" install || return 1 + cd "$builddir" + make DESTDIR="$pkgdir" install } -md5sums="c4eb8e282902e75f4f040f09ea9d99d5 sipsak-0.9.6-1.tar.gz -fd7aa34ef656fc40b7ff186a670b4b60 musl-fix-strcasestr.patch -8fa15fbeadba6d319ae6bfbbb85b1bf7 fix-off-by-one-bugs.patch -b4d16490aa1344301da4d3b551cee261 sipsak-0001-Fix-for-wrong-arity-of-callback-function-for-c-ares.patch -1edea99339c3835f41db56365d4075e8 fix-aaaa-record-segfault.patch -f784d1582f652130c8388c27762f6e59 fix-inline.patch" -sha256sums="5064c56d482a080b6a4aea71821b78c21b59d44f6d1aa14c27429441917911a9 sipsak-0.9.6-1.tar.gz -98fbef70fa537a6c46f5641392b19d074ccc0d2c6e71bb903c69a7940dbab3cd musl-fix-strcasestr.patch -bc05de62df8a24492ce6d74f5ce1ec7149db5b7b56bbec941bdc6db038027fe9 fix-off-by-one-bugs.patch -72a57b34d34e0e68c224e9dfe4e1bc1b8e4631217fb90c3b935fbd9c20f1687e sipsak-0001-Fix-for-wrong-arity-of-callback-function-for-c-ares.patch -5a5bba2fe9d069a6d91efdb7299e03d4483254e11ce43e0fc6468335c30b70e3 fix-aaaa-record-segfault.patch -115163c21e5acc525fd532b7b75ffe6ea65e7e4cb86d551396a1c957df3af52c fix-inline.patch" sha512sums="c2d62ddaf2ecc9616941cf002a0494d2f9c43747e6b527f8b1542e9b5ae143fc69b18fc140bd3f255896b0e8eb02f7d198cc1799a4041e2d0c95d90b653591fe sipsak-0.9.6-1.tar.gz 5a9f2679ef8b5e7a7d2db79e32c2a9ca304bd507804d86628231ad273cc08810bf3470f2b3fb5e873279d619669917f81fbf9bdfe74e83e3dfa6451aa4b62e85 musl-fix-strcasestr.patch 4f4978924482d9d8b4a1167bf968cec8c3e705ea81cd8fe4b83873f408684d43cc166d0eeeb20f7a459ff9e02ddb0cac08644d5d6f77629557d07f96f9634605 fix-off-by-one-bugs.patch 1bfd9703029cc5e0b8bd5719d96871358c33412982a39bb1f8204ed68cd472ee3bbdee7924d4cd8f48e33299659c484709c7c347629f3771707f5e23d8eb2b2f sipsak-0001-Fix-for-wrong-arity-of-callback-function-for-c-ares.patch 6e60e023feef1c36d4e45426568142e8aed5bcc5f91509a610dc3b0dd507677aa7a978ae2573f3f8c93f228cb415e79d92eddd6fc544897606b597d0a44aab6b fix-aaaa-record-segfault.patch -8be402ee2d377ca047ef428e43c2100d762b050bfad820e2f6e550ff94c19f565e7e879b63567d3fc758a760a78e060f8651074b52768845bd49d5926d2ff47b fix-inline.patch" +1e21453d2a91cc4a1f0533833e260cba83107cdb340dd0c5a98446b22156650926c6d087d4074ffd5880694f3b5bac30368b40e302b8abb53da6783c3928c34a fix-inline.patch" diff --git a/main/sipsak/fix-inline.patch b/main/sipsak/fix-inline.patch index 7d865853f3..1556805c82 100644 --- a/main/sipsak/fix-inline.patch +++ b/main/sipsak/fix-inline.patch @@ -9,3 +9,16 @@ index 19d22b4..64885f0 100644 -inline char* get_body(char *mes); +extern char* get_body(char *mes); #endif +diff --git a/helper.c b/helper.c +index 547f4e7..117d6f1 100644 +--- a/helper.c ++++ b/helper.c +@@ -299,7 +299,7 @@ static void cares_callback(void *arg, int status, int timeouts, unsigned char *a + } + } + +-inline unsigned long srv_ares(char *host, int *port, char *srv) { ++static unsigned long srv_ares(char *host, int *port, char *srv) { + int nfds, count, srvh_len; + char *srvh; + fd_set read_fds, write_fds; |