Date: Saturday, May 16, 2015 @ 18:51:05 Author: anatolik Revision: 239471
archrelease: copy trunk to extra-i686, extra-x86_64 Added: apache/repos/extra-i686/PKGBUILD (from rev 239470, apache/trunk/PKGBUILD) apache/repos/extra-i686/apache.install (from rev 239470, apache/trunk/apache.install) apache/repos/extra-i686/apache.tmpfiles.conf (from rev 239470, apache/trunk/apache.tmpfiles.conf) apache/repos/extra-i686/arch.layout (from rev 239470, apache/trunk/arch.layout) apache/repos/extra-i686/httpd.logrotate (from rev 239470, apache/trunk/httpd.logrotate) apache/repos/extra-i686/httpd.service (from rev 239470, apache/trunk/httpd.service) apache/repos/extra-i686/lua53_fixes.patch (from rev 239470, apache/trunk/lua53_fixes.patch) apache/repos/extra-x86_64/PKGBUILD (from rev 239470, apache/trunk/PKGBUILD) apache/repos/extra-x86_64/apache.install (from rev 239470, apache/trunk/apache.install) apache/repos/extra-x86_64/apache.tmpfiles.conf (from rev 239470, apache/trunk/apache.tmpfiles.conf) apache/repos/extra-x86_64/arch.layout (from rev 239470, apache/trunk/arch.layout) apache/repos/extra-x86_64/httpd.logrotate (from rev 239470, apache/trunk/httpd.logrotate) apache/repos/extra-x86_64/httpd.service (from rev 239470, apache/trunk/httpd.service) apache/repos/extra-x86_64/lua53_fixes.patch (from rev 239470, apache/trunk/lua53_fixes.patch) Deleted: apache/repos/extra-i686/PKGBUILD apache/repos/extra-i686/apache.install apache/repos/extra-i686/apache.tmpfiles.conf apache/repos/extra-i686/arch.layout apache/repos/extra-i686/httpd.logrotate apache/repos/extra-i686/httpd.service apache/repos/extra-i686/lua53_fixes.patch apache/repos/extra-x86_64/PKGBUILD apache/repos/extra-x86_64/apache.install apache/repos/extra-x86_64/apache.tmpfiles.conf apache/repos/extra-x86_64/arch.layout apache/repos/extra-x86_64/httpd.logrotate apache/repos/extra-x86_64/httpd.service apache/repos/extra-x86_64/lua53_fixes.patch -----------------------------------+ /PKGBUILD | 252 ++++++++++++++++++++++++++++++++++++ /apache.install | 32 ++++ /apache.tmpfiles.conf | 2 /arch.layout | 44 ++++++ /httpd.logrotate | 12 + /httpd.service | 30 ++++ /lua53_fixes.patch | 110 +++++++++++++++ extra-i686/PKGBUILD | 126 ------------------ extra-i686/apache.install | 16 -- extra-i686/apache.tmpfiles.conf | 1 extra-i686/arch.layout | 22 --- extra-i686/httpd.logrotate | 6 extra-i686/httpd.service | 15 -- extra-i686/lua53_fixes.patch | 55 ------- extra-x86_64/PKGBUILD | 126 ------------------ extra-x86_64/apache.install | 16 -- extra-x86_64/apache.tmpfiles.conf | 1 extra-x86_64/arch.layout | 22 --- extra-x86_64/httpd.logrotate | 6 extra-x86_64/httpd.service | 15 -- extra-x86_64/lua53_fixes.patch | 55 ------- 21 files changed, 482 insertions(+), 482 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2015-05-16 16:49:41 UTC (rev 239470) +++ extra-i686/PKGBUILD 2015-05-16 16:51:05 UTC (rev 239471) @@ -1,126 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <j...@archlinux.org> -# Contributor: Andrea Scarpino <and...@archlinux.org> -# Contributor: Pierre Schmitz <pie...@archlinux.de> - -pkgname=apache -pkgver=2.4.12 -pkgrel=3 -pkgdesc='A high performance Unix-based HTTP server' -arch=('i686' 'x86_64') -url='http://www.apache.org/dist/httpd' -license=('APACHE') -backup=( - etc/httpd/conf/httpd.conf - etc/httpd/conf/extra/httpd-{autoindex,dav,default,info,languages}.conf - etc/httpd/conf/extra/httpd-{manual,mpm,multilang-errordoc}.conf - etc/httpd/conf/extra/httpd-{ssl,userdir,vhosts}.conf - etc/httpd/conf/extra/proxy-html.conf - etc/httpd/conf/{mime.types,magic} - etc/logrotate.d/httpd -) -depends=('zlib' 'apr-util' 'pcre') -makedepends=('libxml2' 'lua' 'openssl') -optdepends=( - 'lua: for mod_lua module' - 'openssl: for mod_ssl module' - 'libxml2: for mod_proxy_html, mod_xml2enc modules' - 'lynx: apachectl status' -) -install=apache.install -source=( - http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2{,.asc} - apache.tmpfiles.conf - httpd.logrotate - httpd.service - arch.layout - lua53_fixes.patch -) -sha256sums=('ad6d39edfe4621d8cc9a2791f6f8d6876943a9da41ac8533d77407a2e630eae4' - 'SKIP' - '63da1a420f4714a3e7af2672d28384419cc7eedbe7bf35baebd02938fabc15bf' - '875903831634edf35d8d57e9a51bacb818255ecb3bfff29627f03e43d1ab65c3' - '14d0a775eea7f8c66ba55399a9ad1e4fd29e0302f479a15b28bbfc754c5aa347' - 'dda05c6e76f12624e418ca18a36f2e90ec1c5b1cc52fed7142fce6076ec413f3' - 'e2c3fe0747908971449dba8f1526f008fc27b9ff5c3b490ea9d43a2a5fe8c1e4') -validpgpkeys=('A93D62ECC3C8EA12DB220EC934EA76E6791485A8') # Jim Jagielski - -prepare() { - cd httpd-${pkgver} - - # set default user - sed -e 's#User daemon#User http#' \ - -e 's#Group daemon#Group http#' \ - -i docs/conf/httpd.conf.in - - cat "${srcdir}/arch.layout" >> config.layout - - patch -p3 < ../lua53_fixes.patch -} - -build() { - cd httpd-${pkgver} - - ./configure --sbindir=/usr/bin \ - --enable-layout=Arch \ - --enable-mpms-shared=all \ - --enable-modules=all \ - --enable-mods-shared=all \ - --enable-so \ - --enable-suexec \ - --with-suexec-caller=http \ - --with-suexec-docroot=/srv/http \ - --with-suexec-logfile=/var/log/httpd/suexec.log \ - --with-suexec-bin=/usr/bin/suexec \ - --with-suexec-uidmin=99 --with-suexec-gidmin=99 \ - --enable-ldap --enable-authnz-ldap --enable-authnz-fcgi \ - --enable-cache --enable-disk-cache --enable-mem-cache --enable-file-cache \ - --enable-ssl --with-ssl \ - --enable-deflate --enable-cgi --enable-cgid \ - --enable-proxy --enable-proxy-connect \ - --enable-proxy-http --enable-proxy-ftp \ - --enable-dbd --enable-imagemap --enable-ident --enable-cern-meta \ - --enable-lua --enable-xml2enc \ - --with-apr=/usr/bin/apr-1-config \ - --with-apr-util=/usr/bin/apu-1-config \ - --with-pcre=/usr - - make -} - -package() { - cd httpd-${pkgver} - - make DESTDIR="${pkgdir}" install - - install -D -m644 "${srcdir}/httpd.logrotate" "${pkgdir}/etc/logrotate.d/httpd" - install -D -m644 "${srcdir}/apache.tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/apache.conf" - install -D -m644 "${srcdir}/httpd.service" "${pkgdir}/usr/lib/systemd/system/httpd.service" - install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - - # symlinks for /etc/httpd - # do we really need these symlinks? - #ln -fs /var/log/httpd "${pkgdir}/etc/httpd/logs" - ln -fs /usr/lib/httpd/modules "${pkgdir}/etc/httpd/modules" - #ln -fs /usr/lib/httpd/build "${pkgdir}/etc/httpd/build" - - # set sane defaults - sed -e 's#/usr/lib/httpd/modules/#modules/#' \ - -e 's|#\(LoadModule negotiation_module \)|\1|' \ - -e 's|#\(LoadModule include_module \)|\1|' \ - -e 's|#\(LoadModule userdir_module \)|\1|' \ - -e 's|#\(LoadModule slotmem_shm_module \)|\1|' \ - -e 's|#\(Include conf/extra/httpd-multilang-errordoc.conf\)|\1|' \ - -e 's|#\(Include conf/extra/httpd-autoindex.conf\)|\1|' \ - -e 's|#\(Include conf/extra/httpd-languages.conf\)|\1|' \ - -e 's|#\(Include conf/extra/httpd-userdir.conf\)|\1|' \ - -e 's|#\(Include conf/extra/httpd-default.conf\)|\1|' \ - -e 's|#\(Include conf/extra/httpd-mpm.conf\)|\1|' \ - -i "${pkgdir}/etc/httpd/conf/httpd.conf" - - # cleanup - rm -r "${pkgdir}/usr/share/httpd/manual" - rm -r "${pkgdir}/etc/httpd/conf/original" - rm -r "${pkgdir}/srv/" - rm -r "${pkgdir}/run" -} Copied: apache/repos/extra-i686/PKGBUILD (from rev 239470, apache/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2015-05-16 16:51:05 UTC (rev 239471) @@ -0,0 +1,126 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> +# Contributor: Pierre Schmitz <pie...@archlinux.de> + +pkgname=apache +pkgver=2.4.12 +pkgrel=4 +pkgdesc='A high performance Unix-based HTTP server' +arch=('i686' 'x86_64') +url='http://www.apache.org/dist/httpd' +license=('APACHE') +backup=( + etc/httpd/conf/httpd.conf + etc/httpd/conf/extra/httpd-{autoindex,dav,default,info,languages}.conf + etc/httpd/conf/extra/httpd-{manual,mpm,multilang-errordoc}.conf + etc/httpd/conf/extra/httpd-{ssl,userdir,vhosts}.conf + etc/httpd/conf/extra/proxy-html.conf + etc/httpd/conf/{mime.types,magic} + etc/logrotate.d/httpd +) +depends=('zlib' 'apr-util' 'pcre') +makedepends=('libxml2' 'lua' 'openssl') +optdepends=( + 'lua: for mod_lua module' + 'openssl: for mod_ssl module' + 'libxml2: for mod_proxy_html, mod_xml2enc modules' + 'lynx: apachectl status' +) +install=apache.install +source=( + http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2{,.asc} + apache.tmpfiles.conf + httpd.logrotate + httpd.service + arch.layout + lua53_fixes.patch +) +sha256sums=('ad6d39edfe4621d8cc9a2791f6f8d6876943a9da41ac8533d77407a2e630eae4' + 'SKIP' + '63da1a420f4714a3e7af2672d28384419cc7eedbe7bf35baebd02938fabc15bf' + '875903831634edf35d8d57e9a51bacb818255ecb3bfff29627f03e43d1ab65c3' + '14d0a775eea7f8c66ba55399a9ad1e4fd29e0302f479a15b28bbfc754c5aa347' + 'dda05c6e76f12624e418ca18a36f2e90ec1c5b1cc52fed7142fce6076ec413f3' + 'e2c3fe0747908971449dba8f1526f008fc27b9ff5c3b490ea9d43a2a5fe8c1e4') +validpgpkeys=('A93D62ECC3C8EA12DB220EC934EA76E6791485A8') # Jim Jagielski + +prepare() { + cd httpd-${pkgver} + + # set default user + sed -e 's#User daemon#User http#' \ + -e 's#Group daemon#Group http#' \ + -i docs/conf/httpd.conf.in + + cat "${srcdir}/arch.layout" >> config.layout + + patch -p3 < ../lua53_fixes.patch +} + +build() { + cd httpd-${pkgver} + + ./configure --sbindir=/usr/bin \ + --enable-layout=Arch \ + --enable-mpms-shared=all \ + --enable-modules=all \ + --enable-mods-shared=all \ + --enable-so \ + --enable-suexec \ + --with-suexec-caller=http \ + --with-suexec-docroot=/srv/http \ + --with-suexec-logfile=/var/log/httpd/suexec.log \ + --with-suexec-bin=/usr/bin/suexec \ + --with-suexec-uidmin=99 --with-suexec-gidmin=99 \ + --enable-ldap --enable-authnz-ldap --enable-authnz-fcgi \ + --enable-cache --enable-disk-cache --enable-mem-cache --enable-file-cache \ + --enable-ssl --with-ssl \ + --enable-deflate --enable-cgi --enable-cgid \ + --enable-proxy --enable-proxy-connect \ + --enable-proxy-http --enable-proxy-ftp \ + --enable-dbd --enable-imagemap --enable-ident --enable-cern-meta \ + --enable-lua --enable-xml2enc \ + --with-apr=/usr/bin/apr-1-config \ + --with-apr-util=/usr/bin/apu-1-config \ + --with-pcre=/usr + + make +} + +package() { + cd httpd-${pkgver} + + make DESTDIR="${pkgdir}" install + + install -D -m644 "${srcdir}/httpd.logrotate" "${pkgdir}/etc/logrotate.d/httpd" + install -D -m644 "${srcdir}/apache.tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/apache.conf" + install -D -m644 "${srcdir}/httpd.service" "${pkgdir}/usr/lib/systemd/system/httpd.service" + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + + # symlinks for /etc/httpd + # do we really need these symlinks? + #ln -fs /var/log/httpd "${pkgdir}/etc/httpd/logs" + ln -fs /usr/lib/httpd/modules "${pkgdir}/etc/httpd/modules" + #ln -fs /usr/lib/httpd/build "${pkgdir}/etc/httpd/build" + + # set sane defaults + sed -e 's#/usr/lib/httpd/modules/#modules/#' \ + -e 's|#\(LoadModule negotiation_module \)|\1|' \ + -e 's|#\(LoadModule include_module \)|\1|' \ + -e 's|#\(LoadModule userdir_module \)|\1|' \ + -e 's|#\(LoadModule slotmem_shm_module \)|\1|' \ + -e 's|#\(Include conf/extra/httpd-multilang-errordoc.conf\)|\1|' \ + -e 's|#\(Include conf/extra/httpd-autoindex.conf\)|\1|' \ + -e 's|#\(Include conf/extra/httpd-languages.conf\)|\1|' \ + -e 's|#\(Include conf/extra/httpd-userdir.conf\)|\1|' \ + -e 's|#\(Include conf/extra/httpd-default.conf\)|\1|' \ + -e 's|#\(Include conf/extra/httpd-mpm.conf\)|\1|' \ + -i "${pkgdir}/etc/httpd/conf/httpd.conf" + + # cleanup + rm -r "${pkgdir}/usr/share/httpd/manual" + rm -r "${pkgdir}/etc/httpd/conf/original" + rm -r "${pkgdir}/srv/" + rm -r "${pkgdir}/run" +} Deleted: extra-i686/apache.install =================================================================== --- extra-i686/apache.install 2015-05-16 16:49:41 UTC (rev 239470) +++ extra-i686/apache.install 2015-05-16 16:51:05 UTC (rev 239471) @@ -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 -} Copied: apache/repos/extra-i686/apache.install (from rev 239470, apache/trunk/apache.install) =================================================================== --- extra-i686/apache.install (rev 0) +++ extra-i686/apache.install 2015-05-16 16:51:05 UTC (rev 239471) @@ -0,0 +1,16 @@ +post_install() { + if type -P systemd-tmpfiles &> /dev/null; then + systemd-tmpfiles --create apache.conf + fi +} + +post_upgrade() { + if type -P systemd-tmpfiles &> /dev/null; then + systemd-tmpfiles --create apache.conf + fi + + if [[ $2 == 2\.2\.* ]]; then + # it is a major upgrade, show a useful link to upgrade instructions + echo ' Check Apache upgrade instructions: https://httpd.apache.org/docs/2.4/upgrading.html' + fi +} Deleted: extra-i686/apache.tmpfiles.conf =================================================================== --- extra-i686/apache.tmpfiles.conf 2015-05-16 16:49:41 UTC (rev 239470) +++ extra-i686/apache.tmpfiles.conf 2015-05-16 16:51:05 UTC (rev 239471) @@ -1 +0,0 @@ -d /run/httpd 0755 root root - Copied: apache/repos/extra-i686/apache.tmpfiles.conf (from rev 239470, apache/trunk/apache.tmpfiles.conf) =================================================================== --- extra-i686/apache.tmpfiles.conf (rev 0) +++ extra-i686/apache.tmpfiles.conf 2015-05-16 16:51:05 UTC (rev 239471) @@ -0,0 +1 @@ +d /run/httpd 0755 root root - Deleted: extra-i686/arch.layout =================================================================== --- extra-i686/arch.layout 2015-05-16 16:49:41 UTC (rev 239470) +++ extra-i686/arch.layout 2015-05-16 16:51:05 UTC (rev 239471) @@ -1,22 +0,0 @@ -<Layout Arch> - prefix: /etc/httpd - exec_prefix: /usr - bindir: /usr/bin - sbindir: /usr/bin - libdir: /usr/lib/httpd - libexecdir: /usr/lib/httpd/modules - mandir: /usr/share/man - sysconfdir: /etc/httpd/conf - datadir: /usr/share/httpd - installbuilddir: /usr/lib/httpd/build - errordir: /usr/share/httpd/error - iconsdir: /usr/share/httpd/icons - htdocsdir: /srv/http - manualdir: /usr/share/httpd/manual - cgidir: /srv/http/cgi-bin - includedir: /usr/include/httpd - localstatedir: /var - runtimedir: /run/httpd - logfiledir: /var/log/httpd - proxycachedir: /var/cache/httpd -</Layout> \ No newline at end of file Copied: apache/repos/extra-i686/arch.layout (from rev 239470, apache/trunk/arch.layout) =================================================================== --- extra-i686/arch.layout (rev 0) +++ extra-i686/arch.layout 2015-05-16 16:51:05 UTC (rev 239471) @@ -0,0 +1,22 @@ +<Layout Arch> + prefix: /etc/httpd + exec_prefix: /usr + bindir: /usr/bin + sbindir: /usr/bin + libdir: /usr/lib/httpd + libexecdir: /usr/lib/httpd/modules + mandir: /usr/share/man + sysconfdir: /etc/httpd/conf + datadir: /usr/share/httpd + installbuilddir: /usr/lib/httpd/build + errordir: /usr/share/httpd/error + iconsdir: /usr/share/httpd/icons + htdocsdir: /srv/http + manualdir: /usr/share/httpd/manual + cgidir: /srv/http/cgi-bin + includedir: /usr/include/httpd + localstatedir: /var + runtimedir: /run/httpd + logfiledir: /var/log/httpd + proxycachedir: /var/cache/httpd +</Layout> \ No newline at end of file Deleted: extra-i686/httpd.logrotate =================================================================== --- extra-i686/httpd.logrotate 2015-05-16 16:49:41 UTC (rev 239470) +++ extra-i686/httpd.logrotate 2015-05-16 16:51:05 UTC (rev 239471) @@ -1,6 +0,0 @@ -/var/log/httpd/*log { - missingok - postrotate - /bin/kill -HUP `cat /run/httpd/httpd.pid 2>/dev/null` 2> /dev/null || true - endscript -} Copied: apache/repos/extra-i686/httpd.logrotate (from rev 239470, apache/trunk/httpd.logrotate) =================================================================== --- extra-i686/httpd.logrotate (rev 0) +++ extra-i686/httpd.logrotate 2015-05-16 16:51:05 UTC (rev 239471) @@ -0,0 +1,6 @@ +/var/log/httpd/*log { + missingok + postrotate + /bin/kill -HUP `cat /run/httpd/httpd.pid 2>/dev/null` 2> /dev/null || true + endscript +} Deleted: extra-i686/httpd.service =================================================================== --- extra-i686/httpd.service 2015-05-16 16:49:41 UTC (rev 239470) +++ extra-i686/httpd.service 2015-05-16 16:51:05 UTC (rev 239471) @@ -1,15 +0,0 @@ -[Unit] -Description=Apache Web Server -After=network.target remote-fs.target nss-lookup.target - -[Service] -Type=forking -PIDFile=/run/httpd/httpd.pid -ExecStart=/usr/bin/apachectl start -ExecStop=/usr/bin/apachectl graceful-stop -ExecReload=/usr/bin/apachectl graceful -PrivateTmp=true -LimitNOFILE=infinity - -[Install] -WantedBy=multi-user.target Copied: apache/repos/extra-i686/httpd.service (from rev 239470, apache/trunk/httpd.service) =================================================================== --- extra-i686/httpd.service (rev 0) +++ extra-i686/httpd.service 2015-05-16 16:51:05 UTC (rev 239471) @@ -0,0 +1,15 @@ +[Unit] +Description=Apache Web Server +After=network.target remote-fs.target nss-lookup.target + +[Service] +Type=forking +PIDFile=/run/httpd/httpd.pid +ExecStart=/usr/bin/apachectl start +ExecStop=/usr/bin/apachectl graceful-stop +ExecReload=/usr/bin/apachectl graceful +PrivateTmp=true +LimitNOFILE=infinity + +[Install] +WantedBy=multi-user.target Deleted: extra-i686/lua53_fixes.patch =================================================================== --- extra-i686/lua53_fixes.patch 2015-05-16 16:49:41 UTC (rev 239470) +++ extra-i686/lua53_fixes.patch 2015-05-16 16:51:05 UTC (rev 239471) @@ -1,55 +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&r1=1652885&r2=1652886&view=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&r1=1652885&r2=1652886&view=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 Copied: apache/repos/extra-i686/lua53_fixes.patch (from rev 239470, apache/trunk/lua53_fixes.patch) =================================================================== --- extra-i686/lua53_fixes.patch (rev 0) +++ extra-i686/lua53_fixes.patch 2015-05-16 16:51:05 UTC (rev 239471) @@ -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=1652886&r1=1652885&r2=1652886&view=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&r1=1652885&r2=1652886&view=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 Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2015-05-16 16:49:41 UTC (rev 239470) +++ extra-x86_64/PKGBUILD 2015-05-16 16:51:05 UTC (rev 239471) @@ -1,126 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <j...@archlinux.org> -# Contributor: Andrea Scarpino <and...@archlinux.org> -# Contributor: Pierre Schmitz <pie...@archlinux.de> - -pkgname=apache -pkgver=2.4.12 -pkgrel=3 -pkgdesc='A high performance Unix-based HTTP server' -arch=('i686' 'x86_64') -url='http://www.apache.org/dist/httpd' -license=('APACHE') -backup=( - etc/httpd/conf/httpd.conf - etc/httpd/conf/extra/httpd-{autoindex,dav,default,info,languages}.conf - etc/httpd/conf/extra/httpd-{manual,mpm,multilang-errordoc}.conf - etc/httpd/conf/extra/httpd-{ssl,userdir,vhosts}.conf - etc/httpd/conf/extra/proxy-html.conf - etc/httpd/conf/{mime.types,magic} - etc/logrotate.d/httpd -) -depends=('zlib' 'apr-util' 'pcre') -makedepends=('libxml2' 'lua' 'openssl') -optdepends=( - 'lua: for mod_lua module' - 'openssl: for mod_ssl module' - 'libxml2: for mod_proxy_html, mod_xml2enc modules' - 'lynx: apachectl status' -) -install=apache.install -source=( - http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2{,.asc} - apache.tmpfiles.conf - httpd.logrotate - httpd.service - arch.layout - lua53_fixes.patch -) -sha256sums=('ad6d39edfe4621d8cc9a2791f6f8d6876943a9da41ac8533d77407a2e630eae4' - 'SKIP' - '63da1a420f4714a3e7af2672d28384419cc7eedbe7bf35baebd02938fabc15bf' - '875903831634edf35d8d57e9a51bacb818255ecb3bfff29627f03e43d1ab65c3' - '14d0a775eea7f8c66ba55399a9ad1e4fd29e0302f479a15b28bbfc754c5aa347' - 'dda05c6e76f12624e418ca18a36f2e90ec1c5b1cc52fed7142fce6076ec413f3' - 'e2c3fe0747908971449dba8f1526f008fc27b9ff5c3b490ea9d43a2a5fe8c1e4') -validpgpkeys=('A93D62ECC3C8EA12DB220EC934EA76E6791485A8') # Jim Jagielski - -prepare() { - cd httpd-${pkgver} - - # set default user - sed -e 's#User daemon#User http#' \ - -e 's#Group daemon#Group http#' \ - -i docs/conf/httpd.conf.in - - cat "${srcdir}/arch.layout" >> config.layout - - patch -p3 < ../lua53_fixes.patch -} - -build() { - cd httpd-${pkgver} - - ./configure --sbindir=/usr/bin \ - --enable-layout=Arch \ - --enable-mpms-shared=all \ - --enable-modules=all \ - --enable-mods-shared=all \ - --enable-so \ - --enable-suexec \ - --with-suexec-caller=http \ - --with-suexec-docroot=/srv/http \ - --with-suexec-logfile=/var/log/httpd/suexec.log \ - --with-suexec-bin=/usr/bin/suexec \ - --with-suexec-uidmin=99 --with-suexec-gidmin=99 \ - --enable-ldap --enable-authnz-ldap --enable-authnz-fcgi \ - --enable-cache --enable-disk-cache --enable-mem-cache --enable-file-cache \ - --enable-ssl --with-ssl \ - --enable-deflate --enable-cgi --enable-cgid \ - --enable-proxy --enable-proxy-connect \ - --enable-proxy-http --enable-proxy-ftp \ - --enable-dbd --enable-imagemap --enable-ident --enable-cern-meta \ - --enable-lua --enable-xml2enc \ - --with-apr=/usr/bin/apr-1-config \ - --with-apr-util=/usr/bin/apu-1-config \ - --with-pcre=/usr - - make -} - -package() { - cd httpd-${pkgver} - - make DESTDIR="${pkgdir}" install - - install -D -m644 "${srcdir}/httpd.logrotate" "${pkgdir}/etc/logrotate.d/httpd" - install -D -m644 "${srcdir}/apache.tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/apache.conf" - install -D -m644 "${srcdir}/httpd.service" "${pkgdir}/usr/lib/systemd/system/httpd.service" - install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - - # symlinks for /etc/httpd - # do we really need these symlinks? - #ln -fs /var/log/httpd "${pkgdir}/etc/httpd/logs" - ln -fs /usr/lib/httpd/modules "${pkgdir}/etc/httpd/modules" - #ln -fs /usr/lib/httpd/build "${pkgdir}/etc/httpd/build" - - # set sane defaults - sed -e 's#/usr/lib/httpd/modules/#modules/#' \ - -e 's|#\(LoadModule negotiation_module \)|\1|' \ - -e 's|#\(LoadModule include_module \)|\1|' \ - -e 's|#\(LoadModule userdir_module \)|\1|' \ - -e 's|#\(LoadModule slotmem_shm_module \)|\1|' \ - -e 's|#\(Include conf/extra/httpd-multilang-errordoc.conf\)|\1|' \ - -e 's|#\(Include conf/extra/httpd-autoindex.conf\)|\1|' \ - -e 's|#\(Include conf/extra/httpd-languages.conf\)|\1|' \ - -e 's|#\(Include conf/extra/httpd-userdir.conf\)|\1|' \ - -e 's|#\(Include conf/extra/httpd-default.conf\)|\1|' \ - -e 's|#\(Include conf/extra/httpd-mpm.conf\)|\1|' \ - -i "${pkgdir}/etc/httpd/conf/httpd.conf" - - # cleanup - rm -r "${pkgdir}/usr/share/httpd/manual" - rm -r "${pkgdir}/etc/httpd/conf/original" - rm -r "${pkgdir}/srv/" - rm -r "${pkgdir}/run" -} Copied: apache/repos/extra-x86_64/PKGBUILD (from rev 239470, apache/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2015-05-16 16:51:05 UTC (rev 239471) @@ -0,0 +1,126 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> +# Contributor: Pierre Schmitz <pie...@archlinux.de> + +pkgname=apache +pkgver=2.4.12 +pkgrel=4 +pkgdesc='A high performance Unix-based HTTP server' +arch=('i686' 'x86_64') +url='http://www.apache.org/dist/httpd' +license=('APACHE') +backup=( + etc/httpd/conf/httpd.conf + etc/httpd/conf/extra/httpd-{autoindex,dav,default,info,languages}.conf + etc/httpd/conf/extra/httpd-{manual,mpm,multilang-errordoc}.conf + etc/httpd/conf/extra/httpd-{ssl,userdir,vhosts}.conf + etc/httpd/conf/extra/proxy-html.conf + etc/httpd/conf/{mime.types,magic} + etc/logrotate.d/httpd +) +depends=('zlib' 'apr-util' 'pcre') +makedepends=('libxml2' 'lua' 'openssl') +optdepends=( + 'lua: for mod_lua module' + 'openssl: for mod_ssl module' + 'libxml2: for mod_proxy_html, mod_xml2enc modules' + 'lynx: apachectl status' +) +install=apache.install +source=( + http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2{,.asc} + apache.tmpfiles.conf + httpd.logrotate + httpd.service + arch.layout + lua53_fixes.patch +) +sha256sums=('ad6d39edfe4621d8cc9a2791f6f8d6876943a9da41ac8533d77407a2e630eae4' + 'SKIP' + '63da1a420f4714a3e7af2672d28384419cc7eedbe7bf35baebd02938fabc15bf' + '875903831634edf35d8d57e9a51bacb818255ecb3bfff29627f03e43d1ab65c3' + '14d0a775eea7f8c66ba55399a9ad1e4fd29e0302f479a15b28bbfc754c5aa347' + 'dda05c6e76f12624e418ca18a36f2e90ec1c5b1cc52fed7142fce6076ec413f3' + 'e2c3fe0747908971449dba8f1526f008fc27b9ff5c3b490ea9d43a2a5fe8c1e4') +validpgpkeys=('A93D62ECC3C8EA12DB220EC934EA76E6791485A8') # Jim Jagielski + +prepare() { + cd httpd-${pkgver} + + # set default user + sed -e 's#User daemon#User http#' \ + -e 's#Group daemon#Group http#' \ + -i docs/conf/httpd.conf.in + + cat "${srcdir}/arch.layout" >> config.layout + + patch -p3 < ../lua53_fixes.patch +} + +build() { + cd httpd-${pkgver} + + ./configure --sbindir=/usr/bin \ + --enable-layout=Arch \ + --enable-mpms-shared=all \ + --enable-modules=all \ + --enable-mods-shared=all \ + --enable-so \ + --enable-suexec \ + --with-suexec-caller=http \ + --with-suexec-docroot=/srv/http \ + --with-suexec-logfile=/var/log/httpd/suexec.log \ + --with-suexec-bin=/usr/bin/suexec \ + --with-suexec-uidmin=99 --with-suexec-gidmin=99 \ + --enable-ldap --enable-authnz-ldap --enable-authnz-fcgi \ + --enable-cache --enable-disk-cache --enable-mem-cache --enable-file-cache \ + --enable-ssl --with-ssl \ + --enable-deflate --enable-cgi --enable-cgid \ + --enable-proxy --enable-proxy-connect \ + --enable-proxy-http --enable-proxy-ftp \ + --enable-dbd --enable-imagemap --enable-ident --enable-cern-meta \ + --enable-lua --enable-xml2enc \ + --with-apr=/usr/bin/apr-1-config \ + --with-apr-util=/usr/bin/apu-1-config \ + --with-pcre=/usr + + make +} + +package() { + cd httpd-${pkgver} + + make DESTDIR="${pkgdir}" install + + install -D -m644 "${srcdir}/httpd.logrotate" "${pkgdir}/etc/logrotate.d/httpd" + install -D -m644 "${srcdir}/apache.tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/apache.conf" + install -D -m644 "${srcdir}/httpd.service" "${pkgdir}/usr/lib/systemd/system/httpd.service" + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + + # symlinks for /etc/httpd + # do we really need these symlinks? + #ln -fs /var/log/httpd "${pkgdir}/etc/httpd/logs" + ln -fs /usr/lib/httpd/modules "${pkgdir}/etc/httpd/modules" + #ln -fs /usr/lib/httpd/build "${pkgdir}/etc/httpd/build" + + # set sane defaults + sed -e 's#/usr/lib/httpd/modules/#modules/#' \ + -e 's|#\(LoadModule negotiation_module \)|\1|' \ + -e 's|#\(LoadModule include_module \)|\1|' \ + -e 's|#\(LoadModule userdir_module \)|\1|' \ + -e 's|#\(LoadModule slotmem_shm_module \)|\1|' \ + -e 's|#\(Include conf/extra/httpd-multilang-errordoc.conf\)|\1|' \ + -e 's|#\(Include conf/extra/httpd-autoindex.conf\)|\1|' \ + -e 's|#\(Include conf/extra/httpd-languages.conf\)|\1|' \ + -e 's|#\(Include conf/extra/httpd-userdir.conf\)|\1|' \ + -e 's|#\(Include conf/extra/httpd-default.conf\)|\1|' \ + -e 's|#\(Include conf/extra/httpd-mpm.conf\)|\1|' \ + -i "${pkgdir}/etc/httpd/conf/httpd.conf" + + # cleanup + rm -r "${pkgdir}/usr/share/httpd/manual" + rm -r "${pkgdir}/etc/httpd/conf/original" + rm -r "${pkgdir}/srv/" + rm -r "${pkgdir}/run" +} Deleted: extra-x86_64/apache.install =================================================================== --- extra-x86_64/apache.install 2015-05-16 16:49:41 UTC (rev 239470) +++ extra-x86_64/apache.install 2015-05-16 16:51:05 UTC (rev 239471) @@ -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 -} Copied: apache/repos/extra-x86_64/apache.install (from rev 239470, apache/trunk/apache.install) =================================================================== --- extra-x86_64/apache.install (rev 0) +++ extra-x86_64/apache.install 2015-05-16 16:51:05 UTC (rev 239471) @@ -0,0 +1,16 @@ +post_install() { + if type -P systemd-tmpfiles &> /dev/null; then + systemd-tmpfiles --create apache.conf + fi +} + +post_upgrade() { + if type -P systemd-tmpfiles &> /dev/null; then + systemd-tmpfiles --create apache.conf + fi + + if [[ $2 == 2\.2\.* ]]; then + # it is a major upgrade, show a useful link to upgrade instructions + echo ' Check Apache upgrade instructions: https://httpd.apache.org/docs/2.4/upgrading.html' + fi +} Deleted: extra-x86_64/apache.tmpfiles.conf =================================================================== --- extra-x86_64/apache.tmpfiles.conf 2015-05-16 16:49:41 UTC (rev 239470) +++ extra-x86_64/apache.tmpfiles.conf 2015-05-16 16:51:05 UTC (rev 239471) @@ -1 +0,0 @@ -d /run/httpd 0755 root root - Copied: apache/repos/extra-x86_64/apache.tmpfiles.conf (from rev 239470, apache/trunk/apache.tmpfiles.conf) =================================================================== --- extra-x86_64/apache.tmpfiles.conf (rev 0) +++ extra-x86_64/apache.tmpfiles.conf 2015-05-16 16:51:05 UTC (rev 239471) @@ -0,0 +1 @@ +d /run/httpd 0755 root root - Deleted: extra-x86_64/arch.layout =================================================================== --- extra-x86_64/arch.layout 2015-05-16 16:49:41 UTC (rev 239470) +++ extra-x86_64/arch.layout 2015-05-16 16:51:05 UTC (rev 239471) @@ -1,22 +0,0 @@ -<Layout Arch> - prefix: /etc/httpd - exec_prefix: /usr - bindir: /usr/bin - sbindir: /usr/bin - libdir: /usr/lib/httpd - libexecdir: /usr/lib/httpd/modules - mandir: /usr/share/man - sysconfdir: /etc/httpd/conf - datadir: /usr/share/httpd - installbuilddir: /usr/lib/httpd/build - errordir: /usr/share/httpd/error - iconsdir: /usr/share/httpd/icons - htdocsdir: /srv/http - manualdir: /usr/share/httpd/manual - cgidir: /srv/http/cgi-bin - includedir: /usr/include/httpd - localstatedir: /var - runtimedir: /run/httpd - logfiledir: /var/log/httpd - proxycachedir: /var/cache/httpd -</Layout> \ No newline at end of file Copied: apache/repos/extra-x86_64/arch.layout (from rev 239470, apache/trunk/arch.layout) =================================================================== --- extra-x86_64/arch.layout (rev 0) +++ extra-x86_64/arch.layout 2015-05-16 16:51:05 UTC (rev 239471) @@ -0,0 +1,22 @@ +<Layout Arch> + prefix: /etc/httpd + exec_prefix: /usr + bindir: /usr/bin + sbindir: /usr/bin + libdir: /usr/lib/httpd + libexecdir: /usr/lib/httpd/modules + mandir: /usr/share/man + sysconfdir: /etc/httpd/conf + datadir: /usr/share/httpd + installbuilddir: /usr/lib/httpd/build + errordir: /usr/share/httpd/error + iconsdir: /usr/share/httpd/icons + htdocsdir: /srv/http + manualdir: /usr/share/httpd/manual + cgidir: /srv/http/cgi-bin + includedir: /usr/include/httpd + localstatedir: /var + runtimedir: /run/httpd + logfiledir: /var/log/httpd + proxycachedir: /var/cache/httpd +</Layout> \ No newline at end of file Deleted: extra-x86_64/httpd.logrotate =================================================================== --- extra-x86_64/httpd.logrotate 2015-05-16 16:49:41 UTC (rev 239470) +++ extra-x86_64/httpd.logrotate 2015-05-16 16:51:05 UTC (rev 239471) @@ -1,6 +0,0 @@ -/var/log/httpd/*log { - missingok - postrotate - /bin/kill -HUP `cat /run/httpd/httpd.pid 2>/dev/null` 2> /dev/null || true - endscript -} Copied: apache/repos/extra-x86_64/httpd.logrotate (from rev 239470, apache/trunk/httpd.logrotate) =================================================================== --- extra-x86_64/httpd.logrotate (rev 0) +++ extra-x86_64/httpd.logrotate 2015-05-16 16:51:05 UTC (rev 239471) @@ -0,0 +1,6 @@ +/var/log/httpd/*log { + missingok + postrotate + /bin/kill -HUP `cat /run/httpd/httpd.pid 2>/dev/null` 2> /dev/null || true + endscript +} Deleted: extra-x86_64/httpd.service =================================================================== --- extra-x86_64/httpd.service 2015-05-16 16:49:41 UTC (rev 239470) +++ extra-x86_64/httpd.service 2015-05-16 16:51:05 UTC (rev 239471) @@ -1,15 +0,0 @@ -[Unit] -Description=Apache Web Server -After=network.target remote-fs.target nss-lookup.target - -[Service] -Type=forking -PIDFile=/run/httpd/httpd.pid -ExecStart=/usr/bin/apachectl start -ExecStop=/usr/bin/apachectl graceful-stop -ExecReload=/usr/bin/apachectl graceful -PrivateTmp=true -LimitNOFILE=infinity - -[Install] -WantedBy=multi-user.target Copied: apache/repos/extra-x86_64/httpd.service (from rev 239470, apache/trunk/httpd.service) =================================================================== --- extra-x86_64/httpd.service (rev 0) +++ extra-x86_64/httpd.service 2015-05-16 16:51:05 UTC (rev 239471) @@ -0,0 +1,15 @@ +[Unit] +Description=Apache Web Server +After=network.target remote-fs.target nss-lookup.target + +[Service] +Type=forking +PIDFile=/run/httpd/httpd.pid +ExecStart=/usr/bin/apachectl start +ExecStop=/usr/bin/apachectl graceful-stop +ExecReload=/usr/bin/apachectl graceful +PrivateTmp=true +LimitNOFILE=infinity + +[Install] +WantedBy=multi-user.target Deleted: extra-x86_64/lua53_fixes.patch =================================================================== --- extra-x86_64/lua53_fixes.patch 2015-05-16 16:49:41 UTC (rev 239470) +++ extra-x86_64/lua53_fixes.patch 2015-05-16 16:51:05 UTC (rev 239471) @@ -1,55 +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&r1=1652885&r2=1652886&view=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&r1=1652885&r2=1652886&view=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 Copied: apache/repos/extra-x86_64/lua53_fixes.patch (from rev 239470, apache/trunk/lua53_fixes.patch) =================================================================== --- extra-x86_64/lua53_fixes.patch (rev 0) +++ extra-x86_64/lua53_fixes.patch 2015-05-16 16:51:05 UTC (rev 239471) @@ -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=1652886&r1=1652885&r2=1652886&view=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&r1=1652885&r2=1652886&view=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