Split the asm/page.h patch to account for USE=-crypt #169133 by Milan Barta.

Package-Manager: portage-2.1.2-r13

diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index 2f74519b1d7e5e031f5cb24b1ac8ca963a4ceeb7..3ad1a13107d6dff5c55f27ed4076c85f882ace09 100644 (file)
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/util-linux
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.180 2007/03/03 06:21:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.181 2007/03/03 21:22:18 vapier Exp $
+
+  03 Mar 2007; Mike Frysinger <vapier@gentoo.org>
+  files/util-linux-2.12r-HAVE_asm_page_h.patch,
+  +files/util-linux-2.12r-HAVE_asm_page_h-loop-aes.patch,
+  util-linux-2.12r-r6.ebuild:
+  Split the asm/page.h patch to account for USE=-crypt #169133 by Milan Barta.
 
 *util-linux-2.12r-r6 (03 Mar 2007)
 

diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index ffff75eea7bc402283879ca5d564c052f50656cb..a2ff9f12126e000432737051ea910f7a1a24deb9 100644 (file)
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -113,10 +113,14 @@ AUX util-linux-2.12q-use-update_mtab-for-fake.patch 546 RMD160 fada9ac9cb1fc76d5
 MD5 202b78b99074c7c91faea44d1de6e1bd files/util-linux-2.12q-use-update_mtab-for-fake.patch 546
 RMD160 fada9ac9cb1fc76d51b5b49e193b6d08ef385e5a files/util-linux-2.12q-use-update_mtab-for-fake.patch 546
 SHA256 b9a883947be436346f41b3387c5fe10e17e832d16a586c9ddcecd0598757dcb3 files/util-linux-2.12q-use-update_mtab-for-fake.patch 546
-AUX util-linux-2.12r-HAVE_asm_page_h.patch 578 RMD160 da482a71e7d95091975833bc67ca500b75d1d7ea SHA1 77270b12796b30787af32da86a00e9afff42d18a SHA256 e6c6e878a9caf01211dea48805037f09c19564740680ebc841488677b635d58e
-MD5 e2811263189441e0d7c555fa8e43e454 files/util-linux-2.12r-HAVE_asm_page_h.patch 578
-RMD160 da482a71e7d95091975833bc67ca500b75d1d7ea files/util-linux-2.12r-HAVE_asm_page_h.patch 578
-SHA256 e6c6e878a9caf01211dea48805037f09c19564740680ebc841488677b635d58e files/util-linux-2.12r-HAVE_asm_page_h.patch 578
+AUX util-linux-2.12r-HAVE_asm_page_h-loop-aes.patch 370 RMD160 6c428248445b8e55261f6dac8409f645b4aa0451 SHA1 74c51461c983cbe46a6f350714a75deb8813c8ee SHA256 bc30eb5c36b4af754b948d30c045c2fe5be107e5e113f81de0f582ae803f0db8
+MD5 513f63b1e4318631060091cbb92b1f07 files/util-linux-2.12r-HAVE_asm_page_h-loop-aes.patch 370
+RMD160 6c428248445b8e55261f6dac8409f645b4aa0451 files/util-linux-2.12r-HAVE_asm_page_h-loop-aes.patch 370
+SHA256 bc30eb5c36b4af754b948d30c045c2fe5be107e5e113f81de0f582ae803f0db8 files/util-linux-2.12r-HAVE_asm_page_h-loop-aes.patch 370
+AUX util-linux-2.12r-HAVE_asm_page_h.patch 320 RMD160 5946c033622c6d558c095ed218ba8a768f661d59 SHA1 32459a5e11beee46e16e3436c782ae50401872ad SHA256 24d4b6617892e7c51c27195fc23cb6161e1807354be690d6e5355a02bb40803d
+MD5 d8f98cdc1e7dc8e105f989a7e0e33c38 files/util-linux-2.12r-HAVE_asm_page_h.patch 320
+RMD160 5946c033622c6d558c095ed218ba8a768f661d59 files/util-linux-2.12r-HAVE_asm_page_h.patch 320
+SHA256 24d4b6617892e7c51c27195fc23cb6161e1807354be690d6e5355a02bb40803d files/util-linux-2.12r-HAVE_asm_page_h.patch 320
 AUX util-linux-2.12r-cal-dumb-terminal.patch 824 RMD160 134349a02d588c601367cf6359722d42180d6a52 SHA1 03eda7ace8f1c91584d44a3479ca829a94cfb0c8 SHA256 ca25d6caf429996d6ab24169aad09e530fc78cbd6f65cb2c8307b50676603ba8
 MD5 1fcb9c258e5e86d3d4920ab3a5fe37da files/util-linux-2.12r-cal-dumb-terminal.patch 824
 RMD160 134349a02d588c601367cf6359722d42180d6a52 files/util-linux-2.12r-cal-dumb-terminal.patch 824
@@ -159,18 +163,18 @@ EBUILD util-linux-2.12r-r5.ebuild 6308 RMD160 2dedc968f35dfc93ac43a93432c7ebf3ac
 MD5 29269b9593f23aeff06ba5c8140cd97c util-linux-2.12r-r5.ebuild 6308
 RMD160 2dedc968f35dfc93ac43a93432c7ebf3ac506c99 util-linux-2.12r-r5.ebuild 6308
 SHA256 7b9d9aadcafad3686ae13d4eecbb054d0ddea2058efa7876be044069c666ac85 util-linux-2.12r-r5.ebuild 6308
-EBUILD util-linux-2.12r-r6.ebuild 6320 RMD160 662ff98d4e1bdfd071d3b1012f1757bc425d4c4e SHA1 4a12b25ad2434750653169c5f5234eb3db23decd SHA256 6fc8cf0c0cd08b1f86564d6177a9ef2f068b4e6a65c33b8b97ee66d99069849d
-MD5 a2b80a4a7070db572586369adfb675af util-linux-2.12r-r6.ebuild 6320
-RMD160 662ff98d4e1bdfd071d3b1012f1757bc425d4c4e util-linux-2.12r-r6.ebuild 6320
-SHA256 6fc8cf0c0cd08b1f86564d6177a9ef2f068b4e6a65c33b8b97ee66d99069849d util-linux-2.12r-r6.ebuild 6320
+EBUILD util-linux-2.12r-r6.ebuild 6398 RMD160 e1830853559d7dc9d7a64e75b80cb8079d766b39 SHA1 666e060b8319f0aa78fb99a897d43aab5ea99c71 SHA256 8ba3b12de2ed4dda478f6b8ea520b4038692f2346d1a3fb2fcd95c5dac264088
+MD5 0c8d536736087b2fec673e3198d8482f util-linux-2.12r-r6.ebuild 6398
+RMD160 e1830853559d7dc9d7a64e75b80cb8079d766b39 util-linux-2.12r-r6.ebuild 6398
+SHA256 8ba3b12de2ed4dda478f6b8ea520b4038692f2346d1a3fb2fcd95c5dac264088 util-linux-2.12r-r6.ebuild 6398
 EBUILD util-linux-2.13_pre7.ebuild 3966 RMD160 477c6d511454716d6a940ee17434889b09478039 SHA1 96cef99d7724393ee8facd1bc02b329030be4010 SHA256 812ae088a465b12e7302d92ced8365972511b74f495a1ccafe5209638e8025c6
 MD5 8b5b3fe1ea733988e8918ca1562b0669 util-linux-2.13_pre7.ebuild 3966
 RMD160 477c6d511454716d6a940ee17434889b09478039 util-linux-2.13_pre7.ebuild 3966
 SHA256 812ae088a465b12e7302d92ced8365972511b74f495a1ccafe5209638e8025c6 util-linux-2.13_pre7.ebuild 3966
-MISC ChangeLog 28366 RMD160 312fe14ae64201eb02b48ae9c1def622ace8713a SHA1 9da42aa9ad9d738386bee8e521f4525676c46260 SHA256 bf87df36d194fe1fe40166362a40b134155518cdf657f0f092c938f8f0753d73
-MD5 abf8d57f5c8574c37c8fdddbbcbaf4eb ChangeLog 28366
-RMD160 312fe14ae64201eb02b48ae9c1def622ace8713a ChangeLog 28366
-SHA256 bf87df36d194fe1fe40166362a40b134155518cdf657f0f092c938f8f0753d73 ChangeLog 28366
+MISC ChangeLog 28632 RMD160 354bbc46186d4c6c3158eff0575d17d4ab907464 SHA1 f1e38e773952f9d234a60ab54612239a247819bf SHA256 20499608e45350d8848845b77fcc158dd3f19c9146c5489588dc7ee7e11c183d
+MD5 ab1e5fbdd944c31d05e133588191618e ChangeLog 28632
+RMD160 354bbc46186d4c6c3158eff0575d17d4ab907464 ChangeLog 28632
+SHA256 20499608e45350d8848845b77fcc158dd3f19c9146c5489588dc7ee7e11c183d ChangeLog 28632
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -187,7 +191,7 @@ SHA256 49b2f3787cdb29a392a658d239821ece467e41d6f4dcc8ffe6502115aa0de290 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFF6RPy8bi6rjpTunYRAqKNAKCHwhgnQQpxyD/5z91u3xTl3iyASwCgwWkh
-NmjRJ3J3X36ML5hGll8PkQg=
-=7/mc
+iD8DBQFF6ecQ8bi6rjpTunYRAvcxAJ45p+tCb43AbaSURhTTG3VjH0Pp6ACgq051
+LyGkv2onrrg5AS+nNVZn5lo=
+=Cxe6
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/util-linux/files/util-linux-2.12r-HAVE_asm_page_h-loop-aes.patch b/sys-apps/util-linux/files/util-linux-2.12r-HAVE_asm_page_h-loop-aes.patch
new file mode 100644 (file)
index 0000000..8c5bbc7
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.12r-HAVE_asm_page_h-loop-aes.patch
@@ -0,0 +1,18 @@
+fix building when asm/page.h is not available
+
+http://bugs.gentoo.org/168278
+
+the loop-aes patch adds this ...
+
+--- mount/swapon.c
++++ mount/swapon.c
+@@ -31,7 +31,9 @@
+ #include <sys/ioctl.h>
+ #include <sys/utsname.h>
+ #include <sys/time.h>
++#ifdef HAVE_asm_page_h
+ #include <asm/page.h>
++#endif
+ #include "xmalloc.h"
+ #include "swap_constants.h"
+ #include "swapargs.h"

diff --git a/sys-apps/util-linux/files/util-linux-2.12r-HAVE_asm_page_h.patch b/sys-apps/util-linux/files/util-linux-2.12r-HAVE_asm_page_h.patch
index 0f7c3e252f70208eb582a9c42915549755fd680f..21c04709d809d123d508a5126ea3ff678b4b1bba 100644 (file)
--- a/sys-apps/util-linux/files/util-linux-2.12r-HAVE_asm_page_h.patch
+++ b/sys-apps/util-linux/files/util-linux-2.12r-HAVE_asm_page_h.patch
@@ -14,15 +14,3 @@ http://bugs.gentoo.org/168278
  #ifdef PAGE_SIZE
  #define PAGE_CACHE_SIZE ((int) PAGE_SIZE)
  #elif defined __ia64__
---- mount/swapon.c
-+++ mount/swapon.c
-@@ -31,7 +31,9 @@
- #include <sys/ioctl.h>
- #include <sys/utsname.h>
- #include <sys/time.h>
-+#ifdef HAVE_asm_page_h
- #include <asm/page.h>
-+#endif
- #include "xmalloc.h"
- #include "swap_constants.h"
- #include "swapargs.h"

diff --git a/sys-apps/util-linux/util-linux-2.12r-r6.ebuild b/sys-apps/util-linux/util-linux-2.12r-r6.ebuild
index 8f953be387daea09cd5f352f40e07e262d5bb14f..b7827d2b2995be2671d018d5449672d8bec26a8f 100644 (file)
--- a/sys-apps/util-linux/util-linux-2.12r-r6.ebuild
+++ b/sys-apps/util-linux/util-linux-2.12r-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.12r-r6.ebuild,v 1.1 2007/03/03 06:21:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.12r-r6.ebuild,v 1.2 2007/03/03 21:22:18 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -119,6 +119,7 @@ src_unpack() {
 
        epatch "${FILESDIR}"/${PN}-2.12r-no-_syscall.patch #150852
        epatch "${FILESDIR}"/${PN}-2.12r-HAVE_asm_page_h.patch #168278
+       use crypt && epatch "${FILESDIR}"/${PN}-2.12r-HAVE_asm_page_h-loop-aes.patch
 
        # Enable random features
        local mconfigs="MCONFIG"