diff --git a/.gitignore b/.gitignore index 0a378f7..96c6fc6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,18 @@ -ser2net-2.5.tar.gz +ser2net-2.7.tar.gz +/ser2net-2.8-rc2.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 new file mode 100644 index 0000000..80e7a91 --- /dev/null +++ b/changelog @@ -0,0 +1,132 @@ +* 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 deleted file mode 100644 index 29106f7..0000000 --- a/ser2net-2.5-initfixes.patch +++ /dev/null @@ -1,51 +0,0 @@ -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.spec b/ser2net.spec index 3198200..9e1c3d4 100644 --- a/ser2net.spec +++ b/ser2net.spec @@ -1,19 +1,32 @@ -Name: ser2net -Summary: Proxy that allows tcp connections to serial ports -Version: 2.6 -Release: 1%{?dist} -License: GPLv2+ -Group: Applications/System -Source0: http://download.sourceforge.net/ser2net/%{name}-%{version}.tar.gz -# Filed upstream: -# http://sourceforge.net/tracker/index.php?func=detail&aid=2074265&group_id=28625&atid=393783 -Patch0: ser2net-2.5-initfixes.patch -URL: http://ser2net.sourceforge.net/ -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires(post): chkconfig -Requires(preun): chkconfig -Requires(preun): /sbin/service -Requires(postun): /sbin/service +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} %description ser2net provides a way for a user to connect from a network connection to a @@ -21,69 +34,47 @@ 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 -%setup -q -%patch0 -p1 -b .initfixes +%forgeautosetup + %build +autoreconf -f -i %configure -make %{?_smp_mflags} +%make_build + %install -rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install -mkdir -p $RPM_BUILD_ROOT%{_initrddir} -install -m0644 ser2net.conf $RPM_BUILD_ROOT%{_sysconfdir} -install ser2net.init $RPM_BUILD_ROOT%{_initrddir}/ser2net +%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 -%clean -rm -rf $RPM_BUILD_ROOT +%pre +%sysusers_create_compat %{SOURCE1} %post -/sbin/chkconfig --add ser2net +%systemd_post %{name}.service %preun -if test [ $1 = 0 ]; then - /sbin/service ser2net stop >/dev/null 2>&1 || : - /sbin/chkconfig --del ser2net -fi +%systemd_preun %{name}.service %postun -if [ "$1" -ge "1" ]; then - /sbin/service ser2net condrestart >/dev/null 2>&1 || : -fi +%systemd_postun_with_restart %{name}.service + %files -%defattr(-,root,root) -%doc COPYING ChangeLog AUTHORS README -%attr(0755,root,root) %{_initrddir}/ser2net -%config(noreplace) %{_sysconfdir}/ser2net.conf -%{_sbindir}/ser2net -%{_mandir}/man8/ser2net* +%license COPYING +%doc AUTHORS README.rst +%dir %{_sysconfdir}/%{name} +%config(noreplace) %{_sysconfdir}/%{name}/%{name}.yaml +%{_unitdir}/%{name}.service +%{_bindir}/%{name} +%{_sysusersdir}/%{name}.conf +%{_mandir}/man5/%{name}.yaml.5.gz +%{_mandir}/man8/%{name}.8.gz + %changelog -* Wed Jul 22 2009 Tom "spot" Callaway - 2.6-1 -- update to 2.6 - -* 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 +%autochangelog diff --git a/ser2net.sysusers b/ser2net.sysusers new file mode 100644 index 0000000..9e4d8f4 --- /dev/null +++ b/ser2net.sysusers @@ -0,0 +1,12 @@ +# 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 0317952..27ec084 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f53e067380ab31897923db665d044064 ser2net-2.6.tar.gz +SHA512 (ser2net-4.6.8.tar.gz) = 9ed574bd2d984d445f9022a2b7a9a957003a3f534911f2482ca161a6b9fd98e037bae43669ab895fe1f97494be2e2436959d12898a91fc19f7c153fb27e09574