diff --git a/.gitignore b/.gitignore index 3132bea..c102096 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /luasec-0.4.1.tar.gz /063e8a8.tar.gz +/luasec-0.5.tar.gz diff --git a/lua-sec-0.4.1-no_ecdh.patch b/lua-sec-0.4.1-no_ecdh.patch deleted file mode 100644 index b8d7b7f..0000000 --- a/lua-sec-0.4.1-no_ecdh.patch +++ /dev/null @@ -1,23 +0,0 @@ -Patch suggestion by Robert Scheck for lua-sec < 0.4.2 to avoid build failures like -"context.c:255:1: error: unknown type name 'EC_KEY'" on Fedora and Red Hat Linux Enterprise based distributions -which do not just disable EC support in OpenSSL but completely rip it out on the source code level already. The -patch re-uses the previously (by upstream) introduced OPENSSL_NO_ECDH definement. - ---- luasec-063e8a8a5c57858cdc845f8d51b994426edd37ab/src/context.c 2013-06-20 18:03:58.000000000 +0200 -+++ luasec-063e8a8a5c57858cdc845f8d51b994426edd37ab/src/context.c.no_ecdh 2013-09-08 14:12:52.000000000 +0200 -@@ -252,6 +252,7 @@ - return (verify & LSEC_VERIFY_CONTINUE ? 1 : preverify_ok); - } - -+#ifndef OPENSSL_NO_ECDH - static EC_KEY *find_ec_key(const char *str) - { - p_ec ptr; -@@ -261,6 +262,7 @@ - } - return NULL; - } -+#endif - - /*------------------------------ Lua Functions -------------------------------*/ - diff --git a/lua-sec.spec b/lua-sec.spec index 322e987..854d993 100644 --- a/lua-sec.spec +++ b/lua-sec.spec @@ -4,28 +4,28 @@ %define luaver 5.1 %endif +%define luacompatver 5.1 +%define luacompatlibdir %{_libdir}/lua/%{luacompatver} +%define luacompatpkgdir %{_datadir}/lua/%{luacompatver} +%define lua51dir %{_builddir}/lua51-%{name}-%{version}-%{release} + %global lualibdir %{_libdir}/lua/%{luaver} %global luapkgdir %{_datadir}/lua/%{luaver} %global real_name luasec -%global github_commit 063e8a8a5c57858cdc845f8d51b994426edd37ab -%global shortcommit %(c=%{github_commit}; echo ${c:0:7}) Name: lua-sec -Version: 0.4.1 -Release: 6.0.3.20130824R%{shortcommit}%{?dist} +Version: 0.5 +Release: 1%{?dist} Summary: Lua binding for OpenSSL library Group: Development/Libraries License: MIT URL: https://github.com/brunoos/luasec -Source0: https://github.com/brunoos/luasec/archive/%{shortcommit}.tar.gz -Patch0: lua-sec-0.4.1-no_ecdh.patch -Patch1: lua-sec-0.4.1-fix-Makefile.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Source0: https://github.com/brunoos/luasec/archive/%{real_name}-%{version}.tar.gz +Patch0: lua-sec-0.4.1-fix-Makefile.patch BuildRequires: lua-devel -BuildRequires: lua-socket-devel BuildRequires: openssl-devel Requires: lua-socket %if 0%{?fedora} >= 16 || 0%{?rhel} >= 7 @@ -34,17 +34,29 @@ Requires: lua(abi) = %{luaver} Requires: lua >= %{luaver} %endif +%if 0%{?fedora} >= 20 +BuildRequires: compat-lua >= %{luacompatver}, compat-lua-devel >= %{luacompatver} +%endif %description Lua binding for OpenSSL library to provide TLS/SSL communication. It takes an already established TCP connection and creates a secure session between the peers. +%if 0%{?fedora} >= 20 +%package compat +Summary: Lua 5.1 binding for OpenSSL library +Group: Development/Libraries + +%description compat +Lua 5.1 binding for OpenSSL library to provide TLS/SSL communication. +It takes an already established TCP connection and creates a secure +session between the peers. +%endif %prep -%setup -q -n %{real_name}-%{github_commit} -%patch0 -p1 -b .ecdh -%patch1 -p1 -b .fixMakefile +%setup -q -n %{real_name}-%{real_name}-%{version} +%patch0 -p1 -b .fixMakefile for file in CHANGELOG LICENSE; do iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \ @@ -52,26 +64,42 @@ for file in CHANGELOG LICENSE; do mv $file.new $file done +%if 0%{?fedora} >= 20 +rm -rf %{lua51dir} +cp -a . %{lua51dir} +%endif %build -make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -fPIC -I%{_includedir}" \ - LDFLAGS="-L%{_libdir}" EXTRA="" DEFS="" \ +make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -fPIC -I. -I%{_includedir} -DWITH_LUASOCKET -DLUASOCKET_DEBUG" \ + LD="gcc -shared" LDFLAGS="-O -fPIC -shared -L./luasocket" \ linux +%if 0%{?fedora} >= 20 +pushd %{lua51dir} +make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -fPIC -I. -I%{_includedir}/lua-%{luacompatver} -DWITH_LUASOCKET -DLUASOCKET_DEBUG" \ + LD="gcc -shared" LDFLAGS="-O -fPIC -shared -L./luasocket" \ + linux +popd +%endif %install -rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{luapkgdir} mkdir -p $RPM_BUILD_ROOT%{lualibdir} make install DESTDIR=$RPM_BUILD_ROOT \ - CFLAGS="$RPM_OPT_FLAGS -fPIC -I%{_includedir}" \ - EXTRA="" DEFS="" LDFLAGS="-L%{_libdir}" \ - LUAPATH=$RPM_BUILD_ROOT%{luapkgdir} \ - LUACPATH=$RPM_BUILD_ROOT%{lualibdir} - - -%clean -rm -rf $RPM_BUILD_ROOT + CFLAGS="$RPM_OPT_FLAGS -fPIC -I. -I%{_includedir}/lua-%{luaver} -DWITH_LUASOCKET -DLUASOCKET_DEBUG" \ + LUAPATH=%{luapkgdir} \ + LUACPATH=%{lualibdir} + +%if 0%{?fedora} >= 20 +pushd %{lua51dir} +mkdir -p $RPM_BUILD_ROOT%{luacompatpkgdir} +mkdir -p $RPM_BUILD_ROOT%{luacompatlibdir} +make install DESTDIR=$RPM_BUILD_ROOT \ + CFLAGS="$RPM_OPT_FLAGS -fPIC -I. -I%{_includedir}/lua-%{luacompatver} -DWITH_LUASOCKET -DLUASOCKET_DEBUG" \ + LUAPATH=%{luacompatpkgdir} \ + LUACPATH=%{luacompatlibdir} +popd +%endif %files @@ -82,10 +110,20 @@ rm -rf $RPM_BUILD_ROOT %dir %{luapkgdir}/ssl %{luapkgdir}/ssl/* +%if 0%{?fedora} >= 20 +%files compat +%defattr(-,root,root,-) +%doc CHANGELOG LICENSE +%{luacompatlibdir}/ssl.so +%{luacompatpkgdir}/ssl.lua +%dir %{luacompatpkgdir}/ssl +%{luacompatpkgdir}/ssl/* +%endif %changelog -* Mon Sep 09 2013 Matěj Cepl - 0.4.1-6.0.3.20130824R063e8a8 -- Rebuilt for new lua-socket (#985573, #1000622) +* Wed May 14 2014 Jan Kaluza - 0.5-1 +- update to luasec-0.5 (#1000622) +- build -compat subpackage against compat-lua * Sat Aug 03 2013 Fedora Release Engineering - 0.4.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index d6be1da..a6bb2ca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b5da776d0f984c720766d40d93b5795d 063e8a8.tar.gz +0518f4524f399f33424c6f450e1d06db luasec-0.5.tar.gz