Attachment #42373 for bug #66090

View | Details | Raw Unified | Return to bug 66090
Collapse All | Expand All




#

PORTNAME=	nn
PORTVERSION=	6.6.5
PORTREVISION=	2
CATEGORIES=	news
MASTER_SITES=	ftp://ftp.nndev.org/pub/nn-6.6/%SUBDIR%/
MASTER_SITE_SUBDIR=	. old

MAN8=		nnmaster.8 nnspew.8

.include <bsd.port.pre.mk>

.if ${OSVERSION} >= 501000
BROKEN=		"Does not compile"
.endif

pre-patch:
	@${CP} ${WRKSRC}/config.h-dist ${WRKSRC}/config.h.unparsed

Lines 1-2 Link Here

(-)/usr/ports/news/nn/distinfo (-2 / +2 lines)
1	MD5 (nn-6.6.2.tar.Z) = 527cb8fb6410170bd53d09c2767329ac	1	MD5 (nn-6.6.5.tar.Z) = 90761c1325a82a729f668e8a2c364845
2	SIZE (nn-6.6.2.tar.Z) = 830437	2	SIZE (nn-6.6.5.tar.Z) = 826135

Lines 1-9 Link Here

(-)/usr/ports/news/nn/files/patch-ab (-2 / +2 lines)
1	--- chset.c.orig Tue Jan 25 09:33:52 2000	1	--- chset.c.orig Tue Jan 25 09:33:52 2000
2	+++ chset.c Tue Jan 25 09:34:51 2000	2	+++ chset.c Wed Apr 28 17:47:59 2004
3	@@ -18,6 +18,7 @@	3	@@ -18,6 +18,7 @@
4	"iso-8859-7", 8,
5	"iso-8859-8", 8,	4	"iso-8859-8", 8,
6	"iso-8859-9", 8,	5	"iso-8859-9", 8,
		6	"iso-8859-15", 8,
7	+ "koi8-r", 8,	7	+ "koi8-r", 8,
8	"unknown", 0,	8	"unknown", 0,
9	NULL, 0,	9	NULL, 0,




--- Makefile.orig	Thu Feb  7 22:14:41 2002
+++ Makefile	Wed Apr 28 17:47:59 2004
@@ -18,16 +18,17 @@
 #
 # Use /lib/cpp or /usr/ccs/lib/cpp for CPP on Solaris or SVR4 machines.
 
-CC =		cc
+CC ?=		cc
 
 CPP =		$(CC) -E
 #CPP =		/lib/cpp
 #CPP =		/usr/bin/cpp -no-cpp-precomp	# for MacOS X
 
-CFLAGS =	-O # -g -Wall -ansi -pedantic
+#CFLAGS =	-O # -g -Wall -ansi -pedantic
 #CFLAGS =	-O # -w0 -g3			# for DEC
+LDFLAGS =	-s
 
 #-Waggregate-return -Wmissing-prototypes -Wnested-externs
-#LDFLAGS =	-s # -lmalloc # /usr/local/lib/malloc-debug/libmalloc.a
-MAKE =		make
+#MAKE =		make
 
 
 SHELL = /bin/sh
@@ -63,6 +64,7 @@
 	    -e 's/^        /	/' \
 	    -e '/^[ \f	]$$/d' \
 	    -e '/^[ \/]*[*]/d' | \
+	    unexpand | \
 	sed -n -e '/^..*$$/p' > ymakefile
 	rm -f MF.c
 
@@ -97,3 +99,5 @@
 man/nn.1.D: man/nn.1
 	sh SPLITNN1
 

Lines 1-11 Link Here

(-)/usr/ports/news/nn/files/patch-aj (-11 lines)
1	--- xmakefile.orig Fri Dec 7 07:06:27 2001
2	+++ xmakefile Fri Dec 7 07:06:38 2001
3	@@ -65,7 +65,7 @@
4	* Notice: ymakefile is made from xmakefile by the Makefile.
5	*
6
7	-#ifndef DOMAIN
8	+#ifndef DOMAIN_FILE
9	CC = YOU_BLEW_IT READ_THE_INSTRUCTIONS_AGAIN
10	#else
11	CC = COMPILER




--- nntp.c.orig	Sat Jan 25 00:10:39 2003
+++ nntp.c	Wed Apr 28 17:47:59 2004
@@ -39,6 +39,7 @@
 #include <errno.h>
 #include <pwd.h>
 #include <ctype.h>

 
 #ifdef NOV
 #include "hash.h"
@@ -63,6 +64,7 @@
 static int	connect_server(void);
 static void debug_msg __APROTO((char *prefix, char *str));
 static void io_error __APROTO((void));
 static void find_server __APROTO((void));
+char *find_domain __APROTO((char *domainFile));
 static int get_server_line __APROTO((char *string, int size));
 static int get_server __APROTO((char *string, int size));
 static int get_socket __APROTO((void));
@@ -212,6 +214,50 @@
     sys_error("Failed to find name of NNTP server!");
 }
 
+
+/*
+ * find_domain		Get the domain name for posting from a named file.
+ *			Handle blank lines and comments.
+ *

+ */
+
+char *
+find_domain(char *domainFile)
+char	*domainFile;
+{
+	register FILE	*fp;
+	register char	*cp;

+	return (NULL);
+}
+
+
 /*
  * get_server_line: get a line from the server.
  *
@@ -1415,15 +1461,24 @@
 gen_frompath()
 {
 	struct	passwd *passwd;
 	default:
-	    nn_exitmsg(1, line);
+	    nn_exitmsg(1, "%s", line);
 	    /* NOTREACHED */
 	}
     }
@@ -1726,7 +1771,7 @@
  * Phil Lapsley <phil@ucbvax.berkeley.edu>
  */
 
-static char    host_name[256];
+static char    host_name[MAXHOSTNAMELEN];
 
 /*
  * gen_frompath -- generate From: and Path: lines, in the form
@@ -1745,6 +1790,7 @@
 #ifndef HIDDENNET
 	char	*cp;
 #endif
+	char	*domain;
+	char	*fromFormat = "From: <%s@%s>\r\n";
 
 	fprintf(nntp_out, "From: ");
 	passwd = getpwuid(getuid());
 
 	fprintf(nntp_out, "From: ");
 	fprintf(nntp_out, "%s ", full_name());
 
-	fprintf(nntp_out, "<%s@%s>\r\n",
-		passwd->pw_name,
-		domain);
+	domain = find_domain(DOMAIN_FILE);
+	if (domain == NULL) {
+		fprintf(nntp_out, fromFormat,
+			passwd->pw_name,
+			host_name);
+	} else {
+		fprintf(nntp_out, fromFormat,
+			passwd->pw_name,
+			domain);
+	}
 
 #ifdef HIDDENNET
 	/* Only the login name - nntp server will add uucp name */




--- global.c.orig	Mon Jun 10 10:29:25 2002
+++ global.c	Mon Jun 10 10:30:51 2002
@@ -585,20 +585,20 @@
     off_t len1, len2;
 
     if ((fd1 = open(work, O_RDONLY, 0)) < 0) {
-	nn_exitmsg("%s %s", work, strerror(errno));
+	msg("%s %s", work, strerror(errno));
 	return(2);
     }
     if ((fd2 = open(copy, O_RDONLY, 0)) < 0) {
-	nn_exitmsg("%s %s", copy, strerror(errno));
+	msg("%s %s", copy, strerror(errno));
 	return(2);
     }
 
     if (fstat(fd1, &sb1)) {
-	nn_exitmsg("%s %s", work, strerror(errno));
+	msg("%s %s", work, strerror(errno));
 	return(2);
     }
     if (fstat(fd2, &sb2)) {
-	nn_exitmsg("%s %s", copy, strerror(errno));
+	msg("%s %s", copy, strerror(errno));
 	return(2);
     }
 

Return to bug 66090

Lines 6-13 Link Here

(-)/usr/ports/news/nn/Makefile (-6 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= nn	8	PORTNAME= nn
9	PORTVERSION= 6.6.2	9	PORTVERSION= 6.6.5
10	PORTREVISION= 2
11	CATEGORIES= news	10	CATEGORIES= news
12	MASTER_SITES= ftp://ftp.nndev.org/pub/nn-6.6/%SUBDIR%/	11	MASTER_SITES= ftp://ftp.nndev.org/pub/nn-6.6/%SUBDIR%/
13	MASTER_SITE_SUBDIR= . old	12	MASTER_SITE_SUBDIR= . old
Lines 23-32 Link Here
23	MAN8= nnmaster.8 nnspew.8	22	MAN8= nnmaster.8 nnspew.8
24		23
25	.include <bsd.port.pre.mk>	24	.include <bsd.port.pre.mk>
26
27	.if ${OSVERSION} >= 501000
28	BROKEN= "Does not compile"
29	.endif
30		25
31	pre-patch:	26	pre-patch:
32	@${CP} ${WRKSRC}/config.h-dist ${WRKSRC}/config.h.unparsed	27	@${CP} ${WRKSRC}/config.h-dist ${WRKSRC}/config.h.unparsed

Lines 1-35 Link Here

(-)/usr/ports/news/nn/files/patch-ag (-15 / +15 lines)
1	--- Makefile.orig Mon Jul 2 06:54:34 2001	1	--- Makefile.orig Thu Feb 7 22:14:41 2002
2	+++ Makefile Sun Oct 27 16:54:54 2002	2	+++ Makefile Wed Apr 28 17:47:59 2004
3	@@ -18,17 +18,16 @@	3	@@ -18,16 +18,17 @@
4	#	4	#
5	# Use /lib/cpp or /usr/ccs/lib/cpp for CPP on Solaris or SVR4 machines.	5	# Use /lib/cpp or /usr/ccs/lib/cpp for CPP on Solaris or SVR4 machines.
6		6
7	-CC = gcc	7	-CC = cc
8	+CC ?= gcc	8	+CC ?= cc
		9
9	CPP = $(CC) -E	10	CPP = $(CC) -E
10	#CPP = /lib/cpp	11	#CPP = /lib/cpp
11	#CFLAGS = -O2 # -g # -I/usr/local/lib/malloc-debug -DMALLOC_FUNC_CHECK	12	#CPP = /usr/bin/cpp -no-cpp-precomp # for MacOS X
		13
12	-CFLAGS = -O # -g -Wall -ansi -pedantic	14	-CFLAGS = -O # -g -Wall -ansi -pedantic
13	+#CFLAGS = -O # -g -Wall -ansi -pedantic	15	+#CFLAGS = -O # -g -Wall -ansi -pedantic
14	#-Wall -Wcomment \	16	#CFLAGS = -O # -w0 -g3 # for DEC
15	#-Wtraditional -Wshadow \	17	+LDFLAGS = -s
16	#-Wpointer-arith -Wcast-qual -Wcast-align -Wconversion \	18
17	#-Waggregate-return -Wmissing-prototypes -Wnested-externs
18	-#LDFLAGS = -s # -lmalloc # /usr/local/lib/malloc-debug/libmalloc.a
19	-MAKE = make	19	-MAKE = make
20	+LDFLAGS = -s # -lmalloc # /usr/local/lib/malloc-debug/libmalloc.a	20	+#MAKE = make
21		21
22		22
23	SHELL = /bin/sh	23	SHELL = /bin/sh
24	@@ -63,6 +62,7 @@	24	@@ -63,6 +64,7 @@
25	-e '/^#/d' \	25	-e 's/^ / /' \
26	-e '/^[ \f ]$$/d' \	26	-e '/^[ \f ]$$/d' \
27	-e '/^[ \/][]/d' \| \	27	-e '/^[ \/][]/d' \| \
28	+ unexpand \| \	28	+ unexpand \| \
29	sed -n -e '/^..*$$/p' > ymakefile	29	sed -n -e '/^..*$$/p' > ymakefile
30	rm -f MF.c	30	rm -f MF.c
31		31
32	@@ -97,3 +97,5 @@	32	@@ -97,3 +99,5 @@
33	man/nn.1.D: man/nn.1	33	man/nn.1.D: man/nn.1
34	sh SPLITNN1	34	sh SPLITNN1
35		35

Lines 1-6 Link Here

(-)/usr/ports/news/nn/files/patch-an (-45 / +29 lines)
1	--- nntp.c.orig Tue Oct 9 11:39:11 2001	1	--- nntp.c.orig Sat Jan 25 00:10:39 2003
2	+++ nntp.c Mon Jun 10 10:15:02 2002	2	+++ nntp.c Wed Apr 28 17:47:59 2004
3	@@ -37,6 +37,7 @@	3	@@ -39,6 +39,7 @@
4	#include <errno.h>	4	#include <errno.h>
5	#include <pwd.h>	5	#include <pwd.h>
6	#include <ctype.h>	6	#include <ctype.h>
Lines 8-25 Link Here
8		8
9	#ifdef NOV	9	#ifdef NOV
10	#include "hash.h"	10	#include "hash.h"
11	@@ -88,6 +89,7 @@	11	@@ -63,6 +64,7 @@
		12	static int connect_server(void);
12	static void debug_msg __APROTO((char prefix, char str));	13	static void debug_msg __APROTO((char prefix, char str));
13	static void io_error __APROTO((void));
14	static void find_server __APROTO((void));	14	static void find_server __APROTO((void));
15	+char * find_domain(char *domainFile);	15	+char find_domain __APROTO((char domainFile));
16	static int get_server_line __APROTO((char *string, int size));	16	static int get_server_line __APROTO((char *string, int size));
17	static int get_server __APROTO((char *string, int size));	17	static int get_server __APROTO((char *string, int size));
18	static int get_socket __APROTO((void));	18	static int get_socket __APROTO((void));
19	@@ -319,6 +321,49 @@	19	@@ -212,6 +214,50 @@
		20	sys_error("Failed to find name of NNTP server!");
20	}	21	}
21		22
22	/*	23	+
		24	+/*
23	+ * find_domain Get the domain name for posting from a named file.	25	+ * find_domain Get the domain name for posting from a named file.
24	+ * Handle blank lines and comments.	26	+ * Handle blank lines and comments.
25	+ *	27	+ *
Lines 33-40 Link Here
33	+ */	35	+ */
34	+	36	+
35	+char *	37	+char *
36	+find_domain(domainFile)	38	+find_domain(char *domainFile)
37	+char *domainFile;
38	+{	39	+{
39	+ register FILE *fp;	40	+ register FILE *fp;
40	+ register char *cp;	41	+ register char *cp;
Lines 62-113 Link Here
62	+ return (NULL);	63	+ return (NULL);
63	+}	64	+}
64	+	65	+
65	+/*	66	+
		67	/*
66	* get_server_line: get a line from the server.	68	* get_server_line: get a line from the server.
67	*	69	*
68	* Expects to be connected to the server.	70	@@ -1415,15 +1461,24 @@
69	@@ -634,7 +679,7 @@	71	gen_frompath()
70	can_post = 0;	72	{
71	break;	73	struct passwd *passwd;
72	default:
73	- nn_exitmsg(1, line);
74	+ nn_exitmsg(1, "%s", line);
75	/* NOTREACHED */
76	}
77	}
78	@@ -1726,7 +1771,7 @@
79	* Phil Lapsley <phil@ucbvax.berkeley.edu>
80	*/
81
82	-static char host_name[256];
83	+static char host_name[MAXHOSTNAMELEN];
84
85	/*
86	* gen_frompath -- generate From: and Path: lines, in the form
87	@@ -1745,6 +1790,7 @@
88	#ifndef HIDDENNET
89	char *cp;
90	#endif
91	+ char *domain;	74	+ char *domain;
		75	+ char *fromFormat = "From: <%s@%s>\r\n";
92		76
93	fprintf(nntp_out, "From: ");
94	passwd = getpwuid(getuid());	77	passwd = getpwuid(getuid());
95	@@ -1772,9 +1818,15 @@	78
96	DOMAIN);	79	fprintf(nntp_out, "From: ");
97	#endif /* HIDDENNET */	80	fprintf(nntp_out, "%s ", full_name());
98	#else	81
99	- fprintf(nntp_out, "<%s@%s>\r\n",	82	- fprintf(nntp_out, "<%s@%s>\r\n",
100	- passwd->pw_name,	83	- passwd->pw_name,
101	- host_name);	84	- domain);
102	+ domain = find_domain(DOMAIN_FILE);	85	+ domain = find_domain(DOMAIN_FILE);
103	+ if (domain == NULL)	86	+ if (domain == NULL) {
104	+ fprintf(nntp_out, "From: <%s@%s>\r\n",	87	+ fprintf(nntp_out, fromFormat,
105	+ passwd->pw_name,	88	+ passwd->pw_name,
106	+ host_name);	89	+ host_name);
107	+ else	90	+ } else {
108	+ fprintf(nntp_out, "From: <%s@%s>\r\n",	91	+ fprintf(nntp_out, fromFormat,
109	+ passwd->pw_name,	92	+ passwd->pw_name,
110	+ domain);	93	+ domain);
111	#endif	94	+ }
112		95
113	#ifdef HIDDENNET	96	#ifdef HIDDENNET
		97	/* Only the login name - nntp server will add uucp name */

Lines 1-27 Link Here

(-)/usr/ports/news/nn/files/patch-global.c (-27 lines)
1	--- global.c.orig Mon Jun 10 10:29:25 2002
2	+++ global.c Mon Jun 10 10:30:51 2002
3	@@ -585,20 +585,20 @@
4	off_t len1, len2;
5
6	if ((fd1 = open(work, O_RDONLY, 0)) < 0) {
7	- nn_exitmsg("%s %s", work, strerror(errno));
8	+ msg("%s %s", work, strerror(errno));
9	return(2);
10	}
11	if ((fd2 = open(copy, O_RDONLY, 0)) < 0) {
12	- nn_exitmsg("%s %s", copy, strerror(errno));
13	+ msg("%s %s", copy, strerror(errno));
14	return(2);
15	}
16
17	if (fstat(fd1, &sb1)) {
18	- nn_exitmsg("%s %s", work, strerror(errno));
19	+ msg("%s %s", work, strerror(errno));
20	return(2);
21	}
22	if (fstat(fd2, &sb2)) {
23	- nn_exitmsg("%s %s", copy, strerror(errno));
24	+ msg("%s %s", copy, strerror(errno));
25	return(2);
26	}
27