commit:     66c912b46c1f4f9cdf3d48db4210fcfac9501c06
Author:     Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 10 14:18:14 2015 +0000
Commit:     Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
CommitDate: Thu Sep 10 14:18:58 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66c912b4

www-apps/guacamole: Bump to 0.9.8 with better instructions

Package-Manager: portage-2.2.20.1

 www-apps/guacamole/Manifest               |   4 +
 www-apps/guacamole/guacamole-0.9.8.ebuild | 126 ++++++++++++++++++++++++++++++
 2 files changed, 130 insertions(+)

diff --git a/www-apps/guacamole/Manifest b/www-apps/guacamole/Manifest
index 4c298cb..4e11870 100644
--- a/www-apps/guacamole/Manifest
+++ b/www-apps/guacamole/Manifest
@@ -1,16 +1,20 @@
 DIST guacamole-auth-jdbc-0.9.7.tar.gz 2997194 SHA256 
f112c0ab83e4253f3a914716c5a7e61c4d7dc64d724e7c11bb4b695f386474a5 SHA512 
0bfa920fed4b5baabc6f5541d9a5badc0a88c51e95675f00889d9d6f7a2069b07f0bee4ed628b82a4c243dd0a8fb1646a5ba6f822ca5704b1f60b49f3a2fd698
 WHIRLPOOL 
013ad62f68050b8c431565fa375e6c3c50e2cd1b962b6409c3b79f8652f021f71139de6facf3cd4195b34067ad01fba33bc980bbe4d50d8cc3d7f984555396c9
+DIST guacamole-auth-jdbc-0.9.8.tar.gz 7018542 SHA256 
7a4026e1cc3cb08bf4b7c265c91df62a616560b21ec14bbde32f5c52bd0e928a SHA512 
c1c1a4f0f33a46108a45c826ad075825846838ad05205579024820f4737db6c96e35c5be3d20c78a0e088cecc08738369bdcf00c6efd43307848a71c710aa394
 WHIRLPOOL 
d05038376e7f5cb1722c0e05a5a70892341806de27cf107c99e6545f3e7d239ff2ea6b7eb3b528099dfd764ff9b79a01e038e7c37ca008f7f502d752b323d836
 DIST guacamole-auth-ldap-0.8.0.tar.gz 382872 SHA256 
745e7541ab5db9decb463a7358e17c13cab5843d8458e0bf04f5a8eda8f19064 SHA512 
2e775de3757b0e161fd7c6ac19982763bbafec42fef3418cb469cf3cb6bf1783b01486fe28e5a250af7b67107a5c3c73e2ad2b10a4e49b3ca187e76e2b578776
 WHIRLPOOL 
df9a926df2f2a095a816234b6499640149e81acb4b6610d94ff8588e28ae9eaace8c0ca1808d1522aa55531674c53cbc6b5f55f606d7af73918610c9eb095ecf
 DIST guacamole-auth-ldap-0.9.0.tar.gz 382885 SHA256 
b9e0440202a4106b6fd0a8cdd9da7bfa476895ce8724edc7d75e80b89bca9780 SHA512 
caf228029a4e69ac1ac1f252c761167c1676eadbb362877753710aa28d274f76ed8091102f5a142b871dc7a7e22f98d113c18fa06e46dfbf6ec57c3ea92b435b
 WHIRLPOOL 
3f674c98c6c0bf068426f3c78947f1f09fecc19d55a341b58f9adde8920bc30722077feed7f293d082009991bc08ab8cbddba2569a65e05fcc39b8a91f5f875f
 DIST guacamole-auth-ldap-0.9.2.tar.gz 382892 SHA256 
478b0f5a3f9df0de4614b0432707cad443ea9f65ad219cffe904c6a91177250c SHA512 
7ff6ed8aeac872aebfe654992208342370f991eabd141ac102ea553cc94b8c69c382344b5c8419745bcdc8f83b77d9b72577c8ddef9e2d000549a5fb1ae70617
 WHIRLPOOL 
846a673f1d61294b201d95160e2979254537fe80ffbbdc00756ee6202dd9886807a9c1f4b8f60653c528776a5c852cc7382cd14dec624aa10934fbf04e4a4584
 DIST guacamole-auth-ldap-0.9.3.tar.gz 382919 SHA256 
0502e3d4e8512fbdd12b144285badfe2cd0b02fa9b0072b0b9772076998c8156 SHA512 
e3eebeafd841d304f4c2beb21c1d54327bf0af2201794685c008d1812f05e70c8389888eec1e417c7e08600ebaf6f7f7330cddcf5176c9a12c987ba516155ebe
 WHIRLPOOL 
c7d2869d4ede53478cf55be4825dfdae4f47a7c03113e79dbf17afd190c823279f9967c2fefd518de0858484151901e5c3d4592ef3ffcb241c50949d59643068
 DIST guacamole-auth-ldap-0.9.7.tar.gz 384154 SHA256 
479307fc54c20f0e4c661e135c0ad7251b3601054adbccdab2b7638cfa9c40bd SHA512 
e750a89059a247ac17c7d137f8b7e03f43673a82559b91a39d0d1e69c94bb8212f7a17c335ec69f3c7d892c8ad0aaa746f50dfd247202468fc6c880e9126f1d2
 WHIRLPOOL 
bdce95eb5d8a07de539dd44e55b6b44b746d0d3b12c7caba3c205ae584bdc69a83e5d05b753a650367fb2e172bd42eea0e3a21d3ef61f9e2cb35b8a028ac203c
+DIST guacamole-auth-ldap-0.9.8.tar.gz 1055810 SHA256 
712d7462368b690ddecd26a9bac926f9f307c84a63d8af622996d29fea71c99b SHA512 
b13947581dfad5b25a423369867c1a98327fd9a6a2124c12fe16c68700caefec217f18d01a1436419cb60dd43bb7f2126f5e47f3aebd069b2ce6a46759c0b402
 WHIRLPOOL 
270991364222ea8f0202cc0fb76c129859f717e24bd3e1653a880562d077eb9368d8e56f327f60b07f7c2d615b2981dcc604261288cd90630b53087a738369d6
 DIST guacamole-auth-mysql-0.8.2.tar.gz 2101795 SHA256 
26902d50237a5bcb65b5dc9e31e7c51d6318614b97200c58c030a655e57aed82 SHA512 
9bc5e7a5750d52a3df288088fa331f9e442cea06abf704df3989e714daba03e20b07ff5c531b4966ccc2f50c49124b9b7819447330d3be9ac5cce79c368663c6
 WHIRLPOOL 
bce4711ca03315feb770cd82f07b4370ea8ff74ca38a952827b36428150ee31c3e6deaf633fd7e256047ccf9e361e80b2d46248e5f2f6c3f896363b2e2badd13
 DIST guacamole-auth-mysql-0.9.0.tar.gz 2104231 SHA256 
5419d62a8decae579b54773ed70c8f21b03c11a53c24de982e8f84a79d74423e SHA512 
00cc09e75f8c977a2465759b97022007fe34ba9272f9b9004eec404419a68b8c0b301fc385b4f09af07bde82510a6f5b808585c78a61b26cabd98529a5b1c4fa
 WHIRLPOOL 
cacb8ee6387b43b0c4fd5c473680404828acc8cbdee219930043ef2f18857ca53b1502e8a650f0cbc6a4a2dfbb42d457991043a4823445e261eb2dc53aad9601
 DIST guacamole-auth-mysql-0.9.2.tar.gz 2104317 SHA256 
74567dcb03f2b4bbe059a8270c568ccf54a0a0ed8491de4ed2c3500cde0eabc3 SHA512 
4422358b1ced34ca468f130807da6f8d7c65f39a0c3e1c7eecf004803ca62ccccda07b5a7a2b72f4b4e8337ad60783e5514af6318c2cc38f37397ba14cd2f552
 WHIRLPOOL 
cc9583781f53110fd53e4f5dd6e2fc24fdd8a1c160fc674db4694ca3517b20846f43e0bb1a172378982303d03e4be8b2cb3a9e0e5e7c52a4d0f708b4da3766f1
 DIST guacamole-auth-mysql-0.9.3.tar.gz 2104479 SHA256 
1cd081758b81b7cc082c383c7c2804434cb90ce609f5d02ed5c48fdcd50d13e6 SHA512 
b33e1228b261e3857c385260a15f7b3b6088bdcaf2785f837b9525c5469a7af6560610c8064614b438160d98e349487037d78c11737dbef6a83be6b41bd37e4c
 WHIRLPOOL 
371617fecb15b193cb51a3f76896982365e7d1d4c394021eeaec5281f57ce885517240842ce30f9543b002db71907ae550173b8ba75f19c866f297c3c52985a5
 DIST guacamole-auth-noauth-0.9.7.tar.gz 5810 SHA256 
0ff433a73dcbc014cc5c7269f408ef01d02ab0d743f4b45a868b0f98a38d61ba SHA512 
1f5e6f0b9e035c75edc556ff47a73e8e6e047369306e00e1281a97ac4896c7563b41dfbd66c89926d972e01a5aee3fdd9c0214d91cb84a83f177a4e3df05d537
 WHIRLPOOL 
7b75d883f6785bee4470cc3dee70e964c36447c0d1434c785e23b2d5bed8b18b3488c04dc4f8ae04f5a12dd54ba88ac7035acea99cd89e855ff264b1c548a09f
+DIST guacamole-auth-noauth-0.9.8.tar.gz 6011 SHA256 
3e3c060b37e6fd606b489ffb8b048749208d4124e075e42fb2b1cfe556cf4d4b SHA512 
481f7ee88cbc7989734afb23cb9807d2cab71846ecdd17475f0e24afab5d3cd82040d5f448abe3eb01bfd828b9d834a753e0f0ec573b8b8c863fe5e2718ad1a2
 WHIRLPOOL 
8ad6bb47e47fe3f7e905e4f4e44a41affbe890a38d066357f255006ce0879f29a509255a750d2fae4a3d5e295e1f78fcd8898b22cd03060c2252df9d09859624
 DIST guacamole-client-0.8.3.tar.gz 345097 SHA256 
a2e3d96b9f83308caf35068d657882fff9c3977533bb3b125cda1971422112ce SHA512 
395ffbb08b877e4af538b1d0859d8e28e3352f2fe41482e7790c9b3c7597f37882ca032d383c7994d5f2e193404c5c267cdf793d642fb551e04465edfe93d7f0
 WHIRLPOOL 
19a778b40b7220604a7c5ecd93fa8a7680b7efadf304ffb5b747dad52bbf6dffdeed5a16c26cdd3773b6a0a155b7ba23a76b3233bdd2d658c0dc71a4a86ada80
 DIST guacamole-client-0.9.0.tar.gz 314566 SHA256 
2f98776e542fccdeb3a120ae266834e56935a30196d0c3088a8fa523a07f3594 SHA512 
33dd583cde9188066f0254fe9a531886be79110ef9f0e62fc60771d2751a927f783eb484e5484760e4ed3bc2aaa1f2000f43f953b78122cbdc2b0f19d8141457
 WHIRLPOOL 
972ea5c2bfe7f7dc2b1cc42ca6bc49485c18e46b161180e6eddf828467dcce76cae58f89ca0a4e847ab33ebb0ee2ffa87b052c94a9707d8b1538cc3f1ac29c20
 DIST guacamole-client-0.9.2.tar.gz 386263 SHA256 
c12f9b1b32621cc44d1e428d71eac5798f85f6b8df23edd3920907678205084c SHA512 
e9e73b23b64883c64a1bd0908ecc9e685dc23308c3d44bd2c9c691e43fe383424bfc14816d0248b0f2a693da473a3a780a2d2469024aae53587b67f78d0b0af6
 WHIRLPOOL 
5a25e9942c9d9067bfad063833f89cc003ad8ba99c1ad1a2fd49d901f3c3616dac974f6abc67a4854129ea5160a7f7194a6b3e72e4741b0ff9a71025f57f229f
 DIST guacamole-client-0.9.3.tar.gz 396313 SHA256 
e579ef8f5271c19955429b9d064fd58f7554031c078557c1d65e5d51f695d8d1 SHA512 
4ec3ec74b1175ce6b3cde4b9669a3f54f21b45c489c592ea3cabd2af670bf0ec9449f8a368d416640ed7348e77c23ad05243b4fdff083a120f432053642f7727
 WHIRLPOOL 
cb44f374acce366964554cd192440cd4eb71e6b5364bff31a853a7769becce34a608358c204702702220e602cf94732af59ab707b4fb38452cbc78fca541829f
 DIST guacamole-client-0.9.7.tar.gz 1580766 SHA256 
905c32cb26844d7fca2a135cc6fcbc5017da7a71df5d4fed01786fe404ab9883 SHA512 
eb9d9be14e9a55192c2e341fbd9b07d3cf1b3f4f06dbe97cdb5ca5d624362a895a6369100859716d9cf65562fa251424c9b3a36c2a7d4812bfb2814ab96dc5c3
 WHIRLPOOL 
fbdade073fd2be4ea442d1b604f623a1e0046d744b86447e1eabc42643aae70eec62b596e2e014b294f14377c5823a42a498b75c06ded70346446b4ccc9c72b4
+DIST guacamole-client-0.9.8.tar.gz 1685223 SHA256 
115107d4404a96abb122e5e4c06071adfe60bdd6bc7ff949dc537578f98e7f8b SHA512 
e8152a10c8c51b0adff93ee476287e3c264ddae4de4b581a43009d8613e8cc2276ddd1ff5a53e84d74ff19901ec82433321d176e1335b4445dcbed04afe6f9f8
 WHIRLPOOL 
3daf2ac277f12360914c8cea0752a146d944ff8eaba01bfade5e8863b5e7d0da2163767b732b6f96120c4bfb2ab2f3eaa38fa700663b114684de12a311cd7411

diff --git a/www-apps/guacamole/guacamole-0.9.8.ebuild 
b/www-apps/guacamole/guacamole-0.9.8.ebuild
new file mode 100644
index 0000000..0e27996
--- /dev/null
+++ b/www-apps/guacamole/guacamole-0.9.8.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+DESCRIPTION="Guacamole is a html5 vnc client as servlet"
+HOMEPAGE="http://guac-dev.org/";
+SRC_URI="mirror://sourceforge/${PN}/${PN}-client-${PV}.tar.gz
+       mysql? ( 
http://sourceforge.net/projects/${PN}/files/current/extensions/${PN}-auth-jdbc-${PV}.tar.gz
 )
+       postgres? ( 
http://sourceforge.net/projects/${PN}/files/current/extensions/${PN}-auth-jdbc-${PV}.tar.gz
 )
+       noauth? ( 
http://sourceforge.net/projects/${PN}/files/current/extensions/${PN}-auth-noauth-${PV}.tar.gz
 )
+       ldap? ( 
http://sourceforge.net/projects/guacamole/files/current/extensions/${PN}-auth-ldap-${PV}.tar.gz
 )"
+S="${WORKDIR}/${PN}-client-${PV}"
+
+LICENSE="MIT"
+
+SLOT="0"
+
+KEYWORDS="~x86 ~amd64"
+
+IUSE="ldap mysql postgres noauth"
+
+DEPEND="dev-java/maven-bin:*"
+
+RDEPEND="${DEPEND}
+       www-servers/tomcat[websockets]
+       >virtual/jre-1.6
+       net-misc/guacamole-server
+       mysql? ( virtual/mysql )
+       postgres? ( dev-db/postgresql )
+       ldap? ( net-nds/openldap )"
+
+src_compile() {
+       mkdir "${HOME}"/.m2
+       cat /usr/share/`readlink /usr/bin/mvn | sed 
's:mvn:maven-bin:'`/conf/settings.xml | \
+       sed -e 's:/path/to/local/repo:'${HOME}/.m2':g' -e 's:<!-- localRepo::' 
>"${S}"/settings.xml
+       mvn -s "${S}"/settings.xml package
+}
+
+src_install() {
+       echo guacd-hostname: localhost 
>>"${S}/${PN}/doc/example/${PN}.properties"
+       echo guacd-port:     4822 >>"${S}/${PN}/doc/example/${PN}.properties"
+       echo basic-user-mapping: /etc/guacamole/user-mapping.xml 
>>"${S}/${PN}/doc/example/${PN}.properties"
+       if use noauth; then
+               sed -e 's:basic-user-mapping:#basic-user-mapping:' -i 
"${S}/${PN}/doc/example/${PN}.properties"
+               echo noauth-config: /etc/guacamole/noauth-config.xml  
>>"${S}/${PN}/doc/example/${PN}.properties"
+               insinto "/etc/${PN}/extensions"
+               find "${WORKDIR}/${PN}-auth-noauth-${PV}/" -name '*.jar' -exec 
doins '{}' +
+               insinto "/etc/guacamole"
+               find "${WORKDIR}/${PN}-auth-noauth-${PV}/doc/example/" -name 
'*.xml' -exec doins '{}' +
+               elog "Warning: Setting No Authentication is obviously very 
insecure! Only use it if you know what you are doing!"
+       fi
+       if use mysql; then
+               echo mysql-hostname: localhost 
>>"${S}/${PN}/doc/example/${PN}.properties"
+               echo mysql-port: 3306 
>>"${S}/${PN}/doc/example/${PN}.properties"
+               echo mysql-database: guacamole 
>>"${S}/${PN}/doc/example/${PN}.properties"
+               echo mysql-username: guacamole 
>>"${S}/${PN}/doc/example/${PN}.properties"
+               echo mysql-password: some_password 
>>"${S}/${PN}/doc/example/${PN}.properties"
+               sed -e 's:basic-user-mapping:#basic-user-mapping:' -i 
"${S}/${PN}/doc/example/${PN}.properties"
+               insinto "/etc/${PN}/extensions"
+               find "${WORKDIR}/${PN}-auth-jdbc-${PV}/mysql/" -name '*.jar' 
-exec doins '{}' +
+               insinto "/usr/share/${PN}/schema"
+               find "${WORKDIR}/${PN}-auth-jdbc-${PV}/mysql/schema/" -name 
'*.sql' -exec doins '{}' +
+               insinto "/usr/share/${PN}/schema/upgrade"
+               find "${WORKDIR}/${PN}-auth-jdbc-${PV}/mysql/schema/upgrade/" 
-name '*.sql' -exec doins '{}' +
+               elog "Please add a mysql database and a user and load the sql 
files in /usr/share/guacamole/schema/ into it."
+               elog "If this is an update, then you will need to apply the 
appropriate update script in the location above."
+               elog "You will also need to adjust the DB propeties in 
/etc/guacamole.properties!"
+               elog "The default user and it's password is \"guacadmin\"."
+               elog "You will also need to download the mysql-connector from 
here http://dev.mysql.com/downloads/connector/j/";
+               elog "and put the contained .jar file into /etc/guacamole/lib!"
+               elog "-"
+       fi
+       if use postgres; then
+               echo postgresql-hostname: localhost 
>>"${S}/${PN}/doc/example/${PN}.properties"
+               echo postgresql-port: 5432 
>>"${S}/${PN}/doc/example/${PN}.properties"
+               echo postgresql-database: guacamole 
>>"${S}/${PN}/doc/example/${PN}.properties"
+               echo postgresql-username: guacamole 
>>"${S}/${PN}/doc/example/${PN}.properties"
+               echo postgresql-password: some_password 
>>"${S}/${PN}/doc/example/${PN}.properties"
+               sed -e 's:basic-user-mapping:#basic-user-mapping:' -i 
"${S}/${PN}/doc/example/${PN}.properties"
+               insinto "/etc/${PN}/extensions"
+               find "${WORKDIR}/${PN}-auth-jdbc-${PV}/postgresql/" -name 
'*.jar' -exec doins '{}' +
+               insinto "/usr/share/${PN}/schema"
+               find "${WORKDIR}/${PN}-auth-jdbc-${PV}/postgresql/schema/" 
-name '*.sql' -exec doins '{}' +
+               insinto "/usr/share/${PN}/schema/upgrade"
+               find 
"${WORKDIR}/${PN}-auth-jdbc-${PV}/postgresql/schema/upgrade/" -name '*.sql' 
-exec doins '{}' +
+               elog "Please add a postgresql database and a user and load the 
sql files in /usr/share/guacamole/schema/ into it."
+               elog "If this is an update, then you will need to apply the 
appropriate update script in the location above."
+               elog "You will also need to adjust the DB propeties in 
/etc/guacamole.properties!"
+               elog "The default user and it's password is \"guacadmin\"."
+               elog "You will also need to download the postgresql-connector 
from here https://jdbc.postgresql.org/download.html#current";
+               elog "and put the contained .jar file into /etc/guacamole/lib!"
+               elog "-"
+       fi
+       if use ldap; then
+               echo ldap-hostname: localhost 
>>"${S}/${PN}/doc/example/${PN}.properties"
+               echo ldap-port: 389 >>"${S}/${PN}/doc/example/${PN}.properties"
+               echo ldap-user-base-dn: ou=people,dc=example,dc=net 
>>"${S}/${PN}/doc/example/${PN}.properties"
+               echo ldap-username-attribute: uid 
>>"${S}/${PN}/doc/example/${PN}.properties"
+               echo ldap-config-base-dn: ou=groups,dc=example,dc=net 
>>"${S}/${PN}/doc/example/${PN}.properties"
+               sed -e 's:basic-user-mapping:#basic-user-mapping:' -i 
"${S}/${PN}/doc/example/${PN}.properties"
+               insinto "/etc/${PN}/extensions"
+               find "${WORKDIR}/${PN}-auth-ldap-${PV}" -name '*.jar' -exec 
doins '{}' +
+               insinto "/usr/share/${PN}/schema"
+               doins 
"${WORKDIR}/${PN}-auth-ldap-${PV}/schema/guacConfigGroup.ldif" 
"${WORKDIR}/${PN}-auth-ldap-${PV}/schema/guacConfigGroup.schema"
+               elog "You will need to add and load the .schema file in 
/usr/share/guacamole/schema/ to your ldap server."
+               elog "There is also an example .lidf file for creating the 
users."
+               elog "-"
+       fi
+       insinto "/etc/${PN}"
+       doins "${WORKDIR}/${PN}-client-${PV}/${PN}/doc/example/user-mapping.xml"
+       insinto "/etc/${PN}"
+       doins "${S}/${PN}/doc/example/guacamole.properties"
+       echo "GUACAMOLE_HOME=/etc/guacamole" >98guacamole
+       doenvd 98guacamole
+       insinto "/var/lib/${PN}"
+       newins "${S}/${PN}/target/${P}.war" "${PN}.war"
+       elog "If it is an update, please make sure to delete the old webapp in 
/var/lib/tomcat-7/webapps/ first!"
+       elog "To deploy guacamole with tomcat, you will need to link the war 
file and create the configuration!"
+       elog "ln -sf /var/lib/${PN}/${PN}.war /var/lib/tomcat-7/webapps/"
+       elog "You will also need to adjust the configuration in 
/etc/${PN}/${PN}.properties"
+       elog "See 
http://guac-dev.org/doc/${PV}/gug/configuring-guacamole.html#initial-setup for 
a basic setup"
+       elog "or http://guac-dev.org/doc/${PV}/gug/jdbc-auth.html for a 
database for authentication and host definitions."
+}

Reply via email to