From 95a37e8513d0b7cfc601591c6568246343bfc7b20fe923f585b67370d80c10f9 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 12 Jun 2009 15:58:59 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cryptsetup?expand=0&rev=26 --- cryptsetup.changes | 5 +++++ cryptsetup.spec | 6 +++++- hashalot-glibc210.diff | 12 ++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 hashalot-glibc210.diff diff --git a/cryptsetup.changes b/cryptsetup.changes index 11f4691..10de68d 100644 --- a/cryptsetup.changes +++ b/cryptsetup.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jun 11 21:36:28 CEST 2009 - coolo@novell.com + +- fix compile with glibc 2.10 + ------------------------------------------------------------------- Thu Apr 2 09:33:22 CEST 2009 - lnussel@suse.de diff --git a/cryptsetup.spec b/cryptsetup.spec index bc9ffa4..f4e3b32 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -30,7 +30,7 @@ License: BSD 3-Clause; GPL v2 only; GPL v2 or later Group: System/Base AutoReqProv: on Version: 1.0.5_SVNr46 -Release: 63 +Release: 64 Summary: Set Up dm-crypt Based Encrypted Block Devices Source: cryptsetup-%{version}.tar.bz2 Source1: hashalot-%haver.tar.bz2 @@ -45,6 +45,7 @@ Patch12: hashalot-ctrl-d.diff Patch13: hashalot-timeout.diff Patch14: hashalot-manpage.diff Patch15: bug-476290_hashalot-hashlen.diff +Patch16: hashalot-glibc210.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: aaa_base:/etc/init.d/boot.crypto Obsoletes: util-linux-crypto <= 2.12r @@ -122,6 +123,7 @@ pushd ../hashalot-%haver %patch13 -p1 %patch14 -p1 %patch15 -p1 +%patch16 -p1 popd %build @@ -223,6 +225,8 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libcryptsetup.so %changelog +* Thu Jun 11 2009 coolo@novell.com +- fix compile with glibc 2.10 * Thu Apr 02 2009 lnussel@suse.de - boot.crypto: * resolve symlinks when searching for loop devices (bnc#490170) diff --git a/hashalot-glibc210.diff b/hashalot-glibc210.diff new file mode 100644 index 0000000..ecbec4a --- /dev/null +++ b/hashalot-glibc210.diff @@ -0,0 +1,12 @@ +Index: hashalot-0.3/hashalot.c +=================================================================== +--- hashalot-0.3.orig/hashalot.c ++++ hashalot-0.3/hashalot.c +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + + #include + #include