From 61150ddf9ad895fbebadabbdf4bdcd6369517da4 Mon Sep 17 00:00:00 2001 From: geos_one Date: Fri, 27 Feb 2009 19:37:52 +0000 Subject: [PATCH] net-misc/simias: fix recovery agent null pointer git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/ifolder@838 6952d904-891a-0410-993b-d76249ca496b --- net-misc/simias/ChangeLog | 4 ++ net-misc/simias/Manifest | 4 +- .../files/simias-recovery_agent-fix-1.patch | 12 +++++ net-misc/simias/simias-1.6.7303.1-r2.ebuild | 47 +++++++++++++++++++ 4 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 net-misc/simias/files/simias-recovery_agent-fix-1.patch create mode 100644 net-misc/simias/simias-1.6.7303.1-r2.ebuild diff --git a/net-misc/simias/ChangeLog b/net-misc/simias/ChangeLog index f7124e7..3885733 100644 --- a/net-misc/simias/ChangeLog +++ b/net-misc/simias/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 27 Feb 2009; Mario Fetka + +files/simias-recovery_agent-fix-1.patch, +simias-1.6.7303.1-r2.ebuild: + fix recovery agent null pointer + 22 Feb 2009; Mario Fetka simias-1.6.7303.1-r1.ebuild: correct mono dependency diff --git a/net-misc/simias/Manifest b/net-misc/simias/Manifest index 3073aad..4a141fb 100644 --- a/net-misc/simias/Manifest +++ b/net-misc/simias/Manifest @@ -4,9 +4,11 @@ AUX simias-Makefile-in-generate.diff 245 RMD160 e98841bdbc05c82565c076000b1a2def 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_make_gcc43_happy.diff 1296 RMD160 11d3abf250e494744a534bac0af2dde451248942 SHA1 45c5e8aa305664caa302cab9b5cbaa8590689d2d SHA256 667df49faa48bde3b4cb76fee38af01965c226af15ddd34b9bfe8083c05adb8b DIST simias-1.6.7303.1.tar.gz 21072448 RMD160 9ced659b4bccf24c84b8a85b15de108da436b1f7 SHA1 6c08b208f6bae9771e6ca2722700f1ba24db32f3 SHA256 894ed8f1e5a00fa0773c105993ba82e62dc7db3ec32d09335d071be80f7feca7 EBUILD simias-1.6.7303.1-r1.ebuild 1091 RMD160 173b14a0b6474dc395d851c0b9751a234b06cc7a SHA1 401cd732e5a09b56c3b38e4601eae9d3f4e092eb SHA256 69ba2dea093db3f7730b7d42e0a4d47246ecbf98cbddfa64caadd6b3a20af8b3 +EBUILD simias-1.6.7303.1-r2.ebuild 1147 RMD160 81a0772ae821dc260bb881ea05f6f22837d42744 SHA1 2b0a326f4c27ef93dc17d25fa2f34cda1b752f8a SHA256 170f18db08c0f839a2782b934121bec5d98d455171f77d2a994a12df6b7d24a2 EBUILD simias-1.6.7303.1.ebuild 1112 RMD160 8365e168ccc0b0d4c7ca79e817a260b6b82f2951 SHA1 d0acae886aba342082063935f1ac06df0da61fbf SHA256 f90e8de280424a1ce92ba032455fed06634429ff88a5ed58349b06cd1972efdb -MISC ChangeLog 1251 RMD160 237ce65d48c186f125ce82c4c1f40b95e10c1a3d SHA1 bc788617fec62575a40bdbdd4d447f07d9bc2202 SHA256 f3d272f63643438a990cd8e8a9c9831b09bd6df9a4e503483da38223972a999a +MISC ChangeLog 1411 RMD160 8acab6720b577903f007ed3399470c54a35410de SHA1 2257586e63952ffb25d9846e9be668c389ae945c SHA256 ead38d5280da3d835f375e1ca54b4b3ae0fd2dab64204b93ea00ab112dd9a20c MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 diff --git a/net-misc/simias/files/simias-recovery_agent-fix-1.patch b/net-misc/simias/files/simias-recovery_agent-fix-1.patch new file mode 100644 index 0000000..3310a99 --- /dev/null +++ b/net-misc/simias/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 ) diff --git a/net-misc/simias/simias-1.6.7303.1-r2.ebuild b/net-misc/simias/simias-1.6.7303.1-r2.ebuild new file mode 100644 index 0000000..a358b23 --- /dev/null +++ b/net-misc/simias/simias-1.6.7303.1-r2.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2009 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" +WANT_AUTOMAKE=1.9 +inherit eutils mono autotools + +DESCRIPTION="Simias SimpleServer" +HOMEPAGE="http://www.ifolder.com/" +SRC_URI="http://distfiles.one-gear.com/distfiles/${P}.tar.gz" +RESTRICT="mirror" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~x86 ~ppc ~amd64" + +DEPEND=">=dev-lang/mono-2.2 + >=dev-dotnet/xsp-1.2.1 + >=dev-dotnet/log4net-1.2.9 + >=dev-db/libflaim-4.9.617 + >=net-libs/gsoap-2.7.1 + !www-apps/ifolder-server" + + + +S=${WORKDIR}/${PN} +MAKEOPTS="-j1" + +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}"/simias-recovery_agent-fix-1.patch + eautoreconf || die "eautoreconf failed" +} + +src_configure() { + econf --with-runasclient || die "configure failed" +} + +src_install() { + make DESTDIR=${D} install +}