Compare commits

..

No commits in common. "rawhide" and "f37" have entirely different histories.

3 changed files with 30 additions and 87 deletions

View file

@ -1,3 +1,3 @@
SHA512 (gpgkey-1D2D2B03A0B68ED11D68A24BA7A21B0A108FF4A9.gpg) = b17e72bc242e606fc660a851676317326ea0a1f3b501cf199a6f59edd999444b957bd52a359e3aa6ceb6c54cba4001e1b94116793c3e0c815eb03df139e1239d
SHA512 (unrealircd-6.1.10.tar.gz) = f682ccc24b8b92fd02729585bff9cdcfcd37c64a7d2ca4a91df6e982adfb57a50fffed7e46bd517328db9ed35f98303bb2ae90132321621dccc7287259498508
SHA512 (unrealircd-6.1.10.tar.gz.asc) = 6d4b3c5ba5bb4148f0907c4f3110833630fab6b5fff0aa341a9153dcdaa15c2f7cf74730f482e1dcf9cd38f9a9c42e746de5f163421ace65f1697871c8cad29a
SHA512 (unrealircd-6.1.2.3.tar.gz) = ea594a96680f58d926857e3b099b862931a29580c6402be951ce085182fb8fe2cadaa9fc9e2b1541c9e1bb3dec8a2b4fe7b9c73159c34fd05281e69d17122137
SHA512 (unrealircd-6.1.2.3.tar.gz.asc) = 76f6f19e0884f17548d1c340bdab599b75835e971067b329410f554dc385a9f138241273f8cbc0d176c711b22644c46e97375fe99c635eea7c5b29a23b3e816d

View file

@ -1,4 +1,4 @@
Nasty hack by Robert Scheck <robert@fedoraproject.org> for UnrealIRCd >= 6.1.8 which disables all
Nasty hack by Robert Scheck <robert@fedoraproject.org> for UnrealIRCd >= 6.1.2 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,29 +22,18 @@ 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.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 @@
--- 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 @@
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 via geoip) */
+// loadmodule "extbans/country"; /* +b ~country (country via geoip) */ /* Disabled by Fedora intentionally, please read the end of this file */
-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/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 */
loadmodule "extbans/inherit"; /* +b ~inherit (inherit bans from another channel) */
@@ -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 */
@@ -291,12 +291,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 */

View file

@ -2,12 +2,12 @@
%global sslkey %{_sysconfdir}/pki/%{name}/server.key.pem
%bcond_without maxmind
%global pcre2 10.44
%global pcre2 10.42
Summary: Open Source IRC server
Name: unrealircd
Version: 6.1.10
Release: 5%{?dist}
Version: 6.1.2.3
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
@ -25,15 +25,19 @@ 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.8-geoip.patch
Patch1: unrealircd-6.1.2-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
%if 0%{?fedora} || 0%{?rhel} >= 9
%else
BuildRequires: openssl11-devel
%endif
%if 0%{?fedora} || 0%{?rhel} > 8
BuildRequires: pcre2-devel >= 10.36
%else
Provides: bundled(pcre2) = %{pcre2}
@ -43,7 +47,6 @@ 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}
@ -60,7 +63,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} >= 9
%if 0%{?fedora} || 0%{?rhel} > 8
BuildRequires: libmaxminddb-devel >= 1.4.3
%else
BuildRequires: libmaxminddb-devel >= 1.2.0
@ -77,17 +80,23 @@ 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
# 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
%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
# 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
@ -106,7 +115,7 @@ export PKG_CONFIG_PATH="$BUNDLED%{_libdir}/pkgconfig"
%endif
# https://github.com/unrealircd/unrealircd/pull/183
%if %{with maxmind} && 0%{?rhel} == 8
%if %{with maxmind} && 0%{?rhel} && 0%{?rhel} < 9
sed -e 's|libmaxminddb >= 1.4.3|libmaxminddb >= 1.2.0|g' -i configure
%endif
@ -231,61 +240,6 @@ fi
%endif
%changelog
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 6.1.10-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
* Sat Jun 13 2026 Yaakov Selkowitz <yselkowi@redhat.com> - 6.1.10-4
- Rebuilt for openssl 4.0
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 6.1.10-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 6.1.10-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Sat Mar 08 2025 Robert Scheck <robert@fedoraproject.org> 6.1.10-1
- Upgrade to 6.1.10 (#2345958)
* Sat Feb 01 2025 Björn Esser <besser82@fedoraproject.org> - 6.1.9.1-3
- Add explicit BR: libxcrypt-devel
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 6.1.9.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Fri Dec 13 2024 Robert Scheck <robert@fedoraproject.org> 6.1.9.1-1
- Upgrade to 6.1.9.1 (#2327604)
* Tue Oct 22 2024 Richard W.M. Jones <rjones@redhat.com> - 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 <robert@fedoraproject.org> 6.1.8.1-1
- Upgrade to 6.1.8.1 (#2319754)
* Sat Oct 12 2024 Robert Scheck <robert@fedoraproject.org> 6.1.8-1
- Upgrade to 6.1.8 (#2315105)
* Sat Sep 14 2024 Robert Scheck <robert@fedoraproject.org> 6.1.7.2-1
- Upgrade to 6.1.7.2 (#2297919)
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 6.1.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Sat Jun 15 2024 Robert Scheck <robert@fedoraproject.org> 6.1.6-1
- Upgrade to 6.1.6 (#2290902)
* Sun May 12 2024 Robert Scheck <robert@fedoraproject.org> 6.1.5-1
- Upgrade to 6.1.5 (#2276377)
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 6.1.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sat Dec 16 2023 Robert Scheck <robert@fedoraproject.org> 6.1.4-1
- Upgrade to 6.1.4 (#2254828)
* Sat Dec 09 2023 Robert Scheck <robert@fedoraproject.org> 6.1.3-1
- Upgrade to 6.1.3 (#2252372)
* Sun Nov 05 2023 Robert Scheck <robert@fedoraproject.org> 6.1.2.3-2
- Build upstream's bundled recent PCRE2 version for RHEL 7 and 8