dbp/ifolder
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bump and correct install dirs and detect for the split tree setup

Browse Source 
Package-Manager: portage-2.2.0_alpha166
RepoMan-Options: --force
This commit is contained in:
Mario Fetka
2013-04-20 08:12:50 +02:00
parent c4440b0d94
commit 43478a1a04
13 changed files with 373 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
www-apps/ifolder3-enterprise-plugins/files/3.9.1/gentoo-openldap-path.patch Normal file
View File

@@ -0,0 +1,19 @@
diff -uNr ifolder3-enterprise-plugins-3.9.1.7665.orig/src/LdapGroup/Makefile.am ifolder3-enterprise-plugins-3.9.1.7665/src/LdapGroup/Makefile.am
--- ifolder3-enterprise-plugins-3.9.1.7665.orig/src/LdapGroup/Makefile.am 2013-04-20 03:46:48.497913815 +0200
+++ ifolder3-enterprise-plugins-3.9.1.7665/src/LdapGroup/Makefile.am 2013-04-20 03:48:43.197479874 +0200
@@ -8,10 +8,11 @@
install-exec-local:
$(mkinstalldirs) $(DESTDIR)$(bindir)
$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/simias/bill/modules/
- $(INSTALL_PROGRAM) iFolderLdapPlugin.ldif $(DESTDIR)$(sysconfdir)
- $(INSTALL_PROGRAM) iFolderLdapGroupExtend.ldif $(DESTDIR)$(sysconfdir)
- $(INSTALL_PROGRAM) iFolderLdapPlugin.schema $(DESTDIR)$(sysconfdir)
- $(INSTALL_PROGRAM) iFolderADLdapPlugin.ldif $(DESTDIR)$(sysconfdir)
+ $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/openldap/schema
+ $(INSTALL_PROGRAM) iFolderLdapPlugin.ldif $(DESTDIR)$(sysconfdir)/openldap/schema
+ $(INSTALL_PROGRAM) iFolderLdapGroupExtend.ldif $(DESTDIR)$(sysconfdir)/openldap/schema
+ $(INSTALL_PROGRAM) iFolderLdapPlugin.schema $(DESTDIR)$(sysconfdir)/openldap/schema
+ $(INSTALL_PROGRAM) iFolderADLdapPlugin.ldif $(DESTDIR)$(sysconfdir)/openldap/schema
$(INSTALL_PROGRAM) IdentityManagement.conf $(DESTDIR)$(sysconfdir)/simias/bill/modules/
uninstall-local:

16
www-apps/ifolder3-enterprise-plugins/files/3.9.1/mod_mono_path.patch Normal file
View File

@@ -0,0 +1,16 @@
Index: simias-1.8.3.10200.stable/configure.in
===================================================================
--- simias-1.8.3.10200.stable.orig/configure.in 2010-07-19 12:30:02.515201941 -0400
+++ simias-1.8.3.10200.stable/configure.in 2010-07-19 12:33:55.935201104 -0400
@@ -722,6 +722,11 @@ if test -e "/etc/httpd/mod_mono.conf"; t
MODMONO_CONFPATH="/etc/httpd/mod_mono.conf"
fi
+# Gentoo location of enabled mod_mono.conf
+if test -e "/etc/gentoo-release"; then
+ MODMONO_CONFPATH="/etc/apache2/modules.d/70_mod_mono.conf"
+fi
+
AC_SUBST(MODMONO_CONFPATH)

36
www-apps/ifolder3-enterprise-plugins/files/3.9.1/separate_client_server_dirs.patch Normal file
View File

@@ -0,0 +1,36 @@
submitted upstream
https://bugzilla.novell.com/show_bug.cgi?id=608881
Index: simias-1.8.3.10200.0/configure.in
===================================================================
--- simias-1.8.3.10200.0.orig/configure.in 2010-07-19 16:46:38.915198031 -0400
+++ simias-1.8.3.10200.0/configure.in 2010-07-19 16:46:45.705202221 -0400
@@ -269,7 +269,11 @@ AC_SUBST(COMMON_MAINTAINER_CLEAN_FILES)
# We have our own "standard" directories for web services.
#
+if test "$clientplugins" = "TRUE"; then
webdir="${libexecdir}/web"
+else
+ webdir="${libexecdir}/server"
+fi
webbindir="${webdir}/bin"
modulesdir="${webdir}/modules"
AC_SUBST(webdir)
@@ -485,16 +485,6 @@
AC_SUBST(GSOAP_PATH)
AC_SUBST(mappingpath)
-# We have our own "standard" directories for web services.
-#
-webdir="${libexecdir}/web"
-webbindir="${webdir}/bin"
-modulesdir="${webdir}/modules"
-AC_SUBST(webdir)
-AC_SUBST(webbindir)
-AC_SUBST(modulesdir)
-
-
#
# Setup the bootstrapdir
#

21
www-apps/ifolder3-enterprise-plugins/files/3.9.1/series Normal file
View File

@@ -0,0 +1,21 @@
use_system_gsoap.patch
use_wsdl_not_wsdl1.patch
use_mono_webserver2.patch
use_lib_as_libdir_on_amd64.patch
use_libdir_for_executables.patch
SimiasLib.dll.config-use-systemwide-FlaimWrapper.so.patch
www-data_apache.patch
mod_mono_path.patch
mod_mono_SimiasServerSetup_cs.patch
mod_mono_iFolderAdminSetup_cs.patch
mod_mono_iFolderWebSetup_cs.patch
convert_relative_path_to_webbindir_variable.patch
ifdata.patch
SimiasServerSetup_use_simiasconfdir_in_SetupDefaultConfigPath.patch
use_webbindir_variable_configurein.patch
separate_client_server_dirs.patch
serverpaths_from_configure_v2.patch
dont_download_deleted_nodes.patch
remove_nodesFromServer.patch
home_never_network_drive.patch
DEBUG_log_default.patch

28
www-apps/ifolder3-enterprise-plugins/files/3.9.1/use_libdir_for_executables.patch Normal file
View File

@@ -0,0 +1,28 @@
diff -uNr ifolder3-enterprise-plugins-3.9.1.7665.orig/src/LdapGroup/Simias.UserAdd/iFolderLdapUserUpdate.sh.in ifolder3-enterprise-plugins-3.9.1.7665/src/LdapGroup/Simias.UserAdd/iFolderLdapUserUpdate.sh.in
--- ifolder3-enterprise-plugins-3.9.1.7665.orig/src/LdapGroup/Simias.UserAdd/iFolderLdapUserUpdate.sh.in 2013-04-20 03:46:48.496913828 +0200
+++ ifolder3-enterprise-plugins-3.9.1.7665/src/LdapGroup/Simias.UserAdd/iFolderLdapUserUpdate.sh.in 2013-04-20 03:51:04.852708939 +0200
@@ -36,10 +36,10 @@
#*
#*******************************************************************************/
-export MONO_PATH=@_webbindir_@:@_bindir_@
+export MONO_PATH=@_webbindir_@:@_bindir_@/../lib/simias
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:@_webbindir_@
export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:@_webbindir_@
cd @_bindir_@
-mono @_bindir_@/UserAdd.exe "$@"
+mono @_bindir_@/../lib/simias/UserAdd.exe "$@"
diff -uNr ifolder3-enterprise-plugins-3.9.1.7665.orig/src/LdapGroup/Simias.UserAdd/Makefile.am ifolder3-enterprise-plugins-3.9.1.7665/src/LdapGroup/Simias.UserAdd/Makefile.am
--- ifolder3-enterprise-plugins-3.9.1.7665.orig/src/LdapGroup/Simias.UserAdd/Makefile.am 2013-04-20 03:46:48.496913828 +0200
+++ ifolder3-enterprise-plugins-3.9.1.7665/src/LdapGroup/Simias.UserAdd/Makefile.am 2013-04-20 03:54:25.178204526 +0200
@@ -42,7 +42,7 @@
install-exec-local: all $(DATA_FILES)
$(mkinstalldirs) $(DESTDIR)$(bindir)
- $(INSTALL_PROGRAM) UserAdd.exe $(DESTDIR)$(bindir)
+ $(INSTALL_PROGRAM) UserAdd.exe $(DESTDIR)$(libexecdir)
$(INSTALL_PROGRAM) iFolderLdapUserUpdate.sh $(DESTDIR)$(bindir)
uninstall-local:

28
www-apps/ifolder3-enterprise-plugins/files/3.9.1/use_system_gsoap.patch Normal file
View File

@@ -0,0 +1,28 @@
Index: simias-1.8.3.10200.stable/configure.in
===================================================================
--- simias-1.8.3.10200.stable.orig/configure.in 2010-04-15 10:16:23.000000000 -0400
+++ simias-1.8.3.10200.stable/configure.in 2010-07-19 12:29:01.505201104 -0400
@@ -345,7 +345,7 @@ case $SIMIAS_OS in
AC_CHECK_PROG(CXX, g++, g++)
StoreProviderAssembly="SimiasLib.dll"
StoreProviderType="Simias.Storage.Provider.Flaim.FlaimProvider"
- GSOAP_PATH="$TOOLDIR/gsoap/linux-2.7"
+ GSOAP_PATH="/usr/bin"
mappingpath="${exec_prefix}/${LIB64}/simias/web/bin/Simias.exe"
;;
#
Index: simias-1.8.3.10200.stable/src/core/libsimias/Makefile.am
===================================================================
--- simias-1.8.3.10200.stable.orig/src/core/libsimias/Makefile.am 2010-04-15 10:16:23.000000000 -0400
+++ simias-1.8.3.10200.stable/src/core/libsimias/Makefile.am 2010-07-19 12:29:01.505201104 -0400
@@ -27,8 +27,8 @@ envC.c: $(srcdir)/stdsoap2.c
$(GSOAP_PATH)/soapcpp2 -c -penv $(srcdir)/env.h
$(srcdir)/stdsoap2.c:
- cp $(GSOAP_PATH)/stdsoap2.h $(srcdir)
- cp $(GSOAP_PATH)/stdsoap2.c $(srcdir)
+ cp $(GSOAP_PATH)/../include/stdsoap2.h $(srcdir)
+ cp $(GSOAP_PATH)/../include/gsoap/stdsoap2.c $(srcdir)
$(srcdir)/libsimias.h: $(srcdir)/stdsoap2.c $(SIMIAS_WSDL)
$(GSOAP_PATH)/wsdl2h -c -o $@ $(SIMIAS_WSDL)

74
www-apps/ifolder3-enterprise-plugins/files/3.9.1/use_webbindir_variable_configurein.patch Normal file
View File

@@ -0,0 +1,74 @@
submitted upstream https://bugzilla.novell.com/show_bug.cgi?id=623576
Index: simias-1.8.3.10200.0/configure.in
===================================================================
--- simias-1.8.3.10200.0.orig/configure.in 2010-07-19 16:30:43.195198310 -0400
+++ simias-1.8.3.10200.0/configure.in 2010-07-19 16:33:22.885386325 -0400
@@ -266,6 +266,30 @@ AC_SUBST(COMMON_CLEAN_FILES)
AC_SUBST(COMMON_DISTCLEAN_FILES)
AC_SUBST(COMMON_MAINTAINER_CLEAN_FILES)
+
+# We have our own "standard" directories for web services.
+#
+webdir="${libexecdir}/web"
+webbindir="${webdir}/bin"
+modulesdir="${webdir}/modules"
+AC_SUBST(webdir)
+AC_SUBST(webbindir)
+AC_SUBST(modulesdir)
+
+
+#
+# Setup standard directories for webaccess app domain
+#
+webaccessdir="${libexecdir}/webaccess"
+AC_SUBST(webaccessdir)
+
+#
+# Setup standard directories for admin app domain
+#
+admindir="${libexecdir}/admin"
+AC_SUBST(admindir)
+
+
#
# Set platform-specific variables
#
@@ -346,7 +370,7 @@ case $SIMIAS_OS in
StoreProviderAssembly="SimiasLib.dll"
StoreProviderType="Simias.Storage.Provider.Flaim.FlaimProvider"
GSOAP_PATH="/usr/bin"
- mappingpath="${exec_prefix}/${LIB64}/simias/web/bin/Simias.exe"
+ mappingpath="${webbindir}/Simias.exe"
;;
#
# Windows-specific configuration
@@ -456,28 +480,6 @@ AC_SUBST(StoreProviderType)
AC_SUBST(GSOAP_PATH)
AC_SUBST(mappingpath)
-# We have our own "standard" directories for web services.
-#
-webdir="${libexecdir}/web"
-webbindir="${webdir}/bin"
-modulesdir="${webdir}/modules"
-AC_SUBST(webdir)
-AC_SUBST(webbindir)
-AC_SUBST(modulesdir)
-
-
-#
-# Setup standard directories for webaccess app domain
-#
-webaccessdir="${libexecdir}/webaccess"
-AC_SUBST(webaccessdir)
-
-#
-# Setup standard directories for admin app domain
-#
-admindir="${libexecdir}/admin"
-AC_SUBST(admindir)
-
#
# Setup the bootstrapdir
#

69
www-apps/ifolder3-enterprise-plugins/files/3.9.1/use_webbindir_variable_configurein_no_gsoap.patch Normal file
View File

@@ -0,0 +1,69 @@
diff -uNr ifolder3-enterprise-plugins-3.9.1.7665.orig/configure.in ifolder3-enterprise-plugins-3.9.1.7665/configure.in
--- ifolder3-enterprise-plugins-3.9.1.7665.orig/configure.in 2013-04-20 03:13:32.779863724 +0200
+++ ifolder3-enterprise-plugins-3.9.1.7665/configure.in 2013-04-20 03:18:23.316231520 +0200
@@ -267,6 +267,30 @@
AC_SUBST(COMMON_DISTCLEAN_FILES)
AC_SUBST(COMMON_MAINTAINER_CLEAN_FILES)
+
+# We have our own "standard" directories for web services.
+#
+webdir="${libexecdir}/web"
+webbindir="${webdir}/bin"
+modulesdir="${webdir}/modules"
+AC_SUBST(webdir)
+AC_SUBST(webbindir)
+AC_SUBST(modulesdir)
+
+
+#
+# Setup standard directories for webaccess app domain
+#
+webaccessdir="${libexecdir}/webaccess"
+AC_SUBST(webaccessdir)
+
+#
+# Setup standard directories for admin app domain
+#
+admindir="${libexecdir}/admin"
+AC_SUBST(admindir)
+
+
#
# Set platform-specific variables
#
@@ -347,7 +371,7 @@
StoreProviderAssembly="SimiasLib.dll"
StoreProviderType="Simias.Storage.Provider.Flaim.FlaimProvider"
GSOAP_PATH="$TOOLDIR/gsoap/linux-2.7"
- mappingpath="${exec_prefix}/${LIB64}/simias/web/bin/Simias.exe"
+ mappingpath="${webbindir}/Simias.exe"
;;
#
# Windows-specific configuration
@@ -468,25 +492,6 @@
#
-# Setup standard directories for webaccess app domain
-#
-webaccessdir="${libexecdir}/webaccess"
-AC_SUBST(webaccessdir)
-
-#
-# Setup standard directories for admin app domain
-#
-admindir="${libexecdir}/admin"
-AC_SUBST(admindir)
-
-
-#
-# Setup the bootstrapdir
-#
-simiasconfdir="${sysconfdir}/simias"
-AC_SUBST(simiasconfdir)
-
-#
# Setup the bootstrapdir
#
bootstrapdir="${simiasconfdir}/bill"