!8 update to 1.7.0

Merge pull request !8 from morn/master

Merge-r1834494-from-trunk.patch

@@ -1,170 +0,0 @@
-This is an upstream patch from: http://svn.apache.org/viewvc?view=revision&revision=1834495
-
---- 1.7.x/buildconf	2018/06/27 11:41:30	1834494
-+++ 1.7.x/buildconf	2018/06/27 11:49:33	1834495
-@@ -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
---- 1.7.x/build/gen-build.py	2018/06/27 11:41:30	1834494
-+++ 1.7.x/build/gen-build.py	2018/06/27 11:49:33	1834495
-@@ -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
---- 1.7.x/build/buildcheck.sh	2018/06/27 11:41:30	1834494
-+++ 1.7.x/build/buildcheck.sh	2018/06/27 11:49:33	1834495
-@@ -4,14 +4,14 @@
- 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"
-   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
- 
- 

apr.spec

@@ -1,8 +1,8 @@
 %define aprver 1
 
 Name: apr
-Version: 1.6.5
+Version: 1.7.0
-Release: 6
+Release: 1
 Summary: Apache Portable Runtime.
 License: ASL 2.0 and BSD with advertising and ISC and BSD
 URL: http://apr.apache.org
@@ -11,11 +11,9 @@ Source1: apr-wrapper.h
 
 Patch0: apr-1.2.2-libdir.patch
 Patch1: apr-1.2.7-pkgconf.patch
-Patch2: Merge-r1834494-from-trunk.patch
+Patch2: Split-apr_pool_check_integrity-into-two-parts.patch
-Patch3: test-testlock.c-test_timeoutcond-Increase-fudge-fact.patch
+Patch3: Pool-debugging-fixes.patch
-Patch4: Split-apr_pool_check_integrity-into-two-parts.patch
+Patch4: Fix-pool-debugging-output-so-that-creation-events-ar.patch
-Patch5: Pool-debugging-fixes.patch
-Patch6: Fix-pool-debugging-output-so-that-creation-events-ar.patch
 
 BuildRequires: gcc autoconf libtool libuuid-devel python3 lksctp-tools-devel
 
@@ -99,6 +97,12 @@ make check
 %doc docs/incomplete_types docs/non_apr_programs
 
 %changelog
+* Thu Jul 23 2020 liuchenguang<liuchenguang4@huawei.com> - 1.7.0-1
+- Type: enhancement
+- ID: NA
+- SUG: NA
+- DESC: update to 1.7.0
+
 * Tue Jul 14 2020 linwei<linwei54@huawei.com> - 1.6.5-6
 - Type: bugfix
 - ID: NA

test-testlock.c-test_timeoutcond-Increase-fudge-fact.patch

@@ -1,28 +0,0 @@
-From d6d48ddd4c3a5ef04749475ed75d26330a3e0dc6 Mon Sep 17 00:00:00 2001
-From: Joe Orton <jorton@apache.org>
-Date: Tue, 19 Sep 2017 16:38:40 +0000
-Subject: [PATCH] * test/testlock.c (test_timeoutcond): Increase fudge factor
- in   checking timeout precision; 100ms failed regularly in Fedora builds,  
- 500ms has Never Failed(TM).
-
-git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1808910 13f79535-47bb-0310-9956-ffa450edef68
----
- test/testlock.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/testlock.c b/test/testlock.c
-index 40da791b7..cd48768ca 100644
---- a/test/testlock.c
-+++ b/test/testlock.c
-@@ -334,7 +334,7 @@ static void test_timeoutcond(abts_case *tc, void *data)
-             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);
--- 
-2.19.1
-