From 0ea294216b541afbc4d6fff1767244ff72debea3e98e97c3db275028f6a8bff7 Mon Sep 17 00:00:00 2001
From: Sascha Peilicke <null@suse.de>
Date: Wed, 22 Jun 2011 10:38:29 +0000
Subject: [PATCH] Accepting request 74300 from system:install:head

- don't use Crypt::PasswdMD5 (bnc #701279, bnc #475370)

OBS-URL: https://build.opensuse.org/request/show/74300
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/syslinux?expand=0&rev=34
---
 syslinux-4.04-md5pass.diff | 16 ++++++++++++++++
 syslinux.changes           |  5 +++++
 syslinux.spec              |  2 ++
 3 files changed, 23 insertions(+)
 create mode 100644 syslinux-4.04-md5pass.diff

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} .