Mon Apr 7 20:14:48 2014 UTC ()
Update lua-sec to 0.5.

 * A new certificate (X509) API, which supports:
   - Reading  the subject  (identity) and  issuer of the certificate.
   - Reading  various X509  extensions, including email  and dnsName.
   - Converting  certificates  to and  from  the  standard ASCII  PEM
     format.
   - Generating the fingerprint/digest of a certificate  (using SHA1,
     SHA256 or SHA512).
   - Reading the  certificate's expiration, serial number,  and other
     info.
 * The ability  to get more  detailed information from  OpenSSL about
   why a certificate failed verification, for each certificate in the
   chain.
 * Flags to  force acceptance of invalid certificates,  e.g. to allow
   the use of self-signed certificates in a Trust On First Use model.
 * Flags to control checking CRLs for certificate revocation status.
 * Support for ECDH cipher suites.
 * An API  to get the TLS  'finished' messages used  for SASL channel
   binding (e.g. the SCRAM PLUS mechanisms).


(fhajny)
diff -r1.8 -r1.9 pkgsrc/security/lua-sec/Makefile
diff -r1.4 -r1.5 pkgsrc/security/lua-sec/distinfo
diff -r1.3 -r1.4 pkgsrc/security/lua-sec/patches/patch-aa
diff -r1.2 -r1.3 pkgsrc/security/lua-sec/patches/patch-ab
cvs diff -r1.8 -r1.9 pkgsrc/security/lua-sec/Makefile (expand / switch to unified diff)

--- pkgsrc/security/lua-sec/Makefile 2014/02/12 23:18:33 1.8
+++ pkgsrc/security/lua-sec/Makefile 2014/04/07 20:14:48 1.9
@@ -1,34 +1,36 @@ @@ -1,34 +1,36 @@
1# $NetBSD: Makefile,v 1.8 2014/02/12 23:18:33 tron Exp $ 1# $NetBSD: Makefile,v 1.9 2014/04/07 20:14:48 fhajny Exp $
2 2
3DISTNAME= luasec-0.4.1 3DISTNAME= luasec-0.5
4PKGNAME= ${LUA_PKGPREFIX}-${DISTNAME:S/lua//} 4PKGNAME= ${LUA_PKGPREFIX}-${DISTNAME:S/lua//}
5PKGREVISION= 1 
6CATEGORIES= security 5CATEGORIES= security
7MASTER_SITES= https://github.com/brunoos/luasec/archive/ 6MASTER_SITES= https://github.com/brunoos/luasec/archive/
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://github.com/brunoos/luasec/ 9HOMEPAGE= https://github.com/brunoos/luasec/
11COMMENT= Lua binding for OpenSSL library 10COMMENT= Lua binding for OpenSSL library
12LICENSE= mit 11LICENSE= mit
13 12
14.include "../../mk/bsd.prefs.mk" 13.include "../../mk/bsd.prefs.mk"
15 14
16DEPENDS+= ${LUA_PKGPREFIX}-socket>=2.0:../../net/lua-socket 15DEPENDS+= ${LUA_PKGPREFIX}-socket>=2.0:../../net/lua-socket
17 16
18USE_TOOLS+= gmake 17USE_TOOLS+= gmake
19 18
20WRKSRC= ${WRKDIR}/luasec-${DISTNAME} 19WRKSRC= ${WRKDIR}/luasec-${DISTNAME}
21INSTALLATION_DIRS+= ${LUA_CDIR} ${LUA_LDIR} 20INSTALLATION_DIRS+= ${LUA_CDIR} ${LUA_LDIR}
22 21
23.if ${OPSYS} == "SunOS" 22.if ${OPSYS} == "SunOS"
24BUILD_TARGET= solaris 23BUILD_TARGET= solaris
25.else 24.else
26BUILD_TARGET= bsd 25BUILD_TARGET= bsd
27.endif 26.endif
28 27
29INSTALL_ENV+= LUA_CDIR=${LUA_CDIR} 28MAKE_ENV+= LUAPATH=${PREFIX}/${LUA_LDIR}
30INSTALL_ENV+= LUA_LDIR=${LUA_LDIR} 29MAKE_ENV+= LUACPATH=${PREFIX}/${LUA_CDIR}
 30MAKE_ENV+= INC_PATH=-I${PREFIX}/include
 31MAKE_ENV+= LIB_PATH="-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib"
 32MAKE_ENV+= LD=${CC:Q}
31 33
32.include "../../lang/lua/module.mk" 34.include "../../lang/lua/module.mk"
33.include "../../security/openssl/buildlink3.mk" 35.include "../../security/openssl/buildlink3.mk"
34.include "../../mk/bsd.pkg.mk" 36.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/security/lua-sec/distinfo (expand / switch to unified diff)

--- pkgsrc/security/lua-sec/distinfo 2013/10/20 17:56:02 1.4
+++ pkgsrc/security/lua-sec/distinfo 2014/04/07 20:14:48 1.5
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.4 2013/10/20 17:56:02 joerg Exp $ 1$NetBSD: distinfo,v 1.5 2014/04/07 20:14:48 fhajny Exp $
2 2
3SHA1 (luasec-0.4.1.tar.gz) = fe4588676e15eab7b34b84dbbfda6e68f6692f9a 3SHA1 (luasec-0.5.tar.gz) = bcfe8fda66b6058d07031df3c4a20f6192cf3e73
4RMD160 (luasec-0.4.1.tar.gz) = 6a7084441352240acb2f0b8b599a6dc59e7e2e81 4RMD160 (luasec-0.5.tar.gz) = a9ef4591a770e178718e24778386136cdc87cadf
5Size (luasec-0.4.1.tar.gz) = 28695 bytes 5Size (luasec-0.5.tar.gz) = 46738 bytes
6SHA1 (patch-aa) = f0c8575451e83998dea95cd88aa251d4be0ede44 6SHA1 (patch-aa) = 364c0e6ee5c4c04ca7c9cb8a70129013289e9df9
7SHA1 (patch-ab) = 1944a859495b2494d37cfd524895c9a2bd8001ac 7SHA1 (patch-ab) = 6f9dd58bef69d260bc28812e76d853f3510f6858
cvs diff -r1.3 -r1.4 pkgsrc/security/lua-sec/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/security/lua-sec/patches/Attic/patch-aa 2013/10/20 17:56:02 1.3
+++ pkgsrc/security/lua-sec/patches/Attic/patch-aa 2014/04/07 20:14:48 1.4
@@ -1,48 +1,35 @@ @@ -1,48 +1,35 @@
1$NetBSD: patch-aa,v 1.3 2013/10/20 17:56:02 joerg Exp $ 1$NetBSD: patch-aa,v 1.4 2014/04/07 20:14:48 fhajny Exp $
2 2
3Pass installation dirs properly, fix search paths, add Solaris support 3Pass installation dirs properly, fix search paths, add Solaris support
4 4
5--- Makefile.orig 2012-09-02 14:40:59.000000000 +0000 5--- Makefile.orig 2014-01-29 20:43:33.000000000 +0000
6+++ Makefile 6+++ Makefile
7@@ -1,16 +1,16 @@ 7@@ -6,7 +6,7 @@ LUACPATH ?= /usr/lib/lua/5.1
8 # Inform the location to intall the modules 8 # Comment this lines if you will link with non-internal LuaSocket's help files
9-LUAPATH=/usr/local/share/lua/5.1 9 # and edit INCDIR and LIBDIR properly.
10-LUACPATH=/usr/local/lib/lua/5.1 10 EXTRA = luasocket
11+LUAPATH=$(DESTDIR)$(PREFIX)/$(LUA_LDIR) 11-DEFS = -DWITH_LUASOCKET
12+LUACPATH=$(DESTDIR)$(PREFIX)/$(LUA_CDIR) 12+DEFS = -DWITH_LUASOCKET -DLUA_COMPAT_MODULE
13  13
14 # Edit the lines below to inform new path, if necessary 14 # Edit the lines below to inform new path, if necessary.
15 # 15 # Path below points to internal LuaSocket's help files.
16-#INCDIR=-I/usr/local/lua-5.1/include -I/usr/local/openssl-0.9.8/include 16@@ -30,6 +30,7 @@ none:
17-#LIBDIR=-L/usr/local/openssl-0.9.8/lib -R/usr/local/openssl-0.9.8/lib 
18+INCDIR=-I${PREFIX}/include 
19+LIBDIR=-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib 
20  
21 # For Mac OS X: set the system version 
22 MACOSX_VERSION=10.4 
23  
24-DEFS=-DBUFFER_DEBUG 
25+DEFS=-DBUFFER_DEBUG -DLUA_COMPAT_MODULE 
26  
27 #---------------------- 
28 # Do not edit this part 
29@@ -24,6 +24,7 @@ none: 
30 @echo " * linux" 17 @echo " * linux"
31 @echo " * bsd" 18 @echo " * bsd"
32 @echo " * macosx" 19 @echo " * macosx"
33+ @echo " * solaris" 20+ @echo " * solaris"
34  21
35 install: 22 install:
36 @cd src ; $(MAKE) LUACPATH="$(LUACPATH)" LUAPATH="$(LUAPATH)" install 23 @cd src && $(MAKE) LUACPATH="$(LUACPATH)" LUAPATH="$(LUAPATH)" install
37@@ -46,5 +47,11 @@ macosx: 24@@ -52,5 +53,11 @@ macosx:
38 @echo "------------------------------" 25 @echo "------------------------------"
39 @cd src ; $(MAKE) INCDIR="$(INCDIR)" LIBDIR="$(LIBDIR)" DEFS="$(DEFS)" MACVER="$(MACOSX_VERSION)" $@ 26 @cd src && $(MAKE) INCDIR="$(INCDIR)" LIBDIR="$(LIBDIR)" MACVER="$(MACOSX_VERSION)" DEFS="$(DEFS)" EXTRA="$(EXTRA)" $@
40  27
41+solaris: 28+solaris:
42+ @echo "---------------------" 29+ @echo "---------------------"
43+ @echo "** Build for Solaris **" 30+ @echo "** Build for Solaris **"
44+ @echo "---------------------"  31+ @echo "---------------------"
45+ @cd src ; $(MAKE) INCDIR="$(INCDIR)" LIBDIR="$(LIBDIR)" DEFS="$(DEFS)" $@ 32+ @cd src ; $(MAKE) INCDIR="$(INCDIR)" LIBDIR="$(LIBDIR)" DEFS="$(DEFS)" EXTRA="$(EXTRA)" $@
46+ 33+
47 clean: 34 clean:
48 @cd src ; $(MAKE) clean 35 @cd src && $(MAKE) clean
cvs diff -r1.2 -r1.3 pkgsrc/security/lua-sec/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/security/lua-sec/patches/Attic/patch-ab 2013/09/13 14:32:19 1.2
+++ pkgsrc/security/lua-sec/patches/Attic/patch-ab 2014/04/07 20:14:48 1.3
@@ -1,48 +1,50 @@ @@ -1,48 +1,50 @@
1$NetBSD: patch-ab,v 1.2 2013/09/13 14:32:19 fhajny Exp $ 1$NetBSD: patch-ab,v 1.3 2014/04/07 20:14:48 fhajny Exp $
2 2
3Pass proper libs for SunOS. 3Pass proper libs for SunOS.
4--- src/Makefile.orig 2012-09-02 14:40:59.000000000 +0000 4--- src/Makefile.orig 2014-01-29 20:43:33.000000000 +0000
5+++ src/Makefile 5+++ src/Makefile
6@@ -9,7 +9,7 @@ OBJS= \ 6@@ -6,7 +6,7 @@ OBJS= \
7 context.o \ 7 context.o \
8 ssl.o 8 ssl.o
9  9
10-LIBS=-lssl -lcrypto 10-LIBS=-lssl -lcrypto -lluasocket
11+LIBS=-lssl -lcrypto $(MYLIBS) 11+LIBS=-lssl -lcrypto -lluasocket $(MYLIBS)
12  12
13 WARN=-Wall -pedantic 13 WARN=-Wall -pedantic
14  14
15@@ -23,8 +23,11 @@ MAC_ENV=env MACOSX_DEPLOYMENT_TARGET='$( 15@@ -20,6 +20,9 @@ MAC_ENV=env MACOSX_DEPLOYMENT_TARGET='$(
16 MAC_CFLAGS=-O2 -fno-common $(WARN) $(INCDIR) $(DEFS) 16 MAC_CFLAGS=-O2 -fno-common $(WARN) $(INCDIR) $(DEFS)
17 MAC_LDFLAGS=-bundle -undefined dynamic_lookup $(LIBDIR) 17 MAC_LDFLAGS=-bundle -undefined dynamic_lookup $(LIBDIR)
18  18
19-CC=gcc 
20-LD=$(MYENV) gcc 
21+SOL_CFLAGS=-O2 -fpic $(WARN) $(INCDIR) $(DEFS) 19+SOL_CFLAGS=-O2 -fpic $(WARN) $(INCDIR) $(DEFS)
22+SOL_LDFLAGS=-O -G -fpic $(LIBDIR) 20+SOL_LDFLAGS=-O -G -fpic $(LIBDIR)
23+ 21+
24+CC?=gcc 22 INSTALL ?= install
25+LD=$(MYENV) $(CC) 23 CC ?= cc
26 CFLAGS=$(MYCFLAGS) 24 LD ?= $(MYENV) cc
27 LDFLAGS=$(MYLDFLAGS) 25@@ -32,10 +35,11 @@ DESTDIR ?= /
28  26 all:
29@@ -34,8 +37,8 @@ all: 
30  27
31 install: $(CMOD) $(LMOD) 28 install: $(CMOD) $(LMOD)
32 mkdir -p $(LUAPATH)/ssl 29- $(INSTALL) -d $(DESTDIR)$(LUAPATH)/ssl $(DESTDIR)$(LUACPATH)
33- cp $(CMOD) $(LUACPATH) 30- $(INSTALL) -D $(CMOD) $(DESTDIR)$(LUACPATH)
34- cp $(LMOD) $(LUAPATH) 31- $(INSTALL) -m644 -D $(LMOD) $(DESTDIR)$(LUAPATH)
35+ ${BSD_INSTALL_LIB} $(CMOD) $(LUACPATH) 32- $(INSTALL) -m644 -D https.lua $(DESTDIR)$(LUAPATH)/ssl
36+ ${BSD_INSTALL_DATA} $(LMOD) $(LUAPATH) 33+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(LUAPATH)/ssl
37 cp https.lua $(LUAPATH)/ssl 34+ $(BSD_INSTALL_LIB_DIR) $(DESTDIR)$(LUACPATH)
 35+ $(BSD_INSTALL_LIB) $(CMOD) $(DESTDIR)$(LUACPATH)
 36+ $(BSD_INSTALL_DATA) $(LMOD) $(DESTDIR)$(LUAPATH)
 37+ $(BSD_INSTALL_DATA) https.lua $(DESTDIR)$(LUAPATH)/ssl
38  38
39 linux: 39 linux:
40@@ -47,6 +50,8 @@ bsd: 40 @$(MAKE) $(CMOD) MYCFLAGS="$(LNX_CFLAGS)" MYLDFLAGS="$(LNX_LDFLAGS)" EXTRA="$(EXTRA)"
 41@@ -46,6 +50,9 @@ bsd:
41 macosx: 42 macosx:
42 @$(MAKE) $(CMOD) MYCFLAGS="$(MAC_CFLAGS)" MYLDFLAGS="$(MAC_LDFLAGS)" MYENV="$(MAC_ENV)" 43 @$(MAKE) $(CMOD) MYCFLAGS="$(MAC_CFLAGS)" MYLDFLAGS="$(MAC_LDFLAGS)" MYENV="$(MAC_ENV)" EXTRA="$(EXTRA)"
43  44
44+solaris: 45+solaris:
45+ @$(MAKE) $(CMOD) MYCFLAGS="$(SOL_CFLAGS)" MYLDFLAGS="$(SOL_LDFLAGS)" MYLIBS="-lsocket -lresolv -lnsl" 46+ @$(MAKE) $(CMOD) MYCFLAGS="$(SOL_CFLAGS)" MYLDFLAGS="$(SOL_LDFLAGS)" EXTRA="$(EXTRA)" MYLIBS="-lsocket -lresolv -lnsl"
 47+
 48 luasocket:
 49 @cd luasocket && $(MAKE)
46  50
47 $(CMOD): $(OBJS) 
48 $(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)