Import Debian changes 1.7.0-ok1

apr (1.7.0-ok1) yangtze; urgency=medium

  * Build for openKylin.
This commit is contained in:
zhouganqing 2023-01-16 15:43:24 +08:00
parent d53211a001
commit d65dbd0880
37 changed files with 1611 additions and 0 deletions

92
debian/apr-1-config.1 vendored Normal file
View File

@ -0,0 +1,92 @@
.TH APR-1-CONFIG "1" "March 2006" "apr-1-config 1.2.2" "User Commands"
.SH NAME
apr-1-config \- Return metainformation about apr library
.SH SYNOPSIS
.B apr-1-config
[\fIOPTION\fR]
.SH DESCRIPTION
The
.I apr-1-config
program is used to retrieve information about the
.I apr
library in the system. It is typically used to compile
and link against the library.
.PP
When linking with libtool, an application should do something like:
.IP
APR_LIBS="`apr\-1\-config \fB\-\-link\-libtool\fR \fB\-\-libs\fR`"
.PP
or when linking directly:
.IP
APR_LIBS="`apr\-1\-config \fB\-\-link\-ld\fR \fB\-\-libs\fR`"
.PP
An application should use the results of \fB\-\-cflags\fR, \fB\-\-cppflags\fR, \fB\-\-includes\fR,
and \fB\-\-ldflags\fR in their build process.
.SH OPTIONS
Known values for OPTION are:
.TP
\fB\-\-prefix\fR[=\fIDIR\fR]
change prefix to DIR
.TP
\fB\-\-bindir\fR
print location where binaries are installed
.TP
\fB\-\-includedir\fR
print location where headers are installed
.TP
\fB\-\-cc\fR
print C compiler name
.TP
\fB\-\-cpp\fR
print C preprocessor name and any required options
.TP
\fB\-\-cflags\fR
print C compiler flags
.TP
\fB\-\-cppflags\fR
print C preprocessor flags
.TP
\fB\-\-includes\fR
print include information
.TP
\fB\-\-ldflags\fR
print linker flags
.TP
\fB\-\-libs\fR
print additional libraries to link against
.TP
\fB\-\-srcdir\fR
print APR source directory
.HP
\fB\-\-installbuilddir\fR print APR build helper directory
.TP
\fB\-\-link\-ld\fR
print link switch(es) for linking to APR
.TP
\fB\-\-link\-libtool\fR
print the libtool inputs for linking to APR
.TP
\fB\-\-shlib\-path\-var\fR
print the name of the shared library path env var
.TP
\fB\-\-apr\-la\-file\fR
print the path to the .la file, if available
.TP
\fB\-\-apr\-so\-ext\fR
print the extensions of shared objects on this platform
.TP
\fB\-\-apr\-lib\-target\fR
print the libtool target information
.TP
\fB\-\-apr\-libtool\fR
print the path to APR's libtool
.TP
\fB\-\-version\fR
print the APR's version as a dotted triple
.TP
\fB\-\-help\fR
print the help
.SH AUTHOR
This manual page was written by Vincent Danjean
<Vincent.Danjean@ens-lyon.org> for the Debian project (but may be used
by others).

5
debian/changelog vendored Normal file
View File

@ -0,0 +1,5 @@
apr (1.7.0-ok1) yangtze; urgency=medium
* Build for openKylin.
-- zhouganqing <zhouganqing@kylinos.cn> Mon, 16 Jan 2023 15:43:24 +0800

41
debian/control vendored Normal file
View File

@ -0,0 +1,41 @@
Source: apr
Section: libs
Priority: optional
Maintainer: OpenKylin Developers <packaging@lists.openkylin.top>
Build-Depends: debhelper-compat (= 12),
autoconf,
mawk,
uuid-dev,
doxygen,
netbase <!nocheck>,
net-tools <!nocheck>,
libtool (>= 2),
python3:any,
libsctp-dev [linux-any]
Standards-Version: 4.5.1
Vcs-Browser: https://gitee.com/openkylin/apr
Vcs-Git: https://gitee.com/openkylin/apr.git
Homepage: https://apr.apache.org/
Package: libapr1
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
Conflicts: libapr1.0
Description: Apache Portable Runtime Library
APR is Apache's Portable Runtime Library, designed to be a support library
that provides a predictable and consistent interface to underlying
platform-specific implementations.
Package: libapr1-dev
Architecture: any
Section: libdevel
Depends: libapr1 (= ${binary:Version}), uuid-dev, ${misc:Depends}, libsctp-dev [linux-any], python3:any
Conflicts: libapr1.0-dev, libapr0-dev
Description: Apache Portable Runtime Library - Development Headers
APR is Apache's Portable Runtime Library, designed to be a support library
that provides a predictable and consistent interface to underlying
platform-specific implementations.
.
This package contains development headers for APR.

141
debian/copyright vendored Normal file
View File

@ -0,0 +1,141 @@
This package was debianized by Thom May <thom@debian.org> on
Wed, 17 Nov 2004 11:27:14 -0800
It was downloaded from https://httpd.apache.org/download.cgi
Upstream Authors: The Apache Software Foundation - https://apr.apache.org/
Copyright:
Licensed to the Apache Software Foundation (ASF) under one or more contributor
license agreements. The ASF licenses this work to You under the Apache License,
Version 2.0 (the "License"); you may not use this work except in compliance
with the License. You may obtain a copy of the License at
https://www.apache.org/licenses/LICENSE-2.0
On a Debian system, the license can be found at
/usr/share/common-licenses/Apache-2.0 .
APACHE PORTABLE RUNTIME SUBCOMPONENTS:
The Apache Portable Runtime includes a number of subcomponents with
separate copyright notices and license terms. Your use of the source
code for the these subcomponents is subject to the terms and
conditions of the following licenses.
From strings/apr_fnmatch.c, include/apr_fnmatch.h, misc/unix/getopt.c,
file_io/unix/mktemp.c, strings/apr_strings.c:
/*
* Copyright (c) 1987, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
From network_io/unix/inet_ntop.c, network_io/unix/inet_pton.c:
/* Copyright (c) 1996 by Internet Software Consortium.
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
* ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
* CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
* DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
* PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
* ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
* SOFTWARE.
From dso/aix/dso.c:
* Based on libdl (dlfcn.c/dlfcn.h) which is
* Copyright (c) 1992,1993,1995,1996,1997,1988
* Jens-Uwe Mager, Helios Software GmbH, Hannover, Germany.
*
* Not derived from licensed software.
*
* Permission is granted to freely use, copy, modify, and redistribute
* this software, provided that the author is not construed to be liable
* for any results of using the software, alterations are clearly marked
* as such, and this notice is not modified.
From strings/apr_strnatcmp.c, include/apr_strings.h:
strnatcmp.c -- Perform 'natural order' comparisons of strings in C.
Copyright (C) 2000 by Martin Pool <mbp@humbug.org.au>
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
From test/CuTest.c, test/CuTest.h:
* Copyright (c) 2002-2006 Asim Jalis
*
* This library is released under the zlib/libpng license as described at
*
* https://www.opensource.org/licenses/zlib-license.html
*
* Here is the statement of the license:
*
* This software is provided 'as-is', without any express or implied warranty.
* In no event will the authors be held liable for any damages arising from
* the use of this software.
*
* Permission is granted to anyone to use this software for any purpose,
* including commercial applications, and to alter it and redistribute it
* freely, subject to the following restrictions:
*
* 1. The origin of this software must not be misrepresented; you must not
* claim that you wrote the original software. If you use this software in a
* product, an acknowledgment in the product documentation would be
* appreciated but is not required.
*
* 2. Altered source versions must be plainly marked as such, and must not be
* misrepresented as being the original software.
*
* 3. This notice may not be removed or altered from any source distribution.

1
debian/libapr1-dbg.docs vendored Normal file
View File

@ -0,0 +1 @@
NOTICE

1
debian/libapr1-dev.docs vendored Normal file
View File

@ -0,0 +1 @@
NOTICE

9
debian/libapr1-dev.install vendored Normal file
View File

@ -0,0 +1,9 @@
usr/include/apr-1.0
usr/lib/*/libapr*a
usr/lib/*/libapr-1.so
usr/lib/*/pkgconfig
usr/bin
usr/share/apr-1.0
build/find_apr.m4 usr/share/apr-1.0/build
build/apr_common.m4 usr/share/apr-1.0/build
debian/build/docs/dox/html usr/share/doc/libapr1-dev

2
debian/libapr1-dev.links vendored Normal file
View File

@ -0,0 +1,2 @@
usr/bin/apr-1-config usr/bin/apr-config
usr/share/man/man1/apr-1-config.1 usr/share/man/man1/apr-config.1

1
debian/libapr1-dev.manpages vendored Normal file
View File

@ -0,0 +1 @@
debian/apr-1-config.1

1
debian/libapr1.docs vendored Normal file
View File

@ -0,0 +1 @@
NOTICE

1
debian/libapr1.install vendored Normal file
View File

@ -0,0 +1 @@
usr/lib/*/libapr-1.so.*

1
debian/libapr1.lintian-overrides vendored Normal file
View File

@ -0,0 +1 @@
libapr1: package-name-doesnt-match-sonames libapr-1-0

2
debian/libapr1.symbols vendored Normal file
View File

@ -0,0 +1,2 @@
here for the purpose of tricking debhelper...bwahahahaha.

47
debian/patches/CVE-2021-35940.patch vendored Normal file
View File

@ -0,0 +1,47 @@
Description: SECURITY: CVE-2021-35940 (cve.mitre.org)
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.
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
--- a/time/unix/time.c
+++ b/time/unix/time.c
@@ -142,6 +142,9 @@ APR_DECLARE(apr_status_t) apr_time_exp_g
static const int dayoffset[12] =
{306, 337, 0, 31, 61, 92, 122, 153, 184, 214, 245, 275};
+ if (xt->tm_mon < 0 || xt->tm_mon >= 12)
+ return APR_EBADDATE;
+
/* shift new year to 1st March in order to make leap year calc easy */
if (xt->tm_mon < 2)
--- a/time/win32/time.c
+++ b/time/win32/time.c
@@ -54,6 +54,9 @@ static void SystemTimeToAprExpTime(apr_t
static const int dayoffset[12] =
{0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334};
+ if (tm->wMonth < 1 || tm->wMonth > 12)
+ return APR_EBADDATE;
+
/* Note; the caller is responsible for filling in detailed tm_usec,
* tm_gmtoff and tm_isdst data when applicable.
*/
@@ -228,6 +231,9 @@ APR_DECLARE(apr_status_t) apr_time_exp_g
static const int dayoffset[12] =
{306, 337, 0, 31, 61, 92, 122, 153, 184, 214, 245, 275};
+ if (xt->tm_mon < 0 || xt->tm_mon >= 12)
+ return APR_EBADDATE;
+
/* shift new year to 1st March in order to make leap year calc easy */
if (xt->tm_mon < 2)

View File

@ -0,0 +1,66 @@
From: Yann Ylavic <ylavic@apache.org>
Date: Sat, 6 Mar 2021 22:20:59 +0000
Subject: build/apr_common.m4: avoid explicit inclusion of "confdefs.h"
Origin: https://github.com/apache/apr/commit/0a763c5e500f4304b7c534fae0fad430d64982e8
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
---
build/apr_common.m4 | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/build/apr_common.m4 b/build/apr_common.m4
index 3dfe85542b76..67d004983d2b 100644
--- a/build/apr_common.m4
+++ b/build/apr_common.m4
@@ -467,13 +467,9 @@ AC_DEFUN([APR_TRY_COMPILE_NO_WARNING],
CFLAGS="$CFLAGS -Werror"
fi
AC_COMPILE_IFELSE(
- [AC_LANG_SOURCE(
- [#include "confdefs.h"
- ]
- [[$1]]
- [int main(int argc, const char *const *argv) {]
+ [AC_LANG_PROGRAM(
+ [[$1]],
[[$2]]
- [ return 0; }]
)], [CFLAGS=$apr_save_CFLAGS
$3], [CFLAGS=$apr_save_CFLAGS
$4])
--
2.33.0

37
debian/patches/cross.patch vendored Normal file
View File

@ -0,0 +1,37 @@
From: Helmut Grohne <helmut@subdivi.de>
Subject: compile gen_test_char with the build architecture compiler
--- apr.orig/Makefile.in
+++ apr/Makefile.in
@@ -8,6 +8,7 @@ top_blddir=@apr_builddir@
# APR (Apache Portable Runtime) library Makefile.
#
CPP = @CPP@
+CC_FOR_BUILD ?= cc
# get substituted into some targets
APR_MAJOR_VERSION=@APR_MAJOR_VERSION@
@@ -46,7 +47,6 @@ LT_VERSION = @LT_VERSION@
CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.c .make.dirs \
build/apr_rules.out tools/gen_test_char@EXEEXT@ \
- tools/gen_test_char.o tools/gen_test_char.lo \
include/private/apr_escape_test_char.h
DISTCLEAN_TARGETS = config.cache config.log config.status \
include/apr.h include/arch/unix/apr_private.h \
@@ -140,13 +140,9 @@ check: $(TARGET_LIB)
etags:
etags `find . -name '*.[ch]'`
-OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS)
-tools/gen_test_char.lo: tools/gen_test_char.c
+tools/gen_test_char@EXEEXT@: tools/gen_test_char.c
$(APR_MKDIR) tools
- $(LT_COMPILE)
-
-tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char)
- $(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS)
+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o $@ $<
include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@
$(APR_MKDIR) include/private

View File

@ -0,0 +1,16 @@
# 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
--- apr.orig/test/testpoll.c
+++ apr/test/testpoll.c
@@ -908,6 +908,9 @@ static void justsleep(abts_case *tc, voi
rv = apr_pollcb_poll(pollcb, apr_time_from_msec(200), NULL, NULL);
t2 = apr_time_now();
ABTS_INT_EQUAL(tc, 1, APR_STATUS_IS_TIMEUP(rv));
+ if ((t2 - t1) <= apr_time_from_msec(100))
+ abts_log_message("pollset method: %d t1: %ld t2: %ld rv: %d\n",
+ i, (long)t1, (long)t2, rv);
ABTS_ASSERT(tc,
"apr_pollcb_poll() didn't sleep",
(t2 - t1) > apr_time_from_msec(100));

View File

@ -0,0 +1,19 @@
# Don't force apr-using projects to use the compile flags used during
# apr's compilation.
--- apr.orig/build/apr_rules.mk.in
+++ apr/build/apr_rules.mk.in
@@ -41,10 +41,10 @@ LIBTOOL=@LIBTOOL@
# compilation and linking flags that are supposed to be set only by the user.
# configure adds to them for tests, but we restore them at the end.
#
-CFLAGS=@CFLAGS@
-CPPFLAGS=@CPPFLAGS@
-LDFLAGS=@LDFLAGS@
-LIBS=@LIBS@
+CFLAGS?=@CFLAGS@
+CPPFLAGS?=@CPPFLAGS@
+LDFLAGS?=@LDFLAGS@
+LIBS?=@LIBS@
DEFS=@DEFS@
# anything added to the standard flags by configure is moved to EXTRA_*

20
debian/patches/fix-apr.pc.patch vendored Normal file
View File

@ -0,0 +1,20 @@
From: <tfheen@debian.org>
Subject: No description.
---
apr.pc.in | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
Index: apr/apr.pc.in
===================================================================
--- apr.orig/apr.pc.in
+++ apr/apr.pc.in
@@ -7,5 +7,6 @@
Name: APR
Description: The Apache Portable Runtime library
Version: @APR_DOTTED_VERSION@
-Libs: -L${libdir} -l@APR_LIBNAME@ @EXTRA_LIBS@
-Cflags: @EXTRA_CPPFLAGS@ @EXTRA_CFLAGS@ -I${includedir}
+Libs: -L${libdir} -l@APR_LIBNAME@
+Libs.private: @EXTRA_LIBS@
+Cflags: @EXTRA_CPPFLAGS@ -I${includedir}

33
debian/patches/fix_apr-config.patch vendored Normal file
View File

@ -0,0 +1,33 @@
From: <tfheen@debian.org>
Subject: No description.
---
apr-config.in | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
Index: apr/apr-config.in
===================================================================
--- apr.orig/apr-config.in
+++ apr/apr-config.in
@@ -39,7 +39,7 @@
LIBS="@EXTRA_LIBS@"
EXTRA_INCLUDES="@EXTRA_INCLUDES@"
SHLIBPATH_VAR="@shlibpath_var@"
-APR_SOURCE_DIR="@apr_srcdir@"
+APR_SOURCE_DIR="$(cd @installbuilddir@/.. ; pwd)"
APR_BUILD_DIR="@apr_builddir@"
APR_SO_EXT="@so_ext@"
APR_LIB_TARGET="@export_lib_target@"
@@ -223,11 +223,7 @@
exit 0
;;
--apr-libtool)
- if test "$location" = "installed"; then
- echo "${installbuilddir}/libtool"
- else
- echo "$APR_BUILD_DIR/libtool"
- fi
+ echo "$installbuilddir/libtool"
exit 0
;;
--help)

69
debian/patches/fix_doxygen.patch vendored Normal file
View File

@ -0,0 +1,69 @@
From: Stefan Fritsch <sf@debian.org>
Subject: Fix generation of docs for out-of-tree builds and newer doxygen versions
---
docs/doxygen.conf | 2 +-
include/apr.h.in | 24 ++++++++++++------------
2 files changed, 13 insertions(+), 13 deletions(-)
--- apr.orig/docs/doxygen.conf
+++ apr/docs/doxygen.conf
@@ -1,6 +1,6 @@
PROJECT_NAME="Apache Portable Runtime"
-INPUT=.
+INPUT=../../include include
QUIET=YES
RECURSIVE=YES
FILE_PATTERNS=*.h
--- apr.orig/include/apr.h.in
+++ apr/include/apr.h.in
@@ -464,11 +464,11 @@ typedef apr_uint32_t apr_uin
/**
* Thread callbacks from APR functions must be declared with APR_THREAD_FUNC,
* so that they follow the platform's calling convention.
- * <PRE>
- *
+ */
+/**
+ * @code
* void* APR_THREAD_FUNC my_thread_entry_fn(apr_thread_t *thd, void *data);
- *
- * </PRE>
+ * @endcode
*/
#define APR_THREAD_FUNC @apr_thread_func@
@@ -502,11 +502,11 @@ typedef apr_uint32_t apr_uin
* APR_DECLARE_NONSTD(), as they must follow the C language calling convention.
* @see APR_DECLARE @see APR_DECLARE_DATA
* @remark Both the declaration and implementations must use the same macro.
- * <PRE>
- *
+ */
+/**
+ * @code
* APR_DECLARE_NONSTD(rettype) apr_func(args, ...);
- *
- * </PRE>
+ * @endcode
*/
#define APR_DECLARE_NONSTD(type) type
@@ -517,12 +517,12 @@ typedef apr_uint32_t apr_uin
* @remark Note that the declaration and implementations use different forms,
* but both must include the macro.
*
- * <PRE>
- *
+ */
+/**
+ * @code
* extern APR_DECLARE_DATA type apr_variable;\n
* APR_DECLARE_DATA type apr_variable = value;
- *
- * </PRE>
+ * @endcode
*/
#define APR_DECLARE_DATA

View File

@ -0,0 +1,46 @@
# 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
Index: apr-1.7.0/include/arch/unix/apr_arch_atomic.h
===================================================================
--- apr-1.7.0.orig/include/arch/unix/apr_arch_atomic.h
+++ apr-1.7.0/include/arch/unix/apr_arch_atomic.h
@@ -26,6 +26,9 @@
/* noop */
#elif HAVE_ATOMIC_BUILTINS
# define USE_ATOMICS_BUILTINS
+# if (__INTPTR_WIDTH__ == 32) && ( defined(__MIPSEL__) || defined(__powerpc__) ) || defined(__m68k__) || defined(__sh__)
+# define NEED_ATOMICS_GENERIC64
+# endif
#elif defined(SOLARIS2) && SOLARIS2 >= 10
# define USE_ATOMICS_SOLARIS
# define NEED_ATOMICS_GENERIC64
Index: apr-1.7.0/atomic/unix/builtins64.c
===================================================================
--- apr-1.7.0.orig/atomic/unix/builtins64.c
+++ apr-1.7.0/atomic/unix/builtins64.c
@@ -16,7 +16,7 @@
#include "apr_arch_atomic.h"
-#ifdef USE_ATOMICS_BUILTINS
+#if defined(USE_ATOMICS_BUILTINS) && ! defined(NEED_ATOMICS_GENERIC64)
APR_DECLARE(apr_uint64_t) apr_atomic_read64(volatile apr_uint64_t *mem)
{
Index: apr-1.7.0/atomic/unix/builtins.c
===================================================================
--- apr-1.7.0.orig/atomic/unix/builtins.c
+++ apr-1.7.0/atomic/unix/builtins.c
@@ -20,7 +20,11 @@
APR_DECLARE(apr_status_t) apr_atomic_init(apr_pool_t *p)
{
+#if defined (NEED_ATOMICS_GENERIC64)
+ return apr__atomic_generic64_init(p);
+#else
return APR_SUCCESS;
+#endif
}
APR_DECLARE(apr_uint32_t) apr_atomic_read32(volatile apr_uint32_t *mem)

19
debian/patches/hurd_path_max.patch vendored Normal file
View File

@ -0,0 +1,19 @@
From: Stefan Fritsch <sf@debian.org>
Subject: #349418
---
include/apr.h.in | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- apr.orig/include/apr.h.in
+++ apr/include/apr.h.in
@@ -629,7 +629,8 @@ typedef int apr_wait_t;
#elif defined(_POSIX_PATH_MAX)
#define APR_PATH_MAX _POSIX_PATH_MAX
#else
-#error no decision has been made on APR_PATH_MAX for your platform
+#warning no decision has been made on APR_PATH_MAX for your platform
+#define APR_PATH_MAX 4096
#endif
#define APR_DSOPATH "@shlibpath_var@"

53
debian/patches/hurd_shm_flock.patch vendored Normal file
View File

@ -0,0 +1,53 @@
From: Pino Toscano <pino@debian.org>
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...)
--- apr.orig/configure.in
+++ apr/configure.in
@@ -1253,6 +1253,13 @@ case $host in
APR_DECISION_OVERRIDE(USE_SHMEM_SHMGET_ANON)
;;
esac
+case $host_os in
+ gnu* )
+ haveshmgetanon="0"
+ havemmapanon="0"
+ APR_DECISION_OVERRIDE(USE_SHMEM_MMAP_ZERO)
+ ;;
+esac
APR_END_DECISION
AC_DEFINE_UNQUOTED($ac_decision)
@@ -1326,6 +1333,13 @@ case $host in
fi
;;
esac
+case $host_os in
+ gnu* )
+ havemmapshm="0"
+ haveshmget="0"
+ APR_DECISION_OVERRIDE(USE_SHMEM_MMAP_TMP)
+ ;;
+esac
APR_END_DECISION
AC_DEFINE_UNQUOTED($ac_decision)
@@ -2381,6 +2395,12 @@ esac
if test "x$apr_lock_method" != "x"; then
APR_DECISION_FORCE($apr_lock_method)
fi
+case $host_os in
+ gnu* )
+ hasfcntlser="0"
+ APR_DECISION_OVERRIDE(USE_FLOCK_SERIALIZE)
+ ;;
+esac
APR_END_DECISION
AC_DEFINE_UNQUOTED($ac_decision)

24
debian/patches/libtoolize_check.patch vendored Normal file
View File

@ -0,0 +1,24 @@
From: Helmut Grohne <helmut@subdivi.de>
Subject: check for libtoolize rather than libtool
Last-Update: 2014-09-19
libtool is now in package libtool-bin, but apr only needs libtoolize.
--- apr.orig/build/buildcheck.sh
+++ apr/build/buildcheck.sh
@@ -39,11 +39,11 @@ fi
# ltmain.sh (GNU libtool 1.1361 2004/01/02 23:10:52) 1.5a
# output is multiline from 1.5 onwards
-# Require libtool 1.4 or newer
-libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14`
-lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
+# Require libtoolize 1.4 or newer
+libtoolize=`build/PrintPath glibtoolize1 glibtoolize libtoolize libtoolize15 libtoolize14`
+lt_pversion=`$libtoolize --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
if test -z "$lt_pversion"; then
- echo "buildconf: libtool not found."
+ echo "buildconf: libtoolize not found."
echo " You need libtool version 1.4 or newer installed"
echo " to build APR from SVN."
res=1

18
debian/patches/omit_extra_libs.patch vendored Normal file
View File

@ -0,0 +1,18 @@
From: Stefan Fritsch <sf@debian.org>
Subject: #463399
---
apr-config.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- apr.orig/apr-config.in
+++ apr/apr-config.in
@@ -36,7 +36,7 @@ SHELL="@SHELL@"
CPPFLAGS="@EXTRA_CPPFLAGS@"
CFLAGS="@EXTRA_CFLAGS@"
LDFLAGS="@EXTRA_LDFLAGS@"
-LIBS="@EXTRA_LIBS@"
+LIBS=""
EXTRA_INCLUDES="@EXTRA_INCLUDES@"
SHLIBPATH_VAR="@shlibpath_var@"
APR_SOURCE_DIR="$(cd @installbuilddir@/.. ; pwd)"

8
debian/patches/python3-hashbang.patch vendored Normal file
View File

@ -0,0 +1,8 @@
--- apr.orig/build/gen-build.py
+++ apr/build/gen-build.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
#
# USAGE: gen-build.py TYPE
#

16
debian/patches/series vendored Normal file
View File

@ -0,0 +1,16 @@
fix_apr-config.patch
ship_find_apr.m4.patch
fix-apr.pc.patch
hurd_path_max.patch
fix_doxygen.patch
omit_extra_libs.patch
hurd_shm_flock.patch
dont_override_external_buildflags
libtoolize_check.patch
debug_testpoll_failure.patch
use_fcntl_locking.patch
cross.patch
python3-hashbang.patch
generic-64bit-atomics.patch
CVE-2021-35940.patch
build-apr_common.m4-avoid-explicit-inclusion-of-conf.patch

25
debian/patches/ship_find_apr.m4.patch vendored Normal file
View File

@ -0,0 +1,25 @@
From: Tollef Fog Heen <tfheen@err.no>
Subject: Install a set of random build files too
---
Makefile.in | 9 +++++++++
1 file changed, 9 insertions(+)
--- apr.orig/Makefile.in
+++ apr/Makefile.in
@@ -94,6 +94,15 @@ install: $(TARGETS)
done
$(INSTALL_DATA) build/apr_rules.out $(DESTDIR)$(installbuilddir)/apr_rules.mk
$(INSTALL) -m 755 apr-config.out $(DESTDIR)$(bindir)/$(APR_CONFIG)
+
+ if [ ! -d $(DESTDIR)$(installbuilddir) ]; then \
+ $(top_srcdir)/build/mkdir.sh $(DESTDIR)$(installbuilddir); \
+ fi
+ for file in install.sh gen-build.py get-version.sh ; do \
+ $(LIBTOOL) --mode=install cp $(top_srcdir)/build/$$file \
+ $(DESTDIR)$(installbuilddir)/$$file ; \
+ done
+
@if [ $(INSTALL_SUBDIRS) != "none" ]; then \
for i in $(INSTALL_SUBDIRS); do \
( cd $$i ; $(MAKE) DESTDIR=$(DESTDIR) install ); \

22
debian/patches/use_fcntl_locking.patch vendored Normal file
View File

@ -0,0 +1,22 @@
# use flock for apr_file_lock/_unlock()
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=752872
--- apr.orig/file_io/unix/flock.c
+++ apr/file_io/unix/flock.c
@@ -27,7 +27,7 @@ APR_DECLARE(apr_status_t) apr_file_lock(
{
int rc;
-#if defined(HAVE_FCNTL_H)
+#if 0 && defined(HAVE_FCNTL_H)
{
struct flock l = { 0 };
int fc;
@@ -86,7 +86,7 @@ APR_DECLARE(apr_status_t) apr_file_unloc
{
int rc;
-#if defined(HAVE_FCNTL_H)
+#if 0 && defined(HAVE_FCNTL_H)
{
struct flock l = { 0 };

171
debian/rules vendored Executable file
View File

@ -0,0 +1,171 @@
#!/usr/bin/make -f
#export DH_VERBOSE=1
SHELL=/bin/bash
BUILDDIR := debian/build
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
DEB_HOST_ARCH_BITS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_BITS)
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
# The 'build' target needs special handling because there there is a directory
# named 'build'.
.PHONY: build
# The build target must not be empty. Sadly because of how make
# works, we have do duplicate the target in this case.
build:
dh $@ -B$(BUILDDIR)
%:
dh $@ -B$(BUILDDIR)
#
# configure
#
CONFFLAGS := LTFLAGS=--no-silent \
--host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) \
--enable-layout=Debian \
--includedir=/usr/include/apr-1.0 \
--with-installbuilddir=/usr/share/apr-1.0/build \
--libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
--enable-nonportable-atomics \
--enable-allocator-uses-mmap \
ac_cv_prog_AWK=mawk
# apr_cv_mutex_robust_shared causes hangs in procmutex test on arm(el|hf) and alpha
ifneq (,$(findstring armel,$(DEB_HOST_ARCH)))
CONFFLAGS += apr_cv_mutex_robust_shared=no
endif
ifneq (,$(findstring armhf,$(DEB_HOST_ARCH)))
CONFFLAGS += apr_cv_mutex_robust_shared=no
endif
ifneq (,$(findstring alpha,$(DEB_HOST_ARCH)))
CONFFLAGS += apr_cv_mutex_robust_shared=no
endif
# SH4 cannot use proc_pthread.
ifneq (,$(findstring sh4,$(DEB_HOST_ARCH)))
CONFFLAGS += apr_cv_hasprocpthreadser=no ac_cv_define_PTHREAD_PROCESS_SHARED=no
endif
# multicast not supported on Hurd
ifeq (hurd,$(DEB_HOST_ARCH_OS))
CONFFLAGS += apr_cv_struct_ipmreq=no
endif
# some minimal cross-building support
ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
ifeq ($(DEB_HOST_ARCH_OS),linux)
CONFFLAGS += ac_cv_file__dev_zero=yes \
ac_cv_func_setpgrp_void=yes \
apr_cv_epoll=yes \
ac_cv_struct_rlimit=yes \
apr_cv_tcp_nodelay_with_cork=yes \
apr_cv_process_shared_works=yes
endif
ifeq ($(DEB_HOST_ARCH_BITS),32)
CONFFLAGS += ac_cv_sizeof_struct_iovec=8
else ifeq ($(DEB_HOST_ARCH_BITS),64)
CONFFLAGS += ac_cv_sizeof_struct_iovec=16
endif
endif
# Set several variables to make build reproducible even when built on
# usrmerge system
CONFFLAGS += SED=/bin/sed
CONFFLAGS += GREP=/bin/grep
CONFFLAGS += EGREP="/bin/grep -E"
CONFFLAGS += FGREP="/bin/grep -F"
CONFFLAGS += ac_cv_path_lt_DD=/bin/dd
override_dh_autoreconf:
LC_ALL=C dh_autoreconf ./buildconf
override_dh_auto_configure:
mkdir -p $(BUILDDIR)/docs
# We need to force the use of bash here. Otherwise, if apr is built with
# /bin/sh -> /bin/bash, the resulting libtool will not work on systems
# where /bin/sh -> /bin/dash.
cd $(BUILDDIR) && CONFIG_SHELL=/bin/bash /bin/bash $(CURDIR)/configure $(CONFFLAGS)
ifeq (linux,$(DEB_HOST_ARCH_OS))
if grep -q APR_HAS_POSIXSEM_SERIALIZE.*0 $(BUILDDIR)/include/apr.h ;\
then \
echo "WARNING: This is Linux but configure did not detect POSIX semaphores." ;\
if ! df /dev/shm/.|grep -q ^tmpfs ;\
then \
echo "ERROR: POSIX semaphores not usable and /dev/shm not mounted." ;\
echo "ERROR: Aborting." ;\
echo "HINT: If you are using pbuilder or cowbuilder, add /dev/shm to BINDMOUNTS" ;\
echo "HINT: in pbuilderrc" ;\
exit 1 ;\
fi ;\
fi
endif
#
# build
#
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
NUMJOBS := $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
endif
override_dh_auto_build:
$(MAKE) -j$(NUMJOBS) -C $(BUILDDIR) all dox
find debian/build/docs/dox/html -name \*.md5 -delete
#
# test
#
ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
# the testsockets test will fail on vservers (no 127.0.0.1) or if ipv6 is
# enabled in the kernel but not configured on any interface
IGNORE_TESTSOCK = $(shell IGN=false; \
/sbin/ifconfig|grep -q 127.0.0.1 || IGN=true; \
grep -q ipv6 /proc/net/protocols && ( /sbin/ifconfig|grep -q inet6 || IGN=true ) ; \
echo $$IGN )
IGNORE_TESTSOCK = true
override_dh_auto_test:
$(MAKE) -C $(BUILDDIR)/test -j$(NUMJOBS) all
cd $(BUILDDIR)/test && ./testall -v testsockets testsock || $(IGNORE_TESTSOCK)
cd $(BUILDDIR)/test && ( ulimit -S -s 8192 ; ./testall -v testatomic)
cd $(BUILDDIR)/test && ./testall -v -x testsockets testsock testatomic
else
override_dh_auto_test:
endif
#
# install
#
override_dh_auto_install:
dh_auto_install --destdir=debian/tmp
perl -p -i -e "s,^dependency_libs=.*,dependency_libs=''," debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libapr-1.la
# Remove hostname to make build reproducible
perl -p -i -e 's/Libtool was configured on host.*//' debian/tmp/usr/share/apr-1.0/build/libtool
# Replace variable build path with BUILDDIR
perl -p -i -e "s,$(CURDIR),BUILDDIR/," debian/tmp/usr/bin/apr-1-config
perl -p -i -e "s,$(CURDIR),BUILDDIR/," debian/tmp/usr/share/apr-1.0/build/apr_rules.mk
perl -p -i -e "s,$(CURDIR),BUILDDIR/," debian/tmp/usr/share/apr-1.0/build/libtool
if ! head -n 1 debian/tmp/usr/share/apr-1.0/build/libtool | grep -q /bin/bash ; then \
echo ERROR: The built libtool uses /bin/sh instead of /bin/bash ; \
exit 1 ; \
fi
override_dh_strip:
dh_strip --dbgsym-migration='libapr1-dbg (<< 1.7.0-4~)'
override_dh_makeshlibs:
dh_makeshlibs -- -Idebian/symbols.$(DEB_HOST_ARCH_OS)
override_dh_auto_clean:
dh_auto_clean
rm -rf $(BUILDDIR)

1
debian/source/format vendored Normal file
View File

@ -0,0 +1 @@
3.0 (quilt)

591
debian/symbols.common vendored Normal file
View File

@ -0,0 +1,591 @@
libapr-1.so.0 libapr1 #MINVER#
apr__SHA256_Data@Base 1.2.7
apr__SHA256_End@Base 1.2.7
apr__SHA256_Final@Base 1.2.7
apr__SHA256_Init@Base 1.2.7
apr__SHA256_Transform@Base 1.2.7
apr__SHA256_Update@Base 1.2.7
apr_allocator_align@Base 1.6.2
apr_allocator_alloc@Base 1.2.7
apr_allocator_create@Base 1.2.7
apr_allocator_destroy@Base 1.2.7
apr_allocator_free@Base 1.2.7
apr_allocator_max_free_set@Base 1.2.7
apr_allocator_mutex_get@Base 1.2.7
apr_allocator_mutex_set@Base 1.2.7
apr_allocator_owner_get@Base 1.2.7
apr_allocator_owner_set@Base 1.2.7
apr_app_initialize@Base 1.2.7
apr_array_append@Base 1.2.7
apr_array_cat@Base 1.2.7
apr_array_clear@Base 1.3.2
apr_array_copy@Base 1.2.7
apr_array_copy_hdr@Base 1.2.7
apr_array_make@Base 1.2.7
apr_array_pop@Base 1.2.7
apr_array_pstrcat@Base 1.2.7
apr_array_push@Base 1.2.7
apr_atoi64@Base 1.2.7
apr_atomic_add32@Base 1.2.7
apr_atomic_add64@Base 1.7.0
apr_atomic_cas32@Base 1.2.7
apr_atomic_cas64@Base 1.7.0
apr_atomic_casptr@Base 1.2.7
apr_atomic_dec32@Base 1.2.7
apr_atomic_dec64@Base 1.7.0
apr_atomic_inc32@Base 1.2.7
apr_atomic_inc64@Base 1.7.0
apr_atomic_init@Base 1.2.7
apr_atomic_read32@Base 1.2.7
apr_atomic_read64@Base 1.7.0
apr_atomic_set32@Base 1.2.7
apr_atomic_set64@Base 1.7.0
apr_atomic_sub32@Base 1.2.7
apr_atomic_sub64@Base 1.7.0
apr_atomic_xchg32@Base 1.2.7
apr_atomic_xchg64@Base 1.7.0
apr_atomic_xchgptr@Base 1.3.2
apr_collapse_spaces@Base 1.2.7
apr_cpystrn@Base 1.2.7
apr_crypto_sha256_new@Base 1.2.7
apr_cstr_atoi64@Base 1.6.2
apr_cstr_atoi@Base 1.6.2
apr_cstr_atoui64@Base 1.6.2
apr_cstr_atoui@Base 1.6.2
apr_cstr_casecmp@Base 1.6.2
apr_cstr_casecmpn@Base 1.6.2
apr_cstr_count_newlines@Base 1.6.2
apr_cstr_match_glob_list@Base 1.6.2
apr_cstr_match_list@Base 1.6.2
apr_cstr_skip_prefix@Base 1.6.2
apr_cstr_split@Base 1.6.2
apr_cstr_split_append@Base 1.6.2
apr_cstr_strtoi64@Base 1.6.2
apr_cstr_strtoui64@Base 1.6.2
apr_cstr_tokenize@Base 1.6.2
apr_ctime@Base 1.2.7
apr_day_snames@Base 1.2.7
apr_decode_base16@Base 1.7.0
apr_decode_base16_binary@Base 1.7.0
apr_decode_base32@Base 1.7.0
apr_decode_base32_binary@Base 1.7.0
apr_decode_base64@Base 1.7.0
apr_decode_base64_binary@Base 1.7.0
apr_dir_close@Base 1.2.7
apr_dir_make@Base 1.2.7
apr_dir_make_recursive@Base 1.2.7
apr_dir_open@Base 1.2.7
apr_dir_read@Base 1.2.7
apr_dir_remove@Base 1.2.7
apr_dir_rewind@Base 1.2.7
apr_dso_error@Base 1.2.7
apr_dso_load@Base 1.2.7
apr_dso_sym@Base 1.2.7
apr_dso_unload@Base 1.2.7
apr_encode_base16@Base 1.7.0
apr_encode_base16_binary@Base 1.7.0
apr_encode_base32@Base 1.7.0
apr_encode_base32_binary@Base 1.7.0
apr_encode_base64@Base 1.7.0
apr_encode_base64_binary@Base 1.7.0
apr_env_delete@Base 1.2.7
apr_env_get@Base 1.2.7
apr_env_set@Base 1.2.7
apr_escape_echo@Base 1.5.0
apr_escape_entity@Base 1.5.0
apr_escape_hex@Base 1.5.0
apr_escape_ldap@Base 1.6.2
apr_escape_path@Base 1.5.0
apr_escape_path_segment@Base 1.5.0
apr_escape_shell@Base 1.5.0
apr_escape_urlencoded@Base 1.5.0
apr_file_append@Base 1.2.7
apr_file_attrs_set@Base 1.2.7
apr_file_buffer_set@Base 1.3.2
apr_file_buffer_size_get@Base 1.3.2
apr_file_close@Base 1.2.7
apr_file_copy@Base 1.2.7
apr_file_data_get@Base 1.2.7
apr_file_data_set@Base 1.2.7
apr_file_datasync@Base 1.4.2
apr_file_dup2@Base 1.2.7
apr_file_dup@Base 1.2.7
apr_file_eof@Base 1.2.7
apr_file_flags_get@Base 1.2.7
apr_file_flush@Base 1.2.7
apr_file_flush_locked@Base 1.2.11
apr_file_getc@Base 1.2.7
apr_file_gets@Base 1.2.7
apr_file_info_get@Base 1.2.7
apr_file_info_get_locked@Base 1.2.11
apr_file_inherit_set@Base 1.2.7
apr_file_inherit_unset@Base 1.2.7
apr_file_link@Base 1.4.2
apr_file_lock@Base 1.2.7
apr_file_mktemp@Base 1.2.7
apr_file_mtime_set@Base 1.2.7
apr_file_name_get@Base 1.2.7
apr_file_namedpipe_create@Base 1.2.7
apr_file_open@Base 1.2.7
apr_file_open_flags_stderr@Base 1.3.2
apr_file_open_flags_stdin@Base 1.3.2
apr_file_open_flags_stdout@Base 1.3.2
apr_file_open_stderr@Base 1.2.7
apr_file_open_stdin@Base 1.2.7
apr_file_open_stdout@Base 1.2.7
apr_file_perms_set@Base 1.2.7
apr_file_pipe_create@Base 1.2.7
apr_file_pipe_create_ex@Base 1.3.2
apr_file_pipe_create_pools@Base 1.6.2
apr_file_pipe_timeout_get@Base 1.2.7
apr_file_pipe_timeout_set@Base 1.2.7
apr_file_pool_get@Base 1.2.7
apr_file_printf@Base 1.2.7
apr_file_putc@Base 1.2.7
apr_file_puts@Base 1.2.7
apr_file_read@Base 1.2.7
apr_file_read_full@Base 1.2.7
apr_file_remove@Base 1.2.7
apr_file_rename@Base 1.2.7
apr_file_seek@Base 1.2.7
apr_file_setaside@Base 1.2.7
apr_file_sync@Base 1.4.2
apr_file_trunc@Base 1.2.7
apr_file_ungetc@Base 1.2.7
apr_file_unlock@Base 1.2.7
apr_file_write@Base 1.2.7
apr_file_write_full@Base 1.2.7
apr_file_writev@Base 1.2.7
apr_file_writev_full@Base 1.2.7
apr_filepath_encoding@Base 1.2.7
apr_filepath_get@Base 1.2.7
apr_filepath_list_merge@Base 1.2.7
apr_filepath_list_merge_impl@Base 1.2.7
apr_filepath_list_split@Base 1.2.7
apr_filepath_list_split_impl@Base 1.2.7
apr_filepath_merge@Base 1.2.7
apr_filepath_name_get@Base 1.2.7
apr_filepath_root@Base 1.2.7
apr_filepath_set@Base 1.2.7
apr_fnmatch@Base 1.2.7
apr_fnmatch_test@Base 1.2.7
apr_generate_random_bytes@Base 1.2.7
apr_gethostname@Base 1.2.7
apr_getnameinfo@Base 1.2.7
apr_getopt@Base 1.2.7
apr_getopt_init@Base 1.2.7
apr_getopt_long@Base 1.2.7
apr_getservbyname@Base 1.2.7
apr_gid_get@Base 1.2.7
apr_gid_name_get@Base 1.2.7
apr_global_mutex_child_init@Base 1.2.7
apr_global_mutex_create@Base 1.2.7
apr_global_mutex_destroy@Base 1.2.7
apr_global_mutex_lock@Base 1.2.7
apr_global_mutex_lockfile@Base 1.4.2
apr_global_mutex_mech@Base 1.6.2
apr_global_mutex_name@Base 1.4.2
apr_global_mutex_perms_set@Base 1.6.2
apr_global_mutex_pool_get@Base 1.2.7
apr_global_mutex_timedlock@Base 1.7.0
apr_global_mutex_trylock@Base 1.2.7
apr_global_mutex_unlock@Base 1.2.7
apr_hash_clear@Base 1.3.2
apr_hash_copy@Base 1.2.7
apr_hash_count@Base 1.2.7
apr_hash_do@Base 1.4.2
apr_hash_first@Base 1.2.7
apr_hash_get@Base 1.2.7
apr_hash_make@Base 1.2.7
apr_hash_make_custom@Base 1.2.7
apr_hash_merge@Base 1.2.7
apr_hash_next@Base 1.2.7
apr_hash_overlay@Base 1.2.7
apr_hash_pool_get@Base 1.2.7
apr_hash_set@Base 1.2.7
apr_hash_this@Base 1.2.7
apr_hash_this_key@Base 1.5.0
apr_hash_this_key_len@Base 1.5.0
apr_hash_this_val@Base 1.5.0
apr_hashfunc_default@Base 1.2.7
apr_inet_ntop@Base 1.2.7
apr_inet_pton@Base 1.2.7
apr_initialize@Base 1.2.7
apr_ipsubnet_create@Base 1.2.7
apr_ipsubnet_test@Base 1.2.7
apr_is_empty_array@Base 1.2.7
apr_is_empty_table@Base 1.2.7
apr_itoa@Base 1.2.7
apr_ltoa@Base 1.2.7
apr_match_glob@Base 1.2.7
apr_mcast_hops@Base 1.2.7
apr_mcast_interface@Base 1.2.7
apr_mcast_join@Base 1.2.7
apr_mcast_leave@Base 1.2.7
apr_mcast_loopback@Base 1.2.7
apr_mmap_create@Base 1.2.7
apr_mmap_delete@Base 1.2.7
apr_mmap_dup@Base 1.2.7
apr_mmap_offset@Base 1.2.7
apr_month_snames@Base 1.2.7
apr_off_t_toa@Base 1.2.7
apr_os_default_encoding@Base 1.2.7
apr_os_dir_get@Base 1.2.7
apr_os_dir_put@Base 1.2.7
apr_os_dso_handle_get@Base 1.2.7
apr_os_dso_handle_put@Base 1.2.7
apr_os_exp_time_get@Base 1.2.7
apr_os_exp_time_put@Base 1.2.7
apr_os_file_get@Base 1.2.7
apr_os_file_put@Base 1.2.7
apr_os_global_mutex_get@Base 1.2.7
apr_os_imp_time_get@Base 1.2.7
apr_os_imp_time_put@Base 1.2.7
apr_os_locale_encoding@Base 1.2.7
apr_os_pipe_put@Base 1.2.7
apr_os_pipe_put_ex@Base 1.2.7
apr_os_proc_mutex_get@Base 1.2.7
apr_os_proc_mutex_get_ex@Base 1.6.2
apr_os_proc_mutex_put@Base 1.2.7
apr_os_proc_mutex_put_ex@Base 1.6.2
apr_os_shm_get@Base 1.2.7
apr_os_shm_put@Base 1.2.7
apr_os_sock_get@Base 1.2.7
apr_os_sock_make@Base 1.2.7
apr_os_sock_put@Base 1.2.7
apr_os_thread_current@Base 1.2.7
apr_os_thread_equal@Base 1.2.7
apr_os_thread_get@Base 1.2.7
apr_os_thread_put@Base 1.2.7
apr_os_threadkey_get@Base 1.2.7
apr_os_threadkey_put@Base 1.2.7
apr_os_uuid_get@Base 1.2.7
apr_palloc@Base 1.2.7
apr_palloc_debug@Base 1.2.7
apr_parse_addr_port@Base 1.2.7
apr_password_get@Base 1.2.7
apr_pcalloc@Base 1.2.7
apr_pcalloc_debug@Base 1.2.7
apr_pdecode_base16@Base 1.7.0
apr_pdecode_base16_binary@Base 1.7.0
apr_pdecode_base32@Base 1.7.0
apr_pdecode_base32_binary@Base 1.7.0
apr_pdecode_base64@Base 1.7.0
apr_pdecode_base64_binary@Base 1.7.0
apr_pencode_base16@Base 1.7.0
apr_pencode_base16_binary@Base 1.7.0
apr_pencode_base32@Base 1.7.0
apr_pencode_base32_binary@Base 1.7.0
apr_pencode_base64@Base 1.7.0
apr_pencode_base64_binary@Base 1.7.0
apr_pescape_echo@Base 1.5.0
apr_pescape_entity@Base 1.5.0
apr_pescape_hex@Base 1.5.0
apr_pescape_ldap@Base 1.6.2
apr_pescape_path@Base 1.5.0
apr_pescape_path_segment@Base 1.5.0
apr_pescape_shell@Base 1.5.0
apr_pescape_urlencoded@Base 1.5.0
apr_pmemdup@Base 1.2.7
apr_poll@Base 1.2.7
apr_poll_close_wakeup_pipe@Base 1.6.2
apr_poll_create_wakeup_pipe@Base 1.6.2
apr_poll_drain_wakeup_pipe@Base 1.6.2
apr_poll_method_defname@Base 1.4.2
apr_pollcb_add@Base 1.3.2
apr_pollcb_create@Base 1.3.2
apr_pollcb_create_ex@Base 1.4.2
apr_pollcb_method_name@Base 1.6.2
apr_pollcb_poll@Base 1.3.2
apr_pollcb_provider_poll@Base 1.4.2
apr_pollcb_remove@Base 1.3.2
apr_pollcb_wakeup@Base 1.6.2
apr_pollset_add@Base 1.2.7
apr_pollset_create@Base 1.2.7
apr_pollset_create_ex@Base 1.4.2
apr_pollset_destroy@Base 1.2.7
apr_pollset_method_name@Base 1.4.2
apr_pollset_poll@Base 1.2.7
apr_pollset_provider_poll@Base 1.4.2
apr_pollset_provider_select@Base 1.4.2
apr_pollset_remove@Base 1.2.7
apr_pollset_wakeup@Base 1.4.2
apr_pool_abort_get@Base 1.2.7
apr_pool_abort_set@Base 1.2.7
apr_pool_allocator_get@Base 1.2.7
apr_pool_child_cleanup_set@Base 1.2.7
apr_pool_cleanup_for_exec@Base 1.2.7
apr_pool_cleanup_kill@Base 1.2.7
apr_pool_cleanup_null@Base 1.2.7
apr_pool_cleanup_register@Base 1.2.7
apr_pool_cleanup_run@Base 1.2.7
apr_pool_clear@Base 1.2.7
apr_pool_clear_debug@Base 1.2.7
apr_pool_create_core_ex@Base 1.3.2
apr_pool_create_core_ex_debug@Base 1.3.2
apr_pool_create_ex@Base 1.2.7
apr_pool_create_ex_debug@Base 1.2.7
apr_pool_create_unmanaged_ex@Base 1.3.3
apr_pool_create_unmanaged_ex_debug@Base 1.3.3
apr_pool_destroy@Base 1.2.7
apr_pool_destroy_debug@Base 1.2.7
apr_pool_initialize@Base 1.2.7
apr_pool_is_ancestor@Base 1.2.7
apr_pool_note_subprocess@Base 1.2.7
apr_pool_parent_get@Base 1.2.7
apr_pool_pre_cleanup_register@Base 1.3.2
apr_pool_tag@Base 1.2.7
apr_pool_terminate@Base 1.2.7
apr_pool_userdata_get@Base 1.2.7
apr_pool_userdata_set@Base 1.2.7
apr_pool_userdata_setn@Base 1.2.7
apr_proc_create@Base 1.2.7
apr_proc_detach@Base 1.2.7
apr_proc_fork@Base 1.2.7
apr_proc_kill@Base 1.2.7
apr_proc_mutex_child_init@Base 1.2.7
apr_proc_mutex_cleanup@Base 1.2.7
apr_proc_mutex_create@Base 1.2.7
apr_proc_mutex_defname@Base 1.2.7
apr_proc_mutex_destroy@Base 1.2.7
apr_proc_mutex_lock@Base 1.2.7
apr_proc_mutex_lockfile@Base 1.2.7
apr_proc_mutex_mech@Base 1.6.2
apr_proc_mutex_name@Base 1.2.7
apr_proc_mutex_perms_set@Base 1.6.2
apr_proc_mutex_pool_get@Base 1.2.7
apr_proc_mutex_timedlock@Base 1.7.0
apr_proc_mutex_trylock@Base 1.2.7
apr_proc_mutex_unix_setup_lock@Base 1.2.7
apr_proc_mutex_unlock@Base 1.2.7
apr_proc_other_child_alert@Base 1.2.7
apr_proc_other_child_refresh@Base 1.2.7
apr_proc_other_child_refresh_all@Base 1.2.7
apr_proc_other_child_register@Base 1.2.7
apr_proc_other_child_unregister@Base 1.2.7
apr_proc_wait@Base 1.2.7
apr_proc_wait_all_procs@Base 1.2.7
apr_procattr_addrspace_set@Base 1.2.7
apr_procattr_child_err_set@Base 1.2.7
apr_procattr_child_errfn_set@Base 1.2.7
apr_procattr_child_in_set@Base 1.2.7
apr_procattr_child_out_set@Base 1.2.7
apr_procattr_cmdtype_set@Base 1.2.7
apr_procattr_create@Base 1.2.7
apr_procattr_detach_set@Base 1.2.7
apr_procattr_dir_set@Base 1.2.7
apr_procattr_error_check_set@Base 1.2.7
apr_procattr_group_set@Base 1.2.7
apr_procattr_io_set@Base 1.2.7
apr_procattr_limit_set@Base 1.2.7
apr_procattr_perms_set_register@Base 1.6.2
apr_procattr_user_set@Base 1.2.7
apr_psprintf@Base 1.2.7
apr_pstrcat@Base 1.2.7
apr_pstrcatv@Base 1.2.7
apr_pstrdup@Base 1.2.7
apr_pstrmemdup@Base 1.2.7
apr_pstrndup@Base 1.2.7
apr_punescape_entity@Base 1.5.0
apr_punescape_hex@Base 1.5.0
apr_punescape_url@Base 1.5.0
apr_pvsprintf@Base 1.2.7
apr_random_add_entropy@Base 1.2.7
apr_random_after_fork@Base 1.2.7
apr_random_barrier@Base 1.2.7
apr_random_init@Base 1.2.7
apr_random_insecure_bytes@Base 1.2.7
apr_random_insecure_ready@Base 1.2.7
apr_random_secure_bytes@Base 1.2.7
apr_random_secure_ready@Base 1.2.7
apr_random_standard_new@Base 1.2.7
apr_rfc822_date@Base 1.2.7
apr_setup_signal_thread@Base 1.2.7
apr_shm_attach@Base 1.2.7
apr_shm_attach_ex@Base 1.5.0
apr_shm_baseaddr_get@Base 1.2.7
apr_shm_create@Base 1.2.7
apr_shm_create_ex@Base 1.5.0
apr_shm_delete@Base 1.6.2
apr_shm_destroy@Base 1.2.7
apr_shm_detach@Base 1.2.7
apr_shm_perms_set@Base 1.6.2
apr_shm_pool_get@Base 1.2.7
apr_shm_remove@Base 1.2.7
apr_shm_size_get@Base 1.2.7
apr_signal@Base 1.2.7
apr_signal_block@Base 1.2.7
apr_signal_description_get@Base 1.2.7
apr_signal_init@Base 1.2.7
apr_signal_thread@Base 1.2.7
apr_signal_unblock@Base 1.2.7
apr_skiplist_add@Base 1.6.2
apr_skiplist_add_compare@Base 1.6.2
apr_skiplist_add_index@Base 1.5.0
apr_skiplist_alloc@Base 1.5.0
apr_skiplist_destroy@Base 1.5.0
apr_skiplist_element@Base 1.6.2
apr_skiplist_find@Base 1.5.0
apr_skiplist_find_compare@Base 1.5.0
apr_skiplist_free@Base 1.5.0
apr_skiplist_getlist@Base 1.5.0
apr_skiplist_height@Base 1.6.2
apr_skiplist_init@Base 1.5.0
apr_skiplist_insert@Base 1.5.0
apr_skiplist_insert_compare@Base 1.5.0
apr_skiplist_last@Base 1.6.2
apr_skiplist_last_compare@Base 1.6.2
apr_skiplist_merge@Base 1.5.0
apr_skiplist_next@Base 1.5.0
apr_skiplist_peek@Base 1.5.0
apr_skiplist_pop@Base 1.5.0
apr_skiplist_preheight@Base 1.6.2
apr_skiplist_previous@Base 1.5.0
apr_skiplist_remove@Base 1.5.0
apr_skiplist_remove_all@Base 1.5.0
apr_skiplist_remove_compare@Base 1.5.0
apr_skiplist_remove_node@Base 1.6.2
apr_skiplist_replace@Base 1.6.2
apr_skiplist_replace_compare@Base 1.6.2
apr_skiplist_set_compare@Base 1.5.0
apr_skiplist_set_preheight@Base 1.6.2
apr_skiplist_size@Base 1.6.2
apr_sleep@Base 1.2.7
apr_snprintf@Base 1.2.7
apr_sockaddr_equal@Base 1.2.7
apr_sockaddr_info_copy@Base 1.6.2
apr_sockaddr_info_get@Base 1.2.7
apr_sockaddr_ip_get@Base 1.2.7
apr_sockaddr_ip_getbuf@Base 1.3.2
apr_sockaddr_is_wildcard@Base 1.5.0
apr_sockaddr_vars_set@Base 1.2.7
apr_sockaddr_zone_get@Base 1.7.0
apr_sockaddr_zone_set@Base 1.7.0
apr_socket_accept@Base 1.2.7
apr_socket_addr_get@Base 1.2.7
apr_socket_atmark@Base 1.2.7
apr_socket_atreadeof@Base 1.4.2
apr_socket_bind@Base 1.2.7
apr_socket_close@Base 1.2.7
apr_socket_connect@Base 1.2.7
apr_socket_create@Base 1.4.8-2~
apr_socket_data_get@Base 1.2.7
apr_socket_data_set@Base 1.2.7
apr_socket_inherit_set@Base 1.2.7
apr_socket_inherit_unset@Base 1.2.7
apr_socket_listen@Base 1.2.7
apr_socket_opt_get@Base 1.2.7
apr_socket_opt_set@Base 1.2.7
apr_socket_perms_set@Base 1.6.2
apr_socket_pool_get@Base 1.2.7
apr_socket_protocol_get@Base 1.2.7
apr_socket_recv@Base 1.2.7
apr_socket_recvfrom@Base 1.2.7
apr_socket_send@Base 1.2.7
apr_socket_sendto@Base 1.2.7
apr_socket_sendv@Base 1.2.7
apr_socket_shutdown@Base 1.2.7
apr_socket_timeout_get@Base 1.2.7
apr_socket_timeout_set@Base 1.2.7
apr_socket_type_get@Base 1.2.7
apr_stat@Base 1.2.7
apr_strerror@Base 1.2.7
apr_strfsize@Base 1.2.7
apr_strftime@Base 1.2.7
apr_strnatcasecmp@Base 1.2.7
apr_strnatcmp@Base 1.2.7
apr_strtoff@Base 1.2.7
apr_strtoi64@Base 1.2.7
apr_strtok@Base 1.2.7
apr_table_add@Base 1.2.7
apr_table_addn@Base 1.2.7
apr_table_clear@Base 1.2.7
apr_table_clone@Base 1.3.2
apr_table_compress@Base 1.2.7
apr_table_copy@Base 1.2.7
apr_table_do@Base 1.2.7
apr_table_elts@Base 1.2.7
apr_table_get@Base 1.2.7
apr_table_getm@Base 1.5.0
apr_table_make@Base 1.2.7
apr_table_merge@Base 1.2.7
apr_table_mergen@Base 1.2.7
apr_table_overlap@Base 1.2.7
apr_table_overlay@Base 1.2.7
apr_table_set@Base 1.2.7
apr_table_setn@Base 1.2.7
apr_table_unset@Base 1.2.7
apr_table_vdo@Base 1.2.7
apr_temp_dir_get@Base 1.2.7
apr_terminate2@Base 1.2.7
apr_terminate@Base 1.2.7
apr_thread_cond_broadcast@Base 1.2.7
apr_thread_cond_create@Base 1.2.7
apr_thread_cond_destroy@Base 1.2.7
apr_thread_cond_pool_get@Base 1.2.7
apr_thread_cond_signal@Base 1.2.7
apr_thread_cond_timedwait@Base 1.2.7
apr_thread_cond_wait@Base 1.2.7
apr_thread_create@Base 1.2.7
apr_thread_data_get@Base 1.2.7
apr_thread_data_set@Base 1.2.7
apr_thread_detach@Base 1.2.7
apr_thread_exit@Base 1.2.7
apr_thread_join@Base 1.2.7
apr_thread_mutex_create@Base 1.2.7
apr_thread_mutex_destroy@Base 1.2.7
apr_thread_mutex_lock@Base 1.2.7
apr_thread_mutex_pool_get@Base 1.2.7
apr_thread_mutex_timedlock@Base 1.7.0
apr_thread_mutex_trylock@Base 1.2.7
apr_thread_mutex_unlock@Base 1.2.7
apr_thread_once@Base 1.2.7
apr_thread_once_init@Base 1.2.7
apr_thread_pool_get@Base 1.2.7
apr_thread_rwlock_create@Base 1.2.7
apr_thread_rwlock_destroy@Base 1.2.7
apr_thread_rwlock_pool_get@Base 1.2.7
apr_thread_rwlock_rdlock@Base 1.2.7
apr_thread_rwlock_tryrdlock@Base 1.2.7
apr_thread_rwlock_trywrlock@Base 1.2.7
apr_thread_rwlock_unlock@Base 1.2.7
apr_thread_rwlock_wrlock@Base 1.2.7
apr_thread_yield@Base 1.2.7
apr_threadattr_create@Base 1.2.7
apr_threadattr_detach_get@Base 1.2.7
apr_threadattr_detach_set@Base 1.2.7
apr_threadattr_guardsize_set@Base 1.2.7
apr_threadattr_stacksize_set@Base 1.2.7
apr_threadkey_data_get@Base 1.2.7
apr_threadkey_data_set@Base 1.2.7
apr_threadkey_private_create@Base 1.2.7
apr_threadkey_private_delete@Base 1.2.7
apr_threadkey_private_get@Base 1.2.7
apr_threadkey_private_set@Base 1.2.7
apr_time_ansi_put@Base 1.2.7
apr_time_clock_hires@Base 1.2.7
apr_time_exp_get@Base 1.2.7
apr_time_exp_gmt@Base 1.2.7
apr_time_exp_gmt_get@Base 1.2.7
apr_time_exp_lt@Base 1.2.7
apr_time_exp_tz@Base 1.2.7
apr_time_now@Base 1.2.7
apr_tokenize_to_argv@Base 1.2.7
apr_uid_current@Base 1.2.7
apr_uid_get@Base 1.2.7
apr_uid_homepath_get@Base 1.2.7
apr_uid_name_get@Base 1.2.7
apr_unescape_entity@Base 1.5.0
apr_unescape_hex@Base 1.5.0
apr_unescape_url@Base 1.5.0
apr_unix_child_file_cleanup@Base 1.2.11
apr_unix_file_cleanup@Base 1.2.7
apr_unix_mode2perms@Base 1.2.7
apr_unix_perms2mode@Base 1.2.7
apr_unix_setup_time@Base 1.2.7
apr_version@Base 1.2.7
apr_version_string@Base 1.2.7
apr_vformatter@Base 1.2.7
apr_vsnprintf@Base 1.2.7
apr_wait_for_io_or_timeout@Base 1.2.7
(arch=mipsel m68k powerpc sh3 sh4)apr__atomic_generic64_init@Base 1.7.0-3~

2
debian/symbols.hurd vendored Normal file
View File

@ -0,0 +1,2 @@
#include "symbols.common"
apr_socket_sendfile@Base 1.2.7

3
debian/symbols.kfreebsd vendored Normal file
View File

@ -0,0 +1,3 @@
#include "symbols.common"
apr_pollcb_provider_kqueue@Base 1.4.2
apr_pollset_provider_kqueue@Base 1.4.2

4
debian/symbols.linux vendored Normal file
View File

@ -0,0 +1,4 @@
#include "symbols.common"
apr_socket_sendfile@Base 1.2.7
apr_pollcb_provider_epoll@Base 1.4.2
apr_pollset_provider_epoll@Base 1.4.2

3
debian/watch vendored Normal file
View File

@ -0,0 +1,3 @@
version=3
opts=pgpsigurlmangle=s/$/.asc/ \
http://www.apache.org/dist/apr/apr-(1\..*)\.tar\.gz