diff --git a/www-apps/ifolder3-enterprise/ChangeLog b/www-apps/ifolder3-enterprise/ChangeLog index c3d185c..66ebd80 100644 --- a/www-apps/ifolder3-enterprise/ChangeLog +++ b/www-apps/ifolder3-enterprise/ChangeLog @@ -2,6 +2,16 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 05 Dec 2009; Mario Fetka + +files/simias-1.8.3-server-setup-1.diff, +files/simias-1.8-mono22-4.patch, + -ifolder-server-3.6.7303.1-r3.ebuild, -ifolder-server-3.7_pre7021.ebuild, + -ifolder-server-3.7_pre7049.ebuild, -ifolder-server-3.7_pre7061.ebuild, + +ifolder3-enterprise-3.8_pre7061.ebuild, + +files/ifolder-3.8-admin-setup-1.diff, + +ifolder3-enterprise-3.8.0.9328.1.ebuild, + +files/ifolder-3.8-web-setup-1.diff: + Bump even with flaimdb erros + *ifolder-server-3.7_pre7061 (30 Apr 2009) 30 Apr 2009; Mario Fetka +files/WSDLPATCH-1.diff, diff --git a/www-apps/ifolder3-enterprise/Manifest b/www-apps/ifolder3-enterprise/Manifest index 5b9e1b8..935399e 100644 --- a/www-apps/ifolder3-enterprise/Manifest +++ b/www-apps/ifolder3-enterprise/Manifest @@ -11,6 +11,8 @@ AUX ifolder-3.7-admin-setup-1.diff 3109 RMD160 c7bba0877accd64923c9b5d6526ecb89f 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-3.8-admin-setup-1.diff 2928 RMD160 f7bb75d80cda0d28ec5043711ca5d38af5f6c1ef SHA1 5179d28be17d12d10e3f20fd4e87417cab880a7c SHA256 8ff42c0748ba155863837844c4f83d88874d8cac8349fa5443a22a959de9ebd6 +AUX ifolder-3.8-web-setup-1.diff 3035 RMD160 41a5c633ed2228e7b099865a491c5d9614042542 SHA1 0db2e6085d9a44c3a06d41ac2ded8dd7d4d83b32 SHA256 694615231878330c5155032f013ec4ae212fc3bb09878ab9945a0cdc690f4eb6 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 @@ -26,9 +28,11 @@ AUX simias-1.6.use_system_gsoap.patch 2922 RMD160 ec4bb9da8a3a0eab08ac36b4dc9d5c 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-mono22-3.patch 1371 RMD160 07223bd3ff49b33a61e5460e76e1109e6a9ae5b4 SHA1 d84821690f1a256b9e3a4db60e6c5674715d657b SHA256 d9d9cc4d2c9b71a9b6febbbea62a7b4acd6e25d768340a28b664b3e4734d3dbe +AUX simias-1.8-mono22-4.patch 1306 RMD160 5eb17a2661953671ba9b9f142a747bfc47acca92 SHA1 e7181aa25814457a4e85b38667f99b06c239d2cc SHA256 03892c1cba2b23e4f705783e34e7f67bb5a2c7a146bee14280d427c9456e04c2 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.3-server-setup-1.diff 2706 RMD160 6cf51563434889a8d6f2252714776cc8c6d7502d SHA1 43f78ae25feed6795404b448500aefe4eea8ef99 SHA256 836e9665893a4d99b4cbbe650b24f4a3357f50aadfb485e47bcf54d5e32350b8 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 @@ -39,12 +43,11 @@ AUX simias-mono22-1.patch 9708 RMD160 527169ab20c88847a8604ba6b5c6d79063fb1392 S AUX simias-mononamespace.dpatch 738 RMD160 57d65758f50a5f2efa1fa097cf899024f28ccd12 SHA1 8a3449fb7bfd7518cbd8050cc6cdeab59c4e8464 SHA256 d88f6096b603410d6235442d95b295d257ebd902203cbaf74e62a663efc2418c AUX simias-recovery_agent-fix-1.patch 682 RMD160 f4faf06f1f00d660f31bfc18951dcdb9cc7c1f72 SHA1 3a5a9844bbbba6c5596826acf3905e19567ab08c SHA256 f4e1d4f58c9ae4eefbad75345d47a592399bc7f14f44dff5357266080fa6934c AUX simias-server-setup.diff 1071 RMD160 d8befc86eb4ebf8230bb28e54a677d21523bc6c9 SHA1 0e99938a4c2e2045ccef4ddfa86e3adcb2a345aa SHA256 f02a5d3cf6430d546b5971d62c08469ca9e6ab4910c074d3bb5e53b2044cf741 +AUX simias-trunk_mod_rewrite-and-mods-enabled.patch 1727 RMD160 06ddc3f3fffc38ea1dc8d2549895062fd3ecd493 SHA1 778ab2514fc034f7777c47808c7a430f7d766422 SHA256 f4fca1e695a167d9544b66a1c89b0570d712b8e2bd7c23d9d2ce2707c3783ec3 AUX simias_make_gcc43_happy.diff 1296 RMD160 11d3abf250e494744a534bac0af2dde451248942 SHA1 45c5e8aa305664caa302cab9b5cbaa8590689d2d SHA256 667df49faa48bde3b4cb76fee38af01965c226af15ddd34b9bfe8083c05adb8b AUX webaccess-browse.patch 1001 RMD160 6262f046567d6736fb4193913cc4b4d0bb764792 SHA1 e33cb643b63ded940f9029fe7a79d3accf800450 SHA256 8517e52d6ac974de169fafe01705e1f9a6b8834b2f493ef485477398029b2353 -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 -EBUILD ifolder-server-3.7_pre7049.ebuild 4731 RMD160 675ec5263409f6e0dc2f6060860bd6b59dc9cf91 SHA1 dcc316237eefdb23d2a5e22f7d0e00c3c5e6f6d7 SHA256 daaf394608a8093e5a3dc11ddef53d80f02fc755b900eec5be84f0919d101875 -EBUILD ifolder-server-3.7_pre7061.ebuild 4733 RMD160 d161aa4ee61f333664585f388255966a53d7a607 SHA1 cdad82e03a4964691f16ba8e04937135b9d454cb SHA256 82c0b68fed8bcf34ab865ad4a0822b76366c707342d3c6e88f4071f2242536a1 -MISC ChangeLog 2798 RMD160 501818446e41ca19a4477dcc22f6d7ba615fe8fc SHA1 51488cbc2565f7c3777ae6fba4cc7c669214917b SHA256 5054c50f5763f7aa633bdcdcaeacc65c06367dd4ad6c58b9f7031f880c3c66a3 +DIST ifolder3-enterprise-3.8.0.9328.1.tar.gz 27781830 RMD160 f8fdf3b849ea6f2e7196506ea438cfb1000d67dc SHA1 25d64d084b87e402c66ba1891cf7605cdfe75a01 SHA256 f6230570b94e762b7bb45964b7a12bf215cffd9c2edb7444053739c53b39c9dc +EBUILD ifolder3-enterprise-3.8.0.9328.1.ebuild 4719 RMD160 5a67506b62d70e5af0556946f2a5bbcb9fcbe912 SHA1 afeffb3374458fb51df32342985b76852baab1f0 SHA256 78222d70ab5d72f94c81c9fbb7a275fcbb769a598a10e30aca0cd0f156d876b6 +EBUILD ifolder3-enterprise-3.8_pre7061.ebuild 4733 RMD160 4f5146ffff9f4679b949762b8adb873105c3503f SHA1 9804a9ab487f1e78db9fe99a28cabaf7023bf552 SHA256 2fe29bf2293839b6595d97b65c64c76c350afd69999454bd86c3c9d6dcd95f8c +MISC ChangeLog 3275 RMD160 d970195df8116750eba1a010fd4feba533b1e0fa SHA1 9490c24d1eed080594c7fe5ee3f14072a2120d28 SHA256 23706b9243afe39cbea64f57c0b451a674b5c9a6d1699494e27c534c8f89c535 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 diff --git a/www-apps/ifolder3-enterprise/files/ifolder-3.8-admin-setup-1.diff b/www-apps/ifolder3-enterprise/files/ifolder-3.8-admin-setup-1.diff new file mode 100644 index 0000000..e1c5245 --- /dev/null +++ b/www-apps/ifolder3-enterprise/files/ifolder-3.8-admin-setup-1.diff @@ -0,0 +1,61 @@ +diff -uNr ifolder3-enterprise.orig/src/server/setup/iFolderAdminSetup.cs ifolder3-enterprise/src/server/setup/iFolderAdminSetup.cs +--- ifolder3-enterprise.orig/src/server/setup/iFolderAdminSetup.cs 2009-12-05 18:47:48.574532375 +0100 ++++ ifolder3-enterprise/src/server/setup/iFolderAdminSetup.cs 2009-12-05 18:55:04.228283615 +0100 +@@ -99,12 +99,12 @@ + /// + /// Apache User. + /// +- 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"); + + /// + /// Apache Group. + /// +- 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"); + + /// + /// 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 @@ + /// + 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 @@ + /// + void SetupModMono() + { +- string path = "/etc/apache2/conf.d/ifolder_admin.conf"; ++ string path = "/etc/simias/apache/gentoo/ifolder_admin.conf"; + string datapath = ReadModMonoConfiguration(); + + +@@ -434,6 +434,7 @@ + { + sslPrefix = "#"; + } ++ /* + if( iFolderMonoPath != null ) + writer.WriteLine( "Include {0}{1}", iFolderMonoPath, "/etc/apache2/conf.d//mod_mono.conf" ); + else +@@ -445,6 +446,7 @@ + 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); + diff --git a/www-apps/ifolder3-enterprise/files/ifolder-3.8-web-setup-1.diff b/www-apps/ifolder3-enterprise/files/ifolder-3.8-web-setup-1.diff new file mode 100644 index 0000000..38648f8 --- /dev/null +++ b/www-apps/ifolder3-enterprise/files/ifolder-3.8-web-setup-1.diff @@ -0,0 +1,61 @@ +diff -uNr ifolder3-enterprise.orig/src/server/setup/iFolderWebSetup.cs ifolder3-enterprise/src/server/setup/iFolderWebSetup.cs +--- ifolder3-enterprise.orig/src/server/setup/iFolderWebSetup.cs 2009-12-05 18:59:49.630531925 +0100 ++++ ifolder3-enterprise/src/server/setup/iFolderWebSetup.cs 2009-12-05 19:01:02.821283510 +0100 +@@ -99,12 +99,12 @@ + /// + /// Apache User. + /// +- 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"); + + /// + /// Apache Group. + /// +- 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"); + + /// + /// 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 @@ + /// + 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 @@ + /// + void SetupModMono() + { +- string path = "/etc/apache2/conf.d/ifolder_web.conf"; ++ string path = "/etc/simias/apache/gentoo/ifolder_web.conf"; + string datapath = ReadModMonoConfiguration(); + + +@@ -449,6 +449,7 @@ + { + sslPrefix = "#"; + } ++ /* + if( iFolderMonoPath != null ) + writer.WriteLine( "Include {0}{1}", iFolderMonoPath, "/etc/apache2/conf.d/mod_mono.conf" ); + else +@@ -460,6 +461,7 @@ + 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); + //if (logoutUrl.Value != String.Empty || logoutUrl.Value.Trim () != "" ) diff --git a/www-apps/ifolder3-enterprise/files/simias-1.8-mono22-4.patch b/www-apps/ifolder3-enterprise/files/simias-1.8-mono22-4.patch new file mode 100644 index 0000000..112cc94 --- /dev/null +++ b/www-apps/ifolder3-enterprise/files/simias-1.8-mono22-4.patch @@ -0,0 +1,38 @@ +diff -uNr simias.orig/configure.in simias/configure.in +--- simias.orig/configure.in 2009-07-25 01:01:14.788228670 +0200 ++++ simias/configure.in 2009-07-25 01:03:19.218740035 +0200 +@@ -32,15 +32,15 @@ + linux*) + SIMIAS_OS='linux' + if test "$runasclient" = "TRUE"; then +- AC_CHECK_PROG(CSC, mcs, mcs) +- AC_CHECK_PROG(WSDL, wsdl1, wsdl1,wsdl) ++ AC_CHECK_PROG(CSC, gmcs, gmcs) ++ AC_CHECK_PROG(WSDL, wsdl2, wsdl2,wsdl) + else + AC_CHECK_PROG(WSDL, wsdl, wsdl,wsdl) + if pkg-config --atleast-version=2.4 mono > /dev/null 2>&1 + then + AC_CHECK_PROG(CSC, gmcs, gmcs) + else +- AC_CHECK_PROG(CSC, mcs, mcs) ++ AC_CHECK_PROG(CSC, gmcs, gmcs) + fi + fi + test -z "$CSC" && AC_MSG_ERROR([no C Sharp compiler: gmcs not found in \$PATH]) +@@ -73,13 +73,13 @@ + AM_CONDITIONAL(DARWIN, test "$SIMIAS_OS" = "darwin") + AM_CONDITIONAL(DARWIN_X86, test "$host_cpu" = "i686") + if test "$runasclient" = "TRUE"; then +- AM_CONDITIONAL(MONO, test "$CSC" = "mcs") ++ AM_CONDITIONAL(MONO, test "$CSC" = "gmcs") + else + if pkg-config --atleast-version=2.4 mono > /dev/null 2>&1 + then + AM_CONDITIONAL(MONO, test "$CSC" = "gmcs") + else +- AM_CONDITIONAL(MONO, test "$CSC" = "mcs") ++ AM_CONDITIONAL(MONO, test "$CSC" = "gmcs") + fi + fi + AM_CONDITIONAL(DOTNET, test "$CSC" = "csc") diff --git a/www-apps/ifolder3-enterprise/files/simias-1.8.3-server-setup-1.diff b/www-apps/ifolder3-enterprise/files/simias-1.8.3-server-setup-1.diff new file mode 100644 index 0000000..51d797d --- /dev/null +++ b/www-apps/ifolder3-enterprise/files/simias-1.8.3-server-setup-1.diff @@ -0,0 +1,61 @@ +diff -uNr ifolder3-enterprise.orig/src/server/setup/SimiasServerSetup.cs ifolder3-enterprise/src/server/setup/SimiasServerSetup.cs +--- ifolder3-enterprise.orig/src/server/setup/SimiasServerSetup.cs 2009-12-05 19:06:34.834284498 +0100 ++++ ifolder3-enterprise/src/server/setup/SimiasServerSetup.cs 2009-12-05 19:10:10.387283893 +0100 +@@ -306,12 +306,12 @@ + /// + /// Apache User. + /// +- 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"); + + /// + /// Apache Group. + /// +- 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"); + + /// + /// Prompt for options. +@@ -891,7 +891,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 ) +@@ -2313,7 +2313,7 @@ + /// + void SetupModMono() + { +- string path = Path.GetFullPath( "/etc/apache2/conf.d/simias.conf" ); ++ string path = Path.GetFullPath( "/etc/simias/apache/gentoo/simias.conf" ); + Console.WriteLine("Configuring {0}...", path); + string ModMonoServer2 = Environment.GetEnvironmentVariable("IFOLDER_MOD_MONO_SERVER2_PATH"); + string iFolderMonoPath = Environment.GetEnvironmentVariable("IFOLDER_MONO_PATH"); +@@ -2338,6 +2338,7 @@ + */ + + string alias = "simias10"; ++ /* + if( iFolderMonoPath != null ) + writer.WriteLine( "Include {0}{1}", iFolderMonoPath, "/etc/apache2/conf.d/mod_mono.conf"); + else +@@ -2349,6 +2350,7 @@ + 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); +@@ -2389,7 +2391,7 @@ + /// + 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; diff --git a/www-apps/ifolder3-enterprise/ifolder-server-3.6.7303.1-r3.ebuild b/www-apps/ifolder3-enterprise/ifolder-server-3.6.7303.1-r3.ebuild deleted file mode 100644 index c301f3d..0000000 --- a/www-apps/ifolder3-enterprise/ifolder-server-3.6.7303.1-r3.ebuild +++ /dev/null @@ -1,141 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" -WANT_AUTOMAKE=1.9 -inherit autotools eutils mono - -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}"/configure.in-xsp-check-by-dl9pf-version3.diff - epatch "${FILESDIR}"/simias-libtool22-1.patch - epatch "${FILESDIR}"/simias-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.6.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-admin-setup.diff - epatch ${FILESDIR}/ifolder-apache-conf.diff - epatch ${FILESDIR}/ifolder-web-setup.diff - epatch ${FILESDIR}/simias-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:///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:///ifolder/" - echo "" - ewarn "Do NOT use epiphany" - -} diff --git a/www-apps/ifolder3-enterprise/ifolder-server-3.7_pre7021.ebuild b/www-apps/ifolder3-enterprise/ifolder-server-3.7_pre7021.ebuild deleted file mode 100644 index 947f0b8..0000000 --- a/www-apps/ifolder3-enterprise/ifolder-server-3.7_pre7021.ebuild +++ /dev/null @@ -1,143 +0,0 @@ -# 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}"/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.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:///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:///ifolder/" - echo "" - ewarn "Do NOT use epiphany" - -} diff --git a/www-apps/ifolder3-enterprise/ifolder-server-3.7_pre7049.ebuild b/www-apps/ifolder3-enterprise/ifolder3-enterprise-3.8.0.9328.1.ebuild similarity index 89% rename from www-apps/ifolder3-enterprise/ifolder-server-3.7_pre7049.ebuild rename to www-apps/ifolder3-enterprise/ifolder3-enterprise-3.8.0.9328.1.ebuild index f5327c7..9162929 100644 --- a/www-apps/ifolder3-enterprise/ifolder-server-3.7_pre7049.ebuild +++ b/www-apps/ifolder3-enterprise/ifolder3-enterprise-3.8.0.9328.1.ebuild @@ -5,12 +5,14 @@ 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 +#ESVN_REPO_URI="https://forgesvn1.novell.com/svn/simias/trunk/@${PV/3.7_pre/}" +#inherit autotools eutils mono subversion + +inherit autotools eutils mono 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" +SRC_URI="http://ftp.mars.arge.at/ifolder/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" @@ -26,8 +28,7 @@ DEPEND="!net-misc/simias sys-fs/e2fsprogs" RDEPEND="${DEPEND}" -S=${WORKDIR}/simias -MAKEOPTS="-j1" +S=${WORKDIR}/${PN} simiasdatadir="${ROOT}var/lib/simias" gentoo_config_dir="${ROOT}etc/simias/apache/gentoo" @@ -36,10 +37,10 @@ DEVNULL=/dev/null src_prepare() { - epatch "${FILESDIR}"/WSDLPATCH.diff +# epatch "${FILESDIR}"/WSDLPATCH-1.diff # epatch "${FILESDIR}"/configure.in-xsp-check-by-dl9pf-version3.diff # epatch "${FILESDIR}"/simias-libtool22-1.patch - epatch "${FILESDIR}"/simias-1.8-mono22-3.patch + epatch "${FILESDIR}"/simias-1.8-mono22-4.patch # epatch "${FILESDIR}"/simias-mononamespace.dpatch # epatch "${FILESDIR}"/simias-etc_use_destdir.dpatch # epatch "${FILESDIR}"/simias-bash.dpatch @@ -54,10 +55,10 @@ src_prepare() { # 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-3.8-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}/ifolder-3.8-web-setup-1.diff + epatch ${FILESDIR}/simias-1.8.3-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 diff --git a/www-apps/ifolder3-enterprise/ifolder-server-3.7_pre7061.ebuild b/www-apps/ifolder3-enterprise/ifolder3-enterprise-3.8_pre7061.ebuild similarity index 99% rename from www-apps/ifolder3-enterprise/ifolder-server-3.7_pre7061.ebuild rename to www-apps/ifolder3-enterprise/ifolder3-enterprise-3.8_pre7061.ebuild index 2500de1..6cacfd1 100644 --- a/www-apps/ifolder3-enterprise/ifolder-server-3.7_pre7061.ebuild +++ b/www-apps/ifolder3-enterprise/ifolder3-enterprise-3.8_pre7061.ebuild @@ -5,7 +5,7 @@ EAPI="2" WANT_AUTOMAKE=1.9 -ESVN_REPO_URI="https://forgesvn1.novell.com/svn/simias/trunk/@${PV/3.7_pre/}" +ESVN_REPO_URI="https://forgesvn1.novell.com/svn/simias/trunk/@${PV/3.8_pre/}" inherit autotools eutils mono subversion DESCRIPTION="Enterprise backend for iFolder"