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

correct many simias db init bugs and drop old ifolder from tree

Browse Source 
Package-Manager: portage-2.2.0_alpha166
RepoMan-Options: --force
This commit is contained in:
Mario Fetka
2013-04-20 08:11:17 +02:00
parent f7b7762481
commit c4440b0d94
28 changed files with 300 additions and 1026 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
www-apps/ifolder3-enterprise/files/3.8.4/DEBUG_log_default.patch
View File

@@ -1,44 +0,0 @@
Index: simias-1.8.5.0~svn7436/src/core/Common/Simias.log4net
===================================================================
--- simias-1.8.5.0~svn7436.orig/src/core/Common/Simias.log4net 2010-07-22 21:16:26.678236725 -0400
+++ simias-1.8.5.0~svn7436/src/core/Common/Simias.log4net 2010-07-22 21:16:49.428238401 -0400
@@ -18,7 +18,7 @@
</appender>
<root>
- <level value="INFO" />
+ <level value="DEBUG" />
<appender-ref ref="RollingLogFile" />
</root>
@@ -36,7 +36,7 @@
</appender>
<logger name="AccessLogger" additivity="false">
- <level value="INFO" />
+ <level value="DEBUG" />
<appender-ref ref="AccessLogFile" />
</logger>
Index: simias-1.8.5.0~svn7436/src/core/Common/Simias.log4net.in
===================================================================
--- simias-1.8.5.0~svn7436.orig/src/core/Common/Simias.log4net.in 2010-07-22 21:15:46.088239517 -0400
+++ simias-1.8.5.0~svn7436/src/core/Common/Simias.log4net.in 2010-07-22 21:16:23.568421947 -0400
@@ -17,7 +17,7 @@
</appender>
<root>
- <level value="INFO" />
+ <level value="DEBUG" />
<appender-ref ref="RollingLogFile" />
</root>
@@ -34,7 +34,7 @@
</appender>
<logger name="AccessLogger" additivity="false">
- <level value="INFO" />
+ <level value="DEBUG" />
<appender-ref ref="AccessLogFile" />
</logger>

10
www-apps/ifolder3-enterprise/files/3.8.4/SimiasLib.dll.config-use-systemwide-FlaimWrapper.so.patch
View File

@@ -1,10 +0,0 @@
Index: simias-1.8.3.9328.1+dfsg/src/core/SimiasLib.dll/SimiasLib.dll.config.in
===================================================================
--- simias-1.8.3.9328.1+dfsg.orig/src/core/SimiasLib.dll/SimiasLib.dll.config.in 2010-04-17 14:36:54.000000000 +0100
+++ simias-1.8.3.9328.1+dfsg/src/core/SimiasLib.dll/SimiasLib.dll.config.in 2010-04-17 14:37:05.000000000 +0100
@@ -1,4 +1,4 @@
<configuration>
- <dllmap dll="FlaimWrapper" target="@webbindir@/FlaimWrapper.so" />
+ <dllmap dll="FlaimWrapper" target="libFlaimWrapper.so.0" />
</configuration>

51
www-apps/ifolder3-enterprise/files/3.8.4/SimiasServerSetup_use_simiasconfdir_in_SetupDefaultConfigPath.patch
View File

@@ -1,51 +0,0 @@
Index: simias-1.8.3.10200.stable/src/server/setup/SimiasServerSetup.cs
===================================================================
--- simias-1.8.3.10200.stable.orig/src/server/setup/SimiasServerSetup.cs 2010-07-19 12:36:57.715197193 -0400
+++ simias-1.8.3.10200.stable/src/server/setup/SimiasServerSetup.cs 2010-07-19 12:37:01.265198310 -0400
@@ -2806,14 +2806,7 @@ Console.WriteLine("Url {0}", service.Url
private bool SetupDefaultConfigPath()
{
// Check /etc first
- string path =
- String.Format( "{0}{1}{2}{3}{4}{5}",
- Path.DirectorySeparatorChar.ToString(),
- "etc",
- Path.DirectorySeparatorChar.ToString(),
- "simias",
- Path.DirectorySeparatorChar.ToString(),
- "bill" );
+ string path = Path.Combine(Simias.Client.SimiasSetup.simiasconfdir, "bill");
if ( System.IO.Directory.Exists( path ) == true )
{
if ( File.Exists( Path.Combine( path, Simias.Configuration.DefaultConfigFileName ) ) == true )
@@ -2825,13 +2818,7 @@ Console.WriteLine("Url {0}", service.Url
}
// Check the target area
- path =
- String.Format( "{0}{1}{2}{3}{4}",
- System.IO.Directory.GetCurrentDirectory(),
- Path.DirectorySeparatorChar.ToString(),
- "etc",
- Path.DirectorySeparatorChar.ToString(),
- "simias" );
+ path = Path.Combine(System.IO.Directory.GetCurrentDirectory(), Simias.Client.SimiasSetup.simiasconfdir.TrimStart(Path.DirectorySeparatorChar));
if ( System.IO.Directory.Exists( path ) == true )
{
@@ -2854,13 +2841,8 @@ Console.WriteLine("Url {0}", service.Url
int lastComp = cwd.LastIndexOf( Path.DirectorySeparatorChar );
cwd = cwd.Remove( lastComp, ( cwd.Length - lastComp ) );
- path =
- String.Format( "{0}{1}{2}{3}{4}",
- cwd,
- Path.DirectorySeparatorChar.ToString(),
- "etc",
- Path.DirectorySeparatorChar.ToString(),
- "simias" );
+ cwd = cwd + Path.DirectorySeparatorChar.ToString();
+ path = Path.Combine(cwd, Simias.Client.SimiasSetup.simiasconfdir.TrimStart(Path.DirectorySeparatorChar));
if ( System.IO.Directory.Exists( path ) == true )
{

40
www-apps/ifolder3-enterprise/files/3.8.4/dont_download_deleted_nodes.patch
View File

@@ -1,40 +0,0 @@
Index: simias-1.8.3.10200.stable/src/core/Sync/SyncClient.cs
===================================================================
--- simias-1.8.3.10200.stable.orig/src/core/Sync/SyncClient.cs 2010-04-15 10:16:23.000000000 -0400
+++ simias-1.8.3.10200.stable/src/core/Sync/SyncClient.cs 2010-07-19 12:37:44.255199987 -0400
@@ -2473,25 +2473,6 @@ namespace Simias.Sync
if (nodeIDs.Length == 0)
return;
- string[] deleteNodeIDs = workArray.DeletesToServer();
-
- if(deleteNodeIDs.Length > 0)
- {
- foreach(string nodeid in nodeIDs)
- {
- foreach(string deleteid in deleteNodeIDs)
- {
- if(nodeid == deleteid)
- {
- workArray.RemoveNodeFromServer(nodeid);
- }
- }
- }
- }
- nodeIDs = workArray.FilesFromServer(merge, Store.IsEnterpriseServer);
- if (nodeIDs.Length == 0)
- return;
- log.Info("Downloading {0} Files from server", nodeIDs.Length);
foreach (string nodeID in nodeIDs)
{
try
@@ -3124,7 +3105,8 @@ namespace Simias.Sync
}
}
}
- else if (nodesFromServer != null && nodesFromServer.Contains(stamp.ID))
+ else if (nodesFromServerMerge.Contains(stamp.ID)
+ || nodesFromServerDownload.Contains(stamp.ID)) // shouldn't be needed?
{
// This node has changed on the server we have a collision that we need to get.
// Unless this is a delete.

23
www-apps/ifolder3-enterprise/files/3.8.4/home_never_network_drive.patch
View File

@@ -1,23 +0,0 @@
submitted https://bugzilla.novell.com/show_bug.cgi?id=623644
Patch tells iFolder that filesystems mount under "/home" are located locally.
This allows synchronizing encrypted filesystems mounted under "/home", e.g.
on Ubuntu.
May cause a problem with filesystems mounted under "/home" which ARE
network or other non-local filesystems.
Thanks to x2b4 on the ifolder-ubuntu-debian-dev google group.
Index: simias-1.8.3.10200.stable/src/core/Simias.Web/SharedCollection.cs
===================================================================
--- simias-1.8.3.10200.stable.orig/src/core/Simias.Web/SharedCollection.cs 2010-04-15 10:16:23.000000000 -0400
+++ simias-1.8.3.10200.stable/src/core/Simias.Web/SharedCollection.cs 2010-07-19 12:38:09.905200825 -0400
@@ -1106,7 +1106,7 @@ namespace Simias.Web
while(mntLine != null)
{
// verify it's a device on this box
- if(mntLine.StartsWith("/dev") && (mntLine.IndexOf("iso9660") == -1))
+ if((mntLine.StartsWith("/dev") || mntLine.StartsWith("/home")) && (mntLine.IndexOf("iso9660") == -1))
{
Stat stat;
string[] entries;

15
www-apps/ifolder3-enterprise/files/3.8.4/ifdata.patch
View File

@@ -1,15 +0,0 @@
diff -uNr ifolder3-enterprise-3.9.1.7638.orig/src/core/ifdata ifolder3-enterprise-3.9.1.7638/src/core/ifdata
--- ifolder3-enterprise-3.9.1.7638.orig/src/core/ifdata 2013-04-18 05:15:38.018388777 +0200
+++ ifolder3-enterprise-3.9.1.7638/src/core/ifdata 2013-04-18 05:18:12.984451434 +0200
@@ -4,6 +4,10 @@
then
/sbin/ifconfig | grep '\<inet\>' | cut -f2 -d' ' | cut -f1 -d' '
else
- /sbin/ifconfig | grep 'inet addr' | cut -f2 -d':' | cut -f1 -d' '
+ if [ -f /sbin/ip ] then
+ /sbin/ip addr | awk '/inet / {sub(/\/.*/, "", $2); print $2}'
+ else
+ /sbin/ifconfig | grep "inet addr" | awk -F: '{print $2}' | awk '{print $1}'
+ fi
fi

22
www-apps/ifolder3-enterprise/files/3.8.4/mod_mono_SimiasServerSetup_cs.patch
View File

@@ -1,22 +0,0 @@
Index: simias-1.8.3.10200.stable/src/server/setup/SimiasServerSetup.cs
===================================================================
--- simias-1.8.3.10200.stable.orig/src/server/setup/SimiasServerSetup.cs 2010-07-19 12:33:45.925199986 -0400
+++ simias-1.8.3.10200.stable/src/server/setup/SimiasServerSetup.cs 2010-07-19 12:34:06.335200824 -0400
@@ -2339,14 +2339,14 @@ Console.WriteLine("Url {0}", service.Url
string alias = "simias10";
if( iFolderMonoPath != null )
- writer.WriteLine( "Include {0}{1}", iFolderMonoPath, "/etc/apache2/conf.d/mod_mono.conf");
+ writer.WriteLine( "Include {0}{1}", iFolderMonoPath, "/etc/apache2/modules.d/70_mod_mono.conf");
else
{
- string mod_mono2_path = "/etc/apache2/conf.d/mod_mono.conf";
+ string mod_mono2_path = "/etc/apache2/modules.d/70_mod_mono.conf";
if( File.Exists( mod_mono2_path ))
writer.WriteLine( "Include {0}", mod_mono2_path );
else
- writer.WriteLine( "Include {0}", "/etc/apache2/mod_mono.conf" );
+ writer.WriteLine( "Include {0}", "/etc/apache2/modules.d/70_mod_mono.conf" );
}
writer.WriteLine();
writer.WriteLine("Alias /{0} \"{1}\"", alias, SimiasSetup.webdir);

27
www-apps/ifolder3-enterprise/files/3.8.4/mod_mono_iFolderAdminSetup_cs.patch
View File

@@ -1,27 +0,0 @@
Index: simias-1.8.3.9328.1+dfsg/src/server/setup/iFolderAdminSetup.cs
===================================================================
--- simias-1.8.3.9328.1+dfsg.orig/src/server/setup/iFolderAdminSetup.cs 2010-04-24 14:26:03.074801984 -0400
+++ simias-1.8.3.9328.1+dfsg/src/server/setup/iFolderAdminSetup.cs 2010-04-24 14:28:09.214998380 -0400
@@ -413,7 +413,7 @@
using(StreamWriter writer = File.CreateText(path))
{
/* example
- Include /etc/apache2/conf.d/mod_mono.conf
+ Include /etc/apache2/modules.d/70_mod_mono.conf
Alias /ifolder "/usr/webaccess"
AddMonoApplications ifolder "/ifolder:/usr/webaccess"
@@ -438,11 +438,11 @@
writer.WriteLine( "Include {0}{1}", iFolderMonoPath, "/etc/apache2/conf.d//mod_mono.conf" );
else
{
- string mod_mono2_path = "/etc/apache2/conf.d/mod_mono.conf";
+ string mod_mono2_path = "/etc/apache2/modules.d/70_mod_mono.conf";
if( File.Exists( mod_mono2_path ))
writer.WriteLine( "Include {0}", mod_mono2_path );
else
- writer.WriteLine( "Include {0}", "/etc/apache2/mod_mono.conf" );
+ writer.WriteLine( "Include {0}", "/etc/apache2/modules.d/70_mod_mono.conf" );
}
writer.WriteLine();
writer.WriteLine("Alias /{0} \"{1}\"", alias, webPath);

31
www-apps/ifolder3-enterprise/files/3.8.4/mod_mono_iFolderWebSetup_cs.patch
View File

@@ -1,31 +0,0 @@
Index: simias-trunk20100511/src/server/setup/iFolderWebSetup.cs
===================================================================
--- simias-trunk20100511.orig/src/server/setup/iFolderWebSetup.cs 2010-05-11 20:25:34.124021446 -0400
+++ simias-trunk20100511/src/server/setup/iFolderWebSetup.cs 2010-05-11 20:26:04.914020328 -0400
@@ -456,7 +456,7 @@
using(StreamWriter writer = File.CreateText(path))
{
/* example
- Include /etc/apache2/conf.d/mod_mono.conf
+ Include /etc/apache2/modules.d/70_mod_mono.conf
Alias /ifolder "/usr/webaccess"
AddMonoApplications ifolder "/ifolder:/usr/webaccess"
@@ -478,14 +478,14 @@
sslPrefix = "#";
}
if( iFolderMonoPath != null )
- writer.WriteLine( "Include {0}{1}", iFolderMonoPath, "/etc/apache2/conf.d/mod_mono.conf" );
+ writer.WriteLine( "Include {0}{1}", iFolderMonoPath, "/etc/apache2/modules.d/70_mod_mono.conf" );
else
{
- string mod_mono2_path = "/etc/apache2/conf.d/mod_mono.conf";
+ string mod_mono2_path = "/etc/apache2/modules.d/70_mod_mono.conf";
if( File.Exists( mod_mono2_path ))
writer.WriteLine( "Include {0}", mod_mono2_path );
else
- writer.WriteLine( "Include {0}", "/etc/apache2/mod_mono.conf" );
+ writer.WriteLine( "Include {0}", "/etc/apache2/modules.d/70_mod_mono.conf" );
}
writer.WriteLine();
writer.WriteLine("Alias /{0} \"{1}\"", alias, webPath);

16
www-apps/ifolder3-enterprise/files/3.8.4/mod_mono_path.patch
View File

@@ -1,16 +0,0 @@
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)

55
www-apps/ifolder3-enterprise/files/3.8.4/remove_nodesFromServer.patch
View File

@@ -1,55 +0,0 @@
submitted as enhancement to
https://bugzilla.novell.com/show_bug.cgi?id=605407
Index: simias-1.8.3.10200.stable/src/core/Sync/SyncClient.cs
===================================================================
--- simias-1.8.3.10200.stable.orig/src/core/Sync/SyncClient.cs 2010-07-19 12:37:44.255199987 -0400
+++ simias-1.8.3.10200.stable/src/core/Sync/SyncClient.cs 2010-07-19 12:37:59.565196913 -0400
@@ -2957,7 +2957,7 @@ namespace Simias.Sync
Hashtable nodesFromServerDownload;
Hashtable nodesToServer;
Hashtable nodesFromServerMerge;
- Hashtable nodesFromServer;
+// Hashtable nodesFromServer;
Access.Rights rights;
bool sparseReplica = false;
@@ -3149,7 +3149,7 @@ namespace Simias.Sync
{
nodesFromServerMerge.Remove(nodeID);
nodesFromServerDownload.Remove(nodeID);
- nodesFromServer.Remove(nodeID);
+// nodesFromServer.Remove(nodeID);
}
/// <summary>
@@ -3163,7 +3163,7 @@ namespace Simias.Sync
else
nodesFromServerDownload.Remove(nodeID);
- nodesFromServer.Remove(nodeID);
+// nodesFromServer.Remove(nodeID);
}
/// <summary>
@@ -3184,10 +3184,9 @@ namespace Simias.Sync
private string[] FromServer(SyncNodeType oType, bool merge)
{
if (merge)
- nodesFromServer = nodesFromServerMerge;
+ return FromServer(oType, nodesFromServerMerge);
else
- nodesFromServer = nodesFromServerDownload;
- return FromServer(oType);
+ return FromServer(oType, nodesFromServerDownload);
}
/// <summary>
@@ -3195,7 +3194,7 @@ namespace Simias.Sync
/// </summary>
/// <param name="oType">The Type of objects to return.</param>
/// <returns></returns>
- private string[] FromServer(SyncNodeType oType)
+ private string[] FromServer(SyncNodeType oType, Hashtable nodesFromServer)
{
ArrayList na = new ArrayList();
bool haveCollection = false;

32
www-apps/ifolder3-enterprise/files/3.8.4/separate_client_server_dirs.patch
View File

@@ -1,32 +0,0 @@
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 "$runasclient" = "TRUE"; then
webdir="${libexecdir}/web"
+else
+ webdir="${libexecdir}/server"
+fi
webbindir="${webdir}/bin"
modulesdir="${webdir}/modules"
AC_SUBST(webdir)
@@ -485,7 +489,11 @@ AC_SUBST(mappingpath)
#
-simiasconfdir="${sysconfdir}/simias"
+if test "$runasclient" = "TRUE"; then
+ simiasconfdir="${sysconfdir}/simias/client"
+else
+ simiasconfdir="${sysconfdir}/simias/server"
+fi
AC_SUBST(simiasconfdir)
#

21
www-apps/ifolder3-enterprise/files/3.8.4/series
View File

@@ -1,21 +0,0 @@
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

135
www-apps/ifolder3-enterprise/files/3.8.4/serverpaths_from_configure_v2.patch
View File

@@ -1,135 +0,0 @@
submitted https://bugzilla.novell.com/show_bug.cgi?id=608882
Index: simias-1.8.3.10200.stable/src/core/SimiasClient/SimiasSetup.cs.in
===================================================================
--- simias-1.8.3.10200.stable.orig/src/core/SimiasClient/SimiasSetup.cs.in 2010-04-15 10:16:23.000000000 -0400
+++ simias-1.8.3.10200.stable/src/core/SimiasClient/SimiasSetup.cs.in 2010-07-19 12:37:33.315199428 -0400
@@ -58,6 +58,8 @@ namespace Simias.Client
// custom setup paths
private static string _webdir = "@webdir@";
+ private static string _admindir = "@admindir@"; // defined in toplevel configure.in
+ private static string _webaccessdir = "@webaccessdir@"; // defined in toplevel configure.in
private static string _webbindir = "@webbindir@";
private static string _modulesdir = "@modulesdir@";
private static string _bootstrapdir = "@bootstrapdir@";
@@ -134,6 +136,8 @@ namespace Simias.Client
_sharedstatedir = Path.GetFullPath(_sharedstatedir.Replace(_prefix, value));
_sysconfdir = Path.GetFullPath(_sysconfdir.Replace(_prefix, value));
_webdir = Path.GetFullPath(_webdir.Replace(_prefix, value));
+ _admindir = Path.GetFullPath(_admindir.Replace(_prefix, value));
+ _webaccessdir = Path.GetFullPath(_webaccessdir.Replace(_prefix, value));
_webbindir = Path.GetFullPath(_webbindir.Replace(_prefix, value));
_modulesdir = Path.GetFullPath(_modulesdir.Replace(_prefix, value));
_bootstrapdir = Path.GetFullPath(_bootstrapdir.Replace(_prefix, value));
@@ -251,6 +255,22 @@ namespace Simias.Client
}
/// <summary>
+ /// admindir
+ /// </summary>
+ public static string admindir
+ {
+ get { return _admindir; }
+ }
+
+ /// <summary>
+ /// webaccessdir
+ /// </summary>
+ public static string webaccessdir
+ {
+ get { return _webaccessdir; }
+ }
+
+ /// <summary>
/// modulesdir
/// </summary>
public static string modulesdir
Index: simias-1.8.3.10200.stable/src/server/setup/SimiasServerSetup.cs
===================================================================
--- simias-1.8.3.10200.stable.orig/src/server/setup/SimiasServerSetup.cs 2010-07-19 12:37:01.265198310 -0400
+++ simias-1.8.3.10200.stable/src/server/setup/SimiasServerSetup.cs 2010-07-19 12:37:33.315199428 -0400
@@ -95,7 +95,7 @@ namespace Novell.iFolder
#region Member Fields
#if MONO
- string webPath = Path.GetFullPath("../lib/simias/web");
+ string webPath = Path.Combine( SimiasSetup.webdir, "" ); // find better method!
#endif
/// <summary>
@@ -820,7 +820,7 @@ Console.WriteLine("Url {0}", service.Url
}
string MachineArch = Environment.GetEnvironmentVariable("OS_ARCH");
- webPath =( MachineArch == null )? Path.GetFullPath("../lib/simias/web"): Path.GetFullPath("../lib64/simias/web");
+ webPath = Path.Combine( SimiasSetup.webdir, ""); // find better methods!
// restore policy
// ServicePointManager.CertificatePolicy = policy;
Index: simias-1.8.3.10200.stable/src/server/setup/iFolderAdminSetup.cs
===================================================================
--- simias-1.8.3.10200.stable.orig/src/server/setup/iFolderAdminSetup.cs 2010-07-19 12:34:17.565198869 -0400
+++ simias-1.8.3.10200.stable/src/server/setup/iFolderAdminSetup.cs 2010-07-19 12:37:33.315199428 -0400
@@ -42,6 +42,7 @@ using System.Text.RegularExpressions;
using System.Security.Cryptography;
using Novell.iFolder.Utility;
+using Simias.Client; // for SimiasSetup.admindir
namespace Novell.iFolderApp.Web
{
@@ -59,9 +60,9 @@ namespace Novell.iFolderApp.Web
/// Web Path
/// </summary>
#if MONO
- string webPath = Path.GetFullPath("../lib/simias/admin");
+ string webPath = Path.Combine(SimiasSetup.admindir, "");
#else
- string webPath = Path.GetFullPath("./admin");
+ string webPath = Path.Combine(SimiasSetup.admindir, "");
#endif
#region Options
@@ -148,7 +149,7 @@ namespace Novell.iFolderApp.Web
try
{
string MachineArch = Environment.GetEnvironmentVariable("OS_ARCH");
- webPath =( MachineArch == null )? Path.GetFullPath("../lib/simias/admin"): Path.GetFullPath("../lib64/simias/admin");
+ webPath = Path.Combine(SimiasSetup.admindir, ""); // lib vs lib64 set in configure.in
// uid.conf
string path = Path.GetFullPath("/etc/apache2/uid.conf");
Index: simias-1.8.3.10200.stable/src/server/setup/iFolderWebSetup.cs
===================================================================
--- simias-1.8.3.10200.stable.orig/src/server/setup/iFolderWebSetup.cs 2010-07-19 12:34:21.005197750 -0400
+++ simias-1.8.3.10200.stable/src/server/setup/iFolderWebSetup.cs 2010-07-19 12:37:33.315199428 -0400
@@ -42,6 +42,7 @@ using System.Text.RegularExpressions;
using System.Security.Cryptography;
using Novell.iFolder.Utility;
+using Simias.Client; // for SimiasSetup.webaccessdir
namespace Novell.iFolderApp.Web
{
@@ -59,9 +60,9 @@ namespace Novell.iFolderApp.Web
/// Web Path
/// </summary>
#if MONO
- string webPath = Path.GetFullPath("../lib/simias/webaccess");
+ string webPath = Path.Combine(SimiasSetup.webaccessdir, "");
#else
- string webPath = Path.GetFullPath("./webaccess");
+ string webPath = Path.Combine(SimiasSetup.webaccessdir, "");
#endif
#region Options
@@ -176,7 +177,7 @@ namespace Novell.iFolderApp.Web
try
{
string MachineArch = Environment.GetEnvironmentVariable("OS_ARCH");
- webPath = (MachineArch == null) ? Path.GetFullPath("../lib/simias/webaccess"): Path.GetFullPath("../lib64/simias/webaccess");
+ webPath = Path.Combine(SimiasSetup.webaccessdir, ""); // lib vs lib64 set in configure.in
// uid.conf
string path = Path.GetFullPath("/etc/apache2/uid.conf");

17
www-apps/ifolder3-enterprise/files/3.8.4/use_lib_as_libdir_on_amd64.patch
View File

@@ -1,17 +0,0 @@
Index: simias-1.8.3.10200.stable/configure.in
===================================================================
--- simias-1.8.3.10200.stable.orig/configure.in 2010-07-19 12:29:19.000000000 -0400
+++ simias-1.8.3.10200.stable/configure.in 2010-07-19 12:30:02.515201941 -0400
@@ -90,10 +90,10 @@ AM_CONDITIONAL(DOTNET, test "$CSC" = "cs
#HACK ALERT : for libflaim 64bit builds
case $host_cpu in
x86_64)
- LIB64='lib64'
+ LIB64='lib'
;;
amd64)
- LIB64='lib64'
+ LIB64='lib'
;;
*)
LIB64='lib'

138
www-apps/ifolder3-enterprise/files/3.8.4/use_libdir_for_executables.patch
View File

@@ -1,138 +0,0 @@
diff -uNr ifolder3-enterprise-3.8.4.7617.orig/src/server/setup/ifolder-admin-setup.in ifolder3-enterprise-3.8.4.7617/src/server/setup/ifolder-admin-setup.in
--- ifolder3-enterprise-3.8.4.7617.orig/src/server/setup/ifolder-admin-setup.in 2013-04-18 20:17:21.705193758 +0200
+++ ifolder3-enterprise-3.8.4.7617/src/server/setup/ifolder-admin-setup.in 2013-04-18 20:29:53.211798633 +0200
@@ -37,29 +37,7 @@
#*******************************************************************************/
-OS_ARCH=`uname -m | grep -c x86_64`
-if [ $OS_ARCH -gt 0 ]
-then
- export OS_ARCH=`uname -m`
-fi
-
-rpm -q novell-ifolder-mono > /dev/null 2>&1
-if [ $? -gt 0 ]
-then
- 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_@/iFolderAdminSetup.exe "$@"
-else
- MONO_RUNTIME_PATH=@_bindir_@/../mono
- export MONO_PATH=$MONO_RUNTIME_PATH/lib/mono/:$MONO_RUNTIME_PATH/lib/mono/2.0:@_webbindir_@:@_bindir_@
- source $MONO_RUNTIME_PATH/bin/novell-ifolder-mono-environment.sh
- export MONO_CFG_DIR=$MONO_RUNTIME_PATH/etc
- export IFOLDER_MOD_MONO_SERVER2_PATH=@_bindir_@
- export IFOLDER_MONO_PATH=$MONO_RUNTIME_PATH
- cd @_bindir_@
-
- $MONO_RUNTIME_PATH/bin/mono @_bindir_@/iFolderAdminSetup.exe "$@"
-fi
+ mono @_bindir_@/../lib/simias/iFolderAdminSetup.exe "$@"
\ Kein Zeilenumbruch am Dateiende.
diff -uNr ifolder3-enterprise-3.8.4.7617.orig/src/server/setup/ifolder-web-setup.in ifolder3-enterprise-3.8.4.7617/src/server/setup/ifolder-web-setup.in
--- ifolder3-enterprise-3.8.4.7617.orig/src/server/setup/ifolder-web-setup.in 2013-04-18 20:17:21.706193745 +0200
+++ ifolder3-enterprise-3.8.4.7617/src/server/setup/ifolder-web-setup.in 2013-04-18 20:28:57.609493757 +0200
@@ -37,31 +37,7 @@
#*******************************************************************************/
-OS_ARCH=`uname -m | grep -c x86_64`
-if [ $OS_ARCH -gt 0 ]
-then
- export OS_ARCH=`uname -m`
-fi
-
-rpm -q novell-ifolder-mono > /dev/null 2>&1
-if [ $? -gt 0 ]
-then
-
- 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_@/iFolderWebSetup.exe "$@"
-
-else
- MONO_RUNTIME_PATH=@_bindir_@/../mono
- export MONO_PATH=$MONO_RUNTIME_PATH/lib/mono/:$MONO_RUNTIME_PATH/lib/mono/2.0:@_webbindir_@:@_bindir_@
- source $MONO_RUNTIME_PATH/bin/novell-ifolder-mono-environment.sh
- export MONO_CFG_DIR=$MONO_RUNTIME_PATH/etc
- export IFOLDER_MOD_MONO_SERVER2_PATH=@_bindir_@
- export IFOLDER_MONO_PATH=$MONO_RUNTIME_PATH
- cd @_bindir_@
-
- $MONO_RUNTIME_PATH/bin/mono @_bindir_@/iFolderWebSetup.exe "$@"
-fi
+ mono @_bindir_@/../lib/simias/iFolderWebSetup.exe "$@"
\ Kein Zeilenumbruch am Dateiende.
diff -uNr ifolder3-enterprise-3.8.4.7617.orig/src/server/setup/Makefile.am ifolder3-enterprise-3.8.4.7617/src/server/setup/Makefile.am
--- ifolder3-enterprise-3.8.4.7617.orig/src/server/setup/Makefile.am 2013-04-18 20:17:21.706193745 +0200
+++ ifolder3-enterprise-3.8.4.7617/src/server/setup/Makefile.am 2013-04-18 20:26:40.950202233 +0200
@@ -158,14 +158,14 @@
install-exec-local: all $(DATA_FILES)
$(mkinstalldirs) $(DESTDIR)$(bindir)
- $(INSTALL_PROGRAM) SimiasServerSetup.exe $(DEBUG_FILES) $(DESTDIR)$(bindir)
- $(INSTALL_PROGRAM) SimiasServerSetup.exe.config $(DEBUG_FILES) $(DESTDIR)$(bindir)
- $(INSTALL_PROGRAM) iFolderWebSetup.exe $(DEBUG_FILES) $(DESTDIR)$(bindir)
- $(INSTALL_PROGRAM) iFolderWebSetup.exe.config $(DEBUG_FILES) $(DESTDIR)$(bindir)
- $(INSTALL_PROGRAM) iFolderAdminSetup.exe $(DEBUG_FILES) $(DESTDIR)$(bindir)
- $(INSTALL_PROGRAM) iFolderAdminSetup.exe.config $(DEBUG_FILES) $(DESTDIR)$(bindir)
- $(INSTALL_PROGRAM) iFolderProxySetup.exe $(DEBUG_FILES) $(DESTDIR)$(bindir)
- $(INSTALL_PROGRAM) CertUpdate.exe $(DEBUG_FILES) $(DESTDIR)$(bindir)
+ $(INSTALL_PROGRAM) SimiasServerSetup.exe $(DEBUG_FILES) $(DESTDIR)$(pkglibdir)
+ $(INSTALL_PROGRAM) SimiasServerSetup.exe.config $(DEBUG_FILES) $(DESTDIR)$(pkglibdir)
+ $(INSTALL_PROGRAM) iFolderWebSetup.exe $(DEBUG_FILES) $(DESTDIR)$(pkglibdir)
+ $(INSTALL_PROGRAM) iFolderWebSetup.exe.config $(DEBUG_FILES) $(DESTDIR)$(pkglibdir)
+ $(INSTALL_PROGRAM) iFolderAdminSetup.exe $(DEBUG_FILES) $(DESTDIR)$(pkglibdir)
+ $(INSTALL_PROGRAM) iFolderAdminSetup.exe.config $(DEBUG_FILES) $(DESTDIR)$(pkglibdir)
+ $(INSTALL_PROGRAM) iFolderProxySetup.exe $(DEBUG_FILES) $(DESTDIR)$(pkglibdir)
+ $(INSTALL_PROGRAM) CertUpdate.exe $(DEBUG_FILES) $(DESTDIR)$(pkglibdir)
if WINDOWS
$(INSTALL_PROGRAM) simias-server-setup.cmd $(DESTDIR)$(bindir)
$(INSTALL_PROGRAM) ifolder-web-setup.cmd $(DESTDIR)$(bindir)
diff -uNr ifolder3-enterprise-3.8.4.7617.orig/src/server/setup/simias-server-setup.in ifolder3-enterprise-3.8.4.7617/src/server/setup/simias-server-setup.in
--- ifolder3-enterprise-3.8.4.7617.orig/src/server/setup/simias-server-setup.in 2013-04-18 20:17:21.706193745 +0200
+++ ifolder3-enterprise-3.8.4.7617/src/server/setup/simias-server-setup.in 2013-04-18 20:27:49.542344713 +0200
@@ -36,31 +36,7 @@
#*
#*******************************************************************************/
-OS_ARCH=`uname -m | grep -c x86_64`
-if [ $OS_ARCH -gt 0 ]
-then
- export OS_ARCH=`uname -m`
-fi
-
-rpm -q novell-ifolder-mono > /dev/null 2>&1
-if [ $? -gt 0 ]
-then
-
- 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_@/SimiasServerSetup.exe "$@"
-
-else
- MONO_RUNTIME_PATH=@_bindir_@/../mono
- export MONO_PATH=$MONO_RUNTIME_PATH/lib/mono/:$MONO_RUNTIME_PATH/lib/mono/2.0:@_webbindir_@:@_bindir_@
- source $MONO_RUNTIME_PATH/bin/novell-ifolder-mono-environment.sh
- export MONO_CFG_DIR=$MONO_RUNTIME_PATH/etc
- export IFOLDER_MOD_MONO_SERVER2_PATH=@_bindir_@
- export IFOLDER_MONO_PATH=$MONO_RUNTIME_PATH
- cd @_bindir_@
-
- $MONO_RUNTIME_PATH/bin/mono @_bindir_@/SimiasServerSetup.exe "$@"
-fi
+ mono @_bindir_@/../lib/simias/SimiasServerSetup.exe "$@"
\ Kein Zeilenumbruch am Dateiende.

35
www-apps/ifolder3-enterprise/files/3.8.4/use_mono_webserver2.patch
View File

@@ -1,35 +0,0 @@
Index: simias-1.8.3.10200.stable/configure.in
===================================================================
--- simias-1.8.3.10200.stable.orig/configure.in 2010-07-19 12:29:01.505201104 -0400
+++ simias-1.8.3.10200.stable/configure.in 2010-07-19 12:29:19.545199987 -0400
@@ -697,7 +697,7 @@ AC_SUBST(XML2_LIBS)
# Configure MONO_WEBSERVER
#
MONO_WEBSERVER="no"
-if test -e "/usr/lib/mono/1.0/Mono.WebServer.dll"; then
+if test -e "/usr/lib/mono/2.0/Mono.WebServer2.dll"; then
MONO_WEBSERVER="yes"
fi
Index: simias-1.8.3.10200.stable/src/core/SimiasApp/Makefile.am
===================================================================
--- simias-1.8.3.10200.stable.orig/src/core/SimiasApp/Makefile.am 2010-04-15 10:16:23.000000000 -0400
+++ simias-1.8.3.10200.stable/src/core/SimiasApp/Makefile.am 2010-07-19 12:29:19.545199987 -0400
@@ -7,7 +7,7 @@ else
SYSTEM_INSTALLER_LIB =
endif
-MONO_WEBSERVER_PATH = ../../../dependencies/external/Mono.WebServer
+MONO_WEBSERVER_PATH = /usr/lib/mono/2.0/
Simias_CSFILES = $(srcdir)/Simias.cs \
$(srcdir)/SimiasAppInstallerClass.cs
@@ -16,7 +16,7 @@ Simias_CSFILES_CSC := $(subst /,$(SEP),$
Simias_INCLUDES =
Simias_RESOURCES = $(srcdir)/App$(ICON_EXT)
Simias_FLAGS = $(CSC_EXEFLAG)
-Simias_LIBS = System.dll System.Data.dll $(SYSTEM_XML) System.Web.dll $(SYSTEM_INSTALLER_LIB) SimiasClient.dll Mono.WebServer.dll
+Simias_LIBS = System.dll System.Data.dll $(SYSTEM_XML) System.Web.dll $(SYSTEM_INSTALLER_LIB) SimiasClient.dll Mono.WebServer2.dll
Simias_LIBPATH = ../SimiasClient $(MONO_WEBSERVER_PATH)
EXTRA_DIST = App.ico $(Simias_CSFILES) AssemblyInfo.cs.in

28
www-apps/ifolder3-enterprise/files/3.8.4/use_system_gsoap.patch
View File

@@ -1,28 +0,0 @@
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)

83
www-apps/ifolder3-enterprise/files/3.8.4/www-data_apache.patch
View File

@@ -1,83 +0,0 @@
Index: simias-1.8.3.9328.1+dfsg/src/server/setup/SimiasServerSetup.cs
===================================================================
--- simias-1.8.3.9328.1+dfsg.orig/src/server/setup/SimiasServerSetup.cs 2010-04-24 10:18:57.000000000 -0400
+++ simias-1.8.3.9328.1+dfsg/src/server/setup/SimiasServerSetup.cs 2010-04-24 10:20:54.524806732 -0400
@@ -83,7 +83,7 @@
private static string MasterAddressKey = "MasterAddress";
private static string PublicAddressKey = "PublicAddress";
private static string PrivateAddressKey = "PrivateAddress";
- private static string oldConfigPath = "/var/lib/wwwrun/.local/share/simias/";
+ private static string oldConfigPath = "/var/lib/apache/.local/share/simias/";
private static string TemplateScriptFile = "simias-server";
@@ -306,12 +306,12 @@
/// <summary>
/// Apache User.
/// </summary>
- public Option apacheUser = new Option("apache-user", "Apache User", "Apache User", false, "wwwrun");
+ public Option apacheUser = new Option("apache-user", "Apache User", "Apache User", false, "apache");
/// <summary>
/// Apache Group.
/// </summary>
- public Option apacheGroup = new Option("apache-group", "Apache Group", "Apache Group", false, "www");
+ public Option apacheGroup = new Option("apache-group", "Apache Group", "Apache Group", false, "apache");
/// <summary>
/// Prompt for options.
Index: simias-1.8.3.9328.1+dfsg/src/server/setup/iFolderWebSetup.cs
===================================================================
--- simias-1.8.3.9328.1+dfsg.orig/src/server/setup/iFolderWebSetup.cs 2010-04-24 10:18:57.000000000 -0400
+++ simias-1.8.3.9328.1+dfsg/src/server/setup/iFolderWebSetup.cs 2010-04-24 10:20:54.524806732 -0400
@@ -99,12 +99,12 @@
/// <summary>
/// Apache User.
/// </summary>
- public Option apacheUser = new Option("apache-user", "Apache User", "Apache User to use for providing permissions", false, "wwwrun");
+ public Option apacheUser = new Option("apache-user", "Apache User", "Apache User to use for providing permissions", false, "apache");
/// <summary>
/// Apache Group.
/// </summary>
- public Option apacheGroup = new Option("apache-group", "Apache Group", "Apache Group to use for providing permissions", false, "www");
+ public Option apacheGroup = new Option("apache-group", "Apache Group", "Apache Group to use for providing permissions", false, "apache");
/// <summary>
/// The port to connect on.
Index: simias-1.8.3.9328.1+dfsg/src/server/setup/iFolderAdminSetup.cs
===================================================================
--- simias-1.8.3.9328.1+dfsg.orig/src/server/setup/iFolderAdminSetup.cs 2010-04-24 10:18:57.000000000 -0400
+++ simias-1.8.3.9328.1+dfsg/src/server/setup/iFolderAdminSetup.cs 2010-04-24 10:20:54.524806732 -0400
@@ -99,12 +99,12 @@
/// <summary>
/// Apache User.
/// </summary>
- public Option apacheUser = new Option("apache-user", "Apache User", "Apache User to use for providing permissions", false, "wwwrun");
+ public Option apacheUser = new Option("apache-user", "Apache User", "Apache User to use for providing permissions", false, "apache");
/// <summary>
/// Apache Group.
/// </summary>
- public Option apacheGroup = new Option("apache-group", "Apache Group", "Apache Group to use for providing permissions", false, "www");
+ public Option apacheGroup = new Option("apache-group", "Apache Group", "Apache Group to use for providing permissions", false, "apache");
/// <summary>
/// The port to connect on.
Index: simias-1.8.3.9328.1+dfsg/src/core/CollectionStore/DataStore.cs
===================================================================
--- simias-1.8.3.9328.1+dfsg.orig/src/core/CollectionStore/DataStore.cs 2010-04-24 10:21:15.314805896 -0400
+++ simias-1.8.3.9328.1+dfsg/src/core/CollectionStore/DataStore.cs 2010-04-24 10:23:03.274988324 -0400
@@ -86,10 +86,10 @@
public bool Enabled;
/// </summary>
- private const string apacheUser = "wwwrun";
+ private const string apacheUser = "apache";
/// </summary>
- private const string apacheGroup = "www";
+ private const string apacheGroup = "apache";

212
www-apps/ifolder3-enterprise/files/3.9.1/gentoo-apache-path.patch Normal file
View File

@@ -0,0 +1,212 @@
diff -uNr ifolder3-enterprise-3.9.1.7638.orig/src/server/setup/CertUpdate.cs ifolder3-enterprise-3.9.1.7638/src/server/setup/CertUpdate.cs
--- ifolder3-enterprise-3.9.1.7638.orig/src/server/setup/CertUpdate.cs 2013-04-19 19:23:31.097433272 +0200
+++ ifolder3-enterprise-3.9.1.7638/src/server/setup/CertUpdate.cs 2013-04-19 19:33:16.333116819 +0200
@@ -62,7 +62,7 @@
/// </summary>
class CertUpdate
{
- private const string apacheSimiasConf = "/etc/apache2/conf.d/simias.conf";
+ private const string apacheSimiasConf = "/etc/apache2/modules.d/90_simias.conf";
private const string SearchStr = "MonoSetEnv simias10 \"SimiasRunAsServer=true;SimiasDataDir=";
private const string datapathEnvStr = "SimiasDataDir=";
private const string certMgrCmd= "certmgr";
diff -uNr ifolder3-enterprise-3.9.1.7638.orig/src/server/setup/iFolderAdminSetup.cs ifolder3-enterprise-3.9.1.7638/src/server/setup/iFolderAdminSetup.cs
--- ifolder3-enterprise-3.9.1.7638.orig/src/server/setup/iFolderAdminSetup.cs 2013-04-19 19:23:31.096433285 +0200
+++ ifolder3-enterprise-3.9.1.7638/src/server/setup/iFolderAdminSetup.cs 2013-04-19 19:29:48.319717345 +0200
@@ -362,11 +362,11 @@
}
/// <summary>
- /// Read the /etc/apache2/conf.d/simias.conf File and return data path.
+ /// Read the /etc/apache2/modules.d/90_simias.conf File and return data path.
/// </summary>
string ReadModMonoConfiguration()
{
- string path = Path.GetFullPath( "/etc/apache2/conf.d/simias.conf" );
+ string path = Path.GetFullPath( "/etc/apache2/modules.d/90_simias.conf" );
string dataPath = null;
if ( path == null || File.Exists( path ) == false )
return null;
@@ -397,11 +397,11 @@
}
/// <summary>
- /// Setup the /etc/apache2/conf.d/ifolder_web.conf File
+ /// Setup the /etc/apache2/modules.d/90_ifolder_web.conf File
/// </summary>
void SetupModMono()
{
- string path = "/etc/apache2/conf.d/ifolder_admin.conf";
+ string path = "/etc/apache2/modules.d/90_ifolder_admin.conf";
string datapath = ReadModMonoConfiguration();
@@ -436,7 +436,7 @@
sslPrefix = "#";
}
if( iFolderMonoPath != null )
- writer.WriteLine( "Include {0}{1}", iFolderMonoPath, "/etc/apache2/conf.d//mod_mono.conf" );
+ writer.WriteLine( "Include {0}{1}", iFolderMonoPath, "/etc/apache2/modules.d/70_mod_mono.conf" );
else
{
string mod_mono2_path = "/etc/apache2/modules.d/70_mod_mono.conf";
diff -uNr ifolder3-enterprise-3.9.1.7638.orig/src/server/setup/ifolder_cluster_setup ifolder3-enterprise-3.9.1.7638/src/server/setup/ifolder_cluster_setup
--- ifolder3-enterprise-3.9.1.7638.orig/src/server/setup/ifolder_cluster_setup 2013-04-19 19:23:31.097433272 +0200
+++ ifolder3-enterprise-3.9.1.7638/src/server/setup/ifolder_cluster_setup 2013-04-19 19:33:02.054295329 +0200
@@ -36,7 +36,7 @@
#*
#*******************************************************************************/
-CONF_FILE_PATH=/etc/apache2/conf.d
+CONF_FILE_PATH=/etc/apache2/modules.d
IFOLDER32BIT="/opt/novell/ifolder3/lib/simias"
IFOLDER64BIT="/opt/novell/ifolder3/lib64/simias"
OS_ARCH=`uname -m | grep -c x86_64`
diff -uNr ifolder3-enterprise-3.9.1.7638.orig/src/server/setup/ifolder_mono_setup.in ifolder3-enterprise-3.9.1.7638/src/server/setup/ifolder_mono_setup.in
--- ifolder3-enterprise-3.9.1.7638.orig/src/server/setup/ifolder_mono_setup.in 2013-04-19 19:23:31.096433285 +0200
+++ ifolder3-enterprise-3.9.1.7638/src/server/setup/ifolder_mono_setup.in 2013-04-19 19:34:30.654187678 +0200
@@ -37,7 +37,7 @@
#*******************************************************************************/
iFPrefix=@_bindir_@/../
-CONF_FILE_PATH=/etc/apache2/conf.d
+CONF_FILE_PATH=/etc/apache2/modules.d
MOD_MONO_CONF_PATH="/etc/apache2/mod_mono.conf"
MOD_MONO_CONF_FILE_PATH="/etc/apache2/conf.d/mod_mono.conf"
IFOLDER32BIT="/opt/novell/ifolder3/lib/simias"
diff -uNr ifolder3-enterprise-3.9.1.7638.orig/src/server/setup/iFolder_proxy_rights_assign.in ifolder3-enterprise-3.9.1.7638/src/server/setup/iFolder_proxy_rights_assign.in
--- ifolder3-enterprise-3.9.1.7638.orig/src/server/setup/iFolder_proxy_rights_assign.in 2013-04-19 19:23:31.096433285 +0200
+++ ifolder3-enterprise-3.9.1.7638/src/server/setup/iFolder_proxy_rights_assign.in 2013-04-19 19:30:13.926397217 +0200
@@ -83,7 +83,7 @@
fi
# get the value of datapath
-datapath=`grep SimiasDataDir /etc/apache2/conf.d/simias.conf | gawk 'BEGIN { RS=";|\"" } { if (/^SimiasDataDir/) print gensub(/SimiasDataDir=/, "", 1) }'`
+datapath=`grep SimiasDataDir /etc/apache2/modules.d/90_simias.conf | gawk 'BEGIN { RS=";|\"" } { if (/^SimiasDataDir/) print gensub(/SimiasDataDir=/, "", 1) }'`
touch $datapath/proxydetails
echo "proxy_rights_assign">>$datapath/proxydetails
echo "$1">>$datapath/proxydetails
diff -uNr ifolder3-enterprise-3.9.1.7638.orig/src/server/setup/iFolder_retrieve_proxy_creds.in ifolder3-enterprise-3.9.1.7638/src/server/setup/iFolder_retrieve_proxy_creds.in
--- ifolder3-enterprise-3.9.1.7638.orig/src/server/setup/iFolder_retrieve_proxy_creds.in 2013-04-19 19:23:31.096433285 +0200
+++ ifolder3-enterprise-3.9.1.7638/src/server/setup/iFolder_retrieve_proxy_creds.in 2013-04-19 19:26:55.184881828 +0200
@@ -40,7 +40,7 @@
MONO_CMD=""
function getProxy(){
- datapath=`grep SimiasDataDir /etc/apache2/conf.d/simias.conf | gawk 'BEGIN { RS=";|\"" } { if (/^SimiasDataDir/) print gensub(/SimiasDataDir=/, "", 1) }'`
+ datapath=`grep SimiasDataDir /etc/apache2/modules.d/90_simias.conf | gawk 'BEGIN { RS=";|\"" } { if (/^SimiasDataDir/) print gensub(/SimiasDataDir=/, "", 1) }'`
if [ $1 = "username" ]; then
$MONO_CMD iFolderProxySetup.exe $datapath retrieve_proxy_creds username $2 $3
exit $?
diff -uNr ifolder3-enterprise-3.9.1.7638.orig/src/server/setup/iFolder_update_proxy_cred_store.in ifolder3-enterprise-3.9.1.7638/src/server/setup/iFolder_update_proxy_cred_store.in
--- ifolder3-enterprise-3.9.1.7638.orig/src/server/setup/iFolder_update_proxy_cred_store.in 2013-04-19 19:23:31.096433285 +0200
+++ ifolder3-enterprise-3.9.1.7638/src/server/setup/iFolder_update_proxy_cred_store.in 2013-04-19 19:26:39.355079728 +0200
@@ -82,7 +82,7 @@
fi
# get the value of datapath
-datapath=`grep SimiasDataDir /etc/apache2/conf.d/simias.conf | gawk 'BEGIN { RS=";|\"" } { if (/^SimiasDataDir/) print gensub(/SimiasDataDir=/, "", 1) }'`
+datapath=`grep SimiasDataDir /etc/apache2/modules.d/90_simias.conf | gawk 'BEGIN { RS=";|\"" } { if (/^SimiasDataDir/) print gensub(/SimiasDataDir=/, "", 1) }'`
touch $datapath/proxydetails
echo update_proxy_cred_store>>$datapath/proxydetails
echo "$1">>$datapath/proxydetails
diff -uNr ifolder3-enterprise-3.9.1.7638.orig/src/server/setup/iFolderWebSetup.cs ifolder3-enterprise-3.9.1.7638/src/server/setup/iFolderWebSetup.cs
--- ifolder3-enterprise-3.9.1.7638.orig/src/server/setup/iFolderWebSetup.cs 2013-04-19 19:23:31.097433272 +0200
+++ ifolder3-enterprise-3.9.1.7638/src/server/setup/iFolderWebSetup.cs 2013-04-19 19:32:49.914447098 +0200
@@ -404,11 +404,11 @@
}
/// <summary>
- /// Read the /etc/apache2/conf.d/simias.conf File and return data path.
+ /// Read the /etc/apache2/modules.d/90_simias.conf File and return data path.
/// </summary>
string ReadModMonoConfiguration()
{
- string path = Path.GetFullPath( "/etc/apache2/conf.d/simias.conf" );
+ string path = Path.GetFullPath( "/etc/apache2/modules.d/90_simias.conf" );
string dataPath = null;
if ( path == null || File.Exists( path ) == false )
return null;
@@ -440,11 +440,11 @@
/// <summary>
- /// Setup the /etc/apache2/conf.d/ifolder_web.conf File
+ /// Setup the /etc/apache2/modules.d/90_ifolder_web.conf File
/// </summary>
void SetupModMono()
{
- string path = "/etc/apache2/conf.d/ifolder_web.conf";
+ string path = "/etc/apache2/modules.d/90_ifolder_web.conf";
string datapath = ReadModMonoConfiguration();
diff -uNr ifolder3-enterprise-3.9.1.7638.orig/src/server/setup/SimiasServerSetup.cs ifolder3-enterprise-3.9.1.7638/src/server/setup/SimiasServerSetup.cs
--- ifolder3-enterprise-3.9.1.7638.orig/src/server/setup/SimiasServerSetup.cs 2013-04-19 19:23:31.096433285 +0200
+++ ifolder3-enterprise-3.9.1.7638/src/server/setup/SimiasServerSetup.cs 2013-04-19 19:31:46.245243073 +0200
@@ -2437,11 +2437,11 @@
}
/// <summary>
- /// Setup the /etc/apache2/conf.d/simias.conf File
+ /// Setup the /etc/apache2/modules.d/90_simias.conf File
/// </summary>
void SetupModMono()
{
- string path = Path.GetFullPath( "/etc/apache2/conf.d/simias.conf" );
+ string path = Path.GetFullPath( "/etc/apache2/modules.d/90_simias.conf" );
Console.WriteLine("Configuring {0}...", path);
string ModMonoServer2 = Environment.GetEnvironmentVariable("IFOLDER_MOD_MONO_SERVER2_PATH");
string iFolderMonoPath = Environment.GetEnvironmentVariable("IFOLDER_MONO_PATH");
@@ -2452,7 +2452,7 @@
using( StreamWriter writer = File.CreateText( path ) )
{
/* example
- Include /etc/apache2/conf.d/mod_mono.conf
+ Include /etc/apache2/modules.d/70_mod_mono.conf
Alias /simias10 "/usr/web"
AddMonoApplications simias10 "/simias10:/usr/web"
@@ -2513,11 +2513,11 @@
}
/// <summary>
- /// Read the /etc/apache2/conf.d/simias.conf File and return data path.
+ /// Read the /etc/apache2/modules.d/90_simias.conf File and return data path.
/// </summary>
string ReadModMonoConfiguration()
{
- string path = Path.GetFullPath( "/etc/apache2/conf.d/simias.conf" );
+ string path = Path.GetFullPath( "/etc/apache2/modules.d/90_simias.conf" );
string dataPath = null;
if ( path == null || File.Exists( path ) == false )
return null;
diff -uNr ifolder3-enterprise-3.9.1.7638.orig/src/utils/restore/iFolderServer.cs ifolder3-enterprise-3.9.1.7638/src/utils/restore/iFolderServer.cs
--- ifolder3-enterprise-3.9.1.7638.orig/src/utils/restore/iFolderServer.cs 2013-04-19 19:23:31.126432910 +0200
+++ ifolder3-enterprise-3.9.1.7638/src/utils/restore/iFolderServer.cs 2013-04-19 19:33:42.493789766 +0200
@@ -3351,11 +3351,11 @@
}
/// <summary>
- /// Read the /etc/apache2/conf.d/simias.conf File and return data path.
+ /// Read the /etc/apache2/modules.d/90_simias.conf File and return data path.
/// </summary>
public static string ReadModMonoConfiguration()
{
- string path = Path.GetFullPath( "/etc/apache2/conf.d/simias.conf" );
+ string path = Path.GetFullPath( "/etc/apache2/modules.d/90_simias.conf" );
string dataPath = null;
if ( path == null || File.Exists( path ) == false )
return null;
diff -uNr ifolder3-enterprise-3.9.1.7638.orig/src/webservices/iFolderServer.cs ifolder3-enterprise-3.9.1.7638/src/webservices/iFolderServer.cs
--- ifolder3-enterprise-3.9.1.7638.orig/src/webservices/iFolderServer.cs 2013-04-19 19:23:31.102433210 +0200
+++ ifolder3-enterprise-3.9.1.7638/src/webservices/iFolderServer.cs 2013-04-19 19:34:14.288392279 +0200
@@ -1221,7 +1221,7 @@
try
{
- string path = Path.GetFullPath("/etc/apache2/conf.d/simias.conf");
+ string path = Path.GetFullPath("/etc/apache2/modules.d/90_simias.conf");
TextReader reader = (TextReader)File.OpenText(path);

2
www-apps/ifolder3-enterprise/files/3.9.1/ifdata.patch
View File

@@ -6,7 +6,7 @@ diff -uNr ifolder3-enterprise-3.9.1.7638.orig/src/core/ifdata ifolder3-enterpris
/sbin/ifconfig | grep '\<inet\>' | cut -f2 -d' ' | cut -f1 -d' '
else
- /sbin/ifconfig | grep 'inet addr' | cut -f2 -d':' | cut -f1 -d' '
+ if [ -f /sbin/ip ] then
+ if [ -f /sbin/ip ] ; then
+ /sbin/ip addr | awk '/inet / {sub(/\/.*/, "", $2); print $2}'
+ else
+ /sbin/ifconfig | grep "inet addr" | awk -F: '{print $2}' | awk '{print $1}'

2
www-apps/ifolder3-enterprise/files/3.8.4/use_webbindir_variable_configurein.patch → www-apps/ifolder3-enterprise/files/3.9.1/use_webbindir_variable_configurein_no_gsoap.patch
View File

@@ -37,7 +37,7 @@ Index: simias-1.8.3.10200.0/configure.in
@@ -346,7 +370,7 @@ case $SIMIAS_OS in
StoreProviderAssembly="SimiasLib.dll"
StoreProviderType="Simias.Storage.Provider.Flaim.FlaimProvider"
GSOAP_PATH="/usr/bin"
GSOAP_PATH="$TOOLDIR/gsoap/linux-2.7"
- mappingpath="${exec_prefix}/${LIB64}/simias/web/bin/Simias.exe"
+ mappingpath="${webbindir}/Simias.exe"
;;

12
www-apps/ifolder3-enterprise/files/3.9.1/xps-MonoWebServer2.patch Normal file
View File

@@ -0,0 +1,12 @@
diff -uNr ifolder3-enterprise-3.9.1.7638.orig/configure.in ifolder3-enterprise-3.9.1.7638/configure.in
--- ifolder3-enterprise-3.9.1.7638.orig/configure.in 2013-04-20 06:30:21.793171829 +0200
+++ ifolder3-enterprise-3.9.1.7638/configure.in 2013-04-20 06:31:35.035256177 +0200
@@ -714,7 +714,7 @@
# Configure MONO_WEBSERVER
#
MONO_WEBSERVER_DLL="Mono.WebServer.dll"
-pkg-config --atleast-version=2.8 xsp-2
+pkg-config --atleast-version=2.6 xsp-2
if test $? -eq 0; then
MONO_WEBSERVER_DLL="Mono.WebServer2.dll"
fi