From cb32c579d2b827375ac271c669848eff897c727d Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Wed, 30 Oct 2019 12:32:05 -0500 Subject: [PATCH] libasr: update to 1.0.3 SONAME version did not change, no need of bumping opensmtpd --- .../libasr/patches/bootstrap-automake.patch | 11 --------- .../patches/musl-inline-res_randomid.patch | 24 ------------------- srcpkgs/libasr/patches/netdb_success.patch | 11 --------- srcpkgs/libasr/template | 9 ++++--- 4 files changed, 4 insertions(+), 51 deletions(-) delete mode 100644 srcpkgs/libasr/patches/bootstrap-automake.patch delete mode 100644 srcpkgs/libasr/patches/musl-inline-res_randomid.patch delete mode 100644 srcpkgs/libasr/patches/netdb_success.patch diff --git a/srcpkgs/libasr/patches/bootstrap-automake.patch b/srcpkgs/libasr/patches/bootstrap-automake.patch deleted file mode 100644 index e5036cae0cf..00000000000 --- a/srcpkgs/libasr/patches/bootstrap-automake.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- bootstrap 2018-08-28 15:14:58.777885703 +0200 -+++ bootstrap 2018-08-28 15:14:50.697886185 +0200 -@@ -36,7 +36,7 @@ - - # Check for automake - amvers="no" --for v in 15 14 13 12 11 10 9 8 7 6 5; do -+for v in 16 15 14 13 12 11 10 9 8 7 6 5; do - if automake-1.${v} --version >/dev/null 2>&1; then - amvers="-1.${v}" - break diff --git a/srcpkgs/libasr/patches/musl-inline-res_randomid.patch b/srcpkgs/libasr/patches/musl-inline-res_randomid.patch deleted file mode 100644 index 1fe96baade4..00000000000 --- a/srcpkgs/libasr/patches/musl-inline-res_randomid.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git configure.ac configure.ac -index 10aff04..07e149f 100644 ---- configure.ac -+++ configure.ac -@@ -456,6 +456,7 @@ AC_CHECK_FUNCS([ \ - issetugid \ - memmove \ - reallocarray \ -+ res_randomid \ - snprintf \ - strdup \ - strerror \ -diff --git src/asr_private.h src/asr_private.h -index 0960e37..158e7ff 100644 ---- src/asr_private.h -+++ src/asr_private.h -@@ -365,3 +365,7 @@ extern FILE * asr_debug; - asr_statestr((a)->as_state), \ - asr_statestr((s))); \ - (a)->as_state = (s); } while (0) -+ -+#ifndef HAVE_RES_RANDOMID -+#define res_randomid(x) (0xffff & getpid()) -+#endif diff --git a/srcpkgs/libasr/patches/netdb_success.patch b/srcpkgs/libasr/patches/netdb_success.patch deleted file mode 100644 index 6c176c03c8f..00000000000 --- a/srcpkgs/libasr/patches/netdb_success.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- openbsd-compat/defines.h.orig -+++ openbsd-compat/defines.h -@@ -823,7 +823,7 @@ - #endif - - #ifndef NETDB_SUCCESS --# define NETDB_SUCCESS -1 -+# define NETDB_SUCCESS 0 - #endif - - /* end of chl */ diff --git a/srcpkgs/libasr/template b/srcpkgs/libasr/template index c83f984bf2d..b36323fb094 100644 --- a/srcpkgs/libasr/template +++ b/srcpkgs/libasr/template @@ -1,8 +1,7 @@ # Template file for 'libasr' pkgname=libasr -version=1.0.2 -revision=4 -wrksrc="${pkgname}-${pkgname}-${version}" +version=1.0.3 +revision=1 build_style=gnu-configure hostmakedepends="automake libtool" makedepends="libressl-devel" @@ -10,8 +9,8 @@ short_desc="Simple and portable asynchronous resolver library" maintainer="Orphaned " license="BSD-2-Clause" homepage="https://www.opensmtpd.org/" -distfiles="https://github.com/OpenSMTPD/${pkgname}/archive/${pkgname}-${version}.tar.gz" -checksum=4ab54264206e255fd6c2de982764bb5ce7857ec8f649ad3ee45771244593b6e1 +distfiles="https://github.com/OpenSMTPD/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.gz" +checksum=9cd88e0172e6d426438875e09229d1d473d56db546d02b630f9dd14db226d68d case "$XBPS_TARGET_MACHINE" in *-musl) ;;