Update to 1.9.32. In addition to the general updates this fixes

Bugtraq #6490, a DoS vulnerability.

Also thanks to margarita@ for the SYSCONFDIR cluestick :)

ok brad@
This commit is contained in:
marcm 2003-01-21 16:58:11 +00:00
parent e7d76c42ea
commit 0e837a2900
8 changed files with 47 additions and 33 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.22 2002/10/21 16:49:06 marcm Exp $
# $OpenBSD: Makefile,v 1.23 2003/01/21 16:58:11 marcm Exp $
COMMENT= "USENET software package designed for small sites"
VERSION= 1.9.27
VERSION= 1.9.32
DISTNAME= leafnode-${VERSION}.rel
PKGNAME= leafnode-${VERSION}
CATEGORIES= news
@ -22,20 +22,19 @@ EXTRACT_SUFX= .tar.bz2
LIB_DEPENDS= pcre::devel/pcre
SYSCONFDIR= /etc/leafnode
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --localstatedir=/var
CONFIGURE_ARGS+= --with-lockfile=/var/spool/news/fetchnews.lck
CONFIGURE_ARGS+= --with-ipv6
DOCS= README README-FQDN INSTALL FAQ.txt
post-install:
@$(INSTALL_DATA_DIR) ${PREFIX}/share/doc/leafnode && \
cd ${WRKSRC} && \
$(INSTALL_DATA) README README-FQDN INSTALL FAQ.txt \
$(INSTALL_DATA_DIR) ${PREFIX}/share/doc/leafnode
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/leafnode
cd ${WRKSRC} && $(INSTALL_DATA) ${DOCS} \
${PREFIX}/share/doc/leafnode
@${INSTALL_DATA_DIR} ${PREFIX}/share/examples/leafnode && \
mv ${WRKINST}/${SYSCONFDIR}/config.example \
${PREFIX}/share/examples/leafnode/config && \
cp -Rp ${WRKINST}/${SYSCONFDIR}/* ${PREFIX}/share/examples/leafnode/
${INSTALL_DATA} ${WRKINST}/${SYSCONFDIR}/leafnode/* \
${PREFIX}/share/examples/leafnode/
.include <bsd.port.mk>

View File

@ -1,3 +1,3 @@
MD5 (leafnode-1.9.27.rel.tar.bz2) = e12e23d140ba84471c75b7d024fdd9ea
RMD160 (leafnode-1.9.27.rel.tar.bz2) = 540ddb42050b8e088d1c098ba1b6af5c7c3156f9
SHA1 (leafnode-1.9.27.rel.tar.bz2) = b07b7dfc7055db2b813b7cd1f4c0db7208871eb4
MD5 (leafnode-1.9.32.rel.tar.bz2) = e197529b2c7fcb034d65559cdec4719f
RMD160 (leafnode-1.9.32.rel.tar.bz2) = 80c4749fc7650c0df4cf8973715418b9697cad27
SHA1 (leafnode-1.9.32.rel.tar.bz2) = 0584b9ec3d67f168626125ee9ef6b28f5106ea2d

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-INSTALL,v 1.2 2002/09/24 00:24:19 marcm Exp $
--- INSTALL.orig Sun Sep 22 00:41:37 2002
+++ INSTALL Sun Sep 22 00:43:30 2002
@@ -160,11 +160,10 @@
$OpenBSD: patch-INSTALL,v 1.3 2003/01/21 16:58:11 marcm Exp $
--- INSTALL.orig Tue Nov 26 04:06:05 2002
+++ INSTALL Sun Dec 22 22:43:22 2002
@@ -172,11 +172,10 @@
for incoming NNTP connections. Here is my inetd.conf line (insert
it at the leftmost column, without leading spaces!):

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.6 2002/10/21 16:49:06 marcm Exp $
--- Makefile.in.orig Tue Sep 24 15:08:40 2002
+++ Makefile.in Sat Oct 19 23:21:48 2002
@@ -1086,15 +1086,7 @@ install-data-hook: quickmkdir amiroot
$OpenBSD: patch-Makefile_in,v 1.7 2003/01/21 16:58:11 marcm Exp $
--- Makefile.in.orig Wed Jan 8 14:56:56 2003
+++ Makefile.in Fri Jan 10 13:35:04 2003
@@ -1244,15 +1244,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 ; \

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-configure,v 1.1 2003/01/21 16:58:11 marcm Exp $
--- configure.orig Mon Jan 6 15:20:28 2003
+++ configure Mon Jan 6 15:22:45 2003
@@ -1754,7 +1754,7 @@ echo "$as_me: WARNING: *** use --sysconf
echo "$as_me: WARNING: ***" >&2;}
sleep 1
fi
-sysconfdir=$CONFDIR
+sysconfdir="$CONFDIR/leafnode"
if test "$localstatedir" = '${prefix}/var' && test "$prefix" = NONE ; then

View File

@ -1,13 +1,13 @@
#!/bin/sh
#
# $OpenBSD: DEINSTALL,v 1.5 2002/09/24 00:24:19 marcm Exp $
# $OpenBSD: DEINSTALL,v 1.6 2003/01/21 16:58:11 marcm Exp $
#
set -e
PATH=/bin:/usr/bin:/sbin:/usr/sbin
FILES='
config
leafnode/config
'
SPOOLDIR=/var/spool/news
@ -15,8 +15,8 @@ SPOOLDIR=/var/spool/news
echo
echo "+--------------- $1"
echo "| To fully remove $1 from your system you should also"
echo "| remove the configuration files from the ${SYSCONFDIR} directory"
echo "| as well as the news spool directory ${SPOOLDIR}."
echo "| remove the configuration files from the ${SYSCONFDIR}/leafnode"
echo "| directory as well as the news spool directory ${SPOOLDIR}."
echo "|"
echo "| If you are planning on installing $1 again in the future"
echo "| you can leave them as they are."

View File

@ -1,15 +1,15 @@
#!/bin/sh
#
# $OpenBSD: INSTALL,v 1.4 2002/09/24 00:24:19 marcm Exp $
# $OpenBSD: INSTALL,v 1.5 2003/01/21 16:58:11 marcm Exp $
P_NAME=leafnode
DIRS='
.
leafnode
'
FILES='
config
leafnode/config
'
SPOOLDIR=/var/spool/news
@ -33,7 +33,7 @@ do_create_user()
echo "User news already exists... ok"
else
echo -n "Adding user news..."
user add -d /var/spool/news -g news -c 'NNTP server' -s /sbin/nologin news
user add -m -d /var/spool/news -g news -c 'NNTP server' -s /sbin/nologin news
echo "ok"
fi
}
@ -61,7 +61,7 @@ do_create_spool_dirs()
do_post()
{
DEST_PFX=${SYSCONFDIR}
SOURCE_PFX=${PREFIX}/share/examples/${P_NAME}
SOURCE_PFX=${PREFIX}/share/examples
echo
echo "+--------------- ${P_NAME}"
@ -78,7 +78,7 @@ do_post()
if [ -f "${DEST_PFX}/$f" ]; then
OLD_CONFS="${OLD_CONFS} $f"
else
if ! install -m 644 ${SOURCE_PFX}/$f ${DEST_PFX}/$f; then
if ! install -m 644 ${SOURCE_PFX}/$f.example ${DEST_PFX}/$f; then
echo "| ERROR: The following file could not be installed, exiting: ${DEST_PFX}/$f"
exit 1
fi

View File

@ -1,5 +1,7 @@
@comment $OpenBSD: PLIST,v 1.8 2002/10/21 16:49:06 marcm Exp $
@comment $OpenBSD: PLIST,v 1.9 2003/01/21 16:58:11 marcm Exp $
bin/leafnode-version
bin/newsq
man/man1/leafnode-version.1
man/man1/newsq.1
man/man8/applyfilter.8
man/man8/checkgroups.8
@ -17,7 +19,8 @@ share/doc/leafnode/README
share/doc/leafnode/README-FQDN
share/examples/leafnode/Makefile.dist
share/examples/leafnode/UNINSTALL-daemontools
share/examples/leafnode/config
share/examples/leafnode/config.example
share/examples/leafnode/filters.example
share/examples/leafnode/nntp.rules.dist
share/examples/leafnode/run.tcpd.dist
share/examples/leafnode/run.tcpserver.dist