.apr.metadata

@@ -1 +0,0 @@
-4f3aa8d8204a2674868b9d485c11349e1848987d SOURCES/apr-1.6.3.tar.bz2

.fmf/version

@@ -0,0 +1 @@
+1

.gitignore

@@ -1 +1,21 @@
-SOURCES/apr-1.6.3.tar.bz2
+apr-1.3.9.tar.bz2
+/apr-1.4.2.tar.bz2
+/*.rpm
+/clog
+/x86_64
+/.build*.log
+/apr-1.4.4.tar.bz2
+/apr-1.4.5.tar.bz2
+/apr-1.4.6.tar.bz2
+/apr-1.4.8.tar.bz2
+/apr-1.5.0.tar.bz2
+/apr-1.5.1.tar.bz2
+/apr-1.5.2.tar.bz2
+/apr-1.6.2.tar.bz2
+/apr-1.6.3.tar.bz2
+/apr-1.6.5.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

SOURCES/apr-1.2.2-locktimeout.patch

@@ -1,11 +0,0 @@
---- apr-1.2.2/test/testlock.c.locktimeout
-+++ apr-1.2.2/test/testlock.c
-@@ -295,7 +295,7 @@
-             continue;
-         }
-         ABTS_INT_EQUAL(tc, 1, APR_STATUS_IS_TIMEUP(s));
--        ABTS_ASSERT(tc, "Timer returned too late", end - begin - timeout < 100000);
-+        ABTS_ASSERT(tc, "Timer returned too late", end - begin - timeout < 500000);
-         break;
-     }
-     ABTS_ASSERT(tc, "Too many retries", i < MAX_RETRY);

SOURCES/apr-1.6.3-r1834495.patch

@@ -1,171 +0,0 @@
-# ./pullrev.sh 1834495
-http://svn.apache.org/viewvc?view=revision&revision=1834495
-
---- apr-1.6.3/buildconf
-+++ apr-1.6.3/buildconf
-@@ -112,8 +112,10 @@
- # Remove autoconf 2.5x's cache directory
- rm -rf autom4te*.cache
- 
-+PYTHON=${PYTHON-`build/PrintPath python3 python2 python`}
-+
- echo "buildconf: generating 'make' outputs ..."
--build/gen-build.py $verbose make
-+${PYTHON} build/gen-build.py $verbose make
- 
- # Create RPM Spec file
- if [ -f `which cut` ]; then
---- apr-1.6.3/build/gen-build.py
-+++ apr-1.6.3/build/gen-build.py
-@@ -10,7 +10,10 @@
- 
- 
- import os
--import ConfigParser
-+try:
-+  import configparser
-+except ImportError:
-+  import ConfigParser as configparser
- import getopt
- import string
- import glob
-@@ -36,7 +39,7 @@
- 
- 
- def main():
--  parser = ConfigParser.ConfigParser()
-+  parser = configparser.ConfigParser()
-   parser.read('build.conf')
- 
-   if parser.has_option('options', 'dsp'):
-@@ -62,7 +65,7 @@
-   # write out the platform-independent files
-   files = get_files(parser.get('options', 'paths'))
-   objects, dirs = write_objects(f, legal_deps, h_deps, files)
--  f.write('\nOBJECTS_all = %s\n\n' % string.join(objects))
-+  f.write('\nOBJECTS_all = %s\n\n' % " ".join(objects))
- 
-   # for each platform and each subdirectory holding platform-specific files,
-   # write out their compilation rules, and an OBJECT_<subdir>_<plat> symbol.
-@@ -86,11 +89,11 @@
-           inherit_files[-1] = inherit_files[-1][:-2] + '.lo'
-           # replace the \\'s with /'s
-           inherit_line = '/'.join(inherit_files)
--          if not inherit_parent.has_key(inherit_files[0]):
-+          if inherit_files[0] not in inherit_parent:
-             inherit_parent[inherit_files[0]] = []
-           inherit_parent[inherit_files[0]].append(inherit_line)
- 
--    for subdir in string.split(parser.get('options', 'platform_dirs')):
-+    for subdir in parser.get('options', 'platform_dirs').split():
-       path = '%s/%s' % (subdir, platform)
-       if not os.path.exists(path):
-         # this subdir doesn't have a subdir for this platform, so we'll
-@@ -106,7 +109,7 @@
-       files = get_files(path + '/*.c')
-       objects, _unused = write_objects(f, legal_deps, h_deps, files)
- 
--      if inherit_parent.has_key(subdir):
-+      if subdir in inherit_parent:
-         objects = objects + inherit_parent[subdir]
- 
-       symname = 'OBJECTS_%s_%s' % (subdir, platform)
-@@ -114,7 +117,7 @@
-       objects.sort()
- 
-       # and write the symbol for the whole group
--      f.write('\n%s = %s\n\n' % (symname, string.join(objects)))
-+      f.write('\n%s = %s\n\n' % (symname, " ".join(objects)))
- 
-       # and include that symbol in the group
-       group.append('$(%s)' % symname)
-@@ -122,18 +125,18 @@
-     group.sort()
- 
-     # write out a symbol which contains the necessary files
--    f.write('OBJECTS_%s = %s\n\n' % (platform, string.join(group)))
-+    f.write('OBJECTS_%s = %s\n\n' % (platform, " ".join(group)))
- 
--  f.write('HEADERS = $(top_srcdir)/%s\n\n' % string.join(headers, ' $(top_srcdir)/'))
--  f.write('SOURCE_DIRS = %s $(EXTRA_SOURCE_DIRS)\n\n' % string.join(dirs.keys()))
-+  f.write('HEADERS = $(top_srcdir)/%s\n\n' % ' $(top_srcdir)/'.join(headers))
-+  f.write('SOURCE_DIRS = %s $(EXTRA_SOURCE_DIRS)\n\n' % " ".join(dirs.keys()))
- 
-   if parser.has_option('options', 'modules'):
-     modules = parser.get('options', 'modules')
- 
--    for mod in string.split(modules):
-+    for mod in modules.split():
-       files = get_files(parser.get(mod, 'paths'))
-       objects, _unused = write_objects(f, legal_deps, h_deps, files)
--      flat_objects = string.join(objects)
-+      flat_objects = " ".join(objects)
-       f.write('OBJECTS_%s = %s\n' % (mod, flat_objects))
- 
-       if parser.has_option(mod, 'target'):
-@@ -153,9 +156,9 @@
-       d = os.path.dirname(d)
- 
-   # Sort so 'foo' is before 'foo/bar'
--  keys = alldirs.keys()
-+  keys = list(alldirs.keys())
-   keys.sort()
--  f.write('BUILD_DIRS = %s\n\n' % string.join(keys))
-+  f.write('BUILD_DIRS = %s\n\n' % " ".join(keys))
- 
-   f.write('.make.dirs: $(srcdir)/build-outputs.mk\n' \
-           '\t@for d in $(BUILD_DIRS); do test -d $$d || mkdir $$d; done\n' \
-@@ -177,12 +180,12 @@
- 
-     # what headers does this file include, along with the implied headers
-     deps = extract_deps(file, legal_deps)
--    for hdr in deps.keys():
-+    for hdr in list(deps.keys()):
-       deps.update(h_deps.get(hdr, {}))
- 
--    vals = deps.values()
-+    vals = list(deps.values())
-     vals.sort()
--    f.write('%s: %s .make.dirs %s\n' % (obj, file, string.join(vals)))
-+    f.write('%s: %s .make.dirs %s\n' % (obj, file, " ".join(vals)))
- 
-   objects.sort()
- 
-@@ -210,7 +213,7 @@
-     for hdr, deps in header_deps.items():
-       # print hdr, deps
-       start = len(deps)
--      for dep in deps.keys():
-+      for dep in list(deps.keys()):
-         deps.update(header_deps.get(dep, {}))
-       if len(deps) != start:
-         altered = 1
-@@ -220,7 +223,7 @@
- 
- def get_files(patterns):
-   files = [ ]
--  for pat in string.split(patterns):
-+  for pat in patterns.split():
-     files.extend(map(clean_path, glob.glob(pat)))
-   files.sort()
-   return files
---- apr-1.6.3/build/buildcheck.sh
-+++ apr-1.6.3/build/buildcheck.sh
-@@ -4,7 +4,7 @@
- res=0
- 
- # any python
--python=`build/PrintPath python`
-+python=${PYTHON-`build/PrintPath python3 python2 python`}
- if test -z "$python"; then
-   echo "buildconf: python not found."
-   echo "           You need python installed"
-@@ -11,7 +11,7 @@
-   echo "           to build APR from SVN."
-   res=1
- else
--  py_version=`python -c 'import sys; print sys.version' 2>&1|sed 's/ .*//;q'`
-+  py_version=`$python -c 'import sys; print(sys.version)' 2>&1|sed 's/ .*//;q'`
-   echo "buildconf: python version $py_version (ok)"
- fi
- 

SOURCES/apr-rh1539844.patch

@@ -1,20 +0,0 @@
-diff -ur apr-1.6.3.orig/test/teststr.c apr-1.6.3/test/teststr.c
---- apr-1.6.3.orig/test/teststr.c	2016-03-03 17:11:16.000000000 +0100
-+++ apr-1.6.3/test/teststr.c	2018-01-29 18:54:44.748931098 +0100
-@@ -307,10 +307,15 @@
-     for (; off < 999999999; off += 999) {
-         apr_strfsize(off, buf);
-     }
--    for (off = 1; off < LONG_MAX && off > 0; off *= 2) {
-+
-+    off = 1;
-+    while (1) {
-         apr_strfsize(off, buf);
-         apr_strfsize(off + 1, buf);
-         apr_strfsize(off - 1, buf);
-+        if (off > LONG_MAX / 2)
-+            break;
-+        off *= 2;
-     }
- 
-     ABTS_ASSERT(tc, "strfsize overflowed", buf[5] == '$');

apr-1.4.6.tar.bz2.asc

@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+iQEVAwUATzGxNnGtyF6eSShKAQIGFwgAlk9BcC/9rLmeMKzhHKJFBzFDcjqy6Sbi
+yZnO8DK2hPVRvcVkz/IxbpmFOa5rXPXrl/50XEkoLtZTF1tfCqQw49U5OvZ668el
+PTNNT6RNyN3SHvSXWCumnndMT1z5S8QDE5KHwzXmI9Hc0c3to78QUi5E/WBI1f8s
+lUMmgZ0hgY3XMcGs2hkPlvojTTP0Cl97rkznkHdKWApoEKIhij544BxTuCqyPvIC
+MH9KScb4MOxVeV5JKTbIoKVaJLPbOZeiHlu3brDeRkA1HrMrL9UE7k1cTpCBof7i
+G9Dd4RyGMrK29apyato/SoHek0jqqlhvQvtC8k40/QBVIFzmUNzirw==
+=J9ns
+-----END PGP SIGNATURE-----

apr-1.7.0-deepbind.patch

@@ -1,8 +1,8 @@
 
 Add $APR_DEEPBIND to enable use of RTLD_DEEPBIND in apr_dso_open().
 
---- apr-1.4.8/dso/unix/dso.c.deepbind
-+++ apr-1.4.8/dso/unix/dso.c
+--- apr-1.7.0/dso/unix/dso.c.deepbind
++++ apr-1.7.0/dso/unix/dso.c
 @@ -38,6 +38,8 @@
  #define DYLD_LIBRARY_HANDLE (void *)-1
  #endif
@@ -18,7 +18,7 @@ Add $APR_DEEPBIND to enable use of RTLD_DEEPBIND in apr_dso_open().
      void *os_handle;
 +
 +    if (use_deepbind == 0)
-+        use_deepbind = getenv("APR_DEEPBIND") != NULL ? 1 : -1;
++        use_deepbind = secure_getenv("APR_DEEPBIND") != NULL ? 1 : -1;
 +    if (use_deepbind == 1)
 +        flags |= RTLD_DEEPBIND;
 +

apr-1.7.2-autoconf.patch

@@ -0,0 +1,21 @@
+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])

apr-1.7.2-libdir.patch

@@ -1,9 +1,8 @@
-
-- avoid adding %{_libdir} to --link-ld output
-
---- apr-1.2.2/apr-config.in.libdir
-+++ apr-1.2.2/apr-config.in
-@@ -181,8 +181,10 @@
+diff --git a/apr-config.in b/apr-config.in
+index bed47ca..d4bf4d8 100644
+--- a/apr-config.in
++++ b/apr-config.in
+@@ -198,8 +198,10 @@ while test $# -gt 0; do
      ;;
      --link-ld)
      if test "$location" = "installed"; then
@@ -13,6 +12,6 @@
 +            flags="$flags -L$libdir"
 +        fi
 +        flags="$flags -l${APR_LIBNAME}"
+     elif test "$location" = "crosscompile"; then
+         flags="$flags -L$APR_TARGET_DIR/$libdir -l${APR_LIBNAME}"
      else
-         ### this surely can't work since the library is in .libs?
-         flags="$flags -L$APR_BUILD_DIR -l${APR_LIBNAME}"

apr.spec

@@ -3,30 +3,35 @@
 # Arches on which the multilib apr.h hack is needed:
 %define multilib_arches %{ix86} ia64 ppc ppc64 s390 s390x x86_64
 
+# Similar issue to https://bugzilla.redhat.com/show_bug.cgi?id=2043092
+%undefine _package_note_flags
+
+# Disable .la file removal since the .la file is exported via apr-config.
+%global __brp_remove_la_files %nil
+
 Summary: Apache Portable Runtime library
 Name: apr
-Version: 1.6.3
-Release: 12%{?dist}
-# ASL 2.0: everything
+Version: 1.7.5
+Release: 2%{?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
-Group: System Environment/Libraries
-URL: http://apr.apache.org/
-Source0: http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2
+# 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.6.3-r1834495.patch
-Patch2: apr-1.2.2-locktimeout.patch
-Patch3: apr-1.2.2-libdir.patch
-Patch4: apr-1.2.7-pkgconf.patch
-Patch5: apr-rh1539844.patch
-Patch6: apr-1.4.8-deepbind.patch
-BuildRequires: gcc, autoconf, libtool, libuuid-devel, python3-devel
-# To enable SCTP support
-BuildRequires: lksctp-tools-devel
+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
+BuildRequires: gcc, autoconf, libtool, libuuid-devel, python3
+BuildRequires: make
 
 %description
 The mission of the Apache Portable Runtime (APR) is to provide a
@@ -35,7 +40,6 @@ portability layer to as many operating systems as possible,
 including Unices, MS Win32, BeOS and OS/2.
 
 %package devel
-Group: Development/Libraries
 Summary: APR library development kit
 Conflicts: subversion-devel < 0.20.1-2
 Requires: apr = %{version}-%{release}, pkgconfig
@@ -47,34 +51,28 @@ Apache Portable Runtime (APR) is to provide a free library of
 C data structures and routines.
 
 %prep
-%setup -q
-%patch1 -p1 -b .r1834495
-%patch2 -p1 -b .locktimeout
-%patch3 -p1 -b .libdir
-%patch4 -p1 -b .pkgconf
-%patch5 -p1 -b .rh1539844
-%patch6 -p1 -b .deepbind
+%autosetup -p1
 
 %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
-
 %configure \
         --includedir=%{_includedir}/apr-%{aprver} \
         --with-installbuilddir=%{_libdir}/apr-%{aprver}/build \
-        --with-devrandom=/dev/urandom
-make %{?_smp_mflags}
+        --with-devrandom=/dev/urandom \
+        --disable-static \
+        --disable-sctp
+%{make_build}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+%{make_install}
 
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/aclocal
-install -m 644 build/find_apr.m4 $RPM_BUILD_ROOT/%{_datadir}/aclocal
+for f in find_apr.m4 apr_common.m4; do
+ install -p -m 644 build/$f $RPM_BUILD_ROOT/%{_datadir}/aclocal
+done
 
 # Trim exported dependecies
 sed -ri '/^dependency_libs/{s,-l(uuid|crypt) ,,g}' \
@@ -116,21 +114,17 @@ pushd test
   ./testall -v -q
 popd
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets
 
 %files
-%defattr(-,root,root,-)
 %doc CHANGES LICENSE NOTICE README*
 %{_libdir}/libapr-%{aprver}.so.*
 
 %files devel
-%defattr(-,root,root,-)
 %doc docs/APRDesign.html docs/canonical_filenames.html
 %doc docs/incomplete_types docs/non_apr_programs
 %{_bindir}/apr-%{aprver}-config
-%{_libdir}/libapr-%{aprver}.*a
+%{_libdir}/libapr-%{aprver}.la
 %{_libdir}/libapr-%{aprver}.so
 %{_libdir}/pkgconfig/*.pc
 %dir %{_libdir}/apr-%{aprver}
@@ -141,17 +135,124 @@ popd
 %{_datadir}/aclocal/*.m4
 
 %changelog
-* Wed Jun 23 2021 Joe Orton <jorton@redhat.com> - 1.6.3-12
-- document $APR_DEEPBIND env var (#1886222)
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.7.5-2
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
 
-* Thu Jun 11 2020 Joe Orton <jorton@redhat.com> - 1.6.3-11
-- only enable RTLD_DEEPBIND if $APR_DEEPBIND is set in env (#1845912)
+* Mon Sep 02 2024 Luboš Uhliarik <luhliari@redhat.com> - 1.7.5-1
+- new version 1.7.5
+- Resolves: RHEL-56637 - apr: Lax permissions in Apache Portable Runtime shared
+  memory (CVE-2023-49582)
 
-* Thu May 28 2020 Joe Orton <jorton@redhat.com> - 1.6.3-10
-- use RTLD_DEEPBIND in apr_dso_open() (#1819607)
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.7.3-10
+- Bump release for June 2024 mass rebuild
 
-* Fri Feb  1 2019 Joe Orton <jorton@redhat.com> - 1.6.3-9
-- package install.sh, gen-build.py and config.* in -devel (#1669589)
+* Thu Feb  8 2024 Joe Orton <jorton@redhat.com> - 1.7.3-8
+- use autosetup
+- always disable SCTP support at build time
+
+* Mon Jan 29 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.3-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.3-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.3-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Tue Oct 24 2023 Luboš Uhliarik <luhliari@redhat.com> - 1.7.3-4
+- rebuilt
+
+* Fri Sep 29 2023 Luboš Uhliarik <luhliari@redhat.com> - 1.7.3-3
+- SPDX migration
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue Apr 11 2023 Luboš Uhliarik <luhliari@redhat.com> - 1.7.3-1
+- new version 1.7.3
+
+* Fri Feb 10 2023 Luboš Uhliarik <luhliari@redhat.com> - 1.7.2-2
+- enable apr_atomic test again
+
+* Thu Feb 02 2023 Luboš Uhliarik <luhliari@redhat.com> - 1.7.2-1
+- new version 1.7.2
+
+* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Mon Jan 16 2023 Florian Weimer <fweimer@redhat.com> - 1.7.0-20
+- Port configure script to C99
+
+* Mon Dec 19 2022 Joe Orton <jorton@redhat.com> - 1.7.0-19
+- rebuild
+
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Fri May 13 2022 Joe Orton <jorton@redhat.com> - 1.7.0-17
+- ship apr_common.m4 in -devel as well
+- disable .la file removal
+
+* Fri Jan 28 2022 Joe Orton <jorton@redhat.com> - 1.7.0-16
+- disable package notes
+
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Tue Aug 24 2021 Luboš Uhliarik <luhliari@redhat.com> - 1.7.0-14
+- Resolves: #1996685 - add various Coverity/Clang cleanups
+
+* Wed Aug 04 2021 Luboš Uhliarik <luhliari@redhat.com> - 1.7.0-13
+- disable sctp protocol support by default
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri Jun 18 2021 Joe Orton <jorton@redhat.com> - 1.7.0-11
+- package additional build/* files in apr-devel (#1945078)
+
+* Fri Jun 18 2021 Joe Orton <jorton@redhat.com> - 1.7.0-10
+- document APR_DEEPBIND and use secure_getenv() (thanks to mturk)
+
+* Mon Apr 12 2021 Lubos Uhliarik <luhliari@redhat.com> - 1.7.0-9
+- Resolves: #1942985 - apr: FTBFS with upcoming autoconf-2.71
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Fri Nov  6 2020 Joe Orton <jorton@redhat.com> - 1.7.0-7
+- disable static build in libtool
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jun 16 2020 Joe Orton <jorton@redhat.com> - 1.7.0-5
+- only enable RTLD_DEEPBIND if $APR_DEEPBIND is set
+
+* Wed Mar  4 2020 Joe Orton <jorton@redhat.com> - 1.7.0-4
+- re-enable RTLD_DEEPBIND (#1739287)
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Tue Apr 16 2019 Lubos Uhliarik <luhliari@redhat.com> - 1.7.0-1
+- update to 1.7.0 (#1696401)
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Mon Jan 14 2019 Björn Esser <besser82@fedoraproject.org> - 1.6.5-2
+- Rebuilt for libcrypt.so.2 (#1666033)
+
+* Mon Sep 17 2018 Joe Orton <jorton@redhat.com> - 1.6.5-1
+- update to 1.6.5 (#1628934)
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.3-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
 * Wed Jun 27 2018 Joe Orton <jorton@redhat.com> - 1.6.3-8
 - update to use Python 3 at build time

ci.fmf

@@ -0,0 +1 @@
+resultsdb-testcase: separate

gating.yaml

@@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-*
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}

mirrors

@@ -0,0 +1 @@
+http://www.apache.org/dist/apr/

plans/tier1-internal.fmf

@@ -0,0 +1,10 @@
+summary: Internal Tier1 beakerlib tests
+discover:
+    how: fmf
+    url: https://gitlab.com/redhat/rhel/tests/apr
+    filter: "tier:1"
+execute:
+    how: tmt
+adjust:
+    enabled: false
+    when: distro == centos-stream-10

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}"

sources

@@ -0,0 +1 @@
+SHA512 (apr-1.7.5.tar.bz2) = d8a7553642da0c81261ac3992536efd9d43ecb9154934ef1a10ae808d6a3ce8198b40433091d3a6d04f61e67c59426fb5276193a37e810ae4bc74a8a10fb651b

upstream

@@ -0,0 +1 @@
+apr-1.2.8.tar.gz