Skip to content

GitLab

H
httpd
Commit c3e08b47 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev
Browse files
Options

Update httpd to 2.4.48

parent 03e52c76
Hide whitespace changes
Inline Side-by-side
Showing with 72 additions and 72 deletions
Makefile
View file @ c3e08b47
......@@ -21,12 +21,12 @@ all: httpd-service httpd-logrotate
ln -sv /data/etc/shadow /etc/shadow
mv -v /etc/gshadow /data/etc/gshadow
ln -sv /data/etc/gshadow /etc/gshadow
tar xf httpd-2.4.43.tar.bz2
patch -Np1 -d httpd-2.4.43 < httpd-2.4.43-blfs_layout-1.patch
cd httpd-2.4.43 && sed '/dir.*CFG_PREFIX/s@^@#@' -i support/apxs.in
cd httpd-2.4.43 && ./configure --enable-authnz-fcgi --enable-layout=BLFS --enable-mods-shared="all cgi" --enable-mpms-shared=all --enable-suexec=shared --with-apr=/usr/bin/apr-1-config --with-apr-util=/usr/bin/apu-1-config --with-suexec-bin=/usr/lib/httpd/suexec --with-suexec-caller=apache --with-suexec-docroot=/srv/www --with-suexec-logfile=/var/log/httpd/suexec.log --with-suexec-uidmin=100 --with-suexec-userdir=public_html
$(MAKE) -C httpd-2.4.43
$(MAKE) -C httpd-2.4.43 install
tar xf httpd-2.4.48.tar.bz2
patch -Np1 -d httpd-2.4.48 < httpd-2.4.48-blfs_layout-1.patch
cd httpd-2.4.48 && sed '/dir.*CFG_PREFIX/s@^@#@' -i support/apxs.in
cd httpd-2.4.48 && ./configure --enable-authnz-fcgi --enable-layout=BLFS --enable-mods-shared="all cgi" --enable-mpms-shared=all --enable-suexec=shared --with-apr=/usr/bin/apr-1-config --with-apr-util=/usr/bin/apu-1-config --with-suexec-bin=/usr/lib/httpd/suexec --with-suexec-caller=apache --with-suexec-docroot=/srv/www --with-suexec-logfile=/var/log/httpd/suexec.log --with-suexec-uidmin=100 --with-suexec-userdir=public_html
$(MAKE) -C httpd-2.4.48
$(MAKE) -C httpd-2.4.48 install
mv -v /usr/sbin/suexec /usr/lib/httpd/suexec
chgrp apache /usr/lib/httpd/suexec
chmod 4754 /usr/lib/httpd/suexec
......@@ -44,7 +44,7 @@ all: httpd-service httpd-logrotate
@echo "$$HTTPD_LOGROTATE" > /etc/logrotate.d/httpd
@echo "$$HTTPD_SERVICE" > /lib/systemd/system/httpd.service
systemctl enable httpd.service
rm -rf httpd-2.4.43
rm -rf httpd-2.4.48
httpd-service:
define HTTPD_SERVICE
......
httpd-2.4.43-blfs_layout-1.patch → httpd-2.4.48-blfs_layout-1.patch
View file @ c3e08b47
diff -uNr httpd-2.4.43/config.layout httpd-2.4.43-blfs_layout-1/config.layout
--- httpd-2.4.43/config.layout 2020-02-21 11:09:22.000000000 +1030
+++ httpd-2.4.43-blfs_layout-1/config.layout 2021-07-27 09:41:30.267943629 +0930
diff -uNr httpd-2.4.48/config.layout httpd-2.4.48-blfs_layout-1/config.layout
--- httpd-2.4.48/config.layout 2020-02-21 11:09:22.000000000 +1030
+++ httpd-2.4.48-blfs_layout-1/config.layout 2023-07-07 18:47:42.020924883 +0930
@@ -9,6 +9,30 @@
## (This may become a configurable parameter at some point.)
##
+<Layout BLFS>
+ prefix:
+ exec_prefix: ${prefix}/usr
+ bindir: ${exec_prefix}/bin
+ sbindir: ${exec_prefix}/sbin
+ libdir: ${exec_prefix}/lib
+ libexecdir: ${exec_prefix}/lib/httpd/modules
+ mandir: ${exec_prefix}/share/man
+ sysconfdir: ${prefix}/etc/httpd
+ datadir: ${exec_prefix}/share/httpd
+ iconsdir: ${datadir}/icons
+ htdocsdir: ${prefix}/srv/www
+ manualdir: ${datadir}/manual
+ cgidir: ${exec_prefix}/lib/httpd/cgi-bin
+ includedir: ${exec_prefix}/include/httpd
+ localstatedir: ${prefix}/var/lock/httpd
+ runtimedir: ${prefix}/var/run/httpd
+ logfiledir: ${prefix}/var/log/httpd
+ proxycachedir: ${prefix}/var/cache/httpd/proxy
+ infodir: ${exec_prefix}/share/info
+ prefix:
+ exec_prefix: ${prefix}/usr
+ bindir: ${exec_prefix}/bin
+ sbindir: ${exec_prefix}/sbin
+ libdir: ${exec_prefix}/lib
+ libexecdir: ${exec_prefix}/lib/httpd/modules
+ mandir: ${exec_prefix}/share/man
+ sysconfdir: ${prefix}/etc/httpd
+ datadir: ${exec_prefix}/share/httpd
+ iconsdir: ${datadir}/icons
+ htdocsdir: ${prefix}/srv/www
+ manualdir: ${datadir}/manual
+ cgidir: ${exec_prefix}/lib/httpd/cgi-bin
+ includedir: ${exec_prefix}/include/httpd
+ localstatedir: ${prefix}/var/lock/httpd
+ runtimedir: ${prefix}/var/run/httpd
+ logfiledir: ${prefix}/var/log/httpd
+ proxycachedir: ${prefix}/var/cache/httpd/proxy
+ infodir: ${exec_prefix}/share/info
+ installbuilddir: ${datadir}/build
+ errordir: ${datadir}/error
+ errordir: ${datadir}/error
+</Layout>
+
# Classical Apache path layout.
<Layout Apache>
prefix: /usr/local/apache2
diff -uNr httpd-2.4.43/configure httpd-2.4.43-blfs_layout-1/configure
--- httpd-2.4.43/configure 2020-03-27 01:16:47.000000000 +1030
+++ httpd-2.4.43-blfs_layout-1/configure 2021-07-27 09:41:30.270943638 +0930
@@ -40151,17 +40151,17 @@
diff -uNr httpd-2.4.48/configure httpd-2.4.48-blfs_layout-1/configure
--- httpd-2.4.48/configure 2021-05-18 06:51:48.000000000 +0930
+++ httpd-2.4.48-blfs_layout-1/configure 2023-07-07 18:51:07.650355791 +0930
@@ -40439,17 +40439,17 @@
cat >>confdefs.h <<_ACEOF
......@@ -56,10 +56,10 @@ diff -uNr httpd-2.4.43/configure httpd-2.4.43-blfs_layout-1/configure
_ACEOF
diff -uNr httpd-2.4.43/configure.in httpd-2.4.43-blfs_layout-1/configure.in
--- httpd-2.4.43/configure.in 2020-02-03 18:26:05.000000000 +1030
+++ httpd-2.4.43-blfs_layout-1/configure.in 2021-07-27 09:41:30.270943638 +0930
@@ -873,11 +873,11 @@
diff -uNr httpd-2.4.48/configure.in httpd-2.4.48-blfs_layout-1/configure.in
--- httpd-2.4.48/configure.in 2020-09-15 16:49:13.000000000 +0930
+++ httpd-2.4.48-blfs_layout-1/configure.in 2023-07-07 18:47:42.027924897 +0930
@@ -874,11 +874,11 @@
echo $MODLIST | $AWK -f $srcdir/build/build-modules-c.awk > modules.c
APR_EXPAND_VAR(ap_prefix, $prefix)
......@@ -74,9 +74,9 @@ diff -uNr httpd-2.4.43/configure.in httpd-2.4.43-blfs_layout-1/configure.in
[Location of the MIME types config file, relative to the Apache root directory])
perlbin=`$ac_aux_dir/PrintPath perl`
diff -uNr httpd-2.4.43/docs/conf/httpd.conf.in httpd-2.4.43-blfs_layout-1/docs/conf/httpd.conf.in
--- httpd-2.4.43/docs/conf/httpd.conf.in 2016-08-17 08:42:07.000000000 +0930
+++ httpd-2.4.43-blfs_layout-1/docs/conf/httpd.conf.in 2021-07-27 09:41:30.270943638 +0930
diff -uNr httpd-2.4.48/docs/conf/httpd.conf.in httpd-2.4.48-blfs_layout-1/docs/conf/httpd.conf.in
--- httpd-2.4.48/docs/conf/httpd.conf.in 2016-08-17 08:42:07.000000000 +0930
+++ httpd-2.4.48-blfs_layout-1/docs/conf/httpd.conf.in 2023-07-07 18:47:42.027924897 +0930
@@ -28,7 +28,7 @@
# same ServerRoot for multiple httpd daemons, you will need to change at
# least PidFile.
......@@ -140,9 +140,9 @@ diff -uNr httpd-2.4.43/docs/conf/httpd.conf.in httpd-2.4.43-blfs_layout-1/docs/c
</IfModule>
<IfModule alias_module>
diff -uNr httpd-2.4.43/include/ap_config_layout.h.in httpd-2.4.43-blfs_layout-1/include/ap_config_layout.h.in
--- httpd-2.4.43/include/ap_config_layout.h.in 2006-07-12 06:25:32.000000000 +0930
+++ httpd-2.4.43-blfs_layout-1/include/ap_config_layout.h.in 2021-07-27 09:41:30.270943638 +0930
diff -uNr httpd-2.4.48/include/ap_config_layout.h.in httpd-2.4.48-blfs_layout-1/include/ap_config_layout.h.in
--- httpd-2.4.48/include/ap_config_layout.h.in 2006-07-12 06:25:32.000000000 +0930
+++ httpd-2.4.48-blfs_layout-1/include/ap_config_layout.h.in 2023-07-07 18:47:42.027924897 +0930
@@ -60,5 +60,6 @@
#define DEFAULT_REL_LOGFILEDIR "@rel_logfiledir@"
#define DEFAULT_EXP_PROXYCACHEDIR "@exp_proxycachedir@"
......@@ -150,9 +150,9 @@ diff -uNr httpd-2.4.43/include/ap_config_layout.h.in httpd-2.4.43-blfs_layout-1/
+#define DEFAULT_PIDLOG "/var/run/httpd/httpd.pid"
#endif /* AP_CONFIG_LAYOUT_H */
diff -uNr httpd-2.4.43/include/httpd.h httpd-2.4.43-blfs_layout-1/include/httpd.h
--- httpd-2.4.43/include/httpd.h 2020-02-21 11:03:40.000000000 +1030
+++ httpd-2.4.43-blfs_layout-1/include/httpd.h 2021-07-27 09:41:30.270943638 +0930
diff -uNr httpd-2.4.48/include/httpd.h httpd-2.4.48-blfs_layout-1/include/httpd.h
--- httpd-2.4.48/include/httpd.h 2021-03-10 02:58:23.000000000 +1030
+++ httpd-2.4.48-blfs_layout-1/include/httpd.h 2023-07-07 18:47:42.028924899 +0930
@@ -109,7 +109,7 @@
#define DOCUMENT_LOCATION HTTPD_ROOT "/docs"
#else
......@@ -162,9 +162,9 @@ diff -uNr httpd-2.4.43/include/httpd.h httpd-2.4.43-blfs_layout-1/include/httpd.
#endif
#endif /* DOCUMENT_LOCATION */
diff -uNr httpd-2.4.43/Makefile.in httpd-2.4.43-blfs_layout-1/Makefile.in
--- httpd-2.4.43/Makefile.in 2018-08-08 21:18:15.000000000 +0930
+++ httpd-2.4.43-blfs_layout-1/Makefile.in 2021-07-27 09:41:30.271943642 +0930
diff -uNr httpd-2.4.48/Makefile.in httpd-2.4.48-blfs_layout-1/Makefile.in
--- httpd-2.4.48/Makefile.in 2021-02-11 21:21:19.000000000 +1030
+++ httpd-2.4.48-blfs_layout-1/Makefile.in 2023-07-07 18:47:42.028924899 +0930
@@ -121,9 +121,9 @@
done ; \
done ; \
......@@ -173,48 +173,48 @@ diff -uNr httpd-2.4.43/Makefile.in httpd-2.4.43-blfs_layout-1/Makefile.in
- if test ! -f $(DESTDIR)$(sbindir)/envvars; then \
- cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
+ install -o root -g root -m644 envvars-std $(DESTDIR)$(installbuilddir); \
+ if test ! -f $(DESTDIR)$(sysconfdir)/envvars; then \
+ install -o root -g root -m644 envvars-std $(DESTDIR)$(sysconfdir)/envvars ; \
+ if test ! -f $(DESTDIR)$(sysconfdir)/envvars; then \
+ install -o root -g root -m644 envvars-std $(DESTDIR)$(sysconfdir)/envvars; \
fi ; \
fi
@@ -175,7 +175,7 @@
@@ -195,7 +195,7 @@
if test -d $(htdocs-srcdir) && test "x$(RSYNC)" != "x" && test -x $(RSYNC) ; then \
$(RSYNC) --exclude .svn -rlpt --numeric-ids $(htdocs-srcdir)/ $(DESTDIR)$(htdocsdir)/; \
else \
- test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)) ; \
+ test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir) && chown -R root:root $(DESTDIR)$(htdocsdir)) ; \
+ test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir) && chown -R root:root $(DESTDIR)$(htdocsdir)) ; \
cd $(DESTDIR)$(htdocsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
fi; \
fi
@@ -186,7 +186,7 @@
@@ -206,7 +206,7 @@
else \
echo Installing error documents ; \
$(MKINSTALLDIRS) $(DESTDIR)$(errordir) ; \
- cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir) ; \
+ cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir) && chown -R root:root $(DESTDIR)$(errordir); \
+ cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir) && chown -R root:root $(DESTDIR)$(errordir); \
test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
fi
@@ -196,7 +196,7 @@
@@ -216,7 +216,7 @@
else \
echo Installing icons ; \
$(MKINSTALLDIRS) $(DESTDIR)$(iconsdir) ; \
- cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir) ; \
+ cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir) && chown -R root:root $(DESTDIR)$(iconsdir); \
+ cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir) && chown -R root:root $(DESTDIR)$(iconsdir); \
test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
fi
@@ -206,7 +206,7 @@
@@ -226,7 +226,7 @@
else \
echo Installing CGIs ; \
$(MKINSTALLDIRS) $(DESTDIR)$(cgidir) ; \
- cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir) ; \
+ cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir) && chown -R root:root $(DESTDIR)$(cgidir); \
+ cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir) && chown -R root:root $(DESTDIR)$(cgidir); \
test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
fi
@@ -260,12 +260,12 @@
@@ -280,12 +280,12 @@
@test -d $(DESTDIR)$(mandir)/man1 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1
@test -d $(DESTDIR)$(mandir)/man8 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man8
@test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
......@@ -226,13 +226,13 @@ diff -uNr httpd-2.4.43/Makefile.in httpd-2.4.43-blfs_layout-1/Makefile.in
$(RSYNC) --exclude .svn -rlpt --numeric-ids $(top_srcdir)/docs/manual/ $(DESTDIR)$(manualdir)/; \
else \
- cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir); \
+ cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir) && chown -R root:root $(DESTDIR)$(manualdir); \
+ cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir) && chown -R root:root $(DESTDIR)$(manualdir); \
cd $(DESTDIR)$(manualdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
fi
diff -uNr httpd-2.4.43/support/apachectl.in httpd-2.4.43-blfs_layout-1/support/apachectl.in
--- httpd-2.4.43/support/apachectl.in 2012-02-01 14:17:28.000000000 +1030
+++ httpd-2.4.43-blfs_layout-1/support/apachectl.in 2021-07-27 09:41:30.271943642 +0930
diff -uNr httpd-2.4.48/support/apachectl.in httpd-2.4.48-blfs_layout-1/support/apachectl.in
--- httpd-2.4.48/support/apachectl.in 2012-02-01 14:17:28.000000000 +1030
+++ httpd-2.4.48-blfs_layout-1/support/apachectl.in 2023-07-07 18:47:42.028924899 +0930
@@ -45,8 +45,8 @@
HTTPD='@exp_sbindir@/@progname@'
#
......@@ -244,9 +244,9 @@ diff -uNr httpd-2.4.43/support/apachectl.in httpd-2.4.43-blfs_layout-1/support/a
fi
#
# a command that outputs a formatted text version of the HTML at the
diff -uNr httpd-2.4.43/support/Makefile.in httpd-2.4.43-blfs_layout-1/support/Makefile.in
--- httpd-2.4.43/support/Makefile.in 2018-02-09 20:47:30.000000000 +1030
+++ httpd-2.4.43-blfs_layout-1/support/Makefile.in 2021-07-27 09:41:30.271943642 +0930
diff -uNr httpd-2.4.48/support/Makefile.in httpd-2.4.48-blfs_layout-1/support/Makefile.in
--- httpd-2.4.48/support/Makefile.in 2018-02-09 20:47:30.000000000 +1030
+++ httpd-2.4.48-blfs_layout-1/support/Makefile.in 2023-07-07 18:47:42.028924899 +0930
@@ -16,23 +16,23 @@
@test -d $(DESTDIR)$(bindir) || $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
@test -d $(DESTDIR)$(sbindir) || $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
......@@ -259,14 +259,14 @@ diff -uNr httpd-2.4.43/support/Makefile.in httpd-2.4.43-blfs_layout-1/support/Ma
if test -f "$(builddir)/$$i"; then \
- cp -p $$i $(DESTDIR)$(bindir); \
- chmod 755 $(DESTDIR)$(bindir)/$$i; \
+ install -o root -g root -m755 $$i $(DESTDIR)$(bindir); \
+ install -o root -g root -m755 $$i $(DESTDIR)$(bindir);\
fi ; \
done
@for i in apachectl; do \
if test -f "$(builddir)/$$i"; then \
- cp -p $$i $(DESTDIR)$(sbindir); \
- chmod 755 $(DESTDIR)$(sbindir)/$$i; \
+ install -o root -g root -m755 $$i $(DESTDIR)$(sbindir); \
+ install -o root -g root -m755 $$i $(DESTDIR)$(sbindir);\
fi ; \
done
@if test -f "$(builddir)/envvars-std"; then \
......@@ -274,8 +274,8 @@ diff -uNr httpd-2.4.43/support/Makefile.in httpd-2.4.43-blfs_layout-1/support/Ma
- if test ! -f $(DESTDIR)$(sbindir)/envvars; then \
- cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
+ install -o root -g root -m644 envvars-std $(DESTDIR)$(installbuilddir); \
+ if test ! -f $(DESTDIR)$(sysconfdir)/envvars; then \
+ install -o root -g root -m644 envvars-std $(DESTDIR)$(sysconfdir)/envvars ; \
+ if test ! -f $(DESTDIR)$(sysconfdir)/envvars; then \
+ install -o root -g root -m644 envvars-std $(DESTDIR)$(sysconfdir)/envvars; \
fi ; \
fi
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment