commit syslinux for openSUSE:Factory
Hello community,
here is the log from the commit of package syslinux for openSUSE:Factory
checked in at 2020-03-23 12:48:55
Comparing /work/SRC/openSUSE:Factory/syslinux (Old)
and /work/SRC/openSUSE:Factory/.syslinux.new.3160 (New)
Package is "syslinux"
Mon Mar 23 12:48:55 2020 rev:67 rq:786496 version:4.04
Changes:
--- /work/SRC/openSUSE:Factory/syslinux/syslinux.changes2019-02-24
17:02:54.180694515 +0100
+++ /work/SRC/openSUSE:Factory/.syslinux.new.3160/syslinux.changes
2020-03-23 12:48:57.431896006 +0100
@@ -1,0 +2,7 @@
+Thu Mar 19 14:24:57 UTC 2020 - Steffen Winterfeldt
+
+- syslinux-4.04-gcc10.diff: fix gcc10 related issues (bsc#1166605)
+ * -fno-common is now the default
+ * provide missing strlen() implementation
+
+---
New:
syslinux-4.04-gcc10.diff
Other differences:
--
++ syslinux.spec ++
--- /var/tmp/diff_new_pack.eM0xwX/_old 2020-03-23 12:48:59.907897561 +0100
+++ /var/tmp/diff_new_pack.eM0xwX/_new 2020-03-23 12:48:59.923897571 +0100
@@ -1,7 +1,7 @@
#
# spec file for package syslinux
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -62,6 +62,7 @@
Patch21:sysmacros.patch
Patch22:remove-note-gnu-section.patch
Patch23:%{name}-%{version}-lzo.diff
+Patch24:%{name}-%{version}-gcc10.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -101,6 +102,7 @@
%patch21 -p1
%patch22 -p1
%patch23 -p0
+%patch24 -p0
%build
cp %{SOURCE2} .
++ syslinux-4.04-gcc10.diff ++
--- com32/MCONFIG 2011-04-18 23:24:17.0 +0200
+++ com32/MCONFIG 2020-03-18 17:05:57.507347671 +0100
@@ -18,6 +18,7 @@
include $(topdir)/MCONFIG
GCCOPT := $(call gcc_ok,-std=gnu99,)
+GCCOPT += $(call gcc_ok,-fcommon,)
GCCOPT += $(call gcc_ok,-m32,)
GCCOPT += $(call gcc_ok,-fno-stack-protector,)
GCCOPT += $(call gcc_ok,-fwrapv,)
--- com32/lib/MCONFIG 2011-04-18 23:24:17.0 +0200
+++ com32/lib/MCONFIG 2020-03-18 17:07:39.960337684 +0100
@@ -3,6 +3,7 @@
include $(topdir)/MCONFIG
GCCOPT := $(call gcc_ok,-std=gnu99,)
+GCCOPT += $(call gcc_ok,-fcommon,)
GCCOPT += $(call gcc_ok,-m32,)
GCCOPT += $(call gcc_ok,-fno-stack-protector,)
GCCOPT += $(call gcc_ok,-fwrapv,)
--- dos/errno.h 2011-04-18 23:24:17.0 +0200
+++ dos/errno.h 2020-03-18 17:12:17.359044057 +0100
@@ -36,7 +36,7 @@
#defineEDOM33 /* Math argument out of domain of func
*/
#defineERANGE 34 /* Math result not representable */
-int errno;
+int errno __attribute__ ((common));
void perror(const char *);
#endif /* ERRNO_H */
--- gpxe/src/core/exec.c2011-04-18 23:24:17.0 +0200
+++ gpxe/src/core/exec.c2020-03-18 16:56:52.257888015 +0100
@@ -38,8 +38,8 @@
*/
/* Avoid dragging in getopt.o unless a command really uses it */
-int optind;
-int nextchar;
+extern int optind;
+extern int nextchar;
/**
* Execute command
--- gpxe/src/include/compiler.h 2011-04-18 23:24:17.0 +0200
+++ gpxe/src/include/compiler.h 2020-03-18 16:48:56.193236495 +0100
@@ -64,7 +64,7 @@
.comm _sym, 0
#else /* ASSEMBLY */
#define PROVIDE_SYMBOL( _sym ) \
- char _sym[0]
+ char _sym[0] __attribute__ ((common))
#endif /* ASSEMBLY */
/** Require a symbol within this object file
--- dos/string.h2020-03-18 17:25:50.019155261 +0100
+++ dos/string.h2020-03-19 15:10:36.310787373 +0100
@@ -5,12 +5,13 @@
#ifndef _STRING_H
#define _STRING_H
+#include
+
/* Standard routines */
#define memcpy(a,b,c) __builtin_memcpy(a,b,c)
#define memmove(a,b,c) __builtin_memmove(a,b,c)
#define memset(a,b,c) __builtin_memset(a,b,c)
#define strcpy(a,b)__builtin_strcpy(a,b)
-#define strlen(a) __builtin_strlen(a)
/* This only returns true or false */
static inline int memcmp(const void *__m1, const void *__m2, unsigned int __n)
@@ -21,6 +22,15 @@
return rv;
}
+static inline size_t strlen(const char *s)
+{
+ size_t len = 0;
+
+ while(*s++) len++;
+
+ return len;
+}
+
extern char *strchr(const char *s, int c);
#endif /* _STRING_H */
commit syslinux for openSUSE:Factory
Hello community,
here is the log from the commit of package syslinux for openSUSE:Factory
checked in at 2019-02-24 17:02:49
Comparing /work/SRC/openSUSE:Factory/syslinux (Old)
and /work/SRC/openSUSE:Factory/.syslinux.new.28833 (New)
Package is "syslinux"
Sun Feb 24 17:02:49 2019 rev:66 rq:677142 version:4.04
Changes:
--- /work/SRC/openSUSE:Factory/syslinux/syslinux.changes2018-12-03
10:03:13.636103374 +0100
+++ /work/SRC/openSUSE:Factory/.syslinux.new.28833/syslinux.changes
2019-02-24 17:02:54.180694515 +0100
@@ -1,0 +2,5 @@
+Mon Feb 18 13:53:18 UTC 2019 - snw...@suse.com
+
+- syslinux-4.04-lzo.diff: fix lzo memory aliasing issue (bsc#1125616)
+
+---
New:
syslinux-4.04-lzo.diff
Other differences:
--
++ syslinux.spec ++
--- /var/tmp/diff_new_pack.JKMde2/_old 2019-02-24 17:02:55.724693780 +0100
+++ /var/tmp/diff_new_pack.JKMde2/_new 2019-02-24 17:02:55.728693778 +0100
@@ -1,7 +1,7 @@
#
# spec file for package syslinux
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via https://bugs.opensuse.org/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
@@ -61,6 +61,7 @@
Patch20:%{name}-%{version}-python3.diff
Patch21:sysmacros.patch
Patch22:remove-note-gnu-section.patch
+Patch23:%{name}-%{version}-lzo.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -99,6 +100,7 @@
%patch20 -p0
%patch21 -p1
%patch22 -p1
+%patch23 -p0
%build
cp %{SOURCE2} .
++ syslinux-4.04-lzo.diff ++
--- lzo/Makefile
+++ lzo/Makefile
@@ -19,6 +19,8 @@
LIB = lzo.a
BINS= prepcore
+OPTFLAGS += -fno-strict-aliasing
+
all : $(BINS)
$(LIB) : $(LIBOBJS)
commit syslinux for openSUSE:Factory
Hello community,
here is the log from the commit of package syslinux for openSUSE:Factory
checked in at 2018-12-03 10:03:12
Comparing /work/SRC/openSUSE:Factory/syslinux (Old)
and /work/SRC/openSUSE:Factory/.syslinux.new.19453 (New)
Package is "syslinux"
Mon Dec 3 10:03:12 2018 rev:65 rq:652611 version:4.04
Changes:
--- /work/SRC/openSUSE:Factory/syslinux/syslinux.changes2018-11-08
09:41:32.837586702 +0100
+++ /work/SRC/openSUSE:Factory/.syslinux.new.19453/syslinux.changes
2018-12-03 10:03:13.636103374 +0100
@@ -1,0 +2,6 @@
+Wed Nov 28 09:03:05 UTC 2018 - Martin Liška
+
+- Add remove-note-gnu-section.patch: strip a newly added section
+ in order to fulfil ELF size limits expected.
+
+---
New:
remove-note-gnu-section.patch
Other differences:
--
++ syslinux.spec ++
--- /var/tmp/diff_new_pack.sRsQzW/_old 2018-12-03 10:03:15.880101329 +0100
+++ /var/tmp/diff_new_pack.sRsQzW/_new 2018-12-03 10:03:15.884101325 +0100
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -60,6 +60,7 @@
Patch19:syslinux-4.04-reproducible.patch
Patch20:%{name}-%{version}-python3.diff
Patch21:sysmacros.patch
+Patch22:remove-note-gnu-section.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -97,6 +98,7 @@
%patch19 -p1
%patch20 -p0
%patch21 -p1
+%patch22 -p1
%build
cp %{SOURCE2} .
++ remove-note-gnu-section.patch ++
diff --git a/mbr/Makefile b/mbr/Makefile
index be2bded7..59e06915 100644
--- a/mbr/Makefile
+++ b/mbr/Makefile
@@ -36,7 +36,7 @@
$(LD) $(LDFLAGS) -T mbr.ld -e _start -o $@ $<
%.bin: %.elf checksize.pl
- $(OBJCOPY) -O binary $< $@
+ $(OBJCOPY) -O binary --remove-section .note.gnu.property $< $@
$(PERL) checksize.pl $@
$(CHMOD) -x $@
commit syslinux for openSUSE:Factory
Hello community,
here is the log from the commit of package syslinux for openSUSE:Factory
checked in at 2018-11-08 09:41:28
Comparing /work/SRC/openSUSE:Factory/syslinux (Old)
and /work/SRC/openSUSE:Factory/.syslinux.new (New)
Package is "syslinux"
Thu Nov 8 09:41:28 2018 rev:64 rq:645212 version:4.04
Changes:
--- /work/SRC/openSUSE:Factory/syslinux/syslinux.changes2018-01-20
11:20:06.734887441 +0100
+++ /work/SRC/openSUSE:Factory/.syslinux.new/syslinux.changes 2018-11-08
09:41:32.837586702 +0100
@@ -1,0 +2,5 @@
+Mon Aug 6 07:35:52 UTC 2018 - sch...@suse.de
+
+- sysmacros.patch: include for major/minor
+
+---
New:
sysmacros.patch
Other differences:
--
++ syslinux.spec ++
--- /var/tmp/diff_new_pack.PthJn1/_old 2018-11-08 09:41:35.829583232 +0100
+++ /var/tmp/diff_new_pack.PthJn1/_new 2018-11-08 09:41:35.857583200 +0100
@@ -30,7 +30,7 @@
Url:http://www.syslinux.org/wiki/index.php/The_Syslinux_Project
Suggests: mtools
Summary:Boot Loader for Linux
-License:GPL-2.0+
+License:GPL-2.0-or-later
Group: System/Boot
Version:4.04
Release:0
@@ -59,6 +59,7 @@
# PATCH-FIX-UPSTREAM -- make package build reproducible
Patch19:syslinux-4.04-reproducible.patch
Patch20:%{name}-%{version}-python3.diff
+Patch21:sysmacros.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -95,6 +96,7 @@
%patch18
%patch19 -p1
%patch20 -p0
+%patch21 -p1
%build
cp %{SOURCE2} .
++ sysmacros.patch ++
>From 1a74985b2a404639b08882c57f3147229605dfd5 Mon Sep 17 00:00:00 2001
From: Mike Frysinger
Date: Tue, 19 Apr 2016 06:50:31 -0400
Subject: [PATCH] extlinux: pull in sys/sysmacros.h for major/minor/makedev
These functions are defined in sys/sysmacros.h, so add the include to
main.c. This is already handled correctly in mountinfo.c. Otherwise
we get build failures like:
main.o: In function 'find_device_sysfs':
extlinux/main.c:1131: undefined reference to 'minor'
Signed-off-by: Mike Frysinger
Signed-off-by: Gene Cumm
---
extlinux/main.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/extlinux/main.c b/extlinux/main.c
index a7ebd49a94..ebff7eae0e 100644
--- a/extlinux/main.c
+++ b/extlinux/main.c
@@ -38,6 +38,7 @@
#include
#include
#include
+#include
#include
#include
#include
--
2.19.0
commit syslinux for openSUSE:Factory
Hello community,
here is the log from the commit of package syslinux for openSUSE:Factory
checked in at 2018-01-20 11:20:04
Comparing /work/SRC/openSUSE:Factory/syslinux (Old)
and /work/SRC/openSUSE:Factory/.syslinux.new (New)
Package is "syslinux"
Sat Jan 20 11:20:04 2018 rev:63 rq:567413 version:4.04
Changes:
--- /work/SRC/openSUSE:Factory/syslinux/syslinux.changes2017-09-13
21:35:17.364370232 +0200
+++ /work/SRC/openSUSE:Factory/.syslinux.new/syslinux.changes 2018-01-20
11:20:06.734887441 +0100
@@ -1,0 +2,5 @@
+Thu Jan 18 12:57:04 CET 2018 - snw...@suse.de
+
+- syslinux-4.04-python3.diff: switch to python3 (bsc#1075769)
+
+---
New:
syslinux-4.04-python3.diff
Other differences:
--
++ syslinux.spec ++
--- /var/tmp/diff_new_pack.RhKA1H/_old 2018-01-20 11:20:08.678796563 +0100
+++ /var/tmp/diff_new_pack.RhKA1H/_new 2018-01-20 11:20:08.682796376 +0100
@@ -1,7 +1,7 @@
#
# spec file for package syslinux
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -23,7 +23,7 @@
BuildRequires: libuuid-devel
BuildRequires: nasm
BuildRequires: netpbm
-BuildRequires: python
+BuildRequires: python3
BuildRequires: xz
# lots of assembler here that would need to be changed :(
#!BuildIgnore: gcc-PIE
@@ -58,6 +58,7 @@
Patch18:%{name}-%{version}-align.diff
# PATCH-FIX-UPSTREAM -- make package build reproducible
Patch19:syslinux-4.04-reproducible.patch
+Patch20:%{name}-%{version}-python3.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -93,6 +94,7 @@
%patch17
%patch18
%patch19 -p1
+%patch20 -p0
%build
cp %{SOURCE2} .
++ syslinux-4.04-python3.diff ++
--- com32/cmenu/Makefile
+++ com32/cmenu/Makefile
@@ -37,7 +37,7 @@
.PRECIOUS: %.c
%.c: %.menu adv_menu.tpl
- python menugen.py --input=$< --output=$@ --template=adv_menu.tpl
+ python3 menugen.py --input=$< --output=$@ --template=adv_menu.tpl
all: menus
--- com32/cmenu/menugen.py
+++ com32/cmenu/menugen.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
import sys, re, getopt
@@ -100,27 +100,27 @@
if not self.entry["info"]:
self.entry["info"] = self.entry["data"]
if not self.menus:
- print "Error before line %d" % self.lineno
- print "REASON: menu must be declared before a menu item is
declared"
+ print("Error before line %d" % self.lineno)
+ print("REASON: menu must be declared before a menu item is
declared")
sys.exit(1)
self.menus[-1][1].append(self.entry)
self.init_entry()
def set_item(self,name,value):
- if not self.entry.has_key(name):
+ if not name in self.entry:
msg = ["Unknown attribute %s in line %d" % (name,self.lineno)]
msg.append("REASON: Attribute must be one of %s" % self.vattrs)
return "\n".join(msg)
- if name=="type" and not self.types.has_key(value):
+ if name=="type" and not value in self.types:
msg = [ "Unrecognized type %s in line %d" % (value,self.lineno)]
msg.append("REASON: Valid types are %s" % self.vtypes)
return "\n".join(msg)
if name=="shortcut":
- if (value <> "-1") and not re.match("^[A-Za-z0-9]$",value):
+ if (value != "-1") and not re.match("^[A-Za-z0-9]$",value):
msg = [ "Invalid shortcut char '%s' in line %d" %
(value,self.lineno) ]
msg.append("REASON: Valid values are [A-Za-z0-9]")
return "\n".join(msg)
- elif value <> "-1": value = "'%s'" % value
+ elif value != "-1": value = "'%s'" % value
elif name in ["state","helpid","ipappend"]:
try:
value = int(value)
@@ -131,14 +131,14 @@
return ""
def set_menu(self,name,value):
- if not self.menu.has_key(name):
+ if not name in self.menu:
return "Error: Unknown keyword %s" % name
self.menu[name] = value
self.menu["_updated"] = 1
return ""
def set_system(self,name,value):
- if not self.system.has_key(name):
+ if not name in self.system:
return "Error: Unknown keyword %s" % name
if name == "skipcondn":
try: # is skipcondn a number?
@@ -169,7 +169,7 @@
if not err: return
# all errors so return item's error message
- print err
+ print(err)
commit syslinux for openSUSE:Factory
Hello community,
here is the log from the commit of package syslinux for openSUSE:Factory
checked in at 2017-09-13 21:35:16
Comparing /work/SRC/openSUSE:Factory/syslinux (Old)
and /work/SRC/openSUSE:Factory/.syslinux.new (New)
Package is "syslinux"
Wed Sep 13 21:35:16 2017 rev:62 rq:523592 version:4.04
Changes:
--- /work/SRC/openSUSE:Factory/syslinux/syslinux.changes2016-06-07
23:45:12.0 +0200
+++ /work/SRC/openSUSE:Factory/.syslinux.new/syslinux.changes 2017-09-13
21:35:17.364370232 +0200
@@ -1,0 +2,6 @@
+Thu Jul 20 12:06:49 UTC 2017 - bwiedem...@suse.com
+
+- Add syslinux-4.04-reproducible.patch to sort file lists
+ to fix build-compare (boo#1041090)
+
+---
New:
syslinux-4.04-reproducible.patch
Other differences:
--
++ syslinux.spec ++
--- /var/tmp/diff_new_pack.JTUw7d/_old 2017-09-13 21:35:18.340232930 +0200
+++ /var/tmp/diff_new_pack.JTUw7d/_new 2017-09-13 21:35:18.344232367 +0200
@@ -56,6 +56,8 @@
Patch16:%{name}-%{version}-mtime.diff
Patch17:%{name}-%{version}-miniacc.diff
Patch18:%{name}-%{version}-align.diff
+# PATCH-FIX-UPSTREAM -- make package build reproducible
+Patch19:syslinux-4.04-reproducible.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -90,6 +92,7 @@
%patch16 -p1
%patch17
%patch18
+%patch19 -p1
%build
cp %{SOURCE2} .
++ syslinux-4.04-reproducible.patch ++
commit be645d7a9848847388a662f6c0f7571d52ed7a05
Author: Philippe Coval
Date: Wed Dec 17 16:46:29 2014 -0500
build: sort sources to build in a more deterministic way
It has been observed that binaries contents
are depending on the order of linked objects.
This order is caused by GNU make's wildcard function
and the position of sources on filesystem.
This change tries to prevent this kind of randomness.
Also consider building using -j1 flag
to make it even more reproductible.
Change-Id: Ie8eee7f336e6f1fa2863c4150d967afd15519f1d
Bug: http://bugzilla.syslinux.org/show_bug.cgi?id=57#related
Signed-off-by: Philippe Coval
Index: syslinux-4.04/com32/cmenu/Makefile
===
--- syslinux-4.04.orig/com32/cmenu/Makefile
+++ syslinux-4.04/com32/cmenu/Makefile
@@ -28,7 +28,7 @@ CFLAGS += -I./libmenu
LIBMENU = libmenu/syslnx.o libmenu/com32io.o libmenu/tui.o \
libmenu/menu.o libmenu/passwords.o libmenu/des.o libmenu/help.o
-CMENUS = $(patsubst %.c,%.c32,$(wildcard *.c))
+CMENUS = $(sort $(patsubst %.c,%.c32,$(wildcard *.c)))
IMENUS = $(patsubst %.menu,%.c32,$(wildcard *.menu))
MENUS = $(CMENUS) $(IMENUS)
@@ -56,7 +56,7 @@ clean: tidy menuclean libclean
rm -f *.lss *.c32 *.com
menuclean:
- rm -f $(patsubst %.menu,%.c,$(wildcard *.menu))
+ rm -f $(patsubst %.menu,%.c,$(sort $(wildcard *.menu)))
spotless: clean libclean menuclean
rm -f *~ \#*
Index: syslinux-4.04/com32/rosh/Makefile
===
--- syslinux-4.04.orig/com32/rosh/Makefile
+++ syslinux-4.04/com32/rosh/Makefile
@@ -24,7 +24,7 @@ include MCONFIG
# official release. Otherwise, substitute a hex string that is pretty much
# guaranteed to be unique to be unique from build to build.
ifndef HEXDATE
-HEXDATE := $(shell $(PERL) $(topdir)/now.pl $(SRCS) $(wildcard *.h))
+HEXDATE := $(shell $(PERL) $(topdir)/now.pl $(SRCS) $(sort $(wildcard *.h)))
endif
ifndef DATE
DATE:= $(shell sh $(topdir)/gen-id.sh $(VERSION) $(HEXDATE))
Index: syslinux-4.04/core/Makefile
===
--- syslinux-4.04.orig/core/Makefile
+++ syslinux-4.04/core/Makefile
@@ -37,10 +37,10 @@ BTARGET = kwdhash.gen \
isolinux.bin isolinux-debug.bin pxelinux.0
# All primary source files for the main syslinux files
-NASMSRC := $(wildcard *.asm)
-NASMHDR := $(wildcard *.inc)
-CSRC:= $(wildcard *.c */*.c */*/*.c)
-SSRC:= $(wildcard *.S */*.S */*/*.S)
+NASMSRC := $(sort $(wildcard *.asm))
+NASMHDR := $(sort $(wildcard *.inc))
+CSRC:= $(sort $(wildcard *.c */*.c */*/*.c))
+SSRC:= $(sort $(wildcard *.S */*.S */*/*.S))
CHDR:= $(wildcard *.h)
OTHERSRC := keywords
ALLSRC= $(NASMSRC) $(NASMHDR) $(CSRC) $(SSRC) $(CHDR) $(OTHERSRC)
Index: syslinux-4.04/gpxe/src/Makefile.housekeeping
===
--- syslinux-4.04.orig/gpxe/src/Makefile.housekeeping
+++ syslinux-4.04/gpxe/src/Makefile.housekeeping
@@ -246,9 +246,9 @@ endif
#
# BIN has the form
commit syslinux for openSUSE:Factory
Hello community, here is the log from the commit of package syslinux for openSUSE:Factory checked in at 2016-06-07 23:45:10 Comparing /work/SRC/openSUSE:Factory/syslinux (Old) and /work/SRC/openSUSE:Factory/.syslinux.new (New) Package is "syslinux" Changes: --- /work/SRC/openSUSE:Factory/syslinux/syslinux.changes2016-04-01 13:00:52.0 +0200 +++ /work/SRC/openSUSE:Factory/.syslinux.new/syslinux.changes 2016-06-07 23:45:12.0 +0200 @@ -1,0 +2,5 @@ +Fri Jun 3 10:50:47 CEST 2016 - snw...@suse.de + +- added aarch64, ppc64le to baselibs.conf (bsc#982948) + +--- Other differences: -- ++ baselibs.conf ++ --- /var/tmp/diff_new_pack.y8LV94/_old 2016-06-07 23:45:13.0 +0200 +++ /var/tmp/diff_new_pack.y8LV94/_new 2016-06-07 23:45:13.0 +0200 @@ -1,4 +1,4 @@ -arch x86_64 targets s390x:64bit +arch x86_64 targets aarch64:64bit ppc64le:64bit s390x:64bit targetname -x86_64
commit syslinux for openSUSE:Factory
Hello community,
here is the log from the commit of package syslinux for openSUSE:Factory
checked in at 2016-04-01 13:00:51
Comparing /work/SRC/openSUSE:Factory/syslinux (Old)
and /work/SRC/openSUSE:Factory/.syslinux.new (New)
Package is "syslinux"
Changes:
--- /work/SRC/openSUSE:Factory/syslinux/syslinux.changes2016-02-17
12:25:18.0 +0100
+++ /work/SRC/openSUSE:Factory/.syslinux.new/syslinux.changes 2016-04-01
13:00:52.0 +0200
@@ -1,0 +2,10 @@
+Wed Mar 16 13:56:48 CET 2016 - snw...@suse.de
+
+- syslinux-4.04-align.diff: fix section alignment (bsc#948445)
+
+---
+Tue Feb 16 09:41:32 CET 2016 - snw...@suse.de
+
+- create also s390x package (bsc#964471)
+
+---
New:
baselibs.conf
syslinux-4.04-align.diff
Other differences:
--
++ syslinux.spec ++
--- /var/tmp/diff_new_pack.zHmSJh/_old 2016-04-01 13:00:53.0 +0200
+++ /var/tmp/diff_new_pack.zHmSJh/_new 2016-04-01 13:00:53.0 +0200
@@ -37,6 +37,7 @@
Source:
https://www.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{version}.tar.bz2
Source1:isolinux-config
Source2:README.gfxboot
+Source3:baselibs.conf
Patch0: %{name}-%{version}-iso9660.diff
Patch1: %{name}-%{version}-cwd.diff
Patch2: %{name}-%{version}-noinitrd.diff
@@ -54,6 +55,7 @@
Patch15:%{name}-%{version}-cache_fix.diff
Patch16:%{name}-%{version}-mtime.diff
Patch17:%{name}-%{version}-miniacc.diff
+Patch18:%{name}-%{version}-align.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -87,6 +89,7 @@
%patch15 -p1
%patch16 -p1
%patch17
+%patch18
%build
cp %{SOURCE2} .
++ baselibs.conf ++
arch x86_64 targets s390x:64bit
targetname -x86_64
arch x86_64 package syslinux
conflicts "syslinux"
+.*
-/usr/bin/syslinux
-/usr/bin/extlinux
-/usr/bin/gethostip
-/usr/bin/isohybrid
-/usr/bin/memdiskfind
++ syslinux-4.04-align.diff ++
--- core/syslinux.ld
+++ core/syslinux.ld
@@ -263,7 +263,7 @@
__text_end = .;
}
- . = ALIGN(16);
+ . = ALIGN(32);
__rodata_vma = .;
__rodata_lma = __rodata_vma + __text_lma - __text_vma;
commit syslinux for openSUSE:Factory
Hello community,
here is the log from the commit of package syslinux for openSUSE:Factory
checked in at 2016-02-17 10:32:21
Comparing /work/SRC/openSUSE:Factory/syslinux (Old)
and /work/SRC/openSUSE:Factory/.syslinux.new (New)
Package is "syslinux"
Changes:
--- /work/SRC/openSUSE:Factory/syslinux/syslinux.changes2015-09-13
09:43:31.0 +0200
+++ /work/SRC/openSUSE:Factory/.syslinux.new/syslinux.changes 2016-02-17
12:25:18.0 +0100
@@ -1,0 +2,5 @@
+Thu Feb 11 13:43:14 UTC 2016 - rguent...@suse.com
+
+- syslinux-4.04-miniacc.diff: fixup broken conformance tests
+
+---
New:
syslinux-4.04-miniacc.diff
Other differences:
--
++ syslinux.spec ++
--- /var/tmp/diff_new_pack.uQdmp9/_old 2016-02-17 12:25:19.0 +0100
+++ /var/tmp/diff_new_pack.uQdmp9/_new 2016-02-17 12:25:19.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package syslinux
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -53,6 +53,7 @@
Patch14:%{name}-%{version}-timeout.diff
Patch15:%{name}-%{version}-cache_fix.diff
Patch16:%{name}-%{version}-mtime.diff
+Patch17:%{name}-%{version}-miniacc.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -85,6 +86,7 @@
%patch14 -p1
%patch15 -p1
%patch16 -p1
+%patch17
%build
cp %{SOURCE2} .
++ syslinux-4.04-miniacc.diff ++
Index: lzo/src/miniacc.h
===
--- lzo/src/miniacc.h.orig 2016-02-11 14:37:17.029802775 +0100
+++ lzo/src/miniacc.h 2016-02-11 14:38:38.086742103 +0100
@@ -4412,12 +4412,12 @@ ACCLIB_EXTERN(int, acc_spawnve) (int mod
#if defined(__MSDOS__) && defined(__TURBOC__) && (__TURBOC__ < 0x0150)
#elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC)
#else
-ACCCHK_ASSERT((1 << (8*SIZEOF_INT-1)) < 0)
+ACCCHK_ASSERT((int)(1u << (8*SIZEOF_INT-1)) < 0)
#endif
ACCCHK_ASSERT((1u << (8*SIZEOF_INT-1)) > 0)
#if 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC)
#else
-ACCCHK_ASSERT((1l << (8*SIZEOF_LONG-1)) < 0)
+ACCCHK_ASSERT((long)(1ul << (8*SIZEOF_LONG-1)) < 0)
#endif
ACCCHK_ASSERT((1ul << (8*SIZEOF_LONG-1)) > 0)
#if defined(acc_int16e_t)
@@ -4646,7 +4646,7 @@ ACCLIB_EXTERN(int, acc_spawnve) (int mod
#elif 1 && (ACC_CC_LCC || ACC_CC_LCCWIN32) && !defined(ACCCHK_CFG_PEDANTIC)
#elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC)
#elif !defined(ACC_BROKEN_INTEGRAL_PROMOTION) && (SIZEOF_INT > 1)
-ACCCHK_ASSERT( (((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0)
+ACCCHK_ASSERT( (int)((unsigned int)((unsigned char)128) <<
(int)(8*sizeof(int)-8)) < 0)
#endif
#if (ACC_CC_BORLANDC && (__BORLANDC__ >= 0x0530) && (__BORLANDC__ < 0x0560))
# pragma option pop
commit syslinux for openSUSE:Factory
Hello community,
here is the log from the commit of package syslinux for openSUSE:Factory
checked in at 2015-09-13 09:43:30
Comparing /work/SRC/openSUSE:Factory/syslinux (Old)
and /work/SRC/openSUSE:Factory/.syslinux.new (New)
Package is "syslinux"
Changes:
--- /work/SRC/openSUSE:Factory/syslinux/syslinux.changes2015-02-27
11:04:34.0 +0100
+++ /work/SRC/openSUSE:Factory/.syslinux.new/syslinux.changes 2015-09-13
09:43:31.0 +0200
@@ -1,0 +2,5 @@
+Fri Sep 4 10:35:04 CEST 2015 - snw...@suse.de
+
+- drop hard dependency on mtools (bsc#943571)
+
+---
Other differences:
--
++ syslinux.spec ++
--- /var/tmp/diff_new_pack.xf4l9b/_old 2015-09-13 09:43:32.0 +0200
+++ /var/tmp/diff_new_pack.xf4l9b/_new 2015-09-13 09:43:32.0 +0200
@@ -28,7 +28,7 @@
# lots of assembler here that would need to be changed :(
#!BuildIgnore: gcc-PIE
Url:http://www.syslinux.org/wiki/index.php/The_Syslinux_Project
-Requires: mtools
+Suggests: mtools
Summary:Boot Loader for Linux
License:GPL-2.0+
Group: System/Boot
@@ -95,9 +95,9 @@
make install-all \
INSTALLROOT=%{buildroot} BINDIR=%{_bindir} SBINDIR=%{_bindir} \
LIBDIR=%{_datadir} INCDIR=%{_includedir} MANDIR=%{_mandir}
-# install -s -m 755 unix/syslinux $RPM_BUILD_ROOT/%{_bindir}/syslinux-nomtools
+install -m 755 mtools/syslinux $RPM_BUILD_ROOT/%{_bindir}/syslinux-mtools
+install -m 755 linux/syslinux $RPM_BUILD_ROOT/%{_bindir}/syslinux
install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir}
-# install -m 755 keytab-lilo.pl syslinux2ansi.pl
$RPM_BUILD_ROOT/%{_datadir}/syslinux
rm -rf $RPM_BUILD_ROOT/%{_datadir}/syslinux/com32
rm -rf $RPM_BUILD_ROOT/boot
rm -rf $RPM_BUILD_ROOT/tftpboot
commit syslinux for openSUSE:Factory
Hello community, here is the log from the commit of package syslinux for openSUSE:Factory checked in at 2015-02-27 11:04:33 Comparing /work/SRC/openSUSE:Factory/syslinux (Old) and /work/SRC/openSUSE:Factory/.syslinux.new (New) Package is syslinux Changes: --- /work/SRC/openSUSE:Factory/syslinux/syslinux.changes2015-02-06 10:54:05.0 +0100 +++ /work/SRC/openSUSE:Factory/.syslinux.new/syslinux.changes 2015-02-27 11:04:34.0 +0100 @@ -1,0 +2,6 @@ +Sun Feb 22 21:02:32 UTC 2015 - meiss...@suse.com + +- Do not use gcc-PIE here, lots of assembler (cpuid etc.) that + would be hard to make ready for PIC. + +--- Other differences: -- ++ syslinux.spec ++ --- /var/tmp/diff_new_pack.vhRwPS/_old 2015-02-27 11:04:35.0 +0100 +++ /var/tmp/diff_new_pack.vhRwPS/_new 2015-02-27 11:04:35.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package syslinux # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,6 +25,8 @@ BuildRequires: netpbm BuildRequires: python BuildRequires: xz +# lots of assembler here that would need to be changed :( +#!BuildIgnore: gcc-PIE Url:http://www.syslinux.org/wiki/index.php/The_Syslinux_Project Requires: mtools Summary:Boot Loader for Linux -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit syslinux for openSUSE:Factory
Hello community,
here is the log from the commit of package syslinux for openSUSE:Factory
checked in at 2015-02-06 10:54:04
Comparing /work/SRC/openSUSE:Factory/syslinux (Old)
and /work/SRC/openSUSE:Factory/.syslinux.new (New)
Package is syslinux
Changes:
--- /work/SRC/openSUSE:Factory/syslinux/syslinux.changes2014-08-13
17:07:54.0 +0200
+++ /work/SRC/openSUSE:Factory/.syslinux.new/syslinux.changes 2015-02-06
10:54:05.0 +0100
@@ -1,0 +2,5 @@
+Wed Feb 4 16:00:26 CET 2015 - snw...@suse.de
+
+- syslinux-4.04-mtime.diff: don't use timestamps to create a unique id (bnc
#915950)
+
+---
New:
syslinux-4.04-mtime.diff
Other differences:
--
++ syslinux.spec ++
--- /var/tmp/diff_new_pack.XWKFw2/_old 2015-02-06 10:54:06.0 +0100
+++ /var/tmp/diff_new_pack.XWKFw2/_new 2015-02-06 10:54:06.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package syslinux
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -50,6 +50,7 @@
Patch13:%{name}-%{version}-nostrip.diff
Patch14:%{name}-%{version}-timeout.diff
Patch15:%{name}-%{version}-cache_fix.diff
+Patch16:%{name}-%{version}-mtime.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -81,6 +82,7 @@
%patch13 -p0
%patch14 -p1
%patch15 -p1
+%patch16 -p1
%build
cp %{SOURCE2} .
++ syslinux-4.04-mtime.diff ++
diff --git a/core/Makefile b/core/Makefile
index 33ad7e9..49ba474 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -63,7 +63,7 @@ PREPCORE = ../lzo/prepcore
# official release. Otherwise, substitute a hex string that is pretty much
# guaranteed to be unique to be unique from build to build.
ifndef HEXDATE
-HEXDATE := $(shell $(PERL) ../now.pl $(SRCS))
+HEXDATE := $(shell $(PERL) ../now.pl $(ALLSRC))
endif
ifndef DATE
DATE:= $(shell sh ../gen-id.sh $(VERSION) $(HEXDATE))
diff --git a/libinstaller/bin2c.pl b/libinstaller/bin2c.pl
index 07c11dd..2864488 100755
--- a/libinstaller/bin2c.pl
+++ b/libinstaller/bin2c.pl
@@ -71,8 +71,4 @@ if ($align != 0) {
printf \n};\n\nconst unsigned int %s_len = %u;\n, $table_name, $total_len;
-@st = stat STDIN;
-
-printf \nconst int %s_mtime = %d;\n, $table_name, $st[9];
-
exit 0;
diff --git a/libinstaller/syslinux.h b/libinstaller/syslinux.h
index 710d30e..963cafe 100644
--- a/libinstaller/syslinux.h
+++ b/libinstaller/syslinux.h
@@ -20,11 +20,9 @@
/* The standard boot sector and ldlinux image */
extern unsigned char syslinux_bootsect[];
extern const unsigned int syslinux_bootsect_len;
-extern const int syslinux_bootsect_mtime;
extern unsigned char syslinux_ldlinux[];
extern const unsigned int syslinux_ldlinux_len;
-extern const int syslinux_ldlinux_mtime;
#define boot_sectorsyslinux_bootsect
#define boot_sector_len syslinux_bootsect_len
@@ -33,7 +31,6 @@ extern const int syslinux_ldlinux_mtime;
extern unsigned char syslinux_mbr[];
extern const unsigned int syslinux_mbr_len;
-extern const int syslinux_mbr_mtime;
/* Sector size assumptions... */
#define SECTOR_SHIFT 9
diff --git a/now.pl b/now.pl
old mode 100644
new mode 100755
index a3b5a79..60c4fe0
--- a/now.pl
+++ b/now.pl
@@ -1,21 +1,22 @@
-#!/usr/bin/perl
-#
-# Print the time (possibly the mtime of a file) as a hexadecimal integer
-# If more than one file, print the mtime of the *newest* file.
-#
-
-undef $now;
-
-foreach $file ( @ARGV ) {
-($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,$atime,$mtime,
- $ctime,$blksize,$blocks) = stat($file);
-if ( !defined($now) || $now $mtime ) {
- $now = $mtime;
-}
-}
+#! /usr/bin/perl
+
+# Use checksum over all sources and source file names to create some unique id.
+
+use Digest::SHA;
+
+use strict;
-if ( !defined($now) ) {
-$now = time;
+my $digest = Digest::SHA-new(256);
+
+# print STDERR now.pl: , join( , @ARGV) , \n;
+
+for (sort @ARGV) {
+ $digest-add($_);
+ $digest-addfile($_);
}
-printf 0x%08x\n, $now;
+my $val = substr($digest-hexdigest, 0, 8);
+
+# printf STDERR now.pl: = 0x$val\n;
+
+print 0x$val\n;
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit syslinux for openSUSE:Factory
Hello community,
here is the log from the commit of package syslinux for openSUSE:Factory
checked in at 2014-08-13 17:07:51
Comparing /work/SRC/openSUSE:Factory/syslinux (Old)
and /work/SRC/openSUSE:Factory/.syslinux.new (New)
Package is syslinux
Changes:
--- /work/SRC/openSUSE:Factory/syslinux/syslinux.changes2014-03-25
13:20:04.0 +0100
+++ /work/SRC/openSUSE:Factory/.syslinux.new/syslinux.changes 2014-08-13
17:07:54.0 +0200
@@ -1,0 +2,6 @@
+Mon Aug 11 15:51:11 CEST 2014 - snw...@suse.de
+
+- syslinux-4.04-cache_fix.diff: fix memory corruption due to wrong fs cache
+ initialisation (bnc #884181)
+
+---
New:
syslinux-4.04-cache_fix.diff
Other differences:
--
++ syslinux.spec ++
--- /var/tmp/diff_new_pack.WvQi4e/_old 2014-08-13 17:07:55.0 +0200
+++ /var/tmp/diff_new_pack.WvQi4e/_new 2014-08-13 17:07:55.0 +0200
@@ -49,6 +49,7 @@
Patch12:%{name}-%{version}-geometry.diff
Patch13:%{name}-%{version}-nostrip.diff
Patch14:%{name}-%{version}-timeout.diff
+Patch15:%{name}-%{version}-cache_fix.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -79,6 +80,7 @@
%patch12 -p1
%patch13 -p0
%patch14 -p1
+%patch15 -p1
%build
cp %{SOURCE2} .
++ syslinux-4.04-cache_fix.diff ++
commit 0a0e0e41cad93cd16c323cf16f40264a21eedd6c
Author: H. Peter Anvin h...@zytor.com
Date: Thu Jul 19 07:29:55 2012 -0700
Correct initialization of the cache doubly-linked list
The initialization of the cache doubly-linked list had
head-next-prev instead of head-prev-next; this entry is supposed
to initialize the -next entry of the last entry in the list (which
points back to the head node.)
For clarity, consistently use head to refer to the head node; the
mixing of head and dev-cache_head needlessly obfuscated the code.
The wild pointer reference caused crashes on some systems.
Reported-by: Jan Safrata jsafr...@centrum.cz
Signed-off-by: H. Peter Anvin h...@zytor.com
diff --git a/core/fs/cache.c b/core/fs/cache.c
index 0d7891b..3b21fc2 100644
--- a/core/fs/cache.c
+++ b/core/fs/cache.c
@@ -37,10 +37,10 @@ void cache_init(struct device *dev, int block_size_shift)
dev-cache_head = head = (struct cache *)
(data + (dev-cache_entries block_size_shift));
-cache = dev-cache_head + 1; /* First cache descriptor */
+cache = head + 1; /* First cache descriptor */
head-prev = cache[dev-cache_entries-1];
-head-next-prev = dev-cache_head;
+head-prev-next = head;
head-block = -1;
head-data = NULL;
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit syslinux for openSUSE:Factory
Hello community,
here is the log from the commit of package syslinux for openSUSE:Factory
checked in at 2014-03-25 13:20:00
Comparing /work/SRC/openSUSE:Factory/syslinux (Old)
and /work/SRC/openSUSE:Factory/.syslinux.new (New)
Package is syslinux
Changes:
--- /work/SRC/openSUSE:Factory/syslinux/syslinux.changes2014-03-06
19:18:17.0 +0100
+++ /work/SRC/openSUSE:Factory/.syslinux.new/syslinux.changes 2014-03-25
13:20:04.0 +0100
@@ -1,0 +2,5 @@
+Fri Mar 21 13:10:04 CET 2014 - snw...@suse.de
+
+- timeout.diff: fix timeout counter to work more accurate (bnc #691211)
+
+---
New:
syslinux-4.04-timeout.diff
Other differences:
--
++ syslinux.spec ++
--- /var/tmp/diff_new_pack.6YHYNx/_old 2014-03-25 13:20:05.0 +0100
+++ /var/tmp/diff_new_pack.6YHYNx/_new 2014-03-25 13:20:05.0 +0100
@@ -48,6 +48,7 @@
Patch11:%{name}-%{version}-localboot.diff
Patch12:%{name}-%{version}-geometry.diff
Patch13:%{name}-%{version}-nostrip.diff
+Patch14:%{name}-%{version}-timeout.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -77,6 +78,7 @@
%patch11 -p1
%patch12 -p1
%patch13 -p0
+%patch14 -p1
%build
cp %{SOURCE2} .
++ syslinux-4.04-timeout.diff ++
diff --git a/core/ui.inc b/core/ui.inc
index 0a4bb56..97945c9 100644
--- a/core/ui.inc
+++ b/core/ui.inc
@@ -529,30 +529,36 @@ kernel_corrupt: mov si,err_notkernel
; which can be adjusted by the caller based on the corresponding
; master variables; on return they're updated.
;
-; This cheats. If we say no timeout we actually get a timeout of
-; 7.5 years.
-;
getchar_timeout:
call vgashowcursor
call reset_idle
.loop:
- push word [__jiffies]
+ push dword [__jiffies]
call pollchar
jnz .got_char
call do_idle
- pop ax
- cmp ax,[__jiffies] ; Has the timer advanced?
+ pop eax
+ sub eax,[__jiffies] ; Has the timer advanced?
je .loop
- dec dword [ThisKbdTo]
- jz .timeout
- dec dword [ThisTotalTo]
- jnz .loop
+ ; more than one tick may have passed, keep the diff in eax
+ neg eax
+
+ cmp dword [ThisKbdTo],0
+ jz .chk_total
+ sub [ThisKbdTo],eax
+ jbe .timeout
+
+.chk_total:
+ cmp dword [ThisTotalTo],0
+ jz .loop
+ sub [ThisTotalTo],eax
+ ja .loop
.timeout:
; Timeout
- pop cx ; Discard return address
+ pop ecx ; Discard return address
call vgahidecursor
mov si,Ontimeout; Copy ontimeout command
mov di,command_line
@@ -561,7 +567,7 @@ getchar_timeout:
jmp command_done
.got_char:
- pop cx ; Discard
+ pop ecx ; Discard
call getchar
call vgahidecursor
ret
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit syslinux for openSUSE:Factory
Hello community,
here is the log from the commit of package syslinux for openSUSE:Factory
checked in at 2014-03-06 19:18:16
Comparing /work/SRC/openSUSE:Factory/syslinux (Old)
and /work/SRC/openSUSE:Factory/.syslinux.new (New)
Package is syslinux
Changes:
--- /work/SRC/openSUSE:Factory/syslinux/syslinux.changes2013-12-19
12:37:42.0 +0100
+++ /work/SRC/openSUSE:Factory/.syslinux.new/syslinux.changes 2014-03-06
19:18:17.0 +0100
@@ -1,0 +2,5 @@
+Wed Mar 5 16:23:01 CET 2014 - snw...@suse.de
+
+- nostrip.diff: don't strip binaries
+
+---
New:
syslinux-4.04-nostrip.diff
Other differences:
--
++ syslinux.spec ++
--- /var/tmp/diff_new_pack.7HTUAK/_old 2014-03-06 19:18:18.0 +0100
+++ /var/tmp/diff_new_pack.7HTUAK/_new 2014-03-06 19:18:18.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package syslinux
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -47,6 +47,7 @@
Patch10:%{name}-%{version}-isohybrid_mbr.diff
Patch11:%{name}-%{version}-localboot.diff
Patch12:%{name}-%{version}-geometry.diff
+Patch13:%{name}-%{version}-nostrip.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -75,10 +76,10 @@
%patch10 -p1
%patch11 -p1
%patch12 -p1
+%patch13 -p0
%build
cp %{SOURCE2} .
-export CFLAGS=$RPM_OPT_FLAGS
make spotless
make
++ syslinux-4.04-nostrip.diff ++
--- utils/Makefile
+++ utils/Makefile
@@ -18,7 +18,7 @@
include $(topdir)/MCONFIG
CFLAGS = $(GCCWARN) -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64
-LDFLAGS = -O2 -s
+LDFLAGS = -O2 -g
TARGETS = mkdiskimage isohybrid gethostip memdiskfind
TARGETS += isohybrid.pl # about to be obsoleted
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit syslinux for openSUSE:Factory
Hello community,
here is the log from the commit of package syslinux for openSUSE:Factory
checked in at 2013-12-19 12:37:41
Comparing /work/SRC/openSUSE:Factory/syslinux (Old)
and /work/SRC/openSUSE:Factory/.syslinux.new (New)
Package is syslinux
Changes:
--- /work/SRC/openSUSE:Factory/syslinux/syslinux.changes2013-04-09
07:10:37.0 +0200
+++ /work/SRC/openSUSE:Factory/.syslinux.new/syslinux.changes 2013-12-19
12:37:42.0 +0100
@@ -1,0 +2,6 @@
+Thu Nov 28 16:12:44 UTC 2013 - rha...@suse.com
+
+- geometry.diff: Fix segfault caused by a bug in geometry handling
+ (bnc#852856)
+
+---
New:
syslinux-4.04-geometry.diff
Other differences:
--
++ syslinux.spec ++
--- /var/tmp/diff_new_pack.1KIH7T/_old 2013-12-19 12:37:43.0 +0100
+++ /var/tmp/diff_new_pack.1KIH7T/_new 2013-12-19 12:37:43.0 +0100
@@ -46,6 +46,7 @@
Patch9: %{name}-%{version}-isohybrid_efi_optional.diff
Patch10:%{name}-%{version}-isohybrid_mbr.diff
Patch11:%{name}-%{version}-localboot.diff
+Patch12:%{name}-%{version}-geometry.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -73,6 +74,7 @@
%patch9 -p1
%patch10 -p1
%patch11 -p1
+%patch12 -p1
%build
cp %{SOURCE2} .
++ syslinux-4.04-geometry.diff ++
From 73cd9bf26066cad0d4a483e31e1d89802a7ca1f9 Mon Sep 17 00:00:00 2001
From: Gene Cumm gene.c...@gmail.com
Date: Wed, 11 May 2011 16:03:30 +
Subject: extlinux/main.c: Fix geometry handling
1) ioctl HDIO_GETGEO expects a pointer to a struct hd_geometry
2) struct stat's st_dev is the parent file used; st_rdev is what we want
Reported-by: Michael Tokarev m...@tls.msk.ru
Tested-By: Michael Tokarev m...@tls.msk.ru
Signed-off-by: Gene Cumm gene.c...@gmail.com
---
(limited to 'extlinux/main.c')
diff --git a/extlinux/main.c b/extlinux/main.c
index e5212a9..6aa6202 100755
--- a/extlinux/main.c
+++ b/extlinux/main.c
@@ -112,7 +112,7 @@ static int sysfs_get_offset(int devfd, unsigned long *start)
if ((size_t)snprintf(sysfs_name, sizeof sysfs_name,
/sys/dev/block/%u:%u/start,
-major(st.st_dev), minor(st.st_dev))
+major(st.st_rdev), minor(st.st_rdev))
= sizeof sysfs_name)
return -1;
@@ -153,7 +153,7 @@ int get_geometry(int devfd, uint64_t totalbytes, struct
hd_geometry *geo)
memset(geo, 0, sizeof *geo);
-if (!ioctl(devfd, HDIO_GETGEO, geo)) {
+if (!ioctl(devfd, HDIO_GETGEO, geo)) {
goto ok;
} else if (!ioctl(devfd, FDGETPRM, fd_str)) {
geo-heads = fd_str.head;
--
cgit v0.9.2
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit syslinux for openSUSE:Factory
Hello community,
here is the log from the commit of package syslinux for openSUSE:Factory
checked in at 2013-04-09 07:10:33
Comparing /work/SRC/openSUSE:Factory/syslinux (Old)
and /work/SRC/openSUSE:Factory/.syslinux.new (New)
Package is syslinux, Maintainer is snw...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/syslinux/syslinux.changes2013-03-12
06:57:53.0 +0100
+++ /work/SRC/openSUSE:Factory/.syslinux.new/syslinux.changes 2013-04-09
07:10:37.0 +0200
@@ -1,0 +2,5 @@
+Fri Apr 5 11:03:29 UTC 2013 - idon...@suse.com
+
+- Add Source URL, see https://en.opensuse.org/SourceUrls
+
+---
Other differences:
--
++ syslinux.spec ++
--- /var/tmp/diff_new_pack.a7kYzs/_old 2013-04-09 07:10:39.0 +0200
+++ /var/tmp/diff_new_pack.a7kYzs/_new 2013-04-09 07:10:39.0 +0200
@@ -25,14 +25,14 @@
BuildRequires: netpbm
BuildRequires: python
BuildRequires: xz
-Url:http://syslinux.zytor.com/
+Url:http://www.syslinux.org/wiki/index.php/The_Syslinux_Project
Requires: mtools
Summary:Boot Loader for Linux
License:GPL-2.0+
Group: System/Boot
Version:4.04
Release:0
-Source: %{name}-%{version}.tar.bz2
+Source:
https://www.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{version}.tar.bz2
Source1:isolinux-config
Source2:README.gfxboot
Patch0: %{name}-%{version}-iso9660.diff
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit syslinux for openSUSE:Factory
Hello community,
here is the log from the commit of package syslinux for openSUSE:Factory
checked in at 2013-03-12 06:57:51
Comparing /work/SRC/openSUSE:Factory/syslinux (Old)
and /work/SRC/openSUSE:Factory/.syslinux.new (New)
Package is syslinux, Maintainer is snw...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/syslinux/syslinux.changes2013-03-01
21:03:23.0 +0100
+++ /work/SRC/openSUSE:Factory/.syslinux.new/syslinux.changes 2013-03-12
06:57:53.0 +0100
@@ -1,0 +2,5 @@
+Mon Mar 4 14:58:22 CET 2013 - snw...@suse.de
+
+- localboot.diff: -2 boots next disk (bnc #807157)
+
+---
New:
syslinux-4.04-localboot.diff
Other differences:
--
++ syslinux.spec ++
--- /var/tmp/diff_new_pack.kZWDhB/_old 2013-03-12 06:57:55.0 +0100
+++ /var/tmp/diff_new_pack.kZWDhB/_new 2013-03-12 06:57:55.0 +0100
@@ -45,6 +45,7 @@
Patch8: %{name}-%{version}-isohybrid_efi.diff
Patch9: %{name}-%{version}-isohybrid_efi_optional.diff
Patch10:%{name}-%{version}-isohybrid_mbr.diff
+Patch11:%{name}-%{version}-localboot.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -71,6 +72,7 @@
%patch8 -p0
%patch9 -p1
%patch10 -p1
+%patch11 -p1
%build
cp %{SOURCE2} .
++ syslinux-4.04-localboot.diff ++
diff --git a/core/localboot.inc b/core/localboot.inc
index 1fe3102..30f34fc 100644
--- a/core/localboot.inc
+++ b/core/localboot.inc
@@ -33,6 +33,15 @@ local_boot:
cmp ax,-1
je .int18
+ cmp ax,-2
+ jne .load
+
+ mov al,[DriveNumber]
+ cmp al,80h
+ mov al,80h
+ jnz .load
+ inc ax
+.load:
; Load boot sector from the specified BIOS device and jump to
it.
mov dl,al
xor dh,dh
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit syslinux for openSUSE:Factory
Hello community,
here is the log from the commit of package syslinux for openSUSE:Factory
checked in at 2013-03-01 20:45:23
Comparing /work/SRC/openSUSE:Factory/syslinux (Old)
and /work/SRC/openSUSE:Factory/.syslinux.new (New)
Package is syslinux, Maintainer is snw...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/syslinux/syslinux.changes2013-02-18
14:00:13.0 +0100
+++ /work/SRC/openSUSE:Factory/.syslinux.new/syslinux.changes 2013-03-01
20:45:27.0 +0100
@@ -1,0 +2,5 @@
+Thu Feb 28 16:00:50 CET 2013 - snw...@suse.de
+
+- isohybrid_mbr.diff: write only mbr unless explicitly specified otherwise
+
+---
New:
syslinux-4.04-isohybrid_mbr.diff
Other differences:
--
++ syslinux.spec ++
--- /var/tmp/diff_new_pack.jq1RtH/_old 2013-03-01 20:45:38.0 +0100
+++ /var/tmp/diff_new_pack.jq1RtH/_new 2013-03-01 20:45:38.0 +0100
@@ -44,6 +44,7 @@
Patch7: %{name}-%{version}-gcc47.diff
Patch8: %{name}-%{version}-isohybrid_efi.diff
Patch9: %{name}-%{version}-isohybrid_efi_optional.diff
+Patch10:%{name}-%{version}-isohybrid_mbr.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -69,6 +70,7 @@
%patch7 -p0
%patch8 -p0
%patch9 -p1
+%patch10 -p1
%build
cp %{SOURCE2} .
++ syslinux-4.04-isohybrid_mbr.diff ++
diff --git a/utils/isohybrid.c b/utils/isohybrid.c
index 09f4520..954b5ed 100644
--- a/utils/isohybrid.c
+++ b/utils/isohybrid.c
@@ -653,12 +653,10 @@ initialise_mbr(uint8_t *mbr)
continue;
}
-if (i == 1)
-mbr[0] = 0x80;
-
if (i == part_data)
{
chs = ofs2chs(offset);
+mbr[0] = 0x80;
mbr[1] = chs 8;
mbr[2] = chs 16;
mbr[3] = chs 24;
@@ -945,7 +943,7 @@ main(int argc, char *argv[])
}
if (!(mode (MODE_MBR | MODE_GPT))) {
-mode |= (mode EFI) ? MODE_GPT : MODE_MBR;
+mode |= MODE_MBR;
}
if ((mode EFI) !offset) type = 0;
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit syslinux for openSUSE:Factory
Hello community,
here is the log from the commit of package syslinux for openSUSE:Factory
checked in at 2013-02-05 11:20:47
Comparing /work/SRC/openSUSE:Factory/syslinux (Old)
and /work/SRC/openSUSE:Factory/.syslinux.new (New)
Package is syslinux, Maintainer is snw...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/syslinux/syslinux.changes2012-06-01
07:24:33.0 +0200
+++ /work/SRC/openSUSE:Factory/.syslinux.new/syslinux.changes 2013-02-05
11:20:49.0 +0100
@@ -1,0 +2,12 @@
+Tue Feb 5 08:17:03 CET 2013 - snw...@suse.de
+
+- fixed BuildRequires
+
+---
+Mon Feb 4 14:29:58 CET 2013 - snw...@suse.de
+
+- update isohybrid and mbr gpt boot code with versions from syslinux-5.00
+- fix gpt code in isohybrid and adjust to create a valid partition table for
+ our new media layout
+
+---
Old:
syslinux-4.04-isohybrid-hex-option-parsing.diff
New:
syslinux-4.04-isohybrid_efi.diff
Other differences:
--
++ syslinux.spec ++
--- /var/tmp/diff_new_pack.42GoQa/_old 2013-02-05 11:20:50.0 +0100
+++ /var/tmp/diff_new_pack.42GoQa/_new 2013-02-05 11:20:50.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package syslinux
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,6 +20,7 @@
ExclusiveArch: %ix86 x86_64
BuildRequires: libext2fs-devel
BuildRequires: libpng-devel
+BuildRequires: libuuid-devel
BuildRequires: nasm
BuildRequires: netpbm
BuildRequires: python
@@ -38,10 +39,10 @@
Patch1: %{name}-%{version}-cwd.diff
Patch2: %{name}-%{version}-noinitrd.diff
Patch3: %{name}-%{version}-mboot_bootif.diff
-Patch4: %{name}-%{version}-isohybrid-hex-option-parsing.diff
Patch5: %{name}-%{version}-md5pass.diff
Patch6: %{name}-%{version}-libext2fs.diff
Patch7: %{name}-%{version}-gcc47.diff
+Patch8: %{name}-%{version}-isohybrid_efi.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -62,10 +63,10 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
%patch5 -p1
%patch6 -p0
%patch7 -p0
+%patch8 -p0
%build
cp %{SOURCE2} .
++ syslinux-4.04-isohybrid_efi.diff ++
1102 lines (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit syslinux for openSUSE:Factory
Hello community,
here is the log from the commit of package syslinux for openSUSE:Factory
checked in at 2012-05-16 21:10:33
Comparing /work/SRC/openSUSE:Factory/syslinux (Old)
and /work/SRC/openSUSE:Factory/.syslinux.new (New)
Package is syslinux, Maintainer is snw...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/syslinux/syslinux.changes2012-05-08
12:29:18.0 +0200
+++ /work/SRC/openSUSE:Factory/.syslinux.new/syslinux.changes 2012-05-16
21:10:39.0 +0200
@@ -1,0 +2,5 @@
+Tue May 15 13:31:20 CEST 2012 - snw...@suse.de
+
+- gcc47 fix: use .init_array section instead of .ctors
+
+---
New:
syslinux-4.04-gcc47.diff
Other differences:
--
++ syslinux.spec ++
--- /var/tmp/diff_new_pack.a0VGuP/_old 2012-05-16 21:10:43.0 +0200
+++ /var/tmp/diff_new_pack.a0VGuP/_new 2012-05-16 21:10:43.0 +0200
@@ -40,6 +40,7 @@
Patch4: %{name}-%{version}-isohybrid-hex-option-parsing.diff
Patch5: %{name}-%{version}-md5pass.diff
Patch6: %{name}-%{version}-umode.diff
+Patch7: %{name}-%{version}-gcc47.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -63,6 +64,7 @@
%patch4 -p1
%patch5 -p1
%patch6 -p0
+%patch7 -p0
%build
cp %{SOURCE2} .
++ syslinux-4.04-gcc47.diff ++
--- com32/lib/sys/entry.S
+++ com32/lib/sys/entry.S
@@ -92,8 +92,8 @@
pushl %eax # Save argc
/* Look for library initialization functions */
- leal __ctors_start@GOTOFF(%ebx),%esi
- leal __ctors_end@GOTOFF(%ebx),%edi
+ leal __init_array_start@GOTOFF(%ebx),%esi
+ leal __init_array_end@GOTOFF(%ebx),%edi
6:
cmpl %edi,%esi
jae 7f
--- com32/lib/sys/exit.S
+++ com32/lib/sys/exit.S
@@ -17,9 +17,9 @@
#endif
/* Run any destructors */
- movl $__dtors_start, %esi
+ movl $__fini_array_start, %esi
2:
- cmpl $__dtors_end, %esi
+ cmpl $__fini_array_end, %esi
jae 1f
call *(%esi)
addl $4,%esi
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit syslinux for openSUSE:Factory
Hello community,
here is the log from the commit of package syslinux for openSUSE:Factory
checked in at 2012-05-08 12:29:14
Comparing /work/SRC/openSUSE:Factory/syslinux (Old)
and /work/SRC/openSUSE:Factory/.syslinux.new (New)
Package is syslinux, Maintainer is snw...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/syslinux/syslinux.changes2011-09-23
12:47:16.0 +0200
+++ /work/SRC/openSUSE:Factory/.syslinux.new/syslinux.changes 2012-05-08
12:29:18.0 +0200
@@ -1,0 +2,5 @@
+Tue May 8 11:22:14 CEST 2012 - snw...@suse.de
+
+- fix build with latest kernel headers
+
+---
New:
syslinux-4.04-umode.diff
Other differences:
--
++ syslinux.spec ++
--- /var/tmp/diff_new_pack.NRaGyq/_old 2012-05-08 12:29:19.0 +0200
+++ /var/tmp/diff_new_pack.NRaGyq/_new 2012-05-08 12:29:19.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package syslinux
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,18 +16,20 @@
#
-
Name: syslinux
ExclusiveArch: %ix86 x86_64
-BuildRequires: libpng-devel nasm netpbm python xz
+BuildRequires: libpng-devel
+BuildRequires: nasm
+BuildRequires: netpbm
+BuildRequires: python
+BuildRequires: xz
Url:http://syslinux.zytor.com/
-License:GPL-2.0+
-Group: System/Boot
Requires: mtools
-AutoReqProv:on
Summary:Boot Loader for Linux
+License:GPL-2.0+
+Group: System/Boot
Version:4.04
-Release:10
+Release:0
Source: %{name}-%{version}.tar.bz2
Source1:isolinux-config
Source2:README.gfxboot
@@ -37,6 +39,7 @@
Patch3: %{name}-%{version}-mboot_bootif.diff
Patch4: %{name}-%{version}-isohybrid-hex-option-parsing.diff
Patch5: %{name}-%{version}-md5pass.diff
+Patch6: %{name}-%{version}-umode.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -59,6 +62,7 @@
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p0
%build
cp %{SOURCE2} .
++ syslinux-4.04-umode.diff ++
--- libinstaller/linuxioctl.h 2011-04-18 23:24:17.0 +0200
+++ libinstaller/linuxioctl.h 2012-05-08 11:20:12.864813538 +0200
@@ -19,6 +19,7 @@
#undef SECTOR_SIZE /* Defined in msdos_fs.h for no good reason */
#undef SECTOR_BITS
+typedef unsigned short umode_t;/* moved into __KERNEL__ */
#include linux/ext2_fs.h /* EXT2_IOC_* */
#ifndef FAT_IOCTL_GET_ATTRIBUTES
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit syslinux for openSUSE:Factory
Hello community, here is the log from the commit of package syslinux for openSUSE:Factory checked in at 2011-12-06 19:06:52 Comparing /work/SRC/openSUSE:Factory/syslinux (Old) and /work/SRC/openSUSE:Factory/.syslinux.new (New) Package is syslinux, Maintainer is snw...@suse.com Changes: Other differences: -- ++ syslinux.spec ++ --- /var/tmp/diff_new_pack.gDOauD/_old 2011-12-06 19:40:46.0 +0100 +++ /var/tmp/diff_new_pack.gDOauD/_new 2011-12-06 19:40:46.0 +0100 @@ -21,7 +21,7 @@ ExclusiveArch: %ix86 x86_64 BuildRequires: libpng-devel nasm netpbm python xz Url:http://syslinux.zytor.com/ -License:GPLv2+ +License:GPL-2.0+ Group: System/Boot Requires: mtools AutoReqProv:on -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit syslinux for openSUSE:Factory
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.0 +0200
+++ /mounts/work_src_done/STABLE/syslinux/syslinux.changes 2011-07-26
11:48:21.0 +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.0 +0200
+++ /var/tmp/diff_new_pack.E21XI0/_new 2011-07-26 13:46:25.0 +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.0 +0200
+++ /var/tmp/diff_new_pack.E21XI0/_new 2011-07-26 13:46:25.0 +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, sector) || sector 1 || sector 63)
-+if (!sscanf(optarg, %hhi, sector) || 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
commit syslinux for openSUSE:Factory
Hello community,
here is the log from the commit of package syslinux for openSUSE:Factory
checked in at Wed Jun 22 12:38:36 CEST 2011.
--- syslinux/syslinux.changes 2011-06-09 11:33:38.0 +0200
+++ /mounts/work_src_done/STABLE/syslinux/syslinux.changes 2011-06-22
11:41:57.0 +0200
@@ -1,0 +2,5 @@
+Tue Jun 21 16:36:27 CEST 2011 - snw...@suse.de
+
+- don't use Crypt::PasswdMD5 (bnc #701279, bnc #475370)
+
+---
calling whatdependson for head-i586
New:
_service:format_spec_file:syslinux.spec
syslinux-4.04-md5pass.diff
Other differences:
--
++ _service:format_spec_file:syslinux.spec ++
#
# spec file for package syslinux
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An Open Source License is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: syslinux
ExclusiveArch: %ix86 x86_64
BuildRequires: libpng-devel nasm netpbm python xz
Url:http://syslinux.zytor.com/
License:GPLv2+
Group: System/Boot
Requires: mtools
AutoReqProv:on
Summary:Boot Loader for Linux
Version:4.04
Release:6
Source: %{name}-%{version}.tar.bz2
Source1:isolinux-config
Source2:README.gfxboot
Patch0: %{name}-%{version}-iso9660.diff
Patch1: %{name}-%{version}-cwd.diff
Patch2: %{name}-%{version}-noinitrd.diff
Patch3: %{name}-%{version}-mboot_bootif.diff
Patch4: %{name}-%{version}-isohybrid-hex-option-parsing.diff
Patch5: %{name}-%{version}-md5pass.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
SYSLINUX is a boot loader for the Linux operating system which operates
off an MS-DOS or Windows FAT file system. It is intended to simplify
first-time installation of Linux and for creation of rescue and other
special purpose boot disks.
Authors:
H. Peter Anvin h...@zytor.com
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%build
cp %{SOURCE2} .
export CFLAGS=$RPM_OPT_FLAGS
make spotless
make
%install
make install-all \
INSTALLROOT=%{buildroot} BINDIR=%{_bindir} SBINDIR=%{_bindir} \
LIBDIR=%{_datadir} INCDIR=%{_includedir} MANDIR=%{_mandir}
# install -s -m 755 unix/syslinux $RPM_BUILD_ROOT/%{_bindir}/syslinux-nomtools
install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir}
# install -m 755 keytab-lilo.pl syslinux2ansi.pl
$RPM_BUILD_ROOT/%{_datadir}/syslinux
rm -rf $RPM_BUILD_ROOT/%{_datadir}/syslinux/com32
rm -rf $RPM_BUILD_ROOT/boot
rm -rf $RPM_BUILD_ROOT/tftpboot
%files
%defattr(-,root,root)
%doc doc/*.txt
%doc README* NEWS
%doc %{_mandir}/man1/*
%{_bindir}/*
%{_datadir}/syslinux
%changelog
++ syslinux.spec ++
--- /var/tmp/diff_new_pack.Ohqj1V/_old 2011-06-22 12:37:45.0 +0200
+++ /var/tmp/diff_new_pack.Ohqj1V/_new 2011-06-22 12:37:45.0 +0200
@@ -27,7 +27,7 @@
AutoReqProv:on
Summary:Boot Loader for Linux
Version:4.04
-Release:6
+Release:8
Source: %{name}-%{version}.tar.bz2
Source1:isolinux-config
Source2:README.gfxboot
@@ -36,6 +36,7 @@
Patch2: %{name}-%{version}-noinitrd.diff
Patch3: %{name}-%{version}-mboot_bootif.diff
Patch4: %{name}-%{version}-isohybrid-hex-option-parsing.diff
+Patch5: %{name}-%{version}-md5pass.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -57,6 +58,7 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
%build
cp %{SOURCE2} .
++ syslinux-4.04-md5pass.diff ++
--- a/utils/md5pass
+++ b/utils/md5pass
@@ -1,7 +1,6 @@
#!/usr/bin/perl
use bytes;
-use Crypt::PasswdMD5;
use MIME::Base64;
sub random_bytes($) {
@@ -31,4 +30,4 @@ unless (defined($salt)) {
$salt =~ tr/\+/./; # . not +
}
-print unix_md5_crypt($pass, $salt), \n;
+print crypt($pass, \$1\$$salt\$), \n;
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit syslinux for openSUSE:Factory
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.0 +0200
+++ /mounts/work_src_done/STABLE/syslinux/syslinux.changes 2011-06-09
11:33:38.0 +0200
@@ -1,0 +2,5 @@
+Thu Jun 9 11:32:40 CEST 2011 - snw...@suse.de
+
+- 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.0 +0200
+++ /var/tmp/diff_new_pack.2YZ230/_new 2011-06-09 12:20:48.0 +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, sector) || sector 1 || sector 63)
+if (!sscanf(optarg, %hhi, sector) || 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: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit syslinux for openSUSE:Factory
Hello community, here is the log from the commit of package syslinux for openSUSE:Factory checked in at Wed Apr 27 15:16:26 CEST 2011. --- syslinux/syslinux.changes 2010-04-27 18:00:02.0 +0200 +++ /mounts/work_src_done/STABLE/syslinux/syslinux.changes 2011-04-20 11:28:59.0 +0200 @@ -1,0 +2,179 @@ +Wed Apr 20 11:27:23 CEST 2011 - snw...@suse.de + +- adrian: mboot: replicate BOOTIF option for all modules + +--- +Tue Apr 19 15:29:10 CEST 2011 - snw...@suse.de + +- handle case where a separate initrd config line is used instead of an + initrd= kernel option + +--- +Tue Apr 19 10:48:40 CEST 2011 - snw...@suse.de + +- update to version 4.04 + * PXELINUX: Fix handling of unqualified DNS names. + * PXELINUX: Fix timer bug when PXELINUX might be unloaded +(Gene Cumm). + * core/writedec.inc: Fix duplicate declaration and overflow +(Gene Cumm). + * GCC 4.5 fixes. + * sample directory: Fix Makefile include (Gene Cumm). + * ver.com: New universal DOS/COMBOOT application to display +version information (includes DRMK) (Gene Cumm). + * rosh.c32: updated; Using getopt() for internal commands to aid +parsing options; Fix bugs in ls; add warm reboot and echo +(Gene Cumm). + * com32: fix a file descriptor leak. + * gfxboot.c32: handle TEXT..ENDTEXT; error out on no LABELs +found (Sebastian Herbszt). + * Fix booting on non-partitioned devices. + * MBR, isohybrid: Workaround for a BIOS issue on Acer +Travelmate and possibly other machines. + * COM32: Adding ACPI parsing libary + * HDT: Release 0.4.1 to support ACPI parsing, +improved mutli-core/cpu reporting + * LUA: Updating to 5.1.4-2 + * SYSLINUX: core/diskstart.inc: Reset DS after checksum in case +it isn't 0 (Gene Cumm). + * win64: Script update for additional mingw compiler names +(Gene Cumm). + * diag: New directory for diagnostic-related tools. Add a +handoff MBR/VBR and geometry display images (Gene Cumm). + * MEMDISK: use mem= parameter to mark available memory above +this point as reserved (core already does alignment) (Gene Cumm). + * MEMDISK: Additional disk probe checks and debug output +(Shao Miller, Gene Cumm). + * gpxe: add gpxelinuxk.0, based off of undionly.kpxe + new +script (Gene Cumm). + * isohybrid: install the isohdpfx*.bin/isohdppx*.bin files to +make isohybrid images in one step with GNU xorriso. + * PXELINUX: disable a hack that would make localboot work on +some machines, but break just about as many. Some machines +which worked with localboot 0 in previous versions may +need localboot -1 in this one. If you have a machine +which requires localboot -1, a copy of the dmidecode +or sysdump output would be appreciated. + * Include a set of diagnostics by Gene Cumm. + * Fixes for gcc 4.6 and binutils 2.21.51. + * chain.c32: Allow uuid as a synonym to guid. + * Handle directory names starting with .. for vfat and +iso9660. + * New MENU HIDDENKEY command to provide a one-keystroke way to +activate a boot option from a hidden menu intro screen. + + +--- +Mon Apr 18 17:35:01 CEST 2011 - snw...@suse.de + +- update to version 4.03 + * Major code base changes; all filesystem rewritten in C. +This work was done primarily by Liu Aleaxander (Yuanhan Liu). + * Better support for booting from MBRs which don't pass +handover information. + * EXTLINUX: Try to be smarter about finding the partition +offset. + * chain.c32: support chainloading Dell Real Mode Kernel (Gene +Cumm). + * chain.c32: fix booting in CHS mode. + * Fix the -s option to the syslinux/extlinux installer (Arwin +Vosselman). + * isohybrid: fix padding of large images (PJ Pandit). + * SYSLINUX: correctly handle the case where the -d option is +specified with a non-absolute path, i.e. syslinux -d +syslinux instead of syslinux -d /syslinux. + * ISOLINUX: recognize the directory names /boot/syslinux and +/syslinux, and the filename syslinux.cfg in addition to the +isolinux-specific names. Thus, syslinux.cfg is now a +generic name, whereas isolinux.cfg or extlinux.conf is +specific to different derivative. + * chain.c32: support setting alternate config filename for +stage2 of GRUB Legacy (Gert Hulselmans). + * whichsys.c32: execute specific command, based on Syslinux +bootloader variant (Gert Hulselmans). + * lua.c32: a lot of new bindings added to the syslinux +namespace: VESA, PCI, DMI, kernel loading (Marcel Ritter). + * btrfs: print a comprehensive error message if compressed or +encrypted files are encountered (neither is currently +supported.) + * SYSLINUX: mtools installer: honor TMPDIR, error out on disk +full. + * Handle fallbacks from EDD to CHS, to deal with systems
