From c513ffe1f794e587a30290d5e8a9c7fe976c104c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 16 Feb 2018 18:21:18 +0100 Subject: [PATCH] Fix debian package --- .../patches/use-etc-dolibarr-conf.patch | 26 ----------------- build/rpm/dolibarr-forrpm.patch | 28 ------------------- htdocs/filefunc.inc.php | 8 ++++-- htdocs/support/inc.php | 9 ++++-- 4 files changed, 11 insertions(+), 60 deletions(-) diff --git a/build/debian/patches/use-etc-dolibarr-conf.patch b/build/debian/patches/use-etc-dolibarr-conf.patch index 3bca20ee66f..04543e5fac6 100644 --- a/build/debian/patches/use-etc-dolibarr-conf.patch +++ b/build/debian/patches/use-etc-dolibarr-conf.patch @@ -9,19 +9,6 @@ Forwarded: not-needed Last-Update: 2013-07-29 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/htdocs/filefunc.inc.php -+++ b/htdocs/filefunc.inc.php -@@ -63,8 +63,8 @@ $conffiletoshowshort = "conf.php"; - $conffile = "conf/conf.php"; - $conffiletoshow = "htdocs/conf/conf.php"; - // For debian/redhat like systems --//$conffile = "/etc/dolibarr/conf.php"; --//$conffiletoshow = "/etc/dolibarr/conf.php"; -+$conffile = "/etc/dolibarr/conf.php"; -+$conffiletoshow = "/etc/dolibarr/conf.php"; - - - // Include configuration --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -73,8 +73,8 @@ $conffiletoshowshort = "conf.php"; @@ -34,17 +21,4 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +$conffiletoshow = "/etc/dolibarr/conf.php"; - // Load conf file if it is already defined ---- a/htdocs/support/inc.php -+++ b/htdocs/support/inc.php -@@ -69,8 +69,8 @@ $conffiletoshowshort = "conf.php"; - $conffile = "../conf/conf.php"; - $conffiletoshow = "htdocs/conf/conf.php"; - // For debian/redhat like systems --//$conffile = "/etc/dolibarr/conf.php"; --//$conffiletoshow = "/etc/dolibarr/conf.php"; -+$conffile = "/etc/dolibarr/conf.php"; -+$conffiletoshow = "/etc/dolibarr/conf.php"; - - // Load conf file if it is already defined diff --git a/build/rpm/dolibarr-forrpm.patch b/build/rpm/dolibarr-forrpm.patch index 6c484345be9..ae9cf5cb2de 100644 --- a/build/rpm/dolibarr-forrpm.patch +++ b/build/rpm/dolibarr-forrpm.patch @@ -1,17 +1,3 @@ -diff -up htdocs/filefunc.inc.php.patch htdocs/filefunc.inc.php ---- htdocs/filefunc.inc.php.patch 2011-09-03 02:32:48.666952000 +0200 -+++ htdocs/filefunc.inc.php 2011-09-03 02:33:00.510952001 +0200 -@@ -63,8 +63,8 @@ - $conffile = "conf/conf.php"; - $conffiletoshow = "htdocs/conf/conf.php"; - // For debian/redhat like systems --//$conffile = "/etc/dolibarr/conf.php"; --//$conffiletoshow = "/etc/dolibarr/conf.php"; -+$conffile = "/etc/dolibarr/conf.php"; -+$conffiletoshow = "/etc/dolibarr/conf.php"; - - - // Include configuration diff -up htdocs/install/inc.php.patch htdocs/install/inc.php --- htdocs/install/inc.php.patch 2011-09-03 02:33:26.450952000 +0200 +++ htdocs/install/inc.php 2011-09-03 02:33:36.286952001 +0200 @@ -25,18 +11,4 @@ diff -up htdocs/install/inc.php.patch htdocs/install/inc.php +$conffiletoshow = "/etc/dolibarr/conf.php"; - // Load conf file if it is already defined -diff -up htdocs/support/inc.php.patch htdocs/support/inc.php ---- htdocs/support/inc.php.patch 2011-09-03 02:34:39.606952000 +0200 -+++ htdocs/support/inc.php 2011-09-03 02:33:59.814952000 +0200 -@@ -69,8 +69,8 @@ - $conffile = "../conf/conf.php"; - $conffiletoshow = "htdocs/conf/conf.php"; - // For debian/redhat like systems --//$conffile = "/etc/dolibarr/conf.php"; --//$conffiletoshow = "/etc/dolibarr/conf.php"; -+$conffile = "/etc/dolibarr/conf.php"; -+$conffiletoshow = "/etc/dolibarr/conf.php"; - - // Load conf file if it is already defined diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index 256501048ba..f0f35ada857 100644 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -62,9 +62,11 @@ $conffiletoshowshort = "conf.php"; $conffile = "conf/conf.php"; $conffiletoshow = "htdocs/conf/conf.php"; // For debian/redhat like systems -//$conffile = "/etc/dolibarr/conf.php"; -//$conffiletoshow = "/etc/dolibarr/conf.php"; - +if (! file_exists($conffile)) +{ + $conffile = "/etc/dolibarr/conf.php"; + $conffiletoshow = "/etc/dolibarr/conf.php"; +} // Include configuration // --- End of part replaced by Dolibarr packager makepack-dolibarr diff --git a/htdocs/support/inc.php b/htdocs/support/inc.php index 2ec9a70351b..c1cf83097b6 100644 --- a/htdocs/support/inc.php +++ b/htdocs/support/inc.php @@ -58,8 +58,11 @@ $conffiletoshowshort = "conf.php"; $conffile = "../conf/conf.php"; $conffiletoshow = "htdocs/conf/conf.php"; // For debian/redhat like systems -//$conffile = "/etc/dolibarr/conf.php"; -//$conffiletoshow = "/etc/dolibarr/conf.php"; +if (! file_exists($conffile)) +{ + $conffile = "/etc/dolibarr/conf.php"; + $conffiletoshow = "/etc/dolibarr/conf.php"; +} // Load conf file if it is already defined @@ -208,7 +211,7 @@ function pHeader($soutitre,$next,$action='none') // On force contenu dans format sortie header("Content-type: text/html; charset=".$conf->file->character_set_client); header("X-Content-Type-Options: nosniff"); - + print ''."\n"; print ''."\n"; print ''."\n";