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 "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/libapr1/libapr1.changes 2012-02-22 11:50:21.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libapr1.new/libapr1.changes 2012-10-18 21:53:09.000000000 +0200 @@ -1,0 +2,10 @@ +Mon Oct 15 10:41:21 UTC 2012 - [email protected] + +- buildrequire explicitly netcfg for the test suite + +------------------------------------------------------------------- +Fri Aug 17 18:42:37 UTC 2012 - [email protected] + +- Merge some build improvements/fixes from Fedora + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libapr1.spec ++++++ --- /var/tmp/diff_new_pack.KAmIoI/_old 2012-10-18 21:53:10.000000000 +0200 +++ /var/tmp/diff_new_pack.KAmIoI/_new 2012-10-18 21:53:10.000000000 +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.000000000 +0200 +++ /var/tmp/diff_new_pack.KAmIoI/_new 2012-10-18 21:53:10.000000000 +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 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 + + AC_SUBST(have_proc_invoked) + ++AC_C_VARARRAYS ++ + AC_MSG_CHECKING(for Variable Length Arrays) + APR_TRY_COMPILE_NO_WARNING([], + [ +@@ -2215,6 +2193,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_DECIDE(USE_PROC_PTHREAD_SERIALIZE, [cross-process pthread mutexes]) ++ + 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_interval_time_t timeout) + { + int i, num_to_poll; +-#ifdef HAVE_VLA ++#ifdef HAVE_C_VARARRAYS + /* XXX: I trust that this is a segv when insufficient stack exists? */ + struct pollfd pollset[num]; + #elif defined(HAVE_ALLOCA) +@@ -129,7 +129,7 @@ APR_DECLARE(apr_status_t) apr_poll(apr_p + } + } + +-#if !defined(HAVE_VLA) && !defined(HAVE_ALLOCA) ++#if !defined(HAVE_C_VARARRAYS) && !defined(HAVE_ALLOCA) + if (num > SMALL_POLLSET_LIMIT) { + free(pollset); + } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
