cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to version 1.9; Bob Pepin <bob@sendar.prophecy.lu>

Browse Source
This commit is contained in:
marc 1999-02-21 20:26:35 +00:00
parent 4bd5b09bc8
commit 719ba1c426
8 changed files with 110 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
news/leafnode/Makefile
View File

@ -1,12 +1,12 @@
# OpenBSD makefile for: leafnode # OpenBSD makefile for: leafnode
# Version required: 1.8.1 # Version required: 1.9
# Date created: 13 Jan 1999 # Date created: 13 Jan 1999
# Whom: Bob Pepin # Whom: Bob Pepin
# #
# $OpenBSD: Makefile,v 1.3 1999/01/31 01:38:06 marc Exp $ # $OpenBSD: Makefile,v 1.4 1999/02/21 20:26:35 marc Exp $
# #
DISTNAME= leafnode-1.8.1 DISTNAME= leafnode-1.9
CATEGORIES= news CATEGORIES= news
MAINTAINER= bob@prophecy.lu MAINTAINER= bob@prophecy.lu
@ -14,6 +14,9 @@ MAINTAINER= bob@prophecy.lu
MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= system/news/transport MASTER_SITE_SUBDIR= system/news/transport
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --sysconfdir=/etc/leafnode --localstatedir=/var
.include <bsd.port.mk> .include <bsd.port.mk>
update: install update: install

2
news/leafnode/files/md5
View File

@ -1 +1 @@
MD5 (leafnode-1.8.1.tar.gz) = 97d429c3d4ba49aef035a0a833bacd5c MD5 (leafnode-1.9.tar.gz) = 82bccb1d6e56894448d23e1f4876bdc6

115
news/leafnode/patches/patch-aa
View File

@ -1,31 +1,19 @@
--- Makefile.orig Fri Jan 8 22:27:53 1999 --- Makefile.in.orig Mon Feb 15 18:23:31 1999
+++ Makefile Wed Jan 13 20:14:31 1999 +++ Makefile.in Mon Feb 15 18:26:59 1999
@@ -6,7 +6,7 @@ @@ -24,8 +24,10 @@
CFLAGS = $(DEBUG)
LIBS =
# LIBS = -lnsl -lsocket # for Solaris 2.6
-PREFIX_USR = /usr/local
+PREFIX_USR = $(PREFIX)
PREFIX_VAR = /var
USRDIR = $(PREFIX_USR)/bin
BINDIR = $(PREFIX_USR)/sbin BINDIR = $(PREFIX_USR)/sbin
@@ -18,11 +18,13 @@ MANDIR = $(PREFIX_USR)/man
# SPOOLDIR = $(PREFIX_VAR)/spool/news
# this is the directory where the configuration and group information is -LIBDIR = /usr/lib/leafnode
# kept. It should preferably not be on the same partition as spooldir
-LIBDIR = /usr/lib/leafnode
+LIBDIR = $(PREFIX_USR)/lib/leafnode
+ETCDIR = /etc/leafnode
#
# This is the lock file for fetch. The normal locations for such lock
# files are /var/run or /var/lock.
-LOCKFILE = "/var/lock/news/fetch.lck" -LOCKFILE = "/var/lock/news/fetch.lck"
+LOCKDIR = $(PREFIX_VAR)/run/news +LIBDIR = $(PREFIX_USR)/share/doc/leafnode
+LOCKFILE = $(LOCKDIR)/fetch.lck +ETCDIR = @sysconfdir@
+LOCKDIR = "$(PREFIX_VAR)/run/news"
+LOCKFILE = "$(LOCKDIR)/fetch.lck"
LIBFILES = nntputil.o configutil.o xoverutil.o activutil.o miscutil.o \ # RPM crap
artutil.o filterutil.o RPM = @RPM@
@@ -66,28 +68,24 @@ @@ -96,50 +98,56 @@
config.o: config.c Makefile config.o: config.c Makefile
$(CC) -c -DSPOOLDIR=\"$(SPOOLDIR)\" \ $(CC) -c -DSPOOLDIR=\"$(SPOOLDIR)\" \
@ -35,54 +23,73 @@
-DLOCKFILE=\"$(LOCKFILE)\" \ -DLOCKFILE=\"$(LOCKFILE)\" \
-DVERSION=\"$(VERSION)\" $< -DVERSION=\"$(VERSION)\" $<
install: nntpd fetch texpire checkgroups install: liblnutil.a nntpd fetch texpire checkgroups applyfilter newsq
- install -d -o root -g root -m 755 $(MANDIR)/man1 - $(INSTALL) -d -o root -g root -m 755 $(MANDIR)/man1
- install -d -o root -g root -m 755 $(MANDIR)/man8 - $(INSTALL) -d -o root -g root -m 755 $(MANDIR)/man8
- install -d -o root -g bin -m 755 $(BINDIR) - $(INSTALL) -d -o root -g bin -m 755 $(BINDIR)
install -g news -m 750 -o news -s nntpd $(BINDIR)/leafnode $(INSTALL) -c -g news -m 750 -o news $(STRIP) nntpd $(BINDIR)/leafnode
install -g news -m 750 -o news -s fetch $(BINDIR)/fetch $(INSTALL) -c -g news -m 750 -o news $(STRIP) fetch $(BINDIR)/fetch
install -g news -m 750 -o news -s texpire $(BINDIR)/texpire $(INSTALL) -c -g news -m 750 -o news $(STRIP) texpire $(BINDIR)/texpire
install -g news -m 750 -o news -s checkgroups $(BINDIR)/checkgroups $(INSTALL) -c -g news -m 750 -o news $(STRIP) checkgroups $(BINDIR)/checkgroups
- install -g news -m 750 -o news -s newsq $(USRDIR)/newsq $(INSTALL) -c -g news -m 750 -o news $(STRIP) applyfilter $(BINDIR)/applyfilter
$(INSTALL) -c -g news -m 755 -o news $(STRIP) newsq $(USRDIR)/newsq
- cp *.8 $(MANDIR)/man8 - cp *.8 $(MANDIR)/man8
- cp *.1 $(MANDIR)/man1 - cp *.1 $(MANDIR)/man1
- -mkdir -p `dirname $(LOCKFILE)` - -mkdir -p `dirname $(LOCKFILE)`
- chown news.news `dirname $(LOCKFILE)`
- -mkdir -p $(SPOOLDIR) $(LIBDIR) - -mkdir -p $(SPOOLDIR) $(LIBDIR)
+ install -g news -m 750 -o news newsq $(USRDIR)/newsq
+ $(BSD_INSTALL_MAN) *.8 $(MANDIR)/man8 + $(BSD_INSTALL_MAN) *.8 $(MANDIR)/man8
+ $(BSD_INSTALL_MAN) *.1 $(MANDIR)/man1 + $(BSD_INSTALL_MAN) *.1 $(MANDIR)/man1
+ install -d -g news -o news $(LOCKDIR) + $(INSTALL) -d -g news -o news $(LOCKDIR)
+ -mkdir -p $(SPOOLDIR) $(LIBDIR) $(ETCDIR) + -mkdir -p $(SPOOLDIR) $(LIBDIR) $(ETCDIR)
-mkdir -p $(SPOOLDIR)/leaf.node -mkdir -p $(SPOOLDIR)/leaf.node
-mkdir -p $(SPOOLDIR)/{message.id,interesting.groups,out.going} -mkdir -p $(SPOOLDIR)/message.id
-mkdir -p $(SPOOLDIR)/interesting.groups
-mkdir -p $(SPOOLDIR)/out.going
- -chown news.news `dirname $(LOCKFILE)`
- -chown news.news $(SPOOLDIR) $(LIBDIR) - -chown news.news $(SPOOLDIR) $(LIBDIR)
+ -chown news.news $(SPOOLDIR) + -chown news.news $(SPOOLDIR)
-chown news.news $(SPOOLDIR)/leaf.node -chown news.news $(SPOOLDIR)/leaf.node
-chown news.news $(SPOOLDIR)/{message.id,interesting.groups,out.going} -chown news.news $(SPOOLDIR)/message.id
-chown news.news $(SPOOLDIR)/interesting.groups
-chown news.news $(SPOOLDIR)/out.going
cd $(SPOOLDIR)/message.id ; for a in 0 1 2 3 4 5 6 7 8 9 ; do \ cd $(SPOOLDIR)/message.id ; for a in 0 1 2 3 4 5 6 7 8 9 ; do \
@@ -101,10 +99,21 @@ - for b in 0 1 2 3 4 5 6 7 8 9 ; do \
$${a}$${b}6 $${a}$${b}7 $${a}$${b}8 \ - mkdir -p $${a}$${b}0 $${a}$${b}1 $${a}$${b}2 \
$${a}$${b}9 ; \ - $${a}$${b}3 $${a}$${b}4 $${a}$${b}5 \
done ; done - $${a}$${b}6 $${a}$${b}7 $${a}$${b}8 \
- $${a}$${b}9 ; \
- chown news.news $${a}$${b}0 $${a}$${b}1 $${a}$${b}2 \
- $${a}$${b}3 $${a}$${b}4 $${a}$${b}5 \
- $${a}$${b}6 $${a}$${b}7 $${a}$${b}8 \
- $${a}$${b}9 ; \
- done ; done
- cp config.example $(LIBDIR) - cp config.example $(LIBDIR)
+ for b in 0 1 2 3 4 5 6 7 8 9 ; do \
+ for c in 0 1 2 3 4 5 6 7 8 9 ; do \
+ test -d "$$a$$b$$c" || \
+ $(INSTALL) -d -o news -g news "$$a$$b$$c"; \
+ done ; done ; done
+ ${BSD_INSTALL_DATA} README INSTALL config.example $(LIBDIR) + ${BSD_INSTALL_DATA} README INSTALL config.example $(LIBDIR)
+ test -f $(ETCDIR)/config || \ + test -f $(ETCDIR)/config || \
+ ${BSD_INSTALL_DATA} config.example $(ETCDIR)/config + ${BSD_INSTALL_DATA} config.example $(ETCDIR)/config
chmod 2755 $(SPOOLDIR) chmod 2755 $(SPOOLDIR)
- @echo Edit /etc/inetd.conf to start $(BINDIR)/leafnode and restart inetd - @echo Edit /etc/inetd.conf to start $(BINDIR)/leafnode and restart inetd
- @echo If you update from a leafnode version \< 1.6, do a "make update" - @echo If you update from a leafnode version \< 1.6, do a "make update"
+ @echo "*** edit /etc/inetd.conf to start $(BINDIR)/leafnode"
+ +
+ @echo "*** Verify $(ETCDIR)/config -- a copy of which is saved" + @echo
+ @echo "*** as $(LIBDIR)/config.example." + @echo "** edit /etc/inetd.conf to start $(BINDIR)/leafnode"
+ @echo "*** See $(LIBDIR)/README" and + @echo "**"
+ @echo "*** $(LIBDIR)/INSTALL for more information" + @echo "** Verify $(ETCDIR)/config, a copy of which is saved as"
+ @echo "### You may need to add" + @echo "** $(LIBDIR)/config.example."
+ @echo "### \"install -d -g news -o news /var/run/news\"" + @echo "**"
+ @echo "### to /etc/rc.local" + @echo "** See $(LIBDIR)/README and"
+ @echo "*** if you update from a leafnode version < 1.6, do a \"make update\"" + @echo "** $(LIBDIR)/INSTALL for more information"
+ @echo "" + @echo "**"
+ @echo "** You may need to add"
+ @echo "** \"install -d -g news -o news /var/run/news\""
+ @echo "** to /etc/rc.local"
+ @echo "**"
+ @echo "** if you update from a leafnode version < 1.6, do a \"make update\""
uninstall: uninstall:
-rm $(BINDIR)/{fetch,checkgroups,texpire,leafnode} -rm $(BINDIR)/fetch

24
news/leafnode/patches/patch-ac
View File

@ -1,13 +1,13 @@
--- fetch.c.orig Fri Jan 8 22:34:46 1999 --- miscutil.c.orig Mon Feb 15 17:34:08 1999
+++ fetch.c Fri Jan 8 22:08:02 1999 +++ miscutil.c Mon Feb 15 17:34:33 1999
@@ -1226,8 +1226,8 @@ @@ -79,8 +79,8 @@
exit( 1 ); return FALSE;
} }
- setregid( pw->pw_gid, pw->pw_gid ); - setregid( pw->pw_gid, pw->pw_gid );
- setreuid( pw->pw_uid, pw->pw_uid ); - setreuid( pw->pw_uid, pw->pw_uid );
+ setgid( pw->pw_gid ); + setgid( pw->pw_gid );
+ setuid( pw->pw_uid ); + setuid( pw->pw_uid );
if ( getuid() != pw->pw_uid || getgid() != pw->pw_gid ) {
if ( getuid() != pw->pw_uid || getgid() != pw->pw_gid ) { fprintf( stderr, "%s: must be run as news or root\n", progname );
fprintf( stderr, "%s: must be run as news or root\n", argv[0] ); return FALSE;

33
news/leafnode/patches/patch-ad
View File

@ -1,11 +1,24 @@
--- checkgroups.c.orig Fri Jan 8 22:33:30 1999 --- update.sh.orig Mon Feb 15 17:13:27 1999
+++ checkgroups.c Fri Jan 8 22:08:22 1999 +++ update.sh Mon Feb 15 17:14:42 1999
@@ -75,7 +75,7 @@ @@ -1,4 +1,4 @@
} -#!/bin/bash
+#!/bin/sh
# This script updates leafnode installations < 1.6
setgid( pw->pw_gid ); if [ $# -ne 2 ]
- setreuid( pw->pw_uid, pw->pw_uid ); @@ -34,13 +34,13 @@
+ setuid( pw->pw_uid ); echo Creating new file for main server ...
server=`awk '{ if ($1 == "server") printf("%s\n", substr($0,index($0,"=")+1)); }' < ${LIBDIR}/config | tr -d ' '`
if ( getuid() != pw->pw_uid || getgid() != pw->pw_gid ) { cd ${SPOOLDIR}/interesting.groups
fprintf( stderr, "%s: must be run as news or root\n", argv[0] ); - ls -c1 | xargs -i@@ grep @@\ ${LIBDIR}/groupinfo | \
+ ls -c1 | xargs apply 'grep %1 ${LIBDIR}/groupinfo' | \
cut -d\ -f 1,4 > ${SPOOLDIR}/leaf.node/$server
echo Converting groupinfo file ... your old groupinfo file will be in ${SPOOLDIR}/leaf.node/groupinfo.old
awk '{ printf("%s %d %d 0", $1, $2, $3); for (i = 5; i <= NF; i++) printf(" %s", $i); printf("\n"); }' < ${LIBDIR}/groupinfo > ${SPOOLDIR}/leaf.node/groupinfo
mv ${LIBDIR}/groupinfo ${SPOOLDIR}/leaf.node/groupinfo.old
echo Move other files ...
- find ${LIBDIR} -type f -not -name 'config*' -exec mv '{}' ${SPOOLDIR}/leaf.node/ \;
+ find ${LIBDIR} -type f \! -name 'config*' -exec mv '{}' ${SPOOLDIR}/leaf.node/ \;
chown news.news ${SPOOLDIR}/leaf.node/*
chmod 664 ${SPOOLDIR}/leaf.node/*
echo Done.

11
news/leafnode/patches/patch-ae
View File

@ -1,11 +0,0 @@
--- texpire.c.orig Fri Jan 8 22:34:59 1999
+++ texpire.c Fri Jan 8 22:09:34 1999
@@ -371,7 +371,7 @@
}
setgid( pw->pw_gid );
- setreuid( pw->pw_uid, pw->pw_uid );
+ setuid( pw->pw_uid );
if ( getuid() != pw->pw_uid || getgid() != pw->pw_gid ) {
fprintf( stderr, "%s: must be run as news or root\n", argv[0] );

24
news/leafnode/patches/patch-af
View File

@ -1,24 +0,0 @@
--- update.sh.orig Sun Jan 10 15:34:36 1999
+++ update.sh Sun Jan 10 15:31:45 1999
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# This script updates leafnode installations < 1.6
if [ $# -ne 2 ]
@@ -34,13 +34,13 @@
echo Creating new file for main server ...
server=`awk '{ if ($1 == "server") printf("%s\n", substr($0,index($0,"=")+1)); }' < ${LIBDIR}/config | tr -d ' '`
cd ${SPOOLDIR}/interesting.groups
- ls -c1 | xargs -i@@ grep @@\ ${LIBDIR}/groupinfo | \
+ find * -exec grep {} ${LIBDIR}/groupinfo \; | \
cut -d\ -f 1,4 > ${SPOOLDIR}/leaf.node/$server
echo Converting groupinfo file ... your old groupinfo file will be in ${SPOOLDIR}/leaf.node/groupinfo.old
awk '{ printf("%s %d %d 0", $1, $2, $3); for (i = 5; i <= NF; i++) printf(" %s", $i); printf("\n"); }' < ${LIBDIR}/groupinfo > ${SPOOLDIR}/leaf.node/groupinfo
mv ${LIBDIR}/groupinfo ${SPOOLDIR}/leaf.node/groupinfo.old
echo Move other files ...
- find ${LIBDIR} -type f -not -name 'config*' -exec mv '{}' ${SPOOLDIR}/leaf.node/ \;
+ find ${LIBDIR} -type f \! -name 'config*' -exec mv '{}' ${SPOOLDIR}/leaf.node/ \;
chown news.news ${SPOOLDIR}/leaf.node/*
chmod 664 ${SPOOLDIR}/leaf.node/*
echo Done.

12
news/leafnode/pkg/PLIST
View File

@ -1,10 +1,8 @@
@cwd /usr/local @cwd /usr/local
@name leafnode-1.8.1 @name leafnode-1.9
bin/newsq bin/newsq
lib/leafnode/README
lib/leafnode/INSTALL
lib/leafnode/config.example
man/man1/newsq.1 man/man1/newsq.1
man/man8/applyfilter.8
man/man8/checkgroups.8 man/man8/checkgroups.8
man/man8/fetch.8 man/man8/fetch.8
man/man8/leafnode.8 man/man8/leafnode.8
@ -13,4 +11,8 @@ sbin/leafnode
sbin/fetch sbin/fetch
sbin/texpire sbin/texpire
sbin/checkgroups sbin/checkgroups
@dirrm lib/leafnode sbin/applyfilter
share/doc/leafnode/README
share/doc/leafnode/INSTALL
share/doc/leafnode/config.example
@dirrm share/doc/leafnode