Subject: [alpine-aports] [PATCH 0/3] Miscellaenous adoptions

From: Drew DeVault <[email-masked]>
Date: Wed, 3 Apr 2019 15:06:49 -0400

Various abandoned packages I'm picking up. There'll be another three
series ahead of this with less miscy patches.

Along the way I updated to the latest version of things wherever I
noticed they were out-of-date, and occasionally normalized stale
APKBUILDs with proper test suites and such.

Note in my original email, I volunteered to adopt fish, but after
further thought I'll decline to maintain that package. All of the other
packages I mentioned adopting are in the forthcoming patchsets.

Drew DeVault (3):
  libbsd: adopt; upgrade to 0.9.1
  main/libedit: adopt; upgrade to 20190324.3.1
  main/pkgconf: adopt

 ...01-Replace-__BEGIN_DECLS-and-__END_DECLS.patch |  5 ++++-
 main/libbsd/APKBUILD                              | 15 +++++++--------
 main/libbsd/headers.patch                         | 10 ++++++++++
 main/libedit/APKBUILD                             |  7 +++----
 main/pkgconf/APKBUILD                             |  2 +-
 5 files changed, 25 insertions(+), 14 deletions(-)
 create mode 100644 main/libbsd/headers.patch

-- 
2.21.0

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

---

From: Drew DeVault <[email-masked]>
Date: Wed, 3 Apr 2019 15:06:50 -0400

---
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/main/libbsd/0001-Replace-__BEGIN_DECLS-and-__END_DECLS.patch b/main/libbsd/0001-Replace-__BEGIN_DECLS-and-__END_DECLS.patch
index e97e30e846..0d4007d09d 100644
--- a/main/libbsd/0001-Replace-__BEGIN_DECLS-and-__END_DECLS.patch
+++ b/main/libbsd/0001-Replace-__BEGIN_DECLS-and-__END_DECLS.patch
@@ -205,7 +205,7 @@ diff --git a/include/bsd/string.h b/include/bsd/string.h
 index ee2f953..fbf8c54 100644
 --- a/include/bsd/string.h
 +++ b/include/bsd/string.h
-@@ -36,13 +36,19 @@
+@@ -36,16 +36,22 @@
  #include <sys/cdefs.h>
  #include <sys/types.h>
  
@@ -219,7 +219,10 @@ index ee2f953..fbf8c54 100644
  char *strnstr(const char *str, const char *find, size_t str_len);
  void strmode(mode_t mode, char *str);
  
+ #if !defined(__GLIBC__) || \
+     (defined(__GLIBC__) && (!__GLIBC_PREREQ(2, 25) || !defined(_GNU_SOURCE)))
  void explicit_bzero(void *buf, size_t len);
+ #endif
 -__END_DECLS
 +#ifdef __cplusplus
 +}
diff --git a/main/libbsd/APKBUILD b/main/libbsd/APKBUILD
index 36b87316ef..4fa127bf28 100644
--- a/main/libbsd/APKBUILD
+++ b/main/libbsd/APKBUILD
@@ -1,9 +1,8 @@
 # Contributor: Sören Tempel <[email-masked]>
-# Contributor: 
-# Maintainer: 
+# Maintainer: Drew DeVault <[email-masked]>
 pkgname=libbsd
-pkgver=0.8.6
-pkgrel=2
+pkgver=0.9.1
+pkgrel=0
 pkgdesc="commonly-used BSD functions not implemented by all libcs"
 url="https://libbsd.freedesktop.org/"
 arch="all"
@@ -14,8 +13,8 @@ makedepends_build="autoconf automake libtool"
 makedepends_host="$depends_dev"
 subpackages="$pkgname-dev $pkgname-doc"
 source="https://libbsd.freedesktop.org/releases/$pkgname-$pkgver.tar.xz
-	0001-Replace-__BEGIN_DECLS-and-__END_DECLS.patch
 	disable-fpurge-test.patch
+	headers.patch
 	"
 
 builddir="$srcdir/$pkgname-$pkgver"
@@ -49,6 +48,6 @@ package() {
 		install
 }
 
-sha512sums="ece01ced324f840c2cee6321c7dcf97ff123d55ea9f203c1ce35e1b46643dc7b34ef6dc6c8d128252b36848624850b40823411cc96b99a66a401eb1e9d8cea6b  libbsd-0.8.6.tar.xz
-4ef5d664f04af21da17c5ac9eed6fec4c0c7d06ff3af70e93bfdfdf926c7473954649e315158ec8f90cef93f82524431fa4fbc60374d20007f1234d6afe9edcd  0001-Replace-__BEGIN_DECLS-and-__END_DECLS.patch
-34ab57a9b67c0d6035312dff78e6dd0d1c48442c6a1b6e769b6ebb6dccb0dac80ccc2c309724e39c097cdac944bdbd9522582f93f2567da8c6615990e2d0238b  disable-fpurge-test.patch"
+sha512sums="435822b8f2495a5e2705e5ab5c834a4f0f3a177b3e5c46a7c6162924507ca984e957e94a512b5ebd0067ecb413bac458fade357709ef199e9b75edf0315de91c  libbsd-0.9.1.tar.xz
+34ab57a9b67c0d6035312dff78e6dd0d1c48442c6a1b6e769b6ebb6dccb0dac80ccc2c309724e39c097cdac944bdbd9522582f93f2567da8c6615990e2d0238b  disable-fpurge-test.patch
+594d598bc7f6d34bff080a26f8d726bf779d3827423f242ee7caa9a58fc89c89d80e0677c03e9c640e0074afbdc34636fa8ffa47a99fd9c576845e3039a7ccbd  headers.patch"
diff --git a/main/libbsd/headers.patch b/main/libbsd/headers.patch
new file mode 100644
index 0000000000..5b8f264253
--- /dev/null
+++ b/main/libbsd/headers.patch
@@ -0,0 +1,10 @@
+--- libbsd-0.9.1/src/flopen.c.old	2018-05-21 02:33:33.000000000 +0000
++++ libbsd-0.9.1/src/flopen.c	2018-09-09 17:43:59.850000000 +0000
+@@ -32,6 +32,7 @@
+ #include <sys/stat.h>
+ 
+ #include <errno.h>
++#include <fcntl.h>
+ #include <stdarg.h>
+ #include <unistd.h>
+ 
-- 
2.21.0

---

---

From: Drew DeVault <[email-masked]>
Date: Wed, 3 Apr 2019 15:06:52 -0400

---
 main/pkgconf/APKBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/pkgconf/APKBUILD b/main/pkgconf/APKBUILD
index 2dff7b4a34..a8297f7af9 100644
--- a/main/pkgconf/APKBUILD
+++ b/main/pkgconf/APKBUILD
@@ -1,4 +1,4 @@
-# Maintainer: 
+# Maintainer: Drew DeVault <[email-masked]>
 pkgname=pkgconf
 pkgver=1.6.1
 pkgrel=0
-- 
2.21.0

---

---

From: Natanael Copa <[email-masked]>
Date: Wed, 3 Apr 2019 21:14:04 +0200

On Wed,  3 Apr 2019 15:06:52 -0400

> +++ b/main/pkgconf/APKBUILD

this needs pkgrel bump. abuild will fish out the maintainer comment and
include it in the .apk.

and we should fix abuild to use maintainer="...", which is a better way
to do it.

-nc

---

---

From: Drew DeVault <[email-masked]>
Date: Wed, 3 Apr 2019 15:06:51 -0400

---
 main/libedit/APKBUILD | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/main/libedit/APKBUILD b/main/libedit/APKBUILD
index 5ab231ecf8..147c3d48e3 100644
--- a/main/libedit/APKBUILD
+++ b/main/libedit/APKBUILD
@@ -1,7 +1,6 @@
-# Contributor: 
-# Maintainer: 
+# Maintainer: Drew DeVault <[email-masked]>
 pkgname=libedit
-pkgver=20181209.3.1
+pkgver=20190324.3.1
 _ver=${pkgver/./-}
 pkgrel=0
 pkgdesc="BSD line editing library"
@@ -42,4 +41,4 @@ package() {
 	rm "$pkgdir"/usr/share/man/man3/history.3*
 }
 
-sha512sums="7673fb5612149a0d3508a103ac6f92041704911b27fffa084624f835fa6ac55b17c43b6e622ff9eac6ca06368e80ede14d93ec75afb5a368651734b8bfe045d2  libedit-20181209-3.1.tar.gz"
+sha512sums="240098989e3c5c8c5e28a61036655ad5a57f1c484e1cce2eaf3da157ff238dfb9cd81c766f82efbefa0935b7b5c07328087788cbac007b11dfb558cfaccaedf3  libedit-20190324-3.1.tar.gz"
-- 
2.21.0

---