[pkg-remote-commits] [guacamole-client] 01/02: Refresh patches.
Dominik George
natureshadow-guest at moszumanska.debian.org
Wed Oct 18 10:27:14 UTC 2017
This is an automated email from the git hooks/post-receive script.
natureshadow-guest pushed a commit to branch master
in repository guacamole-client.
commit dd5022d0119f2ca37948f5c9819e1f61b13f94cc
Author: Dominik George <nik at naturalnet.de>
Date: Wed Oct 18 12:26:13 2017 +0200
Refresh patches.
---
debian/changelog | 1 +
debian/patches/fix-java-build.patch | 20 ++++++++++++--------
debian/patches/fix-js-build.patch | 19 +++++--------------
debian/patches/use-debian-js.patch | 24 +++++++++++++++---------
4 files changed, 33 insertions(+), 31 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 465446a..7904685 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ guacamole-client (0.9.13-1) UNRELEASED; urgency=medium
* New upstream version.
+ Includes fix for CVE-2016-1566. (Closes: #859136)
+ Stop building noauth module because it is now deprecated.
+ + Refresh patches.
* Update watch file for Apache Incubator. (Closes: #859373)
* Update Standards-Version to 4.1.1, no changes needed.
diff --git a/debian/patches/fix-java-build.patch b/debian/patches/fix-java-build.patch
index ae8e8c6..79f974e 100644
--- a/debian/patches/fix-java-build.patch
+++ b/debian/patches/fix-java-build.patch
@@ -7,7 +7,7 @@
--- a/guacamole/pom.xml
+++ b/guacamole/pom.xml
-@@ -48,6 +48,8 @@
+@@ -69,6 +69,8 @@
</properties>
<build>
@@ -16,7 +16,7 @@
<plugins>
<!-- Written for 1.6 -->
-@@ -60,9 +62,13 @@
+@@ -81,9 +83,13 @@
<target>1.6</target>
<compilerArgs>
<arg>-Xlint:all</arg>
@@ -31,7 +31,7 @@
</configuration>
</plugin>
-@@ -239,50 +245,6 @@
+@@ -407,50 +413,6 @@
<scope>runtime</scope>
</dependency>
@@ -82,8 +82,8 @@
<!-- Guice - Dependency Injection -->
<dependency>
<groupId>com.google.inject</groupId>
-@@ -332,6 +294,12 @@
- <version>1.17.1</version>
+@@ -507,6 +469,12 @@
+
</dependency>
+ <dependency>
@@ -97,12 +97,16 @@
</project>
--- a/pom.xml
+++ b/pom.xml
-@@ -28,8 +28,6 @@
+@@ -49,12 +49,6 @@
<module>guacamole-common-js</module>
<!-- Authentication extensions -->
+- <module>extensions/guacamole-auth-cas</module>
+- <module>extensions/guacamole-auth-duo</module>
+- <module>extensions/guacamole-auth-header</module>
- <module>extensions/guacamole-auth-jdbc</module>
- <module>extensions/guacamole-auth-ldap</module>
- <module>extensions/guacamole-auth-noauth</module>
+- <module>extensions/guacamole-auth-noauth</module>
- </modules>
+ <!-- Example web applications using the Guacamole APIs -->
+ <module>doc/guacamole-example</module>
diff --git a/debian/patches/fix-js-build.patch b/debian/patches/fix-js-build.patch
index 5157f39..6715c97 100644
--- a/debian/patches/fix-js-build.patch
+++ b/debian/patches/fix-js-build.patch
@@ -4,7 +4,7 @@ Subject: Some fixes to the JS builds
* Remove stripped libraries from build.
--- a/guacamole-common-js/pom.xml
+++ b/guacamole-common-js/pom.xml
-@@ -84,6 +84,7 @@
+@@ -106,6 +106,7 @@
<charset>UTF-8</charset>
<jsEngine>CLOSURE</jsEngine>
@@ -14,20 +14,11 @@ Subject: Some fixes to the JS builds
<jsTargetDir>/</jsTargetDir>
--- a/guacamole/pom.xml
+++ b/guacamole/pom.xml
-@@ -156,8 +156,6 @@
- <jsFinalFile>guacamole.js</jsFinalFile>
-
- <jsSourceFiles>
-- <jsSourceFile>lib/jquery/jquery.js</jsSourceFile>
-- <jsSourceFile>lib/angular/angular.min.js</jsSourceFile>
- <jsSourceFile>lib/angular-module-shim/angular-module-shim.js</jsSourceFile>
- <jsSourceFile>lib/messageformat/messageformat.js</jsSourceFile>
- <jsSourceFile>license.txt</jsSourceFile>
-@@ -175,6 +173,7 @@
+@@ -199,6 +199,7 @@
<jsSourceExclude>**/*.test.js</jsSourceExclude>
</jsSourceExcludes>
<jsEngine>CLOSURE</jsEngine>
+ <closureLanguage>ECMASCRIPT5</closureLanguage>
-
- </configuration>
- <goals>
+
+ <!-- Disable warnings for JSDoc annotations -->
+ <closureWarningLevels>
diff --git a/debian/patches/use-debian-js.patch b/debian/patches/use-debian-js.patch
index 197b241..0e62e64 100644
--- a/debian/patches/use-debian-js.patch
+++ b/debian/patches/use-debian-js.patch
@@ -5,18 +5,24 @@ Subject: Load Debian JS libraries
compiled them into the minified main application file.
--- a/guacamole/src/main/webapp/index.html
+++ b/guacamole/src/main/webapp/index.html
-@@ -54,7 +54,13 @@
- help-text="loginHelpText"
- form="expectedCredentials"
- values="acceptedCredentials"></guac-login>
--
-+
+@@ -56,14 +56,14 @@
+ <script type="text/javascript" src="relocateParameters.js"></script>
+
+ <!-- Utility libraries -->
+- <script type="text/javascript" src="webjars/jquery/2.1.3/dist/jquery.min.js"></script>
+- <script type="text/javascript" src="webjars/lodash/2.4.1/dist/lodash.min.js"></script>
+ <script type="text/javascript" src="lib/jquery/jquery.min.js"></script>
+ <script type="text/javascript" src="lib/lodash.min.js"></script>
+
+ <!-- AngularJS -->
+- <script type="text/javascript" src="webjars/angular/1.3.16/angular.min.js"></script>
+- <script type="text/javascript" src="webjars/angular-cookies/1.3.16/angular-cookies.min.js"></script>
+- <script type="text/javascript" src="webjars/angular-route/1.3.16/angular-route.min.js"></script>
+- <script type="text/javascript" src="webjars/angular-touch/1.3.16/angular-touch.min.js"></script>
+ <script type="text/javascript" src="lib//angular/angular.min.js"></script>
+ <script type="text/javascript" src="lib//angular/angular-cookies.min.js"></script>
+ <script type="text/javascript" src="lib//angular/angular-route.min.js"></script>
+ <script type="text/javascript" src="lib//angular/angular-touch.min.js"></script>
- <script type="text/javascript" src="app.js?v=${project.version}"></script>
- </body>
- </html>
+
+ <!-- Internationalization -->
+ <script type="text/javascript" src="webjars/messageformat/1.0.2/messageformat.min.js"></script>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-remote/packages/guacamole-client.git
More information about the pkg-remote-commits
mailing list