From ace5f33ce6f4467b28dd7c4d326fa42d7569188d Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sun, 22 May 2022 20:49:38 +0200 Subject: [PATCH] - updated to 2.6.5 --- inn-config.patch | 49 ++++++++++++++++++++++++------------------------ inn-libdir.patch | 8 ++++---- inn.spec | 23 ++++++++--------------- 3 files changed, 36 insertions(+), 44 deletions(-) diff --git a/inn-config.patch b/inn-config.patch index 06b2c66..eaf0ba4 100644 --- a/inn-config.patch +++ b/inn-config.patch @@ -13,9 +13,9 @@ ## 2. Meta-cyclic buffers ## Format: ---- inn-2.5.3/samples/inn.conf.in.orig 2013-06-13 15:49:58.887245670 +0200 -+++ inn-2.5.3/samples/inn.conf.in 2013-06-13 16:20:45.710540510 +0200 -@@ -17,11 +17,11 @@ +--- 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 +@@ -15,11 +15,11 @@ # The following parameters are most likely to need setting, although the # defaults generated by configure may be reasonable. @@ -29,7 +29,7 @@ pathnews: @prefix@ #runasuser: -@@ -37,8 +37,8 @@ +@@ -36,8 +36,8 @@ mailcmd: @bindir@/in # Feed Configuration artcutoff: 10 @@ -40,7 +40,7 @@ dontrejectfiltered: false hiscachesize: 256 ignorenewsgroups: false -@@ -48,13 +48,13 @@ +@@ -47,13 +47,13 @@ maxartsize: 1000000 maxconnections: 50 #pathalias: #pathcluster: @@ -58,7 +58,7 @@ verifygroups: false wanttrash: false wipcheck: 5 -@@ -72,6 +72,7 @@ +@@ -70,6 +70,7 @@ mergetogroups: false nfswriter: false overcachesize: 128 #ovgrouppat: @@ -66,7 +66,7 @@ storeonxref: true useoverchan: false wireformat: true -@@ -78,7 +79,7 @@ +@@ -77,7 +78,7 @@ xrefslave: false # Reading @@ -75,7 +75,7 @@ articlemmap: true clienttimeout: 1800 initialtimeout: 10 -@@ -111,8 +112,8 @@ +@@ -109,8 +110,8 @@ addinjectiondate: true addinjectionpostingaccount: false addinjectionpostinghost: true checkincludedtext: false @@ -86,7 +86,7 @@ localmaxartsize: 1000000 #moderatormailer: nnrpdauthsender: false -@@ -122,7 +123,7 @@ +@@ -122,7 +123,7 @@ strippostcc: false # Posting -- Exponential Backoff backoffauth: false @@ -95,7 +95,7 @@ backoffk: 1 backoffpostfast: 0 backoffpostslow: 1 -@@ -152,7 +153,7 @@ +@@ -159,7 +160,7 @@ innwatchspoolspace: 25000 # Logging @@ -104,18 +104,18 @@ htmlstatus: true incominglogfrequency: 200 logartsize: true -@@ -179,7 +180,7 @@ - keepmmappedthreshold: 1024 +@@ -187,7 +188,7 @@ keepmmappedthreshold: 1024 #maxcmdreadsize: maxforks: 10 + maxlisten: 128 -nicekids: 4 +nicekids: 0 nicenewnews: 0 nicennrpd: 0 pauseretrytime: 300 ---- inn-2.5.4/samples/newsfeeds.in.orig 2014-05-17 10:24:49.000000000 +0200 -+++ inn-2.5.4/samples/newsfeeds.in 2014-06-21 21:14:00.955356887 +0200 -@@ -40,11 +40,21 @@ +--- 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 +@@ -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). @@ -130,24 +130,23 @@ + :: + # Empty default subscription list, reject all incoming articles (including - # locally posted articles) with a distribution of "local" or - # "collabra-internal", accept all others (including articles that do not - # have a Distribution: header field). --ME:!*/!local,!collabra-internal:: -+#ME:!*/!local,!collabra-internal:: + # locally posted articles) with a distribution of "local", accept all others + # (including articles that do not have a Distribution header field). +-ME:!*/!local:: ++#ME:!*/!local:: # The same as the above, but would reject all posts that have # news.example.com in the path (posts passing through that site). -@@ -142,4 +152,4 @@ +@@ -144,4 +154,4 @@ controlchan!\ # come with INN). #capture!\ # :*/foo\ -# :Tp,H2:/usr/local/bin/capture %s +# :Tp,H2:/usr/bin/capture %s ---- inn-2.5.3/samples/readers.conf.orig 2013-06-13 15:49:58.903912336 +0200 -+++ inn-2.5.3/samples/readers.conf 2013-06-13 16:28:23.533864301 +0200 -@@ -55,7 +55,7 @@ - # the local machine +--- 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. auth "localhost" { - hosts: "localhost, 127.0.0.1, ::1, stdin" diff --git a/inn-libdir.patch b/inn-libdir.patch index 7df3304..480db59 100644 --- a/inn-libdir.patch +++ b/inn-libdir.patch @@ -1,6 +1,6 @@ ---- inn-2.5.3/samples/innreport.conf.in.orig 2012-06-15 20:25:36.000000000 +0200 -+++ inn-2.5.3/samples/innreport.conf.in 2013-06-14 19:59:36.165132651 +0200 -@@ -10,7 +10,7 @@ +--- 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 @@ # Default parameters section default { @@ -8,7 +8,7 @@ + libpath "@innlibdir@"; logpath "@LOGDIR@"; unknown true; # want unknown entries. - html-unknown true; # want unknown entries in HTML reports. + 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 @@ diff --git a/inn.spec b/inn.spec index c612678..8ffa168 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.4 -Release: 3 +Version: 2.6.5 +Release: 1 License: distributable Group: Networking/Daemons Source0: ftp://ftp.isc.org/isc/inn/%{name}-%{version}.tar.gz -# Source0-md5: 720aafc4c1b6c22f37356685d7e4747c +# Source0-md5: 25aa0b6d88f941846463e27b20d8de43 Source1: %{name}-default-active Source2: %{name}-default-distributions Source3: %{name}-default-newsgroups @@ -320,9 +320,6 @@ install -d $RPM_BUILD_ROOT/etc/{cron.d,logrotate.d,news/pgp,rc.d/init.d} \ PATHAUTHPASSWD=%{_libdir}/news/auth/passwd \ PATHAUTHRESOLV=%{_libdir}/news/auth/resolv -# avoid conflict with glibc (synced with man-pages >= 5.09) -%{__mv} $RPM_BUILD_ROOT%{_mandir}/man3/list.{3,3inn} - cp -p samples/readers.conf $RPM_BUILD_ROOT%{_sysconfdir}/readers.conf touch $RPM_BUILD_ROOT%{_sysconfdir}/motd.{innd,nnrpd} @@ -410,7 +407,7 @@ sed -e 's/^\(listenonipv6\)/#\1/;s/^bindipv6address/bindaddress6/;s/^sourceipv6a %files %defattr(644,root,root,755) -%doc CONTRIBUTORS ChangeLog INSTALL LICENSE NEWS README TODO doc/[Icehs]* +%doc CONTRIBUTORS INSTALL LICENSE NEWS README TODO doc/[Icehs]* %attr(700,news,news) %dir /home/services/news # DB @@ -639,6 +636,7 @@ sed -e 's/^\(listenonipv6\)/#\1/;s/^bindipv6address/bindaddress6/;s/^sourceipv6a %{_mandir}/man5/inn.conf.5* %{_mandir}/man5/inn-radius.conf.5* %{_mandir}/man5/innfeed.conf.5* +%{_mandir}/man5/innreport.conf.5* %{_mandir}/man5/innwatch.ctl.5* %{_mandir}/man5/localgroups.5* %{_mandir}/man5/moderators.5* @@ -706,9 +704,11 @@ sed -e 's/^\(listenonipv6\)/#\1/;s/^bindipv6address/bindaddress6/;s/^sourceipv6a %{_mandir}/man8/rc.news.8* %{_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* %{_mandir}/man8/tally.control.8* %{_mandir}/man8/tdx-util.8* %{_mandir}/man8/tinyleaf.8* @@ -734,18 +734,11 @@ sed -e 's/^\(listenonipv6\)/#\1/;s/^bindipv6address/bindaddress6/;s/^sourceipv6a %{_libdir}/libinnhist.la %{_libdir}/libstorage.la %{_includedir}/inn -%{_mandir}/man3/clientlib.3* -%{_mandir}/man3/dbz.3* -%{_mandir}/man3/inndcomm.3* %{_mandir}/man3/libauth.3* %{_mandir}/man3/libinn.3* +%{_mandir}/man3/libinn_*.3* %{_mandir}/man3/libinnhist.3* %{_mandir}/man3/libstorage.3* -%{_mandir}/man3/list.3inn* -%{_mandir}/man3/qio.3* -# XXX: too generic name? -%{_mandir}/man3/tst.3* -%{_mandir}/man3/uwildmat.3* %files static %defattr(644,root,root,755) -- 2.44.0