diff options
| author | petere <petere@0070b5ef-2f16-0410-befa-9a02bd1d6ddb> | 2012-01-05 17:37:18 +0000 |
|---|---|---|
| committer | petere <petere@0070b5ef-2f16-0410-befa-9a02bd1d6ddb> | 2012-01-05 17:37:18 +0000 |
| commit | 29e16b68fbbe4883093c9fb9c86f38699245c58c (patch) | |
| tree | 7b7255878a8d2ad5798614a069814d4954614b4f | |
| parent | 443d3ae12de47ca5ad26ab08e0e67678556618ad (diff) | |
| download | ntp-29e16b68fbbe4883093c9fb9c86f38699245c58c.tar.gz | |
Update format-security.patch to include kfreebsd-specific fixes
(closes: #653771)
git-svn-id: svn://svn.debian.org/pkg-ntp/ntp/trunk@353 0070b5ef-2f16-0410-befa-9a02bd1d6ddb
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/patches/format-security.patch | 29 |
2 files changed, 35 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 16b8eb1..8a3c88a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ntp (1:4.2.6.p3+dfsg-3) UNRELEASED; urgency=medium + + * Update format-security.patch to include kfreebsd-specific fixes + (closes: #653771) + + -- Peter Eisentraut <petere@debian.org> Thu, 05 Jan 2012 19:28:23 +0200 + ntp (1:4.2.6.p3+dfsg-2) unstable; urgency=low * Use architecture wildcard for libcap2-dev build dependency, removing diff --git a/debian/patches/format-security.patch b/debian/patches/format-security.patch index c777aa5..06e9dca 100644 --- a/debian/patches/format-security.patch +++ b/debian/patches/format-security.patch @@ -4,7 +4,12 @@ Description: Fix build failures with -Werror=format-security much more difficult to prove that the format string cannot contain any '%' characters. Author: Colin Watson <cjwatson@ubuntu.com> -Last-Update: 2011-05-20 +Author: Steven Chamberlain <steven@pyro.eu.org> +Author: Peter Eisentraut <petere@debian.org> +Bug: http://bugs.ntp.org/2106 +Bug-Debian: http://bugs.debian.org/627403 +Bug-Debian: http://bugs.debian.org/653771 +Last-Update: 2012-01-05 --- a/lib/isc/unix/ifiter_ioctl.c +++ b/lib/isc/unix/ifiter_ioctl.c @@ -77,3 +82,25 @@ Last-Update: 2011-05-20 if (++unexpected_error_cnt == MAX_UNEXPECTED_ERRORS) { +--- a/ntpd/refclock_oncore.c ++++ b/ntpd/refclock_oncore.c +@@ -4058,7 +4058,7 @@ oncore_log ( + + snprintf(Msg, sizeof(Msg), "ONCORE[%d]: %s", instance->unit, + msg); +- syslog(log_level, Msg); ++ syslog(log_level, "%s", Msg); + + i = strlen(msg); + +--- a/lib/isc/include/isc/msgcat.h ++++ b/lib/isc/include/isc/msgcat.h +@@ -110,7 +110,7 @@ isc_msgcat_close(isc_msgcat_t **msgcatp) + + const char * + isc_msgcat_get(isc_msgcat_t *msgcat, int set, int message, +- const char *default_text); ++ const char *default_text) __attribute__((format_arg(4))); + /*%< + * Get message 'message' from message set 'set' in 'msgcat'. If it + * is not available, use 'default_text'. |