www-apps/ifolder-server: Bump correct mono2 config

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/ifolder@844 6952d904-891a-0410-993b-d76249ca496b
2009-02-28 20:39:46 +00:00
parent b6d98d3dff
commit c11cc95545
8 changed files with 335 additions and 2 deletions
--- a/www-apps/ifolder-server/files/simias-Makefile-in-generate.diff
+++ b/www-apps/ifolder-server/files/simias-Makefile-in-generate.diff
@@ -0,0 +1,12 @@
+--- /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
+
--- a/www-apps/ifolder-server/files/simias-bash.dpatch
+++ b/www-apps/ifolder-server/files/simias-bash.dpatch
@@ -0,0 +1,97 @@
+#! /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 $
--- a/www-apps/ifolder-server/files/simias-etc_use_destdir.dpatch
+++ b/www-apps/ifolder-server/files/simias-etc_use_destdir.dpatch
@@ -0,0 +1,31 @@
+#! /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
+ 
--- a/www-apps/ifolder-server/files/simias-mono22-1.patch
+++ b/www-apps/ifolder-server/files/simias-mono22-1.patch
@@ -194,3 +194,25 @@ diff -uNr simias.orig/src/core/WebService/mono.web.config simias/src/core/WebSer
 <!--
     <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
--- a/www-apps/ifolder-server/files/simias-mononamespace.dpatch
+++ b/www-apps/ifolder-server/files/simias-mononamespace.dpatch
@@ -0,0 +1,19 @@
+#! /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