On Sat, Apr 12, 2014 at 01:14:16PM -0400, James Turner wrote:
> On Sat, Apr 12, 2014 at 06:22:31PM +0200, Henrik Friedrichsen wrote:
> > Hello,
> >
> > This patch fixes a bug in which the lua library ssl.so is linked with ld
> > instead of cc.
> >
> > This results in the stack-protector symbols being missing and therefore
> > generates a useless library which cannot be used in lua.
> >
> > The patch sets the LD="cc" to fix this.
> >
> > For some reason this problem did not occur in -CURRENT until recently.
> >
> > OK?
>
> I can confirm. Updated diff attached with REVISION and use of ${CC}.
>
> Can I get an ok? Tested on amd64.
OK juanfra@ with this additional change:
Index: Makefile
===================================================================
RCS file: /cvs/ports/security/luasec/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile 20 Mar 2014 19:21:00 -0000 1.13
+++ Makefile 14 Apr 2014 00:58:32 -0000
@@ -4,6 +4,7 @@ SHARED_ONLY= Yes
COMMENT= lua binding to OpenSSL to provide TLS/SSL communication
VERSION= 0.5
+REVISION= 0
DISTNAME= luasec-${VERSION}
CATEGORIES= security
MASTER_SITES= https://github.com/brunoos/luasec/archive/
@@ -20,7 +21,7 @@ NO_TEST= Yes
MODLUA_RUN_DEPENDS+= net/luasocket
WANTLIB+= crypto ssl
-MAKE_ENV+= INC_PATH="-I${MODLUA_INCL_DIR}" SAVECFLAGS="${CFLAGS}"
+MAKE_ENV+= INC_PATH="-I${MODLUA_INCL_DIR}" SAVECFLAGS="${CFLAGS}"
LD="${CC}"
ALL_TARGET= bsd
WRKDIST= ${WRKDIR}/luasec-luasec-${VERSION}
Index: patches/patch-src_Makefile
===================================================================
RCS file: /cvs/ports/security/luasec/patches/patch-src_Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 patch-src_Makefile
--- patches/patch-src_Makefile 20 Mar 2014 19:21:00 -0000 1.4
+++ patches/patch-src_Makefile 14 Apr 2014 00:58:32 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-src_Makefile,v 1.4 2014/03/20 19:21:00 gsoares Exp $
---- src/Makefile.orig Wed Jan 29 17:43:33 2014
-+++ src/Makefile Thu Mar 20 15:59:36 2014
+--- src/Makefile.orig Wed Jan 29 21:43:33 2014
++++ src/Makefile Mon Apr 14 02:57:11 2014
@@ -10,8 +10,8 @@ LIBS=-lssl -lcrypto -lluasocket
WARN=-Wall -pedantic
@@ -12,12 +12,3 @@ $OpenBSD: patch-src_Makefile,v 1.4 2014/
LNX_CFLAGS=-O2 -fPIC $(WARN) $(INCDIR) $(DEFS)
LNX_LDFLAGS=-O -fPIC -shared $(LIBDIR)
-@@ -22,7 +22,7 @@ MAC_LDFLAGS=-bundle -undefined dynamic_lookup $(LIBDIR
-
- INSTALL ?= install
- CC ?= cc
--LD ?= $(MYENV) cc
-+LD ?= $(MYENV) $(CC)
- CFLAGS += $(MYCFLAGS)
- LDFLAGS += $(MYLDFLAGS)
- DESTDIR ?= /
