Subject: [alpine-aports] [PATCH 2/2] testing/libnsl: rebuild with fixed libtirpc

From: Valery Kartel <[email-masked]>
Date: Fri, 24 Mar 2017 16:16:18 +0200

---
 testing/libnsl/APKBUILD         |  6 ++----
 testing/libnsl/tirpc_hack.patch | 13 -------------
 2 files changed, 2 insertions(+), 17 deletions(-)
 delete mode 100644 testing/libnsl/tirpc_hack.patch

diff --git a/testing/libnsl/APKBUILD b/testing/libnsl/APKBUILD
index 3dcefcb14e..8e5bdaa0fe 100644
--- a/testing/libnsl/APKBUILD
+++ b/testing/libnsl/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Valery Kartel <[email-masked]>
 pkgname=libnsl
 pkgver=1.0.5
-pkgrel=0
+pkgrel=1
 pkgdesc="Public client interface for NIS(YP) and NIS+ in a IPv6 ready version"
 url="http://www.linux-nis.org | https://github.com/thkukuk/libnsl"
 arch="all"
@@ -16,7 +16,6 @@ subpackages="$pkgname-dev"
 source="https://github.com/thkukuk/$pkgname/archive/$pkgname-$pkgver.tar.gz
 	nis_h.patch
 	cdefs.patch
-	tirpc_hack.patch
 	"
 builddir="$srcdir/$pkgname-$pkgname-$pkgver"
 
@@ -44,5 +43,4 @@ package() {
 
 sha512sums="ce0423042d372a9f800738480d222164e7ad2e09c9efa80d4845b9a06b78f478c395a65a4c175dd708d01f0bb9be9514526c44df48990221fd6d28c785767c49  libnsl-1.0.5.tar.gz
 6c555a8efab74eb55e0aaa2bef97d8ab14e382afaec59b99b47ff6f9abf4d33881f20543f88d41beabddfe934c368c4340c7254354fa9680120c0cc021df3468  nis_h.patch
-a0a761a50d611207cae4ad8e46b5b61fed498fe8c094841de99a550b43a0f95febcbccfafcd9568622abeb6e822f4bd9a21ecb261cb86fd8f4e601ce60749a9d  cdefs.patch
-a2a0a7bb3f23bb65c6f4d80dc74c629d2a14a70832f7779f122ce07420ffe240e38df4f0d5b157a812d86538c929fa62ee536ee59b9b19f6b2aa26d8bbc20cf1  tirpc_hack.patch"
+a0a761a50d611207cae4ad8e46b5b61fed498fe8c094841de99a550b43a0f95febcbccfafcd9568622abeb6e822f4bd9a21ecb261cb86fd8f4e601ce60749a9d  cdefs.patch"
diff --git a/testing/libnsl/tirpc_hack.patch b/testing/libnsl/tirpc_hack.patch
deleted file mode 100644
index 7d994aa10f..0000000000
--- a/testing/libnsl/tirpc_hack.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-For some reason tirpc library does not provide 'key_secretkey_is_set'
-
---- a/src/nisplus/nis_callback.c
-+++ b/src/nisplus/nis_callback.c
-@@ -295,7 +295,7 @@
-   cb->callback = callback;
-   cb->userdata = userdata;
- 
--  if ((flags & NO_AUTHINFO) || !key_secretkey_is_set ())
-+  if (flags & NO_AUTHINFO)
-     {
-       cb->serv->key_type = NIS_PK_NONE;
-       cb->serv->pkey.n_bytes = NULL;
-- 
2.12.1

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---