Hello community,
here is the log from the commit of package atftp
checked in at Sat Apr 8 00:46:35 CEST 2006.
--------
--- atftp/atftp.changes 2006-01-25 21:34:31.000000000 +0100
+++ atftp/atftp.changes 2006-04-07 17:27:04.000000000 +0200
@@ -1,0 +2,17 @@
+Thu Mar 30 18:32:19 CEST 2006 - mrueckert@suse.de
+
+- added atftp-0.7_compiler_warnings.patch:
+ o missing include of pthread.h
+ o make the the 1st parameter of tftp_mtftp_missed_packet
+ unsigned int to fix a differ in signedness warning
+ o configure overwrote the CFLAGS from the environment.
+ o fixed logging of threadids
+- added atftp-0.7_thread_crash.patch:
+ fixes http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=271816
+- added atftp-0.7_sol_ip.patch:
+ only use the SOL_IP if it is defined
+- updated atftp-0.7.dif:
+ o really always run through the whole bitmap to find old holes.
+ (bug #148779, #65660)
+
+-------------------------------------------------------------------
@@ -43 +59,0 @@
-
New:
----
atftp-0.7_compiler_warnings.patch
atftp-0.7_sol_ip.patch
atftp-0.7_thread_crash.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ atftp.spec ++++++
--- /var/tmp/diff_new_pack.kfAoVp/_old 2006-04-08 00:41:46.000000000 +0200
+++ /var/tmp/diff_new_pack.kfAoVp/_new 2006-04-08 00:41:46.000000000 +0200
@@ -1,41 +1,43 @@
#
# spec file for package atftp (Version 0.7)
#
-# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
-# Please submit bugfixes or comments via http://bugs.opensuse.org
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: atftp
-BuildRequires: readline-devel tcpd-devel
-URL: ftp://ftp.mamalinux.com/pub/atftp/
Version: 0.7
-Release: 10
-Summary: Advanced TFTP server and client
+Release: 17
License: GPL
Group: System/Daemons
-Autoreqprov: on
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: readline-devel tcpd-devel
+PreReq: %insserv_prereq %fillup_prereq
+Conflicts: tftp
+URL: ftp://ftp.mamalinux.com/pub/atftp/
Source: %{name}-%{version}.tar.bz2
Source1: atftpd.init.d
Source2: atftpd.sysconfig
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-PreReq: %insserv_prereq %fillup_prereq
Patch1: atftp-0.7.dif
Patch2: atftp-CLK_TCK.diff
-Conflicts: tftp
+Patch3: atftp-0.7_compiler_warnings.patch
+Patch4: atftp-0.7_thread_crash.patch
+Patch5: atftp-0.7_sol_ip.patch
+Summary: Advanced TFTP Server and Client
%description
atftp stands for Advanced Trivial File Transfer Protocol. It is called
-"advanced", by contrast to others TFTP servers, for two reasons.
-Firstly, it is intended to be fully compliant with all related RFCs.
-This include RFC1350, RFC2090, RFC2347, RFC2348 and RFC2349. Secondly,
-atftp is intended for serving boot files to large clusters. It is
-multi-threaded and will eventually support multicast, allowing faster
-boot of hundreds of machine simultaneously.
+"advanced", in contrast to others TFTP servers, for two reasons. First,
+it is intended to be fully compliant with all related RFCs. This
+includes RFC1350, RFC2090, RFC2347, RFC2348, and RFC2349. Second, atftp
+is intended for serving boot files to large clusters. It is
+multithreaded and will eventually support multicast, allowing faster
+boot of hundreds of machines simultaneously.
@@ -48,24 +50,25 @@
%setup -q
%patch1
%patch2
+%patch3
+%patch4
+%patch5
%build
-%{suse_update_config}
-libtoolize --force
-autoreconf --force --install
-./configure --prefix=/usr --mandir=%{_mandir}
-make
+autoreconf -fi
+%configure
+%{__make}
%install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+
+%makeinstall
# SuSE rc
-install -d -m 750 $RPM_BUILD_ROOT/etc/init.d/
-install -d $RPM_BUILD_ROOT/usr/sbin/
-install -m 744 %{S:1} $RPM_BUILD_ROOT/etc/init.d/atftpd
-ln -sf ../../etc/init.d/atftpd $RPM_BUILD_ROOT/usr/sbin/rcatftpd
-install -d $RPM_BUILD_ROOT/var/adm/fillup-templates
-install -m 644 %{S:2} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.atftpd
+%{__install} -D -m 0755 %{S:1} %{buildroot}/etc/init.d/atftpd
+%{__ln_s} -f ../../etc/init.d/atftpd %{buildroot}%{_sbindir}/rcatftpd
+%{__install} -D -m 0644 %{S:2} %{buildroot}/var/adm/fillup-templates/sysconfig.atftpd
+
+%clean
+%{__rm} -rf %{buildroot}
%preun
%stop_on_removal atftpd
@@ -77,21 +80,34 @@
%restart_on_update atftpd
%{insserv_cleanup}
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files
%defattr(-,root,root)
%doc BUGS FAQ LICENSE README TODO
-
-%_sbindir/*
-%_bindir/*
+%{_bindir}/atftp
+%{_sbindir}/atftpd
+%{_sbindir}/in.tftpd
+%{_sbindir}/rcatftpd
/etc/init.d/atftpd
/var/adm/fillup-templates/sysconfig.atftpd
-%doc %{_mandir}/man8/*
-%doc %{_mandir}/man1/*
+%{_mandir}/man1/atftp.1.gz
+%{_mandir}/man8/atftpd.8.gz
+%{_mandir}/man8/in.tftpd.8.gz
%changelog -n atftp
+* Thu Mar 30 2006 - mrueckert@suse.de
+- added atftp-0.7_compiler_warnings.patch:
+ o missing include of pthread.h
+ o make the the 1st parameter of tftp_mtftp_missed_packet
+ unsigned int to fix a differ in signedness warning
+ o configure overwrote the CFLAGS from the environment.
+ o fixed logging of threadids
+- added atftp-0.7_thread_crash.patch:
+ fixes http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=271816
+- added atftp-0.7_sol_ip.patch:
+ only use the SOL_IP if it is defined
+- updated atftp-0.7.dif:
+ o really always run through the whole bitmap to find old holes.
+ (bug #148779, #65660)
* Wed Jan 25 2006 - mls@suse.de
- converted neededforbuild to BuildRequires
* Tue Dec 20 2005 - ro@suse.de
++++++ atftp-0.7.dif ++++++
--- /var/tmp/diff_new_pack.kfAoVp/_old 2006-04-08 00:41:46.000000000 +0200
+++ /var/tmp/diff_new_pack.kfAoVp/_new 2006-04-08 00:41:46.000000000 +0200
@@ -1,6 +1,8 @@
---- argz.h
+Index: argz.h
+===================================================================
+--- argz.h.orig
+++ argz.h
-@@ -180,7 +180,7 @@
+@@ -180,7 +180,7 @@ extern char *argz_next (__const char *__
#ifdef __USE_EXTERN_INLINES
extern inline char *
__argz_next (__const char *__argz, size_t __argz_len,
@@ -9,7 +11,7 @@
{
if (__entry)
{
-@@ -194,7 +194,7 @@
+@@ -194,7 +194,7 @@ __argz_next (__const char *__argz, size_
}
extern inline char *
argz_next (__const char *__argz, size_t __argz_len,
@@ -18,9 +20,11 @@
{
return __argz_next (__argz, __argz_len, __entry);
}
---- tftp.c
+Index: tftp.c
+===================================================================
+--- tftp.c.orig
+++ tftp.c
-@@ -354,7 +354,7 @@
+@@ -354,7 +354,7 @@ char *command_generator(const char *text
void make_arg(char *string, int *argc, char ***argv)
{
static char *tmp = NULL;
@@ -29,7 +33,7 @@
/* split the string to an argz vector */
if (argz_create_sep(string, ' ', &tmp, &argz_len) != 0)
-@@ -731,7 +731,7 @@
+@@ -731,7 +731,7 @@ int get_file(int argc, char **argv)
fsync(data.sockfd);
close(data.sockfd);
@@ -38,18 +42,24 @@
}
#ifdef HAVE_MTFTP
---- tftp_file.c
+Index: tftp_file.c
+===================================================================
+--- tftp_file.c.orig
+++ tftp_file.c
-@@ -59,7 +59,7 @@
+@@ -59,9 +59,9 @@ int tftp_find_bitmap_hole(int prev_hole,
unsigned int next_word;
/* initial stuff */
- next_hole = prev_hole + 1;
-+ next_hole = prev_hole;
- next_word_no = next_hole / 32;
- next_bit_no = next_hole % 32;
+- next_word_no = next_hole / 32;
+- next_bit_no = next_hole % 32;
++ next_hole = 0;
++ next_word_no = next_hole / 32; /* effectively 0 */
++ next_bit_no = next_hole % 32; /* effectively 0 */
next_word = bitmap[next_word_no];
-@@ -136,7 +136,7 @@
+
+ /* Check if there is a remainder of the current word to traverse */
+@@ -136,7 +136,7 @@ int tftp_receive_file(struct client_data
struct hostent *host;
int master_client = 0;
unsigned int file_bitmap[NB_BLOCK];
++++++ atftp-0.7_compiler_warnings.patch ++++++
Index: logger.c
===================================================================
--- logger.c.orig
+++ logger.c
@@ -27,6 +27,7 @@
#include