forked from pool/cryptsetup
Accepting request 42377 from security
Copy from security/cryptsetup based on submit request 42377 from user lnussel OBS-URL: https://build.opensuse.org/request/show/42377 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cryptsetup?expand=0&rev=47
This commit is contained in:
commit
ecc34e04ae
25
0001-skip-tmp-mappings-in-early-stage-bnc-591704.diff
Normal file
25
0001-skip-tmp-mappings-in-early-stage-bnc-591704.diff
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
From 3533bf2521a9829d7042f604dcac39c9dc472b43 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ludwig Nussel <ludwig.nussel@suse.de>
|
||||||
|
Date: Thu, 1 Jul 2010 16:18:13 +0200
|
||||||
|
Subject: [PATCH] skip 'tmp' mappings in early stage (bnc#591704)
|
||||||
|
|
||||||
|
---
|
||||||
|
boot.crypto.functions | 2 +-
|
||||||
|
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/boot.crypto.functions b/boot.crypto.functions
|
||||||
|
index 977c589..db9185b 100755
|
||||||
|
--- a/boot.crypto.functions
|
||||||
|
+++ b/boot.crypto.functions
|
||||||
|
@@ -602,7 +602,7 @@ start_crypttab ()
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
|
||||||
|
- if test "$CRYPT_EARLY" = "yes" -a "$noearly" = "yes"; then
|
||||||
|
+ if test "$CRYPT_EARLY" = "yes" -a \( "$noearly" = "yes" -o "$maketmp" = "yes" \); then
|
||||||
|
report 5 "$name... will be set up later"
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
--
|
||||||
|
1.7.1
|
||||||
|
|
@ -1,3 +1,14 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Jul 1 14:27:12 UTC 2010 - lnussel@suse.de
|
||||||
|
|
||||||
|
- skip temporary mappings in early stage as chmod needs to be called
|
||||||
|
on the mounted file systems (bnc#591704)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Sat Jun 26 10:07:24 UTC 2010 - jengelh@medozas.de
|
||||||
|
|
||||||
|
- Use %_smp_mflags
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon May 31 09:42:27 UTC 2010 - lnussel@suse.de
|
Mon May 31 09:42:27 UTC 2010 - lnussel@suse.de
|
||||||
|
|
||||||
|
@ -30,7 +30,7 @@ License: GPLv2+
|
|||||||
Group: System/Base
|
Group: System/Base
|
||||||
AutoReqProv: on
|
AutoReqProv: on
|
||||||
Version: 1.1.2
|
Version: 1.1.2
|
||||||
Release: 1
|
Release: 2
|
||||||
Summary: Set Up dm-crypt Based Encrypted Block Devices
|
Summary: Set Up dm-crypt Based Encrypted Block Devices
|
||||||
Source: http://cryptsetup.googlecode.com/files/cryptsetup-%{version}.tar.bz2
|
Source: http://cryptsetup.googlecode.com/files/cryptsetup-%{version}.tar.bz2
|
||||||
Source1: http://cryptsetup.googlecode.com/files/cryptsetup-%{version}.tar.bz2.asc
|
Source1: http://cryptsetup.googlecode.com/files/cryptsetup-%{version}.tar.bz2.asc
|
||||||
@ -48,6 +48,7 @@ Patch13: hashalot-timeout.diff
|
|||||||
Patch14: hashalot-manpage.diff
|
Patch14: hashalot-manpage.diff
|
||||||
Patch15: bug-476290_hashalot-hashlen.diff
|
Patch15: bug-476290_hashalot-hashlen.diff
|
||||||
Patch16: hashalot-glibc210.diff
|
Patch16: hashalot-glibc210.diff
|
||||||
|
Patch20: 0001-skip-tmp-mappings-in-early-stage-bnc-591704.diff
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
Provides: aaa_base:/etc/init.d/boot.crypto
|
Provides: aaa_base:/etc/init.d/boot.crypto
|
||||||
Obsoletes: util-linux-crypto <= 2.12r
|
Obsoletes: util-linux-crypto <= 2.12r
|
||||||
@ -127,6 +128,9 @@ pushd ../hashalot-%haver
|
|||||||
%patch15 -p1
|
%patch15 -p1
|
||||||
%patch16 -p1
|
%patch16 -p1
|
||||||
popd
|
popd
|
||||||
|
pushd ../boot.crypto-%bcver
|
||||||
|
%patch20 -p1
|
||||||
|
popd
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# cryptsetup build
|
# cryptsetup build
|
||||||
@ -138,14 +142,14 @@ CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%_prefix --mandir=%_mandir \
|
|||||||
--bindir=/sbin --sbindir=/sbin \
|
--bindir=/sbin --sbindir=/sbin \
|
||||||
--disable-static --enable-shared \
|
--disable-static --enable-shared \
|
||||||
--enable-selinux
|
--enable-selinux
|
||||||
make %{?jobs:-j%jobs}
|
make %{?_smp_mflags}
|
||||||
#
|
#
|
||||||
# hashalot build
|
# hashalot build
|
||||||
pushd ../hashalot-%haver
|
pushd ../hashalot-%haver
|
||||||
autoreconf -f -i
|
autoreconf -f -i
|
||||||
%{?suse_update_config:%{suse_update_config}}
|
%{?suse_update_config:%{suse_update_config}}
|
||||||
CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%_prefix --sbindir=/sbin --mandir=%_mandir
|
CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%_prefix --sbindir=/sbin --mandir=%_mandir
|
||||||
make %{?jobs:-j%jobs}
|
make %{?_smp_mflags}
|
||||||
popd
|
popd
|
||||||
|
|
||||||
%install
|
%install
|
||||||
|
Loading…
Reference in New Issue
Block a user