Skip to content
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.

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

httpd (Apache HTTPD): update to 2.4.58 #5101

Merged
merged 1 commit into from
Feb 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 10 additions & 0 deletions app-web/httpd/autobuild/build
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
abinfo "Configuring Apache HTTPD ..."
"$SRCDIR"/configure \
"${AUTOTOOLS_AFTER[@]}"

abinfo "Building Apache HTTPD ..."
make

abinfo "Installing Apache HTTPD ..."
make install \
DESTDIR="$PKGDIR"
3 changes: 3 additions & 0 deletions app-web/httpd/autobuild/defines
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,6 @@ AUTOTOOLS_AFTER=(
--enable-pie
--enable-option-checking=fatal
)

# FIXME: make install is not reliable with parallelism.
NOPARALLEL=1
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
g apache 25
u apache 25:25 "Apache Server Daemon" /srv/www /bin/false
9 changes: 7 additions & 2 deletions app-web/httpd/autobuild/postinst
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
chown -R 25:25 "$PKGDIR"/srv/www
chown -R 25:25 "$PKGDIR"/srv/http
echo "Setting up apache group and user ..."
systemd-sysusers httpd.conf

echo "Changing permission of /srv/www and /srv/http ..."
chown -R apache:apache /srv/www
chown -R apache:apache /srv/http

4 changes: 0 additions & 4 deletions app-web/httpd/autobuild/prepare
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,3 @@ chmod -v a-s "$SRCDIR"

abinfo "Appending -lsystemd to LDFLAGS to fix build ..."
export LDFLAGS="${LDFLAGS} -lsystemd"

# FIXME: Conflicts with layout settings.
abinfo "Unsetting AUTOTOOLS_DEF to prevent conflicts with layout settings ..."
unset AUTOTOOLS_DEF
2 changes: 0 additions & 2 deletions app-web/httpd/autobuild/usergroup

This file was deleted.

4 changes: 2 additions & 2 deletions app-web/httpd/spec
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VER=2.4.57
VER=2.4.58
SRCS="tbl::http://archive.apache.org/dist/httpd/httpd-$VER.tar.bz2"
CHKSUMS="sha256::dbccb84aee95e095edfbb81e5eb926ccd24e6ada55dcd83caecb262e5cf94d2a"
CHKSUMS="sha256::fa16d72a078210a54c47dd5bef2f8b9b8a01d94909a51453956b3ec6442ea4c5"
CHKUPDATE="anitya::id=1335"