diff --git a/.gitignore b/.gitignore index 96c6fc6..a403076 100644 --- a/.gitignore +++ b/.gitignore @@ -3,16 +3,3 @@ ser2net-2.7.tar.gz /ser2net-2.8.tar.gz /ser2net-2.9.1.tar.gz /ser2net-3.5.tar.gz -/ser2net-4.3.12.tar.gz -/ser2net-4.3.13.tar.gz -/ser2net-4.4.0.tar.gz -/ser2net-4.5.0.tar.gz -/ser2net-4.5.1.tar.gz -/ser2net-4.6.0.tar.gz -/ser2net-4.6.1.tar.gz -/ser2net-4.6.2.tar.gz -/ser2net-4.6.4.tar.gz -/ser2net-4.6.5.tar.gz -/ser2net-4.6.6.tar.gz -/ser2net-4.6.7.tar.gz -/ser2net-4.6.8.tar.gz diff --git a/changelog b/changelog deleted file mode 100644 index 80e7a91..0000000 --- a/changelog +++ /dev/null @@ -1,132 +0,0 @@ -* Sat Jan 21 2023 Fedora Release Engineering - 3.5-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 3.5-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 3.5-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 3.5-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 3.5-9 -- Rebuilt for updated systemd-rpm-macros - See https://pagure.io/fesco/issue/2583. - -* Wed Jan 27 2021 Fedora Release Engineering - 3.5-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 3.5-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Thu Jan 30 2020 Fedora Release Engineering - 3.5-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Jul 26 2019 Fedora Release Engineering - 3.5-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sat Feb 02 2019 Fedora Release Engineering - 3.5-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 3.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 3.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jan 18 2018 Tom Callaway - 3.5-1 -- update to 3.5 - -* Thu Aug 03 2017 Fedora Release Engineering - 2.9.1-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 2.9.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 2.9.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Feb 04 2016 Fedora Release Engineering - 2.9.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 2.9.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Thu Aug 21 2014 Kevin Fenzi - 2.9.1-4 -- Rebuild for rpm bug 1131960 - -* Mon Aug 18 2014 Fedora Release Engineering - 2.9.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 2.9.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu Aug 8 2013 Tom Callaway - 2.9.1-1 -- update to 2.9.1 - -* Sun Aug 04 2013 Fedora Release Engineering - 2.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Mar 1 2013 Tom Callaway - 2.8-1 -- update to 2.8 final - -* Thu Feb 14 2013 Fedora Release Engineering - 2.8-0.4.rc2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Thu Aug 23 2012 Tom Callaway - 2.8-0.3.rc2 -- update scriptlets for new systemd macros - -* Sat Jul 21 2012 Fedora Release Engineering - 2.8-0.2.rc2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Tue Jun 26 2012 Tom Callaway - 2.8-0.1.rc2 -- 2.8-rc2 - -* Sat Jan 14 2012 Fedora Release Engineering - 2.7-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Fri May 06 2011 Tom Callaway - 2.7-4 -- fixed scriptlets - -* Wed Feb 09 2011 Tom Callaway - 2.7-3 -- systemd enablement -- rawhide spec cleanup - -* Wed Feb 09 2011 Fedora Release Engineering - 2.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Thu Nov 5 2009 Tom "spot" Callaway - 2.7-1 -- Update to 2.7 - -* Sun Jul 26 2009 Fedora Release Engineering - 2.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Jul 22 2009 Tom "spot" Callaway - 2.6-1 -- update to 2.6 - -* Wed Feb 25 2009 Fedora Release Engineering - 2.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Mon Aug 25 2008 Tom "spot" Callaway - 2.5-1 -- update to 2.5 -- fix initscript to not be on by default -- add try-restart - -* Tue Feb 19 2008 Fedora Release Engineering - 2.4-2.1 -- Autorebuild for GCC 4.3 - -* Mon Aug 27 2007 Tom "spot" Callaway 2.4-2 -- rebuild for BuildID - -* Thu Aug 2 2007 Tom "spot" Callaway 2.4-1 -- bump to 2.4 - -* Wed Oct 18 2006 Tom "spot" Callaway 2.3-3 -- fix typo - -* Wed Oct 4 2006 Tom "spot" Callaway 2.3-2 -- fix initscript handling - -* Fri Jul 28 2006 Tom "spot" Callaway 2.3-1 -- Initial package for Fedora Extras diff --git a/ser2net-2.5-initfixes.patch b/ser2net-2.5-initfixes.patch new file mode 100644 index 0000000..29106f7 --- /dev/null +++ b/ser2net-2.5-initfixes.patch @@ -0,0 +1,51 @@ +diff -up ser2net-2.5/ser2net.init.addreload ser2net-2.5/ser2net.init +--- ser2net-2.5/ser2net.init.addreload 2001-10-05 20:42:01.000000000 -0400 ++++ ser2net-2.5/ser2net.init 2008-08-25 15:53:50.000000000 -0400 +@@ -1,7 +1,7 @@ + #!/bin/sh + # Startup script for ser2ner + # +-# chkconfig: 2345 95 20 ++# chkconfig: - 95 20 + # description: Make serial ports available to network via TCP/IP. + + # Source function library. +@@ -33,6 +33,17 @@ stop() { + return 0 + } + ++reload() { ++ echo -n $"Reloading ser2net: " ++ if [ -n "`pidfileofproc ser2net`" ] ; then ++ killproc ser2net -HUP ++ else ++ failure $"Reloading ser2net" ++ fi ++ RETVAL=$? ++ echo ++} ++ + case "$1" in + start) + start +@@ -49,7 +60,10 @@ case "$1" in + stop + start + ;; +- condrestart) ++ reload) ++ reload ++ ;; ++ condrestart|try-restart) + if test "x`pidof ser2net`" != x; then + stop + start +@@ -57,7 +71,7 @@ case "$1" in + ;; + + *) +- echo "Usage: ser2net {start|stop|restart|condrestart|status}" ++ echo "Usage: ser2net {start|stop|restart|reload|condrestart|try-restart|status}" + exit 1 + + esac diff --git a/ser2net.service b/ser2net.service new file mode 100644 index 0000000..fcf054e --- /dev/null +++ b/ser2net.service @@ -0,0 +1,11 @@ +[Unit] +Description=Proxy that allows tcp connections to serial ports +After=syslog.target network.target + +[Service] +Type=forking +ExecStart=/usr/sbin/ser2net + +[Install] +WantedBy=multi-user.target + diff --git a/ser2net.spec b/ser2net.spec index 9e1c3d4..67628ed 100644 --- a/ser2net.spec +++ b/ser2net.spec @@ -1,32 +1,18 @@ -Version: 4.6.8 - -%global forgeurl https://github.com/cminyard/ser2net -%forgemeta - -Name: ser2net -Release: %autorelease -Summary: Proxy that allows TCP/UDP to serial port connections - -License: GPL-2.0-only -URL: %{forgeurl} -Source0: %{forgesource} -Source1: %{name}.sysusers - -BuildRequires: gcc-c++ -BuildRequires: libtool -BuildRequires: make -BuildRequires: pkgconfig(libgensio) -BuildRequires: pkgconfig(libgensioosh) -BuildRequires: pkgconfig(libgensiomdns) -# EL9 does not provide pkgconfig(pam) yet -%if 0%{?el9} -BuildRequires: pam-devel -%else -BuildRequires: pkgconfig(pam) -%endif -BuildRequires: pkgconfig(yaml-0.1) -BuildRequires: systemd-rpm-macros -%{?sysusers_requires_compat} +Name: ser2net +Summary: Proxy that allows tcp connections to serial ports +Version: 3.5 +Release: 11%{?dist} +License: GPLv2+ +Source0: http://download.sourceforge.net/ser2net/%{name}-%{version}.tar.gz +Source1: %{name}.service +URL: http://ser2net.sourceforge.net/ +BuildRequires: make +BuildRequires: gcc +BuildRequires: systemd-units +Requires(post): systemd-sysv +Requires(post): systemd-units +Requires(preun): systemd-units +Requires(postun): systemd-units %description ser2net provides a way for a user to connect from a network connection to a @@ -34,47 +20,170 @@ serial port. It provides all the serial port setup, a configuration file to configure the ports, a control login for modifying port parameters, monitoring ports, and controlling ports. - %prep -%forgeautosetup - +%setup -q -n %{name}-%{version} %build -autoreconf -f -i %configure -%make_build - +make %{?_smp_mflags} %install -%make_install -install -Dpm0644 %{name}.yaml %{buildroot}%{_sysconfdir}/%{name}/%{name}.yaml -install -Dpm0644 %{name}.service %{buildroot}%{_unitdir}/%{name}.service -install -Dpm0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/%{name}.conf - -%pre -%sysusers_create_compat %{SOURCE1} +make DESTDIR=%{buildroot} install +mkdir -p %{buildroot}%{_sysconfdir} +install -m0644 ser2net.conf %{buildroot}%{_sysconfdir} +mkdir -p %{buildroot}%{_unitdir} +install %{SOURCE1} %{buildroot}%{_unitdir} %post -%systemd_post %{name}.service +%systemd_post ser2net.service %preun -%systemd_preun %{name}.service +%systemd_preun ser2net.service %postun -%systemd_postun_with_restart %{name}.service +%systemd_postun_with_restart ser2net.service +%triggerun -- ser2net < 2.7-3 +# Save the current service runlevel info +# User must manually run systemd-sysv-convert --apply ser2net +# to migrate them to systemd targets +/usr/bin/systemd-sysv-convert --save ser2net >/dev/null 2>&1 ||: + +# Run these because the SysV package being removed won't do them +/sbin/chkconfig --del ser2net >/dev/null 2>&1 || : +/bin/systemctl try-restart ser2net.service >/dev/null 2>&1 || : %files -%license COPYING -%doc AUTHORS README.rst -%dir %{_sysconfdir}/%{name} -%config(noreplace) %{_sysconfdir}/%{name}/%{name}.yaml +%doc COPYING ChangeLog AUTHORS README +%config(noreplace) %{_sysconfdir}/%{name}.conf %{_unitdir}/%{name}.service -%{_bindir}/%{name} -%{_sysusersdir}/%{name}.conf -%{_mandir}/man5/%{name}.yaml.5.gz -%{_mandir}/man8/%{name}.8.gz - +%{_sbindir}/%{name} +%{_mandir}/man8/%{name}* %changelog -%autochangelog +* Sat Jan 22 2022 Fedora Release Engineering - 3.5-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 3.5-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 3.5-9 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + +* Wed Jan 27 2021 Fedora Release Engineering - 3.5-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 3.5-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Thu Jan 30 2020 Fedora Release Engineering - 3.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Jul 26 2019 Fedora Release Engineering - 3.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sat Feb 02 2019 Fedora Release Engineering - 3.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 3.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 3.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Jan 18 2018 Tom Callaway - 3.5-1 +- update to 3.5 + +* Thu Aug 03 2017 Fedora Release Engineering - 2.9.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 2.9.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 2.9.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Feb 04 2016 Fedora Release Engineering - 2.9.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 2.9.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Thu Aug 21 2014 Kevin Fenzi - 2.9.1-4 +- Rebuild for rpm bug 1131960 + +* Mon Aug 18 2014 Fedora Release Engineering - 2.9.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 2.9.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu Aug 8 2013 Tom Callaway - 2.9.1-1 +- update to 2.9.1 + +* Sun Aug 04 2013 Fedora Release Engineering - 2.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Mar 1 2013 Tom Callaway - 2.8-1 +- update to 2.8 final + +* Thu Feb 14 2013 Fedora Release Engineering - 2.8-0.4.rc2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Aug 23 2012 Tom Callaway - 2.8-0.3.rc2 +- update scriptlets for new systemd macros + +* Sat Jul 21 2012 Fedora Release Engineering - 2.8-0.2.rc2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Jun 26 2012 Tom Callaway - 2.8-0.1.rc2 +- 2.8-rc2 + +* Sat Jan 14 2012 Fedora Release Engineering - 2.7-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Fri May 06 2011 Tom Callaway - 2.7-4 +- fixed scriptlets + +* Wed Feb 09 2011 Tom Callaway - 2.7-3 +- systemd enablement +- rawhide spec cleanup + +* Wed Feb 09 2011 Fedora Release Engineering - 2.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu Nov 5 2009 Tom "spot" Callaway - 2.7-1 +- Update to 2.7 + +* Sun Jul 26 2009 Fedora Release Engineering - 2.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Jul 22 2009 Tom "spot" Callaway - 2.6-1 +- update to 2.6 + +* Wed Feb 25 2009 Fedora Release Engineering - 2.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Aug 25 2008 Tom "spot" Callaway - 2.5-1 +- update to 2.5 +- fix initscript to not be on by default +- add try-restart + +* Tue Feb 19 2008 Fedora Release Engineering - 2.4-2.1 +- Autorebuild for GCC 4.3 + +* Mon Aug 27 2007 Tom "spot" Callaway 2.4-2 +- rebuild for BuildID + +* Thu Aug 2 2007 Tom "spot" Callaway 2.4-1 +- bump to 2.4 + +* Wed Oct 18 2006 Tom "spot" Callaway 2.3-3 +- fix typo + +* Wed Oct 4 2006 Tom "spot" Callaway 2.3-2 +- fix initscript handling + +* Fri Jul 28 2006 Tom "spot" Callaway 2.3-1 +- Initial package for Fedora Extras diff --git a/ser2net.sysusers b/ser2net.sysusers deleted file mode 100644 index 9e4d8f4..0000000 --- a/ser2net.sysusers +++ /dev/null @@ -1,12 +0,0 @@ -# sysuser for ser2net -# Group memberships: -# - `dialout` for access to serial devices -# - `lock` for ability to write UUCP lockfiles to /run/lock/lockdev - -# We explicitly set up the user first, then add to groups. -# RPM uses the %add_sysuser RPM macro to compute the correct Provides, which -# does not support implicitly created users in `m` lines of sysusers files. - -u ser2net - "Serial to network proxy" -m ser2net dialout -m ser2net lock diff --git a/sources b/sources index 27ec084..be6530b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ser2net-4.6.8.tar.gz) = 9ed574bd2d984d445f9022a2b7a9a957003a3f534911f2482ca161a6b9fd98e037bae43669ab895fe1f97494be2e2436959d12898a91fc19f7c153fb27e09574 +SHA512 (ser2net-3.5.tar.gz) = 35de533ff9b1538541930c5903f7018e1dbe123d4f6dd1ebd35b3bc2ec24618846d9696c759509dedfc00b778816aa31a2d180e7c158dd8e4e4192c7890aa686