aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo <thinkabit.ukim@gmail.com>2019-05-12 09:17:32 -0300
committerFrancesco Colista <fcolista@alpinelinux.org>2019-05-28 07:21:31 +0000
commit6cbdf20d83ad6bbd3ce99c8f86ab2cde7aff4244 (patch)
tree2bb2fc7fa431c4e7bfa54d19c01b5f6b7dc5a792
parent0b04368fef83aec9820cc0c7a8e9be24efeab1a1 (diff)
downloadaports-6cbdf20d83ad6bbd3ce99c8f86ab2cde7aff4244.tar.gz
aports-6cbdf20d83ad6bbd3ce99c8f86ab2cde7aff4244.tar.bz2
aports-6cbdf20d83ad6bbd3ce99c8f86ab2cde7aff4244.tar.xz
main/lksctp-tools: upgrade to 1.0.18
-rw-r--r--main/lksctp-tools/APKBUILD21
-rw-r--r--main/lksctp-tools/header-install.patch33
2 files changed, 47 insertions, 7 deletions
diff --git a/main/lksctp-tools/APKBUILD b/main/lksctp-tools/APKBUILD
index ea6d1c308e..b6611a2715 100644
--- a/main/lksctp-tools/APKBUILD
+++ b/main/lksctp-tools/APKBUILD
@@ -1,17 +1,17 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=lksctp-tools
-pkgver=1.0.17
+pkgver=1.0.18
pkgrel=0
pkgdesc="User-space access to Linux Kernel SCTP"
url="http://lksctp.sourceforge.net"
arch="all"
options="!check" # sctp_connectx in v4test fails on kernel 4.14
-license="GPL-2.0 and GPL-2.0-or-later and LGPL-2.0 and MIT"
-depends=""
+license="GPL-2.0-only AND LGPL-2.1-or-later"
makedepends="libtool automake autoconf linux-headers"
-install=""
-subpackages="$pkgname-dev $pkgname-doc"
-source="https://downloads.sourceforge.net/lksctp/lksctp-tools-$pkgver.tar.gz"
+subpackages="$pkgname-dev $pkgname-doc lib${pkgname%-tools}:libs"
+source="$pkgname-$pkgver.tar.gz::https://github.com/sctp/$pkgname/archive/v$pkgver.tar.gz
+ header-install.patch
+ "
prepare() {
cd "$builddir"
@@ -40,4 +40,11 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="055719130b7dda4da9cf002dcd5f1fb3d8cf75300a99365976e087b2b6971b4ccd357f95b515a44e37874af161f7b7f9b42c60191aff938d18fada5a49aa44c4 lksctp-tools-1.0.17.tar.gz"
+libs() {
+ default_libs
+ mkdir -p "$subpkgdir"/usr/lib
+ mv "$pkgdir"/usr/lib/lksctp-tools "$subpkgdir"/usr/lib
+}
+
+sha512sums="1d7275fadc0f2270865307cff2645810e9bab6c1a97e70be6115cace737334dbdd87a072fae25b89dd9cac2e05974556542de70ea8ef70b9e4f14873c82a5055 lksctp-tools-1.0.18.tar.gz
+0f26eba03b163e7f3d5dd9760e01734547603a69fb1fe93826c68503b13a175f7f848f9cfbcf79d5509823219c637c3155988a2ae29b080c508ee22b48da28f8 header-install.patch"
diff --git a/main/lksctp-tools/header-install.patch b/main/lksctp-tools/header-install.patch
new file mode 100644
index 0000000000..4cc1db493a
--- /dev/null
+++ b/main/lksctp-tools/header-install.patch
@@ -0,0 +1,33 @@
+From 378560050a8f93786c590cc99a55461666205b61 Mon Sep 17 00:00:00 2001
+From: Xin Long <lucien.xin@gmail.com>
+Date: Fri, 24 Aug 2018 01:13:32 +0800
+Subject: [PATCH] build: fix netinet/sctp.h not to be installed
+
+After libcnetinet_HEADERS was set to sctp.h.in, netinet/sctp.h can
+no longer be installed into ${includedir}.
+
+Since "AC_CONFIG_HEADERS([src/include/netinet/sctp.h])" is already
+added into configure.ac, there's no need to generate sctp.h by
+automake.
+
+So we simply set libcnetinet_HEADERS back to sctp.h.
+
+Fixes: 9607dd85e70a ("netinet/sctp.h: dynamically build based on system setup")
+Signed-off-by: Xin Long <lucien.xin@gmail.com>
+Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
+---
+ src/include/netinet/Makefile.am | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/include/netinet/Makefile.am b/src/include/netinet/Makefile.am
+index ca0aac2..965db8c 100644
+--- a/src/include/netinet/Makefile.am
++++ b/src/include/netinet/Makefile.am
+@@ -11,5 +11,4 @@ libcnetinetdir = $(includedir)/netinet
+ # API.
+ include_HEADERS =
+
+-libcnetinet_HEADERS = sctp.h.in
+-BUILT_SOURCES = sctp.h
++libcnetinet_HEADERS = sctp.h
+