From 6a12689f786f4dee5c202b06183e982a91b6c8cdc4726b03935580eb058c1488 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 9 Jun 2011 10:21:36 +0000 Subject: [PATCH 1/5] Updating link to change in openSUSE:Factory/syslinux revision 33.0 OBS-URL: https://build.opensuse.org/package/show/system:install:head/syslinux?expand=0&rev=c0579764a49eedd57e1a7460a662b57e --- syslinux.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syslinux.spec b/syslinux.spec index 0b5c21f..ad98722 100644 --- a/syslinux.spec +++ b/syslinux.spec @@ -27,7 +27,7 @@ Requires: mtools 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 From 7ca906ccc905e2c573718012a899c2051c27d5cd518579e0c134fe3eb7772141 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Wed, 22 Jun 2011 09:41:58 +0000 Subject: [PATCH 2/5] - don't use Crypt::PasswdMD5 (bnc #701279, bnc #475370) OBS-URL: https://build.opensuse.org/package/show/system:install:head/syslinux?expand=0&rev=33 --- _service:format_spec_file:syslinux.spec | 94 +++++++++++++++++++++++++ syslinux-4.04-md5pass.diff | 16 +++++ syslinux.changes | 5 ++ syslinux.spec | 2 + 4 files changed, 117 insertions(+) create mode 100644 _service:format_spec_file:syslinux.spec create mode 100644 syslinux-4.04-md5pass.diff diff --git a/_service:format_spec_file:syslinux.spec b/_service:format_spec_file:syslinux.spec new file mode 100644 index 0000000..3e6d03e --- /dev/null +++ b/_service:format_spec_file:syslinux.spec @@ -0,0 +1,94 @@ +# +# 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 + +%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 diff --git a/syslinux-4.04-md5pass.diff b/syslinux-4.04-md5pass.diff new file mode 100644 index 0000000..b3c7e12 --- /dev/null +++ b/syslinux-4.04-md5pass.diff @@ -0,0 +1,16 @@ +--- 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"; diff --git a/syslinux.changes b/syslinux.changes index 4db7ddc..332b74d 100644 --- a/syslinux.changes +++ b/syslinux.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jun 21 16:36:27 CEST 2011 - snwint@suse.de + +- don't use Crypt::PasswdMD5 (bnc #701279, bnc #475370) + ------------------------------------------------------------------- Thu Jun 9 11:32:40 CEST 2011 - snwint@suse.de diff --git a/syslinux.spec b/syslinux.spec index ad98722..cbc6cfa 100644 --- a/syslinux.spec +++ b/syslinux.spec @@ -36,6 +36,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 +Patch5: %{name}-%{version}-md5pass.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -57,6 +58,7 @@ Authors: %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build cp %{SOURCE2} . From a9b9c98289e37a7cfd97fb0072632f9b8a71a4392cce1d90a65a0f9d0ebe6c2c Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 22 Jun 2011 10:38:30 +0000 Subject: [PATCH 3/5] Accepting request 74300 from system:install:head baserev update by copy to link target OBS-URL: https://build.opensuse.org/request/show/74300 OBS-URL: https://build.opensuse.org/package/show/system:install:head/syslinux?expand=0&rev=34 --- _service:format_spec_file:syslinux.spec | 94 ------------------------- 1 file changed, 94 deletions(-) delete mode 100644 _service:format_spec_file:syslinux.spec diff --git a/_service:format_spec_file:syslinux.spec b/_service:format_spec_file:syslinux.spec deleted file mode 100644 index 3e6d03e..0000000 --- a/_service:format_spec_file:syslinux.spec +++ /dev/null @@ -1,94 +0,0 @@ -# -# 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 - -%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 From b2a3e9a447ae99afa81ad9d791b1f5d5369be447f24ea4e3da93c100ad984dea Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 22 Jun 2011 10:38:40 +0000 Subject: [PATCH 4/5] Updating link to change in openSUSE:Factory/syslinux revision 35.0 OBS-URL: https://build.opensuse.org/package/show/system:install:head/syslinux?expand=0&rev=2949c2c049d6169f8528eeeac7d7afbf --- _service:format_spec_file:syslinux.spec | 94 +++++++++++++++++++++++++ syslinux.spec | 2 +- 2 files changed, 95 insertions(+), 1 deletion(-) create mode 100644 _service:format_spec_file:syslinux.spec diff --git a/_service:format_spec_file:syslinux.spec b/_service:format_spec_file:syslinux.spec new file mode 100644 index 0000000..3e6d03e --- /dev/null +++ b/_service:format_spec_file:syslinux.spec @@ -0,0 +1,94 @@ +# +# 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 + +%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 diff --git a/syslinux.spec b/syslinux.spec index cbc6cfa..c9406e3 100644 --- a/syslinux.spec +++ b/syslinux.spec @@ -27,7 +27,7 @@ Requires: mtools 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 From 642a17fa6cee073f794f2a1feb9fb25594894686a4c795ea8f6dec2e2573cc5d Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Tue, 26 Jul 2011 09:48:21 +0000 Subject: [PATCH 5/5] - take isohybrid from 4.05 (bnc #708043) OBS-URL: https://build.opensuse.org/package/show/system:install:head/syslinux?expand=0&rev=35 --- _service:format_spec_file:syslinux.spec | 94 ------------------- ...nux-4.04-isohybrid-hex-option-parsing.diff | 43 ++++----- syslinux.changes | 5 + 3 files changed, 27 insertions(+), 115 deletions(-) delete mode 100644 _service:format_spec_file:syslinux.spec diff --git a/_service:format_spec_file:syslinux.spec b/_service:format_spec_file:syslinux.spec deleted file mode 100644 index 3e6d03e..0000000 --- a/_service:format_spec_file:syslinux.spec +++ /dev/null @@ -1,94 +0,0 @@ -# -# 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 - -%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 diff --git a/syslinux-4.04-isohybrid-hex-option-parsing.diff b/syslinux-4.04-isohybrid-hex-option-parsing.diff index dbaa3db..d60cdb8 100644 --- a/syslinux-4.04-isohybrid-hex-option-parsing.diff +++ b/syslinux-4.04-isohybrid-hex-option-parsing.diff @@ -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 - diff --git a/syslinux.changes b/syslinux.changes index 332b74d..578aff0 100644 --- a/syslinux.changes +++ b/syslinux.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 26 11:46:59 CEST 2011 - snwint@suse.de + +- take isohybrid from 4.05 (bnc #708043) + ------------------------------------------------------------------- Tue Jun 21 16:36:27 CEST 2011 - snwint@suse.de