FreeBSD Bugzilla – Attachment 206974 Details for
Bug 239832
security/secpanel hard-coding of "gnome-terminal" fails under mate-only installation
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
svn-diff-secpanel_v14
svn-diff-secpanel (text/plain), 6.51 KB, created by
Walter Schwarzenfeld
on 2019-08-28 13:29:35 UTC
(
hide
)
Description:
svn-diff-secpanel_v14
Filename:
MIME Type:
Creator:
Walter Schwarzenfeld
Created:
2019-08-28 13:29:35 UTC
Size:
6.51 KB
patch
obsolete
>Index: Makefile >=================================================================== >--- Makefile (revision 509305) >+++ Makefile (working copy) >@@ -3,7 +3,7 @@ > > PORTNAME= secpanel > PORTVERSION= 0.6.1 >-PORTREVISION= 3 >+PORTREVISION= 4 > PORTEPOCH= 1 > CATEGORIES= security tcl tk > MASTER_SITES= SF/${PORTNAME} \ >@@ -20,13 +20,31 @@ > > RUN_DEPENDS= ssh-askpass:security/openssh-askpass > >-WRKSRC= ${WRKDIR}/usr/local >+USES= tk:wrapper >+ >+OPTIONS_RADIO= TERMINAL >+OPTIONS_RADIO_TERMINAL= GNOME-TERMINAL MATE-TERMINAL XTERM >+OPTIONS_DEFAULT= GNOME-TERMINAL >+ >+GNOME-TERMINAL_DESC= build with gnome-terminal >+MATE-TERMINAL_DESC= build with mate-terminal (you need mate-desktop) >+XTERM_DESC= build with xterm >+GNOME-TERMINAL_RUN_DEPENDS= gnome-terminal>=3.0.0:x11/gnome-terminal >+MATE-TERMINAL_RUN_DEPENDS= mate-terminal:x11/mate-terminal >+XTERM_RUN_DEPENDS= xterm:x11/xterm >+ >+WRKSRC= ${WRKDIR}/${PREFIX} > NO_BUILD= yes >+SUB_FILES= pkg-message > >-USES= tk:wrapper >+.include <bsd.port.options.mk> > >-DESKTOP_ENTRIES="SecPanel" "${COMMENT}" "${PORTNAME}" "${PORTNAME}" "" false >+.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}|' \ >@@ -33,9 +51,22 @@ > ${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 >+.elif ${PORT_OPTIONS:MGNOME-TERMINAL} >+ ${REINPLACE_CMD} 's|set configs(termver) "Xterm"|set configs(termver) "GNOME-Terminal"|' \ >+ ${WRKSRC}/bin/secpanel >+ ${REINPLACE_CMD} 's|Xterm|GNOME-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/ > >Index: files/patch-bin_secpanel >=================================================================== >--- files/patch-bin_secpanel (revision 509305) >+++ files/patch-bin_secpanel (working copy) >@@ -14,7 +14,7 @@ > foreach {bintag binprog} \ > {sshbin ssh keygenbin ssh-keygen agentbin ssh-agent \ > - addbin ssh-add askpassbin ssh-askpass scpbin scp sftpbin Filezilla termver Xterm browserbin firefox \ >-+ addbin ssh-add askpassbin ssh-askpass scpbin scp sftpbin Filezilla Thunar termver Xterm browserbin firefox \ >++ addbin ssh-add askpassbin ssh-askpass scpbin scp sftpbin Filezilla Thunar thunar termver Xterm browserbin firefox \ > } { > if {! [info exists configs($bintag)]} { > set configs($bintag) $binprog >Index: files/patch-default.config >=================================================================== >--- files/patch-default.config (nonexistent) >+++ files/patch-default.config (working copy) >@@ -0,0 +1,17 @@ >+--- 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" > >Property changes on: files/patch-default.config >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: files/patch-lib_secpanel_termdefs.txt >=================================================================== >--- files/patch-lib_secpanel_termdefs.txt (revision 509305) >+++ files/patch-lib_secpanel_termdefs.txt (working copy) >@@ -1,6 +1,6 @@ >---- lib/secpanel/termdefs.txt.orig 2017-04-08 17:52:46 UTC >+--- lib/secpanel/termdefs.txt.orig 2019-08-20 12:50:45 UTC > +++ lib/secpanel/termdefs.txt >-@@ -56,7 +56,7 @@ set termtype(XFCE-Terminal_titlepar) "--title" >+@@ -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" >@@ -9,3 +9,12 @@ > > 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" >Index: files/pkg-message.in >=================================================================== >--- files/pkg-message.in (nonexistent) >+++ files/pkg-message.in (working copy) >@@ -0,0 +1,13 @@ >+ >+ >+################################################################################################################ >+ >+ >+If you don't have already a default.config file, you have to copy "/usr/local/share/secpanel/default.config.sample" >+to "/usr/local/share/secpanel/default.config" Change it as you need or use the config-panel to make changes. >+ >+ >+################################################################################################################# >+ >+ >+ > >Property changes on: files/pkg-message.in >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: pkg-plist >=================================================================== >--- pkg-plist (revision 509305) >+++ pkg-plist (working copy) >@@ -2,7 +2,7 @@ > share/pixmaps/secpanel.png > %%DATADIR%%/convert_history.tcl > %%DATADIR%%/convert_profile.tcl >-%%DATADIR%%/default.config >+%%DATADIR%%/default.config.sample > %%DATADIR%%/default.profile > %%DATADIR%%/dppw.tcl > %%DATADIR%%/export_profiles.tcl
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 239832
:
206687
|
206688
|
206689
|
206726
|
206813
|
206821
|
206912
|
206913
|
206914
|
206916
|
206917
|
206918
|
206934
|
206935
|
206936
|
206937
|
206949
| 206974