Hello community,
here is the log from the commit of package syslinux for openSUSE:Factory
checked in at Tue Jul 26 13:46:51 CEST 2011.
--------
--- syslinux/syslinux.changes 2011-06-22 11:41:57.000000000 +0200
+++ /mounts/work_src_done/STABLE/syslinux/syslinux.changes 2011-07-26
11:48:21.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Jul 26 11:46:59 CEST 2011 - snw...@suse.de
+
+- take isohybrid from 4.05 (bnc #708043)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
_service:format_spec_file:syslinux.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ syslinux.spec ++++++
--- /var/tmp/diff_new_pack.E21XI0/_old 2011-07-26 13:46:25.000000000 +0200
+++ /var/tmp/diff_new_pack.E21XI0/_new 2011-07-26 13:46:25.000000000 +0200
@@ -27,7 +27,7 @@
AutoReqProv: on
Summary: Boot Loader for Linux
Version: 4.04
-Release: 8
+Release: 10
Source: %{name}-%{version}.tar.bz2
Source1: isolinux-config
Source2: README.gfxboot
++++++ syslinux-4.04-isohybrid-hex-option-parsing.diff ++++++
--- /var/tmp/diff_new_pack.E21XI0/_old 2011-07-26 13:46:25.000000000 +0200
+++ /var/tmp/diff_new_pack.E21XI0/_new 2011-07-26 13:46:25.000000000 +0200
@@ -1,56 +1,57 @@
diff --git a/utils/isohybrid.c b/utils/isohybrid.c
-index 7ee9a7f..e6c50ef 100644
+index 7ee9a7f..8a60531 100644
--- a/utils/isohybrid.c
+++ b/utils/isohybrid.c
-@@ -135,32 +135,32 @@ check_option(int argc, char *argv[])
+@@ -108,6 +108,7 @@ printh(void)
+ int
+ check_option(int argc, char *argv[])
+ {
++ char *err = NULL;
+ int n = 0, ind = 0;
+
+ const char optstr[] = ":h:s:e:o:t:i:fcp?vV";
+@@ -135,32 +136,38 @@ 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)
++ head = strtoul(optarg, &err, 0);
++ if (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)
++ sector = strtoul(optarg, &err, 0);
++ if (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)
++ entry = strtoul(optarg, &err, 0);
++ if (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)
++ offset = strtoul(optarg, &err, 0);
++ if (*err || 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)
++ type = strtoul(optarg, &err, 0);
++ if (*err || type > 255)
errx(1, "invalid type: `%s', 0 <= type <= 255", optarg);
break;
case 'i':
- if (!sscanf(optarg, "%u", &id))
-+ if (!sscanf(optarg, "%i", &id))
++ id = strtoul(optarg, &err, 0);
++ if (*err)
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: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
