ports/123949: Port update: security/vlock - Update to v2.2.2

[Ganael Laplanche]

>Number:         123949
>Category:       ports
>Synopsis:       Port update: security/vlock - Update to v2.2.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat May 24 07:10:10 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Ganael Laplanche
>Release:        8.0-CURRENT
>Organization:
http://contribs.martymac.com
>Environment:
FreeBSD home.martymac.com 8.0-CURRENT FreeBSD 8.0-CURRENT #17: Sun May 18 23:44:45 CEST 2008     root@:/usr/obj/usr/src/sys/MYKERNEL  amd64
>Description:
This patch updates vlock to v2.2.2.

Changes (from the port's view) include :
- New OPTION to disable unlocling terminal using the root account
- Use of the new EXTRA_CFLAGS/EXTRA_LDFLAGS facility

Changes for vlock, v2.2.2 :
- Fix and improve build system: use LDLIBS instead of LDFLAGS where
  appropriate and provide EXTRA_CFLAGS/EXTRA_LDFLAGS parameters
  in ./configure.
- Display number of authentication tries on exit.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -aurN vlock.orig/Makefile vlock/Makefile
--- vlock.orig/Makefile	2008-05-23 22:07:15.418153718 +0200
+++ vlock/Makefile	2008-05-24 08:50:53.666638091 +0200
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	vlock
-PORTVERSION=	2.2.1
+PORTVERSION=	2.2.2
 CATEGORIES=	security
 MASTER_SITES=	http://cthulhu.c3d2.de/~toidinamai/vlock/archive/
 
@@ -21,10 +21,12 @@
 		--with-modules="${VLOCKMODULES}" \
 		--with-scripts="${VLOCKSCRIPTS}" \
 		VLOCK_GROUP="${VLOCKGRP}" \
-		VLOCK_MODE="0750"
-CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
+		VLOCK_MODE="0750" \
+		EXTRA_CFLAGS="-I${LOCALBASE}/include" \
+		EXTRA_LDFLAGS="-L${LOCALBASE}/lib"
 
-OPTIONS=	VLOCKSCRIPTS "Install sample hook scripts" off \
+OPTIONS=	ROOTPWD "Enable unlock using root password" on \
+		VLOCKSCRIPTS "Install sample hook scripts" off \
 		CACASAVER "Enable libcaca screensaver" off
 
 MANLANG=	""
@@ -42,6 +44,12 @@
 
 .include <bsd.port.pre.mk>
 
+.if !defined(WITHOUT_ROOTPWD)
+CONFIGURE_ARGS+=	--enable-root-password
+.else
+CONFIGURE_ARGS+=	--disable-root-password
+.endif
+
 .if !defined(WITHOUT_VLOCKSCRIPTS)
 VLOCKSCRIPTS+=	amarok.sh example_script.sh mplayer.sh
 PLIST_SUB+=	PL_VLOCKSCRIPTS=""
diff -aurN vlock.orig/distinfo vlock/distinfo
--- vlock.orig/distinfo	2008-05-23 22:07:15.418153718 +0200
+++ vlock/distinfo	2008-05-23 22:06:49.123118735 +0200
@@ -1,3 +1,3 @@
-MD5 (vlock-2.2.1.tar.gz) = 5a8f7bb07b9f6107f1d06acb3aaa5578
-SHA256 (vlock-2.2.1.tar.gz) = 11fa31b0cdc9e936cd114384db09b36981c412af7e23db83368d7c40677a031c
-SIZE (vlock-2.2.1.tar.gz) = 54381
+MD5 (vlock-2.2.2.tar.gz) = 51c389ee4ef814bf59063bc367437eb8
+SHA256 (vlock-2.2.2.tar.gz) = ea875250cad150872583b6ed2436470bc5e9c3a580d85554e31a2d5ae1d92fad
+SIZE (vlock-2.2.2.tar.gz) = 54732
diff -aurN vlock.orig/files/patch-configure vlock/files/patch-configure
--- vlock.orig/files/patch-configure	2008-05-23 22:07:15.391978604 +0200
+++ vlock/files/patch-configure	2008-05-24 08:42:47.713243176 +0200
@@ -1,12 +1,12 @@
---- configure.orig	2008-03-26 17:49:33.000000000 +0800
-+++ configure	2008-03-30 13:32:41.000000000 +0800
-@@ -255,6 +255,9 @@
-       DL_LIB=''
-       CRYPT_LIB=''
-       MODULES="all.so new.so"
-+      CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
-+      LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
-+      ROOT_GROUP="wheel"
-     ;;
-   esac
- }
+--- configure.orig	2008-05-24 08:37:25.515872840 +0200
++++ configure	2008-05-24 08:38:44.943843155 +0200
+@@ -220,7 +220,8 @@
+   MODULEDIR="\$(LIBDIR)/vlock/modules"
+ 
+   CC=gcc
+-  DEFAULT_CFLAGS="-O2 -Wall -W -pedantic -std=gnu99"
++  #DEFAULT_CFLAGS="-O2 -Wall -W -pedantic -std=gnu99"
++  DEFAULT_CFLAGS="-pedantic -std=gnu99"
+   DEBUG_CFLAGS="-O0 -g -Wall -W -pedantic -std=gnu99"
+   CFLAGS="${DEFAULT_CFLAGS}"
+   LD=ld


>Release-Note:
>Audit-Trail:
>Unformatted: