From c4440b0d94a7bc59866d798229d05d87351f7cf8 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Sat, 20 Apr 2013 08:11:17 +0200 Subject: [PATCH] correct many simias db init bugs and drop old ifolder from tree Package-Manager: portage-2.2.0_alpha166 RepoMan-Options: --force --- www-apps/ifolder3-enterprise/ChangeLog | 22 ++ www-apps/ifolder3-enterprise/Manifest | 32 +-- .../files/3.8.4/DEBUG_log_default.patch | 44 ---- ...onfig-use-systemwide-FlaimWrapper.so.patch | 10 - ...iasconfdir_in_SetupDefaultConfigPath.patch | 51 ----- .../3.8.4/dont_download_deleted_nodes.patch | 40 ---- .../3.8.4/home_never_network_drive.patch | 23 -- .../files/3.8.4/ifdata.patch | 15 -- .../3.8.4/mod_mono_SimiasServerSetup_cs.patch | 22 -- .../3.8.4/mod_mono_iFolderAdminSetup_cs.patch | 27 --- .../3.8.4/mod_mono_iFolderWebSetup_cs.patch | 31 --- .../files/3.8.4/mod_mono_path.patch | 16 -- .../files/3.8.4/remove_nodesFromServer.patch | 55 ----- .../3.8.4/separate_client_server_dirs.patch | 32 --- .../ifolder3-enterprise/files/3.8.4/series | 21 -- .../3.8.4/serverpaths_from_configure_v2.patch | 135 ----------- .../3.8.4/use_lib_as_libdir_on_amd64.patch | 17 -- .../3.8.4/use_libdir_for_executables.patch | 138 ------------ .../files/3.8.4/use_mono_webserver2.patch | 35 --- .../files/3.8.4/use_system_gsoap.patch | 28 --- .../files/3.8.4/www-data_apache.patch | 83 ------- .../files/3.9.1/gentoo-apache-path.patch | 212 ++++++++++++++++++ .../files/3.9.1/ifdata.patch | 2 +- ...indir_variable_configurein_no_gsoap.patch} | 2 +- .../files/3.9.1/xps-MonoWebServer2.patch | 12 + .../ifolder3-enterprise-3.8.4.7617.ebuild | 154 ------------- .../ifolder3-enterprise-3.9.1.7638.ebuild | 63 ++++-- www-apps/ifolder3-enterprise/metadata.xml | 4 +- 28 files changed, 300 insertions(+), 1026 deletions(-) delete mode 100644 www-apps/ifolder3-enterprise/files/3.8.4/DEBUG_log_default.patch delete mode 100644 www-apps/ifolder3-enterprise/files/3.8.4/SimiasLib.dll.config-use-systemwide-FlaimWrapper.so.patch delete mode 100644 www-apps/ifolder3-enterprise/files/3.8.4/SimiasServerSetup_use_simiasconfdir_in_SetupDefaultConfigPath.patch delete mode 100644 www-apps/ifolder3-enterprise/files/3.8.4/dont_download_deleted_nodes.patch delete mode 100644 www-apps/ifolder3-enterprise/files/3.8.4/home_never_network_drive.patch delete mode 100644 www-apps/ifolder3-enterprise/files/3.8.4/ifdata.patch delete mode 100644 www-apps/ifolder3-enterprise/files/3.8.4/mod_mono_SimiasServerSetup_cs.patch delete mode 100644 www-apps/ifolder3-enterprise/files/3.8.4/mod_mono_iFolderAdminSetup_cs.patch delete mode 100644 www-apps/ifolder3-enterprise/files/3.8.4/mod_mono_iFolderWebSetup_cs.patch delete mode 100644 www-apps/ifolder3-enterprise/files/3.8.4/mod_mono_path.patch delete mode 100644 www-apps/ifolder3-enterprise/files/3.8.4/remove_nodesFromServer.patch delete mode 100644 www-apps/ifolder3-enterprise/files/3.8.4/separate_client_server_dirs.patch delete mode 100644 www-apps/ifolder3-enterprise/files/3.8.4/series delete mode 100644 www-apps/ifolder3-enterprise/files/3.8.4/serverpaths_from_configure_v2.patch delete mode 100644 www-apps/ifolder3-enterprise/files/3.8.4/use_lib_as_libdir_on_amd64.patch delete mode 100644 www-apps/ifolder3-enterprise/files/3.8.4/use_libdir_for_executables.patch delete mode 100644 www-apps/ifolder3-enterprise/files/3.8.4/use_mono_webserver2.patch delete mode 100644 www-apps/ifolder3-enterprise/files/3.8.4/use_system_gsoap.patch delete mode 100644 www-apps/ifolder3-enterprise/files/3.8.4/www-data_apache.patch create mode 100644 www-apps/ifolder3-enterprise/files/3.9.1/gentoo-apache-path.patch rename www-apps/ifolder3-enterprise/files/{3.8.4/use_webbindir_variable_configurein.patch => 3.9.1/use_webbindir_variable_configurein_no_gsoap.patch} (97%) create mode 100644 www-apps/ifolder3-enterprise/files/3.9.1/xps-MonoWebServer2.patch delete mode 100644 www-apps/ifolder3-enterprise/ifolder3-enterprise-3.8.4.7617.ebuild diff --git a/www-apps/ifolder3-enterprise/ChangeLog b/www-apps/ifolder3-enterprise/ChangeLog index bcf5f5e..f9c1423 100644 --- a/www-apps/ifolder3-enterprise/ChangeLog +++ b/www-apps/ifolder3-enterprise/ChangeLog @@ -2,6 +2,28 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 20 Apr 2013; Mario Fetka + +files/3.9.1/gentoo-apache-path.patch, + +files/3.9.1/use_webbindir_variable_configurein_no_gsoap.patch, + +files/3.9.1/xps-MonoWebServer2.patch, -files/3.8.4/DEBUG_log_default.patch, + -files/3.8.4/SimiasLib.dll.config-use-systemwide-FlaimWrapper.so.patch, -files + /3.8.4/SimiasServerSetup_use_simiasconfdir_in_SetupDefaultConfigPath.patch, + -files/3.8.4/dont_download_deleted_nodes.patch, + -files/3.8.4/home_never_network_drive.patch, -files/3.8.4/ifdata.patch, + -files/3.8.4/mod_mono_SimiasServerSetup_cs.patch, + -files/3.8.4/mod_mono_iFolderAdminSetup_cs.patch, + -files/3.8.4/mod_mono_iFolderWebSetup_cs.patch, + -files/3.8.4/mod_mono_path.patch, -files/3.8.4/remove_nodesFromServer.patch, + -files/3.8.4/separate_client_server_dirs.patch, -files/3.8.4/series, + -files/3.8.4/serverpaths_from_configure_v2.patch, + -files/3.8.4/use_lib_as_libdir_on_amd64.patch, + -files/3.8.4/use_libdir_for_executables.patch, + -files/3.8.4/use_mono_webserver2.patch, -files/3.8.4/use_system_gsoap.patch, + -files/3.8.4/use_webbindir_variable_configurein.patch, + -files/3.8.4/www-data_apache.patch, -ifolder3-enterprise-3.8.4.7617.ebuild, + files/3.9.1/ifdata.patch, ifolder3-enterprise-3.9.1.7638.ebuild, metadata.xml: + correct many simias db init bugs and drop old ifolder from tree + *ifolder3-enterprise-3.8.4.7617 (18 Apr 2013) 18 Apr 2013; Mario Fetka diff --git a/www-apps/ifolder3-enterprise/Manifest b/www-apps/ifolder3-enterprise/Manifest index 1a8f881..935a6bf 100644 --- a/www-apps/ifolder3-enterprise/Manifest +++ b/www-apps/ifolder3-enterprise/Manifest @@ -1,29 +1,10 @@ -AUX 3.8.4/DEBUG_log_default.patch 1401 SHA256 ba8dbd5bcf4c15d322c3cff2a4d9f80af1efd2a3d256b44fe25505ca040ac8ea SHA512 d6842ae600f85c94cf233a20c708a1e633c9e8257c32092c51740b3cfab407dbc2b085a2af73a0f78f2d5708b92ca338612e70da3be804adfda9e84ba9a8ca2d WHIRLPOOL 80e7802cf7ddab4a22b2367ceb77cc1dd16b01a0a8fa4dfbdcf6553cda1b497302de63e24ba4d043e786bab006b7b3348d591f5e918ef4e9a93950d81029a077 -AUX 3.8.4/SimiasLib.dll.config-use-systemwide-FlaimWrapper.so.patch 560 SHA256 0fcb1ceebab87b7ec823f942f09499ace535007684b41e04f0051ebfb48f4286 SHA512 f14f9bc0e7c31578509bfba90a5134c528acb2582729763871f60120006daddb4b15474bec26bb13a68be8b6d73849bd4243f8f3d703d6bac055ea515dfd37ec WHIRLPOOL d47414f9d7b3dced0fbf8cbff873b9c84e68e5c0164e4b7dc7c08431e0a6f95a03dcb01d1e27de462c531b379132769aa12a446798a4dece979231b55862c279 -AUX 3.8.4/SimiasServerSetup_use_simiasconfdir_in_SetupDefaultConfigPath.patch 2117 SHA256 09852f06f3ee70befb506d7e9856e4d5591d4802707196ee3b75f7b36220c835 SHA512 beb89b61bb04d5d6bb6d5abed254f952c53f9c740cb791cc9b88b646638f1bf20a968b1e177fa20341c853d5d7662c95d2529c9c8851ac9b5c4ee14bcd22b435 WHIRLPOOL a02954973097062d21d73faabff2b06f2525fa95394ebe7f2d7bce1534882472ed8624c16ed6109823591bd53b11d46f0bb7c95c2b919a67063862488eb9fdd3 -AUX 3.8.4/dont_download_deleted_nodes.patch 1971 SHA256 1f954920f2b9d62e91738963f86eca97e3ab360b6e5f47ab7e114e9a79f5e175 SHA512 99ad9262042134e08240764f0842e339661288cd5da6a05c2eb4e09f0706194988274b25a896745177225ae75189b595009458105df099a2da3b8448d6e1c02e WHIRLPOOL df19007594a305717486c936eef62bc72c2f628649d438fa902f64a458387e73b150d996d1ee2ecc6140d6e7bbd46c50d777c301528bf240dbda403e05cd1501 -AUX 3.8.4/home_never_network_drive.patch 1128 SHA256 4b4c7bf53ba732e55d4bc7b46fc626e5f65c2a286d74516eeae6249be1cf26d2 SHA512 fa48cf65ce58d4ea5b2ce485b08bfcb2cff4f0c301c3aec9a20c8babf9036288d47f54557231a53096c428644a70f2a4f82db23a7be31d77f2d9dbd5637d560b WHIRLPOOL 17debedec07736bc7a32618efb293c764760cb62526a611f424d0bef0f4db6bd24eb66fc14b63aa5c426cc63b25b8f23875cba78102b2affbb57e0cd480a38f8 -AUX 3.8.4/ifdata.patch 647 SHA256 57b22a609b5d7826dbe7f13f62c6104c3f9dec10abff4b9583db021453a41b65 SHA512 91dfe04b884932d9601ca3232f12469f5c889670fd6a4ad644fbf485216e31e3dc8a8dbdf946cd3aebc43705cfa41cac6b05d451f04b1b580459cb3c9feed680 WHIRLPOOL d1bcb6d9a6236c86aca1490600046664b3e77bc4de7c0800602fb1fdeb01620e8363061d8b8f63180c4ec3a9e98640028496bb834861f11e195d8a37d2ea79a3 -AUX 3.8.4/mod_mono_SimiasServerSetup_cs.patch 1234 SHA256 f2a71d80bf2b9a5676e13d6a085f05a2f766458b17ecbb7159679ff1a7296b96 SHA512 a9b25865b860a563b492e0c34f6153c3a79ae5d7b4804f289735743b9c00dfc105143f11016f951df13810c89e3182efbf0ebc45d612a1312c699308f16376d6 WHIRLPOOL 4e3e5614991e11d9ec57bf0f85c6d9f969a4317b7453277659fa715ba028e96f854f194602d1bea2e0f3f0d3d7126ebd510b7d8e3b6e2dca1273921f011fc86d -AUX 3.8.4/mod_mono_iFolderAdminSetup_cs.patch 1287 SHA256 6c31146d44b65811c2e8a14dc3151431181dd54042bcc9daf2f44b7fd8b5ecb5 SHA512 ad1a5239b323513e113b33a3d036fe0b19ac947425ae56992050f20d3aba5b479cca54ae2fbdaa15e4d6fd9dd8d712d8d2cceaaefbd3572cdde70bc4170d7a8f WHIRLPOOL e56a14dbb1d8bd22f6f49b6c23361901d9030cff631d87b1d8b41285cec29b64f284639f960340198fde28469b51b33617c5e488132d97d8000cdfff5b43f908 -AUX 3.8.4/mod_mono_iFolderWebSetup_cs.patch 1464 SHA256 e90bd235a685d72a474546ce693e07d726eaae9cc30cf22bd2334b3b9911468c SHA512 d8184ed942069653a24589c7a581f8e253a09a2f886b3f83f098654d9c888a1ef39365aa404db2be56463214b65eccdbdf49469fa4891117a00a80e2b98c49b6 WHIRLPOOL a21c1e8f66ae56196637bf424a57bd499e8f9446f812bef89d3dee868e9a8da23de340f5e0c8be9cb8a7c97741308fad4eeb674f73534fbf3e02f97757f5605e -AUX 3.8.4/mod_mono_path.patch 574 SHA256 526c17896bbc435c9f0180e39a5fce566f8294c58f64bdc260e4773ce98b3690 SHA512 3e7f8747fd7ccddba40bbe38be400774e2756744aa9600739aa99c726a8a5d897a82b4cceb40388980a1bfa09c714aef8a9d05fd934521e7f06ae847e99898db WHIRLPOOL bd9aaa81ab96b6083e95f8472ba8cb90c5e3633d56e617b3a5ad9bf8ae7d69ef0875ae6d18d719d1601b3b98d81c611809f1dfa369dd16ae890d1d6e6ab37115 -AUX 3.8.4/remove_nodesFromServer.patch 2026 SHA256 daf8525eef881949aefff0ce4de8959523c5575e05d8d6e7da01fcac77df0798 SHA512 d06e5d5f6967f58b5ec237e69f8fb53003acb3f589c3174059215e9549cd12bd2502278b471d65068ee311488bb2e4d2c429028b585a1a48ad7dbb220abdfb6a WHIRLPOOL 3b59a5aecc524ba5813dbb0a7d81d1f5a47dda1b1bf1332db1b7a708df8743c30520cf383e9d20cc934bb48319f178b1c970f0fc825eb99bbf11ac88a5023c93 -AUX 3.8.4/separate_client_server_dirs.patch 905 SHA256 117b5b75da149a1ba39af83b6cab59845f4d8b1e56d808094b442cc9fa5798c5 SHA512 0f1cca5307aa78ca0477d881bcc496ea029e817ebbeb60f12ccfdddc0256a963d3ac2f949a9c523defda2490bbf5f980fe80130b8de10cae5913d7832ea8024f WHIRLPOOL 7c593fed2e24b5ea8f970b17447901d168a80596e19184a4522f6f5bee9e5cf767105a7690fcd9068a64f1e12019c66c6182d48a41063aeb89bb0ef2ed469ab0 -AUX 3.8.4/series 706 SHA256 bad2015a1caf2cc7c1ac5131408db77d444c02b018d3e5c8d479f05162dbe70d SHA512 1cdcfc82a9b54e40916b280f9b2adf290a5fb920bf31cdfcac8aaa5d332fd6ffaaaf3b832ef1c1ff4e4bfd66b1cbbd86f50497fe15cb5566e9864d86805900d6 WHIRLPOOL 3973626f6c8c5100e27fb75cddf21340520e5635e3bf0a8d77a8da77cd8c88ff6f059de2c627a22ea6a96649526082a82e516c4d9c6fdcf8e6868c6b88c6c27d -AUX 3.8.4/serverpaths_from_configure_v2.patch 5867 SHA256 b243caf38145348fecb34fcf160fe4711bf4224a2e399fc13ea9e2e06c7039b9 SHA512 194200e6dd219c58c6f108c4421e884cf65acc8d70e70244f59139e07d212b0b3d38a689fac70db64b3965f4f86f124c9ed1b7e0a1a2b247fa594edb629c77f5 WHIRLPOOL 9fa153008546354b3c0548fc67e6ae9a4882112012f33cb65aa4e27c4e52b780c1043fcc130e0783e2f5b6b949758e4e41d414947c3b7ad3f5c70713025b1a06 -AUX 3.8.4/use_lib_as_libdir_on_amd64.patch 521 SHA256 d89808e1ab8a0d5089f6b35207c663f925e6143cd785cd3e4b9f09ae98b97096 SHA512 df3a1bd9eddb41aedc26655c9387cb95631962309173120c0f3d1e6e5b4d110ccc7c53d7ea4c3ab518c96828f31dfb0fa42cd80d494d2a880f4293dc4b9034c1 WHIRLPOOL 18f22215ec75b8d07768d75770c0873f53b9951ed3e980d44f87007c668f9eedaea5dc5c28b5fa08dee62fbfe6e59a80be53094fb8fdf06e6a18ce90a6cd8c40 -AUX 3.8.4/use_libdir_for_executables.patch 6320 SHA256 f816be2b4035a66ca6983852de09ee2bf76a565bc01b955698910034fdb2565f SHA512 37ea2779889d80501434c90b568be7a6cb0bb4749f8a38035438bcbd7f37a65f4e9d3a542302cc8b8336c64e239d895bb62ec4d520c10548a9677f33b74eec04 WHIRLPOOL b2774fdfcde5dd280ea285fbc17f802f4db8d80f98f2d125aa0753a83e6634393667623afa5689308862d94c296717a8192522c651d9d4d2efadb9662dd9e4a2 -AUX 3.8.4/use_mono_webserver2.patch 1626 SHA256 ea21aec99535f5c4c17fcd86dee3955324db7154174df26d9c2f0258cf4b6823 SHA512 3b82e4d6faf7daa78367dc29e948d100df6ada51b328363e424d48f5902d657097b196f3223267abccc848cc6880fc0c982f868f5bc2e9719bbf799757f90d36 WHIRLPOOL fd86b8cdf930c2ac0c32d9be5f1c4380044326314e973e018b6ce1d57c0684c2037c0d01ae538d7901e030db40bd7cb938d90d441746cdc52380d2c89256461f -AUX 3.8.4/use_system_gsoap.patch 1360 SHA256 b506e21bf8e9fd1dcd8fb538d81147fed6ca993a410c51f373325a59c7879ee9 SHA512 b32c092e3a4f2a3b42ab8c8dfbfad18475144acb89c7e505fc1481db8e8e8641abb70a891415929049a2a53bd7f0e9586776bdd96801dffae8b2b2c574bdeee4 WHIRLPOOL 9551e81067b6a7ec954030f91fdc2ec1221c8649ed9c71f89890e195e9d1b0b10ffc779fd39948b5918bf71f0cffdd3c9419f17a6ee19bf5c5c1fb6f0ae3b3f5 -AUX 3.8.4/use_webbindir_variable_configurein.patch 1871 SHA256 9927c8c5725d435415d848ae5e56c623f949112eb4aee55914fc8113b4f5f157 SHA512 9a8400dcaa53206fefb6fb520082d8fb2044d78a3c0ed27feb8f01d16d4fff9136e39376c07757841dabebf5cca03ad99609a4623687ea2d27d3673887087472 WHIRLPOOL 7b7294219206413df944b87d9d2e424f7124d871e7dba36d50077760927f08e5d9e4b87f7505584def36c9f2400f0b329922e885d611cc7d5dedfca77ccc5322 -AUX 3.8.4/www-data_apache.patch 4577 SHA256 beda9615eb8cf701eb7944d1972c401fb5440786bf38b7b90a0cb6920a998080 SHA512 fd2ded16212bd73450de41b5230a48a5d5c4892f71e6a7d89c1d5ab8961d79463982617acde3fd803728f332bbdf484dc3100288fdf1641fc489b3a8d7911a19 WHIRLPOOL 927fd2b6708ecb3e709523349e51648891db51f60988f0125895cd5b9019401f695910a30e0997cdfdc0b0d005447bf40a240419bad0e72a6f32340e8e76dabc AUX 3.9.1/DEBUG_log_default.patch 1401 SHA256 ba8dbd5bcf4c15d322c3cff2a4d9f80af1efd2a3d256b44fe25505ca040ac8ea SHA512 d6842ae600f85c94cf233a20c708a1e633c9e8257c32092c51740b3cfab407dbc2b085a2af73a0f78f2d5708b92ca338612e70da3be804adfda9e84ba9a8ca2d WHIRLPOOL 80e7802cf7ddab4a22b2367ceb77cc1dd16b01a0a8fa4dfbdcf6553cda1b497302de63e24ba4d043e786bab006b7b3348d591f5e918ef4e9a93950d81029a077 AUX 3.9.1/SimiasLib.dll.config-use-systemwide-FlaimWrapper.so.patch 560 SHA256 0fcb1ceebab87b7ec823f942f09499ace535007684b41e04f0051ebfb48f4286 SHA512 f14f9bc0e7c31578509bfba90a5134c528acb2582729763871f60120006daddb4b15474bec26bb13a68be8b6d73849bd4243f8f3d703d6bac055ea515dfd37ec WHIRLPOOL d47414f9d7b3dced0fbf8cbff873b9c84e68e5c0164e4b7dc7c08431e0a6f95a03dcb01d1e27de462c531b379132769aa12a446798a4dece979231b55862c279 AUX 3.9.1/SimiasServerSetup_use_simiasconfdir_in_SetupDefaultConfigPath.patch 2117 SHA256 09852f06f3ee70befb506d7e9856e4d5591d4802707196ee3b75f7b36220c835 SHA512 beb89b61bb04d5d6bb6d5abed254f952c53f9c740cb791cc9b88b646638f1bf20a968b1e177fa20341c853d5d7662c95d2529c9c8851ac9b5c4ee14bcd22b435 WHIRLPOOL a02954973097062d21d73faabff2b06f2525fa95394ebe7f2d7bce1534882472ed8624c16ed6109823591bd53b11d46f0bb7c95c2b919a67063862488eb9fdd3 AUX 3.9.1/dont_download_deleted_nodes.patch 1971 SHA256 1f954920f2b9d62e91738963f86eca97e3ab360b6e5f47ab7e114e9a79f5e175 SHA512 99ad9262042134e08240764f0842e339661288cd5da6a05c2eb4e09f0706194988274b25a896745177225ae75189b595009458105df099a2da3b8448d6e1c02e WHIRLPOOL df19007594a305717486c936eef62bc72c2f628649d438fa902f64a458387e73b150d996d1ee2ecc6140d6e7bbd46c50d777c301528bf240dbda403e05cd1501 +AUX 3.9.1/gentoo-apache-path.patch 11646 SHA256 2ec6d99b4f5870f08b23be95f4bdcaab44be54da88ab3e9bcaf15aebe08ec4b8 SHA512 741707d55b1244d52969ac4b80a7883dd1f29b8922614da4520317b6631cd7798da310f4a89fbdb2028a8e073eaeabf3497d5a76010952a2fae56dedec2df70a WHIRLPOOL ff850c9e3072111f5db385f04b3bf6a86d17a490452365ef4cc5da59d5da3ce7b92a14d794e3c1ecd5a98af43befd6b641ce3791c2bf2e00bae9b3aa624742cf AUX 3.9.1/home_never_network_drive.patch 1128 SHA256 4b4c7bf53ba732e55d4bc7b46fc626e5f65c2a286d74516eeae6249be1cf26d2 SHA512 fa48cf65ce58d4ea5b2ce485b08bfcb2cff4f0c301c3aec9a20c8babf9036288d47f54557231a53096c428644a70f2a4f82db23a7be31d77f2d9dbd5637d560b WHIRLPOOL 17debedec07736bc7a32618efb293c764760cb62526a611f424d0bef0f4db6bd24eb66fc14b63aa5c426cc63b25b8f23875cba78102b2affbb57e0cd480a38f8 -AUX 3.9.1/ifdata.patch 647 SHA256 57b22a609b5d7826dbe7f13f62c6104c3f9dec10abff4b9583db021453a41b65 SHA512 91dfe04b884932d9601ca3232f12469f5c889670fd6a4ad644fbf485216e31e3dc8a8dbdf946cd3aebc43705cfa41cac6b05d451f04b1b580459cb3c9feed680 WHIRLPOOL d1bcb6d9a6236c86aca1490600046664b3e77bc4de7c0800602fb1fdeb01620e8363061d8b8f63180c4ec3a9e98640028496bb834861f11e195d8a37d2ea79a3 +AUX 3.9.1/ifdata.patch 649 SHA256 c27a7cc69aa40bb0fb32e19361477ddf284fc4841000ef09e8be03181f508db7 SHA512 26b8dc28e3cbacf8250c20587b0e89202080dcc03d3e07304dada599dce5b979e71c618b721cacc991fecec7f3b5ed7738f2cdce8253bb5bb75c9e1592bd9283 WHIRLPOOL 9508391ee13a00da612829c45c7e99144860dbb49cc20472bb6e714472ff4699ecf1a2ac585073ad487a8521e4ffb7eba309680c86b99cd76c0b559f6c5a6480 AUX 3.9.1/mod_mono_SimiasServerSetup_cs.patch 1234 SHA256 f2a71d80bf2b9a5676e13d6a085f05a2f766458b17ecbb7159679ff1a7296b96 SHA512 a9b25865b860a563b492e0c34f6153c3a79ae5d7b4804f289735743b9c00dfc105143f11016f951df13810c89e3182efbf0ebc45d612a1312c699308f16376d6 WHIRLPOOL 4e3e5614991e11d9ec57bf0f85c6d9f969a4317b7453277659fa715ba028e96f854f194602d1bea2e0f3f0d3d7126ebd510b7d8e3b6e2dca1273921f011fc86d AUX 3.9.1/mod_mono_iFolderAdminSetup_cs.patch 1287 SHA256 6c31146d44b65811c2e8a14dc3151431181dd54042bcc9daf2f44b7fd8b5ecb5 SHA512 ad1a5239b323513e113b33a3d036fe0b19ac947425ae56992050f20d3aba5b479cca54ae2fbdaa15e4d6fd9dd8d712d8d2cceaaefbd3572cdde70bc4170d7a8f WHIRLPOOL e56a14dbb1d8bd22f6f49b6c23361901d9030cff631d87b1d8b41285cec29b64f284639f960340198fde28469b51b33617c5e488132d97d8000cdfff5b43f908 AUX 3.9.1/mod_mono_iFolderWebSetup_cs.patch 1464 SHA256 e90bd235a685d72a474546ce693e07d726eaae9cc30cf22bd2334b3b9911468c SHA512 d8184ed942069653a24589c7a581f8e253a09a2f886b3f83f098654d9c888a1ef39365aa404db2be56463214b65eccdbdf49469fa4891117a00a80e2b98c49b6 WHIRLPOOL a21c1e8f66ae56196637bf424a57bd499e8f9446f812bef89d3dee868e9a8da23de340f5e0c8be9cb8a7c97741308fad4eeb674f73534fbf3e02f97757f5605e @@ -37,8 +18,9 @@ AUX 3.9.1/use_libdir_for_executables.patch 6288 SHA256 5039af0bcb6304b91f1d110e7 AUX 3.9.1/use_mono_webserver2.patch 578 SHA256 232c1a5d9575d42f472b9792521356413d40e098e19e92cc90d52abf258c0a61 SHA512 236265edeeeb40af3c3353ab96669b9b13da907a80725ccfe254faae377c2342809f0ce0527fddce4c840859575a6ddad9147bf9280061d4e16d98ef3bfa00d3 WHIRLPOOL 4f22c9d22b139bf5d0c0812d0657e55c6420decda10bfb2f0b1a5c1d81495277fddd0b72c6138dba404e2da2be2740d95811b4760124139b2defab56e6ffcbcf AUX 3.9.1/use_system_gsoap.patch 1360 SHA256 b506e21bf8e9fd1dcd8fb538d81147fed6ca993a410c51f373325a59c7879ee9 SHA512 b32c092e3a4f2a3b42ab8c8dfbfad18475144acb89c7e505fc1481db8e8e8641abb70a891415929049a2a53bd7f0e9586776bdd96801dffae8b2b2c574bdeee4 WHIRLPOOL 9551e81067b6a7ec954030f91fdc2ec1221c8649ed9c71f89890e195e9d1b0b10ffc779fd39948b5918bf71f0cffdd3c9419f17a6ee19bf5c5c1fb6f0ae3b3f5 AUX 3.9.1/use_webbindir_variable_configurein.patch 1871 SHA256 9927c8c5725d435415d848ae5e56c623f949112eb4aee55914fc8113b4f5f157 SHA512 9a8400dcaa53206fefb6fb520082d8fb2044d78a3c0ed27feb8f01d16d4fff9136e39376c07757841dabebf5cca03ad99609a4623687ea2d27d3673887087472 WHIRLPOOL 7b7294219206413df944b87d9d2e424f7124d871e7dba36d50077760927f08e5d9e4b87f7505584def36c9f2400f0b329922e885d611cc7d5dedfca77ccc5322 +AUX 3.9.1/use_webbindir_variable_configurein_no_gsoap.patch 1887 SHA256 6ac23340ef5296202365693f578cd8385432af982df8c4e393eef76a42ea5e94 SHA512 045a519baf015d09bb9d01f2cc1215eea6c8f5d00b9ba5294aac0ab0047c64e98c0deff6a0ae7560a058b4ba3d477571912c411300f5983e4e37ba28bde724ff WHIRLPOOL c6fe183d92ec703aa2e1594d5192190dd955d2c08e44296f43c3290466624d3dcea553b90eb4bba17942bab17b339582d839211546b909de18a161823b0db9da AUX 3.9.1/www-data_apache.patch 4577 SHA256 beda9615eb8cf701eb7944d1972c401fb5440786bf38b7b90a0cb6920a998080 SHA512 fd2ded16212bd73450de41b5230a48a5d5c4892f71e6a7d89c1d5ab8961d79463982617acde3fd803728f332bbdf484dc3100288fdf1641fc489b3a8d7911a19 WHIRLPOOL 927fd2b6708ecb3e709523349e51648891db51f60988f0125895cd5b9019401f695910a30e0997cdfdc0b0d005447bf40a240419bad0e72a6f32340e8e76dabc -EBUILD ifolder3-enterprise-3.8.4.7617.ebuild 5391 SHA256 7d87333d1ad8d89a3375a433742b0fe6431009502a864a8ef403bd5a4bf1144a SHA512 2194cc1096a972afa5bdc7823ab0c2742118a74e205c8330cca604b786ec73dffecc31b62511b24c76d7392223417593bc0a9502893a2ee6d9c267feda39f1f7 WHIRLPOOL 2cc720437aea12744d77afee6a23afbec9b28bda84f87142ecd1a7cdd6536632f525c99de9ec34942077190ff8a24f954adb9c552d3145fa714b771148493c5f -EBUILD ifolder3-enterprise-3.9.1.7638.ebuild 5531 SHA256 c669e657a77b95bc435f99698919f97a235ceeadd8ba367d99417425f399c558 SHA512 10659c5fe4d6c48bde726de5b820651dd4ffcda807538f6b5f0ec3aa93fa22cdc7435510562e83c98f43cac44287a09183f719a92a0604070c17ac7cf120e43e WHIRLPOOL 425540e0f231e0481ab4e5c27a931097f15f9264dc4c6af164f4415158427e4a479537958718e82460721a021bb04f134095fc539688019bb216838552ada7cf -MISC ChangeLog 8485 SHA256 35c6f0bfdcf2b0a485225292eb4d8c4f23f338083d25ef4b33d13172666deae1 SHA512 4f3075494754c1517a737900064294eed7a7ed0b7ebfbe51eba004bb618c3f9c539272a944d614bdc7e2613ab333ecec680a5e5d527b1823d357d18825732784 WHIRLPOOL ade7c0fae4da319a9b32a8ae6f1abeabf4b32a6078d13d57130c1786fc0c8cb65d63b9990510171c48441205620e12011d4dc2aa2b84905d01cf4009ff55ca38 -MISC metadata.xml 170 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 SHA512 c011e0dc20997640fdaf4dbdd0493106446df3ff753040a8ffc638cea0512a535bce9e1c4d2969e708993529c473d9dc17c59804c15a0eee2b0a7e9854b65143 WHIRLPOOL b33b91daccf2a989c728257c6372f7f8a7481bd72af841bf3c76e6625750d6f5e0d31c942fe88368fc016edcc5be954656c488b6d44ea00e4fe0caaec1bdd41e +AUX 3.9.1/xps-MonoWebServer2.patch 519 SHA256 2be4837b31a5b64d14a659a6638de13ac066b34e36850c0fb39f377155fa5cf6 SHA512 aaef8683035861c8ce73f32c7fae70ec7e6c7c5eb46cebacfed0c9f8399978a63a2aeb537cbdda4d47a43e844f6c6d979eef658d6fbf25d905725259457aa929 WHIRLPOOL 273cb14d2ed3a1a1def3377340b5c64945df2bfb299566bff46d2dbd900d5e47cd11676db0384c0f3cbc0283384cf137170044af7cd53f701351adb273e282d6 +EBUILD ifolder3-enterprise-3.9.1.7638.ebuild 6475 SHA256 75aaa2861a90320bcf0a0ec90d8c07b3a213045796deca8a34ae6fde8b6c9169 SHA512 64d810418801ed0cea19eb165ae50cdd185bcbc137e90d9e0b3a459e43c7b3adbc79ff5d0ecb0f3e04205e9047d1cef30fe6055b6a90a2f612197d8d6dbe553d WHIRLPOOL 112f1cc24e880421aed9d269e4d02658280f9daa35f9f5e41aeaa80de9b457e0e48643ae730bcb31bc22186a2aaf112b0343e491c83949f73c2ae86bbc6af8ee +MISC ChangeLog 9821 SHA256 d0396eb144ffd041571fcb2053d0793eb84697d79b275a448ff39a372c6aa0f6 SHA512 a25ead53eb1da62844c0816fd638b379e9072fabc9d0819c44b6aec7581dfd4ef894c4585107cd35436f95ae151f54f0e606ef1245d49b23d699a659e2f047e4 WHIRLPOOL 5162aabd2e2dcb15bec0a3befc7510d4568db1baab6649102a6a86863880cfaa19c30bdde56f7a10fb08ed1878fd607ddc98ac038b7738a94c5f6011b6f1c8a2 +MISC metadata.xml 205 SHA256 9fdfc9c91107d94feb8416adc2cec7734fa27084bff83ea859938b3216e028bc SHA512 ef3a39d2cd131cd29451ec2d009484e89b60e8cbeed5fc0f5f899cebb0c5f9867682ce603982e4de32004493944c6ff99a4c797e7ef2441d6049e5a616143a8b WHIRLPOOL 779e2cb116b19389f70acc6d49694358619116f9849f3b8e46f00df4e39b4476424b20990b9dabb4ba16605d1894d6b820eaeb930401d825265bfdca27f6fb96 diff --git a/www-apps/ifolder3-enterprise/files/3.8.4/DEBUG_log_default.patch b/www-apps/ifolder3-enterprise/files/3.8.4/DEBUG_log_default.patch deleted file mode 100644 index bcc1aeb..0000000 --- a/www-apps/ifolder3-enterprise/files/3.8.4/DEBUG_log_default.patch +++ /dev/null @@ -1,44 +0,0 @@ -Index: simias-1.8.5.0~svn7436/src/core/Common/Simias.log4net -=================================================================== ---- simias-1.8.5.0~svn7436.orig/src/core/Common/Simias.log4net 2010-07-22 21:16:26.678236725 -0400 -+++ simias-1.8.5.0~svn7436/src/core/Common/Simias.log4net 2010-07-22 21:16:49.428238401 -0400 -@@ -18,7 +18,7 @@ - - - -- -+ - - - -@@ -36,7 +36,7 @@ - - - -- -+ - - - -Index: simias-1.8.5.0~svn7436/src/core/Common/Simias.log4net.in -=================================================================== ---- simias-1.8.5.0~svn7436.orig/src/core/Common/Simias.log4net.in 2010-07-22 21:15:46.088239517 -0400 -+++ simias-1.8.5.0~svn7436/src/core/Common/Simias.log4net.in 2010-07-22 21:16:23.568421947 -0400 -@@ -17,7 +17,7 @@ - - - -- -+ - - - -@@ -34,7 +34,7 @@ - - - -- -+ - - - diff --git a/www-apps/ifolder3-enterprise/files/3.8.4/SimiasLib.dll.config-use-systemwide-FlaimWrapper.so.patch b/www-apps/ifolder3-enterprise/files/3.8.4/SimiasLib.dll.config-use-systemwide-FlaimWrapper.so.patch deleted file mode 100644 index 096f304..0000000 --- a/www-apps/ifolder3-enterprise/files/3.8.4/SimiasLib.dll.config-use-systemwide-FlaimWrapper.so.patch +++ /dev/null @@ -1,10 +0,0 @@ -Index: simias-1.8.3.9328.1+dfsg/src/core/SimiasLib.dll/SimiasLib.dll.config.in -=================================================================== ---- simias-1.8.3.9328.1+dfsg.orig/src/core/SimiasLib.dll/SimiasLib.dll.config.in 2010-04-17 14:36:54.000000000 +0100 -+++ simias-1.8.3.9328.1+dfsg/src/core/SimiasLib.dll/SimiasLib.dll.config.in 2010-04-17 14:37:05.000000000 +0100 -@@ -1,4 +1,4 @@ - -- -+ - - diff --git a/www-apps/ifolder3-enterprise/files/3.8.4/SimiasServerSetup_use_simiasconfdir_in_SetupDefaultConfigPath.patch b/www-apps/ifolder3-enterprise/files/3.8.4/SimiasServerSetup_use_simiasconfdir_in_SetupDefaultConfigPath.patch deleted file mode 100644 index 8e2196b..0000000 --- a/www-apps/ifolder3-enterprise/files/3.8.4/SimiasServerSetup_use_simiasconfdir_in_SetupDefaultConfigPath.patch +++ /dev/null @@ -1,51 +0,0 @@ -Index: simias-1.8.3.10200.stable/src/server/setup/SimiasServerSetup.cs -=================================================================== ---- simias-1.8.3.10200.stable.orig/src/server/setup/SimiasServerSetup.cs 2010-07-19 12:36:57.715197193 -0400 -+++ simias-1.8.3.10200.stable/src/server/setup/SimiasServerSetup.cs 2010-07-19 12:37:01.265198310 -0400 -@@ -2806,14 +2806,7 @@ Console.WriteLine("Url {0}", service.Url - private bool SetupDefaultConfigPath() - { - // Check /etc first -- string path = -- String.Format( "{0}{1}{2}{3}{4}{5}", -- Path.DirectorySeparatorChar.ToString(), -- "etc", -- Path.DirectorySeparatorChar.ToString(), -- "simias", -- Path.DirectorySeparatorChar.ToString(), -- "bill" ); -+ string path = Path.Combine(Simias.Client.SimiasSetup.simiasconfdir, "bill"); - if ( System.IO.Directory.Exists( path ) == true ) - { - if ( File.Exists( Path.Combine( path, Simias.Configuration.DefaultConfigFileName ) ) == true ) -@@ -2825,13 +2818,7 @@ Console.WriteLine("Url {0}", service.Url - } - - // Check the target area -- path = -- String.Format( "{0}{1}{2}{3}{4}", -- System.IO.Directory.GetCurrentDirectory(), -- Path.DirectorySeparatorChar.ToString(), -- "etc", -- Path.DirectorySeparatorChar.ToString(), -- "simias" ); -+ path = Path.Combine(System.IO.Directory.GetCurrentDirectory(), Simias.Client.SimiasSetup.simiasconfdir.TrimStart(Path.DirectorySeparatorChar)); - - if ( System.IO.Directory.Exists( path ) == true ) - { -@@ -2854,13 +2841,8 @@ Console.WriteLine("Url {0}", service.Url - int lastComp = cwd.LastIndexOf( Path.DirectorySeparatorChar ); - cwd = cwd.Remove( lastComp, ( cwd.Length - lastComp ) ); - -- path = -- String.Format( "{0}{1}{2}{3}{4}", -- cwd, -- Path.DirectorySeparatorChar.ToString(), -- "etc", -- Path.DirectorySeparatorChar.ToString(), -- "simias" ); -+ cwd = cwd + Path.DirectorySeparatorChar.ToString(); -+ path = Path.Combine(cwd, Simias.Client.SimiasSetup.simiasconfdir.TrimStart(Path.DirectorySeparatorChar)); - - if ( System.IO.Directory.Exists( path ) == true ) - { diff --git a/www-apps/ifolder3-enterprise/files/3.8.4/dont_download_deleted_nodes.patch b/www-apps/ifolder3-enterprise/files/3.8.4/dont_download_deleted_nodes.patch deleted file mode 100644 index fd8ff8b..0000000 --- a/www-apps/ifolder3-enterprise/files/3.8.4/dont_download_deleted_nodes.patch +++ /dev/null @@ -1,40 +0,0 @@ -Index: simias-1.8.3.10200.stable/src/core/Sync/SyncClient.cs -=================================================================== ---- simias-1.8.3.10200.stable.orig/src/core/Sync/SyncClient.cs 2010-04-15 10:16:23.000000000 -0400 -+++ simias-1.8.3.10200.stable/src/core/Sync/SyncClient.cs 2010-07-19 12:37:44.255199987 -0400 -@@ -2473,25 +2473,6 @@ namespace Simias.Sync - if (nodeIDs.Length == 0) - return; - -- string[] deleteNodeIDs = workArray.DeletesToServer(); -- -- if(deleteNodeIDs.Length > 0) -- { -- foreach(string nodeid in nodeIDs) -- { -- foreach(string deleteid in deleteNodeIDs) -- { -- if(nodeid == deleteid) -- { -- workArray.RemoveNodeFromServer(nodeid); -- } -- } -- } -- } -- nodeIDs = workArray.FilesFromServer(merge, Store.IsEnterpriseServer); -- if (nodeIDs.Length == 0) -- return; -- log.Info("Downloading {0} Files from server", nodeIDs.Length); - foreach (string nodeID in nodeIDs) - { - try -@@ -3124,7 +3105,8 @@ namespace Simias.Sync - } - } - } -- else if (nodesFromServer != null && nodesFromServer.Contains(stamp.ID)) -+ else if (nodesFromServerMerge.Contains(stamp.ID) -+ || nodesFromServerDownload.Contains(stamp.ID)) // shouldn't be needed? - { - // This node has changed on the server we have a collision that we need to get. - // Unless this is a delete. diff --git a/www-apps/ifolder3-enterprise/files/3.8.4/home_never_network_drive.patch b/www-apps/ifolder3-enterprise/files/3.8.4/home_never_network_drive.patch deleted file mode 100644 index 5cadd94..0000000 --- a/www-apps/ifolder3-enterprise/files/3.8.4/home_never_network_drive.patch +++ /dev/null @@ -1,23 +0,0 @@ -submitted https://bugzilla.novell.com/show_bug.cgi?id=623644 - -Patch tells iFolder that filesystems mount under "/home" are located locally. -This allows synchronizing encrypted filesystems mounted under "/home", e.g. -on Ubuntu. - -May cause a problem with filesystems mounted under "/home" which ARE -network or other non-local filesystems. - -Thanks to x2b4 on the ifolder-ubuntu-debian-dev google group. -Index: simias-1.8.3.10200.stable/src/core/Simias.Web/SharedCollection.cs -=================================================================== ---- simias-1.8.3.10200.stable.orig/src/core/Simias.Web/SharedCollection.cs 2010-04-15 10:16:23.000000000 -0400 -+++ simias-1.8.3.10200.stable/src/core/Simias.Web/SharedCollection.cs 2010-07-19 12:38:09.905200825 -0400 -@@ -1106,7 +1106,7 @@ namespace Simias.Web - while(mntLine != null) - { - // verify it's a device on this box -- if(mntLine.StartsWith("/dev") && (mntLine.IndexOf("iso9660") == -1)) -+ if((mntLine.StartsWith("/dev") || mntLine.StartsWith("/home")) && (mntLine.IndexOf("iso9660") == -1)) - { - Stat stat; - string[] entries; diff --git a/www-apps/ifolder3-enterprise/files/3.8.4/ifdata.patch b/www-apps/ifolder3-enterprise/files/3.8.4/ifdata.patch deleted file mode 100644 index 75f9225..0000000 --- a/www-apps/ifolder3-enterprise/files/3.8.4/ifdata.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -uNr ifolder3-enterprise-3.9.1.7638.orig/src/core/ifdata ifolder3-enterprise-3.9.1.7638/src/core/ifdata ---- ifolder3-enterprise-3.9.1.7638.orig/src/core/ifdata 2013-04-18 05:15:38.018388777 +0200 -+++ ifolder3-enterprise-3.9.1.7638/src/core/ifdata 2013-04-18 05:18:12.984451434 +0200 -@@ -4,6 +4,10 @@ - then - /sbin/ifconfig | grep '\' | cut -f2 -d' ' | cut -f1 -d' ' - else -- /sbin/ifconfig | grep 'inet addr' | cut -f2 -d':' | cut -f1 -d' ' -+ if [ -f /sbin/ip ] then -+ /sbin/ip addr | awk '/inet / {sub(/\/.*/, "", $2); print $2}' -+ else -+ /sbin/ifconfig | grep "inet addr" | awk -F: '{print $2}' | awk '{print $1}' -+ fi - fi - diff --git a/www-apps/ifolder3-enterprise/files/3.8.4/mod_mono_SimiasServerSetup_cs.patch b/www-apps/ifolder3-enterprise/files/3.8.4/mod_mono_SimiasServerSetup_cs.patch deleted file mode 100644 index d4f476a..0000000 --- a/www-apps/ifolder3-enterprise/files/3.8.4/mod_mono_SimiasServerSetup_cs.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: simias-1.8.3.10200.stable/src/server/setup/SimiasServerSetup.cs -=================================================================== ---- simias-1.8.3.10200.stable.orig/src/server/setup/SimiasServerSetup.cs 2010-07-19 12:33:45.925199986 -0400 -+++ simias-1.8.3.10200.stable/src/server/setup/SimiasServerSetup.cs 2010-07-19 12:34:06.335200824 -0400 -@@ -2339,14 +2339,14 @@ Console.WriteLine("Url {0}", service.Url - - string alias = "simias10"; - if( iFolderMonoPath != null ) -- writer.WriteLine( "Include {0}{1}", iFolderMonoPath, "/etc/apache2/conf.d/mod_mono.conf"); -+ writer.WriteLine( "Include {0}{1}", iFolderMonoPath, "/etc/apache2/modules.d/70_mod_mono.conf"); - else - { -- string mod_mono2_path = "/etc/apache2/conf.d/mod_mono.conf"; -+ string mod_mono2_path = "/etc/apache2/modules.d/70_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( "Include {0}", "/etc/apache2/modules.d/70_mod_mono.conf" ); - } - writer.WriteLine(); - writer.WriteLine("Alias /{0} \"{1}\"", alias, SimiasSetup.webdir); diff --git a/www-apps/ifolder3-enterprise/files/3.8.4/mod_mono_iFolderAdminSetup_cs.patch b/www-apps/ifolder3-enterprise/files/3.8.4/mod_mono_iFolderAdminSetup_cs.patch deleted file mode 100644 index 2387c7b..0000000 --- a/www-apps/ifolder3-enterprise/files/3.8.4/mod_mono_iFolderAdminSetup_cs.patch +++ /dev/null @@ -1,27 +0,0 @@ -Index: simias-1.8.3.9328.1+dfsg/src/server/setup/iFolderAdminSetup.cs -=================================================================== ---- simias-1.8.3.9328.1+dfsg.orig/src/server/setup/iFolderAdminSetup.cs 2010-04-24 14:26:03.074801984 -0400 -+++ simias-1.8.3.9328.1+dfsg/src/server/setup/iFolderAdminSetup.cs 2010-04-24 14:28:09.214998380 -0400 -@@ -413,7 +413,7 @@ - using(StreamWriter writer = File.CreateText(path)) - { - /* example -- Include /etc/apache2/conf.d/mod_mono.conf -+ Include /etc/apache2/modules.d/70_mod_mono.conf - - Alias /ifolder "/usr/webaccess" - AddMonoApplications ifolder "/ifolder:/usr/webaccess" -@@ -438,11 +438,11 @@ - writer.WriteLine( "Include {0}{1}", iFolderMonoPath, "/etc/apache2/conf.d//mod_mono.conf" ); - else - { -- string mod_mono2_path = "/etc/apache2/conf.d/mod_mono.conf"; -+ string mod_mono2_path = "/etc/apache2/modules.d/70_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( "Include {0}", "/etc/apache2/modules.d/70_mod_mono.conf" ); - } - writer.WriteLine(); - writer.WriteLine("Alias /{0} \"{1}\"", alias, webPath); diff --git a/www-apps/ifolder3-enterprise/files/3.8.4/mod_mono_iFolderWebSetup_cs.patch b/www-apps/ifolder3-enterprise/files/3.8.4/mod_mono_iFolderWebSetup_cs.patch deleted file mode 100644 index 906ee14..0000000 --- a/www-apps/ifolder3-enterprise/files/3.8.4/mod_mono_iFolderWebSetup_cs.patch +++ /dev/null @@ -1,31 +0,0 @@ -Index: simias-trunk20100511/src/server/setup/iFolderWebSetup.cs -=================================================================== ---- simias-trunk20100511.orig/src/server/setup/iFolderWebSetup.cs 2010-05-11 20:25:34.124021446 -0400 -+++ simias-trunk20100511/src/server/setup/iFolderWebSetup.cs 2010-05-11 20:26:04.914020328 -0400 -@@ -456,7 +456,7 @@ - using(StreamWriter writer = File.CreateText(path)) - { - /* example -- Include /etc/apache2/conf.d/mod_mono.conf -+ Include /etc/apache2/modules.d/70_mod_mono.conf - - Alias /ifolder "/usr/webaccess" - AddMonoApplications ifolder "/ifolder:/usr/webaccess" -@@ -478,14 +478,14 @@ - sslPrefix = "#"; - } - if( iFolderMonoPath != null ) -- writer.WriteLine( "Include {0}{1}", iFolderMonoPath, "/etc/apache2/conf.d/mod_mono.conf" ); -+ writer.WriteLine( "Include {0}{1}", iFolderMonoPath, "/etc/apache2/modules.d/70_mod_mono.conf" ); - else - { -- string mod_mono2_path = "/etc/apache2/conf.d/mod_mono.conf"; -+ string mod_mono2_path = "/etc/apache2/modules.d/70_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( "Include {0}", "/etc/apache2/modules.d/70_mod_mono.conf" ); - } - writer.WriteLine(); - writer.WriteLine("Alias /{0} \"{1}\"", alias, webPath); diff --git a/www-apps/ifolder3-enterprise/files/3.8.4/mod_mono_path.patch b/www-apps/ifolder3-enterprise/files/3.8.4/mod_mono_path.patch deleted file mode 100644 index bfe4b40..0000000 --- a/www-apps/ifolder3-enterprise/files/3.8.4/mod_mono_path.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: simias-1.8.3.10200.stable/configure.in -=================================================================== ---- simias-1.8.3.10200.stable.orig/configure.in 2010-07-19 12:30:02.515201941 -0400 -+++ simias-1.8.3.10200.stable/configure.in 2010-07-19 12:33:55.935201104 -0400 -@@ -722,6 +722,11 @@ if test -e "/etc/httpd/mod_mono.conf"; t - MODMONO_CONFPATH="/etc/httpd/mod_mono.conf" - fi - -+# Gentoo location of enabled mod_mono.conf -+if test -e "/etc/gentoo-release"; then -+ MODMONO_CONFPATH="/etc/apache2/modules.d/70_mod_mono.conf" -+fi -+ - AC_SUBST(MODMONO_CONFPATH) - - diff --git a/www-apps/ifolder3-enterprise/files/3.8.4/remove_nodesFromServer.patch b/www-apps/ifolder3-enterprise/files/3.8.4/remove_nodesFromServer.patch deleted file mode 100644 index b22e1a6..0000000 --- a/www-apps/ifolder3-enterprise/files/3.8.4/remove_nodesFromServer.patch +++ /dev/null @@ -1,55 +0,0 @@ -submitted as enhancement to -https://bugzilla.novell.com/show_bug.cgi?id=605407 -Index: simias-1.8.3.10200.stable/src/core/Sync/SyncClient.cs -=================================================================== ---- simias-1.8.3.10200.stable.orig/src/core/Sync/SyncClient.cs 2010-07-19 12:37:44.255199987 -0400 -+++ simias-1.8.3.10200.stable/src/core/Sync/SyncClient.cs 2010-07-19 12:37:59.565196913 -0400 -@@ -2957,7 +2957,7 @@ namespace Simias.Sync - Hashtable nodesFromServerDownload; - Hashtable nodesToServer; - Hashtable nodesFromServerMerge; -- Hashtable nodesFromServer; -+// Hashtable nodesFromServer; - - Access.Rights rights; - bool sparseReplica = false; -@@ -3149,7 +3149,7 @@ namespace Simias.Sync - { - nodesFromServerMerge.Remove(nodeID); - nodesFromServerDownload.Remove(nodeID); -- nodesFromServer.Remove(nodeID); -+// nodesFromServer.Remove(nodeID); - } - - /// -@@ -3163,7 +3163,7 @@ namespace Simias.Sync - else - nodesFromServerDownload.Remove(nodeID); - -- nodesFromServer.Remove(nodeID); -+// nodesFromServer.Remove(nodeID); - } - - /// -@@ -3184,10 +3184,9 @@ namespace Simias.Sync - private string[] FromServer(SyncNodeType oType, bool merge) - { - if (merge) -- nodesFromServer = nodesFromServerMerge; -+ return FromServer(oType, nodesFromServerMerge); - else -- nodesFromServer = nodesFromServerDownload; -- return FromServer(oType); -+ return FromServer(oType, nodesFromServerDownload); - } - - /// -@@ -3195,7 +3194,7 @@ namespace Simias.Sync - /// - /// The Type of objects to return. - /// -- private string[] FromServer(SyncNodeType oType) -+ private string[] FromServer(SyncNodeType oType, Hashtable nodesFromServer) - { - ArrayList na = new ArrayList(); - bool haveCollection = false; diff --git a/www-apps/ifolder3-enterprise/files/3.8.4/separate_client_server_dirs.patch b/www-apps/ifolder3-enterprise/files/3.8.4/separate_client_server_dirs.patch deleted file mode 100644 index ed865c4..0000000 --- a/www-apps/ifolder3-enterprise/files/3.8.4/separate_client_server_dirs.patch +++ /dev/null @@ -1,32 +0,0 @@ -submitted upstream -https://bugzilla.novell.com/show_bug.cgi?id=608881 - -Index: simias-1.8.3.10200.0/configure.in -=================================================================== ---- simias-1.8.3.10200.0.orig/configure.in 2010-07-19 16:46:38.915198031 -0400 -+++ simias-1.8.3.10200.0/configure.in 2010-07-19 16:46:45.705202221 -0400 -@@ -269,7 +269,11 @@ AC_SUBST(COMMON_MAINTAINER_CLEAN_FILES) - - # We have our own "standard" directories for web services. - # -+if test "$runasclient" = "TRUE"; then - webdir="${libexecdir}/web" -+else -+ webdir="${libexecdir}/server" -+fi - webbindir="${webdir}/bin" - modulesdir="${webdir}/modules" - AC_SUBST(webdir) -@@ -485,7 +489,11 @@ AC_SUBST(mappingpath) - # - - --simiasconfdir="${sysconfdir}/simias" -+if test "$runasclient" = "TRUE"; then -+ simiasconfdir="${sysconfdir}/simias/client" -+else -+ simiasconfdir="${sysconfdir}/simias/server" -+fi - AC_SUBST(simiasconfdir) - - # diff --git a/www-apps/ifolder3-enterprise/files/3.8.4/series b/www-apps/ifolder3-enterprise/files/3.8.4/series deleted file mode 100644 index 058eac8..0000000 --- a/www-apps/ifolder3-enterprise/files/3.8.4/series +++ /dev/null @@ -1,21 +0,0 @@ -use_system_gsoap.patch -use_wsdl_not_wsdl1.patch -use_mono_webserver2.patch -use_lib_as_libdir_on_amd64.patch -use_libdir_for_executables.patch -SimiasLib.dll.config-use-systemwide-FlaimWrapper.so.patch -www-data_apache.patch -mod_mono_path.patch -mod_mono_SimiasServerSetup_cs.patch -mod_mono_iFolderAdminSetup_cs.patch -mod_mono_iFolderWebSetup_cs.patch -convert_relative_path_to_webbindir_variable.patch -ifdata.patch -SimiasServerSetup_use_simiasconfdir_in_SetupDefaultConfigPath.patch -use_webbindir_variable_configurein.patch -separate_client_server_dirs.patch -serverpaths_from_configure_v2.patch -dont_download_deleted_nodes.patch -remove_nodesFromServer.patch -home_never_network_drive.patch -DEBUG_log_default.patch diff --git a/www-apps/ifolder3-enterprise/files/3.8.4/serverpaths_from_configure_v2.patch b/www-apps/ifolder3-enterprise/files/3.8.4/serverpaths_from_configure_v2.patch deleted file mode 100644 index ff64f22..0000000 --- a/www-apps/ifolder3-enterprise/files/3.8.4/serverpaths_from_configure_v2.patch +++ /dev/null @@ -1,135 +0,0 @@ -submitted https://bugzilla.novell.com/show_bug.cgi?id=608882 - -Index: simias-1.8.3.10200.stable/src/core/SimiasClient/SimiasSetup.cs.in -=================================================================== ---- simias-1.8.3.10200.stable.orig/src/core/SimiasClient/SimiasSetup.cs.in 2010-04-15 10:16:23.000000000 -0400 -+++ simias-1.8.3.10200.stable/src/core/SimiasClient/SimiasSetup.cs.in 2010-07-19 12:37:33.315199428 -0400 -@@ -58,6 +58,8 @@ namespace Simias.Client - - // custom setup paths - private static string _webdir = "@webdir@"; -+ private static string _admindir = "@admindir@"; // defined in toplevel configure.in -+ private static string _webaccessdir = "@webaccessdir@"; // defined in toplevel configure.in - private static string _webbindir = "@webbindir@"; - private static string _modulesdir = "@modulesdir@"; - private static string _bootstrapdir = "@bootstrapdir@"; -@@ -134,6 +136,8 @@ namespace Simias.Client - _sharedstatedir = Path.GetFullPath(_sharedstatedir.Replace(_prefix, value)); - _sysconfdir = Path.GetFullPath(_sysconfdir.Replace(_prefix, value)); - _webdir = Path.GetFullPath(_webdir.Replace(_prefix, value)); -+ _admindir = Path.GetFullPath(_admindir.Replace(_prefix, value)); -+ _webaccessdir = Path.GetFullPath(_webaccessdir.Replace(_prefix, value)); - _webbindir = Path.GetFullPath(_webbindir.Replace(_prefix, value)); - _modulesdir = Path.GetFullPath(_modulesdir.Replace(_prefix, value)); - _bootstrapdir = Path.GetFullPath(_bootstrapdir.Replace(_prefix, value)); -@@ -251,6 +255,22 @@ namespace Simias.Client - } - - /// -+ /// admindir -+ /// -+ public static string admindir -+ { -+ get { return _admindir; } -+ } -+ -+ /// -+ /// webaccessdir -+ /// -+ public static string webaccessdir -+ { -+ get { return _webaccessdir; } -+ } -+ -+ /// - /// modulesdir - /// - public static string modulesdir -Index: simias-1.8.3.10200.stable/src/server/setup/SimiasServerSetup.cs -=================================================================== ---- simias-1.8.3.10200.stable.orig/src/server/setup/SimiasServerSetup.cs 2010-07-19 12:37:01.265198310 -0400 -+++ simias-1.8.3.10200.stable/src/server/setup/SimiasServerSetup.cs 2010-07-19 12:37:33.315199428 -0400 -@@ -95,7 +95,7 @@ namespace Novell.iFolder - - #region Member Fields - #if MONO -- string webPath = Path.GetFullPath("../lib/simias/web"); -+ string webPath = Path.Combine( SimiasSetup.webdir, "" ); // find better method! - #endif - - /// -@@ -820,7 +820,7 @@ Console.WriteLine("Url {0}", service.Url - } - - string MachineArch = Environment.GetEnvironmentVariable("OS_ARCH"); -- webPath =( MachineArch == null )? Path.GetFullPath("../lib/simias/web"): Path.GetFullPath("../lib64/simias/web"); -+ webPath = Path.Combine( SimiasSetup.webdir, ""); // find better methods! - - // restore policy - // ServicePointManager.CertificatePolicy = policy; -Index: simias-1.8.3.10200.stable/src/server/setup/iFolderAdminSetup.cs -=================================================================== ---- simias-1.8.3.10200.stable.orig/src/server/setup/iFolderAdminSetup.cs 2010-07-19 12:34:17.565198869 -0400 -+++ simias-1.8.3.10200.stable/src/server/setup/iFolderAdminSetup.cs 2010-07-19 12:37:33.315199428 -0400 -@@ -42,6 +42,7 @@ using System.Text.RegularExpressions; - using System.Security.Cryptography; - - using Novell.iFolder.Utility; -+using Simias.Client; // for SimiasSetup.admindir - - namespace Novell.iFolderApp.Web - { -@@ -59,9 +60,9 @@ namespace Novell.iFolderApp.Web - /// Web Path - /// - #if MONO -- string webPath = Path.GetFullPath("../lib/simias/admin"); -+ string webPath = Path.Combine(SimiasSetup.admindir, ""); - #else -- string webPath = Path.GetFullPath("./admin"); -+ string webPath = Path.Combine(SimiasSetup.admindir, ""); - #endif - - #region Options -@@ -148,7 +149,7 @@ namespace Novell.iFolderApp.Web - try - { - string MachineArch = Environment.GetEnvironmentVariable("OS_ARCH"); -- webPath =( MachineArch == null )? Path.GetFullPath("../lib/simias/admin"): Path.GetFullPath("../lib64/simias/admin"); -+ webPath = Path.Combine(SimiasSetup.admindir, ""); // lib vs lib64 set in configure.in - // uid.conf - string path = Path.GetFullPath("/etc/apache2/uid.conf"); - -Index: simias-1.8.3.10200.stable/src/server/setup/iFolderWebSetup.cs -=================================================================== ---- simias-1.8.3.10200.stable.orig/src/server/setup/iFolderWebSetup.cs 2010-07-19 12:34:21.005197750 -0400 -+++ simias-1.8.3.10200.stable/src/server/setup/iFolderWebSetup.cs 2010-07-19 12:37:33.315199428 -0400 -@@ -42,6 +42,7 @@ using System.Text.RegularExpressions; - using System.Security.Cryptography; - - using Novell.iFolder.Utility; -+using Simias.Client; // for SimiasSetup.webaccessdir - - namespace Novell.iFolderApp.Web - { -@@ -59,9 +60,9 @@ namespace Novell.iFolderApp.Web - /// Web Path - /// - #if MONO -- string webPath = Path.GetFullPath("../lib/simias/webaccess"); -+ string webPath = Path.Combine(SimiasSetup.webaccessdir, ""); - #else -- string webPath = Path.GetFullPath("./webaccess"); -+ string webPath = Path.Combine(SimiasSetup.webaccessdir, ""); - #endif - - #region Options -@@ -176,7 +177,7 @@ namespace Novell.iFolderApp.Web - try - { - string MachineArch = Environment.GetEnvironmentVariable("OS_ARCH"); -- webPath = (MachineArch == null) ? Path.GetFullPath("../lib/simias/webaccess"): Path.GetFullPath("../lib64/simias/webaccess"); -+ webPath = Path.Combine(SimiasSetup.webaccessdir, ""); // lib vs lib64 set in configure.in - // uid.conf - string path = Path.GetFullPath("/etc/apache2/uid.conf"); - diff --git a/www-apps/ifolder3-enterprise/files/3.8.4/use_lib_as_libdir_on_amd64.patch b/www-apps/ifolder3-enterprise/files/3.8.4/use_lib_as_libdir_on_amd64.patch deleted file mode 100644 index 5171f00..0000000 --- a/www-apps/ifolder3-enterprise/files/3.8.4/use_lib_as_libdir_on_amd64.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: simias-1.8.3.10200.stable/configure.in -=================================================================== ---- simias-1.8.3.10200.stable.orig/configure.in 2010-07-19 12:29:19.000000000 -0400 -+++ simias-1.8.3.10200.stable/configure.in 2010-07-19 12:30:02.515201941 -0400 -@@ -90,10 +90,10 @@ AM_CONDITIONAL(DOTNET, test "$CSC" = "cs - #HACK ALERT : for libflaim 64bit builds - case $host_cpu in - x86_64) -- LIB64='lib64' -+ LIB64='lib' - ;; - amd64) -- LIB64='lib64' -+ LIB64='lib' - ;; - *) - LIB64='lib' diff --git a/www-apps/ifolder3-enterprise/files/3.8.4/use_libdir_for_executables.patch b/www-apps/ifolder3-enterprise/files/3.8.4/use_libdir_for_executables.patch deleted file mode 100644 index 4d2bcd3..0000000 --- a/www-apps/ifolder3-enterprise/files/3.8.4/use_libdir_for_executables.patch +++ /dev/null @@ -1,138 +0,0 @@ -diff -uNr ifolder3-enterprise-3.8.4.7617.orig/src/server/setup/ifolder-admin-setup.in ifolder3-enterprise-3.8.4.7617/src/server/setup/ifolder-admin-setup.in ---- ifolder3-enterprise-3.8.4.7617.orig/src/server/setup/ifolder-admin-setup.in 2013-04-18 20:17:21.705193758 +0200 -+++ ifolder3-enterprise-3.8.4.7617/src/server/setup/ifolder-admin-setup.in 2013-04-18 20:29:53.211798633 +0200 -@@ -37,29 +37,7 @@ - #*******************************************************************************/ - - --OS_ARCH=`uname -m | grep -c x86_64` --if [ $OS_ARCH -gt 0 ] --then -- export OS_ARCH=`uname -m` --fi -- --rpm -q novell-ifolder-mono > /dev/null 2>&1 --if [ $? -gt 0 ] --then -- export MONO_PATH=@_webbindir_@:@_bindir_@ -+ export MONO_PATH=@_webbindir_@:@_bindir_@/../lib/simias - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:@_webbindir_@ - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:@_webbindir_@ -- cd @_bindir_@ -- -- mono @_bindir_@/iFolderAdminSetup.exe "$@" --else -- MONO_RUNTIME_PATH=@_bindir_@/../mono -- export MONO_PATH=$MONO_RUNTIME_PATH/lib/mono/:$MONO_RUNTIME_PATH/lib/mono/2.0:@_webbindir_@:@_bindir_@ -- source $MONO_RUNTIME_PATH/bin/novell-ifolder-mono-environment.sh -- export MONO_CFG_DIR=$MONO_RUNTIME_PATH/etc -- export IFOLDER_MOD_MONO_SERVER2_PATH=@_bindir_@ -- export IFOLDER_MONO_PATH=$MONO_RUNTIME_PATH -- cd @_bindir_@ -- -- $MONO_RUNTIME_PATH/bin/mono @_bindir_@/iFolderAdminSetup.exe "$@" --fi -+ mono @_bindir_@/../lib/simias/iFolderAdminSetup.exe "$@" -\ Kein Zeilenumbruch am Dateiende. -diff -uNr ifolder3-enterprise-3.8.4.7617.orig/src/server/setup/ifolder-web-setup.in ifolder3-enterprise-3.8.4.7617/src/server/setup/ifolder-web-setup.in ---- ifolder3-enterprise-3.8.4.7617.orig/src/server/setup/ifolder-web-setup.in 2013-04-18 20:17:21.706193745 +0200 -+++ ifolder3-enterprise-3.8.4.7617/src/server/setup/ifolder-web-setup.in 2013-04-18 20:28:57.609493757 +0200 -@@ -37,31 +37,7 @@ - #*******************************************************************************/ - - --OS_ARCH=`uname -m | grep -c x86_64` --if [ $OS_ARCH -gt 0 ] --then -- export OS_ARCH=`uname -m` --fi -- --rpm -q novell-ifolder-mono > /dev/null 2>&1 --if [ $? -gt 0 ] --then -- -- export MONO_PATH=@_webbindir_@:@_bindir_@ -+ export MONO_PATH=@_webbindir_@:@_bindir_@/../lib/simias - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:@_webbindir_@ - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:@_webbindir_@ -- cd @_bindir_@ -- -- mono @_bindir_@/iFolderWebSetup.exe "$@" -- --else -- MONO_RUNTIME_PATH=@_bindir_@/../mono -- export MONO_PATH=$MONO_RUNTIME_PATH/lib/mono/:$MONO_RUNTIME_PATH/lib/mono/2.0:@_webbindir_@:@_bindir_@ -- source $MONO_RUNTIME_PATH/bin/novell-ifolder-mono-environment.sh -- export MONO_CFG_DIR=$MONO_RUNTIME_PATH/etc -- export IFOLDER_MOD_MONO_SERVER2_PATH=@_bindir_@ -- export IFOLDER_MONO_PATH=$MONO_RUNTIME_PATH -- cd @_bindir_@ -- -- $MONO_RUNTIME_PATH/bin/mono @_bindir_@/iFolderWebSetup.exe "$@" --fi -+ mono @_bindir_@/../lib/simias/iFolderWebSetup.exe "$@" -\ Kein Zeilenumbruch am Dateiende. -diff -uNr ifolder3-enterprise-3.8.4.7617.orig/src/server/setup/Makefile.am ifolder3-enterprise-3.8.4.7617/src/server/setup/Makefile.am ---- ifolder3-enterprise-3.8.4.7617.orig/src/server/setup/Makefile.am 2013-04-18 20:17:21.706193745 +0200 -+++ ifolder3-enterprise-3.8.4.7617/src/server/setup/Makefile.am 2013-04-18 20:26:40.950202233 +0200 -@@ -158,14 +158,14 @@ - - install-exec-local: all $(DATA_FILES) - $(mkinstalldirs) $(DESTDIR)$(bindir) -- $(INSTALL_PROGRAM) SimiasServerSetup.exe $(DEBUG_FILES) $(DESTDIR)$(bindir) -- $(INSTALL_PROGRAM) SimiasServerSetup.exe.config $(DEBUG_FILES) $(DESTDIR)$(bindir) -- $(INSTALL_PROGRAM) iFolderWebSetup.exe $(DEBUG_FILES) $(DESTDIR)$(bindir) -- $(INSTALL_PROGRAM) iFolderWebSetup.exe.config $(DEBUG_FILES) $(DESTDIR)$(bindir) -- $(INSTALL_PROGRAM) iFolderAdminSetup.exe $(DEBUG_FILES) $(DESTDIR)$(bindir) -- $(INSTALL_PROGRAM) iFolderAdminSetup.exe.config $(DEBUG_FILES) $(DESTDIR)$(bindir) -- $(INSTALL_PROGRAM) iFolderProxySetup.exe $(DEBUG_FILES) $(DESTDIR)$(bindir) -- $(INSTALL_PROGRAM) CertUpdate.exe $(DEBUG_FILES) $(DESTDIR)$(bindir) -+ $(INSTALL_PROGRAM) SimiasServerSetup.exe $(DEBUG_FILES) $(DESTDIR)$(pkglibdir) -+ $(INSTALL_PROGRAM) SimiasServerSetup.exe.config $(DEBUG_FILES) $(DESTDIR)$(pkglibdir) -+ $(INSTALL_PROGRAM) iFolderWebSetup.exe $(DEBUG_FILES) $(DESTDIR)$(pkglibdir) -+ $(INSTALL_PROGRAM) iFolderWebSetup.exe.config $(DEBUG_FILES) $(DESTDIR)$(pkglibdir) -+ $(INSTALL_PROGRAM) iFolderAdminSetup.exe $(DEBUG_FILES) $(DESTDIR)$(pkglibdir) -+ $(INSTALL_PROGRAM) iFolderAdminSetup.exe.config $(DEBUG_FILES) $(DESTDIR)$(pkglibdir) -+ $(INSTALL_PROGRAM) iFolderProxySetup.exe $(DEBUG_FILES) $(DESTDIR)$(pkglibdir) -+ $(INSTALL_PROGRAM) CertUpdate.exe $(DEBUG_FILES) $(DESTDIR)$(pkglibdir) - if WINDOWS - $(INSTALL_PROGRAM) simias-server-setup.cmd $(DESTDIR)$(bindir) - $(INSTALL_PROGRAM) ifolder-web-setup.cmd $(DESTDIR)$(bindir) -diff -uNr ifolder3-enterprise-3.8.4.7617.orig/src/server/setup/simias-server-setup.in ifolder3-enterprise-3.8.4.7617/src/server/setup/simias-server-setup.in ---- ifolder3-enterprise-3.8.4.7617.orig/src/server/setup/simias-server-setup.in 2013-04-18 20:17:21.706193745 +0200 -+++ ifolder3-enterprise-3.8.4.7617/src/server/setup/simias-server-setup.in 2013-04-18 20:27:49.542344713 +0200 -@@ -36,31 +36,7 @@ - #* - #*******************************************************************************/ - --OS_ARCH=`uname -m | grep -c x86_64` --if [ $OS_ARCH -gt 0 ] --then -- export OS_ARCH=`uname -m` --fi -- --rpm -q novell-ifolder-mono > /dev/null 2>&1 --if [ $? -gt 0 ] --then -- -- export MONO_PATH=@_webbindir_@:@_bindir_@ -+ export MONO_PATH=@_webbindir_@:@_bindir_@/../lib/simias - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:@_webbindir_@ - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:@_webbindir_@ -- cd @_bindir_@ -- -- mono @_bindir_@/SimiasServerSetup.exe "$@" -- --else -- MONO_RUNTIME_PATH=@_bindir_@/../mono -- export MONO_PATH=$MONO_RUNTIME_PATH/lib/mono/:$MONO_RUNTIME_PATH/lib/mono/2.0:@_webbindir_@:@_bindir_@ -- source $MONO_RUNTIME_PATH/bin/novell-ifolder-mono-environment.sh -- export MONO_CFG_DIR=$MONO_RUNTIME_PATH/etc -- export IFOLDER_MOD_MONO_SERVER2_PATH=@_bindir_@ -- export IFOLDER_MONO_PATH=$MONO_RUNTIME_PATH -- cd @_bindir_@ -- -- $MONO_RUNTIME_PATH/bin/mono @_bindir_@/SimiasServerSetup.exe "$@" --fi -+ mono @_bindir_@/../lib/simias/SimiasServerSetup.exe "$@" -\ Kein Zeilenumbruch am Dateiende. diff --git a/www-apps/ifolder3-enterprise/files/3.8.4/use_mono_webserver2.patch b/www-apps/ifolder3-enterprise/files/3.8.4/use_mono_webserver2.patch deleted file mode 100644 index 91b8776..0000000 --- a/www-apps/ifolder3-enterprise/files/3.8.4/use_mono_webserver2.patch +++ /dev/null @@ -1,35 +0,0 @@ -Index: simias-1.8.3.10200.stable/configure.in -=================================================================== ---- simias-1.8.3.10200.stable.orig/configure.in 2010-07-19 12:29:01.505201104 -0400 -+++ simias-1.8.3.10200.stable/configure.in 2010-07-19 12:29:19.545199987 -0400 -@@ -697,7 +697,7 @@ AC_SUBST(XML2_LIBS) - # Configure MONO_WEBSERVER - # - MONO_WEBSERVER="no" --if test -e "/usr/lib/mono/1.0/Mono.WebServer.dll"; then -+if test -e "/usr/lib/mono/2.0/Mono.WebServer2.dll"; then - MONO_WEBSERVER="yes" - fi - -Index: simias-1.8.3.10200.stable/src/core/SimiasApp/Makefile.am -=================================================================== ---- simias-1.8.3.10200.stable.orig/src/core/SimiasApp/Makefile.am 2010-04-15 10:16:23.000000000 -0400 -+++ simias-1.8.3.10200.stable/src/core/SimiasApp/Makefile.am 2010-07-19 12:29:19.545199987 -0400 -@@ -7,7 +7,7 @@ else - SYSTEM_INSTALLER_LIB = - endif - --MONO_WEBSERVER_PATH = ../../../dependencies/external/Mono.WebServer -+MONO_WEBSERVER_PATH = /usr/lib/mono/2.0/ - - Simias_CSFILES = $(srcdir)/Simias.cs \ - $(srcdir)/SimiasAppInstallerClass.cs -@@ -16,7 +16,7 @@ Simias_CSFILES_CSC := $(subst /,$(SEP),$ - 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 --git a/www-apps/ifolder3-enterprise/files/3.8.4/use_system_gsoap.patch b/www-apps/ifolder3-enterprise/files/3.8.4/use_system_gsoap.patch deleted file mode 100644 index 0d37a5a..0000000 --- a/www-apps/ifolder3-enterprise/files/3.8.4/use_system_gsoap.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: simias-1.8.3.10200.stable/configure.in -=================================================================== ---- simias-1.8.3.10200.stable.orig/configure.in 2010-04-15 10:16:23.000000000 -0400 -+++ simias-1.8.3.10200.stable/configure.in 2010-07-19 12:29:01.505201104 -0400 -@@ -345,7 +345,7 @@ case $SIMIAS_OS in - AC_CHECK_PROG(CXX, g++, g++) - StoreProviderAssembly="SimiasLib.dll" - StoreProviderType="Simias.Storage.Provider.Flaim.FlaimProvider" -- GSOAP_PATH="$TOOLDIR/gsoap/linux-2.7" -+ GSOAP_PATH="/usr/bin" - mappingpath="${exec_prefix}/${LIB64}/simias/web/bin/Simias.exe" - ;; - # -Index: simias-1.8.3.10200.stable/src/core/libsimias/Makefile.am -=================================================================== ---- simias-1.8.3.10200.stable.orig/src/core/libsimias/Makefile.am 2010-04-15 10:16:23.000000000 -0400 -+++ simias-1.8.3.10200.stable/src/core/libsimias/Makefile.am 2010-07-19 12:29:01.505201104 -0400 -@@ -27,8 +27,8 @@ envC.c: $(srcdir)/stdsoap2.c - $(GSOAP_PATH)/soapcpp2 -c -penv $(srcdir)/env.h - - $(srcdir)/stdsoap2.c: -- cp $(GSOAP_PATH)/stdsoap2.h $(srcdir) -- cp $(GSOAP_PATH)/stdsoap2.c $(srcdir) -+ cp $(GSOAP_PATH)/../include/stdsoap2.h $(srcdir) -+ cp $(GSOAP_PATH)/../include/gsoap/stdsoap2.c $(srcdir) - - $(srcdir)/libsimias.h: $(srcdir)/stdsoap2.c $(SIMIAS_WSDL) - $(GSOAP_PATH)/wsdl2h -c -o $@ $(SIMIAS_WSDL) diff --git a/www-apps/ifolder3-enterprise/files/3.8.4/www-data_apache.patch b/www-apps/ifolder3-enterprise/files/3.8.4/www-data_apache.patch deleted file mode 100644 index c316808..0000000 --- a/www-apps/ifolder3-enterprise/files/3.8.4/www-data_apache.patch +++ /dev/null @@ -1,83 +0,0 @@ -Index: simias-1.8.3.9328.1+dfsg/src/server/setup/SimiasServerSetup.cs -=================================================================== ---- simias-1.8.3.9328.1+dfsg.orig/src/server/setup/SimiasServerSetup.cs 2010-04-24 10:18:57.000000000 -0400 -+++ simias-1.8.3.9328.1+dfsg/src/server/setup/SimiasServerSetup.cs 2010-04-24 10:20:54.524806732 -0400 -@@ -83,7 +83,7 @@ - private static string MasterAddressKey = "MasterAddress"; - private static string PublicAddressKey = "PublicAddress"; - private static string PrivateAddressKey = "PrivateAddress"; -- private static string oldConfigPath = "/var/lib/wwwrun/.local/share/simias/"; -+ private static string oldConfigPath = "/var/lib/apache/.local/share/simias/"; - - private static string TemplateScriptFile = "simias-server"; - -@@ -306,12 +306,12 @@ - /// - /// Apache User. - /// -- public Option apacheUser = new Option("apache-user", "Apache User", "Apache User", false, "wwwrun"); -+ public Option apacheUser = new Option("apache-user", "Apache User", "Apache User", false, "apache"); - - /// - /// Apache Group. - /// -- public Option apacheGroup = new Option("apache-group", "Apache Group", "Apache Group", false, "www"); -+ public Option apacheGroup = new Option("apache-group", "Apache Group", "Apache Group", false, "apache"); - - /// - /// Prompt for options. -Index: simias-1.8.3.9328.1+dfsg/src/server/setup/iFolderWebSetup.cs -=================================================================== ---- simias-1.8.3.9328.1+dfsg.orig/src/server/setup/iFolderWebSetup.cs 2010-04-24 10:18:57.000000000 -0400 -+++ simias-1.8.3.9328.1+dfsg/src/server/setup/iFolderWebSetup.cs 2010-04-24 10:20:54.524806732 -0400 -@@ -99,12 +99,12 @@ - /// - /// Apache User. - /// -- public Option apacheUser = new Option("apache-user", "Apache User", "Apache User to use for providing permissions", false, "wwwrun"); -+ public Option apacheUser = new Option("apache-user", "Apache User", "Apache User to use for providing permissions", false, "apache"); - - /// - /// Apache Group. - /// -- public Option apacheGroup = new Option("apache-group", "Apache Group", "Apache Group to use for providing permissions", false, "www"); -+ public Option apacheGroup = new Option("apache-group", "Apache Group", "Apache Group to use for providing permissions", false, "apache"); - - /// - /// The port to connect on. -Index: simias-1.8.3.9328.1+dfsg/src/server/setup/iFolderAdminSetup.cs -=================================================================== ---- simias-1.8.3.9328.1+dfsg.orig/src/server/setup/iFolderAdminSetup.cs 2010-04-24 10:18:57.000000000 -0400 -+++ simias-1.8.3.9328.1+dfsg/src/server/setup/iFolderAdminSetup.cs 2010-04-24 10:20:54.524806732 -0400 -@@ -99,12 +99,12 @@ - /// - /// Apache User. - /// -- public Option apacheUser = new Option("apache-user", "Apache User", "Apache User to use for providing permissions", false, "wwwrun"); -+ public Option apacheUser = new Option("apache-user", "Apache User", "Apache User to use for providing permissions", false, "apache"); - - /// - /// Apache Group. - /// -- public Option apacheGroup = new Option("apache-group", "Apache Group", "Apache Group to use for providing permissions", false, "www"); -+ public Option apacheGroup = new Option("apache-group", "Apache Group", "Apache Group to use for providing permissions", false, "apache"); - - /// - /// The port to connect on. -Index: simias-1.8.3.9328.1+dfsg/src/core/CollectionStore/DataStore.cs -=================================================================== ---- simias-1.8.3.9328.1+dfsg.orig/src/core/CollectionStore/DataStore.cs 2010-04-24 10:21:15.314805896 -0400 -+++ simias-1.8.3.9328.1+dfsg/src/core/CollectionStore/DataStore.cs 2010-04-24 10:23:03.274988324 -0400 -@@ -86,10 +86,10 @@ - public bool Enabled; - - /// -- private const string apacheUser = "wwwrun"; -+ private const string apacheUser = "apache"; - - /// -- private const string apacheGroup = "www"; -+ private const string apacheGroup = "apache"; - - - diff --git a/www-apps/ifolder3-enterprise/files/3.9.1/gentoo-apache-path.patch b/www-apps/ifolder3-enterprise/files/3.9.1/gentoo-apache-path.patch new file mode 100644 index 0000000..77fe667 --- /dev/null +++ b/www-apps/ifolder3-enterprise/files/3.9.1/gentoo-apache-path.patch @@ -0,0 +1,212 @@ +diff -uNr ifolder3-enterprise-3.9.1.7638.orig/src/server/setup/CertUpdate.cs ifolder3-enterprise-3.9.1.7638/src/server/setup/CertUpdate.cs +--- ifolder3-enterprise-3.9.1.7638.orig/src/server/setup/CertUpdate.cs 2013-04-19 19:23:31.097433272 +0200 ++++ ifolder3-enterprise-3.9.1.7638/src/server/setup/CertUpdate.cs 2013-04-19 19:33:16.333116819 +0200 +@@ -62,7 +62,7 @@ + /// + class CertUpdate + { +- private const string apacheSimiasConf = "/etc/apache2/conf.d/simias.conf"; ++ private const string apacheSimiasConf = "/etc/apache2/modules.d/90_simias.conf"; + private const string SearchStr = "MonoSetEnv simias10 \"SimiasRunAsServer=true;SimiasDataDir="; + private const string datapathEnvStr = "SimiasDataDir="; + private const string certMgrCmd= "certmgr"; +diff -uNr ifolder3-enterprise-3.9.1.7638.orig/src/server/setup/iFolderAdminSetup.cs ifolder3-enterprise-3.9.1.7638/src/server/setup/iFolderAdminSetup.cs +--- ifolder3-enterprise-3.9.1.7638.orig/src/server/setup/iFolderAdminSetup.cs 2013-04-19 19:23:31.096433285 +0200 ++++ ifolder3-enterprise-3.9.1.7638/src/server/setup/iFolderAdminSetup.cs 2013-04-19 19:29:48.319717345 +0200 +@@ -362,11 +362,11 @@ + } + + /// +- /// Read the /etc/apache2/conf.d/simias.conf File and return data path. ++ /// Read the /etc/apache2/modules.d/90_simias.conf File and return data path. + /// + string ReadModMonoConfiguration() + { +- string path = Path.GetFullPath( "/etc/apache2/conf.d/simias.conf" ); ++ string path = Path.GetFullPath( "/etc/apache2/modules.d/90_simias.conf" ); + string dataPath = null; + if ( path == null || File.Exists( path ) == false ) + return null; +@@ -397,11 +397,11 @@ + } + + /// +- /// Setup the /etc/apache2/conf.d/ifolder_web.conf File ++ /// Setup the /etc/apache2/modules.d/90_ifolder_web.conf File + /// + void SetupModMono() + { +- string path = "/etc/apache2/conf.d/ifolder_admin.conf"; ++ string path = "/etc/apache2/modules.d/90_ifolder_admin.conf"; + string datapath = ReadModMonoConfiguration(); + + +@@ -436,7 +436,7 @@ + sslPrefix = "#"; + } + if( iFolderMonoPath != null ) +- writer.WriteLine( "Include {0}{1}", iFolderMonoPath, "/etc/apache2/conf.d//mod_mono.conf" ); ++ writer.WriteLine( "Include {0}{1}", iFolderMonoPath, "/etc/apache2/modules.d/70_mod_mono.conf" ); + else + { + string mod_mono2_path = "/etc/apache2/modules.d/70_mod_mono.conf"; +diff -uNr ifolder3-enterprise-3.9.1.7638.orig/src/server/setup/ifolder_cluster_setup ifolder3-enterprise-3.9.1.7638/src/server/setup/ifolder_cluster_setup +--- ifolder3-enterprise-3.9.1.7638.orig/src/server/setup/ifolder_cluster_setup 2013-04-19 19:23:31.097433272 +0200 ++++ ifolder3-enterprise-3.9.1.7638/src/server/setup/ifolder_cluster_setup 2013-04-19 19:33:02.054295329 +0200 +@@ -36,7 +36,7 @@ + #* + #*******************************************************************************/ + +-CONF_FILE_PATH=/etc/apache2/conf.d ++CONF_FILE_PATH=/etc/apache2/modules.d + IFOLDER32BIT="/opt/novell/ifolder3/lib/simias" + IFOLDER64BIT="/opt/novell/ifolder3/lib64/simias" + OS_ARCH=`uname -m | grep -c x86_64` +diff -uNr ifolder3-enterprise-3.9.1.7638.orig/src/server/setup/ifolder_mono_setup.in ifolder3-enterprise-3.9.1.7638/src/server/setup/ifolder_mono_setup.in +--- ifolder3-enterprise-3.9.1.7638.orig/src/server/setup/ifolder_mono_setup.in 2013-04-19 19:23:31.096433285 +0200 ++++ ifolder3-enterprise-3.9.1.7638/src/server/setup/ifolder_mono_setup.in 2013-04-19 19:34:30.654187678 +0200 +@@ -37,7 +37,7 @@ + #*******************************************************************************/ + + iFPrefix=@_bindir_@/../ +-CONF_FILE_PATH=/etc/apache2/conf.d ++CONF_FILE_PATH=/etc/apache2/modules.d + MOD_MONO_CONF_PATH="/etc/apache2/mod_mono.conf" + MOD_MONO_CONF_FILE_PATH="/etc/apache2/conf.d/mod_mono.conf" + IFOLDER32BIT="/opt/novell/ifolder3/lib/simias" +diff -uNr ifolder3-enterprise-3.9.1.7638.orig/src/server/setup/iFolder_proxy_rights_assign.in ifolder3-enterprise-3.9.1.7638/src/server/setup/iFolder_proxy_rights_assign.in +--- ifolder3-enterprise-3.9.1.7638.orig/src/server/setup/iFolder_proxy_rights_assign.in 2013-04-19 19:23:31.096433285 +0200 ++++ ifolder3-enterprise-3.9.1.7638/src/server/setup/iFolder_proxy_rights_assign.in 2013-04-19 19:30:13.926397217 +0200 +@@ -83,7 +83,7 @@ + fi + + # get the value of datapath +-datapath=`grep SimiasDataDir /etc/apache2/conf.d/simias.conf | gawk 'BEGIN { RS=";|\"" } { if (/^SimiasDataDir/) print gensub(/SimiasDataDir=/, "", 1) }'` ++datapath=`grep SimiasDataDir /etc/apache2/modules.d/90_simias.conf | gawk 'BEGIN { RS=";|\"" } { if (/^SimiasDataDir/) print gensub(/SimiasDataDir=/, "", 1) }'` + touch $datapath/proxydetails + echo "proxy_rights_assign">>$datapath/proxydetails + echo "$1">>$datapath/proxydetails +diff -uNr ifolder3-enterprise-3.9.1.7638.orig/src/server/setup/iFolder_retrieve_proxy_creds.in ifolder3-enterprise-3.9.1.7638/src/server/setup/iFolder_retrieve_proxy_creds.in +--- ifolder3-enterprise-3.9.1.7638.orig/src/server/setup/iFolder_retrieve_proxy_creds.in 2013-04-19 19:23:31.096433285 +0200 ++++ ifolder3-enterprise-3.9.1.7638/src/server/setup/iFolder_retrieve_proxy_creds.in 2013-04-19 19:26:55.184881828 +0200 +@@ -40,7 +40,7 @@ + + MONO_CMD="" + function getProxy(){ +- datapath=`grep SimiasDataDir /etc/apache2/conf.d/simias.conf | gawk 'BEGIN { RS=";|\"" } { if (/^SimiasDataDir/) print gensub(/SimiasDataDir=/, "", 1) }'` ++ datapath=`grep SimiasDataDir /etc/apache2/modules.d/90_simias.conf | gawk 'BEGIN { RS=";|\"" } { if (/^SimiasDataDir/) print gensub(/SimiasDataDir=/, "", 1) }'` + if [ $1 = "username" ]; then + $MONO_CMD iFolderProxySetup.exe $datapath retrieve_proxy_creds username $2 $3 + exit $? +diff -uNr ifolder3-enterprise-3.9.1.7638.orig/src/server/setup/iFolder_update_proxy_cred_store.in ifolder3-enterprise-3.9.1.7638/src/server/setup/iFolder_update_proxy_cred_store.in +--- ifolder3-enterprise-3.9.1.7638.orig/src/server/setup/iFolder_update_proxy_cred_store.in 2013-04-19 19:23:31.096433285 +0200 ++++ ifolder3-enterprise-3.9.1.7638/src/server/setup/iFolder_update_proxy_cred_store.in 2013-04-19 19:26:39.355079728 +0200 +@@ -82,7 +82,7 @@ + fi + + # get the value of datapath +-datapath=`grep SimiasDataDir /etc/apache2/conf.d/simias.conf | gawk 'BEGIN { RS=";|\"" } { if (/^SimiasDataDir/) print gensub(/SimiasDataDir=/, "", 1) }'` ++datapath=`grep SimiasDataDir /etc/apache2/modules.d/90_simias.conf | gawk 'BEGIN { RS=";|\"" } { if (/^SimiasDataDir/) print gensub(/SimiasDataDir=/, "", 1) }'` + touch $datapath/proxydetails + echo update_proxy_cred_store>>$datapath/proxydetails + echo "$1">>$datapath/proxydetails +diff -uNr ifolder3-enterprise-3.9.1.7638.orig/src/server/setup/iFolderWebSetup.cs ifolder3-enterprise-3.9.1.7638/src/server/setup/iFolderWebSetup.cs +--- ifolder3-enterprise-3.9.1.7638.orig/src/server/setup/iFolderWebSetup.cs 2013-04-19 19:23:31.097433272 +0200 ++++ ifolder3-enterprise-3.9.1.7638/src/server/setup/iFolderWebSetup.cs 2013-04-19 19:32:49.914447098 +0200 +@@ -404,11 +404,11 @@ + } + + /// +- /// Read the /etc/apache2/conf.d/simias.conf File and return data path. ++ /// Read the /etc/apache2/modules.d/90_simias.conf File and return data path. + /// + string ReadModMonoConfiguration() + { +- string path = Path.GetFullPath( "/etc/apache2/conf.d/simias.conf" ); ++ string path = Path.GetFullPath( "/etc/apache2/modules.d/90_simias.conf" ); + string dataPath = null; + if ( path == null || File.Exists( path ) == false ) + return null; +@@ -440,11 +440,11 @@ + + + /// +- /// Setup the /etc/apache2/conf.d/ifolder_web.conf File ++ /// Setup the /etc/apache2/modules.d/90_ifolder_web.conf File + /// + void SetupModMono() + { +- string path = "/etc/apache2/conf.d/ifolder_web.conf"; ++ string path = "/etc/apache2/modules.d/90_ifolder_web.conf"; + string datapath = ReadModMonoConfiguration(); + + +diff -uNr ifolder3-enterprise-3.9.1.7638.orig/src/server/setup/SimiasServerSetup.cs ifolder3-enterprise-3.9.1.7638/src/server/setup/SimiasServerSetup.cs +--- ifolder3-enterprise-3.9.1.7638.orig/src/server/setup/SimiasServerSetup.cs 2013-04-19 19:23:31.096433285 +0200 ++++ ifolder3-enterprise-3.9.1.7638/src/server/setup/SimiasServerSetup.cs 2013-04-19 19:31:46.245243073 +0200 +@@ -2437,11 +2437,11 @@ + } + + /// +- /// Setup the /etc/apache2/conf.d/simias.conf File ++ /// Setup the /etc/apache2/modules.d/90_simias.conf File + /// + void SetupModMono() + { +- string path = Path.GetFullPath( "/etc/apache2/conf.d/simias.conf" ); ++ string path = Path.GetFullPath( "/etc/apache2/modules.d/90_simias.conf" ); + Console.WriteLine("Configuring {0}...", path); + string ModMonoServer2 = Environment.GetEnvironmentVariable("IFOLDER_MOD_MONO_SERVER2_PATH"); + string iFolderMonoPath = Environment.GetEnvironmentVariable("IFOLDER_MONO_PATH"); +@@ -2452,7 +2452,7 @@ + using( StreamWriter writer = File.CreateText( path ) ) + { + /* example +- Include /etc/apache2/conf.d/mod_mono.conf ++ Include /etc/apache2/modules.d/70_mod_mono.conf + + Alias /simias10 "/usr/web" + AddMonoApplications simias10 "/simias10:/usr/web" +@@ -2513,11 +2513,11 @@ + } + + /// +- /// Read the /etc/apache2/conf.d/simias.conf File and return data path. ++ /// Read the /etc/apache2/modules.d/90_simias.conf File and return data path. + /// + string ReadModMonoConfiguration() + { +- string path = Path.GetFullPath( "/etc/apache2/conf.d/simias.conf" ); ++ string path = Path.GetFullPath( "/etc/apache2/modules.d/90_simias.conf" ); + string dataPath = null; + if ( path == null || File.Exists( path ) == false ) + return null; +diff -uNr ifolder3-enterprise-3.9.1.7638.orig/src/utils/restore/iFolderServer.cs ifolder3-enterprise-3.9.1.7638/src/utils/restore/iFolderServer.cs +--- ifolder3-enterprise-3.9.1.7638.orig/src/utils/restore/iFolderServer.cs 2013-04-19 19:23:31.126432910 +0200 ++++ ifolder3-enterprise-3.9.1.7638/src/utils/restore/iFolderServer.cs 2013-04-19 19:33:42.493789766 +0200 +@@ -3351,11 +3351,11 @@ + } + + /// +- /// Read the /etc/apache2/conf.d/simias.conf File and return data path. ++ /// Read the /etc/apache2/modules.d/90_simias.conf File and return data path. + /// + public static string ReadModMonoConfiguration() + { +- string path = Path.GetFullPath( "/etc/apache2/conf.d/simias.conf" ); ++ string path = Path.GetFullPath( "/etc/apache2/modules.d/90_simias.conf" ); + string dataPath = null; + if ( path == null || File.Exists( path ) == false ) + return null; +diff -uNr ifolder3-enterprise-3.9.1.7638.orig/src/webservices/iFolderServer.cs ifolder3-enterprise-3.9.1.7638/src/webservices/iFolderServer.cs +--- ifolder3-enterprise-3.9.1.7638.orig/src/webservices/iFolderServer.cs 2013-04-19 19:23:31.102433210 +0200 ++++ ifolder3-enterprise-3.9.1.7638/src/webservices/iFolderServer.cs 2013-04-19 19:34:14.288392279 +0200 +@@ -1221,7 +1221,7 @@ + try + { + +- string path = Path.GetFullPath("/etc/apache2/conf.d/simias.conf"); ++ string path = Path.GetFullPath("/etc/apache2/modules.d/90_simias.conf"); + + TextReader reader = (TextReader)File.OpenText(path); + diff --git a/www-apps/ifolder3-enterprise/files/3.9.1/ifdata.patch b/www-apps/ifolder3-enterprise/files/3.9.1/ifdata.patch index 75f9225..dd8ec8c 100644 --- a/www-apps/ifolder3-enterprise/files/3.9.1/ifdata.patch +++ b/www-apps/ifolder3-enterprise/files/3.9.1/ifdata.patch @@ -6,7 +6,7 @@ diff -uNr ifolder3-enterprise-3.9.1.7638.orig/src/core/ifdata ifolder3-enterpris /sbin/ifconfig | grep '\' | cut -f2 -d' ' | cut -f1 -d' ' else - /sbin/ifconfig | grep 'inet addr' | cut -f2 -d':' | cut -f1 -d' ' -+ if [ -f /sbin/ip ] then ++ if [ -f /sbin/ip ] ; then + /sbin/ip addr | awk '/inet / {sub(/\/.*/, "", $2); print $2}' + else + /sbin/ifconfig | grep "inet addr" | awk -F: '{print $2}' | awk '{print $1}' diff --git a/www-apps/ifolder3-enterprise/files/3.8.4/use_webbindir_variable_configurein.patch b/www-apps/ifolder3-enterprise/files/3.9.1/use_webbindir_variable_configurein_no_gsoap.patch similarity index 97% rename from www-apps/ifolder3-enterprise/files/3.8.4/use_webbindir_variable_configurein.patch rename to www-apps/ifolder3-enterprise/files/3.9.1/use_webbindir_variable_configurein_no_gsoap.patch index a30dbe7..c2e1839 100644 --- a/www-apps/ifolder3-enterprise/files/3.8.4/use_webbindir_variable_configurein.patch +++ b/www-apps/ifolder3-enterprise/files/3.9.1/use_webbindir_variable_configurein_no_gsoap.patch @@ -37,7 +37,7 @@ Index: simias-1.8.3.10200.0/configure.in @@ -346,7 +370,7 @@ case $SIMIAS_OS in StoreProviderAssembly="SimiasLib.dll" StoreProviderType="Simias.Storage.Provider.Flaim.FlaimProvider" - GSOAP_PATH="/usr/bin" + GSOAP_PATH="$TOOLDIR/gsoap/linux-2.7" - mappingpath="${exec_prefix}/${LIB64}/simias/web/bin/Simias.exe" + mappingpath="${webbindir}/Simias.exe" ;; diff --git a/www-apps/ifolder3-enterprise/files/3.9.1/xps-MonoWebServer2.patch b/www-apps/ifolder3-enterprise/files/3.9.1/xps-MonoWebServer2.patch new file mode 100644 index 0000000..3d0b77e --- /dev/null +++ b/www-apps/ifolder3-enterprise/files/3.9.1/xps-MonoWebServer2.patch @@ -0,0 +1,12 @@ +diff -uNr ifolder3-enterprise-3.9.1.7638.orig/configure.in ifolder3-enterprise-3.9.1.7638/configure.in +--- ifolder3-enterprise-3.9.1.7638.orig/configure.in 2013-04-20 06:30:21.793171829 +0200 ++++ ifolder3-enterprise-3.9.1.7638/configure.in 2013-04-20 06:31:35.035256177 +0200 +@@ -714,7 +714,7 @@ + # Configure MONO_WEBSERVER + # + MONO_WEBSERVER_DLL="Mono.WebServer.dll" +-pkg-config --atleast-version=2.8 xsp-2 ++pkg-config --atleast-version=2.6 xsp-2 + if test $? -eq 0; then + MONO_WEBSERVER_DLL="Mono.WebServer2.dll" + fi diff --git a/www-apps/ifolder3-enterprise/ifolder3-enterprise-3.8.4.7617.ebuild b/www-apps/ifolder3-enterprise/ifolder3-enterprise-3.8.4.7617.ebuild deleted file mode 100644 index ff91150..0000000 --- a/www-apps/ifolder3-enterprise/ifolder3-enterprise-3.8.4.7617.ebuild +++ /dev/null @@ -1,154 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" -WANT_AUTOMAKE=1.9 - -ESVN_REPO_URI="https://simias.svn.sourceforge.net/svnroot/simias/branches/iFolder_3.8.4_updates/@${PV/3.8.4./}" -inherit autotools eutils mono subversion toolchain-funcs versionator - -MY_PV=$(replace_version_separator 3 '-' ) -MY_PVV=$(replace_version_separator 3 'beta' $MY_PV ) -MY_PVM=$(get_version_component_range 1-2 ) -MY_PVR=$(get_version_component_range 1-3 ) - - -DESCRIPTION="Enterprise backend for iFolder" -HOMEPAGE="http://www.ifolder.com/" - - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -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.9* - sys-fs/e2fsprogs - sys-devel/gcc:4.3" -RDEPEND=">=dev-lang/mono-2.2 - >=dev-dotnet/log4net-1.2.9 - >=www-apache/mod_mono-1.2.1" -#PDEPEND="=www-apps/ifolder3-enterprise-plugins-${PV}" - -simiasdatadir="${ROOT}var/lib/simias" -gentoo_config_dir="${ROOT}etc/simias/apache/gentoo" -logdir="${ROOT}var/log/ifolder3" -DEVNULL=/dev/null - -src_prepare() { -# rm -rf dependencies - find ${S} -name *.dll -type f | xargs rm -fv - epatch "${FILESDIR}"/${MY_PVR}/use_system_gsoap.patch - epatch "${FILESDIR}"/${MY_PVR}/use_mono_webserver2.patch - # epatch "${FILESDIR}"/${MY_PVR}/use_lib_as_libdir_on_amd64.patch - epatch "${FILESDIR}"/${MY_PVR}/use_libdir_for_executables.patch - epatch "${FILESDIR}"/${MY_PVR}/SimiasLib.dll.config-use-systemwide-FlaimWrapper.so.patch - epatch "${FILESDIR}"/${MY_PVR}/www-data_apache.patch - epatch "${FILESDIR}"/${MY_PVR}/mod_mono_path.patch - epatch "${FILESDIR}"/${MY_PVR}/mod_mono_SimiasServerSetup_cs.patch - epatch "${FILESDIR}"/${MY_PVR}/mod_mono_iFolderAdminSetup_cs.patch - epatch "${FILESDIR}"/${MY_PVR}/mod_mono_iFolderWebSetup_cs.patch - epatch "${FILESDIR}"/${MY_PVR}/ifdata.patch - epatch "${FILESDIR}"/${MY_PVR}/SimiasServerSetup_use_simiasconfdir_in_SetupDefaultConfigPath.patch - epatch "${FILESDIR}"/${MY_PVR}/use_webbindir_variable_configurein.patch - epatch "${FILESDIR}"/${MY_PVR}/separate_client_server_dirs.patch - epatch "${FILESDIR}"/${MY_PVR}/serverpaths_from_configure_v2.patch - epatch "${FILESDIR}"/${MY_PVR}/dont_download_deleted_nodes.patch - epatch "${FILESDIR}"/${MY_PVR}/remove_nodesFromServer.patch - epatch "${FILESDIR}"/${MY_PVR}/home_never_network_drive.patch - epatch "${FILESDIR}"/${MY_PVR}/DEBUG_log_default.patch - eautoreconf || die "eautoreconf failed" -} - -src_configure() { - for GCC_SUB_VERSION in 0 1 2 3 4 5 6 7 8 9 ; do - if has_version =sys-devel/gcc-4.3.$GCC_SUB_VERSION* ; then - local GCC_SLOT_VERSION=-4.3.$GCC_SUB_VERSION - fi - done - - CSC=gmcs WSDL=wsdl CXX="$(tc-getCXX)$GCC_SLOT_VERSION" CC="$(tc-getCC)$GCC_SLOT_VERSION" econf --with-simiasdatadir=${simiasdatadir} || die "configure failed" -} - -src_compile() { - emake -j1 || die "build 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 ifolder3-enterprise 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 - ifolder-admin-setup - ifolder-web-setup - chown -R apache:apache "${simiasdatadir}" - - echo "" - einfo "Congratulations, configuration complete!" - ewarn "Now login to http:///admin/" - ewarn "to initialize the database and create users" - ewarn "if this is the first time running the server" - ewarn "After you have created users you can login" - ewarn "to the web interface by visiting" - ewarn "http:///ifolder/" - echo "" - ewarn "Do NOT use epiphany" - -} diff --git a/www-apps/ifolder3-enterprise/ifolder3-enterprise-3.9.1.7638.ebuild b/www-apps/ifolder3-enterprise/ifolder3-enterprise-3.9.1.7638.ebuild index 89fbc43..33b4b56 100644 --- a/www-apps/ifolder3-enterprise/ifolder3-enterprise-3.9.1.7638.ebuild +++ b/www-apps/ifolder3-enterprise/ifolder3-enterprise-3.9.1.7638.ebuild @@ -6,7 +6,7 @@ EAPI="2" WANT_AUTOMAKE=1.9 ESVN_REPO_URI="https://simias.svn.sourceforge.net/svnroot/simias/branches/iFolder_3.9.1_updates/@${PV/3.9.1./}" -inherit autotools eutils mono subversion toolchain-funcs versionator +inherit autotools eutils mono subversion toolchain-funcs versionator multilib MY_PV=$(replace_version_separator 3 '-' ) MY_PVV=$(replace_version_separator 3 'beta' $MY_PV ) @@ -24,17 +24,18 @@ KEYWORDS="~amd64 ~arm ~x86" RESTRICT="mirror" DEPEND="!net-misc/simias - >=dev-lang/mono-2.2 + =dev-lang/mono-2.6* >=dev-db/libflaim-4.9.617 >=dev-dotnet/log4net-1.2.9 >=www-apache/mod_mono-1.2.1 =net-libs/gsoap-2.7.9* sys-fs/e2fsprogs sys-devel/gcc:4.3" -RDEPEND=">=dev-lang/mono-2.2 +RDEPEND="=dev-lang/mono-2.6* >=dev-dotnet/log4net-1.2.9 - >=www-apache/mod_mono-1.2.1" -#PDEPEND="=www-apps/ifolder3-enterprise-plugins-${PV}" + =www-apache/mod_mono-2.6*" +PDEPEND="=www-apps/ifolder3-enterprise-plugins-${MY_PVR}* + =www-apps/ifolder3-clients-${MY_PVR}*" simiasdatadir="${ROOT}var/lib/simias" gentoo_config_dir="${ROOT}etc/simias/apache/gentoo" @@ -44,7 +45,7 @@ DEVNULL=/dev/null src_prepare() { # rm -rf dependencies find ${S} -name *.dll -type f | xargs rm -fv - epatch "${FILESDIR}"/${MY_PVR}/use_system_gsoap.patch +# epatch "${FILESDIR}"/${MY_PVR}/use_system_gsoap.patch #epatch "${FILESDIR}"/${MY_PVR}/use_wsdl_not_wsdl1.patch epatch "${FILESDIR}"/${MY_PVR}/use_mono_webserver2.patch #epatch "${FILESDIR}"/${MY_PVR}/use_lib_as_libdir_on_amd64.patch @@ -58,14 +59,18 @@ src_prepare() { #epatch "${FILESDIR}"/${MY_PVR}/convert_relative_path_to_webbindir_variable.patch epatch "${FILESDIR}"/${MY_PVR}/ifdata.patch epatch "${FILESDIR}"/${MY_PVR}/SimiasServerSetup_use_simiasconfdir_in_SetupDefaultConfigPath.patch - epatch "${FILESDIR}"/${MY_PVR}/use_webbindir_variable_configurein.patch + # epatch "${FILESDIR}"/${MY_PVR}/use_webbindir_variable_configurein.patch + epatch "${FILESDIR}"/${MY_PVR}/use_webbindir_variable_configurein_no_gsoap.patch epatch "${FILESDIR}"/${MY_PVR}/separate_client_server_dirs.patch epatch "${FILESDIR}"/${MY_PVR}/serverpaths_from_configure_v2.patch epatch "${FILESDIR}"/${MY_PVR}/dont_download_deleted_nodes.patch epatch "${FILESDIR}"/${MY_PVR}/remove_nodesFromServer.patch epatch "${FILESDIR}"/${MY_PVR}/home_never_network_drive.patch epatch "${FILESDIR}"/${MY_PVR}/DEBUG_log_default.patch + epatch "${FILESDIR}"/${MY_PVR}/gentoo-apache-path.patch + epatch "${FILESDIR}"/${MY_PVR}/xps-MonoWebServer2.patch eautoreconf || die "eautoreconf failed" +# die } src_configure() { @@ -79,7 +84,16 @@ src_configure() { } src_compile() { - emake -j1 || die "build failed" + pushd dependencies/external/tools/gsoap/linux-2.7 + cd src + make -f MakefileMacOSX COFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" LIBS="" + cp soapcpp2 .. + cd .. + cd wsdl + make -f MakefileSolaris COFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" LIBS="-lnsl" + cd .. + popd + emake -j1 || die "build failed" } src_install() { @@ -97,35 +111,42 @@ src_install() { # tar -zxvf ${FILESDIR}/setup-files.tar.gz -C ${D}/${simiasdatadir} # fi + # symlink shared server components to the server files (could do a find here as above?) + rm -fv ${D}/usr/$(get_libdir)/simias/admin/bin/SimiasClient.dll + dosym ../../server/bin/SimiasClient.dll /usr/$(get_libdir)/simias/admin/bin/SimiasLib.dll + rm -fv ${D}/usr/$(get_libdir)/simias/admin/bin/SimiasLib.dll + dosym ../../server/bin/SimiasLib.dll /usr/$(get_libdir)/simias/admin/bin/SimiasLib.dll + rm -fv ${D}/usr/$(get_libdir)/simias/webaccess/bin/SimiasLib.dll + dosym ../../server/bin/SimiasLib.dll /usr/$(get_libdir)/simias/webaccess/bin/SimiasLib.dll + + keepdir /var/www/.config + fowners apache:apache /var/www/.config + keepdir /var/www/.mono + fowners apache:apache /var/www/.mono } 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" + ewarn "Please make sure that your Apache is Correctly configured for the iFolder System" + ewarn "This means if you want to use SSL, apache needs to be correctly setup for this" + ewarn "with the for produktion certifikates because ifolder setup stores them into the" + ewarn "simias DB." 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" + ewarn "You can check by running ps aux | grep mono" echo "" ewarn "You must run emerge --config ifolder3-enterprise 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 "!!! Please make sure that your apache is configured corectly and is running !!!" + ewarn "!!! before you start the configuration of the iFolder System !!!" 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(){ diff --git a/www-apps/ifolder3-enterprise/metadata.xml b/www-apps/ifolder3-enterprise/metadata.xml index 7e32869..0830b32 100644 --- a/www-apps/ifolder3-enterprise/metadata.xml +++ b/www-apps/ifolder3-enterprise/metadata.xml @@ -1,5 +1,7 @@ -maintainer-wanted + + mario.fetka@gmail.com +