From: gmbeard <gmbeard@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] apache: Update to 2.4.56
Date: Thu, 30 Mar 2023 08:49:13 +0200 [thread overview]
Message-ID: <20230330064913.UHTYd5cMBOE3eH03wOUdcYVPCA1DGZcFXjDtWh5RBig@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-43108@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1314 bytes --]
There is an updated pull request by gmbeard against master on the void-packages repository
https://github.com/gmbeard/void-packages feature/apache-update
https://github.com/void-linux/void-packages/pull/43108
apache: Update to 2.4.56
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
Tested by running `httpd -V` to show the compile configuration (did this for x86\_64 and aarch64)
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86\_64-glibc
- I built this PR locally for these architectures:
- x86\_64-musl
- aarch64
- armv6l
A patch file from https://github.com/void-linux/void-packages/pull/43108.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-feature/apache-update-43108.patch --]
[-- Type: text/x-diff, Size: 3915 bytes --]
From 99094bb94a1a1a2046d5abf84812515ff8244e74 Mon Sep 17 00:00:00 2001
From: Greg Beard <gmbeard@googlemail.com>
Date: Wed, 29 Mar 2023 23:49:07 +0100
Subject: [PATCH] apache: Update to 2.4.56
---
srcpkgs/apache/template | 45 ++++++++++++++++++++++++++++-------------
1 file changed, 31 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 629ad18b34a5..aa563d506200 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
-version=2.4.54
-revision=2
+version=2.4.56
+revision=1
build_style=gnu-configure
configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
--enable-mods-shared=all --enable-authn-dbm --enable-authn-anon
@@ -34,7 +34,7 @@ license="Apache-2.0"
homepage="https://httpd.apache.org/"
changelog="https://www.apache.org/dist/httpd/CHANGES_2.4"
distfiles="https://dlcdn.apache.org/httpd/httpd-${version}.tar.bz2"
-checksum=eb397feeefccaf254f8d45de3768d9d68e8e73851c49afd5b7176d1ecf80c340
+checksum=d8d45f1398ba84edd05bb33ca7593ac2989b17cb9c7a0cafe5442d41afdb2d7c
system_accounts="_apache"
_apache_homedir="/srv/www/$pkgname"
@@ -55,12 +55,32 @@ fi
pre_configure() {
# set default user
- sed -e 's#User daemon#User _apache#' \
+ vsed -e 's#User daemon#User _apache#' \
-e 's#Group daemon#Group _apache#' \
-i docs/conf/httpd.conf.in
cat ${FILESDIR}/xbps.layout >> config.layout
if [ "$CROSS_BUILD" ]; then
+ # NOTE: Here, we prepare a modified version of
+ # libtool into $XBPS_WRAPPERDIR. This sets...
+ #
+ # `CC=${CC:=gcc}`
+ # `LD=${LD:=ld}`
+ #
+ # ...so the build doesn't attempt to use the
+ # host linker...
+ sed ${XBPS_CROSS_BASE}/usr/bin/libtool \
+ -e 's;^\(LD\)="\(.\+\)"$;\1="${\1:=\2}";g' \
+ -e 's;^\(CC\)="\(.\+\)"$;\1="${\1:=\2}";g' \
+ > ${XBPS_WRAPPERDIR}/libtool
+ chmod +x ${XBPS_WRAPPERDIR}/libtool
+
+ # Here, we're altering the configure script
+ # to use our modified libtool...
+ vsed -i configure \
+ -e "s;\(my_libtool=\).*$;\1\""${XBPS_WRAPPERDIR}"/libtool\";g" \
+ -e "s;\(SH_LIBTOOL=\)'\$(SHELL).*'$;\1'\$(LIBTOOL)';g"
+
# pcre{,2}-config detection doesn't work on cross
# since httpd-2.4.53, manually export PCRE_CONFIG
# to let configure know where it is
@@ -76,14 +96,15 @@ pre_configure() {
post_configure() {
if [ "$CROSS_BUILD" ]; then
# Build gen_test_char using $BUILD_CC
- sed -i server/Makefile \
+ vsed -i server/Makefile \
-e "s;\$(LINK) \$(EXTRA_LDFLAGS) \$(\(gen_test_char\).*;${BUILD_CC} -o \1 \1.c -I${XBPS_CROSS_BASE}/usr/include/apr-1;"
# More hacks to make cross compiling work
- sed -i build/*.mk Makefile */Makefile \
+ vsed -i build/rules.mk support/Makefile \
-e "s;--mode=compile;& --tag=CC;" \
- -e "s;--mode=link;& --tag=CC;" \
- -e "s;-\(L|R\)/usr/lib;-\1${XBPS_CROSS_BASE}/usr/lib;" \
- -e "s;^\(LIBTOOL =\) /usr/share/apr-1/build/libtool;\1 ${XBPS_CROSS_BASE}/usr/bin/libtool;"
+ -e "s;--mode=link;& --tag=CC;"
+
+ vsed -i build/config_vars.mk \
+ -e "s;--mode=install;& --tag=CC;"
fi
}
@@ -108,7 +129,7 @@ post_install() {
# * httpd-userdir.conf
# * httpd-default.conf
#
- sed \
+ vsed \
-e 's|ServerRoot ""|ServerRoot "/srv/www/apache"|' \
-e 's|#\(LoadModule include_module /usr/libexec/httpd/mod_include.so\)|\1|' \
-e 's|\(LoadModule unique_id_module /usr/libexec/httpd/mod_unique_id.so\)|#\1|' \
@@ -123,10 +144,6 @@ post_install() {
-e 's|#\(Include /etc/apache/extra/httpd-default.conf\)|\1|' \
-i "${DESTDIR}/etc/apache/httpd.conf"
- # Remove references to hardening -specs.
- sed -e "s|\(-specs=.*hardened-ld\)||g" -e "s|\(-specs=.*hardened-cc1\)||g" -i \
- ${DESTDIR}/usr/share/apache/webroot/build/config{.nice,_vars.mk}
-
# Remove unused stuff.
vmkdir usr/share/apache/webroot
mv ${DESTDIR}/srv/www/$pkgname/cgi-bin ${DESTDIR}/usr/share/apache/webroot
next prev parent reply other threads:[~2023-03-30 6:49 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-29 22:54 [PR PATCH] " gmbeard
2023-03-30 6:49 ` gmbeard [this message]
2023-03-30 6:55 ` [PR PATCH] [Updated] " gmbeard
2023-03-30 7:02 ` gmbeard
2023-05-15 17:11 ` [PR REVIEW] " klarasm
2023-05-15 17:42 ` klarasm
2023-06-23 20:01 ` [PR PATCH] [Merged]: " Duncaen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230330064913.UHTYd5cMBOE3eH03wOUdcYVPCA1DGZcFXjDtWh5RBig@z \
--to=gmbeard@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).