[Fedora-directory-commits] ldapserver ldapserver.spec.tmpl, 1.18, 1.19
Richard Allen Megginson (rmeggins)
fedora-directory-commits at redhat.com
Wed Dec 7 21:29:10 UTC 2005
Author: rmeggins
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5433/ldapserver
Modified Files:
ldapserver.spec.tmpl
Log Message:
Bug(s) fixed: 175098
Bug Description: The dsgw cookie directory needs to be writable by the admin server uid
Reviewed by: Nathan (Thanks!)
Fix Description: DS Gateway authentication breaks because the admin server uid cannot write to the bin/slapd/authck directory. This fix makes sure that directory is owned by the correct uid. I've also put a similar fix into the ds spec file %post section to fix this when upgrading from fds10 to fds101.
Platforms tested: Fedora Core 4
Flag Day: no
Doc impact: no
Index: ldapserver.spec.tmpl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldapserver.spec.tmpl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ldapserver.spec.tmpl 16 Nov 2005 17:40:35 -0000 1.18
+++ ldapserver.spec.tmpl 7 Dec 2005 21:29:03 -0000 1.19
@@ -44,8 +44,8 @@
%define __os_install_post %{nil}
Summary: @COMPANY-PRODUCT-NAME@
Name: @LCASE-COMPANY-NAME-NOSP at -ds
-Version: @GEN-VERSION@
-Release: 2. at PLATFORM@
+Version: @NOSP-VERSION@
+Release: 1. at PLATFORM@
License: GPL plus extensions
Group: System Environment/Daemons
URL: @COMPANY-URL@
@@ -78,6 +78,8 @@
# the echo yes is for dsktune to continue
# the second echo yes is for some platforms that need it
(echo yes ; echo yes) | ./setup -b $RPM_BUILD_ROOT/%{prefix}
+# remove the setup log files so they aren't packaged
+rm -f $RPM_BUILD_ROOT/%{prefix}/setup/*/*.log
%clean
if [ -z "$RPM_INSTALL_PREFIX" ]; then
@@ -120,7 +122,37 @@
if [ -z "$RPM_INSTALL_PREFIX" ]; then
RPM_INSTALL_PREFIX=%{prefix}
fi
-echo "Install finished. Please run $RPM_INSTALL_PREFIX/setup/setup to set up the servers."
+if [ "$1" -ge 1 ] ; then
+# patch file to upgrade admin server from 1.0 to 1.0.1
+ if [ -f $RPM_INSTALL_PREFIX/setup/adminserver10to101.patch ] ; then
+ patch -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/adminserver10to101.patch
+ fi
+# patch file to fix start-admin on Fedora Core 2
+ if [ -f $RPM_INSTALL_PREFIX/setup/adminserver-start-admin.patch ] ; then
+ patch -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/adminserver-start-admin.patch
+ fi
+# fix up file permissions
+ testfile=$RPM_INSTALL_PREFIX/admin-serv/config/nss.conf
+ if [ ! -f $testfile ] ; then
+ testfile=$RPM_INSTALL_PREFIX/admin-serv/config/adm.conf
+ fi
+ if [ -f $testfile ] ; then
+ usergroup=`ls -l $testfile | awk '{print $3":"$4}'`
+ if [ -d $RPM_INSTALL_PREFIX/admin-serv/config ] ; then
+ chown $usergroup $RPM_INSTALL_PREFIX/admin-serv/config
+ fi
+ if [ -d $RPM_INSTALL_PREFIX/bin/slapd/authck ] ; then
+ chown $usergroup $RPM_INSTALL_PREFIX/bin/slapd/authck
+ fi
+ if [ -d $RPM_INSTALL_PREFIX/alias ] ; then
+ chown $usergroup $RPM_INSTALL_PREFIX/alias
+ fi
+ fi
+ echo "Install finished. Please restart your directory servers first,"
+ echo "then the admin server. Do not run setup."
+else
+ echo "Install finished. Please run $RPM_INSTALL_PREFIX/setup/setup to set up the servers."
+fi
%preun
# only run uninstall if this is the last version of the package
@@ -133,6 +165,11 @@
fi
%changelog
+* Tue Dec 6 2005 Rich Megginson <rmeggins at redhat.com> - 1.0.1-1
+- Use nosp version instead of gen version to get patch version numbers
+- Patch the admin server in the post install section
+- Remove the unnecessary log files after setup so they aren't packaged
+
* Wed Nov 09 2005 Nathan Kinder <nkinder at redhat.com> 7.1-2
- Changed cyrus-sasl dependency to >= 2.1.15 for RHEL3 compatibility
More information about the Fedora-directory-commits
mailing list