robert pushed to lua-sec (f20). "Rebuilt for new lua-socket (#985573, #1000622)"

Sat Apr 18 12:03:36 UTC 2015

>From 4bfa6640b1811aa4ff3371eb002e7bf447e30ce9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl at redhat.com>
Date: Mon, 9 Sep 2013 14:47:30 +0200
Subject: Rebuilt for new lua-socket (#985573, #1000622)

diff --git a/lua-sec-0.4.1-fix-Makefile.patch b/lua-sec-0.4.1-fix-Makefile.patch
new file mode 100644
index 0000000..4b864a5
--- /dev/null
+++ b/lua-sec-0.4.1-fix-Makefile.patch
@@ -0,0 +1,47 @@
+--- a/Makefile
++++ b/Makefile
+@@ -32,13 +32,13 @@ none:
+ 	@echo "  * macosx"
+ 
+ install:
+-	@cd src && $(MAKE) LUACPATH="$(LUACPATH)" LUAPATH="$(LUAPATH)" install
++	cd src && $(MAKE) LUACPATH="$(LUACPATH)" LUAPATH="$(LUAPATH)" install
+ 
+ linux:
+-	@echo "---------------------"
+-	@echo "** Build for Linux **"
+-	@echo "---------------------"
+-	@cd src && $(MAKE) INCDIR="$(INCDIR)" LIBDIR="$(LIBDIR)" DEFS="$(DEFS)" EXTRA="$(EXTRA)" $@
++	echo "---------------------"
++	echo "** Build for Linux **"
++	echo "---------------------"
++	cd src && $(MAKE) INCDIR="$(INCDIR)" LIBDIR="$(LIBDIR)" DEFS="$(DEFS)" EXTRA="$(EXTRA)" $@
+ 
+ bsd:
+ 	@echo "-------------------"
+@@ -53,4 +53,4 @@ macosx:
+ 	@cd src && $(MAKE) INCDIR="$(INCDIR)" LIBDIR="$(LIBDIR)" MACVER="$(MACOSX_VERSION)" DEFS="$(DEFS)" EXTRA="$(EXTRA)" $@
+ 
+ clean:
+-	@cd src && $(MAKE) clean
++	cd src && $(MAKE) clean
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -38,7 +38,7 @@ install: $(CMOD) $(LMOD)
+ 	$(INSTALL) -m644 -D https.lua $(DESTDIR)$(LUAPATH)/ssl
+ 
+ linux:
+-	@$(MAKE) $(CMOD) MYCFLAGS="$(LNX_CFLAGS)" MYLDFLAGS="$(LNX_LDFLAGS)" EXTRA="$(EXTRA)"
++	$(MAKE) $(CMOD) MYCFLAGS="$(LNX_CFLAGS)" MYLDFLAGS="$(LNX_LDFLAGS)" EXTRA="$(EXTRA)"
+ 
+ bsd:
+ 	@$(MAKE) $(CMOD) MYCFLAGS="$(BSD_CFLAGS)" MYLDFLAGS="$(BSD_LDFLAGS)" EXTRA="$(EXTRA)"
+@@ -47,7 +47,7 @@ macosx:
+ 	@$(MAKE) $(CMOD) MYCFLAGS="$(MAC_CFLAGS)" MYLDFLAGS="$(MAC_LDFLAGS)" MYENV="$(MAC_ENV)" EXTRA="$(EXTRA)"
+ 
+ luasocket:
+-	@cd luasocket && $(MAKE)
++	cd luasocket && $(MAKE)
+ 
+ $(CMOD): $(EXTRA) $(OBJS)
+ 	$(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
diff --git a/lua-sec-0.4.1-no_ecdh.patch b/lua-sec-0.4.1-no_ecdh.patch
new file mode 100644
index 0000000..b8d7b7f
--- /dev/null
+++ b/lua-sec-0.4.1-no_ecdh.patch
@@ -0,0 +1,23 @@
+Patch suggestion by Robert Scheck <robert at fedoraproject.org> 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 0b6b3e3..322e987 100644
--- a/lua-sec.spec
+++ b/lua-sec.spec
@@ -1,4 +1,9 @@
-%global luaver 5.2
+%if 0%{?fedora} >= 20 || 0%{?rhel} > 7
+%define luaver 5.2
+%else
+%define luaver 5.1
+%endif
+
 %global lualibdir %{_libdir}/lua/%{luaver}
 %global luapkgdir %{_datadir}/lua/%{luaver}
 
@@ -8,16 +13,19 @@
 
 Name:           lua-sec
 Version:        0.4.1
-Release:        6.0.1.20130824R%{shortcommit}%{?dist}
+Release:        6.0.3.20130824R%{shortcommit}%{?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)
 
 BuildRequires:  lua-devel
+BuildRequires:  lua-socket-devel
 BuildRequires:  openssl-devel
 Requires:       lua-socket
 %if 0%{?fedora} >= 16 || 0%{?rhel} >= 7
@@ -35,6 +43,9 @@ session between the peers.
 
 %prep
 %setup -q -n %{real_name}-%{github_commit}
+%patch0 -p1 -b .ecdh
+%patch1 -p1 -b .fixMakefile
+
 for file in CHANGELOG LICENSE; do
     iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \
     touch -r $file $file.new && \
@@ -43,14 +54,20 @@ done
 
 
 %build
-make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -fPIC" linux
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -fPIC -I%{_includedir}" \
+    LDFLAGS="-L%{_libdir}" EXTRA="" DEFS="" \
+    linux
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{luapkgdir}
 mkdir -p $RPM_BUILD_ROOT%{lualibdir}
-make install DESTDIR=$RPM_BUILD_ROOT LUAPATH=$RPM_BUILD_ROOT%{luapkgdir} LUACPATH=$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
@@ -67,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 09 2013 Matěj Cepl <mcepl at redhat.com> - 0.4.1-6.0.3.20130824R063e8a8
+- Rebuilt for new lua-socket (#985573, #1000622)
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/lua-sec.git/commit/?h=f20&id=4bfa6640b1811aa4ff3371eb002e7bf447e30ce9
