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

www-apps/ifolder-server: Bump revision

Browse Source 
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/ifolder@1131 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one 2009-04-20 06:30:56 +00:00
parent e2f801ccf5
commit ac4e377d80
8 changed files with 513 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
www-apps/ifolder-server/ChangeLog
View File

@ -2,6 +2,16 @@
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
* ifolder-server-3.7_pre7049 (20 Apr 2009)
20 Apr 2009; Mario Fetka <mario.fetka@gmail.com>
+files/simias-1.8-server-setup-1.diff,
+files/simias-1.8-use_system_gsoap-2.patch,
+files/ifolder-3.7-admin-setup-1.diff,
+files/ifolder-3.7-web-setup-1.diff, +files/WSDLPATCH.diff,
ifolder-server-3.7_pre7049:
Bump revision
13 Apr 2009; Mario Fetka <mario.fetka@gmail.com>
+files/simias-1.8-mono22-2.patch, ifolder-server-3.7_pre7021.ebuild:
Bump mono 2.2 patch

8
www-apps/ifolder-server/Manifest
View File

@ -1,3 +1,4 @@
AUX WSDLPATCH.diff 4742 RMD160 b06875e1856e945d42f6551f767d76ab339e5f60 SHA1 5d1b11fce97b6a9401c4ce41cd9f58e8742bc507 SHA256 b40336de7783eb824e17cb3f37862a7a9c46a7c342992d659bbad5bffcd1645b
AUX configure.in-xsp-check-by-dl9pf-version3.diff 3030 RMD160 2ffd1183ae56b2b9389bb5fc366ae4f2b74006f9 SHA1 9e5c6e5eb9e38f7c131d0a8aac49e3cebff89093 SHA256 f241ff570abf445a1839b7dbb28b097010524a91e9a361336f25f8b2207eb738
AUX flex_in_lib64.diff 435 RMD160 c884f5b5b8b11fbbde50efe0f33ecc14b9c7c7aa SHA1 362b8742f0f69bfabd7bd1b1ba0a8b55615ca4a5 SHA256 a8e62c614c07189ad8b4c5dd5c52ee9748a0fbb0f1aade12e3570669a4ca30cc
AUX gsoap-2.7.12.patch 1227 RMD160 499766eab20663e54a0cb0b688754dbed036599d SHA1 4ff03ebfd78add128d9a7801c1b53e6e86a5f2eb SHA256 964f67598407884ac77f9ecf741f5456b36ad0acb33684e01ac945b06175c915
@ -5,7 +6,9 @@ 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-1.diff 3109 RMD160 c7bba0877accd64923c9b5d6526ecb89f14baa28 SHA1 5ffd3362512d7c7186cbca2f062531f9264228ad SHA256 337092e6d940b629567893b5abbbc1792ce20325966321bb0f6979251bd9f130
AUX ifolder-3.7-admin-setup.diff 2042 RMD160 afae167e940d7ce24df7074d6d8eda039444d3bb SHA1 61f226215ce1e55d557867bff39f99ea80a3c392 SHA256 9574ab052a460779f10fdadfaac687175578999a11d5af57329f7f2bdfc405bf
AUX ifolder-3.7-web-setup-1.diff 3111 RMD160 f1aa396d21af1f385599ae780e2a2e4e64109eb8 SHA1 9c1d71497bd7c6fc447054da073efaea70cd060c SHA256 f156a1d706c04fc1cde56c4af21e01c3b8258d92071e83aff72c943de5ffb04c
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
@ -21,7 +24,9 @@ AUX setup-files.tar.gz 1104 RMD160 a1e0abc2dc43b168267d1b0c79b450ce7bd66011 SHA1
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-mono22-2.patch 7676 RMD160 0bef41dfea10ced43fb8b84cc727dd08b7593e30 SHA1 37fe4586026cb98873697a4bb965e55dd17ed7a4 SHA256 ace9c67f7260e68f1f2fe96fa1ee9af1680442e86462d5b271095f3d55c543d9
AUX simias-1.8-server-setup-1.diff 2383 RMD160 a62a76a5c755ffbfdf0615bfc2fb2adccf1c4e1f SHA1 8f19357b150a000c6090ebed8831fcabe7ba2bac SHA256 405a734a85f2cc2148cba11cca6f318ac4a4bd25c7fab0006516435a8b24a439
AUX simias-1.8-server-setup.diff 1840 RMD160 b5f648fe50ff9cee4a0053eb6929d28362c0707f SHA1 27fb693f52d8d259eedc7867eaec262233bbf897 SHA256 5af21b3c71a507e5def0cbaf0aba0ebaf1be4eadb665bc62eb22c313ebb343e6
AUX simias-1.8-use_system_gsoap-2.patch 2431 RMD160 17bbd1ba7db59b2b83f79a4dfb9801a860c585bc SHA1 eec1afc346bbcce296e8118eae20771315a38636 SHA256 f76e52c10107e62ef71f249d291a82b56fb13a5217c494ea2b48ac6267d2a549
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
@ -37,5 +42,6 @@ AUX webaccess-browse.patch 1001 RMD160 6262f046567d6736fb4193913cc4b4d0bb764792
DIST ifolder3-server-3.6.7303.1.tar.gz 19986658 RMD160 703f38b730c0dc59f77b1c55e83bb864008d45cf SHA1 329d128772c09ac7facff6d3b9e23989c8a1b972 SHA256 a047e14b5bf7235c83b0fe706a0bb05f69319887e49b9176b2c373c1e409ba55
EBUILD ifolder-server-3.6.7303.1-r3.ebuild 4571 RMD160 2012675d768bacc2f49ce26185312a35f2b37a58 SHA1 daedd1558a81b5c82026f854529b551a8e7ac328 SHA256 86da153aa4fd47f9391251e5ac59a718f30ff0d66015f3f4df166165d2a24139
EBUILD ifolder-server-3.7_pre7021.ebuild 4683 RMD160 32765ca02d315b7b75e9b90ec303e1bccdb77009 SHA1 735f8a4f7b22e8c0aa57d537bdb847d605474c3e SHA256 3f06675d83cd6b33a270595b8fbee69761654588d1126861151b8a9d9157c988
MISC ChangeLog 2157 RMD160 aa9273a6ab20837a9086361cc9d4aca093fba04f SHA1 a76a1d278ac2d357553ef1a9f08e05677f0f8e21 SHA256 15957a30d07f972227bb2bd76de8cb2393138ae8fb5816a45c4ea67c8015c14c
EBUILD ifolder-server-3.7_pre7049.ebuild 4732 RMD160 2b3e98528b76ff27c6074334525a0091e0d78d74 SHA1 43452722d362ed89c15f1138a3c466c910a05284 SHA256 4f200f067ee6de76c32798fadc96377514099ef94cb7c93c917faca2240758be
MISC ChangeLog 2489 RMD160 99f7a6b0ee64bb0121fae1670162c5d294b7e468 SHA1 ab3cea4637cb118237fc6880d03c09ab4cc65bb8 SHA256 2966de8d16650d0d40eb824c802b9b7ff55087f40ffa2f0acd6dea2e177c9bbb
MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

105
www-apps/ifolder-server/files/WSDLPATCH.diff Normal file
View File

@ -0,0 +1,105 @@
Index: configure.in
===================================================================
--- configure.in (Revision 7049)
+++ configure.in (Arbeitskopie)
@@ -438,7 +438,8 @@
# Setup the bootstrapdir
#
-etcdir="/etc"
+#etcdir="/etc"
+etcdir="${sysconfdir}"
AC_SUBST(etcdir)
case $SIMIAS_OS in
Index: src/webaccess/Makefile.am
===================================================================
--- src/webaccess/Makefile.am (Revision 7049)
+++ src/webaccess/Makefile.am (Arbeitskopie)
@@ -121,7 +121,7 @@
all: Novell.iFolderWeb.dll
iFolderWebProxy.cs: ../webservices/iFolderWeb.wsdl
- wsdl /nologo /out:$@ $<
+ $(WSDL) /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
Index: src/utils/usercmd/Makefile.am
===================================================================
--- src/utils/usercmd/Makefile.am (Revision 7049)
+++ src/utils/usercmd/Makefile.am (Arbeitskopie)
@@ -34,7 +34,7 @@
all: UserCmd.exe
AdminService.cs: ../../webservices/iFolderAdmin.wsdl
- wsdl /nologo /out:$@ $<
+ $(WSDL) /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)
Index: src/webservices/Makefile.am
===================================================================
--- src/webservices/Makefile.am (Revision 7049)
+++ src/webservices/Makefile.am (Arbeitskopie)
@@ -101,10 +101,10 @@
cp ../server/Simias.LdapProvider/Simias.LdapProvider.dll .
iFolderWebLocalProxy.cs: iFolderWebLocal.wsdl
- wsdl /nologo /namespace:iFolder.WebService.Web /out:$@ $<
+ $(WSDL) /nologo /namespace:iFolder.WebService.Web /out:$@ $<
iFolderAdminLocalProxy.cs: iFolderAdminLocal.wsdl
- wsdl /nologo /namespace:iFolder.WebService.Admin /out:$@ $<
+ $(WSDL) /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 $@
Index: src/admin/Makefile.am
===================================================================
--- src/admin/Makefile.am (Revision 7049)
+++ src/admin/Makefile.am (Arbeitskopie)
@@ -141,7 +141,7 @@
all: Novell.iFolderAdmin.dll
iFolderAdminWebProxy.cs: ../webservices/iFolderAdmin.wsdl
- wsdl /nologo /out:$@ $<
+ $(WSDL) /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)
Index: src/core/SimiasClient/Makefile.am
===================================================================
--- src/core/SimiasClient/Makefile.am (Revision 7049)
+++ src/core/SimiasClient/Makefile.am (Arbeitskopie)
@@ -38,7 +38,7 @@
wsdl /out:SimiasService.cs $(srcdir)/../WebService/Simias.wsdl
endif
if LINUX
- -$(WSDL) -nologo -out:SimiasService.cs $(srcdir)/../WebService/Simias.wsdl
+ $(WSDL) -nologo -out:SimiasService.cs $(srcdir)/../WebService/Simias.wsdl
endif
if DARWIN
wsdl -nologo -out:SimiasService.cs $(srcdir)/../WebService/Simias.wsdl
@@ -46,7 +46,7 @@
$(srcdir)/SimiasService2.cs: $(srcdir)/../WebService/Simias.wsdl
if LINUX
- wsdl -nologo -out:SimiasService2.cs $(srcdir)/../WebService/Simias.wsdl
+ $(WSDL) -nologo -out:SimiasService2.cs $(srcdir)/../WebService/Simias.wsdl
$(WSDL) -nologo -out:SimiasService.cs $(srcdir)/../WebService/Simias.wsdl
endif
Index: src/reports/Proxy/Makefile.am
===================================================================
--- src/reports/Proxy/Makefile.am (Revision 7049)
+++ src/reports/Proxy/Makefile.am (Arbeitskopie)
@@ -28,7 +28,7 @@
all: Novell.iFolder.Enterprise.Reports.Proxy.dll
iFolderReportsProxy.cs: ../WebService/iFolderReports.wsdl
- wsdl /nologo /out:$@ $<
+ $(WSDL) /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

63
www-apps/ifolder-server/files/ifolder-3.7-admin-setup-1.diff Normal file
View File

@ -0,0 +1,63 @@
diff -uNr simias.orig/src/server/setup/iFolderAdminSetup.cs simias/src/server/setup/iFolderAdminSetup.cs
--- simias.orig/src/server/setup/iFolderAdminSetup.cs 2009-04-20 07:50:52.102027111 +0200
+++ simias/src/server/setup/iFolderAdminSetup.cs 2009-04-20 08:05:06.621986960 +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.
@@ -150,7 +150,7 @@
string MachineArch = Environment.GetEnvironmentVariable("OS_ARCH");
webPath =( MachineArch == null )? Path.GetFullPath("../lib/simias/admin"): Path.GetFullPath("../lib64/simias/admin");
// uid.conf
- string path = Path.GetFullPath("/etc/apache2/uid.conf");
+ string path = Path.GetFullPath("/etc/apache2/httpd.conf");
TextReader reader = (TextReader)File.OpenText(path);
@@ -365,7 +365,7 @@
/// </summary>
string ReadModMonoConfiguration()
{
- string path = Path.GetFullPath( "/etc/apache2/conf.d/simias.conf" );
+ string path = Path.GetFullPath( "/etc/simias/apache/gentoo/ifolder_admin.conf" );
string dataPath = null;
if ( path == null || File.Exists( path ) == false )
return null;
@@ -400,7 +400,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");
@@ -434,17 +434,6 @@
{
sslPrefix = "#";
}
- if( Mono2TreePath != null )
- writer.WriteLine( "Include {0}", Path.GetFullPath( Path.Combine(Mono2TreePath, "bin/mod_mono.conf")) );
- else
- {
- 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}", "/etc/apache2/mod_mono.conf" );
- }
- writer.WriteLine();
writer.WriteLine("Alias /{0} \"{1}\"", alias, webPath);
writer.WriteLine("AddMonoApplications {0} \"/{0}:{1}\"", alias, webPath);

62
www-apps/ifolder-server/files/ifolder-3.7-web-setup-1.diff Normal file
View File

@ -0,0 +1,62 @@
diff -uNr simias.orig/src/server/setup/iFolderWebSetup.cs simias/src/server/setup/iFolderWebSetup.cs
--- simias.orig/src/server/setup/iFolderWebSetup.cs 2009-04-20 08:09:10.061712198 +0200
+++ simias/src/server/setup/iFolderWebSetup.cs 2009-04-20 08:12:20.265928077 +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.
@@ -150,7 +150,7 @@
string MachineArch = Environment.GetEnvironmentVariable("OS_ARCH");
webPath = (MachineArch == null) ? Path.GetFullPath("../lib/simias/webaccess"): Path.GetFullPath("../lib64/simias/webaccess");
// uid.conf
- string path = Path.GetFullPath("/etc/apache2/uid.conf");
+ string path = Path.GetFullPath("/etc/apache2/httpd.conf");
TextReader reader = (TextReader)File.OpenText(path);
@@ -379,7 +379,7 @@
/// </summary>
string ReadModMonoConfiguration()
{
- string path = Path.GetFullPath( "/etc/apache2/conf.d/simias.conf" );
+ string path = Path.GetFullPath( "/etc/simias/apache/gentoo/simias.conf" );
string dataPath = null;
if ( path == null || File.Exists( path ) == false )
return null;
@@ -415,7 +415,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");
@@ -449,16 +449,6 @@
{
sslPrefix = "#";
}
- if( Mono2TreePath != null )
- writer.WriteLine( "Include {0}", Path.GetFullPath( Path.Combine(Mono2TreePath, "bin/mod_mono.conf")) );
- else
- {
- 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}", "/etc/apache2/mod_mono.conf" );
- }
writer.WriteLine();
writer.WriteLine("Alias /{0} \"{1}\"", alias, webPath);
writer.WriteLine("AddMonoApplications {0} \"/{0}:{1}\"", alias, webPath);

54
www-apps/ifolder-server/files/simias-1.8-server-setup-1.diff Normal file
View File

@ -0,0 +1,54 @@
diff -uNr simias.orig/src/server/setup/SimiasServerSetup.cs simias/src/server/setup/SimiasServerSetup.cs
--- simias.orig/src/server/setup/SimiasServerSetup.cs 2009-04-20 08:15:08.228832251 +0200
+++ simias/src/server/setup/SimiasServerSetup.cs 2009-04-20 08:19:45.906975519 +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.
@@ -892,7 +892,7 @@
try
{
// uid.conf
- using( TextReader reader = (TextReader)File.OpenText( Path.GetFullPath( "/etc/apache2/uid.conf" ) ) )
+ using( TextReader reader = (TextReader)File.OpenText( Path.GetFullPath( "/etc/apache2/httpd.conf" ) ) )
{
string line;
while( ( line = reader.ReadLine() ) != null )
@@ -2288,7 +2288,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);
string Mono2TreePath = Environment.GetEnvironmentVariable("LOCAL_MONO_RUNTIME_PATH");
@@ -2312,17 +2312,6 @@
*/
string alias = "simias10";
- if( Mono2TreePath != null )
- writer.WriteLine( "Include {0}", Path.GetFullPath( Path.Combine(Mono2TreePath, "bin/mod_mono.conf")) );
- else
- {
- 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}", "/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);

68
www-apps/ifolder-server/files/simias-1.8-use_system_gsoap-2.patch Normal file
View File

@ -0,0 +1,68 @@
diff -uNr simias.orig/src/core/libsimias/Makefile.am simias/src/core/libsimias/Makefile.am
--- simias.orig/src/core/libsimias/Makefile.am 2009-04-19 18:28:33.292587761 +0200
+++ simias/src/core/libsimias/Makefile.am 2009-04-19 18:31:32.025741548 +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:

144
www-apps/ifolder-server/ifolder-server-3.7_pre7049.ebuild Normal file
View File

@ -0,0 +1,144 @@
# 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 ~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}"/WSDLPATCH.diff
# epatch "${FILESDIR}"/configure.in-xsp-check-by-dl9pf-version3.diff
# epatch "${FILESDIR}"/simias-libtool22-1.patch
# epatch "${FILESDIR}"/simias-1.8-mono22-2.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-2.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-1.diff
epatch ${FILESDIR}/ifolder-apache-conf.diff
epatch ${FILESDIR}/ifolder-3.7-web-setup-1.diff
epatch ${FILESDIR}/simias-1.8-server-setup-1.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"
}