- updated to 2.7.1 (new libinn soname)

diff --git a/inn-config.patch b/inn-config.patch
index 6bc2226f39aacbda9e54d87506d9b2967b349179..4d066414100486fd58e9c4e0f14b40cfb712839d 100644 (file)
--- a/inn-config.patch
+++ b/inn-config.patch
@@ -13,11 +13,11 @@
  
  ##  2. Meta-cyclic buffers
  ##  Format:
---- 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.
+--- inn-2.7.1/samples/inn.conf.in.orig 2023-04-16 21:50:54.000000000 +0200
++++ inn-2.7.1/samples/inn.conf.in      2023-08-20 19:51:47.703846915 +0200
+@@ -17,11 +17,11 @@
+ # See the description of the mta parameter in inn.conf(5) for useful options
+ # that may be worthwhile adding to the default sendmail command.
  
 -mta:                         "@SENDMAIL@ -oi -oem %s"
 +mta:                         "@SENDMAIL@ -oi %s"
@@ -29,7 +29,7 @@
  pathnews:                    @prefix@
  
  #runasuser:
-@@ -36,8 +36,8 @@ mailcmd:                     @bindir@/in
+@@ -38,8 +38,8 @@ mailcmd:                     @bindir@/in
  # Feed Configuration
  
  artcutoff:                   10
@@ -40,7 +40,7 @@
  docancels:                   "require-auth"
  dontrejectfiltered:          false
  hiscachesize:                256
-@@ -48,11 +48,11 @@ maxartsize:                  1000000
+@@ -50,11 +50,11 @@ maxartsize:                  1000000
  maxconnections:              50
  #pathalias:
  #pathcluster:
@@ -55,7 +55,7 @@
  verifygroups:                false
  wanttrash:                   false
  wipcheck:                    5
-@@ -69,6 +69,7 @@ mergetogroups:               false
+@@ -71,6 +71,7 @@ mergetogroups:               false
  nfswriter:                   false
  overcachesize:               128
  #ovgrouppat:
@@ -63,7 +63,7 @@
  storeonxref:                 true
  useoverchan:                 false
  wireformat:                  true
-@@ -76,7 +77,7 @@ xrefslave:                   false
+@@ -78,7 +79,7 @@ xrefslave:                   false
  
  # Reading
  
@@ -72,7 +72,7 @@
  articlemmap:                 true
  clienttimeout:               1800
  initialtimeout:              10
-@@ -108,8 +109,8 @@ addinjectiondate:            true
+@@ -110,8 +111,8 @@ addinjectiondate:            true
  addinjectionpostingaccount:  false
  addinjectionpostinghost:     true
  checkincludedtext:           false
@@ -83,7 +83,7 @@
  localmaxartsize:             1000000
  #moderatormailer:
  nnrpdauthsender:             false
-@@ -121,7 +122,7 @@ strippostcc:                 false
+@@ -123,7 +124,7 @@ strippostcc:                 false
  # Posting -- Exponential Backoff
  
  backoffauth:                 false
@@ -92,7 +92,7 @@
  backoffk:                    1
  backoffpostfast:             0
  backoffpostslow:             1
-@@ -158,7 +159,7 @@ innwatchspoolspace:          25000
+@@ -160,7 +161,7 @@ innwatchspoolspace:          25000
  
  # Logging
  
@@ -101,7 +101,7 @@
  htmlstatus:                  true
  incominglogfrequency:        200
  logartsize:                  true
-@@ -186,7 +187,7 @@ keepmmappedthreshold:        1024
+@@ -188,7 +189,7 @@ keepmmappedthreshold:        1024
  #maxcmdreadsize:
  maxforks:                    10
  maxlisten:                   128
@@ -140,10 +140,10 @@
  #    :*/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 @@
- # the local machine.
+--- inn-2.7.1/samples/readers.conf.orig        2023-08-20 19:52:09.017064785 +0200
++++ inn-2.7.1/samples/readers.conf     2023-08-20 20:05:52.232605043 +0200
+@@ -39,7 +39,7 @@
+ # examples).  This assigns the identity of <localhost> to the local machine.
  
  auth "localhost" {
 -    hosts: "localhost, 127.0.0.1, ::1, stdin"

diff --git a/inn-libdir.patch b/inn-libdir.patch
index e7177fa0f4aa9d988513e9ce9069489592971c5c..b802c6233869484db020c72da66f0d99a17e340c 100644 (file)
--- a/inn-libdir.patch
+++ b/inn-libdir.patch
@@ -108,18 +108,18 @@
      -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 @@
- _INN_ARG_DIR([tmp], ['${prefix}/tmp'], [tmpdir],
+--- inn-2.7.1/m4/paths.m4.orig 2023-08-20 20:06:06.032530283 +0200
++++ inn-2.7.1/m4/paths.m4      2023-08-20 20:07:20.302127930 +0200
+@@ -46,6 +46,9 @@ AC_DEFUN([INN_ARG_PATHS],
+  _INN_ARG_DIR([tmp], ['${prefix}/tmp'], [tmpdir],
      [AS_HELP_STRING([--with-tmp-dir=PATH],
-         [Path for temporary files [PREFIX/tmp]])])
+         [Path for temporary files @<:@PREFIX/tmp@:>@])])
 +_INN_ARG_DIR([innlib], ['${datadir}/news'], [innlibdir],
 +    [AS_HELP_STRING([--with-innlib-dir=PATH],
 +        [Path to inn library scripts [DATADIR/news]])])
  
- dnl Some additional paths used by inn/paths.h.
- eval PATH_CONFIG="$sysconfdir"
+  dnl Some additional paths used by inn/paths.h.
+  eval PATH_CONFIG="$sysconfdir"
 --- 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

diff --git a/inn.spec b/inn.spec
index ef9f9b828692c2c0a032d55ac83ea5b648e4dd16..b40a02fd1c66d2769f4731f8dc28dee9bab5cb6a 100644 (file)
--- 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.7.0
-Release:       3
+Version:       2.7.1
+Release:       1
 License:       distributable
 Group:         Networking/Daemons
 Source0:       ftp://ftp.isc.org/isc/inn/%{name}-%{version}.tar.gz
-# Source0-md5: a052b6efda2457a9078f330b5134b63e
+# Source0-md5: 987b35e6d42cc2b94159a57f6a394c68
 Source1:       %{name}-default-active
 Source2:       %{name}-default-distributions
 Source3:       %{name}-default-newsgroups
@@ -597,6 +597,7 @@ sed -e 's/^\(listenonipv6\)/#\1/;s/^bindipv6address/bindaddress6/;s/^sourceipv6a
 %attr(755,root,root) %{_bindir}/ovdb_*
 %attr(755,root,root) %{_bindir}/overchan
 %attr(755,root,root) %{_bindir}/ovsqlite-server
+%attr(755,root,root) %{_bindir}/ovsqlite-util
 %attr(755,root,root) %{_bindir}/perl-nocem
 %attr(755,root,root) %{_bindir}/pgpverify
 %attr(755,root,root) %{_bindir}/procbatch
@@ -712,6 +713,7 @@ sed -e 's/^\(listenonipv6\)/#\1/;s/^bindipv6address/bindaddress6/;s/^sourceipv6a
 %{_mandir}/man8/ovdb_*.8*
 %{_mandir}/man8/overchan.8*
 %{_mandir}/man8/ovsqlite-server.8*
+%{_mandir}/man8/ovsqlite-util.8*
 %{_mandir}/man8/perl-nocem.8*
 %{_mandir}/man8/procbatch.8*
 %{_mandir}/man8/prunehistory.8*
@@ -733,7 +735,7 @@ 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.8
+%attr(755,root,root) %ghost %{_libdir}/libinn.so.9
 %attr(755,root,root) %{_libdir}/libinnhist.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libinnhist.so.3
 %attr(755,root,root) %{_libdir}/libinnstorage.so.*.*.*