diff --git a/ngircd-service.patch b/ngircd-service.patch index cc768f4..26b7938 100644 --- a/ngircd-service.patch +++ b/ngircd-service.patch @@ -1,27 +1,34 @@ -diff -up ngircd-23/contrib/ngircd.service.service ngircd-23/contrib/ngircd.service ---- ngircd-23/contrib/ngircd.service.service 2015-08-20 08:29:56.000000000 -0600 -+++ ngircd-23/contrib/ngircd.service 2015-11-17 14:34:03.116837671 -0700 -@@ -1,20 +1,16 @@ - [Unit] - Description=Next Generation IRC Daemon -+Documentation=man:ngircd(8) man:ngircd.conf(5) http://ngircd.barton.de/documentation.php.en - After=network.target +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 [Service] -Type=forking -User=irc -Group=irc --CapabilityBoundingSet=CAP_SETUID CAP_SETGID CAP_SYS_CHROOT CAP_NET_BIND_SERVICE + # Settings & limits: +-CapabilityBoundingSet=CAP_SYS_CHROOT CAP_NET_BIND_SERVICE +CapabilityBoundingSet=CAP_SETUID CAP_SETGID CAP_SYS_CHROOT CAP_NET_BIND_SERVICE CAP_KILL - PrivateTmp=yes + MemoryDenyWriteExecute=yes + NoNewPrivileges=yes PrivateDevices=yes +@@ -27,15 +24,8 @@ ProtectSystem=full - ProtectHome=true - NoNewPrivileges=true + RestrictAddressFamilies=AF_INET AF_INET6 AF_UNIX + RestrictRealtime=yes -RuntimeDirectory=ircd -RuntimeDirectoryMode=750 --ExecStart=/usr/sbin/ngircd +-# 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 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 diff --git a/ngircd.spec b/ngircd.spec index 5372593..265e424 100644 --- a/ngircd.spec +++ b/ngircd.spec @@ -1,5 +1,5 @@ Name: ngircd -Version: 23 +Version: 26 Release: 1%{?dist} Summary: Next Generation IRC Daemon Group: System Environment/Daemons @@ -84,7 +84,7 @@ 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 +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 @@ -151,6 +151,9 @@ fi %endif %changelog +* Sun Jun 28 2020 Kevin Fenzi - 26-1 +- Update to 26 + * Tue Nov 17 2015 Orion Poplawski 23-1 - Update to 23 - Update service file from upstream diff --git a/sources b/sources index eb229ef..bf5e38e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a58e0075fea60176fa7df092ca7e2c6a ngircd-23.tar.gz +SHA512 (ngircd-26.tar.gz) = 2502baf83e3bfca3e6b83c22fe660fee24732ee875b32a7071a489a8babcc08124738142215b55d4f9bd4e94bec3f2a41889ab18324f772b1674b02883cbfb91