Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/telnet.git#2bfc7496c22dbc863b9ecffe8ff448f293558b79
This commit is contained in:
DistroBaker 2021-02-03 05:33:40 +00:00
parent 3afebab2e5
commit 5cacc99aa7

View File

@ -3,7 +3,7 @@
Summary: The client program for the Telnet remote login protocol Summary: The client program for the Telnet remote login protocol
Name: telnet Name: telnet
Version: 0.17 Version: 0.17
Release: 82%{?dist} Release: 83%{?dist}
Epoch: 1 Epoch: 1
License: BSD License: BSD
Source0: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-telnet-%{version}.tar.gz Source0: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-telnet-%{version}.tar.gz
@ -43,6 +43,7 @@ Patch32: telnet-log-address.patch
Patch33: telnet-0.17-overflow-exploit.patch Patch33: telnet-0.17-overflow-exploit.patch
Patch34: telnet-0.17-pty-retry.patch Patch34: telnet-0.17-pty-retry.patch
BuildRequires: make
BuildRequires: ncurses-devel systemd gcc gcc-c++ BuildRequires: ncurses-devel systemd gcc gcc-c++
BuildRequires: perl-interpreter BuildRequires: perl-interpreter
@ -130,15 +131,14 @@ perl -pi -e 's|install[ ]+-s|install|g' \
%install %install
mkdir -p ${RPM_BUILD_ROOT}%{_bindir} mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
mkdir -p ${RPM_BUILD_ROOT}%{_sbindir} mkdir -p ${RPM_BUILD_ROOT}%{_sbindir}
mkdir -p ${RPM_BUILD_ROOT}%{_unitdir}
mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1
mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man5 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man5
mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8
make INSTALLROOT=${RPM_BUILD_ROOT} install make INSTALLROOT=${RPM_BUILD_ROOT} install
install -p -m644 %SOURCE5 ${RPM_BUILD_ROOT}%{_unitdir}/telnet@.service install -D -p -m644 %SOURCE5 ${RPM_BUILD_ROOT}%{_unitdir}/telnet@.service
install -p -m644 %SOURCE6 ${RPM_BUILD_ROOT}%{_unitdir}/telnet.socket install -D -p -m644 %SOURCE6 ${RPM_BUILD_ROOT}%{_unitdir}/telnet.socket
%post server %post server
%systemd_post telnet.socket %systemd_post telnet.socket
@ -151,7 +151,6 @@ install -p -m644 %SOURCE6 ${RPM_BUILD_ROOT}%{_unitdir}/telnet.socket
%files %files
%doc README %doc README
%defattr(-,root,root,-)
%{_bindir}/telnet %{_bindir}/telnet
%{_mandir}/man1/telnet.1* %{_mandir}/man1/telnet.1*
@ -163,6 +162,9 @@ install -p -m644 %SOURCE6 ${RPM_BUILD_ROOT}%{_unitdir}/telnet.socket
%{_mandir}/man8/telnetd.8* %{_mandir}/man8/telnetd.8*
%changelog %changelog
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.17-83
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Thu Nov 19 2020 Michal Ruprich <mruprich@redhat.com> - 1:0.17-82 * Thu Nov 19 2020 Michal Ruprich <mruprich@redhat.com> - 1:0.17-82
- Changing LD_FLAGS to RPM_LD_FLAGS - Changing LD_FLAGS to RPM_LD_FLAGS
- Use make_build macro and remove hard-coded gcc - Use make_build macro and remove hard-coded gcc