pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

inetdextra: Update to 20140904 release



Module Name:	pkgsrc-wip
Committed By:	Hauke Fath <hauke%NetBSD.org@localhost>
Pushed By:	hauke
Date:		Mon Jun 8 17:57:28 2020 +0200
Changeset:	d18a2ce0caa5570187dcf224771e25be647127b9

Modified Files:
	inetdxtra/Makefile
	inetdxtra/PLIST
	inetdxtra/distinfo
	inetdxtra/patches/patch-Makefile
	inetdxtra/patches/patch-in.ctcs_in.ctcs.c
	inetdxtra/patches/patch-in.dhcp_in.dhcp.c
	inetdxtra/patches/patch-in.dns_in.dns.c
	inetdxtra/patches/patch-in.jabberd_in.jabberd.c
	inetdxtra/patches/patch-in.mvp_in.mvp.c
	inetdxtra/patches/patch-in.www_in.www.c
Added Files:
	inetdxtra/patches/patch-in.proxy_in.proxy.c
	inetdxtra/patches/patch-in.smtp_in.smtp.c

Log Message:
inetdextra: Update to 20140904 release

Install man pages and preferences

TODO: Deal with compiler warnings

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d18a2ce0caa5570187dcf224771e25be647127b9

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 inetdxtra/Makefile                              | 57 ++++++++++++++++---------
 inetdxtra/PLIST                                 |  5 ++-
 inetdxtra/distinfo                              | 24 ++++++-----
 inetdxtra/patches/patch-Makefile                | 10 +++--
 inetdxtra/patches/patch-in.ctcs_in.ctcs.c       | 28 ++++++++++--
 inetdxtra/patches/patch-in.dhcp_in.dhcp.c       | 46 +++++++++++++++++---
 inetdxtra/patches/patch-in.dns_in.dns.c         |  5 ++-
 inetdxtra/patches/patch-in.jabberd_in.jabberd.c |  9 ++--
 inetdxtra/patches/patch-in.mvp_in.mvp.c         |  6 ++-
 inetdxtra/patches/patch-in.proxy_in.proxy.c     | 14 ++++++
 inetdxtra/patches/patch-in.smtp_in.smtp.c       | 43 +++++++++++++++++++
 inetdxtra/patches/patch-in.www_in.www.c         |  4 +-
 12 files changed, 200 insertions(+), 51 deletions(-)

diffs:
diff --git a/inetdxtra/Makefile b/inetdxtra/Makefile
index da9abc6ce7..832b40b484 100644
--- a/inetdxtra/Makefile
+++ b/inetdxtra/Makefile
@@ -1,40 +1,57 @@
-# $NetBSD: Makefile,v 1.1 2014/05/16 15:19:19 hfath Exp $
+# $NetBSD$
 
-INETDXTRA_VERSION=	20130516
+INETDXTRA_VERSION=	20140904
 DISTNAME=		inetdxtra-${INETDXTRA_VERSION}_src
 PKGNAME=		${DISTNAME:S/_src//}
 CATEGORIES=		net
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=inetdxtra/}
+MASTER_SITES=		http://rawsontetley.org/oss/
 
 MAINTAINER=		hauke%NetBSD.org@localhost
-HOMEPAGE=		http://inetdxtra.sourceforge.net/
+HOMEPAGE=		http://rawsontetley.org/proj_inetdxtra.html
 COMMENT=		Collection of inetd based servers
 
 LICENSE=		gnu-gpl-v2
 
-PKG_SYSCONFSUBDIR=	inetdxtra
+USE_TOOLS+=		gunzip
+
+WRKSRC=			${WRKDIR}/inetdxtra
+
 CFLAGS+=		-DSYSCONFDIR=\"${PKG_SYSCONFDIR}\"
 CFLAGS+=		-DONELOG -DNORELATIVE -DCGI -DUPDATEPS
 
-WRKSRC=			${WRKDIR}/inetdxtra
-LIBEXECDIR=		${DESTDIR}${PREFIX}/libexec/inetdxtra
-DOCDIR=			${DESTDIR}${PREFIX}/share/doc/inetdxtra
-EGDIR=			${DESTDIR}${PREFIX}/share/examples/inetdxtra
+PKG_SYSCONFSUBDIR=	inetdxtra
+
+LIBEXECDIR=		libexec/inetdxtra
+DOCDIR=			share/doc/inetdxtra
+EGDIR=			share/examples/inetdxtra
+
+CONF_FILES=		${EGDIR}/inetd.conf.sample \
+				${PKG_SYSCONFDIR}/inetd.conf
+CONF_FILES+=		${EGDIR}/in.dhcp.conf.sample \
+				${PKG_SYSCONFDIR}/in.dhcp.conf
 
-# TODOs
-#
-# Take care of example preference files
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${LIBEXECDIR} ${DOCDIR} ${EGDIR}
+
+MAN1_PAGES=		in.jabberd/man/in.jabberd.1
+MAN1_PAGES+=		in.www/man/in.www.1
 
 do-install:
-	${MKDIR} ${LIBEXECDIR}
-	${MKDIR} ${DOCDIR}
-	${MKDIR} ${EGDIR}
 .for pp in ctcs dhcp dns jabberd mvp proxy smtp www
-	${INSTALL_PROGRAM} ${WRKSRC}/in.${pp}/in.${pp} ${LIBEXECDIR}
-	${INSTALL_DATA} ${WRKSRC}/in.${pp}/README ${DOCDIR}/README.${pp}
+	${INSTALL_PROGRAM} ${WRKSRC}/in.${pp}/in.${pp} \
+		${DESTDIR}${PREFIX}/${LIBEXECDIR}
+	${INSTALL_DATA} ${WRKSRC}/in.${pp}/README \
+		${DESTDIR}${PREFIX}/${DOCDIR}/README.${pp}
+.endfor
+.for mp in ${MAN1_PAGES}
+	gunzip ${WRKSRC}/${mp}.gz
+	${INSTALL_DATA} ${WRKSRC}/${mp} \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${mm}
 .endfor
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/inetd.conf.sample ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/in.dhcp/in.dhcp.conf.sample ${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/README \
+		${DESTDIR}${PREFIX}/${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/inetd.conf.sample \
+		${DESTDIR}${PREFIX}/${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/in.dhcp/in.dhcp.conf.sample \
+		${DESTDIR}${PREFIX}/${EGDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/inetdxtra/PLIST b/inetdxtra/PLIST
index ed617404dc..0c2f34646f 100644
--- a/inetdxtra/PLIST
+++ b/inetdxtra/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2014/05/16 15:19:19 hfath Exp $
+@comment $NetBSD$
 libexec/inetdxtra/in.ctcs
 libexec/inetdxtra/in.dhcp
 libexec/inetdxtra/in.dns
@@ -7,6 +7,8 @@ libexec/inetdxtra/in.mvp
 libexec/inetdxtra/in.proxy
 libexec/inetdxtra/in.smtp
 libexec/inetdxtra/in.www
+man/man1/in.jabberd.1
+man/man1/in.www.1
 share/doc/inetdxtra/README
 share/doc/inetdxtra/README.ctcs
 share/doc/inetdxtra/README.dhcp
@@ -18,3 +20,4 @@ share/doc/inetdxtra/README.smtp
 share/doc/inetdxtra/README.www
 share/examples/inetdxtra/in.dhcp.conf.sample
 share/examples/inetdxtra/inetd.conf.sample
+@pkgdir bin
diff --git a/inetdxtra/distinfo b/inetdxtra/distinfo
index ae0a09d302..1fea8fb20c 100644
--- a/inetdxtra/distinfo
+++ b/inetdxtra/distinfo
@@ -1,13 +1,15 @@
 $NetBSD: distinfo,v 1.1 2014/05/16 15:19:19 hfath Exp $
 
-SHA1 (inetdxtra-20130516_src.tar.gz) = 6d2f2c055d502cb85f2a23d5f7bd592b7f91ce7a
-RMD160 (inetdxtra-20130516_src.tar.gz) = 136a5f948b2b3b477354dba7ad963573a319e98c
-SHA512 (inetdxtra-20130516_src.tar.gz) = bdd193cc1877caf7ebd4013261659d30cac8eb2ba16a69bd5182ee032eaae6dc75e03518c116c5b2290e066246c4e6ed2f6e3d4a15b5fe754be91b7d7fbc083b
-Size (inetdxtra-20130516_src.tar.gz) = 56675 bytes
-SHA1 (patch-Makefile) = 88aa58b5ccc35cfcf7deb7b50f673e78f653c838
-SHA1 (patch-in.ctcs_in.ctcs.c) = dcee3fcec2cd6e5e2590a305fe7230b1dd3e2d89
-SHA1 (patch-in.dhcp_in.dhcp.c) = 649efcc08849fa15913ffcde33ab38a324c0ac6c
-SHA1 (patch-in.dns_in.dns.c) = 421c2bfbf29d24182a2fd062f86c76a25570d789
-SHA1 (patch-in.jabberd_in.jabberd.c) = 86c752940bd9a3f0d7bac41daeedf4d7d93e412a
-SHA1 (patch-in.mvp_in.mvp.c) = e9ec692d268d85f52b2f06c910cee75185e72ea2
-SHA1 (patch-in.www_in.www.c) = fc1a58223adc4401cec773bd331e21d7198cf5f5
+SHA1 (inetdxtra-20140904_src.tar.gz) = 1171f2edc5bab11290d84081470e6dcb2ce674c5
+RMD160 (inetdxtra-20140904_src.tar.gz) = c3a71564b7a48b2054a8532cd267dc1a79dafd01
+SHA512 (inetdxtra-20140904_src.tar.gz) = 911e7f95d1893026caa902ab373c76e13d11a94b61c726490abae2308432a2e07346898f16ad4f463be020afc1ed86219c746e857412c83ce0e1c7772fe73ec7
+Size (inetdxtra-20140904_src.tar.gz) = 143162 bytes
+SHA1 (patch-Makefile) = ce09b73281f7310535dea35b548b8cb47b34ac8d
+SHA1 (patch-in.ctcs_in.ctcs.c) = f094b05986ec03eba053be7c642379f4d4b446da
+SHA1 (patch-in.dhcp_in.dhcp.c) = 517d1eca3eb9a8af5bec376c0dfe68c718d2e6f4
+SHA1 (patch-in.dns_in.dns.c) = 8da64954c590fe9ba4b0af348b87da32409d6cd0
+SHA1 (patch-in.jabberd_in.jabberd.c) = 50e8d4188d68dcd141a01816449f0b84c42fa8f8
+SHA1 (patch-in.mvp_in.mvp.c) = 532eabec3ea811219a37c508bb4b68be178be1bc
+SHA1 (patch-in.proxy_in.proxy.c) = 225f9dbe2f4cc26c2e3335679b49b11ac61f107e
+SHA1 (patch-in.smtp_in.smtp.c) = 1b1462e33b09834b3ac44e944cf6d6eac78f2aa8
+SHA1 (patch-in.www_in.www.c) = abaf0bbd7e0b62a9faffcb161dfa83acc0c7706b
diff --git a/inetdxtra/patches/patch-Makefile b/inetdxtra/patches/patch-Makefile
index b6710adb1b..ec0ead7f69 100644
--- a/inetdxtra/patches/patch-Makefile
+++ b/inetdxtra/patches/patch-Makefile
@@ -1,12 +1,14 @@
-$NetBSD: patch-Makefile,v 1.1 2014/05/16 15:19:19 hfath Exp $
+$NetBSD$
 
---- Makefile.orig	2013-05-16 08:26:44.000000000 +0000
+We provide PREFIX and CFLAGS from the package Makefile
+
+--- Makefile.orig	2014-09-04 10:57:27.000000000 +0000
 +++ Makefile
 @@ -1,6 +1,6 @@
  
- VERSION=20130516
+ VERSION=20140904
 -PREFIX=/usr/local/sbin
-+#PREFIX=/usr/local/sbin
++PREFIX?=/usr/local/sbin
  SUBDIR=in.dhcp in.dns in.mvp in.jabberd in.www in.proxy in.smtp in.ctcs
  
  # Available CFLAGS:
diff --git a/inetdxtra/patches/patch-in.ctcs_in.ctcs.c b/inetdxtra/patches/patch-in.ctcs_in.ctcs.c
index bf3c095526..ce00ffca3b 100644
--- a/inetdxtra/patches/patch-in.ctcs_in.ctcs.c
+++ b/inetdxtra/patches/patch-in.ctcs_in.ctcs.c
@@ -1,8 +1,28 @@
-$NetBSD: patch-in.ctcs_in.ctcs.c,v 1.1 2014/05/16 15:19:19 hfath Exp $
+$NetBSD$
 
---- in.ctcs/in.ctcs.c.orig	2011-01-13 15:53:55.000000000 +0000
+An ANSI C FILE and a unix file number are two kettle of fish. Convert.
+
+--- in.ctcs/in.ctcs.c.orig	2013-04-26 20:00:11.000000000 +0000
 +++ in.ctcs/in.ctcs.c
-@@ -204,7 +204,7 @@ char* strip_term(char* str) {
+@@ -25,6 +25,7 @@
+ */
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <unistd.h>
+ #include <string.h>
+ #include <time.h>
+ #include <fcntl.h>
+@@ -157,7 +158,8 @@ int get_unused_bandwidth() {
+             // Is this our file? Ignore if it is
+             if (!strstr(ds->d_name, ourpid)) {
+                 // Ok, open the file and find the dlrate line
+-                sprintf(fname, "%s/%s", WORKING_FOLDER, ds->d_name);
++		    snprintf(fname, sizeof fname, "%s/%s",
++			WORKING_FOLDER, ds->d_name);
+                 f = fopen(fname, "r");
+                 while (!feof(f)) {
+                     fgets(line, sizeof(line), f);
+@@ -204,7 +206,7 @@ char* strip_term(char* str) {
  // Clears the input file
  void blank_input_file() {
      FILE* f = fopen(infilename, "w");
@@ -11,7 +31,7 @@ $NetBSD: patch-in.ctcs_in.ctcs.c,v 1.1 2014/05/16 15:19:19 hfath Exp $
      fclose(f);
  }
  
-@@ -230,7 +230,7 @@ void update_file() {
+@@ -230,7 +232,7 @@ void update_file() {
  
      lastfile = time(NULL);
      FILE* f = fopen(filename, "w");
diff --git a/inetdxtra/patches/patch-in.dhcp_in.dhcp.c b/inetdxtra/patches/patch-in.dhcp_in.dhcp.c
index 354dfb73dc..69d5b75759 100644
--- a/inetdxtra/patches/patch-in.dhcp_in.dhcp.c
+++ b/inetdxtra/patches/patch-in.dhcp_in.dhcp.c
@@ -1,20 +1,30 @@
-$NetBSD: patch-in.dhcp_in.dhcp.c,v 1.1 2014/05/16 15:19:19 hfath Exp $
+$NetBSD$
 
---- in.dhcp/in.dhcp.c.orig	2011-01-13 15:53:56.000000000 +0000
+Add missing header #includes
+Respect PKG_SYSCONFDIR
+Socket functions generally expect sockaddr, not sockaddr_in 
+
+--- in.dhcp/in.dhcp.c.orig	2013-04-26 20:00:10.000000000 +0000
 +++ in.dhcp/in.dhcp.c
-@@ -32,7 +32,11 @@
+@@ -29,10 +29,17 @@
+ #include <stdio.h>
+ #include <stdint.h>
+ #include <stdlib.h>
++#include <unistd.h>
++#include <ctype.h>
  #include <string.h>
  #include <netdb.h>
  #include <netinet/in.h>
 +#include <net/if.h>
 +#include <netinet/if_ether.h>
++#include <arpa/inet.h>
 +#if defined(__LINUX__)
  #include <netinet/ether.h>
 +#endif
  
  #ifdef LOGGING
  #include <syslog.h>
-@@ -42,7 +46,7 @@
+@@ -42,7 +49,7 @@
  #include <syslog.h>
  #endif
  
@@ -23,7 +33,7 @@ $NetBSD: patch-in.dhcp_in.dhcp.c,v 1.1 2014/05/16 15:19:19 hfath Exp $
  #define LEASES "/tmp/in.dhcp.leases.%s"
  #define INBOUND_PACKET "/tmp/in.dhcp.in"
  #define OUTBOUND_PACKET "/tmp/in.dhcp.out"
-@@ -190,7 +194,7 @@ uint8_t dhcp_message_type;
+@@ -190,7 +197,7 @@ uint8_t dhcp_message_type;
  char clientmacstr[30];
  
  // Socket gubbins
@@ -32,3 +42,29 @@ $NetBSD: patch-in.dhcp_in.dhcp.c,v 1.1 2014/05/16 15:19:19 hfath Exp $
  socklen_t fromlen;
  
  // Options we've already set, so we know to ignore
+@@ -230,7 +237,6 @@ int recv_data() {
+ // Converts an IP address to a 4 byte array and adds
+ // it to our packet. Returns the length.
+ int addip(unsigned char* p, char* ip) {
+-    int i;
+     uint32_t add = ntohl(inet_addr(ip));
+     #ifdef LOGGING
+         syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "Converting ASCII IP '%s' to 32-bit int %08X", ip, add);
+@@ -370,7 +376,7 @@ uint32_t get_pool_address() {
+         syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "Assign pool IP %s for MAC %s (%08X)", inet_ntoa(htonl(i)), clientmacstr, i);
+     #endif
+     f = fopen(leasesfile, "a");
+-    fprintf(f, "%s %s\n", inet_ntoa(htonl(i)), clientmacstr);
++    fprintf(f, "%s %s\n", inet_ntoa(inet_makeaddr(htonl(i), 0L)), clientmacstr);
+     fclose(f);
+ 
+     return i;
+@@ -807,7 +813,7 @@ int main(int argc, char** argv) {
+     #endif
+ 
+     #ifdef ONELOG
+-        syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_NOTICE), "%s chaddr=%s yiaddr=%s via=%s", (dhcp_message_type == DHCPDISCOVER ? "DHCPOFFER" : "DHCPACK"), clientmacstr, inet_ntoa(htonl(yiaddr)), (*bindaddress == '\0' ? "255.255.255.255" : bindaddress));
++        syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_NOTICE), "%s chaddr=%s yiaddr=%s via=%s", (dhcp_message_type == DHCPDISCOVER ? "DHCPOFFER" : "DHCPACK"), clientmacstr, inet_ntoa(inet_makeaddr(htonl(yiaddr), 0L)), (*bindaddress == '\0' ? "255.255.255.255" : bindaddress));
+     #endif
+ 
+     #ifdef LOGGING
diff --git a/inetdxtra/patches/patch-in.dns_in.dns.c b/inetdxtra/patches/patch-in.dns_in.dns.c
index ee6f200f78..afd377b3ad 100644
--- a/inetdxtra/patches/patch-in.dns_in.dns.c
+++ b/inetdxtra/patches/patch-in.dns_in.dns.c
@@ -1,4 +1,7 @@
-$NetBSD: patch-in.dns_in.dns.c,v 1.1 2014/05/16 15:19:19 hfath Exp $
+$NetBSD$
+
+Respect PKG_SYSCONFDIR
+Socket functions generally expect sockaddr, not sockaddr_in 
 
 --- in.dns/in.dns.c.orig	2013-05-16 08:26:34.000000000 +0000
 +++ in.dns/in.dns.c
diff --git a/inetdxtra/patches/patch-in.jabberd_in.jabberd.c b/inetdxtra/patches/patch-in.jabberd_in.jabberd.c
index 03f51d4827..1699941383 100644
--- a/inetdxtra/patches/patch-in.jabberd_in.jabberd.c
+++ b/inetdxtra/patches/patch-in.jabberd_in.jabberd.c
@@ -1,9 +1,12 @@
-$NetBSD: patch-in.jabberd_in.jabberd.c,v 1.1 2014/05/16 15:19:19 hfath Exp $
+$NetBSD$
 
---- in.jabberd/in.jabberd.c.orig	2011-01-13 15:53:56.000000000 +0000
+Respect PKG_SYSCONFDIR
+An ANSI C FILE and a unix file number are two kettle of fish. Convert.
+
+--- in.jabberd/in.jabberd.c.orig	2014-09-04 10:54:38.000000000 +0000
 +++ in.jabberd/in.jabberd.c
 @@ -37,7 +37,7 @@
- #define VERSION "200810"
+ #define VERSION "201409"
  #define PROGNAME "in.jabberd"
  #define WORKING_FOLDER "/tmp"
 -#define USER_LIST "/etc/in.jabberd.conf"
diff --git a/inetdxtra/patches/patch-in.mvp_in.mvp.c b/inetdxtra/patches/patch-in.mvp_in.mvp.c
index c3847fd987..a992aa6cd0 100644
--- a/inetdxtra/patches/patch-in.mvp_in.mvp.c
+++ b/inetdxtra/patches/patch-in.mvp_in.mvp.c
@@ -1,4 +1,8 @@
-$NetBSD: patch-in.mvp_in.mvp.c,v 1.1 2014/05/16 15:19:19 hfath Exp $
+$NetBSD$
+
+Socket functions generally expect sockaddr, not sockaddr_in 
+Check for presence of SIOCGIFHWADDR
+Cast sockaddr to sockaddr_in properly before using it with syslog()
 
 --- in.mvp/in.mvp.c.orig	2011-01-13 15:53:56.000000000 +0000
 +++ in.mvp/in.mvp.c
diff --git a/inetdxtra/patches/patch-in.proxy_in.proxy.c b/inetdxtra/patches/patch-in.proxy_in.proxy.c
new file mode 100644
index 0000000000..57bcc41f44
--- /dev/null
+++ b/inetdxtra/patches/patch-in.proxy_in.proxy.c
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Add missing #include
+
+--- in.proxy/in.proxy.c.orig	2013-04-26 20:00:11.000000000 +0000
++++ in.proxy/in.proxy.c
+@@ -26,6 +26,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <unistd.h>
+ #include <string.h>
+ #include <time.h>
+ #include <netinet/in.h>
diff --git a/inetdxtra/patches/patch-in.smtp_in.smtp.c b/inetdxtra/patches/patch-in.smtp_in.smtp.c
new file mode 100644
index 0000000000..77d34b22b3
--- /dev/null
+++ b/inetdxtra/patches/patch-in.smtp_in.smtp.c
@@ -0,0 +1,43 @@
+$NetBSD$
+
+Add missing #include
+Rename local gethostname() to avoid collision
+
+--- in.smtp/in.smtp.c.orig	2013-04-26 20:00:10.000000000 +0000
++++ in.smtp/in.smtp.c
+@@ -28,6 +28,7 @@
+ */
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <unistd.h>
+ #include <string.h>
+ #include <time.h>
+ 
+@@ -176,7 +177,7 @@ int parse_address(char* dest) {
+ }
+ 
+ // Returns the machine's hostname
+-char* gethostname() {
++char* sm_gethostname() {
+     return get_command_output(hostname, "hostname");
+ }
+ 
+@@ -201,7 +202,7 @@ int main(int argc, char** argv) {
+     sprintf(dataname, DATA_FILE, getpid());
+ 
+     // Send our greeting first
+-    printf("220 %s SMTP in.smtp (%s)\n", gethostname(), getostype());
++    printf("220 %s SMTP in.smtp (%s)\n", sm_gethostname(), getostype());
+     fflush(stdout);
+ 
+     // SMTP is a 3 stage protocol, the phase tells us where we're
+@@ -226,7 +227,8 @@ int main(int argc, char** argv) {
+                 printf("250 Hello %s\n", helo);
+                 fflush(stdout);
+                 // Pre-generate our received header
+-                sprintf(recheader, "Received: from %s by %s ; %s\r\n", helo, gethostname(), get_date_time());
++                sprintf(recheader, "Received: from %s by %s ; %s\r\n",
++		    helo, sm_gethostname(), get_date_time());
+                 phase++;
+             }
+ 
diff --git a/inetdxtra/patches/patch-in.www_in.www.c b/inetdxtra/patches/patch-in.www_in.www.c
index d89d559a47..e608e35178 100644
--- a/inetdxtra/patches/patch-in.www_in.www.c
+++ b/inetdxtra/patches/patch-in.www_in.www.c
@@ -1,4 +1,6 @@
-$NetBSD: patch-in.www_in.www.c,v 1.1 2014/05/16 15:19:19 hfath Exp $
+$NetBSD$
+
+Add missing #include
 
 --- in.www/in.www.c.orig	2011-01-13 15:53:56.000000000 +0000
 +++ in.www/in.www.c


Home | Main Index | Thread Index | Old Index