[Fusionforge-commits] FusionForge branch master updated. 54fd4c11b564d85eb70895550057f31927db6b3a

Sylvain Beucler beuc-inria at fusionforge.org
Fri Sep 5 12:11:09 CEST 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, master has been updated
       via  54fd4c11b564d85eb70895550057f31927db6b3a (commit)
       via  1463c39262479b78b483c95f8677f0a8436b38b4 (commit)
       via  c4916c40ac0d9ec4e8ea87d7550dfdd3169005fa (commit)
      from  fd9b9a710dae4793bbf884a30c4911a424a89699 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 54fd4c11b564d85eb70895550057f31927db6b3a
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Fri Sep 5 12:05:49 2014 +0200

    Move libs to vendor/ to ease replacement in distros

diff --git a/src/common/tracker/Artifact.class.php b/src/common/tracker/Artifact.class.php
index a3834b3..c845554 100644
--- a/src/common/tracker/Artifact.class.php
+++ b/src/common/tracker/Artifact.class.php
@@ -1592,12 +1592,15 @@ class Artifact extends Error {
 			$body .= "\nYou can respond by visiting: ".
 				"\n".util_make_url ('/tracker/?func=detail&atid='. $this->ArtifactType->getID() .
 					    "&aid=". $this->getID() .
-					    "&group_id=". $this->ArtifactType->Group->getID()) .
+					    "&group_id=". $this->ArtifactType->Group->getID());
+			if (false) {  // currently not working
+				$body .=
 				"\nOr by replying to this e-mail entering your response between the following markers: ".
 				"\n".ARTIFACT_MAIL_MARKER.
 				"\n(enter your response here, only in plain text format)".
-				"\n".ARTIFACT_MAIL_MARKER.
-				"\n";
+				"\n".ARTIFACT_MAIL_MARKER;
+			}
+			$body .= "\n";
 		}
 
 		$body .= "\n".$this->marker('status',$changes).
diff --git a/src/debian/control.in b/src/debian/control.in
index 3628ce9..6cb5098 100644
--- a/src/debian/control.in
+++ b/src/debian/control.in
@@ -73,7 +73,7 @@ Description: collaborative development tool - database (remote)
 
 Package: fusionforge-web
 Architecture: all
-Depends: fusionforge-common (=${source:Version}), fusionforge-db, php5-cli, libapache2-mod-php5, libphp-simplepie, python, ucf, ${misc:Depends}
+Depends: fusionforge-common (=${source:Version}), fusionforge-db, php5-cli, libapache2-mod-php5, libphp-simplepie, libjs-jquery-livequery, python, ucf, ${misc:Depends}
 Recommends: locales-all
 Description: collaborative development tool - web part (using Apache)
  FusionForge provides many tools to aid collaboration in a
diff --git a/src/debian/rules b/src/debian/rules
index 36c207e..96ac583 100755
--- a/src/debian/rules
+++ b/src/debian/rules
@@ -39,10 +39,14 @@ override_dh_auto_install:
 			echo plugins/$$i/README > debian/fusionforge-plugin-$$i.docs; \
 		fi; \
 	done
-#	embedded-php-library usr/share/fusionforge/**/simplepie.inc -> libphp-simplepie
+#	embedded-php-library .../simplepie.inc -> libphp-simplepie
 	rm -rf debian/fusionforge-web/usr/share/fusionforge/vendor/simplepie/
-#	embedded-php-library usr/share/fusionforge/**/Snoopy.class.php -> libphp-snoopy
+#	embedded-php-library .../Snoopy.class.php -> libphp-snoopy
 	rm -rf debian/fusionforge-web/usr/share/fusionforge/vendor/libphp-snoopy/
+#	embedded-javascript-library .../jquery.livequery.js -> libjs-jquery-livequery
+	rm -rf debian/fusionforge-web/usr/share/fusionforge/vendor/jquery-livequery/
+	ln -s /usr/share/javascript/jquery-livequery \
+		debian/fusionforge-web/usr/share/fusionforge/vendor/jquery-livequery
 #	extra-license-file usr/share/fusionforge/**/postreceiveemail/LICENCE
 	rm -f debian/fusionforge-plugin-scmhook/usr/share/fusionforge/plugins/scmhook/library/scmgit/hooks/postreceiveemail/LICENCE
 
diff --git a/src/etc/config.ini.d/debug.ini b/src/etc/config.ini.d/debug.ini
index 2625972..42d5480 100644
--- a/src/etc/config.ini.d/debug.ini
+++ b/src/etc/config.ini.d/debug.ini
@@ -1,12 +1,13 @@
 [core]
 
 ; Switch to "production" to remove extra debugging
-installation_environment = development
+;installation_environment = development
+installation_environment = production
 
 ; fine-grained control over debugging
 
 ; enable debugging at all (overlay the page with pink box)
-sysdebug_enable = true
+sysdebug_enable = false
 
 ; enable the PHP Error Handler (default if sysdebug_enable)
 sysdebug_phphandler = true
diff --git a/src/plugins/scmsvn/etc/scmsvn.ini b/src/plugins/scmsvn/etc/scmsvn.ini
index 5596d19..0fbec73 100644
--- a/src/plugins/scmsvn/etc/scmsvn.ini
+++ b/src/plugins/scmsvn/etc/scmsvn.ini
@@ -7,9 +7,9 @@
 ; is available in installation_environment = development only.
 plugin_status = valid
 
-use_dav = yes
+use_dav = no
 use_ssl = "$core/use_ssl"
-use_ssh = no
+use_ssh = yes
 anonsvn_login = anonsvn
 anonsvn_password = anonsvn
 default_server = "$core/web_host"
diff --git a/src/templates/httpd.conf.d/vhost-main.inc b/src/templates/httpd.conf.d/vhost-main.inc
index f3c0513..f5e637c 100644
--- a/src/templates/httpd.conf.d/vhost-main.inc
+++ b/src/templates/httpd.conf.d/vhost-main.inc
@@ -39,6 +39,7 @@ Alias /scripts/jquery-ui/ {core/source_path}/vendor/jquery-ui/
 Alias /scripts/jquery-storage/ {core/source_path}/vendor/jquery-storage/
 Alias /scripts/jquery-simpletreemenu/ {core/source_path}/vendor/jquery-simpletreemenu/
 Alias /scripts/jquery-jqplot/ {core/source_path}/vendor/jquery-jqplot/
+Alias /scripts/jquery-livequery/ {core/source_path}/vendor/jquery-livequery/
 Alias /scripts/jquery-teamwork-gantt/ {core/source_path}/vendor/jquery-teamwork-gantt/
 Alias /scripts/jquery-splitter/ {core/source_path}/vendor/jquery-splitter/
 Alias /scripts/jquery-auto-height/ {core/source_path}/vendor/jquery-auto-height/
diff --git a/src/vendor/jquery-teamwork-gantt/libs/jquery.livequery.js b/src/vendor/jquery-livequery/jquery.livequery.js
similarity index 100%
rename from src/vendor/jquery-teamwork-gantt/libs/jquery.livequery.js
rename to src/vendor/jquery-livequery/jquery.livequery.js
diff --git a/src/vendor/jquery-teamwork-gantt/libs/jquery.livequery.min.js b/src/vendor/jquery-livequery/jquery.livequery.min.js
similarity index 100%
rename from src/vendor/jquery-teamwork-gantt/libs/jquery.livequery.min.js
rename to src/vendor/jquery-livequery/jquery.livequery.min.js
diff --git a/src/vendor/jquery-teamwork-gantt/libs/jquery.timers.js b/src/vendor/jquery-livequery/jquery.timers.js
similarity index 100%
rename from src/vendor/jquery-teamwork-gantt/libs/jquery.timers.js
rename to src/vendor/jquery-livequery/jquery.timers.js
diff --git a/src/www/soap/nusoap.php b/src/vendor/nusoap/nusoap.php
similarity index 100%
rename from src/www/soap/nusoap.php
rename to src/vendor/nusoap/nusoap.php
diff --git a/src/www/include/html.php b/src/www/include/html.php
index 8c571ee..fa9ecdf 100644
--- a/src/www/include/html.php
+++ b/src/www/include/html.php
@@ -495,7 +495,7 @@ function html_use_jqueryjqplotplugindateAxisRenderer() {
 
 function html_use_jqueryteamworkgantt() {
 	html_use_jqueryui();
-	use_javascript('/scripts/jquery-teamwork-gantt/libs/jquery.livequery.min.js');
+	use_javascript('/scripts/jquery-livequery/jquery.livequery.min.js');
 	use_javascript('/scripts/jquery-teamwork-gantt/libs/jquery.timers.js');
 	use_javascript('/scripts/jquery-teamwork-gantt/libs/platform.js');
 	use_javascript('/scripts/jquery-teamwork-gantt/libs/date.js');
diff --git a/src/www/soap/index.php b/src/www/soap/index.php
index a7ef4e7..d53c65a 100644
--- a/src/www/soap/index.php
+++ b/src/www/soap/index.php
@@ -17,7 +17,7 @@ error_reporting(0);
 
 $uri = 'http://'.forge_get_config('web_host');
 // 1. include client and server
-require_once $gfwww.'soap/nusoap.php';
+require_once $gfcommon.'vendor/nusoap/nusoap.php';
 //$debug = true;
 // 2. instantiate server object
 $server = new soap_server();

commit 1463c39262479b78b483c95f8677f0a8436b38b4
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Fri Sep 5 10:53:58 2014 +0200

    debian: fix ${perl:Depends} warnings

diff --git a/src/debian/control.in b/src/debian/control.in
index 0e97736..3628ce9 100644
--- a/src/debian/control.in
+++ b/src/debian/control.in
@@ -42,7 +42,7 @@ Description: collaborative development tool - shared files
 
 Package: fusionforge-db-local
 Architecture: all
-Depends: fusionforge-common (=${source:Version}), postgresql, php5-cli, ${misc:Depends}
+Depends: fusionforge-common (=${source:Version}), postgresql, php5-cli, ${perl:Depends}, ${misc:Depends}
 Description: collaborative development tool - database (using PostgreSQL)
  FusionForge provides many tools to aid collaboration in a
  development project, such as bug-tracking, task management,
diff --git a/src/debian/plugins b/src/debian/plugins
index d008d54..0eb6176 100644
--- a/src/debian/plugins
+++ b/src/debian/plugins
@@ -11,7 +11,7 @@ Package: fusionforge-plugin-scmarch
 Depends: tla
 
 Package: fusionforge-plugin-scmcvs
-Depends: php5-cli, libipc-run-perl, rcs, liburi-perl, cvs, python, libphp-snoopy, openbsd-inetd | inet-superserver, update-inetd
+Depends: php5-cli, rcs, cvs, python, libphp-snoopy, openbsd-inetd | inet-superserver, update-inetd, libipc-run-perl, liburi-perl, ${perl:Depends}
 
 Package: fusionforge-plugin-scmdarcs
 Depends: fusionforge-shell, darcs, darcsweb
@@ -56,7 +56,7 @@ Package: fusionforge-plugin-foafprofiles
 Depends:
 
 Package: fusionforge-plugin-globalsearch
-Depends: libxml-rss-perl, libgetopt-mixed-perl, libdbi-perl, libwww-perl, libcrypt-ssleay-perl, libunicode-string-perl
+Depends: libxml-rss-perl, libgetopt-mixed-perl, libdbi-perl, libwww-perl, libcrypt-ssleay-perl, libunicode-string-perl, ${perl:Depends}
 
 Package: fusionforge-plugin-gravatar
 Depends: 
@@ -76,8 +76,8 @@ Depends:
 # Note: scmhook might need to be manually packaged to allow installing
 # the commit hooks on a separate SCM server
 Package: fusionforge-plugin-scmhook
-Depends: php5-cli, libphp-snoopy
+Depends: php5-cli, libphp-snoopy, ${perl:Depends}
 
 Package: fusionforge-plugin-sysauthldap
 Depends: php5-ldap
-Recommends: slapd, ldap-utils
+Recommends: slapd, ldap-utils, ${perl:Depends}

commit c4916c40ac0d9ec4e8ea87d7550dfdd3169005fa
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Fri Sep 5 10:53:13 2014 +0200

    scmcvs: remove old .spec

diff --git a/src/plugins/scmcvs/fusionforge-plugin-scmcvs.spec b/src/plugins/scmcvs/fusionforge-plugin-scmcvs.spec
deleted file mode 100644
index 606a81c..0000000
--- a/src/plugins/scmcvs/fusionforge-plugin-scmcvs.spec
+++ /dev/null
@@ -1,175 +0,0 @@
-%define plugin          scmcvs
-%{!?release:%define release 1}
-
-Summary: CVS Plugin for FusionForge
-Name: fusionforge-plugin-%{plugin}
-Version: 4.8.2
-Release: %{release}
-BuildArch: noarch
-License: GPL
-Group: Development/Tools
-Source: %{name}-%{version}.tar.bz2
-AutoReqProv: off
-Requires: fusionforge >= 4.7
-Requires: perl perl-URI
-Requires: cvs >= 1.11
-#update etc/plugins/scmcvs/config.php $cvs_binary_version before updating cvs to 1.12
-Requires: cvs < 1.12
-Requires: rcs
-URL: http://www.gforge.org/
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-
-%define gfuser                  gforge
-%define gfgroup                 gforge
-
-%if "%{_vendor}" == "suse"
-        %define httpduser               wwwrun
-        %define httpdgroup              www
-#Requires: perl-IPC-Run
-%else
-        %define httpduser               apache
-        %define httpdgroup              apache
-Requires: perl-IPC-Run
-%endif
-
-#Globals defines for gforge
-%define GFORGE_DIR              %{_datadir}/gforge
-%define GFORGE_CONF_DIR         %{_sysconfdir}/gforge
-%define GFORGE_SBIN_DIR         %{_sbindir}
-%define GFORGE_BIN_DIR          %{GFORGE_DIR}/bin
-%define PLUGINS_LIB_DIR         %{GFORGE_DIR}/plugins
-%define PLUGINS_CONF_DIR        %{GFORGE_CONF_DIR}/plugins
-%define CROND_DIR               %{_sysconfdir}/cron.d
-%define SBIN_DIR				%{_sbindir}
-
-#specific define for plugins
-%define PLUGIN_LIB              %{PLUGINS_LIB_DIR}/%{plugin}
-%define PLUGIN_CONF             %{PLUGINS_CONF_DIR}/%{plugin}
-
-
-%description
-FusionForge is a web-based Collaborative Development Environment offering
-easy access to CVS, mailing lists, bug tracking, message
-boards/forums, task management, permanent file archival, and total
-web-based administration.
-
-This RPM installs SCM CVS plugin for FusionForge and provides CVS support
-to FusionForge.
-
-It also provides a specific version of CVSWeb wrapped in FusionForge.
-
-%prep
-%setup
-
-%build
-
-%install
-# cleaning build environment
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-
-# installing crontab
-install -m 755 -d $RPM_BUILD_ROOT/%{CROND_DIR}/
-install -m 644 cron.d/%{name} $RPM_BUILD_ROOT/%{CROND_DIR}/
-
-# copying all needed stuff to %{PLUGIN_LIB}
-install -m 755 -d $RPM_BUILD_ROOT/%{PLUGIN_LIB}
-for dir in bin common www cronjobs; do
-        cp -rp $dir $RPM_BUILD_ROOT/%{PLUGIN_LIB}/
-done;
-chmod 755 $RPM_BUILD_ROOT/%{PLUGIN_LIB}/bin/*
-chmod 755 $RPM_BUILD_ROOT/%{PLUGIN_LIB}/cronjobs/cvscreate.sh
-
-# installing executable for pserver
-install -m 755 -d $RPM_BUILD_ROOT/%{GFORGE_BIN_DIR}/
-cp -rp sbin/cvs-pserver $RPM_BUILD_ROOT/%{GFORGE_BIN_DIR}/
-chmod 755 $RPM_BUILD_ROOT/%{GFORGE_BIN_DIR}/cvs-pserver
-
-# installing configuration file
-install -m 755 -d  $RPM_BUILD_ROOT/%{GFORGE_CONF_DIR}/
-cp -rp etc/* $RPM_BUILD_ROOT/%{GFORGE_CONF_DIR}/
-install -m 755 -d $RPM_BUILD_ROOT/%{PLUGIN_CONF}
-install -m 664 etc/plugins/%{plugin}/config.php $RPM_BUILD_ROOT/%{PLUGIN_CONF}/
-install -m 664 etc/plugins/%{plugin}/cvsweb.conf $RPM_BUILD_ROOT/%{PLUGIN_CONF}/
-
-
-%pre
-
-%post
-if [ "$1" = "1" ] ; then
-	# link the plugin www rep to be accessed by web
-	ln -s %{PLUGIN_LIB}/www %{GFORGE_DIR}/www/plugins/%{plugin}
-
-	[ ! -f /bin/cvssh ] && ln -s %{PLUGIN_LIB}/bin/cvssh.pl /bin/cvssh
-
-        #GF_DOMAIN=$(grep ^domain_name= %{GFORGE_CONF_DIR}/gforge.conf | cut -d= -f2-)
-        #perl -pi -e "
-        #        s#^\\\$sys_plugins_path=.*#\\\$sys_plugins_path='"%{PLUGINS_LIB_DIR}"';#;
-        #        s#^\\\$sys_default_domain=.*#\\\$sys_default_domain='$GF_DOMAIN';#" %{PLUGIN_CONF}/config.php
-
-        # register plugin in database
-        %{GFORGE_BIN_DIR}/register-plugin %{plugin} CVS &> /dev/null
-        
-        perl -pi -e "
-		s/sys_use_scm=false/sys_use_scm=true/g" %{GFORGE_CONF_DIR}/gforge.conf
-		
-	CHROOT=`grep '^gforge_chroot=' %{GFORGE_CONF_DIR}/gforge.conf | sed 's/.*=\s*\(.*\)/\1/'`
-	if [ ! -d $CHROOT/cvsroot ] ; then
-		mkdir -p $CHROOT/cvsroot
-	fi
-	ln -s $CHROOT/cvsroot /cvsroot
-
-	#if sys_account_manager_type=pgsql, comment the cron usergroup.php
-	SYS_ACCOUNT_MANAGER_TYPE=`grep '^sys_account_manager_type=' %{GFORGE_CONF_DIR}/gforge.conf | sed 's/.*=\s*\(.*\)/\1/'`
-	if [ $SYS_ACCOUNT_MANAGER_TYPE = "pgsql" ]; then
-		#echo "plugin scmcvs installed"
-		if [ "$(grep 'usergroup.php' %{CROND_DIR}/fusionforge-plugin-scmcvs | grep '#')" = "" ]; then
-			#echo "I comment the cron if it is un comment"
-			sed -i "s/^\(.*usergroup.php.*\)/#\1/" %{CROND_DIR}/fusionforge-plugin-scmcvs
-		fi
-	fi
-else
-        # upgrade
-        :
-fi
-
-%postun
-if [ "$1" = "0" ] ; then
-        # unregister plugin in database
-        %{GFORGE_BIN_DIR}/unregister-plugin %{plugin}
-        
-        [ -L /bin/cvssh ] && rm -f /bin/cvssh
-else
-        # upgrade
-        :
-fi
-
-%clean
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-, root, root)
-%doc AUTHORS COPYING README
-%attr(0664, %{httpduser}, %{gfgroup}) %config(noreplace) %{PLUGIN_CONF}/config.php
-%attr(0660, %{httpduser}, %{gfgroup}) %config(noreplace) %{PLUGIN_CONF}/cvsweb.conf
-%{GFORGE_CONF_DIR}/httpd.d
-%{PLUGIN_CONF}/config.pl
-%{PLUGIN_LIB}/bin
-%{PLUGIN_LIB}/common
-%{PLUGIN_LIB}/www
-%{PLUGIN_LIB}/cronjobs
-%{CROND_DIR}/%{name}
-%{GFORGE_BIN_DIR}/cvs-pserver
-
-%changelog
-* Mon Jan 09 2006 Nicolas Quienot <nquienot at linagora.com>
-- 4.5.6
-* Fri Apr 29 2005 Xavier Rameau <xrameau at gmail.com>
-- Added support for SuSE
-* Sat Feb 19 2005 Guillaume Smet <guillaume-gforge at smet.org>
-- 4.1
-- replaced -f test with ls
-- redirects register-plugin output to /dev/null
-* Mon Jan 03 2005 Guillaume Smet <guillaume-gforge at smet.org>
-- it's now possible to add specific language files in the RPM
-* Sun Sep 26 2004  Guillaume Smet <guillaume-gforge at smet.org>
-Initial RPM packaging

-----------------------------------------------------------------------

Summary of changes:
 src/common/tracker/Artifact.class.php              |    9 +-
 src/debian/control.in                              |    4 +-
 src/debian/plugins                                 |    8 +-
 src/debian/rules                                   |    8 +-
 src/etc/config.ini.d/debug.ini                     |    5 +-
 src/plugins/scmcvs/fusionforge-plugin-scmcvs.spec  |  175 --------------------
 src/plugins/scmsvn/etc/scmsvn.ini                  |    4 +-
 src/templates/httpd.conf.d/vhost-main.inc          |    1 +
 .../libs => jquery-livequery}/jquery.livequery.js  |    0
 .../jquery.livequery.min.js                        |    0
 .../libs => jquery-livequery}/jquery.timers.js     |    0
 src/{www/soap => vendor/nusoap}/nusoap.php         |    0
 src/www/include/html.php                           |    2 +-
 src/www/soap/index.php                             |    2 +-
 14 files changed, 26 insertions(+), 192 deletions(-)
 delete mode 100644 src/plugins/scmcvs/fusionforge-plugin-scmcvs.spec
 rename src/vendor/{jquery-teamwork-gantt/libs => jquery-livequery}/jquery.livequery.js (100%)
 rename src/vendor/{jquery-teamwork-gantt/libs => jquery-livequery}/jquery.livequery.min.js (100%)
 rename src/vendor/{jquery-teamwork-gantt/libs => jquery-livequery}/jquery.timers.js (100%)
 rename src/{www/soap => vendor/nusoap}/nusoap.php (100%)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list