commit libapr1 for openSUSE:Factory
Hello community, here is the log from the commit of package libapr1 for openSUSE:Factory checked in at 2017-06-20 11:00:09 Comparing /work/SRC/openSUSE:Factory/libapr1 (Old) and /work/SRC/openSUSE:Factory/.libapr1.new (New) Package is "libapr1" Tue Jun 20 11:00:09 2017 rev:53 rq:504888 version:1.6.2 Changes: --- /work/SRC/openSUSE:Factory/libapr1/libapr1.changes 2016-05-10 09:25:09.0 +0200 +++ /work/SRC/openSUSE:Factory/.libapr1.new/libapr1.changes 2017-06-20 11:00:57.910730331 +0200 @@ -1,0 +2,21 @@ +Mon Jun 19 16:48:39 UTC 2017 - crrodrig...@opensuse.org + +- apr 1.6.2 + * apr_allocator: Provide apr_allocator_align() + * apr_file_io: Add apr_file_pipe_create_pools() + * Add APR_SO_FREEBIND option for apr_socket_opt_set. + * apr_skiplist: Add apr_skiplist_addne*() + * Added Unix domain socket support. + * See http://www.apache.org/dist/apr/CHANGES-APR-1.6 for +a full list of changes. +- Drop patches from upstream: + * 0017-Merge-r1733694-r1733708-from-trunk.patch + * 0018-apr_proc_mutex-unix-backport-r1733775-from-trunk-par.patch + +--- +Wed Jun 14 01:07:53 UTC 2017 - crrodrig...@opensuse.org + +- define READDIR_IS_THREAD_SAFE, because it is. Avoid + using obsolete and potentially dangerous readdir_r. + +--- Old: 0017-Merge-r1733694-r1733708-from-trunk.patch 0018-apr_proc_mutex-unix-backport-r1733775-from-trunk-par.patch apr-1.5.2.tar.bz2 apr-1.5.2.tar.bz2.asc New: apr-1.6.2.tar.bz2 apr-1.6.2.tar.bz2.asc Other differences: -- ++ libapr1.spec ++ --- /var/tmp/diff_new_pack.XWarWN/_old 2017-06-20 11:00:59.298534709 +0200 +++ /var/tmp/diff_new_pack.XWarWN/_new 2017-06-20 11:00:59.302534146 +0200 @@ -1,7 +1,7 @@ # # spec file for package libapr1 # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ %define installbuilddir %{_libdir}/apr-%{aprver}/build %define includedir %{_includedir}/apr-%{aprver} Name: libapr1 -Version:1.5.2 +Version:1.6.2 Release:0 Summary:Apache Portable Runtime (APR) Library License:Apache-2.0 @@ -32,8 +32,6 @@ Patch4: apr-1.4.5-linux3.patch Patch5: apr-visibility.patch Patch6: apr-use-getrandom.patch -Patch7: 0017-Merge-r1733694-r1733708-from-trunk.patch -Patch8: 0018-apr_proc_mutex-unix-backport-r1733775-from-trunk-par.patch Patch9: apr-proc-mutex-map-anon.patch BuildRequires: doxygen BuildRequires: fdupes @@ -83,8 +81,6 @@ %patch4 %patch5 -p1 %patch6 -p1 -%patch7 -p1 -%patch8 -p1 %patch9 -p1 # Do not put date to doxy content @@ -107,7 +103,7 @@ --enable-posix-shm \ --with-sendfile \ --with-pic -make %{?_smp_mflags} CFLAGS="%{optflags} -fvisibility=hidden -fPIC" +make %{?_smp_mflags} CFLAGS="%{optflags} -DREADDIR_IS_THREAD_SAFE -fvisibility=hidden -fPIC" make dox %{?_smp_mflags} %install ++ apr-1.5.2.tar.bz2 -> apr-1.6.2.tar.bz2 ++ 32081 lines of diff (skipped) ++ apr-proc-mutex-map-anon.patch ++ --- /var/tmp/diff_new_pack.XWarWN/_old 2017-06-20 11:01:00.278396591 +0200 +++ /var/tmp/diff_new_pack.XWarWN/_new 2017-06-20 11:01:00.278396591 +0200 @@ -1,9 +1,9 @@ -Index: apr-1.5.2/locks/unix/proc_mutex.c +Index: apr-1.6.2/locks/unix/proc_mutex.c === apr-1.5.2.orig/locks/unix/proc_mutex.c -+++ apr-1.5.2/locks/unix/proc_mutex.c -@@ -405,23 +405,15 @@ static apr_status_t proc_mutex_proc_pthr -const char *fname) +--- apr-1.6.2.orig/locks/unix/proc_mutex.c apr-1.6.2/locks/unix/proc_mutex.c +@@ -435,24 +435,16 @@ static apr_status_t proc_mutex_pthread_c + const char *fname) { apr_status_t rv; -int fd; @@ -14,12 +14,13 @@ -return errno; -} - - new_mutex->pthread_interproc = mmap(NULL, sizeof(proc_pthread_mutex_t), --PROT_READ | PROT_WRITE, MAP_SHARED, --fd, 0); -+PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, -+-1, 0); - if (new_mutex->pthread_interproc == MAP_FAILED) { + new_mutex->os.pthread_interproc = mmap(NULL, sizeof(proc_pthread_mutex_t), +-
commit libapr1 for openSUSE:Factory
Hello community, here is the log from the commit of package libapr1 for openSUSE:Factory checked in at 2016-05-10 09:25:07 Comparing /work/SRC/openSUSE:Factory/libapr1 (Old) and /work/SRC/openSUSE:Factory/.libapr1.new (New) Package is "libapr1" Changes: --- /work/SRC/openSUSE:Factory/libapr1/libapr1.changes 2015-10-03 20:29:23.0 +0200 +++ /work/SRC/openSUSE:Factory/.libapr1.new/libapr1.changes 2016-05-10 09:25:09.0 +0200 @@ -1,0 +2,12 @@ +Wed May 4 13:17:03 UTC 2016 - crrodrig...@opensuse.org + +- 0017-Merge-r1733694-r1733708-from-trunk.patch and + 0018-apr_proc_mutex-unix-backport-r1733775-from-trunk-par.patch + Refcount shared mutexes usage to avoid + destruction while still is use by some processes, this fixes + apache graceful-restart sometimes leaving processes in + "Gracefully finishing" state forever. +- apr-proc-mutex-map-anon.patch use MAP_ANON instead of mmap'ing + /dev/zero. + +--- New: 0017-Merge-r1733694-r1733708-from-trunk.patch 0018-apr_proc_mutex-unix-backport-r1733775-from-trunk-par.patch apr-proc-mutex-map-anon.patch Other differences: -- ++ libapr1.spec ++ --- /var/tmp/diff_new_pack.nDQpGY/_old 2016-05-10 09:25:10.0 +0200 +++ /var/tmp/diff_new_pack.nDQpGY/_new 2016-05-10 09:25:10.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package libapr1 # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -32,6 +32,9 @@ Patch4: apr-1.4.5-linux3.patch Patch5: apr-visibility.patch Patch6: apr-use-getrandom.patch +Patch7: 0017-Merge-r1733694-r1733708-from-trunk.patch +Patch8: 0018-apr_proc_mutex-unix-backport-r1733775-from-trunk-par.patch +Patch9: apr-proc-mutex-map-anon.patch BuildRequires: doxygen BuildRequires: fdupes BuildRequires: libtool @@ -80,6 +83,10 @@ %patch4 %patch5 -p1 %patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 + # Do not put date to doxy content sed -i \ -e '4 iHTML_TIMESTAMP=NO' \ ++ 0017-Merge-r1733694-r1733708-from-trunk.patch ++ >From f1e4634ad2e1a321a425f7c43b9f60d0d2706686 Mon Sep 17 00:00:00 2001 From: Yann YlavicDate: Tue, 12 Apr 2016 13:29:31 + Subject: [PATCH 17/18] Merge r1733694, r1733708 from trunk: apr_proc_mutex-pthread: Refcount shared mutexes usage to avoid destruction while still is use by some process(es). PR 49504. apr_proc_mutex-pthread: follow up to r1733694. Simplify #if/#else/#endif logic, no functional change. Note: this merge additionnaly fixes the munmap()ing size of the pthread_interproc mutex to match the mmap()ed one, which was done in trunk by r1733775 (barely related and backported later), hence the additional change for *this* bugfix to be self contained. git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.5.x@1738800 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 4 +++ locks/unix/proc_mutex.c | 66 +++-- 2 files changed, 57 insertions(+), 13 deletions(-) diff --git a/locks/unix/proc_mutex.c b/locks/unix/proc_mutex.c index 32012a7..13ba2ea 100644 --- a/locks/unix/proc_mutex.c +++ b/locks/unix/proc_mutex.c @@ -19,6 +19,7 @@ #include "apr_arch_proc_mutex.h" #include "apr_arch_file_io.h" /* for apr_mkstemp() */ #include "apr_hash.h" +#include "apr_atomic.h" APR_DECLARE(apr_status_t) apr_proc_mutex_destroy(apr_proc_mutex_t *mutex) { @@ -325,7 +326,24 @@ static const apr_proc_mutex_unix_lock_methods_t mutex_sysv_methods = #if APR_HAS_PROC_PTHREAD_SERIALIZE -static apr_status_t proc_mutex_proc_pthread_cleanup(void *mutex_) +/* The mmap()ed pthread_interproc is the native pthread_mutex_t followed + * by a refcounter to track children using it. We want to avoid calling + * pthread_mutex_destroy() on the shared mutex area while it is in use by + * another process, because this may mark the shared pthread_mutex_t as + * invalid for everyone, including forked children (unlike "sysvsem" for + * example), causing unexpected errors or deadlocks (PR 49504). So the + * last process (parent or child) referencing the mutex will effectively + * destroy it. + */ +typedef struct { +pthread_mutex_t mutex; +apr_uint32_t refcount; +} proc_pthread_mutex_t; + +#define proc_pthread_mutex_refcount(m) \ +(((proc_pthread_mutex_t *)(m)->pthread_interproc)->refcount) + +static apr_status_t proc_pthread_mutex_unref(void *mutex_) { apr_proc_mutex_t *mutex=mutex_;
commit libapr1 for openSUSE:Factory
Hello community, here is the log from the commit of package libapr1 for openSUSE:Factory checked in at 2015-10-03 20:28:25 Comparing /work/SRC/openSUSE:Factory/libapr1 (Old) and /work/SRC/openSUSE:Factory/.libapr1.new (New) Package is "libapr1" Changes: --- /work/SRC/openSUSE:Factory/libapr1/libapr1.changes 2015-05-06 07:47:05.0 +0200 +++ /work/SRC/openSUSE:Factory/.libapr1.new/libapr1.changes 2015-10-03 20:29:23.0 +0200 @@ -1,0 +2,5 @@ +Tue Sep 29 10:05:23 UTC 2015 - mplus...@suse.com + +- Add gpg signature + +--- New: apr-1.5.2.tar.bz2.asc libapr1.keyring Other differences: -- ++ libapr1.spec ++ --- /var/tmp/diff_new_pack.6MeyeE/_old 2015-10-03 20:29:24.0 +0200 +++ /var/tmp/diff_new_pack.6MeyeE/_new 2015-10-03 20:29:24.0 +0200 @@ -26,7 +26,9 @@ License:Apache-2.0 Group: Development/Libraries/Other Url:http://apr.apache.org/ -Source: http://www.apache.org/dist/apr/apr-%{version}.tar.bz2 +Source0:http://www.apache.org/dist/apr/apr-%{version}.tar.bz2 +Source1:http://www.apache.org/dist/apr/apr-%{version}.tar.bz2.asc +Source2:%{name}.keyring Patch4: apr-1.4.5-linux3.patch Patch5: apr-visibility.patch Patch6: apr-use-getrandom.patch
commit libapr1 for openSUSE:Factory
Hello community, here is the log from the commit of package libapr1 for openSUSE:Factory checked in at 2015-05-06 07:47:04 Comparing /work/SRC/openSUSE:Factory/libapr1 (Old) and /work/SRC/openSUSE:Factory/.libapr1.new (New) Package is libapr1 Changes: --- /work/SRC/openSUSE:Factory/libapr1/libapr1.changes 2015-03-12 16:38:10.0 +0100 +++ /work/SRC/openSUSE:Factory/.libapr1.new/libapr1.changes 2015-05-06 07:47:05.0 +0200 @@ -1,0 +2,33 @@ +Sun May 3 03:32:33 UTC 2015 - crrodrig...@opensuse.org + +- remove baselibs.conf that osc rejects now with message: +ERROR: 'arch' referenced in baselibs.conf is not being built +ERROR: 'ppc' referenced in baselibs.conf is not being built +ERROR: 'package' referenced in baselibs.conf is not being built +ERROR: 'arch' referenced in baselibs.conf is not being built +ERROR: 'ppc' referenced in baselibs.conf is not being built +ERROR: 'package' referenced in baselibs.conf is not being built + +--- +Sun May 3 03:24:24 UTC 2015 - crrodrig...@opensuse.org + +- apr 1.5.2 +* apr_escape: Correctly calculate the size of the returned string in + apr_escape_path and set the correct return value in case we actually + escape the string +* apr_poll(cb): fix error paths returned values and leaks. +* apr_skiplist: Optimize the number of allocations by reusing pooled or + malloc()ed nodes for the lifetime of the skiplist. +* apr_skiplist: Fix possible multiple-free() on the same value in + apr_skiplist_remove_all() + (obsoletes 0007-backport-r1604596-1604598-from-trunk.patch) +* apr_global_mutex/apr_proc_mutex: Resolve failures with the + POSIX sem implementation in environments which receive signals. + (obsoletes 0009-Merge-r1610854-from-trunk.patch) +* drop already included or no longer needed patches: + 0004-Backport-r1593600-from-1.6.patch + 0005-Backport-r1593612-from-1.6.patch + 0007-backport-r1604596-1604598-from-trunk.patch + 0009-Merge-r1610854-from-trunk.patch + string-compare.diff +--- Old: 0004-Backport-r1593600-from-1.6.patch 0005-Backport-r1593612-from-1.6.patch 0007-backport-r1604596-1604598-from-trunk.patch 0009-Merge-r1610854-from-trunk.patch apr-1.5.1.tar.bz2 baselibs.conf string-compare.diff New: apr-1.5.2.tar.bz2 Other differences: -- ++ libapr1.spec ++ --- /var/tmp/diff_new_pack.nMLx8c/_old 2015-05-06 07:47:06.0 +0200 +++ /var/tmp/diff_new_pack.nMLx8c/_new 2015-05-06 07:47:06.0 +0200 @@ -20,22 +20,16 @@ %define installbuilddir %{_libdir}/apr-%{aprver}/build %define includedir %{_includedir}/apr-%{aprver} Name: libapr1 -Version:1.5.1 +Version:1.5.2 Release:0 Summary:Apache Portable Runtime (APR) Library License:Apache-2.0 Group: Development/Libraries/Other Url:http://apr.apache.org/ Source: http://www.apache.org/dist/apr/apr-%{version}.tar.bz2 -Source2:baselibs.conf -Patch1: string-compare.diff Patch4: apr-1.4.5-linux3.patch Patch5: apr-visibility.patch -Patch6: 0004-Backport-r1593600-from-1.6.patch -Patch7: 0005-Backport-r1593612-from-1.6.patch -Patch8: 0007-backport-r1604596-1604598-from-trunk.patch -Patch9: 0009-Merge-r1610854-from-trunk.patch -Patch10:apr-use-getrandom.patch +Patch6: apr-use-getrandom.patch BuildRequires: doxygen BuildRequires: fdupes BuildRequires: libtool @@ -81,14 +75,9 @@ %prep %setup -q -n apr-%{version} -%patch1 %patch4 %patch5 -p1 %patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 # Do not put date to doxy content sed -i \ -e '4 iHTML_TIMESTAMP=NO' \ ++ apr-1.5.1.tar.bz2 - apr-1.5.2.tar.bz2 ++ 3048 lines of diff (skipped)
commit libapr1 for openSUSE:Factory
Hello community, here is the log from the commit of package libapr1 for openSUSE:Factory checked in at 2015-03-12 16:38:08 Comparing /work/SRC/openSUSE:Factory/libapr1 (Old) and /work/SRC/openSUSE:Factory/.libapr1.new (New) Package is libapr1 Changes: --- /work/SRC/openSUSE:Factory/libapr1/libapr1.changes 2014-11-02 16:46:01.0 +0100 +++ /work/SRC/openSUSE:Factory/.libapr1.new/libapr1.changes 2015-03-12 16:38:10.0 +0100 @@ -1,0 +2,25 @@ +Sun Mar 8 18:17:59 UTC 2015 - crrodrig...@opensuse.org + +- No longer use --enable-allocator-uses-mmap but the default + which is using malloc, this feature exists to reduce + fragmentation but this is currently at the expense of: + * Loosing all malloc sanity checks. + * mmap and munmap are expensive operations when using +at lot of threads (like in apache worker,event) + * It will waste memory, even more on archs that have big +page sizes. +- If there are fragmentation or performance problems in glibc + malloc, the library has to be fixed instead. + +--- +Sat Mar 7 18:25:52 UTC 2015 - crrodrig...@opensuse.org + +- apr-use-getrandom.patch: Update, if getrandom blocks, fallback + to the old codepath, restoring old always non-blocking behaviour + in practice it blocks only at boottime when the entropy pool + has not been fully initialized, this delays the startup + of apache for example. + * Use SYS_getrandom constant instead of the internal + __NR_getrandom + +--- Other differences: -- ++ libapr1.spec ++ --- /var/tmp/diff_new_pack.lLb2RG/_old 2015-03-12 16:38:11.0 +0100 +++ /var/tmp/diff_new_pack.lLb2RG/_new 2015-03-12 16:38:11.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package libapr1 # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -104,7 +104,6 @@ %ifarch %ix86 --enable-nonportable-atomics=yes \ %endif - --enable-allocator-uses-mmap \ --with-devrandom=/dev/urandom \ --disable-static \ --enable-posix-shm \ ++ apr-use-getrandom.patch ++ --- /var/tmp/diff_new_pack.lLb2RG/_old 2015-03-12 16:38:11.0 +0100 +++ /var/tmp/diff_new_pack.lLb2RG/_new 2015-03-12 16:38:11.0 +0100 @@ -1,7 +1,5 @@ -diff --git a/misc/unix/rand.c b/misc/unix/rand.c -index c1e1e8f..e443d7e 100644 a/misc/unix/rand.c -+++ b/misc/unix/rand.c +--- apr-1.5.1.orig/misc/unix/rand.c apr-1.5.1/misc/unix/rand.c @@ -43,6 +43,9 @@ #include sys/uuid.h #endif @@ -12,12 +10,12 @@ #ifndef SHUT_RDWR #define SHUT_RDWR 2 #endif -@@ -89,6 +92,12 @@ APR_DECLARE(apr_status_t) apr_generate_random_bytes(unsigned char *buf, +@@ -89,6 +92,12 @@ APR_DECLARE(apr_status_t) apr_generate_r { #ifdef DEV_RANDOM -+#ifdef __NR_getrandom -+int r = TEMP_FAILURE_RETRY(syscall(__NR_getrandom, buf, length, 0)); ++#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.. */ -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libapr1 for openSUSE:Factory
Hello community, here is the log from the commit of package libapr1 for openSUSE:Factory checked in at 2014-11-02 16:45:56 Comparing /work/SRC/openSUSE:Factory/libapr1 (Old) and /work/SRC/openSUSE:Factory/.libapr1.new (New) Package is libapr1 Changes: --- /work/SRC/openSUSE:Factory/libapr1/libapr1.changes 2014-08-27 22:18:06.0 +0200 +++ /work/SRC/openSUSE:Factory/.libapr1.new/libapr1.changes 2014-11-02 16:46:01.0 +0100 @@ -1,0 +2,7 @@ +Sun Oct 19 18:52:04 UTC 2014 - crrodrig...@opensuse.org + +- apr-use-getrandom.patch Use the new getrandom() system call + in apr_generate_random_bytes() if the system call number + is defined and if the call is sucessful, fallback if otherwise. + +--- New: apr-use-getrandom.patch Other differences: -- ++ libapr1.spec ++ --- /var/tmp/diff_new_pack.g4wS0Q/_old 2014-11-02 16:46:03.0 +0100 +++ /var/tmp/diff_new_pack.g4wS0Q/_new 2014-11-02 16:46:03.0 +0100 @@ -35,6 +35,7 @@ Patch7: 0005-Backport-r1593612-from-1.6.patch Patch8: 0007-backport-r1604596-1604598-from-trunk.patch Patch9: 0009-Merge-r1610854-from-trunk.patch +Patch10:apr-use-getrandom.patch BuildRequires: doxygen BuildRequires: fdupes BuildRequires: libtool @@ -87,6 +88,7 @@ %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 # Do not put date to doxy content sed -i \ -e '4 iHTML_TIMESTAMP=NO' \ ++ apr-use-getrandom.patch ++ diff --git a/misc/unix/rand.c b/misc/unix/rand.c index c1e1e8f..e443d7e 100644 --- a/misc/unix/rand.c +++ b/misc/unix/rand.c @@ -43,6 +43,9 @@ #include sys/uuid.h #endif +#include sys/syscall.h +#include linux/random.h + #ifndef SHUT_RDWR #define SHUT_RDWR 2 #endif @@ -89,6 +92,12 @@ APR_DECLARE(apr_status_t) apr_generate_random_bytes(unsigned char *buf, { #ifdef DEV_RANDOM +#ifdef __NR_getrandom +int r = TEMP_FAILURE_RETRY(syscall(__NR_getrandom, buf, length, 0)); +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 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libapr1 for openSUSE:Factory
Hello community, here is the log from the commit of package libapr1 for openSUSE:Factory checked in at 2014-08-27 22:18:05 Comparing /work/SRC/openSUSE:Factory/libapr1 (Old) and /work/SRC/openSUSE:Factory/.libapr1.new (New) Package is libapr1 Changes: --- /work/SRC/openSUSE:Factory/libapr1/libapr1.changes 2014-06-25 15:24:18.0 +0200 +++ /work/SRC/openSUSE:Factory/.libapr1.new/libapr1.changes 2014-08-27 22:18:06.0 +0200 @@ -1,0 +2,8 @@ +Tue Aug 19 23:28:46 UTC 2014 - crrodrig...@opensuse.org + +- 0004-Backport-r1593600-from-1.6.patch memory leak apr_pvsprintf() +- 0005-Backport-r1593612-from-1.6.patch Missing error codes in apr_error_string() +- 0007-backport-r1604596-1604598-from-trunk.patch memory corruption in apr_skiplist +- 0009-Merge-r1610854-from-trunk.patch posix semaphore must handle EINTR. + +--- New: 0004-Backport-r1593600-from-1.6.patch 0005-Backport-r1593612-from-1.6.patch 0007-backport-r1604596-1604598-from-trunk.patch 0009-Merge-r1610854-from-trunk.patch Other differences: -- ++ libapr1.spec ++ --- /var/tmp/diff_new_pack.ovqwXa/_old 2014-08-27 22:18:08.0 +0200 +++ /var/tmp/diff_new_pack.ovqwXa/_new 2014-08-27 22:18:08.0 +0200 @@ -31,6 +31,10 @@ Patch1: string-compare.diff Patch4: apr-1.4.5-linux3.patch Patch5: apr-visibility.patch +Patch6: 0004-Backport-r1593600-from-1.6.patch +Patch7: 0005-Backport-r1593612-from-1.6.patch +Patch8: 0007-backport-r1604596-1604598-from-trunk.patch +Patch9: 0009-Merge-r1610854-from-trunk.patch BuildRequires: doxygen BuildRequires: fdupes BuildRequires: libtool @@ -79,7 +83,10 @@ %patch1 %patch4 %patch5 -p1 - +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 # Do not put date to doxy content sed -i \ -e '4 iHTML_TIMESTAMP=NO' \ ++ 0004-Backport-r1593600-from-1.6.patch ++ From dc099b699dc673f61a7a130d83e63a2c8c06f5bb Mon Sep 17 00:00:00 2001 From: Stefan Fritsch s...@apache.org Date: Fri, 9 May 2014 19:55:08 + Subject: [PATCH 04/13] Backport r1593600 from 1.6: Backport r1438940 from trunk: Don't leak memnodes in apr_pvsprintf() if out of memory and no pool abort function is set git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.5.x@1593610 13f79535-47bb-0310-9956-ffa450edef68 --- memory/unix/apr_pools.c | 26 +- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/memory/unix/apr_pools.c b/memory/unix/apr_pools.c index 5c1a1ff..20e4254 100644 --- a/memory/unix/apr_pools.c +++ b/memory/unix/apr_pools.c @@ -1135,21 +1135,12 @@ APR_DECLARE(char *) apr_pvsprintf(apr_pool_t *pool, const char *fmt, va_list ap) * room to hold the NUL terminator. */ if (ps.node-first_avail == ps.node-endp) { -if (psprintf_flush(ps.vbuff) == -1) { -if (pool-abort_fn) { -pool-abort_fn(APR_ENOMEM); -} - -return NULL; -} +if (psprintf_flush(ps.vbuff) == -1) + goto error; } -if (apr_vformatter(psprintf_flush, ps.vbuff, fmt, ap) == -1) { -if (pool-abort_fn) -pool-abort_fn(APR_ENOMEM); - -return NULL; -} +if (apr_vformatter(psprintf_flush, ps.vbuff, fmt, ap) == -1) +goto error; strp = ps.vbuff.curpos; *strp++ = '\0'; @@ -1195,6 +1186,15 @@ APR_DECLARE(char *) apr_pvsprintf(apr_pool_t *pool, const char *fmt, va_list ap) list_insert(active, node); return strp; + +error: +if (pool-abort_fn) +pool-abort_fn(APR_ENOMEM); +if (ps.got_a_new_node) { +ps.node-next = ps.free; +allocator_free(pool-allocator, ps.node); +} +return NULL; } -- 2.0.4 ++ 0005-Backport-r1593612-from-1.6.patch ++ From 5a7aa108394a9a59079c73a0ff875907b8992cf0 Mon Sep 17 00:00:00 2001 From: Stefan Fritsch s...@apache.org Date: Fri, 9 May 2014 20:01:43 + Subject: [PATCH 05/13] Backport r1593612 from 1.6: Backport r1593611 from trunk: Add some missing error messages to apr_error_string git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.5.x@1593613 13f79535-47bb-0310-9956-ffa450edef68 --- misc/unix/errorcodes.c | 11 +-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/misc/unix/errorcodes.c b/misc/unix/errorcodes.c index 75567c2..f553a37 100644 --- a/misc/unix/errorcodes.c +++ b/misc/unix/errorcodes.c @@ -39,6 +39,8 @@ static char *stuffbuffer(char *buf, apr_size_t bufsize, const char *s) static char *apr_error_string(apr_status_t statcode) { switch (statcode) { +case APR_ENOSTAT: +return Could not
commit libapr1 for openSUSE:Factory
Hello community, here is the log from the commit of package libapr1 for openSUSE:Factory checked in at 2014-06-25 15:24:07 Comparing /work/SRC/openSUSE:Factory/libapr1 (Old) and /work/SRC/openSUSE:Factory/.libapr1.new (New) Package is libapr1 Changes: --- /work/SRC/openSUSE:Factory/libapr1/libapr1.changes 2014-04-26 06:04:52.0 +0200 +++ /work/SRC/openSUSE:Factory/.libapr1.new/libapr1.changes 2014-06-25 15:24:18.0 +0200 @@ -1,0 +2,24 @@ +Mon Jun 23 14:15:22 UTC 2014 - tchva...@suse.com + +- Single thread for tests. + +--- +Mon Jun 23 07:32:57 UTC 2014 - tchva...@suse.com + +- Move plain .so file from devel package to fix tomcat intercation. + bnc#881700 + +--- +Fri Jun 20 11:46:37 UTC 2014 - tchva...@suse.com + +- Remove sparc mentions from baselibs + +--- +Fri Jun 20 09:03:19 UTC 2014 - tchva...@suse.com + +- Cleanup with spec-cleaner +- Remove support for sle9 and friends. +- Fix date and time usage to avoid the completely needless rebuilds +- Run the tests in multiple threads + +--- @@ -14 +37,0 @@ - Other differences: -- ++ libapr1.spec ++ --- /var/tmp/diff_new_pack.YZcXIh/_old 2014-06-25 15:24:19.0 +0200 +++ /var/tmp/diff_new_pack.YZcXIh/_new 2014-06-25 15:24:19.0 +0200 @@ -16,42 +16,31 @@ # +%define aprver 1 +%define installbuilddir %{_libdir}/apr-%{aprver}/build +%define includedir %{_includedir}/apr-%{aprver} Name: libapr1 -BuildRequires: libtool -BuildRequires: libuuid-devel -BuildRequires: lksctp-tools-devel -BuildRequires: python -%if %{?suse_version:1}0 -BuildRequires: doxygen -# for the test suite -BuildRequires: netcfg -%endif -%if %{?suse_version:1}0 0%{?sles_version} != 9 -BuildRequires: pkg-config -%endif -Url:http://apr.apache.org/ -# bug437293 -%ifarch ppc64 -Obsoletes: libapr1-64bit -%endif -%ifarch %ix86 ppc -Obsoletes: libapr1-32bit -%endif -# Version:1.5.1 Release:0 Summary:Apache Portable Runtime (APR) Library License:Apache-2.0 Group: Development/Libraries/Other +Url:http://apr.apache.org/ Source: http://www.apache.org/dist/apr/apr-%{version}.tar.bz2 Source2:baselibs.conf Patch1: string-compare.diff Patch4: apr-1.4.5-linux3.patch Patch5: apr-visibility.patch +BuildRequires: doxygen +BuildRequires: fdupes +BuildRequires: libtool +BuildRequires: libuuid-devel +BuildRequires: lksctp-tools-devel +# for the testsuite +BuildRequires: netcfg +BuildRequires: pkg-config +BuildRequires: python BuildRoot: %{_tmppath}/%{name}-%{version}-build -%define aprver 1 -%define installbuilddir %{_libdir}/apr-%{aprver}/build -%define includedir %{_includedir}/apr-%{aprver} %description The mission of the Apache Portable Runtime (APR) project is to create @@ -71,14 +60,6 @@ Group: Development/Libraries/Other Requires: glibc-devel Requires: libapr1 = %{version} -# bug437293 -%ifarch ppc64 -Obsoletes: libapr1-devel-64bit -%endif -%ifarch %ix86 ppc -Obsoletes: libapr1-devel-32bit -%endif -# %description devel The mission of the Apache Portable Runtime (APR) project is to create @@ -98,55 +79,19 @@ %patch1 %patch4 %patch5 -p1 -# -# workaround for ugly bug 400488 -# Xen kernel on sles9 x86_64 is set up to behave different than all other kernels -# skip sockets test on that platform -ls -l /lib/modules/ ||: -%if 0%{?sles_version} == 9 -%ifarch x86_64 -sed -i '/testsockets/ d' test/abts_tests.h -#sed -i '/testatomic/ d' test/abts_tests.h -%endif -%endif -# -# this test fails on sles9-x86_64, not only in Xen though. -# disable it for a moment to get packages for testing at least... -%if 0%{?sles_version} == 9 -%ifarch x86_64 -sed -i '/testatomic/ d' test/abts_tests.h -%endif -%endif -# -# this test also fails on sles10, both 32 and 64 bit. But only in the OBS. -# Run manually, it works. Must be either Xen- or ulimit-related. (It doesn't -# seem to be possible to increase ulimit -v in the OBS, unfortunately.) -%if 0%{?sles_version} == 10 || %{?centos_version:1}0 -sed -i '/testatomic/ d' test/abts_tests.h -%endif -# -# the following test currently is broken on hppa: -%ifarch hppa -sed -i '/testatomic/ d' test/abts_tests.h -%endif + +# Do not put date to doxy content +sed -i \ + -e '4 iHTML_TIMESTAMP=NO' \ + docs/doxygen.conf %build -# -#rm -rf aclocal.m4 autom4te*.cache -#autoheader -#%if %{?suse_version:1}0 0%{?sles_version} != 9
commit libapr1 for openSUSE:Factory
Hello community, here is the log from the commit of package libapr1 for openSUSE:Factory checked in at 2014-04-26 06:04:51 Comparing /work/SRC/openSUSE:Factory/libapr1 (Old) and /work/SRC/openSUSE:Factory/.libapr1.new (New) Package is libapr1 Changes: --- /work/SRC/openSUSE:Factory/libapr1/libapr1.changes 2013-11-22 07:11:57.0 +0100 +++ /work/SRC/openSUSE:Factory/.libapr1.new/libapr1.changes 2014-04-26 06:04:52.0 +0200 @@ -1,0 +2,15 @@ +Fri Apr 18 03:05:58 UTC 2014 - crrodrig...@opensuse.org + +- apr 1.5.1 +* avoid segfault on apr_os_proc_mutex_get() with cross- + process pthread mutexes +* Fix POSIX shared memory (shm_open) use for named shared memory. + (reenabled in package as well) + +--- +Fri Apr 18 03:03:27 UTC 2014 - crrodrig...@opensuse.org + +- remove apr-1.3.0-testshm-apr_shm_remove.patch, no longer needed + + +--- Old: apr-1.3.0-testshm-apr_shm_remove.patch apr-1.5.0.tar.bz2 New: apr-1.5.1.tar.bz2 Other differences: -- ++ libapr1.spec ++ --- /var/tmp/diff_new_pack.adpmUZ/_old 2014-04-26 06:04:53.0 +0200 +++ /var/tmp/diff_new_pack.adpmUZ/_new 2014-04-26 06:04:53.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package libapr1 # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -38,7 +38,7 @@ Obsoletes: libapr1-32bit %endif # -Version:1.5.0 +Version:1.5.1 Release:0 Summary:Apache Portable Runtime (APR) Library License:Apache-2.0 @@ -46,7 +46,6 @@ Source: http://www.apache.org/dist/apr/apr-%{version}.tar.bz2 Source2:baselibs.conf Patch1: string-compare.diff -Patch3: apr-1.3.0-testshm-apr_shm_remove.patch Patch4: apr-1.4.5-linux3.patch Patch5: apr-visibility.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -97,7 +96,6 @@ %prep %setup -q -n apr-%{version} %patch1 -%patch3 -p1 %patch4 %patch5 -p1 # @@ -142,7 +140,6 @@ # # --enable-pool-debug[=yes|no|verbose|verbose-alloc|lifetime|owner|all] ./buildconf -export ac_cv_search_shm_open=no export apr_lock_method=USE_PROC_PTHREAD_SERIALIZE %configure --enable-other-child \ --with-installbuilddir=%{installbuilddir} \ @@ -156,6 +153,8 @@ --enable-allocator-uses-mmap \ --with-devrandom=/dev/urandom \ --disable-static \ +--enable-posix-shm \ +--with-sendfile \ --with-pic %{__make} %{?jobs:-j%jobs} CFLAGS=$RPM_OPT_FLAGS -fvisibility=hidden -fPIC %if %{?suse_version:1}0 ++ apr-1.4.5-linux3.patch ++ --- /var/tmp/diff_new_pack.adpmUZ/_old 2014-04-26 06:04:53.0 +0200 +++ /var/tmp/diff_new_pack.adpmUZ/_new 2014-04-26 06:04:53.0 +0200 @@ -9,7 +9,38 @@ dnl AC_PROG_SED is only avaliable in recent autoconf versions. dnl Use AC_CHECK_PROG instead if AC_PROG_SED is not present. -@@ -2060,6 +2060,8 @@ fi +@@ -211,14 +211,7 @@ AC_CHECK_PROG(ASCPP, cpp, cpp) + AC_CHECK_TOOL(AR, ar, ar) + + dnl Various OS checks that apparently set required flags +-ifdef([AC_USE_SYSTEM_EXTENSIONS], [ + AC_USE_SYSTEM_EXTENSIONS +-], [ +-AC_AIX +-AC_MINIX +-]) +- +-AC_ISC_POSIX + APR_EBCDIC + + dnl this is our library name +@@ -664,15 +657,7 @@ case $host in + fi + ;; + *linux*) +-os_major=[`uname -r | sed -e 's/\([1-9][0-9]*\)\..*/\1/'`] +-os_minor=[`uname -r | sed -e 's/[1-9][0-9]*\.\([0-9]\+\)\..*/\1/'`] +-if test $os_major -lt 2 -o \( $os_major -eq 2 -a $os_minor -lt 4 \); then +-AC_MSG_WARN([Configured for pre-2.4 Linux $os_major.$os_minor]) +-os_pre24linux=1 +-else + os_pre24linux=0 +-AC_MSG_NOTICE([Configured for Linux $os_major.$os_minor]) +-fi + ;; + *os390) + os_version=`uname -r | sed -e 's/\.//g'` +@@ -2060,6 +2045,8 @@ fi AC_SUBST(have_proc_invoked) @@ -18,7 +49,7 @@ AC_MSG_CHECKING(for Variable Length Arrays) APR_TRY_COMPILE_NO_WARNING([], [ -@@ -2226,6 +2228,9 @@ APR_IFALLYES(header:OS.h func:create_sem +@@ -2226,6 +2213,9 @@ APR_IFALLYES(header:OS.h func:create_sem if test x$apr_lock_method != x; then APR_DECISION_FORCE($apr_lock_method) fi ++ apr-1.5.0.tar.bz2 - apr-1.5.1.tar.bz2 ++ 2015 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail:
commit libapr1 for openSUSE:Factory
Hello community, here is the log from the commit of package libapr1 for openSUSE:Factory checked in at 2013-11-22 07:11:56 Comparing /work/SRC/openSUSE:Factory/libapr1 (Old) and /work/SRC/openSUSE:Factory/.libapr1.new (New) Package is libapr1 Changes: --- /work/SRC/openSUSE:Factory/libapr1/libapr1.changes 2013-09-26 19:35:20.0 +0200 +++ /work/SRC/openSUSE:Factory/.libapr1.new/libapr1.changes 2013-11-22 07:11:57.0 +0100 @@ -1,0 +2,12 @@ +Thu Nov 21 14:55:45 UTC 2013 - crrodrig...@opensuse.org + +- Update to version 1.5.0. required for upcoming apache 2.4.x +* Add apr_sockaddr_is_wildcard() +* Add the apr_escape interface. +* Add apr_skiplist family. +* Add the apr_table_getm() call +* Add apr_hash_this_key(), apr_hash_this_key_len(), and + apr_hash_this_val() +* many other changes irrelevant to *nix. + +--- Old: apr-1.4.8.tar.bz2 New: apr-1.5.0.tar.bz2 Other differences: -- ++ libapr1.spec ++ --- /var/tmp/diff_new_pack.ranuAE/_old 2013-11-22 07:11:58.0 +0100 +++ /var/tmp/diff_new_pack.ranuAE/_new 2013-11-22 07:11:58.0 +0100 @@ -38,7 +38,7 @@ Obsoletes: libapr1-32bit %endif # -Version:1.4.8 +Version:1.5.0 Release:0 Summary:Apache Portable Runtime (APR) Library License:Apache-2.0 ++ apr-1.4.5-linux3.patch ++ --- /var/tmp/diff_new_pack.ranuAE/_old 2013-11-22 07:11:58.0 +0100 +++ /var/tmp/diff_new_pack.ranuAE/_new 2013-11-22 07:11:58.0 +0100 @@ -1,5 +1,3 @@ -Index: configure.in -=== --- configure.in.orig +++ configure.in @@ -181,7 +181,7 @@ dnl Do the various CC checks *before* pr @@ -11,58 +9,7 @@ dnl AC_PROG_SED is only avaliable in recent autoconf versions. dnl Use AC_CHECK_PROG instead if AC_PROG_SED is not present. -@@ -649,7 +649,7 @@ case $host in - fi - ;; - *linux*) --os_version=`uname -r | sed -e 's/\(.\)\.\(.\)\.\(.\).*/\1\2\3/'` -+os_version=260 - ;; - *os390) - os_version=`uname -r | sed -e 's/\.//g'` -@@ -1174,20 +1174,7 @@ APR_IFALLYES(header:windows.h func:Creat - [havewin32shm=1 - APR_DECIDE(USE_SHMEM_WIN32_ANON, - [Windows CreateFileMapping()])]) --case $host in --*linux* ) --# Linux has problems with MM_SHMT_MMANON even though it reports --# that it has it. --# FIXME - find exact 2.3 version that MMANON was fixed in. It is --# confirmed fixed in 2.4 series. --if test $os_version -le 240; then --APR_DECISION_OVERRIDE(USE_SHMEM_MMAP_ZERO USE_SHMEM_SHMGET_ANON) --fi --;; --*hpux11* ) --APR_DECISION_OVERRIDE(USE_SHMEM_SHMGET_ANON) --;; --esac -+ - APR_END_DECISION - AC_DEFINE_UNQUOTED($ac_decision) - -@@ -1244,18 +1231,7 @@ APR_IFALLYES(header:os2.h, - APR_IFALLYES(header:windows.h, - [havewin32shm=1 - APR_DECIDE(USE_SHMEM_WIN32, [Windows shared memory])]) --case $host in --*linux* ) --# Linux has problems with MM_SHMT_MMANON even though it reports --# that it has it. --# FIXME - find exact 2.3 version that MMANON was fixed in. It is --# confirmed fixed in 2.4 series. --if test $os_version -le 240; then --APR_DECISION_OVERRIDE(USE_SHMEM_MMAP_TMP USE_SHMEM_MMAP_SHM dnl -- USE_SHMEM_SHMGET) --fi --;; --esac -+ - APR_END_DECISION - AC_DEFINE_UNQUOTED($ac_decision) - -@@ -2049,6 +2025,8 @@ fi +@@ -2060,6 +2060,8 @@ fi AC_SUBST(have_proc_invoked) @@ -71,7 +18,7 @@ AC_MSG_CHECKING(for Variable Length Arrays) APR_TRY_COMPILE_NO_WARNING([], [ -@@ -2215,6 +2193,9 @@ APR_IFALLYES(header:OS.h func:create_sem +@@ -2226,6 +2228,9 @@ APR_IFALLYES(header:OS.h func:create_sem if test x$apr_lock_method != x; then APR_DECISION_FORCE($apr_lock_method) fi @@ -81,8 +28,6 @@ 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 ++ apr-1.4.8.tar.bz2 - apr-1.5.0.tar.bz2 ++ 26017 lines of diff (skipped) ++ apr-visibility.patch ++ --- /var/tmp/diff_new_pack.ranuAE/_old 2013-11-22 07:11:58.0 +0100 +++ /var/tmp/diff_new_pack.ranuAE/_new 2013-11-22 07:11:58.0 +0100 @@ -1,6 +1,6 @@ apr-1.4.8.orig/include/apr.h.in -+++ apr-1.4.8/include/apr.h.in -@@ -474,7 +474,7 @@ typedef apr_uint32_t
commit libapr1 for openSUSE:Factory
Hello community, here is the log from the commit of package libapr1 for openSUSE:Factory checked in at 2013-09-26 19:35:19 Comparing /work/SRC/openSUSE:Factory/libapr1 (Old) and /work/SRC/openSUSE:Factory/.libapr1.new (New) Package is libapr1 Changes: --- /work/SRC/openSUSE:Factory/libapr1/libapr1.changes 2013-08-28 21:21:41.0 +0200 +++ /work/SRC/openSUSE:Factory/.libapr1.new/libapr1.changes 2013-09-26 19:35:20.0 +0200 @@ -1,0 +2,6 @@ +Tue Sep 24 19:23:12 UTC 2013 - dmuel...@suse.com + +- correct condition for avoiding make check is qemu_user_build, + not armv7l + +--- Other differences: -- ++ libapr1.spec ++ --- /var/tmp/diff_new_pack.bE9xXY/_old 2013-09-26 19:35:21.0 +0200 +++ /var/tmp/diff_new_pack.bE9xXY/_new 2013-09-26 19:35:21.0 +0200 @@ -179,7 +179,7 @@ $RPM_BUILD_ROOT%{_libdir}/pkgconfig/apr-%{aprver}.pc %check -%ifnarch %arm +%if ! 0%{?qemu_user_space_build} make check %endif -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libapr1 for openSUSE:Factory
Hello community, here is the log from the commit of package libapr1 for openSUSE:Factory checked in at 2013-08-28 21:21:40 Comparing /work/SRC/openSUSE:Factory/libapr1 (Old) and /work/SRC/openSUSE:Factory/.libapr1.new (New) Package is libapr1 Changes: --- /work/SRC/openSUSE:Factory/libapr1/libapr1.changes 2013-07-23 12:32:05.0 +0200 +++ /work/SRC/openSUSE:Factory/.libapr1.new/libapr1.changes 2013-08-28 21:21:41.0 +0200 @@ -1,0 +2,5 @@ +Wed Aug 28 07:20:31 UTC 2013 - crrodrig...@opensuse.org + +- Use compiler symbol visibility + +--- New: apr-visibility.patch Other differences: -- ++ libapr1.spec ++ --- /var/tmp/diff_new_pack.ZoJYzY/_old 2013-08-28 21:21:41.0 +0200 +++ /var/tmp/diff_new_pack.ZoJYzY/_new 2013-08-28 21:21:41.0 +0200 @@ -48,6 +48,7 @@ Patch1: string-compare.diff Patch3: apr-1.3.0-testshm-apr_shm_remove.patch Patch4: apr-1.4.5-linux3.patch +Patch5: apr-visibility.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define aprver 1 %define installbuilddir %{_libdir}/apr-%{aprver}/build @@ -98,6 +99,7 @@ %patch1 %patch3 -p1 %patch4 +%patch5 -p1 # # workaround for ugly bug 400488 # Xen kernel on sles9 x86_64 is set up to behave different than all other kernels @@ -131,7 +133,6 @@ %endif %build -export CFLAGS=$RPM_OPT_FLAGS -fPIC # #rm -rf aclocal.m4 autom4te*.cache #autoheader @@ -142,7 +143,7 @@ # --enable-pool-debug[=yes|no|verbose|verbose-alloc|lifetime|owner|all] ./buildconf export ac_cv_search_shm_open=no - +export apr_lock_method=USE_PROC_PTHREAD_SERIALIZE %configure --enable-other-child \ --with-installbuilddir=%{installbuilddir} \ --includedir=%{includedir} \ @@ -156,7 +157,7 @@ --with-devrandom=/dev/urandom \ --disable-static \ --with-pic -%{__make} %{?jobs:-j%jobs} +%{__make} %{?jobs:-j%jobs} CFLAGS=$RPM_OPT_FLAGS -fvisibility=hidden -fPIC %if %{?suse_version:1}0 make dox %endif ++ apr-visibility.patch ++ --- apr-1.4.8.orig/include/apr.h.in +++ apr-1.4.8/include/apr.h.in @@ -474,7 +474,7 @@ typedef apr_uint32_tapr_uin * headers, without defining APR_DECLARE_STATIC, will prepare the code to be * linked to the dynamic library. */ -#define APR_DECLARE(type)type +#define APR_DECLARE(type)__attribute__ ((visibility (default))) type /** * The public APR functions using variable arguments are declared with @@ -487,7 +487,7 @@ typedef apr_uint32_tapr_uin * * /PRE */ -#define APR_DECLARE_NONSTD(type) type +#define APR_DECLARE_NONSTD(type) __attribute__ ((visibility (default))) type /** * The public APR variables are declared with AP_MODULE_DECLARE_DATA. @@ -503,7 +503,7 @@ typedef apr_uint32_tapr_uin * * /PRE */ -#define APR_DECLARE_DATA +#define APR_DECLARE_DATA __attribute__ ((visibility (default))) /* Define APR_SSIZE_T_FMT. * If ssize_t is an integer we define it to be d, --- apr-1.4.8.orig/include/apr_support.h +++ apr-1.4.8/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. */ -apr_status_t apr_wait_for_io_or_timeout(apr_file_t *f, apr_socket_t *s, +APR_DECLARE(apr_status_t) apr_wait_for_io_or_timeout(apr_file_t *f, apr_socket_t *s, int for_read); /** @} */ -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libapr1 for openSUSE:Factory
Hello community, here is the log from the commit of package libapr1 for openSUSE:Factory checked in at 2013-07-23 12:32:04 Comparing /work/SRC/openSUSE:Factory/libapr1 (Old) and /work/SRC/openSUSE:Factory/.libapr1.new (New) Package is libapr1 Changes: --- /work/SRC/openSUSE:Factory/libapr1/libapr1.changes 2013-07-16 16:41:12.0 +0200 +++ /work/SRC/openSUSE:Factory/.libapr1.new/libapr1.changes 2013-07-23 12:32:05.0 +0200 @@ -1,0 +2,7 @@ +Mon Jul 22 17:32:25 UTC 2013 - crrodrig...@opensuse.org + +- Update to apr 1.4.8 +* Fix amd64 assembler version of apr_atomic_xchgptr() +* many other bugfixes, see https://www.apache.org/dist/apr/CHANGES-APR-1.4 + +--- Old: apr-1.4.6.tar.bz2 New: apr-1.4.8.tar.bz2 Other differences: -- ++ libapr1.spec ++ --- /var/tmp/diff_new_pack.lSDWOF/_old 2013-07-23 12:32:06.0 +0200 +++ /var/tmp/diff_new_pack.lSDWOF/_new 2013-07-23 12:32:06.0 +0200 @@ -38,7 +38,7 @@ Obsoletes: libapr1-32bit %endif # -Version:1.4.6 +Version:1.4.8 Release:0 Summary:Apache Portable Runtime (APR) Library License:Apache-2.0 ++ apr-1.4.6.tar.bz2 - apr-1.4.8.tar.bz2 ++ 4169 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libapr1 for openSUSE:Factory
Hello community, here is the log from the commit of package libapr1 for openSUSE:Factory checked in at 2013-07-16 16:41:11 Comparing /work/SRC/openSUSE:Factory/libapr1 (Old) and /work/SRC/openSUSE:Factory/.libapr1.new (New) Package is libapr1 Changes: --- /work/SRC/openSUSE:Factory/libapr1/libapr1.changes 2012-10-18 21:53:09.0 +0200 +++ /work/SRC/openSUSE:Factory/.libapr1.new/libapr1.changes 2013-07-16 16:41:12.0 +0200 @@ -1,0 +2,5 @@ +Tue Jul 16 14:00:09 CEST 2013 - m...@suse.de + +- get rid of --parents in doc section + +--- Other differences: -- ++ libapr1.spec ++ --- /var/tmp/diff_new_pack.J2IW7q/_old 2013-07-16 16:41:12.0 +0200 +++ /var/tmp/diff_new_pack.J2IW7q/_new 2013-07-16 16:41:12.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package libapr1 # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -203,7 +203,7 @@ %doc docs/incomplete_types %doc docs/non_apr_programs %if %{?suse_version:1}0 -%doc --parents html +%doc html %endif %doc emacs-mode %{includedir} -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libapr1 for openSUSE:Factory
Hello community, here is the log from the commit of package libapr1 for openSUSE:Factory checked in at 2012-10-18 21:53:08 Comparing /work/SRC/openSUSE:Factory/libapr1 (Old) and /work/SRC/openSUSE:Factory/.libapr1.new (New) Package is libapr1, Maintainer is dr...@suse.com Changes: --- /work/SRC/openSUSE:Factory/libapr1/libapr1.changes 2012-02-22 11:50:21.0 +0100 +++ /work/SRC/openSUSE:Factory/.libapr1.new/libapr1.changes 2012-10-18 21:53:09.0 +0200 @@ -1,0 +2,10 @@ +Mon Oct 15 10:41:21 UTC 2012 - co...@suse.com + +- buildrequire explicitly netcfg for the test suite + +--- +Fri Aug 17 18:42:37 UTC 2012 - crrodrig...@opensuse.org + +- Merge some build improvements/fixes from Fedora + +--- Other differences: -- ++ libapr1.spec ++ --- /var/tmp/diff_new_pack.KAmIoI/_old 2012-10-18 21:53:10.0 +0200 +++ /var/tmp/diff_new_pack.KAmIoI/_new 2012-10-18 21:53:10.0 +0200 @@ -16,11 +16,15 @@ # - Name: libapr1 -BuildRequires: autoconf +BuildRequires: libtool +BuildRequires: libuuid-devel +BuildRequires: lksctp-tools-devel +BuildRequires: python %if %{?suse_version:1}0 BuildRequires: doxygen +# for the test suite +BuildRequires: netcfg %endif %if %{?suse_version:1}0 0%{?sles_version} != 9 BuildRequires: pkg-config @@ -65,7 +69,8 @@ %package devel Summary:Apache Portable Runtime (APR) Library Group: Development/Libraries/Other -Requires: libapr1 = %{version} glibc-devel +Requires: glibc-devel +Requires: libapr1 = %{version} # bug437293 %ifarch ppc64 Obsoletes: libapr1-devel-64bit @@ -128,24 +133,25 @@ %build export CFLAGS=$RPM_OPT_FLAGS -fPIC # -rm -rf aclocal.m4 autom4te*.cache -autoheader -%if %{?suse_version:1}0 0%{?sles_version} != 9 0%{?sles_version} != 10 -autoconf -%endif +#rm -rf aclocal.m4 autom4te*.cache +#autoheader +#%if %{?suse_version:1}0 0%{?sles_version} != 9 0%{?sles_version} != 10 +#autoconf +#%endif # # --enable-pool-debug[=yes|no|verbose|verbose-alloc|lifetime|owner|all] -%configure \ +./buildconf +export ac_cv_search_shm_open=no + +%configure --enable-other-child \ --with-installbuilddir=%{installbuilddir} \ --includedir=%{includedir} \ %if %{?build_with_memory_pool_debug:1}0 --enable-debug --enable-pool-debug=verbose \ %endif %ifarch %ix86 -%ifnarch i386 --enable-nonportable-atomics=yes \ %endif -%endif --enable-allocator-uses-mmap \ --with-devrandom=/dev/urandom \ --disable-static \ @@ -165,15 +171,19 @@ %{__rm} -f $RPM_BUILD_ROOT/%{_libdir}/apr.exp %{__rm} -f %{buildroot}%{_libdir}/libapr-%{aprver}.la +# Trim exported dependecies +sed -ri '/^LIBS=/{s,-l(uuid|crypt) ,,g;s/ */ /g}' \ + $RPM_BUILD_ROOT%{_bindir}/apr-%{aprver}-config +sed -ri '/^Libs/{s,-l(uuid|crypt) ,,g}' \ + $RPM_BUILD_ROOT%{_libdir}/pkgconfig/apr-%{aprver}.pc + %check %ifnarch %arm make check %endif %clean -if ! test -f /.buildenv; then - rm -rf $RPM_BUILD_ROOT -fi +rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig ++ apr-1.4.5-linux3.patch ++ --- /var/tmp/diff_new_pack.KAmIoI/_old 2012-10-18 21:53:10.0 +0200 +++ /var/tmp/diff_new_pack.KAmIoI/_new 2012-10-18 21:53:10.0 +0200 @@ -1,6 +1,17 @@ +Index: configure.in +=== --- configure.in.orig +++ configure.in -@@ -650,7 +650,7 @@ case $host in +@@ -181,7 +181,7 @@ dnl Do the various CC checks *before* pr + dnl may need to use compiler characteristics to make decisions. This macro + dnl can only be used once within a configure script, so this prevents a + dnl preload section from invoking the macro to get compiler info. +-AC_PROG_CC ++AC_PROG_CC_STDC + + dnl AC_PROG_SED is only avaliable in recent autoconf versions. + dnl Use AC_CHECK_PROG instead if AC_PROG_SED is not present. +@@ -649,7 +649,7 @@ case $host in fi ;; *linux*) @@ -9,3 +20,86 @@ ;; *os390) os_version=`uname -r | sed -e 's/\.//g'` +@@ -1174,20 +1174,7 @@ APR_IFALLYES(header:windows.h func:Creat + [havewin32shm=1 + APR_DECIDE(USE_SHMEM_WIN32_ANON, + [Windows CreateFileMapping()])]) +-case $host in +-*linux* ) +-# Linux has problems with MM_SHMT_MMANON even though it reports +-# that it has it. +-# FIXME - find exact 2.3 version that MMANON was fixed in. It is +-# confirmed fixed in 2.4 series. +-if test $os_version -le 240; then +-APR_DECISION_OVERRIDE(USE_SHMEM_MMAP_ZERO
commit libapr1 for openSUSE:Factory
Hello community, here is the log from the commit of package libapr1 for openSUSE:Factory checked in at 2012-02-22 11:50:20 Comparing /work/SRC/openSUSE:Factory/libapr1 (Old) and /work/SRC/openSUSE:Factory/.libapr1.new (New) Package is libapr1, Maintainer is dr...@suse.com Changes: --- /work/SRC/openSUSE:Factory/libapr1/libapr1.changes 2012-02-16 16:17:04.0 +0100 +++ /work/SRC/openSUSE:Factory/.libapr1.new/libapr1.changes 2012-02-22 11:50:21.0 +0100 @@ -1,0 +2,30 @@ +Sat Feb 18 14:05:46 UTC 2012 - po...@cmdline.net + +- updated to 1.4.6 + *) Flush write buffer before truncate call on a file. + *) Security: oCERT-2011-003 + Randomise hashes by providing a seed. + *) apr_random: Prevent segfault if pool used to initialize apr_random is + destroyed before forking. + *) testrand: Improve child randomness test case. + *) apr_proc_fork, apr_random_after_fork: disambiguate what happens to the + proc structure passed in, and ensure that the pid is set correctly in + a newly created child; note that merely mixing a PID into the random + seed of a new child doesn't markedly increase entropy. + *) apr_file_open: Avoid fcntl() calls if support for O_CLOEXEC works. + PR 48557. + *) apr_dir_make_recursive: Fix race condition that could lead to EEXIST + being returned. PR 51254. + *) configure: Fix APR_RESTORE_THE_ENVIRONMENT if the original variable was + a single space. PR 50334. + *) apr_proc_create: Don't close any of the new stdin/stdout/stderr in the + child if it already has the correct FD. PR 51995. + *) Fix flag character '#' in combination with format character 'x' in + apr snprintf implementations. + *) Improve platform detection by updating config.guess and config.sub. + *) Add libtool2 files to extraclean make target. + *) Don't overwrite our config.guess and config.sub + when running buildconf. + *) Silence autoconf 2.68 warnings. + +--- Old: apr-1.4.5.tar.bz2 New: apr-1.4.6.tar.bz2 Other differences: -- ++ libapr1.spec ++ --- /var/tmp/diff_new_pack.Mgf3Jm/_old 2012-02-22 11:50:23.0 +0100 +++ /var/tmp/diff_new_pack.Mgf3Jm/_new 2012-02-22 11:50:23.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package libapr1 # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,6 +15,8 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + + Name: libapr1 BuildRequires: autoconf %if %{?suse_version:1}0 @@ -32,7 +34,7 @@ Obsoletes: libapr1-32bit %endif # -Version:1.4.5 +Version:1.4.6 Release:0 Summary:Apache Portable Runtime (APR) Library License:Apache-2.0 ++ apr-1.4.5.tar.bz2 - apr-1.4.6.tar.bz2 ++ 76967 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libapr1 for openSUSE:Factory
Hello community, here is the log from the commit of package libapr1 for openSUSE:Factory checked in at 2012-02-16 16:17:01 Comparing /work/SRC/openSUSE:Factory/libapr1 (Old) and /work/SRC/openSUSE:Factory/.libapr1.new (New) Package is libapr1, Maintainer is dr...@suse.com Changes: --- /work/SRC/openSUSE:Factory/libapr1/libapr1.changes 2011-12-27 18:36:18.0 +0100 +++ /work/SRC/openSUSE:Factory/.libapr1.new/libapr1.changes 2012-02-16 16:17:04.0 +0100 @@ -1,0 +2,11 @@ +Tue Jan 24 13:58:01 UTC 2012 - cfarr...@suse.com + +- license update: Apache-2.0 + Fix the license to a single SPDX compatible string + +--- +Sat Jan 21 00:07:57 CET 2012 - dr...@suse.de + +- add Group tag to subpackages + +--- Other differences: -- ++ libapr1.spec ++ --- /var/tmp/diff_new_pack.cXeX1q/_old 2012-02-16 16:17:05.0 +0100 +++ /var/tmp/diff_new_pack.cXeX1q/_new 2012-02-16 16:17:05.0 +0100 @@ -35,7 +35,7 @@ Version:1.4.5 Release:0 Summary:Apache Portable Runtime (APR) Library -License:Other uncritical OpenSource License ; Apache-2.0 +License:Apache-2.0 Group: Development/Libraries/Other Source: http://www.apache.org/dist/apr/apr-%{version}.tar.bz2 Source2:baselibs.conf @@ -62,6 +62,7 @@ %package devel Summary:Apache Portable Runtime (APR) Library +Group: Development/Libraries/Other Requires: libapr1 = %{version} glibc-devel # bug437293 %ifarch ppc64 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libapr1 for openSUSE:Factory
Hello community, here is the log from the commit of package libapr1 for openSUSE:Factory checked in at 2011-12-27 18:36:13 Comparing /work/SRC/openSUSE:Factory/libapr1 (Old) and /work/SRC/openSUSE:Factory/.libapr1.new (New) Package is libapr1, Maintainer is dr...@suse.com Changes: --- /work/SRC/openSUSE:Factory/libapr1/libapr1.changes 2011-10-05 12:37:44.0 +0200 +++ /work/SRC/openSUSE:Factory/.libapr1.new/libapr1.changes 2011-12-27 18:36:18.0 +0100 @@ -1,0 +2,5 @@ +Tue Dec 20 20:58:34 UTC 2011 - co...@suse.com + +- add autoconf as buildrequire to avoid implicit dependency + +--- Other differences: -- ++ libapr1.spec ++ --- /var/tmp/diff_new_pack.g6njqM/_old 2011-12-27 18:37:33.0 +0100 +++ /var/tmp/diff_new_pack.g6njqM/_new 2011-12-27 18:37:33.0 +0100 @@ -1,7 +1,7 @@ # -# spec file for package libapr1 (Version 1.4.2) +# spec file for package libapr1 # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,9 +15,8 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: libapr1 +BuildRequires: autoconf %if %{?suse_version:1}0 BuildRequires: doxygen %endif @@ -25,9 +24,6 @@ BuildRequires: pkg-config %endif Url:http://apr.apache.org/ -License:Other uncritical OpenSource License ; Apache Software License .. -Group: Development/Libraries/Other -AutoReqProv:on # bug437293 %ifarch ppc64 Obsoletes: libapr1-64bit @@ -37,8 +33,10 @@ %endif # Version:1.4.5 -Release:2 +Release:0 Summary:Apache Portable Runtime (APR) Library +License:Other uncritical OpenSource License ; Apache-2.0 +Group: Development/Libraries/Other Source: http://www.apache.org/dist/apr/apr-%{version}.tar.bz2 Source2:baselibs.conf Patch1: string-compare.diff @@ -63,11 +61,8 @@ examples being the Apache HTTP server. %package devel -License:Other uncritical OpenSource License ; Apache Software License .. Summary:Apache Portable Runtime (APR) Library -Group: Development/Libraries/Other Requires: libapr1 = %{version} glibc-devel -AutoReqProv:on # bug437293 %ifarch ppc64 Obsoletes: libapr1-devel-64bit -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libapr1 for openSUSE:Factory
Hello community, here is the log from the commit of package libapr1 for openSUSE:Factory checked in at Wed Oct 5 12:37:50 CEST 2011. --- openSUSE:Factory/libapr1/libapr1.changes2011-09-23 02:07:49.0 +0200 +++ /mounts/work_src_done/STABLE/libapr1/libapr1.changes2011-08-07 03:22:56.0 +0200 @@ -1,0 +2,32 @@ +Sun Aug 7 01:21:44 UTC 2011 - crrodrig...@opensuse.org + +- Fix broken linux 3 version test in configure,make the configure + script assume linux 2.6.0 + +--- +Sat Jul 16 04:10:44 UTC 2011 - crrodrig...@opensuse.org + +- remove -fno-strict-aliasing and LDAP_DEPRECATED from CFLAGS + no longer needed. + +--- +Thu May 26 03:43:35 UTC 2011 - crrodrig...@opensuse.org + +- Update to APR 1.4.5 + * Security: CVE-2011-1928 + apr_fnmatch(): Fix high CPU loop. [William Rowe] + * Fix top_builddir in installed apr_rules.mk. [Bojan Smojver] + +--- +Fri May 20 19:41:33 UTC 2011 - crrodrig...@opensuse.org + +- Update to APR 1.4.4 +* Security: CVE-2011-0419 +* Fix address handling when accepting an AF_INET socket from a socket + bound as AF_INET6. +* Add configure option --enable-allocator-uses-mmap to reduce memory + fragmentation. +* Avoid a redundant fcntl() call in apr_file_open() where O_CLOEXEC + is supported. + +--- calling whatdependson for head-i586 Old: apr-1.4.2.tar.bz2 New: apr-1.4.5-linux3.patch apr-1.4.5.tar.bz2 Other differences: -- ++ libapr1.spec ++ --- /var/tmp/diff_new_pack.t50CC9/_old 2011-10-05 12:37:42.0 +0200 +++ /var/tmp/diff_new_pack.t50CC9/_new 2011-10-05 12:37:42.0 +0200 @@ -36,13 +36,14 @@ Obsoletes: libapr1-32bit %endif # -Version:1.4.2 +Version:1.4.5 Release:2 Summary:Apache Portable Runtime (APR) Library Source: http://www.apache.org/dist/apr/apr-%{version}.tar.bz2 Source2:baselibs.conf Patch1: string-compare.diff Patch3: apr-1.3.0-testshm-apr_shm_remove.patch +Patch4: apr-1.4.5-linux3.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define aprver 1 %define installbuilddir %{_libdir}/apr-%{aprver}/build @@ -90,9 +91,10 @@ examples being the Apache HTTP server. %prep -%setup -n apr-%{version} +%setup -q -n apr-%{version} %patch1 %patch3 -p1 +%patch4 # # workaround for ugly bug 400488 # Xen kernel on sles9 x86_64 is set up to behave different than all other kernels @@ -126,7 +128,7 @@ %endif %build -export CFLAGS=$RPM_OPT_FLAGS -fno-strict-aliasing -DLDAP_DEPRECATED -fPIC +export CFLAGS=$RPM_OPT_FLAGS -fPIC # rm -rf aclocal.m4 autom4te*.cache autoheader @@ -146,6 +148,7 @@ --enable-nonportable-atomics=yes \ %endif %endif +--enable-allocator-uses-mmap \ --with-devrandom=/dev/urandom \ --disable-static \ --with-pic ++ apr-1.4.5-linux3.patch ++ --- configure.in.orig +++ configure.in @@ -650,7 +650,7 @@ case $host in fi ;; *linux*) -os_version=`uname -r | sed -e 's/\(.\)\.\(.\)\.\(.\).*/\1\2\3/'` +os_version=260 ;; *os390) os_version=`uname -r | sed -e 's/\.//g'` ++ apr-1.4.2.tar.bz2 - apr-1.4.5.tar.bz2 ++ 112498 lines of diff (skipped) continue with q... Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org