104 lines
4.6 KiB
Diff
104 lines
4.6 KiB
Diff
Submitted By: Mario Fetka (mario.fetka@gmail.com)
|
|
Date: 2010-10-13
|
|
Initial Package Version: 6.40.2 (7.0.3)
|
|
Origin: me
|
|
Upstream Status: gentoo specific
|
|
Description: this patch correct the install dir for the default install target from /etc/sysconfig to the gentoo equivalent /etc/conf.d
|
|
|
|
diff -uNr zarafa-7.0.3.orig/installer/linux/Makefile.am zarafa-7.0.3/installer/linux/Makefile.am
|
|
--- zarafa-7.0.3.orig/installer/linux/Makefile.am 2011-11-20 18:45:15.661461795 +0100
|
|
+++ zarafa-7.0.3/installer/linux/Makefile.am 2011-11-20 18:48:10.780508507 +0100
|
|
@@ -26,7 +26,7 @@
|
|
sysconf_initdir=${sysconfdir}/init.d
|
|
sysconf_init_SCRIPTS = ${@DISTRO@_initscript_files}
|
|
|
|
-rhel_sysconfig_path = ${sysconfdir}/sysconfig
|
|
+rhel_sysconfig_path = ${sysconfdir}/conf.d
|
|
suse_sysconfig_path = ${localstatedir}/adm/fillup-templates
|
|
sles_sysconfig_path = ${localstatedir}/adm/fillup-templates
|
|
sysconf_sysconfigdir = ${@DISTRO@_sysconfig_path}
|
|
diff -uNr zarafa-7.0.3.orig/installer/userscripts/createcompany.in zarafa-7.0.3/installer/userscripts/createcompany.in
|
|
--- zarafa-7.0.3.orig/installer/userscripts/createcompany.in 2011-11-20 18:45:15.640628342 +0100
|
|
+++ zarafa-7.0.3/installer/userscripts/createcompany.in 2011-11-20 18:47:09.706088759 +0100
|
|
@@ -9,8 +9,8 @@
|
|
# beware that this string can contain any characters, so take heed to
|
|
# correct quoting.
|
|
|
|
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
|
- . @sysconfdir@/sysconfig/zarafa
|
|
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
|
+ . @sysconfdir@/conf.d/zarafa
|
|
elif [ -f @sysconfdir@/default/zarafa ]; then
|
|
. @sysconfdir@/default/zarafa
|
|
fi
|
|
diff -uNr zarafa-7.0.3.orig/installer/userscripts/creategroup.in zarafa-7.0.3/installer/userscripts/creategroup.in
|
|
--- zarafa-7.0.3.orig/installer/userscripts/creategroup.in 2011-11-20 18:45:15.640628342 +0100
|
|
+++ zarafa-7.0.3/installer/userscripts/creategroup.in 2011-11-20 18:46:48.060132907 +0100
|
|
@@ -9,8 +9,8 @@
|
|
# beware that this string can contain any characters, so take heed to
|
|
# correct quoting.
|
|
|
|
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
|
- . @sysconfdir@/sysconfig/zarafa
|
|
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
|
+ . @sysconfdir@/conf.d/zarafa
|
|
elif [ -f @sysconfdir@/default/zarafa ]; then
|
|
. @sysconfdir@/default/zarafa
|
|
fi
|
|
diff -uNr zarafa-7.0.3.orig/installer/userscripts/createuser.in zarafa-7.0.3/installer/userscripts/createuser.in
|
|
--- zarafa-7.0.3.orig/installer/userscripts/createuser.in 2011-11-20 18:45:15.640628342 +0100
|
|
+++ zarafa-7.0.3/installer/userscripts/createuser.in 2011-11-20 18:47:04.215316936 +0100
|
|
@@ -9,8 +9,8 @@
|
|
# beware that this string can contain any characters, so take heed to
|
|
# correct quoting.
|
|
|
|
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
|
- . @sysconfdir@/sysconfig/zarafa
|
|
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
|
+ . @sysconfdir@/conf.d/zarafa
|
|
elif [ -f @sysconfdir@/default/zarafa ]; then
|
|
. @sysconfdir@/default/zarafa
|
|
fi
|
|
diff -uNr zarafa-7.0.3.orig/installer/userscripts/deletecompany.in zarafa-7.0.3/installer/userscripts/deletecompany.in
|
|
--- zarafa-7.0.3.orig/installer/userscripts/deletecompany.in 2011-11-20 18:45:15.638313511 +0100
|
|
+++ zarafa-7.0.3/installer/userscripts/deletecompany.in 2011-11-20 18:46:16.113192833 +0100
|
|
@@ -9,8 +9,8 @@
|
|
# beware that this string can contain any characters, so take heed to
|
|
# correct quoting.
|
|
|
|
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
|
- . @sysconfdir@/sysconfig/zarafa
|
|
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
|
+ . @sysconfdir@/conf.d/zarafa
|
|
fi
|
|
|
|
ZARAFA_COMPANY_SCRIPTS=@USERSCRIPTDIR@/deletecompany.d
|
|
diff -uNr zarafa-7.0.3.orig/installer/userscripts/deletegroup.in zarafa-7.0.3/installer/userscripts/deletegroup.in
|
|
--- zarafa-7.0.3.orig/installer/userscripts/deletegroup.in 2011-11-20 18:45:15.638313511 +0100
|
|
+++ zarafa-7.0.3/installer/userscripts/deletegroup.in 2011-11-20 18:46:26.173434957 +0100
|
|
@@ -9,8 +9,8 @@
|
|
# beware that this string can contain any characters, so take heed to
|
|
# correct quoting.
|
|
|
|
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
|
- . @sysconfdir@/sysconfig/zarafa
|
|
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
|
+ . @sysconfdir@/conf.d/zarafa
|
|
fi
|
|
|
|
ZARAFA_GROUP_SCRIPTS=@USERSCRIPTDIR@/deletegroup.d
|
|
diff -uNr zarafa-7.0.3.orig/installer/userscripts/deleteuser.in zarafa-7.0.3/installer/userscripts/deleteuser.in
|
|
--- zarafa-7.0.3.orig/installer/userscripts/deleteuser.in 2011-11-20 18:45:15.659146961 +0100
|
|
+++ zarafa-7.0.3/installer/userscripts/deleteuser.in 2011-11-20 18:47:14.958433297 +0100
|
|
@@ -9,8 +9,8 @@
|
|
# that this string can contain any characters, so take heed to correct
|
|
# quoting.
|
|
|
|
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
|
- . @sysconfdir@/sysconfig/zarafa
|
|
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
|
+ . @sysconfdir@/conf.d/zarafa
|
|
fi
|
|
|
|
ZARAFA_USER_SCRIPTS=@USERSCRIPTDIR@/deleteuser.d
|