public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/inn] epel10.3: update to 2.7.0 (#2107592)
@ 2026-08-26 8:55 Dominik 'Rathann' Mierzejewski
0 siblings, 0 replies; only message in thread
From: Dominik 'Rathann' Mierzejewski @ 2026-08-26 8:55 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/inn
Branch : epel10.3
Commit : 02c2022ac441f2ee6e7e2676cc85207d45a1ba66
Author : Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Date : 2022-11-07T14:28:20+01:00
Stats : +136/-124 in 5 file(s)
URL : https://src.fedoraproject.org/rpms/inn/c/02c2022ac441f2ee6e7e2676cc85207d45a1ba66?branch=epel10.3
Log:
update to 2.7.0 (#2107592)
update files list (API and ABI break)
---
diff --git a/.gitignore b/.gitignore
index 3affe64..d7b7fe7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,6 @@ inn-faq.tar.gz
/inn-2.6.4.tar.gz.asc
/inn-2.6.5.tar.gz
/inn-2.6.5.tar.gz.asc
+/inn-2.7.0.tar.gz
+/inn-2.7.0.tar.gz.asc
+/inn-faq-2.7.0.html
diff --git a/inn-2.6.4-rh.patch b/inn-2.6.4-rh.patch
deleted file mode 100644
index d6d613c..0000000
--- a/inn-2.6.4-rh.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-diff -up inn-2.6.4/lib/innconf.c.rh inn-2.6.4/lib/innconf.c
---- inn-2.6.4/lib/innconf.c.rh 2021-01-21 22:53:07.000000000 +0100
-+++ inn-2.6.4/lib/innconf.c 2021-02-14 18:09:10.916597648 +0100
-@@ -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.4/Makefile.global.in.rh inn-2.6.4/Makefile.global.in
---- inn-2.6.4/Makefile.global.in.rh 2021-02-14 18:09:10.916597648 +0100
-+++ inn-2.6.4/Makefile.global.in 2021-02-14 18:17:33.717252944 +0100
-@@ -316,8 +316,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.6.4/perl/INN/Config.pm.in.rh inn-2.6.4/perl/INN/Config.pm.in
---- inn-2.6.4/perl/INN/Config.pm.in.rh 2021-01-21 22:53:07.000000000 +0100
-+++ inn-2.6.4/perl/INN/Config.pm.in 2021-02-14 18:09:10.916597648 +0100
-@@ -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.6.4/samples/inn.conf.in.rh inn-2.6.4/samples/inn.conf.in
---- inn-2.6.4/samples/inn.conf.in.rh 2021-01-21 22:53:07.000000000 +0100
-+++ inn-2.6.4/samples/inn.conf.in 2021-02-14 18:09:10.916597648 +0100
-@@ -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.4/scripts/Makefile.rh inn-2.6.4/scripts/Makefile
---- inn-2.6.4/scripts/Makefile.rh 2021-01-21 22:53:07.000000000 +0100
-+++ inn-2.6.4/scripts/Makefile 2021-02-14 18:09:10.916597648 +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.6.4/support/fixscript.in.rh inn-2.6.4/support/fixscript.in
---- inn-2.6.4/support/fixscript.in.rh 2021-01-21 22:53:07.000000000 +0100
-+++ inn-2.6.4/support/fixscript.in 2021-02-14 18:09:10.916597648 +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%"`
-diff -up inn-2.6.4/tests/lib/innconf-t.c.rh inn-2.6.4/tests/lib/innconf-t.c
---- inn-2.6.4/tests/lib/innconf-t.c.rh 2021-01-21 22:53:07.000000000 +0100
-+++ inn-2.6.4/tests/lib/innconf-t.c 2021-02-14 18:09:10.916597648 +0100
-@@ -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 --git a/inn-2.7.0-fedora.patch b/inn-2.7.0-fedora.patch
new file mode 100644
index 0000000..e09c63f
--- /dev/null
+++ b/inn-2.7.0-fedora.patch
@@ -0,0 +1,103 @@
+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;
diff --git a/inn.spec b/inn.spec
index 14c26dc..33aa56a 100644
--- a/inn.spec
+++ b/inn.spec
@@ -2,8 +2,8 @@
Summary: The InterNetNews system, an Usenet news server
Name: inn
-Version: 2.6.5
-Release: 2%{?dist}
+Version: 2.7.0
+Release: 1%{?dist}
#see LICENSE file for details
License: GPLv2+ and BSD and MIT and Public Domain
URL: https://www.eyrie.org/~eagle/software/inn/
@@ -13,7 +13,7 @@ Source2: inn-default-distributions
# gpg2 --recv-key 0xD73934B49674CF5CCD9AC2787D80315C5736DE75
# gpg2 --export --export-options export-minimal 0xD73934B49674CF5CCD9AC2787D80315C5736DE75
Source3: 0xD73934B49674CF5CCD9AC2787D80315C5736DE75.gpg
-Source10: http://www.eyrie.org/~eagle/faqs/inn.html
+Source10: http://www.eyrie.org/~eagle/faqs/inn.html#/inn-faq-%{version}.html
Source20: innd.service
Source21: innd-expire.service
Source22: innd-expire.timer
@@ -22,7 +22,7 @@ Source24: innd-nntpsend.timer
Source25: innd-rnews.service
Source26: innd-rnews.timer
Source30: inn.rsyslog
-Patch1: inn-2.6.4-rh.patch
+Patch1: inn-2.7.0-fedora.patch
BuildRequires: autoconf
BuildRequires: byacc
BuildRequires: cyrus-sasl-devel
@@ -155,7 +155,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
# -- Install man pages needed by suck et al.
mkdir -p $RPM_BUILD_ROOT%{_includedir}/inn
-for f in defines.h system.h libinn.h storage.h options.h dbz.h
+for f in system.h libinn.h storage.h options.h dbz.h
do
install -p -m 0644 ./include/inn/$f $RPM_BUILD_ROOT%{_includedir}/inn
done
@@ -190,7 +190,7 @@ export PATH
EOF
#Fix perms in sample directory to avoid bogus dependencies
-find samples -name "*.in" -exec chmod a-x {} \;
+find samples -type f | xargs chmod a-x
# we get this from cleanfeed
rm -f $RPM_BUILD_ROOT%{_libexecdir}/news/filter/filter_innd.pl
@@ -199,7 +199,7 @@ mkdir -p $RPM_BUILD_ROOT%{_bindir}
ln -sf %{_libexecdir}/news/inews $RPM_BUILD_ROOT%{_bindir}/inews
ln -sf %{_libexecdir}/news/rnews $RPM_BUILD_ROOT%{_bindir}/rnews
# fix debuginfo extraction, permissions are set in files section, anyway
-chmod u+w $RPM_BUILD_ROOT%{_libdir}/lib{inn{,hist},storage}.so.*
+chmod u+w $RPM_BUILD_ROOT%{_libdir}/libinn{,hist,storage}.so.*
pushd $RPM_BUILD_ROOT%{_libexecdir}/news
chmod u+w \
actsync \
@@ -207,13 +207,14 @@ chmod u+w \
auth/passwd/{auth_krb5,ckpasswd,radius} \
auth/resolv/{domain,ident} \
batcher \
- {buff,file,over}chan \
+ {buff,over}chan \
buffindexed_d \
convdate \
ctlinnd \
cvtbatch \
expire{,over} \
fastrm \
+ gencancel \
getlist \
{grep,make,prune}history \
imapfeed \
@@ -224,6 +225,7 @@ chmod u+w \
nnrpd \
nntpget \
ovdb_{init,monitor,server,stat} \
+ ovsqlite-server \
rnews{,.libexec/{de,en}code} \
shlock \
shrinkfile \
@@ -371,7 +373,9 @@ fi
%config(noreplace) %{_sysconfdir}/news/nocem.ctl
%config(noreplace) %{_sysconfdir}/news/incoming.conf
%config(noreplace) %{_sysconfdir}/news/inn-radius.conf
+%config(noreplace) %{_sysconfdir}/news/inn-secrets.conf
%config(noreplace) %{_sysconfdir}/news/ovdb.conf
+%config(noreplace) %{_sysconfdir}/news/ovsqlite.conf
%config(noreplace) %{_sysconfdir}/news/newsfeeds
%config(noreplace) %{_sysconfdir}/news/readers.conf
%config(noreplace) %{_sysconfdir}/news/distributions
@@ -389,16 +393,16 @@ fi
%config(noreplace) %{_sysconfdir}/news/innshellvars.tcl.local
%defattr(0755,root,news,0755)
-%attr(0755,news,news) %{_bindir}/rnews
+%{_bindir}/rnews
%dir %{_libexecdir}/news
%{_libexecdir}/news/controlbatch
%attr(4510,root,news) %{_libexecdir}/news/innbind
%{_libexecdir}/news/docheckgroups
%{_libexecdir}/news/imapfeed
-%{_libexecdir}/news/send-nntp
%{_libexecdir}/news/actmerge
%{_libexecdir}/news/ovdb_server
-%{_libexecdir}/news/filechan
+%{_libexecdir}/news/ovsqlite-server
+%{_libexecdir}/news/gencancel
%{_libexecdir}/news/ninpaths
%{_libexecdir}/news/mod-active
%{_libexecdir}/news/news2mail
@@ -447,6 +451,7 @@ fi
%{_libexecdir}/news/prunehistory
%{_libexecdir}/news/innreport
%attr(0644,root,news) %{_libexecdir}/news/innreport_inn.pm
+%attr(0644,root,news) %{_libexecdir}/news/innreport-display.conf
%{_libexecdir}/news/getlist
%{_libexecdir}/news/innd
%{_libexecdir}/news/innupgrade
@@ -455,7 +460,6 @@ fi
%{_libexecdir}/news/innwatch
%{_libexecdir}/news/inncheck
%{_libexecdir}/news/writelog
-%{_libexecdir}/news/signcontrol
%{_libexecdir}/news/tdx-util
%{_libexecdir}/news/tally.control
%{_libexecdir}/news/overchan
@@ -496,12 +500,9 @@ fi
%define controldir %{_libexecdir}/news/control
%dir %{controldir}
-%{controldir}/version.pl
%{controldir}/ihave.pl
-%{controldir}/sendsys.pl
%{controldir}/sendme.pl
%{controldir}/checkgroups.pl
-%{controldir}/senduuname.pl
%{controldir}/newgroup.pl
%{controldir}/rmgroup.pl
@@ -535,14 +536,17 @@ fi
%dir /var/spool/news/overview
%dir /var/log/news/OLD
%dir %{_sharedstatedir}/news/tmp
-%ghost %dir /run/news
%files libs
-%{_libdir}/lib*.so.*
+%{_libdir}/libinn.so.8{,.*}
+%{_libdir}/libinnhist.so.3{,.*}
+%{_libdir}/libinnstorage.so.3{,.*}
%files devel
%{_includedir}/inn
-%{_libdir}/lib*.so
+%{_libdir}/libinn.so
+%{_libdir}/libinnhist.so
+%{_libdir}/libinnstorage.so
%{_mandir}/man3/*
%exclude %{_mandir}/man3/INN::Config.3pm*
%exclude %{_mandir}/man3/INN::Utils::Shlock.3pm*
@@ -550,12 +554,17 @@ fi
%files -n inews
%config(noreplace) %attr(-,news,news) %{_sysconfdir}/news/inn.conf
+%config(noreplace) %attr(0660,news,news) %{_sysconfdir}/news/inn-secrets.conf
%config(noreplace) %attr(-,news,news) %{_sysconfdir}/news/passwd.nntp
%{_bindir}/inews
%attr(0755,root,root) %{_libexecdir}/news/inews
%{_mandir}/man1/inews*
%changelog
+* Mon Nov 07 2022 Dominik Mierzejewski <dominik@greysector.net> - 2.7.0-1
+- update to 2.7.0 (#2107592)
+- update files list (API and ABI break)
+
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
diff --git a/sources b/sources
index a1b9563..f391b21 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (inn-2.6.5.tar.gz) = 7200880e179ac10dcb04ed534d2f3119ad4045e912016342e2552e3fc129a2b2d4360615bc03bc9f4e17c440cf07c8017c55f4c17400af140a8bf7b96dc52a2f
-SHA512 (inn-2.6.5.tar.gz.asc) = f488554d90dcb8a4251113d7a7cc76899616797374e8e9703fffb5dd77ab83870fe6626564fe52ad6fc40b96c8b37f3aec125181008f7c2771a83715eaa06ea2
-SHA512 (inn.html) = 2f7838bd774b65c59c3323224c5762b02e346d6369865538cf299facf08e6631766355d63c291cf9c383c65d5bc0f87fff0f83a6cd80ac76747e93b23586a736
+SHA512 (inn-2.7.0.tar.gz) = 5c54816edfab667b12ea330714656de6501d780f3f622fd3cc7721d767f17eb38e7a18ddfe123fd0d8e67c4f21e0beb9ea05668ef77e1c52abd7e32f603824c4
+SHA512 (inn-2.7.0.tar.gz.asc) = 9680d3219c657ded4f5ceb6dc5265d2dc164e2c9d9dfbec4ea88ca78a1b6282a95aa252b6a0ea5603c20bfb1ab6dc0a55bb7cd8df122904673991d1d9133505c
+SHA512 (inn-faq-2.7.0.html) = 3e5f0874cb2a3c407f18bbb4151cc9c80037f92192ee7f7e28b7b153709a7342910966ad606fdbe13b0a3cf225089c112c9e0cb565d6cc631b90e2438b3f60ff
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-08-26 8:55 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-26 8:55 [rpms/inn] epel10.3: update to 2.7.0 (#2107592) Dominik 'Rathann' Mierzejewski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox