From 7afc5387240733c8c8da9848662776dcf38308f716e5173a8ffb6629dae1bc04 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Thu, 18 Jan 2018 11:57:41 +0000 Subject: [PATCH 1/2] - switch to python3 (bsc#1075769) OBS-URL: https://build.opensuse.org/package/show/system:install:head/syslinux?expand=0&rev=92 --- syslinux-4.04-python3.diff | 148 +++++++++++++++++++++++++++++++++++++ syslinux.changes | 5 ++ syslinux.spec | 6 +- 3 files changed, 157 insertions(+), 2 deletions(-) create mode 100644 syslinux-4.04-python3.diff diff --git a/syslinux-4.04-python3.diff b/syslinux-4.04-python3.diff new file mode 100644 index 0000000..f095f14 --- /dev/null +++ b/syslinux-4.04-python3.diff @@ -0,0 +1,148 @@ +--- 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) + sys.exit(1) + + def print_entry(self,entry,fd): +@@ -211,9 +211,9 @@ + + missing = None + for x in self.reqd_templates: +- if not self.templates.has_key(x): missing = x ++ if not x in self.templates: missing = x + if missing: +- print "Template %s required but not defined in %s" % (missing,self.code_template_filename) ++ print("Template %s required but not defined in %s" % (missing,self.code_template_filename)) + + if filename == "-": + fd = sys.stdout +@@ -227,8 +227,8 @@ + fd.write(self.templates["footer"]) + fd.close() + if not self.foundmain: +- print "main menu not found" +- print self.menus ++ print("main menu not found") ++ print(self.menus) + sys.exit(1) + + def input(self,filename): +@@ -259,26 +259,26 @@ + # add property of current entry + pos = line.find("=") # find the first = in string + if pos < 0: +- print "Syntax error in line %d" % self.lineno +- print "REASON: non-section lines must be of the form ATTRIBUTE=VALUE" ++ print("Syntax error in line %d" % self.lineno) ++ print("REASON: non-section lines must be of the form ATTRIBUTE=VALUE") + sys.exit(1) + attr = line[:pos].strip().lower() + value = line[pos+1:].strip() + self.set(attr,value) + except: +- print "Error while parsing line %d: %s" % (self.lineno,line) ++ print("Error while parsing line %d: %s" % (self.lineno,line)) + raise + fd.close() + self.add_item() + + def usage(): +- print sys.argv[0]," [options]" +- print "--input= is the name of the .menu file declaring the menu structure" +- print "--output= is the name of generated C source" +- print "--template= is the name of template to be used" +- print +- print "input and output default to - (stdin and stdout respectively)" +- print "template defaults to adv_menu.tpl" ++ print(sys.argv[0]," [options]") ++ print("--input= is the name of the .menu file declaring the menu structure") ++ print("--output= is the name of generated C source") ++ print("--template= is the name of template to be used") ++ print() ++ print("input and output default to - (stdin and stdout respectively)") ++ print("template defaults to adv_menu.tpl") + sys.exit(1) + + def main(): +@@ -287,7 +287,7 @@ + ofile = "-" + opts,args = getopt.getopt(sys.argv[1:], "hi:o:t:",["input=","output=","template=","help"]) + if args: +- print "Unknown options %s" % args ++ print("Unknown options %s" % args) + usage() + for o,a in opts: + if o in ["-i","--input"]: diff --git a/syslinux.changes b/syslinux.changes index 4ffcabd..6acedd8 100644 --- a/syslinux.changes +++ b/syslinux.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 18 12:57:04 CET 2018 - snwint@suse.de + +- switch to python3 (bsc#1075769) + ------------------------------------------------------------------- Thu Jul 20 12:06:49 UTC 2017 - bwiedemann@suse.com diff --git a/syslinux.spec b/syslinux.spec index 2485a9f..e677acb 100644 --- a/syslinux.spec +++ b/syslinux.spec @@ -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: libpng-devel 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 @@ Patch17: %{name}-%{version}-miniacc.diff 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 @@ Authors: %patch17 %patch18 %patch19 -p1 +%patch20 -p0 %build cp %{SOURCE2} . From e61ec138b3a1e1a6250046cd12b166d8c6db080607318e982c2ff868d97763df Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Thu, 18 Jan 2018 12:32:39 +0000 Subject: [PATCH 2/2] - syslinux-4.04-python3.diff: switch to python3 (bsc#1075769) OBS-URL: https://build.opensuse.org/package/show/system:install:head/syslinux?expand=0&rev=93 --- syslinux.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syslinux.changes b/syslinux.changes index 6acedd8..dc7cbe1 100644 --- a/syslinux.changes +++ b/syslinux.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Thu Jan 18 12:57:04 CET 2018 - snwint@suse.de -- switch to python3 (bsc#1075769) +- syslinux-4.04-python3.diff: switch to python3 (bsc#1075769) ------------------------------------------------------------------- Thu Jul 20 12:06:49 UTC 2017 - bwiedemann@suse.com