diff options
| author |   Miroslav Šulc <fordfrog@gentoo.org> | 2013-02-25 13:19:02 +0000 |
|---|---|---|
| committer | Miroslav Šulc <fordfrog@gentoo.org> | 2013-02-25 13:19:02 +0000 |
| commit | 38775025689d966356e6f154cd952995de1de8c7 (patch) | |
| tree | a9604ff99270b5114108aa0c1d747b027c9693ad /dev-java/netbeans-nb | |
| parent | Stable for x86, wrt bug #458238 (diff) | |
| download | gentoo-2-38775025689d966356e6f154cd952995de1de8c7.tar.gz gentoo-2-38775025689d966356e6f154cd952995de1de8c7.tar.bz2 gentoo-2-38775025689d966356e6f154cd952995de1de8c7.zip | |
dev-java/netbeans-nb: added missing patch
(Portage version: 2.1.11.52/cvs/Linux x86_64, signed Manifest commit with key CFE47E2F)
Diffstat (limited to 'dev-java/netbeans-nb')
| -rw-r--r-- | dev-java/netbeans-nb/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/netbeans-nb/files/7.3/keychain-support.patch | 26 |
2 files changed, 31 insertions, 1 deletions
diff --git a/dev-java/netbeans-nb/ChangeLog b/dev-java/netbeans-nb/ChangeLog index a76fbf0dfd99..8f5c695e9616 100644 --- a/dev-java/netbeans-nb/ChangeLog +++ b/dev-java/netbeans-nb/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/netbeans-nb # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-nb/ChangeLog,v 1.19 2013/02/21 15:51:37 fordfrog Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-nb/ChangeLog,v 1.20 2013/02/25 13:19:02 fordfrog Exp $ + + 25 Feb 2013; Miroslav Šulc <fordfrog@gentoo.org> + +files/7.3/keychain-support.patch: + added missing patch *netbeans-nb-7.3 (21 Feb 2013) diff --git a/dev-java/netbeans-nb/files/7.3/keychain-support.patch b/dev-java/netbeans-nb/files/7.3/keychain-support.patch new file mode 100644 index 000000000000..4e9c4878fbcc --- /dev/null +++ b/dev-java/netbeans-nb/files/7.3/keychain-support.patch @@ -0,0 +1,26 @@ +# HG changeset patch +# Parent cbf7b2d2851314077b9c1ecd6ec95ce51453daf8 +diff -r cbf7b2d28513 -r 0350861eeabf ide/launcher/unix/netbeans +--- a/ide/launcher/unix/netbeans Tue Nov 09 13:44:15 2010 +0100 ++++ b/ide/launcher/unix/netbeans Tue Nov 09 14:21:18 2010 +0100 +@@ -169,6 +169,20 @@ + then + sh=/bin/bash + fi ++ keychain=`which keychain` ++ if [ -n "$keychain" ]; then ++ $keychain -q ++ . $HOME/.keychain/$HOSTNAME-sh ++ if [ -e $userdir/keychain-keys.txt ]; then ++ for key in `cat $userdir/keychain-keys.txt`; do ++ SSH_ASKPASS=`which x11-ssh-askpass` ++ export SSH_ASKPASS ++ if [ -n "$key" ]; then ++ keychain $key ++ fi ++ done ++ fi ++ fi + if [ "${founduserdir}" = "yes" ]; then + exec $sh "$nbexec" "$@" + else |