www-apps/ifolder-server: Bump to ifolder server 3.7
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/ifolder@920 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one
parent
fe4c57b656
commit
533716cb86
|
|
@ -2,6 +2,13 @@
|
|||
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
|
||||
# $Header: $
|
||||
|
||||
06 Apr 2009; Mario Fetka <mario.fetka@gmail.com>
|
||||
+files/simias-1.8-mono22-1.patch, +files/simias-1.8-server-setup.diff,
|
||||
+files/simias-1.8.use_system_gsoap.patch,
|
||||
+files/ifolder-3.7-admin-setup.diff, +files/ifolder-3.7-web-setup.diff,
|
||||
+ifolder-server-3.7_pre7020.ebuild:
|
||||
Bump to ifolder server 3.7
|
||||
|
||||
01 Mar 2009; Mario Fetka <mario.fetka@gmail.com>
|
||||
ifolder-server-3.6.7303.1-r3.ebuild:
|
||||
remve wrong patch
|
||||
|
|
|
|||
|
|
@ -5,6 +5,8 @@ AUX gsoap-compile-final.patch 402 RMD160 29619a25145d4fd7f8a6f05211a5eb2322c5634
|
|||
AUX gsoap-compile-new.patch 431 RMD160 e6230ce3337369bfd773b68c71ea5b0ca64312d9 SHA1 ab6872d237a6007019471d23785911e7bf36edca SHA256 6539b41d1c421f9578be3eb4f3e698567d0954e6417619e9f9431d09b62c7b28
|
||||
AUX gsoap-compile.patch 360 RMD160 3f498dcf545df164aaf9cfeacb7382a0a6b18194 SHA1 4ce5bf7e6a8f7343e06e8445cfd200cf33ea9651 SHA256 e813db06442e5375a45dfa32a71de3d6b5eddea3cf90b6be5c9e5a04cd917bc5
|
||||
AUX gsoap-path.patch 441 RMD160 853a2222305bda35600983b8e15d7c84e107e43c SHA1 d4124e62d9a8e13fd6ff17859ea4ac779da52a3d SHA256 4f0b22bf788ad50c7455fa0d75d149f929abca7516743f9e62a1904abcad5fef
|
||||
AUX ifolder-3.7-admin-setup.diff 2042 RMD160 afae167e940d7ce24df7074d6d8eda039444d3bb SHA1 61f226215ce1e55d557867bff39f99ea80a3c392 SHA256 9574ab052a460779f10fdadfaac687175578999a11d5af57329f7f2bdfc405bf
|
||||
AUX ifolder-3.7-web-setup.diff 2146 RMD160 ede533ddd86e3c5aef0a6a89c0b65e6cb9173870 SHA1 749a5cc7fcdce88ae61dc45538bed4476586c206 SHA256 909927c6967b78361a7c5aee77fc233bfa34c7e76832f2ee636e9ebcbd36bd6d
|
||||
AUX ifolder-admin-setup.diff 841 RMD160 b2d6b79037a0c3d02e9a761688c9605dc3f7c497 SHA1 d628ec533f755f58cebf4a0a969c8527c41a944e SHA256 e391577bb0fe37ce873371be95b110af02d499dc7035592ef2199a0f1bdc382a
|
||||
AUX ifolder-apache-conf.diff 335 RMD160 10d26c5367bf21b36e3c129ca5913a6744c42551 SHA1 d7fbdc42b0cfaef907a64c48054ac902c41855f4 SHA256 c839ee18851cc12094992bb9b7db4c5ee5a36bc0878ae608bfa9a2963263bbde
|
||||
AUX ifolder-server-apache-rights.patch 476 RMD160 d4b2f3af1268d70761e90e121656395990e93430 SHA1 34da71e64d7c2afdb29844dba3fbecde0c26a447 SHA256 53153825f5ed7632cdfa2c14bbcb1fb5856b86e8cb01af050ffeb56a6fd1cea9
|
||||
|
|
@ -17,6 +19,9 @@ AUX new_mod_mono.diff 342 RMD160 9a882b17c42d2dd1e31a95545ffb4fdc0a89bfe6 SHA1 2
|
|||
AUX no_write_to_etc_during_install.diff 916 RMD160 9cd1ee64a3006aad139892010b2ba9a4f0f695be SHA1 a4c1c6ed6ad7be0bbcf75fda1601d7edab843981 SHA256 3c8045848161d34a49f1c1934b1111489e18f48d0b4225e287f83d1407425d7f
|
||||
AUX setup-files.tar.gz 1104 RMD160 a1e0abc2dc43b168267d1b0c79b450ce7bd66011 SHA1 1f99f09cdcacc8eb859e4e17bd18948f2293a782 SHA256 40a6f1400e59a06cc220193dcfd0dbd1cf8ce629526db9598cc6aeafda06e001
|
||||
AUX simias-1.6.use_system_gsoap.patch 2922 RMD160 ec4bb9da8a3a0eab08ac36b4dc9d5c19aa833736 SHA1 fa49d2d34f210919590838c9d302315a304ff037 SHA256 e8432f7883b161c8f68c16f7a99da4ade7eab5b41f8391e7f99b3f92474c74c0
|
||||
AUX simias-1.8-mono22-1.patch 7492 RMD160 4a09f05ecee38b52ec7b3f60cc2c6e6e55e15fc1 SHA1 45797cd0f9b72747e4ab72fc02ee301446bb3c4b SHA256 3460a484bb46bf2f121f343e24a16d792c3819d114807714c4198cb10ad023db
|
||||
AUX simias-1.8-server-setup.diff 1840 RMD160 b5f648fe50ff9cee4a0053eb6929d28362c0707f SHA1 27fb693f52d8d259eedc7867eaec262233bbf897 SHA256 5af21b3c71a507e5def0cbaf0aba0ebaf1be4eadb665bc62eb22c313ebb343e6
|
||||
AUX simias-1.8.use_system_gsoap.patch 3026 RMD160 3a63dafb8767b36ff9f99009d1749f07b2b82232 SHA1 3cae95bbab594e84eb41b3dee9e37fc9d1644404 SHA256 4b176aa58b40799c270a91889e22a2a8603e256b9f8415bda665071de7cd5b4e
|
||||
AUX simias-Makefile-in-generate.diff 245 RMD160 e98841bdbc05c82565c076000b1a2def2d647a00 SHA1 4c9bb42fbc6eeb078389e554a1ce400a88051e84 SHA256 62621a68f45cf3b7eba1af206d18f245b624c8e52361707648306360f20f3778
|
||||
AUX simias-bash.dpatch 4540 RMD160 35a754408252415667aa13bc46f78a94842e83c1 SHA1 12df994febdddcd5f06fb6b9437ff9ed828eceb4 SHA256 44a142f060bdfb4dd276e81e878822998819516e37cd30f7a255be98ba446d3b
|
||||
AUX simias-etc_use_destdir.dpatch 1570 RMD160 50dd9de5b9ca0f45735bdc2d166e6020b1d0d4a3 SHA1 0b5128209c1d5546e399e4bac773d4c7a4fa9760 SHA256 53611a9778cac46e249694198a95b07ba6e9a514b0551c361900894282e728c1
|
||||
|
|
@ -34,5 +39,6 @@ EBUILD ifolder-server-3.6.7303.1-r1.ebuild 4374 RMD160 ba5010a12d06ea9df3f43a87e
|
|||
EBUILD ifolder-server-3.6.7303.1-r2.ebuild 4430 RMD160 70af925f2444662b3be7af67169d31981e5e446e SHA1 f471033ed2486bc5213d343eb6118070ef1083c8 SHA256 1f3696c81ede5651670f44f4f80b4a1a6ac2f3934c50e5ed5603912f88c30b91
|
||||
EBUILD ifolder-server-3.6.7303.1-r3.ebuild 4574 RMD160 fbae8aff2510c0679f8208a865c0604ecd8e0fbf SHA1 36f084e88888d3b5c9807aba29395b7caeebef05 SHA256 0f279370359f696bd2b3afd3bbebf80a65a9738bb646d5a5c74a86d7a10b8e5d
|
||||
EBUILD ifolder-server-3.6.7303.1.ebuild 4320 RMD160 2d8cfb188d8384206d043f3ff7ff7c8960aecce7 SHA1 0a83a3bcb51648888081ce8ff676c89dd08cc9f0 SHA256 da6a3447ec2cfdaf6ca56ab32398bdf02a5198644925b20b1782092999294b8a
|
||||
MISC ChangeLog 1408 RMD160 02d363cb2f1dc76acbb4f244d65c5fec85e4a673 SHA1 f10e58e1d6963960f6126b3f8e20d3a9a6f16e36 SHA256 a308c0e4319f48ee1d9598f648fcec972a74da66cac9d4b17ac98f0ae8067d3a
|
||||
EBUILD ifolder-server-3.7_pre7020.ebuild 4686 RMD160 9e59225354ca87ee477c043515be6e61ca3d323d SHA1 1e7db43f63f7b39e566f177970f7d2dbfe16396f SHA256 4082b02dd7a0c2781780bfc2533d71ecc37544db9bbf52f1ee2b530bd10b44ee
|
||||
MISC ChangeLog 1718 RMD160 55f36db865648a9453f3f828dde6e8bdbe14d620 SHA1 9c3d327987d4b5f293b4c8e0be53954229e0471b SHA256 5fd7b601f54a951e39285cc6721fce274572cb35b3372f21641e4a1c83a45326
|
||||
MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
|
||||
|
|
|
|||
|
|
@ -0,0 +1,41 @@
|
|||
diff -uNr simias.orig/src/server/setup/iFolderAdminSetup.cs simias/src/server/setup/iFolderAdminSetup.cs
|
||||
--- simias.orig/src/server/setup/iFolderAdminSetup.cs 2009-04-06 19:49:34.819204306 +0200
|
||||
+++ simias/src/server/setup/iFolderAdminSetup.cs 2009-04-06 19:54:51.990381096 +0200
|
||||
@@ -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.
|
||||
@@ -400,7 +403,7 @@
|
||||
/// </summary>
|
||||
void SetupModMono()
|
||||
{
|
||||
- string path = "/etc/apache2/conf.d/ifolder_admin.conf";
|
||||
+ string path = "/etc/simias/apache/gentoo/ifolder_admin.conf";
|
||||
string datapath = ReadModMonoConfiguration();
|
||||
|
||||
string MachineArch = Environment.GetEnvironmentVariable("MACHINE_ARCH");
|
||||
@@ -432,13 +435,6 @@
|
||||
{
|
||||
sslPrefix = "#";
|
||||
}
|
||||
- string mod_mono_path = "/etc/apache2/mod_mono.conf";
|
||||
- string mod_mono2_path = "/etc/apache2/conf.d/mod_mono.conf";
|
||||
- if( File.Exists( mod_mono2_path ))
|
||||
- writer.WriteLine( "Include {0}", mod_mono2_path );
|
||||
- else
|
||||
- writer.WriteLine( "Include {0}", mod_mono_path );
|
||||
- writer.WriteLine();
|
||||
writer.WriteLine("Alias /{0} \"{1}\"", alias, webPath);
|
||||
writer.WriteLine("AddMonoApplications {0} \"/{0}:{1}\"", alias, webPath);
|
||||
|
||||
|
|
@ -0,0 +1,41 @@
|
|||
diff -uNr simias.orig/src/server/setup/iFolderWebSetup.cs simias/src/server/setup/iFolderWebSetup.cs
|
||||
--- simias.orig/src/server/setup/iFolderWebSetup.cs 2009-04-06 19:57:18.302251000 +0200
|
||||
+++ simias/src/server/setup/iFolderWebSetup.cs 2009-04-06 20:01:01.853674639 +0200
|
||||
@@ -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.
|
||||
@@ -415,7 +418,7 @@
|
||||
/// </summary>
|
||||
void SetupModMono()
|
||||
{
|
||||
- string path = "/etc/apache2/conf.d/ifolder_web.conf";
|
||||
+ string path = "/etc/simias/apache/gentoo/ifolder_web.conf";
|
||||
string datapath = ReadModMonoConfiguration();
|
||||
|
||||
string MachineArch = Environment.GetEnvironmentVariable("MACHINE_ARCH");
|
||||
@@ -447,13 +450,6 @@
|
||||
{
|
||||
sslPrefix = "#";
|
||||
}
|
||||
- string mod_mono_path = "/etc/apache2/mod_mono.conf";
|
||||
- string mod_mono2_path = "/etc/apache2/conf.d/mod_mono.conf";
|
||||
- if( File.Exists( mod_mono2_path ))
|
||||
- writer.WriteLine( "Include {0}", mod_mono2_path );
|
||||
- else
|
||||
- writer.WriteLine( "Include {0}", mod_mono_path );
|
||||
- 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 () != "" )
|
||||
|
|
@ -0,0 +1,154 @@
|
|||
diff -uNr simias.orig/configure.in simias/configure.in
|
||||
--- simias.orig/configure.in 2009-04-06 11:03:00.061800856 +0200
|
||||
+++ simias/configure.in 2009-04-06 11:03:46.480191295 +0200
|
||||
@@ -18,8 +18,8 @@
|
||||
case $host_os in
|
||||
linux*)
|
||||
SIMIAS_OS='linux'
|
||||
- AC_CHECK_PROG(CSC, mcs, mcs)
|
||||
- test -z "$CSC" && AC_MSG_ERROR([no C Sharp compiler: mcs not found in \$PATH])
|
||||
+ AC_CHECK_PROG(CSC, gmcs, gmcs)
|
||||
+ test -z "$CSC" && AC_MSG_ERROR([no C Sharp compiler: gmcs not found in \$PATH])
|
||||
PKG_CONFIG_DIR="$LIB64"
|
||||
AC_CHECK_PROG(CSC2, gmcs, gmcs)
|
||||
test -z "$CSC" && AC_MSG_ERROR([no C Sharp .Net 2.0 compiler: gmcs not found in \$PATH])
|
||||
@@ -48,7 +48,7 @@
|
||||
AM_CONDITIONAL(WINDOWS, test "$SIMIAS_OS" = "windows")
|
||||
AM_CONDITIONAL(DARWIN, test "$SIMIAS_OS" = "darwin")
|
||||
AM_CONDITIONAL(DARWIN_X86, test "$host_cpu" = "i686")
|
||||
-AM_CONDITIONAL(MONO, test "$CSC" = "mcs")
|
||||
+AM_CONDITIONAL(MONO, test "$CSC" = "gmcs")
|
||||
AM_CONDITIONAL(DOTNET, test "$CSC" = "csc")
|
||||
|
||||
|
||||
@@ -121,7 +121,7 @@
|
||||
#
|
||||
# Mono-specific configuration
|
||||
#
|
||||
- mcs)
|
||||
+ gmcs)
|
||||
CSC_EXEFLAG=/target:exe
|
||||
CSC_LIBFLAG=/target:library
|
||||
CSC_WINEXEFLAG=/target:winexe
|
||||
diff -uNr simias.orig/src/admin/Makefile.am simias/src/admin/Makefile.am
|
||||
--- simias.orig/src/admin/Makefile.am 2009-04-06 11:03:00.057171272 +0200
|
||||
+++ simias/src/admin/Makefile.am 2009-04-06 11:05:12.318699017 +0200
|
||||
@@ -141,7 +141,7 @@
|
||||
all: Novell.iFolderAdmin.dll
|
||||
|
||||
iFolderAdminWebProxy.cs: ../webservices/iFolderAdmin.wsdl
|
||||
- wsdl /nologo /out:$@ $<
|
||||
+ wsdl2 /nologo /out:$@ $<
|
||||
|
||||
Novell.iFolderAdmin.dll: $(srcdir)/AssemblyInfo.cs iFolderAdminWebProxy.cs $(iFolderAdmin_CSFILES) $(iFolderAdmin_RESOURCES)
|
||||
$(CSC) /out:$@ $(CSCFLAGS) $(iFolderAdmin_FLAGS) $(iFolderAdmin_LIBS:%=/r:%) $(iFolderAdmin_RESOURCES:%=/res:%) $(iFolderAdmin_LIBPATH:%=/lib:%) $(srcdir)/AssemblyInfo.cs $(iFolderAdmin_CSFILES_CSC) $(LOG4NET_LIBS)
|
||||
diff -uNr simias.orig/src/core/Notifications/Notification.cs simias/src/core/Notifications/Notification.cs
|
||||
--- simias.orig/src/core/Notifications/Notification.cs 2009-04-06 11:02:59.987723103 +0200
|
||||
+++ simias/src/core/Notifications/Notification.cs 2009-04-06 11:16:49.596233553 +0200
|
||||
@@ -43,6 +43,8 @@
|
||||
using Simias.Service;
|
||||
using Simias.Sync;
|
||||
|
||||
+using Action = Simias.Client.Event.Action;
|
||||
+
|
||||
namespace Simias.Storage
|
||||
{
|
||||
/// <summary>
|
||||
diff -uNr simias.orig/src/core/SimiasApp/Makefile.am simias/src/core/SimiasApp/Makefile.am
|
||||
--- simias.orig/src/core/SimiasApp/Makefile.am 2009-04-06 11:02:59.985412467 +0200
|
||||
+++ simias/src/core/SimiasApp/Makefile.am 2009-04-06 11:12:44.117150083 +0200
|
||||
@@ -7,7 +7,8 @@
|
||||
SYSTEM_INSTALLER_LIB =
|
||||
endif
|
||||
|
||||
-MONO_WEBSERVER_PATH = ../../../dependencies/external/Mono.WebServer
|
||||
+$(GACD_MONO_WEBSERVER_FALSE) MONO_WEBSERVER_PATH = ../../../dependencies/external/Mono.WebServer
|
||||
+$(GACD_MONO_WEBSERVER_TRUE) MONO_WEBSERVER_PATH = $(MONO_PATH)
|
||||
|
||||
Simias_CSFILES = $(srcdir)/Simias.cs \
|
||||
$(srcdir)/SimiasAppInstallerClass.cs
|
||||
@@ -16,7 +17,7 @@
|
||||
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
|
||||
diff -uNr simias.orig/src/core/SimiasClient/Makefile.am simias/src/core/SimiasClient/Makefile.am
|
||||
--- simias.orig/src/core/SimiasClient/Makefile.am 2009-04-06 11:02:59.983094008 +0200
|
||||
+++ simias/src/core/SimiasClient/Makefile.am 2009-04-06 11:08:43.841779002 +0200
|
||||
@@ -34,7 +34,7 @@
|
||||
wsdl /out:SimiasService.cs $(srcdir)/../WebService/Simias.wsdl
|
||||
endif
|
||||
if LINUX
|
||||
- -wsdl -nologo -out:SimiasService.cs $(srcdir)/../WebService/Simias.wsdl
|
||||
+ wsdl2 -nologo -out:SimiasService.cs $(srcdir)/../WebService/Simias.wsdl
|
||||
endif
|
||||
if DARWIN
|
||||
wsdl -nologo -out:SimiasService.cs $(srcdir)/../WebService/Simias.wsdl
|
||||
diff -uNr simias.orig/src/core/Sync/SyncClient.cs simias/src/core/Sync/SyncClient.cs
|
||||
--- simias.orig/src/core/Sync/SyncClient.cs 2009-04-06 11:02:59.994671636 +0200
|
||||
+++ simias/src/core/Sync/SyncClient.cs 2009-04-06 11:17:24.656406387 +0200
|
||||
@@ -48,7 +48,7 @@
|
||||
using Simias.Client.Event;
|
||||
using Simias.DomainServices;
|
||||
|
||||
-
|
||||
+using Action = Simias.Client.Event.Action;
|
||||
|
||||
namespace Simias.Sync
|
||||
{
|
||||
diff -uNr simias.orig/src/reports/Proxy/Makefile.am simias/src/reports/Proxy/Makefile.am
|
||||
--- simias.orig/src/reports/Proxy/Makefile.am 2009-04-06 11:03:00.022445721 +0200
|
||||
+++ simias/src/reports/Proxy/Makefile.am 2009-04-06 11:05:39.207006205 +0200
|
||||
@@ -28,7 +28,7 @@
|
||||
all: Novell.iFolder.Enterprise.Reports.Proxy.dll
|
||||
|
||||
iFolderReportsProxy.cs: ../WebService/iFolderReports.wsdl
|
||||
- wsdl /nologo /out:$@ $<
|
||||
+ wsdl2 /nologo /out:$@ $<
|
||||
|
||||
Novell.iFolder.Enterprise.Reports.Proxy.dll: iFolderReportsProxy.cs $(iFolderReportsProxy_CSFILES) $(iFolderReportsProxy_RESOURCES)
|
||||
$(CSC) /out:$@ $(CSCFLAGS) $(iFolderReportsProxy_FLAGS) $(iFolderReportsProxy_LIBS:%=/r:%) $(iFolderReportsProxy_LIBPATH:%=/lib:%) $(iFolderReportsProxy_CSFILES_CSC) /doc:iFolderReportsProxy.doc.xml
|
||||
diff -uNr simias.orig/src/utils/usercmd/Makefile.am simias/src/utils/usercmd/Makefile.am
|
||||
--- simias.orig/src/utils/usercmd/Makefile.am 2009-04-06 11:03:00.022445721 +0200
|
||||
+++ simias/src/utils/usercmd/Makefile.am 2009-04-06 11:05:59.938476129 +0200
|
||||
@@ -34,7 +34,7 @@
|
||||
all: UserCmd.exe
|
||||
|
||||
AdminService.cs: ../../webservices/iFolderAdmin.wsdl
|
||||
- wsdl /nologo /out:$@ $<
|
||||
+ wsdl2 /nologo /out:$@ $<
|
||||
|
||||
UserCmd.exe: $(srcdir)/AssemblyInfo.cs $(UserCmd_CSFILES) $(UserCmd_RESOURCES)
|
||||
$(CSC) /out:$@ $(CSCFLAGS) $(UserCmd_FLAGS) $(SIMIAS_LIBS) $(UserCmd_LIBS:%=/r:%) $(UserCmd_LIBPATH:%=/lib:%) $(UserCmd_RESOURCES:%=$(ICON_FLAG)%) $(UserCmd_CSFILES_CSC) $(DOC_FILE_CMD)
|
||||
diff -uNr simias.orig/src/webaccess/Makefile.am simias/src/webaccess/Makefile.am
|
||||
--- simias.orig/src/webaccess/Makefile.am 2009-04-06 11:03:00.020130196 +0200
|
||||
+++ simias/src/webaccess/Makefile.am 2009-04-06 11:06:08.061160358 +0200
|
||||
@@ -121,7 +121,7 @@
|
||||
all: Novell.iFolderWeb.dll
|
||||
|
||||
iFolderWebProxy.cs: ../webservices/iFolderWeb.wsdl
|
||||
- wsdl /nologo /out:$@ $<
|
||||
+ wsdl2 /nologo /out:$@ $<
|
||||
|
||||
Novell.iFolderWeb.dll: $(srcdir)/AssemblyInfo.cs $(iFolderWeb_CSFILES) $(iFolderWeb_RESOURCES)
|
||||
$(CSC) /out:$@ $(CSCFLAGS) $(iFolderWeb_FLAGS) $(iFolderWeb_LIBS:%=/r:%) $(iFolderWeb_RESOURCES:%=/res:%) $(iFolderWeb_LIBPATH:%=/lib:%) $(LOG4NET_LIBS) $(iFolderWeb_CSFILES_CSC) /doc:iFolderWeb.doc.xml
|
||||
diff -uNr simias.orig/src/webservices/Makefile.am simias/src/webservices/Makefile.am
|
||||
--- simias.orig/src/webservices/Makefile.am 2009-04-06 11:02:59.966891195 +0200
|
||||
+++ simias/src/webservices/Makefile.am 2009-04-06 11:09:21.894426864 +0200
|
||||
@@ -101,10 +101,10 @@
|
||||
cp ../server/Simias.LdapProvider/Simias.LdapProvider.dll .
|
||||
|
||||
iFolderWebLocalProxy.cs: iFolderWebLocal.wsdl
|
||||
- wsdl /nologo /namespace:iFolder.WebService.Web /out:$@ $<
|
||||
+ wsdl2 /nologo /namespace:iFolder.WebService.Web /out:$@ $<
|
||||
|
||||
iFolderAdminLocalProxy.cs: iFolderAdminLocal.wsdl
|
||||
- wsdl /nologo /namespace:iFolder.WebService.Admin /out:$@ $<
|
||||
+ wsdl2 /nologo /namespace:iFolder.WebService.Admin /out:$@ $<
|
||||
|
||||
iFolderWebLocal.wsdl: copy iFolder.WebService.Local.dll GenerateWsdl.exe
|
||||
$(MONO) GenerateWsdl.exe iFolder.WebService.Local.dll iFolder.WebService.iFolderWebLocal http://127.0.0.1:8086/simias10/iFolderWebLocal.asmx $@
|
||||
|
|
@ -0,0 +1,41 @@
|
|||
diff -uNr simias.orig/src/server/setup/SimiasServerSetup.cs simias/src/server/setup/SimiasServerSetup.cs
|
||||
--- simias.orig/src/server/setup/SimiasServerSetup.cs 2009-04-06 20:02:53.607688672 +0200
|
||||
+++ simias/src/server/setup/SimiasServerSetup.cs 2009-04-06 20:05:04.892943722 +0200
|
||||
@@ -307,12 +307,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.
|
||||
@@ -2288,7 +2291,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 )
|
||||
@@ -2312,13 +2315,6 @@
|
||||
|
||||
string alias = "simias10";
|
||||
|
||||
- string mod_mono_path = "/etc/apache2/mod_mono.conf";
|
||||
- string mod_mono2_path = "/etc/apache2/conf.d/mod_mono.conf";
|
||||
- if( File.Exists( mod_mono2_path ))
|
||||
- writer.WriteLine( "Include {0}", mod_mono2_path );
|
||||
- else
|
||||
- writer.WriteLine( "Include {0}", mod_mono_path );
|
||||
- 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);
|
||||
|
|
@ -0,0 +1,80 @@
|
|||
diff -uNr simias.orig/Makefile.am simias/Makefile.am
|
||||
--- simias.orig/Makefile.am 2009-04-06 10:47:59.070799915 +0200
|
||||
+++ simias/Makefile.am 2009-04-06 10:49:36.281417403 +0200
|
||||
@@ -7,7 +7,7 @@
|
||||
rm -rf `find $(distdir) -name CVS`
|
||||
rm -rf `find $(distdir) -name ".svn"`
|
||||
|
||||
-EXTRA_DIST = ./iFolder.snk ./dependencies/external/tools/aclocal ./dependencies/external/tools/gsoap ./dependencies/external/libflaim ./dependencies/external/Mono.WebServer
|
||||
+EXTRA_DIST = ./iFolder.snk ./dependencies/external/tools/aclocal ./dependencies/external/libflaim ./dependencies/external/Mono.WebServer
|
||||
|
||||
all:
|
||||
|
||||
diff -uNr simias.orig/src/core/libsimias/Makefile.am simias/src/core/libsimias/Makefile.am
|
||||
--- simias.orig/src/core/libsimias/Makefile.am 2009-04-06 10:47:58.901816898 +0200
|
||||
+++ simias/src/core/libsimias/Makefile.am 2009-04-06 10:52:53.117582758 +0200
|
||||
@@ -6,7 +6,6 @@
|
||||
dist-hook:
|
||||
rm -rf `find $(distdir) |grep simiasClientLib.c`
|
||||
rm -rf `find $(distdir) |grep envC.c`
|
||||
- rm -rf `find $(distdir) |grep stdsoap2.c`
|
||||
|
||||
|
||||
lib_LTLIBRARIES = libsimias.la
|
||||
@@ -14,7 +13,7 @@
|
||||
override CFLAGS =
|
||||
|
||||
libsimias_la_SOURCES = \
|
||||
- envC.c simiasClientLib.c stdsoap2.c simias.c simias.h simiasweb.c simiasweb.h
|
||||
+ envC.c simiasClientLib.c simias.c simias.h simiasweb.c simiasweb.h
|
||||
|
||||
libsimias_la_CFLAGS = \
|
||||
$(XML2_CFLAGS) -DWITH_NONAMESPACES -DWITH_COOKIES
|
||||
@@ -22,19 +21,15 @@
|
||||
libsimias_la_LDFLAGS = \
|
||||
$(XML2_LIBS)
|
||||
|
||||
-envC.c: $(srcdir)/stdsoap2.c
|
||||
+envC.c:
|
||||
> $(srcdir)/env.h
|
||||
- $(GSOAP_PATH)/soapcpp2 -c -penv $(srcdir)/env.h
|
||||
+ soapcpp2 -c -penv $(srcdir)/env.h
|
||||
|
||||
-$(srcdir)/stdsoap2.c:
|
||||
- cp $(GSOAP_PATH)/stdsoap2.h $(srcdir)
|
||||
- cp $(GSOAP_PATH)/stdsoap2.c $(srcdir)
|
||||
-
|
||||
-$(srcdir)/libsimias.h: $(srcdir)/stdsoap2.c $(SIMIAS_WSDL)
|
||||
- $(GSOAP_PATH)/wsdl2h -c -o $@ $(SIMIAS_WSDL)
|
||||
+$(srcdir)/libsimias.h: $(SIMIAS_WSDL)
|
||||
+ wsdl2h -c -o $@ $(SIMIAS_WSDL)
|
||||
|
||||
$(srcdir)/simiasClientLib.c: $(srcdir)/libsimias.h
|
||||
- $(GSOAP_PATH)/soapcpp2 -c -n -psimias $(srcdir)/libsimias.h
|
||||
+ soapcpp2 -c -n -psimias $(srcdir)/libsimias.h
|
||||
|
||||
install-exec-hook:
|
||||
if !WINDOWS
|
||||
@@ -46,7 +41,6 @@
|
||||
$(mkinstalldirs) $(DESTDIR)$(includedir)
|
||||
$(INSTALL_PROGRAM) simiasStub.h $(DESTDIR)$(includedir)/simias
|
||||
$(INSTALL_PROGRAM) simias.nsmap $(DESTDIR)$(includedir)/simias
|
||||
- $(INSTALL_PROGRAM) stdsoap2.h $(DESTDIR)$(includedir)/simias
|
||||
$(INSTALL_PROGRAM) simiasH.h $(DESTDIR)$(includedir)/simias
|
||||
$(INSTALL_PROGRAM) simias.h $(DESTDIR)$(includedir)/simias
|
||||
$(INSTALL_PROGRAM) simiasweb.h $(DESTDIR)$(includedir)/simias
|
||||
@@ -54,13 +48,12 @@
|
||||
uninstall-local:
|
||||
rm -f $(DESTDIR)$(includedir)/simias/simiasStub.h
|
||||
rm -f $(DESTDIR)$(includedir)/simias/simias.nsmap
|
||||
- rm -f $(DESTDIR)$(includedir)/simias/stdsoap2.h
|
||||
rm -f $(DESTDIR)$(includedir)/simias/simiasH.h
|
||||
rm -f $(DESTDIR)$(includedir)/simias/simias.h
|
||||
rm -f $(DESTDIR)$(includedir)/simias/simiasweb.h
|
||||
|
||||
clean-local:
|
||||
- rm -f stdsoap2.* *.xml simias.nsmap simiasC* simiasH* simiasS* env* soap*
|
||||
+ rm -f *.xml simias.nsmap simiasC* simiasH* simiasS* env* soap*
|
||||
rm -rf $(COMMON_CLEAN_FILES)
|
||||
|
||||
distclean-local:
|
||||
|
|
@ -0,0 +1,143 @@
|
|||
# Copyright 1999-2009 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="2"
|
||||
WANT_AUTOMAKE=1.9
|
||||
|
||||
ESVN_REPO_URI="https://forgesvn1.novell.com/svn/simias/trunk/@${PV/3.7_pre/}"
|
||||
inherit autotools eutils mono subversion
|
||||
|
||||
DESCRIPTION="Enterprise backend for iFolder"
|
||||
HOMEPAGE="http://www.ifolder.com/"
|
||||
#SRC_URI="http://distfiles.one-gear.com/distfiles/ifolder${PV:0:1}-server-${PV}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~x86 ~ppc ~amd64"
|
||||
RESTRICT="mirror"
|
||||
|
||||
DEPEND="!net-misc/simias
|
||||
>=dev-lang/mono-2.2
|
||||
>=dev-db/libflaim-4.9.617
|
||||
>=dev-dotnet/log4net-1.2.9
|
||||
>=www-apache/mod_mono-1.2.1
|
||||
>=net-libs/gsoap-2.7.12
|
||||
sys-fs/e2fsprogs"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
S=${WORKDIR}/simias
|
||||
MAKEOPTS="-j1"
|
||||
|
||||
simiasdatadir="${ROOT}var/lib/simias"
|
||||
gentoo_config_dir="${ROOT}etc/simias/apache/gentoo"
|
||||
logdir="${ROOT}var/log/ifolder3"
|
||||
DEVNULL=/dev/null
|
||||
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/configure.in-xsp-check-by-dl9pf-version3.diff
|
||||
epatch "${FILESDIR}"/simias-libtool22-1.patch
|
||||
epatch "${FILESDIR}"/simias-1.8-mono22-1.patch
|
||||
epatch "${FILESDIR}"/simias-mononamespace.dpatch
|
||||
# epatch "${FILESDIR}"/simias-etc_use_destdir.dpatch
|
||||
# epatch "${FILESDIR}"/simias-bash.dpatch
|
||||
# epatch "${FILESDIR}"/simias_make_gcc43_happy.diff
|
||||
epatch "${FILESDIR}"/simias-libflaim_shared-1.patch
|
||||
epatch "${FILESDIR}"/simias-1.8.use_system_gsoap.patch
|
||||
# epatch "${FILESDIR}"/gsoap-2.7.12.patch
|
||||
# epatch "${FILESDIR}"/simias-recovery_agent-fix-1.patch
|
||||
#Patch the path of mod_mono.conf
|
||||
# epatch ${FILESDIR}/${PN}-mod_mono-path.patch
|
||||
# epatch ${FILESDIR}/${PN}-apache-rights.patch
|
||||
# epatch ${FILESDIR}/${PN}-simias-server-setup.patch
|
||||
|
||||
epatch ${FILESDIR}/new_mod_mono.diff
|
||||
epatch ${FILESDIR}/ifolder-3.7-admin-setup.diff
|
||||
epatch ${FILESDIR}/ifolder-apache-conf.diff
|
||||
epatch ${FILESDIR}/ifolder-3.7-web-setup.diff
|
||||
epatch ${FILESDIR}/simias-1.8-server-setup.diff
|
||||
# epatch ${FILESDIR}/no_write_to_etc_during_install.diff
|
||||
epatch ${FILESDIR}/new_default_simias.config.diff
|
||||
# epatch ${FILESDIR}/flex_in_lib64.diff
|
||||
# epatch ${FILESDIR}/${PN}-simias-server-setup.patch
|
||||
eautoreconf || die "eautoreconf failed"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf --with-runasserver --with-simiasdatadir=${simiasdatadir} || die "configure failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
|
||||
make DESTDIR=${D} install || die "Error install ${PN}"
|
||||
dodir "${simiasdatadir}"
|
||||
keepdir "${simiasdatadir}"
|
||||
# dodir "${logdir}"
|
||||
# keepdir "${logdir}"
|
||||
dodir "${gentoo_config_dir}"
|
||||
|
||||
# if [[ ! -f ${simiasdatadir}/Simias.config ]];then
|
||||
# einfo "It appears you have never setup iFolder"
|
||||
# einfo "Extracting setup-files to ${simiasdatadir}"
|
||||
# tar -zxvf ${FILESDIR}/setup-files.tar.gz -C ${D}/${simiasdatadir}
|
||||
# fi
|
||||
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
|
||||
|
||||
echo ""
|
||||
ewarn "Please edit ${ROOT}etc/apache2/httpd.conf and add the following line"
|
||||
ewarn "at the bottom of the file after Include ${ROOT}etc/apache2/vhosts.d/*.conf"
|
||||
ewarn "Include /etc/simias/apache/*.conf"
|
||||
echo ""
|
||||
ewarn "You MUST add \"-D MONO\" to APACHE2_OPTS in /etc/conf.d/apache2"
|
||||
echo ""
|
||||
# ewarn "You can check by running ps aux | grep mono"
|
||||
# ewarn "Remember, your default admin credentials are: admin:novell"
|
||||
echo ""
|
||||
ewarn "You must run emerge --config ifolder-server now"
|
||||
ewarn "to complete the install if this is the first time"
|
||||
ewarn "you have installed the server"
|
||||
# ewarn "Please edit ${simiasdatadir}/Simias.config now to change your administrative"
|
||||
# ewarn "username and password if desired and to set the name and description of your new iFolder server."
|
||||
# ewarn "You must also edit the \"PublicAddress\" and \"PrivateAddress\""
|
||||
# ewarn "settings to match your environment!"
|
||||
echo ""
|
||||
ewarn "Visit http://www.ifolder.com/index.php/HowTo:Building_iFolder_Enterprise_Server_on_Gentoo"
|
||||
ewarn "for more information"
|
||||
# echo ""
|
||||
# ewarn "Please login to http://localhost/admin/ in order to initialize the db"
|
||||
# ewarn "if this is the first time running the server"
|
||||
|
||||
}
|
||||
|
||||
pkg_config(){
|
||||
|
||||
ewarn "Remember that ${PN} runs behind apache"
|
||||
ewarn "therefore give appropriate urls when running this"
|
||||
ewarn "script. Specifically with regards to ports"
|
||||
ewarn "ie: use \"http://localhost\""
|
||||
ewarn "do not use \"http://localhost:8086\""
|
||||
echo ""
|
||||
|
||||
simias-server-setup --apache --path=${simiasdatadir} --prompt
|
||||
chown -R apache:apache "${simiasdatadir}"
|
||||
|
||||
ifolder-admin-setup
|
||||
ifolder-web-setup
|
||||
|
||||
echo ""
|
||||
einfo "Congratulations, configuration complete!"
|
||||
ewarn "Now login to http://<server>/admin/"
|
||||
ewarn "to initialize the database and create users"
|
||||
ewarn "if this is the first time running the server"
|
||||
ewarn "After you have created users you can login"
|
||||
ewarn "to the web interface by visiting"
|
||||
ewarn "http://<server>/ifolder/"
|
||||
echo ""
|
||||
ewarn "Do NOT use epiphany"
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue