net-misc/simias: new point release
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/ifolder@1414 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one
parent
ee533a9a2f
commit
bb43daceae
|
|
@ -2,6 +2,23 @@
|
|||
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
|
||||
# $Header: $
|
||||
|
||||
*simias-1.8_pre7153 (24 Jul 2009)
|
||||
|
||||
24 Jul 2009; Mario Fetka <mario.fetka@gmail.com>
|
||||
-simias-1.6.7303.1-r3.ebuild, -files/simias-1.6.use_system_gsoap.patch,
|
||||
-simias-1.8_pre7021.ebuild, -simias-1.8_pre7049.ebuild,
|
||||
+simias-1.8_pre7153.ebuild, -files/simias-1.8-mono22-1.patch,
|
||||
-files/simias-1.8-mono22-2.patch, -files/simias-1.8-mono22-3.patch,
|
||||
-files/simias-1.8.use_system_gsoap.patch, -files/WSDLPATCH-1.diff,
|
||||
-files/simias-recovery_agent-fix-1.patch, -files/simias-libtool22-1.patch,
|
||||
-files/simias-mono22-1.patch, -files/WSDLPATCH.diff,
|
||||
-files/configure.in-xsp-check-by-dl9pf-version3.diff,
|
||||
-files/eval_gacd_mono_webserver_true.diff,
|
||||
-files/simias-Makefile-in-generate.diff, -files/simias-bash.dpatch,
|
||||
-files/simias-etc_use_destdir.dpatch, -files/simias-mononamespace.dpatch,
|
||||
-files/simias_make_gcc43_happy.diff, -simias-1.8_pre7061.ebuild:
|
||||
new point release
|
||||
|
||||
*simias-1.8_pre7061 (30 Apr 2009)
|
||||
|
||||
30 Apr 2009; Mario Fetka <mario.fetka@gmail.com>
|
||||
|
|
|
|||
|
|
@ -1,26 +1,5 @@
|
|||
AUX WSDLPATCH-1.diff 1372 RMD160 1d663404c3fb49346cb3d3cd53b09b28cdd60038 SHA1 625674f7aad4ad495acccc7c522eb3b07dcbb1fb SHA256 fa2edda34b8be078a3c796228a67920ba5c8a5143a3b164a6162fd626c52264a
|
||||
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-mono22-3.patch 1371 RMD160 07223bd3ff49b33a61e5460e76e1109e6a9ae5b4 SHA1 d84821690f1a256b9e3a4db60e6c5674715d657b SHA256 d9d9cc4d2c9b71a9b6febbbea62a7b4acd6e25d768340a28b664b3e4734d3dbe
|
||||
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
|
||||
AUX simias-etc_use_destdir.dpatch 1570 RMD160 50dd9de5b9ca0f45735bdc2d166e6020b1d0d4a3 SHA1 0b5128209c1d5546e399e4bac773d4c7a4fa9760 SHA256 53611a9778cac46e249694198a95b07ba6e9a514b0551c361900894282e728c1
|
||||
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 9708 RMD160 527169ab20c88847a8604ba6b5c6d79063fb1392 SHA1 9f371158b24d3e9098f88f6986ebb745dbd0a9bc SHA256 5d1e8a078407ab8953de8487de6e33432cdb1e530c34ab51dc374e2727f4f45a
|
||||
AUX simias-mononamespace.dpatch 738 RMD160 57d65758f50a5f2efa1fa097cf899024f28ccd12 SHA1 8a3449fb7bfd7518cbd8050cc6cdeab59c4e8464 SHA256 d88f6096b603410d6235442d95b295d257ebd902203cbaf74e62a663efc2418c
|
||||
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-r3.ebuild 1280 RMD160 485e5c8cf0f51faa207f01db636e7366a01db445 SHA1 321ab0e0e7e254deaa9724891bef4a688dbf72c6 SHA256 3a7be8c6b3f893151125a6c98bbb4e56214d0649aa252b019a5b6cd863c65120
|
||||
EBUILD simias-1.8_pre7021.ebuild 1441 RMD160 fa614e3d07c8e36b778d62633db1f657b117eb54 SHA1 ee85da2d28213481b31e693fa106bfbe3807ff2f SHA256 da5ef0a29b659f3182b2c73b4cb5ebf3d5e57ef3415c0d5334a947152c5c3fb8
|
||||
EBUILD simias-1.8_pre7049.ebuild 1483 RMD160 76745aabd342be488dee69ae50e827eaeb609af7 SHA1 963829ca3cf3a8f3c6296b7d6a6c205b2b135fe4 SHA256 cef95d314ceadf9567e755df80a632ba8bed8348afde75253a9d29f56c57f89c
|
||||
EBUILD simias-1.8_pre7061.ebuild 1485 RMD160 b016c15e57640828b7a0624dd5213597a2106ee8 SHA1 14caf6c4ee6a38a73990f0bdf5026b71f0712287 SHA256 f06a325cc5cf879545a32a3ae1b53876175f69ccaf4943ebe57cd7f17b7c5f20
|
||||
MISC ChangeLog 2868 RMD160 43fb19f393274126c9bfa68ea5501fa9bee624c3 SHA1 f0ad1a594ced85f343d41541ef8063c847d53c48 SHA256 dc50dcf977313cd6cb7ded4696f0396d2d6c857886e5030623026ee0d3280a03
|
||||
EBUILD simias-1.8_pre7153.ebuild 1485 RMD160 865eeaa7bdcab93c1af53aa3f30b277dee1936b3 SHA1 e688cd3b9ce51500e764d49848abbb6ad5d0d91c SHA256 f89144be0c8b8936a700d8f944d5533d74e17ce08faa98e005a704abc4761d86
|
||||
MISC ChangeLog 3756 RMD160 44d15e8bed4b270a39f7a2860deb026fe10fb423 SHA1 460eddfc2a1677ccfe3e58df24b321407531177c SHA256 0e9e72915f9b9b861709ea80ece46202e783cdf0011598f4374ff494575d8b95
|
||||
MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
|
||||
|
|
|
|||
|
|
@ -1,24 +0,0 @@
|
|||
diff -uNr simias.orig/src/core/SimiasClient/Makefile.am simias/src/core/SimiasClient/Makefile.am
|
||||
--- simias.orig/src/core/SimiasClient/Makefile.am 2009-04-30 15:07:32.792699886 +0200
|
||||
+++ simias/src/core/SimiasClient/Makefile.am 2009-04-30 15:13:14.750911570 +0200
|
||||
@@ -43,7 +43,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
|
||||
|
||||
diff -uNr simias.orig/src/reports/Proxy/Makefile.am simias/src/reports/Proxy/Makefile.am
|
||||
--- simias.orig/src/reports/Proxy/Makefile.am 2009-04-30 15:07:32.882977909 +0200
|
||||
+++ simias/src/reports/Proxy/Makefile.am 2009-04-30 15:11:44.554184382 +0200
|
||||
@@ -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
|
||||
|
|
@ -1,105 +0,0 @@
|
|||
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
|
||||
|
|
@ -1,94 +0,0 @@
|
|||
Index: configure.in
|
||||
===================================================================
|
||||
--- configure.in (Revision 6873)
|
||||
+++ configure.in (Arbeitskopie)
|
||||
@@ -607,8 +607,87 @@
|
||||
# Configure MONO_WEBSERVER
|
||||
#
|
||||
MONO_WEBSERVER="no"
|
||||
-if test -e "/usr/lib/mono/1.0/Mono.WebServer.dll"; then
|
||||
- MONO_WEBSERVER="yes"
|
||||
+if test "$SIMIAS_OS" = "linux"; then
|
||||
+ # If we have xsp in our $PATH, then we have xsp installed
|
||||
+ AC_CHECK_PROG(HAVE_XSP, xsp, yes)
|
||||
+ AC_CHECKING([whether xsp version is >= 1.1.13.8])
|
||||
+ if test "$HAVE_XSP" = "yes"; then
|
||||
+ # Get the version info and check if we have a version >= 1.1.18
|
||||
+ # 1st: Get the version string
|
||||
+ XSP_EXE_VER=`LANG="C" xsp --version | head -n 1 | cut -d" " -f2`
|
||||
+
|
||||
+ # We have to look at a minimum of 3 digits (mono-W.X.Y.Z)
|
||||
+ DIGIT_W=`echo $XSP_EXE_VER | cut -d"." -f1` # major
|
||||
+ DIGIT_X=`echo $XSP_EXE_VER | cut -d"." -f2` # minor
|
||||
+ DIGIT_Y=`echo $XSP_EXE_VER | cut -d"." -f3` # sub
|
||||
+ DIGIT_Z=`echo $XSP_EXE_VER | cut -d"." -f4` # extra
|
||||
+
|
||||
+ # We want to require a minimum of 1.1.18 (no z, setting "0")
|
||||
+ REQ_MAJOR="1"
|
||||
+ REQ_MINOR="1"
|
||||
+ REQ_SUB="13"
|
||||
+ REQ_EXTRA="7"
|
||||
+
|
||||
+ # Lets compare things
|
||||
+ echo " M M S E"
|
||||
+ echo " A I U X"
|
||||
+ echo " J N B T"
|
||||
+ echo " O O R"
|
||||
+ echo " R R A"
|
||||
+ echo " - - - "
|
||||
+ echo "DEBUG $DIGIT_W - $DIGIT_X - $DIGIT_Y - $DIGIT_Z"
|
||||
+ echo "DEBUG $REQ_MAJOR - $REQ_MINOR - $REQ_SUB - $REQ_EXTRA"
|
||||
+
|
||||
+XSP_ERROR_MSG="
|
||||
+* Your xsp version seems to be $DIGIT_W.$DIGIT_X.$DIGIT_Y.$DIGIT_Z
|
||||
+* You need to install xsp >= $REQ_MAJOR.$REQ_MINOR.$REQ_SUB to run simias
|
||||
+"
|
||||
+
|
||||
+ if [[[ -n $DIGIT_W && $DIGIT_W -ge $REQ_MAJOR ]]] ; then
|
||||
+ echo "MAJOR OK"
|
||||
+ # MAJOR IS OK, NOW CHECK MINOR
|
||||
+ if [[[ -n $DIGIT_X && $DIGIT_X -gt $REQ_MINOR ]]] ; then
|
||||
+ echo "MINOR GREATER"
|
||||
+ # MINOR IS GREATER, SKIP CHECK SUB
|
||||
+ MONO_WEBSERVER="yes"
|
||||
+ else
|
||||
+ if [[[ -n $DIGIT_X && $DIGIT_X -eq $REQ_MINOR ]]] ; then
|
||||
+ echo "MINOR EQUAL"
|
||||
+ # MINOR IS EQUAL, CHECK SUB
|
||||
+ if [[[ -n $DIGIT_Y && $DIGIT_Y -gt $REQ_SUB ]]] ; then
|
||||
+ echo "SUB OK"
|
||||
+ # SUB IS GREATER - SKIP CHECK EXTRA
|
||||
+ MONO_WEBSERVER="yes"
|
||||
+ else
|
||||
+ if [[[ -n $DIGIT_Y && $DIGIT_Y -eq $REQ_SUB ]]] ; then
|
||||
+ echo "SUB OK"
|
||||
+ # SUB IS EQUAL, CHECK EXTRA
|
||||
+ if [[[ -n $DIGIT_Z && $DIGIT_Z -ge $REQ_EXTRA ]]] ; then
|
||||
+ echo "EXTRA OK"
|
||||
+ # EXTRA IS GREATER/EQUAL
|
||||
+ MONO_WEBSERVER="yes"
|
||||
+ else
|
||||
+ echo "EXTRA NOT OK !"
|
||||
+ AC_MSG_ERROR($XSP_ERROR_MSG)
|
||||
+ fi
|
||||
+ else
|
||||
+ echo "SUB NOT OK !"
|
||||
+ AC_MSG_ERROR($XSP_ERROR_MSG)
|
||||
+ fi
|
||||
+ fi
|
||||
+ else
|
||||
+ echo "MINOR NOT OK !"
|
||||
+ AC_MSG_ERROR($XSP_ERROR_MSG)
|
||||
+ fi
|
||||
+ fi
|
||||
+ else
|
||||
+ echo "MAJOR NOT OK !"
|
||||
+ AC_MSG_ERROR($XSP_ERROR_MSG)
|
||||
+ fi
|
||||
+ echo "DEBUG MONO_WEBSERVER=yes"
|
||||
+ else
|
||||
+ AC_MSG_ERROR(* xsp command not found)
|
||||
+ fi
|
||||
fi
|
||||
|
||||
AC_SUBST(MONO_WEBSERVER)
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
Index: src/core/SimiasApp/Makefile.am
|
||||
===================================================================
|
||||
--- src/core/SimiasApp/Makefile.am (Revision 6873)
|
||||
+++ src/core/SimiasApp/Makefile.am (Arbeitskopie)
|
||||
@@ -7,7 +7,8 @@
|
||||
SYSTEM_INSTALLER_LIB =
|
||||
endif
|
||||
|
||||
-MONO_WEBSERVER_PATH = ../../../external/Mono.WebServer
|
||||
+$(GACD_MONO_WEBSERVER_FALSE) MONO_WEBSERVER_PATH = ../../../external/Mono.WebServer
|
||||
+$(GACD_MONO_WEBSERVER_TRUE) MONO_WEBSERVER_PATH = $(MONO_PATH)
|
||||
|
||||
Simias_CSFILES = $(srcdir)/AssemblyInfo.cs \
|
||||
$(srcdir)/Simias.cs \
|
||||
|
|
@ -1,80 +0,0 @@
|
|||
diff -uNr simias.orig/Makefile.am simias/Makefile.am
|
||||
--- simias.orig/Makefile.am 2009-02-21 15:54:46.573843452 +0100
|
||||
+++ simias/Makefile.am 2009-02-21 15:55:03.186687971 +0100
|
||||
@@ -7,7 +7,7 @@
|
||||
rm -rf `find $(distdir) -name CVS`
|
||||
rm -rf `find $(distdir) -name ".svn"`
|
||||
|
||||
-EXTRA_DIST = iFolder.snk tools/aclocal tools/gsoap external/libflaim external/log4net external/Mono.WebServer
|
||||
+EXTRA_DIST = iFolder.snk tools/aclocal external/libflaim external/log4net 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-02-21 15:54:46.492830527 +0100
|
||||
+++ simias/src/core/libsimias/Makefile.am 2009-02-21 15:55:52.874747286 +0100
|
||||
@@ -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:
|
||||
|
|
@ -1,154 +0,0 @@
|
|||
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 $@
|
||||
|
|
@ -1,161 +0,0 @@
|
|||
Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
|
||||
Date: 2009-04-13
|
||||
Initial Package Version: 1.8
|
||||
Origin: me
|
||||
Upstream Status: unkonown
|
||||
Description: make it mono 2.2 aware
|
||||
|
||||
diff -Naur simias.orig/configure.in simias/configure.in
|
||||
--- simias.orig/configure.in 2009-04-13 18:27:54.551295916 +0000
|
||||
+++ simias/configure.in 2009-04-13 18:28:12.308812139 +0000
|
||||
@@ -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 -Naur simias.orig/src/admin/Makefile.am simias/src/admin/Makefile.am
|
||||
--- simias.orig/src/admin/Makefile.am 2009-04-13 18:27:54.546665502 +0000
|
||||
+++ simias/src/admin/Makefile.am 2009-04-13 18:28:12.308812139 +0000
|
||||
@@ -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 -Naur simias.orig/src/core/Notifications/Notification.cs simias/src/core/Notifications/Notification.cs
|
||||
--- simias.orig/src/core/Notifications/Notification.cs 2009-04-13 18:27:54.440185052 +0000
|
||||
+++ simias/src/core/Notifications/Notification.cs 2009-04-13 18:28:12.311129546 +0000
|
||||
@@ -43,6 +43,8 @@
|
||||
using Simias.Service;
|
||||
using Simias.Sync;
|
||||
|
||||
+using Action = Simias.Client.Event.Action;
|
||||
+
|
||||
namespace Simias.Storage
|
||||
{
|
||||
/// <summary>
|
||||
diff -Naur simias.orig/src/core/SimiasApp/Makefile.am simias/src/core/SimiasApp/Makefile.am
|
||||
--- simias.orig/src/core/SimiasApp/Makefile.am 2009-04-13 18:27:54.433240653 +0000
|
||||
+++ simias/src/core/SimiasApp/Makefile.am 2009-04-13 18:28:12.313443530 +0000
|
||||
@@ -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 -Naur simias.orig/src/core/SimiasClient/Makefile.am simias/src/core/SimiasClient/Makefile.am
|
||||
--- simias.orig/src/core/SimiasClient/Makefile.am 2009-04-13 18:27:54.423986181 +0000
|
||||
+++ simias/src/core/SimiasClient/Makefile.am 2009-04-13 18:28:12.313443530 +0000
|
||||
@@ -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 -Naur simias.orig/src/core/Sync/SyncClient.cs simias/src/core/Sync/SyncClient.cs
|
||||
--- simias.orig/src/core/Sync/SyncClient.cs 2009-04-13 18:27:54.449444901 +0000
|
||||
+++ simias/src/core/Sync/SyncClient.cs 2009-04-13 18:30:07.259580369 +0000
|
||||
@@ -48,7 +48,7 @@
|
||||
using Simias.Client.Event;
|
||||
using Simias.DomainServices;
|
||||
|
||||
-
|
||||
+using Action = Simias.Client.Event.Action;
|
||||
|
||||
namespace Simias.Sync
|
||||
{
|
||||
diff -Naur simias.orig/src/reports/Proxy/Makefile.am simias/src/reports/Proxy/Makefile.am
|
||||
--- simias.orig/src/reports/Proxy/Makefile.am 2009-04-13 18:27:54.507312607 +0000
|
||||
+++ simias/src/reports/Proxy/Makefile.am 2009-04-13 18:28:12.318074433 +0000
|
||||
@@ -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 -Naur simias.orig/src/utils/usercmd/Makefile.am simias/src/utils/usercmd/Makefile.am
|
||||
--- simias.orig/src/utils/usercmd/Makefile.am 2009-04-13 18:27:54.507312607 +0000
|
||||
+++ simias/src/utils/usercmd/Makefile.am 2009-04-13 18:28:12.320384995 +0000
|
||||
@@ -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 -Naur simias.orig/src/webaccess/Makefile.am simias/src/webaccess/Makefile.am
|
||||
--- simias.orig/src/webaccess/Makefile.am 2009-04-13 18:27:54.502683660 +0000
|
||||
+++ simias/src/webaccess/Makefile.am 2009-04-13 18:28:12.320384995 +0000
|
||||
@@ -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 -Naur simias.orig/src/webservices/Makefile.am simias/src/webservices/Makefile.am
|
||||
--- simias.orig/src/webservices/Makefile.am 2009-04-13 18:27:54.313452717 +0000
|
||||
+++ simias/src/webservices/Makefile.am 2009-04-13 18:28:12.320384995 +0000
|
||||
@@ -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 $@
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
diff -uNr simias.orig/configure.in simias/configure.in
|
||||
--- simias.orig/configure.in 2009-04-20 09:26:07.736014674 +0200
|
||||
+++ simias/configure.in 2009-04-20 09:31:35.060549522 +0200
|
||||
@@ -22,13 +22,13 @@
|
||||
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])
|
||||
PKG_CONFIG_DIR="$LIB64"
|
||||
- AC_CHECK_PROG(WSDL, wsdl1, wsdl1,wsdl)
|
||||
+ AC_CHECK_PROG(WSDL, wsdl2, wsdl2)
|
||||
;;
|
||||
darwin*)
|
||||
SIMIAS_OS='darwin'
|
||||
@@ -53,7 +53,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")
|
||||
|
||||
|
||||
@@ -126,7 +126,7 @@
|
||||
#
|
||||
# Mono-specific configuration
|
||||
#
|
||||
- mcs)
|
||||
+ gmcs)
|
||||
CSC_EXEFLAG=/target:exe
|
||||
CSC_LIBFLAG=/target:library
|
||||
CSC_WINEXEFLAG=/target:winexe
|
||||
|
|
@ -1,80 +0,0 @@
|
|||
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:
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
--- /home/srinidhi/sandbox/simias/configure.in 2007-01-04 19:57:04.000000000 +0530
|
||||
+++ configure.in 2007-01-04 21:21:43.000000000 +0530
|
||||
@@ -616,7 +616,7 @@
|
||||
fi
|
||||
|
||||
AC_SUBST(MODMONO_CONFPATH)
|
||||
-
|
||||
+AM_CONFIG_HEADER(config.h)
|
||||
|
||||
#
|
||||
# Configure files
|
||||
|
||||
|
|
@ -1,97 +0,0 @@
|
|||
#! /bin/sh /usr/share/dpatch/dpatch-run
|
||||
## 004_bash.dpatch by <fabbione@gordian.int.fabbione.net>
|
||||
##
|
||||
## All lines beginning with `## DP:' are a description of the patch.
|
||||
## DP: No description.
|
||||
|
||||
@DPATCH@
|
||||
diff -urNad simias-3.6~/src/client/simias.in simias-3.6/src/client/simias.in
|
||||
--- simias-3.6~/src/client/simias.in 2006-04-12 23:37:31.000000000 +0200
|
||||
+++ simias-3.6/src/client/simias.in 2007-10-12 12:16:03.000000000 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/bin/sh
|
||||
+#!/bin/bash
|
||||
#######################################################################
|
||||
#
|
||||
# $RCSfile$
|
||||
diff -urNad simias-3.6~/src/reports/Client/ifolder-reports-generate.in simias-3.6/src/reports/Client/ifolder-reports-generate.in
|
||||
--- simias-3.6~/src/reports/Client/ifolder-reports-generate.in 2006-03-28 23:22:11.000000000 +0200
|
||||
+++ simias-3.6/src/reports/Client/ifolder-reports-generate.in 2007-10-12 12:16:03.000000000 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/bin/sh
|
||||
+#!/bin/bash
|
||||
#######################################################################
|
||||
#
|
||||
# $RCSfile: ifolder-reports-generate.in,v $
|
||||
diff -urNad simias-3.6~/src/server/setup/ifolder-admin-setup.in simias-3.6/src/server/setup/ifolder-admin-setup.in
|
||||
--- simias-3.6~/src/server/setup/ifolder-admin-setup.in 2007-08-10 06:26:59.000000000 +0200
|
||||
+++ simias-3.6/src/server/setup/ifolder-admin-setup.in 2007-10-12 12:16:03.000000000 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/bin/sh
|
||||
+#!/bin/bash
|
||||
|
||||
#****************************************************************************
|
||||
#
|
||||
diff -urNad simias-3.6~/src/server/setup/ifolder-web-setup.in simias-3.6/src/server/setup/ifolder-web-setup.in
|
||||
--- simias-3.6~/src/server/setup/ifolder-web-setup.in 2007-08-10 06:26:59.000000000 +0200
|
||||
+++ simias-3.6/src/server/setup/ifolder-web-setup.in 2007-10-12 12:16:03.000000000 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/bin/sh
|
||||
+#!/bin/bash
|
||||
#****************************************************************************
|
||||
#
|
||||
# Copyright (c) 2007 Novell, Inc.
|
||||
diff -urNad simias-3.6~/src/server/setup/simias-server-setup.in simias-3.6/src/server/setup/simias-server-setup.in
|
||||
--- simias-3.6~/src/server/setup/simias-server-setup.in 2007-08-10 06:26:59.000000000 +0200
|
||||
+++ simias-3.6/src/server/setup/simias-server-setup.in 2007-10-12 12:16:03.000000000 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/bin/sh
|
||||
+#!/bin/bash
|
||||
#****************************************************************************
|
||||
#
|
||||
# Copyright (c) 2007 Novell, Inc.
|
||||
diff -urNad simias-3.6~/src/server/simias-server.in simias-3.6/src/server/simias-server.in
|
||||
--- simias-3.6~/src/server/simias-server.in 2006-08-24 22:51:26.000000000 +0200
|
||||
+++ simias-3.6/src/server/simias-server.in 2007-10-12 12:16:03.000000000 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/bin/sh
|
||||
+#!/bin/bash
|
||||
#######################################################################
|
||||
#
|
||||
# $RCSfile: simias-server.in,v $
|
||||
diff -urNad simias-3.6~/src/utils/usercmd/simias-create-user.in simias-3.6/src/utils/usercmd/simias-create-user.in
|
||||
--- simias-3.6~/src/utils/usercmd/simias-create-user.in 2006-03-30 18:42:58.000000000 +0200
|
||||
+++ simias-3.6/src/utils/usercmd/simias-create-user.in 2007-10-12 12:16:03.000000000 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/bin/sh
|
||||
+#!/bin/bash
|
||||
#######################################################################
|
||||
#
|
||||
# $RCSfile: simias-create-user.in,v $
|
||||
diff -urNad simias-3.6~/src/utils/usercmd/simias-delete-user.in simias-3.6/src/utils/usercmd/simias-delete-user.in
|
||||
--- simias-3.6~/src/utils/usercmd/simias-delete-user.in 2006-03-30 18:42:58.000000000 +0200
|
||||
+++ simias-3.6/src/utils/usercmd/simias-delete-user.in 2007-10-12 12:16:03.000000000 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/bin/sh
|
||||
+#!/bin/bash
|
||||
#######################################################################
|
||||
#
|
||||
# $RCSfile: simias-delete-user.in,v $
|
||||
diff -urNad simias-3.6~/src/utils/usercmd/simias-user.cmd.in simias-3.6/src/utils/usercmd/simias-user.cmd.in
|
||||
--- simias-3.6~/src/utils/usercmd/simias-user.cmd.in 2006-03-30 22:07:32.000000000 +0200
|
||||
+++ simias-3.6/src/utils/usercmd/simias-user.cmd.in 2007-10-12 12:16:03.000000000 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/bin/sh
|
||||
+#!/bin/bash
|
||||
#######################################################################
|
||||
#
|
||||
# $RCSfile: simias-user.cmd.in,v $
|
||||
diff -urNad simias-3.6~/src/utils/usercmd/simias-user.in simias-3.6/src/utils/usercmd/simias-user.in
|
||||
--- simias-3.6~/src/utils/usercmd/simias-user.in 2006-03-30 18:42:58.000000000 +0200
|
||||
+++ simias-3.6/src/utils/usercmd/simias-user.in 2007-10-12 12:16:03.000000000 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/bin/sh
|
||||
+#!/bin/bash
|
||||
#######################################################################
|
||||
#
|
||||
# $RCSfile: simias-user.in,v $
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
#! /bin/sh /usr/share/dpatch/dpatch-run
|
||||
## 003_etc_use_destdir.dpatch by <fabbione@gordian.int.fabbione.net>
|
||||
##
|
||||
## All lines beginning with `## DP:' are a description of the patch.
|
||||
## DP: No description.
|
||||
|
||||
@DPATCH@
|
||||
diff -urNad simias-3.6~/src/server/setup/Makefile.in simias-3.6/src/server/setup/Makefile.in
|
||||
--- simias-3.6~/src/server/setup/Makefile.in 2007-10-12 08:15:45.000000000 +0200
|
||||
+++ simias-3.6/src/server/setup/Makefile.in 2007-10-12 09:36:52.000000000 +0200
|
||||
@@ -680,9 +680,8 @@
|
||||
@WINDOWS_FALSE@ $(INSTALL_PROGRAM) ifolder-web-setup $(DESTDIR)$(bindir)
|
||||
@WINDOWS_FALSE@ $(INSTALL_PROGRAM) ifolder-admin-setup $(DESTDIR)$(bindir)
|
||||
@WINDOWS_FALSE@ $(INSTALL_PROGRAM) utility.exe $(DEBUG_FILES) $(DESTDIR)$(bindir)
|
||||
-@WINDOWS_FALSE@ $(mkinstalldirs) /etc/ld.so.conf.d
|
||||
-@WINDOWS_FALSE@ $(INSTALL_PROGRAM) novell-ifolder3.conf /etc/ld.so.conf.d
|
||||
-@WINDOWS_FALSE@ grep -q "include /etc/ld.so.conf.d/\*.conf" /etc/ld.so.conf || echo "include /etc/ld.so.conf.d/*.conf" >> /etc/ld.so.conf
|
||||
+@WINDOWS_FALSE@ $(mkinstalldirs) $(DESTDIR)/etc/ld.so.conf.d
|
||||
+@WINDOWS_FALSE@ $(INSTALL_PROGRAM) novell-ifolder3.conf $(DESTDIR)/etc/ld.so.conf.d
|
||||
|
||||
uninstall-local:
|
||||
cd $(DESTDIR)$(bindir); rm -f SimiasServerSetup.exe $(DEBUG_FILES)
|
||||
@@ -695,7 +694,7 @@
|
||||
cd $(DESTDIR)$(bindir); rm -f ifolder-admin-setup ifolder-admin-setup.cmd
|
||||
cd $(DESTDIR)$(bindir); rm -f iFolderAdminSetup.exe.config
|
||||
cd $(DESTDIR)$(bindir); rm -f utility.exe
|
||||
- cd /etc/ld.so.conf.d; rm -f novell-ifolder3.conf
|
||||
+ cd $(DESTDIR)/etc/ld.so.conf.d; rm -f novell-ifolder3.conf
|
||||
|
||||
installcheck-local: install
|
||||
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
|
||||
Date: 2009-02-21
|
||||
Initial Package Version: 1.6.7303.1
|
||||
Origin: me
|
||||
Upstream Status: unknown
|
||||
Description: make it littool 2.2 aware
|
||||
|
||||
diff -Naur simias.orig/configure.in simias/configure.in
|
||||
--- simias.orig/configure.in 2009-02-21 10:43:03.000000000 +0000
|
||||
+++ simias/configure.in 2009-02-21 11:06:19.641171546 +0000
|
||||
@@ -8,6 +8,7 @@
|
||||
VERSION=$VERSION.$BUILDNUM.1
|
||||
AM_MAINTAINER_MODE
|
||||
AC_PROG_CC
|
||||
+AC_PROG_CXX
|
||||
m4_pattern_allow(PKG_CONFIG)
|
||||
|
||||
#
|
||||
|
|
@ -1,218 +0,0 @@
|
|||
Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
|
||||
Date: 2009-02-21
|
||||
Initial Package Version: 1.6.7303.1
|
||||
Origin: me
|
||||
Upstream Status: unknown
|
||||
Description: make it mono 2 aware
|
||||
|
||||
diff -Naur simias.orig/configure.in simias/configure.in
|
||||
--- simias.orig/configure.in 2009-02-21 11:13:16.000000000 +0000
|
||||
+++ simias/configure.in 2009-02-21 11:23:28.589302092 +0000
|
||||
@@ -17,22 +17,22 @@
|
||||
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='lib'
|
||||
;;
|
||||
darwin*)
|
||||
SIMIAS_OS='darwin'
|
||||
- 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])
|
||||
export PKG_CONFIG_PATH="/Library/Frameworks/Mono.framework/Versions/Current/lib/pkgconfig:$PKG_CONFIG_PATH"
|
||||
PKG_CONFIG_DIR='lib'
|
||||
;;
|
||||
cygwin*)
|
||||
SIMIAS_OS='windows'
|
||||
AC_CHECK_PROG(CSC, csc, csc)
|
||||
- test -z "$CSC" && AC_CHECK_PROG(CSC, mcs, mcs)
|
||||
- test -z "$CSC" && AC_MSG_ERROR([no C Sharp compiler: neither csc nor mcs found in \$PATH])
|
||||
+ test -z "$CSC" && AC_CHECK_PROG(CSC, gmcs, gmcs)
|
||||
+ test -z "$CSC" && AC_MSG_ERROR([no C Sharp compiler: neither csc nor gmcs found in \$PATH])
|
||||
PKG_CONFIG_DIR='.'
|
||||
;;
|
||||
*)
|
||||
@@ -43,7 +43,7 @@
|
||||
AM_CONDITIONAL(LINUX, test "$SIMIAS_OS" = "linux")
|
||||
AM_CONDITIONAL(WINDOWS, test "$SIMIAS_OS" = "windows")
|
||||
AM_CONDITIONAL(DARWIN, test "$SIMIAS_OS" = "darwin")
|
||||
-AM_CONDITIONAL(MONO, test "$CSC" = "mcs")
|
||||
+AM_CONDITIONAL(MONO, test "$CSC" = "gmcs")
|
||||
AM_CONDITIONAL(DOTNET, test "$CSC" = "csc")
|
||||
|
||||
|
||||
@@ -116,7 +116,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 2007-10-16 17:55:39.000000000 +0200
|
||||
+++ simias/src/admin/Makefile.am 2009-02-21 13:00:37.456573254 +0100
|
||||
@@ -128,7 +128,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)
|
||||
diff -uNr simias.orig/src/core/SimiasClient/Makefile.am simias/src/core/SimiasClient/Makefile.am
|
||||
--- simias.orig/src/core/SimiasClient/Makefile.am 2007-10-16 17:55:49.000000000 +0200
|
||||
+++ simias/src/core/SimiasClient/Makefile.am 2009-02-21 13:02:44.947848486 +0100
|
||||
@@ -31,13 +31,13 @@
|
||||
|
||||
$(srcdir)/SimiasService.cs: $(srcdir)/../WebService/Simias.wsdl
|
||||
if WINDOWS
|
||||
- wsdl /out:SimiasService.cs $(srcdir)/../WebService/Simias.wsdl
|
||||
+ wsdl2 /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
|
||||
+ wsdl2 -nologo -out:SimiasService.cs $(srcdir)/../WebService/Simias.wsdl
|
||||
endif
|
||||
|
||||
SimiasClient.dll: $(srcdir)/AssemblyInfo.cs $(SimiasClient_CSFILES) $(SimiasClient_RESOURCES)
|
||||
diff -uNr simias.orig/src/reports/Proxy/Makefile.am simias/src/reports/Proxy/Makefile.am
|
||||
--- simias.orig/src/reports/Proxy/Makefile.am 2007-10-16 17:56:12.000000000 +0200
|
||||
+++ simias/src/reports/Proxy/Makefile.am 2009-02-21 13:00:58.569994200 +0100
|
||||
@@ -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 2007-10-16 17:55:08.000000000 +0200
|
||||
+++ simias/src/utils/usercmd/Makefile.am 2009-02-21 13:01:09.111656943 +0100
|
||||
@@ -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 2007-10-16 17:55:07.000000000 +0200
|
||||
+++ simias/src/webaccess/Makefile.am 2009-02-21 13:01:14.940358254 +0100
|
||||
@@ -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 2007-10-16 17:55:15.000000000 +0200
|
||||
+++ simias/src/webservices/Makefile.am 2009-02-21 13:04:56.399191235 +0100
|
||||
@@ -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 $@
|
||||
diff -uNr simias.orig/src/core/Notifications/Notification.cs simias/src/core/Notifications/Notification.cs.
|
||||
--- simias.orig/src/core/Notifications/Notification.cs 2007-10-16 17:56:09.000000000 +0200
|
||||
+++ simias/src/core/Notifications/Notification.cs 2009-02-21 13:28:38.493601028 +0100
|
||||
@@ -33,6 +33,8 @@
|
||||
using Simias.Service;
|
||||
using Simias.Sync;
|
||||
|
||||
+using Action = Simias.Client.Event.Action;
|
||||
+
|
||||
namespace Simias.Storage
|
||||
{
|
||||
/// <summary>
|
||||
diff -uNr simias.orig/src/core/Sync/SyncClient.cs simias/src/core/Sync/SyncClient.cs
|
||||
--- simias.orig/src/core/Sync/SyncClient.cs 2007-10-16 18:10:06.000000000 +0200
|
||||
+++ simias/src/core/Sync/SyncClient.cs 2009-02-21 13:37:17.039134110 +0100
|
||||
@@ -39,6 +39,7 @@
|
||||
using Simias.Client.Event;
|
||||
using Simias.DomainServices;
|
||||
|
||||
+using Action = Simias.Client.Event.Action;
|
||||
|
||||
namespace Simias.Sync
|
||||
{
|
||||
diff -uNr simias.orig/src/core/WebService/mono.server.web.config simias/src/core/WebService/mono.server.web.config
|
||||
--- simias.orig/src/core/WebService/mono.server.web.config 2009-02-27 21:39:43.937796032 +0100
|
||||
+++ simias/src/core/WebService/mono.server.web.config 2009-02-27 21:41:30.872940869 +0100
|
||||
@@ -38,12 +38,6 @@
|
||||
|
||||
</system.web>
|
||||
|
||||
- <system.net>
|
||||
- <connectionManagement>
|
||||
- <add address="*" maxconnection="10" />
|
||||
- </connectionManagement>
|
||||
- </system.net>
|
||||
-
|
||||
<!--
|
||||
<mono.aspnet>
|
||||
<acceptEncoding>
|
||||
diff -uNr simias.orig/src/core/WebService/mono.web.config simias/src/core/WebService/mono.web.config
|
||||
--- simias.orig/src/core/WebService/mono.web.config 2009-02-27 21:39:43.937796032 +0100
|
||||
+++ simias/src/core/WebService/mono.web.config 2009-02-27 21:40:51.532681719 +0100
|
||||
@@ -33,12 +33,6 @@
|
||||
|
||||
</system.web>
|
||||
|
||||
- <system.net>
|
||||
- <connectionManagement>
|
||||
- <add address="*" maxconnection="10" />
|
||||
- </connectionManagement>
|
||||
- </system.net>
|
||||
-
|
||||
<!--
|
||||
<mono.aspnet>
|
||||
<acceptEncoding>
|
||||
diff -uNr simias.orig/src/core/SimiasApp/Makefile.am simias/src/core/SimiasApp/Makefile.am
|
||||
--- simias.orig/src/core/SimiasApp/Makefile.am 2009-02-28 07:42:46.297742303 +0100
|
||||
+++ simias/src/core/SimiasApp/Makefile.am 2009-02-28 07:47:42.471249900 +0100
|
||||
@@ -7,7 +7,8 @@
|
||||
SYSTEM_INSTALLER_LIB =
|
||||
endif
|
||||
|
||||
-MONO_WEBSERVER_PATH = ../../../external/Mono.WebServer
|
||||
+$(GACD_MONO_WEBSERVER_FALSE) MONO_WEBSERVER_PATH = ../../../external/Mono.WebServer
|
||||
+$(GACD_MONO_WEBSERVER_TRUE) MONO_WEBSERVER_PATH = $(MONO_PATH)
|
||||
|
||||
Simias_CSFILES = $(srcdir)/AssemblyInfo.cs \
|
||||
$(srcdir)/Simias.cs \
|
||||
@@ -17,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
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
#! /bin/sh /usr/share/dpatch/dpatch-run
|
||||
## 002_mononamespace.dpatch by <fabbione@gordian.int.fabbione.net>
|
||||
##
|
||||
## All lines beginning with `## DP:' are a description of the patch.
|
||||
## DP: No description.
|
||||
|
||||
@DPATCH@
|
||||
diff -urNad simias-3.6~/configure.in simias-3.6/configure.in
|
||||
--- simias-3.6~/configure.in 2007-09-11 16:33:01.000000000 +0200
|
||||
+++ simias-3.6/configure.in 2007-10-12 09:07:15.000000000 +0200
|
||||
@@ -119,7 +119,7 @@
|
||||
CSC_EXEFLAG=/target:exe
|
||||
CSC_LIBFLAG=/target:library
|
||||
CSC_WINEXEFLAG=/target:winexe
|
||||
- CSCFLAGS='/d:MONO /warn:4 /d:TRACE'
|
||||
+ CSCFLAGS='/d:MONO /d:MONONATIVE /warn:4 /d:TRACE'
|
||||
CSCFLAGS_DEBUG="/debug+ /d:DEBUG"
|
||||
CSCFLAGS_OPTIMIZE="/optimize+"
|
||||
MONO=mono
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
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 )
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
commit 3fd0a202d298e633e00f1756405c82e4b794de25
|
||||
Author: Jan-Simon Möller <dl9pf@legolas.auenland.lan>
|
||||
Date: Tue Aug 19 08:51:41 2008 +0200
|
||||
|
||||
Make gcc4.3 happy (added 2* #include <cstring>)
|
||||
|
||||
Signed-off-by: Jan-Simon Möller <dl9pf@legolas.auenland.lan>
|
||||
|
||||
diff --git a/simias/src/core/FlaimProvider/FlaimWrapper/CSPObjectIterator.cpp b/simias/src/core/FlaimProvider/FlaimWrapper/CSPObjectIterator.cpp
|
||||
index d47944d..16f87c0 100644
|
||||
--- a/simias/src/core/FlaimProvider/FlaimWrapper/CSPObjectIterator.cpp
|
||||
+++ b/simias/src/core/FlaimProvider/FlaimWrapper/CSPObjectIterator.cpp
|
||||
@@ -21,6 +21,7 @@
|
||||
*
|
||||
***********************************************************************/
|
||||
#include "CSPObjectIterator.h"
|
||||
+#include <cstring>
|
||||
|
||||
CSPObjectIterator::CSPObjectIterator(HFCURSOR cursor, int count, FLMBOOL includeColId) :
|
||||
m_Count(count),
|
||||
diff --git a/simias/src/core/FlaimProvider/FlaimWrapper/CSPType.h b/simias/src/core/FlaimProvider/FlaimWrapper/CSPType.h
|
||||
index 616435f..58e4f92 100644
|
||||
--- a/simias/src/core/FlaimProvider/FlaimWrapper/CSPType.h
|
||||
+++ b/simias/src/core/FlaimProvider/FlaimWrapper/CSPType.h
|
||||
@@ -22,6 +22,7 @@
|
||||
***********************************************************************/
|
||||
#ifndef _CSTYPE_H_
|
||||
#define _CSTYPE_H_
|
||||
+#include <cstring>
|
||||
|
||||
#define MAX_INT_STRING 21
|
||||
|
||||
|
|
@ -1,50 +0,0 @@
|
|||
# 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 ~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-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.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
|
||||
}
|
||||
|
|
@ -1,55 +0,0 @@
|
|||
# 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.patch
|
||||
# epatch "${FILESDIR}"/simias-recovery_agent-fix-1.patch
|
||||
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"
|
||||
}
|
||||
|
|
@ -1,56 +0,0 @@
|
|||
# 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-3.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-1.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"
|
||||
}
|
||||
|
|
@ -17,8 +17,8 @@ SLOT="0"
|
|||
LICENSE="GPL-2"
|
||||
KEYWORDS="~x86 ~amd64"
|
||||
|
||||
DEPEND=">=dev-lang/mono-2.2
|
||||
>=dev-dotnet/xsp-1.2.1
|
||||
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
|
||||
|
|
@ -31,7 +31,7 @@ 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-3.patch
|
||||
# epatch "${FILESDIR}"/simias-1.8-mono22-3.patch
|
||||
# epatch "${FILESDIR}"/simias-mononamespace.dpatch
|
||||
# epatch "${FILESDIR}"/simias-etc_use_destdir.dpatch
|
||||
# epatch "${FILESDIR}"/simias-bash.dpatch
|
||||
|
|
@ -39,7 +39,7 @@ src_prepare() {
|
|||
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
|
||||
# epatch "${FILESDIR}"/WSDLPATCH-1.diff
|
||||
eautoreconf || die "eautoreconf failed"
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue