From d35e217008fe9ad5fea4559c9298ef3b447ed294 Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg@phi-gamma.net>
Date: Sun, 13 Jul 2014 11:05:38 +0200
Subject: luasec: fix PKGBUILD by removing patch in favor of sed

---
 luasec-prosody-git/PKGBUILD             | 13 ++++++-------
 luasec-prosody-git/luasec-prosody.patch | 26 --------------------------
 2 files changed, 6 insertions(+), 33 deletions(-)
 delete mode 100644 luasec-prosody-git/luasec-prosody.patch

(limited to 'luasec-prosody-git')

diff --git a/luasec-prosody-git/PKGBUILD b/luasec-prosody-git/PKGBUILD
index fd798ae..f488618 100644
--- a/luasec-prosody-git/PKGBUILD
+++ b/luasec-prosody-git/PKGBUILD
@@ -3,8 +3,8 @@
 pkgname=luasec-prosody-git
 _gitname=luasec
 _gitbranch=master
-pkgver=19.063e8a8
-pkgrel=2
+pkgver=42.903efaf
+pkgrel=1
 pkgdesc="A fork of LuaSec, an SSL and crypto library for Lua."
 arch=("i686" "x86_64")
 url="https://github.com/brunoos/luasec/wiki"
@@ -15,11 +15,9 @@ makedepends=("git")
 provides=("luasec")
 conflicts=("luasec-hg")
 #install=
-source=("${_gitname}::git+https://github.com/brunoos/${_gitname}#branch=${_gitbranch}"
-        "luasec-prosody.patch") # build for Lua 5.2
+source=("${_gitname}::git+https://github.com/brunoos/${_gitname}#branch=${_gitbranch}")
 noextract=()
-sha512sums=("SKIP"
-            "459969712d74fd2137f0cf7c7acc227bfe1e097e99937c2b897c625e96d9de3d20265634a6e49418f4ef5cf037435d2e07b0a1747a850d110aa207ef6735c7b7")
+sha512sums=("SKIP")
 
 pkgver() {
   cd "${_gitname}"
@@ -45,7 +43,8 @@ build() {
   cd "${srcdir}/${_gitname}-build"
 
   msg "Rewrite paths in Makefile to build for Lua 5.2"
-  git apply "${srcdir}/luasec-prosody.patch"
+  sed -i "/LUAPATH/ cLUAPATH  ?= ${pkgdir}/usr/share/lua/5.2" "Makefile"
+  sed -i "/LUACPATH/cLUACPATH ?= ${pkgdir}/usr/share/lua/5.2" "Makefile"
 
   ## build
   msg "Compile for target \"linux\""
diff --git a/luasec-prosody-git/luasec-prosody.patch b/luasec-prosody-git/luasec-prosody.patch
deleted file mode 100644
index 2d2672b..0000000
--- a/luasec-prosody-git/luasec-prosody.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/Makefile b/Makefile
-index c8aa90f..31e27c8 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,6 +1,6 @@
- # Inform the location to intall the modules
--LUAPATH		?= /usr/share/lua/5.1
--LUACPATH	?= /usr/lib/lua/5.1
-+LUAPATH		?= /usr/share/lua/5.2
-+LUACPATH	?= /usr/lib/lua/5.2
- 
- # Compile with build-in LuaSocket's help files.
- # Comment this lines if you will link with non-internal LuaSocket's help files
-diff --git a/src/ssl.lua b/src/ssl.lua
-index 1b062f6..1b63e70 100644
---- a/src/ssl.lua
-+++ b/src/ssl.lua
-@@ -4,6 +4,8 @@
- --
- ------------------------------------------------------------------------------
- 
-+local unpack  = unpack or table.unpack
-+
- local core    = require("ssl.core")
- local context = require("ssl.context")
- local x509    = require("ssl.x509")
-- 
cgit v1.2.3