Fix linux-4 compatibility, bug#547182, thanks to Hank Leininger

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xBF20DC51

diff --git a/sys-fs/loop-aes/ChangeLog b/sys-fs/loop-aes/ChangeLog
index de23bf221acaa178af65e8ccac03f93e89b32592..79398c352d3ec6b5243b7565232207ca8328ff6e 100644 (file)
--- a/sys-fs/loop-aes/ChangeLog
+++ b/sys-fs/loop-aes/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/loop-aes
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/loop-aes/ChangeLog,v 1.110 2015/02/13 20:35:13 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/loop-aes/ChangeLog,v 1.111 2015/05/06 19:58:05 alonbl Exp $
+
+  06 May 2015; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/loop-aes-3.7c-linux4.patch, loop-aes-3.7c.ebuild:
+  Fix linux-4 compatibility, bug#547182, thanks to Hank Leininger
 
 *loop-aes-3.7c (13 Feb 2015)
 

diff --git a/sys-fs/loop-aes/Manifest b/sys-fs/loop-aes/Manifest
index 916523c5286be6714b20a36a2f8d7ae66f450b59..7e24b3e2a9eff7f604860e125d01b42e30cb808c 100644 (file)
--- a/sys-fs/loop-aes/Manifest
+++ b/sys-fs/loop-aes/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX loop-aes-3.7c-linux4.patch 1221 SHA256 40ab233a5fae74c6146637069cf58e83a73b6c0a65f72e37d9fc4a1c131597c6 SHA512 bdb501b0be9e30a31ea06838768e79912e2e6742e5e71e34c672e7dc8faa3d9adb2862eed3073624b1a5ced5db1c5ce6eebab0e1a275c56af79b56ff92ed6625 WHIRLPOOL d06ed175bfdc50277bdb785c655a43da009c82cba7735e2ea5a64ac8700538cc04691cdc6e49ec770de58b08add0ac86b764a257e75f71594fa9e16f8a119f95
 DIST loop-AES-v3.7b.tar.bz2 334227 SHA256 b6794ca655c8a0b9ac47814264d96d7dab588493e3d2c09357eaad1e3436d648 SHA512 f673d8ccb9b3072256ff3501785204f1d64af5211eabaf47b5d3dc6c42e3d7ad6a2e4bcddcad76ee903637097a8aa4e1df9e16fff345af2ecd6e105b32bf35d3 WHIRLPOOL 1d4aeda49fbdfb404d8377bb87572a8a2cf18859917188916c00951829b834c9ec475615adf6f587a4bdda63888fdbee8f91ae0161c1ecba755488292a4d72df
 DIST loop-AES-v3.7c.tar.bz2 334719 SHA256 2c4eb21afc6e45d99d17e4c26b084d1f1e45c0453da9092a6a95ef918c588173 SHA512 8b260cfe7864973714ddae37ea7231fdefa98ce104f5bee4a1157653a5dd36a89328ee97f3d76d59e1824468f59e46873acd7e5cf9083b73ef0a3b74c24d6bdb WHIRLPOOL 20d07e5f07a158118dcd022f14dff2144c41c51e9add1c747545b7ae8742dd617705e37b03a39262d9b8faed7550a2563f9d827549c487e31e06287b99d36825
 EBUILD loop-aes-3.7b.ebuild 2257 SHA256 9af0b025bbf8760a11a24a5b7f3dd129a4ee4edd0b1d34c9b4bdd9f519cc6ccc SHA512 42a6c92e4b7d99194a0435d1ab46822aeaff7828c42a135c89402246957be9f0dec6d08716bb3bf8f4cd9c736d373e1d992fb281420793c62309aab436928bbb WHIRLPOOL 5c5e5bef628c990531125d9fb738d673a8e805eb35b5f21539a7a0c9f378bac8197bce68e0cce6ff433e0dee547ccd996ebdecf2a2c9df291d167cfe3e34e4d2
-EBUILD loop-aes-3.7c.ebuild 2260 SHA256 2da7d92fcd0a7b7b88cd7d8cd3bd6c7193b68d259be4c672eb33dd4d60ccb68d SHA512 5f3649717b7b0364c3c2ab6402d6ce0c40575d63af03e5403b6fde56840fa7ddc6cbc41b0ddfafc6d76bf22bbdcb1a3d7704c1fc7c12afd6bff19fb67241e576 WHIRLPOOL dd4e2941059bf79930e7b355f66f6563403a51408a8e1bfb3c5b00165ef89d0dd3f4311914a0fdf7bc087d017b7535319f3fe2ac3ba62dbadb8078719c56b2d9
-MISC ChangeLog 14484 SHA256 09cf6740292c186e377d31f234300021000627c1e2f5b12acfbb0d23df7370ce SHA512 1fd6d12622c7dd427f30a411a8465edd71f6106794a8c8668c1c1f79866d415dab298aa55320a0bb4f78540aa02c179dd4f6ec5c14ebf6cc70c825689ae9a9df WHIRLPOOL c15c08500de2f1acf29b72ee15311c5077692e0e69ed5719dca6905c10ef409b226bddcc31436c75b5ff62a1319caf0c864066b88c61bc91d2872a8e288ca13e
+EBUILD loop-aes-3.7c.ebuild 2307 SHA256 0347a74c2607d6904fb3bc010b476416b2b6c3cdbf01ef6e3b12911dc7e701a6 SHA512 4b248ab9df5bcd1d0e09194d44675c593f83847b6015862bf7738de269a265d756ae988e659a17cc22c648103ee83255bd62bd8d672f46d21ae77ff91dd074e9 WHIRLPOOL 3bea565ae3c67f61cdf8ce86d34bc14bafd9edb311eee9ce5f446ac03a18a4e245d1232138f4d83ef168502dcd55c6cde63525716953f088c47a0960ed3d6772
+MISC ChangeLog 14658 SHA256 3ac157d592589c78c762cbd38e67521c9ad100edfbb3a580576331aee5cc5d70 SHA512 6b201712082fbf637fe0b65460cd7726720deb34695309c8f1cfa0d78f5fa149237892a3db61bea707fe40ed6293b03dbdec3b3d93017a8cf208c71ea6ba0672 WHIRLPOOL 17923eb1d197d355fed2324f68103f6ec4f0910f471e00bd377bbd2f939118a63b9e784505f21117bda5161da85ba22d56e6d73658fbe49bf8eb36e2c02622cb
 MISC metadata.xml 475 SHA256 c57d79931d4bbcd713e95c3a15d07e29e603c2eb3a86905037a76cddce19c1e6 SHA512 22da38fbe14237b05430581da261a37f3ecbe62f5ac88611a53ae8f4e2406e4fc5d1239b04d6d7ec77074ebde9c84a1079e85336dbde23a651deeebd775cbac4 WHIRLPOOL ec3d9ae49e9f88456684e6fa1401fa953e63af6635688a6af789ec0eb73bb7a71fd9f46be2c556bef5e97d3756df85fa6999689c6549d9dff324b06b6dd698f8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlTeYAYACgkQXYk9GL8g3FHP4AD/Wht9yIuoSvpwJKBUG0/u8K77
-7zPKfLVnAPMCY14qj4sA/jAzMrKmwKR3P3KowDDj2rE2vZ6nlFNYcEZOgqwwxWd5
-=iL6t
+iF4EAREIAAYFAlVKclAACgkQXYk9GL8g3FEX8QD9HMm35Gpgy+XSUULdMVqdyRHt
+4dRgvT//QcteYFDxHXwA/0szpPgyE97S9j6jNc6Lew9U322fMJb4fehDhsmMFlcX
+=UXu0
 -----END PGP SIGNATURE-----

diff --git a/sys-fs/loop-aes/files/loop-aes-3.7c-linux4.patch b/sys-fs/loop-aes/files/loop-aes-3.7c-linux4.patch
new file mode 100644 (file)
index 0000000..339f2c9
--- /dev/null
+++ b/sys-fs/loop-aes/files/loop-aes-3.7c-linux4.patch
@@ -0,0 +1,45 @@
+From 9b7f9272a5462e03daea0b316f9047e103866ed3 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Wed, 6 May 2015 22:51:54 +0300
+Subject: [PATCH] build: support linux-4
+
+---
+ loop-h-version.h   | 4 +++-
+ loop.c-4.x.patched | 1 +
+ loop.h-4.x.patched | 1 +
+ 3 files changed, 5 insertions(+), 1 deletion(-)
+ create mode 120000 loop.c-4.x.patched
+ create mode 120000 loop.h-4.x.patched
+
+diff --git a/loop-h-version.h b/loop-h-version.h
+index 8e6a734..84a538c 100644
+--- a/loop-h-version.h
++++ b/loop-h-version.h
+@@ -1,5 +1,7 @@
+ #include <linux/version.h>
+-#if LINUX_VERSION_CODE >= 0x30000
++#if LINUX_VERSION_CODE >= 0x40000
++# include "loop.h-4.x.patched"
++#elif LINUX_VERSION_CODE >= 0x30000
+ # include "loop.h-3.x.patched"
+ #elif LINUX_VERSION_CODE >= 0x20600
+ # include "loop.h-2.6.patched"
+diff --git a/loop.c-4.x.patched b/loop.c-4.x.patched
+new file mode 120000
+index 0000000..b6e51c3
+--- /dev/null
++++ b/loop.c-4.x.patched
+@@ -0,0 +1 @@
++loop.c-3.x.patched
+\ No newline at end of file
+diff --git a/loop.h-4.x.patched b/loop.h-4.x.patched
+new file mode 120000
+index 0000000..0924ecb
+--- /dev/null
++++ b/loop.h-4.x.patched
+@@ -0,0 +1 @@
++loop.h-3.x.patched
+\ No newline at end of file
+-- 
+2.3.6
+

diff --git a/sys-fs/loop-aes/loop-aes-3.7c.ebuild b/sys-fs/loop-aes/loop-aes-3.7c.ebuild
index e38c81e2af3adacd63cc49ef8c32970ab817b1ad..3091115eb261b398575a343eb9a30fd500101132 100644 (file)
--- a/sys-fs/loop-aes/loop-aes-3.7c.ebuild
+++ b/sys-fs/loop-aes/loop-aes-3.7c.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/loop-aes/loop-aes-3.7c.ebuild,v 1.1 2015/02/13 20:35:13 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/loop-aes/loop-aes-3.7c.ebuild,v 1.2 2015/05/06 19:58:05 alonbl Exp $
 
 EAPI="5"
 
-inherit linux-mod
+inherit eutils linux-mod
 
 MY_P="${PN/aes/AES}-v${PV}"
 
@@ -48,6 +48,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+       epatch "${FILESDIR}/${P}-linux4.patch"
        sed -e 's/make/$(MAKE)/g' -i Makefile || die "sed failed"
 }