Skip to content

apache: Update to 2.4.56 #43108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Duncaen merged 1 commit into from
Jun 23, 2023
Merged

apache: Update to 2.4.56 #43108

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 28 additions & 14 deletions srcpkgs/apache/template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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"
Copy link
Contributor

@klarasm klarasm May 15, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
distfiles="https://dlcdn.apache.org/httpd/httpd-${version}.tar.bz2"
distfiles="https://archive.apache.org/dist/httpd/httpd-${version}.tar.bz2"

I don't know if it's appropriate for this package, but https://archive.apache.org/dist does not delete outdated versions which would help for local testing when revbumping (as the distfiles are not cached locally if they have not been used earlier).

checksum=eb397feeefccaf254f8d45de3768d9d68e8e73851c49afd5b7176d1ecf80c340
checksum=d8d45f1398ba84edd05bb33ca7593ac2989b17cb9c7a0cafe5442d41afdb2d7c

system_accounts="_apache"
_apache_homedir="/srv/www/$pkgname"
Expand All @@ -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
Expand All @@ -76,14 +96,12 @@ 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;"
fi
}

Expand All @@ -108,7 +126,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|' \
Expand All @@ -123,10 +141,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
Expand Down