Re: [ANNOUNCE] util-linux v2.33

[Samuel Thibault <samuel.thibault@ens-lyon.org>]

[-- Attachment #1: Type: text/plain, Size: 318 bytes --]

Hello,

Karel Zak, le mar. 06 nov. 2018 12:33:06 +0100, a ecrit:
> The util-linux release v2.33 is available at
> 
>   http://www.kernel.org/pub/linux/utils/util-linux/v2.33
> 
> Feedback and bug reports, as always, are welcomed.

It seems new portability issues came in since the rc I tested :)
Fix attached.

Samuel

[-- Attachment #2: fix --]
[-- Type: text/plain, Size: 1255 bytes --]

Index: util-linux-2.33/term-utils/agetty.c
===================================================================
--- util-linux-2.33.orig/term-utils/agetty.c
+++ util-linux-2.33/term-utils/agetty.c
@@ -1768,6 +1768,7 @@ static void eval_issue_file(struct issue
 }
 #else /* ISSUE_SUPPORT */
 
+#ifdef AGETTY_RELOAD
 static int issue_is_changed(struct issue *ie)
 {
 	if (ie->mem_old && ie->mem
@@ -1780,6 +1781,7 @@ static int issue_is_changed(struct issue
 
 	return 1;
 }
+#endif
 
 static void print_issue_file(struct issue *ie,
 			     struct options *op,
@@ -2066,8 +2068,8 @@ static char *get_logname(struct issue *i
 		/* Write issue file and prompt */
 		do_prompt(ie, op, tp);
 
-#ifdef AGETTY_RELOAD
 	no_reload:
+#ifdef AGETTY_RELOAD
 		if (!wait_for_term_input(STDIN_FILENO)) {
 			/* refresh prompt -- discard input data, clear terminal
 			 * and call do_prompt() again
@@ -2731,6 +2733,7 @@ static void output_special_char(struct i
 			fprintf (ie->output, "%d ", users);
 		break;
 	}
+#if defined(RTMGRP_IPV4_IFADDR) && defined(RTMGRP_IPV6_IFADDR)
 	case '4':
 	case '6':
 	{
@@ -2754,6 +2757,7 @@ static void output_special_char(struct i
 			netlink_groups |= RTMGRP_IPV6_IFADDR;
 		break;
 	}
+#endif
 	default:
 		putchar(c);
 		break;