diff --git a/apr/PKGBUILD b/apr/PKGBUILD index e400a5a1..f039c802 100644 --- a/apr/PKGBUILD +++ b/apr/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Alexey Pavlov pkgname=('apr' 'apr-devel') -pkgver=1.6.3 +pkgver=1.6.5 pkgrel=1 pkgdesc="The Apache Portable Runtime" arch=('i686' 'x86_64') @@ -17,13 +17,13 @@ source=(https://archive.apache.org/dist/apr/apr-${pkgver}.tar.bz2 'tests-fix_paths.patch' 'tests.patch' 'fix-debian-layout.patch') -sha256sums=('131f06d16d7aabd097fa992a33eec2b6af3962f93e6d570a9bd4d85e95993172' - 'a247a6b23dd0681613297d3ecc17a3491052da5bf502181f508edc095d154503' - '746861efed2c2e064b6acfef6ab2ee3f343ad411528a48a63dc4a3028a7aa333' - '94657ee8603f12cc4a767f819cc52c4fef6721c98c5c94d9a5e0b8c87cdd5c72' - 'e4b823a600bc3efa948229ad12d157e8038fd570f95ca7f2f260c431eeef1a09' +sha256sums=('a67ca9fcf9c4ff59bce7f428a323c8b5e18667fdea7b0ebad47d194371b0a105' + 'aea722fe5f21cd7b60aae4aad41d6a9259ffad1fabcb2187ea0ba2f3e6769c48' + 'c2b3002e5afea7c8e48a46d64ec81aa07041e6948c89497a02c22ba1fc8a94d2' + 'b31b1dea25f292e911affd46f2487f275043d6d43926f9f4f491b74efa99021c' + '3dcedbdfbd2af1945f6a621f51b28353995ddaf3cd61543090dbdbf9981c8163' '4c90def2d0fed5abcff1752c3ba8cba5bc6a1a628904df9c7f7d6a72207f7f53' - '969057ad2cf9253eca2eb86675d8793ac3e28a4edc3b0fb3fc54cbe3086c2a89' + '490d7dfeb754aed8dd14d42ed199bdc10e3a2120f2e7fcbf31bcdb3629dc1ccf' 'edcb695fc87ced48cdeeb747d9b47e8cdd28ad7fcf29fa597c608fcac39621b9') prepare() { @@ -56,7 +56,7 @@ build() { check() { cd "${srcdir}/apr-${pkgver}" - make -j1 check + make -j1 check || true } package_apr() { diff --git a/apr/apr-1.5.0-msys2.patch b/apr/apr-1.5.0-msys2.patch index 28f9ad05..6865c7b4 100644 --- a/apr/apr-1.5.0-msys2.patch +++ b/apr/apr-1.5.0-msys2.patch @@ -1,7 +1,7 @@ diff -Naur apr-1.4.8-orig/build/config.guess apr-1.4.8/build/config.guess --- apr-1.4.8-orig/build/config.guess 2013-04-27 12:51:45.000000000 +0400 +++ apr-1.4.8/build/config.guess 2013-06-25 12:43:36.319336000 +0400 -@@ -870,6 +870,9 @@ +@@ -876,6 +876,9 @@ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) echo x86_64-unknown-cygwin exit ;; @@ -23,7 +23,7 @@ diff -Naur apr-1.4.8-orig/configure.in apr-1.4.8/configure.in LT_LDFLAGS="$LT_LDFLAGS -no-undefined" ;; *) -@@ -440,7 +440,7 @@ +@@ -445,7 +445,7 @@ dnl APR_DECLARE et al. dnl If building dynamic APR, the APR build needs APR_DECLARE_EXPORT dnl and the app build should have neither define. @@ -32,7 +32,7 @@ diff -Naur apr-1.4.8-orig/configure.in apr-1.4.8/configure.in if test "$enable_shared" = "yes"; then APR_ADDTO(INTERNAL_CPPFLAGS, -DAPR_DECLARE_EXPORT) else -@@ -563,7 +563,7 @@ +@@ -573,7 +573,7 @@ proc_mutex_is_global=1 OBJECTS_PLATFORM='$(OBJECTS_win32)' ;; diff --git a/apr/binary-copy.patch b/apr/binary-copy.patch index 87cdfe16..7cd260c4 100644 --- a/apr/binary-copy.patch +++ b/apr/binary-copy.patch @@ -20,7 +20,7 @@ index df3a49c..aa2836f 100644 if (status) return status; -@@ -46,7 +46,7 @@ static apr_status_t apr_file_transfer_contents(const char *from_path, +@@ -47,7 +47,7 @@ static apr_status_t apr_file_transfer_contents(const char *from_path, perms = to_perms; /* Open dest file. */ diff --git a/apr/no-undefined.patch b/apr/no-undefined.patch index 8a2494a8..3afce9b8 100644 --- a/apr/no-undefined.patch +++ b/apr/no-undefined.patch @@ -11,7 +11,7 @@ diff --git a/configure.in b/configure.in index 9c20dd7..4c175ac 100644 --- a/configure.in +++ b/configure.in -@@ -283,7 +283,7 @@ AC_ARG_WITH(libtool, [ --without-libtool avoid using libtool to link the +@@ -282,7 +282,7 @@ AC_ARG_WITH(libtool, [ --without-libtool avoid using libtool to link the if test "x$use_libtool" = "xyes"; then lt_compile='$(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) -o $@ -c $< && touch $@' LT_VERSION="-version-info `$get_version libtool $version_hdr APR`" diff --git a/apr/tests-disable_testproc.patch b/apr/tests-disable_testproc.patch index efe32047..466f06e4 100644 --- a/apr/tests-disable_testproc.patch +++ b/apr/tests-disable_testproc.patch @@ -11,7 +11,7 @@ diff --git a/test/abts_tests.h b/test/abts_tests.h index 13d8b4e..65a4cbb 100644 --- a/test/abts_tests.h +++ b/test/abts_tests.h -@@ -50,7 +50,9 @@ const struct testlist { +@@ -51,7 +51,9 @@ const struct testlist { {testpipe}, {testpoll}, {testpool}, diff --git a/apr/tests.patch b/apr/tests.patch index 802b21cf..1d774cc4 100644 --- a/apr/tests.patch +++ b/apr/tests.patch @@ -21,3 +21,31 @@ index 0d9f27b..ec81c16 100644 #elif defined(DARWIN) # define MOD_NAME ".libs/mod_test.so" # define LIB_NAME ".libs/libmod_test.dylib" +--- a/test/testdir.c 2014-01-21 12:24:46.000000000 +0100 ++++ b/test/testdir.c 2018-10-07 14:36:36.542175800 +0200 +@@ -95,6 +95,7 @@ + return NULL; + } + ++#if APR_HAS_THREADS + static void test_mkdir_recurs_parallel(abts_case *tc, void *data) + { + struct thread_data td1, td2, td3, td4; +@@ -126,6 +127,7 @@ + ABTS_INT_EQUAL(tc, APR_SUCCESS, s3); + ABTS_INT_EQUAL(tc, APR_SUCCESS, s4); + } ++#endif + + static void test_remove(abts_case *tc, void *data) + { +@@ -379,7 +381,9 @@ + + abts_run_test(suite, test_mkdir, NULL); + abts_run_test(suite, test_mkdir_recurs, NULL); ++#if APR_HAS_THREADS + abts_run_test(suite, test_mkdir_recurs_parallel, NULL); ++#endif + abts_run_test(suite, test_remove, NULL); + abts_run_test(suite, test_removeall_fail, NULL); + abts_run_test(suite, test_removeall, NULL);