Skip to content

GitLab

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

Updated httpd to 2.4.39

parent 26c23bd8
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 48 deletions
Makefile
View file @ 03e52c76
...@@ -21,12 +21,12 @@ all: httpd-service httpd-logrotate ...@@ -21,12 +21,12 @@ all: httpd-service httpd-logrotate
ln -sv /data/etc/shadow /etc/shadow ln -sv /data/etc/shadow /etc/shadow
mv -v /etc/gshadow /data/etc/gshadow mv -v /etc/gshadow /data/etc/gshadow
ln -sv /data/etc/gshadow /etc/gshadow ln -sv /data/etc/gshadow /etc/gshadow
tar xf httpd-2.4.39.tar.bz2 tar xf httpd-2.4.43.tar.bz2
patch -Np1 -d httpd-2.4.39 < httpd-2.4.39-blfs_layout-1.patch patch -Np1 -d httpd-2.4.43 < httpd-2.4.43-blfs_layout-1.patch
cd httpd-2.4.39 && sed '/dir.*CFG_PREFIX/s@^@#@' -i support/apxs.in cd httpd-2.4.43 && sed '/dir.*CFG_PREFIX/s@^@#@' -i support/apxs.in
cd httpd-2.4.39 && ./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 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.39 $(MAKE) -C httpd-2.4.43
$(MAKE) -C httpd-2.4.39 install $(MAKE) -C httpd-2.4.43 install
mv -v /usr/sbin/suexec /usr/lib/httpd/suexec mv -v /usr/sbin/suexec /usr/lib/httpd/suexec
chgrp apache /usr/lib/httpd/suexec chgrp apache /usr/lib/httpd/suexec
chmod 4754 /usr/lib/httpd/suexec chmod 4754 /usr/lib/httpd/suexec
...@@ -44,7 +44,7 @@ all: httpd-service httpd-logrotate ...@@ -44,7 +44,7 @@ all: httpd-service httpd-logrotate
@echo "$$HTTPD_LOGROTATE" > /etc/logrotate.d/httpd @echo "$$HTTPD_LOGROTATE" > /etc/logrotate.d/httpd
@echo "$$HTTPD_SERVICE" > /lib/systemd/system/httpd.service @echo "$$HTTPD_SERVICE" > /lib/systemd/system/httpd.service
systemctl enable httpd.service systemctl enable httpd.service
rm -rf httpd-2.4.39 rm -rf httpd-2.4.43
httpd-service: httpd-service:
define HTTPD_SERVICE define HTTPD_SERVICE
......
httpd-2.4.39-blfs_layout-1.patch → httpd-2.4.43-blfs_layout-1.patch
View file @ 03e52c76
Submitted By: Armin K. <krejzi at email dot com> diff -uNr httpd-2.4.43/config.layout httpd-2.4.43-blfs_layout-1/config.layout
Date: 2013-04-17 --- httpd-2.4.43/config.layout 2020-02-21 11:09:22.000000000 +1030
Initial Package Version: 2.4.4 +++ httpd-2.4.43-blfs_layout-1/config.layout 2021-07-27 09:41:30.267943629 +0930
Comment: rediffed for version 2.4.10 (Fernando de Oliveira
<famobr at yahoo dot com dot br>)
rediffed for version 2.4.34 (thomas)
Upstream Status: Not applicable
Origin: Self
Description: Patches the build system to install stuff into BLFS
specific paths, and adjusts proper permissions
on installed files and directories.
diff -Naur httpd-2.4.34.orig/config.layout httpd-2.4.34/config.layout
--- httpd-2.4.34.orig/config.layout 2018-02-09 11:30:35.000000000 +0100
+++ httpd-2.4.34/config.layout 2018-07-15 07:31:23.216202917 +0200
@@ -9,6 +9,30 @@ @@ -9,6 +9,30 @@
## (This may become a configurable parameter at some point.) ## (This may become a configurable parameter at some point.)
## ##
...@@ -44,10 +32,10 @@ diff -Naur httpd-2.4.34.orig/config.layout httpd-2.4.34/config.layout ...@@ -44,10 +32,10 @@ diff -Naur httpd-2.4.34.orig/config.layout httpd-2.4.34/config.layout
# Classical Apache path layout. # Classical Apache path layout.
<Layout Apache> <Layout Apache>
prefix: /usr/local/apache2 prefix: /usr/local/apache2
diff -Naur httpd-2.4.34.orig/configure httpd-2.4.34/configure diff -uNr httpd-2.4.43/configure httpd-2.4.43-blfs_layout-1/configure
--- httpd-2.4.34.orig/configure 2018-07-10 15:55:14.000000000 +0200 --- httpd-2.4.43/configure 2020-03-27 01:16:47.000000000 +1030
+++ httpd-2.4.34/configure 2018-07-15 07:31:23.232202853 +0200 +++ httpd-2.4.43-blfs_layout-1/configure 2021-07-27 09:41:30.270943638 +0930
@@ -39653,17 +39653,17 @@ @@ -40151,17 +40151,17 @@
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
...@@ -68,10 +56,10 @@ diff -Naur httpd-2.4.34.orig/configure httpd-2.4.34/configure ...@@ -68,10 +56,10 @@ diff -Naur httpd-2.4.34.orig/configure httpd-2.4.34/configure
_ACEOF _ACEOF
diff -Naur httpd-2.4.34.orig/configure.in httpd-2.4.34/configure.in diff -uNr httpd-2.4.43/configure.in httpd-2.4.43-blfs_layout-1/configure.in
--- httpd-2.4.34.orig/configure.in 2018-05-30 21:09:00.000000000 +0200 --- httpd-2.4.43/configure.in 2020-02-03 18:26:05.000000000 +1030
+++ httpd-2.4.34/configure.in 2018-07-15 07:31:23.235202841 +0200 +++ httpd-2.4.43-blfs_layout-1/configure.in 2021-07-27 09:41:30.270943638 +0930
@@ -871,11 +871,11 @@ @@ -873,11 +873,11 @@
echo $MODLIST | $AWK -f $srcdir/build/build-modules-c.awk > modules.c echo $MODLIST | $AWK -f $srcdir/build/build-modules-c.awk > modules.c
APR_EXPAND_VAR(ap_prefix, $prefix) APR_EXPAND_VAR(ap_prefix, $prefix)
...@@ -86,9 +74,9 @@ diff -Naur httpd-2.4.34.orig/configure.in httpd-2.4.34/configure.in ...@@ -86,9 +74,9 @@ diff -Naur httpd-2.4.34.orig/configure.in httpd-2.4.34/configure.in
[Location of the MIME types config file, relative to the Apache root directory]) [Location of the MIME types config file, relative to the Apache root directory])
perlbin=`$ac_aux_dir/PrintPath perl` perlbin=`$ac_aux_dir/PrintPath perl`
diff -Naur httpd-2.4.34.orig/docs/conf/httpd.conf.in httpd-2.4.34/docs/conf/httpd.conf.in 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.34.orig/docs/conf/httpd.conf.in 2016-08-17 01:12:07.000000000 +0200 --- httpd-2.4.43/docs/conf/httpd.conf.in 2016-08-17 08:42:07.000000000 +0930
+++ httpd-2.4.34/docs/conf/httpd.conf.in 2018-07-15 07:31:23.236202837 +0200 +++ httpd-2.4.43-blfs_layout-1/docs/conf/httpd.conf.in 2021-07-27 09:41:30.270943638 +0930
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
# same ServerRoot for multiple httpd daemons, you will need to change at # same ServerRoot for multiple httpd daemons, you will need to change at
# least PidFile. # least PidFile.
...@@ -152,9 +140,9 @@ diff -Naur httpd-2.4.34.orig/docs/conf/httpd.conf.in httpd-2.4.34/docs/conf/http ...@@ -152,9 +140,9 @@ diff -Naur httpd-2.4.34.orig/docs/conf/httpd.conf.in httpd-2.4.34/docs/conf/http
</IfModule> </IfModule>
<IfModule alias_module> <IfModule alias_module>
diff -Naur httpd-2.4.34.orig/include/ap_config_layout.h.in httpd-2.4.34/include/ap_config_layout.h.in 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.34.orig/include/ap_config_layout.h.in 2006-07-11 22:55:32.000000000 +0200 --- httpd-2.4.43/include/ap_config_layout.h.in 2006-07-12 06:25:32.000000000 +0930
+++ httpd-2.4.34/include/ap_config_layout.h.in 2018-07-15 07:31:23.237202833 +0200 +++ httpd-2.4.43-blfs_layout-1/include/ap_config_layout.h.in 2021-07-27 09:41:30.270943638 +0930
@@ -60,5 +60,6 @@ @@ -60,5 +60,6 @@
#define DEFAULT_REL_LOGFILEDIR "@rel_logfiledir@" #define DEFAULT_REL_LOGFILEDIR "@rel_logfiledir@"
#define DEFAULT_EXP_PROXYCACHEDIR "@exp_proxycachedir@" #define DEFAULT_EXP_PROXYCACHEDIR "@exp_proxycachedir@"
...@@ -162,9 +150,9 @@ diff -Naur httpd-2.4.34.orig/include/ap_config_layout.h.in httpd-2.4.34/include/ ...@@ -162,9 +150,9 @@ diff -Naur httpd-2.4.34.orig/include/ap_config_layout.h.in httpd-2.4.34/include/
+#define DEFAULT_PIDLOG "/var/run/httpd/httpd.pid" +#define DEFAULT_PIDLOG "/var/run/httpd/httpd.pid"
#endif /* AP_CONFIG_LAYOUT_H */ #endif /* AP_CONFIG_LAYOUT_H */
diff -Naur httpd-2.4.34.orig/include/httpd.h httpd-2.4.34/include/httpd.h diff -uNr httpd-2.4.43/include/httpd.h httpd-2.4.43-blfs_layout-1/include/httpd.h
--- httpd-2.4.34.orig/include/httpd.h 2018-05-31 15:19:12.000000000 +0200 --- httpd-2.4.43/include/httpd.h 2020-02-21 11:03:40.000000000 +1030
+++ httpd-2.4.34/include/httpd.h 2018-07-15 07:31:23.238202829 +0200 +++ httpd-2.4.43-blfs_layout-1/include/httpd.h 2021-07-27 09:41:30.270943638 +0930
@@ -109,7 +109,7 @@ @@ -109,7 +109,7 @@
#define DOCUMENT_LOCATION HTTPD_ROOT "/docs" #define DOCUMENT_LOCATION HTTPD_ROOT "/docs"
#else #else
...@@ -174,9 +162,9 @@ diff -Naur httpd-2.4.34.orig/include/httpd.h httpd-2.4.34/include/httpd.h ...@@ -174,9 +162,9 @@ diff -Naur httpd-2.4.34.orig/include/httpd.h httpd-2.4.34/include/httpd.h
#endif #endif
#endif /* DOCUMENT_LOCATION */ #endif /* DOCUMENT_LOCATION */
diff -Naur httpd-2.4.34.orig/Makefile.in httpd-2.4.34/Makefile.in diff -uNr httpd-2.4.43/Makefile.in httpd-2.4.43-blfs_layout-1/Makefile.in
--- httpd-2.4.34.orig/Makefile.in 2018-05-30 21:09:00.000000000 +0200 --- httpd-2.4.43/Makefile.in 2018-08-08 21:18:15.000000000 +0930
+++ httpd-2.4.34/Makefile.in 2018-07-15 07:31:23.244202804 +0200 +++ httpd-2.4.43-blfs_layout-1/Makefile.in 2021-07-27 09:41:30.271943642 +0930
@@ -121,9 +121,9 @@ @@ -121,9 +121,9 @@
done ; \ done ; \
done ; \ done ; \
...@@ -242,9 +230,9 @@ diff -Naur httpd-2.4.34.orig/Makefile.in httpd-2.4.34/Makefile.in ...@@ -242,9 +230,9 @@ diff -Naur httpd-2.4.34.orig/Makefile.in httpd-2.4.34/Makefile.in
cd $(DESTDIR)$(manualdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \ cd $(DESTDIR)$(manualdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
fi fi
diff -Naur httpd-2.4.34.orig/support/apachectl.in httpd-2.4.34/support/apachectl.in diff -uNr httpd-2.4.43/support/apachectl.in httpd-2.4.43-blfs_layout-1/support/apachectl.in
--- httpd-2.4.34.orig/support/apachectl.in 2012-02-01 04:47:28.000000000 +0100 --- httpd-2.4.43/support/apachectl.in 2012-02-01 14:17:28.000000000 +1030
+++ httpd-2.4.34/support/apachectl.in 2018-07-15 07:31:23.244202804 +0200 +++ httpd-2.4.43-blfs_layout-1/support/apachectl.in 2021-07-27 09:41:30.271943642 +0930
@@ -45,8 +45,8 @@ @@ -45,8 +45,8 @@
HTTPD='@exp_sbindir@/@progname@' HTTPD='@exp_sbindir@/@progname@'
# #
...@@ -256,9 +244,9 @@ diff -Naur httpd-2.4.34.orig/support/apachectl.in httpd-2.4.34/support/apachectl ...@@ -256,9 +244,9 @@ diff -Naur httpd-2.4.34.orig/support/apachectl.in httpd-2.4.34/support/apachectl
fi fi
# #
# a command that outputs a formatted text version of the HTML at the # a command that outputs a formatted text version of the HTML at the
diff -Naur httpd-2.4.34.orig/support/Makefile.in httpd-2.4.34/support/Makefile.in diff -uNr httpd-2.4.43/support/Makefile.in httpd-2.4.43-blfs_layout-1/support/Makefile.in
--- httpd-2.4.34.orig/support/Makefile.in 2018-02-09 11:17:30.000000000 +0100 --- httpd-2.4.43/support/Makefile.in 2018-02-09 20:47:30.000000000 +1030
+++ httpd-2.4.34/support/Makefile.in 2018-07-15 07:31:23.245202800 +0200 +++ httpd-2.4.43-blfs_layout-1/support/Makefile.in 2021-07-27 09:41:30.271943642 +0930
@@ -16,23 +16,23 @@ @@ -16,23 +16,23 @@
@test -d $(DESTDIR)$(bindir) || $(MKINSTALLDIRS) $(DESTDIR)$(bindir) @test -d $(DESTDIR)$(bindir) || $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
@test -d $(DESTDIR)$(sbindir) || $(MKINSTALLDIRS) $(DESTDIR)$(sbindir) @test -d $(DESTDIR)$(sbindir) || $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
......
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