[phpBB] svn: r611 - trunk/phpbb3

taffit at wolffelaar.nl taffit at wolffelaar.nl
Tue Mar 8 04:58:05 CET 2011


Author: taffit
Date: 2011-03-08 04:58:05 +0100 (Tue, 08 Mar 2011)
New Revision: 611

Modified:
   trunk/phpbb3/changelog
   trunk/phpbb3/phpbb3.config
Log:
Don't use local lib on preinst (closes: #595536)

Skip some parts of the config until the package files are presents.

Modified: trunk/phpbb3/changelog
===================================================================
--- trunk/phpbb3/changelog	2011-03-08 03:57:39 UTC (rev 610)
+++ trunk/phpbb3/changelog	2011-03-08 03:58:05 UTC (rev 611)
@@ -5,13 +5,14 @@
   * Fix cross site scripting vulnerability (closes: #612477) [CVE-2011-0544].
   * Enforce run_sql with "-h localhost" when $dbc_dbserver is empty
     (closes: #613060).
+  * Don't use local lib on preinst (closes: #595536).
 
   [ Jean-Marc Roth ]
   * Fix postgres failure when postgres server is remote (closes: #612441). 
   * Don't be too rude on trying to uninstall when unsupported webserver is 
     used (closes: #597373). 
 
- -- Jean-Marc Roth <jmroth at iip.lu>  Sun, 06 Mar 2011 22:35:33 -0400
+ -- Jean-Marc Roth <jmroth at iip.lu>  Mon, 07 Mar 2011 14:10:49 -0400
 
 phpbb3 (3.0.7-PL1-4) unstable; urgency=high
 

Modified: trunk/phpbb3/phpbb3.config
===================================================================
--- trunk/phpbb3/phpbb3.config	2011-03-08 03:57:39 UTC (rev 610)
+++ trunk/phpbb3/phpbb3.config	2011-03-08 03:58:05 UTC (rev 611)
@@ -16,9 +16,6 @@
 
 SUPPORTED_WEBSERVERS="apache2 lighttpd"
 
-. /usr/share/phpbb3/maint-libs/webapps-config
-. /usr/share/phpbb3/maint-libs/dbapps-lib
-
 . /usr/share/debconf/confmodule
 db_version 2.0
 
@@ -41,6 +38,13 @@
 db_input high phpbb3/httpd || true
 db_go || true
 
+# some files of the package need to be present to configure the package
+if [ -f /usr/share/phpbb3/maint-libs/webapps-config ] && \
+   [ -f /usr/share/phpbb3/maint-libs/dbapps-lib ]; then
+
+. /usr/share/phpbb3/maint-libs/webapps-config
+. /usr/share/phpbb3/maint-libs/dbapps-lib
+
 dc_dbg
 
 if [ -f /usr/share/dbconfig-common/dpkg/config ]; then
@@ -135,3 +139,4 @@
     fi
     dc_forget phpbb3/admin-pass-ask
 fi
+fi





More information about the phpBB-l mailing list