[arch-commits] Commit in apache/repos (24 files)
Anatol Pomozov
anatolik at archlinux.org
Tue Jun 20 20:06:05 UTC 2017
Date: Tuesday, June 20, 2017 @ 20:06:00
Author: anatolik
Revision: 299081
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
apache/repos/testing-i686/PKGBUILD
(from rev 299080, apache/trunk/PKGBUILD)
apache/repos/testing-i686/apache.tmpfiles.conf
(from rev 299080, apache/trunk/apache.tmpfiles.conf)
apache/repos/testing-i686/arch.layout
(from rev 299080, apache/trunk/arch.layout)
apache/repos/testing-i686/httpd.logrotate
(from rev 299080, apache/trunk/httpd.logrotate)
apache/repos/testing-i686/httpd.service
(from rev 299080, apache/trunk/httpd.service)
apache/repos/testing-i686/openssl-malloc-init.patch
(from rev 299080, apache/trunk/openssl-malloc-init.patch)
apache/repos/testing-x86_64/PKGBUILD
(from rev 299080, apache/trunk/PKGBUILD)
apache/repos/testing-x86_64/apache.tmpfiles.conf
(from rev 299080, apache/trunk/apache.tmpfiles.conf)
apache/repos/testing-x86_64/arch.layout
(from rev 299080, apache/trunk/arch.layout)
apache/repos/testing-x86_64/httpd.logrotate
(from rev 299080, apache/trunk/httpd.logrotate)
apache/repos/testing-x86_64/httpd.service
(from rev 299080, apache/trunk/httpd.service)
apache/repos/testing-x86_64/openssl-malloc-init.patch
(from rev 299080, apache/trunk/openssl-malloc-init.patch)
Deleted:
apache/repos/testing-i686/PKGBUILD
apache/repos/testing-i686/apache.tmpfiles.conf
apache/repos/testing-i686/arch.layout
apache/repos/testing-i686/httpd.logrotate
apache/repos/testing-i686/httpd.service
apache/repos/testing-i686/openssl-malloc-init.patch
apache/repos/testing-x86_64/PKGBUILD
apache/repos/testing-x86_64/apache.tmpfiles.conf
apache/repos/testing-x86_64/arch.layout
apache/repos/testing-x86_64/httpd.logrotate
apache/repos/testing-x86_64/httpd.service
apache/repos/testing-x86_64/openssl-malloc-init.patch
------------------------------------------+
/PKGBUILD | 246 +++++++++++++++++++++++++++++
/apache.tmpfiles.conf | 2
/arch.layout | 44 +++++
/httpd.logrotate | 14 +
/httpd.service | 30 +++
/openssl-malloc-init.patch | 40 ++++
testing-i686/PKGBUILD | 123 --------------
testing-i686/apache.tmpfiles.conf | 1
testing-i686/arch.layout | 22 --
testing-i686/httpd.logrotate | 7
testing-i686/httpd.service | 15 -
testing-i686/openssl-malloc-init.patch | 20 --
testing-x86_64/PKGBUILD | 123 --------------
testing-x86_64/apache.tmpfiles.conf | 1
testing-x86_64/arch.layout | 22 --
testing-x86_64/httpd.logrotate | 7
testing-x86_64/httpd.service | 15 -
testing-x86_64/openssl-malloc-init.patch | 20 --
18 files changed, 376 insertions(+), 376 deletions(-)
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2017-06-20 19:54:43 UTC (rev 299080)
+++ testing-i686/PKGBUILD 2017-06-20 20:06:00 UTC (rev 299081)
@@ -1,123 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=apache
-pkgver=2.4.26
-pkgrel=1
-pkgdesc='A high performance Unix-based HTTP server'
-arch=('i686' 'x86_64')
-url='http://www.apache.org/dist/httpd'
-license=('APACHE')
-backup=(
- etc/httpd/conf/httpd.conf
- etc/httpd/conf/extra/httpd-{autoindex,dav,default,info,languages}.conf
- etc/httpd/conf/extra/httpd-{manual,mpm,multilang-errordoc}.conf
- etc/httpd/conf/extra/httpd-{ssl,userdir,vhosts}.conf
- etc/httpd/conf/extra/proxy-html.conf
- etc/httpd/conf/{mime.types,magic}
- etc/logrotate.d/httpd
-)
-depends=('zlib' 'apr-util' 'pcre' 'libnghttp2' 'openssl')
-makedepends=('libxml2' 'lua')
-optdepends=(
- 'lua: for mod_lua module'
- 'libxml2: for mod_proxy_html, mod_xml2enc modules'
- 'lynx: apachectl status'
-)
-source=(
- https://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2{,.asc}
- openssl-malloc-init.patch
- apache.tmpfiles.conf
- httpd.logrotate
- httpd.service
- arch.layout
-)
-sha256sums=('a07eb52fafc879e0149d31882f7da63173e72df4478db4dc69f7a775b663d387'
- 'SKIP'
- 'd305f8b52ac2a9bbda7bb0776496471e69e9d30642740f594d00086a8c7e344c'
- '63da1a420f4714a3e7af2672d28384419cc7eedbe7bf35baebd02938fabc15bf'
- '0bbbfae23a917b2fce0bf8f900f60319b50769224a96314e9301a75ccd078e16'
- 'f574bac6d5f398e7a649fc0e1ca66ff01ad4ef34dac71258e93d8a9d9a2b3960'
- 'dda05c6e76f12624e418ca18a36f2e90ec1c5b1cc52fed7142fce6076ec413f3')
-validpgpkeys=('A93D62ECC3C8EA12DB220EC934EA76E6791485A8') # Jim Jagielski
-
-prepare() {
- cd httpd-${pkgver}
-
- # set default user
- sed -e 's#User daemon#User http#' \
- -e 's#Group daemon#Group http#' \
- -i docs/conf/httpd.conf.in
-
- cat "${srcdir}/arch.layout" >> config.layout
-
- # https://github.com/openssl/openssl/issues/2865
- patch -Np1 -i ../openssl-malloc-init.patch
-}
-
-build() {
- cd httpd-${pkgver}
-
- ./configure --sbindir=/usr/bin \
- --enable-layout=Arch \
- --enable-mpms-shared=all \
- --enable-modules=all \
- --enable-mods-shared=all \
- --enable-so \
- --enable-suexec \
- --with-suexec-caller=http \
- --with-suexec-docroot=/srv/http \
- --with-suexec-logfile=/var/log/httpd/suexec.log \
- --with-suexec-bin=/usr/bin/suexec \
- --with-suexec-uidmin=99 --with-suexec-gidmin=99 \
- --enable-ldap --enable-authnz-ldap --enable-authnz-fcgi \
- --enable-cache --enable-disk-cache --enable-mem-cache --enable-file-cache \
- --enable-ssl --with-ssl \
- --enable-deflate --enable-cgi --enable-cgid \
- --enable-proxy --enable-proxy-connect \
- --enable-proxy-http --enable-proxy-ftp \
- --enable-dbd --enable-imagemap --enable-ident --enable-cern-meta \
- --enable-lua --enable-xml2enc --enable-http2 \
- --with-apr=/usr/bin/apr-1-config \
- --with-apr-util=/usr/bin/apu-1-config \
- --with-pcre=/usr
-
- make
-}
-
-package() {
- cd httpd-${pkgver}
-
- make DESTDIR="${pkgdir}" install
-
- install -D -m644 "${srcdir}/httpd.logrotate" "${pkgdir}/etc/logrotate.d/httpd"
- install -D -m644 "${srcdir}/apache.tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/apache.conf"
- install -D -m644 "${srcdir}/httpd.service" "${pkgdir}/usr/lib/systemd/system/httpd.service"
- install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
- # symlinks for /etc/httpd
- # do we really need this symlink?
- ln -fs /usr/lib/httpd/modules "${pkgdir}/etc/httpd/modules"
-
- # set sane defaults
- sed -e 's#/usr/lib/httpd/modules/#modules/#' \
- -e 's|#\(LoadModule negotiation_module \)|\1|' \
- -e 's|#\(LoadModule include_module \)|\1|' \
- -e 's|#\(LoadModule userdir_module \)|\1|' \
- -e 's|#\(LoadModule slotmem_shm_module \)|\1|' \
- -e 's|#\(Include conf/extra/httpd-multilang-errordoc.conf\)|\1|' \
- -e 's|#\(Include conf/extra/httpd-autoindex.conf\)|\1|' \
- -e 's|#\(Include conf/extra/httpd-languages.conf\)|\1|' \
- -e 's|#\(Include conf/extra/httpd-userdir.conf\)|\1|' \
- -e 's|#\(Include conf/extra/httpd-default.conf\)|\1|' \
- -e 's|#\(Include conf/extra/httpd-mpm.conf\)|\1|' \
- -i "${pkgdir}/etc/httpd/conf/httpd.conf"
-
- # cleanup
- rm -r "${pkgdir}/usr/share/httpd/manual"
- rm -r "${pkgdir}/etc/httpd/conf/original"
- rm -r "${pkgdir}/srv/"
- rm -r "${pkgdir}/run"
-}
Copied: apache/repos/testing-i686/PKGBUILD (from rev 299080, apache/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2017-06-20 20:06:00 UTC (rev 299081)
@@ -0,0 +1,123 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=apache
+pkgver=2.4.26
+pkgrel=1
+pkgdesc='A high performance Unix-based HTTP server'
+arch=('i686' 'x86_64')
+url='http://www.apache.org/dist/httpd'
+license=('APACHE')
+backup=(
+ etc/httpd/conf/httpd.conf
+ etc/httpd/conf/extra/httpd-{autoindex,dav,default,info,languages}.conf
+ etc/httpd/conf/extra/httpd-{manual,mpm,multilang-errordoc}.conf
+ etc/httpd/conf/extra/httpd-{ssl,userdir,vhosts}.conf
+ etc/httpd/conf/extra/proxy-html.conf
+ etc/httpd/conf/{mime.types,magic}
+ etc/logrotate.d/httpd
+)
+depends=('zlib' 'apr-util' 'pcre' 'libnghttp2' 'openssl')
+makedepends=('libxml2' 'lua')
+optdepends=(
+ 'lua: for mod_lua module'
+ 'libxml2: for mod_proxy_html, mod_xml2enc modules'
+ 'lynx: apachectl status'
+)
+source=(
+ https://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2{,.asc}
+ openssl-malloc-init.patch
+ apache.tmpfiles.conf
+ httpd.logrotate
+ httpd.service
+ arch.layout
+)
+sha256sums=('a07eb52fafc879e0149d31882f7da63173e72df4478db4dc69f7a775b663d387'
+ 'SKIP'
+ 'd305f8b52ac2a9bbda7bb0776496471e69e9d30642740f594d00086a8c7e344c'
+ '63da1a420f4714a3e7af2672d28384419cc7eedbe7bf35baebd02938fabc15bf'
+ '0bbbfae23a917b2fce0bf8f900f60319b50769224a96314e9301a75ccd078e16'
+ 'f574bac6d5f398e7a649fc0e1ca66ff01ad4ef34dac71258e93d8a9d9a2b3960'
+ 'dda05c6e76f12624e418ca18a36f2e90ec1c5b1cc52fed7142fce6076ec413f3')
+validpgpkeys=('A93D62ECC3C8EA12DB220EC934EA76E6791485A8') # Jim Jagielski
+
+prepare() {
+ cd httpd-${pkgver}
+
+ # set default user
+ sed -e 's#User daemon#User http#' \
+ -e 's#Group daemon#Group http#' \
+ -i docs/conf/httpd.conf.in
+
+ cat "${srcdir}/arch.layout" >> config.layout
+
+ # https://github.com/openssl/openssl/issues/2865
+ patch -Np1 -i ../openssl-malloc-init.patch
+}
+
+build() {
+ cd httpd-${pkgver}
+
+ ./configure --sbindir=/usr/bin \
+ --enable-layout=Arch \
+ --enable-mpms-shared=all \
+ --enable-modules=all \
+ --enable-mods-shared=all \
+ --enable-so \
+ --enable-suexec \
+ --with-suexec-caller=http \
+ --with-suexec-docroot=/srv/http \
+ --with-suexec-logfile=/var/log/httpd/suexec.log \
+ --with-suexec-bin=/usr/bin/suexec \
+ --with-suexec-uidmin=99 --with-suexec-gidmin=99 \
+ --enable-ldap --enable-authnz-ldap --enable-authnz-fcgi \
+ --enable-cache --enable-disk-cache --enable-mem-cache --enable-file-cache \
+ --enable-ssl --with-ssl \
+ --enable-deflate --enable-cgi --enable-cgid \
+ --enable-proxy --enable-proxy-connect \
+ --enable-proxy-http --enable-proxy-ftp \
+ --enable-dbd --enable-imagemap --enable-ident --enable-cern-meta \
+ --enable-lua --enable-xml2enc --enable-http2 \
+ --with-apr=/usr/bin/apr-1-config \
+ --with-apr-util=/usr/bin/apu-1-config \
+ --with-pcre=/usr
+
+ make
+}
+
+package() {
+ cd httpd-${pkgver}
+
+ make DESTDIR="${pkgdir}" install
+
+ install -D -m644 "${srcdir}/httpd.logrotate" "${pkgdir}/etc/logrotate.d/httpd"
+ install -D -m644 "${srcdir}/apache.tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/apache.conf"
+ install -D -m644 "${srcdir}/httpd.service" "${pkgdir}/usr/lib/systemd/system/httpd.service"
+ install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
+ # symlinks for /etc/httpd
+ # do we really need this symlink?
+ ln -fs /usr/lib/httpd/modules "${pkgdir}/etc/httpd/modules"
+
+ # set sane defaults
+ sed -e 's#/usr/lib/httpd/modules/#modules/#' \
+ -e 's|#\(LoadModule negotiation_module \)|\1|' \
+ -e 's|#\(LoadModule include_module \)|\1|' \
+ -e 's|#\(LoadModule userdir_module \)|\1|' \
+ -e 's|#\(LoadModule slotmem_shm_module \)|\1|' \
+ -e 's|#\(Include conf/extra/httpd-multilang-errordoc.conf\)|\1|' \
+ -e 's|#\(Include conf/extra/httpd-autoindex.conf\)|\1|' \
+ -e 's|#\(Include conf/extra/httpd-languages.conf\)|\1|' \
+ -e 's|#\(Include conf/extra/httpd-userdir.conf\)|\1|' \
+ -e 's|#\(Include conf/extra/httpd-default.conf\)|\1|' \
+ -e 's|#\(Include conf/extra/httpd-mpm.conf\)|\1|' \
+ -i "${pkgdir}/etc/httpd/conf/httpd.conf"
+
+ # cleanup
+ rm -r "${pkgdir}/usr/share/httpd/manual"
+ rm -r "${pkgdir}/etc/httpd/conf/original"
+ rm -r "${pkgdir}/srv/"
+ rm -r "${pkgdir}/run"
+}
Deleted: testing-i686/apache.tmpfiles.conf
===================================================================
--- testing-i686/apache.tmpfiles.conf 2017-06-20 19:54:43 UTC (rev 299080)
+++ testing-i686/apache.tmpfiles.conf 2017-06-20 20:06:00 UTC (rev 299081)
@@ -1 +0,0 @@
-d /run/httpd 0755 root root -
Copied: apache/repos/testing-i686/apache.tmpfiles.conf (from rev 299080, apache/trunk/apache.tmpfiles.conf)
===================================================================
--- testing-i686/apache.tmpfiles.conf (rev 0)
+++ testing-i686/apache.tmpfiles.conf 2017-06-20 20:06:00 UTC (rev 299081)
@@ -0,0 +1 @@
+d /run/httpd 0755 root root -
Deleted: testing-i686/arch.layout
===================================================================
--- testing-i686/arch.layout 2017-06-20 19:54:43 UTC (rev 299080)
+++ testing-i686/arch.layout 2017-06-20 20:06:00 UTC (rev 299081)
@@ -1,22 +0,0 @@
-<Layout Arch>
- prefix: /etc/httpd
- exec_prefix: /usr
- bindir: /usr/bin
- sbindir: /usr/bin
- libdir: /usr/lib/httpd
- libexecdir: /usr/lib/httpd/modules
- mandir: /usr/share/man
- sysconfdir: /etc/httpd/conf
- datadir: /usr/share/httpd
- installbuilddir: /usr/lib/httpd/build
- errordir: /usr/share/httpd/error
- iconsdir: /usr/share/httpd/icons
- htdocsdir: /srv/http
- manualdir: /usr/share/httpd/manual
- cgidir: /srv/http/cgi-bin
- includedir: /usr/include/httpd
- localstatedir: /var
- runtimedir: /run/httpd
- logfiledir: /var/log/httpd
- proxycachedir: /var/cache/httpd
-</Layout>
\ No newline at end of file
Copied: apache/repos/testing-i686/arch.layout (from rev 299080, apache/trunk/arch.layout)
===================================================================
--- testing-i686/arch.layout (rev 0)
+++ testing-i686/arch.layout 2017-06-20 20:06:00 UTC (rev 299081)
@@ -0,0 +1,22 @@
+<Layout Arch>
+ prefix: /etc/httpd
+ exec_prefix: /usr
+ bindir: /usr/bin
+ sbindir: /usr/bin
+ libdir: /usr/lib/httpd
+ libexecdir: /usr/lib/httpd/modules
+ mandir: /usr/share/man
+ sysconfdir: /etc/httpd/conf
+ datadir: /usr/share/httpd
+ installbuilddir: /usr/lib/httpd/build
+ errordir: /usr/share/httpd/error
+ iconsdir: /usr/share/httpd/icons
+ htdocsdir: /srv/http
+ manualdir: /usr/share/httpd/manual
+ cgidir: /srv/http/cgi-bin
+ includedir: /usr/include/httpd
+ localstatedir: /var
+ runtimedir: /run/httpd
+ logfiledir: /var/log/httpd
+ proxycachedir: /var/cache/httpd
+</Layout>
\ No newline at end of file
Deleted: testing-i686/httpd.logrotate
===================================================================
--- testing-i686/httpd.logrotate 2017-06-20 19:54:43 UTC (rev 299080)
+++ testing-i686/httpd.logrotate 2017-06-20 20:06:00 UTC (rev 299081)
@@ -1,7 +0,0 @@
-/var/log/httpd/*log {
- missingok
- sharedscripts
- postrotate
- /usr/bin/systemctl reload httpd.service 2>/dev/null || true
- endscript
-}
Copied: apache/repos/testing-i686/httpd.logrotate (from rev 299080, apache/trunk/httpd.logrotate)
===================================================================
--- testing-i686/httpd.logrotate (rev 0)
+++ testing-i686/httpd.logrotate 2017-06-20 20:06:00 UTC (rev 299081)
@@ -0,0 +1,7 @@
+/var/log/httpd/*log {
+ missingok
+ sharedscripts
+ postrotate
+ /usr/bin/systemctl reload httpd.service 2>/dev/null || true
+ endscript
+}
Deleted: testing-i686/httpd.service
===================================================================
--- testing-i686/httpd.service 2017-06-20 19:54:43 UTC (rev 299080)
+++ testing-i686/httpd.service 2017-06-20 20:06:00 UTC (rev 299081)
@@ -1,15 +0,0 @@
-[Unit]
-Description=Apache Web Server
-After=network.target remote-fs.target nss-lookup.target
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/httpd -k start -DFOREGROUND
-ExecStop=/usr/bin/httpd -k graceful-stop
-ExecReload=/usr/bin/httpd -k graceful
-PrivateTmp=true
-LimitNOFILE=infinity
-KillMode=mixed
-
-[Install]
-WantedBy=multi-user.target
Copied: apache/repos/testing-i686/httpd.service (from rev 299080, apache/trunk/httpd.service)
===================================================================
--- testing-i686/httpd.service (rev 0)
+++ testing-i686/httpd.service 2017-06-20 20:06:00 UTC (rev 299081)
@@ -0,0 +1,15 @@
+[Unit]
+Description=Apache Web Server
+After=network.target remote-fs.target nss-lookup.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/httpd -k start -DFOREGROUND
+ExecStop=/usr/bin/httpd -k graceful-stop
+ExecReload=/usr/bin/httpd -k graceful
+PrivateTmp=true
+LimitNOFILE=infinity
+KillMode=mixed
+
+[Install]
+WantedBy=multi-user.target
Deleted: testing-i686/openssl-malloc-init.patch
===================================================================
--- testing-i686/openssl-malloc-init.patch 2017-06-20 19:54:43 UTC (rev 299080)
+++ testing-i686/openssl-malloc-init.patch 2017-06-20 20:06:00 UTC (rev 299081)
@@ -1,20 +0,0 @@
---- httpd-2.4.25/support/ab.c.orig 2017-05-21 21:59:17.131193359 +0000
-+++ httpd-2.4.25/support/ab.c 2017-05-21 22:01:34.704322361 +0000
-@@ -2496,6 +2496,8 @@
- heartbeatres = 0;
-
- #ifdef USE_SSL
-+ SSL_load_error_strings();
-+ SSL_library_init();
- #ifdef RSAREF
- R_malloc_init();
- #else
-@@ -2505,8 +2507,6 @@
- OPENSSL_malloc_init();
- #endif
- #endif
-- SSL_load_error_strings();
-- SSL_library_init();
- bio_out=BIO_new_fp(stdout,BIO_NOCLOSE);
- bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
-
Copied: apache/repos/testing-i686/openssl-malloc-init.patch (from rev 299080, apache/trunk/openssl-malloc-init.patch)
===================================================================
--- testing-i686/openssl-malloc-init.patch (rev 0)
+++ testing-i686/openssl-malloc-init.patch 2017-06-20 20:06:00 UTC (rev 299081)
@@ -0,0 +1,20 @@
+--- httpd-2.4.25/support/ab.c.orig 2017-05-21 21:59:17.131193359 +0000
++++ httpd-2.4.25/support/ab.c 2017-05-21 22:01:34.704322361 +0000
+@@ -2496,6 +2496,8 @@
+ heartbeatres = 0;
+
+ #ifdef USE_SSL
++ SSL_load_error_strings();
++ SSL_library_init();
+ #ifdef RSAREF
+ R_malloc_init();
+ #else
+@@ -2505,8 +2507,6 @@
+ OPENSSL_malloc_init();
+ #endif
+ #endif
+- SSL_load_error_strings();
+- SSL_library_init();
+ bio_out=BIO_new_fp(stdout,BIO_NOCLOSE);
+ bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
+
Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2017-06-20 19:54:43 UTC (rev 299080)
+++ testing-x86_64/PKGBUILD 2017-06-20 20:06:00 UTC (rev 299081)
@@ -1,123 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=apache
-pkgver=2.4.26
-pkgrel=1
-pkgdesc='A high performance Unix-based HTTP server'
-arch=('i686' 'x86_64')
-url='http://www.apache.org/dist/httpd'
-license=('APACHE')
-backup=(
- etc/httpd/conf/httpd.conf
- etc/httpd/conf/extra/httpd-{autoindex,dav,default,info,languages}.conf
- etc/httpd/conf/extra/httpd-{manual,mpm,multilang-errordoc}.conf
- etc/httpd/conf/extra/httpd-{ssl,userdir,vhosts}.conf
- etc/httpd/conf/extra/proxy-html.conf
- etc/httpd/conf/{mime.types,magic}
- etc/logrotate.d/httpd
-)
-depends=('zlib' 'apr-util' 'pcre' 'libnghttp2' 'openssl')
-makedepends=('libxml2' 'lua')
-optdepends=(
- 'lua: for mod_lua module'
- 'libxml2: for mod_proxy_html, mod_xml2enc modules'
- 'lynx: apachectl status'
-)
-source=(
- https://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2{,.asc}
- openssl-malloc-init.patch
- apache.tmpfiles.conf
- httpd.logrotate
- httpd.service
- arch.layout
-)
-sha256sums=('a07eb52fafc879e0149d31882f7da63173e72df4478db4dc69f7a775b663d387'
- 'SKIP'
- 'd305f8b52ac2a9bbda7bb0776496471e69e9d30642740f594d00086a8c7e344c'
- '63da1a420f4714a3e7af2672d28384419cc7eedbe7bf35baebd02938fabc15bf'
- '0bbbfae23a917b2fce0bf8f900f60319b50769224a96314e9301a75ccd078e16'
- 'f574bac6d5f398e7a649fc0e1ca66ff01ad4ef34dac71258e93d8a9d9a2b3960'
- 'dda05c6e76f12624e418ca18a36f2e90ec1c5b1cc52fed7142fce6076ec413f3')
-validpgpkeys=('A93D62ECC3C8EA12DB220EC934EA76E6791485A8') # Jim Jagielski
-
-prepare() {
- cd httpd-${pkgver}
-
- # set default user
- sed -e 's#User daemon#User http#' \
- -e 's#Group daemon#Group http#' \
- -i docs/conf/httpd.conf.in
-
- cat "${srcdir}/arch.layout" >> config.layout
-
- # https://github.com/openssl/openssl/issues/2865
- patch -Np1 -i ../openssl-malloc-init.patch
-}
-
-build() {
- cd httpd-${pkgver}
-
- ./configure --sbindir=/usr/bin \
- --enable-layout=Arch \
- --enable-mpms-shared=all \
- --enable-modules=all \
- --enable-mods-shared=all \
- --enable-so \
- --enable-suexec \
- --with-suexec-caller=http \
- --with-suexec-docroot=/srv/http \
- --with-suexec-logfile=/var/log/httpd/suexec.log \
- --with-suexec-bin=/usr/bin/suexec \
- --with-suexec-uidmin=99 --with-suexec-gidmin=99 \
- --enable-ldap --enable-authnz-ldap --enable-authnz-fcgi \
- --enable-cache --enable-disk-cache --enable-mem-cache --enable-file-cache \
- --enable-ssl --with-ssl \
- --enable-deflate --enable-cgi --enable-cgid \
- --enable-proxy --enable-proxy-connect \
- --enable-proxy-http --enable-proxy-ftp \
- --enable-dbd --enable-imagemap --enable-ident --enable-cern-meta \
- --enable-lua --enable-xml2enc --enable-http2 \
- --with-apr=/usr/bin/apr-1-config \
- --with-apr-util=/usr/bin/apu-1-config \
- --with-pcre=/usr
-
- make
-}
-
-package() {
- cd httpd-${pkgver}
-
- make DESTDIR="${pkgdir}" install
-
- install -D -m644 "${srcdir}/httpd.logrotate" "${pkgdir}/etc/logrotate.d/httpd"
- install -D -m644 "${srcdir}/apache.tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/apache.conf"
- install -D -m644 "${srcdir}/httpd.service" "${pkgdir}/usr/lib/systemd/system/httpd.service"
- install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
- # symlinks for /etc/httpd
- # do we really need this symlink?
- ln -fs /usr/lib/httpd/modules "${pkgdir}/etc/httpd/modules"
-
- # set sane defaults
- sed -e 's#/usr/lib/httpd/modules/#modules/#' \
- -e 's|#\(LoadModule negotiation_module \)|\1|' \
- -e 's|#\(LoadModule include_module \)|\1|' \
- -e 's|#\(LoadModule userdir_module \)|\1|' \
- -e 's|#\(LoadModule slotmem_shm_module \)|\1|' \
- -e 's|#\(Include conf/extra/httpd-multilang-errordoc.conf\)|\1|' \
- -e 's|#\(Include conf/extra/httpd-autoindex.conf\)|\1|' \
- -e 's|#\(Include conf/extra/httpd-languages.conf\)|\1|' \
- -e 's|#\(Include conf/extra/httpd-userdir.conf\)|\1|' \
- -e 's|#\(Include conf/extra/httpd-default.conf\)|\1|' \
- -e 's|#\(Include conf/extra/httpd-mpm.conf\)|\1|' \
- -i "${pkgdir}/etc/httpd/conf/httpd.conf"
-
- # cleanup
- rm -r "${pkgdir}/usr/share/httpd/manual"
- rm -r "${pkgdir}/etc/httpd/conf/original"
- rm -r "${pkgdir}/srv/"
- rm -r "${pkgdir}/run"
-}
Copied: apache/repos/testing-x86_64/PKGBUILD (from rev 299080, apache/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2017-06-20 20:06:00 UTC (rev 299081)
@@ -0,0 +1,123 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=apache
+pkgver=2.4.26
+pkgrel=1
+pkgdesc='A high performance Unix-based HTTP server'
+arch=('i686' 'x86_64')
+url='http://www.apache.org/dist/httpd'
+license=('APACHE')
+backup=(
+ etc/httpd/conf/httpd.conf
+ etc/httpd/conf/extra/httpd-{autoindex,dav,default,info,languages}.conf
+ etc/httpd/conf/extra/httpd-{manual,mpm,multilang-errordoc}.conf
+ etc/httpd/conf/extra/httpd-{ssl,userdir,vhosts}.conf
+ etc/httpd/conf/extra/proxy-html.conf
+ etc/httpd/conf/{mime.types,magic}
+ etc/logrotate.d/httpd
+)
+depends=('zlib' 'apr-util' 'pcre' 'libnghttp2' 'openssl')
+makedepends=('libxml2' 'lua')
+optdepends=(
+ 'lua: for mod_lua module'
+ 'libxml2: for mod_proxy_html, mod_xml2enc modules'
+ 'lynx: apachectl status'
+)
+source=(
+ https://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2{,.asc}
+ openssl-malloc-init.patch
+ apache.tmpfiles.conf
+ httpd.logrotate
+ httpd.service
+ arch.layout
+)
+sha256sums=('a07eb52fafc879e0149d31882f7da63173e72df4478db4dc69f7a775b663d387'
+ 'SKIP'
+ 'd305f8b52ac2a9bbda7bb0776496471e69e9d30642740f594d00086a8c7e344c'
+ '63da1a420f4714a3e7af2672d28384419cc7eedbe7bf35baebd02938fabc15bf'
+ '0bbbfae23a917b2fce0bf8f900f60319b50769224a96314e9301a75ccd078e16'
+ 'f574bac6d5f398e7a649fc0e1ca66ff01ad4ef34dac71258e93d8a9d9a2b3960'
+ 'dda05c6e76f12624e418ca18a36f2e90ec1c5b1cc52fed7142fce6076ec413f3')
+validpgpkeys=('A93D62ECC3C8EA12DB220EC934EA76E6791485A8') # Jim Jagielski
+
+prepare() {
+ cd httpd-${pkgver}
+
+ # set default user
+ sed -e 's#User daemon#User http#' \
+ -e 's#Group daemon#Group http#' \
+ -i docs/conf/httpd.conf.in
+
+ cat "${srcdir}/arch.layout" >> config.layout
+
+ # https://github.com/openssl/openssl/issues/2865
+ patch -Np1 -i ../openssl-malloc-init.patch
+}
+
+build() {
+ cd httpd-${pkgver}
+
+ ./configure --sbindir=/usr/bin \
+ --enable-layout=Arch \
+ --enable-mpms-shared=all \
+ --enable-modules=all \
+ --enable-mods-shared=all \
+ --enable-so \
+ --enable-suexec \
+ --with-suexec-caller=http \
+ --with-suexec-docroot=/srv/http \
+ --with-suexec-logfile=/var/log/httpd/suexec.log \
+ --with-suexec-bin=/usr/bin/suexec \
+ --with-suexec-uidmin=99 --with-suexec-gidmin=99 \
+ --enable-ldap --enable-authnz-ldap --enable-authnz-fcgi \
+ --enable-cache --enable-disk-cache --enable-mem-cache --enable-file-cache \
+ --enable-ssl --with-ssl \
+ --enable-deflate --enable-cgi --enable-cgid \
+ --enable-proxy --enable-proxy-connect \
+ --enable-proxy-http --enable-proxy-ftp \
+ --enable-dbd --enable-imagemap --enable-ident --enable-cern-meta \
+ --enable-lua --enable-xml2enc --enable-http2 \
+ --with-apr=/usr/bin/apr-1-config \
+ --with-apr-util=/usr/bin/apu-1-config \
+ --with-pcre=/usr
+
+ make
+}
+
+package() {
+ cd httpd-${pkgver}
+
+ make DESTDIR="${pkgdir}" install
+
+ install -D -m644 "${srcdir}/httpd.logrotate" "${pkgdir}/etc/logrotate.d/httpd"
+ install -D -m644 "${srcdir}/apache.tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/apache.conf"
+ install -D -m644 "${srcdir}/httpd.service" "${pkgdir}/usr/lib/systemd/system/httpd.service"
+ install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
+ # symlinks for /etc/httpd
+ # do we really need this symlink?
+ ln -fs /usr/lib/httpd/modules "${pkgdir}/etc/httpd/modules"
+
+ # set sane defaults
+ sed -e 's#/usr/lib/httpd/modules/#modules/#' \
+ -e 's|#\(LoadModule negotiation_module \)|\1|' \
+ -e 's|#\(LoadModule include_module \)|\1|' \
+ -e 's|#\(LoadModule userdir_module \)|\1|' \
+ -e 's|#\(LoadModule slotmem_shm_module \)|\1|' \
+ -e 's|#\(Include conf/extra/httpd-multilang-errordoc.conf\)|\1|' \
+ -e 's|#\(Include conf/extra/httpd-autoindex.conf\)|\1|' \
+ -e 's|#\(Include conf/extra/httpd-languages.conf\)|\1|' \
+ -e 's|#\(Include conf/extra/httpd-userdir.conf\)|\1|' \
+ -e 's|#\(Include conf/extra/httpd-default.conf\)|\1|' \
+ -e 's|#\(Include conf/extra/httpd-mpm.conf\)|\1|' \
+ -i "${pkgdir}/etc/httpd/conf/httpd.conf"
+
+ # cleanup
+ rm -r "${pkgdir}/usr/share/httpd/manual"
+ rm -r "${pkgdir}/etc/httpd/conf/original"
+ rm -r "${pkgdir}/srv/"
+ rm -r "${pkgdir}/run"
+}
Deleted: testing-x86_64/apache.tmpfiles.conf
===================================================================
--- testing-x86_64/apache.tmpfiles.conf 2017-06-20 19:54:43 UTC (rev 299080)
+++ testing-x86_64/apache.tmpfiles.conf 2017-06-20 20:06:00 UTC (rev 299081)
@@ -1 +0,0 @@
-d /run/httpd 0755 root root -
Copied: apache/repos/testing-x86_64/apache.tmpfiles.conf (from rev 299080, apache/trunk/apache.tmpfiles.conf)
===================================================================
--- testing-x86_64/apache.tmpfiles.conf (rev 0)
+++ testing-x86_64/apache.tmpfiles.conf 2017-06-20 20:06:00 UTC (rev 299081)
@@ -0,0 +1 @@
+d /run/httpd 0755 root root -
Deleted: testing-x86_64/arch.layout
===================================================================
--- testing-x86_64/arch.layout 2017-06-20 19:54:43 UTC (rev 299080)
+++ testing-x86_64/arch.layout 2017-06-20 20:06:00 UTC (rev 299081)
@@ -1,22 +0,0 @@
-<Layout Arch>
- prefix: /etc/httpd
- exec_prefix: /usr
- bindir: /usr/bin
- sbindir: /usr/bin
- libdir: /usr/lib/httpd
- libexecdir: /usr/lib/httpd/modules
- mandir: /usr/share/man
- sysconfdir: /etc/httpd/conf
- datadir: /usr/share/httpd
- installbuilddir: /usr/lib/httpd/build
- errordir: /usr/share/httpd/error
- iconsdir: /usr/share/httpd/icons
- htdocsdir: /srv/http
- manualdir: /usr/share/httpd/manual
- cgidir: /srv/http/cgi-bin
- includedir: /usr/include/httpd
- localstatedir: /var
- runtimedir: /run/httpd
- logfiledir: /var/log/httpd
- proxycachedir: /var/cache/httpd
-</Layout>
\ No newline at end of file
Copied: apache/repos/testing-x86_64/arch.layout (from rev 299080, apache/trunk/arch.layout)
===================================================================
--- testing-x86_64/arch.layout (rev 0)
+++ testing-x86_64/arch.layout 2017-06-20 20:06:00 UTC (rev 299081)
@@ -0,0 +1,22 @@
+<Layout Arch>
+ prefix: /etc/httpd
+ exec_prefix: /usr
+ bindir: /usr/bin
+ sbindir: /usr/bin
+ libdir: /usr/lib/httpd
+ libexecdir: /usr/lib/httpd/modules
+ mandir: /usr/share/man
+ sysconfdir: /etc/httpd/conf
+ datadir: /usr/share/httpd
+ installbuilddir: /usr/lib/httpd/build
+ errordir: /usr/share/httpd/error
+ iconsdir: /usr/share/httpd/icons
+ htdocsdir: /srv/http
+ manualdir: /usr/share/httpd/manual
+ cgidir: /srv/http/cgi-bin
+ includedir: /usr/include/httpd
+ localstatedir: /var
+ runtimedir: /run/httpd
+ logfiledir: /var/log/httpd
+ proxycachedir: /var/cache/httpd
+</Layout>
\ No newline at end of file
Deleted: testing-x86_64/httpd.logrotate
===================================================================
--- testing-x86_64/httpd.logrotate 2017-06-20 19:54:43 UTC (rev 299080)
+++ testing-x86_64/httpd.logrotate 2017-06-20 20:06:00 UTC (rev 299081)
@@ -1,7 +0,0 @@
-/var/log/httpd/*log {
- missingok
- sharedscripts
- postrotate
- /usr/bin/systemctl reload httpd.service 2>/dev/null || true
- endscript
-}
Copied: apache/repos/testing-x86_64/httpd.logrotate (from rev 299080, apache/trunk/httpd.logrotate)
===================================================================
--- testing-x86_64/httpd.logrotate (rev 0)
+++ testing-x86_64/httpd.logrotate 2017-06-20 20:06:00 UTC (rev 299081)
@@ -0,0 +1,7 @@
+/var/log/httpd/*log {
+ missingok
+ sharedscripts
+ postrotate
+ /usr/bin/systemctl reload httpd.service 2>/dev/null || true
+ endscript
+}
Deleted: testing-x86_64/httpd.service
===================================================================
--- testing-x86_64/httpd.service 2017-06-20 19:54:43 UTC (rev 299080)
+++ testing-x86_64/httpd.service 2017-06-20 20:06:00 UTC (rev 299081)
@@ -1,15 +0,0 @@
-[Unit]
-Description=Apache Web Server
-After=network.target remote-fs.target nss-lookup.target
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/httpd -k start -DFOREGROUND
-ExecStop=/usr/bin/httpd -k graceful-stop
-ExecReload=/usr/bin/httpd -k graceful
-PrivateTmp=true
-LimitNOFILE=infinity
-KillMode=mixed
-
-[Install]
-WantedBy=multi-user.target
Copied: apache/repos/testing-x86_64/httpd.service (from rev 299080, apache/trunk/httpd.service)
===================================================================
--- testing-x86_64/httpd.service (rev 0)
+++ testing-x86_64/httpd.service 2017-06-20 20:06:00 UTC (rev 299081)
@@ -0,0 +1,15 @@
+[Unit]
+Description=Apache Web Server
+After=network.target remote-fs.target nss-lookup.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/httpd -k start -DFOREGROUND
+ExecStop=/usr/bin/httpd -k graceful-stop
+ExecReload=/usr/bin/httpd -k graceful
+PrivateTmp=true
+LimitNOFILE=infinity
+KillMode=mixed
+
+[Install]
+WantedBy=multi-user.target
Deleted: testing-x86_64/openssl-malloc-init.patch
===================================================================
--- testing-x86_64/openssl-malloc-init.patch 2017-06-20 19:54:43 UTC (rev 299080)
+++ testing-x86_64/openssl-malloc-init.patch 2017-06-20 20:06:00 UTC (rev 299081)
@@ -1,20 +0,0 @@
---- httpd-2.4.25/support/ab.c.orig 2017-05-21 21:59:17.131193359 +0000
-+++ httpd-2.4.25/support/ab.c 2017-05-21 22:01:34.704322361 +0000
-@@ -2496,6 +2496,8 @@
- heartbeatres = 0;
-
- #ifdef USE_SSL
-+ SSL_load_error_strings();
-+ SSL_library_init();
- #ifdef RSAREF
- R_malloc_init();
- #else
-@@ -2505,8 +2507,6 @@
- OPENSSL_malloc_init();
- #endif
- #endif
-- SSL_load_error_strings();
-- SSL_library_init();
- bio_out=BIO_new_fp(stdout,BIO_NOCLOSE);
- bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
-
Copied: apache/repos/testing-x86_64/openssl-malloc-init.patch (from rev 299080, apache/trunk/openssl-malloc-init.patch)
===================================================================
--- testing-x86_64/openssl-malloc-init.patch (rev 0)
+++ testing-x86_64/openssl-malloc-init.patch 2017-06-20 20:06:00 UTC (rev 299081)
@@ -0,0 +1,20 @@
+--- httpd-2.4.25/support/ab.c.orig 2017-05-21 21:59:17.131193359 +0000
++++ httpd-2.4.25/support/ab.c 2017-05-21 22:01:34.704322361 +0000
+@@ -2496,6 +2496,8 @@
+ heartbeatres = 0;
+
+ #ifdef USE_SSL
++ SSL_load_error_strings();
++ SSL_library_init();
+ #ifdef RSAREF
+ R_malloc_init();
+ #else
+@@ -2505,8 +2507,6 @@
+ OPENSSL_malloc_init();
+ #endif
+ #endif
+- SSL_load_error_strings();
+- SSL_library_init();
+ bio_out=BIO_new_fp(stdout,BIO_NOCLOSE);
+ bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
+
More information about the arch-commits
mailing list