diff --git a/lua-sec.spec b/lua-sec.spec index 4a86585..2a69cdc 100644 --- a/lua-sec.spec +++ b/lua-sec.spec @@ -10,19 +10,19 @@ Summary: Lua binding for OpenSSL library Name: lua-sec Version: 0.9 -Release: 4%{?dist} +Release: 5%{?dist} License: MIT URL: https://github.com/brunoos/luasec Source0: https://github.com/brunoos/luasec/archive/v%{version}/luasec-%{version}.tar.gz -%if 0%{?fedora} >= 16 || 0%{?rhel} >= 7 Requires: lua(abi) = %{lua_version} -%else -Requires: lua >= %{lua_version} -%endif Requires: lua-socket BuildRequires: gcc BuildRequires: lua-devel +%if 0%{?fedora} || 0%{?rhel} >= 8 BuildRequires: openssl-devel >= 1.0.2 +%else +BuildRequires: openssl11-devel +%endif %description Lua binding for OpenSSL library to provide TLS/SSL communication. @@ -53,9 +53,14 @@ cp -a . %{lua_compat_builddir} %endif %build +%if 0%{?rhel} == 7 +OPENSSL_CFLAGS="$(pkg-config --cflags-only-I openssl11)" +OPENSSL_LDFLAGS="$(pkg-config --libs-only-L openssl11)" +%endif + %make_build linux \ - CFLAGS="$RPM_OPT_FLAGS -fPIC -I. -I%{_includedir} -DWITH_LUASOCKET -DLUASOCKET_DEBUG -DLUA_COMPAT_APIINTCASTS" \ - LD="gcc -shared" LDFLAGS="-fPIC -shared -L./luasocket $RPM_LD_FLAGS" + CFLAGS="$RPM_OPT_FLAGS -fPIC -I. -I%{_includedir} -DWITH_LUASOCKET -DLUASOCKET_DEBUG -DLUA_COMPAT_APIINTCASTS $OPENSSL_CFLAGS" \ + LD="gcc -shared" LDFLAGS="-fPIC -shared -L./luasocket $RPM_LD_FLAGS $OPENSSL_LDFLAGS" %if 0%{?fedora} >= 20 pushd %{lua_compat_builddir} @@ -67,8 +72,8 @@ popd %install %make_install \ - CFLAGS="$RPM_OPT_FLAGS -fPIC -I. -I%{_includedir} -DWITH_LUASOCKET -DLUASOCKET_DEBUG -DLUA_COMPAT_APIINTCASTS" \ - LD="gcc -shared" LDFLAGS="-fPIC -shared -L./luasocket $RPM_LD_FLAGS" \ + CFLAGS="$RPM_OPT_FLAGS -fPIC -I. -I%{_includedir} -DWITH_LUASOCKET -DLUASOCKET_DEBUG -DLUA_COMPAT_APIINTCASTS $OPENSSL_CFLAGS" \ + LD="gcc -shared" LDFLAGS="-fPIC -shared -L./luasocket $RPM_LD_FLAGS $OPENSSL_LDFLAGS" \ LUAPATH=%{lua_pkgdir} LUACPATH=%{lua_libdir} %if 0%{?fedora} >= 20 @@ -99,6 +104,9 @@ popd %endif %changelog +* Sat Nov 14 2020 Robert Scheck 0.9-5 +- Build against OpenSSL 1.1 on RHEL 7 (for TLSv1.3 support) + * Tue Jul 28 2020 Fedora Release Engineering - 0.9-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild