diff --git a/.gitignore b/.gitignore index f7457a3..9e9ac78 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,6 @@ apr-1.3.9.tar.bz2 /apr-1.7.0.tar.bz2 /apr-1.7.1.tar.bz2 /apr-1.7.2.tar.bz2 +/apr-1.7.3.tar.bz2 +/apr-1.7.5.tar.bz2 +/apr-1.7.6.tar.bz2 diff --git a/apr-1.7.2-autoconf.patch b/apr-1.7.2-autoconf.patch deleted file mode 100644 index 368fc79..0000000 --- a/apr-1.7.2-autoconf.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/build/apr_common.m4 b/build/apr_common.m4 -index ac2312c..5d232c4 100644 ---- a/build/apr_common.m4 -+++ b/build/apr_common.m4 -@@ -468,15 +468,8 @@ AC_DEFUN([APR_TRY_COMPILE_NO_WARNING], - fi - AC_COMPILE_IFELSE( - [AC_LANG_SOURCE( -- [ --#ifndef PACKAGE_NAME --#include "confdefs.h" --#endif -- ] -- [[$1]] -- [int main(int argc, const char *const *argv) {] -+ [[$1]], - [[$2]] -- [ return 0; }] - )], [CFLAGS=$apr_save_CFLAGS - $3], [CFLAGS=$apr_save_CFLAGS - $4]) diff --git a/apr-1.7.2-r1907541.patch b/apr-1.7.2-r1907541.patch deleted file mode 100644 index b586260..0000000 --- a/apr-1.7.2-r1907541.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/atomic/unix/mutex64.c 2023/02/09 12:45:02 1907540 -+++ b/atomic/unix/mutex64.c 2023/02/09 13:36:18 1907541 -@@ -96,7 +96,26 @@ - - APR_DECLARE(apr_uint64_t) apr_atomic_read64(volatile apr_uint64_t *mem) - { -+ /* On 32bit CPUs this loads with two instructions (tearing), -+ * so a lock is needed to ensure atomicity. -+ * -+ * APR_SIZEOF_VOIDP is probably not the right check for 32 vs 64 bits CPUs -+ * but it spares an (hardly-)exhaustive list of supported CPUs (and using -+ * assembly). If APR_SIZEOF_VOIDP==4 means that the compiler generates -+ * 32bit instructions (-m32 or whatever) then it's the right check though. -+ */ -+#if APR_SIZEOF_VOIDP >= 8 - return *mem; -+#else -+ apr_uint64_t cur_value; -+ DECLARE_MUTEX_LOCKED(mutex, mem); -+ -+ cur_value = *mem; -+ -+ MUTEX_UNLOCK(mutex); -+ -+ return cur_value; -+#endif - } - - APR_DECLARE(void) apr_atomic_set64(volatile apr_uint64_t *mem, apr_uint64_t val) diff --git a/apr-1.7.6-autoconf.patch b/apr-1.7.6-autoconf.patch new file mode 100644 index 0000000..58dc4a3 --- /dev/null +++ b/apr-1.7.6-autoconf.patch @@ -0,0 +1,200 @@ + +https://github.com/apache/apr/pull/68 + +--- apr-1.7.6/build/apr_common.m4.5 ++++ apr-1.7.6/build/apr_common.m4 +@@ -467,19 +467,11 @@ + CFLAGS="$CFLAGS -Werror" + fi + AC_COMPILE_IFELSE( +- [AC_LANG_SOURCE( +- [ +-#ifndef PACKAGE_NAME +-#include "confdefs.h" +-#endif +- ] +- [[$1]] +- [int main(int argc, const char *const *argv) {] +- [[$2]] +- [ return 0; }] +- )], [CFLAGS=$apr_save_CFLAGS +-$3], [CFLAGS=$apr_save_CFLAGS +-$4]) ++ [AC_LANG_PROGRAM([[$1]], [[$2]])], ++ [CFLAGS=$apr_save_CFLAGS ++ $3], ++ [CFLAGS=$apr_save_CFLAGS ++ $4]) + ]) + + dnl +--- apr-1.7.6/build/apr_network.m4.5 ++++ apr-1.7.6/build/apr_network.m4 +@@ -259,11 +259,12 @@ + #ifdef HAVE_STDLIB_H + #include + #endif ++#include + ],[ + int tmp = gethostbyname_r((const char *) 0, (struct hostent *) 0, + (char *) 0, 0, (struct hostent **) 0, &tmp); + /* use tmp to suppress the warning */ +-tmp=0; ++puts(tmp ? "non-zero" : "zero"); + ], ac_cv_gethostbyname_r_style=glibc2, ac_cv_gethostbyname_r_style=none)) + + if test "$ac_cv_gethostbyname_r_style" = "glibc2"; then +@@ -287,11 +288,12 @@ + #ifdef HAVE_STDLIB_H + #include + #endif ++#include + ],[ + int tmp = gethostbyname_r((const char *) 0, (struct hostent *) 0, + (struct hostent_data *) 0); + /* use tmp to suppress the warning */ +-tmp=0; ++puts(tmp ? "non-zero" : "zero"); + ], ac_cv_gethostbyname_r_arg=hostent_data, ac_cv_gethostbyname_r_arg=char)) + + if test "$ac_cv_gethostbyname_r_arg" = "hostent_data"; then +@@ -327,12 +329,13 @@ + #ifdef HAVE_STDLIB_H + #include + #endif ++#include + ],[ + int tmp = getservbyname_r((const char *) 0, (const char *) 0, + (struct servent *) 0, (char *) 0, 0, + (struct servent **) 0); + /* use tmp to suppress the warning */ +-tmp=0; ++puts(tmp ? "non-zero" : "zero"); + ], ac_cv_getservbyname_r_style=glibc2, ac_cv_getservbyname_r_style=none) + + if test "$ac_cv_getservbyname_r_style" = "none"; then +@@ -354,11 +357,12 @@ + #ifdef HAVE_STDLIB_H + #include + #endif ++ #include + ],[ + struct servent *tmp = getservbyname_r((const char *) 0, (const char *) 0, + (struct servent *) 0, (char *) 0, 0); + /* use tmp to suppress the warning */ +- tmp=NULL; ++ puts(tmp ? "non-zero" : "zero"); + ], ac_cv_getservbyname_r_style=solaris, ac_cv_getservbyname_r_style=none) + fi + +@@ -381,11 +385,12 @@ + #ifdef HAVE_STDLIB_H + #include + #endif ++ #include + ],[ + int tmp = getservbyname_r((const char *) 0, (const char *) 0, + (struct servent *) 0, (struct servent_data *) 0); + /* use tmp to suppress the warning */ +- tmp=0; ++ puts(tmp ? "non-zero" : "zero"); + ], ac_cv_getservbyname_r_style=osf1, ac_cv_getservbyname_r_style=none) + fi + ]) +--- apr-1.7.6/build/buildcheck.sh.5 ++++ apr-1.7.6/build/buildcheck.sh +@@ -15,11 +15,11 @@ + echo "buildconf: python version $py_version (ok)" + fi + +-# autoconf 2.59 or newer ++# autoconf 2.61 or newer + ac_version=`${AUTOCONF:-autoconf} --version 2>/dev/null|sed -e 's/^[^0-9]*//;s/[a-z]* *$//;q'` + if test -z "$ac_version"; then + echo "buildconf: autoconf not found." +- echo " You need autoconf version 2.59 or newer installed" ++ echo " You need autoconf version 2.61 or newer installed" + echo " to build APR from SVN." + res=1 + else +--- apr-1.7.6/configure.in.5 ++++ apr-1.7.6/configure.in +@@ -145,12 +145,14 @@ + APR_CROSS_COMPILING=maybe + elif test "x$build_alias" != "x$host_alias"; then + APR_CROSS_COMPILING=yes ++ else ++ APR_CROSS_COMPILING=no + fi + else + APR_CROSS_COMPILING=no + fi +- + AC_SUBST(APR_CROSS_COMPILING) ++AC_MSG_NOTICE([cross-compilation detection: $APR_CROSS_COMPILING]) + + # Libtool might need this symbol -- it must point to the location of + # the generated libtool script (not necessarily the "top" build dir). +@@ -1876,6 +1878,7 @@ + AC_CHECK_TYPE(ssize_t, int) + AC_C_INLINE + AC_C_CONST ++AC_C_VARARRAYS + AC_FUNC_SETPGRP + + APR_CHECK_SOCKLEN_T +@@ -1971,6 +1974,8 @@ + AC_ERROR([could not detect a 64-bit integer type]) + fi + ++AC_MSG_NOTICE([for apr_(u)int64_t using $int64_strfn and ${int64_value}/${uint64_value}]) ++ + # If present, allow the C99 macro INT64_C to override our conversion. + # + # HP-UX's ANSI C compiler provides this without any includes, so we +@@ -2152,7 +2157,6 @@ + aprlfs=0 + fi + +-AC_MSG_CHECKING([which type to use for apr_off_t]) + if test "${ac_cv_sizeof_off_t}${apr_cv_use_lfs64}" = "4yes"; then + # LFS is go! + off_t_fmt='#define APR_OFF_T_FMT APR_INT64_T_FMT' +@@ -2203,7 +2207,7 @@ + off_t_fmt=d + off_t_strfn='strtoi' + fi +-AC_MSG_RESULT($off_t_value) ++AC_MSG_NOTICE([for apr_off_t using $off_t_strfn and $off_t_value]) + + # Regardless of whether _LARGEFILE64_SOURCE is used, on some + # platforms _FILE_OFFSET_BITS will affect the size of ino_t and hence +@@ -2234,7 +2238,7 @@ + fi + ;; + esac +-AC_MSG_NOTICE([using $ino_t_value for ino_t]) ++AC_MSG_NOTICE([for apr_ino_t using $ino_t_value]) + + # Checks for endianness + AC_C_BIGENDIAN +--- apr-1.7.6/poll/unix/poll.c.5 ++++ apr-1.7.6/poll/unix/poll.c +@@ -73,7 +73,7 @@ + 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 + 1]; /* +1 since allocating 0 is undefined behaviour */ + #elif defined(HAVE_ALLOCA) +@@ -130,7 +130,7 @@ + } + } + +-#if !defined(HAVE_VLA) && !defined(HAVE_ALLOCA) ++#if !defined(HAVE_C_VARARRAYS) && !defined(HAVE_ALLOCA) + if (num > SMALL_POLLSET_LIMIT) { + free(pollset); + } diff --git a/apr.spec b/apr.spec index 305a41e..eae3116 100644 --- a/apr.spec +++ b/apr.spec @@ -1,5 +1,7 @@ %define aprver 1 +%bcond tests 1 + # Arches on which the multilib apr.h hack is needed: %define multilib_arches %{ix86} ia64 ppc ppc64 s390 s390x x86_64 @@ -11,25 +13,26 @@ Summary: Apache Portable Runtime library Name: apr -Version: 1.7.2 -Release: 2%{?dist} -# ASL 2.0: everything +Version: 1.7.6 +Release: 4%{?dist} +# Apache-2.0: everything # ISC: network_io/apr-1.4.6/network_io/unix/inet_?to?.c -# BSD with advertising: strings/apr_snprintf.c, strings/apr_fnmatch.c, +# BSD-4-Clause-UC: strings/apr_snprintf.c, strings/apr_fnmatch.c, # include/apr_fnmatch.h, misc/unix/getopt.c, # file_io/unix/mktemp.c, strings/apr_strings.c -# BSD (3-clause): strings/apr_strnatcmp.c, include/apr_strings.h -License: ASL 2.0 and BSD with advertising and ISC and BSD +# Zlib: strings/apr_strnatcmp.c, include/apr_strings.h +# Caldera-no-preamble: strings/apr_snprintf.c +License: Apache-2.0 AND (BSD-4-Clause-UC AND ISC AND Zlib AND Caldera-no-preamble) URL: https://apr.apache.org/ Source0: https://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2 Source1: apr-wrapper.h Patch1: apr-1.7.2-libdir.patch Patch2: apr-1.2.7-pkgconf.patch Patch3: apr-1.7.0-deepbind.patch -Patch4: apr-1.7.2-autoconf.patch -Patch5: apr-1.7.2-r1907541.patch +Patch4: apr-1.7.6-autoconf.patch BuildRequires: gcc, autoconf, libtool, libuuid-devel, python3 BuildRequires: make +BuildRequires: libxcrypt-devel %description The mission of the Apache Portable Runtime (APR) is to provide a @@ -49,29 +52,39 @@ Apache Portable Runtime (APR) is to provide a free library of C data structures and routines. %prep -%setup -q -%patch1 -p1 -b .libdir -%patch2 -p1 -b .pkgconf -%patch3 -p1 -b .deepbind -%patch4 -p1 -b .autoconf-2-71 -%patch5 -p1 -b .r1907541 +%autosetup -p1 -S gendiff %build # regenerate configure script etc. ./buildconf -# Forcibly prevent detection of shm_open (which then picks up but -# does not use -lrt). -export ac_cv_search_shm_open=no - -# Forcibly disable sctp protocol support -export apr_cv_sctp=no - %configure \ --includedir=%{_includedir}/apr-%{aprver} \ --with-installbuilddir=%{_libdir}/apr-%{aprver}/build \ --with-devrandom=/dev/urandom \ - --disable-static + --disable-static \ + --disable-sctp + +# Sanity tests to catch subtle configure script failures: +# +# 1. Fail if apr_strtoi64() is not using libc strtol/strtoll +strfn=`echo XXX APR_INT64_STRFN | cpp -I./include -I./include/arch/unix -include include/arch/unix/apr_private.h \ + | sed -n '/^XXX/{s/XXX //;p;}'` +: APR_INT64_STRFN detected as $strfn +if test "x$strfn" = "x"; then + cat config.log + : configure failed to detect working strtol, bailing. +fi + +# 2. Fail if LFS support isn't present in a 32-bit build, since this +# breaks ABI and the soname doesn't change: see #254241 +if grep 'define SIZEOF_VOIDP 4' include/apr.h \ + && ! grep off64_t include/apr.h; then + cat config.log + : LFS support not present in 32-bit build + exit 1 +fi + %{make_build} %install @@ -110,18 +123,14 @@ for f in build/gen-build.py build/install.sh build/config.*; do done %check -# Fail if LFS support isn't present in a 32-bit build, since this -# breaks ABI and the soname doesn't change: see #254241 -if grep 'define SIZEOF_VOIDP 4' include/apr.h \ - && ! grep off64_t include/apr.h; then - cat config.log - : LFS support not present in 32-bit build - exit 1 -fi +grep ^cross_compiling=no $RPM_BUILD_ROOT%{_bindir}/apr-%{aprver}-config + +%if %{with tests} pushd test make %{?_smp_mflags} ./testall -v -q popd +%endif %ldconfig_scriptlets @@ -144,6 +153,58 @@ popd %{_datadir}/aclocal/*.m4 %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 1.7.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Thu Aug 07 2025 Joe Orton - 1.7.6-3 +- fix APR_TRY_COMPILE_NO_WARNING in apr_common.m4 +- add tests bcond +- move configure sanity tests into build section +- fix cross-compilation detection (#2386875) + +* Wed Jul 23 2025 Fedora Release Engineering - 1.7.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Wed May 28 2025 Joe Orton - 1.7.6-1 +- update to 1.7.6 (#2366842) + +* Sat Feb 01 2025 Björn Esser - 1.7.5-3 +- Add explicit BR: libxcrypt-devel + +* Thu Jan 16 2025 Fedora Release Engineering - 1.7.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Wed Aug 28 2024 Joe Orton - 1.7.5-1 +- update to 1.7.5 (#2307902) + +* Wed Jul 17 2024 Fedora Release Engineering - 1.7.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Thu Feb 8 2024 Joe Orton - 1.7.3-8 +- use autosetup +- always disable SCTP support at build time + +* Mon Jan 29 2024 Fedora Release Engineering - 1.7.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 1.7.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 1.7.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Tue Oct 24 2023 Luboš Uhliarik - 1.7.3-4 +- rebuilt + +* Fri Sep 29 2023 Luboš Uhliarik - 1.7.3-3 +- SPDX migration + +* Wed Jul 19 2023 Fedora Release Engineering - 1.7.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Apr 11 2023 Luboš Uhliarik - 1.7.3-1 +- new version 1.7.3 + * Fri Feb 10 2023 Luboš Uhliarik - 1.7.2-2 - enable apr_atomic test again diff --git a/pullrev.sh b/pullrev.sh new file mode 100755 index 0000000..ec8815d --- /dev/null +++ b/pullrev.sh @@ -0,0 +1,53 @@ +#!/bin/sh -e + +if [ $# -lt 1 ]; then + echo "What?" + exit 1 +fi + +repo="https://svn.apache.org/repos/asf/apr/apr/trunk" +#repo="https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x" +ver=1.7.3 +prefix="apr-${ver}" +suffix="r$1${2:++}" +fn="${prefix}-${suffix}.patch" +vcurl="http://svn.apache.org/viewvc?view=revision&revision=" + +if test -f ${fn}; then + mv -v -f ${fn} ${fn}\~ + echo "# $0 $*" > ${fn} + sed '1{/#.*pullrev/d;};/^--- /,$d' < ${fn}\~ >> ${fn} +else + echo "# $0 $*" > ${fn} +fi + +new=0 +for r in $*; do + if ! grep -q "${vcurl}${r}" ${fn}; then + echo "${vcurl}${r}" + new=1 + fi +done >> ${fn} + +[ $new -eq 0 ] || echo >> ${fn} + +prev=/dev/null +for r in $*; do + echo "+ fetching ${r}" + this=`mktemp /tmp/pullrevXXXXXX` + svn diff -c ${r} ${repo} | filterdiff --remove-timestamps --clean -x 'CHANGES' -x 'next-number' -x 'STATUS' \ + --addprefix="${prefix}/" > ${this} + next=`mktemp /tmp/pullrevXXXXXX` + combinediff --quiet ${prev} ${this} > ${next} + rm -f "${this}" + [ "${prev}" = "/dev/null" ] || rm -f "${prev}" + prev=${next} +done + +cat ${prev} >> ${fn} + +vi "${fn}" +echo "+ git add ${fn}" +git add "${fn}" +echo "+ spec template:" +echo "PatchN: ${fn}" diff --git a/sources b/sources index 8d4c71a..0c31c18 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apr-1.7.2.tar.bz2) = 0a3a27ccc97bbe4865c1bc0b803012e3da6d5b1f17d4fb0da6f5f58eec01f6d2ae1f25e52896ea5f9c5ac04c5fddcfd1ac606b301c322cf40d5c4d4ce0a1b76e +SHA512 (apr-1.7.6.tar.bz2) = 629b60680d1244641828019db903a1b199e8a19c8f27a5132b93faacb381ce561f88463345ab019258f1f1e8cfdf8aa986ac815153a8e7e04a22b3932f9fedd2