[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
===================================================================
--- PKGBUILD	2015-10-15 20:36:18 UTC (rev 249399)
+++ PKGBUILD	2015-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&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"