Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

apr: bump to 1.7.0

Browse source 
Version bump + patches refresh.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
This commit is contained in:
Sebastian Kemper 2020-02-04 21:33:12 +01:00
parent 6e6e076eef
commit 0c6d461cc9
4 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libs/apr/Makefile
View file

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

2
libs/apr/patches/001-cross-compile.patch
View file

@ -40,7 +40,7 @@ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
# get substituted into some targets # get substituted into some targets
APR_MAJOR_VERSION=@APR_MAJOR_VERSION@ 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 $(APR_MKDIR) tools
$(LT_COMPILE) $(LT_COMPILE)

8
libs/apr/patches/002-sys-param-h.patch
View file

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

16
libs/apr/patches/301-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch
View file

@ -35,7 +35,7 @@ Upstream-Status: Pending
--- a/configure.in --- a/configure.in
+++ b/configure.in +++ b/configure.in
@@ -1785,7 +1785,7 @@ else @@ -1809,7 +1809,7 @@ else
socklen_t_value="int" socklen_t_value="int"
fi fi
@ -44,25 +44,25 @@ Upstream-Status: Pending
if test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_short"; then if test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_short"; then
pid_t_fmt='#define APR_PID_T_FMT "hd"' pid_t_fmt='#define APR_PID_T_FMT "hd"'
@@ -1854,7 +1854,7 @@ APR_CHECK_TYPES_COMPATIBLE(ssize_t, long @@ -1881,7 +1881,7 @@ APR_CHECK_TYPES_FMT_COMPATIBLE(size_t, u
APR_CHECK_TYPES_COMPATIBLE(size_t, unsigned int, [size_t_fmt="u"]) APR_CHECK_TYPES_FMT_COMPATIBLE(size_t, unsigned int, u, [size_t_fmt="u"])
APR_CHECK_TYPES_COMPATIBLE(size_t, unsigned long, [size_t_fmt="lu"]) ])
-APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], ssize_t, 8) -APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], ssize_t, 8)
+AC_CHECK_SIZEOF(ssize_t) +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]) AC_MSG_CHECKING([which format to use for apr_ssize_t])
if test -n "$ssize_t_fmt"; then @@ -1899,7 +1899,7 @@ fi
@@ -1871,7 +1871,7 @@ fi
ssize_t_fmt="#define APR_SSIZE_T_FMT \"$ssize_t_fmt\"" ssize_t_fmt="#define APR_SSIZE_T_FMT \"$ssize_t_fmt\""
-APR_CHECK_SIZEOF_EXTENDED([#include <stddef.h>], size_t, 8) -APR_CHECK_SIZEOF_EXTENDED([#include <stddef.h>], size_t, 8)
+AC_CHECK_SIZEOF(size_t) +AC_CHECK_SIZEOF(size_t)
# else cases below should no longer occur;
AC_MSG_CHECKING([which format to use for apr_size_t]) AC_MSG_CHECKING([which format to use for apr_size_t])
if test -n "$size_t_fmt"; then @@ -1917,7 +1917,7 @@ fi
@@ -1888,7 +1888,7 @@ fi
size_t_fmt="#define APR_SIZE_T_FMT \"$size_t_fmt\"" size_t_fmt="#define APR_SIZE_T_FMT \"$size_t_fmt\""