diff options
author | fhajny <fhajny> | 2014-04-07 20:14:48 +0000 |
---|---|---|
committer | fhajny <fhajny> | 2014-04-07 20:14:48 +0000 |
commit | ac6ec2cb8a523f49c164e3becfacb127a554afa3 (patch) | |
tree | 5ea06f8f45c58063758e3bbabcafde36647a4040 /security | |
parent | 615216a7440b216737dabe4e0789f356719b09d1 (diff) | |
download | pkgsrc-ac6ec2cb8a523f49c164e3becfacb127a554afa3.tar.gz |
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).
Diffstat (limited to 'security')
-rw-r--r-- | security/lua-sec/Makefile | 12 | ||||
-rw-r--r-- | security/lua-sec/distinfo | 12 | ||||
-rw-r--r-- | security/lua-sec/patches/patch-aa | 47 | ||||
-rw-r--r-- | security/lua-sec/patches/patch-ab | 52 |
4 files changed, 57 insertions, 66 deletions
diff --git a/security/lua-sec/Makefile b/security/lua-sec/Makefile index 6da2767cb80..01a71a9da23 100644 --- a/security/lua-sec/Makefile +++ b/security/lua-sec/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.8 2014/02/12 23:18:33 tron Exp $ +# $NetBSD: Makefile,v 1.9 2014/04/07 20:14:48 fhajny Exp $ -DISTNAME= luasec-0.4.1 +DISTNAME= luasec-0.5 PKGNAME= ${LUA_PKGPREFIX}-${DISTNAME:S/lua//} -PKGREVISION= 1 CATEGORIES= security MASTER_SITES= https://github.com/brunoos/luasec/archive/ @@ -26,8 +25,11 @@ BUILD_TARGET= solaris BUILD_TARGET= bsd .endif -INSTALL_ENV+= LUA_CDIR=${LUA_CDIR} -INSTALL_ENV+= LUA_LDIR=${LUA_LDIR} +MAKE_ENV+= LUAPATH=${PREFIX}/${LUA_LDIR} +MAKE_ENV+= LUACPATH=${PREFIX}/${LUA_CDIR} +MAKE_ENV+= INC_PATH=-I${PREFIX}/include +MAKE_ENV+= LIB_PATH="-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib" +MAKE_ENV+= LD=${CC:Q} .include "../../lang/lua/module.mk" .include "../../security/openssl/buildlink3.mk" diff --git a/security/lua-sec/distinfo b/security/lua-sec/distinfo index 55c2974939c..f82b81e47b3 100644 --- a/security/lua-sec/distinfo +++ b/security/lua-sec/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.4 2013/10/20 17:56:02 joerg Exp $ +$NetBSD: distinfo,v 1.5 2014/04/07 20:14:48 fhajny Exp $ -SHA1 (luasec-0.4.1.tar.gz) = fe4588676e15eab7b34b84dbbfda6e68f6692f9a -RMD160 (luasec-0.4.1.tar.gz) = 6a7084441352240acb2f0b8b599a6dc59e7e2e81 -Size (luasec-0.4.1.tar.gz) = 28695 bytes -SHA1 (patch-aa) = f0c8575451e83998dea95cd88aa251d4be0ede44 -SHA1 (patch-ab) = 1944a859495b2494d37cfd524895c9a2bd8001ac +SHA1 (luasec-0.5.tar.gz) = bcfe8fda66b6058d07031df3c4a20f6192cf3e73 +RMD160 (luasec-0.5.tar.gz) = a9ef4591a770e178718e24778386136cdc87cadf +Size (luasec-0.5.tar.gz) = 46738 bytes +SHA1 (patch-aa) = 364c0e6ee5c4c04ca7c9cb8a70129013289e9df9 +SHA1 (patch-ab) = 6f9dd58bef69d260bc28812e76d853f3510f6858 diff --git a/security/lua-sec/patches/patch-aa b/security/lua-sec/patches/patch-aa index b6d01a549eb..8cb4ed4eaa3 100644 --- a/security/lua-sec/patches/patch-aa +++ b/security/lua-sec/patches/patch-aa @@ -1,48 +1,35 @@ -$NetBSD: patch-aa,v 1.3 2013/10/20 17:56:02 joerg Exp $ +$NetBSD: patch-aa,v 1.4 2014/04/07 20:14:48 fhajny Exp $ Pass installation dirs properly, fix search paths, add Solaris support ---- Makefile.orig 2012-09-02 14:40:59.000000000 +0000 +--- Makefile.orig 2014-01-29 20:43:33.000000000 +0000 +++ Makefile -@@ -1,16 +1,16 @@ - # Inform the location to intall the modules --LUAPATH=/usr/local/share/lua/5.1 --LUACPATH=/usr/local/lib/lua/5.1 -+LUAPATH=$(DESTDIR)$(PREFIX)/$(LUA_LDIR) -+LUACPATH=$(DESTDIR)$(PREFIX)/$(LUA_CDIR) +@@ -6,7 +6,7 @@ LUACPATH ?= /usr/lib/lua/5.1 + # Comment this lines if you will link with non-internal LuaSocket's help files + # and edit INCDIR and LIBDIR properly. + EXTRA = luasocket +-DEFS = -DWITH_LUASOCKET ++DEFS = -DWITH_LUASOCKET -DLUA_COMPAT_MODULE - # Edit the lines below to inform new path, if necessary - # --#INCDIR=-I/usr/local/lua-5.1/include -I/usr/local/openssl-0.9.8/include --#LIBDIR=-L/usr/local/openssl-0.9.8/lib -R/usr/local/openssl-0.9.8/lib -+INCDIR=-I${PREFIX}/include -+LIBDIR=-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib - - # For Mac OS X: set the system version - MACOSX_VERSION=10.4 - --DEFS=-DBUFFER_DEBUG -+DEFS=-DBUFFER_DEBUG -DLUA_COMPAT_MODULE - - #---------------------- - # Do not edit this part -@@ -24,6 +24,7 @@ none: + # Edit the lines below to inform new path, if necessary. + # Path below points to internal LuaSocket's help files. +@@ -30,6 +30,7 @@ none: @echo " * linux" @echo " * bsd" @echo " * macosx" + @echo " * solaris" install: - @cd src ; $(MAKE) LUACPATH="$(LUACPATH)" LUAPATH="$(LUAPATH)" install -@@ -46,5 +47,11 @@ macosx: + @cd src && $(MAKE) LUACPATH="$(LUACPATH)" LUAPATH="$(LUAPATH)" install +@@ -52,5 +53,11 @@ macosx: @echo "------------------------------" - @cd src ; $(MAKE) INCDIR="$(INCDIR)" LIBDIR="$(LIBDIR)" DEFS="$(DEFS)" MACVER="$(MACOSX_VERSION)" $@ + @cd src && $(MAKE) INCDIR="$(INCDIR)" LIBDIR="$(LIBDIR)" MACVER="$(MACOSX_VERSION)" DEFS="$(DEFS)" EXTRA="$(EXTRA)" $@ +solaris: + @echo "---------------------" + @echo "** Build for Solaris **" -+ @echo "---------------------" -+ @cd src ; $(MAKE) INCDIR="$(INCDIR)" LIBDIR="$(LIBDIR)" DEFS="$(DEFS)" $@ ++ @echo "---------------------" ++ @cd src ; $(MAKE) INCDIR="$(INCDIR)" LIBDIR="$(LIBDIR)" DEFS="$(DEFS)" EXTRA="$(EXTRA)" $@ + clean: - @cd src ; $(MAKE) clean + @cd src && $(MAKE) clean diff --git a/security/lua-sec/patches/patch-ab b/security/lua-sec/patches/patch-ab index ea611476051..a28d62409d1 100644 --- a/security/lua-sec/patches/patch-ab +++ b/security/lua-sec/patches/patch-ab @@ -1,48 +1,50 @@ -$NetBSD: patch-ab,v 1.2 2013/09/13 14:32:19 fhajny Exp $ +$NetBSD: patch-ab,v 1.3 2014/04/07 20:14:48 fhajny Exp $ Pass proper libs for SunOS. ---- src/Makefile.orig 2012-09-02 14:40:59.000000000 +0000 +--- src/Makefile.orig 2014-01-29 20:43:33.000000000 +0000 +++ src/Makefile -@@ -9,7 +9,7 @@ OBJS= \ +@@ -6,7 +6,7 @@ OBJS= \ context.o \ ssl.o --LIBS=-lssl -lcrypto -+LIBS=-lssl -lcrypto $(MYLIBS) +-LIBS=-lssl -lcrypto -lluasocket ++LIBS=-lssl -lcrypto -lluasocket $(MYLIBS) WARN=-Wall -pedantic -@@ -23,8 +23,11 @@ MAC_ENV=env MACOSX_DEPLOYMENT_TARGET='$( +@@ -20,6 +20,9 @@ MAC_ENV=env MACOSX_DEPLOYMENT_TARGET='$( MAC_CFLAGS=-O2 -fno-common $(WARN) $(INCDIR) $(DEFS) MAC_LDFLAGS=-bundle -undefined dynamic_lookup $(LIBDIR) --CC=gcc --LD=$(MYENV) gcc +SOL_CFLAGS=-O2 -fpic $(WARN) $(INCDIR) $(DEFS) +SOL_LDFLAGS=-O -G -fpic $(LIBDIR) + -+CC?=gcc -+LD=$(MYENV) $(CC) - CFLAGS=$(MYCFLAGS) - LDFLAGS=$(MYLDFLAGS) - -@@ -34,8 +37,8 @@ all: + INSTALL ?= install + CC ?= cc + LD ?= $(MYENV) cc +@@ -32,10 +35,11 @@ DESTDIR ?= / + all: install: $(CMOD) $(LMOD) - mkdir -p $(LUAPATH)/ssl -- cp $(CMOD) $(LUACPATH) -- cp $(LMOD) $(LUAPATH) -+ ${BSD_INSTALL_LIB} $(CMOD) $(LUACPATH) -+ ${BSD_INSTALL_DATA} $(LMOD) $(LUAPATH) - cp https.lua $(LUAPATH)/ssl +- $(INSTALL) -d $(DESTDIR)$(LUAPATH)/ssl $(DESTDIR)$(LUACPATH) +- $(INSTALL) -D $(CMOD) $(DESTDIR)$(LUACPATH) +- $(INSTALL) -m644 -D $(LMOD) $(DESTDIR)$(LUAPATH) +- $(INSTALL) -m644 -D https.lua $(DESTDIR)$(LUAPATH)/ssl ++ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(LUAPATH)/ssl ++ $(BSD_INSTALL_LIB_DIR) $(DESTDIR)$(LUACPATH) ++ $(BSD_INSTALL_LIB) $(CMOD) $(DESTDIR)$(LUACPATH) ++ $(BSD_INSTALL_DATA) $(LMOD) $(DESTDIR)$(LUAPATH) ++ $(BSD_INSTALL_DATA) https.lua $(DESTDIR)$(LUAPATH)/ssl linux: -@@ -47,6 +50,8 @@ bsd: + @$(MAKE) $(CMOD) MYCFLAGS="$(LNX_CFLAGS)" MYLDFLAGS="$(LNX_LDFLAGS)" EXTRA="$(EXTRA)" +@@ -46,6 +50,9 @@ bsd: macosx: - @$(MAKE) $(CMOD) MYCFLAGS="$(MAC_CFLAGS)" MYLDFLAGS="$(MAC_LDFLAGS)" MYENV="$(MAC_ENV)" + @$(MAKE) $(CMOD) MYCFLAGS="$(MAC_CFLAGS)" MYLDFLAGS="$(MAC_LDFLAGS)" MYENV="$(MAC_ENV)" EXTRA="$(EXTRA)" +solaris: -+ @$(MAKE) $(CMOD) MYCFLAGS="$(SOL_CFLAGS)" MYLDFLAGS="$(SOL_LDFLAGS)" MYLIBS="-lsocket -lresolv -lnsl" ++ @$(MAKE) $(CMOD) MYCFLAGS="$(SOL_CFLAGS)" MYLDFLAGS="$(SOL_LDFLAGS)" EXTRA="$(EXTRA)" MYLIBS="-lsocket -lresolv -lnsl" ++ + luasocket: + @cd luasocket && $(MAKE) - $(CMOD): $(OBJS) - $(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) |