Hello community,
here is the log from the commit of package tftp
checked in at Thu Aug 7 01:35:59 CEST 2008.
--------
--- tftp/tftp.changes 2008-07-18 18:00:46.000000000 +0200
+++ /mounts/work_src_done/STABLE/tftp/tftp.changes 2008-08-06 16:05:50.375792000 +0200
@@ -1,0 +2,5 @@
+Wed Aug 6 16:04:07 CEST 2008 - kkeil@suse.de
+
+- Update to current git version with enhanced IPv6 support included
+
+-------------------------------------------------------------------
Old:
----
tftp-hpa-0.48_ipv6.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tftp.spec ++++++
--- /var/tmp/diff_new_pack.G12122/_old 2008-08-07 01:35:36.000000000 +0200
+++ /var/tmp/diff_new_pack.G12122/_new 2008-08-07 01:35:36.000000000 +0200
@@ -2,9 +2,16 @@
# spec file for package tftp (Version 0.48)
#
# Copyright (c) 2008 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.
#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
@@ -12,14 +19,14 @@
Name: tftp
-BuildRequires: libedit-devel tcpd-devel
+BuildRequires: binutils-devel libedit-devel tcpd-devel
Url: http://www.kernel.org/pub/software/network/tftp/
License: BSD 3-Clause
Group: Productivity/Networking/Ftp/Clients
Requires: inet-daemon netcfg
AutoReqProv: on
Version: 0.48
-Release: 82
+Release: 90
Summary: Trivial File Transfer Protocol (TFTP)
Source: tftp-hpa-git-%{version}.tar.bz2
Source1: tftp.xinetd
@@ -27,7 +34,6 @@
Patch1: tftp-hpa-0.46_colon_check.patch
Patch2: tftp-hpa-0.43_readline.diff
Patch3: tftp-hpa-0.46_libedit.patch
-Patch4: tftp-hpa-0.48_ipv6.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -47,13 +53,12 @@
%patch1
%patch2
%patch3
-%patch4 -p1
%build
%{__make}
%install
-%makeinstall INSTALLROOT="%{buildroot}"
+%makeinstall INSTALLROOT="%{buildroot}" MANDIR="%{_mandir}"
%{__install} -D -m 0644 %{S:1} %{buildroot}/etc/xinetd.d/tftp
%clean
@@ -70,6 +75,8 @@
%config(noreplace) /etc/xinetd.d/tftp
%changelog
+* Wed Aug 06 2008 kkeil@suse.de
+- Update to current git version with enhanced IPv6 support included
* Fri Jul 18 2008 kkeil@suse.de
- Update to git version 0.48 for mainline compatibility; code is
still the same but formatting was cleaned up
++++++ tftp-hpa-0.43_include_sys_params.patch ++++++
--- /var/tmp/diff_new_pack.G12122/_old 2008-08-07 01:35:36.000000000 +0200
+++ /var/tmp/diff_new_pack.G12122/_new 2008-08-07 01:35:36.000000000 +0200
@@ -8,5 +8,5 @@
#include
+#include
#include
- #include
#ifdef WITH_READLINE
+ #include
++++++ tftp-hpa-0.43_readline.diff ++++++
--- /var/tmp/diff_new_pack.G12122/_old 2008-08-07 01:35:36.000000000 +0200
+++ /var/tmp/diff_new_pack.G12122/_new 2008-08-07 01:35:36.000000000 +0200
@@ -5,7 +5,7 @@
===================================================================
--- configure.in.orig
+++ configure.in
-@@ -218,7 +218,7 @@ PA_WITH_BOOL(readline, 1,
+@@ -239,7 +239,7 @@ PA_WITH_BOOL(readline, 1,
AC_DEFINE(WITH_READLINE)
],
[],
++++++ tftp-hpa-0.46_colon_check.patch ++++++
--- /var/tmp/diff_new_pack.G12122/_old 2008-08-07 01:35:36.000000000 +0200
+++ /var/tmp/diff_new_pack.G12122/_new 2008-08-07 01:35:36.000000000 +0200
@@ -2,8 +2,8 @@
===================================================================
--- tftp/main.c.orig
+++ tftp/main.c
-@@ -298,7 +298,7 @@ int main(int argc, char *argv[])
- }
+@@ -308,7 +308,7 @@ int main(int argc, char *argv[])
+
bsd_signal(SIGINT, intr);
- if (peerargc) {
@@ -11,7 +11,13 @@
/* Set peer */
if (sigsetjmp(toplevel, 1) != 0)
exit(EX_NOHOST);
-@@ -592,6 +592,9 @@ void get(int argc, char *argv[])
+@@ -634,11 +634,14 @@ void get(int argc, char *argv[])
+ return;
+ }
+ if (!connected) {
+- for (n = 1; n < argc; n++)
++ for (n = 1; n < argc; n++) {
+ if (literal || strchr(argv[n], ':') == 0) {
getusage(argv[0]);
return;
}
++++++ tftp-hpa-0.46_libedit.patch ++++++
--- /var/tmp/diff_new_pack.G12122/_old 2008-08-07 01:35:36.000000000 +0200
+++ /var/tmp/diff_new_pack.G12122/_new 2008-08-07 01:35:36.000000000 +0200
@@ -2,9 +2,9 @@
===================================================================
--- configure.in.orig
+++ configure.in
-@@ -226,6 +226,29 @@ PA_WITH_BOOL(readline, 1,
- TFTP_LIBS="$LIBS $XTRALIBS"
- LIBS="$common_libs"
+@@ -268,6 +268,29 @@ PA_WITH_BOOL(ipv6, 1,
+ [AC_MSG_RESULT(disabled)])
+
+AH_TEMPLATE([WITH_EDITLINE],
+[Define if we are compiling with editline command-line editing.])
@@ -36,7 +36,7 @@
===================================================================
--- tftp/main.c.orig
+++ tftp/main.c
-@@ -48,6 +48,9 @@
+@@ -47,6 +47,9 @@
#include
#endif
#endif
@@ -46,7 +46,7 @@
#include "extern.h"
-@@ -81,7 +84,7 @@ int verbose;
+@@ -88,7 +91,7 @@ int verbose;
int literal;
int connected;
const struct modes *mode;
@@ -55,7 +55,7 @@
char *line = NULL;
#else
char line[LBUFLEN];
-@@ -321,8 +324,8 @@ int main(int argc, char *argv[])
+@@ -346,8 +349,8 @@ int main(int argc, char *argv[])
(*c->handler) (pargc, pargv);
exit(0);
}
@@ -66,7 +66,7 @@
using_history();
#endif
#endif
-@@ -340,7 +343,7 @@ char *hostname;
+@@ -365,7 +368,7 @@ char *hostname;
the global variable "line" */
static void getmoreargs(const char *partial, const char *mprompt)
{
@@ -75,7 +75,7 @@
char *eline;
int len, elen;
-@@ -360,7 +363,7 @@ static void getmoreargs(const char *part
+@@ -385,7 +388,7 @@ static void getmoreargs(const char *part
strcpy(line + len, eline);
free(eline);
@@ -84,7 +84,7 @@
add_history(line);
#endif
#else
-@@ -754,7 +757,7 @@ static void command(void)
+@@ -800,7 +803,7 @@ static void command(void)
struct cmd *c;
for (;;) {
@@ -93,7 +93,7 @@
if (line) {
free(line);
line = NULL;
-@@ -774,8 +777,8 @@ static void command(void)
+@@ -820,8 +823,8 @@ static void command(void)
#endif
if ((line[0] == 0) || (line[0] == '\n'))
continue;
@@ -108,7 +108,7 @@
===================================================================
--- config.h.orig
+++ config.h
-@@ -306,7 +306,7 @@ int daemon(int, int);
+@@ -350,7 +350,7 @@ const char *inet_ntop(int, const void *,
#include "version.h"
++++++ tftp-hpa-git-0.48.tar.bz2 ++++++
++++ 2797 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
