diff --git a/apr-1.6.5.tar.bz2 b/apr-1.6.5.tar.bz2 deleted file mode 100644 index 92fcd5e..0000000 --- a/apr-1.6.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a67ca9fcf9c4ff59bce7f428a323c8b5e18667fdea7b0ebad47d194371b0a105 -size 855393 diff --git a/apr-1.6.5.tar.bz2.asc b/apr-1.6.5.tar.bz2.asc deleted file mode 100644 index 15b106c..0000000 --- a/apr-1.6.5.tar.bz2.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIcBAABAgAGBQJblt7YAAoJEB4fkJkRx4c1LzoP/jqJSZUPlYRmVYZeFLLWlMPx -x3YR9wjWMF28SUlkpvYZ8WIkfLRjIyaApdkrbOXWrk2LrJrV9z8R+pBzQGqMGw/L -35yq+r5VdnT+UdtaGNn4lCCx2ix/BHDt40Of3aEpYHYg6Hkh0uXPzKxuWecwwpjg -AKsWgxAmZRZexLVsYci+sAmIE+arr/GmMCo9erqINS43eXLyLqz/ANFjBPWytLrE -8NhZ/bCJ+siwhAQOg7KWIcwhfO7CTGMBGu9zTdMnYCh5Xm1wxLw83azJkmwiMMr8 -le0xBvny95sJT/9eehQhFypwe30Xbsi3OIgMU1AVCpONRpDRkeOQd9ck6k2+6F4P -kke8CMuQgqM+1G94A0Umjqv9i/kS8LlOIOt/78cIrDaaPHq3kwjpsfrX0iPQ7dsz -GWwYIw37TpJFMPJdw6a/M5y+3dGtQvxQv0roNwCIGGCZEl++4o6r1s2dd1nvFAQY -dUJkzCzlQyrHv9IXGx4hnsO4uApK89tyua5w4yQACQWxcKMUyhJZurJENPFJ5kxV -9cZHgQgWQmRUgFJ5uW9D3+dGTmQSYVzATQ6QRQgUfTOt1TFLb1ApOA4Sa/f/TMFl -j79UO2nvuh5BYvqAd1pcRe56hww626aXW829J65Hl8ZvEWsPI1hEPPsDRK+zd0Ug -FfP/G+YvA9ZQu7bOTW4B -=tOyB ------END PGP SIGNATURE----- diff --git a/apr-1.7.0.tar.bz2 b/apr-1.7.0.tar.bz2 new file mode 100644 index 0000000..08433a3 --- /dev/null +++ b/apr-1.7.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e2e148f0b2e99b8e5c6caa09f6d4fb4dd3e83f744aa72a952f94f5a14436f7ea +size 872238 diff --git a/apr-1.7.0.tar.bz2.asc b/apr-1.7.0.tar.bz2.asc new file mode 100644 index 0000000..6ce2291 --- /dev/null +++ b/apr-1.7.0.tar.bz2.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIcBAABAgAGBQJcolDOAAoJEB4fkJkRx4c1PPwP/Az3wofxvzRGg9ojAjhLOJbU +0Zb3NnbEkLWgl9UeTZLgyl5EVWm8Iajje8V/JLSgHKiYebLh39bdvCF/A/vl+iaW +Xcw00yAfieCa45Io5PqBlLnnqe1ELbfG2Hx+lGaCOwXpZyPsA40WO+ZUJyqXCQHf +D2IE1rtVP6auCvhmGLmtkGTlcyTltJWm0mYEkmWR/nM+n5YvOFlSUOcAMbnloE67 +VOcy0pH/Vjga7pfsRRN/N76EkZDNfEfRvlZKBFHguWNSig20scvKo1pjjEOpjHwC +7DdtZNWKCtw3s5nMXd8+qhAg1paqoRaMKOw71y8W6yXgq1D2KyhywZGkU5k1H3xO +QdJwyQjsGyMnk2GOfSikmKPY2PaGAAxXArnQRvsdcN4IfhVYq+NgUOZB/QSVCC4f +81/y1mK7yxDuK4fIRnqpICO+wQfXpevTc7kBpX2u2Sq3Jk8n5cNKDXJehfo9z09J +p5XcVyJqyIEpXhY2UEbJfMIiDQaVJR48CGPBmbhaHcF8sx5EIk6FVlcJR3805BPf +iUy+jWOm7hYxACPPI804xAUdhFAMmKzA6PqCimUQ+OVmumQ3E5UsYbugXnqxDJxO +fiAjOs6pqbrVdA7DIIBpx/Titjq5Ikrpb+7XXKTp5oC1lIi3oueg+cH+5dGF7amw +uzHvhRtZd4Nvh5lJ6ffY +=LV+K +-----END PGP SIGNATURE----- diff --git a/apr-use-getrandom.patch b/apr-use-getrandom.patch deleted file mode 100644 index c367231..0000000 --- a/apr-use-getrandom.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- apr-1.5.1.orig/misc/unix/rand.c -+++ apr-1.5.1/misc/unix/rand.c -@@ -43,6 +43,9 @@ - #include - #endif - -+#include -+#include -+ - #ifndef SHUT_RDWR - #define SHUT_RDWR 2 - #endif -@@ -89,6 +92,12 @@ APR_DECLARE(apr_status_t) apr_generate_r - { - #ifdef DEV_RANDOM - -+#ifdef SYS_getrandom -+ int r = TEMP_FAILURE_RETRY(syscall(SYS_getrandom, buf, length, GRND_NONBLOCK)); -+ if(r != -1 && r == length) -+ return APR_SUCCESS; -+ /* If this fails for whatever reason..fallback to the old ways.. */ -+#endif - int fd = -1; - - /* On BSD/OS 4.1, /dev/random gives out 8 bytes at a time, then diff --git a/apr-visibility.patch b/apr-visibility.patch index ea5eb4d..ece97d3 100644 --- a/apr-visibility.patch +++ b/apr-visibility.patch @@ -1,8 +1,8 @@ -Index: apr-1.6.3/include/apr.h.in +Index: apr-1.7.0/include/apr.h.in =================================================================== ---- apr-1.6.3.orig/include/apr.h.in -+++ apr-1.6.3/include/apr.h.in -@@ -477,7 +477,7 @@ typedef apr_uint32_t apr_uin +--- apr-1.7.0.orig/include/apr.h.in ++++ apr-1.7.0/include/apr.h.in +@@ -495,7 +495,7 @@ typedef apr_uint32_t apr_uin * headers, without defining APR_DECLARE_STATIC, will prepare the code to be * linked to the dynamic library. */ @@ -11,7 +11,7 @@ Index: apr-1.6.3/include/apr.h.in /** * The public APR functions using variable arguments are declared with -@@ -490,7 +490,7 @@ typedef apr_uint32_t apr_uin +@@ -508,7 +508,7 @@ typedef apr_uint32_t apr_uin * * */ @@ -20,7 +20,7 @@ Index: apr-1.6.3/include/apr.h.in /** * The public APR variables are declared with AP_MODULE_DECLARE_DATA. -@@ -506,7 +506,7 @@ typedef apr_uint32_t apr_uin +@@ -524,7 +524,7 @@ typedef apr_uint32_t apr_uin * * */ @@ -31,8 +31,8 @@ Index: apr-1.6.3/include/apr.h.in #define APR_DECLARE(type) type __stdcall Index: apr-1.6.3/include/apr_support.h =================================================================== ---- apr-1.6.3.orig/include/apr_support.h -+++ apr-1.6.3/include/apr_support.h +--- apr-1.7.0.orig/include/apr_support.h ++++ apr-1.7.0/include/apr_support.h @@ -45,7 +45,7 @@ extern "C" { * otherwise wait for data to be able to be written. * @return APR_TIMEUP if we run out of time. diff --git a/apr.changes b/apr.changes index 846fa9b..25da6ac 100644 --- a/apr.changes +++ b/apr.changes @@ -1,3 +1,44 @@ +------------------------------------------------------------------- +Sat Aug 3 14:11:24 UTC 2019 - Manu Maier + +- Version 1.7.0 + * apr_dir_read: [Unix] Dropped the preference of the dirread_r() flavor + for dirread(), because the former is both deprecated and unneeded. + [Yann Ylavic, William Rowe] + * apr_file_info: [Win32 only] Treat only "name surrogate" reparse points + as symlinks, and not other reparse tag types. PR47630 + [Oleg Liatte ] + * Test %ld vs. %lld to avoid compiler emits using APR_OFF_T_FMT, in the + case of apparently equivilant long and long long types. [William Rowe] + * Recognize APPLE predefined macros as equivilant to DARWIN. [Jim Jagielski] + * Signals: Allow handling of SIGUSR2 in apr_signal_thread. [Yann Ylavic] + * Atomics: Support for 64bit ints. [Jim Jagielski] + * Add the apr_encode_* API that implements RFC4648 and RFC7515 + compliant BASE64, BASE64URL, BASE32, BASE32HEX and BASE16 + encode/decode functions. [Graham Leggett] + * rand: Use arc4random_buf() on BSD platforms and getrandom() on Linux, + when available. [Christian Weisgerber diff --git a/apr.spec b/apr.spec index 257ff8c..013c251 100644 --- a/apr.spec +++ b/apr.spec @@ -21,7 +21,7 @@ %define installbuilddir %{_libdir}/apr-%{aprver}/build %define includedir %{_includedir}/apr-%{aprver} Name: apr -Version: 1.6.5 +Version: 1.7.0 Release: 0 Summary: Apache Portable Runtime (APR) Library License: Apache-2.0 @@ -31,7 +31,6 @@ Source0: https://www.apache.org/dist/apr/apr-%{version}.tar.bz2 Source1: https://www.apache.org/dist/apr/apr-%{version}.tar.bz2.asc Source2: %{name}.keyring Patch5: apr-visibility.patch -Patch6: apr-use-getrandom.patch Patch9: apr-proc-mutex-map-anon.patch # prevent random failures of the testsuite (sendfile test) Patch10: apr-test-sendfile-timeout.patch @@ -85,7 +84,6 @@ that want to make use of APR. %prep %setup -q %patch5 -p1 -%patch6 -p1 %patch9 -p1 %patch10 -p1