[arch-commits] Commit in apr/trunk (PKGBUILD apr_mcast_v6.patch)

[Anatol Pomozov]

    Date: Sunday, June 25, 2017 @ 16:10:05
  Author: anatolik
Revision: 299223

upgpkg: apr 1.6.2-1

Modified:
  apr/trunk/PKGBUILD
Deleted:
  apr/trunk/apr_mcast_v6.patch

--------------------+
 PKGBUILD           |   16 +++++++---------
 apr_mcast_v6.patch |   11 -----------
 2 files changed, 7 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-06-25 16:05:49 UTC (rev 299222)
+++ PKGBUILD	2017-06-25 16:10:05 UTC (rev 299223)
@@ -4,8 +4,8 @@
 # Contributor: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=apr
-pkgver=1.5.2
-pkgrel=2
+pkgver=1.6.2
+pkgrel=1
 pkgdesc='The Apache Portable Runtime'
 arch=('i686' 'x86_64')
 url='http://apr.apache.org/'
@@ -17,17 +17,16 @@
         ship_find_apr.m4.patch
         fix-apr.pc.patch
         omit_extra_libs.patch
-        dont_override_external_buildflags
-        apr_mcast_v6.patch)
-sha256sums=('7d03ed29c22a7152be45b8e50431063736df9e1daa1ddf93f6a547ba7a28f67a'
+        dont_override_external_buildflags)
+sha256sums=('09109cea377bab0028bba19a92b5b0e89603df9eab05c0f7dbd4dd83d48dcebd'
             'SKIP'
             '91490ffee726f851edad9fc733ac6632aaf434a87920e706eeb132a97ee5f402'
             '315932ef6536fc0644c1efe770ceb3bb675c3c7103a7cbb2f02efd8be03eb752'
             '12595d331b48be9e44bd843635eb4f0f500bd213e197a551a9d383a28a24641f'
             '3d491d3af8fb5a75db4e085a17e5d8dcbe058bd256ef893ee779dc97fc9f8ad6'
-            '5ac0bdc532479f6082d29115ac9d3ca24524fd8b97a556568755b88e5a68e3df'
-            '3cb473d1f0e1e27f7f4308daf15237bb886870bf444a7f44cd45ff469ac99fd2')
-validpgpkeys=('5B5181C2C0AB13E59DA3F7A3EC582EB639FF092C') # Jeff Trawick
+            '5ac0bdc532479f6082d29115ac9d3ca24524fd8b97a556568755b88e5a68e3df')
+validpgpkeys=('5B5181C2C0AB13E59DA3F7A3EC582EB639FF092C'  # Jeff Trawick
+              'B1B96F45DFBDCCF974019235193F180AB55D9977') # Nick Kew <niq at apache.org>
 
 prepare() {
   cd apr-$pkgver
@@ -36,7 +35,6 @@
   patch -Np1 -i ../fix-apr.pc.patch
   patch -Np1 -i ../omit_extra_libs.patch
   patch -Np1 -i ../dont_override_external_buildflags
-  patch -Np1 -i ../apr_mcast_v6.patch
   sed -e 's/env python/env python2/' -i build/gen-build.py
   sed -e 's/python/python2/g' -i build/buildcheck.sh
   ./buildconf

Deleted: apr_mcast_v6.patch
===================================================================
--- apr_mcast_v6.patch	2017-06-25 16:05:49 UTC (rev 299222)
+++ apr_mcast_v6.patch	2017-06-25 16:10:05 UTC (rev 299223)
@@ -1,11 +0,0 @@
---- apr.orig/network_io/unix/multicast.c
-+++ apr/network_io/unix/multicast.c
-@@ -62,7 +62,7 @@ static unsigned int find_if_index(const
-     for (ifp = ifs; ifp; ifp = ifp->ifa_next) {
-         if (ifp->ifa_addr != NULL && ifp->ifa_addr->sa_family == AF_INET6) {
-             if (memcmp(&iface->sa.sin6.sin6_addr,
--                       &ifp->ifa_addr->sa_data[0],
-+                       &((struct sockaddr_in6*)ifp->ifa_addr)->sin6_addr,
-                        sizeof(iface->sa.sin6.sin6_addr)) == 0) {
-                 index = if_nametoindex(ifp->ifa_name);
-                 break;