[arch-commits] Commit in apache/trunk (PKGBUILD)

[Jelle van der Waa via arch-commits]

Date: Wednesday, October 14, 2020 @ 19:04:52
  Author: jelle
Revision: 398350

Add perl optional dependency

https://www.archlinux.org/todo/perl-transient-openssl-dependencies/

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-10-14 19:03:28 UTC (rev 398349)
+++ PKGBUILD2020-10-14 19:04:52 UTC (rev 398350)
@@ -4,7 +4,7 @@
 
 pkgname=apache
 pkgver=2.4.46
-pkgrel=2
+pkgrel=3
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('x86_64')
 url='https://www.apache.org/dist/httpd'
@@ -31,6 +31,7 @@
 'brotli: for mod_brotli module'
 'uwsgi: for mod_proxy_uwsgi module'
 'lynx: apachectl status'
+'perl: for apxs and dbmmanage'
 )
 source=(
 https://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2{,.asc}

[arch-commits] Commit in apache/trunk (PKGBUILD)

[Anatol Pomozov via arch-commits]

Date: Friday, August 21, 2020 @ 22:00:59
  Author: anatolik
Revision: 394519

upgpkg: apache 2.4.46-2: libxcrypt rebuild

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-08-21 20:17:19 UTC (rev 394518)
+++ PKGBUILD2020-08-21 22:00:59 UTC (rev 394519)
@@ -4,7 +4,7 @@
 
 pkgname=apache
 pkgver=2.4.46
-pkgrel=1
+pkgrel=2
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('x86_64')
 url='https://www.apache.org/dist/httpd'
@@ -21,7 +21,7 @@
 provides=('mod_proxy_uwsgi')
 conflicts=('mod_proxy_uwsgi')
 replaces=('mod_proxy_uwsgi')
-depends=('zlib' 'apr-util' 'pcre' 'libnghttp2' 'openssl')
+depends=('zlib' 'apr-util' 'pcre' 'libnghttp2' 'openssl' 'libxcrypt')
 makedepends=('libxml2' 'lua53' 'curl' 'brotli' 'jansson')
 optdepends=(
 'lua53: for mod_lua module'

[arch-commits] Commit in apache/trunk (PKGBUILD)

[Anatol Pomozov via arch-commits]

Date: Wednesday, August 5, 2020 @ 23:36:56
  Author: anatolik
Revision: 393203

upgpkg: apache 2.4.46-1

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-08-05 22:59:42 UTC (rev 393202)
+++ PKGBUILD2020-08-05 23:36:56 UTC (rev 393203)
@@ -3,8 +3,8 @@
 # Contributor: Pierre Schmitz 
 
 pkgname=apache
-pkgver=2.4.43
-pkgrel=2
+pkgver=2.4.46
+pkgrel=1
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('x86_64')
 url='https://www.apache.org/dist/httpd'
@@ -40,7 +40,7 @@
 httpd.service
 arch.layout
 )
-sha256sums=('a497652ab3fc81318cdc2a203090a999150d86461acff97c1065dc910fe10f43'
+sha256sums=('740eddf6e1c641992b22359cabc66e6325868c3c5e2e3f98faf349b61ecf41ea'
 'SKIP'
 'd305f8b52ac2a9bbda7bb0776496471e69e9d30642740f594d00086a8c7e344c'
 '63da1a420f4714a3e7af2672d28384419cc7eedbe7bf35baebd02938fabc15bf'
@@ -48,7 +48,8 @@
 'f574bac6d5f398e7a649fc0e1ca66ff01ad4ef34dac71258e93d8a9d9a2b3960'
 'dda05c6e76f12624e418ca18a36f2e90ec1c5b1cc52fed7142fce6076ec413f3')
 validpgpkeys=('A93D62ECC3C8EA12DB220EC934EA76E6791485A8' # Jim Jagielski
-  'B9E8213AEFB861AF35A41F2C995E35221AD84DFF') # Daniel Ruggeri 
+  'B9E8213AEFB861AF35A41F2C995E35221AD84DFF'
+ 'E3480043595621FE56105F112AB12A7ADC55C003') # Daniel Ruggeri 
 
 prepare() {
   cd httpd-${pkgver}

[arch-commits] Commit in apache/trunk (PKGBUILD)

[Anatol Pomozov via arch-commits]

Date: Wednesday, July 1, 2020 @ 00:56:20
  Author: anatolik
Revision: 390675

upgpkg: apache 2.4.43-2: Apache's mod_lua is not compatible with Lua 5.4, 
rebuild it with Lua 5.3

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-06-30 20:52:01 UTC (rev 390674)
+++ PKGBUILD2020-07-01 00:56:20 UTC (rev 390675)
@@ -4,7 +4,7 @@
 
 pkgname=apache
 pkgver=2.4.43
-pkgrel=1
+pkgrel=2
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('x86_64')
 url='https://www.apache.org/dist/httpd'
@@ -22,9 +22,9 @@
 conflicts=('mod_proxy_uwsgi')
 replaces=('mod_proxy_uwsgi')
 depends=('zlib' 'apr-util' 'pcre' 'libnghttp2' 'openssl')
-makedepends=('libxml2' 'lua' 'curl' 'brotli' 'jansson')
+makedepends=('libxml2' 'lua53' 'curl' 'brotli' 'jansson')
 optdepends=(
-'lua: for mod_lua module'
+'lua53: for mod_lua module'
 'libxml2: for mod_proxy_html, mod_xml2enc modules'
 'curl: for mod_md module'
 'jansson: for mod_md module'

[arch-commits] Commit in apache/trunk (PKGBUILD)

[Anatol Pomozov via arch-commits]

Date: Tuesday, March 31, 2020 @ 18:37:28
  Author: anatolik
Revision: 379005

upgpkg: apache 2.4.43-1

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-03-31 18:02:38 UTC (rev 379004)
+++ PKGBUILD2020-03-31 18:37:28 UTC (rev 379005)
@@ -3,7 +3,7 @@
 # Contributor: Pierre Schmitz 
 
 pkgname=apache
-pkgver=2.4.41
+pkgver=2.4.43
 pkgrel=1
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('x86_64')
@@ -40,7 +40,7 @@
 httpd.service
 arch.layout
 )
-sha256sums=('133d48298fe5315ae9366a0ec66282fa4040efa5d566174481077ade7d18ea40'
+sha256sums=('a497652ab3fc81318cdc2a203090a999150d86461acff97c1065dc910fe10f43'
 'SKIP'
 'd305f8b52ac2a9bbda7bb0776496471e69e9d30642740f594d00086a8c7e344c'
 '63da1a420f4714a3e7af2672d28384419cc7eedbe7bf35baebd02938fabc15bf'

[arch-commits] Commit in apache/trunk (PKGBUILD)

[Anatol Pomozov via arch-commits]

Date: Tuesday, August 13, 2019 @ 22:46:31
  Author: anatolik
Revision: 359797

upgpkg: apache 2.4.41-1

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-08-13 19:51:52 UTC (rev 359796)
+++ PKGBUILD2019-08-13 22:46:31 UTC (rev 359797)
@@ -3,7 +3,7 @@
 # Contributor: Pierre Schmitz 
 
 pkgname=apache
-pkgver=2.4.39
+pkgver=2.4.41
 pkgrel=1
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('x86_64')
@@ -40,7 +40,7 @@
 httpd.service
 arch.layout
 )
-sha256sums=('b4ca9d05773aa59b54d66cd8f4744b945289f084d3be17d7981d1783a5decfa2'
+sha256sums=('133d48298fe5315ae9366a0ec66282fa4040efa5d566174481077ade7d18ea40'
 'SKIP'
 'd305f8b52ac2a9bbda7bb0776496471e69e9d30642740f594d00086a8c7e344c'
 '63da1a420f4714a3e7af2672d28384419cc7eedbe7bf35baebd02938fabc15bf'

[arch-commits] Commit in apache/trunk (PKGBUILD)

[Antonio Rojas via arch-commits]

Date: Thursday, May 2, 2019 @ 20:50:33
  Author: arojas
Revision: 352400

https

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-05-02 20:49:33 UTC (rev 352399)
+++ PKGBUILD2019-05-02 20:50:33 UTC (rev 352400)
@@ -7,7 +7,7 @@
 pkgrel=1
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('x86_64')
-url='http://www.apache.org/dist/httpd'
+url='https://www.apache.org/dist/httpd'
 license=('APACHE')
 backup=(
 etc/httpd/conf/httpd.conf

[arch-commits] Commit in apache/trunk (PKGBUILD)

[Anatol Pomozov via arch-commits]

Date: Tuesday, April 2, 2019 @ 04:06:51
  Author: anatolik
Revision: 349584

upgpkg: apache 2.4.39-1

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-04-02 02:17:22 UTC (rev 349583)
+++ PKGBUILD2019-04-02 04:06:51 UTC (rev 349584)
@@ -3,7 +3,7 @@
 # Contributor: Pierre Schmitz 
 
 pkgname=apache
-pkgver=2.4.38
+pkgver=2.4.39
 pkgrel=1
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('x86_64')
@@ -40,7 +40,7 @@
 httpd.service
 arch.layout
 )
-sha256sums=('7dc65857a994c98370dc4334b260101a7a04be60e6e74a5c57a6dee1bc8f394a'
+sha256sums=('b4ca9d05773aa59b54d66cd8f4744b945289f084d3be17d7981d1783a5decfa2'
 'SKIP'
 'd305f8b52ac2a9bbda7bb0776496471e69e9d30642740f594d00086a8c7e344c'
 '63da1a420f4714a3e7af2672d28384419cc7eedbe7bf35baebd02938fabc15bf'

[arch-commits] Commit in apache/trunk (PKGBUILD)

[Anatol Pomozov via arch-commits]

Date: Tuesday, January 22, 2019 @ 22:35:11
  Author: anatolik
Revision: 344587

upgpkg: apache 2.4.38-1

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-01-22 14:23:30 UTC (rev 344586)
+++ PKGBUILD2019-01-22 22:35:11 UTC (rev 344587)
@@ -3,7 +3,7 @@
 # Contributor: Pierre Schmitz 
 
 pkgname=apache
-pkgver=2.4.37
+pkgver=2.4.38
 pkgrel=1
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('x86_64')
@@ -40,7 +40,7 @@
 httpd.service
 arch.layout
 )
-sha256sums=('3498dc5c6772fac2eb7307dc7963122ffe243b5e806e0be4fb51974ff759d726'
+sha256sums=('7dc65857a994c98370dc4334b260101a7a04be60e6e74a5c57a6dee1bc8f394a'
 'SKIP'
 'd305f8b52ac2a9bbda7bb0776496471e69e9d30642740f594d00086a8c7e344c'
 '63da1a420f4714a3e7af2672d28384419cc7eedbe7bf35baebd02938fabc15bf'

[arch-commits] Commit in apache/trunk (PKGBUILD)

[Anatol Pomozov via arch-commits]

Date: Tuesday, October 23, 2018 @ 18:37:04
  Author: anatolik
Revision: 337193

upgpkg: apache 2.4.37-1

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-10-23 17:00:18 UTC (rev 337192)
+++ PKGBUILD2018-10-23 18:37:04 UTC (rev 337193)
@@ -3,7 +3,7 @@
 # Contributor: Pierre Schmitz 
 
 pkgname=apache
-pkgver=2.4.35
+pkgver=2.4.37
 pkgrel=1
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('x86_64')
@@ -40,7 +40,7 @@
 httpd.service
 arch.layout
 )
-sha256sums=('2607c6fdd4d12ac3f583127629291e9432b247b782396a563bec5678aae69b56'
+sha256sums=('3498dc5c6772fac2eb7307dc7963122ffe243b5e806e0be4fb51974ff759d726'
 'SKIP'
 'd305f8b52ac2a9bbda7bb0776496471e69e9d30642740f594d00086a8c7e344c'
 '63da1a420f4714a3e7af2672d28384419cc7eedbe7bf35baebd02938fabc15bf'

[arch-commits] Commit in apache/trunk (PKGBUILD)

[Anatol Pomozov via arch-commits]

Date: Friday, September 21, 2018 @ 22:04:32
  Author: anatolik
Revision: 335207

upgpkg: apache 2.4.35-1

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-09-21 20:20:26 UTC (rev 335206)
+++ PKGBUILD2018-09-21 22:04:32 UTC (rev 335207)
@@ -3,7 +3,7 @@
 # Contributor: Pierre Schmitz 
 
 pkgname=apache
-pkgver=2.4.34
+pkgver=2.4.35
 pkgrel=1
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('x86_64')
@@ -40,7 +40,7 @@
 httpd.service
 arch.layout
 )
-sha256sums=('fa53c95631febb08a9de41fd2864cfff815cf62d9306723ab0d4b8d7aa1638f0'
+sha256sums=('2607c6fdd4d12ac3f583127629291e9432b247b782396a563bec5678aae69b56'
 'SKIP'
 'd305f8b52ac2a9bbda7bb0776496471e69e9d30642740f594d00086a8c7e344c'
 '63da1a420f4714a3e7af2672d28384419cc7eedbe7bf35baebd02938fabc15bf'

[arch-commits] Commit in apache/trunk (PKGBUILD)

[Anatol Pomozov via arch-commits]

Date: Monday, July 16, 2018 @ 17:50:40
  Author: anatolik
Revision: 328808

upgpkg: apache 2.4.34-1

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-07-16 17:46:05 UTC (rev 328807)
+++ PKGBUILD2018-07-16 17:50:40 UTC (rev 328808)
@@ -4,8 +4,8 @@
 # Contributor: Pierre Schmitz 
 
 pkgname=apache
-pkgver=2.4.33
-pkgrel=3
+pkgver=2.4.34
+pkgrel=1
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('x86_64')
 url='http://www.apache.org/dist/httpd'
@@ -41,7 +41,7 @@
 httpd.service
 arch.layout
 )
-sha256sums=('de02511859b00d17845b9abdd1f975d5ccb5d0b280c567da5bf2ad4b70846f05'
+sha256sums=('fa53c95631febb08a9de41fd2864cfff815cf62d9306723ab0d4b8d7aa1638f0'
 'SKIP'
 'd305f8b52ac2a9bbda7bb0776496471e69e9d30642740f594d00086a8c7e344c'
 '63da1a420f4714a3e7af2672d28384419cc7eedbe7bf35baebd02938fabc15bf'

[arch-commits] Commit in apache/trunk (PKGBUILD)

[Anatol Pomozov via arch-commits]

Date: Monday, April 2, 2018 @ 19:17:03
  Author: anatolik
Revision: 320856

upgpkg: apache 2.4.33-3

FS#58005: fix mod_proxy_uwsgi conflicts/replaces statement

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-04-02 19:10:29 UTC (rev 320855)
+++ PKGBUILD2018-04-02 19:17:03 UTC (rev 320856)
@@ -5,7 +5,7 @@
 
 pkgname=apache
 pkgver=2.4.33
-pkgrel=2
+pkgrel=3
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('x86_64')
 url='http://www.apache.org/dist/httpd'
@@ -20,6 +20,8 @@
 etc/logrotate.d/httpd
 )
 provides=('mod_proxy_uwsgi')
+conflicts=('mod_proxy_uwsgi')
+replaces=('mod_proxy_uwsgi')
 depends=('zlib' 'apr-util' 'pcre' 'libnghttp2' 'openssl')
 makedepends=('libxml2' 'lua' 'curl' 'brotli' 'jansson')
 optdepends=(
@@ -28,6 +30,7 @@
 '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=(

[arch-commits] Commit in apache/trunk (PKGBUILD)

[Anatol Pomozov via arch-commits]

Date: Sunday, April 1, 2018 @ 22:31:12
  Author: anatolik
Revision: 320838

FS#58005: apache now provides mod_proxy_uwsgi module

Enable other new modules mod_brotli, mod_proxy_http2 and mod_md

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-04-01 18:24:45 UTC (rev 320837)
+++ PKGBUILD2018-04-01 22:31:12 UTC (rev 320838)
@@ -5,7 +5,7 @@
 
 pkgname=apache
 pkgver=2.4.33
-pkgrel=1
+pkgrel=2
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('x86_64')
 url='http://www.apache.org/dist/httpd'
@@ -19,11 +19,15 @@
 etc/httpd/conf/{mime.types,magic}
 etc/logrotate.d/httpd
 )
+provides=('mod_proxy_uwsgi')
 depends=('zlib' 'apr-util' 'pcre' 'libnghttp2' 'openssl')
-makedepends=('libxml2' 'lua')
+makedepends=('libxml2' 'lua' 'curl' 'brotli' 'jansson')
 optdepends=(
 'lua: 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'
 'lynx: apachectl status'
 )
 source=(
@@ -81,6 +85,7 @@
   --enable-proxy-http --enable-proxy-ftp \
   --enable-dbd --enable-imagemap --enable-ident --enable-cern-meta \
   --enable-lua --enable-xml2enc --enable-http2 \
+  --enable-proxy-http2 --enable-md --enable-brotli \
   --with-apr=/usr/bin/apr-1-config \
   --with-apr-util=/usr/bin/apu-1-config \
   --with-pcre=/usr

[arch-commits] Commit in apache/trunk (PKGBUILD)

[Anatol Pomozov via arch-commits]

Date: Sunday, March 25, 2018 @ 01:52:55
  Author: anatolik
Revision: 320290

upgpkg: apache 2.4.33-1

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-03-25 01:19:18 UTC (rev 320289)
+++ PKGBUILD2018-03-25 01:52:55 UTC (rev 320290)
@@ -4,7 +4,7 @@
 # Contributor: Pierre Schmitz 
 
 pkgname=apache
-pkgver=2.4.29
+pkgver=2.4.33
 pkgrel=1
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('x86_64')
@@ -34,7 +34,7 @@
 httpd.service
 arch.layout
 )
-sha256sums=('53a5a25568a2a27428b2214980564bc1c38c1abf9ccc7630b639991f7f00'
+sha256sums=('de02511859b00d17845b9abdd1f975d5ccb5d0b280c567da5bf2ad4b70846f05'
 'SKIP'
 'd305f8b52ac2a9bbda7bb0776496471e69e9d30642740f594d00086a8c7e344c'
 '63da1a420f4714a3e7af2672d28384419cc7eedbe7bf35baebd02938fabc15bf'
@@ -41,7 +41,8 @@
 '0bbbfae23a917b2fce0bf8f900f60319b50769224a96314e9301a75ccd078e16'
 'f574bac6d5f398e7a649fc0e1ca66ff01ad4ef34dac71258e93d8a9d9a2b3960'
 'dda05c6e76f12624e418ca18a36f2e90ec1c5b1cc52fed7142fce6076ec413f3')
-validpgpkeys=('A93D62ECC3C8EA12DB220EC934EA76E6791485A8') # Jim Jagielski
+validpgpkeys=('A93D62ECC3C8EA12DB220EC934EA76E6791485A8' # Jim Jagielski
+  'B9E8213AEFB861AF35A41F2C995E35221AD84DFF') # Daniel Ruggeri 
 
 prepare() {
   cd httpd-${pkgver}

[arch-commits] Commit in apache/trunk (PKGBUILD)

[Anatol Pomozov]

Date: Saturday, October 21, 2017 @ 19:47:15
  Author: anatolik
Revision: 308311

upgpkg: apache 2.4.29-1

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-10-21 18:51:30 UTC (rev 308310)
+++ PKGBUILD2017-10-21 19:47:15 UTC (rev 308311)
@@ -4,7 +4,7 @@
 # Contributor: Pierre Schmitz 
 
 pkgname=apache
-pkgver=2.4.28
+pkgver=2.4.29
 pkgrel=1
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
@@ -34,7 +34,7 @@
 httpd.service
 arch.layout
 )
-sha256sums=('c1197a3a62a4ab5c584ab89b249af38cf28b4adee9c0106b62999fd29f920666'
+sha256sums=('53a5a25568a2a27428b2214980564bc1c38c1abf9ccc7630b639991f7f00'
 'SKIP'
 'd305f8b52ac2a9bbda7bb0776496471e69e9d30642740f594d00086a8c7e344c'
 '63da1a420f4714a3e7af2672d28384419cc7eedbe7bf35baebd02938fabc15bf'

[arch-commits] Commit in apache/trunk (PKGBUILD)

[Anatol Pomozov]

Date: Tuesday, October 3, 2017 @ 16:20:20
  Author: anatolik
Revision: 306637

upgpkg: apache 2.4.28-1

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |   12 
 1 file changed, 4 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-10-03 13:44:27 UTC (rev 306636)
+++ PKGBUILD2017-10-03 16:20:20 UTC (rev 306637)
@@ -4,8 +4,8 @@
 # Contributor: Pierre Schmitz 
 
 pkgname=apache
-pkgver=2.4.27
-pkgrel=2
+pkgver=2.4.28
+pkgrel=1
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
 url='http://www.apache.org/dist/httpd'
@@ -33,16 +33,14 @@
 httpd.logrotate
 httpd.service
 arch.layout
-apache-2.2-optionsbleed-CVE-2017-9798.patch
 )
-sha256sums=('71fcc128238a690515bd8174d5330a5309161ef314a326ae45c7c15ed139c13a'
+sha256sums=('c1197a3a62a4ab5c584ab89b249af38cf28b4adee9c0106b62999fd29f920666'
 'SKIP'
 'd305f8b52ac2a9bbda7bb0776496471e69e9d30642740f594d00086a8c7e344c'
 '63da1a420f4714a3e7af2672d28384419cc7eedbe7bf35baebd02938fabc15bf'
 '0bbbfae23a917b2fce0bf8f900f60319b50769224a96314e9301a75ccd078e16'
 'f574bac6d5f398e7a649fc0e1ca66ff01ad4ef34dac71258e93d8a9d9a2b3960'
-'dda05c6e76f12624e418ca18a36f2e90ec1c5b1cc52fed7142fce6076ec413f3'
-'8278b462612dd64e1d6e9e7b6ef6141efc60917b3598ba20b4423998b2c05b01')
+'dda05c6e76f12624e418ca18a36f2e90ec1c5b1cc52fed7142fce6076ec413f3')
 validpgpkeys=('A93D62ECC3C8EA12DB220EC934EA76E6791485A8') # Jim Jagielski
 
 prepare() {
@@ -57,8 +55,6 @@
 
   # https://github.com/openssl/openssl/issues/2865
   patch -Np1 -i ../openssl-malloc-init.patch
-
-  patch -p1 -i ../apache-2.2-optionsbleed-CVE-2017-9798.patch
 }
 
 build() {

[arch-commits] Commit in apache/trunk (PKGBUILD)

[Anatol Pomozov]

Date: Wednesday, July 12, 2017 @ 15:54:32
  Author: anatolik
Revision: 300152

upgpkg: apache 2.4.27-1

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |   18 --
 1 file changed, 4 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-07-12 14:38:04 UTC (rev 300151)
+++ PKGBUILD2017-07-12 15:54:32 UTC (rev 300152)
@@ -4,8 +4,8 @@
 # Contributor: Pierre Schmitz 
 
 pkgname=apache
-pkgver=2.4.26
-pkgrel=3
+pkgver=2.4.27
+pkgrel=1
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
 url='http://www.apache.org/dist/httpd'
@@ -33,18 +33,14 @@
 httpd.logrotate
 httpd.service
 arch.layout
-nohttp2forprefork.patch # 
https://github.com/apache/httpd/commit/ab03196a879f4064f618a9a45d63c67a67f4b901
-script_name.patch # 
https://github.com/apache/httpd/commit/7806711b85b46c3caad150c8fde97f29f32ae6f8
 )
-sha256sums=('a07eb52fafc879e0149d31882f7da63173e72df4478db4dc69f7a775b663d387'
+sha256sums=('71fcc128238a690515bd8174d5330a5309161ef314a326ae45c7c15ed139c13a'
 'SKIP'
 'd305f8b52ac2a9bbda7bb0776496471e69e9d30642740f594d00086a8c7e344c'
 '63da1a420f4714a3e7af2672d28384419cc7eedbe7bf35baebd02938fabc15bf'
 '0bbbfae23a917b2fce0bf8f900f60319b50769224a96314e9301a75ccd078e16'
 'f574bac6d5f398e7a649fc0e1ca66ff01ad4ef34dac71258e93d8a9d9a2b3960'
-'dda05c6e76f12624e418ca18a36f2e90ec1c5b1cc52fed7142fce6076ec413f3'
-'25d297199c536ccfdb2c4d92988a74113ac2e14261090b5c1d3ac01537c5c742'
-'9500789503c0e78e12bfc14901dbb276564f2b48b24c614aa1bb9987fc351f5e')
+'dda05c6e76f12624e418ca18a36f2e90ec1c5b1cc52fed7142fce6076ec413f3')
 validpgpkeys=('A93D62ECC3C8EA12DB220EC934EA76E6791485A8') # Jim Jagielski
 
 prepare() {
@@ -59,12 +55,6 @@
 
   # https://github.com/openssl/openssl/issues/2865
   patch -Np1 -i ../openssl-malloc-init.patch
-
-  # https://bugs.archlinux.org/task/54666
-  patch -Np1 -i ../nohttp2forprefork.patch
-
-  # https://bugs.archlinux.org/task/54633
-  patch -Np1 -i ../script_name.patch
 }
 
 build() {

[arch-commits] Commit in apache/trunk (PKGBUILD script_name.patch)

[Anatol Pomozov]

Date: Wednesday, July 5, 2017 @ 23:10:52
  Author: anatolik
Revision: 299732

FS#54633 Revert changes that break SCRIPT_NAME

Added:
  apache/trunk/script_name.patch
Modified:
  apache/trunk/PKGBUILD

---+
 PKGBUILD  |9 -
 script_name.patch |   84 
 2 files changed, 91 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-07-05 21:58:07 UTC (rev 299731)
+++ PKGBUILD2017-07-05 23:10:52 UTC (rev 299732)
@@ -5,7 +5,7 @@
 
 pkgname=apache
 pkgver=2.4.26
-pkgrel=2
+pkgrel=3
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
 url='http://www.apache.org/dist/httpd'
@@ -34,6 +34,7 @@
 httpd.service
 arch.layout
 nohttp2forprefork.patch # 
https://github.com/apache/httpd/commit/ab03196a879f4064f618a9a45d63c67a67f4b901
+script_name.patch # 
https://github.com/apache/httpd/commit/7806711b85b46c3caad150c8fde97f29f32ae6f8
 )
 sha256sums=('a07eb52fafc879e0149d31882f7da63173e72df4478db4dc69f7a775b663d387'
 'SKIP'
@@ -42,7 +43,8 @@
 '0bbbfae23a917b2fce0bf8f900f60319b50769224a96314e9301a75ccd078e16'
 'f574bac6d5f398e7a649fc0e1ca66ff01ad4ef34dac71258e93d8a9d9a2b3960'
 'dda05c6e76f12624e418ca18a36f2e90ec1c5b1cc52fed7142fce6076ec413f3'
-'25d297199c536ccfdb2c4d92988a74113ac2e14261090b5c1d3ac01537c5c742')
+'25d297199c536ccfdb2c4d92988a74113ac2e14261090b5c1d3ac01537c5c742'
+'9500789503c0e78e12bfc14901dbb276564f2b48b24c614aa1bb9987fc351f5e')
 validpgpkeys=('A93D62ECC3C8EA12DB220EC934EA76E6791485A8') # Jim Jagielski
 
 prepare() {
@@ -60,6 +62,9 @@
 
   # https://bugs.archlinux.org/task/54666
   patch -Np1 -i ../nohttp2forprefork.patch
+
+  # https://bugs.archlinux.org/task/54633
+  patch -Np1 -i ../script_name.patch
 }
 
 build() {

Added: script_name.patch
===
--- script_name.patch   (rev 0)
+++ script_name.patch   2017-07-05 23:10:52 UTC (rev 299732)
@@ -0,0 +1,84 @@
+From 7806711b85b46c3caad150c8fde97f29f32ae6f8 Mon Sep 17 00:00:00 2001
+From: Jim Jagielski 
+Date: Mon, 3 Jul 2017 10:22:07 +
+Subject: [PATCH] Merge r1800306, r1800393 from trunk:
+
+proxy_fcgi: remove FPM-specific logic
+
+Reverts r1780328, r1780329, and their associated followups, which
+incorrectly manipulated SCRIPT_NAME by default. All proxy_fcgi.t
+regression tests now pass.
+
+PR: 61202
+
+Partial reversal of r1800306... note virtual scripts in notes
+
+Submitted by: jchampion, jim
+Reviewed by: jchampion, jim, covener
+
+
+git-svn-id: 
https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1800618 
13f79535-47bb-0310-9956-ffa450edef68
+---
+ modules/proxy/mod_proxy_fcgi.c | 32 
+ 3 files changed, 4 insertions(+), 39 deletions(-)
+
+diff --git a/modules/proxy/mod_proxy_fcgi.c b/modules/proxy/mod_proxy_fcgi.c
+index a268556e302..41292e87267 100644
+--- a/modules/proxy/mod_proxy_fcgi.c
 b/modules/proxy/mod_proxy_fcgi.c
+@@ -321,7 +321,6 @@ static apr_status_t send_environment(proxy_conn_rec *conn, 
request_rec *r,
+ apr_status_t rv;
+ apr_size_t avail_len, len, required_len;
+ int next_elem, starting_elem;
+-int fpm = 0;
+ fcgi_req_config_t *rconf = ap_get_module_config(r->request_config, 
_fcgi_module);
+ fcgi_dirconf_t *dconf = ap_get_module_config(r->per_dir_config, 
_fcgi_module);
+ 
+@@ -354,8 +353,6 @@ static apr_status_t send_environment(proxy_conn_rec *conn, 
request_rec *r,
+ *qs = '\0';
+ }
+ }
+-} else {
+-fpm = 1;
+ }
+ 
+ if (newfname) {
+@@ -364,38 +361,9 @@ static apr_status_t send_environment(proxy_conn_rec 
*conn, request_rec *r,
+ }
+ }
+ 
+-#if 0
+-ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(0)
+-  "r->filename: %s", (r->filename ? r->filename : "nil"));
+-ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(0)
+-  "r->uri: %s", (r->uri ? r->uri : "nil"));
+-ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(0)
+-  "r->path_info: %s", (r->path_info ? r->path_info : "nil"));
+-#endif
+-
+ ap_add_common_vars(r);
+ ap_add_cgi_vars(r);
+ 
+-if (fpm || apr_table_get(r->notes, "virtual_script")) {
+-/*
+- * Adjust SCRIPT_NAME, PATH_INFO and PATH_TRANSLATED for PHP-FPM
+- * TODO: Right now, PATH_INFO and PATH_TRANSLATED look OK...
+- */
+-const char *pend;
+-const char *script_name = apr_table_get(r->subprocess_env, 
"SCRIPT_NAME");
+-pend = script_name + strlen(script_name);
+-if (r->path_info && *r->path_info) {
+-pend = script_name + ap_find_path_info(script_name, r->path_info) 
- 1;
+-}
+-while 

[arch-commits] Commit in apache/trunk (PKGBUILD nohttp2forprefork.patch)

[Anatol Pomozov]

Date: Wednesday, July 5, 2017 @ 17:12:47
  Author: anatolik
Revision: 299699

FS#54666 disable http2 module if Prefork MPM is used

Added:
  apache/trunk/nohttp2forprefork.patch
Modified:
  apache/trunk/PKGBUILD

-+
 PKGBUILD|9 
 nohttp2forprefork.patch |  506 ++
 2 files changed, 513 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-07-05 17:04:58 UTC (rev 299698)
+++ PKGBUILD2017-07-05 17:12:47 UTC (rev 299699)
@@ -5,7 +5,7 @@
 
 pkgname=apache
 pkgver=2.4.26
-pkgrel=1
+pkgrel=2
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
 url='http://www.apache.org/dist/httpd'
@@ -33,6 +33,7 @@
 httpd.logrotate
 httpd.service
 arch.layout
+nohttp2forprefork.patch # 
https://github.com/apache/httpd/commit/ab03196a879f4064f618a9a45d63c67a67f4b901
 )
 sha256sums=('a07eb52fafc879e0149d31882f7da63173e72df4478db4dc69f7a775b663d387'
 'SKIP'
@@ -40,7 +41,8 @@
 '63da1a420f4714a3e7af2672d28384419cc7eedbe7bf35baebd02938fabc15bf'
 '0bbbfae23a917b2fce0bf8f900f60319b50769224a96314e9301a75ccd078e16'
 'f574bac6d5f398e7a649fc0e1ca66ff01ad4ef34dac71258e93d8a9d9a2b3960'
-'dda05c6e76f12624e418ca18a36f2e90ec1c5b1cc52fed7142fce6076ec413f3')
+'dda05c6e76f12624e418ca18a36f2e90ec1c5b1cc52fed7142fce6076ec413f3'
+'25d297199c536ccfdb2c4d92988a74113ac2e14261090b5c1d3ac01537c5c742')
 validpgpkeys=('A93D62ECC3C8EA12DB220EC934EA76E6791485A8') # Jim Jagielski
 
 prepare() {
@@ -55,6 +57,9 @@
 
   # https://github.com/openssl/openssl/issues/2865
   patch -Np1 -i ../openssl-malloc-init.patch
+
+  # https://bugs.archlinux.org/task/54666
+  patch -Np1 -i ../nohttp2forprefork.patch
 }
 
 build() {

Added: nohttp2forprefork.patch
===
--- nohttp2forprefork.patch (rev 0)
+++ nohttp2forprefork.patch 2017-07-05 17:12:47 UTC (rev 299699)
@@ -0,0 +1,506 @@
+From ab03196a879f4064f618a9a45d63c67a67f4b901 Mon Sep 17 00:00:00 2001
+From: Jim Jagielski 
+Date: Tue, 4 Jul 2017 12:34:15 +
+Subject: [PATCH] Merge r1800689 from trunk:
+
+On the trunk:
+
+mod_http2: disable and give warning when mpm_prefork is encountered.
+ The server will continue to work, but HTTP/2 will no longer be negotiated.
+
+
+Submitted by: icing
+Reviewed by: icing, ylavic, jim
+
+
+git-svn-id: 
https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1800774 
13f79535-47bb-0310-9956-ffa450edef68
+---
+ modules/http2/h2_conn.c|  21 +++-
+ modules/http2/h2_conn.h|   3 +-
+ modules/http2/h2_mplx.c|  37 +++---
+ modules/http2/h2_mplx.h|   2 +-
+ modules/http2/h2_session.c |   7 +--
+ modules/http2/h2_stream.c  |  14 +-
+ modules/http2/h2_switch.c  |   8 +++
+ modules/http2/h2_util.c| 118 +
+ modules/http2/h2_workers.c |   7 +--
+ modules/http2/mod_http2.c  |  12 +
+ 12 files changed, 139 insertions(+), 99 deletions(-)
+
+diff --git a/modules/http2/h2_conn.c b/modules/http2/h2_conn.c
+index fcf6bad4d41..e2502c2f167 100644
+--- a/modules/http2/h2_conn.c
 b/modules/http2/h2_conn.c
+@@ -47,6 +47,7 @@ static struct h2_workers *workers;
+ static h2_mpm_type_t mpm_type = H2_MPM_UNKNOWN;
+ static module *mpm_module;
+ static int async_mpm;
++static int mpm_supported = 1;
+ static apr_socket_t *dummy_socket;
+ 
+ static void check_modules(int force) 
+@@ -76,11 +77,18 @@ static void check_modules(int force)
+ else if (!strcmp("prefork.c", m->name)) {
+ mpm_type = H2_MPM_PREFORK;
+ mpm_module = m;
++/* While http2 can work really well on prefork, it collides
++ * today's use case for prefork: runnning single-thread app 
engines
++ * like php. If we restrict h2_workers to 1 per process, php 
will
++ * work fine, but browser will be limited to 1 active request 
at a
++ * time. */
++mpm_supported = 0;
+ break;
+ }
+ else if (!strcmp("simple_api.c", m->name)) {
+ mpm_type = H2_MPM_SIMPLE;
+ mpm_module = m;
++mpm_supported = 0;
+ break;
+ }
+ else if (!strcmp("mpm_winnt.c", m->name)) {
+@@ -107,7 +115,6 @@ apr_status_t h2_conn_child_init(apr_pool_t *pool, 
server_rec *s)
+ int idle_secs = 0;
+ 
+ check_modules(1);
+-
+ ap_mpm_query(AP_MPMQ_MAX_THREADS, _threads_per_child);
+ 
+ status = ap_mpm_query(AP_MPMQ_IS_ASYNC, _mpm);
+@@ -157,6 +164,18 @@ h2_mpm_type_t h2_conn_mpm_type(void)
+ return mpm_type;
+ }
+ 
++const char *h2_conn_mpm_name(void)
++{
++check_modules(0);
++return mpm_module? 

[arch-commits] Commit in apache/trunk (PKGBUILD openssl-malloc-init.patch)

[Jan de Groot]

Date: Sunday, May 21, 2017 @ 22:10:21
  Author: jgc
Revision: 296391

upgpkg: apache 2.4.25-3

Fix ab (FS#53934)

Added:
  apache/trunk/openssl-malloc-init.patch
Modified:
  apache/trunk/PKGBUILD

---+
 PKGBUILD  |7 ++-
 openssl-malloc-init.patch |   20 
 2 files changed, 26 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-05-21 21:29:38 UTC (rev 296390)
+++ PKGBUILD2017-05-21 22:10:21 UTC (rev 296391)
@@ -5,7 +5,7 @@
 
 pkgname=apache
 pkgver=2.4.25
-pkgrel=2
+pkgrel=3
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
 url='http://www.apache.org/dist/httpd'
@@ -30,6 +30,7 @@
 https://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2{,.asc}
 http2-fixes.patch
 httpd-2.4.23-openssl11.patch
+openssl-malloc-init.patch
 apache.tmpfiles.conf
 httpd.logrotate
 httpd.service
@@ -39,6 +40,7 @@
 'SKIP'
 '4f0ee70a847d1b87f77b16892cbde38d65e4089e543a0e5d7f0ddc39a5a41f1d'
 '2ff801bbc6ef8a19d177409bd39a4af6b588e9e43d257e43fbf9f786f6140758'
+'d305f8b52ac2a9bbda7bb0776496471e69e9d30642740f594d00086a8c7e344c'
 '63da1a420f4714a3e7af2672d28384419cc7eedbe7bf35baebd02938fabc15bf'
 '0bbbfae23a917b2fce0bf8f900f60319b50769224a96314e9301a75ccd078e16'
 'f574bac6d5f398e7a649fc0e1ca66ff01ad4ef34dac71258e93d8a9d9a2b3960'
@@ -60,6 +62,9 @@
 
   # Support OpenSSL 1.1
   patch -Np1 -i ../httpd-2.4.23-openssl11.patch
+
+  # https://github.com/openssl/openssl/issues/2865
+  patch -Np1 -i ../openssl-malloc-init.patch
 }
 
 build() {

Added: openssl-malloc-init.patch
===
--- openssl-malloc-init.patch   (rev 0)
+++ openssl-malloc-init.patch   2017-05-21 22:10:21 UTC (rev 296391)
@@ -0,0 +1,20 @@
+--- httpd-2.4.25/support/ab.c.orig 2017-05-21 21:59:17.131193359 +
 httpd-2.4.25/support/ab.c  2017-05-21 22:01:34.704322361 +
+@@ -2496,6 +2496,8 @@
+ heartbeatres = 0;
+ 
+ #ifdef USE_SSL
++SSL_load_error_strings();
++SSL_library_init();
+ #ifdef RSAREF
+ R_malloc_init();
+ #else
+@@ -2505,8 +2507,6 @@
+ OPENSSL_malloc_init();
+ #endif
+ #endif
+-SSL_load_error_strings();
+-SSL_library_init();
+ bio_out=BIO_new_fp(stdout,BIO_NOCLOSE);
+ bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
+ 

[arch-commits] Commit in apache/trunk (PKGBUILD apache.install)

[Anatol Pomozov]

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)

[Anatol Pomozov]

Date: Tuesday, December 20, 2016 @ 21:16:34
  Author: anatolik
Revision: 284357

upgpkg: apache 2.4.25-1

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-12-20 21:15:16 UTC (rev 284356)
+++ PKGBUILD2016-12-20 21:16:34 UTC (rev 284357)
@@ -4,7 +4,7 @@
 # Contributor: Pierre Schmitz 
 
 pkgname=apache
-pkgver=2.4.23
+pkgver=2.4.25
 pkgrel=1
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
@@ -36,7 +36,7 @@
 httpd.service
 arch.layout
 )
-sha256sums=('0c1694b2aad7765896faf92843452ee2555b9591ae10d4f19b245f2adfe85e58'
+sha256sums=('f87ec2df1c9fee3e6bfde3c8b855a3ddb7ca1ab20ca877bd0e2b6bf3f05c80b2'
 'SKIP'
 '63da1a420f4714a3e7af2672d28384419cc7eedbe7bf35baebd02938fabc15bf'
 '0bbbfae23a917b2fce0bf8f900f60319b50769224a96314e9301a75ccd078e16'

[arch-commits] Commit in apache/trunk (PKGBUILD)

[Anatol Pomozov]

Date: Tuesday, July 5, 2016 @ 14:45:26
  Author: anatolik
Revision: 271039

upgpkg: apache 2.4.23-1

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-07-05 12:07:34 UTC (rev 271038)
+++ PKGBUILD2016-07-05 14:45:26 UTC (rev 271039)
@@ -4,7 +4,7 @@
 # Contributor: Pierre Schmitz 
 
 pkgname=apache
-pkgver=2.4.20
+pkgver=2.4.23
 pkgrel=1
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
@@ -36,7 +36,7 @@
 httpd.service
 arch.layout
 )
-sha256sums=('0e76a375ed3dbac636f50ac39de966ece443751fe4d62392f9a360a19d94d0da'
+sha256sums=('0c1694b2aad7765896faf92843452ee2555b9591ae10d4f19b245f2adfe85e58'
 'SKIP'
 '63da1a420f4714a3e7af2672d28384419cc7eedbe7bf35baebd02938fabc15bf'
 '0bbbfae23a917b2fce0bf8f900f60319b50769224a96314e9301a75ccd078e16'

[arch-commits] Commit in apache/trunk (PKGBUILD)

[Anatol Pomozov]

Date: Monday, April 11, 2016 @ 19:07:11
  Author: anatolik
Revision: 264673

upgpkg: apache 2.4.20-1

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-04-11 17:03:35 UTC (rev 264672)
+++ PKGBUILD2016-04-11 17:07:11 UTC (rev 264673)
@@ -4,8 +4,8 @@
 # Contributor: Pierre Schmitz 
 
 pkgname=apache
-pkgver=2.4.18
-pkgrel=2
+pkgver=2.4.20
+pkgrel=1
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
 url='http://www.apache.org/dist/httpd'
@@ -36,7 +36,7 @@
 httpd.service
 arch.layout
 )
-sha256sums=('0644b050de41f5c9f67c825285049b144690421acb709b06fe53eddfa8a9fd4c'
+sha256sums=('0e76a375ed3dbac636f50ac39de966ece443751fe4d62392f9a360a19d94d0da'
 'SKIP'
 '63da1a420f4714a3e7af2672d28384419cc7eedbe7bf35baebd02938fabc15bf'
 '0bbbfae23a917b2fce0bf8f900f60319b50769224a96314e9301a75ccd078e16'

[arch-commits] Commit in apache/trunk (PKGBUILD)

[Felix Yan]

Date: Friday, March 4, 2016 @ 22:20:40
  Author: fyan
Revision: 260834

OpenSSL 1.0.2g rebuild

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-03-04 21:17:47 UTC (rev 260833)
+++ PKGBUILD2016-03-04 21:20:40 UTC (rev 260834)
@@ -5,7 +5,7 @@
 
 pkgname=apache
 pkgver=2.4.18
-pkgrel=1
+pkgrel=2
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
 url='http://www.apache.org/dist/httpd'

[arch-commits] Commit in apache/trunk (PKGBUILD)

[Jan Steffens]

Date: Thursday, February 11, 2016 @ 06:37:24
  Author: heftig
Revision: 259057

PKGBUILD: Update sums

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-02-11 05:36:58 UTC (rev 259056)
+++ PKGBUILD2016-02-11 05:37:24 UTC (rev 259057)
@@ -39,7 +39,7 @@
 sha256sums=('0644b050de41f5c9f67c825285049b144690421acb709b06fe53eddfa8a9fd4c'
 'SKIP'
 '63da1a420f4714a3e7af2672d28384419cc7eedbe7bf35baebd02938fabc15bf'
-'09165b754414347592a60e3cab3904cc441cfe2100eb66c7c76e6b0f18280ec8'
+'0bbbfae23a917b2fce0bf8f900f60319b50769224a96314e9301a75ccd078e16'
 'f574bac6d5f398e7a649fc0e1ca66ff01ad4ef34dac71258e93d8a9d9a2b3960'
 'dda05c6e76f12624e418ca18a36f2e90ec1c5b1cc52fed7142fce6076ec413f3')
 validpgpkeys=('A93D62ECC3C8EA12DB220EC934EA76E6791485A8') # Jim Jagielski

[arch-commits] Commit in apache/trunk (PKGBUILD revert_redirect_url.patch)

[Anatol Pomozov]

Date: Monday, December 14, 2015 @ 17:45:37
  Author: anatolik
Revision: 256058

upgpkg: apache 2.4.18-1

Modified:
  apache/trunk/PKGBUILD
Deleted:
  apache/trunk/revert_redirect_url.patch

---+
 PKGBUILD  |   14 +---
 revert_redirect_url.patch |  150 
 2 files changed, 4 insertions(+), 160 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-14 16:02:46 UTC (rev 256057)
+++ PKGBUILD2015-12-14 16:45:37 UTC (rev 256058)
@@ -4,8 +4,8 @@
 # Contributor: Pierre Schmitz 
 
 pkgname=apache
-pkgver=2.4.17
-pkgrel=5
+pkgver=2.4.18
+pkgrel=1
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
 url='http://www.apache.org/dist/httpd'
@@ -35,17 +35,13 @@
 httpd.logrotate
 httpd.service
 arch.layout
-# bugfix for https://bz.apache.org/bugzilla/show_bug.cgi?id=57785
-# taken from 
https://github.com/apache/httpd/commit/7feb3c027f9d0d16f37c7bed13b58c09162f
-revert_redirect_url.patch
 )
-sha256sums=('331e035dec81d3db95b048f036f4d7b1a97ec8daa5b377bde42d4ccf1f2eb798'
+sha256sums=('0644b050de41f5c9f67c825285049b144690421acb709b06fe53eddfa8a9fd4c'
 'SKIP'
 '63da1a420f4714a3e7af2672d28384419cc7eedbe7bf35baebd02938fabc15bf'
 '09165b754414347592a60e3cab3904cc441cfe2100eb66c7c76e6b0f18280ec8'
 'f574bac6d5f398e7a649fc0e1ca66ff01ad4ef34dac71258e93d8a9d9a2b3960'
-'dda05c6e76f12624e418ca18a36f2e90ec1c5b1cc52fed7142fce6076ec413f3'
-'eb9033e039e24cd443c861af0853dd8a8f7369170a393ef25fd31a627f6d40db')
+'dda05c6e76f12624e418ca18a36f2e90ec1c5b1cc52fed7142fce6076ec413f3')
 validpgpkeys=('A93D62ECC3C8EA12DB220EC934EA76E6791485A8') # Jim Jagielski
 
 prepare() {
@@ -57,8 +53,6 @@
   -i docs/conf/httpd.conf.in
 
   cat "${srcdir}/arch.layout" >> config.layout
-
-  patch -p1 < ../revert_redirect_url.patch
 }
 
 build() {

Deleted: revert_redirect_url.patch
===
--- revert_redirect_url.patch   2015-12-14 16:02:46 UTC (rev 256057)
+++ revert_redirect_url.patch   2015-12-14 16:45:37 UTC (rev 256058)
@@ -1,150 +0,0 @@
-From 7feb3c027f9d0d16f37c7bed13b58c09162f Mon Sep 17 00:00:00 2001
-From: Jim Jagielski 
-Date: Tue, 3 Nov 2015 12:02:43 +
-Subject: [PATCH] Merge r1710380, r1710391 from trunk:
-
-Make the fix for fully qualifying REDIRECT_URL from PR#57785 opt-in.
-
-
-
-
-followup to r1710380 -- refactored name and didn't have 'make depend'
-
-
-Submitted by: covener
-Reviewed/backported by: jim
-
-
-git-svn-id: 
https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1712268 
13f79535-47bb-0310-9956-ffa450edef68

- CHANGES  |  3 +++
- STATUS   |  7 ---
- docs/manual/mod/core.xml | 27 +++
- include/http_core.h  | 13 +
- server/core.c| 16 
- server/util_script.c | 31 ++-
- 6 files changed, 77 insertions(+), 20 deletions(-)
-
-diff --git a/include/http_core.h b/include/http_core.h
-index 6ca53f7..8535455 100644
 a/include/http_core.h
-+++ b/include/http_core.h
-@@ -465,6 +465,17 @@ typedef unsigned long etag_components_t;
- /* This is the default value used */
- #define ETAG_BACKWARD (ETAG_MTIME | ETAG_SIZE)
- 
-+/* Generic ON/OFF/UNSET for unsigned int foo :2 */
-+#define AP_CORE_CONFIG_OFF   (0)
-+#define AP_CORE_CONFIG_ON(1)
-+#define AP_CORE_CONFIG_UNSET (2)
-+
-+/* Generic merge of flag */
-+#define AP_CORE_MERGE_FLAG(field, to, base, over) to->field = \
-+   over->field != AP_CORE_CONFIG_UNSET\
-+   ? over->field  \
-+   : base->field   
-+
- /**
-  * @brief Server Signature Enumeration
-  */
-@@ -630,6 +641,8 @@ typedef struct {
-  * advice
-  */
- unsigned int cgi_pass_auth : 2;
-+unsigned int qualify_redirect_url :2;
-+
- } core_dir_config;
- 
- /* macro to implement off by default behaviour */
-diff --git a/server/core.c b/server/core.c
-index 37484b6..803d4d4 100644
 a/server/core.c
-+++ b/server/core.c
-@@ -191,6 +191,7 @@ static void *create_core_dir_config(apr_pool_t *a, char 
*dir)
- conf->max_reversals = AP_MAXRANGES_UNSET;
- 
- conf->cgi_pass_auth = AP_CGI_PASS_AUTH_UNSET;
-+conf->qualify_redirect_url = AP_CORE_CONFIG_UNSET; 
- 
- return (void *)conf;
- }
-@@ -405,6 +406,8 @@ static void *merge_core_dir_configs(apr_pool_t *a, void 
*basev, void *newv)
- 
- conf->cgi_pass_auth = new->cgi_pass_auth != AP_CGI_PASS_AUTH_UNSET ? 
new->cgi_pass_auth : base->cgi_pass_auth;
- 
-+AP_CORE_MERGE_FLAG(qualify_redirect_url, conf, base, new);
-+
- return (void*)conf;
- }
- 
-@@ -1707,6 +1710,15 @@ static const char 

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

[Anatol Pomozov]

Date: Monday, December 7, 2015 @ 17:53:14
  Author: anatolik
Revision: 253534

upgpkg: apache 2.4.17-5

Avoid using apachectl wrapper and use httpd binary directly

Modified:
  apache/trunk/PKGBUILD
  apache/trunk/httpd.logrotate
  apache/trunk/httpd.service

-+
 PKGBUILD|6 +++---
 httpd.logrotate |2 +-
 httpd.service   |9 -
 3 files changed, 8 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-07 16:43:39 UTC (rev 253533)
+++ PKGBUILD2015-12-07 16:53:14 UTC (rev 253534)
@@ -5,7 +5,7 @@
 
 pkgname=apache
 pkgver=2.4.17
-pkgrel=4
+pkgrel=5
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
 url='http://www.apache.org/dist/httpd'
@@ -42,8 +42,8 @@
 sha256sums=('331e035dec81d3db95b048f036f4d7b1a97ec8daa5b377bde42d4ccf1f2eb798'
 'SKIP'
 '63da1a420f4714a3e7af2672d28384419cc7eedbe7bf35baebd02938fabc15bf'
-'875903831634edf35d8d57e9a51bacb818255ecb3bfff29627f03e43d1ab65c3'
-'4d16b6ddeafbc94bc7109017be61788064f455c7ab453cce19a35a30a1f5e64f'
+'09165b754414347592a60e3cab3904cc441cfe2100eb66c7c76e6b0f18280ec8'
+'f574bac6d5f398e7a649fc0e1ca66ff01ad4ef34dac71258e93d8a9d9a2b3960'
 'dda05c6e76f12624e418ca18a36f2e90ec1c5b1cc52fed7142fce6076ec413f3'
 'eb9033e039e24cd443c861af0853dd8a8f7369170a393ef25fd31a627f6d40db')
 validpgpkeys=('A93D62ECC3C8EA12DB220EC934EA76E6791485A8') # Jim Jagielski

Modified: httpd.logrotate
===
--- httpd.logrotate 2015-12-07 16:43:39 UTC (rev 253533)
+++ httpd.logrotate 2015-12-07 16:53:14 UTC (rev 253534)
@@ -1,6 +1,6 @@
 /var/log/httpd/*log {
missingok
postrotate
-  /bin/kill -HUP `cat /run/httpd/httpd.pid 2>/dev/null` 2> /dev/null || 
true
+  /usr/bin/systemctl reload httpd.service 2>/dev/null || true
endscript
 }

Modified: httpd.service
===
--- httpd.service   2015-12-07 16:43:39 UTC (rev 253533)
+++ httpd.service   2015-12-07 16:53:14 UTC (rev 253534)
@@ -3,11 +3,10 @@
 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
+Type=simple
+ExecStart=/usr/bin/httpd -k start -DFOREGROUND
+ExecStop=/usr/bin/httpd -k graceful-stop
+ExecReload=/usr/bin/httpd -k graceful
 PrivateTmp=true
 LimitNOFILE=infinity
 KillMode=mixed

[arch-commits] Commit in apache/trunk (PKGBUILD)

[Anatol Pomozov]

Date: Wednesday, December 2, 2015 @ 17:23:38
  Author: anatolik
Revision: 252120

Remove unused ln commands

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-02 16:22:28 UTC (rev 252119)
+++ PKGBUILD2015-12-02 16:23:38 UTC (rev 252120)
@@ -102,10 +102,8 @@
   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"
+  # do we really need this symlink?
   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/#' \

[arch-commits] Commit in apache/trunk (PKGBUILD)

[Anatol Pomozov]

Date: Wednesday, December 2, 2015 @ 17:48:01
  Author: anatolik
Revision: 252121

upgpkg: apache 2.4.17-4

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-02 16:23:38 UTC (rev 252120)
+++ PKGBUILD2015-12-02 16:48:01 UTC (rev 252121)
@@ -5,7 +5,7 @@
 
 pkgname=apache
 pkgver=2.4.17
-pkgrel=3
+pkgrel=4
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
 url='http://www.apache.org/dist/httpd'
@@ -43,7 +43,7 @@
 'SKIP'
 '63da1a420f4714a3e7af2672d28384419cc7eedbe7bf35baebd02938fabc15bf'
 '875903831634edf35d8d57e9a51bacb818255ecb3bfff29627f03e43d1ab65c3'
-'2c6fc6fabc7fb113650690ce4e9347e54c4d2124b2975c7d671720169c990398'
+'4d16b6ddeafbc94bc7109017be61788064f455c7ab453cce19a35a30a1f5e64f'
 'dda05c6e76f12624e418ca18a36f2e90ec1c5b1cc52fed7142fce6076ec413f3'
 'eb9033e039e24cd443c861af0853dd8a8f7369170a393ef25fd31a627f6d40db')
 validpgpkeys=('A93D62ECC3C8EA12DB220EC934EA76E6791485A8') # Jim Jagielski

[arch-commits] Commit in apache/trunk (PKGBUILD revert_redirect_url.patch)

[Anatol Pomozov]

Date: Wednesday, November 11, 2015 @ 17:37:45
  Author: anatolik
Revision: 250752

upgpkg: apache 2.4.17-3

Backport fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=57785

Added:
  apache/trunk/revert_redirect_url.patch
Modified:
  apache/trunk/PKGBUILD

---+
 PKGBUILD  |   12 ++-
 revert_redirect_url.patch |  150 
 2 files changed, 159 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-11-11 15:35:33 UTC (rev 250751)
+++ PKGBUILD2015-11-11 16:37:45 UTC (rev 250752)
@@ -5,7 +5,7 @@
 
 pkgname=apache
 pkgver=2.4.17
-pkgrel=2
+pkgrel=3
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
 url='http://www.apache.org/dist/httpd'
@@ -35,13 +35,17 @@
 httpd.logrotate
 httpd.service
 arch.layout
+# bugfix for https://bz.apache.org/bugzilla/show_bug.cgi?id=57785
+# taken from 
https://github.com/apache/httpd/commit/7feb3c027f9d0d16f37c7bed13b58c09162f
+revert_redirect_url.patch
 )
 sha256sums=('331e035dec81d3db95b048f036f4d7b1a97ec8daa5b377bde42d4ccf1f2eb798'
 'SKIP'
 '63da1a420f4714a3e7af2672d28384419cc7eedbe7bf35baebd02938fabc15bf'
 '875903831634edf35d8d57e9a51bacb818255ecb3bfff29627f03e43d1ab65c3'
-'14d0a775eea7f8c66ba55399a9ad1e4fd29e0302f479a15b28bbfc754c5aa347'
-'dda05c6e76f12624e418ca18a36f2e90ec1c5b1cc52fed7142fce6076ec413f3')
+'2c6fc6fabc7fb113650690ce4e9347e54c4d2124b2975c7d671720169c990398'
+'dda05c6e76f12624e418ca18a36f2e90ec1c5b1cc52fed7142fce6076ec413f3'
+'eb9033e039e24cd443c861af0853dd8a8f7369170a393ef25fd31a627f6d40db')
 validpgpkeys=('A93D62ECC3C8EA12DB220EC934EA76E6791485A8') # Jim Jagielski
 
 prepare() {
@@ -53,6 +57,8 @@
   -i docs/conf/httpd.conf.in
 
   cat "${srcdir}/arch.layout" >> config.layout
+
+  patch -p1 < ../revert_redirect_url.patch
 }
 
 build() {

Added: revert_redirect_url.patch
===
--- revert_redirect_url.patch   (rev 0)
+++ revert_redirect_url.patch   2015-11-11 16:37:45 UTC (rev 250752)
@@ -0,0 +1,150 @@
+From 7feb3c027f9d0d16f37c7bed13b58c09162f Mon Sep 17 00:00:00 2001
+From: Jim Jagielski 
+Date: Tue, 3 Nov 2015 12:02:43 +
+Subject: [PATCH] Merge r1710380, r1710391 from trunk:
+
+Make the fix for fully qualifying REDIRECT_URL from PR#57785 opt-in.
+
+
+
+
+followup to r1710380 -- refactored name and didn't have 'make depend'
+
+
+Submitted by: covener
+Reviewed/backported by: jim
+
+
+git-svn-id: 
https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1712268 
13f79535-47bb-0310-9956-ffa450edef68
+---
+ CHANGES  |  3 +++
+ STATUS   |  7 ---
+ docs/manual/mod/core.xml | 27 +++
+ include/http_core.h  | 13 +
+ server/core.c| 16 
+ server/util_script.c | 31 ++-
+ 6 files changed, 77 insertions(+), 20 deletions(-)
+
+diff --git a/include/http_core.h b/include/http_core.h
+index 6ca53f7..8535455 100644
+--- a/include/http_core.h
 b/include/http_core.h
+@@ -465,6 +465,17 @@ typedef unsigned long etag_components_t;
+ /* This is the default value used */
+ #define ETAG_BACKWARD (ETAG_MTIME | ETAG_SIZE)
+ 
++/* Generic ON/OFF/UNSET for unsigned int foo :2 */
++#define AP_CORE_CONFIG_OFF   (0)
++#define AP_CORE_CONFIG_ON(1)
++#define AP_CORE_CONFIG_UNSET (2)
++
++/* Generic merge of flag */
++#define AP_CORE_MERGE_FLAG(field, to, base, over) to->field = \
++   over->field != AP_CORE_CONFIG_UNSET\
++   ? over->field  \
++   : base->field   
++
+ /**
+  * @brief Server Signature Enumeration
+  */
+@@ -630,6 +641,8 @@ typedef struct {
+  * advice
+  */
+ unsigned int cgi_pass_auth : 2;
++unsigned int qualify_redirect_url :2;
++
+ } core_dir_config;
+ 
+ /* macro to implement off by default behaviour */
+diff --git a/server/core.c b/server/core.c
+index 37484b6..803d4d4 100644
+--- a/server/core.c
 b/server/core.c
+@@ -191,6 +191,7 @@ static void *create_core_dir_config(apr_pool_t *a, char 
*dir)
+ conf->max_reversals = AP_MAXRANGES_UNSET;
+ 
+ conf->cgi_pass_auth = AP_CGI_PASS_AUTH_UNSET;
++conf->qualify_redirect_url = AP_CORE_CONFIG_UNSET; 
+ 
+ return (void *)conf;
+ }
+@@ -405,6 +406,8 @@ static void *merge_core_dir_configs(apr_pool_t *a, void 
*basev, void *newv)
+ 
+ conf->cgi_pass_auth = new->cgi_pass_auth != AP_CGI_PASS_AUTH_UNSET ? 
new->cgi_pass_auth : base->cgi_pass_auth;
+ 
++AP_CORE_MERGE_FLAG(qualify_redirect_url, conf, base, new);
++
+ return (void*)conf;
+ }
+ 
+@@ -1707,6 +1710,15 @@ static const char 

[arch-commits] Commit in apache/trunk (PKGBUILD lua53_fixes.patch)

[Anatol Pomozov]

Date: Thursday, October 15, 2015 @ 22:52:44
  Author: anatolik
Revision: 249400

Remove lua5.3 compat patch. Upstream has resolved the problem already.

Modified:
  apache/trunk/PKGBUILD
Deleted:
  apache/trunk/lua53_fixes.patch

---+
 PKGBUILD  |8 ++--
 lua53_fixes.patch |   44 
 2 files changed, 2 insertions(+), 50 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-10-15 20:36:18 UTC (rev 249399)
+++ PKGBUILD2015-10-15 20:52:44 UTC (rev 249400)
@@ -34,7 +34,6 @@
 httpd.logrotate
 httpd.service
 arch.layout
-lua53_fixes.patch
 )
 sha256sums=('331e035dec81d3db95b048f036f4d7b1a97ec8daa5b377bde42d4ccf1f2eb798'
 'SKIP'
@@ -41,8 +40,7 @@
 '63da1a420f4714a3e7af2672d28384419cc7eedbe7bf35baebd02938fabc15bf'
 '875903831634edf35d8d57e9a51bacb818255ecb3bfff29627f03e43d1ab65c3'
 '14d0a775eea7f8c66ba55399a9ad1e4fd29e0302f479a15b28bbfc754c5aa347'
-'dda05c6e76f12624e418ca18a36f2e90ec1c5b1cc52fed7142fce6076ec413f3'
-'de613a4903848ee103b73f5381a366281a62c0006dc8d2b1ebd919ddffb05398')
+'dda05c6e76f12624e418ca18a36f2e90ec1c5b1cc52fed7142fce6076ec413f3')
 validpgpkeys=('A93D62ECC3C8EA12DB220EC934EA76E6791485A8') # Jim Jagielski
 
 prepare() {
@@ -54,8 +52,6 @@
   -i docs/conf/httpd.conf.in
 
   cat "${srcdir}/arch.layout" >> config.layout
-
-  patch -p3 < ../lua53_fixes.patch
 }
 
 build() {
@@ -80,7 +76,7 @@
   --enable-proxy --enable-proxy-connect \
   --enable-proxy-http --enable-proxy-ftp \
   --enable-dbd --enable-imagemap --enable-ident --enable-cern-meta \
-  --enable-lua --enable-xml2enc \
+  --enable-lua --enable-xml2enc --enable-http2 \
   --with-apr=/usr/bin/apr-1-config \
   --with-apr-util=/usr/bin/apu-1-config \
   --with-pcre=/usr

Deleted: lua53_fixes.patch
===
--- lua53_fixes.patch   2015-10-15 20:36:18 UTC (rev 249399)
+++ lua53_fixes.patch   2015-10-15 20:52:44 UTC (rev 249400)
@@ -1,44 +0,0 @@
-Author: fuankg
-Date: Mon Jan 19 00:35:25 2015
-New Revision: 1652886
-
-URL: http://svn.apache.org/r1652886
-Log:
-Enable to build mod_lua against Lua 5.3.
-
-Modified:
-httpd/httpd/trunk/modules/lua/NWGNUmakefile
-httpd/httpd/trunk/modules/lua/mod_lua.h
-
-Modified: httpd/httpd/trunk/modules/lua/NWGNUmakefile
-URL: 
http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/lua/NWGNUmakefile?rev=1652886=1652885=1652886=diff
-==
 httpd/httpd/trunk/modules/lua/NWGNUmakefile (original)
-+++ httpd/httpd/trunk/modules/lua/NWGNUmakefile Mon Jan 19 00:35:25 2015
-@@ -46,6 +46,9 @@ XCFLAGS  += \
- #
- XDEFINES  += \
-   -DLUA_COMPAT_ALL \
-+  -DLUA_COMPAT_5_2 \
-+  -DLUA_COMPAT_5_1 \
-+  -DLUA_COMPAT_MODULE \
-   $(EOLIST)
- 
- #
-
-Modified: httpd/httpd/trunk/modules/lua/mod_lua.h
-URL: 
http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/lua/mod_lua.h?rev=1652886=1652885=1652886=diff
-==
 httpd/httpd/trunk/modules/lua/mod_lua.h (original)
-+++ httpd/httpd/trunk/modules/lua/mod_lua.h Mon Jan 19 00:35:25 2015
-@@ -43,6 +43,10 @@
- 
- /* Allow for Lua 5.2 backwards compatibility */
- #define LUA_COMPAT_ALL
-+/* Allow for Lua 5.3 backwards compatibility */
-+#define LUA_COMPAT_5_2
-+#define LUA_COMPAT_5_1
-+#define LUA_COMPAT_MODULE
- 
- #include "lua.h"
- #include "lauxlib.h"

[arch-commits] Commit in apache/trunk (PKGBUILD)

[Anatol Pomozov]

Date: Friday, October 16, 2015 @ 00:08:10
  Author: anatolik
Revision: 249410

upgpkg: apache 2.4.17-2

Enable experimental http2 module

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-10-15 22:07:14 UTC (rev 249409)
+++ PKGBUILD2015-10-15 22:08:10 UTC (rev 249410)
@@ -5,7 +5,7 @@
 
 pkgname=apache
 pkgver=2.4.17
-pkgrel=1
+pkgrel=2
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
 url='http://www.apache.org/dist/httpd'
@@ -20,11 +20,12 @@
 etc/logrotate.d/httpd
 )
 depends=('zlib' 'apr-util' 'pcre')
-makedepends=('libxml2' 'lua' 'openssl')
+makedepends=('libxml2' 'lua' 'openssl' 'nghttp2')
 optdepends=(
 'lua: for mod_lua module'
 'openssl: for mod_ssl module'
-'libxml2: for mod_proxy_html, mod_xml2enc modules' 
+'libxml2: for mod_proxy_html, mod_xml2enc modules'
+'nghttp2: for mod_http2 module'
 'lynx: apachectl status'
 )
 install=apache.install

[arch-commits] Commit in apache/trunk (PKGBUILD)

[Anatol Pomozov]

Date: Tuesday, October 13, 2015 @ 21:41:21
  Author: anatolik
Revision: 249231

upgpkg: apache 2.4.17-1

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-10-13 19:21:52 UTC (rev 249230)
+++ PKGBUILD2015-10-13 19:41:21 UTC (rev 249231)
@@ -4,7 +4,7 @@
 # Contributor: Pierre Schmitz 
 
 pkgname=apache
-pkgver=2.4.16
+pkgver=2.4.17
 pkgrel=1
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
@@ -36,7 +36,7 @@
 arch.layout
 lua53_fixes.patch
 )
-sha256sums=('ac660b47aaa7887779a6430404dcb40c0b04f90ea69e7bd49a40552e9ff13743'
+sha256sums=('331e035dec81d3db95b048f036f4d7b1a97ec8daa5b377bde42d4ccf1f2eb798'
 'SKIP'
 '63da1a420f4714a3e7af2672d28384419cc7eedbe7bf35baebd02938fabc15bf'
 '875903831634edf35d8d57e9a51bacb818255ecb3bfff29627f03e43d1ab65c3'

[arch-commits] Commit in apache/trunk (PKGBUILD lua53_fixes.patch)

[Anatol Pomozov]

Date: Wednesday, July 15, 2015 @ 18:43:46
  Author: anatolik
Revision: 242252

upgpkg: apache 2.4.16-1

Modified:
  apache/trunk/PKGBUILD
  apache/trunk/lua53_fixes.patch

---+
 PKGBUILD  |8 
 lua53_fixes.patch |   11 ---
 2 files changed, 4 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-07-15 16:16:15 UTC (rev 242251)
+++ PKGBUILD2015-07-15 16:43:46 UTC (rev 242252)
@@ -4,8 +4,8 @@
 # Contributor: Pierre Schmitz pie...@archlinux.de
 
 pkgname=apache
-pkgver=2.4.12
-pkgrel=4
+pkgver=2.4.16
+pkgrel=1
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
 url='http://www.apache.org/dist/httpd'
@@ -36,13 +36,13 @@
 arch.layout
 lua53_fixes.patch
 )
-sha256sums=('ad6d39edfe4621d8cc9a2791f6f8d6876943a9da41ac8533d77407a2e630eae4'
+sha256sums=('ac660b47aaa7887779a6430404dcb40c0b04f90ea69e7bd49a40552e9ff13743'
 'SKIP'
 '63da1a420f4714a3e7af2672d28384419cc7eedbe7bf35baebd02938fabc15bf'
 '875903831634edf35d8d57e9a51bacb818255ecb3bfff29627f03e43d1ab65c3'
 '14d0a775eea7f8c66ba55399a9ad1e4fd29e0302f479a15b28bbfc754c5aa347'
 'dda05c6e76f12624e418ca18a36f2e90ec1c5b1cc52fed7142fce6076ec413f3'
-'e2c3fe0747908971449dba8f1526f008fc27b9ff5c3b490ea9d43a2a5fe8c1e4')
+'de613a4903848ee103b73f5381a366281a62c0006dc8d2b1ebd919ddffb05398')
 validpgpkeys=('A93D62ECC3C8EA12DB220EC934EA76E6791485A8') # Jim Jagielski
 
 prepare() {

Modified: lua53_fixes.patch
===
--- lua53_fixes.patch   2015-07-15 16:16:15 UTC (rev 242251)
+++ lua53_fixes.patch   2015-07-15 16:43:46 UTC (rev 242252)
@@ -42,14 +42,3 @@
  
  #include lua.h
  #include lauxlib.h
-@@ -55,6 +59,10 @@
- #else
- #define lua_rawlen(L,i)   lua_objlen(L, (i))
- #endif
-+#if LUA_VERSION_NUM  502
-+/* Load mode for lua_dump() */
-+#define lua_dump(a,b,c)   lua_dump(a,b,c,0)
-+#endif
- 
- /* Create a set of AP_LUA_DECLARE(type), AP_LUA_DECLARE_NONSTD(type) and
-  * AP_LUA_DECLARE_DATA with appropriate export and import tags for the 
platform

[arch-commits] Commit in apache/trunk (PKGBUILD)

[Anatol Pomozov]

Date: Saturday, May 16, 2015 @ 18:49:41
  Author: anatolik
Revision: 239470

upgpkg: apache 2.4.12-4

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-05-16 16:22:39 UTC (rev 239469)
+++ PKGBUILD2015-05-16 16:49:41 UTC (rev 239470)
@@ -5,7 +5,7 @@
 
 pkgname=apache
 pkgver=2.4.12
-pkgrel=3
+pkgrel=4
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
 url='http://www.apache.org/dist/httpd'

[arch-commits] Commit in apache/trunk (PKGBUILD lua53_fixes.patch)

[Anatol Pomozov]

Date: Monday, May 4, 2015 @ 18:25:22
  Author: anatolik
Revision: 238469

Lua 5.3 rebuild

Added:
  apache/trunk/lua53_fixes.patch
Modified:
  apache/trunk/PKGBUILD

---+
 PKGBUILD  |   16 +++
 lua53_fixes.patch |   55 
 2 files changed, 67 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-05-04 16:15:43 UTC (rev 238468)
+++ PKGBUILD2015-05-04 16:25:22 UTC (rev 238469)
@@ -5,7 +5,7 @@
 
 pkgname=apache
 pkgver=2.4.12
-pkgrel=2
+pkgrel=3
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
 url='http://www.apache.org/dist/httpd'
@@ -34,6 +34,7 @@
 httpd.logrotate
 httpd.service
 arch.layout
+lua53_fixes.patch
 )
 sha256sums=('ad6d39edfe4621d8cc9a2791f6f8d6876943a9da41ac8533d77407a2e630eae4'
 'SKIP'
@@ -40,10 +41,11 @@
 '63da1a420f4714a3e7af2672d28384419cc7eedbe7bf35baebd02938fabc15bf'
 '875903831634edf35d8d57e9a51bacb818255ecb3bfff29627f03e43d1ab65c3'
 '14d0a775eea7f8c66ba55399a9ad1e4fd29e0302f479a15b28bbfc754c5aa347'
-'dda05c6e76f12624e418ca18a36f2e90ec1c5b1cc52fed7142fce6076ec413f3')
+'dda05c6e76f12624e418ca18a36f2e90ec1c5b1cc52fed7142fce6076ec413f3'
+'e2c3fe0747908971449dba8f1526f008fc27b9ff5c3b490ea9d43a2a5fe8c1e4')
 validpgpkeys=('A93D62ECC3C8EA12DB220EC934EA76E6791485A8') # Jim Jagielski
 
-build() {
+prepare() {
   cd httpd-${pkgver}
 
   # set default user
@@ -52,7 +54,13 @@
   -i docs/conf/httpd.conf.in
 
   cat ${srcdir}/arch.layout  config.layout
-   
+
+  patch -p3  ../lua53_fixes.patch
+}
+
+build() {
+  cd httpd-${pkgver}
+
   ./configure --sbindir=/usr/bin \
   --enable-layout=Arch \
   --enable-mpms-shared=all \

Added: lua53_fixes.patch
===
--- lua53_fixes.patch   (rev 0)
+++ lua53_fixes.patch   2015-05-04 16:25:22 UTC (rev 238469)
@@ -0,0 +1,55 @@
+Author: fuankg
+Date: Mon Jan 19 00:35:25 2015
+New Revision: 1652886
+
+URL: http://svn.apache.org/r1652886
+Log:
+Enable to build mod_lua against Lua 5.3.
+
+Modified:
+httpd/httpd/trunk/modules/lua/NWGNUmakefile
+httpd/httpd/trunk/modules/lua/mod_lua.h
+
+Modified: httpd/httpd/trunk/modules/lua/NWGNUmakefile
+URL: 
http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/lua/NWGNUmakefile?rev=1652886r1=1652885r2=1652886view=diff
+==
+--- httpd/httpd/trunk/modules/lua/NWGNUmakefile (original)
 httpd/httpd/trunk/modules/lua/NWGNUmakefile Mon Jan 19 00:35:25 2015
+@@ -46,6 +46,9 @@ XCFLAGS  += \
+ #
+ XDEFINES  += \
+   -DLUA_COMPAT_ALL \
++  -DLUA_COMPAT_5_2 \
++  -DLUA_COMPAT_5_1 \
++  -DLUA_COMPAT_MODULE \
+   $(EOLIST)
+ 
+ #
+
+Modified: httpd/httpd/trunk/modules/lua/mod_lua.h
+URL: 
http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/lua/mod_lua.h?rev=1652886r1=1652885r2=1652886view=diff
+==
+--- httpd/httpd/trunk/modules/lua/mod_lua.h (original)
 httpd/httpd/trunk/modules/lua/mod_lua.h Mon Jan 19 00:35:25 2015
+@@ -43,6 +43,10 @@
+ 
+ /* Allow for Lua 5.2 backwards compatibility */
+ #define LUA_COMPAT_ALL
++/* Allow for Lua 5.3 backwards compatibility */
++#define LUA_COMPAT_5_2
++#define LUA_COMPAT_5_1
++#define LUA_COMPAT_MODULE
+ 
+ #include lua.h
+ #include lauxlib.h
+@@ -55,6 +59,10 @@
+ #else
+ #define lua_rawlen(L,i)   lua_objlen(L, (i))
+ #endif
++#if LUA_VERSION_NUM  502
++/* Load mode for lua_dump() */
++#define lua_dump(a,b,c)   lua_dump(a,b,c,0)
++#endif
+ 
+ /* Create a set of AP_LUA_DECLARE(type), AP_LUA_DECLARE_NONSTD(type) and
+  * AP_LUA_DECLARE_DATA with appropriate export and import tags for the 
platform

[arch-commits] Commit in apache/trunk (PKGBUILD)

[Anatol Pomozov]

Date: Saturday, January 31, 2015 @ 20:08:48
  Author: anatolik
Revision: 230336

upgpkg: apache 2.4.12-2

Enable mod_authnz_fcgi (new since 2.4.10)

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-01-31 16:44:38 UTC (rev 230335)
+++ PKGBUILD2015-01-31 19:08:48 UTC (rev 230336)
@@ -5,7 +5,7 @@
 
 pkgname=apache
 pkgver=2.4.12
-pkgrel=1
+pkgrel=2
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
 url='http://www.apache.org/dist/httpd'

[arch-commits] Commit in apache/trunk (PKGBUILD)

[Anatol Pomozov]

Date: Friday, January 30, 2015 @ 23:25:25
  Author: anatolik
Revision: 230302

upgpkg: apache 2.4.12-1

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-01-30 21:32:21 UTC (rev 230301)
+++ PKGBUILD2015-01-30 22:25:25 UTC (rev 230302)
@@ -4,7 +4,7 @@
 # Contributor: Pierre Schmitz pie...@archlinux.de
 
 pkgname=apache
-pkgver=2.4.10
+pkgver=2.4.12
 pkgrel=1
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
@@ -35,7 +35,7 @@
 httpd.service
 arch.layout
 )
-sha256sums=('176c4dac1a745f07b7b91e7f4fd48f9c48049fa6f088efe758d61d9738669c6a'
+sha256sums=('ad6d39edfe4621d8cc9a2791f6f8d6876943a9da41ac8533d77407a2e630eae4'
 'SKIP'
 '63da1a420f4714a3e7af2672d28384419cc7eedbe7bf35baebd02938fabc15bf'
 '875903831634edf35d8d57e9a51bacb818255ecb3bfff29627f03e43d1ab65c3'

[arch-commits] Commit in apache/trunk (PKGBUILD)

[Anatol Pomozov]

Date: Saturday, January 31, 2015 @ 04:59:05
  Author: anatolik
Revision: 230304

Enable authnz-fcgi module (new to 2.4.10)

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-01-30 22:26:29 UTC (rev 230303)
+++ PKGBUILD2015-01-31 03:59:05 UTC (rev 230304)
@@ -65,7 +65,7 @@
   --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-ldap --enable-authnz-ldap --enable-authnz-fcgi \
   --enable-cache --enable-disk-cache --enable-mem-cache 
--enable-file-cache \
   --enable-ssl --with-ssl \
   --enable-deflate --enable-cgi --enable-cgid \

[arch-commits] Commit in apache/trunk (PKGBUILD)

[Anatol Pomozov]

Date: Tuesday, December 30, 2014 @ 01:23:26
  Author: anatolik
Revision: 228162

Add validpgpkeys()

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |1 +
 1 file changed, 1 insertion(+)

Modified: PKGBUILD
===
--- PKGBUILD2014-12-30 00:18:46 UTC (rev 228161)
+++ PKGBUILD2014-12-30 00:23:26 UTC (rev 228162)
@@ -41,6 +41,7 @@
 '875903831634edf35d8d57e9a51bacb818255ecb3bfff29627f03e43d1ab65c3'
 '14d0a775eea7f8c66ba55399a9ad1e4fd29e0302f479a15b28bbfc754c5aa347'
 'dda05c6e76f12624e418ca18a36f2e90ec1c5b1cc52fed7142fce6076ec413f3')
+validpgpkeys=('A93D62ECC3C8EA12DB220EC934EA76E6791485A8') # Jim Jagielski
 
 build() {
   cd httpd-${pkgver}

[arch-commits] Commit in apache/trunk (PKGBUILD)

[Anatol Pomozov]

Date: Saturday, July 19, 2014 @ 20:00:55
  Author: anatolik
Revision: 217482

upgpkg: apache 2.4.10-1

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-07-19 16:03:47 UTC (rev 217481)
+++ PKGBUILD2014-07-19 18:00:55 UTC (rev 217482)
@@ -4,7 +4,7 @@
 # Contributor: Pierre Schmitz pie...@archlinux.de
 
 pkgname=apache
-pkgver=2.4.9
+pkgver=2.4.10
 pkgrel=1
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
@@ -35,7 +35,7 @@
 httpd.service
 arch.layout
 )
-sha256sums=('f78cc90dfa47caf3d83ad18fd6b4e85f23c1733fc9088594b70ce2847603'
+sha256sums=('176c4dac1a745f07b7b91e7f4fd48f9c48049fa6f088efe758d61d9738669c6a'
 'SKIP'
 '63da1a420f4714a3e7af2672d28384419cc7eedbe7bf35baebd02938fabc15bf'
 '875903831634edf35d8d57e9a51bacb818255ecb3bfff29627f03e43d1ab65c3'

[arch-commits] Commit in apache/trunk (PKGBUILD)

[Anatol Pomozov]

Date: Sunday, March 16, 2014 @ 20:56:14
  Author: anatolik
Revision: 207990

upgpkg: apache 2.4.9-1

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-03-16 19:05:38 UTC (rev 207989)
+++ PKGBUILD2014-03-16 19:56:14 UTC (rev 207990)
@@ -4,8 +4,8 @@
 # Contributor: Pierre Schmitz pie...@archlinux.de
 
 pkgname=apache
-pkgver=2.4.7
-pkgrel=2
+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'
@@ -22,9 +22,9 @@
 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' 
+'lua: for mod_lua module'
+'openssl: for mod_ssl module'
+'libxml2: for mod_proxy_html, mod_xml2enc modules' 
 'lynx: apachectl status'
 )
 install=apache.install
@@ -35,7 +35,7 @@
 httpd.service
 arch.layout
 )
-sha256sums=('64368d8301836815ae237f2b62d909711c896c1bd34573771e0ee5ad808ce71b'
+sha256sums=('f78cc90dfa47caf3d83ad18fd6b4e85f23c1733fc9088594b70ce2847603'
 'SKIP'
 '63da1a420f4714a3e7af2672d28384419cc7eedbe7bf35baebd02938fabc15bf'
 '875903831634edf35d8d57e9a51bacb818255ecb3bfff29627f03e43d1ab65c3'

[arch-commits] Commit in apache/trunk (PKGBUILD apache.install)

[Anatol Pomozov]

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)

[Anatol Pomozov]

Date: Sunday, March 9, 2014 @ 01:16:15
  Author: anatolik
Revision: 207425

Enable missing Apache modules:

mod_cern_meta
mod_cgi
mod_ident
mod_imagemap
mod_lua
mod_proxy_html
mod_xml2enc

Fixes FS#39222 FS#39206

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-03-08 20:13:20 UTC (rev 207424)
+++ PKGBUILD2014-03-09 00:16:15 UTC (rev 207425)
@@ -5,7 +5,7 @@
 
 pkgname=apache
 pkgver=2.4.7
-pkgrel=1
+pkgrel=2
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
 url='http://www.apache.org/dist/httpd'

[arch-commits] Commit in apache/trunk (PKGBUILD)

[Anatol Pomozov]

Date: Friday, March 7, 2014 @ 19:18:36
  Author: anatolik
Revision: 207146

httpd binary is already installed by 'make install'

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |1 -
 1 file changed, 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-03-07 17:54:47 UTC (rev 207145)
+++ PKGBUILD2014-03-07 18:18:36 UTC (rev 207146)
@@ -73,7 +73,6 @@
 
   make DESTDIR=${pkgdir} install

-  install -D -m755 httpd ${pkgdir}/usr/bin/httpd
   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  

[arch-commits] Commit in apache/trunk (PKGBUILD)

[Anatol Pomozov]

Date: Friday, March 7, 2014 @ 01:16:42
  Author: anatolik
Revision: 207121

Enable cgi module used for non-threaded MPM

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-03-06 22:35:39 UTC (rev 207120)
+++ PKGBUILD2014-03-07 00:16:42 UTC (rev 207121)
@@ -57,7 +57,7 @@
   --enable-ldap --enable-authnz-ldap \
   --enable-cache --enable-disk-cache --enable-mem-cache 
--enable-file-cache \
   --enable-ssl --with-ssl \
-  --enable-deflate --enable-cgid \
+  --enable-deflate --enable-cgi --enable-cgid \
   --enable-proxy --enable-proxy-connect \
   --enable-proxy-http --enable-proxy-ftp \
   --enable-dbd \

[arch-commits] Commit in apache/trunk (PKGBUILD)

[Andreas Radke]

Date: Sunday, February 2, 2014 @ 17:37:29
  Author: andyrtr
Revision: 204969

upgpkg: apache 2.2.26-1

upstream update 2.2.26

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-02-02 11:52:21 UTC (rev 204968)
+++ PKGBUILD2014-02-02 16:37:29 UTC (rev 204969)
@@ -4,7 +4,7 @@
 # Contributor: Pierre Schmitz pie...@archlinux.de
 
 pkgname=apache
-pkgver=2.2.25
+pkgver=2.2.26
 pkgrel=1
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
@@ -20,8 +20,7 @@
 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
+source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2{,.asc}
 ${_itkurl}/02-rename-prefork-to-itk.patch
 ${_itkurl}/03-add-mpm-to-build-system.patch
 ${_itkurl}/04-correct-output-makefile-location.patch
@@ -38,7 +37,7 @@
 httpd.logrotate
 httpd.service
 arch.layout)
-md5sums=('9ebe3070c0bb4311f21a0cd0e34f0045'
+md5sums=('254eda547f8d624604e4bf403241e617'
  'SKIP'
  'f1d9d41360908ceb2374da55ae99197a'
  'cdfa04985a0efa850976aef01c2a0c40'

[arch-commits] Commit in apache/trunk (PKGBUILD)

[Florian Pritz]

Date: Wednesday, August 7, 2013 @ 20:03:54
  Author: bluewind
Revision: 192208

Readd /etc/conf.d/apache to backup array

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |1 +
 1 file changed, 1 insertion(+)

Modified: PKGBUILD
===
--- PKGBUILD2013-08-07 16:17:59 UTC (rev 192207)
+++ PKGBUILD2013-08-07 18:03:54 UTC (rev 192208)
@@ -15,6 +15,7 @@
 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/conf.d/apache
 etc/logrotate.d/httpd)
 depends=('openssl' 'zlib' 'apr-util' 'pcre' 'systemd')
 optdepends=('lynx: apachectl status')

[arch-commits] Commit in apache/trunk (PKGBUILD)

[Jan de Groot]

Date: Thursday, July 18, 2013 @ 21:18:57
  Author: jgc
Revision: 190842

upgpkg: apache 2.2.25-1

Probably the last apache 2.2.x we'll ship

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-07-18 18:46:16 UTC (rev 190841)
+++ PKGBUILD2013-07-18 19:18:57 UTC (rev 190842)
@@ -4,8 +4,8 @@
 # Contributor: Pierre Schmitz pie...@archlinux.de
 
 pkgname=apache
-pkgver=2.2.24
-pkgrel=3
+pkgver=2.2.25
+pkgrel=1
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
 options=('!libtool')
@@ -38,7 +38,7 @@
 httpd.logrotate
 httpd.service
 arch.layout)
-md5sums=('91bd1484aca13a7095d6432be37fc7ae'
+md5sums=('9ebe3070c0bb4311f21a0cd0e34f0045'
  'SKIP'
  'f1d9d41360908ceb2374da55ae99197a'
  'cdfa04985a0efa850976aef01c2a0c40'

[arch-commits] Commit in apache/trunk (PKGBUILD apache.conf.d apachectl-confd.patch)

[Pierre Schmitz]

Date: Friday, May 31, 2013 @ 10:01:01
  Author: pierre
Revision: 186793

revert to conf.d usage

Added:
  apache/trunk/apache.conf.d
  apache/trunk/apachectl-confd.patch
Modified:
  apache/trunk/PKGBUILD

---+
 PKGBUILD  |9 -
 apache.conf.d |   15 +++
 apachectl-confd.patch |   15 +++
 3 files changed, 38 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-31 07:47:58 UTC (rev 186792)
+++ PKGBUILD2013-05-31 08:01:01 UTC (rev 186793)
@@ -5,7 +5,7 @@
 
 pkgname=apache
 pkgver=2.2.24
-pkgrel=2
+pkgrel=3
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
 options=('!libtool')
@@ -32,6 +32,8 @@
 ${_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.service
@@ -48,6 +50,8 @@
  'e75b7dd8d8afcd299ba4ab2ab81c11e4'
  'ce1ccc21f3ad8625169c8f62913450ac'
  '1e5b222edcfbf99a3edc56fcb2074fbe'
+ '4ac64df6e019edbe137017cba1ff2f51'
+ '08b3c875f6260644f2f52b4056d656b0'
  '82068753dab92fe86312b1010a2904d7'
  '13dbaaf949c5bc36cfcf5718b95cb020'
  'a823bb355c136fd0e2b3fb820e2d903c'
@@ -56,6 +60,8 @@
 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#' \
@@ -133,6 +139,7 @@
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

Added: apache.conf.d
===
--- apache.conf.d   (rev 0)
+++ apache.conf.d   2013-05-31 08:01:01 UTC (rev 186793)
@@ -0,0 +1,15 @@
+# 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=

Added: apachectl-confd.patch
===
--- apachectl-confd.patch   (rev 0)
+++ apachectl-confd.patch   2013-05-31 08:01:01 UTC (rev 186793)
@@ -0,0 +1,15 @@
+--- support/apachectl.in.orig  2010-03-06 18:09:11.0 +0100
 support/apachectl.in   2010-03-06 18:12:31.0 +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

[arch-commits] Commit in apache/trunk (PKGBUILD apache.install)

[Jan de Groot]

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)

[Jan de Groot]

Date: Monday, March 18, 2013 @ 16:19:34
  Author: jgc
Revision: 180176

Use package() function. Split off itk to its own source build, as otherwise 
package() would be installing patched headers

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |   66 -
 1 file changed, 40 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-03-18 14:41:10 UTC (rev 180175)
+++ PKGBUILD2013-03-18 15:19:34 UTC (rev 180176)
@@ -5,7 +5,7 @@
 
 pkgname=apache
 pkgver=2.2.24
-pkgrel=1
+pkgrel=2
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
 options=('!libtool')
@@ -71,31 +71,41 @@
 
cat ${srcdir}/arch.layout  config.layout
 
-   for mpm in prefork worker itk; do
-   if [ ${mpm} = itk ]; then
-# Fix patch to apply with latest Apache version
-sed -i -e 's/mpmt_os2}/mpmt_os2|winnt}/g' 
${srcdir}/03-add-mpm-to-build-system.patch
+   cd ..
+   cp -r httpd-${pkgver} httpd-itk-${pkgver}
 
-   mkdir -p server/mpm/experimental/itk
-   cp -r server/mpm/prefork/* server/mpm/experimental/itk/
-   mv server/mpm/experimental/itk/prefork.c 
server/mpm/experimental/itk/itk.c
+   cd httpd-itk-${pkgver}
+   
+   # Fix patch to apply with latest Apache version
+   sed -i -e 's/mpmt_os2}/mpmt_os2|winnt}/g' 
${srcdir}/03-add-mpm-to-build-system.patch
 
-   patch -Np1 -i ${srcdir}/02-rename-prefork-to-itk.patch
-   patch -Np1 -i 
${srcdir}/03-add-mpm-to-build-system.patch
-   patch -Np1 -i 
${srcdir}/04-correct-output-makefile-location.patch
-   patch -Np1 -i ${srcdir}/05-add-copyright.patch
-   patch -Np1 -i 
${srcdir}/06-hook-just-after-merging-perdir-config.patch
-   patch -Np1 -i ${srcdir}/07-base-functionality.patch
-   patch -Np1 -i ${srcdir}/08-max-clients-per-vhost.patch
-   patch -Np1 -i ${srcdir}/09-capabilities.patch
-   patch -Np1 -i ${srcdir}/10-nice.patch
-patch -Np1 -i 
${srcdir}/11-fix-htaccess-reads-for-persistent-connections.patch
+   mkdir -p server/mpm/experimental/itk
+   cp -r server/mpm/prefork/* server/mpm/experimental/itk/
+   mv server/mpm/experimental/itk/prefork.c 
server/mpm/experimental/itk/itk.c
 
-   autoconf
+   patch -Np1 -i ${srcdir}/02-rename-prefork-to-itk.patch
+   patch -Np1 -i ${srcdir}/03-add-mpm-to-build-system.patch
+   patch -Np1 -i ${srcdir}/04-correct-output-makefile-location.patch
+   patch -Np1 -i ${srcdir}/05-add-copyright.patch
+   patch -Np1 -i ${srcdir}/06-hook-just-after-merging-perdir-config.patch
+   patch -Np1 -i ${srcdir}/07-base-functionality.patch
+   patch -Np1 -i ${srcdir}/08-max-clients-per-vhost.patch
+   patch -Np1 -i ${srcdir}/09-capabilities.patch
+   patch -Np1 -i ${srcdir}/10-nice.patch
+   patch -Np1 -i 
${srcdir}/11-fix-htaccess-reads-for-persistent-connections.patch
+
+   autoconf
+   cd ..
+   for mpm in prefork worker itk; do
+   if [ ${mpm} = itk ]; then
+   CONFIGURE=../httpd-itk-${pkgver}/configure
+   else
+   CONFIGURE=../httpd-${pkgver}/configure
fi
+
mkdir build-${mpm}
pushd build-${mpm}
-   ../configure --enable-layout=Arch \
+   $CONFIGURE --enable-layout=Arch \
--enable-modules=all \
--enable-mods-shared=all \
--enable-so \
@@ -117,14 +127,19 @@
--with-pcre=/usr \
--with-mpm=${mpm}
make
-   if [ ${mpm} = prefork ]; then
-   make DESTDIR=${pkgdir} install
-   else
-   install -m755 httpd ${pkgdir}/usr/sbin/httpd.${mpm}
-   fi
popd
done
+}
 
+package() {
+   cd ${srcdir}
+   cd build-prefork
+   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 -D -m644 ${srcdir}/httpd.logrotate 
${pkgdir}/etc/logrotate.d/httpd
install -D -m644 ${srcdir}/apache.conf.d ${pkgdir}/etc/conf.d/apache
@@ -152,7 +167,6 @@
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/
 }

[arch-commits] Commit in apache/trunk (PKGBUILD)

[Jan de Groot]

Date: Monday, March 18, 2013 @ 18:37:42
  Author: jgc
Revision: 180231

Revert pkgrel to 1, as the resulting package is still the same

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-03-18 17:34:16 UTC (rev 180230)
+++ PKGBUILD2013-03-18 17:37:42 UTC (rev 180231)
@@ -5,7 +5,7 @@
 
 pkgname=apache
 pkgver=2.2.24
-pkgrel=2
+pkgrel=1
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
 options=('!libtool')

[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
===
--- PKGBUILD2012-09-19 22:20:03 UTC (rev 166853)
+++ PKGBUILD2012-09-19 22:45:07 UTC (rev 166854)
@@ -4,8 +4,8 @@
 # Contributor: Pierre Schmitz pie...@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.c2005-11-10 16:20:05.0 +0100
-+++ httpd-2.2.22/server/util_pcre.c2012-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;
- }
- 

[arch-commits] Commit in apache/trunk (PKGBUILD apache.install apache.tmpfiles.conf)

[Jan Steffens]

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 -

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

[Pierre Schmitz]

Date: Wednesday, February 8, 2012 @ 05:36:07
  Author: pierre
Revision: 149496

upgpkg: apache 2.2.22-3

Use propper pcre_info patch
See https://issues.apache.org/bugzilla/show_bug.cgi?id=52623

Modified:
  apache/trunk/PKGBUILD
  apache/trunk/pcre_info.patch

-+
 PKGBUILD|6 +++---
 pcre_info.patch |   21 -
 2 files changed, 19 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-02-08 10:36:00 UTC (rev 149495)
+++ PKGBUILD2012-02-08 10:36:07 UTC (rev 149496)
@@ -5,7 +5,7 @@
 
 pkgname=apache
 pkgver=2.2.22
-pkgrel=2
+pkgrel=3
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
 options=('!libtool')
@@ -54,12 +54,12 @@
  '6382331e9700ed9e8cc78ea51887b537'
  'c7e300a287ef7e2e066ac7639536f87e'
  '3d659d41276ba3bfcb20c231eb254e0c'
- 'f74652f3169baaae595026116ef54599')
+ 'fde5121e32b5aeef5a7eedb5a97009ff')
 
 build() {
cd ${srcdir}/httpd-${pkgver}
 
-   #patch -p1 -i ${srcdir}/pcre_info.patch
+   patch -p1 -i ${srcdir}/pcre_info.patch
patch -Np0 -i ${srcdir}/apachectl-confd.patch
 
# set default user

Modified: pcre_info.patch
===
--- pcre_info.patch 2012-02-08 10:36:00 UTC (rev 149495)
+++ pcre_info.patch 2012-02-08 10:36:07 UTC (rev 149496)
@@ -1,11 +1,22 @@
 httpd-2.2.22/server/util_pcre.c2005-11-11 01:20:05.0 +1000
-+++ httpd-2.2.22/server/util_pcre.c2012-02-06 23:45:37.687946748 +1000
-@@ -137,7 +137,7 @@
+--- httpd-2.2.22/server/util_pcre.c2005-11-10 16:20:05.0 +0100
 httpd-2.2.22/server/util_pcre.c2012-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);
-+preg-re_nsub = pcre_fullinfo((const pcre *)preg-re_pcre, NULL, NULL, NULL);
++pcre_fullinfo((const pcre *)preg-re_pcre, NULL,
++   PCRE_INFO_CAPTURECOUNT, nsub);
++preg-re_nsub = nsub;
  return 0;
  }
  

[arch-commits] Commit in apache/trunk (PKGBUILD)

[Jan de Groot]

Date: Tuesday, February 7, 2012 @ 08:57:11
  Author: jgc
Revision: 149397

upgpkg: apache 2.2.22-2

Update to 2.2.22 for extra, build against apr-util 1.4.1

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-02-07 13:30:38 UTC (rev 149396)
+++ PKGBUILD2012-02-07 13:57:11 UTC (rev 149397)
@@ -5,7 +5,7 @@
 
 pkgname=apache
 pkgver=2.2.22
-pkgrel=1
+pkgrel=2
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
 options=('!libtool')
@@ -59,7 +59,7 @@
 build() {
cd ${srcdir}/httpd-${pkgver}
 
-   patch -p1 -i ${srcdir}/pcre_info.patch
+   #patch -p1 -i ${srcdir}/pcre_info.patch
patch -Np0 -i ${srcdir}/apachectl-confd.patch
 
# set default user

[arch-commits] Commit in apache/trunk (PKGBUILD)

[Pierre Schmitz]

Date: Monday, February 6, 2012 @ 07:55:05
  Author: pierre
Revision: 149214

prepare upstream update

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-02-06 11:42:36 UTC (rev 149213)
+++ PKGBUILD2012-02-06 12:55:05 UTC (rev 149214)
@@ -4,7 +4,7 @@
 # Contributor: Pierre Schmitz pie...@archlinux.de
 
 pkgname=apache
-pkgver=2.2.21
+pkgver=2.2.22
 pkgrel=1
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
@@ -20,6 +20,7 @@
 optdepends=('lynx: apachectl status')
 _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
 ${_itkurl}/02-rename-prefork-to-itk.patch
 ${_itkurl}/03-add-mpm-to-build-system.patch
 ${_itkurl}/04-correct-output-makefile-location.patch
@@ -35,7 +36,8 @@
 httpd.logrotate
 httpd
 arch.layout)
-md5sums=('1696ae62cd879ab1d4dd9ff021a470f2'
+md5sums=('9fe3093194c8a57f085ff7c3fc43715f'
+ '41b3a6e4948679cab70b9caf490877c4'
  'f1d9d41360908ceb2374da55ae99197a'
  'cdfa04985a0efa850976aef01c2a0c40'
  '0930d2d0612eb0a53a0d00aea7e8687f'

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

[Pierre Schmitz]

Date: Monday, February 6, 2012 @ 09:00:13
  Author: pierre
Revision: 149225

upgpkg: apache 2.2.22-1

pcre 8.30 rebuild

Added:
  apache/trunk/pcre_info.patch
Modified:
  apache/trunk/PKGBUILD

-+
 PKGBUILD|7 +--
 pcre_info.patch |   11 +++
 2 files changed, 16 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-02-06 13:52:26 UTC (rev 149224)
+++ PKGBUILD2012-02-06 14:00:13 UTC (rev 149225)
@@ -35,7 +35,8 @@
 apache.conf.d
 httpd.logrotate
 httpd
-arch.layout)
+arch.layout
+pcre_info.patch)
 md5sums=('9fe3093194c8a57f085ff7c3fc43715f'
  '41b3a6e4948679cab70b9caf490877c4'
  'f1d9d41360908ceb2374da55ae99197a'
@@ -52,11 +53,13 @@
  '08b3c875f6260644f2f52b4056d656b0'
  '6382331e9700ed9e8cc78ea51887b537'
  'c7e300a287ef7e2e066ac7639536f87e'
- '3d659d41276ba3bfcb20c231eb254e0c')
+ '3d659d41276ba3bfcb20c231eb254e0c'
+ 'f74652f3169baaae595026116ef54599')
 
 build() {
cd ${srcdir}/httpd-${pkgver}
 
+   patch -p1 -i ${srcdir}/pcre_info.patch
patch -Np0 -i ${srcdir}/apachectl-confd.patch
 
# set default user

Added: pcre_info.patch
===
--- pcre_info.patch (rev 0)
+++ pcre_info.patch 2012-02-06 14:00:13 UTC (rev 149225)
@@ -0,0 +1,11 @@
+--- httpd-2.2.22/server/util_pcre.c2005-11-11 01:20:05.0 +1000
 httpd-2.2.22/server/util_pcre.c2012-02-06 23:45:37.687946748 +1000
+@@ -137,7 +137,7 @@
+ 
+ if (preg-re_pcre == NULL) return AP_REG_INVARG;
+ 
+-preg-re_nsub = pcre_info((const pcre *)preg-re_pcre, NULL, NULL);
++preg-re_nsub = pcre_fullinfo((const pcre *)preg-re_pcre, NULL, NULL, NULL);
+ return 0;
+ }
+ 

[arch-commits] Commit in apache/trunk (PKGBUILD)

[Pierre Schmitz]

Date: Wednesday, September 14, 2011 @ 07:57:37
  Author: pierre
Revision: 138020

upgpkg: apache 2.2.21-1

upstream security update

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-09-14 11:17:03 UTC (rev 138019)
+++ PKGBUILD2011-09-14 11:57:37 UTC (rev 138020)
@@ -4,7 +4,7 @@
 # Contributor: Pierre Schmitz pie...@archlinux.de
 
 pkgname=apache
-pkgver=2.2.20
+pkgver=2.2.21
 pkgrel=1
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
@@ -35,7 +35,7 @@
 httpd.logrotate
 httpd
 arch.layout)
-md5sums=('1ac251431c8c4285f6b085c1d156bb56'
+md5sums=('1696ae62cd879ab1d4dd9ff021a470f2'
  'f1d9d41360908ceb2374da55ae99197a'
  'cdfa04985a0efa850976aef01c2a0c40'
  '0930d2d0612eb0a53a0d00aea7e8687f'

[arch-commits] Commit in apache/trunk (PKGBUILD)

[Pierre Schmitz]

Date: Wednesday, August 31, 2011 @ 07:27:32
  Author: pierre
Revision: 136657

upgpkg: apache 2.2.20-1

upstream update

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-08-31 11:23:05 UTC (rev 136656)
+++ PKGBUILD2011-08-31 11:27:32 UTC (rev 136657)
@@ -4,7 +4,7 @@
 # Contributor: Pierre Schmitz pie...@archlinux.de
 
 pkgname=apache
-pkgver=2.2.19
+pkgver=2.2.20
 pkgrel=1
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
@@ -35,7 +35,7 @@
 httpd.logrotate
 httpd
 arch.layout)
-md5sums=('832f96a6ec4b8fc7cf49b9efd4e89060'
+md5sums=('1ac251431c8c4285f6b085c1d156bb56'
  'f1d9d41360908ceb2374da55ae99197a'
  'cdfa04985a0efa850976aef01c2a0c40'
  '0930d2d0612eb0a53a0d00aea7e8687f'

[arch-commits] Commit in apache/trunk (PKGBUILD)

[Jan de Groot]

Date: Monday, May 30, 2011 @ 05:46:57
  Author: jgc
Revision: 125827

upgpkg: apache 2.2.19-1
Update to 2.2.19, fixup ITK patch to apply with this version of Apache

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-05-30 09:43:53 UTC (rev 125826)
+++ PKGBUILD2011-05-30 09:46:57 UTC (rev 125827)
@@ -4,8 +4,8 @@
 # Contributor: Pierre Schmitz pie...@archlinux.de
 
 pkgname=apache
-pkgver=2.2.17
-pkgrel=3
+pkgver=2.2.19
+pkgrel=1
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
 options=('!libtool')
@@ -35,7 +35,7 @@
 httpd.logrotate
 httpd
 arch.layout)
-md5sums=('16eadc59ea6b38af33874d300973202e'
+md5sums=('832f96a6ec4b8fc7cf49b9efd4e89060'
  'f1d9d41360908ceb2374da55ae99197a'
  'cdfa04985a0efa850976aef01c2a0c40'
  '0930d2d0612eb0a53a0d00aea7e8687f'
@@ -66,6 +66,9 @@
 
for mpm in prefork worker itk; do
if [ ${mpm} = itk ]; then
+# Fix patch to apply with latest Apache version
+sed -i -e 's/mpmt_os2}/mpmt_os2|winnt}/g' 
${srcdir}/03-add-mpm-to-build-system.patch
+
mkdir -p server/mpm/experimental/itk
cp -r server/mpm/prefork/* server/mpm/experimental/itk/
mv server/mpm/experimental/itk/prefork.c 
server/mpm/experimental/itk/itk.c

[arch-commits] Commit in apache/trunk (PKGBUILD)

[Evangelos Foutras]

Date: Tuesday, May 10, 2011 @ 17:15:00
  Author: foutrelis
Revision: 123392

upgpkg: apache 2.2.17-3
Rebuild against APR 1.4.4 which includes a fix for an aliasing issue in the 
APR_RING_HEAD macro. (See 
https://issues.apache.org/bugzilla/show_bug.cgi?id=50190 and FS#24208).

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-05-10 21:11:31 UTC (rev 123391)
+++ PKGBUILD2011-05-10 21:15:00 UTC (rev 123392)
@@ -5,7 +5,7 @@
 
 pkgname=apache
 pkgver=2.2.17
-pkgrel=2
+pkgrel=3
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
 options=('!libtool')

[arch-commits] Commit in apache/trunk (PKGBUILD)

[Jan de Groot]

Date: Monday, May 9, 2011 @ 09:25:58
  Author: jgc
Revision: 123237

upgpkg: apache 2.2.17-2
Update ITK patches, security update

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |   25 ++---
 1 file changed, 14 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-05-09 12:19:54 UTC (rev 123236)
+++ PKGBUILD2011-05-09 13:25:58 UTC (rev 123237)
@@ -5,7 +5,7 @@
 
 pkgname=apache
 pkgver=2.2.17
-pkgrel=1
+pkgrel=2
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
 options=('!libtool')
@@ -18,7 +18,7 @@
 etc/logrotate.d/httpd)
 depends=('openssl' 'zlib' 'apr-util' 'pcre')
 optdepends=('lynx: apachectl status')
-_itkurl=http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02
+_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
 ${_itkurl}/02-rename-prefork-to-itk.patch
 ${_itkurl}/03-add-mpm-to-build-system.patch
@@ -29,21 +29,23 @@
 ${_itkurl}/08-max-clients-per-vhost.patch
 ${_itkurl}/09-capabilities.patch
 ${_itkurl}/10-nice.patch
+${_itkurl}/11-fix-htaccess-reads-for-persistent-connections.patch
 apachectl-confd.patch
 apache.conf.d
 httpd.logrotate
 httpd
 arch.layout)
 md5sums=('16eadc59ea6b38af33874d300973202e'
- 'db42cfcc18ae1c32aaaff2347e35b79d'
- '131408ad4dc7b18547b4e062e7e495ab'
- 'ee488f391054d528547c3a372faa2aa7'
- 'b202944761b2f0516196488b12504236'
- '78fa15f8ca3a284b7d71f942e24e47fb'
- 'd33e39350e987721d50e6fb8e164ab6b'
- '9f7a8935f9cabc7b46d0052906634cef'
- '1b28e3363e1b0d05b738a21e7ddd264f'
- 'd9667fcd2ffecc63e446edd4d731'
+ 'f1d9d41360908ceb2374da55ae99197a'
+ 'cdfa04985a0efa850976aef01c2a0c40'
+ '0930d2d0612eb0a53a0d00aea7e8687f'
+ '3a0c29bb91442c33ea73ebbe072af922'
+ '0ef4729a6f1ffc848ad0e9b440a66f66'
+ '940944caa948340b11ddae56adaef89b'
+ 'ce09a987523884de8838f73dc8ec0d19'
+ 'e75b7dd8d8afcd299ba4ab2ab81c11e4'
+ 'ce1ccc21f3ad8625169c8f62913450ac'
+ '1e5b222edcfbf99a3edc56fcb2074fbe'
  '4ac64df6e019edbe137017cba1ff2f51'
  '08b3c875f6260644f2f52b4056d656b0'
  '6382331e9700ed9e8cc78ea51887b537'
@@ -77,6 +79,7 @@
patch -Np1 -i ${srcdir}/08-max-clients-per-vhost.patch
patch -Np1 -i ${srcdir}/09-capabilities.patch
patch -Np1 -i ${srcdir}/10-nice.patch
+patch -Np1 -i 
${srcdir}/11-fix-htaccess-reads-for-persistent-connections.patch
 
autoconf
fi

[arch-commits] Commit in apache/trunk (PKGBUILD)

[Jan de Groot]

Date: Thursday, October 21, 2010 @ 05:16:04
  Author: jgc
Revision: 96448

Update to 2.2.17

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-10-21 08:52:50 UTC (rev 96447)
+++ PKGBUILD2010-10-21 09:16:04 UTC (rev 96448)
@@ -4,7 +4,7 @@
 # Contributor: Pierre Schmitz pie...@archlinux.de
 
 pkgname=apache
-pkgver=2.2.16
+pkgver=2.2.17
 pkgrel=1
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
@@ -34,7 +34,7 @@
 httpd.logrotate
 httpd
 arch.layout)
-md5sums=('c8ff2a07c884300bc7766a2e7f662d33'
+md5sums=('16eadc59ea6b38af33874d300973202e'
  'db42cfcc18ae1c32aaaff2347e35b79d'
  '131408ad4dc7b18547b4e062e7e495ab'
  'ee488f391054d528547c3a372faa2aa7'

[arch-commits] Commit in apache/trunk (PKGBUILD httpd.logrotate)

[Jan de Groot]

Date: Tuesday, August 17, 2010 @ 09:13:14
  Author: jgc
Revision: 87621

upgpkg: apache 2.2.16-1
Update to 2.2.16, add missingok to logrotate config

Modified:
  apache/trunk/PKGBUILD
  apache/trunk/httpd.logrotate

-+
 PKGBUILD|   11 ++-
 httpd.logrotate |1 +
 2 files changed, 7 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-08-17 12:38:20 UTC (rev 87620)
+++ PKGBUILD2010-08-17 13:13:14 UTC (rev 87621)
@@ -1,10 +1,11 @@
 # $Id$
-# Maintainer: Andrea Scarpino and...@archlinux.org
+# Maintainer: Jan de Groot j...@archlinux.org
+# Contributor: Andrea Scarpino and...@archlinux.org
 # Contributor: Pierre Schmitz pie...@archlinux.de
 
 pkgname=apache
-pkgver=2.2.15
-pkgrel=2
+pkgver=2.2.16
+pkgrel=1
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
 options=('!libtool')
@@ -33,7 +34,7 @@
 httpd.logrotate
 httpd
 arch.layout)
-md5sums=('016cec97337eccead2aad6a7c27f2e14'
+md5sums=('c8ff2a07c884300bc7766a2e7f662d33'
  'db42cfcc18ae1c32aaaff2347e35b79d'
  '131408ad4dc7b18547b4e062e7e495ab'
  'ee488f391054d528547c3a372faa2aa7'
@@ -45,7 +46,7 @@
  'd9667fcd2ffecc63e446edd4d731'
  '4ac64df6e019edbe137017cba1ff2f51'
  '08b3c875f6260644f2f52b4056d656b0'
- 'f4d627c64024c1b7b95efb5ffbaa625e'
+ '6382331e9700ed9e8cc78ea51887b537'
  'c7e300a287ef7e2e066ac7639536f87e'
  '3d659d41276ba3bfcb20c231eb254e0c')
 

Modified: httpd.logrotate
===
--- httpd.logrotate 2010-08-17 12:38:20 UTC (rev 87620)
+++ httpd.logrotate 2010-08-17 13:13:14 UTC (rev 87621)
@@ -1,4 +1,5 @@
 /var/log/httpd/*log {
+   missingok
postrotate
   /bin/kill -HUP `cat /var/run/httpd/httpd.pid 2/dev/null` 2 /dev/null 
|| true
endscript

[arch-commits] Commit in apache/trunk (PKGBUILD httpd)

[Jan de Groot]

Date: Wednesday, June 23, 2010 @ 06:09:19
  Author: jgc
Revision: 83847

Fix FS#18767

Modified:
  apache/trunk/PKGBUILD
  apache/trunk/httpd

--+
 PKGBUILD |   46 +++---
 httpd|8 
 2 files changed, 27 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-06-23 08:48:35 UTC (rev 83846)
+++ PKGBUILD2010-06-23 10:09:19 UTC (rev 83847)
@@ -4,7 +4,7 @@
 
 pkgname=apache
 pkgver=2.2.15
-pkgrel=2
+pkgrel=3
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
 options=('!libtool')
@@ -46,38 +46,38 @@
  '4ac64df6e019edbe137017cba1ff2f51'
  '08b3c875f6260644f2f52b4056d656b0'
  'f4d627c64024c1b7b95efb5ffbaa625e'
- '9e001fbb082a08113e7f4bc431085c11'
+ 'c7e300a287ef7e2e066ac7639536f87e'
  '3d659d41276ba3bfcb20c231eb254e0c')
 
 build() {
cd ${srcdir}/httpd-${pkgver}
 
-   patch -Np0 -i ${srcdir}/apachectl-confd.patch || return 1
+   patch -Np0 -i ${srcdir}/apachectl-confd.patch
 
# set default user
sed -e 's#User daemon#User http#' \
-e 's#Group daemon#Group http#' \
-   -i docs/conf/httpd.conf.in || return 1
+   -i docs/conf/httpd.conf.in
 
cat ${srcdir}/arch.layout  config.layout
 
for mpm in prefork worker itk; do
if [ ${mpm} = itk ]; then
mkdir -p server/mpm/experimental/itk
-   cp -r server/mpm/prefork/* server/mpm/experimental/itk/ 
|| return 1
-   mv server/mpm/experimental/itk/prefork.c 
server/mpm/experimental/itk/itk.c || return 1
+   cp -r server/mpm/prefork/* server/mpm/experimental/itk/
+   mv server/mpm/experimental/itk/prefork.c 
server/mpm/experimental/itk/itk.c
 
-   patch -Np1 -i 
${srcdir}/02-rename-prefork-to-itk.patch || return 1
-   patch -Np1 -i 
${srcdir}/03-add-mpm-to-build-system.patch || return 1
-   patch -Np1 -i 
${srcdir}/04-correct-output-makefile-location.patch || return 1
-   patch -Np1 -i ${srcdir}/05-add-copyright.patch || 
return 1
-   patch -Np1 -i 
${srcdir}/06-hook-just-after-merging-perdir-config.patch || return 1
-   patch -Np1 -i ${srcdir}/07-base-functionality.patch 
|| return 1
-   patch -Np1 -i 
${srcdir}/08-max-clients-per-vhost.patch || return 1
-   patch -Np1 -i ${srcdir}/09-capabilities.patch || 
return 1
-   patch -Np1 -i ${srcdir}/10-nice.patch || return 1
+   patch -Np1 -i ${srcdir}/02-rename-prefork-to-itk.patch
+   patch -Np1 -i 
${srcdir}/03-add-mpm-to-build-system.patch
+   patch -Np1 -i 
${srcdir}/04-correct-output-makefile-location.patch
+   patch -Np1 -i ${srcdir}/05-add-copyright.patch
+   patch -Np1 -i 
${srcdir}/06-hook-just-after-merging-perdir-config.patch
+   patch -Np1 -i ${srcdir}/07-base-functionality.patch
+   patch -Np1 -i ${srcdir}/08-max-clients-per-vhost.patch
+   patch -Np1 -i ${srcdir}/09-capabilities.patch
+   patch -Np1 -i ${srcdir}/10-nice.patch
 
-   autoconf || return 1
+   autoconf
fi
mkdir build-${mpm}
pushd build-${mpm}
@@ -101,19 +101,19 @@
--with-apr=/usr/bin/apr-1-config \
--with-apr-util=/usr/bin/apu-1-config \
--with-pcre=/usr \
-   --with-mpm=${mpm} || return 1
-   make || return 1
+   --with-mpm=${mpm}
+   make
if [ ${mpm} = prefork ]; then
-   make DESTDIR=${pkgdir} install || return 1
+   make DESTDIR=${pkgdir} install
else
install -m755 httpd ${pkgdir}/usr/sbin/httpd.${mpm}
fi
popd
done
 
-   install -D -m755 ${srcdir}/httpd ${pkgdir}/etc/rc.d/httpd || return 
1
-   install -D -m644 ${srcdir}/httpd.logrotate 
${pkgdir}/etc/logrotate.d/httpd || return 1
-   install -D -m644 ${srcdir}/apache.conf.d 
${pkgdir}/etc/conf.d/apache || return 1
+   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
 
# symlinks for /etc/httpd
ln -fs /var/log/httpd ${pkgdir}/etc/httpd/logs
@@ -128,7 +128,7 @@
-e 's|#\(Include conf/extra/httpd-languages.conf\)|\1|' \
-e 's|#\(Include 

[arch-commits] Commit in apache/trunk (PKGBUILD)

[Jan de Groot]

Date: Wednesday, June 23, 2010 @ 06:15:44
  Author: jgc
Revision: 83848

Revert pkgrel, we are not doing a rebuild yet

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-06-23 10:09:19 UTC (rev 83847)
+++ PKGBUILD2010-06-23 10:15:44 UTC (rev 83848)
@@ -4,7 +4,7 @@
 
 pkgname=apache
 pkgver=2.2.15
-pkgrel=3
+pkgrel=2
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
 options=('!libtool')

[arch-commits] Commit in apache/trunk (PKGBUILD)

[Pierre Schmitz]

Date: Thursday, April 1, 2010 @ 02:38:15
  Author: pierre
Revision: 75272

upgpkg: apache 2.2.15-2
openssl/heimdal rebuild

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-04-01 06:31:36 UTC (rev 75271)
+++ PKGBUILD2010-04-01 06:38:15 UTC (rev 75272)
@@ -4,7 +4,7 @@
 
 pkgname=apache
 pkgver=2.2.15
-pkgrel=1
+pkgrel=2
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
 options=('!libtool')
@@ -52,7 +52,7 @@
 build() {
cd ${srcdir}/httpd-${pkgver}
 
-  patch -Np0 -i ${srcdir}/apachectl-confd.patch || return 1
+   patch -Np0 -i ${srcdir}/apachectl-confd.patch || return 1
 
# set default user
sed -e 's#User daemon#User http#' \
@@ -113,7 +113,7 @@
 
install -D -m755 ${srcdir}/httpd ${pkgdir}/etc/rc.d/httpd || return 
1
install -D -m644 ${srcdir}/httpd.logrotate 
${pkgdir}/etc/logrotate.d/httpd || return 1
-  install -D -m644 ${srcdir}/apache.conf.d ${pkgdir}/etc/conf.d/apache || 
return 1
+   install -D -m644 ${srcdir}/apache.conf.d 
${pkgdir}/etc/conf.d/apache || return 1
 
# symlinks for /etc/httpd
ln -fs /var/log/httpd ${pkgdir}/etc/httpd/logs

[arch-commits] Commit in apache/trunk (PKGBUILD httpd-2.2.14-CVE-2009-3555.patch)

[Jan de Groot]

Date: Saturday, March 13, 2010 @ 15:37:40
  Author: jgc
Revision: 72250

upgpkg: apache 2.2.15-1
Update to 2.2.15, remove upstream-applied patch

Modified:
  apache/trunk/PKGBUILD
Deleted:
  apache/trunk/httpd-2.2.14-CVE-2009-3555.patch

--+
 PKGBUILD |9 -
 httpd-2.2.14-CVE-2009-3555.patch |  284 -
 2 files changed, 3 insertions(+), 290 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-03-13 20:28:16 UTC (rev 72249)
+++ PKGBUILD2010-03-13 20:37:40 UTC (rev 72250)
@@ -3,8 +3,8 @@
 # Contributor: Pierre Schmitz pie...@archlinux.de
 
 pkgname=apache
-pkgver=2.2.14
-pkgrel=3
+pkgver=2.2.15
+pkgrel=1
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
 options=('!libtool')
@@ -28,13 +28,12 @@
 ${_itkurl}/08-max-clients-per-vhost.patch
 ${_itkurl}/09-capabilities.patch
 ${_itkurl}/10-nice.patch
-httpd-2.2.14-CVE-2009-3555.patch
 apachectl-confd.patch
 apache.conf.d
 httpd.logrotate
 httpd
 arch.layout)
-md5sums=('a5226203aaf97e5b941c41a71c112704'
+md5sums=('016cec97337eccead2aad6a7c27f2e14'
  'db42cfcc18ae1c32aaaff2347e35b79d'
  '131408ad4dc7b18547b4e062e7e495ab'
  'ee488f391054d528547c3a372faa2aa7'
@@ -44,7 +43,6 @@
  '9f7a8935f9cabc7b46d0052906634cef'
  '1b28e3363e1b0d05b738a21e7ddd264f'
  'd9667fcd2ffecc63e446edd4d731'
- '65df0a4f22728b84479dd59155ac940c'
  '4ac64df6e019edbe137017cba1ff2f51'
  '08b3c875f6260644f2f52b4056d656b0'
  'f4d627c64024c1b7b95efb5ffbaa625e'
@@ -54,7 +52,6 @@
 build() {
cd ${srcdir}/httpd-${pkgver}
 
-  patch -Np1 -i ${srcdir}/httpd-2.2.14-CVE-2009-3555.patch || return 1
   patch -Np0 -i ${srcdir}/apachectl-confd.patch || return 1
 
# set default user

Deleted: httpd-2.2.14-CVE-2009-3555.patch
===
--- httpd-2.2.14-CVE-2009-3555.patch2010-03-13 20:28:16 UTC (rev 72249)
+++ httpd-2.2.14-CVE-2009-3555.patch2010-03-13 20:37:40 UTC (rev 72250)
@@ -1,284 +0,0 @@
 httpd-2.2.14/modules/ssl/ssl_engine_init.c.cve3555
-+++ httpd-2.2.14/modules/ssl/ssl_engine_init.c
-@@ -501,10 +501,7 @@ static void ssl_init_ctx_callbacks(serve
- SSL_CTX_set_tmp_rsa_callback(ctx, ssl_callback_TmpRSA);
- SSL_CTX_set_tmp_dh_callback(ctx,  ssl_callback_TmpDH);
- 
--if (s-loglevel = APLOG_DEBUG) {
--/* this callback only logs if LogLevel = info */
--SSL_CTX_set_info_callback(ctx, ssl_callback_LogTracingState);
--}
-+SSL_CTX_set_info_callback(ctx, ssl_callback_Info);
- }
- 
- static void ssl_init_ctx_verify(server_rec *s,
 httpd-2.2.14/modules/ssl/ssl_engine_io.c.cve3555
-+++ httpd-2.2.14/modules/ssl/ssl_engine_io.c
-@@ -103,6 +103,7 @@ typedef struct {
- ap_filter_t*pInputFilter;
- ap_filter_t*pOutputFilter;
- intnobuffer; /* non-zero to prevent buffering */
-+SSLConnRec *config;
- } ssl_filter_ctx_t;
- 
- typedef struct {
-@@ -193,7 +194,13 @@ static int bio_filter_out_read(BIO *bio,
- static int bio_filter_out_write(BIO *bio, const char *in, int inl)
- {
- bio_filter_out_ctx_t *outctx = (bio_filter_out_ctx_t *)(bio-ptr);
--
-+
-+/* Abort early if the client has initiated a renegotiation. */
-+if (outctx-filter_ctx-config-reneg_state == RENEG_ABORT) {
-+outctx-rc = APR_ECONNABORTED;
-+return -1;
-+}
-+
- /* when handshaking we'll have a small number of bytes.
-  * max size SSL will pass us here is about 16k.
-  * (16413 bytes to be exact)
-@@ -466,6 +473,12 @@ static int bio_filter_in_read(BIO *bio, 
- if (!in)
- return 0;
- 
-+/* Abort early if the client has initiated a renegotiation. */
-+if (inctx-filter_ctx-config-reneg_state == RENEG_ABORT) {
-+inctx-rc = APR_ECONNABORTED;
-+return -1;
-+}
-+
- /* XXX: flush here only required for SSLv2;
-  * OpenSSL calls BIO_flush() at the appropriate times for
-  * the other protocols.
-@@ -1724,6 +1737,8 @@ void ssl_io_filter_init(conn_rec *c, SSL
- 
- filter_ctx = apr_palloc(c-pool, sizeof(ssl_filter_ctx_t));
- 
-+filter_ctx-config  = myConnConfig(c);
-+
- filter_ctx-nobuffer= 0;
- filter_ctx-pOutputFilter   = ap_add_output_filter(ssl_io_filter,
-filter_ctx, NULL, c);
 httpd-2.2.14/modules/ssl/ssl_engine_kernel.c.cve3555
-+++ httpd-2.2.14/modules/ssl/ssl_engine_kernel.c
-@@ -729,6 +729,10 @@ int ssl_hook_Access(request_rec *r)
-(unsigned char *)id,
-sizeof(id));
- 
-+/* Toggle the renegotiation state to allow the new
-+ * handshake to proceed. */

[arch-commits] Commit in apache/trunk (PKGBUILD)

[Jan de Groot]

Date: Saturday, March 6, 2010 @ 11:37:04
  Author: jgc
Revision: 71308

Change ITK patch to incremental patches. The 01-patch should not get applied as 
copying prefork by hand includes security fixes while the patch does not

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |   49 +++--
 1 file changed, 39 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-03-06 12:10:13 UTC (rev 71307)
+++ PKGBUILD2010-03-06 16:37:04 UTC (rev 71308)
@@ -5,7 +5,6 @@
 pkgname=apache
 pkgver=2.2.14
 pkgrel=3
-_itkver=20090414-00
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
 options=('!libtool')
@@ -18,13 +17,30 @@
 etc/logrotate.d/httpd)
 depends=('openssl' 'zlib' 'apr-util' 'pcre')
 optdepends=('lynx: apachectl status')
+_itkurl=http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02
 source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2
-http://mpm-itk.sesse.net/apache2.2-mpm-itk-${_itkver}.patch
+${_itkurl}/02-rename-prefork-to-itk.patch
+${_itkurl}/03-add-mpm-to-build-system.patch
+${_itkurl}/04-correct-output-makefile-location.patch
+${_itkurl}/05-add-copyright.patch
+${_itkurl}/06-hook-just-after-merging-perdir-config.patch
+${_itkurl}/07-base-functionality.patch
+${_itkurl}/08-max-clients-per-vhost.patch
+${_itkurl}/09-capabilities.patch
+${_itkurl}/10-nice.patch
 httpd.logrotate
-   httpd
-   arch.layout)
+httpd
+arch.layout)
 md5sums=('a5226203aaf97e5b941c41a71c112704'
- 'e26cf8ad861e41877c0f0dda6e471ca9'
+ 'db42cfcc18ae1c32aaaff2347e35b79d'
+ '131408ad4dc7b18547b4e062e7e495ab'
+ 'ee488f391054d528547c3a372faa2aa7'
+ 'b202944761b2f0516196488b12504236'
+ '78fa15f8ca3a284b7d71f942e24e47fb'
+ 'd33e39350e987721d50e6fb8e164ab6b'
+ '9f7a8935f9cabc7b46d0052906634cef'
+ '1b28e3363e1b0d05b738a21e7ddd264f'
+ 'd9667fcd2ffecc63e446edd4d731'
  'f4d627c64024c1b7b95efb5ffbaa625e'
  '9e001fbb082a08113e7f4bc431085c11'
  '3d659d41276ba3bfcb20c231eb254e0c')
@@ -40,12 +56,25 @@
cat ${srcdir}/arch.layout  config.layout
 
for mpm in prefork worker itk; do
-   if [ $mpm = itk ]; then
-   patch -Np1 -i 
${srcdir}/apache2.2-mpm-itk-${_itkver}.patch || return 1
+   if [ ${mpm} = itk ]; then
+   mkdir -p server/mpm/experimental/itk
+   cp -r server/mpm/prefork/* server/mpm/experimental/itk/ 
|| return 1
+   mv server/mpm/experimental/itk/prefork.c 
server/mpm/experimental/itk/itk.c || return 1
+
+   patch -Np1 -i 
${srcdir}/02-rename-prefork-to-itk.patch || return 1
+   patch -Np1 -i 
${srcdir}/03-add-mpm-to-build-system.patch || return 1
+   patch -Np1 -i 
${srcdir}/04-correct-output-makefile-location.patch || return 1
+   patch -Np1 -i ${srcdir}/05-add-copyright.patch || 
return 1
+   patch -Np1 -i 
${srcdir}/06-hook-just-after-merging-perdir-config.patch || return 1
+   patch -Np1 -i ${srcdir}/07-base-functionality.patch 
|| return 1
+   patch -Np1 -i 
${srcdir}/08-max-clients-per-vhost.patch || return 1
+   patch -Np1 -i ${srcdir}/09-capabilities.patch || 
return 1
+   patch -Np1 -i ${srcdir}/10-nice.patch || return 1
+
autoconf || return 1
fi
-   mkdir build-$mpm
-   pushd build-$mpm
+   mkdir build-${mpm}
+   pushd build-${mpm}
../configure --enable-layout=Arch \
--enable-modules=all \
--enable-mods-shared=all \
@@ -68,7 +97,7 @@
--with-pcre=/usr \
--with-mpm=${mpm} || return 1
make || return 1
-   if [ $mpm = prefork ]; then
+   if [ ${mpm} = prefork ]; then
make DESTDIR=${pkgdir} install || return 1
else
install -m755 httpd ${pkgdir}/usr/sbin/httpd.${mpm}

[arch-commits] Commit in apache/trunk (PKGBUILD apache.conf.d apachectl-confd.patch)

[Jan de Groot]

Date: Saturday, March 6, 2010 @ 12:20:41
  Author: jgc
Revision: 71310

Add /etc/conf.d/apache support

Added:
  apache/trunk/apache.conf.d
  apache/trunk/apachectl-confd.patch
Modified:
  apache/trunk/PKGBUILD

---+
 PKGBUILD  |9 -
 apache.conf.d |   15 +++
 apachectl-confd.patch |   15 +++
 3 files changed, 38 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-03-06 17:17:42 UTC (rev 71309)
+++ PKGBUILD2010-03-06 17:20:41 UTC (rev 71310)
@@ -10,7 +10,7 @@
 options=('!libtool')
 url='http://www.apache.org/dist/httpd'
 license=('APACHE')
-backup=(etc/httpd/conf/httpd.conf
+backup=(etc/conf.d/apache 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
@@ -28,6 +28,8 @@
 ${_itkurl}/08-max-clients-per-vhost.patch
 ${_itkurl}/09-capabilities.patch
 ${_itkurl}/10-nice.patch
+apachectl-confd.patch
+apache.conf.d
 httpd.logrotate
 httpd
 arch.layout)
@@ -41,6 +43,8 @@
  '9f7a8935f9cabc7b46d0052906634cef'
  '1b28e3363e1b0d05b738a21e7ddd264f'
  'd9667fcd2ffecc63e446edd4d731'
+ '4ac64df6e019edbe137017cba1ff2f51'
+ '08b3c875f6260644f2f52b4056d656b0'
  'f4d627c64024c1b7b95efb5ffbaa625e'
  '9e001fbb082a08113e7f4bc431085c11'
  '3d659d41276ba3bfcb20c231eb254e0c')
@@ -48,6 +52,8 @@
 build() {
cd ${srcdir}/httpd-${pkgver}
 
+  patch -Np0 -i ${srcdir}/apachectl-confd.patch || return 1
+
# set default user
sed -e 's#User daemon#User http#' \
-e 's#Group daemon#Group http#' \
@@ -107,6 +113,7 @@
 
install -D -m755 ${srcdir}/httpd ${pkgdir}/etc/rc.d/httpd || return 
1
install -D -m644 ${srcdir}/httpd.logrotate 
${pkgdir}/etc/logrotate.d/httpd || return 1
+  install -D -m644 ${srcdir}/apache.conf.d ${pkgdir}/etc/conf.d/apache || 
return 1
 
# symlinks for /etc/httpd
ln -fs /var/log/httpd ${pkgdir}/etc/httpd/logs

Added: apache.conf.d
===
--- apache.conf.d   (rev 0)
+++ apache.conf.d   2010-03-06 17:20:41 UTC (rev 71310)
@@ -0,0 +1,15 @@
+# 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=

Added: apachectl-confd.patch
===
--- apachectl-confd.patch   (rev 0)
+++ apachectl-confd.patch   2010-03-06 17:20:41 UTC (rev 71310)
@@ -0,0 +1,15 @@
+--- support/apachectl.in.orig  2010-03-06 18:09:11.0 +0100
 support/apachectl.in   2010-03-06 18:12:31.0 +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

[arch-commits] Commit in apache/trunk (PKGBUILD httpd-2.2.14-CVE-2009-3555.patch)

[Jan de Groot]

Date: Saturday, March 6, 2010 @ 13:17:38
  Author: jgc
Revision: 71325

upgpkg: apache 2.2.14-3
Add patch for CVE-2009-3555 to fix renegotiation issues

Added:
  apache/trunk/httpd-2.2.14-CVE-2009-3555.patch
Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |3 
 httpd-2.2.14-CVE-2009-3555.patch |  284 +
 2 files changed, 287 insertions(+)

Modified: PKGBUILD
===
--- PKGBUILD2010-03-06 17:46:02 UTC (rev 71324)
+++ PKGBUILD2010-03-06 18:17:38 UTC (rev 71325)
@@ -28,6 +28,7 @@
 ${_itkurl}/08-max-clients-per-vhost.patch
 ${_itkurl}/09-capabilities.patch
 ${_itkurl}/10-nice.patch
+httpd-2.2.14-CVE-2009-3555.patch
 apachectl-confd.patch
 apache.conf.d
 httpd.logrotate
@@ -43,6 +44,7 @@
  '9f7a8935f9cabc7b46d0052906634cef'
  '1b28e3363e1b0d05b738a21e7ddd264f'
  'd9667fcd2ffecc63e446edd4d731'
+ '65df0a4f22728b84479dd59155ac940c'
  '4ac64df6e019edbe137017cba1ff2f51'
  '08b3c875f6260644f2f52b4056d656b0'
  'f4d627c64024c1b7b95efb5ffbaa625e'
@@ -52,6 +54,7 @@
 build() {
cd ${srcdir}/httpd-${pkgver}
 
+  patch -Np1 -i ${srcdir}/httpd-2.2.14-CVE-2009-3555.patch || return 1
   patch -Np0 -i ${srcdir}/apachectl-confd.patch || return 1
 
# set default user

Added: httpd-2.2.14-CVE-2009-3555.patch
===
--- httpd-2.2.14-CVE-2009-3555.patch(rev 0)
+++ httpd-2.2.14-CVE-2009-3555.patch2010-03-06 18:17:38 UTC (rev 71325)
@@ -0,0 +1,284 @@
+--- httpd-2.2.14/modules/ssl/ssl_engine_init.c.cve3555
 httpd-2.2.14/modules/ssl/ssl_engine_init.c
+@@ -501,10 +501,7 @@ static void ssl_init_ctx_callbacks(serve
+ SSL_CTX_set_tmp_rsa_callback(ctx, ssl_callback_TmpRSA);
+ SSL_CTX_set_tmp_dh_callback(ctx,  ssl_callback_TmpDH);
+ 
+-if (s-loglevel = APLOG_DEBUG) {
+-/* this callback only logs if LogLevel = info */
+-SSL_CTX_set_info_callback(ctx, ssl_callback_LogTracingState);
+-}
++SSL_CTX_set_info_callback(ctx, ssl_callback_Info);
+ }
+ 
+ static void ssl_init_ctx_verify(server_rec *s,
+--- httpd-2.2.14/modules/ssl/ssl_engine_io.c.cve3555
 httpd-2.2.14/modules/ssl/ssl_engine_io.c
+@@ -103,6 +103,7 @@ typedef struct {
+ ap_filter_t*pInputFilter;
+ ap_filter_t*pOutputFilter;
+ intnobuffer; /* non-zero to prevent buffering */
++SSLConnRec *config;
+ } ssl_filter_ctx_t;
+ 
+ typedef struct {
+@@ -193,7 +194,13 @@ static int bio_filter_out_read(BIO *bio,
+ static int bio_filter_out_write(BIO *bio, const char *in, int inl)
+ {
+ bio_filter_out_ctx_t *outctx = (bio_filter_out_ctx_t *)(bio-ptr);
+-
++
++/* Abort early if the client has initiated a renegotiation. */
++if (outctx-filter_ctx-config-reneg_state == RENEG_ABORT) {
++outctx-rc = APR_ECONNABORTED;
++return -1;
++}
++
+ /* when handshaking we'll have a small number of bytes.
+  * max size SSL will pass us here is about 16k.
+  * (16413 bytes to be exact)
+@@ -466,6 +473,12 @@ static int bio_filter_in_read(BIO *bio, 
+ if (!in)
+ return 0;
+ 
++/* Abort early if the client has initiated a renegotiation. */
++if (inctx-filter_ctx-config-reneg_state == RENEG_ABORT) {
++inctx-rc = APR_ECONNABORTED;
++return -1;
++}
++
+ /* XXX: flush here only required for SSLv2;
+  * OpenSSL calls BIO_flush() at the appropriate times for
+  * the other protocols.
+@@ -1724,6 +1737,8 @@ void ssl_io_filter_init(conn_rec *c, SSL
+ 
+ filter_ctx = apr_palloc(c-pool, sizeof(ssl_filter_ctx_t));
+ 
++filter_ctx-config  = myConnConfig(c);
++
+ filter_ctx-nobuffer= 0;
+ filter_ctx-pOutputFilter   = ap_add_output_filter(ssl_io_filter,
+filter_ctx, NULL, c);
+--- httpd-2.2.14/modules/ssl/ssl_engine_kernel.c.cve3555
 httpd-2.2.14/modules/ssl/ssl_engine_kernel.c
+@@ -729,6 +729,10 @@ int ssl_hook_Access(request_rec *r)
+(unsigned char *)id,
+sizeof(id));
+ 
++/* Toggle the renegotiation state to allow the new
++ * handshake to proceed. */
++sslconn-reneg_state = RENEG_ALLOW;
++
+ SSL_renegotiate(ssl);
+ SSL_do_handshake(ssl);
+ 
+@@ -750,6 +754,8 @@ int ssl_hook_Access(request_rec *r)
+ SSL_set_state(ssl, SSL_ST_ACCEPT);
+ SSL_do_handshake(ssl);
+ 
++sslconn-reneg_state = RENEG_REJECT;
++
+ if (SSL_get_state(ssl) != SSL_ST_OK) {
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+   Re-negotiation handshake failed: 

[arch-commits] Commit in apache/trunk (PKGBUILD)

[Jan de Groot]

Date: Wednesday, March 3, 2010 @ 11:02:48
  Author: jgc
Revision: 71040

Add initial work for multi-MPM support. Needs more work

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |   99 +++--
 1 file changed, 58 insertions(+), 41 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-03-03 12:57:27 UTC (rev 71039)
+++ PKGBUILD2010-03-03 16:02:48 UTC (rev 71040)
@@ -4,7 +4,8 @@
 
 pkgname=apache
 pkgver=2.2.14
-pkgrel=2
+pkgrel=3
+_itkver=20090414-00
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
 options=('!libtool')
@@ -17,56 +18,72 @@
 etc/logrotate.d/httpd)
 depends=('openssl' 'zlib' 'apr-util' 'pcre')
 optdepends=('lynx: apachectl status')
-source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2;
-'httpd.logrotate'
-   'httpd'
-   'arch.layout')
+source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2
+http://mpm-itk.sesse.net/apache2.2-mpm-itk-${_itkver}.patch
+httpd.logrotate
+   httpd
+   arch.layout)
 md5sums=('a5226203aaf97e5b941c41a71c112704'
+ 'e26cf8ad861e41877c0f0dda6e471ca9'
  'f4d627c64024c1b7b95efb5ffbaa625e'
  '9e001fbb082a08113e7f4bc431085c11'
  '3d659d41276ba3bfcb20c231eb254e0c')
 
 build() {
-   cd ${srcdir}/httpd-${pkgver}
+   cd ${srcdir}/httpd-${pkgver}
 
# set default user
sed -e 's#User daemon#User http#' \
-e 's#Group daemon#Group http#' \
-   -i docs/conf/httpd.conf.in
+   -i docs/conf/httpd.conf.in || return 1
 
-   cat ${srcdir}/arch.layout  config.layout
-   ./configure --enable-layout=Arch \
-   --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/sbin/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-cgid \
-   --enable-proxy --enable-proxy-connect \
-   --enable-proxy-http --enable-proxy-ftp \
-   --enable-dbd \
-   --with-apr=/usr/bin/apr-1-config \
-   --with-apr-util=/usr/bin/apu-1-config \
-   --with-pcre=/usr
+   cat ${srcdir}/arch.layout  config.layout
 
-   make || return 1
+   for mpm in prefork worker itk; do
+   if [ $mpm = itk ]; then
+   patch -Np1 -i 
${srcdir}/apache2.2-mpm-itk-${_itkver}.patch || return 1
+   autoconf || return 1
+   fi
+   mkdir build-$mpm
+   pushd build-$mpm
+   ../configure --enable-layout=Arch \
+   --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/sbin/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-cgid \
+   --enable-proxy --enable-proxy-connect \
+   --enable-proxy-http --enable-proxy-ftp \
+   --enable-dbd \
+   --with-apr=/usr/bin/apr-1-config \
+   --with-apr-util=/usr/bin/apu-1-config \
+   --with-pcre=/usr \
+   --with-mpm=${mpm} || return 1
+   make || return 1
+   if [ $mpm = prefork ]; then
+   make DESTDIR=${pkgdir} install || return 1
+   else
+   install -m755 httpd ${pkgdir}/usr/sbin/httpd.${mpm}
+   fi
+   popd
+   done
 
-   make DESTDIR=${pkgdir} install
-   install -D -m755 ${srcdir}/httpd ${pkgdir}/etc/rc.d/httpd
-   install -D -m644 ${srcdir}/httpd.logrotate 
${pkgdir}/etc/logrotate.d/httpd
+   install -D -m755 ${srcdir}/httpd ${pkgdir}/etc/rc.d/httpd || return 
1
+   install -D -m644 ${srcdir}/httpd.logrotate 
${pkgdir}/etc/logrotate.d/httpd || return 1
 
# symlinks for 

[arch-commits] Commit in apache/trunk (PKGBUILD)

[Andrea Scarpino]

Date: Tuesday, February 2, 2010 @ 20:02:51
  Author: andrea
Revision: 67091

minor fixes

Modified:
  apache/trunk/PKGBUILD

--+
 PKGBUILD |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-02-03 00:50:19 UTC (rev 67090)
+++ PKGBUILD2010-02-03 01:02:51 UTC (rev 67091)
@@ -80,7 +80,6 @@
# cleanup
rm -rf ${pkgdir}/usr/share/httpd/manual
rm -rf ${pkgdir}/etc/httpd/conf/original
-   rm -rf ${pkgdir}/srv/http
-   rmdir ${pkgdir}/usr/bin
+   rm -rf ${pkgdir}/srv/
+   rm -rf ${pkgdir}/usr/bin
 }
-

[arch-commits] Commit in apache/trunk (PKGBUILD httpd)

[Andrea Scarpino]

Date: Monday, February 1, 2010 @ 14:07:11
  Author: andrea
Revision: 66834

check for /var/run/httpd dir before start (FS#17433)

Modified:
  apache/trunk/PKGBUILD
  apache/trunk/httpd

--+
 PKGBUILD |7 +--
 httpd|1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-02-01 19:01:19 UTC (rev 66833)
+++ PKGBUILD2010-02-01 19:07:11 UTC (rev 66834)
@@ -18,10 +18,12 @@
 depends=('openssl' 'zlib' 'apr-util' 'pcre')
 optdepends=('lynx: apachectl status')
 source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2;
-'httpd.logrotate' 'httpd' 'arch.layout')
+'httpd.logrotate'
+   'httpd'
+   'arch.layout')
 md5sums=('a5226203aaf97e5b941c41a71c112704'
  'f4d627c64024c1b7b95efb5ffbaa625e'
- '3fb8b616e0b5f0118420edd26d8536bb'
+ '9e001fbb082a08113e7f4bc431085c11'
  '3d659d41276ba3bfcb20c231eb254e0c')
 
 build() {
@@ -81,3 +83,4 @@
rm -rf ${pkgdir}/srv/http
rmdir ${pkgdir}/usr/bin
 }
+

Modified: httpd
===
--- httpd   2010-02-01 19:01:19 UTC (rev 66833)
+++ httpd   2010-02-01 19:07:11 UTC (rev 66834)
@@ -10,6 +10,7 @@
 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

[arch-commits] Commit in apache/trunk (PKGBUILD httpd)

[Andrea Scarpino]

Date: Saturday, November 7, 2009 @ 07:17:38
  Author: andrea
Revision: 58370

rewritten rc.d script, the previous restart gave DONE with a wrong http.conf 
(FS#16994)

Modified:
  apache/trunk/PKGBUILD
  apache/trunk/httpd

--+
 PKGBUILD |4 ++--
 httpd|   51 ++-
 2 files changed, 24 insertions(+), 31 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-11-07 11:16:42 UTC (rev 58369)
+++ PKGBUILD2009-11-07 12:17:38 UTC (rev 58370)
@@ -4,7 +4,7 @@
 
 pkgname=apache
 pkgver=2.2.14
-pkgrel=1
+pkgrel=2
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
 options=('!libtool')
@@ -21,7 +21,7 @@
 'httpd.logrotate' 'httpd' 'arch.layout')
 md5sums=('a5226203aaf97e5b941c41a71c112704'
  'f4d627c64024c1b7b95efb5ffbaa625e'
- 'bddd84dafa770d74df1dc1f96bd71823'
+ 'a2f8d78b622384783fca8388931397fa'
  '3d659d41276ba3bfcb20c231eb254e0c')
 
 build() {

Modified: httpd
===
--- httpd   2009-11-07 11:16:42 UTC (rev 58369)
+++ httpd   2009-11-07 12:17:38 UTC (rev 58370)
@@ -5,62 +5,55 @@
 . /etc/rc.conf
 . /etc/rc.d/functions
 
+APACHECTL=/usr/sbin/apachectl
 
 case $1 in
   start)
-stat_busy Starting Apache Web Server
-# RUN
-/usr/sbin/apachectl start /dev/null
-#
-if [ $? -gt 0 ]; then
-  stat_fail
-  exit 1
-else
+stat_busy Starting $daemon_name daemon
+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
-# KILL
-/usr/sbin/apachectl stop /dev/null
-#
-if [ $? -gt 0 ]; then
-  stat_fail
-  exit 1
-else
+stat_busy Stopping $daemon_name daemon
+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
-/usr/sbin/apachectl graceful /dev/null
-if [ $? -gt 0 ]; then
-  stat_fail
-  exit 1
-else
+stat_busy Reloading $daemon_name daemon
+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
-/usr/sbin/apachectl restart /dev/null
-if [ $? -gt 0 ]; then
-  stat_fail
-  exit 1
-else
+stat_busy Restarting $daemon_name daemon
+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;
+stat_busy Checking $daemon_name status;
 ck_status $daemon_name
 ;;
 

[arch-commits] Commit in apache/trunk (PKGBUILD httpd)

[Andrea Scarpino]

Date: Saturday, November 7, 2009 @ 07:22:43
  Author: andrea
Revision: 58371

upgpkg: apache 2.2.14-2
rewritten rc.d script, the previous restart gave DONE with a wrong 
http.conf (FS#16994)

Modified:
  apache/trunk/PKGBUILD
  apache/trunk/httpd

--+
 PKGBUILD |2 +-
 httpd|   10 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-11-07 12:17:38 UTC (rev 58370)
+++ PKGBUILD2009-11-07 12:22:43 UTC (rev 58371)
@@ -21,7 +21,7 @@
 'httpd.logrotate' 'httpd' 'arch.layout')
 md5sums=('a5226203aaf97e5b941c41a71c112704'
  'f4d627c64024c1b7b95efb5ffbaa625e'
- 'a2f8d78b622384783fca8388931397fa'
+ '3fb8b616e0b5f0118420edd26d8536bb'
  '3d659d41276ba3bfcb20c231eb254e0c')
 
 build() {

Modified: httpd
===
--- httpd   2009-11-07 12:17:38 UTC (rev 58370)
+++ httpd   2009-11-07 12:22:43 UTC (rev 58371)
@@ -9,7 +9,7 @@
 
 case $1 in
   start)
-stat_busy Starting $daemon_name daemon
+stat_busy Starting Apache Web Server
 if $APACHECTL start /dev/null ; then
   add_daemon $daemon_name
   stat_done
@@ -20,7 +20,7 @@
 ;;
 
   stop)
-stat_busy Stopping $daemon_name daemon
+stat_busy Stopping Apache Web Server
 if $APACHECTL stop /dev/null ; then
   rm_daemon $daemon_name
   stat_done
@@ -31,7 +31,7 @@
 ;;
 
   reload)
-stat_busy Reloading $daemon_name daemon
+stat_busy Reloading Apache Web Server
 if $APACHECTL graceful /dev/null ; then
   add_daemon $daemon_name
   stat_done
@@ -42,7 +42,7 @@
 ;;
 
   restart)
-stat_busy Restarting $daemon_name daemon
+stat_busy Restarting Apache Web Server
 if $APACHECTL restart /dev/null ; then
   add_daemon $daemon_name
   stat_done
@@ -53,7 +53,7 @@
 ;;
 
   status)
-stat_busy Checking $daemon_name status;
+stat_busy Checking Apache Web Server status;
 ck_status $daemon_name
 ;;