commit e642a4bbec14ca4ba82c1856c394562cb9fb145e
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Wed Feb 1 21:39:22 2023 +0100
Up to 1.7.2; fixes CVE-2022-24963, CVE-2021-35940
apr-libtool.patch | 17 -----------------
apr.spec | 10 +++++-----
2 files changed, 5 insertions(+), 22 deletions(-)
---
diff --git a/apr.spec b/apr.spec
index d032574..8a88f99 100644
--- a/apr.spec
+++ b/apr.spec
@@ -5,15 +5,15 @@
Summary: Apache Portable Runtime
Summary(pl.UTF-8): Apache Portable Runtime - przenośna biblioteka
uruchomieniowa
Name: apr
-Version: 1.7.0
-Release: 2
+Version: 1.7.2
+Release: 1
Epoch: 1
License: Apache v2.0
Group: Libraries
Source0: http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2
-# Source0-md5: 7a14a83d664e87599ea25ff4432e48a7
+# Source0-md5: 9a00835e4da8c215348e263b550fc130
Patch0: %{name}-link.patch
-Patch1: %{name}-libtool.patch
+
# disable some things that require recent kernel
Patch2: %{name}-disable-features.patch
URL: http://apr.apache.org/
@@ -99,7 +99,7 @@ Statyczna biblioteka apr.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
+
%patch2 -p1
cat >> config.layout <<'EOF'
diff --git a/apr-libtool.patch b/apr-libtool.patch
deleted file mode 100644
index 6618972..0000000
--- a/apr-libtool.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-must give hint to libtool which tag to use, in case we use ccache and then
-libtool is unable to autodetect from $CC
-
---- apr-1.5.0/configure.in.orig 2013-11-22 17:29:57.303051538 +0100
-+++ apr-1.5.0/configure.in 2013-11-22 17:31:11.273048433 +0100
-@@ -280,9 +280,9 @@
- [ use_libtool=$withval ], [ use_libtool="yes" ] )
-
- if test "x$use_libtool" = "xyes"; then
-- lt_compile='$(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) -o $@ -c $<
&& touch $@'
-+ lt_compile='$(LIBTOOL) $(LTFLAGS) --mode=compile --tag=CC $(COMPILE) -o
$@ -c $< && touch $@'
- LT_VERSION="-version-info `$get_version libtool $version_hdr APR`"
-- link="\$(LIBTOOL) \$(LTFLAGS) --mode=link \$(COMPILE) \$(LT_LDFLAGS)
\$(LT_VERSION) \$(ALL_LDFLAGS) -o \$@"
-+ link="\$(LIBTOOL) \$(LTFLAGS) --mode=link --tag=CC \$(COMPILE)
\$(LT_LDFLAGS) \$(LT_VERSION) \$(ALL_LDFLAGS) -o \$@"
- so_ext='lo'
- lib_target='-rpath $(libdir) $(OBJECTS)'
- export_lib_target='-rpath \$(libdir) \$(OBJECTS)'
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/apr.git/commitdiff/e642a4bbec14ca4ba82c1856c394562cb9fb145e
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
