-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 02555 -b .OLD $? $@
-+ $(LIBTOOL) --mode=install $(INSTALL) $? $D$(PATHBIN)
- $D$(PATHBIN)/rnews: rnews
-- $(LIBTOOL) ../installit.sh $(ROWNER) -m 04550 -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.4.2/site/Makefile.orig 2004-12-22 05:21:19.000000000 +0100
++++ inn-2.4.2/site/Makefile 2004-12-28 18:12:21.688619120 +0100
+@@ -132,12 +132,9 @@
+ $D$(PATH_NEWSGROUPS): ; $(CP_DATA) newsgroups.minimal $@
+ $D$(PATH_ACTIVE_TIMES):
+ touch $@
+- chown $(NEWSUSER) $@
+- chgrp $(NEWSGROUP) $@
+ chmod $(FILEMODE) $@
+ $D$(PATH_HISTORY):
+ touch $@
+- $(PATHBIN)/makedbz -i -o
+
+ ## Remove files that are unchanged from the release version.
+ clean: