[arch-commits] Commit in apache/trunk (7 files)
Pierre Schmitz
pierre at nymeria.archlinux.org
Fri May 31 07:14:12 UTC 2013
Date: Friday, May 31, 2013 @ 09:14:12
Author: pierre
Revision: 186775
move binaries to /usr/bin; drop initscripts
Modified:
apache/trunk/PKGBUILD
apache/trunk/arch.layout
apache/trunk/httpd.logrotate
apache/trunk/httpd.service
Deleted:
apache/trunk/apache.conf.d
apache/trunk/apachectl-confd.patch
apache/trunk/httpd
-----------------------+
PKGBUILD | 33 ++++++++----------------
apache.conf.d | 15 -----------
apachectl-confd.patch | 15 -----------
arch.layout | 4 +-
httpd | 65 ------------------------------------------------
httpd.logrotate | 2 -
httpd.service | 6 ++--
7 files changed, 17 insertions(+), 123 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-05-31 07:01:32 UTC (rev 186774)
+++ PKGBUILD 2013-05-31 07:14:12 UTC (rev 186775)
@@ -5,13 +5,13 @@
pkgname=apache
pkgver=2.2.24
-pkgrel=1
+pkgrel=2
pkgdesc='A high performance Unix-based HTTP server'
arch=('i686' 'x86_64')
options=('!libtool')
url='http://www.apache.org/dist/httpd'
license=('APACHE')
-backup=(etc/conf.d/apache etc/httpd/conf/httpd.conf
+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
@@ -32,15 +32,12 @@
${_itkurl}/09-capabilities.patch
${_itkurl}/10-nice.patch
${_itkurl}/11-fix-htaccess-reads-for-persistent-connections.patch
- apachectl-confd.patch
- apache.conf.d
apache.tmpfiles.conf
httpd.logrotate
- httpd
httpd.service
arch.layout)
md5sums=('91bd1484aca13a7095d6432be37fc7ae'
- 'f8f0d879b5fda028aad7ac9f329e057b'
+ 'SKIP'
'f1d9d41360908ceb2374da55ae99197a'
'cdfa04985a0efa850976aef01c2a0c40'
'0930d2d0612eb0a53a0d00aea7e8687f'
@@ -51,19 +48,14 @@
'e75b7dd8d8afcd299ba4ab2ab81c11e4'
'ce1ccc21f3ad8625169c8f62913450ac'
'1e5b222edcfbf99a3edc56fcb2074fbe'
- '4ac64df6e019edbe137017cba1ff2f51'
- '08b3c875f6260644f2f52b4056d656b0'
'82068753dab92fe86312b1010a2904d7'
- '6382331e9700ed9e8cc78ea51887b537'
- 'c7e300a287ef7e2e066ac7639536f87e'
- 'ed219c8228d4d5ae9b7a55107cf79706'
- '3d659d41276ba3bfcb20c231eb254e0c')
+ '13dbaaf949c5bc36cfcf5718b95cb020'
+ 'a823bb355c136fd0e2b3fb820e2d903c'
+ '6b7122245a67597230a3b3f317eaf34e')
build() {
cd "${srcdir}/httpd-${pkgver}"
- patch -Np0 -i "${srcdir}/apachectl-confd.patch"
-
# set default user
sed -e 's#User daemon#User http#' \
-e 's#Group daemon#Group http#' \
@@ -113,7 +105,7 @@
--with-suexec-caller=http \
--with-suexec-docroot=/srv/http \
--with-suexec-logfile=/var/log/httpd/suexec.log \
- --with-suexec-bin=/usr/sbin/suexec \
+ --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 \
@@ -137,12 +129,10 @@
make DESTDIR="${pkgdir}" install
cd ..
- install -m755 build-worker/httpd "${pkgdir}/usr/sbin/httpd.worker"
- install -m755 build-itk/httpd "${pkgdir}/usr/sbin/httpd.itk"
-
- install -D -m755 "${srcdir}/httpd" "${pkgdir}/etc/rc.d/httpd"
+ install -m755 build-worker/httpd "${pkgdir}/usr/bin/httpd.worker"
+ install -m755 build-itk/httpd "${pkgdir}/usr/bin/httpd.itk"
+
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
@@ -164,8 +154,7 @@
rm -rf "${pkgdir}/usr/share/httpd/manual"
rm -rf "${pkgdir}/etc/httpd/conf/original"
rm -rf "${pkgdir}/srv/"
- rm -rf "${pkgdir}/usr/bin"
- rm -rf "${pkgdir}/var/run"
+ rm -rf "${pkgdir}/run"
install -m755 -d "${pkgdir}/usr/lib/systemd/system"
install -m644 "${srcdir}/httpd.service" "${pkgdir}/usr/lib/systemd/system/"
Deleted: apache.conf.d
===================================================================
--- apache.conf.d 2013-05-31 07:01:32 UTC (rev 186774)
+++ apache.conf.d 2013-05-31 07:14:12 UTC (rev 186775)
@@ -1,15 +0,0 @@
-# Configuration file for the httpd service.
-
-#
-# The default processing model (MPM) is the process-based
-# 'prefork' model. A thread-based model, 'worker', is also
-# available, but does not work with some modules (such as PHP).
-# The service must be stopped before changing this variable.
-#
-#HTTPD=/usr/sbin/httpd.worker
-
-#
-# To pass additional options (for instance, -D definitions) to the
-# httpd binary at startup, set OPTIONS here.
-#
-#OPTIONS=
Deleted: apachectl-confd.patch
===================================================================
--- apachectl-confd.patch 2013-05-31 07:01:32 UTC (rev 186774)
+++ apachectl-confd.patch 2013-05-31 07:14:12 UTC (rev 186775)
@@ -1,15 +0,0 @@
---- support/apachectl.in.orig 2010-03-06 18:09:11.000000000 +0100
-+++ support/apachectl.in 2010-03-06 18:12:31.000000000 +0100
-@@ -56,6 +56,12 @@
- # the URL to your server's mod_status status page. If you do not
- # have one, then status and fullstatus will not work.
- STATUSURL="http://localhost:@PORT@/server-status"
-+
-+# Source /etc/conf.d/apache for $HTTPD setting, etc.
-+if [ -r /etc/conf.d/apache ]; then
-+ . /etc/conf.d/apache
-+fi
-+
- #
- # Set this variable to a command that increases the maximum
- # number of file descriptors allowed per child process. This is
Modified: arch.layout
===================================================================
--- arch.layout 2013-05-31 07:01:32 UTC (rev 186774)
+++ arch.layout 2013-05-31 07:14:12 UTC (rev 186775)
@@ -2,7 +2,7 @@
prefix: /etc/httpd
exec_prefix: /usr
bindir: /usr/bin
- sbindir: /usr/sbin
+ sbindir: /usr/bin
libdir: /usr/lib/httpd
libexecdir: /usr/lib/httpd/modules
mandir: /usr/share/man
@@ -16,7 +16,7 @@
cgidir: /srv/http/cgi-bin
includedir: /usr/include/httpd
localstatedir: /var
- runtimedir: /var/run/httpd
+ runtimedir: /run/httpd
logfiledir: /var/log/httpd
proxycachedir: /var/cache/httpd
</Layout>
\ No newline at end of file
Deleted: httpd
===================================================================
--- httpd 2013-05-31 07:01:32 UTC (rev 186774)
+++ httpd 2013-05-31 07:14:12 UTC (rev 186775)
@@ -1,65 +0,0 @@
-#!/bin/bash
-
-daemon_name=httpd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-APACHECTL=/usr/sbin/apachectl
-
-case "$1" in
- start)
- stat_busy "Starting Apache Web Server"
- [ ! -d /var/run/httpd ] && install -d /var/run/httpd
- if $APACHECTL start >/dev/null ; then
- add_daemon $daemon_name
- stat_done
- else
- stat_fail
- exit 1
- fi
- ;;
-
- stop)
- stat_busy "Stopping Apache Web Server"
- if $APACHECTL stop >/dev/null ; then
- rm_daemon $daemon_name
- stat_done
- else
- stat_fail
- exit 1
- fi
- ;;
-
- reload)
- stat_busy "Reloading Apache Web Server"
- if $APACHECTL graceful >/dev/null ; then
- add_daemon $daemon_name
- stat_done
- else
- stat_fail
- exit 1
- fi
- ;;
-
- restart)
- stat_busy "Restarting Apache Web Server"
- if $APACHECTL restart >/dev/null ; then
- add_daemon $daemon_name
- stat_done
- else
- stat_fail
- exit 1
- fi
- ;;
-
- status)
- stat_busy "Checking Apache Web Server status";
- ck_status $daemon_name
- ;;
-
- *)
- echo "usage: $0 {start|stop|reload|restart|status}"
-esac
-
-exit 0
Modified: httpd.logrotate
===================================================================
--- httpd.logrotate 2013-05-31 07:01:32 UTC (rev 186774)
+++ httpd.logrotate 2013-05-31 07:14:12 UTC (rev 186775)
@@ -1,6 +1,6 @@
/var/log/httpd/*log {
missingok
postrotate
- /bin/kill -HUP `cat /var/run/httpd/httpd.pid 2>/dev/null` 2> /dev/null || true
+ /bin/kill -HUP `cat /run/httpd/httpd.pid 2>/dev/null` 2> /dev/null || true
endscript
}
Modified: httpd.service
===================================================================
--- httpd.service 2013-05-31 07:01:32 UTC (rev 186774)
+++ httpd.service 2013-05-31 07:14:12 UTC (rev 186775)
@@ -5,9 +5,9 @@
[Service]
Type=forking
PIDFile=/run/httpd/httpd.pid
-ExecStart=/usr/sbin/apachectl start
-ExecStop=/usr/sbin/apachectl graceful-stop
-ExecReload=/usr/sbin/apachectl graceful
+ExecStart=/usr/bin/apachectl start
+ExecStop=/usr/bin/apachectl graceful-stop
+ExecReload=/usr/bin/apachectl graceful
PrivateTmp=true
LimitNOFILE=infinity
More information about the arch-commits
mailing list