Attachment #85902 for bug #122230

View | Details | Raw Unified | Return to bug 122230
Collapse All | Expand All




#

PORTNAME=	vlock
PORTVERSION=	2.2.1
CATEGORIES=	security
MASTER_SITES=	http://cthulhu.c3d2.de/~toidinamai/vlock/archive/


COMMENT=	Locks a terminal

USE_GMAKE=	yes
HAS_CONFIGURE=	yes
CONFIGURE_ARGS=	--enable-plugins --enable-pam \
				--prefix=${PREFIX} \
				--mandir=${MANPREFIX}/man \
				--with-modules="${VLOCKMODULES}" \
				--with-scripts="${VLOCKSCRIPTS}" \
				VLOCK_GROUP="${VLOCKGRP}" \
				VLOCK_MODE="0750"

OPTIONS=		VLOCKSCRIPTS "Install sample hook scripts" on \
				CACASAVER	"Enable libcaca screensaver" off

MANLANG=	""
MAN1=		vlock.1
MAN5=		vlock-plugins.5
MAN8=		vlock-main.8

# Default scripts/modules
VLOCKSCRIPTS=
VLOCKMODULES=	all.so new.so

# Vlock group = vlock:*:129:
VLOCKGRP=	vlock
VLOCKGID=	129

.include <bsd.port.pre.mk>

.if !defined(WITHOUT_VLOCKSCRIPTS)
VLOCKSCRIPTS+=	amarok.sh example_script.sh mplayer.sh
PLIST_SUB+=	PL_VLOCKSCRIPTS=""
.else
PLIST_SUB+=	PL_VLOCKSCRIPTS="@comment "
.endif

.if !defined(WITHOUT_CACASAVER)
BUILD_DEPENDS+=	${LOCALBASE}/lib/libcaca.a:${PORTSDIR}/graphics/libcaca
VLOCKMODULES+=	caca.so
PLIST_SUB+=	PL_CACASAVER=""
.else
PLIST_SUB+=	PL_CACASAVER="@comment "
.endif

pre-install:
	if ! pw groupshow ${VLOCKGRP}; then pw groupadd ${VLOCKGRP} -g ${VLOCKGID}; fi

post-install:
.if !defined(NOPORTDOCS)
	@${MKDIR} ${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/COPYING ${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/PLUGINS ${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/README.X11 ${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/SECURITY ${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/TODO ${DOCSDIR}
.endif

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)vlock/distinfo (-3 / +3 lines)
1	MD5 (vlock-2.1.tar.gz) = a365a8fdde9379417ef2adc1c1230c4d	1	MD5 (vlock-2.2.1.tar.gz) = 5a8f7bb07b9f6107f1d06acb3aaa5578
2	SHA256 (vlock-2.1.tar.gz) = 9d733ab0d8643ca71ee2c8bb22e8bc97a3d87b4f48582999d009855df402bace	2	SHA256 (vlock-2.2.1.tar.gz) = 11fa31b0cdc9e936cd114384db09b36981c412af7e23db83368d7c40677a031c
3	SIZE (vlock-2.1.tar.gz) = 21045	3	SIZE (vlock-2.2.1.tar.gz) = 54381




--- 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:




--- 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

Line 0 Link Here

(-)vlock/files/patch-configure (+11 lines)
	1	--- configure.orig 2008-03-24 14:03:53.148931378 +0100
	2	+++ configure 2008-03-24 14:06:02.748596139 +0100
	3	@@ -255,6 +255,8 @@
	4	DL_LIB=''
	5	CRYPT_LIB=''
	6	MODULES="all.so new.so"
	7	+ CFLAGS="${CFLAGS} -I/usr/local/include"
	8	+ LDFLAGS="${LDFLAGS} -L/usr/local/lib"
	9	;;
	10	esac
	11	}




bin/vlock
sbin/vlock-main
lib/vlock/modules/all.so
lib/vlock/modules/new.so
%%PL_CACASAVER%%lib/vlock/modules/caca.so
@dirrm lib/vlock/modules
%%PL_VLOCKSCRIPTS%%lib/vlock/scripts/amarok
%%PL_VLOCKSCRIPTS%%lib/vlock/scripts/example_script
%%PL_VLOCKSCRIPTS%%lib/vlock/scripts/mplayer
%%PL_VLOCKSCRIPTS%%@dirrm lib/vlock/scripts
@dirrm lib/vlock
%%PORTDOCS%%%%DOCSDIR%%/COPYING
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
%%PORTDOCS%%%%DOCSDIR%%/PLUGINS
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/README.X11
%%PORTDOCS%%%%DOCSDIR%%/SECURITY
%%PORTDOCS%%%%DOCSDIR%%/TODO
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@exec if ! pw groupshow vlock 2>/dev/null; then pw groupadd vlock -g 129; fi

Return to bug 122230

Lines 6-12 Link Here

(-)vlock/Makefile (-4 / +55 lines)
6	#	6	#
7		7
8	PORTNAME= vlock	8	PORTNAME= vlock
9	PORTVERSION= 2.1	9	PORTVERSION= 2.2.1
10	CATEGORIES= security	10	CATEGORIES= security
11	MASTER_SITES= http://cthulhu.c3d2.de/~toidinamai/vlock/archive/	11	MASTER_SITES= http://cthulhu.c3d2.de/~toidinamai/vlock/archive/
12		12
Lines 14-23 Link Here
14	COMMENT= Locks a terminal	14	COMMENT= Locks a terminal
15		15
16	USE_GMAKE= yes	16	USE_GMAKE= yes
		17	HAS_CONFIGURE= yes
		18	CONFIGURE_ARGS= --enable-plugins --enable-pam \
		19	--prefix=${PREFIX} \
		20	--mandir=${MANPREFIX}/man \
		21	--with-modules="${VLOCKMODULES}" \
		22	--with-scripts="${VLOCKSCRIPTS}" \
		23	VLOCK_GROUP="${VLOCKGRP}" \
		24	VLOCK_MODE="0750"
		25
		26	OPTIONS= VLOCKSCRIPTS "Install sample hook scripts" on \
		27	CACASAVER "Enable libcaca screensaver" off
17		28
18	MANLANG= ""	29	MANLANG= ""
19	MAN1= vlock.1	30	MAN1= vlock.1
20	MAN8= vlock-current.8 vlock-all.8 vlock-new.8 vlock-nosysrq.8	31	MAN5= vlock-plugins.5
21	PLIST_FILES= bin/vlock sbin/vlock-current sbin/vlock-all sbin/vlock-nosysrq sbin/vlock-new	32	MAN8= vlock-main.8
		33
		34	# Default scripts/modules
		35	VLOCKSCRIPTS=
		36	VLOCKMODULES= all.so new.so
		37
		38	# Vlock group = vlock:*:129:
		39	VLOCKGRP= vlock
		40	VLOCKGID= 129
		41
		42	.include <bsd.port.pre.mk>
		43
		44	.if !defined(WITHOUT_VLOCKSCRIPTS)
		45	VLOCKSCRIPTS+= amarok.sh example_script.sh mplayer.sh
		46	PLIST_SUB+= PL_VLOCKSCRIPTS=""
		47	.else
		48	PLIST_SUB+= PL_VLOCKSCRIPTS="@comment "
		49	.endif
		50
		51	.if !defined(WITHOUT_CACASAVER)
		52	BUILD_DEPENDS+= ${LOCALBASE}/lib/libcaca.a:${PORTSDIR}/graphics/libcaca
		53	VLOCKMODULES+= caca.so
		54	PLIST_SUB+= PL_CACASAVER=""
		55	.else
		56	PLIST_SUB+= PL_CACASAVER="@comment "
		57	.endif
		58
		59	pre-install:
		60	if ! pw groupshow ${VLOCKGRP}; then pw groupadd ${VLOCKGRP} -g ${VLOCKGID}; fi
		61
		62	post-install:
		63	.if !defined(NOPORTDOCS)
		64	@${MKDIR} ${DOCSDIR}
		65	${INSTALL_DATA} ${WRKSRC}/COPYING ${DOCSDIR}
		66	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DOCSDIR}
		67	${INSTALL_DATA} ${WRKSRC}/PLUGINS ${DOCSDIR}
		68	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
		69	${INSTALL_DATA} ${WRKSRC}/README.X11 ${DOCSDIR}
		70	${INSTALL_DATA} ${WRKSRC}/SECURITY ${DOCSDIR}
		71	${INSTALL_DATA} ${WRKSRC}/TODO ${DOCSDIR}
		72	.endif
22		73
23	.include <bsd.port.mk>	74	.include <bsd.port.post.mk>

Lines 1-36 Link Here

(-)vlock/files/patch-Makefile (-36 lines)
1	--- Makefile.orig 2007-09-08 20:04:25.000000000 +0200
2	+++ Makefile 2008-03-15 11:04:38.067938121 +0100
3	@@ -62,19 +62,23 @@
4
5	.PHONY: install-programs
6	install-programs: $(PROGRAMS)
7	- $(INSTALL) -D -m 755 -o root -g $(ROOT_GROUP) vlock $(DESTDIR)$(PREFIX)/bin/vlock
8	- $(INSTALL) -D -m 4711 -o root -g $(ROOT_GROUP) vlock-current $(DESTDIR)$(PREFIX)/sbin/vlock-current
9	- $(INSTALL) -D -m 755 -o root -g $(ROOT_GROUP) vlock-all $(DESTDIR)$(PREFIX)/sbin/vlock-all
10	- $(INSTALL) -D -m $(VLOCK_MODE) -o root -g $(VLOCK_GROUP) vlock-nosysrq $(DESTDIR)$(PREFIX)/sbin/vlock-nosysrq
11	- $(INSTALL) -D -m $(VLOCK_MODE) -o root -g $(VLOCK_GROUP) vlock-new $(DESTDIR)$(PREFIX)/sbin/vlock-new
12	+ $(INSTALL) -d $(PREFIX)/bin
13	+ $(INSTALL) -m 755 -o root -g $(ROOT_GROUP) vlock $(PREFIX)/bin/vlock
14	+ $(INSTALL) -d $(PREFIX)/sbin
15	+ $(INSTALL) -m 4711 -o root -g $(ROOT_GROUP) vlock-current $(PREFIX)/sbin/vlock-current
16	+ $(INSTALL) -m 755 -o root -g $(ROOT_GROUP) vlock-all $(PREFIX)/sbin/vlock-all
17	+ $(INSTALL) -m $(VLOCK_MODE) -o root -g $(VLOCK_GROUP) vlock-nosysrq $(PREFIX)/sbin/vlock-nosysrq
18	+ $(INSTALL) -m $(VLOCK_MODE) -o root -g $(VLOCK_GROUP) vlock-new $(PREFIX)/sbin/vlock-new
19
20	.PHONY: install-man
21	install-man:
22	- $(INSTALL) -D -m 644 -o root -g $(ROOT_GROUP) man/vlock.1 $(DESTDIR)$(PREFIX)/share/man/man1/vlock.1
23	- $(INSTALL) -D -m 644 -o root -g $(ROOT_GROUP) man/vlock-current.8 $(DESTDIR)$(PREFIX)/share/man/man8/vlock-current.8
24	- $(INSTALL) -D -m 644 -o root -g $(ROOT_GROUP) man/vlock-all.8 $(DESTDIR)$(PREFIX)/share/man/man8/vlock-all.8
25	- $(INSTALL) -D -m 644 -o root -g $(ROOT_GROUP) man/vlock-new.8 $(DESTDIR)$(PREFIX)/share/man/man8/vlock-new.8
26	- $(INSTALL) -D -m 644 -o root -g $(ROOT_GROUP) man/vlock-nosysrq.8 $(DESTDIR)$(PREFIX)/share/man/man8/vlock-nosysrq.8
27	+ $(INSTALL) -d $(MANPREFIX)/man/man1
28	+ $(INSTALL) -m 644 -o root -g $(ROOT_GROUP) man/vlock.1 $(MANPREFIX)/man/man1/vlock.1
29	+ $(INSTALL) -d $(MANPREFIX)/man/man8
30	+ $(INSTALL) -m 644 -o root -g $(ROOT_GROUP) man/vlock-current.8 $(MANPREFIX)/man/man8/vlock-current.8
31	+ $(INSTALL) -m 644 -o root -g $(ROOT_GROUP) man/vlock-all.8 $(MANPREFIX)/man/man8/vlock-all.8
32	+ $(INSTALL) -m 644 -o root -g $(ROOT_GROUP) man/vlock-new.8 $(MANPREFIX)/man/man8/vlock-new.8
33	+ $(INSTALL) -m 644 -o root -g $(ROOT_GROUP) man/vlock-nosysrq.8 $(MANPREFIX)/man/man8/vlock-nosysrq.8
34
35	.PHONY: clean
36	clean:

Lines 1-32 Link Here

(-)vlock/files/patch-config.mk (-32 lines)
1	--- config.mk.orig 2007-09-08 20:04:25.000000000 +0200
2	+++ config.mk 2008-03-15 10:57:43.866012457 +0100
3	@@ -9,18 +9,13 @@
4
5	# group to install vlock-all and vlock-nosysrq as
6	# defaults to 'root')
7	-VLOCK_GROUP =
8	+VLOCK_GROUP = wheel
9	# mode to install vlock-all and vlock-nosysrq as
10	# defaults to 4711 if group is unset and 4710 otherwise
11	VLOCK_MODE =
12
13	# root's group
14	-ROOT_GROUP = root
15	-
16	-# installation prefix
17	-PREFIX = /usr/local
18	-# installation root
19	-DESTDIR =
20	+ROOT_GROUP = wheel
21
22	# c compiler
23	CC = gcc
24	@@ -30,7 +25,7 @@
25	LDFLAGS =
26
27	# linker flags needed for pam
28	-PAM_LIBS = -ldl -lpam
29	+PAM_LIBS = -lpam
30
31	# gnu install
32	INSTALL = install

Line 0 Link Here

(-)vlock/pkg-plist (+20 lines)
	1	bin/vlock
	2	sbin/vlock-main
	3	lib/vlock/modules/all.so
	4	lib/vlock/modules/new.so
	5	%%PL_CACASAVER%%lib/vlock/modules/caca.so
	6	@dirrm lib/vlock/modules
	7	%%PL_VLOCKSCRIPTS%%lib/vlock/scripts/amarok
	8	%%PL_VLOCKSCRIPTS%%lib/vlock/scripts/example_script
	9	%%PL_VLOCKSCRIPTS%%lib/vlock/scripts/mplayer
	10	%%PL_VLOCKSCRIPTS%%@dirrm lib/vlock/scripts
	11	@dirrm lib/vlock
	12	%%PORTDOCS%%%%DOCSDIR%%/COPYING
	13	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
	14	%%PORTDOCS%%%%DOCSDIR%%/PLUGINS
	15	%%PORTDOCS%%%%DOCSDIR%%/README
	16	%%PORTDOCS%%%%DOCSDIR%%/README.X11
	17	%%PORTDOCS%%%%DOCSDIR%%/SECURITY
	18	%%PORTDOCS%%%%DOCSDIR%%/TODO
	19	%%PORTDOCS%%@dirrm %%DOCSDIR%%
	20	@exec if ! pw groupshow vlock 2>/dev/null; then pw groupadd vlock -g 129; fi