[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
===================================================================
--- PKGBUILD	2015-05-04 16:15:43 UTC (rev 238468)
+++ PKGBUILD	2015-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=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