Hello community, here is the log from the commit of package syslinux for openSUSE:Factory checked in at Thu Jun 9 12:21:34 CEST 2011.
-------- --- syslinux/syslinux.changes 2011-04-20 11:28:59.000000000 +0200 +++ /mounts/work_src_done/STABLE/syslinux/syslinux.changes 2011-06-09 11:33:38.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jun 9 11:32:40 CEST 2011 - [email protected] + +- fix isohybrid option parsing (bnc #697389) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- syslinux-4.04-isohybrid-hex-option-parsing.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ syslinux.spec ++++++ --- /var/tmp/diff_new_pack.2YZ230/_old 2011-06-09 12:20:48.000000000 +0200 +++ /var/tmp/diff_new_pack.2YZ230/_new 2011-06-09 12:20:48.000000000 +0200 @@ -27,7 +27,7 @@ AutoReqProv: on Summary: Boot Loader for Linux Version: 4.04 -Release: 1 +Release: 6 Source: %{name}-%{version}.tar.bz2 Source1: isolinux-config Source2: README.gfxboot @@ -35,6 +35,7 @@ Patch1: %{name}-%{version}-cwd.diff Patch2: %{name}-%{version}-noinitrd.diff Patch3: %{name}-%{version}-mboot_bootif.diff +Patch4: %{name}-%{version}-isohybrid-hex-option-parsing.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -55,6 +56,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build cp %{SOURCE2} . ++++++ syslinux-4.04-isohybrid-hex-option-parsing.diff ++++++ diff --git a/utils/isohybrid.c b/utils/isohybrid.c index 7ee9a7f..e6c50ef 100644 --- a/utils/isohybrid.c +++ b/utils/isohybrid.c @@ -135,32 +135,32 @@ check_option(int argc, char *argv[]) switch (n) { case 'h': - if (!sscanf(optarg, "%hu", &head) || head < 1 || head > 256) + if (!sscanf(optarg, "%hi", &head) || head < 1 || head > 256) errx(1, "invalid head: `%s', 1 <= head <= 256", optarg); break; case 's': - if (!sscanf(optarg, "%hhu", §or) || sector < 1 || sector > 63) + if (!sscanf(optarg, "%hhi", §or) || sector < 1 || sector > 63) errx(1, "invalid sector: `%s', 1 <= sector <= 63", optarg); break; case 'e': - if (!sscanf(optarg, "%hhu", &entry) || entry < 1 || entry > 4) + if (!sscanf(optarg, "%hhi", &entry) || entry < 1 || entry > 4) errx(1, "invalid entry: `%s', 1 <= entry <= 4", optarg); break; case 'o': - if (!sscanf(optarg, "%hhu", &offset) || offset > 64) + if (!sscanf(optarg, "%hhi", &offset) || offset > 64) errx(1, "invalid offset: `%s', 0 <= offset <= 64", optarg); break; case 't': - if (!sscanf(optarg, "%hu", &type) || type > 255) + if (!sscanf(optarg, "%hi", &type) || type > 255) errx(1, "invalid type: `%s', 0 <= type <= 255", optarg); break; case 'i': - if (!sscanf(optarg, "%u", &id)) + if (!sscanf(optarg, "%i", &id)) errx(1, "invalid id: `%s'", optarg); break; diff --git a/utils/isohybrid.h b/utils/isohybrid.h index 826e90c..eecf1ca 100644 --- a/utils/isohybrid.h +++ b/utils/isohybrid.h @@ -20,7 +20,7 @@ * */ -#define VERSION "0.11" +#define VERSION "0.12" #define BUFSIZE 2048 #define MBRSIZE 432 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
