Author: rmeggins
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2205/ldapserver
Modified Files:
components.mk ldapserver.spec.tmpl
Log Message:
Bug(s) fixed: 182613
Bug Description: Upgrade wipes out sectool wrappers
Reviewed by: Pete and Nathan (Thanks!)
Fix Description: It's better if we just package those wrappers instead
of creating them on the fly. The new file sec_tools_wrappers is a
simple shell script that assumes it's being run out of a parent/bin
directory which contains a program called $0-bin, and the shared libs it
needs are in parent/lib. This shell script is copied to
shared/bin/certutil, shared/bin/modutil, etc. I had to create another
makefile packaging macro to handle the case where you want to package a
file under a different name than the original. Also
1) Add Red Hat and Fedora DS to upgradeServer
2) adminutil property directory is now adminutil-properties instead of
property
3) General clean up of some upgrade install things
Platforms tested: Fedora Core 4
Flag Day: no
Doc impact: no
Index: components.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/components.mk,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- components.mk 14 Feb 2006 04:26:54 -0000 1.40
+++ components.mk 23 Feb 2006 19:30:23 -0000 1.41
@@ -112,6 +112,14 @@
# separate the src from the dest with a single space
PACKAGE_SRC_DEST =
+# this macro contains a list of pairs of source and dest files, not directories
+# the source is where to find the item in the build tree, and the dest is
+# the place in the release to put the item, relative to the server root e.g.
+# nls locale files are in libnls31/locale, but for packaging they need to
+# go into lib/nls, not just lib; the destination should be a file name;
+# separate the src from the dest with a single space
+PACKAGE_SRC_DESTFILE =
+
# these defs are useful for doing pattern search/replace
COMMA := ,
NULLSTRING :=
@@ -264,8 +272,10 @@
# we need to package the root cert file in the alias directory
PACKAGE_SRC_DEST += $(SECURITY_LIBPATH)/$(LIB_PREFIX)nssckbi.$(DLL_SUFFIX) alias
-# need to package the sec tools in shared/bin
-BINS_TO_PKG_SHARED += $(SECURITY_TOOLS_FULLPATH)
+# the security tools are wrapped with shell scripts so that the correct ld libpath can be
set
+# so, when we package them, we rename them with a -bin extension e.g. certutil ->
shared/bin/certutil-bin
+# the actual certutil will be an executable shell script that points to certutil-bin
+PACKAGE_SRC_DESTFILE += $(foreach
prog,$(SECURITY_TOOLS),$(SECURITY_BINPATH)/$(prog)$(SPACE)shared/bin/$(prog)-bin)
### SECURITY END #############################
@@ -531,7 +541,7 @@
ADMINUTIL_INCPATH = $(ADMINUTIL_BUILD_DIR)/include/adminutil-$(ADMINUTIL_DOT_VER)
endif
-PACKAGE_SRC_DEST += $(ADMINUTIL_LIBPATH)/property bin/slapd/lib
+PACKAGE_SRC_DEST += $(ADMINUTIL_LIBPATH)/adminutil-properties bin/slapd/lib
LIBS_TO_PKG += $(wildcard $(ADMINUTIL_LIBPATH)/*.$(DLL_SUFFIX))
LIBS_TO_PKG_CLIENTS += $(wildcard $(ADMINUTIL_LIBPATH)/*.$(DLL_SUFFIX))
Index: ldapserver.spec.tmpl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldapserver.spec.tmpl,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ldapserver.spec.tmpl 23 Feb 2006 04:06:17 -0000 1.24
+++ ldapserver.spec.tmpl 23 Feb 2006 19:30:23 -0000 1.25
@@ -156,13 +156,10 @@
chown $usergroup $RPM_INSTALL_PREFIX/alias
fi
fi
- for instance in `ls -d $RPM_INSTALL_PREFIX/slapd-*`
- do
- cp $RPM_INSTALL_PREFIX/bin/slapd/install/schema/00core.ldif
$instance/config/schema
- done
- echo "Upgrade complete. Please restart slapd then admin."
+ echo "Upgrade finished. Please run $RPM_INSTALL_PREFIX/setup/setup to complete
the upgrade."
+else
+ echo "Install finished. Please run $RPM_INSTALL_PREFIX/setup/setup to complete
installation and set up the servers."
fi
-echo "Install finished. Please run $RPM_INSTALL_PREFIX/setup/setup to set up the
servers."
%preun
# only run uninstall if this is the last version of the package
Show replies by date