Commit Graph

19 Commits

Author SHA1 Message Date
zhouganqing 4679de11c8 changed debian/source/format to native 2023-01-16 15:55:45 +08:00
Yann Ylavic 844777a15f build/apr_common.m4: avoid explicit inclusion of "confdefs.h"
Origin: 0a763c5e50

The failure is observed on `autoconf-2.69d` (soon to be released
as `autoconf-2.70`). There `int64_t` detection fails as:

$ autoreconf && ./configure
checking whether int64_t and int use fmt %d... no
checking whether int64_t and long use fmt %ld... no
checking whether int64_t and long long use fmt %lld... no
configure: error: could not determine the string function for int64_t
```

This happens because `./configure` always stumbles on warning:

configure:3350: gcc -c -g -O2 -Werror  conftest.c >&5
In file included from conftest.c:31:
confdefs.h:22: error: "__STDC_WANT_IEC_60559_ATTRIBS_EXT__" redefined [-Werror]
   22 | #define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1
      |

It's triggered by double inclusion of `"confdefs.h"` contents:
explicitly in `APR_TRY_COMPILE_NO_WARNING` macro and implicitly
via `AC_LANG_SOURCE` use.

To fix it and avoid having to define `main()` declaration the change
uses `AC_LANG_PROGRAM` instead.

Tested on both `autoconf-2.69` and `autoconf-2.69d`.


Github: closes #25
Submitted by: Sergei Trofimovich <slyfox gentoo.org>
Reviewed by: ylavic


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1887279 13f79535-47bb-0310-9956-ffa450edef68

Gbp-Pq: Name build-apr_common.m4-avoid-explicit-inclusion-of-conf.patch
2023-01-16 15:55:45 +08:00
OpenKylin Developers 699ce709af SECURITY: CVE-2021-35940 (cve.mitre.org)
Origin: upstream, https://svn.apache.org/viewvc?view=revision&revision=1891198
Bug-Debian: https://bugs.debian.org/992789
Forwarded: not-needed
Last-Update: 2021-08-20

Restore fix for CVE-2017-12613 which was missing in 1.7.x branch, though
was addressed in 1.6.x in 1.6.3 and later via r1807976.

The fix was merged back to 1.7.x in r1891198.

Since this was a regression in 1.7.0, a new CVE name has been assigned
to track this, CVE-2021-35940.

Gbp-Pq: Name CVE-2021-35940.patch
2023-01-16 15:55:45 +08:00
OpenKylin Developers 1871ed3f97 generic-64bit-atomics
# quick and dirty fix for FTBFS on mipsel
# There should be a proper configure check, see 
# https://bz.apache.org/bugzilla/show_bug.cgi?id=63566

Gbp-Pq: Name generic-64bit-atomics.patch
2023-01-16 15:55:44 +08:00
OpenKylin Developers e65583f8c1 python3-hashbang
Gbp-Pq: Name python3-hashbang.patch
2023-01-16 15:55:44 +08:00
Helmut Grohne d770ab0143 compile gen_test_char with the build architecture compiler
Gbp-Pq: Name cross.patch
2023-01-16 15:55:44 +08:00
OpenKylin Developers 6d00dacec9 use_fcntl_locking
# use flock for apr_file_lock/_unlock()
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=752872

Gbp-Pq: Name use_fcntl_locking.patch
2023-01-16 15:55:44 +08:00
OpenKylin Developers e38fe5e8a6 debug_testpoll_failure
# reproducible.debian.net gave strange test error on build:
#   testpoll            :  Line 876: apr_pollcb_poll() didn't sleep

# reproducible.debian.net gave strange test error on build:
#   testpoll            :  Line 876: apr_pollcb_poll() didn't sleep
#   FAILED 1 of 23
# add some debug output

Gbp-Pq: Name debug_testpoll_failure.patch
2023-01-16 15:55:44 +08:00
Helmut Grohne 5fd373d77a check for libtoolize rather than libtool
Last-Update: 2014-09-19

libtool is now in package libtool-bin, but apr only needs libtoolize.


Gbp-Pq: Name libtoolize_check.patch
2023-01-16 15:55:44 +08:00
OpenKylin Developers c64139833a dont_override_external_buildflags
# Don't force apr-using projects to use the compile flags used during
# apr's compilation.

Gbp-Pq: Name dont_override_external_buildflags
2023-01-16 15:55:44 +08:00
Pino Toscano 467fb8c407 hurd_shm_flock
Bug: #656880

# * hurd_shm_flock.diff
# This patch disables all the methods for shared memory and file locking
# found by the configure checks, forcing the only working ones.
# This patch should stay Debian-specific, as it is not that suitable for
# upstream inclusion. (As you can guess, ideally all of those
# non-working methods should be ideally fixed in Hurd...)


Gbp-Pq: Name hurd_shm_flock.patch
2023-01-16 15:55:44 +08:00
Stefan Fritsch ddae25897d #463399
Gbp-Pq: Name omit_extra_libs.patch
2023-01-16 15:55:44 +08:00
Stefan Fritsch 24f49db0b9 Fix generation of docs for out-of-tree builds and newer doxygen versions
Gbp-Pq: Name fix_doxygen.patch
2023-01-16 15:55:44 +08:00
Stefan Fritsch 61fa846bf0 #349418
Gbp-Pq: Name hurd_path_max.patch
2023-01-16 15:55:44 +08:00
tfheen@debian.org fc568588c9 No description.
Gbp-Pq: Name fix-apr.pc.patch
2023-01-16 15:55:44 +08:00
Tollef Fog Heen d0adca284b Install a set of random build files too
Gbp-Pq: Name ship_find_apr.m4.patch
2023-01-16 15:55:44 +08:00
tfheen@debian.org 62e3e057d5 No description.
Gbp-Pq: Name fix_apr-config.patch
2023-01-16 15:55:44 +08:00
zhouganqing d65dbd0880 Import Debian changes 1.7.0-ok1
apr (1.7.0-ok1) yangtze; urgency=medium

  * Build for openKylin.
2023-01-16 15:55:43 +08:00
zhouganqing d53211a001 Import Upstream version 1.7.0 2023-01-16 15:55:43 +08:00