diff options
| author |   Hanno Boeck <hanno@gentoo.org> | 2008-10-07 23:16:39 +0000 |
|---|---|---|
| committer | Hanno Boeck <hanno@gentoo.org> | 2008-10-07 23:16:39 +0000 |
| commit | 2423de79203aea6b34ae4b59eaf15f52a6b85a5e (patch) | |
| tree | 50c3acb497497a56b70c83f562f9b6ceb779f146 /sci-geosciences | |
| parent | Stop using a patch to fix the problem of linking to the original poppler libr... (diff) | |
| download | historical-2423de79203aea6b34ae4b59eaf15f52a6b85a5e.tar.gz historical-2423de79203aea6b34ae4b59eaf15f52a6b85a5e.tar.bz2 historical-2423de79203aea6b34ae4b59eaf15f52a6b85a5e.zip | |
josm: fix http_proxy usage if no protocol is set
Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.27-rc9-00169-gb34c873 x86_64
Diffstat (limited to 'sci-geosciences')
| -rw-r--r-- | sci-geosciences/josm/ChangeLog | 5 | ||||
| -rw-r--r-- | sci-geosciences/josm/Manifest | 10 | ||||
| -rwxr-xr-x | sci-geosciences/josm/files/josm-r1 | 2 |
3 files changed, 10 insertions, 7 deletions
diff --git a/sci-geosciences/josm/ChangeLog b/sci-geosciences/josm/ChangeLog index 35a10172ba19..88c4d5d7d3f2 100644 --- a/sci-geosciences/josm/ChangeLog +++ b/sci-geosciences/josm/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sci-geosciences/josm # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/ChangeLog,v 1.16 2008/07/27 22:50:57 hanno Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/ChangeLog,v 1.17 2008/10/07 23:16:39 hanno Exp $ + + 07 Oct 2008; Hanno Boeck <hanno@gentoo.org> files/josm-r1: + Fix for setting http_proxy without protocol. *josm-1.5_p736 (27 Jul 2008) diff --git a/sci-geosciences/josm/Manifest b/sci-geosciences/josm/Manifest index c4a68873c1af..03df490f2fbf 100644 --- a/sci-geosciences/josm/Manifest +++ b/sci-geosciences/josm/Manifest @@ -1,7 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX josm-r1 298 RMD160 bdb869a4ffc5e0b87fe4cd640bf1769507cb6597 SHA1 9e95f99915a19fe791bdee0edd7229690373fdab SHA256 10ee3a842d98719606622f71744d6ec52eddc367189fe62e3a889d6a95ed0cf9 +AUX josm-r1 304 RMD160 a54bbdbbc2cd1b8ca4deeb11604be22df4194444 SHA1 0bd5757ed573a2c274d76c0b4ba4b770134a0734 SHA256 c407df927e62c4e2afbff998e105dfe4084ab07484a4b28a00f196e7dafee3cf AUX josm.png 1737 RMD160 81fc37d55d4b6b14f9a35c3ed89da3ecd7d538f2 SHA1 cd51f118224555727279536bb42a634afcef6626 SHA256 fed9c1ef73900e6a3cac162a4006ab8cd972ba29938a857e8af604779109c39f DIST josm-snapshot-736.jar 1747376 RMD160 0596d75933fe8a1decb24bf196c5be40c681fa12 SHA1 d0185f61b60484bdcd7eedebb7e79645024d2bd0 SHA256 3f46822ba9f96af32ca7127830f3987ec796a9a91363d7a32133988e0755fb6a DIST lang-de-20080705.jar 75594 RMD160 448766ae25f2612cdd18e9d1e84f8809b9823f43 SHA1 4677f0e49a5d00a770e88f7732dec5a3d0c816b3 SHA256 5f73a785ec25d7764ec02e7a8301e5ad049cc00bf01fecd24ae3a4cae47ccdb8 @@ -9,12 +9,12 @@ DIST lang-en_GB-20080207.jar 15384 RMD160 1cd109db687e376bd4b33189a5cceaf5fe3793 DIST lang-fr-20080207.jar 22508 RMD160 8710121a5400fe30de092cb040ffbc5229bb9e79 SHA1 aa19e22e298f77bccd29c1b29df741873561f976 SHA256 c9b53bef3778ffd46343660fa4963c18a4139eb39e2917cf56981cee52c34dba DIST lang-ro-20080207.jar 23019 RMD160 3ccacf43f4a8be7080e9a64929b222e71565c59f SHA1 86eae74f175c9590121c324b2067cd194ba1cc2a SHA256 5a5e6275118f22f050733abe913714706fb62e44e12c4565e09b5e111ff35312 EBUILD josm-1.5_p736.ebuild 1571 RMD160 daaaa57785354ebf3790d950618f69fa1dfd12ac SHA1 234e4c955a042375092deb4a5c9747b49ff9a4f0 SHA256 75ffe77248997488dac30900356ddf7426b93109658c3089ed73feddd5dd2e24 -MISC ChangeLog 2182 RMD160 0335fea8a84188ebfa45671ef2b5bae18ce74ebd SHA1 ae67fc0528555a92b5d82480c514b415e419e2e5 SHA256 925cb68a3b429b3d3a50bd81d08e53c75e007600367fb6a664a03248ba5afa12 +MISC ChangeLog 2291 RMD160 b59e8da1a7c57b9141404b96b29f5a31e67f3d47 SHA1 1ba19f9692f086f867238b89793bc3ba9a26575a SHA256 42eb811941e27db2a5d15ddfe50421e5aa2c8b0a91be308532adaf5300765759 MISC metadata.xml 237 RMD160 20944f06e761a57587043f3ec7ec969a5ab9bdcc SHA1 33b0366a9efeb0caad5712fb7e628147dff924be SHA256 29eb01e164be9510d6a51d6477c169df641127a2a2df064c9d99c90c067ac3d7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) -iEYEARECAAYFAkincuAACgkQr2QksT29OyCdGQCfZ15/8iv8i2QiDDPPU0s34W30 -ALcAoKIFo4mGvsZdUrvKKkjXjXxt2IAO -=P4QY +iEYEARECAAYFAkjr7dgACgkQr2QksT29OyAASwCfTOMRLoRyEgzYRMqBA8hraKto +6TIAn2git9Sfl3SNmPOitgd5mvcb/N1U +=KnsZ -----END PGP SIGNATURE----- diff --git a/sci-geosciences/josm/files/josm-r1 b/sci-geosciences/josm/files/josm-r1 index 8d9783e45639..48c34d8bb46d 100755 --- a/sci-geosciences/josm/files/josm-r1 +++ b/sci-geosciences/josm/files/josm-r1 @@ -4,6 +4,6 @@ if [ -z "$http_proxy" ]; then java -jar /usr/share/josm/lib/josm.jar else proxy_port=`echo $http_proxy|sed -e 's/.*://g'` - proxy_host=`echo $http_proxy|sed -e 's!.*://\(.*\):.*!\1!g'` + proxy_host=`echo $http_proxy|sed -e 's!\(.*://\)\?\(.*\):.*!\2!g'` java -Dhttp.proxyHost=$proxy_host -Dhttp.proxyPort=$proxy_port -jar /usr/share/josm/lib/josm.jar fi |