sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Fix handling of hostname if hostname contains more than 31 characters

Browse source 
for FreeBSD versions before 5.x.
* Bump PORTREVISION.

PR:		ports/51621, ports/51622
Submitted by:	maintainer
This commit is contained in:
Oliver Braun 2003-04-30 20:45:08 +00:00
parent 738b2e8829
commit 0144da99d5
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=79930
6 changed files with 150 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mail/mutt-devel/Makefile
View file

@ -66,7 +66,7 @@
PORTNAME= mutt-devel PORTNAME= mutt-devel
PORTVERSION= 1.5.4 PORTVERSION= 1.5.4
PORTREVISION?= 1 PORTREVISION?= 2
CATEGORIES+= mail CATEGORIES+= mail
.if defined(WITH_MUTT_NNTP) .if defined(WITH_MUTT_NNTP)
CATEGORIES+= news CATEGORIES+= news

49
mail/mutt-devel/files/patch-init.c Normal file
View file

@ -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

2
mail/mutt/Makefile
View file

@ -8,7 +8,7 @@
PORTNAME= mutt PORTNAME= mutt
PORTVERSION= 1.4.1 PORTVERSION= 1.4.1
PORTREVISION= 0 PORTREVISION= 1
CATEGORIES+= mail CATEGORIES+= mail
MASTER_SITES= ftp://ftp.mutt.org/mutt/ \ MASTER_SITES= ftp://ftp.mutt.org/mutt/ \
ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \ ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \

49
mail/mutt/files/patch-init.c Normal file
View file

@ -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

2
mail/mutt14/Makefile
View file

@ -8,7 +8,7 @@
PORTNAME= mutt PORTNAME= mutt
PORTVERSION= 1.4.1 PORTVERSION= 1.4.1
PORTREVISION= 0 PORTREVISION= 1
CATEGORIES+= mail CATEGORIES+= mail
MASTER_SITES= ftp://ftp.mutt.org/mutt/ \ MASTER_SITES= ftp://ftp.mutt.org/mutt/ \
ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \ ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \

49
mail/mutt14/files/patch-init.c Normal file
View file

@ -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