Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package nbd for openSUSE:Factory checked in at 2021-12-13 20:44:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nbd (Old) and /work/SRC/openSUSE:Factory/.nbd.new.2520 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nbd" Mon Dec 13 20:44:54 2021 rev:57 rq:940210 version:3.23 Changes: -------- --- /work/SRC/openSUSE:Factory/nbd/nbd.changes 2021-10-18 22:02:57.814127053 +0200 +++ /work/SRC/openSUSE:Factory/.nbd.new.2520/nbd.changes 2021-12-13 20:51:06.096661990 +0100 @@ -1,0 +2,6 @@ +Sat Dec 11 14:39:22 UTC 2021 - Andreas Stieger <[email protected]> + +- nbd 3.23: + * Don't overwrite the hostname with the TLS hostname + +------------------------------------------------------------------- Old: ---- nbd-3.22.tar.xz New: ---- nbd-3.23.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nbd.spec ++++++ --- /var/tmp/diff_new_pack.jZqmb5/_old 2021-12-13 20:51:06.560662287 +0100 +++ /var/tmp/diff_new_pack.jZqmb5/_new 2021-12-13 20:51:06.572662294 +0100 @@ -20,7 +20,7 @@ %define _fillupdir %{_localstatedir}/adm/fillup-templates %endif Name: nbd -Version: 3.22 +Version: 3.23 Release: 0 Summary: Network Block Device Server and Client Utilities License: GPL-2.0-or-later ++++++ nbd-3.22.tar.xz -> nbd-3.23.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbd-3.22/Makefile.in new/nbd-3.23/Makefile.in --- old/nbd-3.22/Makefile.in 2021-10-04 14:09:50.000000000 +0200 +++ new/nbd-3.23/Makefile.in 2021-11-16 10:55:37.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.4 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2021 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbd-3.22/aclocal.m4 new/nbd-3.23/aclocal.m4 --- old/nbd-3.22/aclocal.m4 2021-10-04 14:09:48.000000000 +0200 +++ new/nbd-3.23/aclocal.m4 2021-11-16 10:55:36.000000000 +0100 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.16.4 -*- Autoconf -*- +# generated automatically by aclocal 1.16.5 -*- Autoconf -*- # Copyright (C) 1996-2021 Free Software Foundation, Inc. @@ -376,7 +376,7 @@ [am__api_version='1.16' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.16.4], [], +m4_if([$1], [1.16.5], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -392,7 +392,7 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.16.4])dnl +[AM_AUTOMAKE_VERSION([1.16.5])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) @@ -769,6 +769,10 @@ # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], [AC_PREREQ([2.65])dnl +m4_ifdef([_$0_ALREADY_INIT], + [m4_fatal([$0 expanded multiple times +]m4_defn([_$0_ALREADY_INIT]))], + [m4_define([_$0_ALREADY_INIT], m4_expansion_stack)])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbd-3.22/configure new/nbd-3.23/configure --- old/nbd-3.22/configure 2021-10-04 14:09:49.000000000 +0200 +++ new/nbd-3.23/configure 2021-11-16 10:55:38.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for nbd 3.22. +# Generated by GNU Autoconf 2.71 for nbd 3.23. # # Report bugs to <[email protected]>. # @@ -621,8 +621,8 @@ # Identity of this package. PACKAGE_NAME='nbd' PACKAGE_TARNAME='nbd' -PACKAGE_VERSION='3.22' -PACKAGE_STRING='nbd 3.22' +PACKAGE_VERSION='3.23' +PACKAGE_STRING='nbd 3.23' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='http://nbd.sourceforge.net/' @@ -1400,7 +1400,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures nbd 3.22 to adapt to many kinds of systems. +\`configure' configures nbd 3.23 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1471,7 +1471,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of nbd 3.22:";; + short | recursive ) echo "Configuration of nbd 3.23:";; esac cat <<\_ACEOF @@ -1618,7 +1618,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -nbd configure 3.22 +nbd configure 3.23 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2275,7 +2275,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by nbd $as_me 3.22, which was +It was created by nbd $as_me 3.23, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3548,7 +3548,7 @@ # Define the identity of the package. PACKAGE='nbd' - VERSION='3.22' + VERSION='3.23' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -16381,7 +16381,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by nbd $as_me 3.22, which was +This file was extended by nbd $as_me 3.23, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16454,7 +16454,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -nbd config.status 3.22 +nbd config.status 3.23 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbd-3.22/doc/Makefile.in new/nbd-3.23/doc/Makefile.in --- old/nbd-3.22/doc/Makefile.in 2021-10-04 14:09:50.000000000 +0200 +++ new/nbd-3.23/doc/Makefile.in 2021-11-16 10:55:37.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.4 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2021 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbd-3.22/gznbd/Makefile.in new/nbd-3.23/gznbd/Makefile.in --- old/nbd-3.22/gznbd/Makefile.in 2021-10-04 14:09:50.000000000 +0200 +++ new/nbd-3.23/gznbd/Makefile.in 2021-11-16 10:55:37.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.4 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2021 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbd-3.22/man/Makefile.in new/nbd-3.23/man/Makefile.in --- old/nbd-3.22/man/Makefile.in 2021-10-04 14:09:50.000000000 +0200 +++ new/nbd-3.23/man/Makefile.in 2021-11-16 10:55:37.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.4 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2021 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbd-3.22/nbd-client.c new/nbd-3.23/nbd-client.c --- old/nbd-3.22/nbd-client.c 2021-09-16 15:46:01.000000000 +0200 +++ new/nbd-3.23/nbd-client.c 2021-10-18 16:35:04.000000000 +0200 @@ -1154,7 +1154,7 @@ if(hostname) { if((!name || !nbddev) && !(opts & NBDC_DO_LIST)) { if(!strncmp(hostname, "nbd", 3) || !strncmp(hostname, "/dev/nbd", 8)) { - if(!get_from_config(hostname, &name, &nbddev, &hostname, &blocksize, &timeout, &cont, &swap, &sdp, &b_unix, &port, &num_connections, &certfile, &keyfile, &cacertfile, &hostname, &can_opt_go)) { + if(!get_from_config(hostname, &name, &nbddev, &hostname, &blocksize, &timeout, &cont, &swap, &sdp, &b_unix, &port, &num_connections, &certfile, &keyfile, &cacertfile, &tlshostname, &can_opt_go)) { usage("no valid configuration for specified device found", hostname); exit(EXIT_FAILURE); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbd-3.22/nbdtab_lexer.c new/nbd-3.23/nbdtab_lexer.c --- old/nbd-3.22/nbdtab_lexer.c 2021-09-16 16:16:47.000000000 +0200 +++ new/nbd-3.23/nbdtab_lexer.c 2021-10-04 14:35:28.000000000 +0200 @@ -444,8 +444,8 @@ #define YY_MORE_ADJ 0 #define YY_RESTORE_YY_MORE_OFFSET char *yytext; -#line 1 "../nbdtab_lexer.l" -#line 2 "../nbdtab_lexer.l" +#line 1 "nbdtab_lexer.l" +#line 2 "nbdtab_lexer.l" #include "nbdtab_parser.tab.h" #line 451 "nbdtab_lexer.c" #line 452 "nbdtab_lexer.c" @@ -665,7 +665,7 @@ } { -#line 7 "../nbdtab_lexer.l" +#line 7 "nbdtab_lexer.l" #line 672 "nbdtab_lexer.c" @@ -728,33 +728,33 @@ case 1: /* rule 1 can match eol */ YY_RULE_SETUP -#line 9 "../nbdtab_lexer.l" +#line 9 "nbdtab_lexer.l" { /* ignoring comments */ } YY_BREAK case 2: YY_RULE_SETUP -#line 10 "../nbdtab_lexer.l" +#line 10 "nbdtab_lexer.l" { yylval = strdup(yytext); return SPACE; } YY_BREAK case 3: YY_RULE_SETUP -#line 11 "../nbdtab_lexer.l" +#line 11 "nbdtab_lexer.l" { yylval = strdup(yytext); return STRING; } YY_BREAK case 4: YY_RULE_SETUP -#line 12 "../nbdtab_lexer.l" +#line 12 "nbdtab_lexer.l" { yylval = strdup(yytext); return *yytext; } YY_BREAK case 5: /* rule 5 can match eol */ YY_RULE_SETUP -#line 13 "../nbdtab_lexer.l" +#line 13 "nbdtab_lexer.l" { yylval = strdup(yytext); return *yytext; } YY_BREAK case 6: YY_RULE_SETUP -#line 14 "../nbdtab_lexer.l" +#line 14 "nbdtab_lexer.l" ECHO; YY_BREAK #line 761 "nbdtab_lexer.c" @@ -1762,4 +1762,4 @@ #define YYTABLES_NAME "yytables" -#line 14 "../nbdtab_lexer.l" +#line 14 "nbdtab_lexer.l" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbd-3.22/nbdtab_parser.c new/nbd-3.23/nbdtab_parser.c --- old/nbd-3.22/nbdtab_parser.c 2021-09-16 16:16:47.000000000 +0200 +++ new/nbd-3.23/nbdtab_parser.c 2021-10-04 14:35:28.000000000 +0200 @@ -1,4 +1,4 @@ -/* A Bison parser, made by GNU Bison 3.7.6. */ +/* A Bison parser, made by GNU Bison 3.8.1. */ /* Bison implementation for Yacc-like parsers in C @@ -46,10 +46,10 @@ USER NAME SPACE" below. */ /* Identify Bison output, and Bison version. */ -#define YYBISON 30706 +#define YYBISON 30801 /* Bison version string. */ -#define YYBISON_VERSION "3.7.6" +#define YYBISON_VERSION "3.8.1" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -67,7 +67,7 @@ /* First part of user prologue. */ -#line 1 "../nbdtab_parser.y" +#line 1 "nbdtab_parser.y" extern int yylex(); #include <stdio.h> @@ -133,9 +133,11 @@ extern YYSTYPE yylval; + int yyparse (void); + /* Symbol kind. */ enum yysymbol_kind_t { @@ -311,12 +313,18 @@ # define YY_USE(E) /* empty */ #endif -#if defined __GNUC__ && ! defined __ICC && 407 <= __GNUC__ * 100 + __GNUC_MINOR__ /* Suppress an incorrect diagnostic about yylval being uninitialized. */ -# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ +#if defined __GNUC__ && ! defined __ICC && 406 <= __GNUC__ * 100 + __GNUC_MINOR__ +# if __GNUC__ * 100 + __GNUC_MINOR__ < 407 +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"") +# else +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ _Pragma ("GCC diagnostic push") \ _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"") \ _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"") +# endif # define YY_IGNORE_MAYBE_UNINITIALIZED_END \ _Pragma ("GCC diagnostic pop") #else @@ -530,7 +538,7 @@ }; #if YYDEBUG - /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ +/* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_int8 yyrline[] = { 0, 19, 19, 20, 21, 25, 29, 30, 34, 35, @@ -562,15 +570,6 @@ } #endif -#ifdef YYPRINT -/* YYTOKNUM[NUM] -- (External) token number corresponding to the - (internal) symbol number NUM (which must be that of a token). */ -static const yytype_int16 yytoknum[] = -{ - 0, 256, 257, 258, 259, 10, 44, 61 -}; -#endif - #define YYPACT_NINF (-10) #define yypact_value_is_default(Yyn) \ @@ -581,8 +580,8 @@ #define yytable_value_is_error(Yyn) \ 0 - /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing - STATE-NUM. */ +/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing + STATE-NUM. */ static const yytype_int8 yypact[] = { -1, 2, -1, 1, -1, 3, -10, -10, -10, 5, @@ -590,9 +589,9 @@ -10 }; - /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. - Performed when YYTABLE does not specify something else to do. Zero - means the default is an error. */ +/* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. + Performed when YYTABLE does not specify something else to do. Zero + means the default is an error. */ static const yytype_int8 yydefact[] = { 2, 0, 2, 0, 2, 0, 3, 1, 4, 0, @@ -600,21 +599,21 @@ 8 }; - /* YYPGOTO[NTERM-NUM]. */ +/* YYPGOTO[NTERM-NUM]. */ static const yytype_int8 yypgoto[] = { -10, -2, -10, -10, -10, -9 }; - /* YYDEFGOTO[NTERM-NUM]. */ +/* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int8 yydefgoto[] = { 0, 3, 4, 13, 15, 16 }; - /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If - positive, shift that token. If negative, reduce the rule whose - number is the opposite. If YYTABLE_NINF, syntax error. */ +/* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If + positive, shift that token. If negative, reduce the rule whose + number is the opposite. If YYTABLE_NINF, syntax error. */ static const yytype_int8 yytable[] = { 6, 7, 8, 1, 2, 5, 18, 9, 10, 20, @@ -627,8 +626,8 @@ 4, 3, -1, 4, 7, 4 }; - /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing - symbol of state STATE-NUM. */ +/* YYSTOS[STATE-NUM] -- The symbol kind of the accessing symbol of + state STATE-NUM. */ static const yytype_int8 yystos[] = { 0, 4, 5, 9, 10, 3, 9, 0, 9, 4, @@ -636,14 +635,14 @@ 13 }; - /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ +/* YYR1[RULE-NUM] -- Symbol kind of the left-hand side of rule RULE-NUM. */ static const yytype_int8 yyr1[] = { 0, 8, 9, 9, 9, 10, 11, 11, 12, 12, 13, 13 }; - /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ +/* YYR2[RULE-NUM] -- Number of symbols on the right-hand side of rule RULE-NUM. */ static const yytype_int8 yyr2[] = { 0, 2, 0, 2, 2, 6, 0, 2, 3, 1, @@ -659,6 +658,7 @@ #define YYACCEPT goto yyacceptlab #define YYABORT goto yyabortlab #define YYERROR goto yyerrorlab +#define YYNOMEM goto yyexhaustedlab #define YYRECOVERING() (!!yyerrstatus) @@ -699,10 +699,7 @@ YYFPRINTF Args; \ } while (0) -/* This macro is provided for backward compatibility. */ -# ifndef YY_LOCATION_PRINT -# define YY_LOCATION_PRINT(File, Loc) ((void) 0) -# endif + # define YY_SYMBOL_PRINT(Title, Kind, Value, Location) \ @@ -729,10 +726,6 @@ YY_USE (yyoutput); if (!yyvaluep) return; -# ifdef YYPRINT - if (yykind < YYNTOKENS) - YYPRINT (yyo, yytoknum[yykind], *yyvaluep); -# endif YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN YY_USE (yykind); YY_IGNORE_MAYBE_UNINITIALIZED_END @@ -917,6 +910,7 @@ YYDPRINTF ((stderr, "Starting parse\n")); yychar = YYEMPTY; /* Cause a token to be read. */ + goto yysetstate; @@ -942,7 +936,7 @@ if (yyss + yystacksize - 1 <= yyssp) #if !defined yyoverflow && !defined YYSTACK_RELOCATE - goto yyexhaustedlab; + YYNOMEM; #else { /* Get the current used size of the three stacks, in elements. */ @@ -970,7 +964,7 @@ # else /* defined YYSTACK_RELOCATE */ /* Extend the stack our own way. */ if (YYMAXDEPTH <= yystacksize) - goto yyexhaustedlab; + YYNOMEM; yystacksize *= 2; if (YYMAXDEPTH < yystacksize) yystacksize = YYMAXDEPTH; @@ -981,7 +975,7 @@ YY_CAST (union yyalloc *, YYSTACK_ALLOC (YY_CAST (YYSIZE_T, YYSTACK_BYTES (yystacksize)))); if (! yyptr) - goto yyexhaustedlab; + YYNOMEM; YYSTACK_RELOCATE (yyss_alloc, yyss); YYSTACK_RELOCATE (yyvs_alloc, yyvs); # undef YYSTACK_RELOCATE @@ -1003,6 +997,7 @@ } #endif /* !defined yyoverflow && !defined YYSTACK_RELOCATE */ + if (yystate == YYFINAL) YYACCEPT; @@ -1115,25 +1110,25 @@ switch (yyn) { case 5: /* mountdef: STRING SPACE STRING SPACE STRING optlist */ -#line 25 "../nbdtab_parser.y" +#line 25 "nbdtab_parser.y" { nbdtab_commit_line(yyvsp[-5], yyvsp[-3], yyvsp[-1]); } -#line 1121 "nbdtab_parser.c" +#line 1116 "nbdtab_parser.c" break; case 10: /* option: STRING */ -#line 39 "../nbdtab_parser.y" +#line 39 "nbdtab_parser.y" { nbdtab_set_flag(yyvsp[0]); } -#line 1127 "nbdtab_parser.c" +#line 1122 "nbdtab_parser.c" break; case 11: /* option: STRING '=' STRING */ -#line 40 "../nbdtab_parser.y" +#line 40 "nbdtab_parser.y" { nbdtab_set_property(yyvsp[-2], yyvsp[0]); } -#line 1133 "nbdtab_parser.c" +#line 1128 "nbdtab_parser.c" break; -#line 1137 "nbdtab_parser.c" +#line 1132 "nbdtab_parser.c" default: break; } @@ -1215,6 +1210,7 @@ label yyerrorlab therefore never appears in user code. */ if (0) YYERROR; + ++yynerrs; /* Do not reclaim the symbols of the rule whose action triggered this YYERROR. */ @@ -1275,7 +1271,7 @@ `-------------------------------------*/ yyacceptlab: yyresult = 0; - goto yyreturn; + goto yyreturnlab; /*-----------------------------------. @@ -1283,24 +1279,22 @@ `-----------------------------------*/ yyabortlab: yyresult = 1; - goto yyreturn; + goto yyreturnlab; -#if !defined yyoverflow -/*-------------------------------------------------. -| yyexhaustedlab -- memory exhaustion comes here. | -`-------------------------------------------------*/ +/*-----------------------------------------------------------. +| yyexhaustedlab -- YYNOMEM (memory exhaustion) comes here. | +`-----------------------------------------------------------*/ yyexhaustedlab: yyerror (YY_("memory exhausted")); yyresult = 2; - goto yyreturn; -#endif + goto yyreturnlab; -/*-------------------------------------------------------. -| yyreturn -- parsing is finished, clean up and return. | -`-------------------------------------------------------*/ -yyreturn: +/*----------------------------------------------------------. +| yyreturnlab -- parsing is finished, clean up and return. | +`----------------------------------------------------------*/ +yyreturnlab: if (yychar != YYEMPTY) { /* Make sure we have latest lookahead translation. See comments at diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbd-3.22/nbdtab_parser.tab.h new/nbd-3.23/nbdtab_parser.tab.h --- old/nbd-3.22/nbdtab_parser.tab.h 2021-09-16 16:16:47.000000000 +0200 +++ new/nbd-3.23/nbdtab_parser.tab.h 2021-10-04 14:35:28.000000000 +0200 @@ -1,4 +1,4 @@ -/* A Bison parser, made by GNU Bison 3.7.6. */ +/* A Bison parser, made by GNU Bison 3.8.1. */ /* Bison interface for Yacc-like parsers in C @@ -70,6 +70,8 @@ extern YYSTYPE yylval; + int yyparse (void); + #endif /* !YY_YY_NBDTAB_PARSER_TAB_H_INCLUDED */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbd-3.22/systemd/Makefile.in new/nbd-3.23/systemd/Makefile.in --- old/nbd-3.22/systemd/Makefile.in 2021-10-04 14:09:50.000000000 +0200 +++ new/nbd-3.23/systemd/Makefile.in 2021-11-16 10:55:37.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.4 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2021 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbd-3.22/tests/Makefile.in new/nbd-3.23/tests/Makefile.in --- old/nbd-3.22/tests/Makefile.in 2021-10-04 14:09:50.000000000 +0200 +++ new/nbd-3.23/tests/Makefile.in 2021-11-16 10:55:37.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.4 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2021 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbd-3.22/tests/code/Makefile.in new/nbd-3.23/tests/code/Makefile.in --- old/nbd-3.22/tests/code/Makefile.in 2021-10-04 14:09:50.000000000 +0200 +++ new/nbd-3.23/tests/code/Makefile.in 2021-11-16 10:55:37.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.4 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2021 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbd-3.22/tests/parse/Makefile.am new/nbd-3.23/tests/parse/Makefile.am --- old/nbd-3.22/tests/parse/Makefile.am 2021-09-16 15:46:01.000000000 +0200 +++ new/nbd-3.23/tests/parse/Makefile.am 2021-10-18 16:22:41.000000000 +0200 @@ -3,5 +3,5 @@ TESTS_ENVIRONMENT = $(builddir)/parser parser_SOURCES = parser.c parser_LDADD = $(top_builddir)/libnbdclt.la $(top_builddir)/libcliserv.la -TESTS = empty noopts singleopt multiopt +TESTS = empty noopts singleopt multiopt ipv6 EXTRA_DIST=$(TESTS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbd-3.22/tests/parse/Makefile.in new/nbd-3.23/tests/parse/Makefile.in --- old/nbd-3.22/tests/parse/Makefile.in 2021-10-04 14:09:50.000000000 +0200 +++ new/nbd-3.23/tests/parse/Makefile.in 2021-11-16 10:55:37.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.4 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2021 Free Software Foundation, Inc. @@ -334,7 +334,7 @@ TESTS_ENVIRONMENT = $(builddir)/parser parser_SOURCES = parser.c parser_LDADD = $(top_builddir)/libnbdclt.la $(top_builddir)/libcliserv.la -TESTS = empty noopts singleopt multiopt +TESTS = empty noopts singleopt multiopt ipv6 EXTRA_DIST = $(TESTS) all: all-am diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbd-3.22/tests/parse/ipv6 new/nbd-3.23/tests/parse/ipv6 --- old/nbd-3.22/tests/parse/ipv6 1970-01-01 01:00:00.000000000 +0100 +++ new/nbd-3.23/tests/parse/ipv6 2021-10-18 16:21:43.000000000 +0200 @@ -0,0 +1,7 @@ + + +# This config file contains a few empty lines. + +# It also contains an IPv6 address + +nbd0 2a01:4f8:200:91e8::2 test diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbd-3.22/tests/parse/parser.c new/nbd-3.23/tests/parse/parser.c --- old/nbd-3.22/tests/parse/parser.c 2021-09-16 15:46:01.000000000 +0200 +++ new/nbd-3.23/tests/parse/parser.c 2021-10-18 16:23:20.000000000 +0200 @@ -29,6 +29,12 @@ .no_optgo = true, }; +CLIENT client_ipv6 = { + .name = "test", + .dev = "nbd0", + .hostn = "2a01:4f8:200:91e8::2", +}; + CLIENT *cur_client; void nbdtab_set_property(char *property, char *val) { @@ -73,6 +79,7 @@ KNOW_CONF(noopts); KNOW_CONF(singleopt); KNOW_CONF(multiopt); + KNOW_CONF(ipv6); #undef KNOW_CONF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nbd-3.22/tests/run/Makefile.in new/nbd-3.23/tests/run/Makefile.in --- old/nbd-3.22/tests/run/Makefile.in 2021-10-04 14:09:50.000000000 +0200 +++ new/nbd-3.23/tests/run/Makefile.in 2021-11-16 10:55:37.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.4 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2021 Free Software Foundation, Inc.
