From acdb37a416a843f4b3bdf69a64592b13216ddc16461a9701c40e99d2a26796c9 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 9 Jul 2012 21:33:52 +0000 Subject: [PATCH 1/2] Accepting request 127399 from home:babelworx:ldig:branches:security MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit license update: SUSE-GPL-2.0-with-openssl-exception and LGPL-2.0+ cryÃptsetup developers use a special exception to link against openSSL OBS-URL: https://build.opensuse.org/request/show/127399 OBS-URL: https://build.opensuse.org/package/show/security/cryptsetup?expand=0&rev=88 --- cryptsetup.changes | 6 ++++++ cryptsetup.spec | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/cryptsetup.changes b/cryptsetup.changes index 66ea7fb..6cdd5a5 100644 --- a/cryptsetup.changes +++ b/cryptsetup.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jul 9 09:37:43 UTC 2012 - cfarrell@suse.com + +- license update: SUSE-GPL-2.0-with-openssl-exception and LGPL-2.0+ + cryÃptsetup developers use a special exception to link against openSSL + ------------------------------------------------------------------- Fri Jun 15 12:41:00 UTC 2012 - lnussel@suse.de diff --git a/cryptsetup.spec b/cryptsetup.spec index d76af8f..81aad46 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -28,7 +28,7 @@ BuildRequires: libtool %define haver 0.3 # boot.crypto version %define bcver 0_201206151440 -License: GPL-2.0+ +License: SUSE-GPL-2.0-with-openssl-exception and LGPL-2.0+ Group: System/Base Version: 1.4.2 Release: 1 @@ -66,7 +66,7 @@ includes support for automatically setting up encrypted volumes at boot time via the config file /etc/crypttab. %package -n libcryptsetup4 -License: GPL-2.0+ +License: SUSE-GPL-2.0-with-openssl-exception and LGPL-2.0+ Summary: Set Up dm-crypt Based Encrypted Block Devices Group: System/Base @@ -78,7 +78,7 @@ includes support for automatically setting up encrypted volumes at boot time via the config file /etc/crypttab. %package -n libcryptsetup-devel -License: GPL-2.0+ +License: SUSE-GPL-2.0-with-openssl-exception and LGPL-2.0+ Summary: Set Up dm-crypt Based Encrypted Block Devices Group: Development/Libraries/C and C++ # cryptsetup-devel last used 11.1 From b9c271feebeab59c291b11580760da2cbb56d492c57ce2a3c87d05ea80bc2232 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Tue, 10 Jul 2012 06:28:35 +0000 Subject: [PATCH 2/2] cryptsetup developers use a special exception to link against openSSL OBS-URL: https://build.opensuse.org/package/show/security/cryptsetup?expand=0&rev=89 --- cryptsetup.changes | 2 +- cryptsetup.spec | 22 ++++++++++++++-------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/cryptsetup.changes b/cryptsetup.changes index 6cdd5a5..d2dfe1f 100644 --- a/cryptsetup.changes +++ b/cryptsetup.changes @@ -2,7 +2,7 @@ Mon Jul 9 09:37:43 UTC 2012 - cfarrell@suse.com - license update: SUSE-GPL-2.0-with-openssl-exception and LGPL-2.0+ - cryÃptsetup developers use a special exception to link against openSSL + cryptsetup developers use a special exception to link against openSSL ------------------------------------------------------------------- Fri Jun 15 12:41:00 UTC 2012 - lnussel@suse.de diff --git a/cryptsetup.spec b/cryptsetup.spec index 81aad46..d14959d 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -21,19 +21,23 @@ Name: cryptsetup Url: http://code.google.com/p/cryptsetup/ -BuildRequires: device-mapper-devel e2fsprogs-devel libgcrypt-devel popt-devel -BuildRequires: libselinux-devel pkgconfig +BuildRequires: device-mapper-devel +BuildRequires: e2fsprogs-devel +BuildRequires: libgcrypt-devel +BuildRequires: libselinux-devel BuildRequires: libtool +BuildRequires: pkgconfig +BuildRequires: popt-devel # hashalot version %define haver 0.3 # boot.crypto version %define bcver 0_201206151440 -License: SUSE-GPL-2.0-with-openssl-exception and LGPL-2.0+ -Group: System/Base Version: 1.4.2 -Release: 1 +Release: 0 #Release: %{?beta:0.}.%{?beta:.}%{?beta} Summary: Set Up dm-crypt Based Encrypted Block Devices +License: SUSE-GPL-2.0-with-openssl-exception and LGPL-2.0+ +Group: System/Base Source: http://cryptsetup.googlecode.com/files/cryptsetup-%{ver}.tar.bz2 Source1: http://cryptsetup.googlecode.com/files/cryptsetup-%{ver}.tar.bz2.asc Source2: baselibs.conf @@ -66,7 +70,6 @@ includes support for automatically setting up encrypted volumes at boot time via the config file /etc/crypttab. %package -n libcryptsetup4 -License: SUSE-GPL-2.0-with-openssl-exception and LGPL-2.0+ Summary: Set Up dm-crypt Based Encrypted Block Devices Group: System/Base @@ -78,14 +81,17 @@ includes support for automatically setting up encrypted volumes at boot time via the config file /etc/crypttab. %package -n libcryptsetup-devel -License: SUSE-GPL-2.0-with-openssl-exception and LGPL-2.0+ Summary: Set Up dm-crypt Based Encrypted Block Devices Group: Development/Libraries/C and C++ # cryptsetup-devel last used 11.1 Provides: cryptsetup-devel = %{version} Obsoletes: cryptsetup-devel < %{version} +Requires: device-mapper-devel +Requires: e2fsprogs-devel +Requires: glibc-devel Requires: libcryptsetup4 = %{version} -Requires: device-mapper-devel libgcrypt-devel libgpg-error-devel e2fsprogs-devel glibc-devel +Requires: libgcrypt-devel +Requires: libgpg-error-devel %description -n libcryptsetup-devel cryptsetup is used to conveniently set up dm-crypt based device-mapper