Date: Monday, March 7, 2016 @ 14:49:31 Author: spupykin Revision: 165502
archrelease: copy trunk to community-i686, community-x86_64 Added: luasec/repos/community-i686/PKGBUILD (from rev 165501, luasec/trunk/PKGBUILD) luasec/repos/community-i686/nossl.patch (from rev 165501, luasec/trunk/nossl.patch) luasec/repos/community-x86_64/PKGBUILD (from rev 165501, luasec/trunk/PKGBUILD) luasec/repos/community-x86_64/nossl.patch (from rev 165501, luasec/trunk/nossl.patch) Deleted: luasec/repos/community-i686/PKGBUILD luasec/repos/community-x86_64/PKGBUILD ------------------------------+ /PKGBUILD | 172 +++++++++++++++++++++++++++++++++++++++++ community-i686/PKGBUILD | 84 -------------------- community-i686/nossl.patch | 16 +++ community-x86_64/PKGBUILD | 84 -------------------- community-x86_64/nossl.patch | 16 +++ 5 files changed, 204 insertions(+), 168 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2016-03-07 13:49:13 UTC (rev 165501) +++ community-i686/PKGBUILD 2016-03-07 13:49:31 UTC (rev 165502) @@ -1,84 +0,0 @@ -# $Id$ -# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> -# Contributor: Dwayne Bent <db...@liqd.org> -# Contributor: Paul-Sebastian Manole <brokenth...@gmail.com> - -pkgbase=luasec -pkgname=(lua-sec lua51-sec lua52-sec) -pkgver=0.6 -pkgrel=1 -epoch=1 -pkgdesc='Lua bindings for OpenSSL library to provide TLS/SSL communication.' -arch=('i686' 'x86_64') -url='https://github.com/brunoos/luasec/wiki' -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") -md5sums=('14e1aef6d2aae96bbf98afc6b6634af2') - -prepare() { -# cd luasec-luasec-$pkgver -# patch -p1 < ../lua53_compat.patch -# cd .. - - cp -a luasec-luasec-$pkgver luasec-luasec-$pkgver-51 - cp -a luasec-luasec-$pkgver luasec-luasec-$pkgver-52 -} - -build() { - msg2 'Building with lua 5.3' - cd "$srcdir"/luasec-luasec-$pkgver - make linux - - msg2 'Building with lua 5.1' - cd "$srcdir"/luasec-luasec-$pkgver-51 - find . -type f -name \*.[ch] -exec sed -i \ - -e 's|include .lua.h.|include "lua5.1/lua.h"|g' \ - -e 's|include .lualib.h.|include "lua5.1/lualib.h"|g' \ - -e 's|include .luaconf.h.|include "lua5.1/luaconf.h"|g' \ - -e 's|include .lauxlib.h.|include "lua5.1/lauxlib.h"|g' \ - {} \; - make linux - - msg2 'Building with lua 5.2' - cd "$srcdir"/luasec-luasec-$pkgver-52 - find . -type f -name \*.[ch] -exec sed -i \ - -e 's|include .lua.h.|include "lua5.2/lua.h"|g' \ - -e 's|include .lualib.h.|include "lua5.2/lualib.h"|g' \ - -e 's|include .luaconf.h.|include "lua5.2/luaconf.h"|g' \ - -e 's|include .lauxlib.h.|include "lua5.2/lauxlib.h"|g' \ - {} \; - make linux -} - -package_lua-sec() { - depends=('openssl' 'lua' 'lua-socket') - - install -dm755 "$pkgdir/usr/lib/lua/5.3" - cd luasec-luasec-$pkgver - make LUACPATH="$pkgdir/usr/lib/lua/5.3" LUAPATH="$pkgdir/usr/share/lua/5.3" install - install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - -package_lua51-sec() { - depends=('openssl' 'lua51' 'lua51-socket') - conflicts=('luasec') - replaces=('luasec') - - install -dm755 "$pkgdir/usr/lib/lua/5.1" - cd luasec-luasec-$pkgver-51 - make LUACPATH="$pkgdir/usr/lib/lua/5.1" LUAPATH="$pkgdir/usr/share/lua/5.1" install - install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - -package_lua52-sec() { - depends=('openssl' 'lua52' 'lua52-socket') - - install -dm755 "$pkgdir/usr/lib/lua/5.2" - cd luasec-luasec-$pkgver-52 - make LUACPATH="$pkgdir/usr/lib/lua/5.2" LUAPATH="$pkgdir/usr/share/lua/5.2" install - install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - -# vim:set ts=2 sw=2 et: Copied: luasec/repos/community-i686/PKGBUILD (from rev 165501, luasec/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2016-03-07 13:49:31 UTC (rev 165502) @@ -0,0 +1,86 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Contributor: Dwayne Bent <db...@liqd.org> +# Contributor: Paul-Sebastian Manole <brokenth...@gmail.com> + +pkgbase=luasec +pkgname=(lua-sec lua51-sec lua52-sec) +pkgver=0.6 +pkgrel=1 +epoch=1 +pkgdesc='Lua bindings for OpenSSL library to provide TLS/SSL communication.' +arch=('i686' 'x86_64') +url='https://github.com/brunoos/luasec/wiki' +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=('14e1aef6d2aae96bbf98afc6b6634af2' + '4dd73139419f32898d06ade68a1053ab') + +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 +} + +build() { + msg2 'Building with lua 5.3' + cd "$srcdir"/luasec-luasec-$pkgver + make linux + + msg2 'Building with lua 5.1' + cd "$srcdir"/luasec-luasec-$pkgver-51 + find . -type f -name \*.[ch] -exec sed -i \ + -e 's|include .lua.h.|include "lua5.1/lua.h"|g' \ + -e 's|include .lualib.h.|include "lua5.1/lualib.h"|g' \ + -e 's|include .luaconf.h.|include "lua5.1/luaconf.h"|g' \ + -e 's|include .lauxlib.h.|include "lua5.1/lauxlib.h"|g' \ + {} \; + make linux + + msg2 'Building with lua 5.2' + cd "$srcdir"/luasec-luasec-$pkgver-52 + find . -type f -name \*.[ch] -exec sed -i \ + -e 's|include .lua.h.|include "lua5.2/lua.h"|g' \ + -e 's|include .lualib.h.|include "lua5.2/lualib.h"|g' \ + -e 's|include .luaconf.h.|include "lua5.2/luaconf.h"|g' \ + -e 's|include .lauxlib.h.|include "lua5.2/lauxlib.h"|g' \ + {} \; + make linux +} + +package_lua-sec() { + depends=('openssl' 'lua' 'lua-socket') + + install -dm755 "$pkgdir/usr/lib/lua/5.3" + cd luasec-luasec-$pkgver + make LUACPATH="$pkgdir/usr/lib/lua/5.3" LUAPATH="$pkgdir/usr/share/lua/5.3" install + install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +package_lua51-sec() { + depends=('openssl' 'lua51' 'lua51-socket') + conflicts=('luasec') + replaces=('luasec') + + install -dm755 "$pkgdir/usr/lib/lua/5.1" + cd luasec-luasec-$pkgver-51 + make LUACPATH="$pkgdir/usr/lib/lua/5.1" LUAPATH="$pkgdir/usr/share/lua/5.1" install + install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +package_lua52-sec() { + depends=('openssl' 'lua52' 'lua52-socket') + + install -dm755 "$pkgdir/usr/lib/lua/5.2" + cd luasec-luasec-$pkgver-52 + make LUACPATH="$pkgdir/usr/lib/lua/5.2" LUAPATH="$pkgdir/usr/share/lua/5.2" install + install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +# vim:set ts=2 sw=2 et: Copied: luasec/repos/community-i686/nossl.patch (from rev 165501, luasec/trunk/nossl.patch) =================================================================== --- community-i686/nossl.patch (rev 0) +++ community-i686/nossl.patch 2016-03-07 13:49:31 UTC (rev 165502) @@ -0,0 +1,16 @@ +diff -wbBur luasec-luasec-0.6-51/src/context.c luasec-luasec-0.6/src/context.c +--- luasec-luasec-0.6-51/src/context.c 2016-03-03 22:11:46.000000000 +0300 ++++ luasec-luasec-0.6/src/context.c 2016-03-07 16:47:50.328080321 +0300 +@@ -96,11 +96,7 @@ + */ + static LSEC_SSL_METHOD* str2method(const char *method) + { +- if (!strcmp(method, "any")) return SSLv23_method(); +- if (!strcmp(method, "sslv23")) return SSLv23_method(); // deprecated +-#ifndef OPENSSL_NO_SSL3 +- if (!strcmp(method, "sslv3")) return SSLv3_method(); +-#endif ++ if (!strcmp(method, "any")) return TLSv1_method(); + if (!strcmp(method, "tlsv1")) return TLSv1_method(); + #if (OPENSSL_VERSION_NUMBER >= 0x1000100fL) + if (!strcmp(method, "tlsv1_1")) return TLSv1_1_method(); Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2016-03-07 13:49:13 UTC (rev 165501) +++ community-x86_64/PKGBUILD 2016-03-07 13:49:31 UTC (rev 165502) @@ -1,84 +0,0 @@ -# $Id$ -# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> -# Contributor: Dwayne Bent <db...@liqd.org> -# Contributor: Paul-Sebastian Manole <brokenth...@gmail.com> - -pkgbase=luasec -pkgname=(lua-sec lua51-sec lua52-sec) -pkgver=0.6 -pkgrel=1 -epoch=1 -pkgdesc='Lua bindings for OpenSSL library to provide TLS/SSL communication.' -arch=('i686' 'x86_64') -url='https://github.com/brunoos/luasec/wiki' -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") -md5sums=('14e1aef6d2aae96bbf98afc6b6634af2') - -prepare() { -# cd luasec-luasec-$pkgver -# patch -p1 < ../lua53_compat.patch -# cd .. - - cp -a luasec-luasec-$pkgver luasec-luasec-$pkgver-51 - cp -a luasec-luasec-$pkgver luasec-luasec-$pkgver-52 -} - -build() { - msg2 'Building with lua 5.3' - cd "$srcdir"/luasec-luasec-$pkgver - make linux - - msg2 'Building with lua 5.1' - cd "$srcdir"/luasec-luasec-$pkgver-51 - find . -type f -name \*.[ch] -exec sed -i \ - -e 's|include .lua.h.|include "lua5.1/lua.h"|g' \ - -e 's|include .lualib.h.|include "lua5.1/lualib.h"|g' \ - -e 's|include .luaconf.h.|include "lua5.1/luaconf.h"|g' \ - -e 's|include .lauxlib.h.|include "lua5.1/lauxlib.h"|g' \ - {} \; - make linux - - msg2 'Building with lua 5.2' - cd "$srcdir"/luasec-luasec-$pkgver-52 - find . -type f -name \*.[ch] -exec sed -i \ - -e 's|include .lua.h.|include "lua5.2/lua.h"|g' \ - -e 's|include .lualib.h.|include "lua5.2/lualib.h"|g' \ - -e 's|include .luaconf.h.|include "lua5.2/luaconf.h"|g' \ - -e 's|include .lauxlib.h.|include "lua5.2/lauxlib.h"|g' \ - {} \; - make linux -} - -package_lua-sec() { - depends=('openssl' 'lua' 'lua-socket') - - install -dm755 "$pkgdir/usr/lib/lua/5.3" - cd luasec-luasec-$pkgver - make LUACPATH="$pkgdir/usr/lib/lua/5.3" LUAPATH="$pkgdir/usr/share/lua/5.3" install - install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - -package_lua51-sec() { - depends=('openssl' 'lua51' 'lua51-socket') - conflicts=('luasec') - replaces=('luasec') - - install -dm755 "$pkgdir/usr/lib/lua/5.1" - cd luasec-luasec-$pkgver-51 - make LUACPATH="$pkgdir/usr/lib/lua/5.1" LUAPATH="$pkgdir/usr/share/lua/5.1" install - install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - -package_lua52-sec() { - depends=('openssl' 'lua52' 'lua52-socket') - - install -dm755 "$pkgdir/usr/lib/lua/5.2" - cd luasec-luasec-$pkgver-52 - make LUACPATH="$pkgdir/usr/lib/lua/5.2" LUAPATH="$pkgdir/usr/share/lua/5.2" install - install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - -# vim:set ts=2 sw=2 et: Copied: luasec/repos/community-x86_64/PKGBUILD (from rev 165501, luasec/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2016-03-07 13:49:31 UTC (rev 165502) @@ -0,0 +1,86 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Contributor: Dwayne Bent <db...@liqd.org> +# Contributor: Paul-Sebastian Manole <brokenth...@gmail.com> + +pkgbase=luasec +pkgname=(lua-sec lua51-sec lua52-sec) +pkgver=0.6 +pkgrel=1 +epoch=1 +pkgdesc='Lua bindings for OpenSSL library to provide TLS/SSL communication.' +arch=('i686' 'x86_64') +url='https://github.com/brunoos/luasec/wiki' +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=('14e1aef6d2aae96bbf98afc6b6634af2' + '4dd73139419f32898d06ade68a1053ab') + +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 +} + +build() { + msg2 'Building with lua 5.3' + cd "$srcdir"/luasec-luasec-$pkgver + make linux + + msg2 'Building with lua 5.1' + cd "$srcdir"/luasec-luasec-$pkgver-51 + find . -type f -name \*.[ch] -exec sed -i \ + -e 's|include .lua.h.|include "lua5.1/lua.h"|g' \ + -e 's|include .lualib.h.|include "lua5.1/lualib.h"|g' \ + -e 's|include .luaconf.h.|include "lua5.1/luaconf.h"|g' \ + -e 's|include .lauxlib.h.|include "lua5.1/lauxlib.h"|g' \ + {} \; + make linux + + msg2 'Building with lua 5.2' + cd "$srcdir"/luasec-luasec-$pkgver-52 + find . -type f -name \*.[ch] -exec sed -i \ + -e 's|include .lua.h.|include "lua5.2/lua.h"|g' \ + -e 's|include .lualib.h.|include "lua5.2/lualib.h"|g' \ + -e 's|include .luaconf.h.|include "lua5.2/luaconf.h"|g' \ + -e 's|include .lauxlib.h.|include "lua5.2/lauxlib.h"|g' \ + {} \; + make linux +} + +package_lua-sec() { + depends=('openssl' 'lua' 'lua-socket') + + install -dm755 "$pkgdir/usr/lib/lua/5.3" + cd luasec-luasec-$pkgver + make LUACPATH="$pkgdir/usr/lib/lua/5.3" LUAPATH="$pkgdir/usr/share/lua/5.3" install + install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +package_lua51-sec() { + depends=('openssl' 'lua51' 'lua51-socket') + conflicts=('luasec') + replaces=('luasec') + + install -dm755 "$pkgdir/usr/lib/lua/5.1" + cd luasec-luasec-$pkgver-51 + make LUACPATH="$pkgdir/usr/lib/lua/5.1" LUAPATH="$pkgdir/usr/share/lua/5.1" install + install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +package_lua52-sec() { + depends=('openssl' 'lua52' 'lua52-socket') + + install -dm755 "$pkgdir/usr/lib/lua/5.2" + cd luasec-luasec-$pkgver-52 + make LUACPATH="$pkgdir/usr/lib/lua/5.2" LUAPATH="$pkgdir/usr/share/lua/5.2" install + install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +# vim:set ts=2 sw=2 et: Copied: luasec/repos/community-x86_64/nossl.patch (from rev 165501, luasec/trunk/nossl.patch) =================================================================== --- community-x86_64/nossl.patch (rev 0) +++ community-x86_64/nossl.patch 2016-03-07 13:49:31 UTC (rev 165502) @@ -0,0 +1,16 @@ +diff -wbBur luasec-luasec-0.6-51/src/context.c luasec-luasec-0.6/src/context.c +--- luasec-luasec-0.6-51/src/context.c 2016-03-03 22:11:46.000000000 +0300 ++++ luasec-luasec-0.6/src/context.c 2016-03-07 16:47:50.328080321 +0300 +@@ -96,11 +96,7 @@ + */ + static LSEC_SSL_METHOD* str2method(const char *method) + { +- if (!strcmp(method, "any")) return SSLv23_method(); +- if (!strcmp(method, "sslv23")) return SSLv23_method(); // deprecated +-#ifndef OPENSSL_NO_SSL3 +- if (!strcmp(method, "sslv3")) return SSLv3_method(); +-#endif ++ if (!strcmp(method, "any")) return TLSv1_method(); + if (!strcmp(method, "tlsv1")) return TLSv1_method(); + #if (OPENSSL_VERSION_NUMBER >= 0x1000100fL) + if (!strcmp(method, "tlsv1_1")) return TLSv1_1_method();