This is an automated email from the git hooks/post-receive script. sthibault pushed a commit to branch master in repository hurd.
commit 368872320a3275ba172210d4eecce36e0fc398e8 Author: Samuel Thibault <[email protected]> Date: Sun Feb 28 16:34:43 2016 +0000 Fix netdde log output --- debian/changelog | 2 ++ debian/patches/netdde_log.patch | 13 +++++++++++++ debian/patches/series | 2 ++ debian/patches/using_std.patch | 21 +++++++++++++++++++++ 4 files changed, 38 insertions(+) diff --git a/debian/changelog b/debian/changelog index 3e7c477..11ee7e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ hurd (1:0.7.git20160228-1) UNRELEASED; urgency=medium * control: Fix spurious build of hurd-headers-dev and libihash-dev in unstaged builds. * rules: Fix cross-build of libdde-linux26. + * patches/using_std.patch: Fix external reference to using_std variable. + * patches/netdde_log.patch: Move logs to /var/run. -- Samuel Thibault <[email protected]> Sun, 28 Feb 2016 11:28:16 +0000 diff --git a/debian/patches/netdde_log.patch b/debian/patches/netdde_log.patch new file mode 100644 index 0000000..8d98bdc --- /dev/null +++ b/debian/patches/netdde_log.patch @@ -0,0 +1,13 @@ +Index: hurd-debian/libddekit/printf.c +=================================================================== +--- hurd-debian.orig/libddekit/printf.c ++++ hurd-debian/libddekit/printf.c +@@ -79,7 +79,7 @@ int log_init () + output = stderr; + } + else { +- char template[] = "/var/log/dde_log.XXXXXX"; ++ char template[] = "/var/run/dde_log.XXXXXX"; + int ret = mkstemp (template); + if (ret < 0) { + error (0, errno, "mkstemp"); diff --git a/debian/patches/series b/debian/patches/series index cfc105b..b4af055 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -25,3 +25,5 @@ dl_origin.patch cross-link.patch procfs-compatible crash-logging.patch +using_std.patch +netdde_log.patch diff --git a/debian/patches/using_std.patch b/debian/patches/using_std.patch new file mode 100644 index 0000000..f900b70 --- /dev/null +++ b/debian/patches/using_std.patch @@ -0,0 +1,21 @@ +Index: hurd-debian/libddekit/printf.c +=================================================================== +--- hurd-debian.orig/libddekit/printf.c ++++ hurd-debian/libddekit/printf.c +@@ -15,6 +15,7 @@ + #include "ddekit/printf.h" + + extern boolean_t using_std; ++#pragma weak using_std + static FILE *output; + + /** +@@ -74,7 +75,7 @@ int ddekit_vprintf(const char *fmt, va_l + + int log_init () + { +- if (using_std) { ++ if (&using_std && using_std) { + output = stderr; + } + else { -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hurd/hurd.git
