Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers.

.gitignore

@@ -12,3 +12,6 @@ ngircd-16.tar.gz
 /ngircd-23.tar.gz
 /ngircd-24.tar.gz
 /ngircd-25.tar.gz
+/ngircd-26.tar.gz
+/ngircd-26.1.tar.gz
+/ngircd-27.tar.gz

ngircd-configure-c99.patch

@@ -0,0 +1,42 @@
+Include <string.h> for memset in WORKING_GETADDRINFO probe.
+Otherwise, the probe always fails with compilers which do not support
+implicit function declarations.
+
+Submitted upstream: <https://github.com/ngircd/ngircd/pull/305>
+
+diff --git a/configure b/configure
+index 4435369c657b6fd6..242230bc334f7d4e 100755
+--- a/configure
++++ b/configure
+@@ -6286,6 +6286,7 @@ else
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netdb.h>
++#include <string.h>
+ 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 <sys/types.h>
+ #include <sys/socket.h>
+ #include <netdb.h>
++#include <string.h>
+ 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 <sys/types.h>
+ #include <sys/socket.h>
+ #include <netdb.h>
++#include <string.h>
+ int
+ main(int argc, char **argv)
+ {

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]

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.

ngircd.spec

@@ -1,8 +1,9 @@
 Name:           ngircd
-Version:        25
-Release:        2%{?dist}
+Version:        27
+Release:        6%{?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
@@ -15,26 +16,18 @@ 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:  libident-devel
 BuildRequires:  gnutls-devel
 BuildRequires:  pam-devel
 # Needed for tests
-BuildRequires:  expect procps-ng telnet
-%if 0%{?rhel} > 6 || 0%{?fedora}
+BuildRequires:  expect procps-ng telnet openssl
 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
 
 %description
 ngIRCd is a free open source daemon for Internet Relay Chat (IRC), 
@@ -42,21 +35,18 @@ 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 not yet in EL
-%if 0%{?fedora}
-%patch1 -p1 -b .cipher
-%endif
-%patch2 -p1 -b .service
+%autosetup -p1
+
+# Create a sysusers.d config file
+cat >ngircd.sysusers.conf <<EOF
+u ngircd - 'Next Generation IRC Daemon' /tmp/ -
+EOF
 
 %build
 %configure \
 	--with-syslog \
 	--with-zlib \
 	--with-epoll \
-	--with-zeroconf \
-	--with-ident \
 	--with-gnutls \
 	--with-pam \
 	--enable-ipv6
@@ -68,67 +58,31 @@ 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
 install -D -m 660 ./contrib/Debian/ngircd.pam %{buildroot}%{_sysconfdir}/pam.d/ngircd
 
 touch  %{buildroot}%{_sysconfdir}/ngircd.motd
-rm %{buildroot}%{_docdir}/ngircd/INSTALL
-%if 0%{?rhel} > 6 || 0%{?fedora}
+rm %{buildroot}%{_docdir}/ngircd/INSTALL.md
 mkdir -p %{buildroot}%{_tmpfilesdir}
 echo d /run/ngircd 0750 ngircd ngircd - > %{buildroot}%{_tmpfilesdir}/ngircd.conf
-%else
-mkdir -p %{buildroot}%{_localstatedir}/run/ngircd
-%endif
+
+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
-%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}
@@ -136,22 +90,96 @@ 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
+%{_sysusersdir}/ngircd.conf
 
 %changelog
+* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 27-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 27-5
+- Add sysusers.d config file to allow rpm to create users/groups automatically
+
+* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 27-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Fri Jul 26 2024 Miroslav Suchý <msuchy@redhat.com> - 27-3
+- convert license to SPDX
+
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 27-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Sat May 11 2024 Kevin Fenzi <kevin@scrye.com> - 27-1
+- Update to 27. Fixes rhbz#2274888
+- Clean up and drop old conditionals.
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 26.1-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 26.1-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 26.1-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Feb 02 2023 Florian Weimer <fweimer@redhat.com> - 26.1-8
+- Port configure script to C99
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 26.1-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 26.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 26.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 26.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 26.1-3
+- Rebuilt for updated systemd-rpm-macros
+  See https://pagure.io/fesco/issue/2583.
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 26.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Sun Jan 03 2021 Kevin Fenzi <kevin@scrye.com> - 26.1-1
+- Update to 26.1. rhbz#1912027
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 26-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sun Jun 28 2020 Kevin Fenzi <kevin@scrye.com> - 26-3
+- Fix arch conditional for tests. :( 
+
+* Sun Jun 28 2020 Kevin Fenzi <kevin@scrye.com> - 26-2
+- Drop gcc10 workaround (fixed upstream)
+- Disable tests on i686 for now as they seem sporadically broken. ( https://github.com/ngircd/ngircd/issues/280 )
+
+* Wed Jun 24 2020 Kevin Fenzi <kevin@scrye.com> - 26-1
+- Update to 26. Fixes bug 1849314
+
+* Sat May 16 2020 Kevin Fenzi <kevin@scrye.com> - 25-7
+- rhel8 also has system cypher support, so add that before initial epel8 package.
+
+* Sun Mar 29 2020 Kevin Fenzi <kevin@scrye.com> - 25-6
+- Build with -fcommon for now until upstream gcc10 fixes land. Fixes FTBFS bug #1799688
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 25-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Tue Jan 14 2020 Orion Poplawski <orion@nwra.com> - 25-4
+- Build without libident (bz#1790478)
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 25-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 25-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (ngircd-25.tar.gz) = 0c96e97da312fe86c50007a72db03f85b9f79df053806f50badd07c7ca8e8bddd99adb478eab8be9630330707d7aa578b5d0bd3017b59bf4515319a64c29ea6c
+SHA512 (ngircd-27.tar.gz) = 54ad38b3f5a9a899106c1163f53f45c5b021f6bad3ea3b7cb9b06e619434d76416d494b046508f588b334daba5b39a451bbf28e6196ef8fffa0408e395ea3839