diff --git a/net-nds/fedora-ds-admin/ChangeLog b/net-nds/fedora-ds-admin/ChangeLog index cdaac5da..735b3689 100644 --- a/net-nds/fedora-ds-admin/ChangeLog +++ b/net-nds/fedora-ds-admin/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 30 Aug 2008; Mario Fetka + +files/fedora-ds-admin-1.1.5-cfgstuff-1.patch, + fedora-ds-admin-1.1.5-r2.ebuild: + correct cfg stuff + 30 Aug 2008; Mario Fetka -fedora-ds-admin-1.1.5-r1.ebuild, +fedora-ds-admin-1.1.5-r2.ebuild: depend on java part of admin server diff --git a/net-nds/fedora-ds-admin/Manifest b/net-nds/fedora-ds-admin/Manifest index 917a6de9..61884bb4 100644 --- a/net-nds/fedora-ds-admin/Manifest +++ b/net-nds/fedora-ds-admin/Manifest @@ -1,7 +1,8 @@ AUX dirsrv-admin.confd 3079 RMD160 4c85078cd92ca5b16582aabb6c5c614d2cb06784 SHA1 d0dd4117d67324bb5fe005ef54a7882b46ff2556 SHA256 e27ea96a265e3738905c9acb37096a6fe15d873d15832e417d7dff41fc94a149 AUX dirsrv-admin.initd 3701 RMD160 70ea7e54f83fb5c29e0c931c4143198832f4562e SHA1 56f635f57df05f965fe9c66f2b57921eec96c2c8 SHA256 4f3e7a2795527633fecc70685e9109519e6780f528382ac663f5d280bff28226 +AUX fedora-ds-admin-1.1.5-cfgstuff-1.patch 2162 RMD160 b90280b41920d7e8351ef001f3d9e096e980052b SHA1 6252504afa4d7cd41d0e6abab84fd4ae34b94f6e SHA256 97fd463723eb927a81fd7524eeb32e165c90a9caa7651a6b1ec250217af3573f AUX fedora-ds-admin-cvs.sh 340 RMD160 ebd9c99007e7c0864b1bb654333d1b672294e91d SHA1 3dc407f3e5f8cd1afab01106d7e3fddfb4201048 SHA256 7572aa1936dc728732e59412a033077a58e2bd399ec9ab90857a1716739d4a62 DIST fedora-ds-admin-1.1.5.tar.bz2 1068625 RMD160 1bcb1f9f3cf38ef15e38a89ae943c2965ac98306 SHA1 55749243ca9ad7f304dced35154904c6b1c1a20b SHA256 27560a4cdccde8360d098b8370aa8880139b0b47d6ae9080e8ecee7b0e71f1a6 -EBUILD fedora-ds-admin-1.1.5-r2.ebuild 1780 RMD160 946241a2d3c90812fdcaed6383694e095d459ce6 SHA1 a2107c8130a01cedd33ea9a7ca285875d4afe22a SHA256 408ba4b14604f6f361aa0cbfdbc60a4653fc7283b02329305e75266fcbdd3906 -MISC ChangeLog 1830 RMD160 ea46da1687cd466c7a6c858bd0acd01af3384c3f SHA1 c459ba1608732ba527945b008a9ead44ad6d9a1b SHA256 4caa15bce2ddce828894e5bc01c21efd30841264e0ac8a808ebc60d8906499f0 +EBUILD fedora-ds-admin-1.1.5-r2.ebuild 1877 RMD160 60b28f587ab2dbbebb13a91ba7cc0042449650c2 SHA1 1c2c79fcf86d7d456e68647f33b6706dba13525b SHA256 9fd2b3f45d3764ae6a6589eb45a64b4ab7108ad20f0c341679b3b0a66da6010f +MISC ChangeLog 1986 RMD160 af44afde18bfc714f72cec5c213023e9544fe45a SHA1 42e3223db67b03e13406e052ff609f9c2ceed1e3 SHA256 4e06a9ddb5518dc660a6afafc9c88882df5b8c1071240899cf062cfe2c19f293 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 diff --git a/net-nds/fedora-ds-admin/fedora-ds-admin-1.1.5-r2.ebuild b/net-nds/fedora-ds-admin/fedora-ds-admin-1.1.5-r2.ebuild index 27f039d8..8a4fc43e 100644 --- a/net-nds/fedora-ds-admin/fedora-ds-admin-1.1.5-r2.ebuild +++ b/net-nds/fedora-ds-admin/fedora-ds-admin-1.1.5-r2.ebuild @@ -44,6 +44,7 @@ need_apache2 src_unpack() { unpack ${A} cd "${S}" + epatch "${FILESDIR}"/fedora-ds-admin-1.1.5-cfgstuff-1.patch sed -e "s!SUBDIRS!# SUBDIRS!g" -i Makefile.am rm -rf mod_* eautoreconf @@ -68,6 +69,7 @@ src_compile() { src_install () { emake DESTDIR="${D}" install || die "emake failed" + keepdir /var/log/dirsrv/admin-serv # remove redhat style init script. rm -rf "${D}"/etc/rc.d diff --git a/net-nds/fedora-ds-admin/files/fedora-ds-admin-1.1.5-cfgstuff-1.patch b/net-nds/fedora-ds-admin/files/fedora-ds-admin-1.1.5-cfgstuff-1.patch new file mode 100644 index 00000000..51d05e05 --- /dev/null +++ b/net-nds/fedora-ds-admin/files/fedora-ds-admin-1.1.5-cfgstuff-1.patch @@ -0,0 +1,43 @@ +Submitted By: Mario Fetka (mario dot fetka at gmail dot com) +Date: 2008-08-30 +Initial Package Version: 1.1.5 +Origin: me +Upstream Status: Gentoo specific +Description: correct filelocations + +diff -Naur fedora-ds-admin-1.1.5.orig/admserv/cfgstuff/httpd-2.2.conf.in fedora-ds-admin-1.1.5/admserv/cfgstuff/httpd-2.2.conf.in +--- fedora-ds-admin-1.1.5.orig/admserv/cfgstuff/httpd-2.2.conf.in 2007-08-01 18:14:53.000000000 +0000 ++++ fedora-ds-admin-1.1.5/admserv/cfgstuff/httpd-2.2.conf.in 2008-08-30 12:25:00.766003282 +0000 +@@ -141,10 +141,10 @@ + LoadModule disk_cache_module @moddir@/mod_disk_cache.so + LoadModule file_cache_module @moddir@/mod_file_cache.so + LoadModule mem_cache_module @moddir@/mod_mem_cache.so +-LoadModule cgi_module @moddir@/mod_cgi.so +-LoadModule restartd_module @admmoddir@/mod_restartd.so +-LoadModule nss_module @nssmoddir@/libmodnss.so +-LoadModule admserv_module @admmoddir@/mod_admserv.so ++LoadModule cgid_module @moddir@/mod_cgid.so ++LoadModule restartd_module @moddir@/mod_restartd.so ++LoadModule nss_module @moddir@/mod_nss.so ++LoadModule admserv_module @moddir@/mod_admserv.so + + ### Section 2: 'Main' server configuration + # +diff -Naur fedora-ds-admin-1.1.5.orig/admserv/cfgstuff/httpd.conf.in fedora-ds-admin-1.1.5/admserv/cfgstuff/httpd.conf.in +--- fedora-ds-admin-1.1.5.orig/admserv/cfgstuff/httpd.conf.in 2007-08-01 18:14:53.000000000 +0000 ++++ fedora-ds-admin-1.1.5/admserv/cfgstuff/httpd.conf.in 2008-08-30 12:26:03.402003388 +0000 +@@ -140,10 +140,10 @@ + LoadModule disk_cache_module @moddir@/mod_disk_cache.so + LoadModule file_cache_module @moddir@/mod_file_cache.so + LoadModule mem_cache_module @moddir@/mod_mem_cache.so +-LoadModule cgi_module @moddir@/mod_cgi.so +-LoadModule restartd_module @admmoddir@/mod_restartd.so +-LoadModule nss_module @nssmoddir@/libmodnss.so +-LoadModule admserv_module @admmoddir@/mod_admserv.so ++LoadModule cgid_module @moddir@/mod_cgid.so ++LoadModule restartd_module @moddir@/mod_restartd.so ++LoadModule nss_module @moddir@/mod_nss.so ++LoadModule admserv_module @moddir@/mod_admserv.so + + ### Section 2: 'Main' server configuration + #