[apr] 03/05: refresh patches

[Stefan Fritsch]

This is an automated email from the git hooks/post-receive script.

sf pushed a commit to branch master
in repository apr.

commit 3d835f524e16c7d4a4b20de4fb6417785b459220
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Mon Nov 6 19:59:50 2017 +0100

    refresh patches
---
 debian/patches/hurd_shm_flock.patch   |  6 +++---
 debian/patches/libtoolize_check.patch | 18 ++++++++----------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/debian/patches/hurd_shm_flock.patch b/debian/patches/hurd_shm_flock.patch
index 307304f..3b533de 100644
--- a/debian/patches/hurd_shm_flock.patch
+++ b/debian/patches/hurd_shm_flock.patch
@@ -10,7 +10,7 @@ Bug: #656880
 
 --- apr.orig/configure.in
 +++ apr/configure.in
-@@ -1239,6 +1239,13 @@ case $host in
+@@ -1244,6 +1244,13 @@ case $host in
          APR_DECISION_OVERRIDE(USE_SHMEM_SHMGET_ANON)
          ;;
  esac
@@ -24,7 +24,7 @@ Bug: #656880
  APR_END_DECISION
  AC_DEFINE_UNQUOTED($ac_decision)
  
-@@ -1312,6 +1319,13 @@ case $host in
+@@ -1317,6 +1324,13 @@ case $host in
          fi
          ;;
  esac
@@ -38,7 +38,7 @@ Bug: #656880
  APR_END_DECISION
  AC_DEFINE_UNQUOTED($ac_decision)
  
-@@ -2309,6 +2323,12 @@ APR_IFALLYES(header:OS.h func:create_sem
+@@ -2314,6 +2328,12 @@ APR_IFALLYES(header:OS.h func:create_sem
  if test "x$apr_lock_method" != "x"; then
      APR_DECISION_FORCE($apr_lock_method)
  fi
diff --git a/debian/patches/libtoolize_check.patch b/debian/patches/libtoolize_check.patch
index e5356eb..8b33898 100644
--- a/debian/patches/libtoolize_check.patch
+++ b/debian/patches/libtoolize_check.patch
@@ -4,11 +4,9 @@ Last-Update: 2014-09-19
 
 libtool is now in package libtool-bin, but apr only needs libtoolize.
 
-Index: apr-1.5.1/build/buildcheck.sh
-===================================================================
---- apr-1.5.1.orig/build/buildcheck.sh	2009-11-13 01:27:16.000000000 +0100
-+++ apr-1.5.1/build/buildcheck.sh	2014-09-19 12:33:14.000000000 +0200
-@@ -37,11 +37,11 @@
+--- apr.orig/build/buildcheck.sh
++++ apr/build/buildcheck.sh
+@@ -39,11 +39,11 @@ fi
  # ltmain.sh (GNU libtool 1.1361 2004/01/02 23:10:52) 1.5a
  # output is multiline from 1.5 onwards
  
@@ -19,8 +17,8 @@ Index: apr-1.5.1/build/buildcheck.sh
 +libtoolize=`build/PrintPath glibtoolize1 glibtoolize libtoolize libtoolize15 libtoolize14`
 +lt_pversion=`$libtoolize --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
  if test -z "$lt_pversion"; then
--echo "buildconf: libtool not found."
-+echo "buildconf: libtoolize not found."
- echo "           You need libtool version 1.4 or newer installed"
- echo "           to build APR from SVN."
- exit 1
+-  echo "buildconf: libtool not found."
++  echo "buildconf: libtoolize not found."
+   echo "           You need libtool version 1.4 or newer installed"
+   echo "           to build APR from SVN."
+   res=1

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-apache/apr.git