Date: Wed, 30 Apr 2003 14:02:37 +0200 (CEST) From: Udo Schweigert <udo.schweigert@siemens.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/51621: maintainer-update of mail/mutt Message-ID: <200304301202.h3UC2bTd055823@alaska.cert.siemens.de> Resent-Message-ID: <200304301210.h3UCACgH008713@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 51621 >Category: ports >Synopsis: maintainer-update of mail/mutt >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Apr 30 05:10:12 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Udo Schweigert >Release: FreeBSD 4.8-STABLE i386 >Organization: >Environment: System: FreeBSD alaska.cert.siemens.de 4.8-STABLE FreeBSD 4.8-STABLE #55: Sun Apr 20 10:42:59 CEST 2003 ust@alaska.cert.siemens.de:/usr/obj/work/src/RELENG_4/sys/alaska i386 >Description: Maintainer update of mail/mutt: - Fix handling of hostname if hostname contains more than 31 characters for FreeBSD versions before 5.x Committer: new file (cvs add) files/patch-init.c Tested on -stable and 5.0-RELEASE. This closes PR ports/43926. >How-To-Repeat: >Fix: diff -ru /usr/ports/mail/mutt/Makefile ./Makefile --- /usr/ports/mail/mutt/Makefile Thu Apr 24 11:48:57 2003 +++ ./Makefile Wed Apr 30 13:19:10 2003 @@ -8,7 +8,7 @@ PORTNAME= mutt PORTVERSION= 1.4.1 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES+= mail MASTER_SITES= ftp://ftp.mutt.org/mutt/ \ ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \ diff -ru /usr/ports/mail/mutt/files/patch-init.c ./files/patch-init.c --- /usr/ports/mail/mutt/files/patch-init.c Thu Jan 1 01:00:00 1970 +++ ./files/patch-init.c Wed Apr 30 13:13:28 2003 @@ -0,0 +1,49 @@ +--- init.c.orig Wed Jul 24 10:41:29 2002 ++++ init.c Wed Apr 30 13:06:45 2003 +@@ -45,7 +45,9 @@ + #include <stdlib.h> + #include <unistd.h> + #include <string.h> ++#if __FreeBSD_version >= 500000 + #include <sys/utsname.h> ++#endif + #include <errno.h> + #include <sys/wait.h> + +@@ -1707,7 +1709,11 @@ + void mutt_init (int skip_sys_rc, LIST *commands) + { + struct passwd *pw; ++#if __FreeBSD_version < 500000 ++ char nodename[STRING]; ++#else + struct utsname utsname; ++#endif + char *p, buffer[STRING], error[STRING]; + int i, default_rc = 0, need_pause = 0; + BUFFER err; +@@ -1765,16 +1771,21 @@ + #endif + + /* And about the host... */ ++#if __FreeBSD_version < 500000 ++ gethostname(nodename, sizeof (nodename)); ++#else + uname (&utsname); ++ strfcpy (nodename, utsname.nodename, sizeof (nodename)); ++#endif + /* some systems report the FQDN instead of just the hostname */ +- if ((p = strchr (utsname.nodename, '.'))) ++ if ((p = strchr (nodename, '.'))) + { +- Hostname = mutt_substrdup (utsname.nodename, p); ++ Hostname = mutt_substrdup (nodename, p); + p++; + strfcpy (buffer, p, sizeof (buffer)); /* save the domain for below */ + } + else +- Hostname = safe_strdup (utsname.nodename); ++ Hostname = safe_strdup (nodename); + + #ifndef DOMAIN + #define DOMAIN buffer >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200304301202.h3UC2bTd055823>