[Fusionforge-commits] FusionForge branch 6.0 updated. 067c1b63eed7d121e906dad27ee15e99d7d13782

Sylvain Beucler beuc-inria at fusionforge.org
Tue Apr 28 14:59:11 CEST 2015


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, 6.0 has been updated
       via  067c1b63eed7d121e906dad27ee15e99d7d13782 (commit)
       via  448f715422a13c08771b090b856b904be263b194 (commit)
       via  7f4d57e67066e347b3aa71d9cce017d3c1e017e9 (commit)
       via  f2d2d311a760182c5b3061f8aa76e56e517704db (commit)
      from  d4d188b8d69c9175e59596432ff83faa0d124e1a (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 067c1b63eed7d121e906dad27ee15e99d7d13782
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Tue Apr 28 14:55:35 2015 +0200

    deb: remove perl dependencies, since we rewrote the last Perl script in PHP

diff --git a/src/debian/control.in b/src/debian/control.in
index 19e4a4b..8e09d94 100644
--- a/src/debian/control.in
+++ b/src/debian/control.in
@@ -28,7 +28,7 @@ Description: collaborative development tool - standard metapackage
 
 Package: fusionforge-common
 Architecture: all
-Depends: php5-cli, php5-pgsql, php-htmlpurifier, cron, perl, ucf, ${misc:Depends}
+Depends: php5-cli, php5-pgsql, php-htmlpurifier, cron, ucf, ${misc:Depends}
 Description: collaborative development tool - shared files
  FusionForge provides many tools to aid collaboration in a
  development project, such as bug-tracking, task management,
@@ -43,7 +43,7 @@ Description: collaborative development tool - shared files
 Package: fusionforge-db-local
 Architecture: all
 Provides: fusionforge-db
-Depends: fusionforge-common (=${source:Version}), postgresql, php5-cli, ${perl:Depends}, ${misc:Depends}
+Depends: fusionforge-common (=${source:Version}), postgresql, php5-cli, ${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,

commit 448f715422a13c08771b090b856b904be263b194
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Tue Apr 28 14:54:18 2015 +0200

    deb: fix forced installation of db-remote

diff --git a/src/debian/control.in b/src/debian/control.in
index 8ffc6bd..19e4a4b 100644
--- a/src/debian/control.in
+++ b/src/debian/control.in
@@ -42,6 +42,7 @@ Description: collaborative development tool - shared files
 
 Package: fusionforge-db-local
 Architecture: all
+Provides: fusionforge-db
 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

commit 7f4d57e67066e347b3aa71d9cce017d3c1e017e9
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Tue Apr 28 14:53:24 2015 +0200

    db-remote: provide postgresql stub for init.d, so fusionforge-systasksd properly runs on startup

diff --git a/src/GNUmakefile b/src/GNUmakefile
index bbbdc12..a6401f2 100644
--- a/src/GNUmakefile
+++ b/src/GNUmakefile
@@ -90,6 +90,10 @@ install-db: install-base-dirs
 			> $(DESTDIR)$(sysconfdir)/cron.d/fusionforge-db; \
 	fi
 
+install-db-remote:
+	$(INSTALL) -d -m 00755 $(DESTDIR)$(sysconfdir)/init.d/
+	$(CP_R) etc/init.d/fusionforge-db-remote $(DESTDIR)$(sysconfdir)/init.d/fusionforge-db-remote
+
 install-web: install-base-dirs
 	$(CP_R) vendor www $(DESTDIR)$(pkgdatadir)/
 	$(CP_R) --no-clobber etc/httpd.conf* $(DESTDIR)$(config_path)
diff --git a/src/debian/rules b/src/debian/rules
index ae12a93..9c7716a 100755
--- a/src/debian/rules
+++ b/src/debian/rules
@@ -24,6 +24,7 @@ include /usr/share/dpkg/default.mk
 override_dh_auto_install:
 	make install-common      prefix=/usr DESTDIR=$(CURDIR)/debian/fusionforge-common
 	make install-db-local    prefix=/usr DESTDIR=$(CURDIR)/debian/fusionforge-db-local
+	make install-db-remote   prefix=/usr DESTDIR=$(CURDIR)/debian/fusionforge-db-remote
 	make install-web         prefix=/usr DESTDIR=$(CURDIR)/debian/fusionforge-web
 	make install-web-vhosts  prefix=/usr DESTDIR=$(CURDIR)/debian/fusionforge-web-vhosts
 	make install-shell       prefix=/usr DESTDIR=$(CURDIR)/debian/fusionforge-shell
diff --git a/src/etc/init.d/fusionforge-db-remote b/src/etc/init.d/fusionforge-db-remote
new file mode 100755
index 0000000..38621c9
--- /dev/null
+++ b/src/etc/init.d/fusionforge-db-remote
@@ -0,0 +1,18 @@
+#!/bin/bash
+### BEGIN INIT INFO
+# Provides:          postgresql
+# Required-Start:    $local_fs $remote_fs $network $syslog $named
+# Required-Stop:     $local_fs $remote_fs $network $syslog $named
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# X-Interactive:     true
+# Short-Description: Fake init dependency for remote DB installs
+### END INIT INFO
+
+true
+
+# Rationale:
+# $ update-rc.d fusionforge-systasksd defaults
+# insserv: Service postgresql has to be enabled to start service fusionforge-systasksd
+# insserv: exiting now!
+# update-rc.d: error: insserv rejected the script header
diff --git a/src/rpm/fusionforge.spec.in b/src/rpm/fusionforge.spec.in
index dfcc227..e4a19c3 100644
--- a/src/rpm/fusionforge.spec.in
+++ b/src/rpm/fusionforge.spec.in
@@ -67,6 +67,7 @@ install_listfiles common
 %find_lang %{name}
 # Install sub-modules
 install_listfiles db-local
+install_listfiles db-remote
 install_listfiles web
 install_listfiles web-vhosts
 install_listfiles shell
@@ -141,7 +142,7 @@ This dummy package tells FusionForge you installed the database on a
 separate machine.  It preserves the fusionforge-db virtual dependency,
 to configure the database before depending packages in single-server
 installs (e.g. plugins activation requires a populated db).
-%files db-remote
+%files db-remote -f db-remote.rpmfiles
 
 
 %package shell

commit f2d2d311a760182c5b3061f8aa76e56e517704db
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Tue Apr 28 11:48:59 2015 +0200

    install: got an issue with missing HTTP.php during manual tests, adding it to the source installs deps

diff --git a/autoinstall/install-src.sh b/autoinstall/install-src.sh
index b53728b..c28b2de 100755
--- a/autoinstall/install-src.sh
+++ b/autoinstall/install-src.sh
@@ -29,7 +29,7 @@ if [ -e /etc/debian_version ]; then
     export DEBIAN_FRONTEND=noninteractive
     backports_deb
     apt-get update
-    apt-get install -y make gettext php5-cli php5-pgsql php-htmlpurifier \
+    apt-get install -y make gettext php5-cli php5-pgsql php-htmlpurifier php-http \
 	libapache2-mpm-itk libapache2-mod-svn \
 	apache2 postgresql libnss-pgsql2 unscd \
 	subversion viewvc python-pycurl git xinetd \
@@ -43,7 +43,7 @@ else
     yum install -y make tar
     backports_rpm
     yum --enablerepo=epel install -y httpd-itk
-    yum install -y gettext php-cli php-pgsql php-process php-mbstring \
+    yum install -y gettext php-cli php-pgsql php-process php-mbstring php-pear-HTTP \
 	httpd mod_dav_svn mod_ssl postgresql-server nscd \
 	subversion viewvc python-pycurl git gitweb xinetd \
 	mediawiki119 \

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

Summary of changes:
 autoinstall/install-src.sh           |    4 ++--
 src/GNUmakefile                      |    4 ++++
 src/debian/control.in                |    5 +++--
 src/debian/rules                     |    1 +
 src/etc/init.d/fusionforge-db-remote |   18 ++++++++++++++++++
 src/rpm/fusionforge.spec.in          |    3 ++-
 6 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100755 src/etc/init.d/fusionforge-db-remote


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list