From ff32a0834bd84c938745db97011bc2439e8c63e9 Mon Sep 17 00:00:00 2001 From: sturm Date: Mon, 12 Jan 2004 21:33:12 +0000 Subject: [PATCH] update to leafnode 1.9.49 from rohee@ --- news/leafnode/Makefile | 4 +-- news/leafnode/distinfo | 6 ++-- news/leafnode/patches/patch-Makefile_in | 8 ++--- news/leafnode/patches/patch-configure | 8 ++--- news/leafnode/patches/patch-configutil_c | 12 +++++++ news/leafnode/patches/patch-nntpd_c | 46 ------------------------ 6 files changed, 25 insertions(+), 59 deletions(-) create mode 100644 news/leafnode/patches/patch-configutil_c delete mode 100644 news/leafnode/patches/patch-nntpd_c diff --git a/news/leafnode/Makefile b/news/leafnode/Makefile index 0f74c35396d..792e7180a16 100644 --- a/news/leafnode/Makefile +++ b/news/leafnode/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.30 2003/11/08 21:55:50 sturm Exp $ +# $OpenBSD: Makefile,v 1.31 2004/01/12 21:33:12 sturm Exp $ COMMENT= "USENET software package designed for small sites" -VERSION= 1.9.46 +VERSION= 1.9.49 DISTNAME= leafnode-${VERSION}.rel PKGNAME= leafnode-${VERSION} CATEGORIES= news diff --git a/news/leafnode/distinfo b/news/leafnode/distinfo index 1e4adff8ffe..9a393aaf87a 100644 --- a/news/leafnode/distinfo +++ b/news/leafnode/distinfo @@ -1,3 +1,3 @@ -MD5 (leafnode-1.9.46.rel.tar.bz2) = d756a475c6be11d932ec21a8eb94f2be -RMD160 (leafnode-1.9.46.rel.tar.bz2) = 29fc3f033ca8a548998fd2111eade4044a722690 -SHA1 (leafnode-1.9.46.rel.tar.bz2) = a1112d399f4803db69784c3df336f9dc32ced128 +MD5 (leafnode-1.9.49.rel.tar.bz2) = cbaedb673882d90ee4301dc29728e7dc +RMD160 (leafnode-1.9.49.rel.tar.bz2) = e437671fa3698a6c338f62da41741e79f46110bb +SHA1 (leafnode-1.9.49.rel.tar.bz2) = fbf69b03e6e535ce780ccf542fc75cc0a5913901 diff --git a/news/leafnode/patches/patch-Makefile_in b/news/leafnode/patches/patch-Makefile_in index 7b273996c81..5a273e680e1 100644 --- a/news/leafnode/patches/patch-Makefile_in +++ b/news/leafnode/patches/patch-Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-Makefile_in,v 1.11 2003/11/08 21:55:50 sturm Exp $ ---- Makefile.in.orig 2003-10-30 16:00:28.000000000 +0100 -+++ Makefile.in 2003-10-30 21:07:38.000000000 +0100 -@@ -1378,15 +1378,7 @@ install-data-hook: quickmkdir amiroot +$OpenBSD: patch-Makefile_in,v 1.12 2004/01/12 21:33:12 sturm Exp $ +--- Makefile.in.orig 2004-01-09 17:18:28.000000000 +0100 ++++ Makefile.in 2004-01-12 18:38:27.000000000 +0100 +@@ -1346,15 +1346,7 @@ install-data-hook: quickmkdir amiroot set -e ; for i in . leaf.node failed.postings interesting.groups \ out.going message.id temp.files ; do \ mkdir -p $(DESTDIR)$(SPOOLDIR)/$$i ; \ diff --git a/news/leafnode/patches/patch-configure b/news/leafnode/patches/patch-configure index 8fa72597436..76c2d4a73fd 100644 --- a/news/leafnode/patches/patch-configure +++ b/news/leafnode/patches/patch-configure @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure,v 1.3 2003/11/08 21:55:50 sturm Exp $ ---- configure.orig 2003-10-30 16:00:30.000000000 +0100 -+++ configure 2003-10-30 21:07:39.000000000 +0100 -@@ -1765,7 +1765,7 @@ echo "$as_me: WARNING: *** use --sysconf +$OpenBSD: patch-configure,v 1.4 2004/01/12 21:33:12 sturm Exp $ +--- configure.orig 2004-01-09 17:18:31.000000000 +0100 ++++ configure 2004-01-12 18:38:27.000000000 +0100 +@@ -1818,7 +1818,7 @@ echo "$as_me: WARNING: *** use --sysconf echo "$as_me: WARNING: ***" >&2;} sleep 1 fi diff --git a/news/leafnode/patches/patch-configutil_c b/news/leafnode/patches/patch-configutil_c new file mode 100644 index 00000000000..0a9831fcede --- /dev/null +++ b/news/leafnode/patches/patch-configutil_c @@ -0,0 +1,12 @@ +$OpenBSD: patch-configutil_c,v 1.1 2004/01/12 21:33:12 sturm Exp $ +--- configutil.c.orig 2004-01-12 18:38:47.000000000 +0100 ++++ configutil.c 2004-01-12 18:39:03.000000000 +0100 +@@ -484,7 +484,7 @@ readconfig(int logtostderr) + debug = debugmode; + + if (!newsadmin) { +- const char t[] = "news@"; ++ const char t[] = "_news@"; + newsadmin = critmalloc(strlen(fqdn) + strlen(t) + 1, "readconfig"); + strcpy(newsadmin, t); /* RATS: ignore */ + strcat(newsadmin, fqdn); /* RATS: ignore */ diff --git a/news/leafnode/patches/patch-nntpd_c b/news/leafnode/patches/patch-nntpd_c deleted file mode 100644 index 6b8b8fa20d4..00000000000 --- a/news/leafnode/patches/patch-nntpd_c +++ /dev/null @@ -1,46 +0,0 @@ -$OpenBSD: patch-nntpd_c,v 1.3 2003/07/26 13:24:08 sturm Exp $ ---- nntpd.c.orig Wed Jul 23 09:08:24 2003 -+++ nntpd.c Wed Jul 23 09:09:54 2003 -@@ -294,7 +294,7 @@ buildpseudoart(const char *grp) - - fprintf(f, "Path: %s\n", fqdn); - fprintf(f, "Newsgroups: %s\n", grp); -- fprintf(f, "From: Leafnode \n", fqdn); -+ fprintf(f, "From: Leafnode <_news@%s>\n", fqdn); - fprintf(f, "Subject: Leafnode placeholder for group %s\n", grp); - fprintf(f, "Date: %s\n", rfctime()); - fprintf(f, "Message-ID: \n", grp, fqdn); -@@ -838,7 +838,7 @@ list(struct newsgroup *g, int what, cons - printf("%s\t%s\r\n", g->name, g->desc ? g->desc : "-x-"); - break; - case 2: -- printf("%s %lu news@%s\r\n", g->name, (unsigned long)g->age, fqdn); -+ printf("%s %lu _news@%s\r\n", g->name, (unsigned long)g->age, fqdn); - break; - default: - break; -@@ -1469,7 +1469,7 @@ doxhdr(char *arg) - if (n == 0) /* Subject: */ - printf("Leafnode placeholder for group %s\r\n", group->name); - else if (n == 1) /* From: */ -- printf("Leafnode \r\n", fqdn); -+ printf("Leafnode <_news@%s>\r\n", fqdn); - else if (n == 2) /* Date: */ - printf("%s\r\n", rfctime()); - else if (n == 3) /* Message-ID: */ -@@ -1657,13 +1657,13 @@ doxover(char *arg) - "postings %lu-%lu:", group->first, group->first); - printf("%lu\t" - "Leafnode placeholder for group %s\t" -- "news@%s (Leafnode)\t%s\t" -+ "_news@%s (Leafnode)\t%s\t" - "\t\t1000\t40\r\n", group->first, - group->name, fqdn, rfctime(), group->name, fqdn); - printf(".\r\n"); - if (debugmode) - syslog(LOG_DEBUG, ">%lu\tLeafnode placeholder for group %s\t" -- "news@%s (Leafnode)\t%s\t\t\t1000\t40", -+ "_news@%s (Leafnode)\t%s\t\t\t1000\t40", - group->first, group->name, fqdn, rfctime(), group->name, fqdn); - } - }