- updated to 0.8.0; added patch to remove unnecessary -lnsl

diff --git a/atftp-clk.patch b/atftp-clk.patch
deleted file mode 100644 (file)
index 0b920d0..0000000
--- a/atftp-clk.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- atftp-0.7/stats.c~ 2002-03-27 04:02:12.000000000 +0100
-+++ atftp-0.7/stats.c  2009-02-24 08:23:43.131044573 +0100
-@@ -22,6 +22,10 @@
- #include "stats.h"
- #include "logger.h"
- 
-+#ifndef CLK_TCK
-+#define CLK_TCK CLOCKS_PER_SEC
-+#endif
-+
- /*
-  * That structure allows global statistic to be collected. See stats.h.
-  */

diff --git a/atftp-link.patch b/atftp-link.patch
new file mode 100644 (file)
index 0000000..cef5a3e
--- /dev/null
+++ b/atftp-link.patch
@@ -0,0 +1,20 @@
+--- atftp-0.8.0/configure.ac.orig      2023-12-25 17:03:51.624746674 +0100
++++ atftp-0.8.0/configure.ac   2023-12-25 17:31:38.212384661 +0100
+@@ -149,7 +149,7 @@ if test x$libwrap = xtrue; then
+    dnl test here. We automatically link against nsl since libwrap is not
+    dnl already linked with it on all systems.
+    orig_LIBS="$LIBS"
+-   LIBS="-lnsl -lwrap"
++   LIBS="-lwrap"
+    AC_MSG_CHECKING([for hosts_ctl in -lwrap])
+    AC_TRY_LINK([
+         #include <tcpd.h>
+@@ -158,7 +158,7 @@ if test x$libwrap = xtrue; then
+         ],
+       hosts_ctl("", STRING_UNKNOWN, STRING_UNKNOWN, STRING_UNKNOWN);
+         ,
+-        LIBWRAP="-lnsl -lwrap"
++        LIBWRAP="-lwrap"
+         LIBS="$orig_LIBS"
+         AC_MSG_RESULT(yes)
+         AC_DEFINE([HAVE_WRAP], 1, "Support for libwrap")

diff --git a/atftp.spec b/atftp.spec
index 20cd4fb7ffa5bd2faa37644925ed972a91f0dad1..8855b5ca6b108c40ddd9142ae82bdae744e326f0 100644 (file)
--- a/atftp.spec
+++ b/atftp.spec
@@ -4,23 +4,23 @@ Summary(fr.UTF-8):    Client pour le « trivial file transfer protocol » (tftp)
 Summary(pl.UTF-8):     Klient TFTP (Trivial File Transfer Protocol)
 Summary(tr.UTF-8):     İlkel dosya aktarım protokolu (TFTP) için sunucu ve istemci
 Name:          atftp
-Version:       0.7.2
-Release:       2
-License:       GPL
+Version:       0.8.0
+Release:       1
+License:       GPL v2+
 Group:         Applications/Networking
-Source0:       http://downloads.sourceforge.net/project/atftp/%{name}-%{version}.tar.gz
-# Source0-md5: eb358eb1af10ae5dc51095cd10b6738b
+Source0:       https://downloads.sourceforge.net/project/atftp/%{name}-%{version}.tar.gz
+# Source0-md5: 852f4c0773ae8c429ec4f74413eabe1b
 Source1:       %{name}d.inetd
 Source2:       %{name}d.init
 Source3:       %{name}d.sysconfig
 Patch0:                %{name}-tinfo.patch
-Patch1:                %{name}-clk.patch
-Patch2:                no-inline.patch
-URL:           http://sourceforge.net/projects/atftp/
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: libtool
+Patch1:                %{name}-link.patch
+URL:           https://sourceforge.net/projects/atftp/
+BuildRequires: autoconf >= 2.50
+BuildRequires: automake >= 1:1.7
 BuildRequires: libwrap-devel
+BuildRequires: ncurses-devel
+BuildRequires: pcre2-8-devel
 BuildRequires: readline-devel
 BuildRequires: rpmbuild(macros) >= 1.268
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -93,7 +93,7 @@ Group:                Networking/Daemons/FTP
 Requires:      atftpd-common = %{epoch}:%{version}-%{release}
 Requires:      rc-inetd >= 0.8.1
 Provides:      tftpdaemon
-Obsoletes:     atftpd
+Obsoletes:     atftpd < 0.7-9
 Obsoletes:     inetutils-tftpd
 Obsoletes:     tftp-server
 Obsoletes:     tftpd
@@ -113,7 +113,7 @@ Group:              Networking/Daemons/FTP
 Requires:      atftpd-common = %{epoch}:%{version}-%{release}
 Requires:      rc-scripts
 Provides:      tftpdaemon
-Obsoletes:     atftpd
+Obsoletes:     atftpd < 0.7-9
 Obsoletes:     inetutils-tftpd
 Obsoletes:     tftp-server
 Obsoletes:     tftpd
@@ -131,21 +131,19 @@ standalone.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
-sed -i -e 's#AM_CONFIG_HEADER#AC_CONFIG_HEADERS#g' configure.ac
-sed -i -e 's#CFLAGS="-g -Wall -D_REENTRANT"##g' configure.ac
+#sed -i -e 's#AM_CONFIG_HEADER#AC_CONFIG_HEADERS#g' configure.ac
+#sed -i -e 's#CFLAGS="-g -Wall -D_REENTRANT"##g' configure.ac
 
 %build
-%{__libtoolize}
 %{__aclocal}
-%{__automake}
 %{__autoconf}
-
+%{__autoheader}
+%{__automake}
 %configure \
+       --enable-libpcre \
        --enable-libreadline \
        --enable-libwrap \
-       --enable-libpcre \
        --enable-mtftp
 %{__make}
 
@@ -193,19 +191,22 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/*
-%{_mandir}/man1/*
+%doc BUGS Changelog FAQ README README.MCAST README.PCRE TODO docs/pxespec.txt
+%attr(755,root,root) %{_bindir}/atftp
+%{_mandir}/man1/atftp.1*
 
 %files -n atftpd-common
 %defattr(644,root,root,755)
-%doc README FAQ
-%attr(755,root,root) %{_sbindir}/*
+%doc BUGS Changelog FAQ README README.MCAST README.PCRE TODO docs/pxespec.txt
+%attr(755,root,root) %{_sbindir}/atftpd
 %attr(750,tftp,root) %dir /var/lib/tftp
-%{_mandir}/man8/*
+%{_mandir}/man8/atftpd.8*
 
 %files -n atftpd-inetd
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/rc-inetd/tftpd
+%attr(755,root,root) %{_sbindir}/in.tftpd
+%{_mandir}/man8/in.tftpd.8*
 
 %files -n atftpd-standalone
 %defattr(644,root,root,755)

diff --git a/no-inline.patch b/no-inline.patch
deleted file mode 100644 (file)
index da2be2a..0000000
--- a/no-inline.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- atftp-0.7.1/argz.h~        2011-03-11 07:51:24.000000000 +0100
-+++ atftp-0.7.1/argz.h 2016-10-18 19:25:56.408888344 +0200
-@@ -177,7 +177,7 @@
- extern char *argz_next (__const char *__restrict __argz, size_t __argz_len,
-                       __const char *__restrict __entry) __THROW;
- 
--#ifdef __USE_EXTERN_INLINES
-+#if 0
- extern inline char *
- __argz_next (__const char *__argz, size_t __argz_len,
-            __const char *__entry)
---- atftp-0.7.1/tftpd.h~       2011-03-11 07:51:24.000000000 +0100
-+++ atftp-0.7.1/tftpd.h        2016-10-18 19:27:33.845636877 +0200
-@@ -93,7 +93,7 @@
- /*
-  * Defined in tftpd_list.c, operation on client structure list.
-  */
--inline void tftpd_clientlist_ready(struct thread_data *thread);
-+void tftpd_clientlist_ready(struct thread_data *thread);
- void tftpd_clientlist_remove(struct thread_data *thread,
-                              struct client_info *client);
- void tftpd_clientlist_free(struct thread_data *thread);
---- atftp-0.7.1/tftp_def.h~    2011-03-24 09:24:18.000000000 +0100
-+++ atftp-0.7.1/tftp_def.h     2016-10-18 19:26:51.552296429 +0200
-@@ -50,7 +50,7 @@
- 
- int timeval_diff(struct timeval *res, struct timeval *t1, struct timeval *t0);
- int print_eng(double value, char *string, int size, char *format);
--inline char *Strncpy(char *to, const char *from, size_t size);
-+char *Strncpy(char *to, const char *from, size_t size);
- int Gethostbyname(char *addr, struct hostent *host);
- 
- char *sockaddr_print_addr(const struct sockaddr_storage *, char *, size_t);