diff --git a/www-apps/ifolder-server/ChangeLog b/www-apps/ifolder-server/ChangeLog index 5ed6b57..210c553 100644 --- a/www-apps/ifolder-server/ChangeLog +++ b/www-apps/ifolder-server/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 28 Feb 2009; Mario Fetka + files/simias-mono22-1.patch, +files/simias-Makefile-in-generate.diff, + +files/simias-bash.dpatch, +files/simias-etc_use_destdir.dpatch, + +files/simias-mononamespace.dpatch, +ifolder-server-3.6.7303.1-r3.ebuild: + Bump correct mono2 config + 27 Feb 2009; Mario Fetka files/simias-mono22-1.patch: fix mono 2.0 connectionManagement diff --git a/www-apps/ifolder-server/Manifest b/www-apps/ifolder-server/Manifest index b5f7bfa..f9a3f47 100644 --- a/www-apps/ifolder-server/Manifest +++ b/www-apps/ifolder-server/Manifest @@ -17,9 +17,13 @@ AUX new_mod_mono.diff 342 RMD160 9a882b17c42d2dd1e31a95545ffb4fdc0a89bfe6 SHA1 2 AUX no_write_to_etc_during_install.diff 916 RMD160 9cd1ee64a3006aad139892010b2ba9a4f0f695be SHA1 a4c1c6ed6ad7be0bbcf75fda1601d7edab843981 SHA256 3c8045848161d34a49f1c1934b1111489e18f48d0b4225e287f83d1407425d7f AUX setup-files.tar.gz 1104 RMD160 a1e0abc2dc43b168267d1b0c79b450ce7bd66011 SHA1 1f99f09cdcacc8eb859e4e17bd18948f2293a782 SHA256 40a6f1400e59a06cc220193dcfd0dbd1cf8ce629526db9598cc6aeafda06e001 AUX simias-1.6.use_system_gsoap.patch 2922 RMD160 ec4bb9da8a3a0eab08ac36b4dc9d5c19aa833736 SHA1 fa49d2d34f210919590838c9d302315a304ff037 SHA256 e8432f7883b161c8f68c16f7a99da4ade7eab5b41f8391e7f99b3f92474c74c0 +AUX simias-Makefile-in-generate.diff 245 RMD160 e98841bdbc05c82565c076000b1a2def2d647a00 SHA1 4c9bb42fbc6eeb078389e554a1ce400a88051e84 SHA256 62621a68f45cf3b7eba1af206d18f245b624c8e52361707648306360f20f3778 +AUX simias-bash.dpatch 4540 RMD160 35a754408252415667aa13bc46f78a94842e83c1 SHA1 12df994febdddcd5f06fb6b9437ff9ed828eceb4 SHA256 44a142f060bdfb4dd276e81e878822998819516e37cd30f7a255be98ba446d3b +AUX simias-etc_use_destdir.dpatch 1570 RMD160 50dd9de5b9ca0f45735bdc2d166e6020b1d0d4a3 SHA1 0b5128209c1d5546e399e4bac773d4c7a4fa9760 SHA256 53611a9778cac46e249694198a95b07ba6e9a514b0551c361900894282e728c1 AUX simias-libflaim_shared-1.patch 749 RMD160 a8c402e4c822cf7961068308e46dbfea4e69ffea SHA1 37aed1ec52275c2d3e3cdfe37e2b122e07781c43 SHA256 9a9918fcaa7a6e528b8f15f9c719b886b51af3264bb89fd59859f0023eb9050f AUX simias-libtool22-1.patch 498 RMD160 3c6c621765382c3bbf66877217aef55301e6c337 SHA1 04affadf85f3f731b530acdc54659e83c08b0942 SHA256 156f539e59b62592a2e83902b063f7b941940bb93294eb2bd8d99146302d888b -AUX simias-mono22-1.patch 8635 RMD160 c499fc17833a226ac0624ab677e8574256d7c9fa SHA1 73637c865a0e59e99727988645be37a940b59137 SHA256 e54e0fb5af95c5f97cb664333efff6cc03dbc21354aab49ff26ceace68ef020f +AUX simias-mono22-1.patch 9708 RMD160 527169ab20c88847a8604ba6b5c6d79063fb1392 SHA1 9f371158b24d3e9098f88f6986ebb745dbd0a9bc SHA256 5d1e8a078407ab8953de8487de6e33432cdb1e530c34ab51dc374e2727f4f45a +AUX simias-mononamespace.dpatch 738 RMD160 57d65758f50a5f2efa1fa097cf899024f28ccd12 SHA1 8a3449fb7bfd7518cbd8050cc6cdeab59c4e8464 SHA256 d88f6096b603410d6235442d95b295d257ebd902203cbaf74e62a663efc2418c AUX simias-recovery_agent-fix-1.patch 682 RMD160 f4faf06f1f00d660f31bfc18951dcdb9cc7c1f72 SHA1 3a5a9844bbbba6c5596826acf3905e19567ab08c SHA256 f4e1d4f58c9ae4eefbad75345d47a592399bc7f14f44dff5357266080fa6934c AUX simias-server-setup.diff 1071 RMD160 d8befc86eb4ebf8230bb28e54a677d21523bc6c9 SHA1 0e99938a4c2e2045ccef4ddfa86e3adcb2a345aa SHA256 f02a5d3cf6430d546b5971d62c08469ca9e6ab4910c074d3bb5e53b2044cf741 AUX simias_make_gcc43_happy.diff 1296 RMD160 11d3abf250e494744a534bac0af2dde451248942 SHA1 45c5e8aa305664caa302cab9b5cbaa8590689d2d SHA256 667df49faa48bde3b4cb76fee38af01965c226af15ddd34b9bfe8083c05adb8b @@ -28,6 +32,7 @@ DIST gsoap-linux-2.7.tar.gz 5528885 RMD160 d952e0e6cc8d5bf19b5a157cfbd7585d043d9 DIST ifolder3-server-3.6.7303.1.tar.gz 19986658 RMD160 703f38b730c0dc59f77b1c55e83bb864008d45cf SHA1 329d128772c09ac7facff6d3b9e23989c8a1b972 SHA256 a047e14b5bf7235c83b0fe706a0bb05f69319887e49b9176b2c373c1e409ba55 EBUILD ifolder-server-3.6.7303.1-r1.ebuild 4374 RMD160 ba5010a12d06ea9df3f43a87eaf4e3c409a11b94 SHA1 e933443beb69bae373e7c5f8e532ee2fe3cc795c SHA256 475c53b2270288ec949024463181762466edad27ad1f807e61807cdf5ab647cf EBUILD ifolder-server-3.6.7303.1-r2.ebuild 4430 RMD160 70af925f2444662b3be7af67169d31981e5e446e SHA1 f471033ed2486bc5213d343eb6118070ef1083c8 SHA256 1f3696c81ede5651670f44f4f80b4a1a6ac2f3934c50e5ed5603912f88c30b91 +EBUILD ifolder-server-3.6.7303.1-r3.ebuild 4573 RMD160 c2e5d6953f05ef9a5899727468d720abffcfdaf3 SHA1 419214f740baa86bfe27e312d20a630a8e9c5d07 SHA256 1eaa1169ccbf992525e2e0c2489f9b40e84b1dc07766e3e64c1abbbd79395677 EBUILD ifolder-server-3.6.7303.1.ebuild 4320 RMD160 2d8cfb188d8384206d043f3ff7ff7c8960aecce7 SHA1 0a83a3bcb51648888081ce8ff676c89dd08cc9f0 SHA256 da6a3447ec2cfdaf6ca56ab32398bdf02a5198644925b20b1782092999294b8a -MISC ChangeLog 1002 RMD160 0012299276c26f40ba78bb3c67813bbf17d720ba SHA1 4b536f0f76fa81ebc2fd5c245d9947aa3bc044db SHA256 a1ab18595866c7bd79e01ce60e1a36984c0cc25a88fc0ef3433986371a1b4b53 +MISC ChangeLog 1297 RMD160 5a79f9115360d9d2fa2affbd5e52668e7e697e3d SHA1 9c3d58fe679a7003dc1acfd06de2156c9795d9d0 SHA256 79dfa079eb8d4b7342565e18d5e5033480932639cf91836a7e175cb48c17578f MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 diff --git a/www-apps/ifolder-server/files/simias-Makefile-in-generate.diff b/www-apps/ifolder-server/files/simias-Makefile-in-generate.diff new file mode 100644 index 0000000..6e28221 --- /dev/null +++ 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 + diff --git a/www-apps/ifolder-server/files/simias-bash.dpatch b/www-apps/ifolder-server/files/simias-bash.dpatch new file mode 100755 index 0000000..17e3c29 --- /dev/null +++ b/www-apps/ifolder-server/files/simias-bash.dpatch @@ -0,0 +1,97 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 004_bash.dpatch by +## +## 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 $ diff --git a/www-apps/ifolder-server/files/simias-etc_use_destdir.dpatch b/www-apps/ifolder-server/files/simias-etc_use_destdir.dpatch new file mode 100755 index 0000000..4af5e8e --- /dev/null +++ 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 +## +## 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 + diff --git a/www-apps/ifolder-server/files/simias-mono22-1.patch b/www-apps/ifolder-server/files/simias-mono22-1.patch index c4f7534..8a5bd82 100644 --- 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