diff -up inn-2.7.0/lib/innconf.c.rh inn-2.7.0/lib/innconf.c
--- inn-2.7.0/lib/innconf.c.rh 2022-07-10 15:00:35.000000000 +0200
+++ inn-2.7.0/lib/innconf.c 2022-11-07 12:50:09.549278376 +0100
@@ -225,7 +225,7 @@ static 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.7.0/Makefile.global.in.rh inn-2.7.0/Makefile.global.in
--- inn-2.7.0/Makefile.global.in.rh 2022-07-10 15:00:35.000000000 +0200
+++ inn-2.7.0/Makefile.global.in 2022-11-07 12:50:09.549278376 +0100
@@ -281,8 +281,8 @@ INEWSMODE = @INEWSMODE@
RNEWSMODE = @RNEWSMODE@
FILEMODE = @FILEMODE@
-OWNER = -o $(RUNASUSER) -g $(RUNASGROUP)
-ROWNER = -o $(RUNASUSER) -g $(RNEWSGROUP)
+OWNER =
+ROWNER =
INSTALL = $(top)/support/install-sh -p
diff -up inn-2.7.0/perl/INN/Config.pm.in.rh inn-2.7.0/perl/INN/Config.pm.in
--- inn-2.7.0/perl/INN/Config.pm.in.rh 2022-07-10 15:00:35.000000000 +0200
+++ inn-2.7.0/perl/INN/Config.pm.in 2022-11-07 12:50:09.550278384 +0100
@@ -15,7 +15,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.7.0/samples/inn.conf.in.rh inn-2.7.0/samples/inn.conf.in
--- inn-2.7.0/samples/inn.conf.in.rh 2022-07-10 15:00:35.000000000 +0200
+++ inn-2.7.0/samples/inn.conf.in 2022-11-07 12:50:09.550278384 +0100
@@ -19,7 +19,7 @@ mta: "@SENDMAIL@
organization: "A poorly-installed InterNetNews site"
ovmethod: tradindexed
hismethod: hisv6
-pathhost: @HOSTNAME@
+#pathhost: localhost
pathnews: @prefix@
#runasuser:
@@ -146,7 +146,7 @@ backofftrigger: 10000
# Monitoring
-doinnwatch: true
+doinnwatch: false
innwatchbatchspace: 4000
innwatchlibspace: 25000
innwatchloload: 1000
diff -up inn-2.7.0/scripts/Makefile.rh inn-2.7.0/scripts/Makefile
--- inn-2.7.0/scripts/Makefile.rh 2022-07-10 15:00:35.000000000 +0200
+++ inn-2.7.0/scripts/Makefile 2022-11-07 12:50:09.550278384 +0100
@@ -25,7 +25,7 @@ install: all
done
for F in innreport-display.conf 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.7.0/support/fixscript.in.rh inn-2.7.0/support/fixscript.in
--- inn-2.7.0/support/fixscript.in.rh 2022-07-10 15:00:35.000000000 +0200
+++ inn-2.7.0/support/fixscript.in 2022-11-07 12:50:09.550278384 +0100
@@ -24,6 +24,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.
@@ -58,7 +59,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%")
diff -up inn-2.7.0/tests/lib/innconf-t.c.rh inn-2.7.0/tests/lib/innconf-t.c
--- inn-2.7.0/tests/lib/innconf-t.c.rh 2022-07-10 15:00:35.000000000 +0200
+++ inn-2.7.0/tests/lib/innconf-t.c 2022-11-07 13:29:56.756772162 +0100
@@ -72,7 +72,7 @@ main(void)
fclose(config);
ok(7, !innconf_check("config/tmp"));
unlink("config/tmp");
- ok_string(8, "config/tmp:29: unknown parameter foo\n", errors);
+ ok_string(8, "config/tmp:28: unknown parameter foo\n", errors);
errors_uncapture();
free(errors);
errors = NULL;