dbp/ifolder
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

www-apps/ifolder3-enterprise: add log-datadir-patch

Browse Source 
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/ifolder@1898 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one 2010-01-30 13:26:28 +00:00
parent 1f6d56e127
commit 6131f91648
6 changed files with 88 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
www-apps/ifolder3-enterprise/ChangeLog
View File

@ -2,6 +2,13 @@
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
30 Jan 2010; Mario Fetka <mario.fetka@gmail.com>
files/ifolder-3.7-admin-setup-1.diff,
ifolder3-enterprise-3.8.0.9328.1.ebuild,
files/ifolder-3.8-admin-setup-1.diff,
+files/simias-3.8.0.9328.1-log-data-dir-1.patch:
add log-datadir-patch
30 Jan 2010; Mario Fetka <mario.fetka@gmail.com>
ifolder3-enterprise-3.8.0.9328.1.ebuild:
correct typo -ge -gt

9
www-apps/ifolder3-enterprise/Manifest
View File

@ -7,11 +7,11 @@ AUX gsoap-compile-final.patch 402 RMD160 29619a25145d4fd7f8a6f05211a5eb2322c5634
AUX gsoap-compile-new.patch 431 RMD160 e6230ce3337369bfd773b68c71ea5b0ca64312d9 SHA1 ab6872d237a6007019471d23785911e7bf36edca SHA256 6539b41d1c421f9578be3eb4f3e698567d0954e6417619e9f9431d09b62c7b28
AUX gsoap-compile.patch 360 RMD160 3f498dcf545df164aaf9cfeacb7382a0a6b18194 SHA1 4ce5bf7e6a8f7343e06e8445cfd200cf33ea9651 SHA256 e813db06442e5375a45dfa32a71de3d6b5eddea3cf90b6be5c9e5a04cd917bc5
AUX gsoap-path.patch 441 RMD160 853a2222305bda35600983b8e15d7c84e107e43c SHA1 d4124e62d9a8e13fd6ff17859ea4ac779da52a3d SHA256 4f0b22bf788ad50c7455fa0d75d149f929abca7516743f9e62a1904abcad5fef
AUX ifolder-3.7-admin-setup-1.diff 3109 RMD160 c7bba0877accd64923c9b5d6526ecb89f14baa28 SHA1 5ffd3362512d7c7186cbca2f062531f9264228ad SHA256 337092e6d940b629567893b5abbbc1792ce20325966321bb0f6979251bd9f130
AUX ifolder-3.7-admin-setup-1.diff 3102 RMD160 53cda521aa883c1f97df9ea8f81caf17859fab7f SHA1 db2515751af926f25201b60feb7c3e33364bad38 SHA256 4034c2896ab9e65a9c1675ada7e34afbfee6d395ea5965f89d54d43fab65a231
AUX ifolder-3.7-admin-setup.diff 2042 RMD160 afae167e940d7ce24df7074d6d8eda039444d3bb SHA1 61f226215ce1e55d557867bff39f99ea80a3c392 SHA256 9574ab052a460779f10fdadfaac687175578999a11d5af57329f7f2bdfc405bf
AUX ifolder-3.7-web-setup-1.diff 3111 RMD160 f1aa396d21af1f385599ae780e2a2e4e64109eb8 SHA1 9c1d71497bd7c6fc447054da073efaea70cd060c SHA256 f156a1d706c04fc1cde56c4af21e01c3b8258d92071e83aff72c943de5ffb04c
AUX ifolder-3.7-web-setup.diff 2146 RMD160 ede533ddd86e3c5aef0a6a89c0b65e6cb9173870 SHA1 749a5cc7fcdce88ae61dc45538bed4476586c206 SHA256 909927c6967b78361a7c5aee77fc233bfa34c7e76832f2ee636e9ebcbd36bd6d
AUX ifolder-3.8-admin-setup-1.diff 2928 RMD160 f7bb75d80cda0d28ec5043711ca5d38af5f6c1ef SHA1 5179d28be17d12d10e3f20fd4e87417cab880a7c SHA256 8ff42c0748ba155863837844c4f83d88874d8cac8349fa5443a22a959de9ebd6
AUX ifolder-3.8-admin-setup-1.diff 2921 RMD160 6c3c6c8f70a1bbefa71a1b5d084e895d66675f87 SHA1 3b320e928b6941bf070e040bfce25da44553574c SHA256 3f0d867dfebc0d2ae797f610f349d6920d083dce53d4aa26ce231872900e8db6
AUX ifolder-3.8-web-setup-1.diff 3035 RMD160 41a5c633ed2228e7b099865a491c5d9614042542 SHA1 0db2e6085d9a44c3a06d41ac2ded8dd7d4d83b32 SHA256 694615231878330c5155032f013ec4ae212fc3bb09878ab9945a0cdc690f4eb6
AUX ifolder-admin-setup.diff 841 RMD160 b2d6b79037a0c3d02e9a761688c9605dc3f7c497 SHA1 d628ec533f755f58cebf4a0a969c8527c41a944e SHA256 e391577bb0fe37ce873371be95b110af02d499dc7035592ef2199a0f1bdc382a
AUX ifolder-apache-conf.diff 335 RMD160 10d26c5367bf21b36e3c129ca5913a6744c42551 SHA1 d7fbdc42b0cfaef907a64c48054ac902c41855f4 SHA256 c839ee18851cc12094992bb9b7db4c5ee5a36bc0878ae608bfa9a2963263bbde
@ -35,6 +35,7 @@ AUX simias-1.8-use_system_gsoap-2.patch 2431 RMD160 17bbd1ba7db59b2b83f79a4dfb98
AUX simias-1.8.3-server-setup-1.diff 2706 RMD160 6cf51563434889a8d6f2252714776cc8c6d7502d SHA1 43f78ae25feed6795404b448500aefe4eea8ef99 SHA256 836e9665893a4d99b4cbbe650b24f4a3357f50aadfb485e47bcf54d5e32350b8
AUX simias-1.8.3.9328.1-system_xsp-1.patch 2256 RMD160 13303b758dcf27bf5b0c3596700c2997df18b022 SHA1 0e86aee0c9d63077c16a8742b65a5cf908070a11 SHA256 a75191361ee845124cef3384b66d5568c07ec88eed46e0b04e436f6bda61cb31
AUX simias-1.8.use_system_gsoap.patch 3026 RMD160 3a63dafb8767b36ff9f99009d1749f07b2b82232 SHA1 3cae95bbab594e84eb41b3dee9e37fc9d1644404 SHA256 4b176aa58b40799c270a91889e22a2a8603e256b9f8415bda665071de7cd5b4e
AUX simias-3.8.0.9328.1-log-data-dir-1.patch 3566 RMD160 40f2a832e76c05987c11c35598bd17e1f8360724 SHA1 fcdad8690ea300589003a05ef96b83f0f3b6f522 SHA256 33edec5359e35e8ac9b5beee31424ead248b1331133c7672d9b2a97774c0455e
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
@ -48,7 +49,7 @@ AUX simias-trunk_mod_rewrite-and-mods-enabled.patch 1727 RMD160 06ddc3f3fffc38ea
AUX simias_make_gcc43_happy.diff 1296 RMD160 11d3abf250e494744a534bac0af2dde451248942 SHA1 45c5e8aa305664caa302cab9b5cbaa8590689d2d SHA256 667df49faa48bde3b4cb76fee38af01965c226af15ddd34b9bfe8083c05adb8b
AUX webaccess-browse.patch 1001 RMD160 6262f046567d6736fb4193913cc4b4d0bb764792 SHA1 e33cb643b63ded940f9029fe7a79d3accf800450 SHA256 8517e52d6ac974de169fafe01705e1f9a6b8834b2f493ef485477398029b2353
DIST ifolder3-enterprise-3.8.0.9328.1.tar.gz 27791071 RMD160 b0a3b677802722a89e37600ff2bc414ce94ae5ca SHA1 75bba166ec219314db85dde103b5d73481854cbe SHA256 0da6caa6511c6d37d77099b4aaa47914c8069a4d72fba39326ea92ee69b63748
EBUILD ifolder3-enterprise-3.8.0.9328.1.ebuild 5254 RMD160 c0b7e8cb241eee10da6aaa75efaa37658ce84fe7 SHA1 f1d543e690e511722abca69f176bcc07ec21454c SHA256 f8c5017496afa2c43ce8bc52185a279241faef0dbbb18184900659ea3dc77050
EBUILD ifolder3-enterprise-3.8.0.9328.1.ebuild 5321 RMD160 2ee21b8283ab829d4ef7e85fe50a0ccf4ed52635 SHA1 ba315d9a69f9afbffc867b1e2ded34e320737e7e SHA256 d5cf544bcb9db6d77a7911d16c8e79b03388f1b25745f403bbc6be5524cd74f2
EBUILD ifolder3-enterprise-3.8_pre7061.ebuild 4733 RMD160 4f5146ffff9f4679b949762b8adb873105c3503f SHA1 9804a9ab487f1e78db9fe99a28cabaf7023bf552 SHA256 2fe29bf2293839b6595d97b65c64c76c350afd69999454bd86c3c9d6dcd95f8c
MISC ChangeLog 4167 RMD160 1a894b329e684aaf841f2cda055dea24b34a4122 SHA1 f8ba510c95f8565fa4f4a14242564176d3e68a42 SHA256 5b9f2488474a4e6f2c1141c60b762d968fc07c6d62c5e6992de8353f17415699
MISC ChangeLog 4417 RMD160 d2dee3f9dda77f37f6cd10858241429cad46fd10 SHA1 28aef619aaacb618422f64abc027690e1cc83795 SHA256 c479037f35827030b93ba3e6f6d4c8990a5da354d63cf777f9e077bd127c73f5
MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

2
www-apps/ifolder3-enterprise/files/ifolder-3.7-admin-setup-1.diff
View File

@ -30,7 +30,7 @@ diff -uNr simias.orig/src/server/setup/iFolderAdminSetup.cs simias/src/server/se
string ReadModMonoConfiguration()
{
- string path = Path.GetFullPath( "/etc/apache2/conf.d/simias.conf" );
+ string path = Path.GetFullPath( "/etc/simias/apache/gentoo/ifolder_admin.conf" );
+ string path = Path.GetFullPath( "/etc/simias/apache/gentoo/simias.conf" );
string dataPath = null;
if ( path == null || File.Exists( path ) == false )
return null;

2
www-apps/ifolder3-enterprise/files/ifolder-3.8-admin-setup-1.diff
View File

@ -30,7 +30,7 @@ diff -uNr ifolder3-enterprise.orig/src/server/setup/iFolderAdminSetup.cs ifolder
string ReadModMonoConfiguration()
{
- string path = Path.GetFullPath( "/etc/apache2/conf.d/simias.conf" );
+ string path = Path.GetFullPath( "/etc/simias/apache/gentoo/ifolder_admin.conf" );
+ string path = Path.GetFullPath( "/etc/simias/apache/gentoo/simias.conf" );
string dataPath = null;
if ( path == null || File.Exists( path ) == false )
return null;

71
www-apps/ifolder3-enterprise/files/simias-3.8.0.9328.1-log-data-dir-1.patch Normal file
View File

@ -0,0 +1,71 @@
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 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 2010-01-30 12:56:29.633158084 +0000
+++ ifolder3-enterprise-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 ifolder3-enterprise-3.8.0.9328.1.orig/src/server/setup/SimiasServerSetup.cs ifolder3-enterprise-3.8.0.9328.1/src/server/setup/SimiasServerSetup.cs
--- ifolder3-enterprise-3.8.0.9328.1.orig/src/server/setup/SimiasServerSetup.cs 2010-01-30 12:56:29.649157921 +0000
+++ ifolder3-enterprise-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 ifolder3-enterprise-3.8.0.9328.1.orig/src/server/setup/iFolderAdminSetup.cs ifolder3-enterprise-3.8.0.9328.1/src/server/setup/iFolderAdminSetup.cs
--- ifolder3-enterprise-3.8.0.9328.1.orig/src/server/setup/iFolderAdminSetup.cs 2010-01-30 12:56:29.650157758 +0000
+++ ifolder3-enterprise-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 ifolder3-enterprise-3.8.0.9328.1.orig/src/server/setup/iFolderWebSetup.cs ifolder3-enterprise-3.8.0.9328.1/src/server/setup/iFolderWebSetup.cs
--- ifolder3-enterprise-3.8.0.9328.1.orig/src/server/setup/iFolderWebSetup.cs 2010-01-30 12:56:29.650157758 +0000
+++ ifolder3-enterprise-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))
{

6
www-apps/ifolder3-enterprise/ifolder3-enterprise-3.8.0.9328.1.ebuild
View File

@ -76,6 +76,7 @@ src_prepare() {
# epatch ${FILESDIR}/flex_in_lib64.diff
# epatch ${FILESDIR}/${PN}-simias-server-setup.patch
epatch "${FILESDIR}"/simias-1.8.3.9328.1-system_xsp-1.patch
epatch "${FILESDIR}"/simias-1.8.3.9328.1-log-data-dir-1.patch
eautoreconf || die "eautoreconf failed"
}
@ -117,7 +118,7 @@ pkg_postinst() {
# 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 "You must run emerge --config ifolder3-enterprise 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"
@ -143,10 +144,9 @@ pkg_config(){
echo ""
simias-server-setup --apache --path=${simiasdatadir} --prompt
chown -R apache:apache "${simiasdatadir}"
ifolder-admin-setup
ifolder-web-setup
chown -R apache:apache "${simiasdatadir}"
echo ""
einfo "Congratulations, configuration complete!"