diff --git a/.cvsignore b/.cvsignore index e3537a0..e6fb772 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -netkit-tftp-0.17.tar.bz2 -tftp-hpa-0.17.tar.bz2 +tftp-hpa-0.28.tar.bz2 diff --git a/sources b/sources index eafc8a3..3cb5138 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -dcc9f871b0783d26a13a48d15f03b820 netkit-tftp-0.17.tar.bz2 -dbd759d9bf70bcda04bfe4486b254e2d tftp-hpa-0.17.tar.bz2 +a3f2847c5d124c336a1bc3a89cd29b6e tftp-hpa-0.28.tar.bz2 diff --git a/tftp.spec b/tftp.spec index 54345f2..2d10f8a 100644 --- a/tftp.spec +++ b/tftp.spec @@ -1,19 +1,13 @@ -%define tftp_version 0.17 -%define tftp_hpa_version 0.17 +%define tftp_hpa_version 0.28 Summary: The client for the Trivial File Transfer Protocol (TFTP). Name: tftp -Version: %{tftp_version} -Release: 14 +Version: %{tftp_hpa_version} +Release: 2 Copyright: BSD Group: Applications/Internet -Source0: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-tftp-%{tftp_version}.tar.bz2 -Source1: http://www.kernel.org/pub/software/network/tftp/tftp-hpa-%{tftp_hpa_version}.tar.bz2 +Source0: http://www.kernel.org/pub/software/network/tftp/tftp-hpa-%{tftp_hpa_version}.tar.bz2 Source2: tftp-xinetd -Patch0: tftp-netkit-tftp-0.17-segsize.patch -Patch1: tftp-hpa-0.14-tftpd-ushort.patch -Patch2: tftp-hpa-0.17-tftpd-logging.patch -Patch3: tftp-hpa-0.17-tftpd-manpage.patch BuildRoot: %{_tmppath}/%{name}-root %description @@ -37,28 +31,12 @@ enabled unless it is expressly needed. The TFTP server is run from /etc/xinetd.d/tftp, and is disabled by default on Red Hat Linux systems. %prep -%setup -q -n netkit-tftp-%{version} -a 1 -%patch0 -p1 -b .bug29529 -cd tftp-hpa-%{tftp_hpa_version} -%patch1 -p2 -b .bug23725 -%patch2 -p2 -b .logging -%patch3 -p2 -b .oldman -cd .. +%setup -q -n tftp-hpa-%{version} %build -sh configure --with-c-compiler=gcc -perl -pi -e ' - s,^CC=.*$,CC=cc,; - s,^BINDIR=.*$,BINDIR=%{_bindir},; - s,^MANDIR=.*$,MANDIR=%{_mandir},; - s,^SBINDIR=.*$,SBINDIR=%{_sbindir},; - ' MCONFIG -make - -cd tftp-hpa-%{tftp_hpa_version} %configure -make -C tftpd +make %{?_smp_mflags} %install rm -rf ${RPM_BUILD_ROOT} @@ -66,8 +44,7 @@ mkdir -p ${RPM_BUILD_ROOT}%{_bindir} mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man{1,8} mkdir -p ${RPM_BUILD_ROOT}%{_sbindir} -make INSTALLROOT=${RPM_BUILD_ROOT} install -make -C tftp-hpa-%{tftp_hpa_version}/tftpd INSTALLROOT=${RPM_BUILD_ROOT} \ +make INSTALLROOT=${RPM_BUILD_ROOT} \ SBINDIR=%{_sbindir} MANDIR=%{_mandir} \ install install -m755 -d ${RPM_BUILD_ROOT}%{_sysconfdir}/xinetd.d/ @@ -96,6 +73,15 @@ rm -rf ${RPM_BUILD_ROOT} %{_mandir}/man8/* %changelog +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Tue Dec 18 2001 Elliot Lee 0.17-15 +- Add patch4: netkit-tftp-0.17-defaultport.patch for bug #57562 +- Update to tftp-hpa-0.28 (bug #56131) +- Remove include/arpa/tftp.h to fix #57259 +- Add resource limits in tftp-xinetd (#56722) + * Sun Jun 24 2001 Elliot Lee - Bump release + rebuild.