diff options
| -rw-r--r-- | user/libbsd/0001-Replace-__BEGIN_DECLS-and-__END_DECLS.patch | 5 | ||||
| -rw-r--r-- | user/libbsd/APKBUILD | 13 | ||||
| -rw-r--r-- | user/libbsd/headers.patch | 10 |
3 files changed, 21 insertions, 7 deletions
diff --git a/user/libbsd/0001-Replace-__BEGIN_DECLS-and-__END_DECLS.patch b/user/libbsd/0001-Replace-__BEGIN_DECLS-and-__END_DECLS.patch index e97e30e84..0d4007d09 100644 --- a/user/libbsd/0001-Replace-__BEGIN_DECLS-and-__END_DECLS.patch +++ b/user/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/user/libbsd/APKBUILD b/user/libbsd/APKBUILD index 0e36db5a5..015d71295 100644 --- a/user/libbsd/APKBUILD +++ b/user/libbsd/APKBUILD @@ -2,8 +2,8 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=libbsd -pkgver=0.8.6 -pkgrel=3 +pkgver=0.9.1 +pkgrel=0 pkgdesc="Commonly used BSD functions not implemented by all libcs" url="https://libbsd.freedesktop.org/" arch="all" @@ -15,9 +15,9 @@ 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" prepare() { default_prepare @@ -48,6 +48,7 @@ package() { make DESTDIR="$pkgdir" 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 +5a3302601e9534ce8493122b20cc53fe320e0d884ca4abf041a8d151175c076e26ac9ef521c65b1654ea2295bd0251b70b0bdc80ed8a03c98777aab8502719ca 0001-Replace-__BEGIN_DECLS-and-__END_DECLS.patch +34ab57a9b67c0d6035312dff78e6dd0d1c48442c6a1b6e769b6ebb6dccb0dac80ccc2c309724e39c097cdac944bdbd9522582f93f2567da8c6615990e2d0238b disable-fpurge-test.patch +594d598bc7f6d34bff080a26f8d726bf779d3827423f242ee7caa9a58fc89c89d80e0677c03e9c640e0074afbdc34636fa8ffa47a99fd9c576845e3039a7ccbd headers.patch" diff --git a/user/libbsd/headers.patch b/user/libbsd/headers.patch new file mode 100644 index 000000000..5b8f26425 --- /dev/null +++ b/user/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> + |