public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/inn] epel10.3: update to 2.6.1 release (#1403810)
@ 2026-08-26 8:54 Dominik 'Rathann' Mierzejewski
0 siblings, 0 replies; only message in thread
From: Dominik 'Rathann' Mierzejewski @ 2026-08-26 8:54 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/inn
Branch : epel10.3
Commit : 1c561a7694d1959133386f9ce2166ab90ebd8727
Author : Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Date : 2017-01-26T18:10:38+01:00
Stats : +36/-44 in 5 file(s)
URL : https://src.fedoraproject.org/rpms/inn/c/1c561a7694d1959133386f9ce2166ab90ebd8727?branch=epel10.3
Log:
update to 2.6.1 release (#1403810)
drop obsolete patches
bring back the patch to build suid binaries as PIE
---
diff --git a/.gitignore b/.gitignore
index b0c77d2..3433433 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ inn-faq.tar.gz
/inn-2.6.0rc1.tar.gz
/inn-2.6.0.tar.gz
/inn.html
+/inn-2.6.1.tar.gz
diff --git a/inn-2.5.1.pie.patch b/inn-2.5.1.pie.patch
deleted file mode 100644
index 06daa52..0000000
--- a/inn-2.5.1.pie.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up inn-2.5.1/frontends/Makefile.pie inn-2.5.1/frontends/Makefile
---- inn-2.5.1/frontends/Makefile.pie 2009-10-12 20:24:04.000000000 +0200
-+++ inn-2.5.1/frontends/Makefile 2009-10-13 21:51:38.000000000 +0200
-@@ -85,7 +85,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 $(LIBINN) ; $(LINK) rnews.o $(STORELIBS)
-+rnews: rnews.o $(LIBINN) ; $(LINK) rnews.o -pie $(STORELIBS)
- sm: sm.o $(BOTH) ; $(LINK) sm.o $(STORELIBS)
-
- ovdb_init.o: ovdb_init.c
-diff -up inn-2.5.1/innd/Makefile.pie inn-2.5.1/innd/Makefile
---- inn-2.5.1/innd/Makefile.pie 2009-10-12 20:24:04.000000000 +0200
-+++ inn-2.5.1/innd/Makefile 2009-10-13 21:53:11.000000000 +0200
-@@ -44,7 +44,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.0.pie.patch b/inn-2.6.0.pie.patch
new file mode 100644
index 0000000..caffaf3
--- /dev/null
+++ b/inn-2.6.0.pie.patch
@@ -0,0 +1,24 @@
+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.spec b/inn.spec
index 15a30c0..652712a 100644
--- a/inn.spec
+++ b/inn.spec
@@ -2,8 +2,8 @@
Summary: The InterNetNews system, an Usenet news server
Name: inn
-Version: 2.6.0
-Release: 5%{?dist}
+Version: 2.6.1
+Release: 1%{?dist}
#see LICENSE file for details
License: GPLv2+ and BSD and MIT and Public Domain
Group: System Environment/Daemons
@@ -19,18 +19,11 @@ Source24: innd-nntpsend.timer
Source25: innd-rnews.service
Source26: innd-rnews.timer
Patch1: inn-2.6.0-rh.patch
+Patch4: inn-2.6.0.pie.patch
Patch6: inn-2.5.2.posix.patch
Patch7: inn-2.4.3.warn.patch
-Patch10: inn-2.6.0-doc.patch
Patch14: inn-redhat_build.patch
patch17: inn-2.5.2-pconf.patch
-Patch19: inn-2.5.4-docrun.patch
-# https://inn.eyrie.org/trac/changeset/9955
-Patch20: inn-2.6.0-nofork.patch
-# 1/2 Support OpenSSL 1.1.0, bug #1387660, in upstream 2.6 branch
-Patch21: inn-2.6.0-openssl-1.1-r9998.patch
-# 2/2 Support OpenSSL 1.1.0, bug #1387660, in upstream 2.6 branch
-Patch22: inn-2.6.0-openssl-1.1-r10024.patch
BuildRequires: autoconf
BuildRequires: python db4-devel byacc krb5-devel pam-devel e2fsprogs-devel perl
BuildRequires: perl-devel
@@ -108,18 +101,12 @@ exit 0
%prep
%setup -q -n inn-%{version}
%patch1 -p1 -b .rh
+%patch4 -p1 -b .pie
%patch6 -p1 -b .posix
%patch7 -p1 -b .warn
-%patch10 -p1 -b .docx
%patch14 -p1 -b .redhat_build
%patch17 -p1 -b .pfix
-# %patch19 -p1 -b .docrun
-%patch20 -p1 -b .nofork
-%patch21 -p0
-%patch22 -p0
-
-./autogen
perl -pi -e 's/su news/su -m news/' ./INSTALL
perl -pi -e 's/LOCK_READ/LLOCK_READ/' `find . -type f`
@@ -565,6 +552,11 @@ fi
%{_mandir}/man1/inews*
%changelog
+* Wed Jan 25 2017 Dominik Mierzejewski <rpm@greysector.net> - 2.6.1-1
+- update to 2.6.1 release (#1403810)
+- drop obsolete patches
+- bring back the patch to build suid binaries as PIE
+
* Fri Nov 25 2016 Petr Pisar <ppisar@redhat.com> - 2.6.0-5
- Support OpenSSL 1.1.0 (bug #1387660)
diff --git a/sources b/sources
index 4a327c4..a7ee479 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
-4c53092aa2517f4805924b22f8874a43 inn-2.6.0rc1.tar.gz
-e904c2a4d2f917d79b9cfdc94b17e275 inn-2.6.0.tar.gz
-e85e3bfec71ec7fd4c90e59102cf0918 inn.html
+SHA512 (inn-2.6.1.tar.gz) = 3764a1be4f3e83ca555f2399d9555af9811f7b0dc83915a555e2664c875188fd4a4a3abb0fe412826b434eedd1f96dad240573fb5f3d8c5a0e2e1692afdd8ab0
+SHA512 (inn.html) = ee15038d5a3e1b6da79c4d733f039d8cac32c442645f922a1ccdadeeb6b181fc2234121a53c9c9c39efbf686fa95b4b2af69fec23e4b6bacab67024794b71fd1
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-08-26 8:54 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:54 [rpms/inn] epel10.3: update to 2.6.1 release (#1403810) 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