- Update to 0.97.

- Take maintainership.

3 files changed, 64 insertions, 12 deletions

diff --git a/security/cvm/Makefile b/security/cvm/Makefile
index c582f1a17000..6b3981035d1e 100644
--- a/security/cvm/Makefile
+++ b/security/cvm/Makefile
@@ -2,13 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	cvm
-PORTVERSION=	0.96
-PORTREVISION=	3
+PORTVERSION=	0.97
 CATEGORIES=	security
 MASTER_SITES=	http://untroubled.org/${PORTNAME}/ \
 		http://untroubled.org/${PORTNAME}/archive/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	Credential Validation Modules
 
 LICENSE=	GPLv2
@@ -17,10 +16,10 @@ LIB_DEPENDS=	libbg.so:devel/bglibs
 
 CONFLICTS=	bglibs-1.00*
 
-USES=		libtool:build
-USE_LDCONFIG=	yes
+USES=		libtool:build localbase:ldflags
 BGLIBS_INC=	${LOCALBASE}/include/bglibs
 BGLIBS_LIB=	${LOCALBASE}/lib/bglibs
+USE_LDCONFIG=	yes
 
 DOCS=		NEWS README TODO *.html
 
diff --git a/security/cvm/distinfo b/security/cvm/distinfo
index 53681c308e16..2ea3cf8e1451 100644
--- a/security/cvm/distinfo
+++ b/security/cvm/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cvm-0.96.tar.gz) = b85121b2f4b160b27c95705bd83a871675ed4b65b8bcb259a0877f37606224e9
-SIZE (cvm-0.96.tar.gz) = 127999
+TIMESTAMP = 1490355835
+SHA256 (cvm-0.97.tar.gz) = 82e7751d63cc2ae91457e28b5326885beb1d082d4f0695f4fdaac5ffa70a0c47
+SIZE (cvm-0.97.tar.gz) = 127759
diff --git a/security/cvm/files/patch-Makefile b/security/cvm/files/patch-Makefile
index 110926c24582..8faf2ffa97d8 100644
--- a/security/cvm/files/patch-Makefile
+++ b/security/cvm/files/patch-Makefile
@@ -1,6 +1,22 @@
---- Makefile.orig	2010-01-21 23:51:26.000000000 +0100
-+++ Makefile	2014-08-21 05:42:52.000000000 +0200
-@@ -155,10 +155,10 @@
+--- Makefile.orig	2015-01-31 14:00:19 UTC
++++ Makefile
+@@ -35,11 +35,12 @@ client_xfer_local.lo client_xfer_local.o
+ client_xfer_udp.lo client_xfer_udp.o: ltcompile client_xfer_udp.c v1client.h facts.h errors.h protocol.h
+ 	./ltcompile client_xfer_udp.c
+ 
+-compile: conf-cc
+-	( echo '#!/bin/sh'; \
++compile: conf-cc conf-bgincs
++	( bgincs=`head -n 1 conf-bgincs`; \
++	  echo '#!/bin/sh'; \
+ 	  echo 'source=$$1; shift'; \
+ 	  echo 'base=`echo "$$source" | sed -e s:\\\\.c$$::`'; \
+-	  echo exec `head -n 1 conf-cc` -I.  '-o $${base}.o -c $$source $${1+"$$@"}'; \
++	  echo exec `head -n 1 conf-cc` -I. "-I'$${bgincs}'" '-o $${base}.o -c $$source $${1+"$$@"}'; \
+ 	) >compile
+ 	chmod 755 compile
+ 
+@@ -154,10 +155,10 @@ cvm-v1testclient.o: compile cvm-v1testcl
  	./compile cvm-v1testclient.c
  
  cvm-vchkpw: cvm-vchkpw.o ltload libcvm-module.la crypt.lib shadow.lib s.lib socket.lib
@@ -12,8 +28,44 @@
 +	./compile cvm-vchkpw.c `cat /usr/local/vpopmail/etc/inc_deps`
  
  cvm-vmailmgr: cvm-vmailmgr.o ltload vmautoconvert.o vmlookup.o getpwnam.o libcvm-module.la libcvm-qmail.la socket.lib crypt.lib
- 	./ltload cvm-vmailmgr vmautoconvert.o vmlookup.o getpwnam.o libcvm-module.la libcvm-qmail.la -lbg `cat socket.lib` `cat crypt.lib`
-@@ -249,12 +249,12 @@
+ 	./ltload cvm-vmailmgr vmautoconvert.o vmlookup.o getpwnam.o libcvm-module.la libcvm-qmail.la -lbg -lvmailmgr `cat socket.lib` `cat crypt.lib`
+@@ -221,36 +222,39 @@ libcvm-v2client.la: makeshlib v2client.l
+ 
+ libraries: libcvm-module.la libcvm-v2client.la libcvm-local.la libcvm-command.la libcvm-v1client.la libcvm-udp.la libcvm-sql.la libcvm-sasl.la libcvm-qmail.la
+ 
+-load: conf-ld
+-	( echo '#!/bin/sh';\
++load: conf-ld conf-bglibs
++	( bglibs=`head -n 1 conf-bglibs`; \
++	  echo '#!/bin/sh';\
+ 	  echo 'main="$$1"; shift';\
+-	  echo exec `head -n 1 conf-ld` -L. '-o "$$main" "$$main.o" $${1+"$$@"}'; \
++	  echo exec `head -n 1 conf-ld` -L. "-L'$${bglibs}'" "-Wl,-R'$${bglibs}'" '-o "$$main" "$$main.o" $${1+"$$@"}'; \
+ 	) >load
+ 	chmod 755 load
+ 
+-ltcompile: conf-cc
+-	( if libtool --tag=CC --help >/dev/null 2>&1; then tag='--tag=CC'; fi; \
++ltcompile: conf-cc conf-bgincs
++	( bgincs=`head -n 1 conf-bgincs`; \
++	  if libtool --tag=CC --help >/dev/null 2>&1; then tag='--tag=CC'; fi; \
+ 	  echo '#!/bin/sh'; \
+ 	  echo 'source=$$1; shift'; \
+ 	  echo 'base=`echo "$$source" | sed -e s:\\\\.c$$::`'; \
+-	  echo exec libtool --mode=compile --silent $$tag `head -n 1 conf-cc` -I.  '-o $${base}.lo -c $$source $${1+"$$@"}'; \
++	  echo exec libtool --mode=compile --silent $$tag `head -n 1 conf-cc` -I. "-I'$${bgincs}'" '-o $${base}.lo -c $$source $${1+"$$@"}'; \
+ 	) >ltcompile
+ 	chmod 755 ltcompile
+ 
+-ltload: conf-ld
+-	( if libtool --tag=CC --help >/dev/null 2>&1; then tag='--tag=CC'; fi; \
++ltload: conf-ld conf-bglibs
++	( bglibs=`head -n 1 conf-bglibs`; \
++	  if libtool --tag=CC --help >/dev/null 2>&1; then tag='--tag=CC'; fi; \
+ 	  echo '#!/bin/sh';\
+ 	  echo 'main="$$1"; shift';\
+-	  echo exec libtool --mode=link --silent $$tag `head -n 1 conf-ld` -L. '-o "$$main" "$$main.o" $${1+"$$@"}' ; \
++	  echo exec libtool --mode=link --silent $$tag `head -n 1 conf-ld` -L. "-L'$${bglibs}'" "-Wl,-R'$${bglibs}'" '-o "$$main" "$$main.o" $${1+"$$@"}' ; \
  	) >ltload
  	chmod 755 ltload