net-misc/simias: Bump to new 1.8 release

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/ifolder@918 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one 2009-04-06 17:00:44 +00:00
parent f5f1ff2493
commit 9c9d1b896b
5 changed files with 295 additions and 1 deletions

View File

@ -2,6 +2,11 @@
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
06 Apr 2009; Mario Fetka <mario.fetka@gmail.com>
+files/simias-1.8-mono22-1.patch,
+files/simias-1.8.use_system_gsoap.patch, +simias-1.8_pre7020.ebuild:
Bump to new 1.8 release
28 Feb 2009; Mario Fetka <mario.fetka@gmail.com>
files/simias-mono22-1.patch, +files/eval_gacd_mono_webserver_true.diff,
+files/simias-bash.dpatch, +files/simias-etc_use_destdir.dpatch,

View File

@ -1,6 +1,8 @@
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.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
AUX simias-etc_use_destdir.dpatch 1570 RMD160 50dd9de5b9ca0f45735bdc2d166e6020b1d0d4a3 SHA1 0b5128209c1d5546e399e4bac773d4c7a4fa9760 SHA256 53611a9778cac46e249694198a95b07ba6e9a514b0551c361900894282e728c1
@ -15,5 +17,6 @@ EBUILD simias-1.6.7303.1-r1.ebuild 1091 RMD160 173b14a0b6474dc395d851c0b9751a234
EBUILD simias-1.6.7303.1-r2.ebuild 1147 RMD160 81a0772ae821dc260bb881ea05f6f22837d42744 SHA1 2b0a326f4c27ef93dc17d25fa2f34cda1b752f8a SHA256 170f18db08c0f839a2782b934121bec5d98d455171f77d2a994a12df6b7d24a2
EBUILD simias-1.6.7303.1-r3.ebuild 1290 RMD160 da53ddfd16176a35d3f583a36a4cc82c6aa377ff SHA1 196ccf5dcd40e4c709feb80fce82d0b92860c5dd SHA256 cad3291b0a4e4fab8d4df60fbc287136429954886ce18088166d9f7641e3253c
EBUILD simias-1.6.7303.1.ebuild 1112 RMD160 8365e168ccc0b0d4c7ca79e817a260b6b82f2951 SHA1 d0acae886aba342082063935f1ac06df0da61fbf SHA256 f90e8de280424a1ce92ba032455fed06634429ff88a5ed58349b06cd1972efdb
MISC ChangeLog 1819 RMD160 834f2ceba927edd26de7ed47ee0071b53e91113e SHA1 3fd852174d33bcd6522b8545d4098ffa6b139ec8 SHA256 9488ef7c7ffab76cbdef1f88bf795a9020378c1ec4bea8e7dc06e567f705a8d9
EBUILD simias-1.8_pre7020.ebuild 1389 RMD160 d76ebb31b8eced0739655b8f446c84d32087422a SHA1 4ca0e2324d9b6ea287b6a17613f2f212fec629d7 SHA256 202ff0750c9c0c33bd48f086e369ed970014b4da3e0aa505cf0ed9c32cd98b22
MISC ChangeLog 2005 RMD160 215ee13570bf16d9790f59289f0bf846654b4ea4 SHA1 a6f7a10322e06dd2d6bb4068e94e1464f5ad423c SHA256 fadd72441d19544c0f75fd912252c960a0836f09f5bf671cf0ae3742ca2f646c
MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

View File

@ -0,0 +1,154 @@
diff -uNr simias.orig/configure.in simias/configure.in
--- simias.orig/configure.in 2009-04-06 11:03:00.061800856 +0200
+++ simias/configure.in 2009-04-06 11:03:46.480191295 +0200
@@ -18,8 +18,8 @@
case $host_os in
linux*)
SIMIAS_OS='linux'
- AC_CHECK_PROG(CSC, mcs, mcs)
- test -z "$CSC" && AC_MSG_ERROR([no C Sharp compiler: mcs not found in \$PATH])
+ AC_CHECK_PROG(CSC, gmcs, gmcs)
+ test -z "$CSC" && AC_MSG_ERROR([no C Sharp compiler: gmcs not found in \$PATH])
PKG_CONFIG_DIR="$LIB64"
AC_CHECK_PROG(CSC2, gmcs, gmcs)
test -z "$CSC" && AC_MSG_ERROR([no C Sharp .Net 2.0 compiler: gmcs not found in \$PATH])
@@ -48,7 +48,7 @@
AM_CONDITIONAL(WINDOWS, test "$SIMIAS_OS" = "windows")
AM_CONDITIONAL(DARWIN, test "$SIMIAS_OS" = "darwin")
AM_CONDITIONAL(DARWIN_X86, test "$host_cpu" = "i686")
-AM_CONDITIONAL(MONO, test "$CSC" = "mcs")
+AM_CONDITIONAL(MONO, test "$CSC" = "gmcs")
AM_CONDITIONAL(DOTNET, test "$CSC" = "csc")
@@ -121,7 +121,7 @@
#
# Mono-specific configuration
#
- mcs)
+ gmcs)
CSC_EXEFLAG=/target:exe
CSC_LIBFLAG=/target:library
CSC_WINEXEFLAG=/target:winexe
diff -uNr simias.orig/src/admin/Makefile.am simias/src/admin/Makefile.am
--- simias.orig/src/admin/Makefile.am 2009-04-06 11:03:00.057171272 +0200
+++ simias/src/admin/Makefile.am 2009-04-06 11:05:12.318699017 +0200
@@ -141,7 +141,7 @@
all: Novell.iFolderAdmin.dll
iFolderAdminWebProxy.cs: ../webservices/iFolderAdmin.wsdl
- wsdl /nologo /out:$@ $<
+ wsdl2 /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)
diff -uNr simias.orig/src/core/Notifications/Notification.cs simias/src/core/Notifications/Notification.cs
--- simias.orig/src/core/Notifications/Notification.cs 2009-04-06 11:02:59.987723103 +0200
+++ simias/src/core/Notifications/Notification.cs 2009-04-06 11:16:49.596233553 +0200
@@ -43,6 +43,8 @@
using Simias.Service;
using Simias.Sync;
+using Action = Simias.Client.Event.Action;
+
namespace Simias.Storage
{
/// <summary>
diff -uNr simias.orig/src/core/SimiasApp/Makefile.am simias/src/core/SimiasApp/Makefile.am
--- simias.orig/src/core/SimiasApp/Makefile.am 2009-04-06 11:02:59.985412467 +0200
+++ simias/src/core/SimiasApp/Makefile.am 2009-04-06 11:12:44.117150083 +0200
@@ -7,7 +7,8 @@
SYSTEM_INSTALLER_LIB =
endif
-MONO_WEBSERVER_PATH = ../../../dependencies/external/Mono.WebServer
+$(GACD_MONO_WEBSERVER_FALSE) MONO_WEBSERVER_PATH = ../../../dependencies/external/Mono.WebServer
+$(GACD_MONO_WEBSERVER_TRUE) MONO_WEBSERVER_PATH = $(MONO_PATH)
Simias_CSFILES = $(srcdir)/Simias.cs \
$(srcdir)/SimiasAppInstallerClass.cs
@@ -16,7 +17,7 @@
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 -uNr simias.orig/src/core/SimiasClient/Makefile.am simias/src/core/SimiasClient/Makefile.am
--- simias.orig/src/core/SimiasClient/Makefile.am 2009-04-06 11:02:59.983094008 +0200
+++ simias/src/core/SimiasClient/Makefile.am 2009-04-06 11:08:43.841779002 +0200
@@ -34,7 +34,7 @@
wsdl /out:SimiasService.cs $(srcdir)/../WebService/Simias.wsdl
endif
if LINUX
- -wsdl -nologo -out:SimiasService.cs $(srcdir)/../WebService/Simias.wsdl
+ wsdl2 -nologo -out:SimiasService.cs $(srcdir)/../WebService/Simias.wsdl
endif
if DARWIN
wsdl -nologo -out:SimiasService.cs $(srcdir)/../WebService/Simias.wsdl
diff -uNr simias.orig/src/core/Sync/SyncClient.cs simias/src/core/Sync/SyncClient.cs
--- simias.orig/src/core/Sync/SyncClient.cs 2009-04-06 11:02:59.994671636 +0200
+++ simias/src/core/Sync/SyncClient.cs 2009-04-06 11:17:24.656406387 +0200
@@ -48,7 +48,7 @@
using Simias.Client.Event;
using Simias.DomainServices;
-
+using Action = Simias.Client.Event.Action;
namespace Simias.Sync
{
diff -uNr simias.orig/src/reports/Proxy/Makefile.am simias/src/reports/Proxy/Makefile.am
--- simias.orig/src/reports/Proxy/Makefile.am 2009-04-06 11:03:00.022445721 +0200
+++ simias/src/reports/Proxy/Makefile.am 2009-04-06 11:05:39.207006205 +0200
@@ -28,7 +28,7 @@
all: Novell.iFolder.Enterprise.Reports.Proxy.dll
iFolderReportsProxy.cs: ../WebService/iFolderReports.wsdl
- wsdl /nologo /out:$@ $<
+ wsdl2 /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 -uNr simias.orig/src/utils/usercmd/Makefile.am simias/src/utils/usercmd/Makefile.am
--- simias.orig/src/utils/usercmd/Makefile.am 2009-04-06 11:03:00.022445721 +0200
+++ simias/src/utils/usercmd/Makefile.am 2009-04-06 11:05:59.938476129 +0200
@@ -34,7 +34,7 @@
all: UserCmd.exe
AdminService.cs: ../../webservices/iFolderAdmin.wsdl
- wsdl /nologo /out:$@ $<
+ wsdl2 /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)
diff -uNr simias.orig/src/webaccess/Makefile.am simias/src/webaccess/Makefile.am
--- simias.orig/src/webaccess/Makefile.am 2009-04-06 11:03:00.020130196 +0200
+++ simias/src/webaccess/Makefile.am 2009-04-06 11:06:08.061160358 +0200
@@ -121,7 +121,7 @@
all: Novell.iFolderWeb.dll
iFolderWebProxy.cs: ../webservices/iFolderWeb.wsdl
- wsdl /nologo /out:$@ $<
+ wsdl2 /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
diff -uNr simias.orig/src/webservices/Makefile.am simias/src/webservices/Makefile.am
--- simias.orig/src/webservices/Makefile.am 2009-04-06 11:02:59.966891195 +0200
+++ simias/src/webservices/Makefile.am 2009-04-06 11:09:21.894426864 +0200
@@ -101,10 +101,10 @@
cp ../server/Simias.LdapProvider/Simias.LdapProvider.dll .
iFolderWebLocalProxy.cs: iFolderWebLocal.wsdl
- wsdl /nologo /namespace:iFolder.WebService.Web /out:$@ $<
+ wsdl2 /nologo /namespace:iFolder.WebService.Web /out:$@ $<
iFolderAdminLocalProxy.cs: iFolderAdminLocal.wsdl
- wsdl /nologo /namespace:iFolder.WebService.Admin /out:$@ $<
+ wsdl2 /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 $@

View File

@ -0,0 +1,80 @@
diff -uNr simias.orig/Makefile.am simias/Makefile.am
--- simias.orig/Makefile.am 2009-04-06 10:47:59.070799915 +0200
+++ simias/Makefile.am 2009-04-06 10:49:36.281417403 +0200
@@ -7,7 +7,7 @@
rm -rf `find $(distdir) -name CVS`
rm -rf `find $(distdir) -name ".svn"`
-EXTRA_DIST = ./iFolder.snk ./dependencies/external/tools/aclocal ./dependencies/external/tools/gsoap ./dependencies/external/libflaim ./dependencies/external/Mono.WebServer
+EXTRA_DIST = ./iFolder.snk ./dependencies/external/tools/aclocal ./dependencies/external/libflaim ./dependencies/external/Mono.WebServer
all:
diff -uNr simias.orig/src/core/libsimias/Makefile.am simias/src/core/libsimias/Makefile.am
--- simias.orig/src/core/libsimias/Makefile.am 2009-04-06 10:47:58.901816898 +0200
+++ simias/src/core/libsimias/Makefile.am 2009-04-06 10:52:53.117582758 +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:

View File

@ -0,0 +1,52 @@
# 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 ~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-1.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.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
}