Mailinglist Archive: opensuse-commit (914 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

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.000000000 +0200
+++ /mounts/work_src_done/STABLE/syslinux/syslinux.changes      2011-06-22 
11:41:57.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Jun 21 16:36:27 CEST 2011 - snwint@xxxxxxx
+
+- 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 <hpa@xxxxxxxxx>

%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.000000000 +0200
+++ /var/tmp/diff_new_pack.Ohqj1V/_new  2011-06-22 12:37:45.000000000 +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+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx