[apr] 03/06: Move to 1.6.2
Stefan Fritsch
sf at moszumanska.debian.org
Fri Aug 4 15:48:24 UTC 2017
This is an automated email from the git hooks/post-receive script.
sf pushed a commit to branch master
in repository apr.
commit 33f936029142cc2e704693a9ce8722dca4488cda
Author: Stefan Fritsch <sf at sfritsch.de>
Date: Fri Aug 4 16:14:42 2017 +0200
Move to 1.6.2
- changelog entry
- refresh patches
- drop apr_mcast_v6.patch integrated upstream
---
debian/changelog | 6 ++++++
debian/patches/apr_mcast_v6.patch | 11 -----------
debian/patches/cross.patch | 12 +++++-------
debian/patches/debug_testpoll_failure.patch | 2 +-
debian/patches/fix_doxygen.patch | 6 +++---
debian/patches/hurd_path_max.patch | 2 +-
debian/patches/hurd_shm_flock.patch | 6 +++---
debian/patches/series | 1 -
debian/patches/ship_find_apr.m4.patch | 8 ++++----
9 files changed, 23 insertions(+), 31 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 90fd508..13107d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+apr (1.6.2-1) UNRELEASED; urgency=medium
+
+ * New upstream version
+
+ -- Stefan Fritsch <sf at debian.org> Fri, 04 Aug 2017 16:14:23 +0200
+
apr (1.5.2-5) unstable; urgency=medium
[ Helmut Grohne ]
diff --git a/debian/patches/apr_mcast_v6.patch b/debian/patches/apr_mcast_v6.patch
deleted file mode 100644
index d54b531..0000000
--- a/debian/patches/apr_mcast_v6.patch
+++ /dev/null
@@ -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;
diff --git a/debian/patches/cross.patch b/debian/patches/cross.patch
index fe95de5..efe26f0 100644
--- a/debian/patches/cross.patch
+++ b/debian/patches/cross.patch
@@ -1,11 +1,9 @@
From: Helmut Grohne <helmut at subdivi.de>
Subject: compile gen_test_char with the build architecture compiler
-Index: apr-1.5.2/Makefile.in
-===================================================================
---- apr-1.5.2.orig/Makefile.in
-+++ apr-1.5.2/Makefile.in
-@@ -8,6 +8,7 @@
+--- apr.orig/Makefile.in
++++ apr/Makefile.in
+@@ -8,6 +8,7 @@ top_blddir=@apr_builddir@
# APR (Apache Portable Runtime) library Makefile.
#
CPP = @CPP@
@@ -13,7 +11,7 @@ Index: apr-1.5.2/Makefile.in
# get substituted into some targets
APR_MAJOR_VERSION=@APR_MAJOR_VERSION@
-@@ -46,7 +47,6 @@
+@@ -46,7 +47,6 @@ LT_VERSION = @LT_VERSION@
CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.c .make.dirs \
build/apr_rules.out tools/gen_test_char at EXEEXT@ \
@@ -21,7 +19,7 @@ Index: apr-1.5.2/Makefile.in
include/private/apr_escape_test_char.h
DISTCLEAN_TARGETS = config.cache config.log config.status \
include/apr.h include/arch/unix/apr_private.h \
-@@ -138,13 +138,9 @@
+@@ -140,13 +140,9 @@ check: $(TARGET_LIB)
etags:
etags `find . -name '*.[ch]'`
diff --git a/debian/patches/debug_testpoll_failure.patch b/debian/patches/debug_testpoll_failure.patch
index bb3df36..1d2f435 100644
--- a/debian/patches/debug_testpoll_failure.patch
+++ b/debian/patches/debug_testpoll_failure.patch
@@ -4,7 +4,7 @@
# add some debug output
--- apr.orig/test/testpoll.c
+++ apr/test/testpoll.c
-@@ -871,6 +871,9 @@ static void justsleep(abts_case *tc, voi
+@@ -901,6 +901,9 @@ static void justsleep(abts_case *tc, voi
rv = apr_pollcb_poll(pollcb, apr_time_from_msec(200), NULL, NULL);
t2 = apr_time_now();
ABTS_INT_EQUAL(tc, 1, APR_STATUS_IS_TIMEUP(rv));
diff --git a/debian/patches/fix_doxygen.patch b/debian/patches/fix_doxygen.patch
index e4c45f8..6f5ac16 100644
--- a/debian/patches/fix_doxygen.patch
+++ b/debian/patches/fix_doxygen.patch
@@ -18,7 +18,7 @@ Subject: Fix generation of docs for out-of-tree builds and newer doxygen version
FILE_PATTERNS=*.h
--- apr.orig/include/apr.h.in
+++ apr/include/apr.h.in
-@@ -445,11 +445,11 @@ typedef apr_uint32_t apr_uin
+@@ -446,11 +446,11 @@ typedef apr_uint32_t apr_uin
/**
* Thread callbacks from APR functions must be declared with APR_THREAD_FUNC,
* so that they follow the platform's calling convention.
@@ -34,7 +34,7 @@ Subject: Fix generation of docs for out-of-tree builds and newer doxygen version
*/
#define APR_THREAD_FUNC @apr_thread_func@
-@@ -483,11 +483,11 @@ typedef apr_uint32_t apr_uin
+@@ -484,11 +484,11 @@ typedef apr_uint32_t apr_uin
* APR_DECLARE_NONSTD(), as they must follow the C language calling convention.
* @see APR_DECLARE @see APR_DECLARE_DATA
* @remark Both the declaration and implementations must use the same macro.
@@ -50,7 +50,7 @@ Subject: Fix generation of docs for out-of-tree builds and newer doxygen version
*/
#define APR_DECLARE_NONSTD(type) type
-@@ -498,12 +498,12 @@ typedef apr_uint32_t apr_uin
+@@ -499,12 +499,12 @@ typedef apr_uint32_t apr_uin
* @remark Note that the declaration and implementations use different forms,
* but both must include the macro.
*
diff --git a/debian/patches/hurd_path_max.patch b/debian/patches/hurd_path_max.patch
index c920a41..f9a1f57 100644
--- a/debian/patches/hurd_path_max.patch
+++ b/debian/patches/hurd_path_max.patch
@@ -7,7 +7,7 @@ Subject: #349418
--- apr.orig/include/apr.h.in
+++ apr/include/apr.h.in
-@@ -610,7 +610,8 @@ typedef int apr_wait_t;
+@@ -611,7 +611,8 @@ typedef int apr_wait_t;
#elif defined(_POSIX_PATH_MAX)
#define APR_PATH_MAX _POSIX_PATH_MAX
#else
diff --git a/debian/patches/hurd_shm_flock.patch b/debian/patches/hurd_shm_flock.patch
index 84f0f39..307304f 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
-@@ -1213,6 +1213,13 @@ case $host in
+@@ -1239,6 +1239,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)
-@@ -1286,6 +1293,13 @@ case $host in
+@@ -1312,6 +1319,13 @@ case $host in
fi
;;
esac
@@ -38,7 +38,7 @@ Bug: #656880
APR_END_DECISION
AC_DEFINE_UNQUOTED($ac_decision)
-@@ -2262,6 +2276,12 @@ APR_IFALLYES(header:OS.h func:create_sem
+@@ -2309,6 +2323,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/series b/debian/patches/series
index f18a2a4..d1e5fdc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,7 +7,6 @@ omit_extra_libs.patch
hurd_shm_flock.patch
dont_override_external_buildflags
libtoolize_check.patch
-apr_mcast_v6.patch
debug_testpoll_failure.patch
use_fcntl_locking.patch
cross.patch
diff --git a/debian/patches/ship_find_apr.m4.patch b/debian/patches/ship_find_apr.m4.patch
index 0393970..46bb7e5 100644
--- a/debian/patches/ship_find_apr.m4.patch
+++ b/debian/patches/ship_find_apr.m4.patch
@@ -7,15 +7,15 @@ Subject: Install a set of random build files too
--- apr.orig/Makefile.in
+++ apr/Makefile.in
-@@ -92,6 +92,15 @@ install: $(TARGETS)
- done
- $(INSTALL_DATA) build/apr_rules.out $(DESTDIR)$(installbuilddir)/apr_rules.mk
+@@ -94,6 +94,15 @@ install: $(TARGETS)
+ $(INSTALL_DATA) $(top_srcdir)/build/apr_common.m4 $(DESTDIR)$(installbuilddir)
+ $(INSTALL_DATA) $(top_srcdir)/build/find_apr.m4 $(DESTDIR)$(installbuilddir)
$(INSTALL) -m 755 apr-config.out $(DESTDIR)$(bindir)/$(APR_CONFIG)
+
+ if [ ! -d $(DESTDIR)$(installbuilddir) ]; then \
+ $(top_srcdir)/build/mkdir.sh $(DESTDIR)$(installbuilddir); \
+ fi
-+ for file in find_apr.m4 apr_common.m4 install.sh gen-build.py get-version.sh ; do \
++ for file in install.sh gen-build.py get-version.sh ; do \
+ $(LIBTOOL) --mode=install cp $(top_srcdir)/build/$$file \
+ $(DESTDIR)$(installbuilddir)/$$file ; \
+ done
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-apache/apr.git
More information about the Pkg-apache-commits
mailing list