diff -up inn-2.6.3/lib/innconf.c.rh inn-2.6.3/lib/innconf.c
--- inn-2.6.3/lib/innconf.c.rh 2019-02-07 16:02:22.000000000 +0100
+++ inn-2.6.3/lib/innconf.c 2020-09-12 23:58:28.176116563 +0200
@@ -268,7 +268,7 @@ const struct config config_table[] = {
{ K(pgpverify), BOOL (false) },
/* The following settings are specific to innwatch. */
- { K(doinnwatch), BOOL (true) },
+ { K(doinnwatch), BOOL (false) },
{ K(innwatchbatchspace), UNUMBER (4000) },
{ K(innwatchlibspace), UNUMBER (25000) },
{ K(innwatchloload), UNUMBER (1000) },
diff -up inn-2.6.3/Makefile.global.in.rh inn-2.6.3/Makefile.global.in
--- inn-2.6.3/Makefile.global.in.rh 2019-02-07 16:02:22.000000000 +0100
+++ inn-2.6.3/Makefile.global.in 2020-09-12 23:58:28.177116571 +0200
@@ -309,8 +309,8 @@ INEWSMODE = @INEWSMODE@
RNEWSMODE = @RNEWSMODE@
FILEMODE = @FILEMODE@
-OWNER = -o $(RUNASUSER) -g $(RUNASGROUP)
-ROWNER = -o $(RUNASUSER) -g $(RNEWSGROUP)
+OWNER =
+ROWNER =
INSTALL = $(top)/support/install-sh -c
diff -up inn-2.6.3/samples/inn.conf.in.rh inn-2.6.3/samples/inn.conf.in
--- inn-2.6.3/samples/inn.conf.in.rh 2019-02-07 16:02:22.000000000 +0100
+++ inn-2.6.3/samples/inn.conf.in 2020-09-12 23:58:28.177116571 +0200
@@ -21,7 +21,7 @@ mta: "@SENDMAIL@
organization: "A poorly-installed InterNetNews site"
ovmethod: tradindexed
hismethod: hisv6
-pathhost: @HOSTNAME@
+#pathhost: localhost
pathnews: @prefix@
#runasuser:
@@ -149,7 +149,7 @@ backofftrigger: 10000
# Monitoring
-doinnwatch: true
+doinnwatch: false
innwatchbatchspace: 4000
innwatchlibspace: 25000
innwatchloload: 1000
diff -up inn-2.6.3/tests/lib/innconf-t.c.rh inn-2.6.3/tests/lib/innconf-t.c
--- inn-2.6.3/tests/lib/innconf-t.c.rh 2019-02-07 16:02:22.000000000 +0100
+++ inn-2.6.3/tests/lib/innconf-t.c 2020-09-13 00:08:44.805778629 +0200
@@ -73,7 +73,7 @@ main(void)
fclose(config);
ok(7, !innconf_check("config/tmp"));
unlink("config/tmp");
- ok_string(8, "config/tmp:28: unknown parameter foo\n", errors);
+ ok_string(8, "config/tmp:27: unknown parameter foo\n", errors);
errors_uncapture();
free(errors);
errors = NULL;
diff -up inn-2.5.2/perl/INN/Config.pm.in.pfix inn-2.5.2/perl/INN/Config.pm.in
--- inn-2.5.2/perl/INN/Config.pm.in.pfix 2010-06-29 17:13:57.507194722 +0200
+++ inn-2.5.2/perl/INN/Config.pm.in 2010-06-29 17:14:32.270853010 +0200
@@ -20,7 +20,7 @@ our $exec_prefix = "@exec_prefix@";
## Then, process the variables provided by innconfval.
my @INNCONFVAR = ();
-my @values = `${exec_prefix}/bin/innconfval -p`;
+my @values = `${exec_prefix}/innconfval -p`;
foreach my $line (@values) {
eval 'our '.$line;
if ($line =~ /^(.*?) = /m) {
diff -up inn-2.5.1/scripts/Makefile.redhat_build inn-2.5.1/scripts/Makefile
--- inn-2.5.1/scripts/Makefile.redhat_build 2009-12-01 14:06:00.977311656 +0100
+++ inn-2.5.1/scripts/Makefile 2009-12-01 14:06:00.977311656 +0100
@@ -27,7 +27,7 @@ install: all
done
for F in innreport_inn.pm innshellvars innshellvars.pl \
innshellvars.tcl ; do \
- $(CP_RPUB) $$F $D$(PATHLIB)/$$F ; \
+ $(CP_RPUB) $$F $D$(PATHBIN)/$$F ; \
done
bootstrap:
diff -up inn-2.5.1/support/fixscript.in.redhat_build inn-2.5.1/support/fixscript.in
--- inn-2.5.1/support/fixscript.in.redhat_build 2009-12-01 14:18:13.664811185 +0100
+++ inn-2.5.1/support/fixscript.in 2009-12-01 14:18:50.024811262 +0100
@@ -26,6 +26,7 @@ prefix="@prefix@"
exec_prefix="@exec_prefix@"
libdir="@libdir@"
libperldir="@LIBPERLDIR@"
+libexecdir="@libexecdir@"
# We can probably just assume sed is on the path, but since we have it, we may
# as well use it.
@@ -60,7 +61,7 @@ interpreter=`head -n 1 "$input"`
case "$interpreter" in
*/sh|*SH*)
path="@SHELL@"
- lib=". $libdir/innshellvars"
+ lib=". $libexecdir/news/innshellvars"
;;
*/perl*|*PERL*)
path=`echo "$interpreter" | sed 's%^#! *[^ ][^ ]*%'"$PERLPATH%"`