From 73e2e58fbd8f902204dd212001fbb5e3f1753d4b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 09:09:10 +0000 Subject: [PATCH 01/19] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ngircd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ngircd.spec b/ngircd.spec index d0f05c5..3318234 100644 --- a/ngircd.spec +++ b/ngircd.spec @@ -1,6 +1,6 @@ Name: ngircd Version: 26 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Next Generation IRC Daemon License: GPLv2+ URL: http://ngircd.barton.de/ @@ -155,6 +155,9 @@ fi %endif %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 26-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sun Jun 28 2020 Kevin Fenzi - 26-3 - Fix arch conditional for tests. :( From 2d52847a9d2aee3d956899a02895b6a8197bb35c Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sun, 3 Jan 2021 14:39:12 -0800 Subject: [PATCH 02/19] Update to 26.1. rhbz#1912027 --- .gitignore | 1 + ngircd.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 45f0c4b..a09ecde 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ ngircd-16.tar.gz /ngircd-24.tar.gz /ngircd-25.tar.gz /ngircd-26.tar.gz +/ngircd-26.1.tar.gz diff --git a/ngircd.spec b/ngircd.spec index 3318234..5b0eb17 100644 --- a/ngircd.spec +++ b/ngircd.spec @@ -1,6 +1,6 @@ Name: ngircd -Version: 26 -Release: 4%{?dist} +Version: 26.1 +Release: 1%{?dist} Summary: Next Generation IRC Daemon License: GPLv2+ URL: http://ngircd.barton.de/ @@ -155,6 +155,9 @@ fi %endif %changelog +* Sun Jan 03 2021 Kevin Fenzi - 26.1-1 +- Update to 26.1. rhbz#1912027 + * Tue Jul 28 2020 Fedora Release Engineering - 26-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index bf5e38e..aa25656 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ngircd-26.tar.gz) = 2502baf83e3bfca3e6b83c22fe660fee24732ee875b32a7071a489a8babcc08124738142215b55d4f9bd4e94bec3f2a41889ab18324f772b1674b02883cbfb91 +SHA512 (ngircd-26.1.tar.gz) = 4a3ee379dd8d8655a71134c745f750359ceb0512e184db555f65f2bcab68087480365a35680a9ec75b1e6eb0fef23e1cbe0a0e13c3c58d211e5a520a8eeaa71c From a86b679a799e6be1159a78724870cb0f86806f5b Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 7 Jan 2021 05:50:51 +0000 Subject: [PATCH 03/19] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- ngircd.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/ngircd.spec b/ngircd.spec index 5b0eb17..f08f894 100644 --- a/ngircd.spec +++ b/ngircd.spec @@ -15,6 +15,7 @@ Patch1: ngircd-cipher.patch # add CAP_KILL to allow reload Patch2: ngircd-service.patch +BuildRequires: make BuildRequires: gcc BuildRequires: zlib-devel, avahi-compat-howl-devel BuildRequires: gnutls-devel From 36502e8dfea34a6afe8a3f0be641427f61453a99 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 21:31:04 +0000 Subject: [PATCH 04/19] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ngircd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ngircd.spec b/ngircd.spec index f08f894..0ccb394 100644 --- a/ngircd.spec +++ b/ngircd.spec @@ -1,6 +1,6 @@ Name: ngircd Version: 26.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Next Generation IRC Daemon License: GPLv2+ URL: http://ngircd.barton.de/ @@ -156,6 +156,9 @@ fi %endif %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 26.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sun Jan 03 2021 Kevin Fenzi - 26.1-1 - Update to 26.1. rhbz#1912027 From 2e47f2ec244a22b87acb50fbbd4fdfce5b525095 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:13:18 +0100 Subject: [PATCH 05/19] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- ngircd.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ngircd.spec b/ngircd.spec index 0ccb394..261d747 100644 --- a/ngircd.spec +++ b/ngircd.spec @@ -1,6 +1,6 @@ Name: ngircd Version: 26.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Next Generation IRC Daemon License: GPLv2+ URL: http://ngircd.barton.de/ @@ -156,6 +156,10 @@ fi %endif %changelog +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 26.1-3 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + * Tue Jan 26 2021 Fedora Release Engineering - 26.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 6fcfc97480ea8f1c6a7119b58ac5d68e18865514 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 16:07:38 +0000 Subject: [PATCH 06/19] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ngircd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ngircd.spec b/ngircd.spec index 261d747..f2cc48c 100644 --- a/ngircd.spec +++ b/ngircd.spec @@ -1,6 +1,6 @@ Name: ngircd Version: 26.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Next Generation IRC Daemon License: GPLv2+ URL: http://ngircd.barton.de/ @@ -156,6 +156,9 @@ fi %endif %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 26.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 26.1-3 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. From 9afd6044faebb8889eef274752b38e8ca5099d1b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 21:12:14 +0000 Subject: [PATCH 07/19] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ngircd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ngircd.spec b/ngircd.spec index f2cc48c..18e05af 100644 --- a/ngircd.spec +++ b/ngircd.spec @@ -1,6 +1,6 @@ Name: ngircd Version: 26.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Next Generation IRC Daemon License: GPLv2+ URL: http://ngircd.barton.de/ @@ -156,6 +156,9 @@ fi %endif %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 26.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 26.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 88cc4c9c8b8746289332854f95f307a1183d4dd2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 00:34:12 +0000 Subject: [PATCH 08/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ngircd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ngircd.spec b/ngircd.spec index 18e05af..3f7a0ef 100644 --- a/ngircd.spec +++ b/ngircd.spec @@ -1,6 +1,6 @@ Name: ngircd Version: 26.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Next Generation IRC Daemon License: GPLv2+ URL: http://ngircd.barton.de/ @@ -156,6 +156,9 @@ fi %endif %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 26.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 26.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From d2080865831dfb046aaf0bbddc5b1c38b75a9de7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 21:35:11 +0000 Subject: [PATCH 09/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ngircd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ngircd.spec b/ngircd.spec index 3f7a0ef..83d748b 100644 --- a/ngircd.spec +++ b/ngircd.spec @@ -1,6 +1,6 @@ Name: ngircd Version: 26.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Next Generation IRC Daemon License: GPLv2+ URL: http://ngircd.barton.de/ @@ -156,6 +156,9 @@ fi %endif %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 26.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Jul 22 2022 Fedora Release Engineering - 26.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 03c129c7ee4a9bc1c68bf6821a206eaee4a727ee Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Thu, 2 Feb 2023 10:05:23 +0100 Subject: [PATCH 10/19] Port configure script to C99 Related to: --- ngircd-configure-c99.patch | 42 ++++++++++++++++++++++++++++++++++++++ ngircd.spec | 7 ++++++- 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 ngircd-configure-c99.patch diff --git a/ngircd-configure-c99.patch b/ngircd-configure-c99.patch new file mode 100644 index 0000000..0a62d83 --- /dev/null +++ b/ngircd-configure-c99.patch @@ -0,0 +1,42 @@ +Include for memset in WORKING_GETADDRINFO probe. +Otherwise, the probe always fails with compilers which do not support +implicit function declarations. + +Submitted upstream: + +diff --git a/configure b/configure +index 4435369c657b6fd6..242230bc334f7d4e 100755 +--- a/configure ++++ b/configure +@@ -6286,6 +6286,7 @@ else + #include + #include + #include ++#include + int + main(int argc, char **argv) + { +diff --git a/configure.ac b/configure.ac +index 609be364e0d03fef..1d98fd965a844808 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -101,6 +101,7 @@ AC_DEFUN([WORKING_GETADDRINFO],[ + #include + #include + #include ++#include + int + main(int argc, char **argv) + { +diff --git a/configure.ng b/configure.ng +index 59d9d9fe8fd5e469..1195b9e53af2364c 100644 +--- a/configure.ng ++++ b/configure.ng +@@ -101,6 +101,7 @@ AC_DEFUN([WORKING_GETADDRINFO],[ + #include + #include + #include ++#include + int + main(int argc, char **argv) + { diff --git a/ngircd.spec b/ngircd.spec index 83d748b..105d4e5 100644 --- a/ngircd.spec +++ b/ngircd.spec @@ -1,6 +1,6 @@ Name: ngircd Version: 26.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Next Generation IRC Daemon License: GPLv2+ URL: http://ngircd.barton.de/ @@ -14,6 +14,7 @@ Patch1: ngircd-cipher.patch # Patch for service file - no forking, no user/group for SSL key access, add doc, # add CAP_KILL to allow reload Patch2: ngircd-service.patch +Patch3: ngircd-configure-c99.patch BuildRequires: make BuildRequires: gcc @@ -49,6 +50,7 @@ scratch and is not based upon the original IRCd like many others. %patch1 -p1 -b .cipher %endif %patch2 -p1 -b .service +%patch3 -p1 %build %configure \ @@ -156,6 +158,9 @@ fi %endif %changelog +* Thu Feb 02 2023 Florian Weimer - 26.1-8 +- Port configure script to C99 + * Thu Jan 19 2023 Fedora Release Engineering - 26.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 308c277d690da80b904c6e0daaf4c20910d43474 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 16:40:22 +0000 Subject: [PATCH 11/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ngircd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ngircd.spec b/ngircd.spec index 105d4e5..077a8f1 100644 --- a/ngircd.spec +++ b/ngircd.spec @@ -1,6 +1,6 @@ Name: ngircd Version: 26.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Next Generation IRC Daemon License: GPLv2+ URL: http://ngircd.barton.de/ @@ -158,6 +158,9 @@ fi %endif %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 26.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Feb 02 2023 Florian Weimer - 26.1-8 - Port configure script to C99 From 271bc51dc4459de2428888d0255e65b9b159eb7a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 09:42:05 +0000 Subject: [PATCH 12/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- ngircd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ngircd.spec b/ngircd.spec index 077a8f1..c3155c4 100644 --- a/ngircd.spec +++ b/ngircd.spec @@ -1,6 +1,6 @@ Name: ngircd Version: 26.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Next Generation IRC Daemon License: GPLv2+ URL: http://ngircd.barton.de/ @@ -158,6 +158,9 @@ fi %endif %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 26.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Jul 20 2023 Fedora Release Engineering - 26.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 192ca6018103c929e185fe231e4d6df9cdd59798 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 08:59:01 +0000 Subject: [PATCH 13/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- ngircd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ngircd.spec b/ngircd.spec index c3155c4..9af923a 100644 --- a/ngircd.spec +++ b/ngircd.spec @@ -1,6 +1,6 @@ Name: ngircd Version: 26.1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Next Generation IRC Daemon License: GPLv2+ URL: http://ngircd.barton.de/ @@ -158,6 +158,9 @@ fi %endif %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 26.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 26.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 9a87028352957b231fd9564158dd381240e1e0b3 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sun, 12 May 2024 09:56:43 -0700 Subject: [PATCH 14/19] Update to 27. Fixes rhbz#2274888 Clean up and drop old conditionals. --- .gitignore | 1 + ngircd-fedora.patch | 22 +++++++------- ngircd-service.patch | 31 ++++++++++--------- ngircd.spec | 71 +++++--------------------------------------- sources | 2 +- 5 files changed, 36 insertions(+), 91 deletions(-) diff --git a/.gitignore b/.gitignore index a09ecde..6d27b44 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ ngircd-16.tar.gz /ngircd-25.tar.gz /ngircd-26.tar.gz /ngircd-26.1.tar.gz +/ngircd-27.tar.gz diff --git a/ngircd-fedora.patch b/ngircd-fedora.patch index 85fdf5c..5e997b2 100644 --- a/ngircd-fedora.patch +++ b/ngircd-fedora.patch @@ -1,28 +1,26 @@ -diff -up ngircd-23/doc/sample-ngircd.conf.tmpl.fedora ngircd-23/doc/sample-ngircd.conf.tmpl ---- ngircd-23/doc/sample-ngircd.conf.tmpl.fedora 2015-08-20 08:29:56.000000000 -0600 -+++ ngircd-23/doc/sample-ngircd.conf.tmpl 2015-11-17 12:26:54.905029870 -0700 -@@ -45,7 +45,7 @@ - # listen. Default values are: +diff --color -Nur ngircd-27.orig/doc/sample-ngircd.conf.tmpl ngircd-27/doc/sample-ngircd.conf.tmpl +--- ngircd-27.orig/doc/sample-ngircd.conf.tmpl 2024-05-11 16:18:32.156364779 -0700 ++++ ngircd-27/doc/sample-ngircd.conf.tmpl 2024-05-11 16:19:47.972042211 -0700 +@@ -49,6 +49,7 @@ # "0.0.0.0" or (if compiled with IPv6 support) "::,0.0.0.0" # so the server listens on all IP addresses of the system by default. -- ;Listen = 127.0.0.1,192.168.0.1 + ;Listen = 127.0.0.1,192.168.0.1 + Listen = 127.0.0.1 # Text file with the "message of the day" (MOTD). This message will - # be shown to all users connecting to the server: -@@ -77,14 +77,14 @@ - # Group ID under which the ngIRCd should run; you can use the name + # be shown to all users connecting to the server: Default: a built-in +@@ -82,6 +83,7 @@ # of the group or the numerical ID. ATTENTION: For this to work the # server must have been started with root privileges! -- ;ServerGID = 65534 + ;ServerGID = 65534 + ServerGID = ngircd # User ID under which the server should run; you can use the name # of the user or the numerical ID. ATTENTION: For this to work the - # server must have been started with root privileges! In addition, +@@ -89,6 +91,7 @@ # the configuration and MOTD files must be readable by this user, # otherwise RESTART and REHASH won't work! -- ;ServerUID = 65534 + ;ServerUID = 65534 + ServerUID = ngircd [Limits] diff --git a/ngircd-service.patch b/ngircd-service.patch index 26b7938..c49250f 100644 --- a/ngircd-service.patch +++ b/ngircd-service.patch @@ -1,34 +1,37 @@ -diff -Nur ngircd-24.orig/contrib/ngircd.service ngircd-24/contrib/ngircd.service ---- ngircd-24.orig/contrib/ngircd.service 2017-01-07 13:24:46.000000000 -0700 -+++ ngircd-24/contrib/ngircd.service 2017-01-28 15:36:45.127789109 -0700 -@@ -11,11 +11,8 @@ - Before=bopm.service +diff --color -Nur ngircd-27.orig/contrib/ngircd.service ngircd-27/contrib/ngircd.service +--- ngircd-27.orig/contrib/ngircd.service 2024-04-13 02:33:33.000000000 -0700 ++++ ngircd-27/contrib/ngircd.service 2024-05-12 09:07:55.595471549 -0700 +@@ -12,10 +12,10 @@ [Service] --Type=forking + Type=notify -User=irc -Group=irc ++User=ngircd ++Group=ngircd # Settings & limits: -CapabilityBoundingSet=CAP_SYS_CHROOT CAP_NET_BIND_SERVICE -+CapabilityBoundingSet=CAP_SETUID CAP_SETGID CAP_SYS_CHROOT CAP_NET_BIND_SERVICE CAP_KILL ++CapabilityBoundingSet=CAP_SYS_CHROOT CAP_NET_BIND_SERVICE CAP_KILL MemoryDenyWriteExecute=yes NoNewPrivileges=yes PrivateDevices=yes -@@ -27,15 +24,8 @@ +@@ -27,17 +27,12 @@ ProtectSystem=full RestrictAddressFamilies=AF_INET AF_INET6 AF_UNIX RestrictRealtime=yes -RuntimeDirectory=ircd --RuntimeDirectoryMode=750 ++RuntimeDirectory=ngircd + RuntimeDirectoryMode=750 + StandardError=journal + StandardOutput=journal -# Try to load "default files" from any Debian package variant to keep this -# unit generic. -EnvironmentFile=-/etc/default/ngircd -EnvironmentFile=-/etc/default/ngircd-full -EnvironmentFile=-/etc/default/ngircd-full-dbg # Start ngIRCd. Note: systemd doesn't allow to use $DAEMON here! --ExecStart=/usr/sbin/ngircd $PARAMS -+ExecStart=/usr/sbin/ngircd -n +-ExecStart=/usr/sbin/ngircd --nodaemon --syslog $PARAMS ++ExecStart=/usr/sbin/ngircd --nodaemon --syslog ExecReload=/bin/kill -HUP $MAINPID - Restart=on-failure - -Binary files ngircd-24.orig/contrib/.ngircd.service.swp and ngircd-24/contrib/.ngircd.service.swp differ + # Error handling: + # ngIRCd tries to "ping" the service manager every 3 seconds. diff --git a/ngircd.spec b/ngircd.spec index 9af923a..82b1a17 100644 --- a/ngircd.spec +++ b/ngircd.spec @@ -1,6 +1,6 @@ Name: ngircd -Version: 26.1 -Release: 11%{?dist} +Version: 27 +Release: 1%{?dist} Summary: Next Generation IRC Daemon License: GPLv2+ URL: http://ngircd.barton.de/ @@ -14,7 +14,6 @@ Patch1: ngircd-cipher.patch # Patch for service file - no forking, no user/group for SSL key access, add doc, # add CAP_KILL to allow reload Patch2: ngircd-service.patch -Patch3: ngircd-configure-c99.patch BuildRequires: make BuildRequires: gcc @@ -23,17 +22,10 @@ BuildRequires: gnutls-devel BuildRequires: pam-devel # Needed for tests BuildRequires: expect procps-ng telnet openssl -%if 0%{?rhel} > 6 || 0%{?fedora} BuildRequires: systemd Requires(post): systemd Requires(preun): systemd Requires(postun): systemd -%else -Requires(post): /sbin/chkconfig -Requires(preun): /sbin/chkconfig -Requires(preun): /sbin/service -Requires(postun): /sbin/service -%endif Requires(pre): shadow-utils @@ -43,21 +35,13 @@ developed under the GNU General Public License (GPL). It's written from scratch and is not based upon the original IRCd like many others. %prep -%setup -q -%patch0 -p1 -b .fedora -# SYSTEM Cipher support in fedora and rhel > 7 -%if 0%{?fedora} || 0%{?rhel} > 7 -%patch1 -p1 -b .cipher -%endif -%patch2 -p1 -b .service -%patch3 -p1 +%autosetup -p1 %build %configure \ --with-syslog \ --with-zlib \ --with-epoll \ - --with-zeroconf \ --with-gnutls \ --with-pam \ --enable-ipv6 @@ -69,17 +53,7 @@ make %{?_smp_mflags} rm -rf %{buildroot} make install DESTDIR=%{buildroot} -%if 0%{?rhel} > 6 || 0%{?fedora} -# Upstream service file uses options only in newer systemd -%if 0%{?fedora} install -D -m 644 contrib/ngircd.service %{buildroot}%{_unitdir}/ngircd.service -%else -install -D -m 644 %{SOURCE2} %{buildroot}%{_unitdir}/ngircd.service -%endif -%else -install -D -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/ngircd -%endif - install -D -m 660 doc/sample-ngircd.conf %{buildroot}%{_sysconfdir}/ngircd.conf mkdir -p %{buildroot}%{_sysconfdir}/pam.d @@ -87,20 +61,11 @@ install -D -m 660 ./contrib/Debian/ngircd.pam %{buildroot}%{_sysconfdir}/pam.d/n touch %{buildroot}%{_sysconfdir}/ngircd.motd rm %{buildroot}%{_docdir}/ngircd/INSTALL.md -%if 0%{?rhel} > 6 || 0%{?fedora} mkdir -p %{buildroot}%{_tmpfilesdir} echo d /run/ngircd 0750 ngircd ngircd - > %{buildroot}%{_tmpfilesdir}/ngircd.conf -%else -mkdir -p %{buildroot}%{_localstatedir}/run/ngircd -%endif %check -# -# Disable i686 tests pending https://github.com/ngircd/ngircd/issues/280 -# -%ifnarch %{ix86} make check -%endif %pre getent group ngircd >/dev/null || groupadd -r ngircd @@ -110,31 +75,13 @@ getent passwd ngircd >/dev/null || \ exit 0 %post -%if 0%{?rhel} > 6 || 0%{?fedora} %systemd_post ngircd.service -%else -# This adds the proper /etc/rc*.d links for the script -/sbin/chkconfig --add ngircd -%endif %preun -%if 0%{?rhel} > 6 || 0%{?fedora} %systemd_preun ngircd.service -%else -if [ $1 = 0 ]; then - /sbin/service ngircd stop >/dev/null 2>&1 || : - /sbin/chkconfig --del ngircd -fi -%endif %postun -%if 0%{?rhel} > 6 || 0%{?fedora} %systemd_postun_with_restart ngircd.service -%else -if [ "$1" -ge "1" ]; then - /sbin/service ngircd condrestart >/dev/null 2>&1 || : -fi -%endif %files %{!?_licensedir:%global license %%doc} @@ -142,22 +89,18 @@ fi %config(noreplace) %attr(660, root, ngircd) %{_sysconfdir}/ngircd.conf %config(noreplace) %attr(660, root, ngircd) %{_sysconfdir}/pam.d/ngircd %ghost %config(noreplace) %attr(660, root, ngircd) %{_sysconfdir}/ngircd.motd -%if 0%{?rhel} > 6 || 0%{?fedora} %{_unitdir}/ngircd.service -%else -%{_initrddir}/ngircd -%endif %{_sbindir}/ngircd %{_docdir}/ngircd/ %{_mandir}/man5/ngircd.conf* %{_mandir}/man8/ngircd.8* -%if 0%{?rhel} > 6 || 0%{?fedora} %{_tmpfilesdir}/ngircd.conf -%else -%dir %attr(750, ngircd, ngircd) %{_localstatedir}/run/ngircd/ -%endif %changelog +* Sat May 11 2024 Kevin Fenzi - 27-1 +- Update to 27. Fixes rhbz#2274888 +- Clean up and drop old conditionals. + * Thu Jan 25 2024 Fedora Release Engineering - 26.1-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index aa25656..0e9026e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ngircd-26.1.tar.gz) = 4a3ee379dd8d8655a71134c745f750359ceb0512e184db555f65f2bcab68087480365a35680a9ec75b1e6eb0fef23e1cbe0a0e13c3c58d211e5a520a8eeaa71c +SHA512 (ngircd-27.tar.gz) = 54ad38b3f5a9a899106c1163f53f45c5b021f6bad3ea3b7cb9b06e619434d76416d494b046508f588b334daba5b39a451bbf28e6196ef8fffa0408e395ea3839 From 2b13b9a9c005a7e5e57a1de2c2d40037660358d3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 19:31:09 +0000 Subject: [PATCH 15/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- ngircd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ngircd.spec b/ngircd.spec index 82b1a17..e92ff03 100644 --- a/ngircd.spec +++ b/ngircd.spec @@ -1,6 +1,6 @@ Name: ngircd Version: 27 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Next Generation IRC Daemon License: GPLv2+ URL: http://ngircd.barton.de/ @@ -97,6 +97,9 @@ exit 0 %{_tmpfilesdir}/ngircd.conf %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 27-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat May 11 2024 Kevin Fenzi - 27-1 - Update to 27. Fixes rhbz#2274888 - Clean up and drop old conditionals. From 392b13615075909d0ba8e02a46b7c044d4a377ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 26 Jul 2024 01:36:42 +0200 Subject: [PATCH 16/19] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- ngircd.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ngircd.spec b/ngircd.spec index e92ff03..41cf7e1 100644 --- a/ngircd.spec +++ b/ngircd.spec @@ -1,8 +1,9 @@ Name: ngircd Version: 27 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Next Generation IRC Daemon -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: http://ngircd.barton.de/ Source0: http://ngircd.barton.de/pub/ngircd/ngircd-%{version}.tar.gz Source1: ngircd.init @@ -97,6 +98,9 @@ exit 0 %{_tmpfilesdir}/ngircd.conf %changelog +* Fri Jul 26 2024 Miroslav Suchý - 27-3 +- convert license to SPDX + * Thu Jul 18 2024 Fedora Release Engineering - 27-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 808b08080d354bd507526e5bab4fba0df0e1c354 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 20:07:36 +0000 Subject: [PATCH 17/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- ngircd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ngircd.spec b/ngircd.spec index 41cf7e1..3ee3849 100644 --- a/ngircd.spec +++ b/ngircd.spec @@ -1,6 +1,6 @@ Name: ngircd Version: 27 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Next Generation IRC Daemon # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -98,6 +98,9 @@ exit 0 %{_tmpfilesdir}/ngircd.conf %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 27-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Jul 26 2024 Miroslav Suchý - 27-3 - convert license to SPDX From 9e54e748387f5490803579891646e8ca671db850 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 11 Feb 2025 15:53:25 +0100 Subject: [PATCH 18/19] Add sysusers.d config file to allow rpm to create users/groups automatically See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers. --- ngircd.spec | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/ngircd.spec b/ngircd.spec index 3ee3849..6bfc9ef 100644 --- a/ngircd.spec +++ b/ngircd.spec @@ -1,6 +1,6 @@ Name: ngircd Version: 27 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Next Generation IRC Daemon # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -28,7 +28,6 @@ Requires(post): systemd Requires(preun): systemd Requires(postun): systemd -Requires(pre): shadow-utils %description ngIRCd is a free open source daemon for Internet Relay Chat (IRC), @@ -38,6 +37,11 @@ scratch and is not based upon the original IRCd like many others. %prep %autosetup -p1 +# Create a sysusers.d config file +cat >ngircd.sysusers.conf < %{buildroot}%{_tmpfilesdir}/ngircd.conf +install -m0644 -D ngircd.sysusers.conf %{buildroot}%{_sysusersdir}/ngircd.conf + %check make check -%pre -getent group ngircd >/dev/null || groupadd -r ngircd -getent passwd ngircd >/dev/null || \ - useradd -r -g ngircd -d /tmp/ -s /sbin/nologin \ - -c "Next Generation IRC Daemon" ngircd -exit 0 %post %systemd_post ngircd.service @@ -96,8 +96,12 @@ exit 0 %{_mandir}/man5/ngircd.conf* %{_mandir}/man8/ngircd.8* %{_tmpfilesdir}/ngircd.conf +%{_sysusersdir}/ngircd.conf %changelog +* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 27-5 +- Add sysusers.d config file to allow rpm to create users/groups automatically + * Fri Jan 17 2025 Fedora Release Engineering - 27-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From a5694fcb74cd35fe24f0e74c7dd836f556736fd2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 22:50:08 +0000 Subject: [PATCH 19/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- ngircd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ngircd.spec b/ngircd.spec index 6bfc9ef..acb4468 100644 --- a/ngircd.spec +++ b/ngircd.spec @@ -1,6 +1,6 @@ Name: ngircd Version: 27 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Next Generation IRC Daemon # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -99,6 +99,9 @@ make check %{_sysusersdir}/ngircd.conf %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 27-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 27-5 - Add sysusers.d config file to allow rpm to create users/groups automatically