[arch-commits] Commit in opendmarc/trunk (PKGBUILD glibc2.32-compat.patch)

[Thore Bödecker]

    Date: Wednesday, February 24, 2021 @ 14:16:30
  Author: foxxx0
Revision: 871428

upgpkg: opendmarc 1.4.0-1: update to upstream release 1.4.0

Added:
  opendmarc/trunk/glibc2.32-compat.patch
Modified:
  opendmarc/trunk/PKGBUILD

------------------------+
 PKGBUILD               |   24 ++++++++++++------------
 glibc2.32-compat.patch |   19 +++++++++++++++++++
 2 files changed, 31 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-02-24 14:16:23 UTC (rev 871427)
+++ PKGBUILD	2021-02-24 14:16:30 UTC (rev 871428)
@@ -4,8 +4,9 @@
 # Contributor: Hao Zhang <theivorytower [at] gmail [dot] com>
 
 pkgname=opendmarc
-pkgver=1.3.3
-pkgrel=2
+pkgver=1.4.0
+pkgrel=1
+_tarball_folder="OpenDMARC-rel-${pkgname}-${pkgver//./-}"
 pkgdesc="Free open source software implementation of the DMARC specification"
 arch=('x86_64')
 url="https://github.com/trusteddomainproject/OpenDMARC"
@@ -19,27 +20,26 @@
             'perl-dbd-mysql: generate DMARC reports'
             'perl-libwww: generate DMARC reports')
 backup=('etc/opendmarc/opendmarc.conf')
-source=("https://github.com/trusteddomainproject/OpenDMARC/archive/rel-opendmarc-${pkgver//./-}.tar.gz"
-        'CVE-2020-12460.patch'
+source=("https://github.com/trusteddomainproject/OpenDMARC/archive/rel-${pkgname}-${pkgver//./-}.tar.gz"
+        'glibc2.32-compat.patch'
         'opendmarc.service'
         'opendmarc.conf'
         'opendmarc.sysusers')
-sha512sums=('bb4bf8e3ad2d1732b07e55316819d4fd708e529b54a336d7d00763e13bfc62580bb1b30f132fa786dbca15e526e8dd5e146c7be454e1c42714a9f57126fc5e12'
-            '98582c2b0a08d77b27856331f28214b7b5fa3972c572189ed21963030e98858285a5a69851f173d08380bf409d985980e7c61de5d571af11062f0d394fc8b5f5'
+sha512sums=('3f27d5ab0adda6d26184176683d6a784456d85e72bdae23d07977909fceafd679480b5058155d0ccf5c4eac16259215ac4ca7df0a9d1acee3f418a8e2e37d1ef'
+            'b79b6cf0f48030665a70de97d5b264850f2ec6022ef325bce1343980dae68af8129f0a0e40fd84efb6abe36b3a62af9c00a2606cfffdff6fadcb98928c4cf9b2'
             '738de0cd286dd30713f32034f9ecf9009b6f64038c573c9f8aedaf10df8293bb9eec9d19492a03a2ebf2d2960289bdf48be9b1eb25395dbe9a490f7e3b25cb34'
             '2753ad4477b499947ca07bb385ad0e10f327efa61a9059884091ead8e8e2bd65793436053d5a9c734e4c0676b7823982083ea7b35fae967eeacaeafb6226ff20'
             'fbd5e81ded35281e3a63b4858a368033fa27696dee22a5dcf52e3e04b0762476e1ffa6edb489cf76612f3b4ffaee0fce586ab97d1da9805a089bbaf3487c907b')
 
 prepare() {
-  cd "${srcdir}/OpenDMARC-rel-opendmarc-${pkgver//./-}"
-#  sed -i '' configure.ac
+  cd "${srcdir}/${_tarball_folder}"
   mkdir docs
   touch docs/Makefile.in
-  patch -Np1 < "${srcdir}"/CVE-2020-12460.patch
+  patch -p1 -N -i "${srcdir}"/glibc2.32-compat.patch
 }
 
 build() {
-  cd "${srcdir}/OpenDMARC-rel-opendmarc-${pkgver//./-}"
+  cd "${srcdir}/${_tarball_folder}"
 #  export LDFLAGS="${LDFLAGS//,--as-needed}"
   test -x configure || autoreconf -v -i
   ./configure --prefix=/usr \
@@ -53,12 +53,12 @@
 }
 
 check() {
-  cd "${srcdir}/OpenDMARC-rel-opendmarc-${pkgver//./-}"
+  cd "${srcdir}/${_tarball_folder}"
   make -k check
 }
 
 package() {
-  cd "${srcdir}/OpenDMARC-rel-opendmarc-${pkgver//./-}"
+  cd "${srcdir}/${_tarball_folder}"
   make DESTDIR="${pkgdir}/" install
   # config
   install -D -m640 -o 335 -g 12 "${srcdir}/opendmarc.conf" "${pkgdir}/etc/${pkgname}/opendmarc.conf"

Added: glibc2.32-compat.patch
===================================================================
--- glibc2.32-compat.patch	                        (rev 0)
+++ glibc2.32-compat.patch	2021-02-24 14:16:30 UTC (rev 871428)
@@ -0,0 +1,19 @@
+diff -upr a/configure.ac b/configure.ac
+--- a/configure.ac	2021-01-28 18:35:29.000000000 +0100
++++ b/configure.ac	2021-02-24 15:03:51.290443097 +0100
+@@ -139,15 +139,9 @@ m4_define([AC_LANG_CALL], [AC_LANG_PROGR
+ AC_SEARCH_LIBS(res_ninit, resolv,
+ 	AC_DEFINE(HAVE_RES_NINIT, 1,
+ 	[Define to 1 if you have the `res_ninit()' function.]))
+-AC_SEARCH_LIBS(res_ndestroy, resolv,
+-        AC_DEFINE(HAVE_RES_NDESTROY, 1,
+-        [Define to 1 if you have the `res_ndestroy()' function.]))
+ AC_SEARCH_LIBS(__res_ninit, resolv,
+         AC_DEFINE(HAVE_RES_NINIT, 1,
+         [Define to 1 if you have the `__res_ninit()' function.]))
+-AC_SEARCH_LIBS(__res_ndestroy, resolv,
+-        AC_DEFINE(HAVE_RES_NDESTROY, 1,
+-        [Define to 1 if you have the `__res_ndestroy()' function.]))
+  
+ m4_rename_force([saved_AC_LANG_CALL], [AC_LANG_CALL])
+ AC_CHECK_LIB(idn, idn_free)