[arch-commits] Commit in luasec/trunk (PKGBUILD nossl.patch)

[Sergej Pupykin]

    Date: Thursday, July 14, 2016 @ 17:02:44
  Author: spupykin
Revision: 182909

upgpkg: luasec 2:0.6-1

upd

Modified:
  luasec/trunk/PKGBUILD
Deleted:
  luasec/trunk/nossl.patch

-------------+
 PKGBUILD    |   20 +++++++-------------
 nossl.patch |   13 -------------
 2 files changed, 7 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-07-14 16:34:19 UTC (rev 182908)
+++ PKGBUILD	2016-07-14 17:02:44 UTC (rev 182909)
@@ -5,9 +5,9 @@
 
 pkgbase=luasec
 pkgname=(lua-sec lua51-sec lua52-sec)
-pkgver=0.5.1
-pkgrel=2
 epoch=2
+pkgver=0.6
+pkgrel=1
 pkgdesc='Lua bindings for OpenSSL library to provide TLS/SSL communication.'
 arch=('i686' 'x86_64')
 url='https://github.com/brunoos/luasec/wiki'
@@ -14,16 +14,10 @@
 license=('MIT')
 makedepends=('openssl' 'lua' 'lua-socket' 'lua51' 'lua51-socket' 'lua52' 'lua52-socket')
 options=('!buildflags')
-source=("https://github.com/brunoos/luasec/archive/luasec-$pkgver.tar.gz"
-	'nossl.patch')
-md5sums=('e34e274a57e9045641191eb7398cce2a'
-         '7ce9d659e65fe9207e4808ad38f64d24')
+source=("https://github.com/brunoos/luasec/archive/luasec-$pkgver.tar.gz")
+md5sums=('14e1aef6d2aae96bbf98afc6b6634af2')
 
 prepare() {
-  cd luasec-luasec-$pkgver
-  patch -p1 < ../nossl.patch
-  cd ..
-
   cp -a luasec-luasec-$pkgver luasec-luasec-$pkgver-51
   cp -a luasec-luasec-$pkgver luasec-luasec-$pkgver-52
 }
@@ -31,7 +25,7 @@
 build() {
   msg2 'Building with lua 5.3'
   cd "$srcdir"/luasec-luasec-$pkgver
-  make linux
+  make linux DEFS="-DWITH_LUASOCKET -DOPENSSL_NO_SSL3"
 
   msg2 'Building with lua 5.1'
   cd "$srcdir"/luasec-luasec-$pkgver-51
@@ -41,7 +35,7 @@
     -e 's|include .luaconf.h.|include "lua5.1/luaconf.h"|g' \
     -e 's|include .lauxlib.h.|include "lua5.1/lauxlib.h"|g' \
     {} \;
-  make linux
+  make linux DEFS="-DWITH_LUASOCKET -DOPENSSL_NO_SSL3"
 
   msg2 'Building with lua 5.2'
   cd "$srcdir"/luasec-luasec-$pkgver-52
@@ -51,7 +45,7 @@
     -e 's|include .luaconf.h.|include "lua5.2/luaconf.h"|g' \
     -e 's|include .lauxlib.h.|include "lua5.2/lauxlib.h"|g' \
     {} \;
-  make linux
+  make linux DEFS="-DWITH_LUASOCKET -DOPENSSL_NO_SSL3"
 }
 
 package_lua-sec() {

Deleted: nossl.patch
===================================================================
--- nossl.patch	2016-07-14 16:34:19 UTC (rev 182908)
+++ nossl.patch	2016-07-14 17:02:44 UTC (rev 182909)
@@ -1,13 +0,0 @@
---- a/src/context.c	2016-03-03 05:35:25.593333327 +0100
-+++ b/src/context.c	2016-03-03 05:35:47.793333333 +0100
-@@ -65,10 +65,7 @@ static int set_option_flag(const char *o
-  */
- static LSEC_SSL_METHOD* str2method(const char *method)
- {
-   if (!strcmp(method, "sslv23"))  return SSLv23_method();
--#ifndef OPENSSL_NO_SSL3
--  if (!strcmp(method, "sslv3"))   return SSLv3_method();
--#endif
-   if (!strcmp(method, "tlsv1"))   return TLSv1_method();
- #if (OPENSSL_VERSION_NUMBER >= 0x1000100fL)
-   if (!strcmp(method, "tlsv1_1")) return TLSv1_1_method();