[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. f3caa6f19bad0837eb71727a82863c55eef89693

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. f3caa6f19bad0837eb71727a82863c55eef89693

[git]

[-- Attachment #1: Type: text/plain, Size: 3370 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".

The branch, master has been updated
       via  f3caa6f19bad0837eb71727a82863c55eef89693 (commit)
       via  8c34b38484b5d21ac4d61a5c08220f753c26f473 (commit)
      from  43bdff8136ea385ae6e5423d2b4c5b3ea2afedde (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f3caa6f19bad0837eb71727a82863c55eef89693
Merge: 43bdff8 8c34b38
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun May 27 19:48:20 2012 +0200

    Merge remote-tracking branch 'stevee/cryptsetup-luks'

commit 8c34b38484b5d21ac4d61a5c08220f753c26f473
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Sun May 27 16:43:49 2012 +0200

    cryptsetup-luks: Update to 1.4.2.
    
    The new cryptsetup-luks is required to build systemd-183.
    I've also add a compat package for the old 1.1.0 libcryptsetup.

-----------------------------------------------------------------------

Summary of changes:
 cryptsetup-luks/cryptsetup-luks.nm |   39 +++++++++++++++++++++++++++++++----
 1 files changed, 34 insertions(+), 5 deletions(-)

Difference in files:
diff --git a/cryptsetup-luks/cryptsetup-luks.nm b/cryptsetup-luks/cryptsetup-luks.nm
index d57dea9..d39a75f 100644
--- a/cryptsetup-luks/cryptsetup-luks.nm
+++ b/cryptsetup-luks/cryptsetup-luks.nm
@@ -4,8 +4,10 @@
 ###############################################################################
 
 name       = cryptsetup-luks
-version    = 1.1.0
-release    = 3
+version    = 1.4.2
+release    = 1
+
+compat_version = 1.1.0
 
 groups     = System/Filesystems
 url        = http://cryptsetup.googlecode.com/
@@ -13,12 +15,15 @@ license    = GPLv2+
 summary    = A utility for setting up encrypted filesystems.
 
 description
-	This package contains cryptsetup, a utility for setting up \
+	This package contains cryptsetup, a utility for setting up
 	encrypted filesystems using Device Mapper and the dm-crypt target.
 end
 
-source_dl  =
-sources    = cryptsetup-%{version}.tar.bz2
+source_dl  = http://cryptsetup.googlecode.com/files/
+
+sources    = \
+	cryptsetup-%{version}.tar.bz2 \
+	cryptsetup-%{compat_version}.tar.bz2
 
 build
 	requires
@@ -33,11 +38,35 @@ build
 
 	configure_options += \
 		--disable-static
+
+	# Build compat version of libcryptsetup.
+	build_cmds
+		cd %{DIR_SRC}/cryptsetup-%{compat_version}
+		./configure \
+			%{configure_options}
+
+		make %{PARALELLISMFLAGS}
+	end
+
+	install_cmds
+		# Install compat version of libcyptsetup.
+		cd %{DIR_SRC}/cryptsetup-%{compat_version}
+		install -m 644 lib/.libs/libcryptsetup.so.1.0.0 %{BUILDROOT}%{libdir}
+		ln -svf libcryptsetup.so.1.0.0 %{BUILDROOT}%{libdir}/libcryptsetup.so.1	
+	end
 end
 
 packages
 	package %{name}
 
+	package %{name}-compat
+		summary = Compat libraries of %{thisapp}.
+
+		files
+			%{libdir}/libcryptsetup.so.1*
+		end
+	end
+
 	package %{name}-devel
 		template DEVEL
 	end


hooks/post-receive
--
IPFire 3.x development tree