[arch-commits] Commit in postfix/trunk (PKGBUILD glibc2.30.patch)

2020-03-16 Thread Gaƫtan Bisson via arch-commits
Date: Monday, March 16, 2020 @ 18:39:26
  Author: bisson
Revision: 377791

upstream update

Modified:
  postfix/trunk/PKGBUILD
Deleted:
  postfix/trunk/glibc2.30.patch

-+
 PKGBUILD|   11 ++-
 glibc2.30.patch |   51 ---
 2 files changed, 2 insertions(+), 60 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-03-16 17:48:36 UTC (rev 377790)
+++ PKGBUILD2020-03-16 18:39:26 UTC (rev 377791)
@@ -3,7 +3,7 @@
 # Maintainer: Gaetan Bisson 
 
 pkgname=postfix
-pkgver=3.4.10
+pkgver=3.5.0
 pkgrel=1
 url='http://www.postfix.org/'
 pkgdesc='Fast, easy to administer, secure mail server'
@@ -13,12 +13,10 @@
  'mariadb-libs' 'postgresql-libs' 'sqlite' 'tinycdb')
 optdepends=('perl: postfix-collate.pl and qshape')
 
source=("http://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz;
-'glibc2.30.patch'
 'aliases.patch'
 'sysusers.d'
 'service')
-sha256sums=('908a66fc38537a0047e8561e1bc0ef096c53357ffad16d2d728cd4fc8ae56654'
-'8b4730f4629f302471ac1a80653931d32ffcf67241daa10947639a2c701a05f6'
+sha256sums=('22ac929733449a294252ac8deda4b264ff48a997ff3847007291a2ee53ef55cc'
 'f4c766efc20b4638f9fd72707ca6d4c2628279ebd79f5227276fa4ca6867c336'
 '63f39147887336bdd173fb9425998f0a0c6f00a31241f922a255c157bfd8d02e'
 '52781649c49a50cecd7d20f693f602d7dc78b985ac5f0e72c4abfa0d800e58f0')
@@ -29,11 +27,6 @@
 provides=('smtp-server' 'smtp-forwarder' 'postfix-tools')
 replaces=('postfix-tools')
 
-prepare() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
-   patch -Np1 -i ../glibc2.30.patch
-}
-
 build() {
cd "${srcdir}/${pkgname}-${pkgver}"
 

Deleted: glibc2.30.patch
===
--- glibc2.30.patch 2020-03-16 17:48:36 UTC (rev 377790)
+++ glibc2.30.patch 2020-03-16 18:39:26 UTC (rev 377791)
@@ -1,51 +0,0 @@
-Description: fix build with glibc 2.30
- glibc 2.30 release notes at
- https://savannah.gnu.org/forum/forum.php?forum_id=9515 states:
- """
- Support for the "inet6" option in /etc/resolv.conf and the RES_USE_INET6
- resolver flag (deprecated in glibc 2.25) have been removed.
- ...
- The obsolete RES_INSECURE1 and RES_INSECURE2 option flags for the DNS stub
- resolver have been removed from .
- """
- And RES_AAONLY and RES_PRIMARY are already flagged as deprecated and are
- being guarded with the same fix.
-Origin: upstream, 
https://github.com/vdukhovni/postfix/commit/3274c3cea9d739f86e84b65664aabb692e37e83f#diff-777bfb681a1cd539ddc8e1e606959ffa
-Bug: 
http://postfix.1071664.n5.nabble.com/build-failure-with-glibc-2-30-td102511.html
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/postfix/+bug/1842923
-Last-Update: 2019-09-05

-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-diff --git a/postfix/src/dns/dns_str_resflags.c 
b/postfix/src/dns/dns_str_resflags.c
-index 5f2cce5e..472394c3 100644
 a/src/dns/dns_str_resflags.c
-+++ b/src/dns/dns_str_resflags.c
-@@ -52,18 +52,28 @@
- static const LONG_NAME_MASK resflag_table[] = {
- "RES_INIT", RES_INIT,
- "RES_DEBUG", RES_DEBUG,
-+#ifdef RES_AAONLY
- "RES_AAONLY", RES_AAONLY,
-+#endif
- "RES_USEVC", RES_USEVC,
-+#ifdef RES_PRIMARY
- "RES_PRIMARY", RES_PRIMARY,
-+#endif
- "RES_IGNTC", RES_IGNTC,
- "RES_RECURSE", RES_RECURSE,
- "RES_DEFNAMES", RES_DEFNAMES,
- "RES_STAYOPEN", RES_STAYOPEN,
- "RES_DNSRCH", RES_DNSRCH,
-+#ifdef RES_INSECURE1
- "RES_INSECURE1", RES_INSECURE1,
-+#endif
-+#ifdef RES_INSECURE2
- "RES_INSECURE2", RES_INSECURE2,
-+#endif
- "RES_NOALIASES", RES_NOALIASES,
-+#ifdef RES_USE_INET6
- "RES_USE_INET6", RES_USE_INET6,
-+#endif
- #ifdef RES_ROTATE
- "RES_ROTATE", RES_ROTATE,
- #endif


[arch-commits] Commit in postfix/trunk (PKGBUILD glibc2.30.patch)

2019-11-11 Thread Evangelos Foutras via arch-commits
Date: Monday, November 11, 2019 @ 23:03:40
  Author: foutrelis
Revision: 367800

Fix build with glibc 2.30

Added:
  postfix/trunk/glibc2.30.patch
Modified:
  postfix/trunk/PKGBUILD

-+
 PKGBUILD|7 +++
 glibc2.30.patch |   51 +++
 2 files changed, 58 insertions(+)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-11 22:53:54 UTC (rev 367799)
+++ PKGBUILD2019-11-11 23:03:40 UTC (rev 367800)
@@ -13,10 +13,12 @@
  'mariadb-libs' 'postgresql-libs' 'sqlite' 'tinycdb')
 optdepends=('perl: postfix-collate.pl and qshape')
 
source=("http://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz;
+'glibc2.30.patch'
 'aliases.patch'
 'sysusers.d'
 'service')
 sha256sums=('fe3253121d3ba8836a23774225518560b35e40497951ad5bec154afa8205f967'
+'8b4730f4629f302471ac1a80653931d32ffcf67241daa10947639a2c701a05f6'
 'f4c766efc20b4638f9fd72707ca6d4c2628279ebd79f5227276fa4ca6867c336'
 '63f39147887336bdd173fb9425998f0a0c6f00a31241f922a255c157bfd8d02e'
 '52781649c49a50cecd7d20f693f602d7dc78b985ac5f0e72c4abfa0d800e58f0')
@@ -27,6 +29,11 @@
 provides=('smtp-server' 'smtp-forwarder' 'postfix-tools')
 replaces=('postfix-tools')
 
+prepare() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   patch -Np1 -i ../glibc2.30.patch
+}
+
 build() {
cd "${srcdir}/${pkgname}-${pkgver}"
 

Added: glibc2.30.patch
===
--- glibc2.30.patch (rev 0)
+++ glibc2.30.patch 2019-11-11 23:03:40 UTC (rev 367800)
@@ -0,0 +1,51 @@
+Description: fix build with glibc 2.30
+ glibc 2.30 release notes at
+ https://savannah.gnu.org/forum/forum.php?forum_id=9515 states:
+ """
+ Support for the "inet6" option in /etc/resolv.conf and the RES_USE_INET6
+ resolver flag (deprecated in glibc 2.25) have been removed.
+ ...
+ The obsolete RES_INSECURE1 and RES_INSECURE2 option flags for the DNS stub
+ resolver have been removed from .
+ """
+ And RES_AAONLY and RES_PRIMARY are already flagged as deprecated and are
+ being guarded with the same fix.
+Origin: upstream, 
https://github.com/vdukhovni/postfix/commit/3274c3cea9d739f86e84b65664aabb692e37e83f#diff-777bfb681a1cd539ddc8e1e606959ffa
+Bug: 
http://postfix.1071664.n5.nabble.com/build-failure-with-glibc-2-30-td102511.html
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/postfix/+bug/1842923
+Last-Update: 2019-09-05
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+diff --git a/postfix/src/dns/dns_str_resflags.c 
b/postfix/src/dns/dns_str_resflags.c
+index 5f2cce5e..472394c3 100644
+--- a/src/dns/dns_str_resflags.c
 b/src/dns/dns_str_resflags.c
+@@ -52,18 +52,28 @@
+ static const LONG_NAME_MASK resflag_table[] = {
+ "RES_INIT", RES_INIT,
+ "RES_DEBUG", RES_DEBUG,
++#ifdef RES_AAONLY
+ "RES_AAONLY", RES_AAONLY,
++#endif
+ "RES_USEVC", RES_USEVC,
++#ifdef RES_PRIMARY
+ "RES_PRIMARY", RES_PRIMARY,
++#endif
+ "RES_IGNTC", RES_IGNTC,
+ "RES_RECURSE", RES_RECURSE,
+ "RES_DEFNAMES", RES_DEFNAMES,
+ "RES_STAYOPEN", RES_STAYOPEN,
+ "RES_DNSRCH", RES_DNSRCH,
++#ifdef RES_INSECURE1
+ "RES_INSECURE1", RES_INSECURE1,
++#endif
++#ifdef RES_INSECURE2
+ "RES_INSECURE2", RES_INSECURE2,
++#endif
+ "RES_NOALIASES", RES_NOALIASES,
++#ifdef RES_USE_INET6
+ "RES_USE_INET6", RES_USE_INET6,
++#endif
+ #ifdef RES_ROTATE
+ "RES_ROTATE", RES_ROTATE,
+ #endif