Skip to content

GitLab

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

Updated httpd to 2.4.39

parent b2a4894d
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 42 deletions
Makefile
View file @ 6fc5058f
...@@ -21,12 +21,12 @@ all: httpd-service ...@@ -21,12 +21,12 @@ all: httpd-service
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.26.tar.bz2 tar xf httpd-2.4.39.tar.bz2
patch -Np1 -d httpd-2.4.26 < httpd-2.4.26-blfs_layout-1.patch patch -Np1 -d httpd-2.4.39 < httpd-2.4.39-blfs_layout-1.patch
cd httpd-2.4.26 && sed '/dir.*CFG_PREFIX/s@^@#@' -i support/apxs.in cd httpd-2.4.39 && sed '/dir.*CFG_PREFIX/s@^@#@' -i support/apxs.in
cd httpd-2.4.26 && ./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.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
$(MAKE) -C httpd-2.4.26 $(MAKE) -C httpd-2.4.39
$(MAKE) -C httpd-2.4.26 install $(MAKE) -C httpd-2.4.39 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
...@@ -40,7 +40,7 @@ all: httpd-service ...@@ -40,7 +40,7 @@ all: httpd-service
@echo "d /run/httpd 755 root root -" > /usr/lib/tmpfiles.d/httpd.conf @echo "d /run/httpd 755 root root -" > /usr/lib/tmpfiles.d/httpd.conf
@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.26 rm -rf httpd-2.4.39
httpd-service: httpd-service:
define HTTPD_SERVICE define HTTPD_SERVICE
......
httpd-2.4.26-blfs_layout-1.patch → httpd-2.4.39-blfs_layout-1.patch
View file @ 6fc5058f
...@@ -3,15 +3,16 @@ Date: 2013-04-17 ...@@ -3,15 +3,16 @@ Date: 2013-04-17
Initial Package Version: 2.4.4 Initial Package Version: 2.4.4
Comment: rediffed for version 2.4.10 (Fernando de Oliveira Comment: rediffed for version 2.4.10 (Fernando de Oliveira
<famobr at yahoo dot com dot br>) <famobr at yahoo dot com dot br>)
rediffed for version 2.4.34 (thomas)
Upstream Status: Not applicable Upstream Status: Not applicable
Origin: Self Origin: Self
Description: Patches the build system to install stuff into BLFS Description: Patches the build system to install stuff into BLFS
specific paths, and adjusts proper permissions specific paths, and adjusts proper permissions
on installed files and directories. on installed files and directories.
diff -Naur httpd-2.4.10.orig/config.layout httpd-2.4.10/config.layout diff -Naur httpd-2.4.34.orig/config.layout httpd-2.4.34/config.layout
--- httpd-2.4.10.orig/config.layout 2012-04-17 11:01:41.000000000 -0300 --- httpd-2.4.34.orig/config.layout 2018-02-09 11:30:35.000000000 +0100
+++ httpd-2.4.10/config.layout 2014-07-23 09:06:17.325921549 -0300 +++ 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.)
## ##
...@@ -43,10 +44,10 @@ diff -Naur httpd-2.4.10.orig/config.layout httpd-2.4.10/config.layout ...@@ -43,10 +44,10 @@ diff -Naur httpd-2.4.10.orig/config.layout httpd-2.4.10/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.10.orig/configure httpd-2.4.10/configure diff -Naur httpd-2.4.34.orig/configure httpd-2.4.34/configure
--- httpd-2.4.10.orig/configure 2014-07-15 14:15:03.000000000 -0300 --- httpd-2.4.34.orig/configure 2018-07-10 15:55:14.000000000 +0200
+++ httpd-2.4.10/configure 2014-07-23 09:06:17.337921270 -0300 +++ httpd-2.4.34/configure 2018-07-15 07:31:23.232202853 +0200
@@ -33031,17 +33031,17 @@ @@ -39653,17 +39653,17 @@
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
...@@ -67,10 +68,10 @@ diff -Naur httpd-2.4.10.orig/configure httpd-2.4.10/configure ...@@ -67,10 +68,10 @@ diff -Naur httpd-2.4.10.orig/configure httpd-2.4.10/configure
_ACEOF _ACEOF
diff -Naur httpd-2.4.10.orig/configure.in httpd-2.4.10/configure.in diff -Naur httpd-2.4.34.orig/configure.in httpd-2.4.34/configure.in
--- httpd-2.4.10.orig/configure.in 2014-02-20 16:36:12.000000000 -0300 --- httpd-2.4.34.orig/configure.in 2018-05-30 21:09:00.000000000 +0200
+++ httpd-2.4.10/configure.in 2014-07-23 09:06:17.338921244 -0300 +++ httpd-2.4.34/configure.in 2018-07-15 07:31:23.235202841 +0200
@@ -826,11 +826,11 @@ @@ -871,11 +871,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)
...@@ -85,9 +86,9 @@ diff -Naur httpd-2.4.10.orig/configure.in httpd-2.4.10/configure.in ...@@ -85,9 +86,9 @@ diff -Naur httpd-2.4.10.orig/configure.in httpd-2.4.10/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.10.orig/docs/conf/httpd.conf.in httpd-2.4.10/docs/conf/httpd.conf.in diff -Naur httpd-2.4.34.orig/docs/conf/httpd.conf.in httpd-2.4.34/docs/conf/httpd.conf.in
--- httpd-2.4.10.orig/docs/conf/httpd.conf.in 2012-11-08 00:05:38.000000000 -0300 --- httpd-2.4.34.orig/docs/conf/httpd.conf.in 2016-08-17 01:12:07.000000000 +0200
+++ httpd-2.4.10/docs/conf/httpd.conf.in 2014-07-23 09:06:17.339921217 -0300 +++ httpd-2.4.34/docs/conf/httpd.conf.in 2018-07-15 07:31:23.236202837 +0200
@@ -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.
...@@ -151,9 +152,9 @@ diff -Naur httpd-2.4.10.orig/docs/conf/httpd.conf.in httpd-2.4.10/docs/conf/http ...@@ -151,9 +152,9 @@ diff -Naur httpd-2.4.10.orig/docs/conf/httpd.conf.in httpd-2.4.10/docs/conf/http
</IfModule> </IfModule>
<IfModule alias_module> <IfModule alias_module>
diff -Naur httpd-2.4.10.orig/include/ap_config_layout.h.in httpd-2.4.10/include/ap_config_layout.h.in diff -Naur httpd-2.4.34.orig/include/ap_config_layout.h.in httpd-2.4.34/include/ap_config_layout.h.in
--- httpd-2.4.10.orig/include/ap_config_layout.h.in 2006-07-11 17:55:32.000000000 -0300 --- httpd-2.4.34.orig/include/ap_config_layout.h.in 2006-07-11 22:55:32.000000000 +0200
+++ httpd-2.4.10/include/ap_config_layout.h.in 2014-07-23 09:06:17.340921189 -0300 +++ httpd-2.4.34/include/ap_config_layout.h.in 2018-07-15 07:31:23.237202833 +0200
@@ -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@"
...@@ -161,9 +162,9 @@ diff -Naur httpd-2.4.10.orig/include/ap_config_layout.h.in httpd-2.4.10/include/ ...@@ -161,9 +162,9 @@ diff -Naur httpd-2.4.10.orig/include/ap_config_layout.h.in httpd-2.4.10/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.10.orig/include/httpd.h httpd-2.4.10/include/httpd.h diff -Naur httpd-2.4.34.orig/include/httpd.h httpd-2.4.34/include/httpd.h
--- httpd-2.4.10.orig/include/httpd.h 2014-07-12 15:19:16.000000000 -0300 --- httpd-2.4.34.orig/include/httpd.h 2018-05-31 15:19:12.000000000 +0200
+++ httpd-2.4.10/include/httpd.h 2014-07-23 09:06:17.341921161 -0300 +++ httpd-2.4.34/include/httpd.h 2018-07-15 07:31:23.238202829 +0200
@@ -109,7 +109,7 @@ @@ -109,7 +109,7 @@
#define DOCUMENT_LOCATION HTTPD_ROOT "/docs" #define DOCUMENT_LOCATION HTTPD_ROOT "/docs"
#else #else
...@@ -173,10 +174,10 @@ diff -Naur httpd-2.4.10.orig/include/httpd.h httpd-2.4.10/include/httpd.h ...@@ -173,10 +174,10 @@ diff -Naur httpd-2.4.10.orig/include/httpd.h httpd-2.4.10/include/httpd.h
#endif #endif
#endif /* DOCUMENT_LOCATION */ #endif /* DOCUMENT_LOCATION */
diff -Naur httpd-2.4.10.orig/Makefile.in httpd-2.4.10/Makefile.in diff -Naur httpd-2.4.34.orig/Makefile.in httpd-2.4.34/Makefile.in
--- httpd-2.4.10.orig/Makefile.in 2012-12-17 08:50:41.000000000 -0300 --- httpd-2.4.34.orig/Makefile.in 2018-05-30 21:09:00.000000000 +0200
+++ httpd-2.4.10/Makefile.in 2014-07-23 09:06:17.341921161 -0300 +++ httpd-2.4.34/Makefile.in 2018-07-15 07:31:23.244202804 +0200
@@ -91,9 +91,9 @@ @@ -121,9 +121,9 @@
done ; \ done ; \
done ; \ done ; \
if test -f "$(builddir)/envvars-std"; then \ if test -f "$(builddir)/envvars-std"; then \
...@@ -189,7 +190,7 @@ diff -Naur httpd-2.4.10.orig/Makefile.in httpd-2.4.10/Makefile.in ...@@ -189,7 +190,7 @@ diff -Naur httpd-2.4.10.orig/Makefile.in httpd-2.4.10/Makefile.in
fi ; \ fi ; \
fi fi
@@ -145,7 +145,7 @@ @@ -175,7 +175,7 @@
if test -d $(htdocs-srcdir) && test "x$(RSYNC)" != "x" && test -x $(RSYNC) ; then \ if test -d $(htdocs-srcdir) && test "x$(RSYNC)" != "x" && test -x $(RSYNC) ; then \
$(RSYNC) --exclude .svn -rlpt --numeric-ids $(htdocs-srcdir)/ $(DESTDIR)$(htdocsdir)/; \ $(RSYNC) --exclude .svn -rlpt --numeric-ids $(htdocs-srcdir)/ $(DESTDIR)$(htdocsdir)/; \
else \ else \
...@@ -198,7 +199,7 @@ diff -Naur httpd-2.4.10.orig/Makefile.in httpd-2.4.10/Makefile.in ...@@ -198,7 +199,7 @@ diff -Naur httpd-2.4.10.orig/Makefile.in httpd-2.4.10/Makefile.in
cd $(DESTDIR)$(htdocsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \ cd $(DESTDIR)$(htdocsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
fi; \ fi; \
fi fi
@@ -156,7 +156,7 @@ @@ -186,7 +186,7 @@
else \ else \
echo Installing error documents ; \ echo Installing error documents ; \
$(MKINSTALLDIRS) $(DESTDIR)$(errordir) ; \ $(MKINSTALLDIRS) $(DESTDIR)$(errordir) ; \
...@@ -207,7 +208,7 @@ diff -Naur httpd-2.4.10.orig/Makefile.in httpd-2.4.10/Makefile.in ...@@ -207,7 +208,7 @@ diff -Naur httpd-2.4.10.orig/Makefile.in httpd-2.4.10/Makefile.in
test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \ test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
fi fi
@@ -166,7 +166,7 @@ @@ -196,7 +196,7 @@
else \ else \
echo Installing icons ; \ echo Installing icons ; \
$(MKINSTALLDIRS) $(DESTDIR)$(iconsdir) ; \ $(MKINSTALLDIRS) $(DESTDIR)$(iconsdir) ; \
...@@ -216,7 +217,7 @@ diff -Naur httpd-2.4.10.orig/Makefile.in httpd-2.4.10/Makefile.in ...@@ -216,7 +217,7 @@ diff -Naur httpd-2.4.10.orig/Makefile.in httpd-2.4.10/Makefile.in
test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \ test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
fi fi
@@ -176,7 +176,7 @@ @@ -206,7 +206,7 @@
else \ else \
echo Installing CGIs ; \ echo Installing CGIs ; \
$(MKINSTALLDIRS) $(DESTDIR)$(cgidir) ; \ $(MKINSTALLDIRS) $(DESTDIR)$(cgidir) ; \
...@@ -225,7 +226,7 @@ diff -Naur httpd-2.4.10.orig/Makefile.in httpd-2.4.10/Makefile.in ...@@ -225,7 +226,7 @@ diff -Naur httpd-2.4.10.orig/Makefile.in httpd-2.4.10/Makefile.in
test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \ test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
fi fi
@@ -229,12 +229,12 @@ @@ -260,12 +260,12 @@
@test -d $(DESTDIR)$(mandir)/man1 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1 @test -d $(DESTDIR)$(mandir)/man1 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1
@test -d $(DESTDIR)$(mandir)/man8 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man8 @test -d $(DESTDIR)$(mandir)/man8 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man8
@test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir) @test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
...@@ -241,9 +242,9 @@ diff -Naur httpd-2.4.10.orig/Makefile.in httpd-2.4.10/Makefile.in ...@@ -241,9 +242,9 @@ diff -Naur httpd-2.4.10.orig/Makefile.in httpd-2.4.10/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.10.orig/support/apachectl.in httpd-2.4.10/support/apachectl.in diff -Naur httpd-2.4.34.orig/support/apachectl.in httpd-2.4.34/support/apachectl.in
--- httpd-2.4.10.orig/support/apachectl.in 2012-02-01 00:47:28.000000000 -0300 --- httpd-2.4.34.orig/support/apachectl.in 2012-02-01 04:47:28.000000000 +0100
+++ httpd-2.4.10/support/apachectl.in 2014-07-23 09:06:17.342921133 -0300 +++ httpd-2.4.34/support/apachectl.in 2018-07-15 07:31:23.244202804 +0200
@@ -45,8 +45,8 @@ @@ -45,8 +45,8 @@
HTTPD='@exp_sbindir@/@progname@' HTTPD='@exp_sbindir@/@progname@'
# #
...@@ -255,9 +256,9 @@ diff -Naur httpd-2.4.10.orig/support/apachectl.in httpd-2.4.10/support/apachectl ...@@ -255,9 +256,9 @@ diff -Naur httpd-2.4.10.orig/support/apachectl.in httpd-2.4.10/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.10.orig/support/Makefile.in httpd-2.4.10/support/Makefile.in diff -Naur httpd-2.4.34.orig/support/Makefile.in httpd-2.4.34/support/Makefile.in
--- httpd-2.4.10.orig/support/Makefile.in 2012-12-11 07:37:25.000000000 -0300 --- httpd-2.4.34.orig/support/Makefile.in 2018-02-09 11:17:30.000000000 +0100
+++ httpd-2.4.10/support/Makefile.in 2014-07-23 09:06:17.342921133 -0300 +++ httpd-2.4.34/support/Makefile.in 2018-07-15 07:31:23.245202800 +0200
@@ -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