From ce67d2b645cbeb6603a146ba0c2246eda35dd190 Mon Sep 17 00:00:00 2001 From: simon Date: Mon, 9 Aug 2004 21:50:10 +0000 Subject: During FTP installs, when installing Postfix as an alternate MTA, the install of Postfix fails since Postfix 1 is picked from INDEX instead of Postfix 2. The problem is that the package_add function matches multiple Postfix packages and then installs a "random" version (the last one found in INDEX). This does not occur with a CD-ROM install since there is only one Postfix package on the CD-ROM. The correct solution to this would be to check the origin field from INDEX instead of the package name, but due to the way sysinstall is made that is not trivial, so instead work around the problem by hard-coding the Postfix major and minor revision (for the current stable version) to install directly into the package_add call. PR: misc/65426 Reported by: Harold Kachelmyer Approved by: trhodes --- usr.sbin/sade/config.c | 2 +- usr.sbin/sysinstall/config.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'usr.sbin') diff --git a/usr.sbin/sade/config.c b/usr.sbin/sade/config.c index 1371374..82baa42 100644 --- a/usr.sbin/sade/config.c +++ b/usr.sbin/sade/config.c @@ -1129,7 +1129,7 @@ configMTAPostfix(dialogMenuItem *self) msgError("Error setting the enviroment variable POSTFIX_DEFAULT_MTA: %s (%u)", strerror(errno), errno); - ret = package_add("postfix"); + ret = package_add("postfix-2.1"); unsetenv("POSTFIX_DEFAULT_MTA"); if(DITEM_STATUS(ret) == DITEM_FAILURE) { diff --git a/usr.sbin/sysinstall/config.c b/usr.sbin/sysinstall/config.c index 1371374..82baa42 100644 --- a/usr.sbin/sysinstall/config.c +++ b/usr.sbin/sysinstall/config.c @@ -1129,7 +1129,7 @@ configMTAPostfix(dialogMenuItem *self) msgError("Error setting the enviroment variable POSTFIX_DEFAULT_MTA: %s (%u)", strerror(errno), errno); - ret = package_add("postfix"); + ret = package_add("postfix-2.1"); unsetenv("POSTFIX_DEFAULT_MTA"); if(DITEM_STATUS(ret) == DITEM_FAILURE) { -- cgit v1.1