diff -Nru sn-0.3.8/contrib/auto_subscribe/snnewgroups sn-0.3.8/contrib/auto_subscribe/snnewgroups --- sn-0.3.8/contrib/auto_subscribe/snnewgroups 2018-11-09 23:12:17.000000000 +0000 +++ sn-0.3.8/contrib/auto_subscribe/snnewgroups 2004-04-25 01:52:27.000000000 +0000 @@ -53,7 +53,7 @@ else cmd="LIST ACTIVE" fi - printf "MODE READER\n%s\nquit\n" "${cmd}" | + echo -e "MODE READER\n$cmd\nquit" | { nc $server $port || rm $new ; } | grep '^[a-z]' | while read group junk diff -Nru sn-0.3.8/debian/changelog sn-0.3.8/debian/changelog --- sn-0.3.8/debian/changelog 2018-11-09 23:12:17.000000000 +0000 +++ sn-0.3.8/debian/changelog 2018-10-29 05:00:06.000000000 +0000 @@ -1,8 +1,46 @@ -sn (0.3.8-10.1build1) bionic; urgency=high +sn (0.3.8-12) unstable; urgency=medium - * No change rebuild to pick up -fPIE compiler default + * Add snnewsq.8 man page file to debian/ directory. + * Add 'debian/snnewsq.8' to the debian/sn.manpages file. + * Changes to the debian/sn.lintian-overrides file: + + Correct the spelling for the upstream documention lintian warning. + + Add override for manpage-has-errors-from-man lintian issue on the + snexpire.8 man page. + * Add Debian created 'snnewsq' script to the debian/ directory. + * Rename the file 'debian/config' to be 'debian/sn.config' and add the + command line 'set -e' to the beginning of the file. - -- Balint Reczey Tue, 03 Apr 2018 12:44:05 +0000 + -- Robert James Clay Mon, 29 Oct 2018 01:00:06 -0400 + +sn (0.3.8-11) unstable; urgency=medium + + * New Maintainer. (Closes: #910567) + * Changes in debian/rules: + + Add 'build-arch' and 'build-indep' targets. + + Remove trailing whitespace at line 17 of the file. + + Explicitly add 'dh_install' to the binary-arch target. + + Explicitly add 'dh_lintian' to the binary-arch target. + + Use 'dh_prep' instead of 'dh_clean -k' in install target. + + Removed lines related to the lintian overrides as no longer needed. + * Install 'snnewsq' script using the debian/sn.install file. + * Replace 'exim' with 'default-mta' as a Depends in debian/control. + * Add '1-Makefile.patch' and 'series' files to a debian/patches/ directory. + * Remove invalid '--group' option from the update-inetd command line in the + debian/postrm script. (Closes: #909928) + * Ran 'wrap-and-sort' on package files which resulted in changes to the files + debian/control, debian/dirs, & debian/docs. + * Set '3.0 (quilt)' as the package source format. + * Add a debian/TODO file to the package sources. + * Change debhelper version setting from '5.0.0' to '10'. + * Add 'Vcs-Browser' & 'Vcs-Git' settings to debian/control. + * Changes to debian/sn.lintian-overrides: + + Add item regarding a manpage related lintian warning. + + Add 'sn binary:' to the lines in the file in order to correct the + formatting of it and also added a comment to the file. + + Rename 'debian/lintian-overrides' as 'debian/sn.lintian-overrides'. + * Remove debian/source.lintian-overrides' as it is not currently needed. + + -- Robert James Clay Sat, 27 Oct 2018 19:33:14 -0400 sn (0.3.8-10.1) unstable; urgency=low diff -Nru sn-0.3.8/debian/compat sn-0.3.8/debian/compat --- sn-0.3.8/debian/compat 2018-11-09 23:12:17.000000000 +0000 +++ sn-0.3.8/debian/compat 2018-10-23 04:41:26.000000000 +0000 @@ -1 +1 @@ -5 +10 diff -Nru sn-0.3.8/debian/config sn-0.3.8/debian/config --- sn-0.3.8/debian/config 2018-11-09 23:12:17.000000000 +0000 +++ sn-0.3.8/debian/config 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -#!/bin/sh -e - -. /usr/share/debconf/confmodule - -# Find good value for RUNFROM -if [ -f /etc/news/sn/debian-config ] -then - . /etc/news/sn/debian-config -fi -if [ -z "$RUNFROM" ] -then - db_get sn/runfrom - RUNFROM=$RET -fi - -if [ ! -z "$RUNFROM" ] -then - db_set sn/runfrom "$RUNFROM" -fi - -# Find good value for onlylocal -if grep -q "^#-- sn:" /etc/hosts.allow || grep -q "^#-- sn:" /etc/hosts.deny -then - db_set sn/onlylocal true -else - db_set sn/onlylocal false -fi - -db_beginblock -db_input high sn/runfrom || true -db_input high sn/onlylocal || true -db_endblock -db_go - diff -Nru sn-0.3.8/debian/control sn-0.3.8/debian/control --- sn-0.3.8/debian/control 2018-11-09 23:12:17.000000000 +0000 +++ sn-0.3.8/debian/control 2018-10-27 23:23:37.000000000 +0000 @@ -1,16 +1,25 @@ Source: sn Section: news Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Hilko Bengen -Build-Depends: zlib1g-dev, debhelper (>= 5.0.0) -Standards-Version: 3.8.3 +Maintainer: Robert James Clay +Build-Depends: debhelper (>= 10), zlib1g-dev +Standards-Version: 4.2.1 +Vcs-Browser: https://salsa.debian.org/debian/sn +Vcs-Git: https://salsa.debian.org/debian/sn.git Package: sn Architecture: any Provides: news-transport-system Conflicts: news-transport-system -Depends: netbase, tcpd, heirloom-mailx | mailx, exim4 | mail-transport-agent, psmisc, ed, openbsd-inetd | inet-superserver, ${shlibs:Depends}, ${misc:Depends} +Depends: ed, + default-mta | mail-transport-agent, + heirloom-mailx | mailx, + netbase, + openbsd-inetd | inet-superserver, + psmisc, + tcpd, + ${misc:Depends}, + ${shlibs:Depends} Description: Small NNTP server for leaf sites sn is a small news system for small sites serving perhaps a few dozen newsgroups, and with a slow connection to the internet. diff -Nru sn-0.3.8/debian/dirs sn-0.3.8/debian/dirs --- sn-0.3.8/debian/dirs 2018-11-09 23:12:17.000000000 +0000 +++ sn-0.3.8/debian/dirs 2018-10-23 04:41:26.000000000 +0000 @@ -1,9 +1,9 @@ +etc/cron.daily +etc/news/sn +etc/ppp/ip-down.d +etc/ppp/ip-up.d usr/sbin usr/share/man usr/share/man/man8 var/spool/sn var/spool/sn/.outgoing -etc/news/sn -etc/cron.daily -etc/ppp/ip-up.d -etc/ppp/ip-down.d diff -Nru sn-0.3.8/debian/docs sn-0.3.8/debian/docs --- sn-0.3.8/debian/docs 2018-11-09 23:12:17.000000000 +0000 +++ sn-0.3.8/debian/docs 2018-10-23 04:41:26.000000000 +0000 @@ -1,5 +1,5 @@ +INSTALL.notes +INSTALL.run README README.files -INSTALL.run -INSTALL.notes TODO diff -Nru sn-0.3.8/debian/lintian-overrides sn-0.3.8/debian/lintian-overrides --- sn-0.3.8/debian/lintian-overrides 2018-11-09 23:12:17.000000000 +0000 +++ sn-0.3.8/debian/lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -package-contains-upstream-install-documentation usr/share/doc/sn/INSTALL.run.gz -package-contains-upstream-install-documentation usr/share/doc/sn/INSTALL.notes.gz - diff -Nru sn-0.3.8/debian/patches/1-Makefile.patch sn-0.3.8/debian/patches/1-Makefile.patch --- sn-0.3.8/debian/patches/1-Makefile.patch 1970-01-01 00:00:00.000000000 +0000 +++ sn-0.3.8/debian/patches/1-Makefile.patch 2018-10-27 16:30:19.000000000 +0000 @@ -0,0 +1,59 @@ +Description: Patch Makefile to enable Debian package build. + Patch upstream Makefile to enable successful Debian package building. +Author: Robert James Clay +Last-Update: 2018-10-27 + +--- a/Makefile ++++ b/Makefile +@@ -15,12 +15,12 @@ + #PREFIX =/home/patrik/stow/sn-current + + ## Where the news spool will be +-SNROOT =/var/spool/news ++SNROOT =/var/spool/sn + #SNROOT =/home/patrik/spool/news + + ## Where to send mail for the admin if neither the NEWSMASTER nor + ## the LOGNAME environment variable is set +-DEFAULT_ADMIN_EMAIL =newsmaster ++DEFAULT_ADMIN_EMAIL =postmaster + + # + # OS-specific settings. Uncomment only one section below. +@@ -45,8 +45,8 @@ + CC =gcc + LD =gcc + +-BINDIR =$(PREFIX)/sbin +-MANDIR =$(PREFIX)/man ++BINDIR =$(DESTDIR)/usr/sbin ++MANDIR =$(DESTDIR)/usr/share/man + + # + # You can stop editing here. +@@ -63,14 +63,14 @@ + BINS =snprimedb snntpd snfetch snexpire snsend \ + snmail snget sngetd snscan sndumpdb \ + snnewgroup sndelgroup snlockf snsplit +-SCRIPTS =dot-outgoing.ex SNHELLO SNPOST ++SCRIPTS = SNHELLO SNPOST + PROGS =$(BINS) $(SCRIPTS) + MANS =sn.8 sncat.8 sndelgroup.8 sndumpdb.8 snexpire.8 \ + snfetch.8 snget.8 snmail.8 snnewgroup.8 snntpd.8 \ + snprimedb.8 snscan.8 sncancel.8 snsend.8 snstore.8 \ + sngetd.8 snsplit.8 + +-all: cc-flags $(OBJS) $(AOBJS) libs $(PROGS) sed-cmd $(MANS) $(SCRIPTS) ++all: cc-flags $(OBJS) $(AOBJS) libs $(PROGS) dot-outgoing.ex sed-cmd $(MANS) $(SCRIPTS) + cc-flags: + echo ' -g -Wall -pedantic -O' >$@.t + echo ' -I./lib' >>$@.t +@@ -150,6 +150,8 @@ + -cd $(BINDIR); rm -f sncat; ln -s snscan sncat + -cd $(BINDIR); rm -f sncancel; ln -s snscan sncancel + -cd $(BINDIR); rm -f snstore; ln -s snsend snstore ++ mv $(BINDIR)/snntpd $(BINDIR)/snntpd.bin ++ install debian/snntpd.wrapper $(BINDIR)/snntpd + + spoolclean: + @echo -n "make $@ will wipe out your news spool! Sure? [y/n] " diff -Nru sn-0.3.8/debian/patches/series sn-0.3.8/debian/patches/series --- sn-0.3.8/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ sn-0.3.8/debian/patches/series 2018-10-27 15:11:00.000000000 +0000 @@ -0,0 +1 @@ +1-Makefile.patch diff -Nru sn-0.3.8/debian/postrm sn-0.3.8/debian/postrm --- sn-0.3.8/debian/postrm 2018-11-09 23:12:17.000000000 +0000 +++ sn-0.3.8/debian/postrm 2018-10-23 04:41:26.000000000 +0000 @@ -21,7 +21,7 @@ case "$1" in purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) if which update-inetd >/dev/null 2>&1 ; then - update-inetd --group NEWS --remove 'nntp stream tcp nowait news.news /usr/sbin/tcpd /usr/sbin/snntpd logger -p news.info' + update-inetd NEWS --remove 'nntp stream tcp nowait news.news /usr/sbin/tcpd /usr/sbin/snntpd logger -p news.info' fi esac diff -Nru sn-0.3.8/debian/rules sn-0.3.8/debian/rules --- sn-0.3.8/debian/rules 2018-11-09 23:12:17.000000000 +0000 +++ sn-0.3.8/debian/rules 2018-10-27 15:55:51.000000000 +0000 @@ -5,7 +5,9 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -build: build-stamp +build: build-arch build-indep +build-arch: build-stamp +build-indep: build-stamp build-stamp: dh_testdir @@ -14,7 +16,7 @@ touch build-stamp -clean: +clean: dh_testdir dh_testroot rm -f build-stamp @@ -27,15 +29,13 @@ install: build dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs # Add here commands to install the package into debian/tmp. $(MAKE) install DESTDIR=$(CURDIR)/debian/sn dh_installppp ln -s snntpd.8.gz debian/sn/usr/share/man/man8/snntpd.bin.8.gz - mkdir -p debian/sn/usr/share/lintian/overrides/ - install -m 644 debian/lintian-overrides debian/sn/usr/share/lintian/overrides/sn # Build architecture-independent files here. @@ -46,6 +46,7 @@ binary-arch: build install dh_testdir dh_testroot + dh_install dh_installdebconf dh_installdocs chmod 755 debian/regenerate-indices @@ -54,6 +55,7 @@ dh_installcron dh_installman dh_installchangelogs CHANGES + dh_lintian dh_link dh_strip dh_compress diff -Nru sn-0.3.8/debian/sn.config sn-0.3.8/debian/sn.config --- sn-0.3.8/debian/sn.config 1970-01-01 00:00:00.000000000 +0000 +++ sn-0.3.8/debian/sn.config 2018-10-29 01:43:36.000000000 +0000 @@ -0,0 +1,36 @@ +#!/bin/sh -e + +set -e + +. /usr/share/debconf/confmodule + +# Find good value for RUNFROM +if [ -f /etc/news/sn/debian-config ] +then + . /etc/news/sn/debian-config +fi +if [ -z "$RUNFROM" ] +then + db_get sn/runfrom + RUNFROM=$RET +fi + +if [ ! -z "$RUNFROM" ] +then + db_set sn/runfrom "$RUNFROM" +fi + +# Find good value for onlylocal +if grep -q "^#-- sn:" /etc/hosts.allow || grep -q "^#-- sn:" /etc/hosts.deny +then + db_set sn/onlylocal true +else + db_set sn/onlylocal false +fi + +db_beginblock +db_input high sn/runfrom || true +db_input high sn/onlylocal || true +db_endblock +db_go + diff -Nru sn-0.3.8/debian/sn.install sn-0.3.8/debian/sn.install --- sn-0.3.8/debian/sn.install 1970-01-01 00:00:00.000000000 +0000 +++ sn-0.3.8/debian/sn.install 2018-10-27 15:51:37.000000000 +0000 @@ -0,0 +1,2 @@ +debian/snnewsq usr/sbin + diff -Nru sn-0.3.8/debian/sn.lintian-overrides sn-0.3.8/debian/sn.lintian-overrides --- sn-0.3.8/debian/sn.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ sn-0.3.8/debian/sn.lintian-overrides 2018-10-29 04:07:34.000000000 +0000 @@ -0,0 +1,12 @@ +# The INSTALL.notes and INSTALL.run files are actually for use after the binaries +# are installed for specific setups and operation. And have historically been +# installed with those names instead of being renamed or copied as README file +# and installed that way. Override lintian warnings about them. +sn binary: package-contains-upstream-installation-documentation usr/share/doc/sn/INSTALL.run.gz +sn binary: package-contains-upstream-installation-documentation usr/share/doc/sn/INSTALL.notes.gz + +# The source file snexpire.8.in file does have that line as ".TP" but the file +# snexpire.8 that appears to result from sed commands in the Makefile ends up +# with ".tp" for some unknown reason. +sn binary: manpage-has-errors-from-man usr/share/man/man8/snexpire.8.gz 30: warning: macro `tp' not defined + diff -Nru sn-0.3.8/debian/sn.manpages sn-0.3.8/debian/sn.manpages --- sn-0.3.8/debian/sn.manpages 2018-11-09 23:12:17.000000000 +0000 +++ sn-0.3.8/debian/sn.manpages 2018-10-29 01:07:41.000000000 +0000 @@ -1,3 +1,4 @@ debian/SNHELLO.8 debian/SNPOST.8 debian/snlockf.8 +debian/snnewsq.8 diff -Nru sn-0.3.8/debian/snnewsq sn-0.3.8/debian/snnewsq --- sn-0.3.8/debian/snnewsq 1970-01-01 00:00:00.000000000 +0000 +++ sn-0.3.8/debian/snnewsq 2012-08-24 21:05:41.000000000 +0000 @@ -0,0 +1,34 @@ +#!/bin/sh + +# news queue statistics for sn +# by Andras BALI +# modified by Jorgen Schaefer + +SNSPOOL=${SNROOT:-/var/spool/sn} + +for i in $SNSPOOL/.outgoing/*; do + if [ "$i" = "$SNSPOOL/.outgoing/*" ] + then + echo "Can't read from $SNSPOOL/.outgoing/, exiting." + break + fi + servername=$(basename $i | cut -d: -f1) + files=$(find $i/ -type f -not -name .lock \ + -not -name .last-list \ + -not -name password \ + -not -name username) + if [ -z "$files" ]; then + echo No outgoing articles for $servername + else + NUM=$(echo "$files" | wc -l | tr -d ' ') + if [ $NUM -eq 1 ]; then ARTICLES=article ; else ARTICLES=articles ; fi + echo $NUM outgoing $ARTICLES for $servername: + k=1 + echo "$files" | while read j; do + echo -n "-> $k. "; grep "Newsgroups: " $j | head -1 + echo -n " "; grep "Subject: " $j | head -1 + echo -n " "; grep "Date: " $j | head -1 + k=$((k + 1)) + done + fi +done diff -Nru sn-0.3.8/debian/snnewsq.8 sn-0.3.8/debian/snnewsq.8 --- sn-0.3.8/debian/snnewsq.8 1970-01-01 00:00:00.000000000 +0000 +++ sn-0.3.8/debian/snnewsq.8 2012-08-24 21:05:41.000000000 +0000 @@ -0,0 +1,19 @@ +.TH snnewsq,v0.3.8 8 "Andras BALI" "N.B." \" -*- nroff -*- +.SH NAME +snnewsq \- show a list of outgoing news articles +.SH SYNOPSIS +.B snnewsq +(no arguments) +.br +.SH DESCRIPTION +.B snnewsq +shows a list of outgoing news articles in the +.B sn +spool (in no particular order) + +.SH ENVIRONMENT VARIABLES +.TP +.B SNROOT +If this is set and is not empty, the value is used in place of +.BR /var/spool/sn , +the default news spool directory. diff -Nru sn-0.3.8/debian/source/format sn-0.3.8/debian/source/format --- sn-0.3.8/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ sn-0.3.8/debian/source/format 2018-10-23 04:41:26.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru sn-0.3.8/debian/source.lintian-overrides sn-0.3.8/debian/source.lintian-overrides --- sn-0.3.8/debian/source.lintian-overrides 2018-11-09 23:12:17.000000000 +0000 +++ sn-0.3.8/debian/source.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -package-contains-upstream-install-documentation usr/share/doc/sn/INSTALL.notes.gz diff -Nru sn-0.3.8/debian/TODO sn-0.3.8/debian/TODO --- sn-0.3.8/debian/TODO 1970-01-01 00:00:00.000000000 +0000 +++ sn-0.3.8/debian/TODO 2018-10-29 01:43:05.000000000 +0000 @@ -0,0 +1,119 @@ +Debian packaging TODO for the 'sn' package. + +See also: https://bugs.debian.org/cgi-bin/pkgreport.cgi?pkg=sn + +================================================================================ +-------------------------------------------------------------------------------- + +- Rewrite debian/rules to use dh + +- There is a line in debian/rules that creates a symlink for snntpd.bin.8.gz + to point to snntpd.8.gz. There are other instances of this as well. Do that + in 'sn.links' instead? + +- Rewrite debian/copyright to use Dep 5 +P: sn source: no-dep5-copyright + +- The file debian/manpages is already present but is currently only being used +to install the debian created & provided man pages. Use it to also install the +upstream man pages & adjust debian/rules & patch upstream Makefile to do that? + +-------------------------------------------------------------------------------- + +W: sn source: template-uses-unsplit-choices sn - sn/runfrom +- https://lintian.debian.org/tags/template-uses-unsplit-choices.html + +I: sn: spelling-error-in-manpage usr/share/man/man8/snsplit.8.gz avaiable available + +- https://lintian.debian.org/tags/hardening-no-fortify-functions.html +I: sn: hardening-no-fortify-functions usr/sbin/sndelgroup +I: sn: hardening-no-fortify-functions usr/sbin/sndumpdb +I: sn: hardening-no-fortify-functions usr/sbin/snexpire +I: sn: hardening-no-fortify-functions usr/sbin/snfetch +I: sn: hardening-no-fortify-functions usr/sbin/snget +I: sn: hardening-no-fortify-functions usr/sbin/sngetd +I: sn: hardening-no-fortify-functions usr/sbin/snmail +I: sn: hardening-no-fortify-functions usr/sbin/snnewgroup +I: sn: hardening-no-fortify-functions usr/sbin/snntpd.bin +I: sn: hardening-no-fortify-functions usr/sbin/snprimedb +I: sn: hardening-no-fortify-functions usr/sbin/snscan +I: sn: hardening-no-fortify-functions usr/sbin/snsend +I: sn: hardening-no-fortify-functions usr/sbin/snsplit + +- https://lintian.debian.org/tags/hardening-no-bindnow.html +I: sn: hardening-no-bindnow usr/sbin/sndelgroup +I: sn: hardening-no-bindnow usr/sbin/sndumpdb +I: sn: hardening-no-bindnow usr/sbin/snexpire +I: sn: hardening-no-bindnow usr/sbin/snfetch +I: sn: hardening-no-bindnow usr/sbin/snget +I: sn: hardening-no-bindnow usr/sbin/sngetd +I: sn: hardening-no-bindnow usr/sbin/snlockf +I: sn: hardening-no-bindnow usr/sbin/snmail +I: sn: hardening-no-bindnow usr/sbin/snnewgroup +I: sn: hardening-no-bindnow usr/sbin/snntpd.bin +I: sn: hardening-no-bindnow usr/sbin/snprimedb +I: sn: hardening-no-bindnow usr/sbin/snscan +I: sn: hardening-no-bindnow usr/sbin/snsend +I: sn: hardening-no-bindnow usr/sbin/snsplit + +I: sn: debian-news-entry-uses-asterisk +- https://lintian.debian.org/tags/debian-news-entry-uses-asterisk.html +- https://www.debian.org/doc/manuals/developers-reference/ch06.html#bpp-news-debian + +P: sn source: file-contains-trailing-whitespace debian/changelog (line 132) +P: sn source: file-contains-trailing-whitespace debian/changelog (line 133) +P: sn source: file-contains-trailing-whitespace debian/changelog (line 177) +P: sn source: file-contains-trailing-whitespace debian/changelog (line 231) +P: sn source: file-contains-trailing-whitespace debian/changelog (line 262) +P: sn source: file-contains-trailing-whitespace debian/changelog (line 341) +P: sn source: file-contains-trailing-whitespace debian/changelog (line 344) +P: sn source: file-contains-trailing-whitespace debian/changelog (line 352) + + +P: sn source: no-homepage-field + + - No applicable +P: sn source: debian-watch-does-not-check-gpg-signature + +X: sn source: upstream-metadata-file-is-missing + + +-------------------------------------------------------------------------------- + +- Site is still present as HTTP but does not respond to HTTPS access attempts. +I: sn source: debian-watch-uses-insecure-uri http://www.iki.fi/patrik/sn/files/sn-(.*).tar.(gz|bz2) +-------------------------------------------------------------------------------- + +I: sn source: testsuite-autopkgtest-missing + +- I've had some ideas about could be done for the issue of not having that yet; +basically having a script that would create a local.test newsgroup, then post +a msg to it, & then read what was posted. Then add that as the autopkgtest +test script. + +-------------------------------------------------------------------------------- + + +- Public at https://salsa.debian.org/debian/sn + +I have been working on the packaging, including resolving the 'serious' bug [1]. +However, when attempting to test my progress so far, I've run into +issues with the git respository [2]. + +When attempting to do a package build from the git repository (using +'gbp'), the build fails with an error message referring a missing file +'patch-stamp', which had apparently been cleaned up at the start of +the build. Found that the file is indeed in the repository and looks +to have been imported with Debian sn package version 0.3.8-3 some 10 +years ago. I had already found that the so-called 'upstream' branch +also has a 'debian' directory, which is not good for a non-native +package. + +Fortunately I do have a clean sn_0.3.8.orig.tar.gz archive so I've +been working around the issue by doing manual test builds using +'debuild'. That has slowed down working on the package, however... + + + +-------------------------------------------------------------------------------- + diff -Nru sn-0.3.8/INSTALL.run sn-0.3.8/INSTALL.run --- sn-0.3.8/INSTALL.run 2018-11-09 23:12:17.000000000 +0000 +++ sn-0.3.8/INSTALL.run 2004-08-08 13:20:41.000000000 +0000 @@ -3,8 +3,6 @@ file INSTALL. "SNROOT" and "PREFIX" refer to values as you have set in the Makefile. -For Debian, SNROOT=/var/spool/sn and PREFIX=/usr - In the following, remember that (almost) every file and directory under and including SNROOT must be owned be the same user and group. (In some cases the owner may be root instead.) sn won't complain @@ -21,12 +19,12 @@ If you leave out the news server address, the newsgroup will get created as a local one. (You can tell a global group by the symlink news.group.name/.outgoing, which points somewhere - into one of /var/spool/sn/.outgoing/*). A local group doesn't have + into one of SNROOT/.outgoing/*). A local group doesn't have an upstream feed; it gets articles when people post to it. Each newsgroup has at most one upstream feed. If my.isps.server on port PORT requires a username and password: - $ cd /var/spool/sn/.outgoing/my.isps.server:PORT + $ cd SNROOT/.outgoing/my.isps.server:PORT $ echo my-username >username $ echo my-password >password $ chmod 600 username password @@ -42,7 +40,7 @@ it connects. "Optionally" because these lists are usually very long. If you do this, check your email after step 2. - $ echo 'mail me@myhost' >/var/spool/sn/.outgoing/my.isps.server:119/request-list + $ echo 'mail me@myhost' >/SNROOT/.outgoing/my.isps.server:119/request-list Replace "me@myhost" with your email address. You can also replace "mail me@myhost" with any other shell command that will read @@ -80,7 +78,7 @@ The example access control policy here is to permit reading and posting from local clients, and to deny all access to everyone else. The local network is assumed to be 192.168.9.0. For more - complicated posting access control, see the /usr/sbin/SNPOST script, + complicated posting access control, see the PREFIX/sbin/SNPOST script, which can do fine-grain control. The coarse grain posting access here is determined by the POSTING_OK environment variable. @@ -103,22 +101,22 @@ #!/bin/sh # snntpd needs to find snstore if it is to accept news postings. # Replace PREFIX with the real value of PREFIX from the Makefile. - PATH=/usr/sbin:$PATH + PATH=PREFIX/sbin:$PATH export PATH # Enable posting? Can also do this from /etc/hosts.allow POSTING_OK=1; export POSTING_OK # yes # No: unset POSTING_OK # Run snntpd, and log errors in the system log: - /usr/sbin/snntpd /usr/bin/logger -p news.info + PREFIX/sbin/snntpd /usr/bin/logger -p news.info # Run snntpd, and log errors in a log file: - # /usr/sbin/snntpd 2>>/where/you/want/the/snntpd.log + # PREFIX/sbin/snntpd 2>>/where/you/want/the/snntpd.log # End of wrapper script. In /etc/inetd.conf, insert a line: nntp stream tcp nowait root.root /path/to/tcpd /path/to/nntpd - You can change root.root to the owner and group of /var/spool/sn; + You can change root.root to the owner and group of SNROOT; however, snntpd always drops root. Hup inetd and run your newsreader. The news spool can be read @@ -140,9 +138,9 @@ man 1 tcprules for more on this file. Run a command similar to one of the following, and place it somewhere in your rc files when you're happy with it. - Do this as root or as the owner of /var/spool/sn. + Do this as root or as the owner of SNROOT. - $ env - PATH=/usr/sbin:$PATH \ + $ env - PATH=PREFIX/sbin:$PATH \ tcpserver -RHl0 -x news.cdb 0 nntp \ snntpd logger -p news.info & @@ -152,18 +150,18 @@ man tcpserver(1). 4) Crontab entries. The following refers to the crontab for root - or the owner of /var/spool/sn. + or the owner of SNROOT. A line similar to the following will expire old articles: - 0 3 * * * cd /var/spool/sn && /usr/sbin/snexpire * + 0 3 * * * cd SNROOT && PREFIX/sbin/snexpire * man cron(8)/crond(8), crontab(1), crontab(5). 5) You can fetch news automatically whenever you dial up. If you're using pppd, place a line in /etc/ppp/ip-up: - /usr/sbin/snget 2>&1 >/dev/null & + PREFIX/sbin/snget 2>&1 >/dev/null & If you're worried about snget taking up all your bandwidth, use the -h option to snget (see the man page) to throttle @@ -174,7 +172,7 @@ 6) Tuning. After some days or weeks of use, you can start tuning the expiration: - $ echo '10d' >/var/spool/sn/alt.lemmings/.expire + $ echo '10d' >SNROOT/alt.lemmings/.expire expires alt.lemmings in 10 days instead of the default of 7. You can also say '2w' for 2 weeks, or '1m' for one month. @@ -185,7 +183,7 @@ you can enable compression on selected newsgroups, which by now would be easy to identify: - $ touch /var/spool/sn/comp.source-code.big/.compress + $ touch /SNROOT/comp.source-code.big/.compress says new articles entered in comp.source-code.big will be candidates for compression. Old articles won't be touched. Compression and @@ -196,12 +194,12 @@ Deny posting on a per-newsgroup basis: - $ touch /var/spool/sn/alt.usenet.noise.noise.noise/.nopost + $ touch /SNROOT/alt.usenet.noise.noise.noise/.nopost This disallows posting (via "POST" NNTP command) for this group, but permits new articles from it's upstream host. Effectively alt.usenet.noise.noise.noise becomes readonly to users. See the - /usr/sbin/SNPOST script. + PREFIX/sbin/SNPOST script. man snntpd(8). @@ -210,11 +208,11 @@ In one of your system rc scripts, after the filesystems have been mounted and fsck has been run, execute the following: - cd /var/spool/sn + cd SNROOT rm .newsgroup .table .chain find . -type f -name "+*" -exec rm -f {} \; - /usr/sbin/snprimedb -i - /usr/sbin/snscan -n * | /usr/sbin/snprimedb; + PREFIX/sbin/snprimedb -i + PREFIX/sbin/snscan -n * | PREFIX/sbin/snprimedb; This ensures that sn's ID database is in sync with the news spool. diff -Nru sn-0.3.8/lib/cmdopen.c sn-0.3.8/lib/cmdopen.c --- sn-0.3.8/lib/cmdopen.c 2018-11-09 23:12:17.000000000 +0000 +++ sn-0.3.8/lib/cmdopen.c 2004-04-24 23:02:38.000000000 +0000 @@ -6,7 +6,6 @@ */ #include -#include #include #include diff -Nru sn-0.3.8/lib/format.c sn-0.3.8/lib/format.c --- sn-0.3.8/lib/format.c 2018-11-09 23:12:17.000000000 +0000 +++ sn-0.3.8/lib/format.c 2004-04-27 16:52:02.000000000 +0000 @@ -82,10 +82,8 @@ int formats (char *buf, int size, char *fmt, ...) { va_list ap; - int r; va_start(ap, fmt); - r = formatv(buf, size, fmt, ap); + return formatv(buf, size, fmt, ap); va_end(ap); - return r; } diff -Nru sn-0.3.8/lib/Makefile sn-0.3.8/lib/Makefile --- sn-0.3.8/lib/Makefile 2018-11-09 23:12:17.000000000 +0000 +++ sn-0.3.8/lib/Makefile 2002-11-12 20:00:27.000000000 +0000 @@ -2,7 +2,7 @@ stuff.a: set -e; for i in *.c; \ - do $(CC) -c -g $$i -o `basename $$i .c`.o; done + do $(CC) -c -O $$i -o `basename $$i .c`.o; done ar rc stuff.a *.o ranlib stuff.a libstuff.a: stuff.a diff -Nru sn-0.3.8/lib/readln.c sn-0.3.8/lib/readln.c --- sn-0.3.8/lib/readln.c 2018-11-09 23:12:17.000000000 +0000 +++ sn-0.3.8/lib/readln.c 2004-04-24 23:02:38.000000000 +0000 @@ -9,7 +9,6 @@ * Get a single line from an fd. */ -#include #include #include #include diff -Nru sn-0.3.8/Makefile sn-0.3.8/Makefile --- sn-0.3.8/Makefile 2018-11-09 23:12:17.000000000 +0000 +++ sn-0.3.8/Makefile 2004-08-10 12:53:26.000000000 +0000 @@ -15,12 +15,12 @@ #PREFIX =/home/patrik/stow/sn-current ## Where the news spool will be -SNROOT =/var/spool/sn +SNROOT =/var/spool/news #SNROOT =/home/patrik/spool/news ## Where to send mail for the admin if neither the NEWSMASTER nor ## the LOGNAME environment variable is set -DEFAULT_ADMIN_EMAIL =postmaster +DEFAULT_ADMIN_EMAIL =newsmaster # # OS-specific settings. Uncomment only one section below. @@ -45,8 +45,8 @@ CC =gcc LD =gcc -BINDIR =$(DESTDIR)/usr/sbin -MANDIR =$(DESTDIR)/usr/share/man +BINDIR =$(PREFIX)/sbin +MANDIR =$(PREFIX)/man # # You can stop editing here. @@ -63,14 +63,14 @@ BINS =snprimedb snntpd snfetch snexpire snsend \ snmail snget sngetd snscan sndumpdb \ snnewgroup sndelgroup snlockf snsplit -SCRIPTS =SNHELLO SNPOST snnewsq +SCRIPTS =dot-outgoing.ex SNHELLO SNPOST PROGS =$(BINS) $(SCRIPTS) MANS =sn.8 sncat.8 sndelgroup.8 sndumpdb.8 snexpire.8 \ snfetch.8 snget.8 snmail.8 snnewgroup.8 snntpd.8 \ snprimedb.8 snscan.8 sncancel.8 snsend.8 snstore.8 \ -sngetd.8 snsplit.8 snnewsq.8 +sngetd.8 snsplit.8 -all: cc-flags $(OBJS) $(AOBJS) libs $(PROGS) dot-outgoing.ex sed-cmd $(MANS) $(SCRIPTS) +all: cc-flags $(OBJS) $(AOBJS) libs $(PROGS) sed-cmd $(MANS) $(SCRIPTS) cc-flags: echo ' -g -Wall -pedantic -O' >$@.t echo ' -I./lib' >>$@.t @@ -150,8 +150,6 @@ -cd $(BINDIR); rm -f sncat; ln -s snscan sncat -cd $(BINDIR); rm -f sncancel; ln -s snscan sncancel -cd $(BINDIR); rm -f snstore; ln -s snsend snstore - mv $(BINDIR)/snntpd $(BINDIR)/snntpd.bin - install debian/snntpd.wrapper $(BINDIR)/snntpd spoolclean: @echo -n "make $@ will wipe out your news spool! Sure? [y/n] " diff -Nru sn-0.3.8/patch-stamp sn-0.3.8/patch-stamp --- sn-0.3.8/patch-stamp 2018-11-09 23:12:17.000000000 +0000 +++ sn-0.3.8/patch-stamp 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -Patches applied in the Debian version of : - diff -Nru sn-0.3.8/sn.8.in sn-0.3.8/sn.8.in --- sn-0.3.8/sn.8.in 2018-11-09 23:12:17.000000000 +0000 +++ sn-0.3.8/sn.8.in 2002-11-12 20:00:27.000000000 +0000 @@ -54,7 +54,7 @@ .B sn has been tested only against Linux ver. 2.0. It makes heavy use of mmap(2) in MAP_SHARED and MAP_WRITE mode, so it won't work on -pre-1.3.45 or so. I (harold\-sn@nb.com.sg) am interested in bug +pre-1.3.45 or so. I (harold-sn@nb.com.sg) am interested in bug reports, comments, and suggestions. .SH NEWS SPOOL STRUCTURE @@ -119,7 +119,7 @@ aren't running or scheduled to do so. Then run .br -cd !!SNROOT!!; snscan \-n * |snprimedb +cd !!SNROOT!!; snscan -n * |snprimedb .br This will recreate the ID database. @@ -213,14 +213,14 @@ .B Options .B sn programs take -.RI \- d +.RI - d to enable verbose messages (may be repeated), and -.RI \- V , +.RI - V , which displays the version and exits. Where a network timeout is appropriate, this is specified with -.RI \- t\ timeout , +.RI - t\ timeout , in seconds. -.RI \- P +.RI - P indicates the pid should be included in any status output. Other options are possible. diff -Nru sn-0.3.8/sndelgroup.8.in sn-0.3.8/sndelgroup.8.in --- sn-0.3.8/sndelgroup.8.in 2018-11-09 23:12:17.000000000 +0000 +++ sn-0.3.8/sndelgroup.8.in 2002-11-12 20:00:27.000000000 +0000 @@ -12,7 +12,7 @@ after removing the article ID entries in the sn database. Do not use the shell command .br -rm \-rf +rm -rf .RI !!SNROOT!!/ newsgroup .br because that will leave unreclaimed garbage in the database. diff -Nru sn-0.3.8/snexpire.8.in sn-0.3.8/snexpire.8.in --- sn-0.3.8/snexpire.8.in 2018-11-09 23:12:17.000000000 +0000 +++ sn-0.3.8/snexpire.8.in 2002-11-12 20:00:27.000000000 +0000 @@ -5,10 +5,10 @@ system. .SH SYNOPSIS .B snexpire -.RI [\- v ] -.RI [\- exp ] +.RI [- v ] +.RI [- exp ] .IR newsgroup -.RI [[\- exp ] +.RI [[- exp ] .IR newsgroup ]... .br .SH DESCRIPTION @@ -27,8 +27,8 @@ .BR snexpire . .SH OPTIONS -.TP -.RB \- v +.tp +.RB - v Output a line for each article expired. The format of this line is the same as for .BR snscan . @@ -37,7 +37,7 @@ expires all .IR newsgroup s named on the command line. Each newsgroup may be preceded by -.RI \- exp +.RI - exp to control the expiration age. .I exp is of the form @@ -47,12 +47,12 @@ is a number, followed by one of the characters .IR h , d , w , m , y representing hours, days, weeks, months and years. The default for -.RI \- exp +.RI - exp is a compile-time fixed. Each -.RI [\- exp ] +.RI [- exp ] applies to the next newsgroup only, any newsgroups after that one get default treatment unless overridden by another -.RI [\- exp ]. +.RI [- exp ]. .SH FILES MODIFIED .RI !!SNROOT!!/ newsgroup /.times, @@ -72,6 +72,6 @@ If this exists, its contents are taken to be .I exp if not overridden by -.RI \- exp +.RI - exp on the command line. diff -Nru sn-0.3.8/snfetch.8.in sn-0.3.8/snfetch.8.in --- sn-0.3.8/snfetch.8.in 2018-11-09 23:12:17.000000000 +0000 +++ sn-0.3.8/snfetch.8.in 2002-11-12 20:00:27.000000000 +0000 @@ -3,9 +3,9 @@ snfetch \- fetch articles. .SH SYNOPSIS .B snfetch -.RI [\- r ] -.RI [\- t\ timeout ] -.RI [\- c\ depth ] +.RI [- r ] +.RI [- t\ timeout ] +.RI [- c\ depth ] .IR group\ [ serial \ [ max ]] .br .SH DESCRIPTION @@ -47,7 +47,7 @@ .SH OPTIONS .TP -.RI \- t\ timeout +.RI - t\ timeout .B snfetch will wait only .I timeout @@ -55,14 +55,14 @@ respond. .TP -.RI \- r +.RI - r Output in news batch format instead. All articles will take the .B #! rnews form only, even if there is just one article, all lines end in bare linefeed, and dot-unquoting is performed. .TP -.RI \- c\ depth +.RI - c\ depth Employ a command pipeline of depth .IR depth . NNTP command pipelining is not officially sanctioned, so by default diff -Nru sn-0.3.8/snget.8.in sn-0.3.8/snget.8.in --- sn-0.3.8/snget.8.in 2018-11-09 23:12:17.000000000 +0000 +++ sn-0.3.8/snget.8.in 2003-10-23 18:59:31.000000000 +0000 @@ -10,11 +10,11 @@ .RI [ options ] .br .IR options : -.RI [\- d ] -.RI [\- h\ Bps ] -.RI [\- p\ nparallel ] -.RI [\- c\ depth ] -.RI [\- m\ max ] +.RI [- d ] +.RI [- h\ Bps ] +.RI [- p\ nparallel ] +.RI [- c\ depth ] +.RI [- m\ max ] .SH DESCRIPTION .B snget @@ -54,7 +54,7 @@ .SH OPTIONS .TP -.RI \- d +.RI - d Enable verbosity, may be specified multiple times. This option is also propagated to .B snfetch @@ -62,13 +62,13 @@ .BR snstore . .TP -.RI \- p\ nparallel +.RI - p\ nparallel Attempt to fetch for .I nparallel newsgroups at once. Default is 4, maximum is 8. .TP -.RI \- h\ Bps +.RI - h\ Bps Throttle the sum of bandwidth used by all .BR snfetch es to @@ -80,14 +80,14 @@ from hogging the network. By default there is no throttling. .TP -.RI \- c\ depth +.RI - c\ depth .I depth is passed to .B snfetch as the depth of the command pipeline. .TP -.RI \- m\ max +.RI - m\ max The very first time contacting the news server, retrieve no more than .I max @@ -98,7 +98,7 @@ .BR snfetch (8)). .TP -.RI \- t\ timeout +.RI - t\ timeout This option is not documented because it is ignored and will disappear in a future release. See .B .timeout @@ -150,14 +150,14 @@ .TP .B SIGUSR1 If -.RI \- h\ Bps +.RI - h\ Bps was specified, .I Bps is halved, else is ignored. .TP .B SIGUSR2 If -.RI \- h\ Bps +.RI - h\ Bps was specified, .I Bps is doubled, else is ignored. diff -Nru sn-0.3.8/SNHELLO.in sn-0.3.8/SNHELLO.in --- sn-0.3.8/SNHELLO.in 2018-11-09 23:12:17.000000000 +0000 +++ sn-0.3.8/SNHELLO.in 2004-08-08 13:16:51.000000000 +0000 @@ -105,10 +105,8 @@ if [ "x$CODE" != x240 ]; then rmcr <$art; # XXX Problem with LOGNAME if snget started by pppd - mail -s "Posting failed at $SERVER ($CODE $SAID)" ${NEWSMASTER:-${LOGNAME:-!!DEFAULT_ADMIN_EMAIL!!}} <$tmp || + mail -s "Posting failed ($CODE $SAID)" ${NEWSMASTER:-${LOGNAME:-!!DEFAULT_ADMIN_EMAIL!!}} <$tmp || end "Can't run mail" - else - echo "Article successfully posted at $SERVER." fi rm -f $art done diff -Nru sn-0.3.8/snmail.8.in sn-0.3.8/snmail.8.in --- sn-0.3.8/snmail.8.in 2018-11-09 23:12:17.000000000 +0000 +++ sn-0.3.8/snmail.8.in 2004-04-29 00:51:23.000000000 +0000 @@ -3,7 +3,7 @@ snmail \- mail-to-news filter .SH SYNOPSIS .B snmail -.RI [\- sP ] +.RI [- sP ] .RI [ listname .RI [ prefix ]] .br @@ -62,13 +62,13 @@ .SH OPTIONS .TP -.RI \- s +.RI - s Pipe output to .B snstore directly, do not write to standard output. This is so the exit status is not lost in a shell pipeline. If you use this flag, it is also a good idea to also use -.RI \- c +.RI - c (tell .B snstore to check if article already exists). @@ -78,10 +78,10 @@ also accepts options intended for .BR snstore , viz. -.RI \- c , -.RI \- v , +.RI - c , +.RI - v , and -.RI \- n , +.RI - n , and these are passed on uninterpreted. .SH ARGUMENTS @@ -143,7 +143,7 @@ .TP .B PATH If -.RI \- s +.RI - s was specified, determines where to look for .BR snstore , before looking in !!BINDIR!!. diff -Nru sn-0.3.8/snmail.c sn-0.3.8/snmail.c --- sn-0.3.8/snmail.c 2018-11-09 23:12:17.000000000 +0000 +++ sn-0.3.8/snmail.c 2004-07-28 18:56:20.000000000 +0000 @@ -43,7 +43,6 @@ #include #include #include -#include int debug = 0; @@ -56,7 +55,7 @@ struct b references = { 0, }; struct readln input = { 0, }; -void memerr (void) { fail(EX_OSERR, "No memory"); } +void memerr (void) { fail(2, "No memory"); } /* * Construct a References: line @@ -193,7 +192,7 @@ return 0; } -void usage (void) { fail(EX_USAGE, "Usage:%s [-scanv] [listname [prefix]]", progname); } +void usage (void) { fail(1, "Usage:%s [-scanv] [listname [prefix]]", progname); } int main (int argc, char **argv) { @@ -211,7 +210,7 @@ parameters(FALSE); if (-1 == chdir(snroot)) - FAIL(EX_TEMPFAIL, "Can't chdir(%s):%m", snroot); + FAIL(2, "Can't chdir(%s):%m", snroot); newsgroup = 0; s = 1; @@ -230,7 +229,7 @@ default: usage(); } if (s >= sizeof (storeopts)) - fail(EX_USAGE, "Too many options"); + fail(1, "Too many options"); } if (opt_ind < argc) newsgroup = argv[opt_ind++]; @@ -241,14 +240,14 @@ } if (-1 == readln_ready(0, 0, &input)) - FAIL(EX_OSERR, "readln_ready:%m"); + FAIL(2, "readln_ready:%m"); if (storepid != 0) { char *args[3]; storeopts[s] = '\0'; - args[0] = "/usr/sbin/snstore"; + args[0] = "snstore"; i = 1; if (s > 1) { @@ -258,7 +257,7 @@ args[i] = 0; set_path_var(); if ((storepid = cmdopen(args, 0, &fd)) <= 0) - fail(EX_OSERR, "Can't exec snstore:%m?"); + fail(2, "Can't exec snstore:%m?"); } else fd = 1; @@ -267,8 +266,8 @@ switch (unfold(&input, switchline)) { case 0: _exit(0); - case -1: fail(EX_TEMPFAIL, "Read or memory error:%m"); - case -2: case -3: fail(EX_DATAERR, "Bad message format"); + case -1: fail(2, "Read or memory error:%m"); + case -2: case -3: fail(3, "Bad message format"); } if (references.buf == NULL && in_reply_to != NULL) { @@ -277,7 +276,7 @@ } if (!newsgroup) if (!(newsgroup = suffix)) - FAIL(EX_NOUSER, "No newsgroup specified"); + FAIL(1, "No newsgroup specified"); i = strlen(newsgroup) + strlen(prefix); if (!(fullnewsgroup = malloc(i + 1))) diff -Nru sn-0.3.8/snnewsq.8.in sn-0.3.8/snnewsq.8.in --- sn-0.3.8/snnewsq.8.in 2018-11-09 23:12:17.000000000 +0000 +++ sn-0.3.8/snnewsq.8.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -.TH snnewsq,v!!VERSION!! 8 "Andras BALI" "N.B." \" -*- nroff -*- -.SH NAME -snnewsq \- show a list of outgoing news articles -.SH SYNOPSIS -.B snnewsq -(no arguments) -.br -.SH DESCRIPTION -.B snnewsq -shows a list of outgoing news articles in the -.B sn -spool (in no particular order) - -.SH ENVIRONMENT VARIABLES -.TP -.B SNROOT -If this is set and is not empty, the value is used in place of -.BR !!SNROOT!! , -the default news spool directory. diff -Nru sn-0.3.8/snnewsq.in sn-0.3.8/snnewsq.in --- sn-0.3.8/snnewsq.in 2018-11-09 23:12:17.000000000 +0000 +++ sn-0.3.8/snnewsq.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -#!/bin/sh - -# news queue statistics for sn -# by Andras BALI -# modified by Jorgen Schaefer - -SNSPOOL=${SNROOT:-!!SNROOT!!} - -for i in $SNSPOOL/.outgoing/*; do - if [ "$i" = "$SNSPOOL/.outgoing/*" ] - then - echo "Can't read from $SNSPOOL/.outgoing/, exiting." - break - fi - servername=$(basename $i | cut -d: -f1) - files=$(find $i/ -type f -not -name .lock \ - -not -name .last-list \ - -not -name password \ - -not -name username) - if [ -z "$files" ]; then - echo No outgoing articles for $servername - else - NUM=$(echo "$files" | wc -l | tr -d ' ') - if [ $NUM -eq 1 ]; then ARTICLES=article ; else ARTICLES=articles ; fi - echo $NUM outgoing $ARTICLES for $servername: - k=1 - echo "$files" | while read j; do - echo -n "-> $k. "; grep "Newsgroups: " $j | head -1 - echo -n " "; grep "Subject: " $j | head -1 - echo -n " "; grep "Date: " $j | head -1 - k=$((k + 1)) - done - fi -done diff -Nru sn-0.3.8/snntpd.8.in sn-0.3.8/snntpd.8.in --- sn-0.3.8/snntpd.8.in 2018-11-09 23:12:17.000000000 +0000 +++ sn-0.3.8/snntpd.8.in 2003-10-23 18:59:31.000000000 +0000 @@ -3,9 +3,9 @@ snntpd \- small news server .SH SYNOPSIS .B snntpd -.RI [\- t\ timeout ] -.RI [\- P ] -.RI [\- S ] +.RI [- t\ timeout ] +.RI [- P ] +.RI [- S ] .RI [ logger ...] .br .SH DESCRIPTION @@ -28,18 +28,18 @@ .SH OPTIONS .TP -.RI \- t\ timeout +.RI - t\ timeout specifies how long .B snntpd should wait for input before it gives up and exits. .I timeout is in seconds and defaults to 600. .TP -.RI \- P +.RI - P .B snntpd includes it's pid in log output. .TP -.RI \- S +.RI - S Suppress NNTP greeting on startup. This is useful if you want to perform authentication before running .BR snntpd , diff -Nru sn-0.3.8/SNPOST.in sn-0.3.8/SNPOST.in --- sn-0.3.8/SNPOST.in 2018-11-09 23:12:17.000000000 +0000 +++ sn-0.3.8/SNPOST.in 2004-08-08 13:20:41.000000000 +0000 @@ -76,12 +76,10 @@ { echo "X-sn-Newsgroups: $postable" - test -r /etc/news/organization && \ - echo Organization: `/bin/cat /etc/news/organization` # VERIFIED_SENDER is inherited from the authenticating script that # invoked snntpd, if any. [ "x$VERIFIED_SENDER" = x ] || echo "Sender: $VERIFIED_SENDER" - /bin/cat + cat } | snsend -v || fail "Unable to post" echo "Posted to $postable" : Success diff -Nru sn-0.3.8/snprimedb.8.in sn-0.3.8/snprimedb.8.in --- sn-0.3.8/snprimedb.8.in 2018-11-09 23:12:17.000000000 +0000 +++ sn-0.3.8/snprimedb.8.in 2002-11-12 20:00:27.000000000 +0000 @@ -3,7 +3,7 @@ snprimedb \- feed the sn database. .SH SYNOPSIS .B snprimedb -.RB [\- i ] +.RB [- i ] (no arguments) .br .SH DESCRIPTION @@ -21,7 +21,7 @@ .BR snscan . If the option -.RB \- i +.RB - i is given, simply initialize the database files if they do not exist, and exit. @@ -80,5 +80,5 @@ .TP .RI !!SNROOT!! /.newsgroup to attach an integer identifier to each newsgroup name. -This file is a human\-readable flat text file. +This file is a human-readable flat text file. diff -Nru sn-0.3.8/snscan.8.in sn-0.3.8/snscan.8.in --- sn-0.3.8/snscan.8.in 2018-11-09 23:12:17.000000000 +0000 +++ sn-0.3.8/snscan.8.in 2002-11-12 20:19:18.000000000 +0000 @@ -20,10 +20,10 @@ .IR articlespec ... .br .IR options : -.RI [\- n ] -.RI [\- s +.RI [- n ] +.RI [- s .IR since ] -.RI [\- o +.RI [- o .IR outputfile ] .br .SH DESCRIPTION @@ -67,7 +67,7 @@ .I range is .br -.IR serial [\-[ toserial ]] +.IR serial [-[ toserial ]] .br (where .I toserial @@ -87,7 +87,7 @@ .B Specify by articles message ID Here .I articlespec is -.RI \- i +.RI - i .IR id ... .br where each @@ -96,7 +96,7 @@ .SH OPTIONS .TP -.RB \- n +.RB - n This option weeds out articles that are aliases. If an article is crossposted, there will be an original copy, the others will be aliases to it. @@ -104,7 +104,7 @@ the original copy. .TP -.IB \- s since +.IB - s since This option weeds out articles that were obtained before .IR since . .I since @@ -119,7 +119,7 @@ can be any non-digit character. .TP -.IB \- o outputfile +.IB - o outputfile Write output to .I outputfile instead of descriptor 1. Sometimes you just don't feel like using @@ -134,11 +134,11 @@ Display information on article 4, and also articles 12 to the most recent article, from linux.lemmings. .TP -sncat \-n \-s 1998/4/1 linux.lemmings +sncat -n -s 1998/4/1 linux.lemmings Display all articles that are not aliases, and which were entered after April 1 1998, from linux.lemmings. .TP -snscan \-i '123@myhost' +snscan -i '123@myhost' Display information on the article whose ID is .BR <123@myhost> , in whichever newsgroup it is found. diff -Nru sn-0.3.8/snsend.8.in sn-0.3.8/snsend.8.in --- sn-0.3.8/snsend.8.in 2018-11-09 23:12:17.000000000 +0000 +++ sn-0.3.8/snsend.8.in 2002-11-12 20:00:27.000000000 +0000 @@ -6,10 +6,10 @@ .SH SYNOPSIS .B snsend -.RI [\- rvcna ] +.RI [- rvcna ] .br .B snstore -.RI [\- rvcna ] +.RI [- rvcna ] .SH DESCRIPTION .B snsend @@ -126,20 +126,20 @@ equally. .TP -.RB \- r +.RB - r The article stream is in rnews batch format, rather than wire format. Only the .B #! rnews form is understood. .TP -.RB \- c +.RB - c If an article already exists in the local newsgroup it is destined for, don't store it there. For .BR snsend , this option has no effect on newsgroups that are not local. .TP -.RB \- a +.RB - a (Aliases not allowed.) When storing to multiple local newsgroups, do not alias subsequent copies to the first, instead, make a copy. Aliasing saves disk @@ -147,11 +147,11 @@ This option has no effect on newsgroups that are not local. .TP -.RB \- n +.RB - n Don't actually do anything with the article, just dump it back onto descriptor 1. .TP -.RB \- v +.RB - v For each article stored in each newsgroup, output a line to descriptor 1 similar to what .B snscan diff -Nru sn-0.3.8/snsplit.8.in sn-0.3.8/snsplit.8.in --- sn-0.3.8/snsplit.8.in 2018-11-09 23:12:17.000000000 +0000 +++ sn-0.3.8/snsplit.8.in 2002-11-12 20:00:27.000000000 +0000 @@ -3,8 +3,8 @@ snsplit \- split an article stream into individual articles .SH SYNOPSIS .B snsplit -.RI [\- r ] -.RI [ field ...\ \-] +.RI [- r ] +.RI [ field ...\ -] .IR prog ... .br .SH DESCRIPTION @@ -35,7 +35,7 @@ aborts. .TP -.IR field ...\- +.IR field ...- are optional header field names. If these are specified, the value of the first header field of that name will be exported into the environment. This @@ -46,7 +46,7 @@ .SH OPTIONS .TP -.RB \- r +.RB - r Expect input articles in rnews batch format instead. .SH ENVIRONMENT diff -Nru sn-0.3.8/store.c sn-0.3.8/store.c --- sn-0.3.8/store.c 2018-11-09 23:12:17.000000000 +0000 +++ sn-0.3.8/store.c 2004-04-24 23:02:38.000000000 +0000 @@ -51,11 +51,7 @@ #endif extern int rename (const char *old, const char *new); - -/* Already defined in a glibc-supplied header on Alpha (forcer@debian.org) */ -#if !defined(__alpha) && !defined(__GLIBC__) extern ssize_t writev(); /* Slackware 4 needs this */ -#endif struct storeobj { char *filename;