From 9248460eb2d55d5aaebad34555a9f4d38544aef8 Mon Sep 17 00:00:00 2001 From: Ian Beckwith Date: Sat, 26 May 2012 00:40:29 +0100 Subject: [PATCH] Fix Hurd FTBFS: (Closes: #674444) --- ckupty.c | 2 +- debian/changelog | 8 ++++++++ debian/patches/020_fix_ptys.patch | 8 ++++---- debian/rules | 6 +++++- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/ckupty.c b/ckupty.c index aaed05b..5ba88f2 100644 --- a/ckupty.c +++ b/ckupty.c @@ -54,7 +54,7 @@ char *ckptyv = "Pseudoterminal support, 9.0.101, 13 Jun 2011"; . HP-UX 8.00 and earlier (no vhangup or ptsname routines) */ -#define _XOPEN_SOURCE +#define _XOPEN_SOURCE 500 #include #include "ckcsym.h" #include "ckcdeb.h" /* To pick up NETPTY definition */ diff --git a/debian/changelog b/debian/changelog index d164890..667a95f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +ckermit (302-3) unstable; urgency=low + + * Fix Hurd FTBFS: (Closes: #674444) + + 020_fix_ptys.patch: define _XOPEN_SOURCE to 500. + + rules: don't define HAVE_PTMX on hurd. + + -- Ian Beckwith Sat, 26 May 2012 00:39:22 +0100 + ckermit (302-2) unstable; urgency=low * DES support is disabled as libdes425 has been removed. diff --git a/debian/patches/020_fix_ptys.patch b/debian/patches/020_fix_ptys.patch index f32c593..f32105b 100644 --- a/debian/patches/020_fix_ptys.patch +++ b/debian/patches/020_fix_ptys.patch @@ -2,18 +2,18 @@ Description: get correct ptsname() prototype Needed along with -DHAVE_PTMX for working ptys Forwarded: email Author: Mark Wooding -Last-Update: 2012-05-08 +Last-Update: 2012-05-26 Bug-Debian: http://bugs.debian.org/660066 Index: ckermit/ckupty.c =================================================================== ---- ckermit.orig/ckupty.c 2012-05-08 04:43:50.000000000 +0100 -+++ ckermit/ckupty.c 2012-05-08 04:44:30.000000000 +0100 +--- ckermit.orig/ckupty.c 2012-05-09 23:29:20.000000000 +0100 ++++ ckermit/ckupty.c 2012-05-26 00:35:08.000000000 +0100 @@ -54,6 +54,8 @@ . HP-UX 8.00 and earlier (no vhangup or ptsname routines) */ -+#define _XOPEN_SOURCE ++#define _XOPEN_SOURCE 500 +#include #include "ckcsym.h" #include "ckcdeb.h" /* To pick up NETPTY definition */ diff --git a/debian/rules b/debian/rules index 0278b92..c0a0e4d 100755 --- a/debian/rules +++ b/debian/rules @@ -13,7 +13,7 @@ CFLAGS += `dpkg-buildflags --get CPPFLAGS` CFLAGS +=-g \ -DIKSDCONF=\\\\\\\\\\\\\\\"/etc/kermit/iksd.conf\\\\\\\\\\\\\\\" \ -DCK_SYSINI=\\\\\\\\\\\\\\\"/etc/kermit/kermrc\\\\\\\\\\\\\\\" \ - -DCK_INI_B -DX509_SUBJECT_ALT_NAME_TO_USER -DHAVE_PTMX + -DCK_INI_B -DX509_SUBJECT_ALT_NAME_TO_USER ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 @@ -26,6 +26,10 @@ ifneq (,$(or $(findstring kfreebsd, $(DEB_HOST_ARCH_OS)), $(findstring hurd, $(D CFLAGS += -DSELECT endif +ifeq (,$(findstring hurd, $(DEB_HOST_ARCH_OS))) + CFLAGS += -DHAVE_PTMX +endif + LINKERFLAGS=`dpkg-buildflags --get LDFLAGS` LINKERFLAGS+=-Wl,-z,defs -Wl,--as-needed -- 2.11.0