From ea43e1383b9fcee899796fc54b727186d0b66450df5b41306d6f211addeaac4e Mon Sep 17 00:00:00 2001 From: Stephan Kleine Date: Sat, 26 Jun 2010 19:08:28 +0000 Subject: [PATCH 1/3] Accepting request 42090 from home:jengelh:smp Copy from home:jengelh:smp/cryptsetup via accept of submit request 42090 revision 2. Request was accepted with message: Reviewed ok OBS-URL: https://build.opensuse.org/request/show/42090 OBS-URL: https://build.opensuse.org/package/show/security/cryptsetup?expand=0&rev=47 --- cryptsetup.changes | 5 +++++ cryptsetup.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/cryptsetup.changes b/cryptsetup.changes index 23bc11f..2bac3d4 100644 --- a/cryptsetup.changes +++ b/cryptsetup.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/cryptsetup.spec b/cryptsetup.spec index 2da2a11..01f7930 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -138,14 +138,14 @@ CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%_prefix --mandir=%_mandir \ --bindir=/sbin --sbindir=/sbin \ --disable-static --enable-shared \ --enable-selinux -make %{?jobs:-j%jobs} +make %{?_smp_mflags} # # hashalot build pushd ../hashalot-%haver autoreconf -f -i %{?suse_update_config:%{suse_update_config}} CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%_prefix --sbindir=/sbin --mandir=%_mandir -make %{?jobs:-j%jobs} +make %{?_smp_mflags} popd %install From 301bfdeb77b09c30213218d7b6e8e28ef99bf4ae171edb1a21a0c4ea10fbf188 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Thu, 1 Jul 2010 14:26:39 +0000 Subject: [PATCH 2/3] - skip temporary mappings in early stage as chmod needs to be called on the mounted file systems (bnc#591704) OBS-URL: https://build.opensuse.org/package/show/security/cryptsetup?expand=0&rev=48 --- ...mp-mappings-in-early-stage-bnc-591704.diff | 25 +++++++++++++++++++ cryptsetup.changes | 6 +++++ cryptsetup.spec | 4 +++ 3 files changed, 35 insertions(+) create mode 100644 0001-skip-tmp-mappings-in-early-stage-bnc-591704.diff diff --git a/0001-skip-tmp-mappings-in-early-stage-bnc-591704.diff b/0001-skip-tmp-mappings-in-early-stage-bnc-591704.diff new file mode 100644 index 0000000..d42abf1 --- /dev/null +++ b/0001-skip-tmp-mappings-in-early-stage-bnc-591704.diff @@ -0,0 +1,25 @@ +From 3533bf2521a9829d7042f604dcac39c9dc472b43 Mon Sep 17 00:00:00 2001 +From: Ludwig Nussel +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 + diff --git a/cryptsetup.changes b/cryptsetup.changes index 2bac3d4..920c383 100644 --- a/cryptsetup.changes +++ b/cryptsetup.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/cryptsetup.spec b/cryptsetup.spec index 01f7930..7347913 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -48,6 +48,7 @@ Patch13: hashalot-timeout.diff Patch14: hashalot-manpage.diff Patch15: bug-476290_hashalot-hashlen.diff Patch16: hashalot-glibc210.diff +Patch20: 0001-skip-tmp-mappings-in-early-stage-bnc-591704.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: aaa_base:/etc/init.d/boot.crypto Obsoletes: util-linux-crypto <= 2.12r @@ -127,6 +128,9 @@ pushd ../hashalot-%haver %patch15 -p1 %patch16 -p1 popd +pushd ../boot.crypto-%bcver +%patch20 -p1 +popd %build # cryptsetup build From 67c60021f0d6e5030916278fbb975a5d9954114855e614340e7f7ddb1d4efa3c Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 2 Jul 2010 14:03:05 +0000 Subject: [PATCH 3/3] Updating link to change in openSUSE:Factory/cryptsetup revision 47.0 OBS-URL: https://build.opensuse.org/package/show/security/cryptsetup?expand=0&rev=25ba328380f13946ae882def1d2670db --- cryptsetup.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cryptsetup.spec b/cryptsetup.spec index 7347913..477b150 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -30,7 +30,7 @@ License: GPLv2+ Group: System/Base AutoReqProv: on Version: 1.1.2 -Release: 1 +Release: 2 Summary: Set Up dm-crypt Based Encrypted Block Devices Source: http://cryptsetup.googlecode.com/files/cryptsetup-%{version}.tar.bz2 Source1: http://cryptsetup.googlecode.com/files/cryptsetup-%{version}.tar.bz2.asc