www-apps/ifolder-server: fix recovery agent null pointer

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/ifolder@839 6952d904-891a-0410-993b-d76249ca496b

www-apps/ifolder-server/ChangeLog

@@ -2,6 +2,11 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  27 Feb 2009; Mario Fetka <mario.fetka@gmail.com>
+  +files/simias-recovery_agent-fix-1.patch,
+  +ifolder-server-3.6.7303.1-r2.ebuild:
+  fix recovery agent null pointer
+
   22 Feb 2009; Mario Fetka <mario.fetka@gmail.com>
   ifolder-server-3.6.7303.1-r1.ebuild:
   correct mono dependency

www-apps/ifolder-server/Manifest

@@ -20,12 +20,14 @@ AUX simias-1.6.use_system_gsoap.patch 2922 RMD160 ec4bb9da8a3a0eab08ac36b4dc9d5c
 AUX simias-libflaim_shared-1.patch 749 RMD160 a8c402e4c822cf7961068308e46dbfea4e69ffea SHA1 37aed1ec52275c2d3e3cdfe37e2b122e07781c43 SHA256 9a9918fcaa7a6e528b8f15f9c719b886b51af3264bb89fd59859f0023eb9050f
 AUX simias-libtool22-1.patch 498 RMD160 3c6c621765382c3bbf66877217aef55301e6c337 SHA1 04affadf85f3f731b530acdc54659e83c08b0942 SHA256 156f539e59b62592a2e83902b063f7b941940bb93294eb2bd8d99146302d888b
 AUX simias-mono22-1.patch 7625 RMD160 c79c85338af4385b3f6a15eec868af2537a2800a SHA1 212ba89d751446723a281e38b36adf658a0e9ef1 SHA256 f60a542b26e31c0dc907c730eaa6b7f7474c95565f44b72eb0dc196b270286e9
+AUX simias-recovery_agent-fix-1.patch 682 RMD160 f4faf06f1f00d660f31bfc18951dcdb9cc7c1f72 SHA1 3a5a9844bbbba6c5596826acf3905e19567ab08c SHA256 f4e1d4f58c9ae4eefbad75345d47a592399bc7f14f44dff5357266080fa6934c
 AUX simias-server-setup.diff 1071 RMD160 d8befc86eb4ebf8230bb28e54a677d21523bc6c9 SHA1 0e99938a4c2e2045ccef4ddfa86e3adcb2a345aa SHA256 f02a5d3cf6430d546b5971d62c08469ca9e6ab4910c074d3bb5e53b2044cf741
 AUX simias_make_gcc43_happy.diff 1296 RMD160 11d3abf250e494744a534bac0af2dde451248942 SHA1 45c5e8aa305664caa302cab9b5cbaa8590689d2d SHA256 667df49faa48bde3b4cb76fee38af01965c226af15ddd34b9bfe8083c05adb8b
 AUX webaccess-browse.patch 1001 RMD160 6262f046567d6736fb4193913cc4b4d0bb764792 SHA1 e33cb643b63ded940f9029fe7a79d3accf800450 SHA256 8517e52d6ac974de169fafe01705e1f9a6b8834b2f493ef485477398029b2353
 DIST gsoap-linux-2.7.tar.gz 5528885 RMD160 d952e0e6cc8d5bf19b5a157cfbd7585d043d92c1 SHA1 c077e7a48532da680734768cc1c085d666b1fc8c SHA256 6e6999f4d57d9aadf38fb02aac983c61eeefbf371839a44924c0ba1f5228dbab
 DIST ifolder3-server-3.6.7303.1.tar.gz 19986658 RMD160 703f38b730c0dc59f77b1c55e83bb864008d45cf SHA1 329d128772c09ac7facff6d3b9e23989c8a1b972 SHA256 a047e14b5bf7235c83b0fe706a0bb05f69319887e49b9176b2c373c1e409ba55
 EBUILD ifolder-server-3.6.7303.1-r1.ebuild 4374 RMD160 ba5010a12d06ea9df3f43a87eaf4e3c409a11b94 SHA1 e933443beb69bae373e7c5f8e532ee2fe3cc795c SHA256 475c53b2270288ec949024463181762466edad27ad1f807e61807cdf5ab647cf
+EBUILD ifolder-server-3.6.7303.1-r2.ebuild 4430 RMD160 70af925f2444662b3be7af67169d31981e5e446e SHA1 f471033ed2486bc5213d343eb6118070ef1083c8 SHA256 1f3696c81ede5651670f44f4f80b4a1a6ac2f3934c50e5ed5603912f88c30b91
 EBUILD ifolder-server-3.6.7303.1.ebuild 4320 RMD160 2d8cfb188d8384206d043f3ff7ff7c8960aecce7 SHA1 0a83a3bcb51648888081ce8ff676c89dd08cc9f0 SHA256 da6a3447ec2cfdaf6ca56ab32398bdf02a5198644925b20b1782092999294b8a
-MISC ChangeLog 713 RMD160 0a393d3c57eeeccafcbb82249186a38fc4e684bb SHA1 4ce51abbbc469ea2ac83dc2b31816c626af45fd2 SHA256 d02eee93a7499d8bda2ee4fa871b0d61fe5837e337cec9919c74e062207f4925
+MISC ChangeLog 883 RMD160 601de92856e39e70b6d601c4597338ef63b41601 SHA1 897a9821ee75d059a544502c9e45d01ffae9383c SHA256 15de08458908769372d46f365d641e52fd6f3cf837030318c4caf09427ef0d6c
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

www-apps/ifolder-server/files/simias-recovery_agent-fix-1.patch

@@ -0,0 +1,12 @@
+diff -uNr simias.orig/src/core/CollectionStore/Store.cs simias/src/core/CollectionStore/Store.cs
+--- simias.orig/src/core/CollectionStore/Store.cs	2009-02-27 20:32:48.481455316 +0100
++++ simias/src/core/CollectionStore/Store.cs	2009-02-27 20:33:49.312451704 +0100
+@@ -528,7 +528,7 @@
+ 					        Simias.Configuration config = Store.Config;
+ 					        string raPath = config.Get( "Server", "RAPath" );
+ 
+-					        if (raPath != String.Empty && raPath != "")
++					        if (raPath != String.Empty && raPath != "" && raPath != null)
+ 						{
+ 					                string[] racertFiles = Directory.GetFiles( raPath, "*.?er" );
+ 							foreach ( string file in racertFiles )

www-apps/ifolder-server/ifolder-server-3.6.7303.1-r2.ebuild

@@ -0,0 +1,138 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+WANT_AUTOMAKE=1.9
+inherit autotools eutils mono
+
+DESCRIPTION="Enterprise backend for iFolder"
+HOMEPAGE="http://www.ifolder.com/"
+SRC_URI="http://distfiles.one-gear.com/distfiles/ifolder${PV:0:1}-server-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
+RESTRICT="mirror"
+
+DEPEND="!net-misc/simias
+		>=dev-lang/mono-2.2
+		>=dev-db/libflaim-4.9.617
+		>=dev-dotnet/log4net-1.2.9
+		>=www-apache/mod_mono-1.2.1
+		>=net-libs/gsoap-2.7.12
+		sys-fs/e2fsprogs"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/simias
+MAKEOPTS="-j1"
+
+simiasdatadir="${ROOT}var/lib/simias"
+gentoo_config_dir="${ROOT}etc/simias/apache/gentoo"
+logdir="${ROOT}var/log/ifolder3"
+DEVNULL=/dev/null
+
+
+src_prepare() {
+	epatch "${FILESDIR}"/configure.in-xsp-check-by-dl9pf-version3.diff
+	epatch "${FILESDIR}"/simias-libtool22-1.patch
+	epatch "${FILESDIR}"/simias-mono22-1.patch
+	epatch "${FILESDIR}"/simias_make_gcc43_happy.diff
+	epatch "${FILESDIR}"/simias-libflaim_shared-1.patch
+	epatch "${FILESDIR}"/simias-1.6.use_system_gsoap.patch
+	epatch "${FILESDIR}"/gsoap-2.7.12.patch
+	epatch "${FILESDIR}"/simias-recovery_agent-fix-1.patch
+	#Patch the path of mod_mono.conf
+#	epatch ${FILESDIR}/${PN}-mod_mono-path.patch
+#	epatch ${FILESDIR}/${PN}-apache-rights.patch
+#	epatch ${FILESDIR}/${PN}-simias-server-setup.patch
+
+	epatch ${FILESDIR}/new_mod_mono.diff
+	epatch ${FILESDIR}/ifolder-admin-setup.diff
+	epatch ${FILESDIR}/ifolder-apache-conf.diff
+	epatch ${FILESDIR}/ifolder-web-setup.diff
+	epatch ${FILESDIR}/simias-server-setup.diff
+	epatch ${FILESDIR}/no_write_to_etc_during_install.diff
+	epatch ${FILESDIR}/new_default_simias.config.diff
+#	epatch ${FILESDIR}/flex_in_lib64.diff
+#	epatch ${FILESDIR}/${PN}-simias-server-setup.patch
+	eautoreconf || die "eautoreconf failed"
+}
+
+src_configure() {
+	econf --with-runasserver --with-simiasdatadir=${simiasdatadir} || die "configure failed"
+}
+
+src_install() {
+
+	make DESTDIR=${D} install || die "Error install ${PN}"
+	dodir "${simiasdatadir}"
+	keepdir "${simiasdatadir}"
+#	dodir "${logdir}"
+#	keepdir "${logdir}"
+	dodir "${gentoo_config_dir}"
+
+#	if [[ ! -f ${simiasdatadir}/Simias.config ]];then
+#		einfo "It appears you have never setup iFolder"
+#		einfo "Extracting setup-files to ${simiasdatadir}"
+#		tar -zxvf ${FILESDIR}/setup-files.tar.gz -C ${D}/${simiasdatadir}
+#	fi
+
+}
+
+pkg_postinst() {
+
+
+	echo ""	
+	ewarn "Please edit ${ROOT}etc/apache2/httpd.conf and add the following line"
+	ewarn "at the bottom of the file after Include ${ROOT}etc/apache2/vhosts.d/*.conf"
+	ewarn "Include /etc/simias/apache/*.conf"
+	echo ""
+	ewarn "You MUST add \"-D MONO\" to APACHE2_OPTS in /etc/conf.d/apache2"
+	echo ""
+#	ewarn "You can check by running ps aux | grep mono"
+#	ewarn "Remember, your default admin credentials are:  admin:novell"
+	echo ""
+	ewarn "You must run emerge --config ifolder-server now"
+	ewarn "to complete the install if this is the first time"
+	ewarn "you have installed the server"
+#	ewarn "Please edit ${simiasdatadir}/Simias.config now to change your administrative"
+#	ewarn "username and password if desired and to set the name and description of your new iFolder server."
+#	ewarn "You must also edit the \"PublicAddress\" and \"PrivateAddress\""
+#	ewarn "settings to match your environment!"
+	echo ""
+	ewarn "Visit http://www.ifolder.com/index.php/HowTo:Building_iFolder_Enterprise_Server_on_Gentoo"
+	ewarn "for more information"
+#	echo ""
+#	ewarn "Please login to http://localhost/admin/ in order to initialize the db"
+#	ewarn "if this is the first time running the server"
+
+}
+
+pkg_config(){
+
+	ewarn "Remember that ${PN} runs behind apache"
+	ewarn "therefore give appropriate urls when running this"
+	ewarn "script.  Specifically with regards to ports"
+	ewarn "ie: use \"http://localhost\""
+	ewarn "do not use \"http://localhost:8086\""
+	echo ""
+
+	simias-server-setup --apache --path=${simiasdatadir} --prompt
+	chown -R apache:apache "${simiasdatadir}"
+
+	ifolder-admin-setup
+	ifolder-web-setup
+
+	echo ""
+	einfo "Congratulations, configuration complete!"
+	ewarn "Now login to http://<server>/admin/"
+	ewarn "to initialize the database and create users"
+	ewarn "if this is the first time running the server"
+	ewarn "After you have created users you can login"
+	ewarn "to the web interface by visiting"
+	ewarn "http://<server>/ifolder/"
+	echo ""
+	ewarn "Do NOT use epiphany"
+
+}