Attachment #206937 for bug #239832





PORTNAME=	secpanel
PORTVERSION=	0.6.1
PORTREVISION=	4
PORTEPOCH=	1
CATEGORIES=	security tcl tk
MASTER_SITES=	SF/${PORTNAME} \


RUN_DEPENDS=	ssh-askpass:security/openssh-askpass

USES=		tk:wrapper

OPTIONS_RADIO=	TERMINAL
OPTIONS_RADIO_TERMINAL=	GNOME-TERMINAL  MATE-TERMINAL
OPTIONS_DEFAULT=	GNOME-TERMINAL

GNOME-TERMINAL_DESC=	build with gnome-terminal
MATE-TERMINAL_DESC=	build with mate-terminal (you need mate-desktop)
GNOME-TERMINAL_RUN_DEPENDS=	gnome-terminal>=3.0.0:x11/gnome-terminal
MATE-TERMINAL_RUN_DEPENDS=	mate-terminal:x11/mate-terminal

WRKSRC=		${WRKDIR}/${PREFIX}
NO_BUILD=	yes
SUB_FILES=	pkg-message

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MMATE-TERMINAL}
USE_MATE=	desktop
.endif

DESKTOP_ENTRIES="SecPanel" "${COMMENT}" "${PORTNAME}" "${PORTNAME}" ""  ${FALSE}

post-patch:
	@${REINPLACE_CMD} \
		-e 's|\[file dirname \[info script\]\]/../lib/secpanel|${DATADIR}|' \

			${WRKSRC}/bin/secpanel

do-install:
.if ${PORT_OPTIONS:MMATE-TERMINAL}
	${REINPLACE_CMD} 's|set configs(termver) "Xterm"|set configs(termver) "MATE-Terminal"|' \
		${WRKSRC}/bin/secpanel
	${REINPLACE_CMD} 's|Xterm|MATE-Terminal|' \
		${WRKSRC}/lib/secpanel/default.config
.endif

	${INSTALL_SCRIPT} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
	@(cd ${WRKSRC}/lib/secpanel && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
	@${CHMOD} u+rw ${STAGEDIR}${DATADIR}/default.config
	${MV} ${STAGEDIR}${DATADIR}/default.config ${STAGEDIR}${DATADIR}/default.config.sample

	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps/


Lines 14-20 Link Here

(-)files/patch-bin_secpanel (-1 / +1 lines)
14	foreach {bintag binprog} \	14	foreach {bintag binprog} \
15	{sshbin ssh keygenbin ssh-keygen agentbin ssh-agent \	15	{sshbin ssh keygenbin ssh-keygen agentbin ssh-agent \
16	- addbin ssh-add askpassbin ssh-askpass scpbin scp sftpbin Filezilla termver Xterm browserbin firefox \	16	- addbin ssh-add askpassbin ssh-askpass scpbin scp sftpbin Filezilla termver Xterm browserbin firefox \
17	+ addbin ssh-add askpassbin ssh-askpass scpbin scp sftpbin Filezilla Thunar termver Xterm browserbin firefox \	17	+ addbin ssh-add askpassbin ssh-askpass scpbin scp sftpbin Filezilla Thunar thunar termver Xterm browserbin firefox \
18	} {	18	} {
19	if {! [info exists configs($bintag)]} {	19	if {! [info exists configs($bintag)]} {
20	set configs($bintag) $binprog	20	set configs($bintag) $binprog




--- lib/secpanel/default.config.orig	2019-08-26 09:10:20 UTC
+++ lib/secpanel/default.config
@@ -1,2 +1,14 @@
+set configs(sshbin) "ssh"
+set configs(keygenbin) "ssh-keygen"
+set configs(agentbin) "ssh-agent"
+set configs(addbin) "ssh-add"
+set configs(askpassbin) "ssh-askpass"
+set configs(scpbin) "scp"
+set configs(browserbin) "firefox"
+set configs(sshver) "OpenSSH"
+set configs(termver) "Xterm" 
+set configs(sftpbin) "Filezilla"
+set launcher 0
 set configs(entback) #fefefe
 set configs(listback) #ffffff
+set configs(protectdata) "0"




--- lib/secpanel/termdefs.txt.orig	2019-08-20 12:50:45 UTC
+++ lib/secpanel/termdefs.txt
@@ -56,10 +56,16 @@ set termtype(XFCE-Terminal_titlepar) "--
 set termtype(XFCE-Terminal_quotepar) ""
 set termtype(XFCE-Terminal_iconpar) ""
 set termtype(XFCE-Terminal_execpar) "-x"

 
 set termtype(Putty's-Terminal_titlepar) "-title"
 set termtype(Putty's-Terminal_quotepar) ""
 set termtype(Putty's-Terminal_iconpar) ""
 set termtype(Putty's-Terminal_execpar) "-e"
 set termtype(Putty's-Terminal_path) "pterm"
+
+set termtype(Mate-Terminal_titlepar) "--title"
+set termtype(Mate-Terminal_quotepar) ""
+set termtype(Mate-Terminal_iconpar) ""
+set termtype(Mate-Terminal_execpar) "-e"
+set termtype(Mate-Terminal_path) "mate-terminal"

Line 0 Link Here

(-)files/pkg-message.in (+13 lines)
	1
	2
	3	################################################################################################################
	4
	5
	6	If you don't have already a default.config file, you have to copy "/usr/local/share/secpanel/default.config.sample"
	7	to "/usr/local/share/secpanel/default.config" Change it as you need or use the config-panel to make changes.
	8
	9
	10	#################################################################################################################
	11
	12
	13

Lines 2-8 Link Here

(-)pkg-plist (-1 / +1 lines)
2	share/pixmaps/secpanel.png	2	share/pixmaps/secpanel.png
3	%%DATADIR%%/convert_history.tcl	3	%%DATADIR%%/convert_history.tcl
4	%%DATADIR%%/convert_profile.tcl	4	%%DATADIR%%/convert_profile.tcl
5	%%DATADIR%%/default.config	5	%%DATADIR%%/default.config.sample
6	%%DATADIR%%/default.profile	6	%%DATADIR%%/default.profile
7	%%DATADIR%%/dppw.tcl	7	%%DATADIR%%/dppw.tcl
8	%%DATADIR%%/export_profiles.tcl	8	%%DATADIR%%/export_profiles.tcl

Return to bug 239832

Lines 3-9 Link Here

(-)Makefile (-4 / +28 lines)
3		3
4	PORTNAME= secpanel	4	PORTNAME= secpanel
5	PORTVERSION= 0.6.1	5	PORTVERSION= 0.6.1
6	PORTREVISION= 3	6	PORTREVISION= 4
7	PORTEPOCH= 1	7	PORTEPOCH= 1
8	CATEGORIES= security tcl tk	8	CATEGORIES= security tcl tk
9	MASTER_SITES= SF/${PORTNAME} \	9	MASTER_SITES= SF/${PORTNAME} \
Lines 20-32 Link Here
20		20
21	RUN_DEPENDS= ssh-askpass:security/openssh-askpass	21	RUN_DEPENDS= ssh-askpass:security/openssh-askpass
22		22
23	WRKSRC= ${WRKDIR}/usr/local	23	USES= tk:wrapper
		24
		25	OPTIONS_RADIO= TERMINAL
		26	OPTIONS_RADIO_TERMINAL= GNOME-TERMINAL MATE-TERMINAL
		27	OPTIONS_DEFAULT= GNOME-TERMINAL
		28
		29	GNOME-TERMINAL_DESC= build with gnome-terminal
		30	MATE-TERMINAL_DESC= build with mate-terminal (you need mate-desktop)
		31	GNOME-TERMINAL_RUN_DEPENDS= gnome-terminal>=3.0.0:x11/gnome-terminal
		32	MATE-TERMINAL_RUN_DEPENDS= mate-terminal:x11/mate-terminal
		33
		34	WRKSRC= ${WRKDIR}/${PREFIX}
24	NO_BUILD= yes	35	NO_BUILD= yes
		36	SUB_FILES= pkg-message
25		37
26	USES= tk:wrapper	38	.include <bsd.port.options.mk>
27		39
28	DESKTOP_ENTRIES="SecPanel" "${COMMENT}" "${PORTNAME}" "${PORTNAME}" "" false	40	.if ${PORT_OPTIONS:MMATE-TERMINAL}
		41	USE_MATE= desktop
		42	.endif
29		43
		44	DESKTOP_ENTRIES="SecPanel" "${COMMENT}" "${PORTNAME}" "${PORTNAME}" "" ${FALSE}
		45
30	post-patch:	46	post-patch:
31	@${REINPLACE_CMD} \	47	@${REINPLACE_CMD} \
32	-e 's\|\[file dirname \[info script\]\]/../lib/secpanel\|${DATADIR}\|' \	48	-e 's\|\[file dirname \[info script\]\]/../lib/secpanel\|${DATADIR}\|' \
Lines 33-41 Link Here
33	${WRKSRC}/bin/secpanel	49	${WRKSRC}/bin/secpanel
34		50
35	do-install:	51	do-install:
		52	.if ${PORT_OPTIONS:MMATE-TERMINAL}
		53	${REINPLACE_CMD} 's\|set configs(termver) "Xterm"\|set configs(termver) "MATE-Terminal"\|' \
		54	${WRKSRC}/bin/secpanel
		55	${REINPLACE_CMD} 's\|Xterm\|MATE-Terminal\|' \
		56	${WRKSRC}/lib/secpanel/default.config
		57	.endif
		58
36	${INSTALL_SCRIPT} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/	59	${INSTALL_SCRIPT} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
37	@(cd ${WRKSRC}/lib/secpanel && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})	60	@(cd ${WRKSRC}/lib/secpanel && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
38	@${CHMOD} u+rw ${STAGEDIR}${DATADIR}/default.config	61	@${CHMOD} u+rw ${STAGEDIR}${DATADIR}/default.config
		62	${MV} ${STAGEDIR}${DATADIR}/default.config ${STAGEDIR}${DATADIR}/default.config.sample
39		63
40	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps/	64	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps/
41		65

Line 0 Link Here

(-)files/patch-default.config (+17 lines)
	1	--- lib/secpanel/default.config.orig 2019-08-26 09:10:20 UTC
	2	+++ lib/secpanel/default.config
	3	@@ -1,2 +1,14 @@
	4	+set configs(sshbin) "ssh"
	5	+set configs(keygenbin) "ssh-keygen"
	6	+set configs(agentbin) "ssh-agent"
	7	+set configs(addbin) "ssh-add"
	8	+set configs(askpassbin) "ssh-askpass"
	9	+set configs(scpbin) "scp"
	10	+set configs(browserbin) "firefox"
	11	+set configs(sshver) "OpenSSH"
	12	+set configs(termver) "Xterm"
	13	+set configs(sftpbin) "Filezilla"
	14	+set launcher 0
	15	set configs(entback) #fefefe
	16	set configs(listback) #ffffff
	17	+set configs(protectdata) "0"

Lines 1-6 Link Here

(-)files/patch-lib_secpanel_termdefs.txt (-2 / +11 lines)
1	--- lib/secpanel/termdefs.txt.orig 2017-04-08 17:52:46 UTC	1	--- lib/secpanel/termdefs.txt.orig 2019-08-20 12:50:45 UTC
2	+++ lib/secpanel/termdefs.txt	2	+++ lib/secpanel/termdefs.txt
3	@@ -56,7 +56,7 @@ set termtype(XFCE-Terminal_titlepar) "--title"	3	@@ -56,10 +56,16 @@ set termtype(XFCE-Terminal_titlepar) "--
4	set termtype(XFCE-Terminal_quotepar) ""	4	set termtype(XFCE-Terminal_quotepar) ""
5	set termtype(XFCE-Terminal_iconpar) ""	5	set termtype(XFCE-Terminal_iconpar) ""
6	set termtype(XFCE-Terminal_execpar) "-x"	6	set termtype(XFCE-Terminal_execpar) "-x"
Lines 9-11 Link Here
9		9
10	set termtype(Putty's-Terminal_titlepar) "-title"	10	set termtype(Putty's-Terminal_titlepar) "-title"
11	set termtype(Putty's-Terminal_quotepar) ""	11	set termtype(Putty's-Terminal_quotepar) ""
		12	set termtype(Putty's-Terminal_iconpar) ""
		13	set termtype(Putty's-Terminal_execpar) "-e"
		14	set termtype(Putty's-Terminal_path) "pterm"
		15	+
		16	+set termtype(Mate-Terminal_titlepar) "--title"
		17	+set termtype(Mate-Terminal_quotepar) ""
		18	+set termtype(Mate-Terminal_iconpar) ""
		19	+set termtype(Mate-Terminal_execpar) "-e"
		20	+set termtype(Mate-Terminal_path) "mate-terminal"