delete old
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/ifolder@2844 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
parent
ff0c0a3da9
commit
7b96b21f40
@ -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,12 +0,0 @@
|
|||||||
diff -Naur simias/tools/gsoap/gsoap-linux-2.7/src/Makefile simias-changed/tools/gsoap/gsoap-linux-2.7/src/Makefile
|
|
||||||
--- simias/tools/gsoap/gsoap-linux-2.7/src/Makefile 2007-10-01 22:32:04.000000000 +0200
|
|
||||||
+++ simias-changed/tools/gsoap/gsoap-linux-2.7/src/Makefile 2007-10-02 19:34:26.000000000 +0200
|
|
||||||
@@ -10,7 +10,7 @@
|
|
||||||
YACC=bison
|
|
||||||
# For static linkage with Flex use:
|
|
||||||
ifndef (lib)
|
|
||||||
-lib=lib
|
|
||||||
+lib=lib64
|
|
||||||
endif
|
|
||||||
|
|
||||||
LIBS=/usr/$(lib)/libfl.a
|
|
@ -1,38 +0,0 @@
|
|||||||
diff -uNr simias.orig/src/core/libsimias/simiasweb.c simias/src/core/libsimias/simiasweb.c
|
|
||||||
--- simias.orig/src/core/libsimias/simiasweb.c 2009-02-21 21:58:11.207370228 +0100
|
|
||||||
+++ simias/src/core/libsimias/simiasweb.c 2009-02-21 21:58:53.910484314 +0100
|
|
||||||
@@ -241,7 +241,7 @@
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Setup the Request */
|
|
||||||
- req.onlySlaves = only_slaves ? true_ : false_;
|
|
||||||
+ req.onlySlaves = only_slaves ? xsd__boolean__true_ : xsd__boolean__false_;
|
|
||||||
|
|
||||||
init_gsoap(&soap);
|
|
||||||
if (simias_get_web_service_credential(username, password) == SIMIAS_SUCCESS) {
|
|
||||||
@@ -294,7 +294,7 @@
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Active */
|
|
||||||
- if (domainsA[i]->Active == true_) {
|
|
||||||
+ if (domainsA[i]->Active == xsd__boolean__true_) {
|
|
||||||
domain->active = true;
|
|
||||||
} else {
|
|
||||||
domain->active = false;
|
|
||||||
@@ -349,14 +349,14 @@
|
|
||||||
domain->host = strdup("");
|
|
||||||
|
|
||||||
/* IsSlave */
|
|
||||||
- if (domainsA[i]->IsSlave == true_) {
|
|
||||||
+ if (domainsA[i]->IsSlave == xsd__boolean__true_) {
|
|
||||||
domain->is_slave = true;
|
|
||||||
} else {
|
|
||||||
domain->is_slave = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* IsDefault */
|
|
||||||
- if (domainsA[i]->IsDefault == true_) {
|
|
||||||
+ if (domainsA[i]->IsDefault == xsd__boolean__true_) {
|
|
||||||
domain->is_default = true;
|
|
||||||
} else {
|
|
||||||
domain->is_default = false;
|
|
@ -1,11 +0,0 @@
|
|||||||
--- src/core/libsimias/Makefile.am 2007-08-18 02:36:05.000000000 -0600
|
|
||||||
+++ src/core/libsimias/Makefile.am.new 2007-08-18 02:35:58.000000000 -0600
|
|
||||||
@@ -27,6 +27,8 @@
|
|
||||||
$(GSOAP_PATH)/soapcpp2 -c -penv $(srcdir)/env.h
|
|
||||||
|
|
||||||
$(srcdir)/stdsoap2.c:
|
|
||||||
+ cd $(GSOAP_PATH)/src && make && cp soapcpp2 ..
|
|
||||||
+ cd $(GSOAP_PATH)/wsdl && make
|
|
||||||
cp $(GSOAP_PATH)/stdsoap2.h $(srcdir)
|
|
||||||
cp $(GSOAP_PATH)/stdsoap2.c $(srcdir)
|
|
||||||
|
|
@ -1,12 +0,0 @@
|
|||||||
--- src/core/libsimias/Makefile.am 2007-08-18 01:51:50.000000000 -0600
|
|
||||||
+++ src/core/libsimias/Makefile.am.new 2007-08-18 01:51:35.000000000 -0600
|
|
||||||
@@ -27,6 +27,9 @@
|
|
||||||
$(GSOAP_PATH)/soapcpp2 -c -penv $(srcdir)/env.h
|
|
||||||
|
|
||||||
$(srcdir)/stdsoap2.c:
|
|
||||||
+ cd $(GSOAP_PATH)/src && make
|
|
||||||
+ cd $(GSOAP_PATH)/wsdl && make
|
|
||||||
+ cp $(GSOAP_PATH)/src/soapcpp2 $(GSOAP_PATH)
|
|
||||||
cp $(GSOAP_PATH)/stdsoap2.h $(srcdir)
|
|
||||||
cp $(GSOAP_PATH)/stdsoap2.c $(srcdir)
|
|
||||||
|
|
@ -1,10 +0,0 @@
|
|||||||
--- src/core/libsimias/Makefile.am 2007-08-18 02:05:39.000000000 -0600
|
|
||||||
+++ src/core/libsimias/Makefile.am.new 2007-08-18 02:05:32.000000000 -0600
|
|
||||||
@@ -27,6 +27,7 @@
|
|
||||||
$(GSOAP_PATH)/soapcpp2 -c -penv $(srcdir)/env.h
|
|
||||||
|
|
||||||
$(srcdir)/stdsoap2.c:
|
|
||||||
+ cp $(GSOAP_PATH)/bin/* $(GSOAP_PATH)
|
|
||||||
cp $(GSOAP_PATH)/stdsoap2.h $(srcdir)
|
|
||||||
cp $(GSOAP_PATH)/stdsoap2.c $(srcdir)
|
|
||||||
|
|
@ -1,11 +0,0 @@
|
|||||||
--- configure.in 2007-08-18 00:53:11.000000000 -0600
|
|
||||||
+++ configure.in.new 2007-08-18 01:19:24.000000000 -0600
|
|
||||||
@@ -279,7 +279,7 @@
|
|
||||||
AC_CHECK_PROG(CXX, g++, g++)
|
|
||||||
StoreProviderAssembly="SimiasLib.dll"
|
|
||||||
StoreProviderType="Simias.Storage.Provider.Flaim.FlaimProvider"
|
|
||||||
- GSOAP_PATH="$TOOLDIR/gsoap/linux-2.7"
|
|
||||||
+ GSOAP_PATH="$TOOLDIR/gsoap/gsoap-linux-2.7"
|
|
||||||
mappingpath="${exec_prefix}/lib/simias/web/bin/Simias.exe"
|
|
||||||
;;
|
|
||||||
#
|
|
@ -1,63 +0,0 @@
|
|||||||
diff -uNr simias.orig/src/server/setup/iFolderAdminSetup.cs simias/src/server/setup/iFolderAdminSetup.cs
|
|
||||||
--- simias.orig/src/server/setup/iFolderAdminSetup.cs 2009-04-20 07:50:52.102027111 +0200
|
|
||||||
+++ simias/src/server/setup/iFolderAdminSetup.cs 2009-04-20 08:05:06.621986960 +0200
|
|
||||||
@@ -99,12 +99,12 @@
|
|
||||||
/// <summary>
|
|
||||||
/// Apache User.
|
|
||||||
/// </summary>
|
|
||||||
- public Option apacheUser = new Option("apache-user", "Apache User", "Apache User to use for providing permissions", false, "wwwrun");
|
|
||||||
+ public Option apacheUser = new Option("apache-user", "Apache User", "Apache User to use for providing permissions", false, "apache");
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Apache Group.
|
|
||||||
/// </summary>
|
|
||||||
- public Option apacheGroup = new Option("apache-group", "Apache Group", "Apache Group to use for providing permissions", false, "www");
|
|
||||||
+ public Option apacheGroup = new Option("apache-group", "Apache Group", "Apache Group to use for providing permissions", false, "apache");
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// The port to connect on.
|
|
||||||
@@ -150,7 +150,7 @@
|
|
||||||
string MachineArch = Environment.GetEnvironmentVariable("OS_ARCH");
|
|
||||||
webPath =( MachineArch == null )? Path.GetFullPath("../lib/simias/admin"): Path.GetFullPath("../lib64/simias/admin");
|
|
||||||
// uid.conf
|
|
||||||
- string path = Path.GetFullPath("/etc/apache2/uid.conf");
|
|
||||||
+ string path = Path.GetFullPath("/etc/apache2/httpd.conf");
|
|
||||||
|
|
||||||
TextReader reader = (TextReader)File.OpenText(path);
|
|
||||||
|
|
||||||
@@ -365,7 +365,7 @@
|
|
||||||
/// </summary>
|
|
||||||
string ReadModMonoConfiguration()
|
|
||||||
{
|
|
||||||
- string path = Path.GetFullPath( "/etc/apache2/conf.d/simias.conf" );
|
|
||||||
+ string path = Path.GetFullPath( "/etc/simias/apache/gentoo/simias.conf" );
|
|
||||||
string dataPath = null;
|
|
||||||
if ( path == null || File.Exists( path ) == false )
|
|
||||||
return null;
|
|
||||||
@@ -400,7 +400,7 @@
|
|
||||||
/// </summary>
|
|
||||||
void SetupModMono()
|
|
||||||
{
|
|
||||||
- string path = "/etc/apache2/conf.d/ifolder_admin.conf";
|
|
||||||
+ string path = "/etc/simias/apache/gentoo/ifolder_admin.conf";
|
|
||||||
string datapath = ReadModMonoConfiguration();
|
|
||||||
|
|
||||||
string MachineArch = Environment.GetEnvironmentVariable("MACHINE_ARCH");
|
|
||||||
@@ -434,17 +434,6 @@
|
|
||||||
{
|
|
||||||
sslPrefix = "#";
|
|
||||||
}
|
|
||||||
- if( Mono2TreePath != null )
|
|
||||||
- writer.WriteLine( "Include {0}", Path.GetFullPath( Path.Combine(Mono2TreePath, "bin/mod_mono.conf")) );
|
|
||||||
- else
|
|
||||||
- {
|
|
||||||
- string mod_mono2_path = "/etc/apache2/conf.d/mod_mono.conf";
|
|
||||||
- if( File.Exists( mod_mono2_path ))
|
|
||||||
- writer.WriteLine( "Include {0}", mod_mono2_path );
|
|
||||||
- else
|
|
||||||
- writer.WriteLine( "Include {0}", "/etc/apache2/mod_mono.conf" );
|
|
||||||
- }
|
|
||||||
- writer.WriteLine();
|
|
||||||
writer.WriteLine("Alias /{0} \"{1}\"", alias, webPath);
|
|
||||||
writer.WriteLine("AddMonoApplications {0} \"/{0}:{1}\"", alias, webPath);
|
|
||||||
|
|
@ -1,41 +0,0 @@
|
|||||||
diff -uNr simias.orig/src/server/setup/iFolderAdminSetup.cs simias/src/server/setup/iFolderAdminSetup.cs
|
|
||||||
--- simias.orig/src/server/setup/iFolderAdminSetup.cs 2009-04-06 19:49:34.819204306 +0200
|
|
||||||
+++ simias/src/server/setup/iFolderAdminSetup.cs 2009-04-06 19:54:51.990381096 +0200
|
|
||||||
@@ -99,12 +99,12 @@
|
|
||||||
/// <summary>
|
|
||||||
/// Apache User.
|
|
||||||
/// </summary>
|
|
||||||
- public Option apacheUser = new Option("apache-user", "Apache User", "Apache User to use for providing permissions", false, "wwwrun");
|
|
||||||
+ public Option apacheUser = new Option("apache-user", "Apache User", "Apache User to use for providing permissions", false, "apache");
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Apache Group.
|
|
||||||
/// </summary>
|
|
||||||
- public Option apacheGroup = new Option("apache-group", "Apache Group", "Apache Group to use for providing permissions", false, "www");
|
|
||||||
+ public Option apacheGroup = new Option("apache-group", "Apache Group", "Apache Group to use for providing permissions", false, "apache");
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// The port to connect on.
|
|
||||||
@@ -400,7 +403,7 @@
|
|
||||||
/// </summary>
|
|
||||||
void SetupModMono()
|
|
||||||
{
|
|
||||||
- string path = "/etc/apache2/conf.d/ifolder_admin.conf";
|
|
||||||
+ string path = "/etc/simias/apache/gentoo/ifolder_admin.conf";
|
|
||||||
string datapath = ReadModMonoConfiguration();
|
|
||||||
|
|
||||||
string MachineArch = Environment.GetEnvironmentVariable("MACHINE_ARCH");
|
|
||||||
@@ -432,13 +435,6 @@
|
|
||||||
{
|
|
||||||
sslPrefix = "#";
|
|
||||||
}
|
|
||||||
- string mod_mono_path = "/etc/apache2/mod_mono.conf";
|
|
||||||
- string mod_mono2_path = "/etc/apache2/conf.d/mod_mono.conf";
|
|
||||||
- if( File.Exists( mod_mono2_path ))
|
|
||||||
- writer.WriteLine( "Include {0}", mod_mono2_path );
|
|
||||||
- else
|
|
||||||
- writer.WriteLine( "Include {0}", mod_mono_path );
|
|
||||||
- writer.WriteLine();
|
|
||||||
writer.WriteLine("Alias /{0} \"{1}\"", alias, webPath);
|
|
||||||
writer.WriteLine("AddMonoApplications {0} \"/{0}:{1}\"", alias, webPath);
|
|
||||||
|
|
@ -1,62 +0,0 @@
|
|||||||
diff -uNr simias.orig/src/server/setup/iFolderWebSetup.cs simias/src/server/setup/iFolderWebSetup.cs
|
|
||||||
--- simias.orig/src/server/setup/iFolderWebSetup.cs 2009-04-20 08:09:10.061712198 +0200
|
|
||||||
+++ simias/src/server/setup/iFolderWebSetup.cs 2009-04-20 08:12:20.265928077 +0200
|
|
||||||
@@ -99,12 +99,12 @@
|
|
||||||
/// <summary>
|
|
||||||
/// Apache User.
|
|
||||||
/// </summary>
|
|
||||||
- public Option apacheUser = new Option("apache-user", "Apache User", "Apache User to use for providing permissions", false, "wwwrun");
|
|
||||||
+ public Option apacheUser = new Option("apache-user", "Apache User", "Apache User to use for providing permissions", false, "apache");
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Apache Group.
|
|
||||||
/// </summary>
|
|
||||||
- public Option apacheGroup = new Option("apache-group", "Apache Group", "Apache Group to use for providing permissions", false, "www");
|
|
||||||
+ public Option apacheGroup = new Option("apache-group", "Apache Group", "Apache Group to use for providing permissions", false, "apache");
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// The port to connect on.
|
|
||||||
@@ -150,7 +150,7 @@
|
|
||||||
string MachineArch = Environment.GetEnvironmentVariable("OS_ARCH");
|
|
||||||
webPath = (MachineArch == null) ? Path.GetFullPath("../lib/simias/webaccess"): Path.GetFullPath("../lib64/simias/webaccess");
|
|
||||||
// uid.conf
|
|
||||||
- string path = Path.GetFullPath("/etc/apache2/uid.conf");
|
|
||||||
+ string path = Path.GetFullPath("/etc/apache2/httpd.conf");
|
|
||||||
|
|
||||||
TextReader reader = (TextReader)File.OpenText(path);
|
|
||||||
|
|
||||||
@@ -379,7 +379,7 @@
|
|
||||||
/// </summary>
|
|
||||||
string ReadModMonoConfiguration()
|
|
||||||
{
|
|
||||||
- string path = Path.GetFullPath( "/etc/apache2/conf.d/simias.conf" );
|
|
||||||
+ string path = Path.GetFullPath( "/etc/simias/apache/gentoo/simias.conf" );
|
|
||||||
string dataPath = null;
|
|
||||||
if ( path == null || File.Exists( path ) == false )
|
|
||||||
return null;
|
|
||||||
@@ -415,7 +415,7 @@
|
|
||||||
/// </summary>
|
|
||||||
void SetupModMono()
|
|
||||||
{
|
|
||||||
- string path = "/etc/apache2/conf.d/ifolder_web.conf";
|
|
||||||
+ string path = "/etc/simias/apache/gentoo/ifolder_web.conf";
|
|
||||||
string datapath = ReadModMonoConfiguration();
|
|
||||||
|
|
||||||
string MachineArch = Environment.GetEnvironmentVariable("MACHINE_ARCH");
|
|
||||||
@@ -449,16 +449,6 @@
|
|
||||||
{
|
|
||||||
sslPrefix = "#";
|
|
||||||
}
|
|
||||||
- if( Mono2TreePath != null )
|
|
||||||
- writer.WriteLine( "Include {0}", Path.GetFullPath( Path.Combine(Mono2TreePath, "bin/mod_mono.conf")) );
|
|
||||||
- else
|
|
||||||
- {
|
|
||||||
- string mod_mono2_path = "/etc/apache2/conf.d/mod_mono.conf";
|
|
||||||
- if( File.Exists( mod_mono2_path ))
|
|
||||||
- writer.WriteLine( "Include {0}", mod_mono2_path );
|
|
||||||
- else
|
|
||||||
- writer.WriteLine( "Include {0}", "/etc/apache2/mod_mono.conf" );
|
|
||||||
- }
|
|
||||||
writer.WriteLine();
|
|
||||||
writer.WriteLine("Alias /{0} \"{1}\"", alias, webPath);
|
|
||||||
writer.WriteLine("AddMonoApplications {0} \"/{0}:{1}\"", alias, webPath);
|
|
@ -1,41 +0,0 @@
|
|||||||
diff -uNr simias.orig/src/server/setup/iFolderWebSetup.cs simias/src/server/setup/iFolderWebSetup.cs
|
|
||||||
--- simias.orig/src/server/setup/iFolderWebSetup.cs 2009-04-06 19:57:18.302251000 +0200
|
|
||||||
+++ simias/src/server/setup/iFolderWebSetup.cs 2009-04-06 20:01:01.853674639 +0200
|
|
||||||
@@ -99,12 +99,12 @@
|
|
||||||
/// <summary>
|
|
||||||
/// Apache User.
|
|
||||||
/// </summary>
|
|
||||||
- public Option apacheUser = new Option("apache-user", "Apache User", "Apache User to use for providing permissions", false, "wwwrun");
|
|
||||||
+ public Option apacheUser = new Option("apache-user", "Apache User", "Apache User to use for providing permissions", false, "apache");
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Apache Group.
|
|
||||||
/// </summary>
|
|
||||||
- public Option apacheGroup = new Option("apache-group", "Apache Group", "Apache Group to use for providing permissions", false, "www");
|
|
||||||
+ public Option apacheGroup = new Option("apache-group", "Apache Group", "Apache Group to use for providing permissions", false, "apache");
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// The port to connect on.
|
|
||||||
@@ -415,7 +418,7 @@
|
|
||||||
/// </summary>
|
|
||||||
void SetupModMono()
|
|
||||||
{
|
|
||||||
- string path = "/etc/apache2/conf.d/ifolder_web.conf";
|
|
||||||
+ string path = "/etc/simias/apache/gentoo/ifolder_web.conf";
|
|
||||||
string datapath = ReadModMonoConfiguration();
|
|
||||||
|
|
||||||
string MachineArch = Environment.GetEnvironmentVariable("MACHINE_ARCH");
|
|
||||||
@@ -447,13 +450,6 @@
|
|
||||||
{
|
|
||||||
sslPrefix = "#";
|
|
||||||
}
|
|
||||||
- string mod_mono_path = "/etc/apache2/mod_mono.conf";
|
|
||||||
- string mod_mono2_path = "/etc/apache2/conf.d/mod_mono.conf";
|
|
||||||
- if( File.Exists( mod_mono2_path ))
|
|
||||||
- writer.WriteLine( "Include {0}", mod_mono2_path );
|
|
||||||
- else
|
|
||||||
- writer.WriteLine( "Include {0}", mod_mono_path );
|
|
||||||
- writer.WriteLine();
|
|
||||||
writer.WriteLine("Alias /{0} \"{1}\"", alias, webPath);
|
|
||||||
writer.WriteLine("AddMonoApplications {0} \"/{0}:{1}\"", alias, webPath);
|
|
||||||
if (logoutUrl.Value != String.Empty || logoutUrl.Value.Trim () != "" )
|
|
@ -1,61 +0,0 @@
|
|||||||
diff -uNr ifolder3-enterprise.orig/src/server/setup/iFolderAdminSetup.cs ifolder3-enterprise/src/server/setup/iFolderAdminSetup.cs
|
|
||||||
--- ifolder3-enterprise.orig/src/server/setup/iFolderAdminSetup.cs 2009-12-05 18:47:48.574532375 +0100
|
|
||||||
+++ ifolder3-enterprise/src/server/setup/iFolderAdminSetup.cs 2009-12-05 18:55:04.228283615 +0100
|
|
||||||
@@ -99,12 +99,12 @@
|
|
||||||
/// <summary>
|
|
||||||
/// Apache User.
|
|
||||||
/// </summary>
|
|
||||||
- public Option apacheUser = new Option("apache-user", "Apache User", "Apache User to use for providing permissions", false, "wwwrun");
|
|
||||||
+ public Option apacheUser = new Option("apache-user", "Apache User", "Apache User to use for providing permissions", false, "apache");
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Apache Group.
|
|
||||||
/// </summary>
|
|
||||||
- public Option apacheGroup = new Option("apache-group", "Apache Group", "Apache Group to use for providing permissions", false, "www");
|
|
||||||
+ public Option apacheGroup = new Option("apache-group", "Apache Group", "Apache Group to use for providing permissions", false, "apache");
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// The port to connect on.
|
|
||||||
@@ -150,7 +150,7 @@
|
|
||||||
string MachineArch = Environment.GetEnvironmentVariable("OS_ARCH");
|
|
||||||
webPath =( MachineArch == null )? Path.GetFullPath("../lib/simias/admin"): Path.GetFullPath("../lib64/simias/admin");
|
|
||||||
// uid.conf
|
|
||||||
- string path = Path.GetFullPath("/etc/apache2/uid.conf");
|
|
||||||
+ string path = Path.GetFullPath("/etc/apache2/httpd.conf");
|
|
||||||
|
|
||||||
TextReader reader = (TextReader)File.OpenText(path);
|
|
||||||
|
|
||||||
@@ -365,7 +365,7 @@
|
|
||||||
/// </summary>
|
|
||||||
string ReadModMonoConfiguration()
|
|
||||||
{
|
|
||||||
- string path = Path.GetFullPath( "/etc/apache2/conf.d/simias.conf" );
|
|
||||||
+ string path = Path.GetFullPath( "/etc/simias/apache/gentoo/simias.conf" );
|
|
||||||
string dataPath = null;
|
|
||||||
if ( path == null || File.Exists( path ) == false )
|
|
||||||
return null;
|
|
||||||
@@ -400,7 +400,7 @@
|
|
||||||
/// </summary>
|
|
||||||
void SetupModMono()
|
|
||||||
{
|
|
||||||
- string path = "/etc/apache2/conf.d/ifolder_admin.conf";
|
|
||||||
+ string path = "/etc/simias/apache/gentoo/ifolder_admin.conf";
|
|
||||||
string datapath = ReadModMonoConfiguration();
|
|
||||||
|
|
||||||
|
|
||||||
@@ -434,6 +434,7 @@
|
|
||||||
{
|
|
||||||
sslPrefix = "#";
|
|
||||||
}
|
|
||||||
+ /*
|
|
||||||
if( iFolderMonoPath != null )
|
|
||||||
writer.WriteLine( "Include {0}{1}", iFolderMonoPath, "/etc/apache2/conf.d//mod_mono.conf" );
|
|
||||||
else
|
|
||||||
@@ -445,6 +446,7 @@
|
|
||||||
writer.WriteLine( "Include {0}", "/etc/apache2/mod_mono.conf" );
|
|
||||||
}
|
|
||||||
writer.WriteLine();
|
|
||||||
+ */
|
|
||||||
writer.WriteLine("Alias /{0} \"{1}\"", alias, webPath);
|
|
||||||
writer.WriteLine("AddMonoApplications {0} \"/{0}:{1}\"", alias, webPath);
|
|
||||||
|
|
@ -1,61 +0,0 @@
|
|||||||
diff -uNr ifolder3-enterprise.orig/src/server/setup/iFolderWebSetup.cs ifolder3-enterprise/src/server/setup/iFolderWebSetup.cs
|
|
||||||
--- ifolder3-enterprise.orig/src/server/setup/iFolderWebSetup.cs 2009-12-05 18:59:49.630531925 +0100
|
|
||||||
+++ ifolder3-enterprise/src/server/setup/iFolderWebSetup.cs 2009-12-05 19:01:02.821283510 +0100
|
|
||||||
@@ -99,12 +99,12 @@
|
|
||||||
/// <summary>
|
|
||||||
/// Apache User.
|
|
||||||
/// </summary>
|
|
||||||
- public Option apacheUser = new Option("apache-user", "Apache User", "Apache User to use for providing permissions", false, "wwwrun");
|
|
||||||
+ public Option apacheUser = new Option("apache-user", "Apache User", "Apache User to use for providing permissions", false, "apache");
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Apache Group.
|
|
||||||
/// </summary>
|
|
||||||
- public Option apacheGroup = new Option("apache-group", "Apache Group", "Apache Group to use for providing permissions", false, "www");
|
|
||||||
+ public Option apacheGroup = new Option("apache-group", "Apache Group", "Apache Group to use for providing permissions", false, "apache");
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// The port to connect on.
|
|
||||||
@@ -150,7 +150,7 @@
|
|
||||||
string MachineArch = Environment.GetEnvironmentVariable("OS_ARCH");
|
|
||||||
webPath = (MachineArch == null) ? Path.GetFullPath("../lib/simias/webaccess"): Path.GetFullPath("../lib64/simias/webaccess");
|
|
||||||
// uid.conf
|
|
||||||
- string path = Path.GetFullPath("/etc/apache2/uid.conf");
|
|
||||||
+ string path = Path.GetFullPath("/etc/apache2/httpd.conf");
|
|
||||||
|
|
||||||
TextReader reader = (TextReader)File.OpenText(path);
|
|
||||||
|
|
||||||
@@ -379,7 +379,7 @@
|
|
||||||
/// </summary>
|
|
||||||
string ReadModMonoConfiguration()
|
|
||||||
{
|
|
||||||
- string path = Path.GetFullPath( "/etc/apache2/conf.d/simias.conf" );
|
|
||||||
+ string path = Path.GetFullPath( "/etc/simias/apache/gentoo/simias.conf" );
|
|
||||||
string dataPath = null;
|
|
||||||
if ( path == null || File.Exists( path ) == false )
|
|
||||||
return null;
|
|
||||||
@@ -415,7 +415,7 @@
|
|
||||||
/// </summary>
|
|
||||||
void SetupModMono()
|
|
||||||
{
|
|
||||||
- string path = "/etc/apache2/conf.d/ifolder_web.conf";
|
|
||||||
+ string path = "/etc/simias/apache/gentoo/ifolder_web.conf";
|
|
||||||
string datapath = ReadModMonoConfiguration();
|
|
||||||
|
|
||||||
|
|
||||||
@@ -449,6 +449,7 @@
|
|
||||||
{
|
|
||||||
sslPrefix = "#";
|
|
||||||
}
|
|
||||||
+ /*
|
|
||||||
if( iFolderMonoPath != null )
|
|
||||||
writer.WriteLine( "Include {0}{1}", iFolderMonoPath, "/etc/apache2/conf.d/mod_mono.conf" );
|
|
||||||
else
|
|
||||||
@@ -460,6 +461,7 @@
|
|
||||||
writer.WriteLine( "Include {0}", "/etc/apache2/mod_mono.conf" );
|
|
||||||
}
|
|
||||||
writer.WriteLine();
|
|
||||||
+ */
|
|
||||||
writer.WriteLine("Alias /{0} \"{1}\"", alias, webPath);
|
|
||||||
writer.WriteLine("AddMonoApplications {0} \"/{0}:{1}\"", alias, webPath);
|
|
||||||
//if (logoutUrl.Value != String.Empty || logoutUrl.Value.Trim () != "" )
|
|
@ -1,31 +0,0 @@
|
|||||||
--- src/server/setup/iFolderAdminSetup.cs 2007-10-29 18:30:06.000000000 -0600
|
|
||||||
+++ src/server/setup/iFolderAdminSetup.cs.new 2008-01-24 12:10:56.000000000 -0700
|
|
||||||
@@ -154,6 +154,10 @@
|
|
||||||
{
|
|
||||||
// ignore
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+ apacheUser = "apache";
|
|
||||||
+ apacheGroup = "apache";
|
|
||||||
+
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
@@ -324,7 +328,7 @@
|
|
||||||
/// </summary>
|
|
||||||
void SetupModMono()
|
|
||||||
{
|
|
||||||
- string path = "/etc/apache2/conf.d/ifolder_admin.conf";
|
|
||||||
+ string path = "/etc/simias/apache/gentoo/ifolder_admin.conf";
|
|
||||||
|
|
||||||
Console.Write("Configuring {0}...", path);
|
|
||||||
|
|
||||||
@@ -354,8 +358,6 @@
|
|
||||||
sslPrefix = "#";
|
|
||||||
}
|
|
||||||
|
|
||||||
- writer.WriteLine("Include /etc/apache2/mod_mono.conf");
|
|
||||||
- writer.WriteLine();
|
|
||||||
writer.WriteLine("Alias /{0} \"{1}\"", alias, webPath);
|
|
||||||
writer.WriteLine("AddMonoApplications {0} \"/{0}:{1}\"", alias, webPath);
|
|
||||||
|
|
@ -1,10 +0,0 @@
|
|||||||
--- src/setup/apache/ifolder_apache.conf.in 2007-10-29 18:30:03.000000000 -0600
|
|
||||||
+++ src/setup/apache/ifolder_apache.conf.in.new 2008-01-24 12:28:17.000000000 -0700
|
|
||||||
@@ -1,6 +1,6 @@
|
|
||||||
Include @MODMONO_CONFPATH@
|
|
||||||
|
|
||||||
-Include @simiasconfdir@/apache/default/*.conf
|
|
||||||
+Include @simiasconfdir@/apache/gentoo/*.conf
|
|
||||||
|
|
||||||
#NameVirtualHost 127.0.0.1
|
|
||||||
|
|
@ -1,17 +0,0 @@
|
|||||||
--- src/server/setup/SimiasServerSetup.cs 2007-01-02 01:45:42.000000000 -0700
|
|
||||||
+++ src/server/setup/SimiasServerSetup.cs.new 2007-01-03 14:48:05.000000000 -0700
|
|
||||||
@@ -81,12 +81,12 @@
|
|
||||||
/// <summary>
|
|
||||||
/// Apache User
|
|
||||||
/// </summary>
|
|
||||||
- string apacheUser = "wwwrun";
|
|
||||||
+ string apacheUser = "apache";
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Apache Group
|
|
||||||
/// </summary>
|
|
||||||
- string apacheGroup = "www";
|
|
||||||
+ string apacheGroup = "apache";
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// The uri to the ldap server.
|
|
@ -1,56 +0,0 @@
|
|||||||
--- src/server/setup/SimiasServerSetup.cs 2007-01-02 01:45:42.000000000 -0700
|
|
||||||
+++ src/server/setup/SimiasServerSetup.cs.new 2007-01-03 15:53:29.000000000 -0700
|
|
||||||
@@ -901,52 +901,10 @@
|
|
||||||
/// </summary>
|
|
||||||
void SetupModMono()
|
|
||||||
{
|
|
||||||
- string path = Path.GetFullPath( "/etc/apache2/conf.d/simias.conf" );
|
|
||||||
- Console.Write("Configuring {0}...", path);
|
|
||||||
|
|
||||||
if ( apache.Value == true )
|
|
||||||
{
|
|
||||||
- // create configuration
|
|
||||||
- using( StreamWriter writer = File.CreateText( path ) )
|
|
||||||
- {
|
|
||||||
- /* example
|
|
||||||
- Include /etc/apache2/conf.d/mod_mono.conf
|
|
||||||
-
|
|
||||||
- Alias /simias10 "/opt/novell/ifolder3/web"
|
|
||||||
- AddMonoApplications simias10 "/simias10:/opt/novell/ifolder3/web"
|
|
||||||
- MonoSetEnv SimiasRunAsServer=true;SimiasDataPath="/var/opt/novell/ifolder3/simias"
|
|
||||||
- <Location /simias10 >
|
|
||||||
- MonoSetServerAlias simias10
|
|
||||||
- Order allow,deny
|
|
||||||
- Allow from all
|
|
||||||
- SetHandler mono
|
|
||||||
- </Location>
|
|
||||||
- */
|
|
||||||
-
|
|
||||||
- string alias = "simias10";
|
|
||||||
-
|
|
||||||
- writer.WriteLine( "Include /etc/apache2/conf.d/mod_mono.conf" );
|
|
||||||
- writer.WriteLine();
|
|
||||||
- writer.WriteLine("Alias /{0} \"{1}\"", alias, SimiasSetup.webdir);
|
|
||||||
- writer.WriteLine("AddMonoApplications {0} \"/{0}:{1}\"", alias, SimiasSetup.webdir);
|
|
||||||
- writer.WriteLine("MonoSetEnv {0} \"SimiasRunAsServer=true;SimiasDataDir={1}\"", alias, this.storePath);
|
|
||||||
- writer.WriteLine("<Location /{0} >", alias);
|
|
||||||
- writer.WriteLine("\tMonoSetServerAlias {0}", alias);
|
|
||||||
- writer.WriteLine("\tOrder allow,deny");
|
|
||||||
- writer.WriteLine("\tAllow from all");
|
|
||||||
- writer.WriteLine("\tSetHandler mono");
|
|
||||||
- writer.WriteLine("</Location>");
|
|
||||||
- writer.WriteLine();
|
|
||||||
- writer.Close();
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- // chmod
|
|
||||||
- if (Execute("chmod", "644 {0}", path) != 0)
|
|
||||||
- {
|
|
||||||
- throw new Exception(String.Format("Unable to change {0} file permissions.", path));
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- Console.WriteLine("Done");
|
|
||||||
+ Console.WriteLine("Apache/Mono configured");
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
@ -1,13 +0,0 @@
|
|||||||
--- configure.in 2006-03-30 16:41:41.000000000 -0700
|
|
||||||
+++ configure.in.new 2006-03-31 20:34:12.000000000 -0700
|
|
||||||
@@ -558,6 +558,10 @@
|
|
||||||
MODMONO_CONFPATH="/etc/httpd/mod_mono.conf"
|
|
||||||
fi
|
|
||||||
|
|
||||||
+if test -e "/etc/apache2/modules.d/70_mod_mono.conf";then
|
|
||||||
+ MODMONO_CONFPATH="/etc/apache2/modules.d/70_mod_mono.conf"
|
|
||||||
+fi
|
|
||||||
+
|
|
||||||
AC_SUBST(MODMONO_CONFPATH)
|
|
||||||
|
|
||||||
|
|
@ -1,17 +0,0 @@
|
|||||||
--- src/server/setup/SimiasServerSetup.cs 2007-01-02 01:45:42.000000000 -0700
|
|
||||||
+++ src/server/setup/SimiasServerSetup.cs.new 2007-01-03 16:31:20.000000000 -0700
|
|
||||||
@@ -499,12 +499,12 @@
|
|
||||||
}
|
|
||||||
|
|
||||||
SetupPermissions();
|
|
||||||
- SetupModMono();
|
|
||||||
+// SetupModMono();
|
|
||||||
if ( usingLDAP )
|
|
||||||
{
|
|
||||||
SetupLdap();
|
|
||||||
}
|
|
||||||
- SetupScriptFiles();
|
|
||||||
+// SetupScriptFiles();
|
|
||||||
SetupLog4Net();
|
|
||||||
}
|
|
||||||
|
|
@ -1,30 +0,0 @@
|
|||||||
--- src/server/setup/iFolderWebSetup.cs 2007-10-29 18:30:06.000000000 -0600
|
|
||||||
+++ src/server/setup/iFolderWebSetup.cs.new 2008-01-24 12:14:10.000000000 -0700
|
|
||||||
@@ -155,6 +155,9 @@
|
|
||||||
{
|
|
||||||
// ignore
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+ apacheUser = "apache";
|
|
||||||
+ apacheGroup = "apache";
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
@@ -325,7 +328,7 @@
|
|
||||||
/// </summary>
|
|
||||||
void SetupModMono()
|
|
||||||
{
|
|
||||||
- string path = "/etc/apache2/conf.d/ifolder_web.conf";
|
|
||||||
+ string path = "/etc/simias/apache/gentoo/ifolder_web.conf";
|
|
||||||
|
|
||||||
Console.Write("Configuring {0}...", path);
|
|
||||||
|
|
||||||
@@ -355,8 +358,6 @@
|
|
||||||
sslPrefix = "#";
|
|
||||||
}
|
|
||||||
|
|
||||||
- writer.WriteLine("Include /etc/apache2/mod_mono.conf");
|
|
||||||
- writer.WriteLine();
|
|
||||||
writer.WriteLine("Alias /{0} \"{1}\"", alias, webPath);
|
|
||||||
writer.WriteLine("AddMonoApplications {0} \"/{0}:{1}\"", alias, webPath);
|
|
||||||
if (logoutUrl.Value != String.Empty || logoutUrl.Value.Trim () != "" )
|
|
@ -1,14 +0,0 @@
|
|||||||
diff -Naur simias_orig/src/server/Simias.config.in simias/src/server/Simias.config.in
|
|
||||||
--- simias_orig/src/server/Simias.config.in 2007-10-16 16:19:39.000000000 +0200
|
|
||||||
+++ simias/src/server/Simias.config.in 2007-10-30 01:10:50.068278089 +0100
|
|
||||||
@@ -6,7 +6,9 @@
|
|
||||||
<setting name="AdminPassword" value="simias" />
|
|
||||||
</section>
|
|
||||||
<section name="Server">
|
|
||||||
- <setting name="Name" value="Host1" />
|
|
||||||
+ <setting name="Name" value="Host1" />
|
|
||||||
+ <setting name="PublicAddress" value="http://xxxPUBLICADDRESSxxx/simias10" />
|
|
||||||
+ <setting name="PrivateAddress" value="http://xxxPRIVATEADDRESSxxx/simias10" />
|
|
||||||
</section>
|
|
||||||
<section name="Authentication">
|
|
||||||
<setting name="SimiasAuthNotRequired" value="Registration.asmx, Login.ashx, Simias.asmx:PingSimias, DomainService.asmx:GetDomainID, pubrss.ashx, pubsfile.ashx, Simias.asmx:GetRAList, Simias.asmx:GetRACertificate, iFolderBackup.asmx:GetSimiasDataPath, iFolderBackup.asmx:Ping" />
|
|
@ -1,13 +0,0 @@
|
|||||||
--- configure.in 2007-10-29 18:27:42.000000000 -0600
|
|
||||||
+++ configure.in.new 2008-01-24 10:00:34.000000000 -0700
|
|
||||||
@@ -655,6 +655,10 @@
|
|
||||||
MODMONO_CONFPATH="/etc/httpd/mod_mono.conf"
|
|
||||||
fi
|
|
||||||
|
|
||||||
+if test -e "/etc/apache2/modules.d/70_mod_mono.conf"; then
|
|
||||||
+ MODMONO_CONFPATH="/etc/apache2/modules.d/70_mod_mono.conf"
|
|
||||||
+fi
|
|
||||||
+
|
|
||||||
AC_SUBST(MODMONO_CONFPATH)
|
|
||||||
|
|
||||||
|
|
@ -1,16 +0,0 @@
|
|||||||
diff -Naur simias/src/server/setup/Makefile.am simias-changed/src/server/setup/Makefile.am
|
|
||||||
--- simias/src/server/setup/Makefile.am 2007-10-01 22:53:18.000000000 +0200
|
|
||||||
+++ simias-changed/src/server/setup/Makefile.am 2007-10-02 08:52:47.000000000 +0200
|
|
||||||
@@ -120,9 +120,9 @@
|
|
||||||
$(INSTALL_PROGRAM) ifolder-web-setup $(DESTDIR)$(bindir)
|
|
||||||
$(INSTALL_PROGRAM) ifolder-admin-setup $(DESTDIR)$(bindir)
|
|
||||||
$(INSTALL_PROGRAM) utility.exe $(DEBUG_FILES) $(DESTDIR)$(bindir)
|
|
||||||
- $(mkinstalldirs) /etc/ld.so.conf.d
|
|
||||||
- $(INSTALL_PROGRAM) novell-ifolder3.conf /etc/ld.so.conf.d
|
|
||||||
- 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
|
|
||||||
+# $(mkinstalldirs) /etc/ld.so.conf.d
|
|
||||||
+# $(INSTALL_PROGRAM) novell-ifolder3.conf /etc/ld.so.conf.d
|
|
||||||
+# 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
|
|
||||||
|
|
||||||
|
|
||||||
endif
|
|
Binary file not shown.
@ -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,38 +0,0 @@
|
|||||||
diff -uNr simias.orig/configure.in simias/configure.in
|
|
||||||
--- simias.orig/configure.in 2009-07-25 01:01:14.788228670 +0200
|
|
||||||
+++ simias/configure.in 2009-07-25 01:03:19.218740035 +0200
|
|
||||||
@@ -32,15 +32,15 @@
|
|
||||||
linux*)
|
|
||||||
SIMIAS_OS='linux'
|
|
||||||
if test "$runasclient" = "TRUE"; then
|
|
||||||
- AC_CHECK_PROG(CSC, mcs, mcs)
|
|
||||||
- AC_CHECK_PROG(WSDL, wsdl1, wsdl1,wsdl)
|
|
||||||
+ AC_CHECK_PROG(CSC, gmcs, gmcs)
|
|
||||||
+ AC_CHECK_PROG(WSDL, wsdl2, wsdl2,wsdl)
|
|
||||||
else
|
|
||||||
AC_CHECK_PROG(WSDL, wsdl, wsdl,wsdl)
|
|
||||||
if pkg-config --atleast-version=2.4 mono > /dev/null 2>&1
|
|
||||||
then
|
|
||||||
AC_CHECK_PROG(CSC, gmcs, gmcs)
|
|
||||||
else
|
|
||||||
- AC_CHECK_PROG(CSC, mcs, mcs)
|
|
||||||
+ AC_CHECK_PROG(CSC, gmcs, gmcs)
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
test -z "$CSC" && AC_MSG_ERROR([no C Sharp compiler: gmcs not found in \$PATH])
|
|
||||||
@@ -73,13 +73,13 @@
|
|
||||||
AM_CONDITIONAL(DARWIN, test "$SIMIAS_OS" = "darwin")
|
|
||||||
AM_CONDITIONAL(DARWIN_X86, test "$host_cpu" = "i686")
|
|
||||||
if test "$runasclient" = "TRUE"; then
|
|
||||||
- AM_CONDITIONAL(MONO, test "$CSC" = "mcs")
|
|
||||||
+ AM_CONDITIONAL(MONO, test "$CSC" = "gmcs")
|
|
||||||
else
|
|
||||||
if pkg-config --atleast-version=2.4 mono > /dev/null 2>&1
|
|
||||||
then
|
|
||||||
AM_CONDITIONAL(MONO, test "$CSC" = "gmcs")
|
|
||||||
else
|
|
||||||
- AM_CONDITIONAL(MONO, test "$CSC" = "mcs")
|
|
||||||
+ AM_CONDITIONAL(MONO, test "$CSC" = "gmcs")
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
AM_CONDITIONAL(DOTNET, test "$CSC" = "csc")
|
|
@ -1,46 +0,0 @@
|
|||||||
Submitted By: Mario Fetka (geos_one) (mario dot fetka at gmail dot com)
|
|
||||||
Date: 2010-01-30
|
|
||||||
Initial Package Version: 3.8.0.9328.1
|
|
||||||
Origin: me
|
|
||||||
Upstream Status: unknown
|
|
||||||
Description: build with mono22
|
|
||||||
|
|
||||||
diff -Naur ifolder3-enterprise-3.8.0.9328.1.orig/configure.in ifolder3-enterprise-3.8.0.9328.1/configure.in
|
|
||||||
--- ifolder3-enterprise-3.8.0.9328.1.orig/configure.in 2009-12-03 07:36:11.000000000 +0000
|
|
||||||
+++ ifolder3-enterprise-3.8.0.9328.1/configure.in 2010-01-30 15:33:18.812160514 +0000
|
|
||||||
@@ -31,15 +31,15 @@
|
|
||||||
linux*)
|
|
||||||
SIMIAS_OS='linux'
|
|
||||||
if test "$runasclient" = "TRUE"; then
|
|
||||||
- AC_CHECK_PROG(CSC, mcs, mcs)
|
|
||||||
- AC_CHECK_PROG(WSDL, wsdl1, wsdl1,wsdl)
|
|
||||||
+ AC_CHECK_PROG(CSC, gmcs, gmcs)
|
|
||||||
+ AC_CHECK_PROG(WSDL, wsdl2, wsdl2,wsdl)
|
|
||||||
else
|
|
||||||
- AC_CHECK_PROG(WSDL, wsdl, wsdl,wsdl)
|
|
||||||
+ AC_CHECK_PROG(WSDL, wsdl2, wsdl2,wsdl)
|
|
||||||
if pkg-config --atleast-version=2.4 mono > /dev/null 2>&1
|
|
||||||
then
|
|
||||||
AC_CHECK_PROG(CSC, gmcs, gmcs)
|
|
||||||
else
|
|
||||||
- AC_CHECK_PROG(CSC, mcs, mcs)
|
|
||||||
+ AC_CHECK_PROG(CSC, gmcs, gmcs)
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
test -z "$CSC" && AC_MSG_ERROR([no C Sharp compiler: gmcs not found in \$PATH])
|
|
||||||
@@ -72,13 +72,13 @@
|
|
||||||
AM_CONDITIONAL(DARWIN, test "$SIMIAS_OS" = "darwin")
|
|
||||||
AM_CONDITIONAL(DARWIN_X86, test "$host_cpu" = "i686")
|
|
||||||
if test "$runasclient" = "TRUE"; then
|
|
||||||
- AM_CONDITIONAL(MONO, test "$CSC" = "mcs")
|
|
||||||
+ AM_CONDITIONAL(MONO, test "$CSC" = "gmcs")
|
|
||||||
else
|
|
||||||
if pkg-config --atleast-version=2.4 mono > /dev/null 2>&1
|
|
||||||
then
|
|
||||||
AM_CONDITIONAL(MONO, test "$CSC" = "gmcs")
|
|
||||||
else
|
|
||||||
- AM_CONDITIONAL(MONO, test "$CSC" = "mcs")
|
|
||||||
+ AM_CONDITIONAL(MONO, test "$CSC" = "gmcs")
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
AM_CONDITIONAL(DOTNET, test "$CSC" = "csc")
|
|
@ -1,54 +0,0 @@
|
|||||||
diff -uNr simias.orig/src/server/setup/SimiasServerSetup.cs simias/src/server/setup/SimiasServerSetup.cs
|
|
||||||
--- simias.orig/src/server/setup/SimiasServerSetup.cs 2009-04-20 08:15:08.228832251 +0200
|
|
||||||
+++ simias/src/server/setup/SimiasServerSetup.cs 2009-04-20 08:19:45.906975519 +0200
|
|
||||||
@@ -307,12 +307,12 @@
|
|
||||||
/// <summary>
|
|
||||||
/// Apache User.
|
|
||||||
/// </summary>
|
|
||||||
- public Option apacheUser = new Option("apache-user", "Apache User", "Apache User", false, "wwwrun");
|
|
||||||
+ public Option apacheUser = new Option("apache-user", "Apache User", "Apache User", false, "apache");
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Apache Group.
|
|
||||||
/// </summary>
|
|
||||||
- public Option apacheGroup = new Option("apache-group", "Apache Group", "Apache Group", false, "www");
|
|
||||||
+ public Option apacheGroup = new Option("apache-group", "Apache Group", "Apache Group", false, "apache");
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Prompt for options.
|
|
||||||
@@ -892,7 +892,7 @@
|
|
||||||
try
|
|
||||||
{
|
|
||||||
// uid.conf
|
|
||||||
- using( TextReader reader = (TextReader)File.OpenText( Path.GetFullPath( "/etc/apache2/uid.conf" ) ) )
|
|
||||||
+ using( TextReader reader = (TextReader)File.OpenText( Path.GetFullPath( "/etc/apache2/httpd.conf" ) ) )
|
|
||||||
{
|
|
||||||
string line;
|
|
||||||
while( ( line = reader.ReadLine() ) != null )
|
|
||||||
@@ -2288,7 +2288,7 @@
|
|
||||||
/// </summary>
|
|
||||||
void SetupModMono()
|
|
||||||
{
|
|
||||||
- string path = Path.GetFullPath( "/etc/apache2/conf.d/simias.conf" );
|
|
||||||
+ string path = Path.GetFullPath( "/etc/simias/apache/gentoo/simias.conf" );
|
|
||||||
Console.Write("Configuring {0}...", path);
|
|
||||||
string Mono2TreePath = Environment.GetEnvironmentVariable("LOCAL_MONO_RUNTIME_PATH");
|
|
||||||
|
|
||||||
@@ -2312,17 +2312,6 @@
|
|
||||||
*/
|
|
||||||
|
|
||||||
string alias = "simias10";
|
|
||||||
- if( Mono2TreePath != null )
|
|
||||||
- writer.WriteLine( "Include {0}", Path.GetFullPath( Path.Combine(Mono2TreePath, "bin/mod_mono.conf")) );
|
|
||||||
- else
|
|
||||||
- {
|
|
||||||
- string mod_mono2_path = "/etc/apache2/conf.d/mod_mono.conf";
|
|
||||||
- if( File.Exists( mod_mono2_path ))
|
|
||||||
- writer.WriteLine( "Include {0}", mod_mono2_path );
|
|
||||||
- else
|
|
||||||
- writer.WriteLine( "Include {0}", "/etc/apache2/mod_mono.conf" );
|
|
||||||
- }
|
|
||||||
- writer.WriteLine();
|
|
||||||
writer.WriteLine("Alias /{0} \"{1}\"", alias, SimiasSetup.webdir);
|
|
||||||
writer.WriteLine("AddMonoApplications {0} \"/{0}:{1}\"", alias, SimiasSetup.webdir);
|
|
||||||
writer.WriteLine("MonoSetEnv {0} \"SimiasRunAsServer=true;SimiasDataDir={1}\"", alias, this.storePath);
|
|
@ -1,41 +0,0 @@
|
|||||||
diff -uNr simias.orig/src/server/setup/SimiasServerSetup.cs simias/src/server/setup/SimiasServerSetup.cs
|
|
||||||
--- simias.orig/src/server/setup/SimiasServerSetup.cs 2009-04-06 20:02:53.607688672 +0200
|
|
||||||
+++ simias/src/server/setup/SimiasServerSetup.cs 2009-04-06 20:05:04.892943722 +0200
|
|
||||||
@@ -307,12 +307,12 @@
|
|
||||||
/// <summary>
|
|
||||||
/// Apache User.
|
|
||||||
/// </summary>
|
|
||||||
- public Option apacheUser = new Option("apache-user", "Apache User", "Apache User", false, "wwwrun");
|
|
||||||
+ public Option apacheUser = new Option("apache-user", "Apache User", "Apache User", false, "apache");
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Apache Group.
|
|
||||||
/// </summary>
|
|
||||||
- public Option apacheGroup = new Option("apache-group", "Apache Group", "Apache Group", false, "www");
|
|
||||||
+ public Option apacheGroup = new Option("apache-group", "Apache Group", "Apache Group", false, "apache");
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Prompt for options.
|
|
||||||
@@ -2288,7 +2291,7 @@
|
|
||||||
/// </summary>
|
|
||||||
void SetupModMono()
|
|
||||||
{
|
|
||||||
- string path = Path.GetFullPath( "/etc/apache2/conf.d/simias.conf" );
|
|
||||||
+ string path = Path.GetFullPath( "/etc/simias/apache/gentoo/simias.conf" );
|
|
||||||
Console.Write("Configuring {0}...", path);
|
|
||||||
|
|
||||||
if ( apache.Value == true )
|
|
||||||
@@ -2312,13 +2315,6 @@
|
|
||||||
|
|
||||||
string alias = "simias10";
|
|
||||||
|
|
||||||
- string mod_mono_path = "/etc/apache2/mod_mono.conf";
|
|
||||||
- string mod_mono2_path = "/etc/apache2/conf.d/mod_mono.conf";
|
|
||||||
- if( File.Exists( mod_mono2_path ))
|
|
||||||
- writer.WriteLine( "Include {0}", mod_mono2_path );
|
|
||||||
- else
|
|
||||||
- writer.WriteLine( "Include {0}", mod_mono_path );
|
|
||||||
- writer.WriteLine();
|
|
||||||
writer.WriteLine("Alias /{0} \"{1}\"", alias, SimiasSetup.webdir);
|
|
||||||
writer.WriteLine("AddMonoApplications {0} \"/{0}:{1}\"", alias, SimiasSetup.webdir);
|
|
||||||
writer.WriteLine("MonoSetEnv {0} \"SimiasRunAsServer=true;SimiasDataDir={1}\"", alias, this.storePath);
|
|
@ -1,68 +0,0 @@
|
|||||||
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:
|
|
@ -1,61 +0,0 @@
|
|||||||
diff -uNr ifolder3-enterprise.orig/src/server/setup/SimiasServerSetup.cs ifolder3-enterprise/src/server/setup/SimiasServerSetup.cs
|
|
||||||
--- ifolder3-enterprise.orig/src/server/setup/SimiasServerSetup.cs 2009-12-05 19:06:34.834284498 +0100
|
|
||||||
+++ ifolder3-enterprise/src/server/setup/SimiasServerSetup.cs 2009-12-05 19:10:10.387283893 +0100
|
|
||||||
@@ -306,12 +306,12 @@
|
|
||||||
/// <summary>
|
|
||||||
/// Apache User.
|
|
||||||
/// </summary>
|
|
||||||
- public Option apacheUser = new Option("apache-user", "Apache User", "Apache User", false, "wwwrun");
|
|
||||||
+ public Option apacheUser = new Option("apache-user", "Apache User", "Apache User", false, "apache");
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Apache Group.
|
|
||||||
/// </summary>
|
|
||||||
- public Option apacheGroup = new Option("apache-group", "Apache Group", "Apache Group", false, "www");
|
|
||||||
+ public Option apacheGroup = new Option("apache-group", "Apache Group", "Apache Group", false, "apache");
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Prompt for options.
|
|
||||||
@@ -891,7 +891,7 @@
|
|
||||||
try
|
|
||||||
{
|
|
||||||
// uid.conf
|
|
||||||
- using( TextReader reader = (TextReader)File.OpenText( Path.GetFullPath( "/etc/apache2/uid.conf" ) ) )
|
|
||||||
+ using( TextReader reader = (TextReader)File.OpenText( Path.GetFullPath( "/etc/apache2/httpd.conf" ) ) )
|
|
||||||
{
|
|
||||||
string line;
|
|
||||||
while( ( line = reader.ReadLine() ) != null )
|
|
||||||
@@ -2313,7 +2313,7 @@
|
|
||||||
/// </summary>
|
|
||||||
void SetupModMono()
|
|
||||||
{
|
|
||||||
- string path = Path.GetFullPath( "/etc/apache2/conf.d/simias.conf" );
|
|
||||||
+ string path = Path.GetFullPath( "/etc/simias/apache/gentoo/simias.conf" );
|
|
||||||
Console.WriteLine("Configuring {0}...", path);
|
|
||||||
string ModMonoServer2 = Environment.GetEnvironmentVariable("IFOLDER_MOD_MONO_SERVER2_PATH");
|
|
||||||
string iFolderMonoPath = Environment.GetEnvironmentVariable("IFOLDER_MONO_PATH");
|
|
||||||
@@ -2338,6 +2338,7 @@
|
|
||||||
*/
|
|
||||||
|
|
||||||
string alias = "simias10";
|
|
||||||
+ /*
|
|
||||||
if( iFolderMonoPath != null )
|
|
||||||
writer.WriteLine( "Include {0}{1}", iFolderMonoPath, "/etc/apache2/conf.d/mod_mono.conf");
|
|
||||||
else
|
|
||||||
@@ -2349,6 +2350,7 @@
|
|
||||||
writer.WriteLine( "Include {0}", "/etc/apache2/mod_mono.conf" );
|
|
||||||
}
|
|
||||||
writer.WriteLine();
|
|
||||||
+ */
|
|
||||||
writer.WriteLine("Alias /{0} \"{1}\"", alias, SimiasSetup.webdir);
|
|
||||||
writer.WriteLine("AddMonoApplications {0} \"/{0}:{1}\"", alias, SimiasSetup.webdir);
|
|
||||||
writer.WriteLine("MonoSetEnv {0} \"SimiasRunAsServer=true;SimiasDataDir={1}\"", alias, this.storePath);
|
|
||||||
@@ -2389,7 +2391,7 @@
|
|
||||||
/// </summary>
|
|
||||||
string ReadModMonoConfiguration()
|
|
||||||
{
|
|
||||||
- string path = Path.GetFullPath( "/etc/apache2/conf.d/simias.conf" );
|
|
||||||
+ string path = Path.GetFullPath( "/etc/simias/apache/gentoo/simias.conf" );
|
|
||||||
string dataPath = null;
|
|
||||||
if ( path == null || File.Exists( path ) == false )
|
|
||||||
return null;
|
|
@ -1,71 +0,0 @@
|
|||||||
Submitted By: Mario Fetka (geos_one) (mario dot fetka at gmail dot com)
|
|
||||||
Date: 2010-01-30
|
|
||||||
Initial Package Version: 3.8.0.93281
|
|
||||||
Origin: me
|
|
||||||
Upstream Status: unknown
|
|
||||||
Description: change the defaults for the log and data dir in simias
|
|
||||||
|
|
||||||
diff -Naur simias-3.8.0.9328.1.orig/configure.in simias-3.8.0.9328.1/configure.in
|
|
||||||
--- simias-3.8.0.9328.1.orig/configure.in 2010-01-30 12:56:29.633158084 +0000
|
|
||||||
+++ simias-3.8.0.9328.1/configure.in 2010-01-30 13:20:44.045911549 +0000
|
|
||||||
@@ -652,13 +652,13 @@
|
|
||||||
AC_CHECKING([whether a location for the simias log directory was specified])
|
|
||||||
AC_ARG_WITH(simiaslogdir,
|
|
||||||
[AS_HELP_STRING([--with-simiaslogdir=PATH],
|
|
||||||
- [configure the directory where the simias log files will be placed. [Default="/var/log/ifolder3"]])],
|
|
||||||
+ [configure the directory where the simias log files will be placed. [Default="/var/lib/simias/log"]])],
|
|
||||||
[case $SIMIAS_OS in
|
|
||||||
windows) simiaslogdir=`cygpath --mixed $withval` ;;
|
|
||||||
*) simiaslogdir="$withval" ;;
|
|
||||||
esac],
|
|
||||||
[if test "$runasclient" = "FALSE"; then
|
|
||||||
- simiaslogdir="/var/log/ifolder3"
|
|
||||||
+ simiaslogdir="/var/lib/simias/log"
|
|
||||||
fi]
|
|
||||||
)
|
|
||||||
AC_SUBST(simiaslogdir)
|
|
||||||
diff -Naur simias-3.8.0.9328.1.orig/src/server/setup/SimiasServerSetup.cs simias-3.8.0.9328.1/src/server/setup/SimiasServerSetup.cs
|
|
||||||
--- simias-3.8.0.9328.1.orig/src/server/setup/SimiasServerSetup.cs 2010-01-30 12:56:29.649157921 +0000
|
|
||||||
+++ simias-3.8.0.9328.1/src/server/setup/SimiasServerSetup.cs 2010-01-30 13:17:22.972157834 +0000
|
|
||||||
@@ -160,7 +160,7 @@
|
|
||||||
/// <summary>
|
|
||||||
/// The store path.
|
|
||||||
/// </summary>
|
|
||||||
- public Option path = new Option("path,p", "Server's Data Path", "Path to the server's data files", true, "/var/simias/data");
|
|
||||||
+ public Option path = new Option("path,p", "Server's Data Path", "Path to the server's data files", true, "/var/lib/simias");
|
|
||||||
|
|
||||||
/* /// <summary>
|
|
||||||
/// The default configuration path.
|
|
||||||
@@ -226,7 +226,7 @@
|
|
||||||
/// <summary>
|
|
||||||
/// LDAP URL
|
|
||||||
/// </summary>
|
|
||||||
- public Option recoveryAgentCertificatePath = new Option("ra-cert-path", "Recovery Agent Certificate Path", "Path to the Recovery agent certificate's.", false, "/var/simias/data");
|
|
||||||
+ public Option recoveryAgentCertificatePath = new Option("ra-cert-path", "Recovery Agent Certificate Path", "Path to the Recovery agent certificate's.", false, "/var/lib/simias");
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Use LDAP
|
|
||||||
diff -Naur simias-3.8.0.9328.1.orig/src/server/setup/iFolderAdminSetup.cs simias-3.8.0.9328.1/src/server/setup/iFolderAdminSetup.cs
|
|
||||||
--- simias-3.8.0.9328.1.orig/src/server/setup/iFolderAdminSetup.cs 2010-01-30 12:56:29.650157758 +0000
|
|
||||||
+++ simias-3.8.0.9328.1/src/server/setup/iFolderAdminSetup.cs 2010-01-30 13:18:53.814157632 +0000
|
|
||||||
@@ -482,7 +482,7 @@
|
|
||||||
}
|
|
||||||
|
|
||||||
// create directory
|
|
||||||
- string logPath = "/var/log/ifolder3";
|
|
||||||
+ string logPath = "/var/lib/simias/log";
|
|
||||||
|
|
||||||
if (!System.IO.Directory.Exists(logPath))
|
|
||||||
{
|
|
||||||
diff -Naur simias-3.8.0.9328.1.orig/src/server/setup/iFolderWebSetup.cs simias-3.8.0.9328.1/src/server/setup/iFolderWebSetup.cs
|
|
||||||
--- simias-3.8.0.9328.1.orig/src/server/setup/iFolderWebSetup.cs 2010-01-30 12:56:29.650157758 +0000
|
|
||||||
+++ simias-3.8.0.9328.1/src/server/setup/iFolderWebSetup.cs 2010-01-30 13:18:46.357158059 +0000
|
|
||||||
@@ -506,7 +506,7 @@
|
|
||||||
}
|
|
||||||
|
|
||||||
// create directory
|
|
||||||
- string logPath = "/var/log/ifolder3";
|
|
||||||
+ string logPath = "/var/lib/simias/log";
|
|
||||||
|
|
||||||
if (!System.IO.Directory.Exists(logPath))
|
|
||||||
{
|
|
@ -1,45 +0,0 @@
|
|||||||
Submitted By: Mario Fetka (geos_one) (mario dot fetka at gmail dot com)
|
|
||||||
Date: 2010-01-16
|
|
||||||
Initial Package Version: 1.8.3
|
|
||||||
Origin: me
|
|
||||||
Upstream Status: unknown
|
|
||||||
Description: use system Mono.Webserver.dll instead the provided
|
|
||||||
|
|
||||||
diff -Naur simias-1.8.3.9328.1.orig/configure.in simias-1.8.3.9328.1/configure.in
|
|
||||||
--- simias-1.8.3.9328.1.orig/configure.in 2010-01-16 10:16:48.502483182 +0000
|
|
||||||
+++ simias-1.8.3.9328.1/configure.in 2010-01-16 10:32:33.695379928 +0000
|
|
||||||
@@ -226,6 +226,10 @@
|
|
||||||
AC_SUBST(LOG4NET_PREFIX)
|
|
||||||
AC_SUBST(LOG4NET_LIBS)
|
|
||||||
|
|
||||||
+ PKG_CHECK_MODULES(XSP, xsp >= 2.2)
|
|
||||||
+ AC_SUBST(XSP_PREFIX)
|
|
||||||
+ AC_SUBST(XSP_LIBS)
|
|
||||||
+
|
|
||||||
PKG_CHECK_MODULES(LIBFLAIM, libflaim >= 4.8.0)
|
|
||||||
AC_SUBST(LIBFLAIM_PREFIX)
|
|
||||||
AC_SUBST(LIBFLAIM_LIBS)
|
|
||||||
diff -Naur simias-1.8.3.9328.1.orig/src/core/SimiasApp/Makefile.am simias-1.8.3.9328.1/src/core/SimiasApp/Makefile.am
|
|
||||||
--- simias-1.8.3.9328.1.orig/src/core/SimiasApp/Makefile.am 2010-01-16 10:16:48.556215509 +0000
|
|
||||||
+++ simias-1.8.3.9328.1/src/core/SimiasApp/Makefile.am 2010-01-16 10:35:22.899098129 +0000
|
|
||||||
@@ -7,7 +7,7 @@
|
|
||||||
SYSTEM_INSTALLER_LIB =
|
|
||||||
endif
|
|
||||||
|
|
||||||
-MONO_WEBSERVER_PATH = ../../../dependencies/external/Mono.WebServer
|
|
||||||
+MONO_WEBSERVER_PATH = $(shell pkg-config xsp --variable=assemblies_dir)/
|
|
||||||
|
|
||||||
Simias_CSFILES = $(srcdir)/Simias.cs \
|
|
||||||
$(srcdir)/SimiasAppInstallerClass.cs
|
|
||||||
diff -Naur simias-1.8.3.9328.1.orig/src/core/WebService/Makefile.am simias-1.8.3.9328.1/src/core/WebService/Makefile.am
|
|
||||||
--- simias-1.8.3.9328.1.orig/src/core/WebService/Makefile.am 2010-01-16 10:16:48.583078738 +0000
|
|
||||||
+++ simias-1.8.3.9328.1/src/core/WebService/Makefile.am 2010-01-16 10:36:27.839193842 +0000
|
|
||||||
@@ -8,7 +8,7 @@
|
|
||||||
SimiasWebService_FLAGS = $(CSC_LIBFLAG)
|
|
||||||
SimiasWebService_LIBS = System.dll System.Data.dll $(SYSTEM_XML) System.Web.dll System.Web.Services.dll SimiasClient.dll SimiasLib.dll
|
|
||||||
SimiasWebService_LIBPATH = ../SimiasClient ../SimiasLib.dll $(NOVELL_SECURITY_DIR)
|
|
||||||
-WebServerDir = ../../../external/Mono.WebServer/
|
|
||||||
+WebServerDir = $(shell pkg-config xsp --variable=assemblies_dir)/
|
|
||||||
EXTRA_DIST = win.server.web.config mono.server.web.config win.web.config mono.web.config Global.asax Simias.asmx Simias.wsdl $(SimiasWebService_CSFILES) AssemblyInfo.cs.in
|
|
||||||
|
|
||||||
if MAKE_DOC_FILE
|
|
@ -1,42 +0,0 @@
|
|||||||
Submitted By: Mario Fetka (geos_one) (mario dot fetka at gmail dot com)
|
|
||||||
Date: 2010-01-30
|
|
||||||
Initial Package Version: 1.8.3.9328.1
|
|
||||||
Origin: me
|
|
||||||
Upstream Status: unknown
|
|
||||||
Description: use specified wsdl
|
|
||||||
|
|
||||||
diff -Naur ifolder3-enterprise-3.8.0.9328.1.orig/src/core/SimiasClient/Makefile.am ifolder3-enterprise-3.8.0.9328.1/src/core/SimiasClient/Makefile.am
|
|
||||||
--- ifolder3-enterprise-3.8.0.9328.1.orig/src/core/SimiasClient/Makefile.am 2010-01-30 12:56:29.810158078 +0000
|
|
||||||
+++ ifolder3-enterprise-3.8.0.9328.1/src/core/SimiasClient/Makefile.am 2010-01-30 13:51:08.341159836 +0000
|
|
||||||
@@ -39,7 +39,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
|
|
||||||
@@ -47,8 +47,8 @@
|
|
||||||
|
|
||||||
$(srcdir)/SimiasService2.cs: $(srcdir)/../WebService/Simias.wsdl
|
|
||||||
if LINUX
|
|
||||||
- wsdl -nologo -out:SimiasService2.cs $(srcdir)/../WebService/Simias.wsdl
|
|
||||||
- wsdl1 -nologo -out:SimiasService.cs $(srcdir)/../WebService/Simias.wsdl
|
|
||||||
+ $(WSDL) -nologo -out:SimiasService2.cs $(srcdir)/../WebService/Simias.wsdl
|
|
||||||
+ $(WSDL) -nologo -out:SimiasService.cs $(srcdir)/../WebService/Simias.wsdl
|
|
||||||
endif
|
|
||||||
|
|
||||||
SimiasClient.dll: $(srcdir)/AssemblyInfo.cs $(SimiasClient_CSFILES) $(SimiasClient_RESOURCES)
|
|
||||||
diff -Naur ifolder3-enterprise-3.8.0.9328.1.orig/src/reports/Proxy/Makefile.am ifolder3-enterprise-3.8.0.9328.1/src/reports/Proxy/Makefile.am
|
|
||||||
--- ifolder3-enterprise-3.8.0.9328.1.orig/src/reports/Proxy/Makefile.am 2010-01-30 12:56:29.655157432 +0000
|
|
||||||
+++ ifolder3-enterprise-3.8.0.9328.1/src/reports/Proxy/Makefile.am 2010-01-30 13:49:26.778908752 +0000
|
|
||||||
@@ -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,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,15 +0,0 @@
|
|||||||
diff -uNr simias.orig/src/core/FlaimProvider/FlaimWrapper/Makefile.am simias/src/core/FlaimProvider/FlaimWrapper/Makefile.am
|
|
||||||
--- simias.orig/src/core/FlaimProvider/FlaimWrapper/Makefile.am 2007-10-16 17:56:05.000000000 +0200
|
|
||||||
+++ simias/src/core/FlaimProvider/FlaimWrapper/Makefile.am 2009-02-21 13:50:24.654598727 +0100
|
|
||||||
@@ -92,9 +92,9 @@
|
|
||||||
lib=@LIB64@
|
|
||||||
|
|
||||||
# NOTE: The following is a _hack_.
|
|
||||||
-LIBFLAIM_LIBS_HACK = "-lpthread -lrt -lstdc++ -ldl -lncurses /usr/$(lib)/libflaim.a"
|
|
||||||
+# LIBFLAIM_LIBS_HACK = "-lpthread -lrt -lstdc++ -ldl -lncurses /usr/$(lib)/libflaim.a"
|
|
||||||
|
|
||||||
-libFlaimWrapper_la_LDFLAGS = $(LIBFLAIM_LIBS_HACK)
|
|
||||||
+libFlaimWrapper_la_LDFLAGS = $(LIBFLAIM_LIBS)
|
|
||||||
|
|
||||||
install-exec-local: libFlaimWrapper.la
|
|
||||||
$(mkinstalldirs) $(DESTDIR)$(webbindir)
|
|
@ -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,30 +0,0 @@
|
|||||||
--- src/server/setup/SimiasServerSetup.cs 2007-10-29 18:30:06.000000000 -0600
|
|
||||||
+++ src/server/setup/SimiasServerSetup.cs.new 2008-01-24 12:22:21.000000000 -0700
|
|
||||||
@@ -580,6 +580,9 @@
|
|
||||||
apacheUser.Prompt = apacheGroup.Prompt = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
+ apacheUser.Value = "apache";
|
|
||||||
+ apacheGroup.Value = "apache";
|
|
||||||
+
|
|
||||||
}
|
|
||||||
|
|
||||||
bool Configure()
|
|
||||||
@@ -1143,7 +1146,7 @@
|
|
||||||
/// </summary>
|
|
||||||
void SetupModMono()
|
|
||||||
{
|
|
||||||
- string path = Path.GetFullPath( "/etc/apache2/conf.d/simias.conf" );
|
|
||||||
+ string path = Path.GetFullPath( "/etc/simias/apache/gentoo/simias.conf" );
|
|
||||||
Console.Write("Configuring {0}...", path);
|
|
||||||
|
|
||||||
if ( apache.Value == true )
|
|
||||||
@@ -1167,8 +1170,6 @@
|
|
||||||
|
|
||||||
string alias = "simias10";
|
|
||||||
|
|
||||||
- writer.WriteLine( "Include /etc/apache2/mod_mono.conf" );
|
|
||||||
- writer.WriteLine();
|
|
||||||
writer.WriteLine("Alias /{0} \"{1}\"", alias, SimiasSetup.webdir);
|
|
||||||
writer.WriteLine("AddMonoApplications {0} \"/{0}:{1}\"", alias, SimiasSetup.webdir);
|
|
||||||
writer.WriteLine("MonoSetEnv {0} \"SimiasRunAsServer=true;SimiasDataDir={1}\"", alias, this.storePath);
|
|
@ -1,45 +0,0 @@
|
|||||||
Index: configure.in
|
|
||||||
===================================================================
|
|
||||||
--- configure.in (revision 7152)
|
|
||||||
+++ configure.in (working copy)
|
|
||||||
@@ -720,6 +720,10 @@
|
|
||||||
if test -e "/etc/httpd/mod_mono.conf"; then
|
|
||||||
MODMONO_CONFPATH="/etc/httpd/mod_mono.conf"
|
|
||||||
fi
|
|
||||||
+# to work with apache2 the debian way:
|
|
||||||
+if test -e "/etc/apache2/mods-available/mod_mono.conf"; then
|
|
||||||
+ MODMONO_CONFPATH="/etc/apache2/mods-enabled/mod_mono.conf"
|
|
||||||
+fi
|
|
||||||
|
|
||||||
AC_SUBST(MODMONO_CONFPATH)
|
|
||||||
|
|
||||||
Index: src/setup/apache/default/ifolder_admin.conf.in
|
|
||||||
===================================================================
|
|
||||||
--- src/setup/apache/default/ifolder_admin.conf.in (revision 7152)
|
|
||||||
+++ src/setup/apache/default/ifolder_admin.conf.in (working copy)
|
|
||||||
@@ -11,7 +11,9 @@
|
|
||||||
</Location>
|
|
||||||
|
|
||||||
#Remove comments below this line to enable SSL
|
|
||||||
-#LoadModule rewrite_module /usr/lib/apache2/mod_rewrite.so
|
|
||||||
+#<IfModule !rewrite_module>
|
|
||||||
+# LoadModule rewrite_module /usr/lib/apache2/mod_rewrite.so
|
|
||||||
+#</IfModule>
|
|
||||||
#RewriteEngine On
|
|
||||||
#RewriteCond %{HTTPS} !=on
|
|
||||||
#RewriteRule ^/ifolder/(.*) https://%{SERVER_NAME}/ifolder/$1 [R,L]
|
|
||||||
Index: src/setup/apache/default/ifolder_webaccess.conf.in
|
|
||||||
===================================================================
|
|
||||||
--- src/setup/apache/default/ifolder_webaccess.conf.in (revision 7152)
|
|
||||||
+++ src/setup/apache/default/ifolder_webaccess.conf.in (working copy)
|
|
||||||
@@ -11,7 +11,9 @@
|
|
||||||
</Location>
|
|
||||||
|
|
||||||
#Remove comments below this line to enable SSL
|
|
||||||
-#LoadModule rewrite_module /usr/lib/apache2/mod_rewrite.so
|
|
||||||
+#<IfModule !rewrite_module>
|
|
||||||
+# LoadModule rewrite_module /usr/lib/apache2/mod_rewrite.so
|
|
||||||
+#</IfModule>
|
|
||||||
#RewriteEngine On
|
|
||||||
#RewriteCond %{HTTPS} !=on
|
|
||||||
#RewriteRule ^/ifolder/(.*) https://%{SERVER_NAME}/ifolder/$1 [R,L]
|
|
@ -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,28 +0,0 @@
|
|||||||
--- src/webaccess/Browse.aspx.old 2006-05-09 12:27:13.000000000 -0600
|
|
||||||
+++ src/webaccess/Browse.aspx 2006-05-09 12:30:06.000000000 -0600
|
|
||||||
@@ -2,8 +2,6 @@
|
|
||||||
<%@ Register TagPrefix="iFolder" TagName="HeaderControl" Src="Header.ascx" %>
|
|
||||||
<%@ Register TagPrefix="iFolder" TagName="MessageControl" Src="Message.ascx" %>
|
|
||||||
<%@ Register TagPrefix="iFolder" TagName="iFolderContextControl" Src="iFolderContext.ascx" %>
|
|
||||||
-<%@ Register TagPrefix="iFolder" TagName="TabControl" Src="TabControl.ascx" %>
|
|
||||||
-<%@ Register TagPrefix="iFolder" TagName="QuotaControl" Src="Quota.ascx" %>
|
|
||||||
<%@ Register TagPrefix="iFolder" TagName="PaggingControl" Src="Pagging.ascx" %>
|
|
||||||
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
|
|
||||||
<html>
|
|
||||||
@@ -75,9 +73,6 @@
|
|
||||||
|
|
||||||
<div id="nav">
|
|
||||||
|
|
||||||
- <iFolder:TabControl id="Tabs" runat="server" />
|
|
||||||
-
|
|
||||||
- <iFolder:QuotaControl runat="server" />
|
|
||||||
|
|
||||||
</div>
|
|
||||||
|
|
||||||
@@ -176,4 +171,4 @@
|
|
||||||
|
|
||||||
</body>
|
|
||||||
|
|
||||||
-</html>
|
|
||||||
\ No newline at end of file
|
|
||||||
+</html>
|
|
@ -1,144 +0,0 @@
|
|||||||
# Copyright 1999-2009 Gentoo Foundation
|
|
||||||
# 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/3.8_pre/}"
|
|
||||||
inherit autotools eutils mono subversion
|
|
||||||
|
|
||||||
DESCRIPTION="Enterprise backend for iFolder"
|
|
||||||
HOMEPAGE="http://www.ifolder.com/"
|
|
||||||
#SRC_URI="http://distfiles.one-gear.com/distfiles/ifolder${PV:0:1}-server-${PV}.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="GPL-2"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~amd64 ~arm ~x86"
|
|
||||||
RESTRICT="mirror"
|
|
||||||
|
|
||||||
DEPEND="!net-misc/simias
|
|
||||||
>=dev-lang/mono-2.2
|
|
||||||
>=dev-db/libflaim-4.9.617
|
|
||||||
>=dev-dotnet/log4net-1.2.9
|
|
||||||
>=www-apache/mod_mono-1.2.1
|
|
||||||
>=net-libs/gsoap-2.7.12
|
|
||||||
sys-fs/e2fsprogs"
|
|
||||||
RDEPEND="${DEPEND}"
|
|
||||||
|
|
||||||
S=${WORKDIR}/simias
|
|
||||||
MAKEOPTS="-j1"
|
|
||||||
|
|
||||||
simiasdatadir="${ROOT}var/lib/simias"
|
|
||||||
gentoo_config_dir="${ROOT}etc/simias/apache/gentoo"
|
|
||||||
logdir="${ROOT}var/log/ifolder3"
|
|
||||||
DEVNULL=/dev/null
|
|
||||||
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
epatch "${FILESDIR}"/WSDLPATCH-1.diff
|
|
||||||
# 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}"/gsoap-2.7.12.patch
|
|
||||||
# epatch "${FILESDIR}"/simias-recovery_agent-fix-1.patch
|
|
||||||
#Patch the path of mod_mono.conf
|
|
||||||
# epatch ${FILESDIR}/${PN}-mod_mono-path.patch
|
|
||||||
# epatch ${FILESDIR}/${PN}-apache-rights.patch
|
|
||||||
# epatch ${FILESDIR}/${PN}-simias-server-setup.patch
|
|
||||||
|
|
||||||
epatch ${FILESDIR}/new_mod_mono.diff
|
|
||||||
epatch ${FILESDIR}/ifolder-3.7-admin-setup-1.diff
|
|
||||||
epatch ${FILESDIR}/ifolder-apache-conf.diff
|
|
||||||
epatch ${FILESDIR}/ifolder-3.7-web-setup-1.diff
|
|
||||||
epatch ${FILESDIR}/simias-1.8-server-setup-1.diff
|
|
||||||
# epatch ${FILESDIR}/no_write_to_etc_during_install.diff
|
|
||||||
epatch ${FILESDIR}/new_default_simias.config.diff
|
|
||||||
# epatch ${FILESDIR}/flex_in_lib64.diff
|
|
||||||
# epatch ${FILESDIR}/${PN}-simias-server-setup.patch
|
|
||||||
eautoreconf || die "eautoreconf failed"
|
|
||||||
}
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
econf --with-runasserver --with-simiasdatadir=${simiasdatadir} || die "configure failed"
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
|
|
||||||
make DESTDIR="${D}" install || die "Error install ${PN}"
|
|
||||||
dodir "${simiasdatadir}"
|
|
||||||
keepdir "${simiasdatadir}"
|
|
||||||
# dodir "${logdir}"
|
|
||||||
# keepdir "${logdir}"
|
|
||||||
dodir "${gentoo_config_dir}"
|
|
||||||
|
|
||||||
# if [[ ! -f ${simiasdatadir}/Simias.config ]];then
|
|
||||||
# einfo "It appears you have never setup iFolder"
|
|
||||||
# einfo "Extracting setup-files to ${simiasdatadir}"
|
|
||||||
# tar -zxvf ${FILESDIR}/setup-files.tar.gz -C ${D}/${simiasdatadir}
|
|
||||||
# fi
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postinst() {
|
|
||||||
|
|
||||||
|
|
||||||
echo ""
|
|
||||||
ewarn "Please edit ${ROOT}etc/apache2/httpd.conf and add the following line"
|
|
||||||
ewarn "at the bottom of the file after Include ${ROOT}etc/apache2/vhosts.d/*.conf"
|
|
||||||
ewarn "Include /etc/simias/apache/*.conf"
|
|
||||||
echo ""
|
|
||||||
ewarn "You MUST add \"-D MONO\" to APACHE2_OPTS in /etc/conf.d/apache2"
|
|
||||||
echo ""
|
|
||||||
# ewarn "You can check by running ps aux | grep mono"
|
|
||||||
# ewarn "Remember, your default admin credentials are: admin:novell"
|
|
||||||
echo ""
|
|
||||||
ewarn "You must run emerge --config ifolder-server now"
|
|
||||||
ewarn "to complete the install if this is the first time"
|
|
||||||
ewarn "you have installed the server"
|
|
||||||
# ewarn "Please edit ${simiasdatadir}/Simias.config now to change your administrative"
|
|
||||||
# ewarn "username and password if desired and to set the name and description of your new iFolder server."
|
|
||||||
# ewarn "You must also edit the \"PublicAddress\" and \"PrivateAddress\""
|
|
||||||
# ewarn "settings to match your environment!"
|
|
||||||
echo ""
|
|
||||||
ewarn "Visit http://www.ifolder.com/index.php/HowTo:Building_iFolder_Enterprise_Server_on_Gentoo"
|
|
||||||
ewarn "for more information"
|
|
||||||
# echo ""
|
|
||||||
# ewarn "Please login to http://localhost/admin/ in order to initialize the db"
|
|
||||||
# ewarn "if this is the first time running the server"
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_config(){
|
|
||||||
|
|
||||||
ewarn "Remember that ${PN} runs behind apache"
|
|
||||||
ewarn "therefore give appropriate urls when running this"
|
|
||||||
ewarn "script. Specifically with regards to ports"
|
|
||||||
ewarn "ie: use \"http://localhost\""
|
|
||||||
ewarn "do not use \"http://localhost:8086\""
|
|
||||||
echo ""
|
|
||||||
|
|
||||||
simias-server-setup --apache --path=${simiasdatadir} --prompt
|
|
||||||
chown -R apache:apache "${simiasdatadir}"
|
|
||||||
|
|
||||||
ifolder-admin-setup
|
|
||||||
ifolder-web-setup
|
|
||||||
|
|
||||||
echo ""
|
|
||||||
einfo "Congratulations, configuration complete!"
|
|
||||||
ewarn "Now login to http://<server>/admin/"
|
|
||||||
ewarn "to initialize the database and create users"
|
|
||||||
ewarn "if this is the first time running the server"
|
|
||||||
ewarn "After you have created users you can login"
|
|
||||||
ewarn "to the web interface by visiting"
|
|
||||||
ewarn "http://<server>/ifolder/"
|
|
||||||
echo ""
|
|
||||||
ewarn "Do NOT use epiphany"
|
|
||||||
|
|
||||||
}
|
|
Loading…
Reference in New Issue
Block a user