[arch-commits] Commit in apache/trunk (PKGBUILD httpd.service pcre_info.patch)

[Jan de Groot]

    Date: Wednesday, September 19, 2012 @ 18:45:07
  Author: jgc
Revision: 166854

upgpkg: apache 2.2.23-1

Update to 2.2.23, add systemd unit

Added:
  apache/trunk/httpd.service
Modified:
  apache/trunk/PKGBUILD
Deleted:
  apache/trunk/pcre_info.patch

-----------------+
 PKGBUILD        |   23 +++++++++++++----------
 httpd.service   |   15 +++++++++++++++
 pcre_info.patch |   22 ----------------------
 3 files changed, 28 insertions(+), 32 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-09-19 22:20:03 UTC (rev 166853)
+++ PKGBUILD	2012-09-19 22:45:07 UTC (rev 166854)
@@ -4,8 +4,8 @@
 # Contributor: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=apache
-pkgver=2.2.22
-pkgrel=4
+pkgver=2.2.23
+pkgrel=1
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
 options=('!libtool')
@@ -37,10 +37,10 @@
         apache.tmpfiles.conf
         httpd.logrotate
         httpd
-        arch.layout
-        pcre_info.patch)
-md5sums=('9fe3093194c8a57f085ff7c3fc43715f'
-         '41b3a6e4948679cab70b9caf490877c4'
+        httpd.service
+        arch.layout)
+md5sums=('ca133de0e4b4b15316990a97186b9993'
+         '3289ae3b16e1a2dc633c811d6569abb6'
          'f1d9d41360908ceb2374da55ae99197a'
          'cdfa04985a0efa850976aef01c2a0c40'
          '0930d2d0612eb0a53a0d00aea7e8687f'
@@ -56,13 +56,12 @@
          '82068753dab92fe86312b1010a2904d7'
          '6382331e9700ed9e8cc78ea51887b537'
          'c7e300a287ef7e2e066ac7639536f87e'
-         '3d659d41276ba3bfcb20c231eb254e0c'
-         'fde5121e32b5aeef5a7eedb5a97009ff')
+         'ed219c8228d4d5ae9b7a55107cf79706'
+         '3d659d41276ba3bfcb20c231eb254e0c')
 
 build() {
 	cd "${srcdir}/httpd-${pkgver}"
 
-	patch -p1 -i "${srcdir}/pcre_info.patch"
 	patch -Np0 -i "${srcdir}/apachectl-confd.patch"
 
 	# set default user
@@ -133,7 +132,7 @@
 
 	# symlinks for /etc/httpd
 	ln -fs /var/log/httpd "${pkgdir}/etc/httpd/logs"
-	ln -fs /var/run/httpd "${pkgdir}/etc/httpd/run"
+	ln -fs /run/httpd "${pkgdir}/etc/httpd/run"
 	ln -fs /usr/lib/httpd/modules "${pkgdir}/etc/httpd/modules"
 	ln -fs /usr/lib/httpd/build "${pkgdir}/etc/httpd/build"
 
@@ -152,4 +151,8 @@
 	rm -rf "${pkgdir}/srv/"
 	rm -rf "${pkgdir}/usr/bin"
 	rm -rf "${pkgdir}/var/run"
+
+
+        install -m755 -d "${pkgdir}/usr/lib/systemd/system"
+        install -m644 "${srcdir}/httpd.service" "${pkgdir}/usr/lib/systemd/system/"
 }

Added: httpd.service
===================================================================
--- httpd.service	                        (rev 0)
+++ httpd.service	2012-09-19 22:45:07 UTC (rev 166854)
@@ -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/sbin/apachectl start
+ExecStop=/usr/sbin/apachectl graceful-stop
+ExecReload=/usr/sbin/apachectl graceful
+PrivateTmp=true
+LimitNOFILE=infinity
+
+[Install]
+WantedBy=multi-user.target

Deleted: pcre_info.patch
===================================================================
--- pcre_info.patch	2012-09-19 22:20:03 UTC (rev 166853)
+++ pcre_info.patch	2012-09-19 22:45:07 UTC (rev 166854)
@@ -1,22 +0,0 @@
---- httpd-2.2.22/server/util_pcre.c	2005-11-10 16:20:05.000000000 +0100
-+++ httpd-2.2.22/server/util_pcre.c	2012-02-08 11:23:56.273855663 +0100
-@@ -128,6 +128,7 @@
- const char *errorptr;
- int erroffset;
- int options = 0;
-+int nsub;
- 
- if ((cflags & AP_REG_ICASE) != 0) options |= PCRE_CASELESS;
- if ((cflags & AP_REG_NEWLINE) != 0) options |= PCRE_MULTILINE;
-@@ -136,8 +137,9 @@
- preg->re_erroffset = erroffset;
- 
- if (preg->re_pcre == NULL) return AP_REG_INVARG;
--
--preg->re_nsub = pcre_info((const pcre *)preg->re_pcre, NULL, NULL);
-+pcre_fullinfo((const pcre *)preg->re_pcre, NULL,
-+               PCRE_INFO_CAPTURECOUNT, &nsub);
-+preg->re_nsub = nsub;
- return 0;
- }
-