Date: Wednesday, October 14, 2020 @ 19:05:03
Author: jelle
Revision: 398351
archrelease: copy trunk to extra-x86_64
Added:
apache/repos/extra-x86_64/PKGBUILD
(from rev 398350, apache/trunk/PKGBUILD)
apache/repos/extra-x86_64/apache-2.2-optionsbleed-CVE-2017-9798.patch
(from rev 398350, apache/trunk/apache-2.2-optionsbleed-CVE-2017-9798.patch)
apache/repos/extra-x86_64/apache.tmpfiles.conf
(from rev 398350, apache/trunk/apache.tmpfiles.conf)
apache/repos/extra-x86_64/arch.layout
(from rev 398350, apache/trunk/arch.layout)
apache/repos/extra-x86_64/httpd.logrotate
(from rev 398350, apache/trunk/httpd.logrotate)
apache/repos/extra-x86_64/httpd.service
(from rev 398350, apache/trunk/httpd.service)
apache/repos/extra-x86_64/nohttp2forprefork.patch
(from rev 398350, apache/trunk/nohttp2forprefork.patch)
apache/repos/extra-x86_64/openssl-malloc-init.patch
(from rev 398350, apache/trunk/openssl-malloc-init.patch)
apache/repos/extra-x86_64/script_name.patch
(from rev 398350, apache/trunk/script_name.patch)
Deleted:
apache/repos/extra-x86_64/PKGBUILD
apache/repos/extra-x86_64/apache-2.2-optionsbleed-CVE-2017-9798.patch
apache/repos/extra-x86_64/apache.tmpfiles.conf
apache/repos/extra-x86_64/arch.layout
apache/repos/extra-x86_64/httpd.logrotate
apache/repos/extra-x86_64/httpd.service
apache/repos/extra-x86_64/nohttp2forprefork.patch
apache/repos/extra-x86_64/openssl-malloc-init.patch
apache/repos/extra-x86_64/script_name.patch
-+
PKGBUILD| 265 +++---
apache-2.2-optionsbleed-CVE-2017-9798.patch | 42 -
apache.tmpfiles.conf|2
arch.layout | 44 -
httpd.logrotate | 14
httpd.service | 30
nohttp2forprefork.patch | 1012 +-
openssl-malloc-init.patch | 40 -
script_name.patch | 168 ++--
9 files changed, 809 insertions(+), 808 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2020-10-14 19:04:52 UTC (rev 398350)
+++ PKGBUILD2020-10-14 19:05:03 UTC (rev 398351)
@@ -1,132 +0,0 @@
-# Maintainer: Jan de Groot
-# Contributor: Andrea Scarpino
-# Contributor: Pierre Schmitz
-
-pkgname=apache
-pkgver=2.4.46
-pkgrel=2
-pkgdesc='A high performance Unix-based HTTP server'
-arch=('x86_64')
-url='https://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
-)
-provides=('mod_proxy_uwsgi')
-conflicts=('mod_proxy_uwsgi')
-replaces=('mod_proxy_uwsgi')
-depends=('zlib' 'apr-util' 'pcre' 'libnghttp2' 'openssl' 'libxcrypt')
-makedepends=('libxml2' 'lua53' 'curl' 'brotli' 'jansson')
-optdepends=(
-'lua53: for mod_lua module'
-'libxml2: for mod_proxy_html, mod_xml2enc modules'
-'curl: for mod_md module'
-'jansson: for mod_md module'
-'brotli: for mod_brotli module'
-'uwsgi: for mod_proxy_uwsgi module'
-'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=('740eddf6e1c641992b22359cabc66e6325868c3c5e2e3f98faf349b61ecf41ea'
-'SKIP'
-'d305f8b52ac2a9bbda7bb0776496471e69e9d30642740f594d00086a8c7e344c'
-'63da1a420f4714a3e7af2672d28384419cc7eedbe7bf35baebd02938fabc15bf'
-'0bbbfae23a917b2fce0bf8f900f60319b50769224a96314e9301a75ccd078e16'
-'f574bac6d5f398e7a649fc0e1ca66ff01ad4ef34dac71258e93d8a9d9a2b3960'
-'dda05c6e76f12624e418ca18a36f2e90ec1c5b1cc52fed7142fce6076ec413f3')
-validpgpkeys=('A93D62ECC3C8EA12DB220EC934EA76E6791485A8' # Jim Jagielski
- 'B9E8213AEFB861AF35A41F2C995E35221AD84DFF'
- 'E3480043595621FE56105F112AB12A7ADC55C003') # Daniel Ruggeri
-
-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 \
- --wi
