update to leafnode 1.9.53

from rohee@
This commit is contained in:
sturm 2004-05-07 20:46:59 +00:00
parent a7025b0df8
commit 7b7969da6f
8 changed files with 28 additions and 90 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.31 2004/01/12 21:33:12 sturm Exp $
# $OpenBSD: Makefile,v 1.32 2004/05/07 20:46:59 sturm Exp $
COMMENT= "USENET software package designed for small sites"
VERSION= 1.9.49
VERSION= 1.9.53
DISTNAME= leafnode-${VERSION}.rel
PKGNAME= leafnode-${VERSION}
CATEGORIES= news
@ -26,6 +26,7 @@ CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --localstatedir=/var
CONFIGURE_ARGS+= --with-lockfile=/var/spool/news/fetchnews.lck
CONFIGURE_ARGS+= --with-ipv6
CONFIGURE_ARGS+= --with-user=_news
DOCS= README README-FQDN INSTALL FAQ.txt

View File

@ -1,3 +1,3 @@
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
MD5 (leafnode-1.9.53.rel.tar.bz2) = 79c3b65ded9dbf86b065d79ae98a5211
RMD160 (leafnode-1.9.53.rel.tar.bz2) = 595c42fda0be6aa7de031fe89b2d9946eaa9445a
SHA1 (leafnode-1.9.53.rel.tar.bz2) = d40cac9987abd27410b1761fc1c73794a3125195

View File

@ -1,7 +1,7 @@
--- INSTALL.orig Tue Oct 7 12:48:18 2003
+++ INSTALL Thu Oct 30 21:13:11 2003
@@ -26,7 +26,7 @@
the lock file (defaults to leaf.node/lock.file below the spooldir).
--- INSTALL.orig 2004-03-25 11:25:08.000000000 +0100
+++ INSTALL 2004-04-20 07:43:23.000000000 +0200
@@ -37,7 +37,7 @@
## user is in.)
NOTE: DO MAKE SURE that the lock file is in a directory that is writable by
- the user "news". Leafnode will have dropped root privileges when it tries
@ -9,7 +9,7 @@
to obtain the lock file, and it needs write access. The new default (as of
1.9.37) should be fine in most cases.
@@ -47,16 +47,16 @@
@@ -58,16 +58,16 @@
All tests must pass, otherwise, ask on the leafnode mailing list for help.
@ -29,7 +29,7 @@
newaliases.
@@ -108,12 +108,12 @@
@@ -119,12 +119,12 @@
discarded at the upstream server, posts being discarded when Message-IDs of
different postings clash and other troubles.
@ -44,7 +44,7 @@
line. Substituting "1" for the third "*", thus:
0 4 * * 1 /usr/local/sbin/texpire
@@ -122,9 +122,9 @@
@@ -133,9 +133,9 @@
details.
9. Make sure fetchnews is run at the appropriate time. If you have a
@ -56,7 +56,7 @@
probably run fetchnews from /etc/ppp/ip-up.local or /etc/ppp/ip-up.
10. (as root) Edit /etc/hosts.deny to add a line:
@@ -172,11 +172,10 @@
@@ -183,11 +183,10 @@
incoming NNTP connections. Here is my inetd.conf line (insert it at the
leftmost column, without leading spaces!):
@ -70,7 +70,7 @@
Using leafnode without tcpd is not supported and opens your computer to
abuse (even happens on modem lines that are only connected during the
@@ -214,7 +213,7 @@
@@ -225,7 +224,7 @@
socket_type = stream
protocol = tcp
wait = no
@ -79,7 +79,7 @@
server = /usr/sbin/tcpd
server_args = /usr/local/sbin/leafnode
instances = 7
@@ -280,7 +279,7 @@
@@ -291,7 +290,7 @@
#! /bin/sh
exec 2>&1
exec /usr/local/bin/tcpserver -c10 -l0 -H -v 127.0.0.1 119 \
@ -88,7 +88,7 @@
/usr/local/sbin/leafnode
You may need to adjust the paths if your software is in a non-standard
@@ -296,7 +295,7 @@
@@ -307,7 +306,7 @@
exec 2>&1
exec /usr/local/bin/tcpserver -c10 -l0 -H -v -x nntp.cdb \
127.0.0.1 119 \
@ -97,7 +97,7 @@
As above, adjust the paths and the IP.
@@ -331,7 +330,7 @@
@@ -342,7 +341,7 @@
svscan should notice the new leafnode service within 5 seconds and
start it.
@ -106,7 +106,7 @@
fetchnews reads a list of all newsgroups from your upstream server. With
an 28.8 modem, it can take as long as 60 minutes (depending on how many
newsgroups your provider offers). To see fetchnews working, run it with
@@ -358,7 +357,7 @@
@@ -369,7 +368,7 @@
After this, you should have empty files in
/var/spool/news/interesting.groups/ for every group you want to read.

View File

@ -1,19 +1,17 @@
$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
--- Makefile.in.orig Tue Apr 20 07:40:25 2004
+++ Makefile.in Tue Apr 20 07:42:01 2004
@@ -1358,14 +1358,7 @@ install-data-hook: amiroot
set -e ; for i in . leaf.node failed.postings interesting.groups \
out.going message.id temp.files ; do \
mkdir -p $(DESTDIR)$(SPOOLDIR)/$$i ; \
- if ./amiroot ; then \
- chown news:news $(DESTDIR)$(SPOOLDIR)/$$i ; \
- chown @NEWS_USER@:@NEWS_GROUP@ $(DESTDIR)$(SPOOLDIR)/$$i ; \
- chmod 2775 $(DESTDIR)$(SPOOLDIR)/$$i ; fi ; \
done
- d="`dirname $(DESTDIR)@LOCKFILE@`" ; mkdir -p "$${d}" && \
- if ./amiroot ; then \
- chown news:news "$${d}" ; \
- chown @NEWS_USER@:@NEWS_GROUP@ "$${d}" ; \
- chmod 2775 "$${d}" ; fi
- ./quickmkdir $(DESTDIR)
uninstall-local:
rm -rf $(DESTDIR)$(SPOOLDIR) $(DESTDIR)@LOCKFILE@

View File

@ -1,7 +1,7 @@
$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
$OpenBSD: patch-configure,v 1.5 2004/05/07 20:46:59 sturm Exp $
--- configure.orig 2004-04-03 18:57:06.000000000 +0200
+++ configure 2004-04-20 07:43:23.000000000 +0200
@@ -1826,7 +1826,7 @@ echo "$as_me: WARNING: *** use --sysconf
echo "$as_me: WARNING: ***" >&2;}
sleep 1
fi

View File

@ -1,12 +0,0 @@
$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 */

View File

@ -1,35 +0,0 @@
$OpenBSD: patch-miscutil_c,v 1.2 2003/11/08 21:55:50 sturm Exp $
--- miscutil.c.orig 2003-10-14 20:46:47.000000000 +0200
+++ miscutil.c 2003-10-30 21:07:40.000000000 +0100
@@ -107,9 +107,9 @@ initvars(char *progname)
}
#ifndef TESTMODE
- pw = getpwnam("news");
+ pw = getpwnam("_news");
if (!pw) {
- fprintf(stderr, "no such user: news\n");
+ fprintf(stderr, "no such user: _news\n");
return FALSE;
}
#endif
@@ -130,7 +130,7 @@ initvars(char *progname)
|| st.st_uid != pw->pw_uid
#endif
) {
- fprintf(stderr, "Warning: cannot create %s with proper ownership: %s\nMake sure you run this program as user root or news.\n", s, strerror(e));
+ fprintf(stderr, "Warning: cannot create %s with proper ownership: %s\nMake sure you run this program as user root or _news.\n", s, strerror(e));
syslog(LOG_WARNING, "Warning: cannot create %s with proper ownership: %s", s, strerror(e));
suicide();
}
@@ -153,8 +153,8 @@ initvars(char *progname)
setreuid(pw->pw_uid, pw->pw_uid);
#endif
if (getuid() != pw->pw_uid || getgid() != pw->pw_gid) {
- syslog(LOG_ERR, "%s: must be run as news or root\n", progname);
- fprintf(stderr, "%s: must be run as news or root\n", progname);
+ syslog(LOG_ERR, "%s: must be run as _news or root\n", progname);
+ fprintf(stderr, "%s: must be run as _news or root\n", progname);
endpwent();
return FALSE;
}

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-quickmkdir_c,v 1.1 2003/07/26 13:24:08 sturm Exp $
--- quickmkdir.c.orig Wed Jul 23 09:09:59 2003
+++ quickmkdir.c Wed Jul 23 09:11:44 2003
@@ -51,8 +51,8 @@ main(int argc, char **argv)
const char *prepend;
int i, maxlen;
- if (!(pw = getpwnam("news")))
- die("getpwnam(\"news\")");
+ if (!(pw = getpwnam("_news")))
+ die("getpwnam(\"_news\")");
user = pw->pw_uid;
if (!(gr = getgrnam("news")))
die("getgrnam(\"news\")");