[Fusionforge-commits] r10136 - in branches/Branch_5_0/gforge: debian debian/dsf-in debian/patches packaging/control

Roland Mas lolando at libremir.placard.fr.eu.org
Mon Jun 28 13:29:12 CEST 2010


Author: lolando
Date: 2010-06-28 13:29:11 +0200 (Mon, 28 Jun 2010)
New Revision: 10136

Added:
   branches/Branch_5_0/gforge/debian/dsf-in/web-apache2.links
   branches/Branch_5_0/gforge/debian/patches/use-yui-from-distro.dpatch
Modified:
   branches/Branch_5_0/gforge/debian/changelog
   branches/Branch_5_0/gforge/debian/control
   branches/Branch_5_0/gforge/debian/patches/00list
   branches/Branch_5_0/gforge/packaging/control/030web-apache2
Log:
Debian-specific: use system's YUI library rather than the one hosted by Yahoo.

Modified: branches/Branch_5_0/gforge/debian/changelog
===================================================================
--- branches/Branch_5_0/gforge/debian/changelog	2010-06-25 17:29:48 UTC (rev 10135)
+++ branches/Branch_5_0/gforge/debian/changelog	2010-06-28 11:29:11 UTC (rev 10136)
@@ -2,8 +2,10 @@
 
   * Adapted URLs to logos and CSS for gitweb >= 1.7.  Added versioned
     dependency accordingly.
+  * Use local YUI library (over HTTPS if needed) rather than possibly
+    leaking informations to Yahoo's servers (closes: #579459).
 
- -- Roland Mas <lolando at debian.org>  Thu, 24 Jun 2010 14:02:29 +0200
+ -- Roland Mas <lolando at debian.org>  Mon, 28 Jun 2010 10:27:51 +0200
 
 fusionforge (5.0.1+svn10088-1) unstable; urgency=low
 

Modified: branches/Branch_5_0/gforge/debian/control
===================================================================
--- branches/Branch_5_0/gforge/debian/control	2010-06-25 17:29:48 UTC (rev 10135)
+++ branches/Branch_5_0/gforge/debian/control	2010-06-28 11:29:11 UTC (rev 10136)
@@ -84,7 +84,7 @@
 
 Package: gforge-web-apache2
 Architecture: all
-Depends: gforge-common, gforge-db-postgresql | gforge-db, libapache2-mod-php5, php5-cgi, php5-pgsql, php5-gd, perl, libdbi-perl, libdbd-pg-perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, cronolog, python, ssl-cert, libnusoap-php, php-htmlpurifier (>= 4.0), ${misc:Depends}
+Depends: gforge-common, gforge-db-postgresql | gforge-db, libapache2-mod-php5, php5-cgi, php5-pgsql, php5-gd, perl, libdbi-perl, libdbd-pg-perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, cronolog, python, ssl-cert, libnusoap-php, php-htmlpurifier (>= 4.0), libjs-yui, ${misc:Depends}
 Recommends: libphp-jpgraph, locales | locales-all
 Provides: gforge-web
 Conflicts: gforge-web

Added: branches/Branch_5_0/gforge/debian/dsf-in/web-apache2.links
===================================================================
--- branches/Branch_5_0/gforge/debian/dsf-in/web-apache2.links	                        (rev 0)
+++ branches/Branch_5_0/gforge/debian/dsf-in/web-apache2.links	2010-06-28 11:29:11 UTC (rev 10136)
@@ -0,0 +1 @@
+usr/share/javascript/yui usr/share/gforge/www/scripts/yui

Modified: branches/Branch_5_0/gforge/debian/patches/00list
===================================================================
--- branches/Branch_5_0/gforge/debian/patches/00list	2010-06-25 17:29:48 UTC (rev 10135)
+++ branches/Branch_5_0/gforge/debian/patches/00list	2010-06-28 11:29:11 UTC (rev 10136)
@@ -4,3 +4,4 @@
 disable-dav
 use-nusoap-from-distro
 
+use-yui-from-distro

Added: branches/Branch_5_0/gforge/debian/patches/use-yui-from-distro.dpatch
===================================================================
--- branches/Branch_5_0/gforge/debian/patches/use-yui-from-distro.dpatch	                        (rev 0)
+++ branches/Branch_5_0/gforge/debian/patches/use-yui-from-distro.dpatch	2010-06-28 11:29:11 UTC (rev 10136)
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 99-unnamed.dpatch by Christian Bayle <bayle at debian.org> and/or Roland Mas <lolando at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' gforge~/www/themes/gforge/Theme.class.php gforge/www/themes/gforge/Theme.class.php
+--- gforge~/www/themes/gforge/Theme.class.php	2010-06-28 11:26:22.000000000 +0200
++++ gforge/www/themes/gforge/Theme.class.php	2010-06-28 11:32:43.000000000 +0200
+@@ -152,8 +152,8 @@
+ 
+     function headerCSS() {
+         echo '
+-		<link href="http://yui.yahooapis.com/2.6.0/build/reset-fonts-grids/reset-fonts-grids.css" type="text/css" rel="stylesheet" />
+-		<link href="http://yui.yahooapis.com/2.6.0/build/base/base-min.css"	type="text/css" rel="stylesheet" />
++		<link rel="stylesheet" type="text/css" href="'. util_make_uri ('scripts/yui/reset-fonts-grids/reset-fonts-grids.css') .'" />
++		<link rel="stylesheet" type="text/css" href="'. util_make_uri ('scripts/yui/base/base-min.css') .'" />
+ 		<link rel="stylesheet" type="text/css" href="'. util_make_uri ('/themes/css/fusionforge.css') .'" />
+ 		<link rel="stylesheet" type="text/css" href="'. THEME_DIR .'/css/theme.css" />
+ 		<link rel="stylesheet" type="text/css" href="'. THEME_DIR .'/css/theme-pages.css" />


Property changes on: branches/Branch_5_0/gforge/debian/patches/use-yui-from-distro.dpatch
___________________________________________________________________
Added: svn:executable
   + *

Modified: branches/Branch_5_0/gforge/packaging/control/030web-apache2
===================================================================
--- branches/Branch_5_0/gforge/packaging/control/030web-apache2	2010-06-25 17:29:48 UTC (rev 10135)
+++ branches/Branch_5_0/gforge/packaging/control/030web-apache2	2010-06-28 11:29:11 UTC (rev 10136)
@@ -1,6 +1,6 @@
 Package: @OLDPACKAGE at -web-apache2
 Architecture: all
-Depends: @OLDPACKAGE at -common, @OLDPACKAGE at -db-postgresql | @OLDPACKAGE at -db, libapache2-mod-php5, php5-cgi, php5-pgsql, php5-gd, perl, libdbi-perl, libdbd-pg-perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, cronolog, python, ssl-cert, libnusoap-php, php-htmlpurifier (>= 4.0), ${misc:Depends}
+Depends: @OLDPACKAGE at -common, @OLDPACKAGE at -db-postgresql | @OLDPACKAGE at -db, libapache2-mod-php5, php5-cgi, php5-pgsql, php5-gd, perl, libdbi-perl, libdbd-pg-perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, cronolog, python, ssl-cert, libnusoap-php, php-htmlpurifier (>= 4.0), libjs-yui, ${misc:Depends}
 Recommends: libphp-jpgraph, locales | locales-all
 Provides: @OLDPACKAGE at -web
 Conflicts: @OLDPACKAGE at -web




More information about the Fusionforge-commits mailing list