[arch-commits] Commit in apache/trunk (PKGBUILD apache.install)
Date: Wednesday, January 11, 2017 @ 17:48:53
Author: anatolik
Revision: 285695
systemd-tmpfiles invokation moved to hooks
Modified:
apache/trunk/PKGBUILD
Deleted:
apache/trunk/apache.install
+
PKGBUILD |1 -
apache.install | 16
2 files changed, 17 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-01-11 17:46:49 UTC (rev 285694)
+++ PKGBUILD2017-01-11 17:48:53 UTC (rev 285695)
@@ -28,7 +28,6 @@
'nghttp2: for mod_http2 module'
'lynx: apachectl status'
)
-install=apache.install
source=(
https://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2{,.asc}
apache.tmpfiles.conf
Deleted: apache.install
===
--- apache.install 2017-01-11 17:46:49 UTC (rev 285694)
+++ apache.install 2017-01-11 17:48:53 UTC (rev 285695)
@@ -1,16 +0,0 @@
-post_install() {
- if type -P systemd-tmpfiles &> /dev/null; then
-systemd-tmpfiles --create apache.conf
- fi
-}
-
-post_upgrade() {
- if type -P systemd-tmpfiles &> /dev/null; then
-systemd-tmpfiles --create apache.conf
- fi
-
- if [[ $2 == 2\.2\.* ]]; then
-# it is a major upgrade, show a useful link to upgrade instructions
-echo 'Check Apache upgrade instructions:
https://httpd.apache.org/docs/2.4/upgrading.html'
- fi
-}
[arch-commits] Commit in apache/trunk (PKGBUILD apache.install)
Date: Saturday, March 8, 2014 @ 15:47:59
Author: anatolik
Revision: 207390
Enable the rest of modules, move openssl to optional as it needed only for
mod_ssl.
Modified:
apache/trunk/PKGBUILD
apache/trunk/apache.install
+
PKGBUILD | 42 ++
apache.install |4 ++--
2 files changed, 28 insertions(+), 18 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-03-08 14:00:43 UTC (rev 207389)
+++ PKGBUILD2014-03-08 14:47:59 UTC (rev 207390)
@@ -10,21 +10,31 @@
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=('openssl' 'zlib' 'apr-util' 'pcre' 'systemd')
-optdepends=('lynx: apachectl status')
+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')
+makedepends=('libxml2' 'lua' 'openssl')
+optdepends=(
+'lua: for mod_lua support'
+'openssl: for mod_ssl support'
+'libxml2: for mod_xml2enc support'
+'lynx: apachectl status'
+)
install=apache.install
-source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2{,.asc}
-apache.tmpfiles.conf
-httpd.logrotate
-httpd.service
-arch.layout)
+source=(
+http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2{,.asc}
+apache.tmpfiles.conf
+httpd.logrotate
+httpd.service
+arch.layout
+)
sha256sums=('64368d8301836815ae237f2b62d909711c896c1bd34573771e0ee5ad808ce71b'
'SKIP'
'63da1a420f4714a3e7af2672d28384419cc7eedbe7bf35baebd02938fabc15bf'
@@ -60,7 +70,8 @@
--enable-deflate --enable-cgi --enable-cgid \
--enable-proxy --enable-proxy-connect \
--enable-proxy-http --enable-proxy-ftp \
- --enable-dbd \
+ --enable-dbd --enable-imagemap --enable-ident --enable-cern-meta \
+ --enable-lua --enable-xml2enc \
--with-apr=/usr/bin/apr-1-config \
--with-apr-util=/usr/bin/apu-1-config \
--with-pcre=/usr
@@ -76,7 +87,6 @@
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
Modified: apache.install
===
--- apache.install 2014-03-08 14:00:43 UTC (rev 207389)
+++ apache.install 2014-03-08 14:47:59 UTC (rev 207390)
@@ -1,9 +1,9 @@
post_install() {
- systemd-tmpfiles --create apache.conf
+ type -P systemd-tmpfiles /dev/null systemd-tmpfiles --create apache.conf
}
post_upgrade() {
- systemd-tmpfiles --create apache.conf
+ type -P systemd-tmpfiles /dev/null systemd-tmpfiles --create apache.conf
if [[ $2 == 2\.2\.* ]]; then
# it is a major upgrade, show a useful link to upgrade instructions
[arch-commits] Commit in apache/trunk (PKGBUILD apache.install)
Date: Monday, March 18, 2013 @ 15:03:50
Author: jgc
Revision: 180168
Update, includes config option to fix CRIME attack (FS#33561)
Fix install scriptlet, depend on systemd for this (FS#34334)
upgpkg: apache 2.2.24-1
Modified:
apache/trunk/PKGBUILD
apache/trunk/apache.install
+
PKGBUILD |8
apache.install |6 +-
2 files changed, 9 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-03-18 13:36:39 UTC (rev 180167)
+++ PKGBUILD2013-03-18 14:03:50 UTC (rev 180168)
@@ -4,7 +4,7 @@
# Contributor: Pierre Schmitz pie...@archlinux.de
pkgname=apache
-pkgver=2.2.23
+pkgver=2.2.24
pkgrel=1
pkgdesc='A high performance Unix-based HTTP server'
arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@
etc/httpd/conf/extra/httpd-{manual,mpm,multilang-errordoc}.conf
etc/httpd/conf/extra/httpd-{ssl,userdir,vhosts}.conf
etc/logrotate.d/httpd)
-depends=('openssl' 'zlib' 'apr-util' 'pcre')
+depends=('openssl' 'zlib' 'apr-util' 'pcre' 'systemd')
optdepends=('lynx: apachectl status')
install=apache.install
_itkurl=http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.17-01
@@ -39,8 +39,8 @@
httpd
httpd.service
arch.layout)
-md5sums=('ca133de0e4b4b15316990a97186b9993'
- '3289ae3b16e1a2dc633c811d6569abb6'
+md5sums=('91bd1484aca13a7095d6432be37fc7ae'
+ 'f8f0d879b5fda028aad7ac9f329e057b'
'f1d9d41360908ceb2374da55ae99197a'
'cdfa04985a0efa850976aef01c2a0c40'
'0930d2d0612eb0a53a0d00aea7e8687f'
Modified: apache.install
===
--- apache.install 2013-03-18 13:36:39 UTC (rev 180167)
+++ apache.install 2013-03-18 14:03:50 UTC (rev 180168)
@@ -1,3 +1,7 @@
post_install() {
- systemd-tmpfiles --create usr/lib/tmpfiles.d/apache.conf
+ systemd-tmpfiles --create apache.conf
}
+
+post_upgrade() {
+ systemd-tmpfiles --create apache.conf
+}
[arch-commits] Commit in apache/trunk (PKGBUILD apache.install apache.tmpfiles.conf)
Date: Friday, June 8, 2012 @ 19:46:23
Author: heftig
Revision: 161294
Use tmpfiles for /run/httpd
Added:
apache/trunk/apache.install
apache/trunk/apache.tmpfiles.conf
Modified:
apache/trunk/PKGBUILD
--+
PKGBUILD |7 ++-
apache.install |3 +++
apache.tmpfiles.conf |1 +
3 files changed, 10 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-06-08 23:31:04 UTC (rev 161293)
+++ PKGBUILD2012-06-08 23:46:23 UTC (rev 161294)
@@ -5,7 +5,7 @@
pkgname=apache
pkgver=2.2.22
-pkgrel=3
+pkgrel=4
pkgdesc='A high performance Unix-based HTTP server'
arch=('i686' 'x86_64')
options=('!libtool')
@@ -18,6 +18,7 @@
etc/logrotate.d/httpd)
depends=('openssl' 'zlib' 'apr-util' 'pcre')
optdepends=('lynx: apachectl status')
+install=apache.install
_itkurl=http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.17-01
source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2
http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2.asc
@@ -33,6 +34,7 @@
${_itkurl}/11-fix-htaccess-reads-for-persistent-connections.patch
apachectl-confd.patch
apache.conf.d
+apache.tmpfiles.conf
httpd.logrotate
httpd
arch.layout
@@ -51,6 +53,7 @@
'1e5b222edcfbf99a3edc56fcb2074fbe'
'4ac64df6e019edbe137017cba1ff2f51'
'08b3c875f6260644f2f52b4056d656b0'
+ '82068753dab92fe86312b1010a2904d7'
'6382331e9700ed9e8cc78ea51887b537'
'c7e300a287ef7e2e066ac7639536f87e'
'3d659d41276ba3bfcb20c231eb254e0c'
@@ -126,6 +129,7 @@
install -D -m755 ${srcdir}/httpd ${pkgdir}/etc/rc.d/httpd
install -D -m644 ${srcdir}/httpd.logrotate
${pkgdir}/etc/logrotate.d/httpd
install -D -m644 ${srcdir}/apache.conf.d ${pkgdir}/etc/conf.d/apache
+ install -D -m644 ${srcdir}/apache.tmpfiles.conf
${pkgdir}/usr/lib/tmpfiles.d/apache.conf
# symlinks for /etc/httpd
ln -fs /var/log/httpd ${pkgdir}/etc/httpd/logs
@@ -147,4 +151,5 @@
rm -rf ${pkgdir}/etc/httpd/conf/original
rm -rf ${pkgdir}/srv/
rm -rf ${pkgdir}/usr/bin
+ rm -rf ${pkgdir}/var/run
}
Added: apache.install
===
--- apache.install (rev 0)
+++ apache.install 2012-06-08 23:46:23 UTC (rev 161294)
@@ -0,0 +1,3 @@
+post_install() {
+ systemd-tmpfiles --create usr/lib/tmpfiles.d/apache.conf
+}
Added: apache.tmpfiles.conf
===
--- apache.tmpfiles.conf(rev 0)
+++ apache.tmpfiles.conf2012-06-08 23:46:23 UTC (rev 161294)
@@ -0,0 +1 @@
+d /run/httpd 0755 root root -
