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

add ifolder

Browse Source 
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/ifolder@793 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one
2009-02-21 08:30:54 +00:00
parent 0c9ad5e79a
commit 1a3bfd22cf
47 changed files with 1105 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
www-apps/ifolder-server/files/configure.in-xsp-check-by-dl9pf-version3.diff Normal file
View File

@@ -0,0 +1,94 @@
Index: configure.in
===================================================================
--- configure.in (Revision 6873)
+++ configure.in (Arbeitskopie)
@@ -607,8 +607,87 @@
# Configure MONO_WEBSERVER
#
MONO_WEBSERVER="no"
-if test -e "/usr/lib/mono/1.0/Mono.WebServer.dll"; then
- MONO_WEBSERVER="yes"
+if test "$SIMIAS_OS" = "linux"; then
+ # If we have xsp in our $PATH, then we have xsp installed
+ AC_CHECK_PROG(HAVE_XSP, xsp, yes)
+ AC_CHECKING([whether xsp version is >= 1.1.13.8])
+ if test "$HAVE_XSP" = "yes"; then
+ # Get the version info and check if we have a version >= 1.1.18
+ # 1st: Get the version string
+ XSP_EXE_VER=`LANG="C" xsp --version | head -n 1 | cut -d" " -f2`
+
+ # We have to look at a minimum of 3 digits (mono-W.X.Y.Z)
+ DIGIT_W=`echo $XSP_EXE_VER | cut -d"." -f1` # major
+ DIGIT_X=`echo $XSP_EXE_VER | cut -d"." -f2` # minor
+ DIGIT_Y=`echo $XSP_EXE_VER | cut -d"." -f3` # sub
+ DIGIT_Z=`echo $XSP_EXE_VER | cut -d"." -f4` # extra
+
+ # We want to require a minimum of 1.1.18 (no z, setting "0")
+ REQ_MAJOR="1"
+ REQ_MINOR="1"
+ REQ_SUB="13"
+ REQ_EXTRA="7"
+
+ # Lets compare things
+ echo " M M S E"
+ echo " A I U X"
+ echo " J N B T"
+ echo " O O R"
+ echo " R R A"
+ echo " - - - "
+ echo "DEBUG $DIGIT_W - $DIGIT_X - $DIGIT_Y - $DIGIT_Z"
+ echo "DEBUG $REQ_MAJOR - $REQ_MINOR - $REQ_SUB - $REQ_EXTRA"
+
+XSP_ERROR_MSG="
+* Your xsp version seems to be $DIGIT_W.$DIGIT_X.$DIGIT_Y.$DIGIT_Z
+* You need to install xsp >= $REQ_MAJOR.$REQ_MINOR.$REQ_SUB to run simias
+"
+
+ if [[[ -n $DIGIT_W && $DIGIT_W -ge $REQ_MAJOR ]]] ; then
+ echo "MAJOR OK"
+ # MAJOR IS OK, NOW CHECK MINOR
+ if [[[ -n $DIGIT_X && $DIGIT_X -gt $REQ_MINOR ]]] ; then
+ echo "MINOR GREATER"
+ # MINOR IS GREATER, SKIP CHECK SUB
+ MONO_WEBSERVER="yes"
+ else
+ if [[[ -n $DIGIT_X && $DIGIT_X -eq $REQ_MINOR ]]] ; then
+ echo "MINOR EQUAL"
+ # MINOR IS EQUAL, CHECK SUB
+ if [[[ -n $DIGIT_Y && $DIGIT_Y -gt $REQ_SUB ]]] ; then
+ echo "SUB OK"
+ # SUB IS GREATER - SKIP CHECK EXTRA
+ MONO_WEBSERVER="yes"
+ else
+ if [[[ -n $DIGIT_Y && $DIGIT_Y -eq $REQ_SUB ]]] ; then
+ echo "SUB OK"
+ # SUB IS EQUAL, CHECK EXTRA
+ if [[[ -n $DIGIT_Z && $DIGIT_Z -ge $REQ_EXTRA ]]] ; then
+ echo "EXTRA OK"
+ # EXTRA IS GREATER/EQUAL
+ MONO_WEBSERVER="yes"
+ else
+ echo "EXTRA NOT OK !"
+ AC_MSG_ERROR($XSP_ERROR_MSG)
+ fi
+ else
+ echo "SUB NOT OK !"
+ AC_MSG_ERROR($XSP_ERROR_MSG)
+ fi
+ fi
+ else
+ echo "MINOR NOT OK !"
+ AC_MSG_ERROR($XSP_ERROR_MSG)
+ fi
+ fi
+ else
+ echo "MAJOR NOT OK !"
+ AC_MSG_ERROR($XSP_ERROR_MSG)
+ fi
+ echo "DEBUG MONO_WEBSERVER=yes"
+ else
+ AC_MSG_ERROR(* xsp command not found)
+ fi
fi
AC_SUBST(MONO_WEBSERVER)

12
www-apps/ifolder-server/files/flex_in_lib64.diff Normal file
View File

@@ -0,0 +1,12 @@
diff -Naur simias/tools/gsoap/gsoap-linux-2.7/src/Makefile simias-changed/tools/gsoap/gsoap-linux-2.7/src/Makefile
--- simias/tools/gsoap/gsoap-linux-2.7/src/Makefile 2007-10-01 22:32:04.000000000 +0200
+++ simias-changed/tools/gsoap/gsoap-linux-2.7/src/Makefile 2007-10-02 19:34:26.000000000 +0200
@@ -10,7 +10,7 @@
YACC=bison
# For static linkage with Flex use:
ifndef (lib)
-lib=lib
+lib=lib64
endif
LIBS=/usr/$(lib)/libfl.a

11
www-apps/ifolder-server/files/gsoap-compile-final.patch Normal file
View File

@@ -0,0 +1,11 @@
--- src/core/libsimias/Makefile.am 2007-08-18 02:36:05.000000000 -0600
+++ src/core/libsimias/Makefile.am.new 2007-08-18 02:35:58.000000000 -0600
@@ -27,6 +27,8 @@
$(GSOAP_PATH)/soapcpp2 -c -penv $(srcdir)/env.h
$(srcdir)/stdsoap2.c:
+ cd $(GSOAP_PATH)/src && make && cp soapcpp2 ..
+ cd $(GSOAP_PATH)/wsdl && make
cp $(GSOAP_PATH)/stdsoap2.h $(srcdir)
cp $(GSOAP_PATH)/stdsoap2.c $(srcdir)

12
www-apps/ifolder-server/files/gsoap-compile-new.patch Normal file
View File

@@ -0,0 +1,12 @@
--- src/core/libsimias/Makefile.am 2007-08-18 01:51:50.000000000 -0600
+++ src/core/libsimias/Makefile.am.new 2007-08-18 01:51:35.000000000 -0600
@@ -27,6 +27,9 @@
$(GSOAP_PATH)/soapcpp2 -c -penv $(srcdir)/env.h
$(srcdir)/stdsoap2.c:
+ cd $(GSOAP_PATH)/src && make
+ cd $(GSOAP_PATH)/wsdl && make
+ cp $(GSOAP_PATH)/src/soapcpp2 $(GSOAP_PATH)
cp $(GSOAP_PATH)/stdsoap2.h $(srcdir)
cp $(GSOAP_PATH)/stdsoap2.c $(srcdir)

10
www-apps/ifolder-server/files/gsoap-compile.patch Normal file
View File

@@ -0,0 +1,10 @@
--- src/core/libsimias/Makefile.am 2007-08-18 02:05:39.000000000 -0600
+++ src/core/libsimias/Makefile.am.new 2007-08-18 02:05:32.000000000 -0600
@@ -27,6 +27,7 @@
$(GSOAP_PATH)/soapcpp2 -c -penv $(srcdir)/env.h
$(srcdir)/stdsoap2.c:
+ cp $(GSOAP_PATH)/bin/* $(GSOAP_PATH)
cp $(GSOAP_PATH)/stdsoap2.h $(srcdir)
cp $(GSOAP_PATH)/stdsoap2.c $(srcdir)

11
www-apps/ifolder-server/files/gsoap-path.patch Normal file
View File

@@ -0,0 +1,11 @@
--- configure.in 2007-08-18 00:53:11.000000000 -0600
+++ configure.in.new 2007-08-18 01:19:24.000000000 -0600
@@ -279,7 +279,7 @@
AC_CHECK_PROG(CXX, g++, g++)
StoreProviderAssembly="SimiasLib.dll"
StoreProviderType="Simias.Storage.Provider.Flaim.FlaimProvider"
- GSOAP_PATH="$TOOLDIR/gsoap/linux-2.7"
+ GSOAP_PATH="$TOOLDIR/gsoap/gsoap-linux-2.7"
mappingpath="${exec_prefix}/lib/simias/web/bin/Simias.exe"
;;
#

31
www-apps/ifolder-server/files/ifolder-admin-setup.diff Normal file
View File

@@ -0,0 +1,31 @@
--- src/server/setup/iFolderAdminSetup.cs 2007-10-29 18:30:06.000000000 -0600
+++ src/server/setup/iFolderAdminSetup.cs.new 2008-01-24 12:10:56.000000000 -0700
@@ -154,6 +154,10 @@
{
// ignore
}
+
+ apacheUser = "apache";
+ apacheGroup = "apache";
+
}
/// <summary>
@@ -324,7 +328,7 @@
/// </summary>
void SetupModMono()
{
- string path = "/etc/apache2/conf.d/ifolder_admin.conf";
+ string path = "/etc/simias/apache/gentoo/ifolder_admin.conf";
Console.Write("Configuring {0}...", path);
@@ -354,8 +358,6 @@
sslPrefix = "#";
}
- writer.WriteLine("Include /etc/apache2/mod_mono.conf");
- writer.WriteLine();
writer.WriteLine("Alias /{0} \"{1}\"", alias, webPath);
writer.WriteLine("AddMonoApplications {0} \"/{0}:{1}\"", alias, webPath);

10
www-apps/ifolder-server/files/ifolder-apache-conf.diff Normal file
View File

@@ -0,0 +1,10 @@
--- src/setup/apache/ifolder_apache.conf.in 2007-10-29 18:30:03.000000000 -0600
+++ src/setup/apache/ifolder_apache.conf.in.new 2008-01-24 12:28:17.000000000 -0700
@@ -1,6 +1,6 @@
Include @MODMONO_CONFPATH@
-Include @simiasconfdir@/apache/default/*.conf
+Include @simiasconfdir@/apache/gentoo/*.conf
#NameVirtualHost 127.0.0.1

17
www-apps/ifolder-server/files/ifolder-server-apache-rights.patch Normal file
View File

@@ -0,0 +1,17 @@
--- src/server/setup/SimiasServerSetup.cs 2007-01-02 01:45:42.000000000 -0700
+++ src/server/setup/SimiasServerSetup.cs.new 2007-01-03 14:48:05.000000000 -0700
@@ -81,12 +81,12 @@
/// <summary>
/// Apache User
/// </summary>
- string apacheUser = "wwwrun";
+ string apacheUser = "apache";
/// <summary>
/// Apache Group
/// </summary>
- string apacheGroup = "www";
+ string apacheGroup = "apache";
/// <summary>
/// The uri to the ldap server.

56
www-apps/ifolder-server/files/ifolder-server-apache-simias-location.patch Normal file
View File

@@ -0,0 +1,56 @@
--- src/server/setup/SimiasServerSetup.cs 2007-01-02 01:45:42.000000000 -0700
+++ src/server/setup/SimiasServerSetup.cs.new 2007-01-03 15:53:29.000000000 -0700
@@ -901,52 +901,10 @@
/// </summary>
void SetupModMono()
{
- string path = Path.GetFullPath( "/etc/apache2/conf.d/simias.conf" );
- Console.Write("Configuring {0}...", path);
if ( apache.Value == true )
{
- // create configuration
- using( StreamWriter writer = File.CreateText( path ) )
- {
- /* example
- Include /etc/apache2/conf.d/mod_mono.conf
-
- Alias /simias10 "/opt/novell/ifolder3/web"
- AddMonoApplications simias10 "/simias10:/opt/novell/ifolder3/web"
- MonoSetEnv SimiasRunAsServer=true;SimiasDataPath="/var/opt/novell/ifolder3/simias"
- <Location /simias10 >
- MonoSetServerAlias simias10
- Order allow,deny
- Allow from all
- SetHandler mono
- </Location>
- */
-
- string alias = "simias10";
-
- writer.WriteLine( "Include /etc/apache2/conf.d/mod_mono.conf" );
- writer.WriteLine();
- writer.WriteLine("Alias /{0} \"{1}\"", alias, SimiasSetup.webdir);
- writer.WriteLine("AddMonoApplications {0} \"/{0}:{1}\"", alias, SimiasSetup.webdir);
- writer.WriteLine("MonoSetEnv {0} \"SimiasRunAsServer=true;SimiasDataDir={1}\"", alias, this.storePath);
- writer.WriteLine("<Location /{0} >", alias);
- writer.WriteLine("\tMonoSetServerAlias {0}", alias);
- writer.WriteLine("\tOrder allow,deny");
- writer.WriteLine("\tAllow from all");
- writer.WriteLine("\tSetHandler mono");
- writer.WriteLine("</Location>");
- writer.WriteLine();
- writer.Close();
- }
-
- // chmod
- if (Execute("chmod", "644 {0}", path) != 0)
- {
- throw new Exception(String.Format("Unable to change {0} file permissions.", path));
- }
-
- Console.WriteLine("Done");
+ Console.WriteLine("Apache/Mono configured");
}
else
{

13
www-apps/ifolder-server/files/ifolder-server-mod_mono-path.patch Normal file
View File

@@ -0,0 +1,13 @@
--- configure.in 2006-03-30 16:41:41.000000000 -0700
+++ configure.in.new 2006-03-31 20:34:12.000000000 -0700
@@ -558,6 +558,10 @@
MODMONO_CONFPATH="/etc/httpd/mod_mono.conf"
fi
+if test -e "/etc/apache2/modules.d/70_mod_mono.conf";then
+ MODMONO_CONFPATH="/etc/apache2/modules.d/70_mod_mono.conf"
+fi
+
AC_SUBST(MODMONO_CONFPATH)

17
www-apps/ifolder-server/files/ifolder-server-simias-server-setup.patch Normal file
View File

@@ -0,0 +1,17 @@
--- src/server/setup/SimiasServerSetup.cs 2007-01-02 01:45:42.000000000 -0700
+++ src/server/setup/SimiasServerSetup.cs.new 2007-01-03 16:31:20.000000000 -0700
@@ -499,12 +499,12 @@
}
SetupPermissions();
- SetupModMono();
+// SetupModMono();
if ( usingLDAP )
{
SetupLdap();
}
- SetupScriptFiles();
+// SetupScriptFiles();
SetupLog4Net();
}

30
www-apps/ifolder-server/files/ifolder-web-setup.diff Normal file
View File

@@ -0,0 +1,30 @@
--- src/server/setup/iFolderWebSetup.cs 2007-10-29 18:30:06.000000000 -0600
+++ src/server/setup/iFolderWebSetup.cs.new 2008-01-24 12:14:10.000000000 -0700
@@ -155,6 +155,9 @@
{
// ignore
}
+
+ apacheUser = "apache";
+ apacheGroup = "apache";
}
/// <summary>
@@ -325,7 +328,7 @@
/// </summary>
void SetupModMono()
{
- string path = "/etc/apache2/conf.d/ifolder_web.conf";
+ string path = "/etc/simias/apache/gentoo/ifolder_web.conf";
Console.Write("Configuring {0}...", path);
@@ -355,8 +358,6 @@
sslPrefix = "#";
}
- writer.WriteLine("Include /etc/apache2/mod_mono.conf");
- writer.WriteLine();
writer.WriteLine("Alias /{0} \"{1}\"", alias, webPath);
writer.WriteLine("AddMonoApplications {0} \"/{0}:{1}\"", alias, webPath);
if (logoutUrl.Value != String.Empty || logoutUrl.Value.Trim () != "" )

14
www-apps/ifolder-server/files/new_default_simias.config.diff Normal file
View File

@@ -0,0 +1,14 @@
diff -Naur simias_orig/src/server/Simias.config.in simias/src/server/Simias.config.in
--- simias_orig/src/server/Simias.config.in 2007-10-16 16:19:39.000000000 +0200
+++ simias/src/server/Simias.config.in 2007-10-30 01:10:50.068278089 +0100
@@ -6,7 +6,9 @@
<setting name="AdminPassword" value="simias" />
</section>
<section name="Server">
- <setting name="Name" value="Host1" />
+ <setting name="Name" value="Host1" />
+ <setting name="PublicAddress" value="http://xxxPUBLICADDRESSxxx/simias10" />
+ <setting name="PrivateAddress" value="http://xxxPRIVATEADDRESSxxx/simias10" />
</section>
<section name="Authentication">
<setting name="SimiasAuthNotRequired" value="Registration.asmx, Login.ashx, Simias.asmx:PingSimias, DomainService.asmx:GetDomainID, pubrss.ashx, pubsfile.ashx, Simias.asmx:GetRAList, Simias.asmx:GetRACertificate, iFolderBackup.asmx:GetSimiasDataPath, iFolderBackup.asmx:Ping" />

13
www-apps/ifolder-server/files/new_mod_mono.diff Normal file
View File

@@ -0,0 +1,13 @@
--- configure.in 2007-10-29 18:27:42.000000000 -0600
+++ configure.in.new 2008-01-24 10:00:34.000000000 -0700
@@ -655,6 +655,10 @@
MODMONO_CONFPATH="/etc/httpd/mod_mono.conf"
fi
+if test -e "/etc/apache2/modules.d/70_mod_mono.conf"; then
+ MODMONO_CONFPATH="/etc/apache2/modules.d/70_mod_mono.conf"
+fi
+
AC_SUBST(MODMONO_CONFPATH)

16
www-apps/ifolder-server/files/no_write_to_etc_during_install.diff Normal file
View File

@@ -0,0 +1,16 @@
diff -Naur simias/src/server/setup/Makefile.am simias-changed/src/server/setup/Makefile.am
--- simias/src/server/setup/Makefile.am 2007-10-01 22:53:18.000000000 +0200
+++ simias-changed/src/server/setup/Makefile.am 2007-10-02 08:52:47.000000000 +0200
@@ -120,9 +120,9 @@
$(INSTALL_PROGRAM) ifolder-web-setup $(DESTDIR)$(bindir)
$(INSTALL_PROGRAM) ifolder-admin-setup $(DESTDIR)$(bindir)
$(INSTALL_PROGRAM) utility.exe $(DEBUG_FILES) $(DESTDIR)$(bindir)
- $(mkinstalldirs) /etc/ld.so.conf.d
- $(INSTALL_PROGRAM) novell-ifolder3.conf /etc/ld.so.conf.d
- grep -q "include /etc/ld.so.conf.d/\*.conf" /etc/ld.so.conf || echo "include /etc/ld.so.conf.d/*.conf" >> /etc/ld.so.conf
+# $(mkinstalldirs) /etc/ld.so.conf.d
+# $(INSTALL_PROGRAM) novell-ifolder3.conf /etc/ld.so.conf.d
+# grep -q "include /etc/ld.so.conf.d/\*.conf" /etc/ld.so.conf || echo "include /etc/ld.so.conf.d/*.conf" >> /etc/ld.so.conf
endif

BIN
www-apps/ifolder-server/files/setup-files.tar.gz Normal file
View File

Binary file not shown.

30
www-apps/ifolder-server/files/simias-server-setup.diff Normal file
View File

@@ -0,0 +1,30 @@
--- src/server/setup/SimiasServerSetup.cs 2007-10-29 18:30:06.000000000 -0600
+++ src/server/setup/SimiasServerSetup.cs.new 2008-01-24 12:22:21.000000000 -0700
@@ -580,6 +580,9 @@
apacheUser.Prompt = apacheGroup.Prompt = true;
}
+ apacheUser.Value = "apache";
+ apacheGroup.Value = "apache";
+
}
bool Configure()
@@ -1143,7 +1146,7 @@
/// </summary>
void SetupModMono()
{
- string path = Path.GetFullPath( "/etc/apache2/conf.d/simias.conf" );
+ string path = Path.GetFullPath( "/etc/simias/apache/gentoo/simias.conf" );
Console.Write("Configuring {0}...", path);
if ( apache.Value == true )
@@ -1167,8 +1170,6 @@
string alias = "simias10";
- writer.WriteLine( "Include /etc/apache2/mod_mono.conf" );
- writer.WriteLine();
writer.WriteLine("Alias /{0} \"{1}\"", alias, SimiasSetup.webdir);
writer.WriteLine("AddMonoApplications {0} \"/{0}:{1}\"", alias, SimiasSetup.webdir);
writer.WriteLine("MonoSetEnv {0} \"SimiasRunAsServer=true;SimiasDataDir={1}\"", alias, this.storePath);

28
www-apps/ifolder-server/files/webaccess-browse.patch Normal file
View File

@@ -0,0 +1,28 @@
--- src/webaccess/Browse.aspx.old 2006-05-09 12:27:13.000000000 -0600
+++ src/webaccess/Browse.aspx 2006-05-09 12:30:06.000000000 -0600
@@ -2,8 +2,6 @@
<%@ Register TagPrefix="iFolder" TagName="HeaderControl" Src="Header.ascx" %>
<%@ Register TagPrefix="iFolder" TagName="MessageControl" Src="Message.ascx" %>
<%@ Register TagPrefix="iFolder" TagName="iFolderContextControl" Src="iFolderContext.ascx" %>
-<%@ Register TagPrefix="iFolder" TagName="TabControl" Src="TabControl.ascx" %>
-<%@ Register TagPrefix="iFolder" TagName="QuotaControl" Src="Quota.ascx" %>
<%@ Register TagPrefix="iFolder" TagName="PaggingControl" Src="Pagging.ascx" %>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
@@ -75,9 +73,6 @@
<div id="nav">
- <iFolder:TabControl id="Tabs" runat="server" />
-
- <iFolder:QuotaControl runat="server" />
</div>
@@ -176,4 +171,4 @@
</body>
-</html>
\ No newline at end of file
+</html>