-diff -Nur inn-2.2.1.orig/include/paths.h.in inn-2.2.1/include/paths.h.in
---- inn-2.2.1.orig/include/paths.h.in Tue Oct 13 14:18:45 1998
-+++ inn-2.2.1/include/paths.h.in Sat Oct 23 15:40:40 1999
-@@ -14,7 +14,7 @@
- */
+diff -ur inn-2.3.1.orig/Makefile inn-2.3.1/Makefile
+--- inn-2.3.1.orig/Makefile Thu Jan 11 09:55:23 2001
++++ inn-2.3.1/Makefile Sun Jan 21 02:42:15 2001
+@@ -65,7 +65,7 @@
+ ## Installation rules. make install installs everything; make update only
+ ## updates the binaries, scripts, and documentation and leaves config
+ ## files alone.
+-install: directories
++install:
+ @for D in $(ALLDIRS) ; do \
+ echo '' ; \
+ cd $$D && $(MAKE) install || exit 1 ; cd .. ; \
+@@ -81,7 +81,7 @@
+ directories:
+ @chmod +x support/install-sh
+ for D in $(INSTDIRS) ; do \
+- support/install-sh $(OWNER) -m 0755 -d $$D ; \
++ support/install-sh -m 0755 -d $(DESTDIR)$$D ; \
+ done
+ support/install-sh $(OWNER) -m 0750 -d $(PATHRUN)
+
+diff -ur inn-2.3.1.orig/include/paths.h.in inn-2.3.1/include/paths.h.in
+--- inn-2.3.1.orig/include/paths.h.in Thu Jan 11 09:55:23 2001
++++ inn-2.3.1/include/paths.h.in Sun Jan 21 02:41:21 2001
+@@ -15,12 +15,12 @@
+ /* Default prefix path is pathbin. */
#define _PATH_NNRPD "nnrpd"
#define _PATH_NNTPD "nnrpd"
-#define _PATH_AUTHDIR "auth"
-+#define _PATH_AUTHDIR "/usr/share/news/auth"
++#define _PATH_AUTHDIR "/usr/lib/news/auth"
+ #define _PATH_AUTHDIR_GENERIC "generic"
+ #define _PATH_AUTHDIR_NOPASS "resolv"
+ #define _PATH_AUTHDIR_PASSWD "passwd"
#define _PATH_CTLINND "ctlinnd"
- #define _PATH_RNEWSPROGS "rnews.libexec"
- /* Prefix path is pathfilter */
-diff -Nur inn-2.2.1.orig/Makefile inn-2.2.1/Makefile
---- inn-2.2.1.orig/Makefile Wed Aug 25 17:25:55 1999
-+++ inn-2.2.1/Makefile Mon Nov 1 14:27:31 1999
-@@ -44,7 +44,7 @@
- ## Directories where files get put.
- directories:
- chmod +x ./makedirs.sh
-- DESTDIR=$(DESTDIR) ./makedirs.sh;
-+ DESTDIR=$(DESTDIR) ./makedirs.sh -p;
+-#define _PATH_RNEWSPROGS "rnews.libexec"
++#define _PATH_RNEWSPROGS "/usr/lib/news/rnews"
- ## Other generic targets.
- depend tags ctags profiled:
-diff -Nur inn-2.2.1.orig/Makefile inn-2.2.1/Makefile
---- inn-2.2.1.orig/Makefile Wed Aug 25 17:25:55 1999
-+++ inn-2.2.1/Makefile Mon Oct 18 22:37:40 1999
-@@ -34,7 +34,7 @@
- $(MAKE) $(FLAGS) WHAT_TO_MAKE=all DESTDIR=$(DESTDIR) common
+ /* Default prefix path is pathfilter. */
+ #define _PATH_TCL_STARTUP "startup.tcl"
+diff -ur inn-2.3.1.orig/doc/man/rnews.1~ inn-2.3.1/doc/man/rnews.1
+--- inn-2.3.1/doc/man/rnews.1~ Thu Jan 11 09:55:23 2001
++++ inn-2.3.1/doc/man/rnews.1 Sun Jan 21 06:10:42 2001
+@@ -67,7 +67,7 @@
+ is defined and the command is any other word, then
+ .I rnews
+ will try to execute a program with that name in the directory
+-.IR <pathbin\ in\ inn.conf>/bin/rnews.libexec .
++.IR /usr/lib/news/rnews .
- ## Install everything.
--install: directories
-+install:
- $(MAKE) $(FLAGS) WHAT_TO_MAKE=install DESTDIR=$(DESTDIR) common
- @echo "" ; echo Do not forget to update your cron entries.
- @echo Also run makehistory if you have to.
-diff -ur inn-2.2.2.orig/samples/scanlogs.in inn-2.2.2/samples/scanlogs.in
---- inn-2.2.2.orig/samples/scanlogs.in Mon Dec 13 14:18:37 1999
-+++ inn-2.2.2/samples/scanlogs.in Sun Jan 30 01:12:20 2000
-@@ -10,7 +10,7 @@
+ The batch will be fed into the program's standard input, and the
+ standard output will be read back as input into
+diff -ur inn-2.3.1.orig/scripts/scanlogs.in inn-2.3.1/scripts/scanlogs.in
+--- inn-2.3.1.orig/scripts/scanlogs.in Thu Jan 11 09:55:23 2001
++++ inn-2.3.1/scripts/scanlogs.in Sun Jan 21 02:42:37 2001
+@@ -11,7 +11,7 @@
## then get a better egrep, like the FSF one.
## Directory where old log files are kept.
## If you want to archive the active file, enable this line.
ACTIVEFILE=${ACTIVE}
## Number of lines of error in each category to report.
+diff -ur inn-2.3.1.orig/Makefile.global.in~ inn-2.3.1/scripts/Makefile.global.in
+--- inn-2.3.1/Makefile.global.in~ Thu Jan 11 09:55:23 2001
++++ inn-2.3.1/Makefile.global.in Sun Jan 21 05:08:12 2001
+@@ -179,15 +179,6 @@
+ ## configure; inews and rnews are special and have configure flags to
+ ## control how they're installed. See INSTALL for more information.
+
+-NEWSUSER = @NEWSUSER@
+-NEWSGROUP = @NEWSGRP@
+-
+-INEWSMODE = @INEWSMODE@
+-RNEWSMODE = @RNEWSMODE@
+-
+-OWNER = -o $(NEWSUSER) -g $(NEWSGROUP)
+-ROWNER = -o $(NEWSUSER) -g @RNEWSGRP@
+-
+ INSTALL = ../support/install-sh -c
+
+ ## Installation commands. These commands are used by the installation
-## $Revision$
-## inn.conf -- inn configuration data
+## $Id$
+##
+## inn.conf -- INN configuration data
+##
## Format:
-## <parameter>:<whitespace><value>
+## <parameter>:<whitespace><value>
##
-## See the inn.conf(5) man page for a full description of each
-## of these options
+## Blank values are allowed for certain parameters.
##
-## Blank values are allowed for certain parameters
-## ---------------------------------
-# All parameters must exist
-#
-organization:
-server: localhost
-pathhost: localhost
-moderatormailer:
+## See the inn.conf(5) man page for a full description of each of these
+## options. This sample file is divided into two sections; first, there
+## are the parameters that must be set (or should be set in nearly all
+## cases), and then all parameters are given with their defaults for
+## reference in the same order and with the same organization as the
+## inn.conf(5) documentation.
+
+# The following parameters are most likely to need setting, although the
+# defaults generated by configure may be reasonable.
+
+mta: /usr/lib/sendmail -oi %s
+organization: A poorly-installed InterNetNews site
+ovmethod: tradindexed
+pathhost: localhost
+pathnews: /usr
+
+# General Settings
+
domain:
-fromhost:
-pathalias:
-complaints: abuse@localhost
-mta: /usr/lib/sendmail -oi %s
-mailcmd: /usr/bin/innmail
-checkincludedtext: false
-maxforks: 10
-maxartsize: 1000000
-nicekids: 0
-nicenewnews: 0
-verifycancels: true
-logcancelcomm: true
-wanttrash: false
-remembertrash: true
-linecountfuzz: 0
-peertimeout: 3600
-clienttimeout: 1800
-allownewnews: false
-localmaxartsize: 1000000
-logartsize: true
-logipaddr: true
-logsitename: true
-maxconnections: 50
-artcutoff: 14
-icdsynccount: 10
-hiscachesize: 0
-readertrack: false
-strippostcc: false
-status: 0
-timer: 0
-readerswhenstopped: false
-noreader: false
-extendeddbz: false
-nnrpdoverstats: false
-storeonxref: true
-nnrpdcheckart: true
-storemsgid: true
-usecontrolchan: true
-mergetogroups: false
-backoffauth: false
-backoffdb: /var/lib/news/backoff
-backoffpostfast: 0L
-backoffpostslow: 1L
-backofftrigger: 10000L
-mimeversion:
-mimecontenttype:
-mimeencoding:
-refusecybercancels: false
-activedenable: true
-activedupdate: 30
-activedport: 1119
-nnrpperlauth: false
-#
-#
-# These options are unlikely to need changing in most situations
-#
-chaninacttime: 600
-chanretrytime: 300
-pauseretrytime: 300
-nntplinklog: false
-nntpactsync: 200
-badiocount: 5
-blockbackoff: 120
-#
-# ---------------------------------
-# Changing these options can have an effect on the way articles are
-# stored and may require recreating the spool and/or database files
-#
-wireformat: false
-xrefslave: false
-nnrpdposthost:
-nnrpdpostport: 119
-spoolfirst: false
-writelinks: true
-storageapi: true
-articlemmap: false
-overviewmmap: true
+innflags:
+mailcmd: /usr/bin/innmail
+server: localhost
+
+# Feed Configuration
+
+artcutoff: 14
bindaddress: all
+hiscachesize: 0
+ignorenewsgroups: false
+immediatecancel: false
+linecountfuzz: 0
+maxartsize: 1000000
+maxconnections: 50
+pathalias:
+pgpverify: false
+port: 119
+refusecybercancels: false
+remembertrash: true
sourceaddress: any
-port: 119
-#
-## Keywords-in-overview options
-## Enabling this without stopping innd and deleting the existing overview
-## database and adding will probably confuse a lot of things. You must
-## have compiled this support in too.
-#
-keywords: false
-keylimit: 512
-keyartlimit: 100000
-keymaxwords: 250
-#
-# Other options
-innflags:
-doinnwatch: true
-innwatchsleeptime: 600
-pgpverify: false
-controlfailnotice: false
-logcycles: 3
-innwatchpauseload: 1500
-innwatchhiload: 2000
-innwatchloload: 1000
-innwatchspoolspace: 8000
-innwatchbatchspace: 800
-innwatchlibspace: 25000
-innwatchspoolnodes: 200
-docnfsstat: true
-#
-# ---------------------------------
-# Paths to various aspects of the news system
-#
-pathnews: /usr
-pathbin: /usr/bin
-pathfilter: /usr/share/news/filter
-pathcontrol: /usr/share/news/control
-pathdb: /var/lib/news
-pathetc: /etc/news
-pathrun: /var/run/news
-pathlog: /var/log/news
-pathhttp: /var/log/news
-pathtmp: /var/spool/news/incoming/tmp
-pathspool: /var/spool/news
-patharticles: /var/spool/news/articles
-pathoverview: /var/spool/news/overview
-pathoutgoing: /var/spool/news/outgoing
-pathincoming: /var/spool/news/incoming
-patharchive: /var/spool/news/archive
-pathuniover: /var/spool/news/uniover
-overviewname: .overview
-addressfamily: AF_INET6
-#
-# ---------------------------------
+usecontrolchan: true
+verifycancels: true
+wanttrash: false
+wipcheck: 5
+wipexpire: 10
+
+# Article Storage
+
+cnfscheckfudgesize: 0
+enableoverview: true
+groupbaseexpiry: true
+mergetogroups: false
+overcachesize: 15
+ovgrouppat:
+storeonxref: false
+useoverchan: false
+wireformat: false
+xrefslave: false
+
+# Reading
+
+allownewnews: false
+articlemmap: false
+clienttimeout: 1800
+nnrpdcheckart: true
+nnrpperlauth: false
+nnrppythonauth: false
+noreader: false
+readerswhenstopped: false
+readertrack: false
+
+# Reading -- Keyword Support
#
+# Enabling this without stopping innd and deleting the existing overview
+# database and adding will probably confuse a lot of things. You must
+# have compiled this support in too.
+
+keywords: false
+keyartlimit: 100000
+keylimit: 512
+keymaxwords: 250
+
+# Posting
+
+addnntppostingdate: true
+addnntppostinghost: true
+checkincludedtext: false
+complaints: abuse@localhost
+fromhost:
+localmaxartsize: 1000000
+moderatormailer:
+nnrpdauthsender: false
+nnrpdposthost:
+nnrpdpostport: 119
+spoolfirst: false
+strippostcc: false
+
+# Posting -- Exponential Backoff
+
+backoffauth: false
+backoffdb: /var/lib/news/backoff
+backoffk: 1
+backoffpostfast: 0
+backoffpostslow: 1
+backofftrigger: 10000
+
+# Monitoring
+
+doinnwatch: true
+innwatchbatchspace: 800
+innwatchlibspace: 25000
+innwatchloload: 1000
+innwatchhiload: 2000
+innwatchpauseload: 1500
+innwatchsleeptime: 600
+innwatchspoolnodes: 200
+innwatchspoolspace: 25000
+
+# Logging
+
+docnfsstat: true
+logartsize: true
+logcancelcomm: false
+logcycles: 3
+logipaddr: true
+logsitename: true
+nnrpdoverstats: false
+nntpactsync: 200
+nntplinklog: false
+status: 0
+timer: 0
+
+# System Tuning
+
+badiocount: 5
+blockbackoff: 120
+chaninacttime: 600
+chanretrytime: 300
+icdsynccount: 10
+maxforks: 10
+nicekids: 0
+nicenewnews: 0
+nicennrpd: 0
+pauseretrytime: 300
+peertimeout: 3600
+rlimitnofile: -1
+
+# Paths
+
+pathdb: /var/lib/news
+pathspool: /var/spool/news
+patharchive: /var/spool/news/archive
+patharticles: /var/spool/news/articles
+pathincoming: /var/spool/news/incoming
+pathoutgoing: /var/spool/news/outgoing
+pathoverview: /var/spool/news/overview
+pathtmp: /var/spool/news/incoming/tmp
+pathcontrol: /usr/share/news/control
+pathfilter: /usr/share/news/filter
+pathetc: /etc/news
+pathbin: /usr/bin
+pathhttp: /var/log/news
+pathlog: /var/log/news
+pathrun: /var/run/news
+
+# for IPv6 support
+
+listenonipv6: yes
-diff -ur inn-2.2.2.orig/Makefile.global.in inn-2.2.2/Makefile.global.in
---- inn-2.2.2.orig/Makefile.global.in Mon Dec 13 14:18:37 1999
-+++ inn-2.2.2/Makefile.global.in Sat Jan 29 22:56:17 2000
-@@ -38,6 +38,7 @@
- TCLLIB = @TCL_LIB@
- TCLINC = @TCL_INC@
- EXTRA_SRC = @EXTRA_SRC@
-+INSTALL = @INSTALL@
-
- OWNER = -O @NEWSUSER@ -G @NEWSGRP@
- ROWNER = -O @NEWSUSER@ -G uucp
-Only in inn-2.2.2: Makefile.global.in~
-diff -ur inn-2.2.2.orig/backends/Makefile inn-2.2.2/backends/Makefile
---- inn-2.2.2.orig/backends/Makefile Mon Dec 13 14:18:37 1999
-+++ inn-2.2.2/backends/Makefile Sat Jan 29 22:46:54 2000
-@@ -17,8 +17,8 @@
-
- install: all
- for i in ${ALL}; \
-- do $(LIBTOOL) ../installit.sh $(OWNER) -m 0555 \
-- -b .OLD $${i} $D${PATHBIN}/$${i}; \
-+ do $(LIBTOOL) --mode=install $(INSTALL) -m 0555 \
-+ $${i} $D${PATHBIN}; \
- done
-
- clobber clean:
-Only in inn-2.2.2/backends: Makefile~
-diff -ur inn-2.2.2.orig/configure.in inn-2.2.2/configure.in
---- inn-2.2.2.orig/configure.in Mon Dec 13 14:18:37 1999
-+++ inn-2.2.2/configure.in Sat Jan 29 22:57:07 2000
-@@ -129,6 +129,7 @@
- AC_PROG_YACC
- AC_PROG_LEX
- AC_PROG_RANLIB
-+AC_PROG_INSTALL
-
- dnl System specific
- AC_AIX
-Only in inn-2.2.2: configure.in~
-diff -ur inn-2.2.2.orig/expire/Makefile inn-2.2.2/expire/Makefile
---- inn-2.2.2.orig/expire/Makefile Mon Dec 13 14:18:37 1999
-+++ inn-2.2.2/expire/Makefile Sat Jan 29 22:49:09 2000
-@@ -85,25 +85,25 @@
-
- ## Low-level install actions.
- $D$(PATHBIN)/convdate: convdate
-- $(LIBTOOL) ../installit.sh $(OWNER) -m 0555 -b .OLD $? $@
-+ $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN)
- $D$(PATHBIN)/expire: expire
-- $(LIBTOOL) ../installit.sh $(OWNER) -m 0555 -b .OLD $? $@
-+ $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN)
- $D$(PATHBIN)/expireover: expireover
-- $(LIBTOOL) ../installit.sh $(OWNER) -m 0555 -b .OLD $? $@
-+ $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN)
- $D$(PATHBIN)/expireindex: expireindex
-- $(LIBTOOL) ../installit.sh $(OWNER) -m 0555 -b .OLD $? $@
-+ $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN)
- $D$(PATHBIN)/fastrm: fastrm
-- $(LIBTOOL) ../installit.sh $(OWNER) -m 0555 -b .OLD $? $@
-+ $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN)
- $D$(PATHBIN)/grephistory: grephistory
-- $(LIBTOOL) ../installit.sh $(OWNER) -m 0555 -b .OLD $? $@
-+ $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN)
- $D$(PATHBIN)/makeactive: makeactive
-- $(LIBTOOL) ../installit.sh $(OWNER) -m 0555 -b .OLD $? $@
-+ $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN)
- $D$(PATHBIN)/makehistory: makehistory
-- $(LIBTOOL) ../installit.sh $(OWNER) -m 0555 -b .OLD $? $@
-+ $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN)
- $D$(PATHBIN)/newsrequeue: newsrequeue
-- $(LIBTOOL) ../installit.sh $(OWNER) -m 0555 -b .OLD $? $@
-+ $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN)
- $D$(PATHBIN)/prunehistory: prunehistory
-- $(LIBTOOL) ../installit.sh $(OWNER) -m 0555 -b .OLD $? $@
-+ $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN)
-
- ## Dependencies. Default list, below, is probably good enough.
- depend: Makefile $(SOURCES)
-Only in inn-2.2.2/expire: Makefile~
-diff -ur inn-2.2.2.orig/frontends/Makefile inn-2.2.2/frontends/Makefile
---- inn-2.2.2.orig/frontends/Makefile Mon Dec 13 14:18:37 1999
-+++ inn-2.2.2/frontends/Makefile Sat Jan 29 22:50:56 2000
-@@ -64,25 +64,25 @@
-
- ## Low-level install actions.
- $D$(PATHBIN)/inews: inews
-- $(LIBTOOL) ../installit.sh $(OWNER) -m $(INEWSMODE) -b .OLD $? $@
-+ $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN)
- $D$(PATHBIN)/rnews: rnews
-- $(LIBTOOL) ../installit.sh $(ROWNER) -m $(RNEWSMODE) -b .OLD $? $@
-+ $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN)
- $D$(PATHBIN)/ctlinnd: ctlinnd
-- $(LIBTOOL) ../installit.sh $(OWNER) -m 0550 -b .OLD $? $@
-+ $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN)
- $D$(PATHBIN)/sm: sm
-- $(LIBTOOL) ../installit.sh $(OWNER) -m 0550 -b .OLD $? $@
-+ $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN)
- $D$(PATHBIN)/getlist: getlist
-- $(LIBTOOL) ../installit.sh $(OWNER) -m 0555 -b .OLD $? $@
-+ $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN)
- $D$(PATHBIN)/innconfval: innconfval
-- $(LIBTOOL) ../installit.sh $(OWNER) -m 0555 -b .OLD $? $@
-+ $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN)
- $D$(RNEWSPROGS)/c7unbatch: c7unbatch.sh
-- $(LIBTOOL) ../installit.sh $(OWNER) -m 0555 -b .OLD $? $@
-+ $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN)
- $D$(RNEWSPROGS)/gunbatch: gunbatch.sh
-- $(LIBTOOL) ../installit.sh $(OWNER) -m 0555 -b .OLD $? $@
-+ $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN)
- $D$(RNEWSPROGS)/decode: decode
-- $(LIBTOOL) ../installit.sh $(OWNER) -m 0555 -b .OLD $? $@
-+ $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN)
- $D$(RNEWSPROGS)/encode: encode
-- $(LIBTOOL) ../installit.sh $(OWNER) -m 0555 -b .OLD $? $@
-+ $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN)
-
- ## Dependencies. Default list, below, is probably good enough.
- depend: Makefile $(SOURCES)
-Only in inn-2.2.2/frontends: Makefile~
-diff -ur inn-2.2.2.orig/innd/Makefile inn-2.2.2/innd/Makefile
---- inn-2.2.2.orig/innd/Makefile Mon Dec 13 14:18:37 1999
-+++ inn-2.2.2/innd/Makefile Sat Jan 29 22:51:57 2000
-@@ -18,10 +18,10 @@
- install: $D${PATHBIN}/innd $D${PATHBIN}/inndstart
-
- $D${PATHBIN}/innd: innd
-- $(LIBTOOL) ../installit.sh $(OWNER) -m 0550 -b .OLD innd $D${PATHBIN}/innd
-+ $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN)
-
- $D${PATHBIN}/inndstart: inndstart
-- -$(LIBTOOL) ../installit.sh -O root -G $(NEWSGROUP) -m 4550 -b .OLD inndstart $D${PATHBIN}/inndstart
-+ $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN)
- @ME=`(whoami || /usr/ucb/whoami) 2> /dev/null` ;\
- if [ "X$$ME" = Xroot ]; then \
- echo $@ has been installed setuid root. ;\
-Only in inn-2.2.2/innd: Makefile~
-diff -ur inn-2.2.2.orig/innfeed/Makefile inn-2.2.2/innfeed/Makefile
---- inn-2.2.2.orig/innfeed/Makefile Mon Dec 13 14:18:37 1999
-+++ inn-2.2.2/innfeed/Makefile Sat Jan 29 22:55:52 2000
-@@ -89,7 +89,6 @@
- MV = mv
- TAG = etags
- CHMOD = chmod
--INSTALL = $(LIBTOOL) install -c
-
- MAKEDEPEND = ./makedepend
- DEPENDFLAGS = -s -c '$(CC) -E'
-@@ -111,19 +110,19 @@
- $(LINK.c) -o $@ $(OBJS) version.o $(LIBNEWS) $(LIBNEWS) $(LIBS)
-
- $D$(PATHBIN)/innfeed: innfeed
-- $(LIBTOOL) ../installit.sh $(OWNER) -m 550 -b .OLD $? $@
-+ $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN)
-
- $D$(PATHBIN)/procbatch: procbatch
-- $(LIBTOOL) ../installit.sh $(OWNER) -m 550 -b .OLD $? $@
-+ $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN)
-
-
- $D$(PATHBIN)/innfeed-convcfg: innfeed-convcfg
-- $(LIBTOOL) ../installit.sh $(OWNER) -m 550 -b .OLD $? $@
-+ $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN)
- $(SAVEOLD)
- $(COPYFILE)
-
- $D$(PATHBIN)/startinnfeed: startinnfeed
-- -$(LIBTOOL) ../installit.sh -O root -G $(NEWSGROUP) -m 4550 -b .OLD $? $@
-+ $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN)
- @ME=`(whoami || /usr/ucb/whoami) 2> /dev/null` ;\
- if [ "X$$ME" = Xroot ]; then \
- echo $@ has been installed setuid root. ;\
-Only in inn-2.2.2/innfeed: Makefile~
-diff -ur inn-2.2.2.orig/lib/Makefile inn-2.2.2/lib/Makefile
---- inn-2.2.2.orig/lib/Makefile Mon Dec 13 14:18:37 1999
-+++ inn-2.2.2/lib/Makefile Sat Jan 29 22:53:01 2000
-@@ -103,7 +103,7 @@
- ## Low-level install actions.
- $(D)$(PATHLIB)/libinn.$(EXTLIB): libinn.$(EXTLIB)
- @rm -f $@
-- $(LIBTOOL) ../installit.sh $(OWNER) -m 0555 -b .OLD libinn.$(EXTLIB) $@
-+ $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHLIB)
-
- ## Dependencies. Default list, below, is probably good enough.
- depend: Makefile $(SOURCES) ../include/dbz.h
-Only in inn-2.2.2/lib: Makefile~
-diff -ur inn-2.2.2.orig/nnrpd/Makefile inn-2.2.2/nnrpd/Makefile
---- inn-2.2.2.orig/nnrpd/Makefile Mon Dec 13 14:18:37 1999
-+++ inn-2.2.2/nnrpd/Makefile Sat Jan 29 22:53:30 2000
-@@ -22,11 +22,11 @@
-
- ## Low-level install actions.
- $D$(NNRPD): nnrpd
-- $(LIBTOOL) ../installit.sh $(OWNER) -m 0555 -b .OLD $? $@
-+ $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN)
-
- ## Low-level install actions.
- $D$(ACTIVED): actived
-- $(LIBTOOL) ../installit.sh $(OWNER) -m 0555 -b .OLD $? $@
-+ $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN)
-
- clobber clean:
- rm -f *.o $(ALL)
-Only in inn-2.2.2/nnrpd: Makefile~
-diff -ur inn-2.2.2.orig/storage/Makefile inn-2.2.2/storage/Makefile
---- inn-2.2.2.orig/storage/Makefile Mon Dec 13 14:18:37 1999
-+++ inn-2.2.2/storage/Makefile Sat Jan 29 22:54:07 2000
-@@ -68,7 +68,7 @@
- ## Low-level install actions.
- $(D)$(PATHLIB)/libstorage.$(EXTLIB): libstorage.$(EXTLIB)
- @rm -f $@
-- $(LIBTOOL) ../installit.sh $(OWNER) -m 0555 -b .OLD libstorage.$(EXTLIB) $@
-+ $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHLIB)
-
- ## Dependencies. Default list, below, is probably good enough.
- depend: Makefile $(SOURCES)
-Only in inn-2.2.2/storage: Makefile~
+--- inn-2.3.1/Makefile.global.in.orig Sun Jan 21 05:45:47 2001
++++ inn-2.3.1/Makefile.global.in Sun Jan 21 05:47:04 2001
+@@ -190,17 +190,17 @@
+ ## group-readable/group-executable file (only the news group). inews and
+ ## rnews have their own special installation rules.
+
+-LI_SPRI = $(LIBTOOL) $(INSTALL) -o root -g $(NEWSGROUP) -m 4550 -B .OLD
+-LI_XPRI = $(LIBTOOL) $(INSTALL) $(OWNER) -m 0550 -B .OLD
+-LI_XPUB = $(LIBTOOL) $(INSTALL) $(OWNER) -m 0555 -B .OLD
++LI_SPRI = $(LIBTOOL) $(INSTALL) -m 4550
++LI_XPRI = $(LIBTOOL) $(INSTALL) -m 0550
++LI_XPUB = $(LIBTOOL) $(INSTALL) -m 0555
+
+-LI_INEWS = $(LIBTOOL) $(INSTALL) $(OWNER) -m $(INEWSMODE) -B .OLD
+-LI_RNEWS = $(LIBTOOL) $(INSTALL) $(ROWNER) -m $(RNEWSMODE) -B .OLD
++LI_INEWS = $(LIBTOOL) $(INSTALL)
++LI_RNEWS = $(LIBTOOL) $(INSTALL)
+
+-CP_RPRI = $(INSTALL) $(OWNER) -m 0640 -B .OLD
+-CP_RPUB = $(INSTALL) $(OWNER) -m 0644 -B .OLD
+-CP_XPRI = $(INSTALL) $(OWNER) -m 0550 -B .OLD
+-CP_XPUB = $(INSTALL) $(OWNER) -m 0555 -B .OLD
++CP_RPRI = $(INSTALL) -m 0640
++CP_RPUB = $(INSTALL) -m 0644
++CP_XPRI = $(INSTALL) -m 0550
++CP_XPUB = $(INSTALL) -m 0555
+
+ ## Some additional definitions needed by some versions of make, to ensure a
+ ## consistant set of variables are available.
+--- inn-2.3.1/site/Makefile~ Thu Jan 11 09:55:23 2001
++++ inn-2.3.1/site/Makefile Sun Jan 21 05:49:06 2001
+@@ -144,8 +144,6 @@
+ $D$(PATH_NEWSGROUPS): ; $(CP_RPUB) newsgroups.minimal $@
+ $D$(PATH_ACTIVE_TIMES):
+ touch $@
+- chown $(NEWSUSER) $@
+- chgrp $(NEWSGROUP) $@
+ chmod 644 $@
+
+ ## Remove files that are unchanged from the release version.