diff options
| author | Oliver Braun <obraun@FreeBSD.org> | 2003-04-30 20:45:08 +0000 |
|---|---|---|
| committer | Oliver Braun <obraun@FreeBSD.org> | 2003-04-30 20:45:08 +0000 |
| commit | 0144da99d5481b8d35772d14e74ec3092ecc86c2 (patch) | |
| tree | 3b6a3ac8c5935a25dcc9cf7faf63a17e1d57b738 /mail/mutt14 | |
| parent | - Update to 0.8.2. (diff) | |
* Fix handling of hostname if hostname contains more than 31 characters
for FreeBSD versions before 5.x.
* Bump PORTREVISION.
PR: ports/51621, ports/51622
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=79930
Diffstat (limited to 'mail/mutt14')
| -rw-r--r-- | mail/mutt14/Makefile | 2 | ||||
| -rw-r--r-- | mail/mutt14/files/patch-init.c | 49 |
2 files changed, 50 insertions, 1 deletions
diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile index d3225f3eadb3..83a0aeaaab62 100644 --- a/mail/mutt14/Makefile +++ b/mail/mutt14/Makefile @@ -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 --git a/mail/mutt14/files/patch-init.c b/mail/mutt14/files/patch-init.c new file mode 100644 index 000000000000..4d0363a9c1bb --- /dev/null +++ b/mail/mutt14/files/patch-init.c @@ -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 |