From 7fc7407070380e70b127d0a8b650be485d08416c Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sat, 9 Dec 2023 22:52:44 +0100 Subject: [PATCH 01/19] Upgrade to 6.1.3 (#2252372) --- sources | 4 ++-- unrealircd.spec | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 71fbe03..4f31f06 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (gpgkey-1D2D2B03A0B68ED11D68A24BA7A21B0A108FF4A9.gpg) = b17e72bc242e606fc660a851676317326ea0a1f3b501cf199a6f59edd999444b957bd52a359e3aa6ceb6c54cba4001e1b94116793c3e0c815eb03df139e1239d -SHA512 (unrealircd-6.1.2.3.tar.gz) = ea594a96680f58d926857e3b099b862931a29580c6402be951ce085182fb8fe2cadaa9fc9e2b1541c9e1bb3dec8a2b4fe7b9c73159c34fd05281e69d17122137 -SHA512 (unrealircd-6.1.2.3.tar.gz.asc) = 76f6f19e0884f17548d1c340bdab599b75835e971067b329410f554dc385a9f138241273f8cbc0d176c711b22644c46e97375fe99c635eea7c5b29a23b3e816d +SHA512 (unrealircd-6.1.3.tar.gz) = f607da065f1955e5459d7bf996124add4e573636c722c6aa6106f0cb9899c520eb49398766e089d5c2ef9089bcd613b26cda54f2a25d7293b9b10498b53e63c7 +SHA512 (unrealircd-6.1.3.tar.gz.asc) = f2defd4e48b47db476d92d12804bc1b0869683e2bf0d2a33c2109b95c1029684b26971c5916aef5995161ebf7fac8456da07fadc086445bb2c0cb47e5dba6bcd diff --git a/unrealircd.spec b/unrealircd.spec index 12437b7..5eabc63 100644 --- a/unrealircd.spec +++ b/unrealircd.spec @@ -6,8 +6,8 @@ Summary: Open Source IRC server Name: unrealircd -Version: 6.1.2.3 -Release: 2%{?dist} +Version: 6.1.3 +Release: 1%{?dist} # UnrealIRCd declares itself as GPL-2.0-or-later as it's the common denominator for # a GPL-1.0-or-later and GPL-2.0-or-later mixture, breakdown of other source codes: # BSD-3-Clause: include/mempool.h and src/mempool.c @@ -240,6 +240,9 @@ fi %endif %changelog +* Sat Dec 09 2023 Robert Scheck 6.1.3-1 +- Upgrade to 6.1.3 (#2252372) + * Sun Nov 05 2023 Robert Scheck 6.1.2.3-2 - Build upstream's bundled recent PCRE2 version for RHEL 7 and 8 From 0f3f938a78ee6a58a86ebe266440962f7648de4a Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sat, 16 Dec 2023 21:32:29 +0100 Subject: [PATCH 02/19] Upgrade to 6.1.4 (#2254828) --- sources | 4 ++-- unrealircd.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 4f31f06..8b643f5 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (gpgkey-1D2D2B03A0B68ED11D68A24BA7A21B0A108FF4A9.gpg) = b17e72bc242e606fc660a851676317326ea0a1f3b501cf199a6f59edd999444b957bd52a359e3aa6ceb6c54cba4001e1b94116793c3e0c815eb03df139e1239d -SHA512 (unrealircd-6.1.3.tar.gz) = f607da065f1955e5459d7bf996124add4e573636c722c6aa6106f0cb9899c520eb49398766e089d5c2ef9089bcd613b26cda54f2a25d7293b9b10498b53e63c7 -SHA512 (unrealircd-6.1.3.tar.gz.asc) = f2defd4e48b47db476d92d12804bc1b0869683e2bf0d2a33c2109b95c1029684b26971c5916aef5995161ebf7fac8456da07fadc086445bb2c0cb47e5dba6bcd +SHA512 (unrealircd-6.1.4.tar.gz) = 4f2a6e91804579f36d0ef4a5f8db5b626e843ea86cfadce8128c4843bdb0f7785e50b9670a63ecd982c787dfb8c20dd7516d0f77f08300b9d4ec0572c30ce98d +SHA512 (unrealircd-6.1.4.tar.gz.asc) = bbb89db5bec76d9a6ced45fee13b31c75881c847be6516ef9bb4445a29af5a8e80df88bf540da52762161b59678a3f4d414289afb39921c7c87549b415dd72c5 diff --git a/unrealircd.spec b/unrealircd.spec index 5eabc63..07386a0 100644 --- a/unrealircd.spec +++ b/unrealircd.spec @@ -6,7 +6,7 @@ Summary: Open Source IRC server Name: unrealircd -Version: 6.1.3 +Version: 6.1.4 Release: 1%{?dist} # UnrealIRCd declares itself as GPL-2.0-or-later as it's the common denominator for # a GPL-1.0-or-later and GPL-2.0-or-later mixture, breakdown of other source codes: @@ -240,6 +240,9 @@ fi %endif %changelog +* Sat Dec 16 2023 Robert Scheck 6.1.4-1 +- Upgrade to 6.1.4 (#2254828) + * Sat Dec 09 2023 Robert Scheck 6.1.3-1 - Upgrade to 6.1.3 (#2252372) From 075f580e009d8d627b7f3c3d7f24e83eee764a33 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 07:09:59 +0000 Subject: [PATCH 03/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- unrealircd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/unrealircd.spec b/unrealircd.spec index 07386a0..c10a30e 100644 --- a/unrealircd.spec +++ b/unrealircd.spec @@ -7,7 +7,7 @@ Summary: Open Source IRC server Name: unrealircd Version: 6.1.4 -Release: 1%{?dist} +Release: 2%{?dist} # UnrealIRCd declares itself as GPL-2.0-or-later as it's the common denominator for # a GPL-1.0-or-later and GPL-2.0-or-later mixture, breakdown of other source codes: # BSD-3-Clause: include/mempool.h and src/mempool.c @@ -240,6 +240,9 @@ fi %endif %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 6.1.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Dec 16 2023 Robert Scheck 6.1.4-1 - Upgrade to 6.1.4 (#2254828) From 1faa08a29903ee7c1605015712110116190217bd Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sun, 12 May 2024 03:11:01 +0200 Subject: [PATCH 04/19] Upgrade to 6.1.5 (#2276377) --- sources | 4 ++-- unrealircd.spec | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 8b643f5..3573ac9 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (gpgkey-1D2D2B03A0B68ED11D68A24BA7A21B0A108FF4A9.gpg) = b17e72bc242e606fc660a851676317326ea0a1f3b501cf199a6f59edd999444b957bd52a359e3aa6ceb6c54cba4001e1b94116793c3e0c815eb03df139e1239d -SHA512 (unrealircd-6.1.4.tar.gz) = 4f2a6e91804579f36d0ef4a5f8db5b626e843ea86cfadce8128c4843bdb0f7785e50b9670a63ecd982c787dfb8c20dd7516d0f77f08300b9d4ec0572c30ce98d -SHA512 (unrealircd-6.1.4.tar.gz.asc) = bbb89db5bec76d9a6ced45fee13b31c75881c847be6516ef9bb4445a29af5a8e80df88bf540da52762161b59678a3f4d414289afb39921c7c87549b415dd72c5 +SHA512 (unrealircd-6.1.5.tar.gz) = 942215005c614c154823ca4049243cbcc927072365bf3b7c8fba6cf4c5b86b255ea96cf97ec6361ddd63f96ea9d36e0eb5eb16a6c41b813c53a0d61a4fa21a6e +SHA512 (unrealircd-6.1.5.tar.gz.asc) = eb7b1e59be7cf2e57e4f352beb9cd5951012dfa5b0fc757e70245cf571db51cd68ada2e11e8c53396f192dc97312dcdee7247b4a04b9cc804c075f3e6edfe78d diff --git a/unrealircd.spec b/unrealircd.spec index c10a30e..5572349 100644 --- a/unrealircd.spec +++ b/unrealircd.spec @@ -6,8 +6,8 @@ Summary: Open Source IRC server Name: unrealircd -Version: 6.1.4 -Release: 2%{?dist} +Version: 6.1.5 +Release: 1%{?dist} # UnrealIRCd declares itself as GPL-2.0-or-later as it's the common denominator for # a GPL-1.0-or-later and GPL-2.0-or-later mixture, breakdown of other source codes: # BSD-3-Clause: include/mempool.h and src/mempool.c @@ -240,6 +240,9 @@ fi %endif %changelog +* Sun May 12 2024 Robert Scheck 6.1.5-1 +- Upgrade to 6.1.5 (#2276377) + * Sat Jan 27 2024 Fedora Release Engineering - 6.1.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 52ca31c6c0e2e755193c78d23db50647ca9fc866 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sat, 15 Jun 2024 20:18:06 +0200 Subject: [PATCH 05/19] Upgrade to 6.1.6 (#2290902) --- sources | 4 ++-- unrealircd.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 3573ac9..f755706 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (gpgkey-1D2D2B03A0B68ED11D68A24BA7A21B0A108FF4A9.gpg) = b17e72bc242e606fc660a851676317326ea0a1f3b501cf199a6f59edd999444b957bd52a359e3aa6ceb6c54cba4001e1b94116793c3e0c815eb03df139e1239d -SHA512 (unrealircd-6.1.5.tar.gz) = 942215005c614c154823ca4049243cbcc927072365bf3b7c8fba6cf4c5b86b255ea96cf97ec6361ddd63f96ea9d36e0eb5eb16a6c41b813c53a0d61a4fa21a6e -SHA512 (unrealircd-6.1.5.tar.gz.asc) = eb7b1e59be7cf2e57e4f352beb9cd5951012dfa5b0fc757e70245cf571db51cd68ada2e11e8c53396f192dc97312dcdee7247b4a04b9cc804c075f3e6edfe78d +SHA512 (unrealircd-6.1.6.tar.gz) = dc8959778e5697e0390bbdafeda1060880cd3bccfb3cbb484b2c89fbd080485a0baad0c33136c533bd33fc3178e567f8835a3cbc38e7484d9fc56136cf7815a5 +SHA512 (unrealircd-6.1.6.tar.gz.asc) = 37531117510845b45947b783dccf12157ad0425bb8739b95f368e803ebd637ca58cdb48724768802ad1c05a26e8ae4640bd987168730323cbb01c655c3ebf139 diff --git a/unrealircd.spec b/unrealircd.spec index 5572349..fefd292 100644 --- a/unrealircd.spec +++ b/unrealircd.spec @@ -6,7 +6,7 @@ Summary: Open Source IRC server Name: unrealircd -Version: 6.1.5 +Version: 6.1.6 Release: 1%{?dist} # UnrealIRCd declares itself as GPL-2.0-or-later as it's the common denominator for # a GPL-1.0-or-later and GPL-2.0-or-later mixture, breakdown of other source codes: @@ -240,6 +240,9 @@ fi %endif %changelog +* Sat Jun 15 2024 Robert Scheck 6.1.6-1 +- Upgrade to 6.1.6 (#2290902) + * Sun May 12 2024 Robert Scheck 6.1.5-1 - Upgrade to 6.1.5 (#2276377) From aa1692b9a7fcffd9010ae87a8c057f62c20a9d7e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:19:06 +0000 Subject: [PATCH 06/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- unrealircd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/unrealircd.spec b/unrealircd.spec index fefd292..0ffa25e 100644 --- a/unrealircd.spec +++ b/unrealircd.spec @@ -7,7 +7,7 @@ Summary: Open Source IRC server Name: unrealircd Version: 6.1.6 -Release: 1%{?dist} +Release: 2%{?dist} # UnrealIRCd declares itself as GPL-2.0-or-later as it's the common denominator for # a GPL-1.0-or-later and GPL-2.0-or-later mixture, breakdown of other source codes: # BSD-3-Clause: include/mempool.h and src/mempool.c @@ -240,6 +240,9 @@ fi %endif %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 6.1.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jun 15 2024 Robert Scheck 6.1.6-1 - Upgrade to 6.1.6 (#2290902) From 554e471774afb4f1afb9d0f561b98c752bf640ca Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sat, 14 Sep 2024 21:33:23 +0200 Subject: [PATCH 07/19] Upgrade to 6.1.7.2 (#2297919) --- sources | 4 +-- ...eoip.patch => unrealircd-6.1.7-geoip.patch | 18 +++++++---- unrealircd.spec | 32 +++++++------------ 3 files changed, 24 insertions(+), 30 deletions(-) rename unrealircd-6.1.2-geoip.patch => unrealircd-6.1.7-geoip.patch (88%) diff --git a/sources b/sources index f755706..d8bd44c 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (gpgkey-1D2D2B03A0B68ED11D68A24BA7A21B0A108FF4A9.gpg) = b17e72bc242e606fc660a851676317326ea0a1f3b501cf199a6f59edd999444b957bd52a359e3aa6ceb6c54cba4001e1b94116793c3e0c815eb03df139e1239d -SHA512 (unrealircd-6.1.6.tar.gz) = dc8959778e5697e0390bbdafeda1060880cd3bccfb3cbb484b2c89fbd080485a0baad0c33136c533bd33fc3178e567f8835a3cbc38e7484d9fc56136cf7815a5 -SHA512 (unrealircd-6.1.6.tar.gz.asc) = 37531117510845b45947b783dccf12157ad0425bb8739b95f368e803ebd637ca58cdb48724768802ad1c05a26e8ae4640bd987168730323cbb01c655c3ebf139 +SHA512 (unrealircd-6.1.7.2.tar.gz) = 3a5972f985c9e67298ecd17acc57612f976941a27d8cdf7f1d9a9811161599a79d1e23c0d5a336d5b171a28b8b0a728a0771de0c7acac643fb33a2c81d2dd8e8 +SHA512 (unrealircd-6.1.7.2.tar.gz.asc) = 524477f9fbd92b2a55c1e2516a4cee7655fa0e13ccf840f59e3e07fb5d00e83cb1953c855a6c0b83ece38017d2334c977619aafa6c63b058276a8d8436a9549d diff --git a/unrealircd-6.1.2-geoip.patch b/unrealircd-6.1.7-geoip.patch similarity index 88% rename from unrealircd-6.1.2-geoip.patch rename to unrealircd-6.1.7-geoip.patch index c6628b5..e5642ac 100644 --- a/unrealircd-6.1.2-geoip.patch +++ b/unrealircd-6.1.7-geoip.patch @@ -1,4 +1,4 @@ -Nasty hack by Robert Scheck for UnrealIRCd >= 6.1.2 which disables all +Nasty hack by Robert Scheck for UnrealIRCd >= 6.1.7 which disables all default upstream GeoIP functionalities in UnrealIRCd, because: As of writing, the origin of the two GeoIP Legacy databases provided by UnrealIRCd upstream is, at @@ -22,18 +22,22 @@ See also: - https://blog.maxmind.com/2020/06/01/retirement-of-geoip-legacy-downloadable-databases-in-may-2022/ - https://blog.maxmind.com/2019/12/18/significant-changes-to-accessing-and-using-geolite2-databases/ ---- unrealircd-6.1.2.3/doc/conf/modules.default.conf 2023-10-13 08:18:12.000000000 +0200 -+++ unrealircd-6.1.2.3/doc/conf/modules.default.conf.geoip 2023-10-29 21:10:17.488457555 +0100 -@@ -218,7 +218,7 @@ +--- unrealircd-6.1.7.2/doc/conf/modules.default.conf 2024-08-24 08:09:19.000000000 +0200 ++++ unrealircd-6.1.7.2/doc/conf/modules.default.conf.geoip 2024-09-14 20:41:01.549449281 +0200 +@@ -218,10 +218,10 @@ loadmodule "extbans/timedban"; /* +b ~time (old ~t mode, timed bans / temporary bans) */ loadmodule "extbans/partmsg"; /* +b ~partmsg (old ~p mode, hide part/quit message) */ loadmodule "extbans/securitygroup"; /* +b ~security-group (old ~G mode, security group) */ --loadmodule "extbans/country"; /* +b ~country (country/geoip) */ -+// loadmodule "extbans/country"; /* +b ~country (country/geoip) */ /* Disabled by Fedora intentionally, please read the end of this file */ +-loadmodule "extbans/country"; /* +b ~country (country via geoip) */ ++// loadmodule "extbans/country"; /* +b ~country (country via geoip) */ /* Disabled by Fedora intentionally, please read the end of this file */ loadmodule "extbans/msgbypass"; /* +e ~msgbypass (old ~m mode, bypass message restrictions) */ loadmodule "extbans/flood"; /* +e ~flood (flood exemption for chanmode +f/+F) */ +-loadmodule "extbans/asn"; /* +b ~asn (ASN via geoip) */ ++// loadmodule "extbans/asn"; /* +b ~asn (ASN via geoip) */ /* Disabled by Fedora intentionally, please read the end of this file */ -@@ -291,12 +291,36 @@ + + /*** IRCv3 extensions ***/ +@@ -293,12 +293,36 @@ loadmodule "real-quit-reason"; /* unrealircd.org/real-quit-reason for servers only */ loadmodule "targetfloodprot"; /* set::anti-flood::target-flood protection */ loadmodule "watch-backend"; /* used by watch and other modules */ diff --git a/unrealircd.spec b/unrealircd.spec index 0ffa25e..b7790e7 100644 --- a/unrealircd.spec +++ b/unrealircd.spec @@ -2,12 +2,12 @@ %global sslkey %{_sysconfdir}/pki/%{name}/server.key.pem %bcond_without maxmind -%global pcre2 10.42 +%global pcre2 10.44 Summary: Open Source IRC server Name: unrealircd -Version: 6.1.6 -Release: 2%{?dist} +Version: 6.1.7.2 +Release: 1%{?dist} # UnrealIRCd declares itself as GPL-2.0-or-later as it's the common denominator for # a GPL-1.0-or-later and GPL-2.0-or-later mixture, breakdown of other source codes: # BSD-3-Clause: include/mempool.h and src/mempool.c @@ -25,19 +25,15 @@ Source5: %{name}.sysusersd # Apply Fedora system-wide crypto policy Patch0: unrealircd-6.0.6-crypto-policy.patch # Disable GeoIP to avoid dependency to legacy GeoIP -Patch1: unrealircd-6.1.2-geoip.patch +Patch1: unrealircd-6.1.7-geoip.patch # Same options like in unrealircd(ctl) shell script Patch2: unrealircd-6.0.3-unrealircdctl.patch BuildRequires: gnupg2 BuildRequires: gcc BuildRequires: make BuildRequires: %{_bindir}/openssl -%if 0%{?fedora} || 0%{?rhel} > 7 BuildRequires: openssl-devel -%else -BuildRequires: openssl11-devel -%endif -%if 0%{?fedora} || 0%{?rhel} > 8 +%if 0%{?fedora} || 0%{?rhel} >= 9 BuildRequires: pcre2-devel >= 10.36 %else Provides: bundled(pcre2) = %{pcre2} @@ -63,7 +59,7 @@ flood and anti-spam systems, swear filtering and module support. %if %{with maxmind} %package maxmind Summary: GeoIP module using MaxMind databases for UnrealIRCd -%if 0%{?fedora} || 0%{?rhel} > 8 +%if 0%{?fedora} || 0%{?rhel} >= 9 BuildRequires: libmaxminddb-devel >= 1.4.3 %else BuildRequires: libmaxminddb-devel >= 1.2.0 @@ -80,23 +76,14 @@ GeoIP2 C library and databases. %prep %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %setup -q -%if 0%{?fedora} || 0%{?rhel} >= 8 %patch -P0 -p1 -b .crypto-policy touch -c -r doc/conf/examples/example.conf{.crypto-policy,} -%endif %patch -P1 -p1 -b .geoip touch -c -r doc/conf/modules.default.conf{.geoip,} %patch -P2 -p1 -b .unrealircdctl %build -%if 0%{?rhel} == 7 -sed \ - -e 's|include/openssl/|include/openssl11/openssl/|g' \ - -e 's|\(CRYPTOLIB="-lssl -lcrypto\).*|\1 -L%{_libdir}/openssl11"\nCFLAGS="$CFLAGS -I%{_includedir}/openssl11"|' \ - -i configure -%endif - -%if 0%{?rhel} && 0%{?rhel} < 9 +%if 0%{?rhel} == 8 # Bundling option for PCRE2 in UnrealIRCd itself is not really suitable for # distribution packaging, thus build it first and pretend it as system one. BUNDLED=$PWD/extras/pcre2 @@ -115,7 +102,7 @@ export PKG_CONFIG_PATH="$BUNDLED%{_libdir}/pkgconfig" %endif # https://github.com/unrealircd/unrealircd/pull/183 -%if %{with maxmind} && 0%{?rhel} && 0%{?rhel} < 9 +%if %{with maxmind} && 0%{?rhel} == 8 sed -e 's|libmaxminddb >= 1.4.3|libmaxminddb >= 1.2.0|g' -i configure %endif @@ -240,6 +227,9 @@ fi %endif %changelog +* Sat Sep 14 2024 Robert Scheck 6.1.7.2-1 +- Upgrade to 6.1.7.2 (#2297919) + * Sat Jul 20 2024 Fedora Release Engineering - 6.1.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From b38d2cf7cb4c3bcb27606bab1d1bf97760107b09 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sat, 12 Oct 2024 23:53:58 +0200 Subject: [PATCH 08/19] Upgrade to 6.1.8 (#2315105) --- sources | 4 ++-- ...-geoip.patch => unrealircd-6.1.8-geoip.patch | 17 ++++++++++++----- unrealircd.spec | 10 ++++++++-- 3 files changed, 22 insertions(+), 9 deletions(-) rename unrealircd-6.1.7-geoip.patch => unrealircd-6.1.8-geoip.patch (85%) diff --git a/sources b/sources index d8bd44c..68cead7 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (gpgkey-1D2D2B03A0B68ED11D68A24BA7A21B0A108FF4A9.gpg) = b17e72bc242e606fc660a851676317326ea0a1f3b501cf199a6f59edd999444b957bd52a359e3aa6ceb6c54cba4001e1b94116793c3e0c815eb03df139e1239d -SHA512 (unrealircd-6.1.7.2.tar.gz) = 3a5972f985c9e67298ecd17acc57612f976941a27d8cdf7f1d9a9811161599a79d1e23c0d5a336d5b171a28b8b0a728a0771de0c7acac643fb33a2c81d2dd8e8 -SHA512 (unrealircd-6.1.7.2.tar.gz.asc) = 524477f9fbd92b2a55c1e2516a4cee7655fa0e13ccf840f59e3e07fb5d00e83cb1953c855a6c0b83ece38017d2334c977619aafa6c63b058276a8d8436a9549d +SHA512 (unrealircd-6.1.8.tar.gz) = f00c9f0852a2528d3743d3f5f3a0c1581673a8bd6f8885d65a0bfb25ba13593c85018aa1793742d8e3e256ee564e324bb480ef117c8f3a38a25ee40a6666a926 +SHA512 (unrealircd-6.1.8.tar.gz.asc) = 0a777fe2f1540bc5e5b8ac7dd7831dbee6edbba71f0fad3fe0af8915b02e947cd603fb305f7abed1da3f7eb366f807aab1c891e0d301c429a4fcfeb0dc263b3c diff --git a/unrealircd-6.1.7-geoip.patch b/unrealircd-6.1.8-geoip.patch similarity index 85% rename from unrealircd-6.1.7-geoip.patch rename to unrealircd-6.1.8-geoip.patch index e5642ac..c642aee 100644 --- a/unrealircd-6.1.7-geoip.patch +++ b/unrealircd-6.1.8-geoip.patch @@ -1,4 +1,4 @@ -Nasty hack by Robert Scheck for UnrealIRCd >= 6.1.7 which disables all +Nasty hack by Robert Scheck for UnrealIRCd >= 6.1.8 which disables all default upstream GeoIP functionalities in UnrealIRCd, because: As of writing, the origin of the two GeoIP Legacy databases provided by UnrealIRCd upstream is, at @@ -22,8 +22,8 @@ See also: - https://blog.maxmind.com/2020/06/01/retirement-of-geoip-legacy-downloadable-databases-in-may-2022/ - https://blog.maxmind.com/2019/12/18/significant-changes-to-accessing-and-using-geolite2-databases/ ---- unrealircd-6.1.7.2/doc/conf/modules.default.conf 2024-08-24 08:09:19.000000000 +0200 -+++ unrealircd-6.1.7.2/doc/conf/modules.default.conf.geoip 2024-09-14 20:41:01.549449281 +0200 +--- unrealircd-6.1.8/doc/conf/modules.default.conf 2024-10-11 07:39:38.000000000 +0200 ++++ unrealircd-6.1.8/doc/conf/modules.default.conf.geoip 2024-10-12 23:36:25.053387669 +0200 @@ -218,10 +218,10 @@ loadmodule "extbans/timedban"; /* +b ~time (old ~t mode, timed bans / temporary bans) */ loadmodule "extbans/partmsg"; /* +b ~partmsg (old ~p mode, hide part/quit message) */ @@ -34,10 +34,17 @@ See also: loadmodule "extbans/flood"; /* +e ~flood (flood exemption for chanmode +f/+F) */ -loadmodule "extbans/asn"; /* +b ~asn (ASN via geoip) */ +// loadmodule "extbans/asn"; /* +b ~asn (ASN via geoip) */ /* Disabled by Fedora intentionally, please read the end of this file */ + loadmodule "extbans/inherit"; /* +b ~inherit (inherit bans from another channel) */ - /*** IRCv3 extensions ***/ -@@ -293,12 +293,36 @@ +@@ -288,18 +288,42 @@ + loadmodule "connthrottle"; /* see https://www.unrealircd.org/docs/Connthrottle */ + loadmodule "userip-tag"; /* unrealircd.org/userip tag for ircops (IP address) */ + loadmodule "userhost-tag"; /* unrealircd.org/userhost tag for ircops (real host) */ +-loadmodule "geoip-tag"; /* unrealircd.org/geoip tag for ircops (country) */ ++// loadmodule "geoip-tag"; /* unrealircd.org/geoip tag for ircops (country) */ /* Disabled by Fedora intentionally, please read the end of this file */ + loadmodule "json-log-tag"; /* unrealircd.org/json-log tag and CAP for ircops */ + loadmodule "issued-by-tag"; /* unrealircd.org/issued-by tag for servers and ircops */ loadmodule "real-quit-reason"; /* unrealircd.org/real-quit-reason for servers only */ loadmodule "targetfloodprot"; /* set::anti-flood::target-flood protection */ loadmodule "watch-backend"; /* used by watch and other modules */ diff --git a/unrealircd.spec b/unrealircd.spec index b7790e7..f132def 100644 --- a/unrealircd.spec +++ b/unrealircd.spec @@ -6,7 +6,7 @@ Summary: Open Source IRC server Name: unrealircd -Version: 6.1.7.2 +Version: 6.1.8 Release: 1%{?dist} # UnrealIRCd declares itself as GPL-2.0-or-later as it's the common denominator for # a GPL-1.0-or-later and GPL-2.0-or-later mixture, breakdown of other source codes: @@ -25,7 +25,7 @@ Source5: %{name}.sysusersd # Apply Fedora system-wide crypto policy Patch0: unrealircd-6.0.6-crypto-policy.patch # Disable GeoIP to avoid dependency to legacy GeoIP -Patch1: unrealircd-6.1.7-geoip.patch +Patch1: unrealircd-6.1.8-geoip.patch # Same options like in unrealircd(ctl) shell script Patch2: unrealircd-6.0.3-unrealircdctl.patch BuildRequires: gnupg2 @@ -82,6 +82,9 @@ touch -c -r doc/conf/examples/example.conf{.crypto-policy,} touch -c -r doc/conf/modules.default.conf{.geoip,} %patch -P2 -p1 -b .unrealircdctl +# Ensure the bundled PCRE2 tarball matches the version in this spec file +! tar tfz extras/pcre2.tar.gz | grep -E -m 1 -v '^pcre2-%{pcre2}/' + %build %if 0%{?rhel} == 8 # Bundling option for PCRE2 in UnrealIRCd itself is not really suitable for @@ -227,6 +230,9 @@ fi %endif %changelog +* Sat Oct 12 2024 Robert Scheck 6.1.8-1 +- Upgrade to 6.1.8 (#2315105) + * Sat Sep 14 2024 Robert Scheck 6.1.7.2-1 - Upgrade to 6.1.7.2 (#2297919) From a8477401a3e7ffb5a0291edaa9aebbf8e63de4c4 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sat, 19 Oct 2024 00:09:32 +0200 Subject: [PATCH 09/19] Upgrade to 6.1.8.1 (#2319754) --- sources | 4 ++-- unrealircd.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 68cead7..78d6ee8 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (gpgkey-1D2D2B03A0B68ED11D68A24BA7A21B0A108FF4A9.gpg) = b17e72bc242e606fc660a851676317326ea0a1f3b501cf199a6f59edd999444b957bd52a359e3aa6ceb6c54cba4001e1b94116793c3e0c815eb03df139e1239d -SHA512 (unrealircd-6.1.8.tar.gz) = f00c9f0852a2528d3743d3f5f3a0c1581673a8bd6f8885d65a0bfb25ba13593c85018aa1793742d8e3e256ee564e324bb480ef117c8f3a38a25ee40a6666a926 -SHA512 (unrealircd-6.1.8.tar.gz.asc) = 0a777fe2f1540bc5e5b8ac7dd7831dbee6edbba71f0fad3fe0af8915b02e947cd603fb305f7abed1da3f7eb366f807aab1c891e0d301c429a4fcfeb0dc263b3c +SHA512 (unrealircd-6.1.8.1.tar.gz) = 59dd7c24c271311db23814782a623fd5a435ad8e5d653e084f64db6e25bc57d25a1a40044028d860e81034f6880e118faf3e3bb501392a0fb415d9fd1dc363f0 +SHA512 (unrealircd-6.1.8.1.tar.gz.asc) = 282102e4d968d3524b454d8bd14c66e6b8dc1e7ca9a9ff3aec54a28c7ccd40699cf1ee91d8d9a60cf6421485a9a52eea28195a70f77214d5e743597b8f55b31f diff --git a/unrealircd.spec b/unrealircd.spec index f132def..61f654f 100644 --- a/unrealircd.spec +++ b/unrealircd.spec @@ -6,7 +6,7 @@ Summary: Open Source IRC server Name: unrealircd -Version: 6.1.8 +Version: 6.1.8.1 Release: 1%{?dist} # UnrealIRCd declares itself as GPL-2.0-or-later as it's the common denominator for # a GPL-1.0-or-later and GPL-2.0-or-later mixture, breakdown of other source codes: @@ -230,6 +230,9 @@ fi %endif %changelog +* Sat Oct 19 2024 Robert Scheck 6.1.8.1-1 +- Upgrade to 6.1.8.1 (#2319754) + * Sat Oct 12 2024 Robert Scheck 6.1.8-1 - Upgrade to 6.1.8 (#2315105) From aa10bf55e76cea50d1bde8d09cbeee96ae5941d8 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 22 Oct 2024 13:40:25 +0100 Subject: [PATCH 10/19] Rebuild for Jansson 2.14 (https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/3PYINSQGKQ4BB25NQUI2A2UCGGLAG5ND/) --- unrealircd.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/unrealircd.spec b/unrealircd.spec index 61f654f..a6726ec 100644 --- a/unrealircd.spec +++ b/unrealircd.spec @@ -7,7 +7,7 @@ Summary: Open Source IRC server Name: unrealircd Version: 6.1.8.1 -Release: 1%{?dist} +Release: 2%{?dist} # UnrealIRCd declares itself as GPL-2.0-or-later as it's the common denominator for # a GPL-1.0-or-later and GPL-2.0-or-later mixture, breakdown of other source codes: # BSD-3-Clause: include/mempool.h and src/mempool.c @@ -230,6 +230,10 @@ fi %endif %changelog +* Tue Oct 22 2024 Richard W.M. Jones - 6.1.8.1-2 +- Rebuild for Jansson 2.14 + (https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/3PYINSQGKQ4BB25NQUI2A2UCGGLAG5ND/) + * Sat Oct 19 2024 Robert Scheck 6.1.8.1-1 - Upgrade to 6.1.8.1 (#2319754) From 1e180a5a482f5f020ab58ca714520985f8a42cbb Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Fri, 13 Dec 2024 23:55:09 +0100 Subject: [PATCH 11/19] Upgrade to 6.1.9.1 (#2327604) --- sources | 4 ++-- unrealircd.spec | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 78d6ee8..4016655 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (gpgkey-1D2D2B03A0B68ED11D68A24BA7A21B0A108FF4A9.gpg) = b17e72bc242e606fc660a851676317326ea0a1f3b501cf199a6f59edd999444b957bd52a359e3aa6ceb6c54cba4001e1b94116793c3e0c815eb03df139e1239d -SHA512 (unrealircd-6.1.8.1.tar.gz) = 59dd7c24c271311db23814782a623fd5a435ad8e5d653e084f64db6e25bc57d25a1a40044028d860e81034f6880e118faf3e3bb501392a0fb415d9fd1dc363f0 -SHA512 (unrealircd-6.1.8.1.tar.gz.asc) = 282102e4d968d3524b454d8bd14c66e6b8dc1e7ca9a9ff3aec54a28c7ccd40699cf1ee91d8d9a60cf6421485a9a52eea28195a70f77214d5e743597b8f55b31f +SHA512 (unrealircd-6.1.9.1.tar.gz) = 10abba70e7f8979c326c89d6cdf3e197553a49e6277980c4a7bf2d9ea285fa27cb16c783505d775bc500c4b928301f918c9a0c96d6f7b5f52dc313830d6a4942 +SHA512 (unrealircd-6.1.9.1.tar.gz.asc) = 1ac5b5737d27e657d9585b8b17026fbdb091d86ed2c652665aff5b30f08a64f3c95c3fc9a743cdd25202d32605e119dd308bbc7944438f34c8565428d6447394 diff --git a/unrealircd.spec b/unrealircd.spec index a6726ec..42104ef 100644 --- a/unrealircd.spec +++ b/unrealircd.spec @@ -6,8 +6,8 @@ Summary: Open Source IRC server Name: unrealircd -Version: 6.1.8.1 -Release: 2%{?dist} +Version: 6.1.9.1 +Release: 1%{?dist} # UnrealIRCd declares itself as GPL-2.0-or-later as it's the common denominator for # a GPL-1.0-or-later and GPL-2.0-or-later mixture, breakdown of other source codes: # BSD-3-Clause: include/mempool.h and src/mempool.c @@ -230,6 +230,9 @@ fi %endif %changelog +* Fri Dec 13 2024 Robert Scheck 6.1.9.1-1 +- Upgrade to 6.1.9.1 (#2327604) + * Tue Oct 22 2024 Richard W.M. Jones - 6.1.8.1-2 - Rebuild for Jansson 2.14 (https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/3PYINSQGKQ4BB25NQUI2A2UCGGLAG5ND/) From a7a72abb0ac0ed19b203e8580f7af02b421b8277 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 13:49:16 +0000 Subject: [PATCH 12/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- unrealircd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/unrealircd.spec b/unrealircd.spec index 42104ef..874f74d 100644 --- a/unrealircd.spec +++ b/unrealircd.spec @@ -7,7 +7,7 @@ Summary: Open Source IRC server Name: unrealircd Version: 6.1.9.1 -Release: 1%{?dist} +Release: 2%{?dist} # UnrealIRCd declares itself as GPL-2.0-or-later as it's the common denominator for # a GPL-1.0-or-later and GPL-2.0-or-later mixture, breakdown of other source codes: # BSD-3-Clause: include/mempool.h and src/mempool.c @@ -230,6 +230,9 @@ fi %endif %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 6.1.9.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Dec 13 2024 Robert Scheck 6.1.9.1-1 - Upgrade to 6.1.9.1 (#2327604) From baad9bc76a5bab53f154c7180ecdc04f6056d3da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 1 Feb 2025 19:57:59 +0100 Subject: [PATCH 13/19] Add explicit BR: libxcrypt-devel MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Björn Esser --- unrealircd.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/unrealircd.spec b/unrealircd.spec index 874f74d..9912752 100644 --- a/unrealircd.spec +++ b/unrealircd.spec @@ -7,7 +7,7 @@ Summary: Open Source IRC server Name: unrealircd Version: 6.1.9.1 -Release: 2%{?dist} +Release: 3%{?dist} # UnrealIRCd declares itself as GPL-2.0-or-later as it's the common denominator for # a GPL-1.0-or-later and GPL-2.0-or-later mixture, breakdown of other source codes: # BSD-3-Clause: include/mempool.h and src/mempool.c @@ -43,6 +43,7 @@ BuildRequires: libsodium-devel >= 1.0.16 BuildRequires: c-ares-devel >= 1.6.0 BuildRequires: jansson-devel >= 2.0.0 BuildRequires: libcurl-devel +BuildRequires: libxcrypt-devel BuildRequires: systemd-rpm-macros Requires(post): %{_bindir}/openssl %{?systemd_requires} @@ -230,6 +231,9 @@ fi %endif %changelog +* Sat Feb 01 2025 Björn Esser - 6.1.9.1-3 +- Add explicit BR: libxcrypt-devel + * Sun Jan 19 2025 Fedora Release Engineering - 6.1.9.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 097ebcc4b61eb82747f80832c07e0dc86f34ca93 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Wed, 12 Feb 2025 00:51:39 +0100 Subject: [PATCH 14/19] Add upstream patch for C23 compatibility (#2341485) --- unrealircd-6.1.9-c23.patch | 91 ++++++++++++++++++++++++++++++++++++++ unrealircd.spec | 3 ++ 2 files changed, 94 insertions(+) create mode 100644 unrealircd-6.1.9-c23.patch diff --git a/unrealircd-6.1.9-c23.patch b/unrealircd-6.1.9-c23.patch new file mode 100644 index 0000000..f27502f --- /dev/null +++ b/unrealircd-6.1.9-c23.patch @@ -0,0 +1,91 @@ +From 72af36d2a34cc75b0879c7e291a52f017a06ad08 Mon Sep 17 00:00:00 2001 +From: Bram Matthys +Date: Mon, 10 Feb 2025 11:26:34 +0100 +Subject: [PATCH] Fix problem with upcoming GCC 15 that assumes C23. GCC 15 is + not released yet and is scheduled for April/May 2025. + +We now have a ./configure check. If a func() declaration is interpreted +as meaning 0 arguments, so C23 style, then we now add -std=gnu17 to +CFLAGS. If not, then we don't set an explicit C standard version. + +Closes https://bugs.unrealircd.org/view.php?id=6495 +--- + configure | 33 +++++++++++++++++++++++++++++++++ + configure.ac | 19 +++++++++++++++++++ + doc/RELEASE-NOTES.md | 7 +++++-- + 3 files changed, 57 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 8d2e05351..2237a4897 100755 +--- a/configure ++++ b/configure +@@ -9595,6 +9595,39 @@ fi + + UNRLINCDIR="`pwd`/include" + ++{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if explicit -std=gnu17 is needed" >&5 ++printf %s "checking if explicit -std=gnu17 is needed... " >&6; } ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include ++ #include ++ #include ++ #include ++ #include ++ #include ++int ++main (void) ++{ ++ ++ void (*test)(); ++ test = exit; ++ test(0); ++ ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO" ++then : ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++printf "%s\n" "no" >&6; } ++else $as_nop ++ CFLAGS="$CFLAGS -std=gnu17" ++ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++printf "%s\n" "yes" >&6; } ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ++ + if test "$ac_cv_werror" = "yes" ; then + CFLAGS="$CFLAGS -Werror" + fi +diff --git a/configure.ac b/configure.ac +index 8a0778912..25f051601 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -886,6 +886,25 @@ CHECK_LIBMAXMINDDB + + UNRLINCDIR="`pwd`/include" + ++dnl This is at the end so the (potential) -std=gnu17 is not used ++dnl when compiling libraries, as their requirements may be different. ++AC_MSG_CHECKING([if explicit -std=gnu17 is needed]) ++AC_COMPILE_IFELSE([AC_LANG_PROGRAM( ++ [[#include ++ #include ++ #include ++ #include ++ #include ++ #include ]], ++ [[ ++ void (*test)(); ++ test = exit; ++ test(0); ++ ]])], ++ [AC_MSG_RESULT(no)], ++ [CFLAGS="$CFLAGS -std=gnu17" ++ AC_MSG_RESULT(yes)]) ++ + dnl Moved to the very end to ensure it doesn't affect any libs or tests. + if test "$ac_cv_werror" = "yes" ; then + CFLAGS="$CFLAGS -Werror" diff --git a/unrealircd.spec b/unrealircd.spec index 9912752..4d8af60 100644 --- a/unrealircd.spec +++ b/unrealircd.spec @@ -28,6 +28,8 @@ Patch0: unrealircd-6.0.6-crypto-policy.patch Patch1: unrealircd-6.1.8-geoip.patch # Same options like in unrealircd(ctl) shell script Patch2: unrealircd-6.0.3-unrealircdctl.patch +# https://bugs.unrealircd.org/view.php?id=6495 +Patch3: https://github.com/unrealircd/unrealircd/commit/72af36d2a34cc75b0879c7e291a52f017a06ad08.patch#/unrealircd-6.1.9-c23.patch BuildRequires: gnupg2 BuildRequires: gcc BuildRequires: make @@ -82,6 +84,7 @@ touch -c -r doc/conf/examples/example.conf{.crypto-policy,} %patch -P1 -p1 -b .geoip touch -c -r doc/conf/modules.default.conf{.geoip,} %patch -P2 -p1 -b .unrealircdctl +%patch -P3 -p1 -b .c23 # Ensure the bundled PCRE2 tarball matches the version in this spec file ! tar tfz extras/pcre2.tar.gz | grep -E -m 1 -v '^pcre2-%{pcre2}/' From 228533fcc88b1a2287deb65466b9a80bf25e06b1 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sat, 8 Mar 2025 20:08:07 +0100 Subject: [PATCH 15/19] Upgrade to 6.1.10 (#2345958) --- sources | 4 +- unrealircd-6.1.9-c23.patch | 91 -------------------------------------- unrealircd.spec | 10 ++--- 3 files changed, 7 insertions(+), 98 deletions(-) delete mode 100644 unrealircd-6.1.9-c23.patch diff --git a/sources b/sources index 4016655..8d14540 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (gpgkey-1D2D2B03A0B68ED11D68A24BA7A21B0A108FF4A9.gpg) = b17e72bc242e606fc660a851676317326ea0a1f3b501cf199a6f59edd999444b957bd52a359e3aa6ceb6c54cba4001e1b94116793c3e0c815eb03df139e1239d -SHA512 (unrealircd-6.1.9.1.tar.gz) = 10abba70e7f8979c326c89d6cdf3e197553a49e6277980c4a7bf2d9ea285fa27cb16c783505d775bc500c4b928301f918c9a0c96d6f7b5f52dc313830d6a4942 -SHA512 (unrealircd-6.1.9.1.tar.gz.asc) = 1ac5b5737d27e657d9585b8b17026fbdb091d86ed2c652665aff5b30f08a64f3c95c3fc9a743cdd25202d32605e119dd308bbc7944438f34c8565428d6447394 +SHA512 (unrealircd-6.1.10.tar.gz) = f682ccc24b8b92fd02729585bff9cdcfcd37c64a7d2ca4a91df6e982adfb57a50fffed7e46bd517328db9ed35f98303bb2ae90132321621dccc7287259498508 +SHA512 (unrealircd-6.1.10.tar.gz.asc) = 6d4b3c5ba5bb4148f0907c4f3110833630fab6b5fff0aa341a9153dcdaa15c2f7cf74730f482e1dcf9cd38f9a9c42e746de5f163421ace65f1697871c8cad29a diff --git a/unrealircd-6.1.9-c23.patch b/unrealircd-6.1.9-c23.patch deleted file mode 100644 index f27502f..0000000 --- a/unrealircd-6.1.9-c23.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 72af36d2a34cc75b0879c7e291a52f017a06ad08 Mon Sep 17 00:00:00 2001 -From: Bram Matthys -Date: Mon, 10 Feb 2025 11:26:34 +0100 -Subject: [PATCH] Fix problem with upcoming GCC 15 that assumes C23. GCC 15 is - not released yet and is scheduled for April/May 2025. - -We now have a ./configure check. If a func() declaration is interpreted -as meaning 0 arguments, so C23 style, then we now add -std=gnu17 to -CFLAGS. If not, then we don't set an explicit C standard version. - -Closes https://bugs.unrealircd.org/view.php?id=6495 ---- - configure | 33 +++++++++++++++++++++++++++++++++ - configure.ac | 19 +++++++++++++++++++ - doc/RELEASE-NOTES.md | 7 +++++-- - 3 files changed, 57 insertions(+), 2 deletions(-) - -diff --git a/configure b/configure -index 8d2e05351..2237a4897 100755 ---- a/configure -+++ b/configure -@@ -9595,6 +9595,39 @@ fi - - UNRLINCDIR="`pwd`/include" - -+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if explicit -std=gnu17 is needed" >&5 -+printf %s "checking if explicit -std=gnu17 is needed... " >&6; } -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+ #include -+ #include -+ #include -+ #include -+ #include -+int -+main (void) -+{ -+ -+ void (*test)(); -+ test = exit; -+ test(0); -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO" -+then : -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+printf "%s\n" "no" >&6; } -+else $as_nop -+ CFLAGS="$CFLAGS -std=gnu17" -+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+printf "%s\n" "yes" >&6; } -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -+ - if test "$ac_cv_werror" = "yes" ; then - CFLAGS="$CFLAGS -Werror" - fi -diff --git a/configure.ac b/configure.ac -index 8a0778912..25f051601 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -886,6 +886,25 @@ CHECK_LIBMAXMINDDB - - UNRLINCDIR="`pwd`/include" - -+dnl This is at the end so the (potential) -std=gnu17 is not used -+dnl when compiling libraries, as their requirements may be different. -+AC_MSG_CHECKING([if explicit -std=gnu17 is needed]) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM( -+ [[#include -+ #include -+ #include -+ #include -+ #include -+ #include ]], -+ [[ -+ void (*test)(); -+ test = exit; -+ test(0); -+ ]])], -+ [AC_MSG_RESULT(no)], -+ [CFLAGS="$CFLAGS -std=gnu17" -+ AC_MSG_RESULT(yes)]) -+ - dnl Moved to the very end to ensure it doesn't affect any libs or tests. - if test "$ac_cv_werror" = "yes" ; then - CFLAGS="$CFLAGS -Werror" diff --git a/unrealircd.spec b/unrealircd.spec index 4d8af60..0c7d61d 100644 --- a/unrealircd.spec +++ b/unrealircd.spec @@ -6,8 +6,8 @@ Summary: Open Source IRC server Name: unrealircd -Version: 6.1.9.1 -Release: 3%{?dist} +Version: 6.1.10 +Release: 1%{?dist} # UnrealIRCd declares itself as GPL-2.0-or-later as it's the common denominator for # a GPL-1.0-or-later and GPL-2.0-or-later mixture, breakdown of other source codes: # BSD-3-Clause: include/mempool.h and src/mempool.c @@ -28,8 +28,6 @@ Patch0: unrealircd-6.0.6-crypto-policy.patch Patch1: unrealircd-6.1.8-geoip.patch # Same options like in unrealircd(ctl) shell script Patch2: unrealircd-6.0.3-unrealircdctl.patch -# https://bugs.unrealircd.org/view.php?id=6495 -Patch3: https://github.com/unrealircd/unrealircd/commit/72af36d2a34cc75b0879c7e291a52f017a06ad08.patch#/unrealircd-6.1.9-c23.patch BuildRequires: gnupg2 BuildRequires: gcc BuildRequires: make @@ -84,7 +82,6 @@ touch -c -r doc/conf/examples/example.conf{.crypto-policy,} %patch -P1 -p1 -b .geoip touch -c -r doc/conf/modules.default.conf{.geoip,} %patch -P2 -p1 -b .unrealircdctl -%patch -P3 -p1 -b .c23 # Ensure the bundled PCRE2 tarball matches the version in this spec file ! tar tfz extras/pcre2.tar.gz | grep -E -m 1 -v '^pcre2-%{pcre2}/' @@ -234,6 +231,9 @@ fi %endif %changelog +* Sat Mar 08 2025 Robert Scheck 6.1.10-1 +- Upgrade to 6.1.10 (#2345958) + * Sat Feb 01 2025 Björn Esser - 6.1.9.1-3 - Add explicit BR: libxcrypt-devel From ab763bccbebd02f6236d60fe24736a0a8cec0a93 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 19:48:55 +0000 Subject: [PATCH 16/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- unrealircd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/unrealircd.spec b/unrealircd.spec index 0c7d61d..4c6eb1b 100644 --- a/unrealircd.spec +++ b/unrealircd.spec @@ -7,7 +7,7 @@ Summary: Open Source IRC server Name: unrealircd Version: 6.1.10 -Release: 1%{?dist} +Release: 2%{?dist} # UnrealIRCd declares itself as GPL-2.0-or-later as it's the common denominator for # a GPL-1.0-or-later and GPL-2.0-or-later mixture, breakdown of other source codes: # BSD-3-Clause: include/mempool.h and src/mempool.c @@ -231,6 +231,9 @@ fi %endif %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 6.1.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sat Mar 08 2025 Robert Scheck 6.1.10-1 - Upgrade to 6.1.10 (#2345958) From 6239ffc071b3d9a73cba37ec1aba993716371e6d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 19:38:18 +0000 Subject: [PATCH 17/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- unrealircd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/unrealircd.spec b/unrealircd.spec index 4c6eb1b..66075bc 100644 --- a/unrealircd.spec +++ b/unrealircd.spec @@ -7,7 +7,7 @@ Summary: Open Source IRC server Name: unrealircd Version: 6.1.10 -Release: 2%{?dist} +Release: 3%{?dist} # UnrealIRCd declares itself as GPL-2.0-or-later as it's the common denominator for # a GPL-1.0-or-later and GPL-2.0-or-later mixture, breakdown of other source codes: # BSD-3-Clause: include/mempool.h and src/mempool.c @@ -231,6 +231,9 @@ fi %endif %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 6.1.10-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Jul 25 2025 Fedora Release Engineering - 6.1.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 096e860beaa06a7163e2ae869bd6fe153a470f14 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 12 Jun 2026 20:00:13 -0400 Subject: [PATCH 18/19] Rebuilt for openssl 4.0 --- unrealircd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/unrealircd.spec b/unrealircd.spec index 66075bc..b651efb 100644 --- a/unrealircd.spec +++ b/unrealircd.spec @@ -7,7 +7,7 @@ Summary: Open Source IRC server Name: unrealircd Version: 6.1.10 -Release: 3%{?dist} +Release: 4%{?dist} # UnrealIRCd declares itself as GPL-2.0-or-later as it's the common denominator for # a GPL-1.0-or-later and GPL-2.0-or-later mixture, breakdown of other source codes: # BSD-3-Clause: include/mempool.h and src/mempool.c @@ -231,6 +231,9 @@ fi %endif %changelog +* Sat Jun 13 2026 Yaakov Selkowitz - 6.1.10-4 +- Rebuilt for openssl 4.0 + * Sat Jan 17 2026 Fedora Release Engineering - 6.1.10-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 91cd02275ff3792aa6edb26ff09883ce9cbac33d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:12:56 +0000 Subject: [PATCH 19/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- unrealircd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/unrealircd.spec b/unrealircd.spec index b651efb..bc1819d 100644 --- a/unrealircd.spec +++ b/unrealircd.spec @@ -7,7 +7,7 @@ Summary: Open Source IRC server Name: unrealircd Version: 6.1.10 -Release: 4%{?dist} +Release: 5%{?dist} # UnrealIRCd declares itself as GPL-2.0-or-later as it's the common denominator for # a GPL-1.0-or-later and GPL-2.0-or-later mixture, breakdown of other source codes: # BSD-3-Clause: include/mempool.h and src/mempool.c @@ -231,6 +231,9 @@ fi %endif %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 6.1.10-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jun 13 2026 Yaakov Selkowitz - 6.1.10-4 - Rebuilt for openssl 4.0