- Update to 2.1

- Assume maintainership

PR:		ports/121678
Submitted by:	Ganael LAPLANCHE <ganael.laplanche@martymac.com>

10 files changed, 83 insertions, 156 deletions

diff --git a/security/vlock/Makefile b/security/vlock/Makefile
index eeeaf7a96af6..e3b039257250 100644
--- a/security/vlock/Makefile
+++ b/security/vlock/Makefile
@@ -5,16 +5,19 @@
 # $FreeBSD$
 #
 
-PORTNAME=		vlock
-PORTVERSION=		1.3
-CATEGORIES=		security
-MASTER_SITES=		${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	utils/console
+PORTNAME=	vlock
+PORTVERSION=	2.1
+CATEGORIES=	security
+MASTER_SITES=	http://cthulhu.c3d2.de/~toidinamai/vlock/archive/
 
-MAINTAINER=		ports@FreeBSD.org
+MAINTAINER=	ganael.laplanche@martymac.com
 COMMENT=	Locks a terminal
 
-MAN1=			vlock.1
-PLIST_FILES=	bin/vlock
+USE_GMAKE=	yes
+
+MANLANG=	""
+MAN1=		vlock.1
+MAN8=		vlock-current.8 vlock-all.8 vlock-new.8 vlock-nosysrq.8
+PLIST_FILES=	bin/vlock sbin/vlock-current sbin/vlock-all sbin/vlock-nosysrq sbin/vlock-new
 
 .include <bsd.port.mk>
diff --git a/security/vlock/distinfo b/security/vlock/distinfo
index 33f36fe35152..056d2a711246 100644
--- a/security/vlock/distinfo
+++ b/security/vlock/distinfo
@@ -1,3 +1,3 @@
-MD5 (vlock-1.3.tar.gz) = d04076f9c5f12aadc4d5fbbabf8a0c12
-SHA256 (vlock-1.3.tar.gz) = 700b8f45b6b7cdaac2185a4796870ac378015db18a7414eebee5e5b6a4131daf
-SIZE (vlock-1.3.tar.gz) = 17188
+MD5 (vlock-2.1.tar.gz) = a365a8fdde9379417ef2adc1c1230c4d
+SHA256 (vlock-2.1.tar.gz) = 9d733ab0d8643ca71ee2c8bb22e8bc97a3d87b4f48582999d009855df402bace
+SIZE (vlock-2.1.tar.gz) = 21045
diff --git a/security/vlock/files/patch-Makefile b/security/vlock/files/patch-Makefile
new file mode 100644
index 000000000000..b9557e95b7ed
--- /dev/null
+++ b/security/vlock/files/patch-Makefile
@@ -0,0 +1,36 @@
+--- Makefile.orig	2007-09-08 20:04:25.000000000 +0200
++++ Makefile	2008-03-15 11:04:38.067938121 +0100
+@@ -62,19 +62,23 @@
+ 
+ .PHONY: install-programs
+ install-programs: $(PROGRAMS)
+-	$(INSTALL) -D -m 755 -o root -g $(ROOT_GROUP) vlock $(DESTDIR)$(PREFIX)/bin/vlock
+-	$(INSTALL) -D -m 4711 -o root -g $(ROOT_GROUP) vlock-current $(DESTDIR)$(PREFIX)/sbin/vlock-current
+-	$(INSTALL) -D -m 755 -o root -g $(ROOT_GROUP) vlock-all $(DESTDIR)$(PREFIX)/sbin/vlock-all
+-	$(INSTALL) -D -m $(VLOCK_MODE) -o root -g $(VLOCK_GROUP) vlock-nosysrq $(DESTDIR)$(PREFIX)/sbin/vlock-nosysrq
+-	$(INSTALL) -D -m $(VLOCK_MODE) -o root -g $(VLOCK_GROUP) vlock-new $(DESTDIR)$(PREFIX)/sbin/vlock-new
++	$(INSTALL) -d $(PREFIX)/bin
++	$(INSTALL) -m 755 -o root -g $(ROOT_GROUP) vlock $(PREFIX)/bin/vlock
++	$(INSTALL) -d $(PREFIX)/sbin
++	$(INSTALL) -m 4711 -o root -g $(ROOT_GROUP) vlock-current $(PREFIX)/sbin/vlock-current
++	$(INSTALL) -m 755 -o root -g $(ROOT_GROUP) vlock-all $(PREFIX)/sbin/vlock-all
++	$(INSTALL) -m $(VLOCK_MODE) -o root -g $(VLOCK_GROUP) vlock-nosysrq $(PREFIX)/sbin/vlock-nosysrq
++	$(INSTALL) -m $(VLOCK_MODE) -o root -g $(VLOCK_GROUP) vlock-new $(PREFIX)/sbin/vlock-new
+ 
+ .PHONY: install-man
+ install-man:
+-	$(INSTALL) -D -m 644 -o root -g $(ROOT_GROUP) man/vlock.1 $(DESTDIR)$(PREFIX)/share/man/man1/vlock.1
+-	$(INSTALL) -D -m 644 -o root -g $(ROOT_GROUP) man/vlock-current.8 $(DESTDIR)$(PREFIX)/share/man/man8/vlock-current.8
+-	$(INSTALL) -D -m 644 -o root -g $(ROOT_GROUP) man/vlock-all.8 $(DESTDIR)$(PREFIX)/share/man/man8/vlock-all.8
+-	$(INSTALL) -D -m 644 -o root -g $(ROOT_GROUP) man/vlock-new.8 $(DESTDIR)$(PREFIX)/share/man/man8/vlock-new.8
+-	$(INSTALL) -D -m 644 -o root -g $(ROOT_GROUP) man/vlock-nosysrq.8 $(DESTDIR)$(PREFIX)/share/man/man8/vlock-nosysrq.8
++	$(INSTALL) -d $(MANPREFIX)/man/man1
++	$(INSTALL) -m 644 -o root -g $(ROOT_GROUP) man/vlock.1 $(MANPREFIX)/man/man1/vlock.1
++	$(INSTALL) -d $(MANPREFIX)/man/man8
++	$(INSTALL) -m 644 -o root -g $(ROOT_GROUP) man/vlock-current.8 $(MANPREFIX)/man/man8/vlock-current.8
++	$(INSTALL) -m 644 -o root -g $(ROOT_GROUP) man/vlock-all.8 $(MANPREFIX)/man/man8/vlock-all.8
++	$(INSTALL) -m 644 -o root -g $(ROOT_GROUP) man/vlock-new.8 $(MANPREFIX)/man/man8/vlock-new.8
++	$(INSTALL) -m 644 -o root -g $(ROOT_GROUP) man/vlock-nosysrq.8 $(MANPREFIX)/man/man8/vlock-nosysrq.8
+ 
+ .PHONY: clean
+ clean:
diff --git a/security/vlock/files/patch-aa b/security/vlock/files/patch-aa
deleted file mode 100644
index c622a4024d91..000000000000
--- a/security/vlock/files/patch-aa
+++ /dev/null
@@ -1,36 +0,0 @@
---- Makefile.orig	Thu Jan 14 01:19:14 1999
-+++ Makefile	Wed Jun 16 17:23:34 2004
-@@ -1,24 +1,19 @@
- # vlock makefile
- 
--CC = gcc
--# remove the -DUSE_PAM, -ldl, and -lpam if you aren't using PAM
--RPM_OPT_FLAGS=-O2
--CFLAGS = $(RPM_OPT_FLAGS) -DUSE_PAM
--LDFLAGS = -ldl -lpam -lpam_misc
-+CFLAGS += -DUSE_PAM
-+LDFLAGS = -lpam
- 
- OBJS = vlock.o signals.o help.o terminal.o input.o
- 
--vlock: $(OBJS)
-+all:	vlock
- 
--vlock.man: vlock.1
--	groff -man -Tascii vlock.1 > vlock.man
-+vlock:	$(OBJS)
-+	cc $(OBJS) $(LDFLAGS) -o vlock
- 
--vlock.o: vlock.h version.h
--signals.o: vlock.h
--help.o: vlock.h
--terminal.o: vlock.h
--input.o: vlock.h
-+install:
-+	/usr/bin/install -c -s -o root -g wheel -m 4555 vlock ${PREFIX}/bin
-+	/usr/bin/install -c -o root -g wheel -m 444 vlock.1 ${MANPREFIX}/man/man1
- 
- clean:
--	rm -f $(OBJS) vlock core core.vlock
-+	rm -f $(OBJS) vlock vlock.core
- 
diff --git a/security/vlock/files/patch-ab b/security/vlock/files/patch-ab
deleted file mode 100644
index cf1153881467..000000000000
--- a/security/vlock/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- signals.c.orig	Sun Oct  8 18:03:19 2000
-+++ signals.c		Sun Oct  8 18:03:24 2000
-@@ -16,7 +16,7 @@
- #include <signal.h>
- #include <sys/wait.h>
- #include <sys/ioctl.h>
--#include <sys/vt.h>
-+#include <sys/consio.h>
- #include "vlock.h"
- 
- 
diff --git a/security/vlock/files/patch-ac b/security/vlock/files/patch-ac
deleted file mode 100644
index bf65297f651e..000000000000
--- a/security/vlock/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- terminal.c.orig	Sun Oct  8 18:03:19 2000
-+++ terminal.c		Sun Oct  8 18:03:24 2000
-@@ -15,7 +15,7 @@
- #include <unistd.h>
- #include <termios.h>
- #include <sys/ioctl.h>
--#include <sys/vt.h>
-+#include <sys/consio.h>
- #include "vlock.h"
- 
- 
diff --git a/security/vlock/files/patch-ad b/security/vlock/files/patch-ad
deleted file mode 100644
index bcd6e35fbc3e..000000000000
--- a/security/vlock/files/patch-ad
+++ /dev/null
@@ -1,46 +0,0 @@
---- vlock.c.orig	Sun Oct  8 18:03:19 2000
-+++ vlock.c		Sun Oct  8 18:03:24 2000
-@@ -14,12 +14,10 @@
- #include <stdio.h>
- #include <unistd.h>
- #include <fcntl.h>
--#include <getopt.h>
- #include <termios.h>
- #include <signal.h>
--#include <sys/vt.h>
--#include <sys/kd.h>
- #include <sys/ioctl.h>
-+#include <sys/consio.h>
- #include "vlock.h"
- #include "version.h"
- 
-@@ -37,20 +35,12 @@
- 
- int main(int argc, char **argv) {
- 
--  static struct option long_options[] = { /* For parsing long arguments */
--    {"current", 0, &o_lock_all, 0},
--    {"all", 0, &o_lock_all, 1},
--    {"version", no_argument, 0, O_VERSION},
--    {"help", no_argument, 0, O_HELP},
--    {0, 0, 0, 0},
--  };
-   int option_index; /* Unused */
-   int c;
-   struct vt_mode vtm;
- 
-   /* First we parse all the command line arguments */
--  while ((c = getopt_long(argc, argv, "acvh",
--			  long_options, &option_index)) != -1) {
-+  while ((c = getopt(argc, argv, "acvh")) != -1) {
-     switch(c) {
-     case 'c':
-       o_lock_all = 0;
-@@ -107,6 +97,7 @@
-     vtm.mode = VT_PROCESS;
-     vtm.relsig = SIGUSR1; /* handled by release_vt() */
-     vtm.acqsig = SIGUSR2; /* handled by acquire_vt() */
-+    vtm.frsig = SIGUSR1;  /* needed by FreeBSD */
-     ioctl(vfd, VT_SETMODE, &vtm);
-   }
- 
diff --git a/security/vlock/files/patch-ae b/security/vlock/files/patch-ae
deleted file mode 100644
index 28e0d50f56b3..000000000000
--- a/security/vlock/files/patch-ae
+++ /dev/null
@@ -1,39 +0,0 @@
---- input.c.orig	Thu Jan 14 03:19:14 1999
-+++ input.c	Fri Feb 28 13:48:38 2003
-@@ -60,11 +60,27 @@
- #error "Shadow and PAM don't mix!"
- #endif
- 
-+#if (__FreeBSD__ == 0)            /* 1.0 did not define __FreeBSD__ */
-+#define __FreeBSD_version 199401
-+#elsif __FreeBSD__ == 1          /* 1.1 defined it to be 1 */
-+#define __FreeBSD_version 199405
-+#else                           /* 2.0 and higher define it to be 2 */
-+#include <osreldate.h>          /* and this works */
-+#endif
-+
- #include <security/pam_appl.h>
-+#if defined (__FreeBSD_version) && (__FreeBSD_version > 500030)
-+#include <security/openpam.h>
-+#else
- #include <security/pam_misc.h>
-+#endif
- 
- static struct pam_conv PAM_conversation = {
-+#if defined (__FreeBSD_version) && (__FreeBSD_version > 500030)
-+    openpam_ttyconv,
-+#else
-     &misc_conv,
-+#endif
-     NULL
- };
- 
-@@ -291,7 +307,7 @@
-   setuid(getuid());
-   setgid(getgid());
- 
--  sprintf(prompt, "%s's password: ", username);
-+  snprintf(prompt, 99, "%s's password: ", username);
- #endif /* !USE_PAM */
- }
- 
diff --git a/security/vlock/files/patch-config.mk b/security/vlock/files/patch-config.mk
new file mode 100644
index 000000000000..db0812d21b9c
--- /dev/null
+++ b/security/vlock/files/patch-config.mk
@@ -0,0 +1,32 @@
+--- config.mk.orig	2007-09-08 20:04:25.000000000 +0200
++++ config.mk	2008-03-15 10:57:43.866012457 +0100
+@@ -9,18 +9,13 @@
+ 
+ # group to install vlock-all and vlock-nosysrq as
+ # defaults to 'root')
+-VLOCK_GROUP =
++VLOCK_GROUP = wheel
+ # mode to install vlock-all and vlock-nosysrq as
+ # defaults to 4711 if group is unset and 4710 otherwise
+ VLOCK_MODE =
+ 
+ # root's group
+-ROOT_GROUP = root
+-
+-# installation prefix
+-PREFIX = /usr/local
+-# installation root
+-DESTDIR =
++ROOT_GROUP = wheel
+ 
+ # c compiler
+ CC = gcc
+@@ -30,7 +25,7 @@
+ LDFLAGS = 
+ 
+ # linker flags needed for pam
+-PAM_LIBS = -ldl -lpam
++PAM_LIBS = -lpam
+ 
+ # gnu install
+ INSTALL = install
diff --git a/security/vlock/pkg-descr b/security/vlock/pkg-descr
index fcbdf10d2343..595f044a6cb9 100644
--- a/security/vlock/pkg-descr
+++ b/security/vlock/pkg-descr
@@ -1,5 +1,4 @@
 This is a utility which locks a terminal so it can only be unlocked with the
 user's password (or the root password).  It uses PAM authentication by default.
 
-- George Reid
-services@nevernet.net
+WWW: http://freshmeat.net/projects/vlock