Accepting request 606113 from home:matwey:branches:Apache

Update to 1.6.3 to fix building for armv7l - Version 1.6.3: * apr_file_trunc: Truncating a buffered file could add unexpected data after the truncate position. PR 51017. * apr_file_trunc: Fix an issue where reading from a buffered file after truncate could return stale data from the buffer. * apr_ipsubnet_create() now fails for an empty input string. OBS-URL: https://build.opensuse.org/request/show/606113 OBS-URL: https://build.opensuse.org/package/show/Apache/apr?expand=0&rev=13
2018-05-10 10:26:29 +00:00 · 2018-05-10 10:26:29 +00:00 · a796eb3a5e
commit a796eb3a5e
parent c74d6562e9
8 changed files with 48 additions and 30 deletions
--- a/apr-1.4.5-linux3.patch
+++ b/apr-1.4.5-linux3.patch
@ -1,3 +1,5 @@
+Index: configure.in
+===================================================================
 --- configure.in.orig
 +++ configure.in
@@ -181,7 +181,7 @@ dnl Do the various CC checks *before* pr
@ -24,7 +26,7 @@
 APR_EBCDIC
 
 dnl this is our library name
-@@ -664,15 +657,7 @@ case $host in
+@@ -692,15 +685,7 @@ case $host in
         fi
         ;;
     *linux*)
@ -40,7 +42,7 @@
         ;;
     *os390)
         os_version=`uname -r | sed -e 's/\.//g'`
-@@ -2060,6 +2045,8 @@ fi
+@@ -2148,6 +2133,8 @@ fi
 
 AC_SUBST(have_proc_invoked)
 
@ -49,7 +51,7 @@
 AC_MSG_CHECKING(for Variable Length Arrays)
 APR_TRY_COMPILE_NO_WARNING([],
 [
-@@ -2226,6 +2213,9 @@ APR_IFALLYES(header:OS.h func:create_sem
+@@ -2314,6 +2301,9 @@ APR_IFALLYES(header:OS.h func:create_sem
 if test "x$apr_lock_method" != "x"; then
     APR_DECISION_FORCE($apr_lock_method)
 fi
@ -59,6 +61,8 @@
 APR_END_DECISION
 AC_DEFINE_UNQUOTED($ac_decision)
 
+Index: poll/unix/poll.c
+===================================================================
 --- poll/unix/poll.c.orig
 +++ poll/unix/poll.c
@@ -73,7 +73,7 @@ APR_DECLARE(apr_status_t) apr_poll(apr_p
--- a/apr-1.6.2.tar.bz2
+++ b/apr-1.6.2.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:09109cea377bab0028bba19a92b5b0e89603df9eab05c0f7dbd4dd83d48dcebd
-size 853363
--- a/apr-1.6.2.tar.bz2.asc
+++ b/apr-1.6.2.tar.bz2.asc
@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iQIcBAABAgAGBQJZOpsCAAoJEI77GWKQiPVlywYP/0FXUUiDgiI93+RgXwvT9JF2
-HKEaqIGHiXxeOjt92uwNzzzWihpaLsy9D2GALclOq228HMjMfjfCUJ7kjd6JwFLY
-mHyoeQ9sU+aZH+jBDdizwsmMhYvciEhpnT2GCYLJvd5EejxCH/ua3edG9B4DlUaT
-LxNQnD9SddsC2ruKaHEu7JlodQz6Z0qDyXtP5catDungiD6VdElWeUMKzPs0iTy1
-mgkEtgG4E/9jAwdjIVjTfHRVUXbsvVXnFGfKUjs4uyJz3w/mjEhBDLEb5kcDlEwE
-5AZCi8Gr5RIfjMbFA4JRTnbpbDA07woJ2DLoLbRZbXrUmyIjwPvCaeLHMx/8ept/
-j5myTBeNqL7tB1avKGnp2VZV2brWECIeqQd0pUQ1Yp5JXqZQU2HPtcBHv8z4rRM5
-8K1N5aZaA9Tnl2wk5oCr9DTb5UKLSsNOT/K7py6iRt606ks3E4KN8mnhakcWV+TV
-36LHtbV3PXYYROEPTP8D8at1nJT40cq3nKRb63z3LBhy7ZIs6Q7DhWLOjtRxYgBL
-eR2cve8V7/ddh70KozMi9snaY8+T998FwISnQrS7clvh4XHYkokIE6sc7UoezXfU
-DjCT0IhDv9Kzhlo5Gx0nKgtmVaSyHXVHOkOSqQtPIvpWUbDQQDtXuyLDIbULeTMc
-seUfaENbmjd8gE92GUBd
-=4/B6
-----END PGP SIGNATURE-----
--- a/apr-1.6.3.tar.bz2
+++ b/apr-1.6.3.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:131f06d16d7aabd097fa992a33eec2b6af3962f93e6d570a9bd4d85e95993172
+size 854100
--- a/apr-1.6.3.tar.bz2.asc
+++ b/apr-1.6.3.tar.bz2.asc
@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIcBAABAgAGBQJZ52o8AAoJEI77GWKQiPVl4FwP/RVnMhGemgXcdjYxxUT/EtmE
+sw7MPjqQNdwFiJwrB6q3PdqvcQU46eYmXzQCXC5jdu6L0xWat8XVYPRblkTEKQZW
+pi1PJ+o0PFedyzySmTQyLCJCIBGD+8Zm1W1T1LdVtbubEfyf1U0IVuonVWPBg+ml
+HhdUJUPic8V6ZoUlUqGZVZu9gAOazk9NmBC8aZ6ihq9GSn+OvXMcGva6kSRjZkEV
+Gwv33GavckXI2y4wiWjnZVe4QKW8IWzQ+THJM2oRIsHcoqhl2Sa4dfM+Wgw+m65a
+MIog1H+zHraZm+zooXyIW/aEgnp3kBv6LnLpzKexHJVuavfXhIlW0NCNG2qZBZwW
+aWZ1KMxaASVI+UqVTqoKaSyvJ9qqRqD8XMrj/DbVYRebY2DX0bi0JeQEkl9ItuUi
+zpmZ3MABex3dU72GiKpoIkbhoWJB+jcnqbKHBIpnvW+tHQy6VcqTCQSP5FL7mZu0
+BH+U5HlhBW/9GdFkVyp/GTJ3BF8xTrQkxyynReiCSC8+uatQTYLEpAuIEK/iaXTU
+fu8c3P+1plscZ+qBM0OaFXUNGF2BRKinsO2HZWiH2Ug68uVGwLcAVXE8tzgv8rLP
+XaO1poBuZ0epIwa1Lem1MJx6XRaoWKuA0lLV3CxZHONP6p3t666RKW7xJEsoWsTL
+kgUShdXcFlD6ZTxuldh+
+=3Sza
+-----END PGP SIGNATURE-----
--- a/apr-visibility.patch
+++ b/apr-visibility.patch
@ -1,6 +1,8 @@
--- apr-1.5.0.orig/include/apr.h.in
-+++ apr-1.5.0/include/apr.h.in
-@@ -476,7 +476,7 @@ typedef  apr_uint32_t            apr_uin
+Index: apr-1.6.3/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
  * headers, without defining APR_DECLARE_STATIC, will prepare the code to be
  * linked to the dynamic library.
  */
@ -9,7 +11,7 @@
 
 /**
  * The public APR functions using variable arguments are declared with 
-@@ -489,7 +489,7 @@ typedef  apr_uint32_t            apr_uin
+@@ -490,7 +490,7 @@ typedef  apr_uint32_t            apr_uin
  *
  * </PRE>
  */
@ -18,7 +20,7 @@
 
 /**
  * The public APR variables are declared with AP_MODULE_DECLARE_DATA.
-@@ -505,7 +505,7 @@ typedef  apr_uint32_t            apr_uin
+@@ -506,7 +506,7 @@ typedef  apr_uint32_t            apr_uin
  *
  * </PRE>
  */
@ -27,8 +29,10 @@
 
 #elif defined(APR_DECLARE_STATIC)
 #define APR_DECLARE(type)            type __stdcall
--- apr-1.5.0.orig/include/apr_support.h
-+++ apr-1.5.0/include/apr_support.h
+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
@@ -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.
--- a/apr.changes
+++ b/apr.changes
@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu May 10 08:23:39 UTC 2018 - matwey.kornilov@gmail.com
+
+- Version 1.6.3:
+ * apr_file_trunc: Truncating a buffered file could add unexpected
+   data after the truncate position. PR 51017.
+ * apr_file_trunc: Fix an issue where reading from a buffered file
+   after truncate could return stale data from the buffer.
+ * apr_ipsubnet_create() now fails for an empty input string.
+
 -------------------------------------------------------------------
 Wed Apr 18 15:33:14 UTC 2018 - mliska@suse.cz

--- 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.2
+Version:        1.6.3
 Release:        0
 Summary:        Apache Portable Runtime (APR) Library
 License:        Apache-2.0