[arch-commits] Commit in apache/repos (14 files)

Anatol Pomozov anatolik at nymeria.archlinux.org
Sun Mar 16 19:57:22 UTC 2014


    Date: Sunday, March 16, 2014 @ 20:57:22
  Author: anatolik
Revision: 207991

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  apache/repos/testing-i686/
  apache/repos/testing-i686/PKGBUILD
    (from rev 207990, apache/trunk/PKGBUILD)
  apache/repos/testing-i686/apache.install
    (from rev 207990, apache/trunk/apache.install)
  apache/repos/testing-i686/apache.tmpfiles.conf
    (from rev 207990, apache/trunk/apache.tmpfiles.conf)
  apache/repos/testing-i686/arch.layout
    (from rev 207990, apache/trunk/arch.layout)
  apache/repos/testing-i686/httpd.logrotate
    (from rev 207990, apache/trunk/httpd.logrotate)
  apache/repos/testing-i686/httpd.service
    (from rev 207990, apache/trunk/httpd.service)
  apache/repos/testing-x86_64/
  apache/repos/testing-x86_64/PKGBUILD
    (from rev 207990, apache/trunk/PKGBUILD)
  apache/repos/testing-x86_64/apache.install
    (from rev 207990, apache/trunk/apache.install)
  apache/repos/testing-x86_64/apache.tmpfiles.conf
    (from rev 207990, apache/trunk/apache.tmpfiles.conf)
  apache/repos/testing-x86_64/arch.layout
    (from rev 207990, apache/trunk/arch.layout)
  apache/repos/testing-x86_64/httpd.logrotate
    (from rev 207990, apache/trunk/httpd.logrotate)
  apache/repos/testing-x86_64/httpd.service
    (from rev 207990, apache/trunk/httpd.service)

-------------------------------------+
 testing-i686/PKGBUILD               |  117 ++++++++++++++++++++++++++++++++++
 testing-i686/apache.install         |   16 ++++
 testing-i686/apache.tmpfiles.conf   |    1 
 testing-i686/arch.layout            |   22 ++++++
 testing-i686/httpd.logrotate        |    6 +
 testing-i686/httpd.service          |   15 ++++
 testing-x86_64/PKGBUILD             |  117 ++++++++++++++++++++++++++++++++++
 testing-x86_64/apache.install       |   16 ++++
 testing-x86_64/apache.tmpfiles.conf |    1 
 testing-x86_64/arch.layout          |   22 ++++++
 testing-x86_64/httpd.logrotate      |    6 +
 testing-x86_64/httpd.service        |   15 ++++
 12 files changed, 354 insertions(+)

Copied: apache/repos/testing-i686/PKGBUILD (from rev 207990, apache/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2014-03-16 19:57:22 UTC (rev 207991)
@@ -0,0 +1,117 @@
+# $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.9
+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')
+makedepends=('libxml2' 'lua' 'openssl')
+optdepends=(
+    'lua: for mod_lua module'
+    'openssl: for mod_ssl module'
+    'libxml2: for mod_proxy_html, mod_xml2enc modules' 
+    '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
+)
+sha256sums=('f78cc90dfa47caf3d83ad18fd6b4e85f237777c1733fc9088594b70ce2847603'
+            'SKIP'
+            '63da1a420f4714a3e7af2672d28384419cc7eedbe7bf35baebd02938fabc15bf'
+            '875903831634edf35d8d57e9a51bacb818255ecb3bfff29627f03e43d1ab65c3'
+            '14d0a775eea7f8c66ba55399a9ad1e4fd29e0302f479a15b28bbfc754c5aa347'
+            'dda05c6e76f12624e418ca18a36f2e90ec1c5b1cc52fed7142fce6076ec413f3')
+
+build() {
+  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
+	
+  ./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-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 \
+      --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 these symlinks?
+  #ln -fs /var/log/httpd "${pkgdir}/etc/httpd/logs"
+  ln -fs /usr/lib/httpd/modules "${pkgdir}/etc/httpd/modules"
+  #ln -fs /usr/lib/httpd/build "${pkgdir}/etc/httpd/build"
+
+  # 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/apache.install (from rev 207990, apache/trunk/apache.install)
===================================================================
--- testing-i686/apache.install	                        (rev 0)
+++ testing-i686/apache.install	2014-03-16 19:57:22 UTC (rev 207991)
@@ -0,0 +1,16 @@
+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
+}

Copied: apache/repos/testing-i686/apache.tmpfiles.conf (from rev 207990, apache/trunk/apache.tmpfiles.conf)
===================================================================
--- testing-i686/apache.tmpfiles.conf	                        (rev 0)
+++ testing-i686/apache.tmpfiles.conf	2014-03-16 19:57:22 UTC (rev 207991)
@@ -0,0 +1 @@
+d /run/httpd 0755 root root -

Copied: apache/repos/testing-i686/arch.layout (from rev 207990, apache/trunk/arch.layout)
===================================================================
--- testing-i686/arch.layout	                        (rev 0)
+++ testing-i686/arch.layout	2014-03-16 19:57:22 UTC (rev 207991)
@@ -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

Copied: apache/repos/testing-i686/httpd.logrotate (from rev 207990, apache/trunk/httpd.logrotate)
===================================================================
--- testing-i686/httpd.logrotate	                        (rev 0)
+++ testing-i686/httpd.logrotate	2014-03-16 19:57:22 UTC (rev 207991)
@@ -0,0 +1,6 @@
+/var/log/httpd/*log {
+   missingok
+   postrotate
+      /bin/kill -HUP `cat /run/httpd/httpd.pid 2>/dev/null` 2> /dev/null || true
+   endscript
+}

Copied: apache/repos/testing-i686/httpd.service (from rev 207990, apache/trunk/httpd.service)
===================================================================
--- testing-i686/httpd.service	                        (rev 0)
+++ testing-i686/httpd.service	2014-03-16 19:57:22 UTC (rev 207991)
@@ -0,0 +1,15 @@
+[Unit]
+Description=Apache Web Server
+After=network.target remote-fs.target nss-lookup.target
+
+[Service]
+Type=forking
+PIDFile=/run/httpd/httpd.pid
+ExecStart=/usr/bin/apachectl start
+ExecStop=/usr/bin/apachectl graceful-stop
+ExecReload=/usr/bin/apachectl graceful
+PrivateTmp=true
+LimitNOFILE=infinity
+
+[Install]
+WantedBy=multi-user.target

Copied: apache/repos/testing-x86_64/PKGBUILD (from rev 207990, apache/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2014-03-16 19:57:22 UTC (rev 207991)
@@ -0,0 +1,117 @@
+# $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.9
+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')
+makedepends=('libxml2' 'lua' 'openssl')
+optdepends=(
+    'lua: for mod_lua module'
+    'openssl: for mod_ssl module'
+    'libxml2: for mod_proxy_html, mod_xml2enc modules' 
+    '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
+)
+sha256sums=('f78cc90dfa47caf3d83ad18fd6b4e85f237777c1733fc9088594b70ce2847603'
+            'SKIP'
+            '63da1a420f4714a3e7af2672d28384419cc7eedbe7bf35baebd02938fabc15bf'
+            '875903831634edf35d8d57e9a51bacb818255ecb3bfff29627f03e43d1ab65c3'
+            '14d0a775eea7f8c66ba55399a9ad1e4fd29e0302f479a15b28bbfc754c5aa347'
+            'dda05c6e76f12624e418ca18a36f2e90ec1c5b1cc52fed7142fce6076ec413f3')
+
+build() {
+  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
+	
+  ./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-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 \
+      --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 these symlinks?
+  #ln -fs /var/log/httpd "${pkgdir}/etc/httpd/logs"
+  ln -fs /usr/lib/httpd/modules "${pkgdir}/etc/httpd/modules"
+  #ln -fs /usr/lib/httpd/build "${pkgdir}/etc/httpd/build"
+
+  # 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/apache.install (from rev 207990, apache/trunk/apache.install)
===================================================================
--- testing-x86_64/apache.install	                        (rev 0)
+++ testing-x86_64/apache.install	2014-03-16 19:57:22 UTC (rev 207991)
@@ -0,0 +1,16 @@
+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
+}

Copied: apache/repos/testing-x86_64/apache.tmpfiles.conf (from rev 207990, apache/trunk/apache.tmpfiles.conf)
===================================================================
--- testing-x86_64/apache.tmpfiles.conf	                        (rev 0)
+++ testing-x86_64/apache.tmpfiles.conf	2014-03-16 19:57:22 UTC (rev 207991)
@@ -0,0 +1 @@
+d /run/httpd 0755 root root -

Copied: apache/repos/testing-x86_64/arch.layout (from rev 207990, apache/trunk/arch.layout)
===================================================================
--- testing-x86_64/arch.layout	                        (rev 0)
+++ testing-x86_64/arch.layout	2014-03-16 19:57:22 UTC (rev 207991)
@@ -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

Copied: apache/repos/testing-x86_64/httpd.logrotate (from rev 207990, apache/trunk/httpd.logrotate)
===================================================================
--- testing-x86_64/httpd.logrotate	                        (rev 0)
+++ testing-x86_64/httpd.logrotate	2014-03-16 19:57:22 UTC (rev 207991)
@@ -0,0 +1,6 @@
+/var/log/httpd/*log {
+   missingok
+   postrotate
+      /bin/kill -HUP `cat /run/httpd/httpd.pid 2>/dev/null` 2> /dev/null || true
+   endscript
+}

Copied: apache/repos/testing-x86_64/httpd.service (from rev 207990, apache/trunk/httpd.service)
===================================================================
--- testing-x86_64/httpd.service	                        (rev 0)
+++ testing-x86_64/httpd.service	2014-03-16 19:57:22 UTC (rev 207991)
@@ -0,0 +1,15 @@
+[Unit]
+Description=Apache Web Server
+After=network.target remote-fs.target nss-lookup.target
+
+[Service]
+Type=forking
+PIDFile=/run/httpd/httpd.pid
+ExecStart=/usr/bin/apachectl start
+ExecStop=/usr/bin/apachectl graceful-stop
+ExecReload=/usr/bin/apachectl graceful
+PrivateTmp=true
+LimitNOFILE=infinity
+
+[Install]
+WantedBy=multi-user.target




More information about the arch-commits mailing list