From 7ca906ccc905e2c573718012a899c2051c27d5cd518579e0c134fe3eb7772141 Mon Sep 17 00:00:00 2001
From: Steffen Winterfeldt <snwint@suse.com>
Date: Wed, 22 Jun 2011 09:41:58 +0000
Subject: [PATCH] - 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 <hpa@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
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} .