public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
To: git-commits@fedoraproject.org
Subject: [rpms/inn] epel10.3: update to 2.6.4
Date: Wed, 26 Aug 2026 08:55:12 GMT [thread overview]
Message-ID: <178773451234.1.10691758302524978029.rpms-inn-dcf9ac916eab@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/inn
Branch : epel10.3
Commit : dcf9ac916eabb70f026f8261540a574c14578bfe
Author : Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Date : 2021-02-14T22:44:43+01:00
Stats : +139/-172 in 8 file(s)
URL : https://src.fedoraproject.org/rpms/inn/c/dcf9ac916eabb70f026f8261540a574c14578bfe?branch=epel10.3
Log:
update to 2.6.4
drop obsolete patch
---
diff --git a/.gitignore b/.gitignore
index 556b24a..e8bb87b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,5 @@ inn-faq.tar.gz
/inn-2.6.2.tar.gz.asc
/inn-2.6.3.tar.gz
/inn-2.6.3.tar.gz.asc
+/inn-2.6.4.tar.gz
+/inn-2.6.4.tar.gz.asc
diff --git a/inn-2.6.0.pie.patch b/inn-2.6.0.pie.patch
deleted file mode 100644
index caffaf3..0000000
--- a/inn-2.6.0.pie.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up inn-2.6.0/frontends/Makefile.pie inn-2.6.0/frontends/Makefile
---- inn-2.6.0/frontends/Makefile.pie 2016-02-03 22:48:29.000000000 +0100
-+++ inn-2.6.0/frontends/Makefile 2016-02-03 23:02:48.237334608 +0100
-@@ -79,7 +79,7 @@ ovdb_init: ovdb_init.o $(BOTH) ; $(
- ovdb_monitor: ovdb_monitor.o $(BOTH) ; $(LINK) ovdb_monitor.o $(STORELIBS)
- ovdb_server: ovdb_server.o $(BOTH) ; $(LINK) ovdb_server.o $(STORELIBS)
- ovdb_stat: ovdb_stat.o $(BOTH) ; $(LINK) ovdb_stat.o $(STORELIBS)
--rnews: rnews.o $(BOTH) ; $(LINK) rnews.o $(STORELIBS)
-+rnews: rnews.o $(BOTH) ; $(LINK) rnews.o -pie $(STORELIBS)
- sm: sm.o $(BOTH) ; $(LINK) sm.o $(STORELIBS)
-
- ovdb_init.o: ovdb_init.c
-diff -up inn-2.6.0/innd/Makefile.pie inn-2.6.0/innd/Makefile
---- inn-2.6.0/innd/Makefile.pie 2016-02-03 22:48:29.000000000 +0100
-+++ inn-2.6.0/innd/Makefile 2016-02-03 23:03:15.732983731 +0100
-@@ -40,7 +40,7 @@ perl.o: perl.c ; $(CC) $(CFLAGS) $(PE
- python.o: python.c ; $(CC) $(CFLAGS) $(PYTHON_CPPFLAGS) -c python.c
-
- innd: $(OBJECTS) $(LIBSTORAGE) $(LIBHIST) $(LIBINN)
-- $(LIBLD) $(LDFLAGS) -o $@ $(OBJECTS) $(INNDLIBS)
-+ $(LIBLD) -pie $(LDFLAGS) -o $@ $(OBJECTS) $(INNDLIBS)
-
- tinyleaf: tinyleaf.o $(LIBINN)
- $(LIBLD) $(LDFLAGS) -o $@ tinyleaf.o $(LIBINN) $(LIBS)
diff --git a/inn-2.6.3-filterPath.patch b/inn-2.6.3-filterPath.patch
deleted file mode 100644
index b628957..0000000
--- a/inn-2.6.3-filterPath.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -up inn-2.6.3/innd/art.c.fp inn-2.6.3/innd/art.c
---- inn-2.6.3/innd/art.c.fp 2019-02-07 16:02:22.000000000 +0100
-+++ inn-2.6.3/innd/art.c 2020-09-11 14:24:21.055208612 +0200
-@@ -77,10 +77,6 @@ static char ARTjnk[] = "junk";
- static char hostcclass[256];
- #define ARThostchar(c) ((hostcclass[(unsigned char)(c)]) != 0)
-
--#if defined(DO_PERL) || defined(DO_PYTHON)
--const char *filterPath;
--#endif /* DO_PERL || DO_PYTHON */
--
- /* Prototypes. */
- static void ARTerror(CHANNEL *cp, const char *format, ...)
- __attribute__((__format__(printf, 2, 3)));
-@@ -2072,10 +2068,6 @@ ARTpost(CHANNEL *cp)
- }
- }
-
--#if defined(DO_PERL) || defined(DO_PYTHON)
-- filterPath = HDR(HDR__PATH);
--#endif /* DO_PERL || DO_PYHTON */
--
- #if defined(DO_PYTHON)
- TMRstart(TMR_PYTHON);
- filterrc = PYartfilter(data, article->data + data->Body,
-diff -up inn-2.6.3/innd/python.c.fp inn-2.6.3/innd/python.c
---- inn-2.6.3/innd/python.c.fp 2019-02-07 16:02:22.000000000 +0100
-+++ inn-2.6.3/innd/python.c 2020-09-11 14:23:46.143958961 +0200
-@@ -60,7 +60,6 @@
- #include "innd.h"
-
- bool PythonFilterActive;
--char *filterPath; /* This gets set in art.c. */
- PyObject *PYFilterObject = NULL;
- PyObject *PYFilterModule = NULL;
-
diff --git a/inn-2.6.3-rh.patch b/inn-2.6.3-rh.patch
deleted file mode 100644
index 2139158..0000000
--- a/inn-2.6.3-rh.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-diff -up inn-2.6.3/lib/innconf.c.rh inn-2.6.3/lib/innconf.c
---- inn-2.6.3/lib/innconf.c.rh 2019-02-07 16:02:22.000000000 +0100
-+++ inn-2.6.3/lib/innconf.c 2020-09-12 23:58:28.176116563 +0200
-@@ -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.3/Makefile.global.in.rh inn-2.6.3/Makefile.global.in
---- inn-2.6.3/Makefile.global.in.rh 2019-02-07 16:02:22.000000000 +0100
-+++ inn-2.6.3/Makefile.global.in 2020-09-12 23:58:28.177116571 +0200
-@@ -309,8 +309,8 @@ INEWSMODE = @INEWSMODE@
- RNEWSMODE = @RNEWSMODE@
- FILEMODE = @FILEMODE@
-
--OWNER = -o $(RUNASUSER) -g $(RUNASGROUP)
--ROWNER = -o $(RUNASUSER) -g $(RNEWSGROUP)
-+OWNER =
-+ROWNER =
-
- INSTALL = $(top)/support/install-sh -c
-
-diff -up inn-2.6.3/samples/inn.conf.in.rh inn-2.6.3/samples/inn.conf.in
---- inn-2.6.3/samples/inn.conf.in.rh 2019-02-07 16:02:22.000000000 +0100
-+++ inn-2.6.3/samples/inn.conf.in 2020-09-12 23:58:28.177116571 +0200
-@@ -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.3/tests/lib/innconf-t.c.rh inn-2.6.3/tests/lib/innconf-t.c
---- inn-2.6.3/tests/lib/innconf-t.c.rh 2019-02-07 16:02:22.000000000 +0100
-+++ inn-2.6.3/tests/lib/innconf-t.c 2020-09-13 00:08:44.805778629 +0200
-@@ -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 -up inn-2.5.2/perl/INN/Config.pm.in.pfix inn-2.5.2/perl/INN/Config.pm.in
---- inn-2.5.2/perl/INN/Config.pm.in.pfix 2010-06-29 17:13:57.507194722 +0200
-+++ inn-2.5.2/perl/INN/Config.pm.in 2010-06-29 17:14:32.270853010 +0200
-@@ -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.5.1/scripts/Makefile.redhat_build inn-2.5.1/scripts/Makefile
---- inn-2.5.1/scripts/Makefile.redhat_build 2009-12-01 14:06:00.977311656 +0100
-+++ inn-2.5.1/scripts/Makefile 2009-12-01 14:06:00.977311656 +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.5.1/support/fixscript.in.redhat_build inn-2.5.1/support/fixscript.in
---- inn-2.5.1/support/fixscript.in.redhat_build 2009-12-01 14:18:13.664811185 +0100
-+++ inn-2.5.1/support/fixscript.in 2009-12-01 14:18:50.024811262 +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 --git a/inn-2.6.4-pie.patch b/inn-2.6.4-pie.patch
new file mode 100644
index 0000000..e26d7b5
--- /dev/null
+++ b/inn-2.6.4-pie.patch
@@ -0,0 +1,24 @@
+diff -up inn-2.6.4/frontends/Makefile.pie inn-2.6.4/frontends/Makefile
+--- inn-2.6.4/frontends/Makefile.pie 2021-02-14 18:22:01.069190182 +0100
++++ inn-2.6.4/frontends/Makefile 2021-02-14 18:23:30.059845120 +0100
+@@ -88,7 +88,7 @@ ovdb_server: ovdb_server.o $(BOTH)
+ $(LINKDEPS) ovdb_server.o $(STORELIBS)
+ ovdb_stat: ovdb_stat.o $(BOTH)
+ $(LINKDEPS) ovdb_stat.o $(STORELIBS)
+-rnews: rnews.o $(BOTH) ; $(LINK) rnews.o $(STORELIBS)
++rnews: rnews.o $(BOTH) ; $(LINK) rnews.o -pie $(STORELIBS)
+ sm: sm.o $(BOTH)
+ $(LINKDEPS) sm.o $(STORELIBS)
+
+diff -up inn-2.6.4/innd/Makefile.pie inn-2.6.4/innd/Makefile
+--- inn-2.6.4/innd/Makefile.pie 2021-01-21 22:53:07.000000000 +0100
++++ inn-2.6.4/innd/Makefile 2021-02-14 18:22:01.069190182 +0100
+@@ -41,7 +41,7 @@ perl.o: perl.c ; $(CC) $(CFLAGS) $(PE
+ python.o: python.c ; $(CC) $(CFLAGS) $(PYTHON_CPPFLAGS) -c python.c
+
+ innd: $(OBJECTS) $(LIBSTORAGE) $(LIBHIST) $(LIBINN)
+- $(LIBLD) $(LDFLAGS) -o $@ $(OBJECTS) $(INNDLIBS)
++ $(LIBLD) -pie $(LDFLAGS) -o $@ $(OBJECTS) $(INNDLIBS)
+
+ tinyleaf: tinyleaf.o $(LIBINN)
+ $(LIBLD) $(LDFLAGS) -o $@ tinyleaf.o $(LIBINN) $(LIBS)
diff --git a/inn-2.6.4-rh.patch b/inn-2.6.4-rh.patch
new file mode 100644
index 0000000..d6d613c
--- /dev/null
+++ b/inn-2.6.4-rh.patch
@@ -0,0 +1,103 @@
+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.spec b/inn.spec
index 3b892a2..f843a12 100644
--- a/inn.spec
+++ b/inn.spec
@@ -2,8 +2,8 @@
Summary: The InterNetNews system, an Usenet news server
Name: inn
-Version: 2.6.3
-Release: 11%{?dist}
+Version: 2.6.4
+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/
@@ -21,9 +21,8 @@ Source23: innd-nntpsend.service
Source24: innd-nntpsend.timer
Source25: innd-rnews.service
Source26: innd-rnews.timer
-Patch1: inn-2.6.3-rh.patch
-Patch2: inn-2.6.3-filterPath.patch
-Patch4: inn-2.6.0.pie.patch
+Patch1: inn-2.6.4-rh.patch
+Patch4: inn-2.6.4-pie.patch
BuildRequires: autoconf
BuildRequires: byacc
BuildRequires: cyrus-sasl-devel
@@ -115,7 +114,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 -p1 -b .gcc10
%patch4 -p1 -b .pie
%build
@@ -617,6 +615,10 @@ fi
%{_mandir}/man1/inews*
%changelog
+* Sun Feb 14 2021 Dominik Mierzejewski <rpm@greysector.net> - 2.6.4-1
+- update to 2.6.4
+- drop obsolete patch
+
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.3-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
diff --git a/sources b/sources
index bb0833a..2bd985a 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
-SHA512 (inn.html) = ee15038d5a3e1b6da79c4d733f039d8cac32c442645f922a1ccdadeeb6b181fc2234121a53c9c9c39efbf686fa95b4b2af69fec23e4b6bacab67024794b71fd1
-SHA512 (inn-2.6.3.tar.gz) = 123881d474ce1df21983b3093827915706670a400d48c3945c32635cd2fa7f52be2470c39ad54b84cc31b5454d7a3be31feb306802957954a3450146e31f52cb
-SHA512 (inn-2.6.3.tar.gz.asc) = b3dfc2290382c260719670e08678c73d9dff30fb5099e9acaa2a43f1461c26a6c60e273b75fff0adcee9ba815341fc15cb79068d997bcf381c7aefcf182c893e
+SHA512 (inn-2.6.4.tar.gz) = 0b1e4add9fe1f2a423f372adbce9622ffe943c75865427f30b18f5a5b8c2dae158d5bfa4d611631cb993757523bc858ca6ad907463bd5f91c60a851359a70c57
+SHA512 (inn-2.6.4.tar.gz.asc) = 7049483eade10150ecb4d74a47a046fa604267e04d1b7551161622aea3f4e87492675d999a57afc7dccd4b25b658c4cfd6ea8b62ec73fd9edcd610c788749891
reply other threads:[~2026-08-26 8:55 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178773451234.1.10691758302524978029.rpms-inn-dcf9ac916eab@fedoraproject.org \
--to=dominik@greysector.net \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox