Hello community, here is the log from the commit of package linuxrc for openSUSE:Factory checked in at 2014-06-01 18:54:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/linuxrc (Old) and /work/SRC/openSUSE:Factory/.linuxrc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "linuxrc" Changes: -------- --- /work/SRC/openSUSE:Factory/linuxrc/linuxrc.changes 2014-05-22 20:39:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.linuxrc.new/linuxrc.changes 2014-06-01 18:55:01.000000000 +0200 @@ -1,0 +2,9 @@ +Fri May 30 08:03:14 CEST 2014 - snwint@suse.de + +- s390: choose thermonuclear option to deal with whitespace issues + once and for all (bnc #706605) +- s390: allow empty parameters for portname, portno and + osahwaddr (bnc #720765) +- 4.2.30 + +------------------------------------------------------------------- Old: ---- linuxrc-4.2.29.tar.xz New: ---- linuxrc-4.2.30.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.b8jevN/_old 2014-06-01 18:55:02.000000000 +0200 +++ /var/tmp/diff_new_pack.b8jevN/_new 2014-06-01 18:55:02.000000000 +0200 @@ -25,9 +25,9 @@ Summary: SUSE Installation Program License: GPL-3.0+ Group: System/Boot -Version: 4.2.29 +Version: 4.2.30 Release: 0 -Source: linuxrc-4.2.29.tar.xz +Source: linuxrc-4.2.30.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ++++++ linuxrc-4.2.29.tar.xz -> linuxrc-4.2.30.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.29/VERSION new/linuxrc-4.2.30/VERSION --- old/linuxrc-4.2.29/VERSION 2014-05-22 09:20:11.000000000 +0200 +++ new/linuxrc-4.2.30/VERSION 2014-05-30 08:03:11.000000000 +0200 @@ -1 +1 @@ -4.2.29 +4.2.30 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.29/changelog new/linuxrc-4.2.30/changelog --- old/linuxrc-4.2.29/changelog 2014-05-22 09:20:13.000000000 +0200 +++ new/linuxrc-4.2.30/changelog 2014-05-30 08:03:13.000000000 +0200 @@ -1,4 +1,12 @@ -2014-05-22: HEAD +2014-05-30: HEAD + - Merge pull request #9 from openSUSE/bnc879893 + - s390: choose thermonuclear option to deal with whitespace issues + - s390: choose thermonuclear option to deal with whitespace issues + once and for all (bnc #706605) + - s390: allow empty parameters for portname, portno and + osahwaddr (bnc #720765) + +2014-05-22: 4.2.29 - turn default ipv6 off again (bnc #879127) 2014-05-21: 4.2.28 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.29/dialog.c new/linuxrc-4.2.30/dialog.c --- old/linuxrc-4.2.29/dialog.c 2014-04-24 14:35:36.000000000 +0200 +++ new/linuxrc-4.2.30/dialog.c 2014-05-30 07:54:43.000000000 +0200 @@ -1661,7 +1661,20 @@ return j; } + +#if defined(__s390__) || defined(__s390x__) +/* broken HMC terminal workaround: always chop leading and trailing whitespace */ +int dia_input2_chopspace(char* txt, char** input, int fieldlen, int pw_mode); + +int dia_input2(char *txt, char **input, int fieldlen, int pw_mode) +{ + return dia_input2_chopspace(txt, input, fieldlen, pw_mode); +} + +static int __dia_input2(char *txt, char **input, int fieldlen, int pw_mode) +#else int dia_input2(char *txt, char **input, int fieldlen, int pw_mode) +#endif { char buf[1024]; int i; @@ -1695,7 +1708,11 @@ if (*input) deflt = strdup(*input); +#if defined(__s390__) || defined(__s390x__) + retval = __dia_input2(txt, input, fieldlen, pw_mode); +#else retval = dia_input2(txt, input, fieldlen, pw_mode); +#endif oinput = *input; /* null pointer or empty string */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.29/file.c new/linuxrc-4.2.30/file.c --- old/linuxrc-4.2.29/file.c 2014-05-20 11:06:34.000000000 +0200 +++ new/linuxrc-4.2.30/file.c 2014-05-30 07:54:43.000000000 +0200 @@ -1177,7 +1177,7 @@ if(*f->value) str_copy(&config.hwp.userid, f->value); break; case key_portname: - if(*f->value) str_copy(&config.hwp.portname, f->value); + str_copy(&config.hwp.portname, f->value); break; case key_readchan: if(*f->value) str_copy(&config.hwp.readchan, f->value); @@ -1199,9 +1199,10 @@ break; case key_portno: if(f->is.numeric) config.hwp.portno = f->nvalue + 1; + else config.hwp.portno = 1; break; case key_osahwaddr: - if(*f->value) str_copy(&config.hwp.osahwaddr, f->value); + str_copy(&config.hwp.osahwaddr, f->value); break; #endif -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org