diff --git a/net-misc/simias/ChangeLog b/net-misc/simias/ChangeLog index 9b22258..3624df1 100644 --- a/net-misc/simias/ChangeLog +++ b/net-misc/simias/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +* simias-1.8_pre7049 (20 Apr 2009) + + 20 Apr 2009; Mario Fetka + +files/simias-1.8-use_system_gsoap-2.patch, +files/WSDLPATCH.diff, + simias-1.8_pre7049: + Bump revision + 13 Apr 2009; Mario Fetka +files/simias-1.8-mono22-2.patch, simias-1.8_pre7021.ebuild: Bump mono 2.2 patch diff --git a/net-misc/simias/Manifest b/net-misc/simias/Manifest index 7b60c03..1a9df9a 100644 --- a/net-misc/simias/Manifest +++ b/net-misc/simias/Manifest @@ -1,8 +1,10 @@ +AUX WSDLPATCH.diff 4742 RMD160 b06875e1856e945d42f6551f767d76ab339e5f60 SHA1 5d1b11fce97b6a9401c4ce41cd9f58e8742bc507 SHA256 b40336de7783eb824e17cb3f37862a7a9c46a7c342992d659bbad5bffcd1645b AUX configure.in-xsp-check-by-dl9pf-version3.diff 3030 RMD160 2ffd1183ae56b2b9389bb5fc366ae4f2b74006f9 SHA1 9e5c6e5eb9e38f7c131d0a8aac49e3cebff89093 SHA256 f241ff570abf445a1839b7dbb28b097010524a91e9a361336f25f8b2207eb738 AUX eval_gacd_mono_webserver_true.diff 534 RMD160 3f73082ec35ae91d2031380bcfa434759476e2b9 SHA1 163fd3c6f98edd85b4b725e3e35877fb0962653a SHA256 c68a20ada4b170b1fb04cf9dbaae6a49074e672cdfdf00cab87922d86fe1ca7e AUX simias-1.6.use_system_gsoap.patch 2922 RMD160 ec4bb9da8a3a0eab08ac36b4dc9d5c19aa833736 SHA1 fa49d2d34f210919590838c9d302315a304ff037 SHA256 e8432f7883b161c8f68c16f7a99da4ade7eab5b41f8391e7f99b3f92474c74c0 AUX simias-1.8-mono22-1.patch 7492 RMD160 4a09f05ecee38b52ec7b3f60cc2c6e6e55e15fc1 SHA1 45797cd0f9b72747e4ab72fc02ee301446bb3c4b SHA256 3460a484bb46bf2f121f343e24a16d792c3819d114807714c4198cb10ad023db AUX simias-1.8-mono22-2.patch 7676 RMD160 0bef41dfea10ced43fb8b84cc727dd08b7593e30 SHA1 37fe4586026cb98873697a4bb965e55dd17ed7a4 SHA256 ace9c67f7260e68f1f2fe96fa1ee9af1680442e86462d5b271095f3d55c543d9 +AUX simias-1.8-use_system_gsoap-2.patch 2431 RMD160 17bbd1ba7db59b2b83f79a4dfb9801a860c585bc SHA1 eec1afc346bbcce296e8118eae20771315a38636 SHA256 f76e52c10107e62ef71f249d291a82b56fb13a5217c494ea2b48ac6267d2a549 AUX simias-1.8.use_system_gsoap.patch 3026 RMD160 3a63dafb8767b36ff9f99009d1749f07b2b82232 SHA1 3cae95bbab594e84eb41b3dee9e37fc9d1644404 SHA256 4b176aa58b40799c270a91889e22a2a8603e256b9f8415bda665071de7cd5b4e AUX simias-Makefile-in-generate.diff 245 RMD160 e98841bdbc05c82565c076000b1a2def2d647a00 SHA1 4c9bb42fbc6eeb078389e554a1ce400a88051e84 SHA256 62621a68f45cf3b7eba1af206d18f245b624c8e52361707648306360f20f3778 AUX simias-bash.dpatch 4540 RMD160 35a754408252415667aa13bc46f78a94842e83c1 SHA1 12df994febdddcd5f06fb6b9437ff9ed828eceb4 SHA256 44a142f060bdfb4dd276e81e878822998819516e37cd30f7a255be98ba446d3b @@ -16,5 +18,6 @@ AUX simias_make_gcc43_happy.diff 1296 RMD160 11d3abf250e494744a534bac0af2dde4512 DIST simias-1.6.7303.1.tar.gz 21072448 RMD160 9ced659b4bccf24c84b8a85b15de108da436b1f7 SHA1 6c08b208f6bae9771e6ca2722700f1ba24db32f3 SHA256 894ed8f1e5a00fa0773c105993ba82e62dc7db3ec32d09335d071be80f7feca7 EBUILD simias-1.6.7303.1-r3.ebuild 1280 RMD160 485e5c8cf0f51faa207f01db636e7366a01db445 SHA1 321ab0e0e7e254deaa9724891bef4a688dbf72c6 SHA256 3a7be8c6b3f893151125a6c98bbb4e56214d0649aa252b019a5b6cd863c65120 EBUILD simias-1.8_pre7021.ebuild 1441 RMD160 fa614e3d07c8e36b778d62633db1f657b117eb54 SHA1 ee85da2d28213481b31e693fa106bfbe3807ff2f SHA256 da5ef0a29b659f3182b2c73b4cb5ebf3d5e57ef3415c0d5334a947152c5c3fb8 -MISC ChangeLog 2388 RMD160 54cecc0881b8ad6dda1a24215d49827a600bd106 SHA1 e5633f5484c43f610115683e17634f067eefd8ce SHA256 54add0d4ba7b8f92f0ed94cb753134ad34355f73220e22942373497bca60b81e +EBUILD simias-1.8_pre7049.ebuild 1484 RMD160 87e4dbc73a75d9c34a96eeaa2ba367359904ff5f SHA1 95cb6d477525e0e87b85b058a8c01f3d342bf499 SHA256 ad1761602496941a57fba2ef4e2ae7dbec672456f54d9d3debdc5fbb0b6139a1 +MISC ChangeLog 2583 RMD160 b6d81b969e8fc99b91b7e6147594498110460e98 SHA1 01ff25f91ffffcee3f38cdf734912442e812624a SHA256 22cdcb09b3e151c9545a042080d7ee5dbb957c031997640c972afd443c5bcee8 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 diff --git a/net-misc/simias/files/WSDLPATCH.diff b/net-misc/simias/files/WSDLPATCH.diff new file mode 100644 index 0000000..45e0bcd --- /dev/null +++ b/net-misc/simias/files/WSDLPATCH.diff @@ -0,0 +1,105 @@ +Index: configure.in +=================================================================== +--- configure.in (Revision 7049) ++++ configure.in (Arbeitskopie) +@@ -438,7 +438,8 @@ + # Setup the bootstrapdir + # + +-etcdir="/etc" ++#etcdir="/etc" ++etcdir="${sysconfdir}" + AC_SUBST(etcdir) + + case $SIMIAS_OS in +Index: src/webaccess/Makefile.am +=================================================================== +--- src/webaccess/Makefile.am (Revision 7049) ++++ src/webaccess/Makefile.am (Arbeitskopie) +@@ -121,7 +121,7 @@ + all: Novell.iFolderWeb.dll + + iFolderWebProxy.cs: ../webservices/iFolderWeb.wsdl +- wsdl /nologo /out:$@ $< ++ $(WSDL) /nologo /out:$@ $< + + Novell.iFolderWeb.dll: $(srcdir)/AssemblyInfo.cs $(iFolderWeb_CSFILES) $(iFolderWeb_RESOURCES) + $(CSC) /out:$@ $(CSCFLAGS) $(iFolderWeb_FLAGS) $(iFolderWeb_LIBS:%=/r:%) $(iFolderWeb_RESOURCES:%=/res:%) $(iFolderWeb_LIBPATH:%=/lib:%) $(LOG4NET_LIBS) $(iFolderWeb_CSFILES_CSC) /doc:iFolderWeb.doc.xml +Index: src/utils/usercmd/Makefile.am +=================================================================== +--- src/utils/usercmd/Makefile.am (Revision 7049) ++++ src/utils/usercmd/Makefile.am (Arbeitskopie) +@@ -34,7 +34,7 @@ + all: UserCmd.exe + + AdminService.cs: ../../webservices/iFolderAdmin.wsdl +- wsdl /nologo /out:$@ $< ++ $(WSDL) /nologo /out:$@ $< + + UserCmd.exe: $(srcdir)/AssemblyInfo.cs $(UserCmd_CSFILES) $(UserCmd_RESOURCES) + $(CSC) /out:$@ $(CSCFLAGS) $(UserCmd_FLAGS) $(SIMIAS_LIBS) $(UserCmd_LIBS:%=/r:%) $(UserCmd_LIBPATH:%=/lib:%) $(UserCmd_RESOURCES:%=$(ICON_FLAG)%) $(UserCmd_CSFILES_CSC) $(DOC_FILE_CMD) +Index: src/webservices/Makefile.am +=================================================================== +--- src/webservices/Makefile.am (Revision 7049) ++++ src/webservices/Makefile.am (Arbeitskopie) +@@ -101,10 +101,10 @@ + cp ../server/Simias.LdapProvider/Simias.LdapProvider.dll . + + iFolderWebLocalProxy.cs: iFolderWebLocal.wsdl +- wsdl /nologo /namespace:iFolder.WebService.Web /out:$@ $< ++ $(WSDL) /nologo /namespace:iFolder.WebService.Web /out:$@ $< + + iFolderAdminLocalProxy.cs: iFolderAdminLocal.wsdl +- wsdl /nologo /namespace:iFolder.WebService.Admin /out:$@ $< ++ $(WSDL) /nologo /namespace:iFolder.WebService.Admin /out:$@ $< + + iFolderWebLocal.wsdl: copy iFolder.WebService.Local.dll GenerateWsdl.exe + $(MONO) GenerateWsdl.exe iFolder.WebService.Local.dll iFolder.WebService.iFolderWebLocal http://127.0.0.1:8086/simias10/iFolderWebLocal.asmx $@ +Index: src/admin/Makefile.am +=================================================================== +--- src/admin/Makefile.am (Revision 7049) ++++ src/admin/Makefile.am (Arbeitskopie) +@@ -141,7 +141,7 @@ + all: Novell.iFolderAdmin.dll + + iFolderAdminWebProxy.cs: ../webservices/iFolderAdmin.wsdl +- wsdl /nologo /out:$@ $< ++ $(WSDL) /nologo /out:$@ $< + + Novell.iFolderAdmin.dll: $(srcdir)/AssemblyInfo.cs iFolderAdminWebProxy.cs $(iFolderAdmin_CSFILES) $(iFolderAdmin_RESOURCES) + $(CSC) /out:$@ $(CSCFLAGS) $(iFolderAdmin_FLAGS) $(iFolderAdmin_LIBS:%=/r:%) $(iFolderAdmin_RESOURCES:%=/res:%) $(iFolderAdmin_LIBPATH:%=/lib:%) $(srcdir)/AssemblyInfo.cs $(iFolderAdmin_CSFILES_CSC) $(LOG4NET_LIBS) +Index: src/core/SimiasClient/Makefile.am +=================================================================== +--- src/core/SimiasClient/Makefile.am (Revision 7049) ++++ src/core/SimiasClient/Makefile.am (Arbeitskopie) +@@ -38,7 +38,7 @@ + wsdl /out:SimiasService.cs $(srcdir)/../WebService/Simias.wsdl + endif + if LINUX +- -$(WSDL) -nologo -out:SimiasService.cs $(srcdir)/../WebService/Simias.wsdl ++ $(WSDL) -nologo -out:SimiasService.cs $(srcdir)/../WebService/Simias.wsdl + endif + if DARWIN + wsdl -nologo -out:SimiasService.cs $(srcdir)/../WebService/Simias.wsdl +@@ -46,7 +46,7 @@ + + $(srcdir)/SimiasService2.cs: $(srcdir)/../WebService/Simias.wsdl + if LINUX +- wsdl -nologo -out:SimiasService2.cs $(srcdir)/../WebService/Simias.wsdl ++ $(WSDL) -nologo -out:SimiasService2.cs $(srcdir)/../WebService/Simias.wsdl + $(WSDL) -nologo -out:SimiasService.cs $(srcdir)/../WebService/Simias.wsdl + endif + +Index: src/reports/Proxy/Makefile.am +=================================================================== +--- src/reports/Proxy/Makefile.am (Revision 7049) ++++ src/reports/Proxy/Makefile.am (Arbeitskopie) +@@ -28,7 +28,7 @@ + all: Novell.iFolder.Enterprise.Reports.Proxy.dll + + iFolderReportsProxy.cs: ../WebService/iFolderReports.wsdl +- wsdl /nologo /out:$@ $< ++ $(WSDL) /nologo /out:$@ $< + + Novell.iFolder.Enterprise.Reports.Proxy.dll: iFolderReportsProxy.cs $(iFolderReportsProxy_CSFILES) $(iFolderReportsProxy_RESOURCES) + $(CSC) /out:$@ $(CSCFLAGS) $(iFolderReportsProxy_FLAGS) $(iFolderReportsProxy_LIBS:%=/r:%) $(iFolderReportsProxy_LIBPATH:%=/lib:%) $(iFolderReportsProxy_CSFILES_CSC) /doc:iFolderReportsProxy.doc.xml diff --git a/net-misc/simias/files/simias-1.8-use_system_gsoap-2.patch b/net-misc/simias/files/simias-1.8-use_system_gsoap-2.patch new file mode 100644 index 0000000..4459171 --- /dev/null +++ b/net-misc/simias/files/simias-1.8-use_system_gsoap-2.patch @@ -0,0 +1,68 @@ +diff -uNr simias.orig/src/core/libsimias/Makefile.am simias/src/core/libsimias/Makefile.am +--- simias.orig/src/core/libsimias/Makefile.am 2009-04-19 18:28:33.292587761 +0200 ++++ simias/src/core/libsimias/Makefile.am 2009-04-19 18:31:32.025741548 +0200 +@@ -6,7 +6,6 @@ + dist-hook: + rm -rf `find $(distdir) |grep simiasClientLib.c` + rm -rf `find $(distdir) |grep envC.c` +- rm -rf `find $(distdir) |grep stdsoap2.c` + + + lib_LTLIBRARIES = libsimias.la +@@ -14,7 +13,7 @@ + override CFLAGS = + + libsimias_la_SOURCES = \ +- envC.c simiasClientLib.c stdsoap2.c simias.c simias.h simiasweb.c simiasweb.h ++ envC.c simiasClientLib.c simias.c simias.h simiasweb.c simiasweb.h + + libsimias_la_CFLAGS = \ + $(XML2_CFLAGS) -DWITH_NONAMESPACES -DWITH_COOKIES +@@ -22,19 +21,15 @@ + libsimias_la_LDFLAGS = \ + $(XML2_LIBS) + +-envC.c: $(srcdir)/stdsoap2.c ++envC.c: + > $(srcdir)/env.h +- $(GSOAP_PATH)/soapcpp2 -c -penv $(srcdir)/env.h ++ soapcpp2 -c -penv $(srcdir)/env.h + +-$(srcdir)/stdsoap2.c: +- cp $(GSOAP_PATH)/stdsoap2.h $(srcdir) +- cp $(GSOAP_PATH)/stdsoap2.c $(srcdir) +- +-$(srcdir)/libsimias.h: $(srcdir)/stdsoap2.c $(SIMIAS_WSDL) +- $(GSOAP_PATH)/wsdl2h -c -o $@ $(SIMIAS_WSDL) ++$(srcdir)/libsimias.h: $(SIMIAS_WSDL) ++ wsdl2h -c -o $@ $(SIMIAS_WSDL) + + $(srcdir)/simiasClientLib.c: $(srcdir)/libsimias.h +- $(GSOAP_PATH)/soapcpp2 -c -n -psimias $(srcdir)/libsimias.h ++ soapcpp2 -c -n -psimias $(srcdir)/libsimias.h + + install-exec-hook: + if !WINDOWS +@@ -46,7 +41,6 @@ + $(mkinstalldirs) $(DESTDIR)$(includedir) + $(INSTALL_PROGRAM) simiasStub.h $(DESTDIR)$(includedir)/simias + $(INSTALL_PROGRAM) simias.nsmap $(DESTDIR)$(includedir)/simias +- $(INSTALL_PROGRAM) stdsoap2.h $(DESTDIR)$(includedir)/simias + $(INSTALL_PROGRAM) simiasH.h $(DESTDIR)$(includedir)/simias + $(INSTALL_PROGRAM) simias.h $(DESTDIR)$(includedir)/simias + $(INSTALL_PROGRAM) simiasweb.h $(DESTDIR)$(includedir)/simias +@@ -54,13 +48,12 @@ + uninstall-local: + rm -f $(DESTDIR)$(includedir)/simias/simiasStub.h + rm -f $(DESTDIR)$(includedir)/simias/simias.nsmap +- rm -f $(DESTDIR)$(includedir)/simias/stdsoap2.h + rm -f $(DESTDIR)$(includedir)/simias/simiasH.h + rm -f $(DESTDIR)$(includedir)/simias/simias.h + rm -f $(DESTDIR)$(includedir)/simias/simiasweb.h + + clean-local: +- rm -f stdsoap2.* *.xml simias.nsmap simiasC* simiasH* simiasS* env* soap* ++ rm -f *.xml simias.nsmap simiasC* simiasH* simiasS* env* soap* + rm -rf $(COMMON_CLEAN_FILES) + + distclean-local: diff --git a/net-misc/simias/simias-1.8_pre7049.ebuild b/net-misc/simias/simias-1.8_pre7049.ebuild new file mode 100644 index 0000000..a5bb6a5 --- /dev/null +++ b/net-misc/simias/simias-1.8_pre7049.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2009 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 + +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 ~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} + +src_prepare() { +# epatch "${FILESDIR}"/configure.in-xsp-check-by-dl9pf-version3.diff +# epatch "${FILESDIR}"/simias-libtool22-1.patch +# epatch "${FILESDIR}"/simias-1.8-mono22-2.patch +# epatch "${FILESDIR}"/simias-mononamespace.dpatch +# epatch "${FILESDIR}"/simias-etc_use_destdir.dpatch +# epatch "${FILESDIR}"/simias-bash.dpatch +# epatch "${FILESDIR}"/simias_make_gcc43_happy.diff + epatch "${FILESDIR}"/simias-libflaim_shared-1.patch + epatch "${FILESDIR}"/simias-1.8-use_system_gsoap-2.patch +# epatch "${FILESDIR}"/simias-recovery_agent-fix-1.patch + epatch "${FILESDIR}"/WSDLPATCH.diff + eautoreconf || die "eautoreconf failed" +} + +src_configure() { + econf --with-runasclient || die "configure failed" +} + +src_compile() { + emake -j1 || die "build failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "install failed" +}