SPECS/ftp.spec

@@ -1,8 +1,9 @@
 Summary: The standard UNIX FTP (File Transfer Protocol) client
 Name: ftp
 Version: 0.17
-Release: 89%{?dist}
+Release: 78%{?dist}
 License: BSD with advertising
+Group: Applications/Internet
 Source0: ftp://ftp.linux.org.uk/pub/linux/Networking/netkit/netkit-ftp-%{version}.tar.gz
 URL: ftp://ftp.linux.org.uk/pub/linux/Networking/netkit
 Patch1: netkit-ftp-0.17-pre20000412.pasv-security.patch
@@ -39,12 +40,11 @@ Patch31: netkit-ftp-0.17-commands-leaks.patch
 Patch32: netkit-ftp-0.17-lsn-timeout.patch
 Patch33: netkit-ftp-0.17-getlogin.patch
 Patch34: netkit-ftp-0.17-token.patch
-Patch35: netkit-ftp-0.17-linelen-segfault.patch
+Patch35: netkit-ftp-0.17-out-of-memory.patch
-Patch36: netkit-ftp-0.17-out-of-memory.patch
+Patch36: netkit-ftp-0.17-makeargv-linelen.patch
 
 BuildRequires: glibc-devel, readline-devel, ncurses-devel
-BuildRequires: perl-interpreter, gcc
+BuildRequires: perl-interpreter
-BuildRequires: make
 
 %description
 The ftp package provides the standard UNIX command-line FTP (File
@@ -90,11 +90,11 @@ file transfers.
 %patch32 -p1 -b .lsn-timeout
 %patch33 -p1 -b .getlogin
 %patch34 -p1 -b .token
-%patch35 -p1 -b .linelen-segfault
+%patch35 -p1 -b .out-of-memory
-%patch36 -p1 -b .out-of-memory
+%patch36 -p1 -b .makeargv
 
 %build
-sh configure --with-c-compiler=%{__cc} --enable-ipv6
+sh configure --with-c-compiler=gcc --enable-ipv6
 perl -pi -e '
     s,^CC=.*$,CC=cc,;
     s,-O2,\$(RPM_OPT_FLAGS) -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64,;
@@ -104,7 +104,7 @@ perl -pi -e '
     s,^SBINDIR=.*$,SBINDIR=%{_sbindir},;
     ' MCONFIG
 
-%{make_build}
+make %{?_smp_mflags}
 
 %install
 mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
@@ -121,50 +121,15 @@ make INSTALLROOT=${RPM_BUILD_ROOT} install
 %{_mandir}/man5/netrc.*
 
 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.17-89
+* Tue Dec 11 2018 Michal Ruprich <mruprich@redhat.com> - 0.17-78
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Resolves: #1657821 - netkit ftp client buffer overflow in makeargv
-  Related: rhbz#1991688
 
-* Wed Apr 21 2021 Michal Ruprich <mruprich@redhat.com> - 0.17-88
+* Tue Nov 13 2018 Michal Ruprich <mruprich@redhat.com> - 0.17-77
-- Resolves: #1949120 - ftp put failed with 'ftp: Out of memory' when stacksize set to unlimited
+- Resolves: #1645120 - ftp put failed with 'ftp: Out of memory' when stacksize set to unlimited
 
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 0.17-87
+* Fri Aug 31 2018 Michal Ruprich <mruprich@redhat.com> - 0.17-76
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+- Resolves: #1624112 - Review annocheck distro flag failures in ftp
-
+- Fixed bogus dates in log
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.17-86
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Thu Nov 19 2020 Michal Ruprich <mruprich@redhat.com> - 0.17-85
-- Use make_build macro and remove hard-coded gcc
-- https://docs.fedoraproject.org/en-US/packaging-guidelines/#_parallel_make
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.17-84
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.17-83
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.17-82
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sun Feb 17 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.17-81
-- Rebuild for readline 8.0
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.17-80
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Tue Dec 18 2018 Michal Ruprich <mruprich@redhat.com> - 0.17-79
-- Resolves: #1624949 - netkit ftp client buffer overflow in makeargv()
-
-* Mon Jul 23 2018 Michal Ruprich <mruprich@redhat.com> - 0.17-78
-- Resolves: #1604015 - ftp: FTBFS in Fedora rawhide
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.17-77
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Mar 14 2018 Michal Ruprich <mruprich@redhat.com> - 0.17-76
-- use distribution LDFLAGS during build (#1548427) - fix by jsynacek
-- fixed bogus dates in changelog
 
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.17-75
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild