diff --git a/ipxripd-0.8-printf.patch b/ipxripd-0.8-printf.patch deleted file mode 100644 index 7c1c49d..0000000 --- a/ipxripd-0.8-printf.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nrbu ipxripd-0.8/ipxsap.c ipxripd-0.8-OK/ipxsap.c ---- ipxripd-0.8/ipxsap.c 2001-07-01 01:07:34.000000000 +0400 -+++ ipxripd-0.8-OK/ipxsap.c 2013-12-03 18:50:48.506149763 +0400 -@@ -230,7 +230,7 @@ - name[IPX_SAP_SERVER_NAME_LEN] = 0; - len = strlen(name); - memset(name + len, ' ', IPX_SAP_SERVER_NAME_LEN - len); -- fprintf(file, name); -+ fprintf(file, "%s", name); - } - - static void diff --git a/ipxripd-0.8-signal.patch b/ipxripd-0.8-signal.patch deleted file mode 100644 index b374b99..0000000 --- a/ipxripd-0.8-signal.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -Nrbu ipxripd-0.8/ipxd.c ipxripd-0.8-OK/ipxd.c ---- ipxripd-0.8/ipxd.c 2025-01-23 18:25:26.988259036 +0300 -+++ ipxripd-0.8-OK/ipxd.c 2025-01-23 18:28:44.217771305 +0300 -@@ -72,14 +72,14 @@ - } - - static void --int_handler() -+int_handler(int signum) - { - signal(SIGINT,int_handler); - dump_request=1; - } - - static void --timer_handler() -+timer_handler(int signum) - { - signal(SIGALRM,timer_handler); - timer_request=1; -@@ -87,14 +87,14 @@ - } - - static void --terminate_handler() -+terminate_handler(int signum) - { - signal(SIGTERM,terminate_handler); - terminate=1; - } - - static void --hup_handler() -+hup_handler(int signum) - { - signal(SIGHUP,hup_handler); - scan_ticks_request=1; diff --git a/ipxripd-0.8-stdint.patch b/ipxripd-0.8-stdint.patch deleted file mode 100644 index 2e8b7c2..0000000 --- a/ipxripd-0.8-stdint.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -Nrbu ipxripd-0.8/ipxutil.h ipxripd-0.8-OK/ipxutil.h ---- ipxripd-0.8/ipxutil.h 2016-08-18 19:03:12.984841963 +0300 -+++ ipxripd-0.8-OK/ipxutil.h 2016-08-18 19:02:35.036842017 +0300 -@@ -26,6 +26,7 @@ - - #include - #include -+#include - - #define IPX_MAX_ERROR (255) - #define IPX_THIS_NET (0) -@@ -35,11 +36,11 @@ - #define IPX_USER_PTYPE (0) - #define IPX_IS_INTERNAL (1) - --typedef unsigned char IPXNode[6]; --typedef unsigned long int IPXNet; --typedef unsigned short int IPXPort; --typedef unsigned short int hop_t; --typedef unsigned short int tick_t; -+typedef uint8_t IPXNode[6]; -+typedef uint32_t IPXNet; -+typedef uint16_t IPXPort; -+typedef uint16_t hop_t; -+typedef uint16_t tick_t; - - void ipx_print_node(IPXNode node); - void ipx_print_network(IPXNet net); diff --git a/ipxripd.service b/ipxripd.service deleted file mode 100644 index 8652dc0..0000000 --- a/ipxripd.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=IPX RIP and SAP daemon -After=syslog.target network.target - -[Service] -Type=forking -ExecStart=/usr/sbin/ipxd - -[Install] -WantedBy=multi-user.target diff --git a/ipxripd.spec b/ipxripd.spec index b3a28f0..fbf66c9 100644 --- a/ipxripd.spec +++ b/ipxripd.spec @@ -1,26 +1,20 @@ Summary: IPX RIP/SAP daemon - routing for IPX networks Name: ipxripd Version: 0.8 -Release: 43%{?dist} -# Automatically converted from old format: GPLv2+ - review is highly recommended. -License: GPL-2.0-or-later +Release: 7%{?dist} +Group: System Environment/Daemons +License: GPLv2+ URL: ftp://ftp.ibiblio.org/pub/Linux/system/filesystems/ncpfs/ Source0: ftp://ftp.ibiblio.org/pub/Linux/system/filesystems/ncpfs/ipxripd-%{version}.tar.gz Source1: ipxripd.init -Source2: ipxripd.service Patch0: ipxripd-0.8-glibc2.1.patch Patch1: ipxripd-0.7-gcc3.patch Patch2: ipxripd-0.7-kernel2.6.patch -Patch3: ipxripd-0.8-printf.patch -Patch4: ipxripd-0.8-stdint.patch -Patch5: ipxripd-0.8-signal.patch -BuildRequires: gcc -BuildRequires: systemd-units -BuildRequires: make +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires(post): systemd-units -Requires(preun): systemd-units -Requires(postun): systemd-units +Requires(post): /sbin/chkconfig +Requires(preun): /sbin/chkconfig, /sbin/service +Requires(postun): /sbin/service %description @@ -31,12 +25,9 @@ It automagically builds and updates IPX routing table in the Linux kernel. %prep %setup -q -%patch 0 -p1 -%patch 1 -p1 -%patch 2 -p1 -%patch 3 -p1 -%patch 4 -p1 -%patch 5 -p1 +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build @@ -54,145 +45,41 @@ install -d $RPM_BUILD_ROOT%{_mandir}/man5 install -p ipxd.8 $RPM_BUILD_ROOT%{_mandir}/man8 install -p ipx_ticks.5 $RPM_BUILD_ROOT%{_mandir}/man5 -#install -d $RPM_BUILD_ROOT%{_initrddir} -#install -p -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/ipxd - -install -d $RPM_BUILD_ROOT%{_unitdir} -install -p -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_unitdir}/ipxd.service +install -d $RPM_BUILD_ROOT%{_initrddir} +install -p -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/ipxd %post -%systemd_post ipxd.service + +/sbin/chkconfig --add ipxd %preun -%systemd_preun ipxd.service +if [ $1 = 0 ]; then + /sbin/service ipxd stop >/dev/null 2>&1 + /sbin/chkconfig --del ipxd +fi %postun -%systemd_postun_with_restart ipxd.service +if [ $1 != 0 ]; then + /sbin/service ipxd condrestart >/dev/null 2>&1 +fi +%clean +rm -rf $RPM_BUILD_ROOT %files +%defattr(-,root,root,-) %doc COPYING README ipx_ticks ipxripd-*.lsm %{_sbindir}/* -#%{_initrddir}/* -%{_unitdir}/* +%{_initrddir}/* %{_mandir}/*/* %changelog -* Thu Jul 24 2025 Fedora Release Engineering - 0.8-43 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Thu Jan 23 2025 Dmitry Butskoy - 0.8-42 -- Fix signal handler prototype for compiling with C23 standard (#2340660) - -* Fri Jan 17 2025 Fedora Release Engineering - 0.8-41 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Jul 26 2024 Miroslav Suchý - 0.8-40 -- convert license to SPDX - -* Thu Jul 18 2024 Fedora Release Engineering - 0.8-39 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Wed Jan 24 2024 Fedora Release Engineering - 0.8-38 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jan 20 2024 Fedora Release Engineering - 0.8-37 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Jul 20 2023 Fedora Release Engineering - 0.8-36 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jan 19 2023 Fedora Release Engineering - 0.8-35 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Jul 21 2022 Fedora Release Engineering - 0.8-34 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jan 20 2022 Fedora Release Engineering - 0.8-33 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Jul 22 2021 Fedora Release Engineering - 0.8-32 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 0.8-31 -- Rebuilt for updated systemd-rpm-macros - See https://pagure.io/fesco/issue/2583. - -* Tue Jan 26 2021 Fedora Release Engineering - 0.8-30 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 0.8-29 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jan 29 2020 Fedora Release Engineering - 0.8-28 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jul 25 2019 Fedora Release Engineering - 0.8-27 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering - 0.8-26 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 0.8-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 0.8-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Aug 02 2017 Fedora Release Engineering - 0.8-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 0.8-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 0.8-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Aug 18 2016 Dmitry Butskoy - 0.8-20 -- Fix for 64-bit platforms (#1367852) - -* Thu Feb 04 2016 Fedora Release Engineering - 0.8-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 0.8-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat Aug 16 2014 Fedora Release Engineering - 0.8-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 0.8-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue Dec 3 2013 Dmitry Butskoy - 0.8-15 -- fix format-security issue (#1037134) - -* Sat Aug 03 2013 Fedora Release Engineering - 0.8-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Feb 14 2013 Fedora Release Engineering - 0.8-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Mon Sep 24 2012 Dmitry Butskoy - 0.8-12 -- new sustemd-rpm macros (#850169) - -* Thu Jul 19 2012 Fedora Release Engineering - 0.8-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Fri Jan 13 2012 Fedora Release Engineering - 0.8-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Fri Jul 15 2011 Dmitry Butskoy - 0.8-9 -- Migration from SysV to Systemd init system (#662724) - -* Wed Feb 09 2011 Fedora Release Engineering - 0.8-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - * Fri Jul 24 2009 Fedora Release Engineering - 0.8-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild