apr: bump to 1.7.0

Version bump + patches refresh.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>

diff --git a/libs/apr/Makefile b/libs/apr/Makefile
index b8538440219888b1e82bbc59ca8f45e7fc7013f7..853050f458fb0797440ff62aef8dd78e51b80f3a 100644 (file)
--- a/libs/apr/Makefile
+++ b/libs/apr/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=apr
-PKG_VERSION:=1.6.5
-PKG_RELEASE:=5
+PKG_VERSION:=1.7.0
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@APACHE/apr/
-PKG_HASH:=a67ca9fcf9c4ff59bce7f428a323c8b5e18667fdea7b0ebad47d194371b0a105
+PKG_HASH:=e2e148f0b2e99b8e5c6caa09f6d4fb4dd3e83f744aa72a952f94f5a14436f7ea
 
 PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>, \
                Sebastian Kemper <sebastian_ml@gmx.net>

diff --git a/libs/apr/patches/001-cross-compile.patch b/libs/apr/patches/001-cross-compile.patch
index 9845175307e3e2ebdd487da390c1a1691ae69b4b..7fdb952fb989fcefc1e6bb539f8e7470d35d5e9b 100644 (file)
--- a/libs/apr/patches/001-cross-compile.patch
+++ b/libs/apr/patches/001-cross-compile.patch
@@ -40,7 +40,7 @@ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
  
  # get substituted into some targets
  APR_MAJOR_VERSION=@APR_MAJOR_VERSION@
-@@ -137,8 +139,13 @@ tools/gen_test_char.lo: tools/gen_test_c
+@@ -136,8 +138,13 @@ tools/gen_test_char.lo: tools/gen_test_c
        $(APR_MKDIR) tools
        $(LT_COMPILE)
  

diff --git a/libs/apr/patches/002-sys-param-h.patch b/libs/apr/patches/002-sys-param-h.patch
index 4f2bbe811dc45051b9714ad4d6264740f2325828..220f427fa6761432c6e63075879defe01eafe799 100644 (file)
--- a/libs/apr/patches/002-sys-param-h.patch
+++ b/libs/apr/patches/002-sys-param-h.patch
@@ -7,7 +7,7 @@ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
 
 --- a/configure.in
 +++ b/configure.in
-@@ -1593,6 +1593,7 @@ AC_SUBST(stdlibh)
+@@ -1596,6 +1596,7 @@ AC_SUBST(stdlibh)
  AC_SUBST(stringh)
  AC_SUBST(stringsh)
  AC_SUBST(sys_ioctlh)
@@ -17,15 +17,15 @@ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
  AC_SUBST(sys_socketh)
 --- a/include/apr.h.in
 +++ b/include/apr.h.in
-@@ -94,6 +94,7 @@
- #define APR_HAVE_STRING_H        @stringh@
+@@ -95,6 +95,7 @@
  #define APR_HAVE_STRINGS_H       @stringsh@
+ #define APR_HAVE_INTTYPES_H      @inttypesh@
  #define APR_HAVE_SYS_IOCTL_H     @sys_ioctlh@
 +#define APR_HAVE_SYS_PARAM_H     @sys_paramh@
  #define APR_HAVE_SYS_SENDFILE_H  @sys_sendfileh@
  #define APR_HAVE_SYS_SIGNAL_H    @sys_signalh@
  #define APR_HAVE_SYS_SOCKET_H    @sys_socketh@
-@@ -201,6 +202,9 @@
+@@ -218,6 +219,9 @@
  #ifdef __cplusplus
  extern "C" {
  #endif

diff --git a/libs/apr/patches/301-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch b/libs/apr/patches/301-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch
index 2c7e02065c0165e1f5dc0702a58d5d9c96ebe30a..ff0dc108d11c2ff194f0732734d3c84563e569c2 100644 (file)
--- a/libs/apr/patches/301-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch
+++ b/libs/apr/patches/301-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch
@@ -35,7 +35,7 @@ Upstream-Status: Pending
 
 --- a/configure.in
 +++ b/configure.in
-@@ -1785,7 +1785,7 @@ else
+@@ -1809,7 +1809,7 @@ else
      socklen_t_value="int"
  fi
  
@@ -44,25 +44,25 @@ Upstream-Status: Pending
  
  if test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_short"; then
      pid_t_fmt='#define APR_PID_T_FMT "hd"'
-@@ -1854,7 +1854,7 @@ APR_CHECK_TYPES_COMPATIBLE(ssize_t, long
- APR_CHECK_TYPES_COMPATIBLE(size_t, unsigned int, [size_t_fmt="u"])
- APR_CHECK_TYPES_COMPATIBLE(size_t, unsigned long, [size_t_fmt="lu"])
+@@ -1881,7 +1881,7 @@ APR_CHECK_TYPES_FMT_COMPATIBLE(size_t, u
+ APR_CHECK_TYPES_FMT_COMPATIBLE(size_t, unsigned int, u, [size_t_fmt="u"])
+ ])
  
 -APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], ssize_t, 8)
 +AC_CHECK_SIZEOF(ssize_t)
  
+ dnl the else cases below should no longer occur;
  AC_MSG_CHECKING([which format to use for apr_ssize_t])
- if test -n "$ssize_t_fmt"; then
-@@ -1871,7 +1871,7 @@ fi
+@@ -1899,7 +1899,7 @@ fi
  
  ssize_t_fmt="#define APR_SSIZE_T_FMT \"$ssize_t_fmt\""
  
 -APR_CHECK_SIZEOF_EXTENDED([#include <stddef.h>], size_t, 8)
 +AC_CHECK_SIZEOF(size_t)
  
+ # else cases below should no longer occur;
  AC_MSG_CHECKING([which format to use for apr_size_t])
- if test -n "$size_t_fmt"; then
-@@ -1888,7 +1888,7 @@ fi
+@@ -1917,7 +1917,7 @@ fi
  
  size_t_fmt="#define APR_SIZE_T_FMT \"$size_t_fmt\""