tags 564052 + patch
thanks
Dear Debian Syslinux Maintainers,
I have prepared an NMU for tftp-hpa (version 5.0-10.1) to work
around the mipsel toolchain problem and fix the FTBFS.
I’ll have it uploaded to according to devref §5.11, patch attached.
bye,
//mirabilos
--
Sometimes they [people] care too much: pretty printers [and syntax highligh-
ting, d.A.] mechanically produce pretty output that accentuates irrelevant
detail in the program, which is as sensible as putting all the prepositions
in English text in bold font. -- Rob Pike in "Notes on Programming in C"
diff -u tftp-hpa-5.0/debian/changelog tftp-hpa-5.0/debian/changelog
--- tftp-hpa-5.0/debian/changelog
+++ tftp-hpa-5.0/debian/changelog
@@ -1,3 +1,12 @@
+tftp-hpa (5.0-10.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * debian/patches/02-progname.patch: New, __progname[] is provided
+ by libc, rename local variable to tftpd_progname to avoid a
+ clash and work around #519006. (Closes: #564052)
+
+ -- Thorsten Glaser <t...@mirbsd.de> Fri, 22 Jan 2010 18:25:35 +0000
+
tftp-hpa (5.0-10) unstable; urgency=low
* Adding explicit debian source version 1.0 until switch to 3.0.
diff -u tftp-hpa-5.0/debian/patches/series tftp-hpa-5.0/debian/patches/series
--- tftp-hpa-5.0/debian/patches/series
+++ tftp-hpa-5.0/debian/patches/series
@@ -1,0 +2 @@
+02-progname.patch
only in patch2:
unchanged:
--- tftp-hpa-5.0.orig/debian/patches/02-progname.patch
+++ tftp-hpa-5.0/debian/patches/02-progname.patch
@@ -0,0 +1,34 @@
+Index: tftp-hpa-5.0/tftpd/tftpd.c
+===================================================================
+--- tftp-hpa-5.0.orig/tftpd/tftpd.c 2010-01-22 18:14:19.000000000 +0000
++++ tftp-hpa-5.0/tftpd/tftpd.c 2010-01-22 18:14:38.000000000 +0000
+@@ -74,7 +74,7 @@
+ #define TRIES 6 /* Number of attempts to send each packet */
+ #define TIMEOUT_LIMIT ((1 << TRIES)-1)
+
+-const char *__progname;
++const char *tftpd_progname;
+ static int peer;
+ static unsigned long timeout = TIMEOUT; /* Current timeout value */
+ static unsigned long rexmtval = TIMEOUT; /* Basic timeout value */
+@@ -356,9 +356,9 @@
+ /* basename() is way too much of a pain from a portability standpoint */
+
+ p = strrchr(argv[0], '/');
+- __progname = (p && p[1]) ? p + 1 : argv[0];
++ tftpd_progname = (p && p[1]) ? p + 1 : argv[0];
+
+- openlog(__progname, LOG_PID | LOG_NDELAY, LOG_DAEMON);
++ openlog(tftpd_progname, LOG_PID | LOG_NDELAY, LOG_DAEMON);
+
+ srand(time(NULL) ^ getpid());
+
+@@ -873,7 +873,7 @@
+ /* Verify if this was a legal request for us. This has to be
+ done before the chroot, while /etc is still accessible. */
+ request_init(&wrap_request,
+- RQ_DAEMON, __progname,
++ RQ_DAEMON, tftpd_progname,
+ RQ_FILE, fd,
+ RQ_CLIENT_SIN, &from, RQ_SERVER_SIN, &myaddr, 0);
+ sock_methods(&wrap_request);
