[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#598985: marked as done (release.debian.org: unblock: fusionforge/5.0.2-2)



Your message dated Sun, 3 Oct 2010 19:29:35 +0200
with message-id <20101003172935.GT10564@radis.liafa.jussieu.fr>
and subject line Re: Bug#598985: release.debian.org: unblock: fusionforge/5.0.2-2
has caused the Debian Bug report #598985,
regarding release.debian.org: unblock: fusionforge/5.0.2-2
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
598985: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=598985
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Hi,

I'd like to request an unblock for an update of FusionForge 5.0.2-2
(which I just uploaded to unstable).  Most of the debdiff comes from
*.po and *.pot files; the rest of it is summarized by the changelog
entry:

fusionforge (5.0.2-2) unstable; urgency=low

  * Ship a /usr/share/gforge/plugins/ directory in gforge-web-apache2
    (closes: #597714).
  * Update roadmap URL (closes: #597847).
  * Fix detection of PostgreSQL's init script (closes: #596929).
  * Updated Portuguese Debconf translations (closes: #597354).
  * Support rsyslog as well as syslogd (closes: 535580).
  * Handle amd64 architectures and add missing files in chroot creation
    (closes: #396128, #536055).
  * Make up our mind about which config file to use (fusionforge.conf, not
    gforge.conf) and migrate from gforge.conf if needed (closes: #597916).
  * Ditto for fusionforge-config instead of gforge-config (closes: #597931).
  * Updated Spanish, Italian and French translations from upstream.

 -- Roland Mas <lolando@debian.org>  Sun, 03 Oct 2010 18:26:20 +0200

Diffstat:

 deb-specific/create-vhosts.sh                      |    2 -
 deb-specific/fusionforge-config                    |   28 +++++++++++++++++++++
 deb-specific/fusionforge.rsyslog                   |    1 
 deb-specific/install-chroot.sh                     |   15 ++++++++---
 deb-specific/install-ldap.sh                       |    6 ++--
 deb-specific/install-svn.sh                        |    2 -
 deb-specific/prepare-vhosts-file.pl                |    9 ------
 deb-specific/update-ldap.sh                        |    8 +++---
 debian/README.Debian.tmpl                          |    2 -
 debian/dsf-helper/handle-mainconffile.config       |    6 +++-
 debian/dsf-in/common.manpages                      |    2 -
 debian/dsf-in/common.postinst                      |    2 -
 debian/dsf-in/config.sgml                          |    2 -
 debian/dsf-in/db-postgresql.postinst.dsfh-in       |    3 +-
 debian/dsf-in/db-postgresql.prerm                  |    1 
 debian/dsf-in/dns-bind9.postinst                   |    2 -
 debian/dsf-in/ftp-proftpd.postinst                 |    2 -
 debian/dsf-in/lists-mailman.postinst               |    2 -
 debian/dsf-in/mta-exim4.postinst                   |    2 -
 debian/dsf-in/mta-postfix.postinst                 |    2 -
 debian/dsf-in/plugin-mediawiki.postinst            |    2 -
 debian/dsf-in/plugin-scmarch.postinst              |    2 -
 debian/dsf-in/plugin-scmbzr.postinst               |    2 -
 debian/dsf-in/plugin-scmcpold.postinst             |    2 -
 debian/dsf-in/plugin-scmcvs.postinst               |    2 -
 debian/dsf-in/plugin-scmdarcs.postinst             |    2 -
 debian/dsf-in/plugin-scmgit.postinst               |    2 -
 debian/dsf-in/plugin-scmhg.postinst                |    2 -
 debian/dsf-in/plugin-scmsvn.postinst               |    2 -
 debian/dsf-in/shell-postgresql.postinst            |    2 -
 debian/dsf-in/web-apache2-vhosts.postinst.dsfh-in  |    2 -
 debian/dsf-in/web-apache2-vhosts.postrm.dsfh-in    |    2 -
 debian/dsf-in/web-apache2.postinst.dsfh-in         |    2 -
 debian/rules                                       |    8 +++---
 fusionforge-5.0.2/deb-specific/install-db.sh       |   24 +++++++++---------
 fusionforge-5.0.2/debian/changelog                 |   17 ++++++++++++
 fusionforge-5.0.2/rpm-specific/httpd.d/gforge.conf |    2 -
 fusionforge.spec                                   |   10 +++----
 packaging/dirs/web-apache2                         |    1 
 packaging/install/common                           |    2 -
 packaging/install/shell-postgresql                 |    1 
 plugins/cvstracker/Makefile                        |    2 -
 plugins/scmcvs/fusionforge-plugin-scmcvs.spec      |    2 -
 plugins/scmsvn/fusionforge-plugin-scmsvn.spec      |    2 -
 rpm-specific/scripts/fusionforge-config            |   11 ++++++++
 rpm-specific/scripts/gforge-config                 |   11 --------
 setup                                              |    4 +--
 utils/fill-in-the-blanks.pl                        |    4 +--
 utils/install-nsspgsql.sh                          |    6 ++--
 www/admin/admin_table.php                          |    2 -
 www/admin/index.php                                |    3 ++
 www/admin/pluginman.php                            |   16 ++++++------
 www/snippet/browse.php                             |    4 +--
 www/softwaremap/full_list.php                      |    2 -
 54 files changed, 158 insertions(+), 101 deletions(-)

There are a few changes in files not used in Debian (the *.spec and
rpm-specific/* files); this is so that the package sticks to the
upstream SVN repository.  The bulk of the changes is stuff like
s/gforge-config/fusionforge-config/ and
s#/etc/gforge/gforge.conf#/etc/fusionforge/fusionforge.conf#.  The rest
is the change in deb-specific/install-chroot.sh so it handles amd64
servers and stops missing some libraries on others, and so that rsyslog
gets configured when sysklogd is not installed, and a fix for the
detection of which PostgreSQL init script to call that actually works.

Roland.

-- System Information:
Debian Release: squeeze/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: i386 (i686)

Kernel: Linux 2.6.32-5-686 (SMP w/1 CPU core)
Locale: LANG=fr_FR.utf8, LC_CTYPE=fr_FR.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

-- 
Roland Mas

Just a little bit of you every day will surely keep the doctors away.
  -- Just a little bit of you (The Jackson Five)
diff -u fusionforge-5.0.2/deb-specific/install-db.sh fusionforge-5.0.2/deb-specific/install-db.sh
--- fusionforge-5.0.2/deb-specific/install-db.sh
+++ fusionforge-5.0.2/deb-specific/install-db.sh
@@ -87,9 +87,9 @@
 	;;
     configure-files)
 	# Tell PostgreSQL to let us use the database
-	db_passwd=$(grep ^db_password= /etc/gforge/gforge.conf | cut -d= -f2-)
-	db_name=$(grep ^db_name= /etc/gforge/gforge.conf | cut -d= -f2-)
-	db_user=$(grep ^db_user= /etc/gforge/gforge.conf | cut -d= -f2-)
+	db_passwd=$(grep ^db_password= /etc/fusionforge/fusionforge.conf | cut -d= -f2-)
+	db_name=$(grep ^db_name= /etc/fusionforge/fusionforge.conf | cut -d= -f2-)
+	db_user=$(grep ^db_user= /etc/fusionforge/fusionforge.conf | cut -d= -f2-)
 	pattern=$(basename $0).XXXXXX
 
         # PostgreSQL configuration for versions from 7.3 on
@@ -122,9 +122,9 @@
 	;;
     configure)
 	# Create the appropriate database user
-	db_passwd=$(grep ^db_password= /etc/gforge/gforge.conf | cut -d= -f2-)
-	db_name=$(grep ^db_name= /etc/gforge/gforge.conf | cut -d= -f2-)
-	db_user=$(grep ^db_user= /etc/gforge/gforge.conf | cut -d= -f2-)
+	db_passwd=$(grep ^db_password= /etc/fusionforge/fusionforge.conf | cut -d= -f2-)
+	db_name=$(grep ^db_name= /etc/fusionforge/fusionforge.conf | cut -d= -f2-)
+	db_user=$(grep ^db_user= /etc/fusionforge/fusionforge.conf | cut -d= -f2-)
 	pattern=$(basename $0).XXXXXX
 	tmp1=$(mktemp /tmp/$pattern)
 	tmp2=$(mktemp /tmp/$pattern)
@@ -235,8 +235,8 @@
 	perl -pi -e "BEGIN { undef \$/; } s/^### BEGIN GFORGE BLOCK -- DO NOT EDIT.*### END GFORGE BLOCK -- DO NOT EDIT\n//ms;" ${pg_hba_dir}/pg_hba.conf.gforge-new
 	;;
     purge)
-	db_name=$(grep ^db_name= /etc/gforge/gforge.conf | cut -d= -f2-)
-	db_user=$(grep ^db_user= /etc/gforge/gforge.conf | cut -d= -f2-)
+	db_name=$(grep ^db_name= /etc/fusionforge/fusionforge.conf | cut -d= -f2-)
+	db_user=$(grep ^db_user= /etc/fusionforge/fusionforge.conf | cut -d= -f2-)
 	su -s /bin/sh postgres -c "dropdb $db_name" > /dev/null 2>&1 || true
 	su -s /bin/sh postgres -c "dropuser $db_user" > /dev/null 2>&1 || true
 	;;
@@ -246,8 +246,8 @@
     dump)
 	if [ -e /etc/sourceforge/local.pl ] ; then
 	    db_name=$(perl -e'require "/etc/sourceforge/local.pl"; print "$sys_dbname\n";')
-	elif [ -e /etc/gforge/gforge.conf ] ; then
-	    db_name=$(grep ^db_name= /etc/gforge/gforge.conf | cut -d= -f2-)
+	elif [ -e /etc/fusionforge/fusionforge.conf ] ; then
+	    db_name=$(grep ^db_name= /etc/fusionforge/fusionforge.conf | cut -d= -f2-)
 	else
 	    db_name=sourceforge
 	fi
@@ -269,7 +269,7 @@
     #
     restore)
 	pg_name=postgresql-$pg_version
-	db_name=$(grep ^db_name= /etc/gforge/gforge.conf | cut -d= -f2-)
+	db_name=$(grep ^db_name= /etc/fusionforge/fusionforge.conf | cut -d= -f2-)
 	pattern=$(basename $0).XXXXXX
 	newpg=$(mktemp /tmp/$pattern)
 	localtrust="local all all trust"
@@ -281,6 +281,7 @@
 	chmod 644 ${pg_hba_dir}/pg_hba.conf
 
 	# Trying "postgresql" init script...
+	v=0
 	invoke-rc.d postgresql restart || v=$?
 	if test x"$v" = x"100"; then
 		# No "postgresql" init script (for packages << 8.4.4-2)
@@ -304,6 +305,7 @@
         perl -pi -e "s/$localtrust\n//" ${pg_hba_dir}/pg_hba.conf
 
 	# Trying "postgresql" init script...
+	v=0
 	invoke-rc.d postgresql reload || v=$?
 	if test x"$v" = x"100"; then
 		# No "postgresql" init script (for packages << 8.4.4-2)
reverted:
--- fusionforge-5.0.2/rpm-specific/scripts/gforge-config
+++ fusionforge-5.0.2.orig/rpm-specific/scripts/gforge-config
@@ -1,11 +0,0 @@
-# !/bin/bash
-echo '##'
-echo '# Generating GForge configuration files'
-
-cd /usr/share/gforge
-./setup -confdir /etc/gforge -input /etc/gforge/gforge.conf -noapache &> /dev/null
-cd - &> /dev/null
-
-echo '# Done.'
-echo '# If you have modified the database configuration, you have to restart apache (service httpd restart).'
-echo '##'
\ No newline at end of file
diff -u fusionforge-5.0.2/rpm-specific/httpd.d/gforge.conf fusionforge-5.0.2/rpm-specific/httpd.d/gforge.conf
--- fusionforge-5.0.2/rpm-specific/httpd.d/gforge.conf
+++ fusionforge-5.0.2/rpm-specific/httpd.d/gforge.conf
@@ -1,2 +1,2 @@
-# Include gforge httpd.conf generated by gforge-config
+# Include gforge httpd.conf generated by fusionforge-config
 Include /etc/gforge/httpd.conf
\ Pas de fin de ligne à la fin du fichier.
diff -u fusionforge-5.0.2/debian/changelog fusionforge-5.0.2/debian/changelog
--- fusionforge-5.0.2/debian/changelog
+++ fusionforge-5.0.2/debian/changelog
@@ -1,3 +1,20 @@
+fusionforge (5.0.2-2) unstable; urgency=low
+
+  * Ship a /usr/share/gforge/plugins/ directory in gforge-web-apache2
+    (closes: #597714).
+  * Update roadmap URL (closes: #597847).
+  * Fix detection of PostgreSQL's init script (closes: #596929).
+  * Updated Portuguese Debconf translations (closes: #597354).
+  * Support rsyslog as well as syslogd (closes: 535580).
+  * Handle amd64 architectures and add missing files in chroot creation
+    (closes: #396128, #536055).
+  * Make up our mind about which config file to use (fusionforge.conf, not
+    gforge.conf) and migrate from gforge.conf if needed (closes: #597916).
+  * Ditto for fusionforge-config instead of gforge-config (closes: #597931).
+  * Updated Spanish, Italian and French translations from upstream.
+
+ -- Roland Mas <lolando@debian.org>  Sun, 03 Oct 2010 18:26:20 +0200
+
 fusionforge (5.0.2-1) unstable; urgency=low
 
   * New upstream bugfix release.
only in patch2:
unchanged:
--- fusionforge-5.0.2.orig/fusionforge.spec
+++ fusionforge-5.0.2/fusionforge.spec
@@ -191,7 +191,7 @@
 
 # configuring GForge
 install -m 600 rpm-specific/conf/gforge.conf $RPM_BUILD_ROOT/%{GFORGE_CONF_DIR}/
-install -m 750 rpm-specific/scripts/gforge-config $RPM_BUILD_ROOT/%{SBIN_DIR}/
+install -m 750 rpm-specific/scripts/fusionforge-config $RPM_BUILD_ROOT/%{SBIN_DIR}/
 
 #install *.mo
 cp -rp locales/* $RPM_BUILD_ROOT/%{GFORGE_LANG_DIR}/
@@ -282,13 +282,13 @@
  	rm -f %{GFORGE_CONF_DIR}/httpd.d/20list
  	
  	perl -pi -e "
- 		s#^GFORGE_CONF_DIR=.*#GFORGE_CONF_DIR="%{GFORGE_CONF_DIR}"#g" %{SBIN_DIR}/gforge-config
+ 		s#^GFORGE_CONF_DIR=.*#GFORGE_CONF_DIR="%{GFORGE_CONF_DIR}"#g" %{SBIN_DIR}/fusionforge-config
  
  	## plugins installs apache templates in GFORGE_CONF_DIR
  	ln -s %{GFORGE_DIR}/etc/httpd.d %{GFORGE_CONF_DIR}/httpd.d
 	
 	# initializing configuration
-	%{SBIN_DIR}/gforge-config
+	%{SBIN_DIR}/fusionforge-config
 	
 	# creating the database
 	su -l %{gfuser} -c "%{GFORGE_BIN_DIR}/db-upgrade.pl 2>&1" | grep -v ^NOTICE
@@ -322,7 +322,7 @@
 	su -l %{gfuser} -c "%{GFORGE_BIN_DIR}/db-upgrade.pl 2>&1" | grep -v ^NOTICE
 
 	# updating configuration
-	%{SBIN_DIR}/gforge-config || :
+	%{SBIN_DIR}/fusionforge-config || :
 	
 fi
 
@@ -363,7 +363,7 @@
 %doc AUTHORS AUTHORS.sourceforge COPYING ChangeLog INSTALL* README*
 %doc docs/*
 %attr(0660, %{httpduser}, gforge) %config(noreplace) %{GFORGE_CONF_DIR}/gforge.conf
-%attr(0750, root, root) %{SBIN_DIR}/gforge-config
+%attr(0750, root, root) %{SBIN_DIR}/fusionforge-config
 %attr(0640, %{httpduser}, %{httpdgroup}) %config(noreplace) %{HTTPD_CONF_DIR}/conf.d/gforge.conf
 %attr(0644, root, root) %{CROND_DIR}/fusionforge
 %attr(0775, %{httpduser}, %{httpdgroup}) %dir %{UPLOAD_DIR}
only in patch2:
unchanged:
--- fusionforge-5.0.2.orig/setup
+++ fusionforge-5.0.2/setup
@@ -482,8 +482,8 @@
 			SHAREDIR=/usr/share/gforge
 			LIBDIR=/usr/share/gforge
 			CONFFILEOUTDIR=/etc/gforge
-			CONFFILEIN=/etc/gforge/gforge.conf
-			CONFFILEOUT=/etc/gforge/gforge.conf
+			CONFFILEIN=/etc/fusionforge/fusionforge.conf
+			CONFFILEOUT=/etc/fusionforge/fusionforge.conf
 			LOCALINC=/etc/gforge/local.inc
 			HTTPDCONF=/etc/gforge/httpd.conf
 			HTTPDSECRETS=/etc/gforge/httpd.secrets
only in patch2:
unchanged:
--- fusionforge-5.0.2.orig/deb-specific/install-chroot.sh
+++ fusionforge-5.0.2/deb-specific/install-chroot.sh
@@ -26,6 +26,8 @@
 	    etc/security \
 	    lib \
 	    lib/security \
+	    lib64 \
+	    lib64/security \
 	    dev \
 	    var \
 	    var/run \
@@ -57,10 +59,13 @@
 	    /bin/ls \
 	    /bin/sh \
 	    /bin/bash \
-	    /bin/chgrp ; do
-	  if [ -x "$binary" ] ; then
+	    /bin/chgrp \
+	    /lib/security/pam_pgsql.so \
+	    /lib64/security/pam_pgsql.so ; do
+	  if [ -e "$binary" ] ; then
 	      echo "$binary"
-	      ldd $binary | cut -d" " -f3
+	      ldd $binary | awk '/=>/ { print $3 }' | grep ^/
+	      ldd $binary | awk '{ print $1 }' | grep ^/
 	  fi
 	done \
 	    | sort -u \
@@ -85,7 +90,9 @@
 	[ -c $CHROOTDIR/dev/urandom ] || mknod $CHROOTDIR/dev/urandom c 1 9 || true
 	[ -c $CHROOTDIR/dev/console ] || mknod $CHROOTDIR/dev/console c 5 1 || true
 	# For /dev/log
-	if ! grep -q "^SYSLOGD.*/var/lib/gforge/chroot/dev/log.*" /etc/default/syslogd ; then 
+	if [ -e /etc/default/syslogd ] \
+	    && [ ! -e /etc/rsyslog.conf ] \
+	    && ! grep -q "^SYSLOGD.*/var/lib/gforge/chroot/dev/log.*" /etc/default/syslogd ; then 
 		echo '######################################################################################################'
 		echo 'WARNING: you must have SYSLOGD="-p /dev/log -a /var/lib/gforge/chroot/dev/log" in /etc/default/syslogd'
 		echo 'To have cvs pserver running correctly'
only in patch2:
unchanged:
--- fusionforge-5.0.2.orig/deb-specific/create-vhosts.sh
+++ fusionforge-5.0.2/deb-specific/create-vhosts.sh
@@ -7,7 +7,7 @@
 	/usr/share/gforge/bin/fill-in-the-blanks.pl \
 		/var/lib/gforge/etc/templates/httpd.vhosts \
 		/var/lib/gforge/etc/httpd.vhosts \
-		/etc/gforge/gforge.conf
+		/etc/fusionforge/fusionforge.conf
 
 case "$1" in
 	--norestart)
only in patch2:
unchanged:
--- fusionforge-5.0.2.orig/deb-specific/install-ldap.sh
+++ fusionforge-5.0.2/deb-specific/install-ldap.sh
@@ -27,15 +27,15 @@
 PATH=$PATH:/usr/sbin
 
 setup_vars() {
-    ldap_host=$(grep ^ldap_host= /etc/gforge/gforge.conf | cut -d= -f2-)
+    ldap_host=$(grep ^ldap_host= /etc/fusionforge/fusionforge.conf | cut -d= -f2-)
 
-    gforge_base_dn=$(grep ^ldap_base_dn= /etc/gforge/gforge.conf | cut -d= -f2-)
+    gforge_base_dn=$(grep ^ldap_base_dn= /etc/fusionforge/fusionforge.conf | cut -d= -f2-)
     gforge_admin_dn="cn=admin,$gforge_base_dn"
     slapd_base_dn=$(grep ^suffix /etc/ldap/slapd.conf | cut -d\" -f2)
     slapd_admin_dn="cn=admin,$slapd_base_dn"
     robot_dn="cn=SF_robot,$gforge_base_dn"
 
-    robot_passwd=$(grep ^ldap_web_add_password= /etc/gforge/gforge.conf | cut -d= -f2-)
+    robot_passwd=$(grep ^ldap_web_add_password= /etc/fusionforge/fusionforge.conf | cut -d= -f2-)
     robot_cryptedpasswd=`slappasswd -s "$robot_passwd" -h {CRYPT}`
     # TODO: ask the user for the main (slapd) password
     # Probably only do that when needed (when inserting the robot account)
only in patch2:
unchanged:
--- fusionforge-5.0.2.orig/deb-specific/install-svn.sh
+++ fusionforge-5.0.2/deb-specific/install-svn.sh
@@ -12,7 +12,7 @@
     exec su -c "$0 $1"
 fi
 
-gforge_chroot=$(grep ^gforge_chroot= /etc/gforge/gforge.conf | cut -d= -f2-)
+gforge_chroot=$(grep ^gforge_chroot= /etc/fusionforge/fusionforge.conf | cut -d= -f2-)
 
 case "$1" in
     configure)
only in patch2:
unchanged:
--- fusionforge-5.0.2.orig/deb-specific/fusionforge.rsyslog
+++ fusionforge-5.0.2/deb-specific/fusionforge.rsyslog
@@ -0,0 +1 @@
+$AddUnixListenSocket /var/lib/gforge/chroot/dev/log
only in patch2:
unchanged:
--- fusionforge-5.0.2.orig/deb-specific/update-ldap.sh
+++ fusionforge-5.0.2/deb-specific/update-ldap.sh
@@ -25,16 +25,16 @@
 PATH=$PATH:/usr/sbin
 
 setup_vars() {
-    ldap_host=$(grep ^ldap_host= /etc/gforge/gforge.conf | cut -d= -f2-)
+    ldap_host=$(grep ^ldap_host= /etc/fusionforge/fusionforge.conf | cut -d= -f2-)
 
-    gforge_base_dn=$(grep ^ldap_base_dn= /etc/gforge/gforge.conf | cut -d= -f2-)
+    gforge_base_dn=$(grep ^ldap_base_dn= /etc/fusionforge/fusionforge.conf | cut -d= -f2-)
     gforge_admin_dn="cn=admin,$gforge_base_dn"
     slapd_base_dn=$(grep ^suffix /etc/ldap/slapd.conf | cut -d\" -f2)
     slapd_admin_dn="cn=admin,$slapd_base_dn"
     robot_dn="cn=SF_robot,$gforge_base_dn"
 
-    robot_passwd=$(grep ^ldap_web_add_password= /etc/gforge/gforge.conf | cut -d= -f2-)
-    admin_passwd=$(grep ^admin_password= /etc/gforge/gforge.conf | cut -d= -f2-)
+    robot_passwd=$(grep ^ldap_web_add_password= /etc/fusionforge/fusionforge.conf | cut -d= -f2-)
+    admin_passwd=$(grep ^admin_password= /etc/fusionforge/fusionforge.conf | cut -d= -f2-)
     robot_cryptedpasswd=`slappasswd -s "$robot_passwd" -h {CRYPT}`
     # TODO: ask the user for the main (slapd) password
     # Probably only do that when needed (when inserting the robot account)
only in patch2:
unchanged:
--- fusionforge-5.0.2.orig/deb-specific/fusionforge-config
+++ fusionforge-5.0.2/deb-specific/fusionforge-config
@@ -0,0 +1,28 @@
+#! /bin/sh
+#
+# Parse all template files and expand them into real files
+# Roland Mas, debian-sf (Sourceforge for Debian)
+#
+# For apache2 we have to remove the Listen 80 directive 
+# This is to test if apache2 is started and listen on port 80
+#
+# -dovhost will create vhosts
+[ -f /etc/default/apache2 ] && . /etc/default/apache2
+if [ "x$NO_START" = "x0" ]
+then
+	/usr/share/gforge/bin/setup -fhs -noapache $@ -system pgsql -nolisten80
+else
+	/usr/share/gforge/bin/setup -fhs -noapache $@ -system pgsql -listen80
+fi	
+
+[ -f /etc/gforge/local.inc ] && chmod 644 /etc/gforge/local.inc
+[ -f /etc/gforge/httpd.conf ] && chmod 644 /etc/gforge/httpd.conf
+
+[ -f /etc/gforge/database.inc ] && chown gforge:gforge /etc/gforge/database.inc
+[ -f /etc/gforge/database.inc ] && chmod 640 /etc/gforge/database.inc
+
+[ -f /etc/gforge/local.pl ] && chmod go+rx /etc/gforge
+[ -f /etc/gforge/local.pl ] && chown gforge:gforge /etc/gforge/local.pl
+[ -f /etc/gforge/local.pl ] && chmod 640 /etc/gforge/local.pl
+
+[ -f /etc/gforge/templates/httpd.conf.template ] && rm -f /etc/gforge/templates/*.template || true
only in patch2:
unchanged:
--- fusionforge-5.0.2.orig/deb-specific/prepare-vhosts-file.pl
+++ fusionforge-5.0.2/deb-specific/prepare-vhosts-file.pl
@@ -10,15 +10,6 @@
 
 %hash = () ;
 
-#open CONF, "/etc/gforge/gforge.conf" ;
-#while ($line = <CONF>) {
-#    chomp $line ;
-#    next if $line =~ m/^\s*#/ ;
-#    ($key, $val) = split ('=', $line, 2) ;
-#    $hash{$key} = $val ;
-#}
-#close CONF ;
-
 &db_connect ;
 
 $ifile = '/usr/share/gforge/etc/templates/httpd.vhosts' ;
only in patch2:
unchanged:
only in patch2:
unchanged:
only in patch2:
unchanged:
only in patch2:
unchanged:
only in patch2:
unchanged:
only in patch2:
unchanged:
only in patch2:
unchanged:
only in patch2:
unchanged:
only in patch2:
unchanged:
only in patch2:
unchanged:
only in patch2:
unchanged:
only in patch2:
unchanged:
only in patch2:
unchanged:
only in patch2:
unchanged:
only in patch2:
unchanged:
only in patch2:
unchanged:
only in patch2:
unchanged:
only in patch2:
unchanged:
only in patch2:
unchanged:
only in patch2:
unchanged:
only in patch2:
unchanged:
only in patch2:
unchanged:
only in patch2:
unchanged:
only in patch2:
unchanged:
only in patch2:
unchanged:
only in patch2:
unchanged:
only in patch2:
unchanged:
only in patch2:
unchanged:
--- fusionforge-5.0.2.orig/rpm-specific/scripts/fusionforge-config
+++ fusionforge-5.0.2/rpm-specific/scripts/fusionforge-config
@@ -0,0 +1,11 @@
+# !/bin/bash
+echo '##'
+echo '# Generating GForge configuration files'
+
+cd /usr/share/gforge
+./setup -confdir /etc/gforge -input /etc/gforge/gforge.conf -noapache &> /dev/null
+cd - &> /dev/null
+
+echo '# Done.'
+echo '# If you have modified the database configuration, you have to restart apache (service httpd restart).'
+echo '##'
\ No newline at end of file
only in patch2:
unchanged:
--- fusionforge-5.0.2.orig/utils/fill-in-the-blanks.pl
+++ fusionforge-5.0.2/utils/fill-in-the-blanks.pl
@@ -19,7 +19,7 @@
 } else {
 	$ifile = shift @ARGV ;
 	$ofile = shift @ARGV ;
-	$cfile = "/etc/gforge/gforge.conf" ;
+	$cfile = "/etc/fusionforge/fusionforge.conf" ;
 }
 %hash = () ;
 
@@ -45,7 +45,7 @@
 }
 
 $hash{"PLEASE DO NOT REMOVE THIS LINE"} =
-    "Do not edit this file, edit /etc/gforge/templates/* and run gforge-config" ;
+    "Do not edit this file, edit /etc/gforge/templates/* and run fusionforge-config" ;
 
 umask 0077 ;
 open (IFILE, $ifile)
only in patch2:
unchanged:
--- fusionforge-5.0.2.orig/utils/install-nsspgsql.sh
+++ fusionforge-5.0.2/utils/install-nsspgsql.sh
@@ -22,9 +22,9 @@
 PATH=$PATH:/usr/sbin
 
 setup_vars() {
-    db_host=$(grep ^db_host= /etc/gforge/gforge.conf | cut -d= -f2-)
-    db_name=$(grep ^db_name= /etc/gforge/gforge.conf | cut -d= -f2-)
-    db_user=$(grep ^db_user= /etc/gforge/gforge.conf | cut -d= -f2-)
+    db_host=$(grep ^db_host= /etc/fusionforge/fusionforge.conf | cut -d= -f2-)
+    db_name=$(grep ^db_name= /etc/fusionforge/fusionforge.conf | cut -d= -f2-)
+    db_user=$(grep ^db_user= /etc/fusionforge/fusionforge.conf | cut -d= -f2-)
     
     db_user_nss=$db_user"_nss"
 
only in patch2:
unchanged:
--- fusionforge-5.0.2.orig/plugins/cvstracker/Makefile
+++ fusionforge-5.0.2/plugins/cvstracker/Makefile
@@ -30,7 +30,7 @@
 	/usr/share/gforge/bin/fill-in-the-blanks.pl \
 	$(DESTDIR)/etc/gforge/plugins/cvstracker/cvstracker.conf.tmpl \
 	$(DESTDIR)/etc/gforge/plugins/cvstracker/cvstracker.conf \
-        $(DESTDIR)/etc/gforge/gforge.conf
+        $(DESTDIR)/etc/fusionforge/fusionforge.conf
 	chmod 0644 $(DESTDIR)/etc/gforge/plugins/cvstracker/cvstracker.conf
 	$(DESTDIR)/usr/share/gforge/plugins/cvstracker/bin/db-upgrade.pl
 	$(DESTDIR)/usr/share/gforge/bin/register-plugin cvstracker "cvstracker"	
only in patch2:
unchanged:
--- fusionforge-5.0.2.orig/plugins/scmcvs/fusionforge-plugin-scmcvs.spec
+++ fusionforge-5.0.2/plugins/scmcvs/fusionforge-plugin-scmcvs.spec
@@ -113,7 +113,7 @@
 		s/sys_use_scm=false/sys_use_scm=true/g" %{GFORGE_CONF_DIR}/gforge.conf
 		
 	# initializing configuration
-	%{SBIN_DIR}/gforge-config
+	%{SBIN_DIR}/fusionforge-config
 	
 	CHROOT=`grep '^gforge_chroot=' %{GFORGE_CONF_DIR}/gforge.conf | sed 's/.*=\s*\(.*\)/\1/'`
 	if [ ! -d $CHROOT/cvsroot ] ; then
only in patch2:
unchanged:
--- fusionforge-5.0.2.orig/plugins/scmsvn/fusionforge-plugin-scmsvn.spec
+++ fusionforge-5.0.2/plugins/scmsvn/fusionforge-plugin-scmsvn.spec
@@ -91,7 +91,7 @@
 	s/sys_use_scm=false/sys_use_scm=true/g" %{FFORGE_CONF_DIR}/gforge.conf
 		
 	# initializing configuration
-	%{SBIN_DIR}/gforge-config
+	%{SBIN_DIR}/fusionforge-config
 	
 	CHROOT=`grep '^gforge_chroot=' %{FFORGE_CONF_DIR}/gforge.conf | sed 's/.*=\s*\(.*\)/\1/'`
 	if [ ! -d $CHROOT/svnroot ] ; then
only in patch2:
unchanged:
--- fusionforge-5.0.2.orig/packaging/dirs/web-apache2
+++ fusionforge-5.0.2/packaging/dirs/web-apache2
@@ -3,6 +3,7 @@
 etc/gforge/templates
 etc/logrotate.d
 usr/share/gforge/bin
+usr/share/gforge/plugins
 usr/share/gforge/www
 var/lib/gforge/scmtarballs
 var/lib/gforge/scmsnapshots
only in patch2:
unchanged:
--- fusionforge-5.0.2.orig/packaging/install/shell-postgresql
+++ fusionforge-5.0.2/packaging/install/shell-postgresql
@@ -1 +1,2 @@
+deb-specific/fusionforge.rsyslog etc/rsyslog.d/
 utils/install-nsspgsql.sh usr/share/gforge/bin/
only in patch2:
unchanged:
--- fusionforge-5.0.2.orig/packaging/install/common
+++ fusionforge-5.0.2/packaging/install/common
@@ -8,7 +8,7 @@
 deb-specific/install-chroot.sh         usr/share/gforge/bin/
 deb-specific/install-ssh.sh            usr/share/gforge/bin/
 utils/fill-in-the-blanks.pl            usr/share/gforge/bin/
-deb-specific/gforge-config             usr/sbin/
+deb-specific/fusionforge-config        usr/sbin/
 utils/include.pl                       usr/share/gforge/lib/
 #
 deb-specific/user_dump_update.pl       usr/share/gforge/bin/
only in patch2:
unchanged:
--- fusionforge-5.0.2.orig/www/admin/pluginman.php
+++ fusionforge-5.0.2/www/admin/pluginman.php
@@ -205,18 +205,18 @@
 
 //get the directories from the plugins dir
 
-$handle = opendir($sys_plugins_path);
 $filelist = array();
-while (($filename = readdir($handle)) !== false) {
-	if ($filename!='..' && $filename!='.' && $filename!=".svn" && $filename!="CVS" &&
-		is_dir($sys_plugins_path.'/'.$filename) &&
-		!in_array($filename, $plugins_disabled)) {
+if($handle = opendir($sys_plugins_path)) {
+	while (($filename = readdir($handle)) !== false) {
+		if ($filename!='..' && $filename!='.' && $filename!=".svn" && $filename!="CVS" &&
+		    is_dir($sys_plugins_path.'/'.$filename) &&
+		    !in_array($filename, $plugins_disabled)) {
 
-		$filelist[] = $filename;
+			$filelist[] = $filename;
+		}
 	}
+	closedir($handle);
 }
-closedir($handle);
-
 sort($filelist);
 
 $j = 0;
only in patch2:
unchanged:
--- fusionforge-5.0.2.orig/www/admin/index.php
+++ fusionforge-5.0.2/www/admin/index.php
@@ -176,6 +176,9 @@
 	}
 	if($GLOBALS['sys_use_project_database']) { ?>
 		<li><a href="database.php"><?php echo _('Project Database Administration'); ?></a></li>
+	<?php }
+	if($GLOBALS['sys_use_people']) { ?>
+        <li><a href="<?php echo util_make_url ('/people/admin/'); ?>"><?php echo _('Job / Categories Administration'); ?></a></li>
 	<?php } ?>
 </ul>
 <?php }
only in patch2:
unchanged:
--- fusionforge-5.0.2.orig/www/admin/admin_table.php
+++ fusionforge-5.0.2/www/admin/admin_table.php
@@ -86,7 +86,7 @@
 		$values[] = getStringFromPost($field);
 	}
 
-	$qpa = db_construct_qpa ($qpa, implode (',', $v), $values) ;
+	$qpa = db_construct_qpa ($qpa, implode (',', $v).')', $values) ;
 
 	if (db_query_qpa($qpa)) {
 		printf(_('%1$s successfully added.'), ucfirst(getUnitLabel($unit)));
only in patch2:
unchanged:
--- fusionforge-5.0.2.orig/www/snippet/browse.php
+++ fusionforge-5.0.2/www/snippet/browse.php
@@ -35,8 +35,8 @@
 
 $by = getStringFromRequest('by');
 
-$qpa = db_construct_qpa (false, 'SELECT users.realname,users.user_name,snippet.description,snippet.snippet_id,snippet.name FROM snippet,users WHERE users.user_id=snippet.created_by') ;
-$qpa2 = db_construct_qpa (false, 'SELECT users.realname,users.user_name,users.user_id,snippet_package.description,snippet_package.snippet_package_id,snippet_package.name FROM snippet_package,users WHERE users.user_id=snippet_package.created_by') ;
+$qpa = db_construct_qpa (false, 'SELECT users.realname,users.user_name,snippet.description,snippet.snippet_id,snippet.name FROM snippet,users WHERE users.user_id=snippet.created_by ') ;
+$qpa2 = db_construct_qpa (false, 'SELECT users.realname,users.user_name,users.user_id,snippet_package.description,snippet_package.snippet_package_id,snippet_package.name FROM snippet_package,users WHERE users.user_id=snippet_package.created_by ') ;
 
 if ($by=='lang') {
 	$lang = getStringFromRequest('lang');
only in patch2:
unchanged:
--- fusionforge-5.0.2.orig/www/softwaremap/full_list.php
+++ fusionforge-5.0.2/www/softwaremap/full_list.php
@@ -133,7 +133,7 @@
 	if ($row_grp && $viewthisrow) {
 		print '<table border="0" cellpadding="0" width="100%">';
 		print '<tr valign="top"><td colspan="2">';
-		print "<a href=\"/projects/". strtolower($row_grp['unix_group_name']) ."/\"><strong>"
+		print '<a href="'. util_make_uri('/projects/'. strtolower($row_grp['unix_group_name']) .'/') .'"><strong>'
 			.$row_grp['group_name']."</strong></a> ";
 
 		if ($row_grp['short_description']) {
only in patch2:
unchanged:
--- fusionforge-5.0.2.orig/debian/README.Debian.tmpl
+++ fusionforge-5.0.2/debian/README.Debian.tmpl
@@ -12,7 +12,7 @@
 ------
 Want to know what the status of this package is?  Read
 /usr/share/doc/@PACKAGE@/TODO.Debian or (even better)
-<https://fusionforge.org/mediawiki/index.php/Roadmap>.  If you miss a
+<https://fusionforge.org/plugins/mediawiki/wiki/fusionforge/index.php/Roadmap>.  If you miss a
 feature, or find a bug, or want to help, don't hesitate to contact me
 (Roland Mas <lolando@debian.org>) .  Plenty of features are missing,
 I'm working on some, but if you don't tell me which ones you miss the
only in patch2:
unchanged:
--- fusionforge-5.0.2.orig/debian/rules
+++ fusionforge-5.0.2/debian/rules
@@ -58,10 +58,10 @@
 	dh $@
 
 # Build man pages from Docbook sources
-	cat debian/dsf-in/config.sgml | $(SED_REPLACE) > debian/$(OLDPACKAGE)-config.sgml
+	cat debian/dsf-in/config.sgml | $(SED_REPLACE) > debian/$(PACKAGE)-config.sgml
 	cat debian/dsf-in/common.manpages | $(SED_REPLACE) > debian/$(OLDPACKAGE)-common.manpages
 	/usr/bin/docbook-to-man debian/cvssh.sgml > cvssh.1
-	/usr/bin/docbook-to-man debian/$(OLDPACKAGE)-config.sgml > $(OLDPACKAGE)-config.1
+	/usr/bin/docbook-to-man debian/$(PACKAGE)-config.sgml > $(PACKAGE)-config.1
 
 # Build README.Debian from template
 	cat debian/README.Debian.tmpl | $(SED_REPLACE) > debian/README.Debian
@@ -82,9 +82,9 @@
 	rm -f $(CURDIR)/debian/*.dirs
 	rm -f $(CURDIR)/debian/*.install
 	rm -f $(CURDIR)/debian/*.docs
-	rm -f $(CURDIR)/debian/$(OLDPACKAGE)-config.sgml
+	rm -f $(CURDIR)/debian/$(PACKAGE)-config.sgml
 	rm -f $(CURDIR)/debian/$(OLDPACKAGE)-common.manpages
-	rm -f cvssh.1 $(OLDPACKAGE)-config.1
+	rm -f cvssh.1 $(PACKAGE)-config.1
 	rm -f $(CURDIR)/debian/README.Debian
 	rm -rf locales
 
only in patch2:
unchanged:
only in patch2:
unchanged:
--- fusionforge-5.0.2.orig/debian/dsf-helper/handle-mainconffile.config
+++ fusionforge-5.0.2/debian/dsf-helper/handle-mainconffile.config
@@ -8,7 +8,11 @@
 	mkdir -p $mainconfdir
     fi
     if [ ! -e $mainconffile ] ; then
-        touch $mainconffile
+	if [ -e /etc/gforge/gforge.conf ] ; then
+	    cp -a /etc/gforge/gforge.conf $mainconffile
+	else
+            touch $mainconffile
+	fi
         chmod 600 $mainconffile
     fi
 }
only in patch2:
unchanged:
--- fusionforge-5.0.2.orig/debian/dsf-in/config.sgml
+++ fusionforge-5.0.2/debian/dsf-in/config.sgml
@@ -64,7 +64,7 @@
       configuration files found in /etc/@PACKAGE@ with appropriate
       files derived from standard fill-in-the-blank templates (found
       in /usr/share/@PACKAGE@/templates).  The values used to fill in
-      the blanks are taken from /etc/@PACKAGE@.conf.
+      the blanks are taken from /etc/@PACKAGE@/@PACKAGE@.conf.
     </para>
 
   </refsect1>
only in patch2:
unchanged:
--- fusionforge-5.0.2.orig/debian/dsf-in/shell-postgresql.postinst
+++ fusionforge-5.0.2/debian/dsf-in/shell-postgresql.postinst
@@ -27,7 +27,7 @@
 
 case "$1" in
     configure)
-	@OLDPACKAGE@-config
+	@PACKAGE@-config
 
         # Patch NSS configuration files
 	/usr/share/@OLDPACKAGE@/bin/install-nsspgsql.sh configure-files
only in patch2:
unchanged:
--- fusionforge-5.0.2.orig/debian/dsf-in/web-apache2-vhosts.postinst.dsfh-in
+++ fusionforge-5.0.2/debian/dsf-in/web-apache2-vhosts.postinst.dsfh-in
@@ -27,7 +27,7 @@
 
 case "$1" in
     configure)
-        @OLDPACKAGE@-config
+        @PACKAGE@-config
 
 	db_stop
         # Setup our Apache
only in patch2:
unchanged:
--- fusionforge-5.0.2.orig/debian/dsf-in/plugin-scmarch.postinst
+++ fusionforge-5.0.2/debian/dsf-in/plugin-scmarch.postinst
@@ -25,7 +25,7 @@
 
 case "$1" in
     configure)
-	@OLDPACKAGE@-config
+	@PACKAGE@-config
 
 	# Prepare database
 	su -s /bin/sh @OLDPACKAGE@ -c '/usr/share/gforge/bin/register-plugin scmarch "Arch"'
only in patch2:
unchanged:
--- fusionforge-5.0.2.orig/debian/dsf-in/plugin-scmhg.postinst
+++ fusionforge-5.0.2/debian/dsf-in/plugin-scmhg.postinst
@@ -25,7 +25,7 @@
 
 case "$1" in
     configure)
-	@OLDPACKAGE@-config
+	@PACKAGE@-config
 
 	# Prepare database
 	su -s /bin/sh @OLDPACKAGE@ -c '/usr/share/gforge/bin/register-plugin scmhg "Mercurial"'
only in patch2:
unchanged:
--- fusionforge-5.0.2.orig/debian/dsf-in/common.manpages
+++ fusionforge-5.0.2/debian/dsf-in/common.manpages
@@ -1,2 +1,2 @@
-@OLDPACKAGE@-config.1
+@PACKAGE@-config.1
 cvssh.1
only in patch2:
unchanged:
--- fusionforge-5.0.2.orig/debian/dsf-in/plugin-scmbzr.postinst
+++ fusionforge-5.0.2/debian/dsf-in/plugin-scmbzr.postinst
@@ -25,7 +25,7 @@
 
 case "$1" in
     configure)
-	@OLDPACKAGE@-config
+	@PACKAGE@-config
 
 	# Prepare database
 	su -s /bin/sh @OLDPACKAGE@ -c '/usr/share/gforge/bin/register-plugin scmbzr "Bazaar"'
only in patch2:
unchanged:
--- fusionforge-5.0.2.orig/debian/dsf-in/plugin-scmcvs.postinst
+++ fusionforge-5.0.2/debian/dsf-in/plugin-scmcvs.postinst
@@ -25,7 +25,7 @@
 
 case "$1" in
     configure)
-	@OLDPACKAGE@-config
+	@PACKAGE@-config
 
 	# Prepare database
 	su -s /bin/sh @OLDPACKAGE@ -c '/usr/share/@OLDPACKAGE@/bin/register-plugin scmcvs "CVS"'
only in patch2:
unchanged:
--- fusionforge-5.0.2.orig/debian/dsf-in/web-apache2.postinst.dsfh-in
+++ fusionforge-5.0.2/debian/dsf-in/web-apache2.postinst.dsfh-in
@@ -69,7 +69,7 @@
 	    fi
 	fi
 	
-        @OLDPACKAGE@-config
+        @PACKAGE@-config
 
 	db_stop
 
only in patch2:
unchanged:
--- fusionforge-5.0.2.orig/debian/dsf-in/dns-bind9.postinst
+++ fusionforge-5.0.2/debian/dsf-in/dns-bind9.postinst
@@ -27,7 +27,7 @@
 
 case "$1" in
     configure)
-	@OLDPACKAGE@-config
+	@PACKAGE@-config
 
 	# Patch Bind configuration files
 	/usr/share/@OLDPACKAGE@/bin/install-dns.sh configure-files
only in patch2:
unchanged:
--- fusionforge-5.0.2.orig/debian/dsf-in/plugin-mediawiki.postinst
+++ fusionforge-5.0.2/debian/dsf-in/plugin-mediawiki.postinst
@@ -26,7 +26,7 @@
 case "$1" in
     configure)
 	/usr/share/@OLDPACKAGE@/bin/register-plugin mediawiki "Mediawiki"
-	@OLDPACKAGE@-config
+	@PACKAGE@-config
 	for flavour in apache apache-perl apache-ssl apache2 ; do
 	    if [ -x /usr/sbin/$flavour ]; then
 		invoke-rc.d $flavour reload || true
only in patch2:
unchanged:
--- fusionforge-5.0.2.orig/debian/dsf-in/db-postgresql.postinst.dsfh-in
+++ fusionforge-5.0.2/debian/dsf-in/db-postgresql.postinst.dsfh-in
@@ -56,7 +56,7 @@
     configure)
 	add_onevar_mainconfile default_trove_cat 18
 
-	@OLDPACKAGE@-config
+	@PACKAGE@-config
 
         # Patch DB configuration files
 	/usr/share/@OLDPACKAGE@/bin/install-db.sh configure-files
@@ -65,6 +65,7 @@
 
 	# Reload postgresql to make sure the database accepts connections from the new users
 	# Trying "postgresql" init script...
+	v=0
 	invoke-rc.d postgresql reload || v=$?
 	if test x"$v" = x"100"; then
 		# No "postgresql" init script (for packages << 8.4.4-2)
only in patch2:
unchanged:
--- fusionforge-5.0.2.orig/debian/dsf-in/mta-postfix.postinst
+++ fusionforge-5.0.2/debian/dsf-in/mta-postfix.postinst
@@ -27,7 +27,7 @@
 
 case "$1" in
     configure)
-	@OLDPACKAGE@-config
+	@PACKAGE@-config
 
         # Patch Postfix configuration files
 	/usr/share/@OLDPACKAGE@/bin/install-postfix.sh configure-files
only in patch2:
unchanged:
--- fusionforge-5.0.2.orig/debian/dsf-in/lists-mailman.postinst
+++ fusionforge-5.0.2/debian/dsf-in/lists-mailman.postinst
@@ -27,7 +27,7 @@
 
 case "$1" in
     configure)
-	@OLDPACKAGE@-config
+	@PACKAGE@-config
 	
 	echo "Fixing past damage in mailing-lists..."
 	if [ -z "$2" ] || dpkg --compare-versions $2 le 3rc2-4 ; then
only in patch2:
unchanged:
--- fusionforge-5.0.2.orig/debian/dsf-in/mta-exim4.postinst
+++ fusionforge-5.0.2/debian/dsf-in/mta-exim4.postinst
@@ -28,7 +28,7 @@
 case "$1" in
     configure)
 
-	@OLDPACKAGE@-config
+	@PACKAGE@-config
         # Patch Exim configuration files
 	/usr/share/@OLDPACKAGE@/bin/install-exim4.sh configure-files
 	if [ -f /etc/aliases.@OLDPACKAGE@-new ]
only in patch2:
unchanged:
--- fusionforge-5.0.2.orig/debian/dsf-in/ftp-proftpd.postinst
+++ fusionforge-5.0.2/debian/dsf-in/ftp-proftpd.postinst
@@ -27,7 +27,7 @@
 
 case "$1" in
     configure)
-	@OLDPACKAGE@-config
+	@PACKAGE@-config
 
         # Patch Proftpd configuration files
 	/usr/share/@OLDPACKAGE@/bin/install-ftp.sh configure-files
only in patch2:
unchanged:
--- fusionforge-5.0.2.orig/debian/dsf-in/plugin-scmcpold.postinst
+++ fusionforge-5.0.2/debian/dsf-in/plugin-scmcpold.postinst
@@ -25,7 +25,7 @@
 
 case "$1" in
     configure)
-	@OLDPACKAGE@-config
+	@PACKAGE@-config
 
 	# Prepare database
 	su -s /bin/sh @OLDPACKAGE@ -c '/usr/share/gforge/bin/register-plugin scmcpold "CPOLD"'
only in patch2:
unchanged:
--- fusionforge-5.0.2.orig/debian/dsf-in/plugin-scmdarcs.postinst
+++ fusionforge-5.0.2/debian/dsf-in/plugin-scmdarcs.postinst
@@ -25,7 +25,7 @@
 
 case "$1" in
     configure)
-	@OLDPACKAGE@-config
+	@PACKAGE@-config
 
 	# Prepare database
 	su -s /bin/sh @OLDPACKAGE@ -c '/usr/share/gforge/bin/register-plugin scmdarcs "Darcs"'
only in patch2:
unchanged:
--- fusionforge-5.0.2.orig/debian/dsf-in/web-apache2-vhosts.postrm.dsfh-in
+++ fusionforge-5.0.2/debian/dsf-in/web-apache2-vhosts.postrm.dsfh-in
@@ -18,7 +18,7 @@
 
 case "$1" in
     purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-	@OLDPACKAGE@-config
+	@PACKAGE@-config
         # Make Apache see these new changes
 	invoke-rc.d apache2 reload || true
 	;;
only in patch2:
unchanged:
--- fusionforge-5.0.2.orig/debian/dsf-in/plugin-scmgit.postinst
+++ fusionforge-5.0.2/debian/dsf-in/plugin-scmgit.postinst
@@ -25,7 +25,7 @@
 
 case "$1" in
     configure)
-	@OLDPACKAGE@-config
+	@PACKAGE@-config
 
 	# Prepare database
 	su -s /bin/sh @OLDPACKAGE@ -c '/usr/share/gforge/bin/register-plugin scmgit "Git"'
only in patch2:
unchanged:
--- fusionforge-5.0.2.orig/debian/dsf-in/plugin-scmsvn.postinst
+++ fusionforge-5.0.2/debian/dsf-in/plugin-scmsvn.postinst
@@ -25,7 +25,7 @@
 
 case "$1" in
     configure)
-	@OLDPACKAGE@-config
+	@PACKAGE@-config
 
 	# Prepare database
 	su -s /bin/sh @OLDPACKAGE@ -c '/usr/share/gforge/bin/register-plugin scmsvn "Subversion"'
only in patch2:
unchanged:
--- fusionforge-5.0.2.orig/debian/dsf-in/db-postgresql.prerm
+++ fusionforge-5.0.2/debian/dsf-in/db-postgresql.prerm
@@ -55,6 +55,7 @@
 	ucf --purge ${pg_hba_dir}/pg_hba.conf
 
 	# Trying "postgresql" init script...
+	v=0
 	invoke-rc.d postgresql reload || v=$?
 	if test x"$v" = x"100"; then
 		# No "postgresql" init script (for packages << 8.4.4-2)
only in patch2:
unchanged:
--- fusionforge-5.0.2.orig/debian/dsf-in/common.postinst
+++ fusionforge-5.0.2/debian/dsf-in/common.postinst
@@ -32,7 +32,7 @@
 	adduser --system --group --home /var/lib/@OLDPACKAGE@/chroot/cvsroot scm-@OLDPACKAGE@ > /dev/null 2>&1
 	adduser --system --group --home /var/lib/@OLDPACKAGE@/chroot/cvsroot www-@OLDPACKAGE@ > /dev/null 2>&1
 
-	@OLDPACKAGE@-config
+	@PACKAGE@-config
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

--- End Message ---
--- Begin Message ---
On Sun, Oct  3, 2010 at 18:44:28 +0200, Roland Mas wrote:

> fusionforge (5.0.2-2) unstable; urgency=low
> 
Unblocked.

Cheers,
Julien

Attachment: signature.asc
Description: Digital signature


--- End Message ---

Reply to: