[packages/apache] Rediff patches, make rpm4 more happy.
arekm
arekm at pld-linux.org
Wed Jun 16 09:21:42 CEST 2021
commit a9a44d2d5fa4699047a2abab600be3ae2a426e81
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Wed Jun 16 09:21:22 2021 +0200
Rediff patches, make rpm4 more happy.
apache-apr.patch | 12 ++++++------
apache-apxs.patch | 15 ++++++++-------
apache-conffile-path.patch | 12 ++++++------
apache-suexec.patch | 10 +++++-----
apache.spec | 8 ++++----
5 files changed, 29 insertions(+), 28 deletions(-)
---
diff --git a/apache.spec b/apache.spec
index 4f277a5..59b31b5 100644
--- a/apache.spec
+++ b/apache.spec
@@ -628,7 +628,6 @@ URL: http://httpd.apache.org/docs/2.4/mod/mod_authn_core.html
Requires: %{name}-base = %{version}-%{release}
Provides: apache(mod_authn_core) = %{version}-%{release}
Provides: apache(mod_authn_default) = %{version}-%{release}
-Obsoletes: apache(mod_authn_alias)
Obsoletes: apache-mod_authn_default < %{version}-%{release}
%description mod_authn_core
@@ -3070,14 +3069,15 @@ if [ "$1" = "0" ]; then
fi
%systemd_reload
-%triggerpostun base -- %{name}-base < 2.2.22-2
+%triggerpostun base -- %{name}-base < 2.4.0
+# < 2.2.22-2
. /etc/sysconfig/httpd
if [ -z "$HTTPD_CONF" ]; then
echo 'HTTPD_CONF="/etc/httpd/apache.conf"' >> /etc/sysconfig/httpd
fi
%systemd_trigger httpd.service
-%triggerpostun base -- %{name}-base < 2.4.0
+# < 2.4.0
cp -f /etc/httpd/apache.conf{,.rpmsave}
sed -i -e '
/^DefaultType/d
@@ -3309,7 +3309,7 @@ fi
%dir %{_datadir}/cgi-bin
%dir %{_datadir}/html
%dir %{_datadir}/vhosts
-# do not adapter here, %{_datadir} != /usr/share here
+# do not adapter here, %%{_datadir} != /usr/share here
%{_datadir}/icons
%attr(755,root,root) %{_libexecdir}/mod_mpm_event.so
%attr(755,root,root) %{_libexecdir}/mod_mpm_prefork.so
diff --git a/apache-apr.patch b/apache-apr.patch
index 4fa5132..73b6ab4 100644
--- a/apache-apr.patch
+++ b/apache-apr.patch
@@ -1,12 +1,12 @@
-diff -urN httpd-2.0.47.org/configure.in httpd-2.0.47/configure.in
---- httpd-2.0.47.org/configure.in 2003-09-13 14:18:35.000000000 +0200
-+++ httpd-2.0.47/configure.in 2003-09-13 14:18:50.000000000 +0200
-@@ -76,8 +76,6 @@
- AP_CLEAN_SRCLIB_DIRS="$AP_CLEAN_SRCLIB_DIRS apr"
+diff -urNp -x '*.orig' httpd-2.4.46.org/configure.in httpd-2.4.46/configure.in
+--- httpd-2.4.46.org/configure.in 2020-02-03 08:56:05.000000000 +0100
++++ httpd-2.4.46/configure.in 2021-06-16 09:19:28.107118428 +0200
+@@ -126,8 +126,6 @@ if test "$apr_found" = "reconfig"; then
+ done
fi
-APR_SETIFNULL(CC, `$apr_config --cc`)
-APR_SETIFNULL(CPP, `$apr_config --cpp`)
APR_ADDTO(CFLAGS, `$apr_config --cflags`)
APR_ADDTO(CPPFLAGS, `$apr_config --cppflags`)
- APR_ADDTO(LDFLAGS, `$apr_config --ldflags`)
+ dnl internal-only CPPFLAGS (shouldn't affect third-party module builds)
diff --git a/apache-apxs.patch b/apache-apxs.patch
index 309ee24..7dc3930 100644
--- a/apache-apxs.patch
+++ b/apache-apxs.patch
@@ -1,6 +1,7 @@
---- httpd-2.2.3/support/apxs.in-orig 2006-11-01 00:59:27.000000000 +0100
-+++ httpd-2.2.3/support/apxs.in 2006-11-01 00:59:54.000000000 +0100
-@@ -35,6 +35,7 @@
+diff -urNp -x '*.orig' httpd-2.4.46.org/support/apxs.in httpd-2.4.46/support/apxs.in
+--- httpd-2.4.46.org/support/apxs.in 2020-03-20 14:00:44.000000000 +0100
++++ httpd-2.4.46/support/apxs.in 2021-06-16 09:20:17.513003551 +0200
+@@ -45,6 +45,7 @@ my $CFG_PREFIX = $prefix;
my $exec_prefix = get_vars("exec_prefix");
my $datadir = get_vars("datadir");
my $localstatedir = get_vars("localstatedir");
@@ -8,15 +9,15 @@
my $CFG_TARGET = get_vars("progname");
my $CFG_SYSCONFDIR = get_vars("sysconfdir");
my $CFG_CFLAGS = join ' ', map { get_vars($_) }
-@@ -44,6 +45,7 @@
+@@ -56,6 +57,7 @@ my $CFG_INCLUDEDIR = eval qq("$includedi
my $CFG_CC = get_vars("CC");
- my $libexecdir = get_vars("libexecdir");
+ my $libexecdir = $destdir . get_vars("libexecdir");
my $CFG_LIBEXECDIR = eval qq("$libexecdir");
+my $CFG_DESTDIR = '';
my $sbindir = get_vars("sbindir");
my $CFG_SBINDIR = eval qq("$sbindir");
my $ltflags = $ENV{'LTFLAGS'};
-@@ -171,7 +173,7 @@
+@@ -183,7 +185,7 @@ if (@opt_S) {
my ($val) = $2;
my $oldval = eval "\$CFG_$var";
@@ -25,7 +26,7 @@
print STDERR "apxs:Error: no config variable $var\n";
&usage;
}
-@@ -479,8 +480,8 @@
+@@ -512,8 +514,8 @@ if ($opt_i or $opt_e) {
$t =~ s|\.[^./\\]+$|\.so|;
if ($opt_i) {
push(@cmds, $destdir . "$installbuilddir/instdso.sh SH_LIBTOOL='" .
diff --git a/apache-conffile-path.patch b/apache-conffile-path.patch
index 9fa0d31..7ac8348 100644
--- a/apache-conffile-path.patch
+++ b/apache-conffile-path.patch
@@ -1,7 +1,7 @@
-diff -ur httpd-2.0.49-orig/configure.in httpd-2.0.49/configure.in
---- httpd-2.0.49-orig/configure.in 2004-04-02 15:04:49.000000000 -0700
-+++ httpd-2.0.49/configure.in 2004-04-02 15:07:26.319486516 -0700
-@@ -541,9 +541,9 @@
+diff -urNp -x '*.orig' httpd-2.4.46.org/configure.in httpd-2.4.46/configure.in
+--- httpd-2.4.46.org/configure.in 2021-06-16 09:19:52.228364279 +0200
++++ httpd-2.4.46/configure.in 2021-06-16 09:19:53.851781461 +0200
+@@ -873,9 +873,9 @@ echo $MODLIST | $AWK -f $srcdir/build/bu
APR_EXPAND_VAR(ap_prefix, $prefix)
AC_DEFINE_UNQUOTED(HTTPD_ROOT, "${ap_prefix}",
[Root directory of the Apache install area])
@@ -11,5 +11,5 @@ diff -ur httpd-2.0.49-orig/configure.in httpd-2.0.49/configure.in
-AC_DEFINE_UNQUOTED(AP_TYPES_CONFIG_FILE, "${rel_sysconfdir}/mime.types",
+AC_DEFINE_UNQUOTED(AP_TYPES_CONFIG_FILE, "${exp_sysconfdir}/mime.types",
[Location of the MIME types config file, relative to the Apache root directory])
- AC_DEFINE_UNQUOTED(APACHE_MPM_DIR, "$MPM_DIR",
- [Location of the source for the current MPM])
+
+ perlbin=`$ac_aux_dir/PrintPath perl`
diff --git a/apache-suexec.patch b/apache-suexec.patch
index 5615913..cb15598 100644
--- a/apache-suexec.patch
+++ b/apache-suexec.patch
@@ -1,12 +1,12 @@
---- httpd-2.0.43/Makefile.in.wiget Fri Oct 4 15:20:09 2002
-+++ httpd-2.0.43/Makefile.in Fri Oct 4 15:20:32 2002
+diff -urNp -x '*.orig' httpd-2.4.46.org/Makefile.in httpd-2.4.46/Makefile.in
+--- httpd-2.4.46.org/Makefile.in 2018-08-08 13:48:15.000000000 +0200
++++ httpd-2.4.46/Makefile.in 2021-06-16 09:18:53.088643073 +0200
@@ -279,7 +279,7 @@ install-suexec-binary:
- install-suexec-setuid:
+ install-suexec-setuid: install-suexec-binary
@if test -f $(builddir)/support/suexec; then \
- chmod 4755 $(DESTDIR)$(sbindir)/suexec; \
+ chmod 0755 $(DESTDIR)$(sbindir)/suexec; \
fi
- install-suexec-caps:
-
+ install-suexec-caps: install-suexec-binary
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/apache.git/commitdiff/a9a44d2d5fa4699047a2abab600be3ae2a426e81
More information about the pld-cvs-commit
mailing list