From 2bb9cb61b7a1347d19f69ec1b006332a25d58366 Mon Sep 17 00:00:00 2001 From: geos_one Date: Wed, 8 Jun 2011 15:26:24 +0000 Subject: [PATCH] bump git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/ifolder@2911 6952d904-891a-0410-993b-d76249ca496b --- net-libs/gsoap/Manifest | 2 + net-libs/gsoap/gsoap-2.8.2-r1.ebuild | 76 +++++++++ net-misc/ifolder3-client-plugins/Manifest | 1 + ...der3-client-plugins-3.8.0.9328.1-r1.ebuild | 77 +++++++++ net-misc/ifolder3/Manifest | 4 +- .../ifolder3/ifolder3-3.8.0.10197.1.ebuild | 67 ++++++++ .../ifolder3/ifolder3-3.8.0.9328.1.ebuild | 5 +- net-misc/simias/Manifest | 2 + .../files/simias-1.8-use_system_gsoap-3.patch | 27 +++ .../files/simias-1.8.2-libflaim-1.patch | 13 ++ net-misc/simias/simias-1.8.3.10196.1.ebuild | 65 ++++++++ www-apps/ifolder3-enterprise/Manifest | 2 +- .../files/DEBUG_log_default.patch | 44 +++++ ...onfig-use-systemwide-FlaimWrapper.so.patch | 10 ++ ...iasconfdir_in_SetupDefaultConfigPath.patch | 51 ++++++ ..._relative_path_to_webbindir_variable.patch | 30 ++++ .../files/dont_download_deleted_nodes.patch | 40 +++++ .../files/home_never_network_drive.patch | 23 +++ .../ifolder3-enterprise/files/ifdata.patch | 16 ++ .../files/mod_mono_SimiasServerSetup_cs.patch | 22 +++ .../files/mod_mono_iFolderAdminSetup_cs.patch | 27 +++ .../files/mod_mono_iFolderWebSetup_cs.patch | 31 ++++ .../files/mod_mono_path.patch | 16 ++ .../files/remove_nodesFromServer.patch | 55 ++++++ .../files/separate_client_server_dirs.patch | 32 ++++ www-apps/ifolder3-enterprise/files/series | 21 +++ .../files/serverpaths_from_configure_v2.patch | 135 +++++++++++++++ .../files/use_lib_as_libdir_on_amd64.patch | 17 ++ .../files/use_libdir_for_executables.patch | 135 +++++++++++++++ .../files/use_mono_webserver2.patch | 35 ++++ .../files/use_system_gsoap.patch | 28 ++++ .../use_webbindir_variable_configurein.patch | 74 +++++++++ .../files/use_wsdl_not_wsdl1.patch | 17 ++ .../files/www-data_apache.patch | 83 ++++++++++ .../ifolder3-enterprise-3.8.0.10191.1.ebuild | 156 ++++++++++++++++++ 35 files changed, 1434 insertions(+), 5 deletions(-) create mode 100644 net-libs/gsoap/gsoap-2.8.2-r1.ebuild create mode 100644 net-misc/ifolder3-client-plugins/ifolder3-client-plugins-3.8.0.9328.1-r1.ebuild create mode 100644 net-misc/ifolder3/ifolder3-3.8.0.10197.1.ebuild create mode 100644 net-misc/simias/files/simias-1.8-use_system_gsoap-3.patch create mode 100644 net-misc/simias/files/simias-1.8.2-libflaim-1.patch create mode 100644 net-misc/simias/simias-1.8.3.10196.1.ebuild create mode 100644 www-apps/ifolder3-enterprise/files/DEBUG_log_default.patch create mode 100644 www-apps/ifolder3-enterprise/files/SimiasLib.dll.config-use-systemwide-FlaimWrapper.so.patch create mode 100644 www-apps/ifolder3-enterprise/files/SimiasServerSetup_use_simiasconfdir_in_SetupDefaultConfigPath.patch create mode 100644 www-apps/ifolder3-enterprise/files/convert_relative_path_to_webbindir_variable.patch create mode 100644 www-apps/ifolder3-enterprise/files/dont_download_deleted_nodes.patch create mode 100644 www-apps/ifolder3-enterprise/files/home_never_network_drive.patch create mode 100644 www-apps/ifolder3-enterprise/files/ifdata.patch create mode 100644 www-apps/ifolder3-enterprise/files/mod_mono_SimiasServerSetup_cs.patch create mode 100644 www-apps/ifolder3-enterprise/files/mod_mono_iFolderAdminSetup_cs.patch create mode 100644 www-apps/ifolder3-enterprise/files/mod_mono_iFolderWebSetup_cs.patch create mode 100644 www-apps/ifolder3-enterprise/files/mod_mono_path.patch create mode 100644 www-apps/ifolder3-enterprise/files/remove_nodesFromServer.patch create mode 100644 www-apps/ifolder3-enterprise/files/separate_client_server_dirs.patch create mode 100644 www-apps/ifolder3-enterprise/files/series create mode 100644 www-apps/ifolder3-enterprise/files/serverpaths_from_configure_v2.patch create mode 100644 www-apps/ifolder3-enterprise/files/use_lib_as_libdir_on_amd64.patch create mode 100644 www-apps/ifolder3-enterprise/files/use_libdir_for_executables.patch create mode 100644 www-apps/ifolder3-enterprise/files/use_mono_webserver2.patch create mode 100644 www-apps/ifolder3-enterprise/files/use_system_gsoap.patch create mode 100644 www-apps/ifolder3-enterprise/files/use_webbindir_variable_configurein.patch create mode 100644 www-apps/ifolder3-enterprise/files/use_wsdl_not_wsdl1.patch create mode 100644 www-apps/ifolder3-enterprise/files/www-data_apache.patch create mode 100644 www-apps/ifolder3-enterprise/ifolder3-enterprise-3.8.0.10191.1.ebuild diff --git a/net-libs/gsoap/Manifest b/net-libs/gsoap/Manifest index 36f110b..ea5061b 100644 --- a/net-libs/gsoap/Manifest +++ b/net-libs/gsoap/Manifest @@ -5,8 +5,10 @@ AUX gsoap-2.7.15-use_libtool.patch 4790 RMD160 ca5cdee078b3f326bd69b44a016760cbe DIST gsoap_2.7.17.zip 10224444 RMD160 3f947cbc5e1656dd82b8c6425816cfaf08063c19 SHA1 573a08ab7d8ca2d970158911482c308484fdd5ed SHA256 d3af1ce9464b28cacdf1dfbe09b689f8927cbcf3948479996aef52a39afa2c16 DIST gsoap_2.8.0.zip 10776994 RMD160 eb47fbbf8e74ba5b6c97b694730658b27c03ba4f SHA1 e6363871fa0401090f3bd08bcd532c2e39a5d551 SHA256 48dd009fed0ac361c669dab17e543184909d0567175d8be4af5afc7849d314e6 DIST gsoap_2.8.1.zip 10954908 RMD160 fad35d36c6fa98c1409bbb01e3bf42cc62eb43a2 SHA1 da9a1cc8128ed56fc290f22c81b978ac830b8445 SHA256 1b80b04712aa5170a9fa5a88cc4debb489c38dcd0225093c45e99d3141666bae +DIST gsoap_2.8.2.zip 10697087 RMD160 042fa5fd2e1d7069017a23910cb71d344212fe02 SHA1 199b7d4cf0b6a5bf81a2198e39f03c092ffc05a7 SHA256 0ab988dc5e7c39b1d106d29e782e1eee5f173dca0f93b6c73c9be011c2b315dd EBUILD gsoap-2.7.17-r1.ebuild 1730 RMD160 d1448df8f25f263f6bf194d58634598bb00b032c SHA1 ccfacf266a850648264578530a1634fb9b2297c0 SHA256 0b0351f9ffb94647a869d2ccab77fadc734877700017144d9cea25f875bec5f3 EBUILD gsoap-2.8.0-r1.ebuild 1756 RMD160 911f34239f5a2199a3dd6c1656f79af54b8868a9 SHA1 44eefc58bad856797bdf18fec4cb9f08aff4a884 SHA256 920bb7445a84007834fe34768905b82057014ac1407e13e9687b67e9ba9ee865 EBUILD gsoap-2.8.1-r1.ebuild 1698 RMD160 a2f33900e9c260d37b3879cd8e9fc4910bbef94a SHA1 1828c470343dbab1898aee634f582caa8424260c SHA256 9132a6b33636ad766d21e6f83b04856c3b9342eeb877998404308357d0e8f0e7 +EBUILD gsoap-2.8.2-r1.ebuild 1698 RMD160 a2f33900e9c260d37b3879cd8e9fc4910bbef94a SHA1 1828c470343dbab1898aee634f582caa8424260c SHA256 9132a6b33636ad766d21e6f83b04856c3b9342eeb877998404308357d0e8f0e7 MISC ChangeLog 3204 RMD160 1d2631cd8e93a3f5708f8f3b8eee96bd990f1a24 SHA1 0826a25c553cf4dec5fbe1080464e0d3b12ea4aa SHA256 318d05fe7138dc23b1e6ae5bf7d186969097dd3f45e2b8d53ce645e8e377e307 MISC metadata.xml 532 RMD160 6ef28bd3af65d98c51696bb9c4e3fd2d653f62df SHA1 f655ab4efbf1af4b9acd99a8c3b3767f07b8fa1c SHA256 bc34d15c6890718544dec4bb32057b9706376c02fd8de390d74bb21c4d45ce3d diff --git a/net-libs/gsoap/gsoap-2.8.2-r1.ebuild b/net-libs/gsoap/gsoap-2.8.2-r1.ebuild new file mode 100644 index 0000000..f5a06c4 --- /dev/null +++ b/net-libs/gsoap/gsoap-2.8.2-r1.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=2 + +inherit autotools eutils + +MY_P="${PN}-2.8" + +DESCRIPTION="A cross-platform open source C and C++ SDK to ease the development of SOAP/XML Web services" +HOMEPAGE="http://gsoap2.sourceforge.net" +SRC_URI="mirror://sourceforge/gsoap2/gsoap_${PV}.zip" + +LICENSE="GPL-2 gSOAP" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc debug examples +ssl" + +DEPEND="app-arch/unzip + sys-devel/flex + sys-devel/bison + sys-libs/zlib + ssl? ( dev-libs/openssl )" +RDEPEND="" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + # Fix Pre-ISO headers + epatch "${FILESDIR}/${PN}-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch" + + # causes compilation of app-emulation/virtualbox-ose[vboxwebsrv] to + # break (bug #320901): + #epatch "${FILESDIR}/${PN}-2.7.15-use_libtool.patch" + + eautoreconf +} + +src_configure() { + econf \ + $(use_enable ssl openssl) \ + $(use_enable examples samples) \ + $(use_enable debug) +} + +src_compile() { + emake -j1 || die "emake failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "Install failed" + + # yes, we also install the license-file since + # it contains info about how to apply the licenses + dodoc *.txt + + dohtml changelog.html + + rm -rf "${D}"/usr/lib*/*.la + + if use examples; then + rm -rf gsoap/samples/Makefile* gsoap/samples/*/Makefile* gsoap/samples/*/*.o + insinto /usr/share/doc/${PF}/examples + doins -r gsoap/samples/* + fi + + if use doc; then + dohtml -r gsoap/doc/* + fi + + # Install the core files for some packages that are using these files. + # this is to work around provided gsoap in many packages (ifolder3, ...) + insinto /usr/include/gsoap + doins gsoap/*.c* +} diff --git a/net-misc/ifolder3-client-plugins/Manifest b/net-misc/ifolder3-client-plugins/Manifest index 4332bd7..26cce19 100644 --- a/net-misc/ifolder3-client-plugins/Manifest +++ b/net-misc/ifolder3-client-plugins/Manifest @@ -1,5 +1,6 @@ AUX ifolder3-plugins-3.8-mono22-1.patch 1459 RMD160 8b31316a68a58a5264ea7b5f431150e6b945f515 SHA1 b16e4801f8e5fc7a0da89aef6da5e169a8a820a4 SHA256 e391fde1d66eed260ce6cc12b058dae8de1d2b4c6aca6a5b2be2bfc3e0978ba8 DIST ifolder3-client-plugins-3.8.0.9328.1.tar.gz 421648 RMD160 e3bcf5ad62ad35427a839a431b9971e4c48d6b1b SHA1 88d4a74893a46c9c246ea410cc91a0414568e484 SHA256 c52f9c00b815466b4cb8673774b533a6397028c6cb26c971637886bd02187c3c +EBUILD ifolder3-client-plugins-3.8.0.9328.1-r1.ebuild 2623 RMD160 5ffe90eeb514a0931fbf33589f9c02139f057209 SHA1 8720f3154ba57b3bf5e3a460119827abad7af2da SHA256 b8306d4ebde5d0732c7e0b9ce48929ca51d4c24449034b9768dcb1f9d87e0de5 EBUILD ifolder3-client-plugins-3.8.0.9328.1.ebuild 2351 RMD160 ca12c57138dd2c305dd6fa4f0e07ac4096a85071 SHA1 c745878dde10c9496ae4d48ff4dbb80a4c384909 SHA256 c413224696c13c549b4f5d7665882cc6bb67960c4a1dc42f2bbf3b5f90145b6b MISC ChangeLog 217 RMD160 7a2489871785ab88b24d010c21fdd6f7006fe560 SHA1 f967ae7f73a9beaae6894ea2ae5e3d6d004aae9e SHA256 ad708b7f31796dff2d32bb626c0764a602d818f12164fe7cacb330a319a38387 MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5 diff --git a/net-misc/ifolder3-client-plugins/ifolder3-client-plugins-3.8.0.9328.1-r1.ebuild b/net-misc/ifolder3-client-plugins/ifolder3-client-plugins-3.8.0.9328.1-r1.ebuild new file mode 100644 index 0000000..715742a --- /dev/null +++ b/net-misc/ifolder3-client-plugins/ifolder3-client-plugins-3.8.0.9328.1-r1.ebuild @@ -0,0 +1,77 @@ +# 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 + +inherit autotools eutils mono + +DESCRIPTION="Enterprise backend for iFolder" +HOMEPAGE="http://www.ifolder.com/" +SRC_URI="mirror://sourceforge/ifolder/iFolder%20Clients/3.8.0.3/novell-ifolder-client-plugins.tar.gz -> ${P}.tar.gz + http://ftp.disconnected-by-peer.at/ifolder/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +RESTRICT="mirror" + +DEPEND="!www-apps/ifolder3-enterprise-plugins + net-misc/ifolder3 + sys-devel/gcc:4.3" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/novell-ifolder-client-plugins-${PV}" + +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}"/ifolder3-plugins-3.8-mono22-1.patch +# epatch "${FILESDIR}"/simias-mononamespace.dpatch +# epatch "${FILESDIR}"/simias-etc_use_destdir.dpatch +# epatch "${FILESDIR}"/simias-bash.dpatch +# epatch "${FILESDIR}"/simias_make_gcc43_happy.diff +# epatch "${FILESDIR}"/simias-libflaim_shared-1.patch +# epatch "${FILESDIR}"/simias-1.8-use_system_gsoap-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.8-admin-setup-1.diff +# epatch ${FILESDIR}/ifolder-apache-conf.diff +# epatch ${FILESDIR}/ifolder-3.8-web-setup-1.diff +# epatch ${FILESDIR}/simias-1.8.3-server-setup-1.diff +# epatch ${FILESDIR}/no_write_to_etc_during_install.diff +# epatch ${FILESDIR}/new_default_simias.config.diff +# epatch ${FILESDIR}/flex_in_lib64.diff +# epatch ${FILESDIR}/${PN}-simias-server-setup.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-clientplugins --with-simiasdatadir="\${HOME}/.local/share/simias" || die "configure failed" +} + +src_compile() { + emake -j1 || die "build failed" +} + +src_install() { + make DESTDIR="${D}" install || die "Error install ${PN}" +} + diff --git a/net-misc/ifolder3/Manifest b/net-misc/ifolder3/Manifest index 5f8000b..04022a7 100644 --- a/net-misc/ifolder3/Manifest +++ b/net-misc/ifolder3/Manifest @@ -10,8 +10,10 @@ AUX ifolder-disambiguate_process.dpatch 803 RMD160 6f058e9872cfc6bd98556f13c2815 AUX ifolder-gnome-hack-1.patch 569 RMD160 41fc4c52b1019070619c6fe711936417fa862d97 SHA1 c9a32b7679672b08788a2e31d79192c4abeff0af SHA256 efe1d83a25cac7305c550394240636f439687e6a38176541274bada575db09ad AUX ifolder-lib_name.dpatch 856 RMD160 1ee4486c9d412e732617a3bc18387f9201931e64 SHA1 9d0ac4527f91f5f8997bcd7d1d622668898f2455 SHA256 c55cd504abb93b7aa534555940f1cc0b734d2d1f2c06a611808c11b8569b6c57 AUX ifolder-mono22-1.patch 2794 RMD160 5fe95bedd74d227831d32f63643c9a9a96bbe9b2 SHA1 27d301c129d9f48dc5b89155df59f1d00fd30aa1 SHA256 495f8f17b895c15d1aa5314f7fb569a4d9d97db7e2bd0a35694dd29f907d6354 +DIST ifolder3-3.8.0.10197.1.tar.gz 26576647 RMD160 4ddc411ab9e179395cbe6248b3e2123f83367e39 SHA1 8fe83151c9b9a38eac2a2b4038b3cdc50bfd7669 SHA256 3fb207e559d536d5f0b75d4afa1df0eeda83406f8a04412418482ddd5a4fe942 DIST ifolder3-3.8.0.9328.1.tar.gz 26649101 RMD160 f4022f35a0c6a25d01388afe261a16518c1484c2 SHA1 1ef18a49e1314ac3e93b5f48d81cdcbdac403101 SHA256 c81c204beb601a72aa4e2b0fb3affe272f1530ad79f0ced9d1e798479eab99d8 -EBUILD ifolder3-3.8.0.9328.1.ebuild 2056 RMD160 3f4003c1978fd283b029e7f9ff5f0cb3b2611437 SHA1 d1da3863a38f056e414266caf8a6a7fc7b1e1bf4 SHA256 eff6ac631330500ac47a574ab80f4a41aecf1780818b4c0dcbac3b1ad2519680 +EBUILD ifolder3-3.8.0.10197.1.ebuild 2052 RMD160 45849c7662476a6e88f0222f9cefc387289216ec SHA1 64a77bea97a916f17d2c19fa69d4c63217117004 SHA256 c79221d85a1715ff877118071ed59d616355fe1001bb51a318fa83b32e29e69d +EBUILD ifolder3-3.8.0.9328.1.ebuild 2035 RMD160 888be18ac47850755c2ab56fca9d0b144a953dae SHA1 891594b84692c40083841e13138289e46aa7a63a SHA256 ca7228582763c26d20e20588d19c588f6518be73d86e6edbcb91aff859b6a9ed EBUILD ifolder3-3.8_pre7273.ebuild 1626 RMD160 e5a6491d9755e74c722be53498e738ce26dba6f0 SHA1 a7a153c7dcaaf3ad4f635a2a4138cb0fafa2df61 SHA256 2665e70fcc7c29e3257ad7b3366783728cb3c21edcdcf5f970b4c754cb3c8cd4 MISC ChangeLog 4514 RMD160 6a75897b68cc24f9d8fe35e42e702b905ad6fe73 SHA1 872a9d424c37cd2ec365ed4d87b303e22551818f SHA256 cf1101db837d88d0c7f951c8511ee2781b1f50e4f48dad24a93f5f6a7cbcec93 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 diff --git a/net-misc/ifolder3/ifolder3-3.8.0.10197.1.ebuild b/net-misc/ifolder3/ifolder3-3.8.0.10197.1.ebuild new file mode 100644 index 0000000..3fe41ae --- /dev/null +++ b/net-misc/ifolder3/ifolder3-3.8.0.10197.1.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2010 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/ifolder/trunk/ifolder/@${PV/3.8_pre/}" +#inherit mono eutils autotools subversion +inherit mono eutils autotools + +DESCRIPTION="Novell iFolder" +HOMEPAGE="http://www.ifolder.com/" +SRC_URI="mirror://sourceforge/ifolder/iFolder%20Clients/3.8.0.3/${PN}.tar.gz -> ${P}.tar.gz + http://ftp.disconnected-by-peer.at/ifolder/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" + +IUSE="" +DEPEND=">=dev-lang/mono-2.4 + >=dev-dotnet/gconf-sharp-2.0 + >=dev-dotnet/gnome-sharp-2.0 + >=dev-dotnet/gtk-sharp-2.0 + >=net-misc/simias-1.8 + >=net-libs/gsoap-2.7.1 + sys-devel/gcc:4.3 + ! ${P}.tar.gz http://ftp.disconnected-by-peer.at/ifolder/${P}.tar.gz" LICENSE="GPL-2" @@ -24,7 +24,6 @@ DEPEND=">=dev-lang/mono-2.4 >=dev-dotnet/gtk-sharp-2.0 >=net-misc/simias-1.8 >=net-libs/gsoap-2.7.1 - >=gnome-base/eel-2.12 ! $(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) ++ cp /usr/include/stdsoap2.h $(srcdir) ++ cp /usr/include/gsoap/stdsoap2.c $(srcdir) + + $(srcdir)/libsimias.h: $(srcdir)/stdsoap2.c $(SIMIAS_WSDL) +- $(GSOAP_PATH)/wsdl2h -c -o $@ $(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 + diff --git a/net-misc/simias/files/simias-1.8.2-libflaim-1.patch b/net-misc/simias/files/simias-1.8.2-libflaim-1.patch new file mode 100644 index 0000000..1db01b4 --- /dev/null +++ b/net-misc/simias/files/simias-1.8.2-libflaim-1.patch @@ -0,0 +1,13 @@ +Index: simias/src/core/FlaimProvider/FlaimWrapper/Makefile.am +=================================================================== +--- simias.orig/src/core/FlaimProvider/FlaimWrapper/Makefile.am 2010-01-08 18:51:33.008276340 -0200 ++++ simias/src/core/FlaimProvider/FlaimWrapper/Makefile.am 2010-01-08 18:52:13.758276141 -0200 +@@ -91,7 +91,7 @@ + lib=@LIB64@ + + # NOTE: The following is a _hack_. +-LIBFLAIM_LIBS_HACK = "-lpthread -lrt -lstdc++ -ldl -lncurses /usr/$(lib)/libflaim.a" ++LIBFLAIM_LIBS_HACK = $(shell pkg-config --libs libflaim) + + libFlaimWrapper_la_LDFLAGS = $(LIBFLAIM_LIBS_HACK) + diff --git a/net-misc/simias/simias-1.8.3.10196.1.ebuild b/net-misc/simias/simias-1.8.3.10196.1.ebuild new file mode 100644 index 0000000..5131d59 --- /dev/null +++ b/net-misc/simias/simias-1.8.3.10196.1.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2010 Gentoo Technologies, Inc. +# 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/1.8_pre/}" +#inherit eutils mono autotools subversion + +inherit eutils mono autotools + +DESCRIPTION="Simias SimpleServer" +HOMEPAGE="http://www.ifolder.com/" +SRC_URI="mirror://sourceforge/ifolder/iFolder%20Clients/3.8.0.3/${PN}.tar.gz -> ${P}.tar.gz + http://ftp.disconnected-by-peer.at/ifolder/${P}.tar.gz" +RESTRICT="mirror" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~arm ~x86" + +DEPEND=">=dev-lang/mono-2.4 + >=dev-dotnet/xsp-2.4 + >=dev-dotnet/log4net-1.2.9 + >=dev-db/libflaim-4.9.617 + >=net-libs/gsoap-2.7.1 + sys-devel/gcc:4.3 + !www-apps/ifolder-server" + +#S=${WORKDIR}/${PN} + +src_prepare() { + rm -rf dependencies +# epatch "${FILESDIR}"/configure.in-xsp-check-by-dl9pf-version3.diff +# epatch "${FILESDIR}"/simias-libtool22-1.patch + epatch "${FILESDIR}"/simias-1.8-mono22-5.patch +# epatch "${FILESDIR}"/simias-mononamespace.dpatch +# epatch "${FILESDIR}"/simias-etc_use_destdir.dpatch +# epatch "${FILESDIR}"/simias-bash.dpatch + epatch "${FILESDIR}"/simias-1.8.2-libflaim-1.patch +# epatch "${FILESDIR}"/simias-libflaim_shared-1.patch + epatch "${FILESDIR}"/simias-1.8-use_system_gsoap-3.patch +# epatch "${FILESDIR}"/simias-recovery_agent-fix-1.patch +# epatch "${FILESDIR}"/WSDLPATCH-1.diff + epatch "${FILESDIR}"/simias-1.8.3.9328.1-system_xsp-1.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-runasclient --with-simiasdatadir="\${HOME}/.local/share/simias" || die "configure failed" +} + +src_compile() { + emake -j1 || die "build failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "install failed" +} diff --git a/www-apps/ifolder3-enterprise/Manifest b/www-apps/ifolder3-enterprise/Manifest index f3dee5a..d39dbc6 100644 --- a/www-apps/ifolder3-enterprise/Manifest +++ b/www-apps/ifolder3-enterprise/Manifest @@ -21,6 +21,6 @@ AUX use_webbindir_variable_configurein.patch 1871 RMD160 7cb0873632a5c06dd833362 AUX use_wsdl_not_wsdl1.patch 927 RMD160 3da1cf4de48ee73baa2d3fc44cf9075ce49ea633 SHA1 2d268acb6639c24398120b05bea54f73553f441b SHA256 e5c50fc8590b9ef8d425fea8b2029d0212043cee10ce06fd019ef0315df0043c AUX www-data_apache.patch 4577 RMD160 33b6090d17f5e37e490a21f9c36a0809ea7faf42 SHA1 6851c9e7f90ad7aab9afdcacda31cad4f7711a1b SHA256 beda9615eb8cf701eb7944d1972c401fb5440786bf38b7b90a0cb6920a998080 DIST ifolder3-enterprise-3.8.0.10191.1.tar.gz 27793483 RMD160 d12f24c73c9c76d7da3c6c32556248fca8feee9f SHA1 e2498e36d83fbc91b4fc6aa7c8d19d6e7536e34c SHA256 7c98257df01457957b34ef2a0fe24a3620c6628fae9fc7728b66f868a61d4928 -EBUILD ifolder3-enterprise-3.8.0.10191.1.ebuild 4868 RMD160 5afad2d95d0f31689d52598a6c28a26797f6ac7b SHA1 dd9407a33289a63f7d07af56751f862baa7ee3b8 SHA256 d003dda3230f6084788657a5fb838568965ad77b96d177005838a5469c5552da +EBUILD ifolder3-enterprise-3.8.0.10191.1.ebuild 5316 RMD160 38487244de7b9e0e582b1b90306055bddb15d5c8 SHA1 26a2d2d8756050bd78b3322adabd4b58ac1f0a3b SHA256 9fad2a503ffb9c785433dafd35ccfdd37a9d4178c414de14e4d22a6f39d36fb2 MISC ChangeLog 5121 RMD160 d48b724e9c21429247ae148d27cd220580451a4a SHA1 78a73e30b15b205675c23dcee38c77cf45e263c3 SHA256 cc781524dc704854fcc15a0518a170784f03831fa2a13004e52ef310bec47315 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 diff --git a/www-apps/ifolder3-enterprise/files/DEBUG_log_default.patch b/www-apps/ifolder3-enterprise/files/DEBUG_log_default.patch new file mode 100644 index 0000000..bcc1aeb --- /dev/null +++ b/www-apps/ifolder3-enterprise/files/DEBUG_log_default.patch @@ -0,0 +1,44 @@ +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/SimiasLib.dll.config-use-systemwide-FlaimWrapper.so.patch b/www-apps/ifolder3-enterprise/files/SimiasLib.dll.config-use-systemwide-FlaimWrapper.so.patch new file mode 100644 index 0000000..096f304 --- /dev/null +++ b/www-apps/ifolder3-enterprise/files/SimiasLib.dll.config-use-systemwide-FlaimWrapper.so.patch @@ -0,0 +1,10 @@ +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/SimiasServerSetup_use_simiasconfdir_in_SetupDefaultConfigPath.patch b/www-apps/ifolder3-enterprise/files/SimiasServerSetup_use_simiasconfdir_in_SetupDefaultConfigPath.patch new file mode 100644 index 0000000..8e2196b --- /dev/null +++ b/www-apps/ifolder3-enterprise/files/SimiasServerSetup_use_simiasconfdir_in_SetupDefaultConfigPath.patch @@ -0,0 +1,51 @@ +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/convert_relative_path_to_webbindir_variable.patch b/www-apps/ifolder3-enterprise/files/convert_relative_path_to_webbindir_variable.patch new file mode 100644 index 0000000..cb4c862 --- /dev/null +++ b/www-apps/ifolder3-enterprise/files/convert_relative_path_to_webbindir_variable.patch @@ -0,0 +1,30 @@ +submitted upstream as https://bugzilla.novell.com/show_bug.cgi?id=607582 +================================================================== +Index: simias-trunk20100511/src/webaccess/Makefile.am +=================================================================== +--- simias-trunk20100511.orig/src/webaccess/Makefile.am 2010-05-20 12:09:08.131394177 -0400 ++++ simias-trunk20100511/src/webaccess/Makefile.am 2010-05-20 12:09:13.191394736 -0400 +@@ -176,7 +176,7 @@ + rm -rf `find $(DESTDIR)$(webaccessdir)/help -name .svn` + cd $(srcdir)/images; cp -r * $(DESTDIR)$(webaccessdir)/images + rm -rf `find $(DESTDIR)$(webaccessdir)/images -name .svn` +- $(INSTALL_PROGRAM) $(DESTDIR)$(webaccessdir)/../web/bin/SimiasLib.dll $(DESTDIR)$(webaccessdir)/bin ++ $(INSTALL_PROGRAM) $(DESTDIR)$(webbindir)/SimiasLib.dll $(DESTDIR)$(webaccessdir)/bin + #if !LINUX + # $(INSTALL_PROGRAM) $(LOG4NET_DIR)/log4net.dll $(DESTDIR)$(webaccessdir)/bin + #endif +Index: simias-trunk20100511/src/admin/Makefile.am +=================================================================== +--- simias-trunk20100511.orig/src/admin/Makefile.am 2010-05-20 12:09:08.121392780 -0400 ++++ simias-trunk20100511/src/admin/Makefile.am 2010-05-20 12:09:13.191394736 -0400 +@@ -201,8 +201,8 @@ + rm -rf `find $(DESTDIR)$(admindir)/images -name .svn` + cd $(srcdir)/css; cp -r * $(DESTDIR)$(admindir)/css + rm -rf `find $(DESTDIR)$(admindir)/css -name .svn` +- $(INSTALL_PROGRAM) $(DESTDIR)$(admindir)/../web/bin/SimiasLib.dll $(DESTDIR)$(admindir)/bin/ +- $(INSTALL_PROGRAM) $(DESTDIR)$(admindir)/../web/bin/SimiasClient.dll $(DESTDIR)$(admindir)/bin/ ++ $(INSTALL_PROGRAM) $(DESTDIR)$(webbindir)/SimiasLib.dll $(DESTDIR)$(admindir)/bin/ ++ $(INSTALL_PROGRAM) $(DESTDIR)$(webbindir)/SimiasClient.dll $(DESTDIR)$(admindir)/bin/ + #if !LINUX + # $(INSTALL_PROGRAM) $(LOG4NET_DIR)/log4net.dll $(DESTDIR)$(admindir)/bin + #endif diff --git a/www-apps/ifolder3-enterprise/files/dont_download_deleted_nodes.patch b/www-apps/ifolder3-enterprise/files/dont_download_deleted_nodes.patch new file mode 100644 index 0000000..fd8ff8b --- /dev/null +++ b/www-apps/ifolder3-enterprise/files/dont_download_deleted_nodes.patch @@ -0,0 +1,40 @@ +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/home_never_network_drive.patch b/www-apps/ifolder3-enterprise/files/home_never_network_drive.patch new file mode 100644 index 0000000..5cadd94 --- /dev/null +++ b/www-apps/ifolder3-enterprise/files/home_never_network_drive.patch @@ -0,0 +1,23 @@ +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/ifdata.patch b/www-apps/ifolder3-enterprise/files/ifdata.patch new file mode 100644 index 0000000..d8c0f4b --- /dev/null +++ b/www-apps/ifolder3-enterprise/files/ifdata.patch @@ -0,0 +1,16 @@ +thanks to ajft on the iFolder-Ubuntu-Debian-Android-dev google group. +submitted to +https://bugzilla.novell.com/show_bug.cgi?id=614964 +Index: simias-1.8.4.0.trunk.7360/src/core/ifdata +=================================================================== +--- simias-1.8.4.0.trunk.7360.orig/src/core/ifdata 2010-06-16 21:23:51.425392140 -0400 ++++ simias-1.8.4.0.trunk.7360/src/core/ifdata 2010-06-16 21:28:45.285397170 -0400 +@@ -6,7 +6,7 @@ + # /sbin/ifconfig | grep 'inet addr' | cut -f2 -d':' | cut -f1 -d' ' + #fi + ostype=`echo $OSTYPE | awk '/^darwin/ {print "darwin"}'` +-if [ "$ostype" == "darwin" ] ++if [ "$ostype" = "darwin" ] + then + /sbin/ifconfig | grep '\' | cut -f2 -d' ' | cut -f1 -d' ' + else diff --git a/www-apps/ifolder3-enterprise/files/mod_mono_SimiasServerSetup_cs.patch b/www-apps/ifolder3-enterprise/files/mod_mono_SimiasServerSetup_cs.patch new file mode 100644 index 0000000..d4f476a --- /dev/null +++ b/www-apps/ifolder3-enterprise/files/mod_mono_SimiasServerSetup_cs.patch @@ -0,0 +1,22 @@ +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/mod_mono_iFolderAdminSetup_cs.patch b/www-apps/ifolder3-enterprise/files/mod_mono_iFolderAdminSetup_cs.patch new file mode 100644 index 0000000..2387c7b --- /dev/null +++ b/www-apps/ifolder3-enterprise/files/mod_mono_iFolderAdminSetup_cs.patch @@ -0,0 +1,27 @@ +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/mod_mono_iFolderWebSetup_cs.patch b/www-apps/ifolder3-enterprise/files/mod_mono_iFolderWebSetup_cs.patch new file mode 100644 index 0000000..906ee14 --- /dev/null +++ b/www-apps/ifolder3-enterprise/files/mod_mono_iFolderWebSetup_cs.patch @@ -0,0 +1,31 @@ +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/mod_mono_path.patch b/www-apps/ifolder3-enterprise/files/mod_mono_path.patch new file mode 100644 index 0000000..bfe4b40 --- /dev/null +++ b/www-apps/ifolder3-enterprise/files/mod_mono_path.patch @@ -0,0 +1,16 @@ +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/remove_nodesFromServer.patch b/www-apps/ifolder3-enterprise/files/remove_nodesFromServer.patch new file mode 100644 index 0000000..b22e1a6 --- /dev/null +++ b/www-apps/ifolder3-enterprise/files/remove_nodesFromServer.patch @@ -0,0 +1,55 @@ +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/separate_client_server_dirs.patch b/www-apps/ifolder3-enterprise/files/separate_client_server_dirs.patch new file mode 100644 index 0000000..ed865c4 --- /dev/null +++ b/www-apps/ifolder3-enterprise/files/separate_client_server_dirs.patch @@ -0,0 +1,32 @@ +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/series b/www-apps/ifolder3-enterprise/files/series new file mode 100644 index 0000000..058eac8 --- /dev/null +++ b/www-apps/ifolder3-enterprise/files/series @@ -0,0 +1,21 @@ +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/serverpaths_from_configure_v2.patch b/www-apps/ifolder3-enterprise/files/serverpaths_from_configure_v2.patch new file mode 100644 index 0000000..ff64f22 --- /dev/null +++ b/www-apps/ifolder3-enterprise/files/serverpaths_from_configure_v2.patch @@ -0,0 +1,135 @@ +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/use_lib_as_libdir_on_amd64.patch b/www-apps/ifolder3-enterprise/files/use_lib_as_libdir_on_amd64.patch new file mode 100644 index 0000000..5171f00 --- /dev/null +++ b/www-apps/ifolder3-enterprise/files/use_lib_as_libdir_on_amd64.patch @@ -0,0 +1,17 @@ +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/use_libdir_for_executables.patch b/www-apps/ifolder3-enterprise/files/use_libdir_for_executables.patch new file mode 100644 index 0000000..aadd856 --- /dev/null +++ b/www-apps/ifolder3-enterprise/files/use_libdir_for_executables.patch @@ -0,0 +1,135 @@ +Index: simias-1.8.3.9328.1+dfsg/src/server/setup/Makefile.am +=================================================================== +--- simias-1.8.3.9328.1+dfsg.orig/src/server/setup/Makefile.am 2010-04-15 15:53:17.000000000 +0100 ++++ simias-1.8.3.9328.1+dfsg/src/server/setup/Makefile.am 2010-04-15 16:02:43.000000000 +0100 +@@ -114,12 +114,12 @@ + + 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) 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) + if WINDOWS + $(INSTALL_PROGRAM) simias-server-setup.cmd $(DESTDIR)$(bindir) + $(INSTALL_PROGRAM) ifolder-web-setup.cmd $(DESTDIR)$(bindir) +Index: simias-1.8.3.9328.1+dfsg/src/server/setup/simias-server-setup.in +=================================================================== +--- simias-1.8.3.9328.1+dfsg.orig/src/server/setup/simias-server-setup.in 2010-04-15 15:53:17.000000000 +0100 ++++ simias-1.8.3.9328.1+dfsg/src/server/setup/simias-server-setup.in 2010-04-15 15:59:19.000000000 +0100 +@@ -36,31 +36,8 @@ + #* + #*******************************************************************************/ + +-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 "$@" +Index: simias-1.8.3.9328.1+dfsg/src/server/setup/ifolder-admin-setup.in +=================================================================== +--- simias-1.8.3.9328.1+dfsg.orig/src/server/setup/ifolder-admin-setup.in 2010-04-15 15:59:30.000000000 +0100 ++++ simias-1.8.3.9328.1+dfsg/src/server/setup/ifolder-admin-setup.in 2010-04-15 15:59:56.000000000 +0100 +@@ -37,29 +37,8 @@ + #*******************************************************************************/ + + +-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 "$@" +Index: simias-1.8.3.9328.1+dfsg/src/server/setup/ifolder-web-setup.in +=================================================================== +--- simias-1.8.3.9328.1+dfsg.orig/src/server/setup/ifolder-web-setup.in 2010-04-15 16:00:10.000000000 +0100 ++++ simias-1.8.3.9328.1+dfsg/src/server/setup/ifolder-web-setup.in 2010-04-15 16:00:34.000000000 +0100 +@@ -37,31 +37,8 @@ + #*******************************************************************************/ + + +-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 "$@" diff --git a/www-apps/ifolder3-enterprise/files/use_mono_webserver2.patch b/www-apps/ifolder3-enterprise/files/use_mono_webserver2.patch new file mode 100644 index 0000000..91b8776 --- /dev/null +++ b/www-apps/ifolder3-enterprise/files/use_mono_webserver2.patch @@ -0,0 +1,35 @@ +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/use_system_gsoap.patch b/www-apps/ifolder3-enterprise/files/use_system_gsoap.patch new file mode 100644 index 0000000..0d37a5a --- /dev/null +++ b/www-apps/ifolder3-enterprise/files/use_system_gsoap.patch @@ -0,0 +1,28 @@ +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/use_webbindir_variable_configurein.patch b/www-apps/ifolder3-enterprise/files/use_webbindir_variable_configurein.patch new file mode 100644 index 0000000..a30dbe7 --- /dev/null +++ b/www-apps/ifolder3-enterprise/files/use_webbindir_variable_configurein.patch @@ -0,0 +1,74 @@ +submitted upstream https://bugzilla.novell.com/show_bug.cgi?id=623576 +Index: simias-1.8.3.10200.0/configure.in +=================================================================== +--- simias-1.8.3.10200.0.orig/configure.in 2010-07-19 16:30:43.195198310 -0400 ++++ simias-1.8.3.10200.0/configure.in 2010-07-19 16:33:22.885386325 -0400 +@@ -266,6 +266,30 @@ AC_SUBST(COMMON_CLEAN_FILES) + AC_SUBST(COMMON_DISTCLEAN_FILES) + AC_SUBST(COMMON_MAINTAINER_CLEAN_FILES) + ++ ++# We have our own "standard" directories for web services. ++# ++webdir="${libexecdir}/web" ++webbindir="${webdir}/bin" ++modulesdir="${webdir}/modules" ++AC_SUBST(webdir) ++AC_SUBST(webbindir) ++AC_SUBST(modulesdir) ++ ++ ++# ++# Setup standard directories for webaccess app domain ++# ++webaccessdir="${libexecdir}/webaccess" ++AC_SUBST(webaccessdir) ++ ++# ++# Setup standard directories for admin app domain ++# ++admindir="${libexecdir}/admin" ++AC_SUBST(admindir) ++ ++ + # + # Set platform-specific variables + # +@@ -346,7 +370,7 @@ case $SIMIAS_OS in + StoreProviderAssembly="SimiasLib.dll" + StoreProviderType="Simias.Storage.Provider.Flaim.FlaimProvider" + GSOAP_PATH="/usr/bin" +- mappingpath="${exec_prefix}/${LIB64}/simias/web/bin/Simias.exe" ++ mappingpath="${webbindir}/Simias.exe" + ;; + # + # Windows-specific configuration +@@ -456,28 +480,6 @@ AC_SUBST(StoreProviderType) + AC_SUBST(GSOAP_PATH) + AC_SUBST(mappingpath) + +-# We have our own "standard" directories for web services. +-# +-webdir="${libexecdir}/web" +-webbindir="${webdir}/bin" +-modulesdir="${webdir}/modules" +-AC_SUBST(webdir) +-AC_SUBST(webbindir) +-AC_SUBST(modulesdir) +- +- +-# +-# Setup standard directories for webaccess app domain +-# +-webaccessdir="${libexecdir}/webaccess" +-AC_SUBST(webaccessdir) +- +-# +-# Setup standard directories for admin app domain +-# +-admindir="${libexecdir}/admin" +-AC_SUBST(admindir) +- + # + # Setup the bootstrapdir + # diff --git a/www-apps/ifolder3-enterprise/files/use_wsdl_not_wsdl1.patch b/www-apps/ifolder3-enterprise/files/use_wsdl_not_wsdl1.patch new file mode 100644 index 0000000..b293397 --- /dev/null +++ b/www-apps/ifolder3-enterprise/files/use_wsdl_not_wsdl1.patch @@ -0,0 +1,17 @@ +submitted to novell bugzilla +https://bugzilla.novell.com/show_bug.cgi?id=605314 +Index: simias-1.8.3.10200.stable/src/core/SimiasClient/Makefile.am +=================================================================== +--- simias-1.8.3.10200.stable.orig/src/core/SimiasClient/Makefile.am 2010-04-15 10:16:23.000000000 -0400 ++++ simias-1.8.3.10200.stable/src/core/SimiasClient/Makefile.am 2010-07-19 12:29:12.265196075 -0400 +@@ -47,8 +47,8 @@ endif + + $(srcdir)/SimiasService2.cs: $(srcdir)/../WebService/Simias.wsdl + if LINUX +- wsdl -nologo -out:SimiasService2.cs $(srcdir)/../WebService/Simias.wsdl +- wsdl1 -nologo -out:SimiasService.cs $(srcdir)/../WebService/Simias.wsdl ++ $(WSDL) -nologo -out:SimiasService2.cs $(srcdir)/../WebService/Simias.wsdl ++ $(WSDL) -nologo -out:SimiasService.cs $(srcdir)/../WebService/Simias.wsdl + endif + + SimiasClient.dll: $(srcdir)/AssemblyInfo.cs $(SimiasClient_CSFILES) $(SimiasClient_RESOURCES) diff --git a/www-apps/ifolder3-enterprise/files/www-data_apache.patch b/www-apps/ifolder3-enterprise/files/www-data_apache.patch new file mode 100644 index 0000000..c316808 --- /dev/null +++ b/www-apps/ifolder3-enterprise/files/www-data_apache.patch @@ -0,0 +1,83 @@ +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/ifolder3-enterprise-3.8.0.10191.1.ebuild b/www-apps/ifolder3-enterprise/ifolder3-enterprise-3.8.0.10191.1.ebuild new file mode 100644 index 0000000..68d65e1 --- /dev/null +++ b/www-apps/ifolder3-enterprise/ifolder3-enterprise-3.8.0.10191.1.ebuild @@ -0,0 +1,156 @@ +# Copyright 1999-2010 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 + +inherit autotools eutils mono toolchain-funcs + +DESCRIPTION="Enterprise backend for iFolder" +HOMEPAGE="http://www.ifolder.com/" +SRC_URI="mirror://sourceforge/ifolder/iFolder%20Server/3.8.0.3/11.1/ifolder3-enterprise.tar.gz -> ${P}.tar.gz + http://ftp.disconnected-by-peer.at/ifolder/${P}.tar.gz" + + +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[static] + >=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}" + +S=${WORKDIR}/${PN} + +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}"/use_system_gsoap.patch + epatch "${FILESDIR}"/use_wsdl_not_wsdl1.patch + epatch "${FILESDIR}"/use_mono_webserver2.patch + #epatch "${FILESDIR}"/use_lib_as_libdir_on_amd64.patch + epatch "${FILESDIR}"/use_libdir_for_executables.patch + epatch "${FILESDIR}"/SimiasLib.dll.config-use-systemwide-FlaimWrapper.so.patch + epatch "${FILESDIR}"/www-data_apache.patch + epatch "${FILESDIR}"/mod_mono_path.patch + epatch "${FILESDIR}"/mod_mono_SimiasServerSetup_cs.patch + epatch "${FILESDIR}"/mod_mono_iFolderAdminSetup_cs.patch + epatch "${FILESDIR}"/mod_mono_iFolderWebSetup_cs.patch + epatch "${FILESDIR}"/convert_relative_path_to_webbindir_variable.patch + epatch "${FILESDIR}"/ifdata.patch + epatch "${FILESDIR}"/SimiasServerSetup_use_simiasconfdir_in_SetupDefaultConfigPath.patch + epatch "${FILESDIR}"/use_webbindir_variable_configurein.patch + epatch "${FILESDIR}"/separate_client_server_dirs.patch + epatch "${FILESDIR}"/serverpaths_from_configure_v2.patch + epatch "${FILESDIR}"/dont_download_deleted_nodes.patch + epatch "${FILESDIR}"/remove_nodesFromServer.patch + epatch "${FILESDIR}"/home_never_network_drive.patch + epatch "${FILESDIR}"/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" + +}