delete
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/ifolder@1641 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
74
www-apps/ifolder3-enterprise/ChangeLog
Normal file
74
www-apps/ifolder3-enterprise/ChangeLog
Normal file
@@ -0,0 +1,74 @@
|
||||
# ChangeLog for www-apps/ifolder-server
|
||||
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
|
||||
# $Header: $
|
||||
|
||||
*ifolder-server-3.7_pre7061 (30 Apr 2009)
|
||||
|
||||
30 Apr 2009; Mario Fetka <mario.fetka@gmail.com> +files/WSDLPATCH-1.diff,
|
||||
+ifolder-server-3.7_pre7061.ebuild:
|
||||
revision bump
|
||||
|
||||
20 Apr 2009; Mario Fetka <mario.fetka@gmail.com>
|
||||
+files/simias-1.8-mono22-3.patch, ifolder-server-3.7_pre7049:
|
||||
add mono22 patch
|
||||
|
||||
* 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
|
||||
|
||||
08 Apr 2009; Mario Fetka <mario.fetka@gmail.com>
|
||||
-ifolder-server-3.6.7303.1.ebuild, -ifolder-server-3.6.7303.1-r1.ebuild,
|
||||
-ifolder-server-3.6.7303.1-r2.ebuild, ifolder-server-3.6.7303.1-r3.ebuild,
|
||||
-ifolder-server-3.7_pre7020.ebuild, +ifolder-server-3.7_pre7021.ebuild:
|
||||
Bump revision
|
||||
|
||||
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
|
||||
|
||||
28 Feb 2009; Mario Fetka <mario.fetka@gmail.com>
|
||||
files/simias-mono22-1.patch, +files/simias-Makefile-in-generate.diff,
|
||||
+files/simias-bash.dpatch, +files/simias-etc_use_destdir.dpatch,
|
||||
+files/simias-mononamespace.dpatch, +ifolder-server-3.6.7303.1-r3.ebuild:
|
||||
Bump correct mono2 config
|
||||
|
||||
27 Feb 2009; Mario Fetka <mario.fetka@gmail.com>
|
||||
files/simias-mono22-1.patch:
|
||||
fix mono 2.0 connectionManagement
|
||||
|
||||
27 Feb 2009; Mario Fetka <mario.fetka@gmail.com>
|
||||
+files/simias-recovery_agent-fix-1.patch,
|
||||
+ifolder-server-3.6.7303.1-r2.ebuild:
|
||||
fix recovery agent null pointer
|
||||
|
||||
22 Feb 2009; Mario Fetka <mario.fetka@gmail.com>
|
||||
ifolder-server-3.6.7303.1-r1.ebuild:
|
||||
correct mono dependency
|
||||
|
||||
21 Feb 2009; Mario Fetka <mario.fetka@gmail.com>
|
||||
+files/simias-1.6.use_system_gsoap.patch,
|
||||
+files/simias-libflaim_shared-1.patch, +files/simias-libtool22-1.patch,
|
||||
+files/simias-mono22-1.patch, +files/gsoap-2.7.12.patch,
|
||||
+files/simias_make_gcc43_happy.diff, +ifolder-server-3.6.7303.1-r1.ebuild:
|
||||
mono 2.2 / gsoap 2.7.12 / gcc 4.3
|
||||
|
||||
26 Jan 2008; Mario Fetka <mario-fetka@gmx.at> +metadata.xml:
|
||||
initial ifolder import from http://trac.one-gear.com/chaos/wiki
|
||||
|
||||
50
www-apps/ifolder3-enterprise/Manifest
Normal file
50
www-apps/ifolder3-enterprise/Manifest
Normal file
@@ -0,0 +1,50 @@
|
||||
AUX WSDLPATCH-1.diff 1372 RMD160 1d663404c3fb49346cb3d3cd53b09b28cdd60038 SHA1 625674f7aad4ad495acccc7c522eb3b07dcbb1fb SHA256 fa2edda34b8be078a3c796228a67920ba5c8a5143a3b164a6162fd626c52264a
|
||||
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
|
||||
AUX gsoap-compile-final.patch 402 RMD160 29619a25145d4fd7f8a6f05211a5eb2322c56341 SHA1 e1cad4c08f9d3aa3b870cc3a836a2671113bbdd6 SHA256 08abcc2c6182857e832f3914fe8b64b522c75abd0a75da45c9fdf05471fd39f3
|
||||
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
|
||||
AUX ifolder-server-apache-rights.patch 476 RMD160 d4b2f3af1268d70761e90e121656395990e93430 SHA1 34da71e64d7c2afdb29844dba3fbecde0c26a447 SHA256 53153825f5ed7632cdfa2c14bbcb1fb5856b86e8cb01af050ffeb56a6fd1cea9
|
||||
AUX ifolder-server-apache-simias-location.patch 1950 RMD160 dcfbf59a3282c499b102301629b09ff46359da16 SHA1 fa0f1d2dc57bf690738830e1dfc96cfe64f21111 SHA256 085182f9eb1de99d0612a6828c898c26a1607fe6805a3bd2a8b08cf3db68e9ea
|
||||
AUX ifolder-server-mod_mono-path.patch 341 RMD160 7c51cee8549bdc9bea674524f20c290978842611 SHA1 4a5d52fd24f35bfcd7cf058b4ae8322ba8c5049b SHA256 91cdf8f707a2df8e5f67c8aa7778a3cf66d3230da0d462cce15b3f99a10d39fb
|
||||
AUX ifolder-server-simias-server-setup.patch 384 RMD160 161896c0af947151fd586d0c2b9bf921399b2840 SHA1 63a0a599a515271e806be4549858237de898cf79 SHA256 b4b2ee9b56257c9f3189f1281028e43d95e615c3aae629385404f453e10ae6c7
|
||||
AUX ifolder-web-setup.diff 932 RMD160 ac8476fdacddeab9a3c203e3fea3052e6533e192 SHA1 f0b5fc1a169c94da8937f89092cf4c589ed9ed1a SHA256 30da00d219bc2d4f8956864bb87f0f9bd28c8d6661f84d7dfbfbc243656d81b2
|
||||
AUX new_default_simias.config.diff 941 RMD160 92197dcb98f8429636c3d03c3813d3ce2e8b8ffb SHA1 a21205dbad60ddbedfbe1db58dc020813ca0c7e1 SHA256 a7dfc2508c37cf405f1b9b66d3e0e8c913cb4c0277ff8533834948274d685a7d
|
||||
AUX new_mod_mono.diff 342 RMD160 9a882b17c42d2dd1e31a95545ffb4fdc0a89bfe6 SHA1 2ab9fce8376e9802144d3fb5a5919690100ea058 SHA256 016994d0c36ee4ff7c9bd8274fb4d105c375d5b1e3a7d291b3b3c5196b82aff3
|
||||
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-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-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
|
||||
AUX simias-etc_use_destdir.dpatch 1570 RMD160 50dd9de5b9ca0f45735bdc2d166e6020b1d0d4a3 SHA1 0b5128209c1d5546e399e4bac773d4c7a4fa9760 SHA256 53611a9778cac46e249694198a95b07ba6e9a514b0551c361900894282e728c1
|
||||
AUX simias-libflaim_shared-1.patch 749 RMD160 a8c402e4c822cf7961068308e46dbfea4e69ffea SHA1 37aed1ec52275c2d3e3cdfe37e2b122e07781c43 SHA256 9a9918fcaa7a6e528b8f15f9c719b886b51af3264bb89fd59859f0023eb9050f
|
||||
AUX simias-libtool22-1.patch 498 RMD160 3c6c621765382c3bbf66877217aef55301e6c337 SHA1 04affadf85f3f731b530acdc54659e83c08b0942 SHA256 156f539e59b62592a2e83902b063f7b941940bb93294eb2bd8d99146302d888b
|
||||
AUX simias-mono22-1.patch 9708 RMD160 527169ab20c88847a8604ba6b5c6d79063fb1392 SHA1 9f371158b24d3e9098f88f6986ebb745dbd0a9bc SHA256 5d1e8a078407ab8953de8487de6e33432cdb1e530c34ab51dc374e2727f4f45a
|
||||
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_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
|
||||
MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
|
||||
24
www-apps/ifolder3-enterprise/files/WSDLPATCH-1.diff
Normal file
24
www-apps/ifolder3-enterprise/files/WSDLPATCH-1.diff
Normal file
@@ -0,0 +1,24 @@
|
||||
diff -uNr simias.orig/src/core/SimiasClient/Makefile.am simias/src/core/SimiasClient/Makefile.am
|
||||
--- simias.orig/src/core/SimiasClient/Makefile.am 2009-04-30 15:07:32.792699886 +0200
|
||||
+++ simias/src/core/SimiasClient/Makefile.am 2009-04-30 15:13:14.750911570 +0200
|
||||
@@ -43,7 +43,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
|
||||
|
||||
diff -uNr simias.orig/src/reports/Proxy/Makefile.am simias/src/reports/Proxy/Makefile.am
|
||||
--- simias.orig/src/reports/Proxy/Makefile.am 2009-04-30 15:07:32.882977909 +0200
|
||||
+++ simias/src/reports/Proxy/Makefile.am 2009-04-30 15:11:44.554184382 +0200
|
||||
@@ -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
|
||||
105
www-apps/ifolder3-enterprise/files/WSDLPATCH.diff
Normal file
105
www-apps/ifolder3-enterprise/files/WSDLPATCH.diff
Normal 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
|
||||
@@ -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/ifolder3-enterprise/files/flex_in_lib64.diff
Normal file
12
www-apps/ifolder3-enterprise/files/flex_in_lib64.diff
Normal 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
|
||||
38
www-apps/ifolder3-enterprise/files/gsoap-2.7.12.patch
Normal file
38
www-apps/ifolder3-enterprise/files/gsoap-2.7.12.patch
Normal file
@@ -0,0 +1,38 @@
|
||||
diff -uNr simias.orig/src/core/libsimias/simiasweb.c simias/src/core/libsimias/simiasweb.c
|
||||
--- simias.orig/src/core/libsimias/simiasweb.c 2009-02-21 21:58:11.207370228 +0100
|
||||
+++ simias/src/core/libsimias/simiasweb.c 2009-02-21 21:58:53.910484314 +0100
|
||||
@@ -241,7 +241,7 @@
|
||||
}
|
||||
|
||||
/* Setup the Request */
|
||||
- req.onlySlaves = only_slaves ? true_ : false_;
|
||||
+ req.onlySlaves = only_slaves ? xsd__boolean__true_ : xsd__boolean__false_;
|
||||
|
||||
init_gsoap(&soap);
|
||||
if (simias_get_web_service_credential(username, password) == SIMIAS_SUCCESS) {
|
||||
@@ -294,7 +294,7 @@
|
||||
}
|
||||
|
||||
/* Active */
|
||||
- if (domainsA[i]->Active == true_) {
|
||||
+ if (domainsA[i]->Active == xsd__boolean__true_) {
|
||||
domain->active = true;
|
||||
} else {
|
||||
domain->active = false;
|
||||
@@ -349,14 +349,14 @@
|
||||
domain->host = strdup("");
|
||||
|
||||
/* IsSlave */
|
||||
- if (domainsA[i]->IsSlave == true_) {
|
||||
+ if (domainsA[i]->IsSlave == xsd__boolean__true_) {
|
||||
domain->is_slave = true;
|
||||
} else {
|
||||
domain->is_slave = false;
|
||||
}
|
||||
|
||||
/* IsDefault */
|
||||
- if (domainsA[i]->IsDefault == true_) {
|
||||
+ if (domainsA[i]->IsDefault == xsd__boolean__true_) {
|
||||
domain->is_default = true;
|
||||
} else {
|
||||
domain->is_default = false;
|
||||
11
www-apps/ifolder3-enterprise/files/gsoap-compile-final.patch
Normal file
11
www-apps/ifolder3-enterprise/files/gsoap-compile-final.patch
Normal 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/ifolder3-enterprise/files/gsoap-compile-new.patch
Normal file
12
www-apps/ifolder3-enterprise/files/gsoap-compile-new.patch
Normal 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/ifolder3-enterprise/files/gsoap-compile.patch
Normal file
10
www-apps/ifolder3-enterprise/files/gsoap-compile.patch
Normal 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/ifolder3-enterprise/files/gsoap-path.patch
Normal file
11
www-apps/ifolder3-enterprise/files/gsoap-path.patch
Normal 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"
|
||||
;;
|
||||
#
|
||||
@@ -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);
|
||||
|
||||
@@ -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,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);
|
||||
@@ -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 () != "" )
|
||||
31
www-apps/ifolder3-enterprise/files/ifolder-admin-setup.diff
Normal file
31
www-apps/ifolder3-enterprise/files/ifolder-admin-setup.diff
Normal 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/ifolder3-enterprise/files/ifolder-apache-conf.diff
Normal file
10
www-apps/ifolder3-enterprise/files/ifolder-apache-conf.diff
Normal 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
|
||||
|
||||
@@ -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.
|
||||
@@ -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
|
||||
{
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -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/ifolder3-enterprise/files/ifolder-web-setup.diff
Normal file
30
www-apps/ifolder3-enterprise/files/ifolder-web-setup.diff
Normal 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 () != "" )
|
||||
@@ -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/ifolder3-enterprise/files/new_mod_mono.diff
Normal file
13
www-apps/ifolder3-enterprise/files/new_mod_mono.diff
Normal 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)
|
||||
|
||||
|
||||
@@ -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/ifolder3-enterprise/files/setup-files.tar.gz
Normal file
BIN
www-apps/ifolder3-enterprise/files/setup-files.tar.gz
Normal file
Binary file not shown.
@@ -0,0 +1,80 @@
|
||||
diff -uNr simias.orig/Makefile.am simias/Makefile.am
|
||||
--- simias.orig/Makefile.am 2009-02-21 15:54:46.573843452 +0100
|
||||
+++ simias/Makefile.am 2009-02-21 15:55:03.186687971 +0100
|
||||
@@ -7,7 +7,7 @@
|
||||
rm -rf `find $(distdir) -name CVS`
|
||||
rm -rf `find $(distdir) -name ".svn"`
|
||||
|
||||
-EXTRA_DIST = iFolder.snk tools/aclocal tools/gsoap external/libflaim external/log4net external/Mono.WebServer
|
||||
+EXTRA_DIST = iFolder.snk tools/aclocal external/libflaim external/log4net 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-02-21 15:54:46.492830527 +0100
|
||||
+++ simias/src/core/libsimias/Makefile.am 2009-02-21 15:55:52.874747286 +0100
|
||||
@@ -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:
|
||||
154
www-apps/ifolder3-enterprise/files/simias-1.8-mono22-1.patch
Normal file
154
www-apps/ifolder3-enterprise/files/simias-1.8-mono22-1.patch
Normal file
@@ -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 $@
|
||||
161
www-apps/ifolder3-enterprise/files/simias-1.8-mono22-2.patch
Normal file
161
www-apps/ifolder3-enterprise/files/simias-1.8-mono22-2.patch
Normal file
@@ -0,0 +1,161 @@
|
||||
Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
|
||||
Date: 2009-04-13
|
||||
Initial Package Version: 1.8
|
||||
Origin: me
|
||||
Upstream Status: unkonown
|
||||
Description: make it mono 2.2 aware
|
||||
|
||||
diff -Naur simias.orig/configure.in simias/configure.in
|
||||
--- simias.orig/configure.in 2009-04-13 18:27:54.551295916 +0000
|
||||
+++ simias/configure.in 2009-04-13 18:28:12.308812139 +0000
|
||||
@@ -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 -Naur simias.orig/src/admin/Makefile.am simias/src/admin/Makefile.am
|
||||
--- simias.orig/src/admin/Makefile.am 2009-04-13 18:27:54.546665502 +0000
|
||||
+++ simias/src/admin/Makefile.am 2009-04-13 18:28:12.308812139 +0000
|
||||
@@ -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 -Naur simias.orig/src/core/Notifications/Notification.cs simias/src/core/Notifications/Notification.cs
|
||||
--- simias.orig/src/core/Notifications/Notification.cs 2009-04-13 18:27:54.440185052 +0000
|
||||
+++ simias/src/core/Notifications/Notification.cs 2009-04-13 18:28:12.311129546 +0000
|
||||
@@ -43,6 +43,8 @@
|
||||
using Simias.Service;
|
||||
using Simias.Sync;
|
||||
|
||||
+using Action = Simias.Client.Event.Action;
|
||||
+
|
||||
namespace Simias.Storage
|
||||
{
|
||||
/// <summary>
|
||||
diff -Naur simias.orig/src/core/SimiasApp/Makefile.am simias/src/core/SimiasApp/Makefile.am
|
||||
--- simias.orig/src/core/SimiasApp/Makefile.am 2009-04-13 18:27:54.433240653 +0000
|
||||
+++ simias/src/core/SimiasApp/Makefile.am 2009-04-13 18:28:12.313443530 +0000
|
||||
@@ -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 -Naur simias.orig/src/core/SimiasClient/Makefile.am simias/src/core/SimiasClient/Makefile.am
|
||||
--- simias.orig/src/core/SimiasClient/Makefile.am 2009-04-13 18:27:54.423986181 +0000
|
||||
+++ simias/src/core/SimiasClient/Makefile.am 2009-04-13 18:28:12.313443530 +0000
|
||||
@@ -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 -Naur simias.orig/src/core/Sync/SyncClient.cs simias/src/core/Sync/SyncClient.cs
|
||||
--- simias.orig/src/core/Sync/SyncClient.cs 2009-04-13 18:27:54.449444901 +0000
|
||||
+++ simias/src/core/Sync/SyncClient.cs 2009-04-13 18:30:07.259580369 +0000
|
||||
@@ -48,7 +48,7 @@
|
||||
using Simias.Client.Event;
|
||||
using Simias.DomainServices;
|
||||
|
||||
-
|
||||
+using Action = Simias.Client.Event.Action;
|
||||
|
||||
namespace Simias.Sync
|
||||
{
|
||||
diff -Naur simias.orig/src/reports/Proxy/Makefile.am simias/src/reports/Proxy/Makefile.am
|
||||
--- simias.orig/src/reports/Proxy/Makefile.am 2009-04-13 18:27:54.507312607 +0000
|
||||
+++ simias/src/reports/Proxy/Makefile.am 2009-04-13 18:28:12.318074433 +0000
|
||||
@@ -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 -Naur simias.orig/src/utils/usercmd/Makefile.am simias/src/utils/usercmd/Makefile.am
|
||||
--- simias.orig/src/utils/usercmd/Makefile.am 2009-04-13 18:27:54.507312607 +0000
|
||||
+++ simias/src/utils/usercmd/Makefile.am 2009-04-13 18:28:12.320384995 +0000
|
||||
@@ -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 -Naur simias.orig/src/webaccess/Makefile.am simias/src/webaccess/Makefile.am
|
||||
--- simias.orig/src/webaccess/Makefile.am 2009-04-13 18:27:54.502683660 +0000
|
||||
+++ simias/src/webaccess/Makefile.am 2009-04-13 18:28:12.320384995 +0000
|
||||
@@ -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 -Naur simias.orig/src/webservices/Makefile.am simias/src/webservices/Makefile.am
|
||||
--- simias.orig/src/webservices/Makefile.am 2009-04-13 18:27:54.313452717 +0000
|
||||
+++ simias/src/webservices/Makefile.am 2009-04-13 18:28:12.320384995 +0000
|
||||
@@ -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 $@
|
||||
38
www-apps/ifolder3-enterprise/files/simias-1.8-mono22-3.patch
Normal file
38
www-apps/ifolder3-enterprise/files/simias-1.8-mono22-3.patch
Normal file
@@ -0,0 +1,38 @@
|
||||
diff -uNr simias.orig/configure.in simias/configure.in
|
||||
--- simias.orig/configure.in 2009-04-20 09:26:07.736014674 +0200
|
||||
+++ simias/configure.in 2009-04-20 09:31:35.060549522 +0200
|
||||
@@ -22,13 +22,13 @@
|
||||
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])
|
||||
PKG_CONFIG_DIR="$LIB64"
|
||||
- AC_CHECK_PROG(WSDL, wsdl1, wsdl1,wsdl)
|
||||
+ AC_CHECK_PROG(WSDL, wsdl2, wsdl2)
|
||||
;;
|
||||
darwin*)
|
||||
SIMIAS_OS='darwin'
|
||||
@@ -53,7 +53,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")
|
||||
|
||||
|
||||
@@ -126,7 +126,7 @@
|
||||
#
|
||||
# Mono-specific configuration
|
||||
#
|
||||
- mcs)
|
||||
+ gmcs)
|
||||
CSC_EXEFLAG=/target:exe
|
||||
CSC_LIBFLAG=/target:library
|
||||
CSC_WINEXEFLAG=/target:winexe
|
||||
@@ -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);
|
||||
@@ -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,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:
|
||||
@@ -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,12 @@
|
||||
--- /home/srinidhi/sandbox/simias/configure.in 2007-01-04 19:57:04.000000000 +0530
|
||||
+++ configure.in 2007-01-04 21:21:43.000000000 +0530
|
||||
@@ -616,7 +616,7 @@
|
||||
fi
|
||||
|
||||
AC_SUBST(MODMONO_CONFPATH)
|
||||
-
|
||||
+AM_CONFIG_HEADER(config.h)
|
||||
|
||||
#
|
||||
# Configure files
|
||||
|
||||
97
www-apps/ifolder3-enterprise/files/simias-bash.dpatch
Executable file
97
www-apps/ifolder3-enterprise/files/simias-bash.dpatch
Executable file
@@ -0,0 +1,97 @@
|
||||
#! /bin/sh /usr/share/dpatch/dpatch-run
|
||||
## 004_bash.dpatch by <fabbione@gordian.int.fabbione.net>
|
||||
##
|
||||
## All lines beginning with `## DP:' are a description of the patch.
|
||||
## DP: No description.
|
||||
|
||||
@DPATCH@
|
||||
diff -urNad simias-3.6~/src/client/simias.in simias-3.6/src/client/simias.in
|
||||
--- simias-3.6~/src/client/simias.in 2006-04-12 23:37:31.000000000 +0200
|
||||
+++ simias-3.6/src/client/simias.in 2007-10-12 12:16:03.000000000 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/bin/sh
|
||||
+#!/bin/bash
|
||||
#######################################################################
|
||||
#
|
||||
# $RCSfile$
|
||||
diff -urNad simias-3.6~/src/reports/Client/ifolder-reports-generate.in simias-3.6/src/reports/Client/ifolder-reports-generate.in
|
||||
--- simias-3.6~/src/reports/Client/ifolder-reports-generate.in 2006-03-28 23:22:11.000000000 +0200
|
||||
+++ simias-3.6/src/reports/Client/ifolder-reports-generate.in 2007-10-12 12:16:03.000000000 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/bin/sh
|
||||
+#!/bin/bash
|
||||
#######################################################################
|
||||
#
|
||||
# $RCSfile: ifolder-reports-generate.in,v $
|
||||
diff -urNad simias-3.6~/src/server/setup/ifolder-admin-setup.in simias-3.6/src/server/setup/ifolder-admin-setup.in
|
||||
--- simias-3.6~/src/server/setup/ifolder-admin-setup.in 2007-08-10 06:26:59.000000000 +0200
|
||||
+++ simias-3.6/src/server/setup/ifolder-admin-setup.in 2007-10-12 12:16:03.000000000 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/bin/sh
|
||||
+#!/bin/bash
|
||||
|
||||
#****************************************************************************
|
||||
#
|
||||
diff -urNad simias-3.6~/src/server/setup/ifolder-web-setup.in simias-3.6/src/server/setup/ifolder-web-setup.in
|
||||
--- simias-3.6~/src/server/setup/ifolder-web-setup.in 2007-08-10 06:26:59.000000000 +0200
|
||||
+++ simias-3.6/src/server/setup/ifolder-web-setup.in 2007-10-12 12:16:03.000000000 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/bin/sh
|
||||
+#!/bin/bash
|
||||
#****************************************************************************
|
||||
#
|
||||
# Copyright (c) 2007 Novell, Inc.
|
||||
diff -urNad simias-3.6~/src/server/setup/simias-server-setup.in simias-3.6/src/server/setup/simias-server-setup.in
|
||||
--- simias-3.6~/src/server/setup/simias-server-setup.in 2007-08-10 06:26:59.000000000 +0200
|
||||
+++ simias-3.6/src/server/setup/simias-server-setup.in 2007-10-12 12:16:03.000000000 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/bin/sh
|
||||
+#!/bin/bash
|
||||
#****************************************************************************
|
||||
#
|
||||
# Copyright (c) 2007 Novell, Inc.
|
||||
diff -urNad simias-3.6~/src/server/simias-server.in simias-3.6/src/server/simias-server.in
|
||||
--- simias-3.6~/src/server/simias-server.in 2006-08-24 22:51:26.000000000 +0200
|
||||
+++ simias-3.6/src/server/simias-server.in 2007-10-12 12:16:03.000000000 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/bin/sh
|
||||
+#!/bin/bash
|
||||
#######################################################################
|
||||
#
|
||||
# $RCSfile: simias-server.in,v $
|
||||
diff -urNad simias-3.6~/src/utils/usercmd/simias-create-user.in simias-3.6/src/utils/usercmd/simias-create-user.in
|
||||
--- simias-3.6~/src/utils/usercmd/simias-create-user.in 2006-03-30 18:42:58.000000000 +0200
|
||||
+++ simias-3.6/src/utils/usercmd/simias-create-user.in 2007-10-12 12:16:03.000000000 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/bin/sh
|
||||
+#!/bin/bash
|
||||
#######################################################################
|
||||
#
|
||||
# $RCSfile: simias-create-user.in,v $
|
||||
diff -urNad simias-3.6~/src/utils/usercmd/simias-delete-user.in simias-3.6/src/utils/usercmd/simias-delete-user.in
|
||||
--- simias-3.6~/src/utils/usercmd/simias-delete-user.in 2006-03-30 18:42:58.000000000 +0200
|
||||
+++ simias-3.6/src/utils/usercmd/simias-delete-user.in 2007-10-12 12:16:03.000000000 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/bin/sh
|
||||
+#!/bin/bash
|
||||
#######################################################################
|
||||
#
|
||||
# $RCSfile: simias-delete-user.in,v $
|
||||
diff -urNad simias-3.6~/src/utils/usercmd/simias-user.cmd.in simias-3.6/src/utils/usercmd/simias-user.cmd.in
|
||||
--- simias-3.6~/src/utils/usercmd/simias-user.cmd.in 2006-03-30 22:07:32.000000000 +0200
|
||||
+++ simias-3.6/src/utils/usercmd/simias-user.cmd.in 2007-10-12 12:16:03.000000000 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/bin/sh
|
||||
+#!/bin/bash
|
||||
#######################################################################
|
||||
#
|
||||
# $RCSfile: simias-user.cmd.in,v $
|
||||
diff -urNad simias-3.6~/src/utils/usercmd/simias-user.in simias-3.6/src/utils/usercmd/simias-user.in
|
||||
--- simias-3.6~/src/utils/usercmd/simias-user.in 2006-03-30 18:42:58.000000000 +0200
|
||||
+++ simias-3.6/src/utils/usercmd/simias-user.in 2007-10-12 12:16:03.000000000 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/bin/sh
|
||||
+#!/bin/bash
|
||||
#######################################################################
|
||||
#
|
||||
# $RCSfile: simias-user.in,v $
|
||||
31
www-apps/ifolder3-enterprise/files/simias-etc_use_destdir.dpatch
Executable file
31
www-apps/ifolder3-enterprise/files/simias-etc_use_destdir.dpatch
Executable file
@@ -0,0 +1,31 @@
|
||||
#! /bin/sh /usr/share/dpatch/dpatch-run
|
||||
## 003_etc_use_destdir.dpatch by <fabbione@gordian.int.fabbione.net>
|
||||
##
|
||||
## All lines beginning with `## DP:' are a description of the patch.
|
||||
## DP: No description.
|
||||
|
||||
@DPATCH@
|
||||
diff -urNad simias-3.6~/src/server/setup/Makefile.in simias-3.6/src/server/setup/Makefile.in
|
||||
--- simias-3.6~/src/server/setup/Makefile.in 2007-10-12 08:15:45.000000000 +0200
|
||||
+++ simias-3.6/src/server/setup/Makefile.in 2007-10-12 09:36:52.000000000 +0200
|
||||
@@ -680,9 +680,8 @@
|
||||
@WINDOWS_FALSE@ $(INSTALL_PROGRAM) ifolder-web-setup $(DESTDIR)$(bindir)
|
||||
@WINDOWS_FALSE@ $(INSTALL_PROGRAM) ifolder-admin-setup $(DESTDIR)$(bindir)
|
||||
@WINDOWS_FALSE@ $(INSTALL_PROGRAM) utility.exe $(DEBUG_FILES) $(DESTDIR)$(bindir)
|
||||
-@WINDOWS_FALSE@ $(mkinstalldirs) /etc/ld.so.conf.d
|
||||
-@WINDOWS_FALSE@ $(INSTALL_PROGRAM) novell-ifolder3.conf /etc/ld.so.conf.d
|
||||
-@WINDOWS_FALSE@ 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
|
||||
+@WINDOWS_FALSE@ $(mkinstalldirs) $(DESTDIR)/etc/ld.so.conf.d
|
||||
+@WINDOWS_FALSE@ $(INSTALL_PROGRAM) novell-ifolder3.conf $(DESTDIR)/etc/ld.so.conf.d
|
||||
|
||||
uninstall-local:
|
||||
cd $(DESTDIR)$(bindir); rm -f SimiasServerSetup.exe $(DEBUG_FILES)
|
||||
@@ -695,7 +694,7 @@
|
||||
cd $(DESTDIR)$(bindir); rm -f ifolder-admin-setup ifolder-admin-setup.cmd
|
||||
cd $(DESTDIR)$(bindir); rm -f iFolderAdminSetup.exe.config
|
||||
cd $(DESTDIR)$(bindir); rm -f utility.exe
|
||||
- cd /etc/ld.so.conf.d; rm -f novell-ifolder3.conf
|
||||
+ cd $(DESTDIR)/etc/ld.so.conf.d; rm -f novell-ifolder3.conf
|
||||
|
||||
installcheck-local: install
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
diff -uNr simias.orig/src/core/FlaimProvider/FlaimWrapper/Makefile.am simias/src/core/FlaimProvider/FlaimWrapper/Makefile.am
|
||||
--- simias.orig/src/core/FlaimProvider/FlaimWrapper/Makefile.am 2007-10-16 17:56:05.000000000 +0200
|
||||
+++ simias/src/core/FlaimProvider/FlaimWrapper/Makefile.am 2009-02-21 13:50:24.654598727 +0100
|
||||
@@ -92,9 +92,9 @@
|
||||
lib=@LIB64@
|
||||
|
||||
# NOTE: The following is a _hack_.
|
||||
-LIBFLAIM_LIBS_HACK = "-lpthread -lrt -lstdc++ -ldl -lncurses /usr/$(lib)/libflaim.a"
|
||||
+# LIBFLAIM_LIBS_HACK = "-lpthread -lrt -lstdc++ -ldl -lncurses /usr/$(lib)/libflaim.a"
|
||||
|
||||
-libFlaimWrapper_la_LDFLAGS = $(LIBFLAIM_LIBS_HACK)
|
||||
+libFlaimWrapper_la_LDFLAGS = $(LIBFLAIM_LIBS)
|
||||
|
||||
install-exec-local: libFlaimWrapper.la
|
||||
$(mkinstalldirs) $(DESTDIR)$(webbindir)
|
||||
18
www-apps/ifolder3-enterprise/files/simias-libtool22-1.patch
Normal file
18
www-apps/ifolder3-enterprise/files/simias-libtool22-1.patch
Normal file
@@ -0,0 +1,18 @@
|
||||
Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
|
||||
Date: 2009-02-21
|
||||
Initial Package Version: 1.6.7303.1
|
||||
Origin: me
|
||||
Upstream Status: unknown
|
||||
Description: make it littool 2.2 aware
|
||||
|
||||
diff -Naur simias.orig/configure.in simias/configure.in
|
||||
--- simias.orig/configure.in 2009-02-21 10:43:03.000000000 +0000
|
||||
+++ simias/configure.in 2009-02-21 11:06:19.641171546 +0000
|
||||
@@ -8,6 +8,7 @@
|
||||
VERSION=$VERSION.$BUILDNUM.1
|
||||
AM_MAINTAINER_MODE
|
||||
AC_PROG_CC
|
||||
+AC_PROG_CXX
|
||||
m4_pattern_allow(PKG_CONFIG)
|
||||
|
||||
#
|
||||
218
www-apps/ifolder3-enterprise/files/simias-mono22-1.patch
Normal file
218
www-apps/ifolder3-enterprise/files/simias-mono22-1.patch
Normal file
@@ -0,0 +1,218 @@
|
||||
Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
|
||||
Date: 2009-02-21
|
||||
Initial Package Version: 1.6.7303.1
|
||||
Origin: me
|
||||
Upstream Status: unknown
|
||||
Description: make it mono 2 aware
|
||||
|
||||
diff -Naur simias.orig/configure.in simias/configure.in
|
||||
--- simias.orig/configure.in 2009-02-21 11:13:16.000000000 +0000
|
||||
+++ simias/configure.in 2009-02-21 11:23:28.589302092 +0000
|
||||
@@ -17,22 +17,22 @@
|
||||
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='lib'
|
||||
;;
|
||||
darwin*)
|
||||
SIMIAS_OS='darwin'
|
||||
- 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])
|
||||
export PKG_CONFIG_PATH="/Library/Frameworks/Mono.framework/Versions/Current/lib/pkgconfig:$PKG_CONFIG_PATH"
|
||||
PKG_CONFIG_DIR='lib'
|
||||
;;
|
||||
cygwin*)
|
||||
SIMIAS_OS='windows'
|
||||
AC_CHECK_PROG(CSC, csc, csc)
|
||||
- test -z "$CSC" && AC_CHECK_PROG(CSC, mcs, mcs)
|
||||
- test -z "$CSC" && AC_MSG_ERROR([no C Sharp compiler: neither csc nor mcs found in \$PATH])
|
||||
+ test -z "$CSC" && AC_CHECK_PROG(CSC, gmcs, gmcs)
|
||||
+ test -z "$CSC" && AC_MSG_ERROR([no C Sharp compiler: neither csc nor gmcs found in \$PATH])
|
||||
PKG_CONFIG_DIR='.'
|
||||
;;
|
||||
*)
|
||||
@@ -43,7 +43,7 @@
|
||||
AM_CONDITIONAL(LINUX, test "$SIMIAS_OS" = "linux")
|
||||
AM_CONDITIONAL(WINDOWS, test "$SIMIAS_OS" = "windows")
|
||||
AM_CONDITIONAL(DARWIN, test "$SIMIAS_OS" = "darwin")
|
||||
-AM_CONDITIONAL(MONO, test "$CSC" = "mcs")
|
||||
+AM_CONDITIONAL(MONO, test "$CSC" = "gmcs")
|
||||
AM_CONDITIONAL(DOTNET, test "$CSC" = "csc")
|
||||
|
||||
|
||||
@@ -116,7 +116,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 2007-10-16 17:55:39.000000000 +0200
|
||||
+++ simias/src/admin/Makefile.am 2009-02-21 13:00:37.456573254 +0100
|
||||
@@ -128,7 +128,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)
|
||||
diff -uNr simias.orig/src/core/SimiasClient/Makefile.am simias/src/core/SimiasClient/Makefile.am
|
||||
--- simias.orig/src/core/SimiasClient/Makefile.am 2007-10-16 17:55:49.000000000 +0200
|
||||
+++ simias/src/core/SimiasClient/Makefile.am 2009-02-21 13:02:44.947848486 +0100
|
||||
@@ -31,13 +31,13 @@
|
||||
|
||||
$(srcdir)/SimiasService.cs: $(srcdir)/../WebService/Simias.wsdl
|
||||
if WINDOWS
|
||||
- wsdl /out:SimiasService.cs $(srcdir)/../WebService/Simias.wsdl
|
||||
+ wsdl2 /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
|
||||
+ wsdl2 -nologo -out:SimiasService.cs $(srcdir)/../WebService/Simias.wsdl
|
||||
endif
|
||||
|
||||
SimiasClient.dll: $(srcdir)/AssemblyInfo.cs $(SimiasClient_CSFILES) $(SimiasClient_RESOURCES)
|
||||
diff -uNr simias.orig/src/reports/Proxy/Makefile.am simias/src/reports/Proxy/Makefile.am
|
||||
--- simias.orig/src/reports/Proxy/Makefile.am 2007-10-16 17:56:12.000000000 +0200
|
||||
+++ simias/src/reports/Proxy/Makefile.am 2009-02-21 13:00:58.569994200 +0100
|
||||
@@ -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 2007-10-16 17:55:08.000000000 +0200
|
||||
+++ simias/src/utils/usercmd/Makefile.am 2009-02-21 13:01:09.111656943 +0100
|
||||
@@ -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 2007-10-16 17:55:07.000000000 +0200
|
||||
+++ simias/src/webaccess/Makefile.am 2009-02-21 13:01:14.940358254 +0100
|
||||
@@ -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 2007-10-16 17:55:15.000000000 +0200
|
||||
+++ simias/src/webservices/Makefile.am 2009-02-21 13:04:56.399191235 +0100
|
||||
@@ -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 $@
|
||||
diff -uNr simias.orig/src/core/Notifications/Notification.cs simias/src/core/Notifications/Notification.cs.
|
||||
--- simias.orig/src/core/Notifications/Notification.cs 2007-10-16 17:56:09.000000000 +0200
|
||||
+++ simias/src/core/Notifications/Notification.cs 2009-02-21 13:28:38.493601028 +0100
|
||||
@@ -33,6 +33,8 @@
|
||||
using Simias.Service;
|
||||
using Simias.Sync;
|
||||
|
||||
+using Action = Simias.Client.Event.Action;
|
||||
+
|
||||
namespace Simias.Storage
|
||||
{
|
||||
/// <summary>
|
||||
diff -uNr simias.orig/src/core/Sync/SyncClient.cs simias/src/core/Sync/SyncClient.cs
|
||||
--- simias.orig/src/core/Sync/SyncClient.cs 2007-10-16 18:10:06.000000000 +0200
|
||||
+++ simias/src/core/Sync/SyncClient.cs 2009-02-21 13:37:17.039134110 +0100
|
||||
@@ -39,6 +39,7 @@
|
||||
using Simias.Client.Event;
|
||||
using Simias.DomainServices;
|
||||
|
||||
+using Action = Simias.Client.Event.Action;
|
||||
|
||||
namespace Simias.Sync
|
||||
{
|
||||
diff -uNr simias.orig/src/core/WebService/mono.server.web.config simias/src/core/WebService/mono.server.web.config
|
||||
--- simias.orig/src/core/WebService/mono.server.web.config 2009-02-27 21:39:43.937796032 +0100
|
||||
+++ simias/src/core/WebService/mono.server.web.config 2009-02-27 21:41:30.872940869 +0100
|
||||
@@ -38,12 +38,6 @@
|
||||
|
||||
</system.web>
|
||||
|
||||
- <system.net>
|
||||
- <connectionManagement>
|
||||
- <add address="*" maxconnection="10" />
|
||||
- </connectionManagement>
|
||||
- </system.net>
|
||||
-
|
||||
<!--
|
||||
<mono.aspnet>
|
||||
<acceptEncoding>
|
||||
diff -uNr simias.orig/src/core/WebService/mono.web.config simias/src/core/WebService/mono.web.config
|
||||
--- simias.orig/src/core/WebService/mono.web.config 2009-02-27 21:39:43.937796032 +0100
|
||||
+++ simias/src/core/WebService/mono.web.config 2009-02-27 21:40:51.532681719 +0100
|
||||
@@ -33,12 +33,6 @@
|
||||
|
||||
</system.web>
|
||||
|
||||
- <system.net>
|
||||
- <connectionManagement>
|
||||
- <add address="*" maxconnection="10" />
|
||||
- </connectionManagement>
|
||||
- </system.net>
|
||||
-
|
||||
<!--
|
||||
<mono.aspnet>
|
||||
<acceptEncoding>
|
||||
diff -uNr simias.orig/src/core/SimiasApp/Makefile.am simias/src/core/SimiasApp/Makefile.am
|
||||
--- simias.orig/src/core/SimiasApp/Makefile.am 2009-02-28 07:42:46.297742303 +0100
|
||||
+++ simias/src/core/SimiasApp/Makefile.am 2009-02-28 07:47:42.471249900 +0100
|
||||
@@ -7,7 +7,8 @@
|
||||
SYSTEM_INSTALLER_LIB =
|
||||
endif
|
||||
|
||||
-MONO_WEBSERVER_PATH = ../../../external/Mono.WebServer
|
||||
+$(GACD_MONO_WEBSERVER_FALSE) MONO_WEBSERVER_PATH = ../../../external/Mono.WebServer
|
||||
+$(GACD_MONO_WEBSERVER_TRUE) MONO_WEBSERVER_PATH = $(MONO_PATH)
|
||||
|
||||
Simias_CSFILES = $(srcdir)/AssemblyInfo.cs \
|
||||
$(srcdir)/Simias.cs \
|
||||
@@ -17,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
|
||||
19
www-apps/ifolder3-enterprise/files/simias-mononamespace.dpatch
Executable file
19
www-apps/ifolder3-enterprise/files/simias-mononamespace.dpatch
Executable file
@@ -0,0 +1,19 @@
|
||||
#! /bin/sh /usr/share/dpatch/dpatch-run
|
||||
## 002_mononamespace.dpatch by <fabbione@gordian.int.fabbione.net>
|
||||
##
|
||||
## All lines beginning with `## DP:' are a description of the patch.
|
||||
## DP: No description.
|
||||
|
||||
@DPATCH@
|
||||
diff -urNad simias-3.6~/configure.in simias-3.6/configure.in
|
||||
--- simias-3.6~/configure.in 2007-09-11 16:33:01.000000000 +0200
|
||||
+++ simias-3.6/configure.in 2007-10-12 09:07:15.000000000 +0200
|
||||
@@ -119,7 +119,7 @@
|
||||
CSC_EXEFLAG=/target:exe
|
||||
CSC_LIBFLAG=/target:library
|
||||
CSC_WINEXEFLAG=/target:winexe
|
||||
- CSCFLAGS='/d:MONO /warn:4 /d:TRACE'
|
||||
+ CSCFLAGS='/d:MONO /d:MONONATIVE /warn:4 /d:TRACE'
|
||||
CSCFLAGS_DEBUG="/debug+ /d:DEBUG"
|
||||
CSCFLAGS_OPTIMIZE="/optimize+"
|
||||
MONO=mono
|
||||
@@ -0,0 +1,12 @@
|
||||
diff -uNr simias.orig/src/core/CollectionStore/Store.cs simias/src/core/CollectionStore/Store.cs
|
||||
--- simias.orig/src/core/CollectionStore/Store.cs 2009-02-27 20:32:48.481455316 +0100
|
||||
+++ simias/src/core/CollectionStore/Store.cs 2009-02-27 20:33:49.312451704 +0100
|
||||
@@ -528,7 +528,7 @@
|
||||
Simias.Configuration config = Store.Config;
|
||||
string raPath = config.Get( "Server", "RAPath" );
|
||||
|
||||
- if (raPath != String.Empty && raPath != "")
|
||||
+ if (raPath != String.Empty && raPath != "" && raPath != null)
|
||||
{
|
||||
string[] racertFiles = Directory.GetFiles( raPath, "*.?er" );
|
||||
foreach ( string file in racertFiles )
|
||||
30
www-apps/ifolder3-enterprise/files/simias-server-setup.diff
Normal file
30
www-apps/ifolder3-enterprise/files/simias-server-setup.diff
Normal 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);
|
||||
@@ -0,0 +1,45 @@
|
||||
Index: configure.in
|
||||
===================================================================
|
||||
--- configure.in (revision 7152)
|
||||
+++ configure.in (working copy)
|
||||
@@ -720,6 +720,10 @@
|
||||
if test -e "/etc/httpd/mod_mono.conf"; then
|
||||
MODMONO_CONFPATH="/etc/httpd/mod_mono.conf"
|
||||
fi
|
||||
+# to work with apache2 the debian way:
|
||||
+if test -e "/etc/apache2/mods-available/mod_mono.conf"; then
|
||||
+ MODMONO_CONFPATH="/etc/apache2/mods-enabled/mod_mono.conf"
|
||||
+fi
|
||||
|
||||
AC_SUBST(MODMONO_CONFPATH)
|
||||
|
||||
Index: src/setup/apache/default/ifolder_admin.conf.in
|
||||
===================================================================
|
||||
--- src/setup/apache/default/ifolder_admin.conf.in (revision 7152)
|
||||
+++ src/setup/apache/default/ifolder_admin.conf.in (working copy)
|
||||
@@ -11,7 +11,9 @@
|
||||
</Location>
|
||||
|
||||
#Remove comments below this line to enable SSL
|
||||
-#LoadModule rewrite_module /usr/lib/apache2/mod_rewrite.so
|
||||
+#<IfModule !rewrite_module>
|
||||
+# LoadModule rewrite_module /usr/lib/apache2/mod_rewrite.so
|
||||
+#</IfModule>
|
||||
#RewriteEngine On
|
||||
#RewriteCond %{HTTPS} !=on
|
||||
#RewriteRule ^/ifolder/(.*) https://%{SERVER_NAME}/ifolder/$1 [R,L]
|
||||
Index: src/setup/apache/default/ifolder_webaccess.conf.in
|
||||
===================================================================
|
||||
--- src/setup/apache/default/ifolder_webaccess.conf.in (revision 7152)
|
||||
+++ src/setup/apache/default/ifolder_webaccess.conf.in (working copy)
|
||||
@@ -11,7 +11,9 @@
|
||||
</Location>
|
||||
|
||||
#Remove comments below this line to enable SSL
|
||||
-#LoadModule rewrite_module /usr/lib/apache2/mod_rewrite.so
|
||||
+#<IfModule !rewrite_module>
|
||||
+# LoadModule rewrite_module /usr/lib/apache2/mod_rewrite.so
|
||||
+#</IfModule>
|
||||
#RewriteEngine On
|
||||
#RewriteCond %{HTTPS} !=on
|
||||
#RewriteRule ^/ifolder/(.*) https://%{SERVER_NAME}/ifolder/$1 [R,L]
|
||||
@@ -0,0 +1,32 @@
|
||||
commit 3fd0a202d298e633e00f1756405c82e4b794de25
|
||||
Author: Jan-Simon Möller <dl9pf@legolas.auenland.lan>
|
||||
Date: Tue Aug 19 08:51:41 2008 +0200
|
||||
|
||||
Make gcc4.3 happy (added 2* #include <cstring>)
|
||||
|
||||
Signed-off-by: Jan-Simon Möller <dl9pf@legolas.auenland.lan>
|
||||
|
||||
diff --git a/simias/src/core/FlaimProvider/FlaimWrapper/CSPObjectIterator.cpp b/simias/src/core/FlaimProvider/FlaimWrapper/CSPObjectIterator.cpp
|
||||
index d47944d..16f87c0 100644
|
||||
--- a/simias/src/core/FlaimProvider/FlaimWrapper/CSPObjectIterator.cpp
|
||||
+++ b/simias/src/core/FlaimProvider/FlaimWrapper/CSPObjectIterator.cpp
|
||||
@@ -21,6 +21,7 @@
|
||||
*
|
||||
***********************************************************************/
|
||||
#include "CSPObjectIterator.h"
|
||||
+#include <cstring>
|
||||
|
||||
CSPObjectIterator::CSPObjectIterator(HFCURSOR cursor, int count, FLMBOOL includeColId) :
|
||||
m_Count(count),
|
||||
diff --git a/simias/src/core/FlaimProvider/FlaimWrapper/CSPType.h b/simias/src/core/FlaimProvider/FlaimWrapper/CSPType.h
|
||||
index 616435f..58e4f92 100644
|
||||
--- a/simias/src/core/FlaimProvider/FlaimWrapper/CSPType.h
|
||||
+++ b/simias/src/core/FlaimProvider/FlaimWrapper/CSPType.h
|
||||
@@ -22,6 +22,7 @@
|
||||
***********************************************************************/
|
||||
#ifndef _CSTYPE_H_
|
||||
#define _CSTYPE_H_
|
||||
+#include <cstring>
|
||||
|
||||
#define MAX_INT_STRING 21
|
||||
|
||||
28
www-apps/ifolder3-enterprise/files/webaccess-browse.patch
Normal file
28
www-apps/ifolder3-enterprise/files/webaccess-browse.patch
Normal 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>
|
||||
141
www-apps/ifolder3-enterprise/ifolder-server-3.6.7303.1-r3.ebuild
Normal file
141
www-apps/ifolder3-enterprise/ifolder-server-3.6.7303.1-r3.ebuild
Normal file
@@ -0,0 +1,141 @@
|
||||
# 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://<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"
|
||||
|
||||
}
|
||||
143
www-apps/ifolder3-enterprise/ifolder-server-3.7_pre7021.ebuild
Normal file
143
www-apps/ifolder3-enterprise/ifolder-server-3.7_pre7021.ebuild
Normal file
@@ -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 ~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://<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"
|
||||
|
||||
}
|
||||
144
www-apps/ifolder3-enterprise/ifolder-server-3.7_pre7049.ebuild
Normal file
144
www-apps/ifolder3-enterprise/ifolder-server-3.7_pre7049.ebuild
Normal 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-3.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"
|
||||
|
||||
}
|
||||
144
www-apps/ifolder3-enterprise/ifolder-server-3.7_pre7061.ebuild
Normal file
144
www-apps/ifolder3-enterprise/ifolder-server-3.7_pre7061.ebuild
Normal 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-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-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"
|
||||
|
||||
}
|
||||
5
www-apps/ifolder3-enterprise/metadata.xml
Normal file
5
www-apps/ifolder3-enterprise/metadata.xml
Normal file
@@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>maintainer-wanted</herd>
|
||||
</pkgmetadata>
|
||||
Reference in New Issue
Block a user