Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/admin/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2205/ldapserver/ldap/admin/src
Modified Files:
upgradeServer
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: upgradeServer
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/upgradeServer,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- upgradeServer 21 Oct 2005 19:21:10 -0000 1.7
+++ upgradeServer 23 Feb 2006 19:30:30 -0000 1.8
@@ -326,7 +326,29 @@
sleep(1); # allow some data to accumulate in the pipe
# print "Output from $prog -v:\n";
while (<F>) {
- if (/^Netscape-Directory\/(\d+)\.(\d+)(?:\.(\d+))?(?:b\d)*\s+(\S+)/) {
+ if (/^Red Hat-Directory\/(\d+)\.(\d+)(?:\.(\d+))?(?:b\d)*\s+(\S+)/) {
+ $version = $1;
+ $minor = $2;
+ if ($4) {
+ $subminor = $3;
+ $buildNumber = $4;
+ } else {
+ $buildNumber = $3;
+ }
+ last;
+ }
+ elsif (/^Fedora-Directory\/(\d+)\.(\d+)(?:\.(\d+))?(?:b\d)*\s+(\S+)/) {
+ $version = $1;
+ $minor = $2;
+ if ($4) {
+ $subminor = $3;
+ $buildNumber = $4;
+ } else {
+ $buildNumber = $3;
+ }
+ last;
+ }
+ elsif (/^Netscape-Directory\/(\d+)\.(\d+)(?:\.(\d+))?(?:b\d)*\s+(\S+)/) {
$version = $1;
$minor = $2;
if ($4) {
@@ -414,7 +436,6 @@
"$sroot/bin/slapd/admin/scripts/template-migrate5to7",
"$sroot/bin/slapd/admin/scripts/template-migrate6to7",
"$sroot/bin/slapd/admin/scripts/template-migrateInstance7",
- "$sroot/bin/slapd/admin/scripts/template-migrateTo4",
"$sroot/bin/slapd/admin/scripts/template-migrateTo7",
"$sroot/bin/slapd/admin/scripts/template-repl-monitor-cgi.pl",
);
Show replies by date