[rpms/inn] epel10: Merge branch 'f36' into rawhide

[rpms/inn] epel10: Merge branch 'f36' into rawhide

[Dominik 'Rathann' Mierzejewski]

A new commit has been pushed.

Repo   : rpms/inn
Branch : epel10
Commit : 97b81b6085e9934a7b2a50ed072c2acbc94b4501
Author : Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Date   : 2022-06-15T20:57:38+02:00
Stats  : +27/-150 in 5 file(s)
URL    : https://src.fedoraproject.org/rpms/inn/c/97b81b6085e9934a7b2a50ed072c2acbc94b4501?branch=epel10

Log:
Merge branch 'f36' into rawhide

---
diff --git a/.gitignore b/.gitignore
index e8bb87b..3affe64 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,5 @@ inn-faq.tar.gz
 /inn-2.6.3.tar.gz.asc
 /inn-2.6.4.tar.gz
 /inn-2.6.4.tar.gz.asc
+/inn-2.6.5.tar.gz
+/inn-2.6.5.tar.gz.asc

diff --git a/208.patch b/208.patch
deleted file mode 100644
index 71338df..0000000
--- a/208.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From 8e3d894a9cc0d5848834ad19c71a063dc0c39002 Mon Sep 17 00:00:00 2001
-From: Richard Kettlewell <rjk@greenend.org.uk>
-Date: Thu, 21 Oct 2021 14:20:07 +0100
-Subject: [PATCH] Build concurrency fixes
-
-We serialize build of top-level subdirectories. The previous attempt
-to support make -j was broken, since the subdirectories have dependencies
-between them and attempt to cross-invoke one another, leading to multiple
-concurrent make invocations on the same directory.
-
-A couple of missing dependencies are also added. The sql-init.h
-dependency should be generated by makedepend, but it's confused about
-object code extensions. This change is a stopgap until that is
-addressed.
----
- Makefile                     | 58 +++++++++++++++---------------------
- storage/Makefile             |  6 ++++
- storage/ovsqlite/ovmethod.mk |  2 +-
- 3 files changed, 31 insertions(+), 35 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index b8b8486e9..6bd42a6ab 100644
---- a/Makefile
-+++ b/Makefile
-@@ -38,40 +38,30 @@ SNAPDIRS    = -e 1,2d -e '/(Directory)/!d' -e 's/ .*//' -e 's;^;$(SNAPDIR)/;'
- DISTFILES   = -e 1,2d -e '/(Directory)/d' -e 's/ .*//'
- 
- 
--##  Major target -- build everything.  Rather than just looping through
--##  all the directories, use a set of parallel rules so that make -j can
--##  work on more than one directory at a time.
--##  Be careful of a non-GNU make:  after a completed command, it does not
--##  necessarily return the script back to the starting directory.
--all: all-include all-libraries all-programs
--	cd doc     && $(MAKE) all || exit 1 ; cd ..
--	cd samples && $(MAKE) all || exit 1 ; cd ..
--	cd site    && $(MAKE) all || exit 1 ; cd ..
--
--all-include:			; cd include   && $(MAKE) all
--
--all-libraries:	all-lib all-storage all-history
--
--all-lib:	all-include	; cd lib       && $(MAKE) all
--all-storage:	all-lib		; cd storage   && $(MAKE) library
--all-history:	all-storage	; cd history   && $(MAKE) all
--
--all-programs:	all-innd all-nnrpd all-innfeed all-control all-expire \
--		all-frontends all-backends all-authprogs all-scripts \
--		all-perl all-store-util
--
--all-authprogs:	all-lib		; cd authprogs && $(MAKE) all
--all-backends:	all-libraries	; cd backends  && $(MAKE) all
--all-control:			; cd control   && $(MAKE) all
--all-expire:	all-libraries	; cd expire    && $(MAKE) all
--all-frontends:	all-libraries	; cd frontends && $(MAKE) all
--all-innd:	all-libraries	; cd innd      && $(MAKE) all
--all-innfeed:	all-libraries	; cd innfeed   && $(MAKE) all
--all-nnrpd:	all-libraries	; cd nnrpd     && $(MAKE) all
--all-perl:			; cd perl      && $(MAKE) all
--all-scripts:			; cd scripts   && $(MAKE) all
--all-store-util:	all-libraries	; cd storage   && $(MAKE) programs
--
-+##  Major target -- build everything.
-+##
-+## libstorage depends on libinnhist, but some of the storage/...
-+## programs depend on libinnhist, hence the two calls into
-+## storage.
-+all:
-+	$(MAKE) -C include
-+	$(MAKE) -C lib
-+	$(MAKE) -C storage library
-+	$(MAKE) -C history
-+	$(MAKE) -C innd
-+	$(MAKE) -C nnrpd
-+	$(MAKE) -C innfeed
-+	$(MAKE) -C control
-+	$(MAKE) -C expire
-+	$(MAKE) -C frontends
-+	$(MAKE) -C backends
-+	$(MAKE) -C authprogs
-+	$(MAKE) -C scripts
-+	$(MAKE) -C perl
-+	$(MAKE) -C storage programs
-+	$(MAKE) -C doc
-+	$(MAKE) -C samples
-+	$(MAKE) -C site
- 
- ##  If someone tries to run make before running configure, tell them to run
- ##  configure first.
-diff --git a/storage/Makefile b/storage/Makefile
-index 854222c99..c62516c92 100644
---- a/storage/Makefile
-+++ b/storage/Makefile
-@@ -101,6 +101,12 @@ libstorage$(PROFSUFFIX).a: $(SOURCES)
- 	rm -f $(OBJECTS)
- 
- 
-+# TODO bodge in missing dependency. This isn't a full solution
-+# but it works for now.
-+#
-+# See https://github.com/InterNetNews/inn/issues/206
-+ovsqlite/ovsqlite-server.lo: ovsqlite/sql-init.h
-+
- ##  Dependencies.  Default list, below, is probably good enough.
- 
- depend:	Makefile $(SOURCES) $(EXTRA_SOURCES)
-diff --git a/storage/ovsqlite/ovmethod.mk b/storage/ovsqlite/ovmethod.mk
-index 8ab11dc47..3982f698d 100644
---- a/storage/ovsqlite/ovmethod.mk
-+++ b/storage/ovsqlite/ovmethod.mk
-@@ -3,7 +3,7 @@ OVSQLITEOBJECTS = ovsqlite/ovsqlite-server.o ovsqlite/sql-main.o \
- 	ovsqlite/ovsqlite-private.o
- OVSQLITELOBJECTS = $(OVSQLITEOBJECTS:.o=.lo)
- 
--ovsqlite/ovsqlite-server: $(OVSQLITEOBJECTS) $(OVSQLITELOBJECTS)
-+ovsqlite/ovsqlite-server: $(OVSQLITEOBJECTS) $(LIBSTORAGE)
- 	$(LIBLD) $(LDFLAGS) $(SQLITE3_LDFLAGS) -o $@ $(OVSQLITELOBJECTS) \
- 	$(LIBSTORAGE) $(LIBHIST) $(LIBINN) $(STORAGE_LIBS) $(SQLITE3_LIBS) \
- 	$(LIBS)

diff --git a/inn-2.6.4-changeset-10541.patch b/inn-2.6.4-changeset-10541.patch
deleted file mode 100644
index f2c90f7..0000000
--- a/inn-2.6.4-changeset-10541.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: /branches/2.6/tests/util/inndf.t
-===================================================================
---- /branches/2.6/tests/util/inndf.t	(revision 10540)
-+++ /branches/2.6/tests/util/inndf.t	(revision 10541)
-@@ -129,6 +129,6 @@
-     printcount "not ok"
- fi
--out=`$inndf -o`
--if [ "$out" = "3.17% overview space used" ] ; then
-+out=`$inndf -o | sed 's/\...%/\.00%/'`
-+if [ "$out" = "3.00% overview space used" ] ; then
-     printcount "ok"
- else

diff --git a/inn.spec b/inn.spec
index ebe8f56..a122f43 100644
--- a/inn.spec
+++ b/inn.spec
@@ -2,8 +2,8 @@
 
 Summary: The InterNetNews system, an Usenet news server
 Name: inn
-Version: 2.6.4
-Release: 13%{?dist}
+Version: 2.6.5
+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/
@@ -23,9 +23,6 @@ Source25: innd-rnews.service
 Source26: innd-rnews.timer
 Source30: inn.rsyslog
 Patch1: inn-2.6.4-rh.patch
-Patch2: https://inn.eyrie.org/trac/changeset/10541?format=diff&new=10541#/inn-2.6.4-changeset-10541.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=1558586
-Patch3: https://github.com/InterNetNews/inn/pull/208.patch
 BuildRequires: autoconf
 BuildRequires: byacc
 BuildRequires: cyrus-sasl-devel
@@ -116,7 +113,6 @@ This package contains dynamic libraries provided by INN project
 gpgv2 --keyring %{S:3} %{S:1} %{S:0}
 %setup -q -n inn-%{version}
 %patch1 -p1 -b .rh
-%patch2 -p3
 
 %build
 %configure \
@@ -149,8 +145,7 @@ gpgv2 --keyring %{S:3} %{S:1} %{S:0}
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=1558586
-make
+%make_build
 
 %install
 mkdir -p $RPM_BUILD_ROOT%{_libdir}
@@ -245,12 +240,12 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a
 # Documentation is installed via rpm %%doc directive
 rm -rf $RPM_BUILD_ROOT/usr/doc/
 
-# Use tmpfiles.d to create /var/run/news
+# Use tmpfiles.d to create /run/news
 install -d $RPM_BUILD_ROOT%{_tmpfilesdir}
 cat <<EOF >$RPM_BUILD_ROOT%{_tmpfilesdir}/inn.conf
-D %{_localstatedir}/run/news 0755 news news -
+D /run/news 0755 news news -
 EOF
-install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/run/news
+install -d -m 0755 $RPM_BUILD_ROOT/run/news
 
 install -d %{buildroot}%{_presetdir}
 cat <<EOF >%{buildroot}%{_presetdir}/80-inn.preset
@@ -317,7 +312,7 @@ fi
 %files
 %license doc/GPL
 %license LICENSE
-%doc NEWS README* HACKING ChangeLog CONTRIBUTORS INSTALL FAQ.html
+%doc NEWS README* HACKING CONTRIBUTORS INSTALL FAQ.html
 %doc doc/config-design doc/history-innfeed doc/sample-control
 %doc doc/config-semantics doc/external-auth TODO doc/hook-python doc/config-syntax
 %doc doc/hook-perl doc/history
@@ -343,12 +338,12 @@ fi
 %{_mandir}/man1/s*.1.gz
 %{_mandir}/man3/INN::Config.3pm*
 %{_mandir}/man3/INN::Utils::Shlock.3pm*
-%{_mandir}/man3/uwildmat.3*
+%{_mandir}/man3/libinn_uwildmat.3*
 %{_mandir}/man[58]/*
 %defattr(-,news,news,-)
 # tmpfile.d files
 %{_tmpfilesdir}/inn.conf
-%dir %{_localstatedir}/run/news
+%dir /run/news
 # /etc/news config files
 %dir %{_sysconfdir}/news
 %config(noreplace) %{_sysconfdir}/news/send-uucp.cf
@@ -551,7 +546,7 @@ fi
 %{_mandir}/man3/*
 %exclude %{_mandir}/man3/INN::Config.3pm*
 %exclude %{_mandir}/man3/INN::Utils::Shlock.3pm*
-%exclude %{_mandir}/man3/uwildmat.3*
+%exclude %{_mandir}/man3/libinn_uwildmat.3*
 
 %files -n inews
 %config(noreplace) %attr(-,news,news) %{_sysconfdir}/news/inn.conf
@@ -561,6 +556,12 @@ fi
 %{_mandir}/man1/inews*
 
 %changelog
+* Wed Jun 15 2022 Dominik Mierzejewski <dominik@greysector.net> - 2.6.5-1
+- update to 2.6.5 (#2058851)
+- drop obsolete patch
+- point to /run/news in tmpfiles.d drop-in
+- re-enable parallel build
+
 * Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 2.6.4-13
 - Rebuilt for Python 3.11
 

diff --git a/sources b/sources
index 2145a67..a1b9563 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (inn-2.6.4.tar.gz) = 0b1e4add9fe1f2a423f372adbce9622ffe943c75865427f30b18f5a5b8c2dae158d5bfa4d611631cb993757523bc858ca6ad907463bd5f91c60a851359a70c57
-SHA512 (inn-2.6.4.tar.gz.asc) = 7049483eade10150ecb4d74a47a046fa604267e04d1b7551161622aea3f4e87492675d999a57afc7dccd4b25b658c4cfd6ea8b62ec73fd9edcd610c788749891
-SHA512 (inn.html) = c0ff191260d88cb110df4f2c1f2f96649a8f3fccbe596aceea8f6740c01c2a6ff414df5fb29dc47782b3fe1cb2e38abd42c7bb7894eaa42555a1f4494991355b
+SHA512 (inn-2.6.5.tar.gz) = 7200880e179ac10dcb04ed534d2f3119ad4045e912016342e2552e3fc129a2b2d4360615bc03bc9f4e17c440cf07c8017c55f4c17400af140a8bf7b96dc52a2f
+SHA512 (inn-2.6.5.tar.gz.asc) = f488554d90dcb8a4251113d7a7cc76899616797374e8e9703fffb5dd77ab83870fe6626564fe52ad6fc40b96c8b37f3aec125181008f7c2771a83715eaa06ea2
+SHA512 (inn.html) = 2f7838bd774b65c59c3323224c5762b02e346d6369865538cf299facf08e6631766355d63c291cf9c383c65d5bc0f87fff0f83a6cd80ac76747e93b23586a736

diff --git a/inn.spec b/inn.spec
index 250d77b..a122f43 100644
--- a/inn.spec
+++ b/inn.spec
@@ -562,6 +562,12 @@ fi
 - point to /run/news in tmpfiles.d drop-in
 - re-enable parallel build
 
+* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 2.6.4-13
+- Rebuilt for Python 3.11
+
+* Wed Jun 01 2022 Jitka Plesnikova <jplesnik@redhat.com> - 2.6.4-12
+- Perl 5.36 rebuild
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.4-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild