diff --git a/newscache-glibc.patch b/newscache-glibc.patch deleted file mode 100644 index f8b8f0b..0000000 --- a/newscache-glibc.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/too/deep/socket++-1.12.13/socket++/fork.cpp b/too/deep/socket++-1.12.13/socket++/fork.cpp -index fd8b8a2..fe997e4 100644 ---- a/too/deep/socket++-1.12.13/socket++/fork.cpp -+++ b/too/deep/socket++-1.12.13/socket++/fork.cpp -@@ -122,13 +122,13 @@ void Fork::ForkProcess::infanticide_reason (pid_t pid, int status) - - if (WIFSTOPPED (status)) - cerr << "process " << pid << " gets " -- << SYS_SIGLIST [WSTOPSIG (status)] << endl; -+ << strsignal (WSTOPSIG (status)) << endl; - else if (WIFEXITED (status)) - cerr << "process " << pid << " exited with status " - << WEXITSTATUS (status) << endl; - else if (WIFSIGNALED (status)) - cerr << "process " << pid << " got " -- << SYS_SIGLIST [WTERMSIG (status)] << endl; -+ << strsignal (WTERMSIG (status)) << endl; - } - - void Fork::ForkProcess::reaper_nohang (int signo) -diff --git a/too/deep/socket++-1.12.13/socket++/sockstream.cpp b/too/deep/socket++-1.12.13/socket++/sockstream.cpp -index cf8fa15..1f4a107 100644 ---- a/too/deep/socket++-1.12.13/socket++/sockstream.cpp -+++ b/too/deep/socket++-1.12.13/socket++/sockstream.cpp -@@ -127,7 +127,7 @@ using namespace std; - const char* sockerr::errstr () const - { - #ifndef WIN32 -- return SYS_ERRLIST [err]; -+ return strerror (err); - #else - return 0; // TODO - #endif diff --git a/newscache.spec b/newscache.spec index 6fb3ab2..49af30b 100644 --- a/newscache.spec +++ b/newscache.spec @@ -4,10 +4,10 @@ Name: newscache Summary: Free cache server for USENET News Version: 1.2 -Release: 0.53.rc6%{?dist} -# Automatically converted from old format: GPLv2+ - review is highly recommended. -License: GPL-2.0-or-later -URL: https://github.com/hstraub/NewsCache +Release: 0.31.rc6%{?dist} +Group: System Environment/Daemons +License: GPLv2+ +URL: http://www.linuxhacker.at/newscache/ Source0: http://src.linuxhacker.at/NewsCache/%{srcnamever}.tar.gz Source1: http://src.linuxhacker.at/socket++/socket++-%{socketver}.tar.gz Source2: %{name}.init @@ -15,13 +15,11 @@ Source3: %{name}.service Patch1: newscache-1.2rc6-config.patch Patch2: newscache-1.2rc6-gcc43.patch Patch3: socket++-1.12.12-drop_doc.patch -Patch4: newscache-glibc.patch -BuildRequires: make -BuildRequires: libxcrypt-devel BuildRequires: gcc-c++ BuildRequires: libtool, texinfo, pam-devel BuildRequires: systemd-units +Requires(pre): shadow-utils Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units @@ -40,8 +38,8 @@ bandwidth consumption or the IO load caused by news clients. %setup -q -n %{srcnamever} -a 1 cp etc/newscache.conf-dist newscache.conf -%patch -P1 -p0 -%patch -P2 -p1 +%patch1 -p0 +%patch2 -p1 # to satisfy g++ >= 8.0 sed -i 's/^main/int main/' configure.in @@ -52,15 +50,9 @@ mkdir -p too/deep mv socket++-%{socketver} too/deep pushd too/deep/socket++-%{socketver} -%patch -P3 -p1 +%patch3 -p1 popd -%patch -P4 -p1 - -# Create a sysusers.d config file -cat >newscache.sysusers.conf </dev/null || groupadd -r news +getent passwd news >/dev/null || \ + useradd -r -g news -d /etc/news -s /sbin/nologin -c 'News user' news +exit 0 %post @@ -156,77 +152,9 @@ install -m0644 -D newscache.sysusers.conf %{buildroot}%{_sysusersdir}/newscache. %doc AUTHORS COPYING NEWS README THANKS TODO %doc doc/newscache*.txt etc/*-dist %{_mandir}/*/* -%{_sysusersdir}/newscache.conf %changelog -* Sat Oct 4 2025 Dmitry Butskoy - 1.2-0.53.rc6 -- update URL (#2401403) - -* Thu Jul 24 2025 Fedora Release Engineering - 1.2-0.52.rc6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 1.2-0.51.rc6 -- Add sysusers.d config file to allow rpm to create users/groups automatically - -* Sat Feb 01 2025 Björn Esser - 1.2-0.50.rc6 -- Add explicit BR: libxcrypt-devel - -* Fri Jan 17 2025 Fedora Release Engineering - 1.2-0.49.rc6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Jul 26 2024 Miroslav Suchý - 1.2-0.48.rc6 -- convert license to SPDX - -* Thu Jul 18 2024 Fedora Release Engineering - 1.2-0.47.rc6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Thu Jan 25 2024 Fedora Release Engineering - 1.2-0.46.rc6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 1.2-0.45.rc6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Jul 20 2023 Fedora Release Engineering - 1.2-0.44.rc6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jan 19 2023 Fedora Release Engineering - 1.2-0.43.rc6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Jul 22 2022 Fedora Release Engineering - 1.2-0.42.rc6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jan 20 2022 Fedora Release Engineering - 1.2-0.41.rc6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Jul 22 2021 Fedora Release Engineering - 1.2-0.40.rc6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 1.2-0.39.rc6 -- Rebuilt for updated systemd-rpm-macros - See https://pagure.io/fesco/issue/2583. - -* Tue Jan 26 2021 Fedora Release Engineering - 1.2-0.38.rc6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 1.2-0.37.rc6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Thu Jul 23 2020 Jeff Law - 1.2-0.36.rc6 -- Use strsignal and strerror rather than sys_siglist and sys_errlist - -* Wed Jan 29 2020 Fedora Release Engineering - 1.2-0.35.rc6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jul 25 2019 Fedora Release Engineering - 1.2-0.34.rc6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering - 1.2-0.33.rc6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Mon Jan 14 2019 Björn Esser - 1.2-0.32.rc6 -- Rebuilt for libcrypt.so.2 (#1666033) - * Fri Jul 13 2018 Fedora Release Engineering - 1.2-0.31.rc6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild