- updated to 2.7.0 (new sonames, configuration changes)auto/th/inn-2.7.0-1

- updated PLD,asneeded,config,libdir,setgid patches; adjusted to honour _libexecdir

6 files changed, 140 insertions, 132 deletions

diff --git a/inn-PLD.patch b/inn-PLD.patch
index 828c9bc..705ac51 100644
--- a/inn-PLD.patch
+++ b/inn-PLD.patch
@@ -6,7 +6,7 @@ diff -urNp -x '*.orig' inn-2.6.4.org/Makefile.global.in inn-2.6.4/Makefile.globa
  PATHAUTHRESOLV	= $(PATHAUTH)/resolv
  PATHAUTHPASSWD	= $(PATHAUTH)/passwd
 -PATHRNEWS	= $(PATHBIN)/rnews.libexec
-+PATHRNEWS	= @libdir@/news/rnews
++PATHRNEWS	= @libexecdir@/news/rnews
  PATHARCHIVE	= $(PATHSPOOL)/archive
  PATHARTICLES	= $(PATHSPOOL)/articles
  PATHINCOMING	= $(PATHSPOOL)/incoming
@@ -62,41 +62,38 @@ diff -urNp -x '*.orig' inn-2.6.4.org/frontends/Makefile inn-2.6.4/frontends/Make
  
  bootstrap: $(MAN)
  
-diff -urNp -x '*.orig' inn-2.6.4.org/include/inn/paths.h.in inn-2.6.4/include/inn/paths.h.in
---- inn-2.6.4.org/include/inn/paths.h.in	2021-01-21 22:53:07.000000000 +0100
-+++ inn-2.6.4/include/inn/paths.h.in	2021-09-02 23:41:48.986139529 +0200
+--- inn-2.7.0/include/inn/paths.h.in.orig	2022-10-10 08:15:44.051090361 +0200
++++ inn-2.7.0/include/inn/paths.h.in	2022-10-10 20:40:27.209020917 +0200
 @@ -22,12 +22,12 @@
  /* Default prefix path is pathbin. */
- #define INN_PATH_NNRPD                  "nnrpd"
- #define INN_PATH_NNTPD                  "nnrpd"
--#define INN_PATH_AUTHDIR                "auth"
-+#define INN_PATH_AUTHDIR                "@libdir@/news/auth"
- #define INN_PATH_AUTHDIR_GENERIC        "generic"
- #define INN_PATH_AUTHDIR_NOPASS         "resolv"
- #define INN_PATH_AUTHDIR_PASSWD         "passwd"
- #define INN_PATH_CTLINND                "ctlinnd"
--#define INN_PATH_RNEWSPROGS             "rnews.libexec"
-+#define INN_PATH_RNEWSPROGS             "@libdir@/news/rnews"
+ #define INN_PATH_NNRPD             "nnrpd"
+ #define INN_PATH_NNTPD             "nnrpd"
+-#define INN_PATH_AUTHDIR           "auth"
++#define INN_PATH_AUTHDIR           "@libexecdir@/news/auth"
+ #define INN_PATH_AUTHDIR_GENERIC   "generic"
+ #define INN_PATH_AUTHDIR_NOPASS    "resolv"
+ #define INN_PATH_AUTHDIR_PASSWD    "passwd"
+ #define INN_PATH_CTLINND           "ctlinnd"
+-#define INN_PATH_RNEWSPROGS        "rnews.libexec"
++#define INN_PATH_RNEWSPROGS        "@libexecdir@/news/rnews"
  
  /* Default prefix path is pathfilter. */
- #define INN_PATH_PERL_STARTUP_INND      "startup_innd.pl"
-diff -urNp -x '*.orig' inn-2.6.4.org/scripts/inncheck.in inn-2.6.4/scripts/inncheck.in
---- inn-2.6.4.org/scripts/inncheck.in	2021-01-21 22:53:07.000000000 +0100
-+++ inn-2.6.4/scripts/inncheck.in	2021-09-02 23:41:48.986139529 +0200
-@@ -44,7 +44,7 @@ my %paths = (
-     'passwd.nntp',	"$INN::Config::pathetc/passwd.nntp",
-     'readers.conf',	"$INN::Config::pathetc/readers.conf",
-     'rnews',		"$INN::Config::rnews",
--    'rnewsprogs',	"$INN::Config::pathbin/rnews.libexec",
-+    'rnewsprogs',	"@libdir@/news/rnews",
-     'spooltemp',	"$INN::Config::pathtmp",
-     'spool',		"$INN::Config::patharticles",
-     'spoolnews',	"$INN::Config::pathincoming",
-diff -urNp -x '*.orig' inn-2.6.4.org/scripts/scanlogs.in inn-2.6.4/scripts/scanlogs.in
---- inn-2.6.4.org/scripts/scanlogs.in	2021-01-21 22:53:07.000000000 +0100
-+++ inn-2.6.4/scripts/scanlogs.in	2021-09-02 23:41:48.986139529 +0200
-@@ -10,7 +10,7 @@
- ##	norotate	Do not rotate logfiles.
+ #define INN_PATH_PERL_STARTUP_INND "startup_innd.pl"
+--- inn-2.7.0/scripts/inncheck.in.orig	2022-10-10 20:48:52.692949142 +0200
++++ inn-2.7.0/scripts/inncheck.in	2022-10-10 20:50:16.755827068 +0200
+@@ -45,7 +45,7 @@ my %paths = (
+     'passwd.nntp'       => "$INN::Config::pathetc/passwd.nntp",
+     'readers.conf'      => "$INN::Config::pathetc/readers.conf",
+     'rnews'             => "$INN::Config::rnews",
+-    'rnewsprogs'        => "$INN::Config::pathbin/rnews.libexec",
++    'rnewsprogs'        => "@libexecdir@/news/rnews",
+     'spooltemp'         => "$INN::Config::pathtmp",
+     'spool'             => "$INN::Config::patharticles",
+     'spoolnews'         => "$INN::Config::pathincoming",
+--- inn-2.7.0/scripts/scanlogs.in.orig	2022-10-10 20:48:52.692949142 +0200
++++ inn-2.7.0/scripts/scanlogs.in	2022-10-10 20:51:03.085576078 +0200
+@@ -8,7 +8,7 @@
+ ##      norotate      Do not rotate logfiles.
  
  ##  Directory where old log files are kept.
 -OLD=${MOST_LOGS}/OLD
diff --git a/inn-asneeded.patch b/inn-asneeded.patch
index 0c0ff59..8e2708e 100644
--- a/inn-asneeded.patch
+++ b/inn-asneeded.patch
@@ -69,11 +69,11 @@
  
  config_y.c config_y.h: configfile.y
  	$(YACC) -d configfile.y
---- inn-2.6.4/storage/buffindexed/ovmethod.mk.orig	2021-05-16 18:41:59.082457783 +0200
-+++ inn-2.6.4/storage/buffindexed/ovmethod.mk	2021-05-16 18:42:25.558981014 +0200
-@@ -5,4 +5,4 @@
+--- inn-2.7.0/storage/buffindexed/ovmethod.mk.orig	2022-10-10 21:10:50.399143848 +0200
++++ inn-2.7.0/storage/buffindexed/ovmethod.mk	2022-10-10 21:11:54.148798486 +0200
+@@ -5,4 +5,4 @@ buffindexed/buffindexed_d.$(EXTOBJ): buf
  
- buffindexed/buffindexed_d: buffindexed/buffindexed_d.$(EXTOBJ) libstorage.$(EXTLIB) $(LIBHIST)
+ buffindexed/buffindexed_d: buffindexed/buffindexed_d.$(EXTOBJ) libinnstorage.$(EXTLIB) $(LIBHIST)
  	$(LIBLDDEPS) $(LDFLAGS) -o $@ buffindexed/buffindexed_d.$(EXTOBJ) \
 -	    $(LIBSTORAGE) $(LIBHIST) $(LIBINN) $(STORAGE_LIBS) $(LIBS)
 +	    -Wl,-no-as-needed $(LIBSTORAGE) $(LIBHIST) $(LIBINN) $(STORAGE_LIBS) $(LIBS)
diff --git a/inn-config.patch b/inn-config.patch
index eaf0ba4..6bc2226 100644
--- a/inn-config.patch
+++ b/inn-config.patch
@@ -13,8 +13,8 @@
  
  ##  2. Meta-cyclic buffers
  ##  Format:
---- inn-2.6.5/samples/inn.conf.in.orig	2022-02-18 20:36:57.000000000 +0100
-+++ inn-2.6.5/samples/inn.conf.in	2022-05-22 20:06:04.430442175 +0200
+--- inn-2.7.0/samples/inn.conf.in.orig	2022-07-10 15:00:35.000000000 +0200
++++ inn-2.7.0/samples/inn.conf.in	2022-10-10 21:01:03.748988671 +0200
 @@ -15,11 +15,11 @@
  # The following parameters are most likely to need setting, although the
  # defaults generated by configure may be reasonable.
@@ -37,28 +37,25 @@
 -#bindaddress6:
 +#bindaddress:                 all
 +#bindaddress6:                all
+ docancels:                   "require-auth"
  dontrejectfiltered:          false
  hiscachesize:                256
- ignorenewsgroups:            false
-@@ -47,13 +47,13 @@ maxartsize:                  1000000
+@@ -48,11 +48,11 @@ maxartsize:                  1000000
  maxconnections:              50
  #pathalias:
  #pathcluster:
 -pgpverify:                   @DO_PGPVERIFY@
 +pgpverify:                   true
  port:                        119
- refusecybercancels:          false
  remembertrash:               true
 -#sourceaddress:
 -#sourceaddress6:
--verifycancels:               false
 +#sourceaddress:               any
 +#sourceaddress6:              any
-+verifycancels:               true
  verifygroups:                false
  wanttrash:                   false
  wipcheck:                    5
-@@ -70,6 +70,7 @@ mergetogroups:               false
+@@ -69,6 +69,7 @@ mergetogroups:               false
  nfswriter:                   false
  overcachesize:               128
  #ovgrouppat:
@@ -66,7 +63,7 @@
  storeonxref:                 true
  useoverchan:                 false
  wireformat:                  true
-@@ -77,7 +78,7 @@ xrefslave:                   false
+@@ -76,7 +77,7 @@ xrefslave:                   false
  
  # Reading
  
@@ -75,7 +72,7 @@
  articlemmap:                 true
  clienttimeout:               1800
  initialtimeout:              10
-@@ -109,8 +110,8 @@ addinjectiondate:            true
+@@ -108,8 +109,8 @@ addinjectiondate:            true
  addinjectionpostingaccount:  false
  addinjectionpostinghost:     true
  checkincludedtext:           false
@@ -86,7 +83,7 @@
  localmaxartsize:             1000000
  #moderatormailer:
  nnrpdauthsender:             false
-@@ -122,7 +123,7 @@ strippostcc:                 false
+@@ -121,7 +122,7 @@ strippostcc:                 false
  # Posting -- Exponential Backoff
  
  backoffauth:                 false
@@ -95,7 +92,7 @@
  backoffk:                    1
  backoffpostfast:             0
  backoffpostslow:             1
-@@ -159,7 +160,7 @@ innwatchspoolspace:          25000
+@@ -158,7 +159,7 @@ innwatchspoolspace:          25000
  
  # Logging
  
@@ -104,7 +101,7 @@
  htmlstatus:                  true
  incominglogfrequency:        200
  logartsize:                  true
-@@ -187,7 +188,7 @@ keepmmappedthreshold:        1024
+@@ -186,7 +187,7 @@ keepmmappedthreshold:        1024
  #maxcmdreadsize:
  maxforks:                    10
  maxlisten:                   128
@@ -113,8 +110,8 @@
  nicenewnews:                 0
  nicennrpd:                   0
  pauseretrytime:              300
---- inn-2.6.5/samples/newsfeeds.in.orig	2022-02-18 20:36:57.000000000 +0100
-+++ inn-2.6.5/samples/newsfeeds.in	2022-05-22 20:08:17.759719869 +0200
+--- inn-2.7.0/samples/newsfeeds.in.orig	2022-07-10 15:00:35.000000000 +0200
++++ inn-2.7.0/samples/newsfeeds.in	2022-10-10 21:10:17.395989308 +0200
 @@ -38,10 +38,20 @@
  ##  For the ME line (and the ME line *only*), patterns affect *outgoing*
  ##  feeds and distributions affect *incoming* feeds (including local posts).
@@ -138,11 +135,11 @@
  # The same as the above, but would reject all posts that have
  # news.example.com in the path (posts passing through that site).
 @@ -144,4 +154,4 @@ controlchan!\
- # come with INN).
+ # doesn't come with INN).
  #capture!\
- #	:*/foo\
--#	:Tp,H2:/usr/local/bin/capture %s
-+#	:Tp,H2:/usr/bin/capture %s
+ #    :*/foo\
+-#    :Tp,H2:/usr/local/bin/capture %s
++#    :Tp,H2:/usr/bin/capture %s
 --- inn-2.6.5/samples/readers.conf.orig	2022-05-22 20:06:26.763654519 +0200
 +++ inn-2.6.5/samples/readers.conf	2022-05-22 20:09:01.329483831 +0200
 @@ -42,7 +42,7 @@
diff --git a/inn-libdir.patch b/inn-libdir.patch
index 480db59..e7177fa 100644
--- a/inn-libdir.patch
+++ b/inn-libdir.patch
@@ -1,14 +1,14 @@
---- inn-2.6.5/samples/innreport.conf.in.orig	2022-05-22 20:09:19.176053815 +0200
-+++ inn-2.6.5/samples/innreport.conf.in	2022-05-22 20:10:45.795584557 +0200
-@@ -9,7 +9,7 @@
+--- inn-2.7.0/samples/innreport.conf.in.orig	2022-10-10 21:12:12.735364461 +0200
++++ inn-2.7.0/samples/innreport.conf.in	2022-10-10 21:13:59.404786583 +0200
+@@ -5,7 +5,7 @@
+ ##  See the innreport.conf man page for more information.
  
- # Default parameters
  section default {
--	libpath         "@libdir@";
-+	libpath         "@innlibdir@";
- 	logpath		"@LOGDIR@";
- 	unknown		true;        # want unknown entries.
-         html-unknown    true;        # want unknown entries in HTML reports.
+-    libpath            "@libdir@";
++    libpath            "@innlibdir@";
+     logpath            "@LOGDIR@";
+     unknown            true;        # want unknown entries.
+     html-unknown       true;        # want unknown entries in HTML reports.
 --- inn-2.5.3/scripts/innshellvars.tcl.in.orig	2012-06-15 20:25:36.000000000 +0200
 +++ inn-2.5.3/scripts/innshellvars.tcl.in	2013-06-14 20:10:44.008452064 +0200
 @@ -23,7 +23,7 @@
@@ -60,10 +60,10 @@
  PATHLIBPERL	= @LIBPERLDIR@
  PATHCONTROL	= @CONTROLDIR@
  PATHFILTER	= @FILTERDIR@
---- inn-2.5.3/perl/INN/Config.pm.in.orig	2012-06-15 20:25:36.000000000 +0200
-+++ inn-2.5.3/perl/INN/Config.pm.in	2013-06-14 21:06:40.531715437 +0200
-@@ -37,7 +37,7 @@
- $spooltemp $path);
+--- inn-2.7.0/perl/INN/Config.pm.in.orig	2022-10-10 21:12:12.742031092 +0200
++++ inn-2.7.0/perl/INN/Config.pm.in	2022-10-10 21:19:48.819560307 +0200
+@@ -31,7 +31,7 @@ my @DIRVAR = qw($prefix $exec_prefix $ne
+   $spooltemp $path);
  our $newshome = $pathnews;
  our $home = $pathnews;
 -our $newslib = "@libdir@";
@@ -71,9 +71,9 @@
  our $newsbin = $pathbin;
  our $controlprogs = $pathcontrol;
  our $newslbin = "$pathnews/local";
---- inn-2.5.3/support/fixscript.in.orig	2012-06-15 20:25:36.000000000 +0200
-+++ inn-2.5.3/support/fixscript.in	2013-06-14 21:08:38.721712975 +0200
-@@ -25,6 +25,7 @@
+--- inn-2.7.0/support/fixscript.in.orig	2022-07-10 15:00:35.000000000 +0200
++++ inn-2.7.0/support/fixscript.in	2022-10-10 21:51:37.475886895 +0200
+@@ -23,6 +23,7 @@ PERLPATH='@PERL@'
  prefix="@prefix@"
  exec_prefix="@exec_prefix@"
  libdir="@libdir@"
@@ -81,18 +81,18 @@
  libperldir="@LIBPERLDIR@"
  
  # We can probably just assume sed is on the path, but since we have it, we may
-@@ -60,7 +61,7 @@
+@@ -58,7 +59,7 @@ interpreter=$(head -n 1 "$input")
  case "$interpreter" in
- */sh|*SH*)
+ */sh | *SH*)
      path="@SHELL@"
 -    lib=". $libdir/innshellvars"
 +    lib=". $innlibdir/innshellvars"
      ;;
- */perl*|*PERL*)
-     path=`echo "$interpreter" | sed 's%^#! *[^ ][^ ]*%'"$PERLPATH%"`
---- inn-2.5.3/support/fixconfig.in.orig	2012-06-15 20:25:36.000000000 +0200
-+++ inn-2.5.3/support/fixconfig.in	2013-06-14 21:09:38.871711720 +0200
-@@ -17,6 +17,7 @@
+ */perl* | *PERL*)
+     path=$(echo "$interpreter" | sed 's%^#! *[^ ][^ ]*%'"$PERLPATH%")
+--- inn-2.7.0/support/fixconfig.in.orig	2022-07-10 15:00:35.000000000 +0200
++++ inn-2.7.0/support/fixconfig.in	2022-10-10 21:52:24.828963695 +0200
+@@ -15,6 +15,7 @@ exec_prefix=@exec_prefix@
  bindir=@bindir@
  libexecdir=@libexecdir@
  libdir=@libdir@
@@ -100,14 +100,14 @@
  sbindir=@sbindir@
  sysconfdir=@sysconfdir@
  
-@@ -59,6 +60,7 @@
-      -e "s,@bindir[@],$bindir,g" \
-      -e "s,@libexecdir[@],$libexecdir,g" \
-      -e "s,@libdir[@],$libdir,g" \
-+     -e "s,@innlibdir[@],$innlibdir,g" \
-      -e "s,@sbindir[@],$sbindir,g" \
-      -e "s,@sysconfdir[@],$sysconfdir,g" \
-      -e "s,@CONTROLDIR[@],$CONTROLDIR,g" \
+@@ -57,6 +58,7 @@ $SED -e "s,@prefix[@],$prefix,g" \
+     -e "s,@bindir[@],$bindir,g" \
+     -e "s,@libexecdir[@],$libexecdir,g" \
+     -e "s,@libdir[@],$libdir,g" \
++    -e "s,@innlibdir[@],$innlibdir,g" \
+     -e "s,@sbindir[@],$sbindir,g" \
+     -e "s,@sysconfdir[@],$sysconfdir,g" \
+     -e "s,@CONTROLDIR[@],$CONTROLDIR,g" \
 --- inn-2.5.3/m4/paths.m4.orig	2012-06-15 20:25:36.000000000 +0200
 +++ inn-2.5.3/m4/paths.m4	2013-06-14 21:13:15.238373880 +0200
 @@ -47,6 +47,9 @@
@@ -120,12 +120,12 @@
  
  dnl Some additional paths used by inn/paths.h.
  eval PATH_CONFIG="$sysconfdir"
---- inn-2.5.3/scripts/Makefile.orig	2012-06-15 20:25:36.000000000 +0200
-+++ inn-2.5.3/scripts/Makefile	2013-06-14 21:14:08.268372773 +0200
-@@ -27,7 +27,7 @@
+--- inn-2.7.0/scripts/Makefile.orig	2022-10-10 21:53:03.162089360 +0200
++++ inn-2.7.0/scripts/Makefile	2022-10-10 21:53:27.915288594 +0200
+@@ -25,7 +25,7 @@ install: all
  	done
- 	for F in innreport_inn.pm innshellvars innshellvars.pl \
- 	         innshellvars.tcl ; do \
+ 	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$(PATHINNLIB)/$$F ; \
  	done
diff --git a/inn-setgid.patch b/inn-setgid.patch
index be49d16..6e379ab 100644
--- a/inn-setgid.patch
+++ b/inn-setgid.patch
@@ -1,8 +1,8 @@
---- inn-2.6.3/lib/newsuser.c.orig	2019-02-07 16:02:22.000000000 +0100
-+++ inn-2.6.3/lib/newsuser.c	2020-11-07 18:31:54.357153294 +0100
-@@ -100,6 +100,8 @@
-         die ("must be run as %s group",
-              innconf != NULL ? innconf->runasgroup : RUNASGROUP);
+--- inn-2.7.0/lib/newsuser.c.orig	2022-10-10 20:51:16.558836420 +0200
++++ inn-2.7.0/lib/newsuser.c	2022-10-10 20:57:21.660191829 +0200
+@@ -101,6 +101,8 @@ ensure_news_grp(bool may_setgid)
+         die("must be run as %s group",
+             innconf != NULL ? innconf->runasgroup : RUNASGROUP);
      }
 +    const char *runasuser = innconf != NULL ? innconf->runasuser : RUNASUSER;
 +    initgroups(runasuser, gid);
diff --git a/inn.spec b/inn.spec
index cb8bea1..f008699 100644
--- a/inn.spec
+++ b/inn.spec
@@ -12,12 +12,12 @@ Summary(pl.UTF-8):	INN, serwer nowinek
 Summary(pt_BR.UTF-8):	INN, InterNet News System (servidor news)
 Summary(tr.UTF-8):	INN, InterNet Haber Sistemi (haber sunucu)
 Name:		inn
-Version:	2.6.5
-Release:	2
+Version:	2.7.0
+Release:	1
 License:	distributable
 Group:		Networking/Daemons
 Source0:	ftp://ftp.isc.org/isc/inn/%{name}-%{version}.tar.gz
-# Source0-md5:	25aa0b6d88f941846463e27b20d8de43
+# Source0-md5:	a052b6efda2457a9078f330b5134b63e
 Source1:	%{name}-default-active
 Source2:	%{name}-default-distributions
 Source3:	%{name}-default-newsgroups
@@ -42,16 +42,22 @@ BuildRequires:	bison
 BuildRequires:	cyrus-sasl-devel >= 2
 BuildRequires:	db-devel >= 4.4
 BuildRequires:	flex >= 2.5.37
+# or MIT krb5-devel >= 1.6.1
 BuildRequires:	heimdal-devel
+BuildRequires:	libcanlock-devel >= 3.3.0
 BuildRequires:	libtool >= 2:2
 BuildRequires:	openssl-devel >= 0.9.7d
+BuildRequires:	pam-devel
 BuildRequires:	perl-devel >= 1:5.8.0
+BuildRequires:	pkgconfig
 %if %{with python}
 %{!?with_python3:BuildRequires:	python-devel >= 1:2.3}
 %{?with_python3:BuildRequires:	python3-devel >= 1:3.3}
 %endif
 BuildRequires:	rpm-perlprov
 BuildRequires:	rpmbuild(macros) >= 1.663
+BuildRequires:	sqlite3-devel >= 3.8.2
+BuildRequires:	systemd-devel
 BuildRequires:	zlib-devel
 Requires(post):	/bin/kill
 Requires(post):	/usr/bin/getent
@@ -64,6 +70,7 @@ Requires:	%{name}-libs = %{version}-%{release}
 Requires:	awk
 Requires:	cleanfeed >= 0.95.7b-4
 Requires:	crondaemon
+Requires:	libcanlock >= 3.3.0
 Requires:	procps
 Requires:	psmisc >= 20.1
 Requires:	rc-scripts >= 0.4.1.23
@@ -78,7 +85,7 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sysconfdir	/etc/news
 
-%define		skip_post_check_so	libstorage.so.*
+%define		skip_post_check_so	libinnstorage.so.*
 # /usr/bin/pullnews doesn't provide perl(Net::NNTP) - perl-libnet does.
 %define		_noautoprov_perl	Net::NNTP
 # it's necessary only for sample nnrpd_auth.pl hook
@@ -302,7 +309,7 @@ cp -f /usr/share/automake/config.* support
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{cron.d,logrotate.d,news/pgp,rc.d/init.d} \
-	$RPM_BUILD_ROOT%{_libdir}/news/auth/generic \
+	$RPM_BUILD_ROOT%{_libexecdir}/news/auth/generic \
 	$RPM_BUILD_ROOT%{_datadir}/news/auth \
 	$RPM_BUILD_ROOT%{_mandir}/pl/man{1,8} \
 	$RPM_BUILD_ROOT/var/lib/news/backoff \
@@ -316,9 +323,9 @@ install -d $RPM_BUILD_ROOT/etc/{cron.d,logrotate.d,news/pgp,rc.d/init.d} \
 	BACKUP_OPTION= \
 	PATHFILTER=%{_datadir}/news/filter \
 	PATHCONTROL=%{_datadir}/news/control \
-	PATHRNEWS=%{_libdir}/news/rnews \
-	PATHAUTHPASSWD=%{_libdir}/news/auth/passwd \
-	PATHAUTHRESOLV=%{_libdir}/news/auth/resolv
+	PATHRNEWS=%{_libexecdir}/news/rnews \
+	PATHAUTHPASSWD=%{_libexecdir}/news/auth/passwd \
+	PATHAUTHRESOLV=%{_libexecdir}/news/auth/resolv
 
 cp -p samples/readers.conf $RPM_BUILD_ROOT%{_sysconfdir}/readers.conf
 touch $RPM_BUILD_ROOT%{_sysconfdir}/motd.{innd,nnrpd}
@@ -463,6 +470,7 @@ sed -e 's/^\(listenonipv6\)/#\1/;s/^bindipv6address/bindaddress6/;s/^sourceipv6a
 %attr(640,root,news) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/incoming.conf
 %attr(640,root,news) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/inn.conf
 %attr(640,root,news) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/inn-radius.conf
+%attr(640,root,news) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/inn-secrets.conf
 %attr(640,root,news) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/innfeed.conf
 %attr(640,root,news) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/innreport.conf
 %attr(640,root,news) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/innshellvars.local
@@ -481,6 +489,7 @@ sed -e 's/^\(listenonipv6\)/#\1/;s/^bindipv6address/bindaddress6/;s/^sourceipv6a
 %attr(640,root,news) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/nntpsend.ctl
 %attr(640,root,news) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/nocem.ctl
 %attr(640,root,news) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ovdb.conf
+%attr(640,root,news) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ovsqlite.conf
 %attr(640,root,news) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/passwd.nntp
 %attr(640,root,news) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/readers.conf
 %attr(640,root,news) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/send-uucp.cf
@@ -489,14 +498,14 @@ sed -e 's/^\(listenonipv6\)/#\1/;s/^bindipv6address/bindaddress6/;s/^sourceipv6a
 %attr(755,root,news) %dir %{_sysconfdir}/pgp
 
 %attr(755,root,news) %dir %{_datadir}/news
-%dir %{_datadir}/news/control
-%dir %{_datadir}/news/filter
 
+%config(noreplace) %verify(not md5 mtime size) %{_datadir}/news/innreport-display.conf
 %config(noreplace) %verify(not md5 mtime size) %{_datadir}/news/innreport_inn.pm
 %config(noreplace) %verify(not md5 mtime size) %{_datadir}/news/innshellvars
 %config(noreplace) %verify(not md5 mtime size) %{_datadir}/news/innshellvars.pl
 %config(noreplace) %verify(not md5 mtime size) %{_datadir}/news/innshellvars.tcl
 
+%dir %{_datadir}/news/filter
 %config(noreplace) %verify(not md5 mtime size) %{_datadir}/news/filter/INN.py
 %config(noreplace) %verify(not md5 mtime size) %{_datadir}/news/filter/filter_nnrpd.pl
 %config(noreplace) %verify(not md5 mtime size) %{_datadir}/news/filter/nnrpd.py
@@ -507,30 +516,34 @@ sed -e 's/^\(listenonipv6\)/#\1/;s/^bindipv6address/bindaddress6/;s/^sourceipv6a
 %config(noreplace) %verify(not md5 mtime size) %{_datadir}/news/filter/nnrpd_dynamic.py
 %config(noreplace) %verify(not md5 mtime size) %{_datadir}/news/filter/startup_innd.pl
 
+%dir %{_datadir}/news/control
 %attr(755,root,root) %{_datadir}/news/control/checkgroups.pl
 %attr(755,root,root) %{_datadir}/news/control/ihave.pl
 %attr(755,root,root) %{_datadir}/news/control/newgroup.pl
 %attr(755,root,root) %{_datadir}/news/control/rmgroup.pl
 %attr(755,root,root) %{_datadir}/news/control/sendme.pl
-%attr(755,root,root) %{_datadir}/news/control/sendsys.pl
-%attr(755,root,root) %{_datadir}/news/control/senduuname.pl
-%attr(755,root,root) %{_datadir}/news/control/version.pl
 
 %dir %{perl_vendorlib}/INN
 %{perl_vendorlib}/INN/Config.pm
 %dir %{perl_vendorlib}/INN/Utils
 %{perl_vendorlib}/INN/Utils/Shlock.pm
 
-%attr(755,root,news) %dir %{_libdir}/news
-%dir %{_libdir}/news/auth
-%dir %{_libdir}/news/auth/generic
-%dir %{_libdir}/news/auth/passwd
-%dir %{_libdir}/news/auth/resolv
-%dir %{_libdir}/news/rnews
-
-%attr(755,root,root) %{_libdir}/news/auth/passwd/*
-%attr(755,root,root) %{_libdir}/news/auth/resolv/*
-%attr(755,root,root) %{_libdir}/news/rnews/*
+%attr(755,root,news) %dir %{_libexecdir}/news
+%dir %{_libexecdir}/news/auth
+%dir %{_libexecdir}/news/auth/generic
+%dir %{_libexecdir}/news/auth/passwd
+%attr(755,root,root) %{_libexecdir}/news/auth/passwd/auth_krb5
+%attr(755,root,root) %{_libexecdir}/news/auth/passwd/ckpasswd
+%attr(755,root,root) %{_libexecdir}/news/auth/passwd/radius
+%dir %{_libexecdir}/news/auth/resolv
+%attr(755,root,root) %{_libexecdir}/news/auth/resolv/domain
+%attr(755,root,root) %{_libexecdir}/news/auth/resolv/ident
+%dir %{_libexecdir}/news/rnews
+%attr(755,root,root) %{_libexecdir}/news/rnews/bunbatch
+%attr(755,root,root) %{_libexecdir}/news/rnews/c7unbatch
+%attr(755,root,root) %{_libexecdir}/news/rnews/decode
+%attr(755,root,root) %{_libexecdir}/news/rnews/encode
+%attr(755,root,root) %{_libexecdir}/news/rnews/gunbatch
 
 # BINARIES
 %attr(755,root,root) %{_bindir}/actmerge
@@ -553,7 +566,7 @@ sed -e 's/^\(listenonipv6\)/#\1/;s/^bindipv6address/bindaddress6/;s/^sourceipv6a
 %attr(755,root,root) %{_bindir}/expireover
 %attr(755,root,root) %{_bindir}/expirerm
 %attr(755,root,root) %{_bindir}/fastrm
-%attr(755,root,root) %{_bindir}/filechan
+%attr(755,root,root) %{_bindir}/gencancel
 %attr(755,root,root) %{_bindir}/getlist
 %attr(755,root,root) %{_bindir}/grephistory
 %attr(755,root,root) %{_bindir}/imapfeed
@@ -583,6 +596,7 @@ sed -e 's/^\(listenonipv6\)/#\1/;s/^bindipv6address/bindaddress6/;s/^sourceipv6a
 %attr(755,root,root) %{_bindir}/nntpsend
 %attr(755,root,root) %{_bindir}/ovdb_*
 %attr(755,root,root) %{_bindir}/overchan
+%attr(755,root,root) %{_bindir}/ovsqlite-server
 %attr(755,root,root) %{_bindir}/perl-nocem
 %attr(755,root,root) %{_bindir}/pgpverify
 %attr(755,root,root) %{_bindir}/procbatch
@@ -592,13 +606,11 @@ sed -e 's/^\(listenonipv6\)/#\1/;s/^bindipv6address/bindaddress6/;s/^sourceipv6a
 %attr(755,root,root) %{_bindir}/scanlogs
 %attr(755,root,root) %{_bindir}/scanspool
 %attr(755,root,root) %{_bindir}/send-ihave
-%attr(755,root,root) %{_bindir}/send-nntp
 %attr(755,root,root) %{_bindir}/send-uucp
 %attr(755,root,root) %{_bindir}/sendinpaths
 %attr(755,root,root) %{_bindir}/sendxbatches
 %attr(755,root,root) %{_bindir}/shlock
 %attr(755,root,root) %{_bindir}/shrinkfile
-%attr(755,root,root) %{_bindir}/signcontrol
 %attr(755,root,root) %{_bindir}/simpleftp
 %attr(755,root,root) %{_bindir}/sm
 %attr(755,root,root) %{_bindir}/tally.control
@@ -609,6 +621,7 @@ sed -e 's/^\(listenonipv6\)/#\1/;s/^bindipv6address/bindaddress6/;s/^sourceipv6a
 # MAN
 %{_mandir}/man1/convdate.1*
 %{_mandir}/man1/fastrm.1*
+%{_mandir}/man1/gencancel.1*
 %{_mandir}/man1/getlist.1*
 %{_mandir}/man1/grephistory.1*
 %{_mandir}/man1/innconfval.1*
@@ -635,6 +648,7 @@ sed -e 's/^\(listenonipv6\)/#\1/;s/^bindipv6address/bindaddress6/;s/^sourceipv6a
 %{_mandir}/man5/incoming.conf.5*
 %{_mandir}/man5/inn.conf.5*
 %{_mandir}/man5/inn-radius.conf.5*
+%{_mandir}/man5/inn-secrets.conf.5*
 %{_mandir}/man5/innfeed.conf.5*
 %{_mandir}/man5/innreport.conf.5*
 %{_mandir}/man5/innwatch.ctl.5*
@@ -650,6 +664,7 @@ sed -e 's/^\(listenonipv6\)/#\1/;s/^bindipv6address/bindaddress6/;s/^sourceipv6a
 %{_mandir}/man5/nntpsend.ctl.5*
 %{_mandir}/man5/nocem.ctl.5*
 %{_mandir}/man5/ovdb.5*
+%{_mandir}/man5/ovsqlite.5*
 %{_mandir}/man5/passwd.nntp.5*
 %{_mandir}/man5/readers.conf.5*
 %{_mandir}/man5/storage.conf.5*
@@ -671,7 +686,6 @@ sed -e 's/^\(listenonipv6\)/#\1/;s/^bindipv6address/bindaddress6/;s/^sourceipv6a
 %{_mandir}/man8/expire.8*
 %{_mandir}/man8/expireover.8*
 %{_mandir}/man8/expirerm.8*
-%{_mandir}/man8/filechan.8*
 %{_mandir}/man8/ident.8*
 %{_mandir}/man8/imapfeed.8*
 %{_mandir}/man8/innbind.8*
@@ -697,6 +711,7 @@ sed -e 's/^\(listenonipv6\)/#\1/;s/^bindipv6address/bindaddress6/;s/^sourceipv6a
 %{_mandir}/man8/nntpsend.8*
 %{_mandir}/man8/ovdb_*.8*
 %{_mandir}/man8/overchan.8*
+%{_mandir}/man8/ovsqlite-server.8*
 %{_mandir}/man8/perl-nocem.8*
 %{_mandir}/man8/procbatch.8*
 %{_mandir}/man8/prunehistory.8*
@@ -705,7 +720,6 @@ sed -e 's/^\(listenonipv6\)/#\1/;s/^bindipv6address/bindaddress6/;s/^sourceipv6a
 %{_mandir}/man8/scanlogs.8*
 %{_mandir}/man8/scanspool.8*
 %{_mandir}/man8/send-ihave.8*
-%{_mandir}/man8/send-nntp.8*
 %{_mandir}/man8/send-uucp.8*
 %{_mandir}/man8/sendinpaths.8*
 %{_mandir}/man8/sendxbatches.8*
@@ -719,32 +733,32 @@ sed -e 's/^\(listenonipv6\)/#\1/;s/^bindipv6address/bindaddress6/;s/^sourceipv6a
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libinn.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libinn.so.6
+%attr(755,root,root) %ghost %{_libdir}/libinn.so.8
 %attr(755,root,root) %{_libdir}/libinnhist.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libinnhist.so.3
-%attr(755,root,root) %{_libdir}/libstorage.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libstorage.so.3
+%attr(755,root,root) %{_libdir}/libinnstorage.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libinnstorage.so.3
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libinn.so
 %attr(755,root,root) %{_libdir}/libinnhist.so
-%attr(755,root,root) %{_libdir}/libstorage.so
+%attr(755,root,root) %{_libdir}/libinnstorage.so
 %{_libdir}/libinn.la
 %{_libdir}/libinnhist.la
-%{_libdir}/libstorage.la
+%{_libdir}/libinnstorage.la
 %{_includedir}/inn
-%{_mandir}/man3/libauth.3*
 %{_mandir}/man3/libinn.3*
 %{_mandir}/man3/libinn_*.3*
+%{_mandir}/man3/libinnauth.3*
 %{_mandir}/man3/libinnhist.3*
-%{_mandir}/man3/libstorage.3*
+%{_mandir}/man3/libinnstorage.3*
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libinn.a
 %{_libdir}/libinnhist.a
-%{_libdir}/libstorage.a
+%{_libdir}/libinnstorage.a
 
 %files -n inews
 %defattr(644,root,root,755)