nativemad    15/06/13 09:29:48

  Modified:             metadata.xml ChangeLog
  Added:                guacamole-0.9.7.ebuild
  Log:
  version bump, license change, support for postgres and noauth extensions
  
  (Portage version: 2.2.18/cvs/Linux i686, signed Manifest commit with key 
60373227)

Revision  Changes    Path
1.2                  www-apps/guacamole/metadata.xml

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/guacamole/metadata.xml?rev=1.2&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/guacamole/metadata.xml?rev=1.2&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/guacamole/metadata.xml?r1=1.1&r2=1.2

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-apps/guacamole/metadata.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- metadata.xml        10 Nov 2012 14:17:31 -0000      1.1
+++ metadata.xml        13 Jun 2015 09:29:48 -0000      1.2
@@ -13,4 +13,7 @@
        the client requires nothing more than a web browser supporting 
        HTML5 and AJAX.
     </longdescription>
-</pkgmetadata>
\ No newline at end of file
+    <use>
+       <flag name="noauth">enable support for leaving out any authentication 
on the webinterface</flag>
+    </use>
+</pkgmetadata>



1.13                 www-apps/guacamole/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/guacamole/ChangeLog?rev=1.13&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/guacamole/ChangeLog?rev=1.13&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/guacamole/ChangeLog?r1=1.12&r2=1.13

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-apps/guacamole/ChangeLog,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ChangeLog   28 Oct 2014 16:35:48 -0000      1.12
+++ ChangeLog   13 Jun 2015 09:29:48 -0000      1.13
@@ -1,6 +1,11 @@
 # ChangeLog for www-apps/guacamole
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/guacamole/ChangeLog,v 1.12 
2014/10/28 16:35:48 nativemad Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/guacamole/ChangeLog,v 1.13 
2015/06/13 09:29:48 nativemad Exp $
+
+*guacamole-0.9.7 (13 Jun 2015)
+
+  13 Jun 2015; Andreas Schuerch <native...@gentoo.org> +guacamole-0.9.7.ebuild:
+  version bump, license change, postgres and noauth support
 
 *guacamole-0.9.3 (28 Oct 2014)
 



1.1                  www-apps/guacamole/guacamole-0.9.7.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/guacamole/guacamole-0.9.7.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/guacamole/guacamole-0.9.7.ebuild?rev=1.1&content-type=text/plain

Index: guacamole-0.9.7.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/www-apps/guacamole/guacamole-0.9.7.ebuild,v 
1.1 2015/06/13 09:29:48 nativemad Exp $

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"
REQUIRED_USE="ldap? ( !mysql !postgres !noauth )
        mysql? ( !ldap !postgres !noauth )
        postgres? ( !ldap !mysql !noauth )
        noauth? ( !ldap !mysql !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 lib-directory: "/var/lib/${PN}/classpath" 
>>"${S}/${PN}/doc/example/${PN}.properties"
                echo auth-provider: 
net.sourceforge.guacamole.net.auth.noauth.NoAuthenticationProvider 
>>"${S}/${PN}/doc/example/${PN}.properties"
                echo noauth-config: /etc/guacamole/noauth-config.xml  
>>"${S}/${PN}/doc/example/${PN}.properties"
                insinto "/var/lib/${PN}/classpath"
                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 Athentication is obviously very 
insecure! Only use it if you know what you are doing!"
        elif use mysql; then
                echo lib-directory: "/var/lib/${PN}/classpath" 
>>"${S}/${PN}/doc/example/${PN}.properties"
                echo auth-provider: 
net.sourceforge.guacamole.net.auth.mysql.MySQLAuthenticationProvider 
>>"${S}/${PN}/doc/example/${PN}.properties"
                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 "/var/lib/${PN}/classpath"
                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 "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 
/var/lib/guacamole/classpath!"
                elog "-"
        elif use postgres; then
                echo lib-directory: "/var/lib/${PN}/classpath" 
>>"${S}/${PN}/doc/example/${PN}.properties"
                echo auth-provider: 
net.sourceforge.guacamole.net.auth.postgresql.PostgreSQLAuthenticationProvider 
>>"${S}/${PN}/doc/example/${PN}.properties"
                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 "/var/lib/${PN}/classpath"
                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 "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 
/var/lib/guacamole/classpath!"
                elog "-"
        elif use ldap; then
                echo lib-directory: "/var/lib/${PN}/classpath" 
>>"${S}/${PN}/doc/example/${PN}.properties"
                echo auth-provider: 
net.sourceforge.guacamole.net.auth.ldap.LDAPAuthenticationProvider 
>>"${S}/${PN}/doc/example/${PN}.properties"
                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 "/var/lib/${PN}/classpath"
                find "${WORKDIR}/${PN}-auth-ldap-${PV}/lib/" -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 "-"
        else
                insinto "/etc/${PN}"
                doins 
"${WORKDIR}/${PN}-client-${PV}/${PN}/doc/example/user-mapping.xml"
        fi
        insinto "/etc/${PN}"
        doins "${S}/${PN}/doc/example/guacamole.properties"
        doins "${S}/${PN}/doc/example/user-mapping.xml"
        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/ && 
mkdir /var/lib/tomcat-7/webapps/.${PN}"
        elog "You will also need to create a configuration in 
/var/lib/tomcat-7/webapps/.${PN}/${PN}.properties"
        elog "See 
http://guac-dev.org/doc/0.9.7/gug/configuring-guacamole.html#initial-setup for 
a basic setup"
        elog "or http://guac-dev.org/doc/0.9.7/gug/jdbc-auth.html for a 
database for authentication and host definitions."
}




Reply via email to