projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1f6bec9)
Replaced our patch for bug #169623 with the one from debian.
authorTiziano Müller <dev-zero@gentoo.org>
Wed, 7 Mar 2007 09:17:36 +0000 (09:17 +0000)
committerTiziano Müller <dev-zero@gentoo.org>
Wed, 7 Mar 2007 09:17:36 +0000 (09:17 +0000)
Package-Manager: portage-2.1.2-r10

sys-fs/evms/ChangeLog patch | blob | history
sys-fs/evms/Manifest patch | blob | history
sys-fs/evms/evms-2.5.5-r5.ebuild patch | blob | history
sys-fs/evms/files/evms-2.5.5-pagesize.patch [moved from sys-fs/evms/files/evms-2.5.5-getpagesize.patch with 53% similarity] patch | blob | history

diff --git a/sys-fs/evms/ChangeLog b/sys-fs/evms/ChangeLog
index 60324beefb7b24d59d5974136078870e71642498..0b9141d85f3fa32d08fab7d7f336e21d84f2e826 100644 (file)
--- a/sys-fs/evms/ChangeLog
+++ b/sys-fs/evms/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/evms
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/ChangeLog,v 1.63 2007/03/06 23:17:45 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/ChangeLog,v 1.64 2007/03/07 09:17:36 dev-zero Exp $
+
+  07 Mar 2007; Tiziano Müller <dev-zero@gentoo.org>
+  -files/evms-2.5.5-getpagesize.patch, +files/evms-2.5.5-pagesize.patch,
+  evms-2.5.5-r5.ebuild:
+  Replaced our patch for bug #169623 with the one from debian.
 
   06 Mar 2007; Tiziano Müller <dev-zero@gentoo.org>
   +files/evms-2.5.5-getpagesize.patch, evms-2.5.5-r5.ebuild:
diff --git a/sys-fs/evms/Manifest b/sys-fs/evms/Manifest
index 2cd5b5022004a3a0b1f9cf7c7ae16c406d331a34..76782a155235e31497e265274f34ce4f14825669 100644 (file)
--- a/sys-fs/evms/Manifest
+++ b/sys-fs/evms/Manifest
@@ -42,10 +42,6 @@ AUX evms-2.5.5-as-needed.patch 482 RMD160 ebef1e696e0490ebd2c530909c03ec96b52dda
 MD5 19e17ea80b35e5574777ed8e42b4210a files/evms-2.5.5-as-needed.patch 482
 RMD160 ebef1e696e0490ebd2c530909c03ec96b52ddacf files/evms-2.5.5-as-needed.patch 482
 SHA256 695811a6a22a17a2d7247a7109a3d081d4b3d376f6fdce1c64f2a574b9acdf3b files/evms-2.5.5-as-needed.patch 482
-AUX evms-2.5.5-getpagesize.patch 2313 RMD160 b63c5e2707cfbd55ce5701fc92b979475ff81845 SHA1 7d65cd52bb5e4e9c03fdc5ad612c3eb3321112d9 SHA256 c67ac61367346a9dad8e9e02dfa1e59e47f0fb19cb302309b918441a5b8d73a2
-MD5 8be1533bd15d192bbad51a4d06975513 files/evms-2.5.5-getpagesize.patch 2313
-RMD160 b63c5e2707cfbd55ce5701fc92b979475ff81845 files/evms-2.5.5-getpagesize.patch 2313
-SHA256 c67ac61367346a9dad8e9e02dfa1e59e47f0fb19cb302309b918441a5b8d73a2 files/evms-2.5.5-getpagesize.patch 2313
 AUX evms-2.5.5-glib_dep.patch 1341 RMD160 8ce5d9ecc27ccc36b5bf46d527ff231e4f3b6545 SHA1 4635d1f2a873457c4db2fef06631980de8da143a SHA256 5320524979a3a22490854ef8289c4f363dfb8dd5a09a64b2ff8fa5b29dfc79bf
 MD5 03cd65ccd0b2d5a07ec56cb8631ac769 files/evms-2.5.5-glib_dep.patch 1341
 RMD160 8ce5d9ecc27ccc36b5bf46d527ff231e4f3b6545 files/evms-2.5.5-glib_dep.patch 1341
@@ -54,6 +50,10 @@ AUX evms-2.5.5-ocfs2.patch 634 RMD160 03cffc2ca996ac64b93b020fd49f3e18232b1091 S
 MD5 0b916cf6f5faaf97ed9dc149f1294382 files/evms-2.5.5-ocfs2.patch 634
 RMD160 03cffc2ca996ac64b93b020fd49f3e18232b1091 files/evms-2.5.5-ocfs2.patch 634
 SHA256 e69be9be13725811d49a40cdee9c6eea7d60cea94e62129ba830e5d205b4ad53 files/evms-2.5.5-ocfs2.patch 634
+AUX evms-2.5.5-pagesize.patch 2288 RMD160 6db07f143f2e82a318b04121dbf7dedbbd715423 SHA1 7e0bc2e0196d52436d73065b6a7fc8f84dc6038b SHA256 66b992dbf22969b48c8854269f83f91e935096f418f28b6876e512fe7c446ca2
+MD5 43b7b8e3a11ada886a92f0c8f9d18ce4 files/evms-2.5.5-pagesize.patch 2288
+RMD160 6db07f143f2e82a318b04121dbf7dedbbd715423 files/evms-2.5.5-pagesize.patch 2288
+SHA256 66b992dbf22969b48c8854269f83f91e935096f418f28b6876e512fe7c446ca2 files/evms-2.5.5-pagesize.patch 2288
 AUX evms-2.5.5-use_disk_group.patch 1225 RMD160 7c69acdb48758c465429c56e4954214bbb0fed4e SHA1 2c05af9ac5108dc3aefe58257d3f3101f3039d64 SHA256 6ebd11a08a018a364f1155e9e961e421ecf8c96643b0253106fffe9ebf677184
 MD5 baad56a65d2426219e2cfba9daf1dae7 files/evms-2.5.5-use_disk_group.patch 1225
 RMD160 7c69acdb48758c465429c56e4954214bbb0fed4e files/evms-2.5.5-use_disk_group.patch 1225
@@ -71,14 +71,14 @@ EBUILD evms-2.5.5-r4.ebuild 4810 RMD160 c4858c05b849d701f5b643dbdfe112b3cbb8172c
 MD5 459d32e5b7ff45cc0d383cbd236c8113 evms-2.5.5-r4.ebuild 4810
 RMD160 c4858c05b849d701f5b643dbdfe112b3cbb8172c evms-2.5.5-r4.ebuild 4810
 SHA256 7f01a3c6aa8e5c4a89fabb96cb256f27932a7ae3e030de99fdcaff2173e9d953 evms-2.5.5-r4.ebuild 4810
-EBUILD evms-2.5.5-r5.ebuild 4895 RMD160 8665b384a8157387bece9710af8b61088e3284c4 SHA1 920ace7e5cc5a8bcf2af52ac06cabb271e383b05 SHA256 0f339468c02405610bfbdba26266b7122213266311a13d1cc50f001db32d0d28
-MD5 3c81ebc380577eeb54c7e2bb4fe8a26a evms-2.5.5-r5.ebuild 4895
-RMD160 8665b384a8157387bece9710af8b61088e3284c4 evms-2.5.5-r5.ebuild 4895
-SHA256 0f339468c02405610bfbdba26266b7122213266311a13d1cc50f001db32d0d28 evms-2.5.5-r5.ebuild 4895
-MISC ChangeLog 13393 RMD160 80cedf39e477df449658fa06c83b003e23bc0aea SHA1 06f64e5ebafff840ad154d604eedcc00f22b6c2d SHA256 b7f37caf452049eb90acb61309319f8e76783f76bf0e1a8bb99f149f3db432a7
-MD5 96e657d9df308290f5da4d0c96702caf ChangeLog 13393
-RMD160 80cedf39e477df449658fa06c83b003e23bc0aea ChangeLog 13393
-SHA256 b7f37caf452049eb90acb61309319f8e76783f76bf0e1a8bb99f149f3db432a7 ChangeLog 13393
+EBUILD evms-2.5.5-r5.ebuild 4892 RMD160 04a6e98ea90b7624d2cff39cb60fe1cc56d2e4a5 SHA1 c521eabc0b4108e301d9026e1be70fdd37c522f6 SHA256 c501793e8f7a881848d3acbf2386ca504a56de85b01a7e9e7529361b2fd90622
+MD5 94162ef1ccbf57967fed9d2be162d3e9 evms-2.5.5-r5.ebuild 4892
+RMD160 04a6e98ea90b7624d2cff39cb60fe1cc56d2e4a5 evms-2.5.5-r5.ebuild 4892
+SHA256 c501793e8f7a881848d3acbf2386ca504a56de85b01a7e9e7529361b2fd90622 evms-2.5.5-r5.ebuild 4892
+MISC ChangeLog 13607 RMD160 bfb49445ecdcaf61cfde13b771a09124c17f5ae5 SHA1 d84ae4219a78f30a93a4184e10bd5a43e257b84c SHA256 58799095e0197279681901102919f059f45dbdb7436557632717045410db987e
+MD5 8196c5f44b61f6279b2c31bb1c564c01 ChangeLog 13607
+RMD160 bfb49445ecdcaf61cfde13b771a09124c17f5ae5 ChangeLog 13607
+SHA256 58799095e0197279681901102919f059f45dbdb7436557632717045410db987e ChangeLog 13607
 MISC metadata.xml 383 RMD160 92e091c63bb348228df89a66aa6c3fe2b65f0768 SHA1 23d81d62b6e49d0867ad90698ea3ac087b2a9d95 SHA256 6ce67f896d7a3aa021bbfbf18cbd43e096de9f64e59e7159e6efb2689f651e7b
 MD5 515e2b0ddb7f8c4e6fad2c72fda19768 metadata.xml 383
 RMD160 92e091c63bb348228df89a66aa6c3fe2b65f0768 metadata.xml 383
diff --git a/sys-fs/evms/evms-2.5.5-r5.ebuild b/sys-fs/evms/evms-2.5.5-r5.ebuild
index 0a94e3a64c0a6202ebc409e8ed2616631a97f16b..f4a6ff3b247fcea0d80bc85858198e4e51bf661c 100644 (file)
--- a/sys-fs/evms/evms-2.5.5-r5.ebuild
+++ b/sys-fs/evms/evms-2.5.5-r5.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-fs/evms/evms-2.5.5-r5.ebuild,v 1.6 2007/03/06 23:17:45 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/evms-2.5.5-r5.ebuild,v 1.7 2007/03/07 09:17:36 dev-zero Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
@@ -46,7 +46,7 @@ src_unpack() {
        epatch "${FILESDIR}/${P}-glib_dep.patch"
        epatch "${FILESDIR}/${P}-ocfs2.patch"
        epatch "${FILESDIR}/${P}-use_disk_group.patch"
-       epatch "${FILESDIR}/${P}-getpagesize.patch"
+       epatch "${FILESDIR}/${P}-pagesize.patch"
 
        eautoreconf
 }
diff --git a/sys-fs/evms/files/evms-2.5.5-getpagesize.patch b/sys-fs/evms/files/evms-2.5.5-pagesize.patch
similarity index 53%
rename from sys-fs/evms/files/evms-2.5.5-getpagesize.patch
rename to sys-fs/evms/files/evms-2.5.5-pagesize.patch
index 656d68429b396204ceac07141e7d487072379207..7526247a9ca9c021cd298517a88e26b6d2a3fc85 100644 (file)
--- a/sys-fs/evms/files/evms-2.5.5-getpagesize.patch
+++ b/sys-fs/evms/files/evms-2.5.5-pagesize.patch
@@ -1,6 +1,7 @@
-diff -Naur evms-2.5.5.orig/plugins/swap/swapfs.c evms-2.5.5/plugins/swap/swapfs.c
---- evms-2.5.5.orig/plugins/swap/swapfs.c      2007-03-06 23:14:01.000000000 +0100
-+++ evms-2.5.5/plugins/swap/swapfs.c   2007-03-06 23:14:54.000000000 +0100
+Index: evms-2.5.5/plugins/swap/swapfs.c
+===================================================================
+--- evms-2.5.5.orig/plugins/swap/swapfs.c
++++ evms-2.5.5/plugins/swap/swapfs.c
 @@ -27,7 +27,6 @@
  #include <plugin.h>
  #include <fcntl.h>
@@ -9,47 +10,49 @@ diff -Naur evms-2.5.5.orig/plugins/swap/swapfs.c evms-2.5.5/plugins/swap/swapfs.
  #include <sys/swap.h>
  
  #include "swapfs.h"
-@@ -341,7 +340,7 @@
+@@ -341,7 +340,7 @@ static int swap_get_fs_limits(logical_vo
  
        *max_volume_size = (sector_count_t)-1;  /* No limit. */
        *max_object_size = (sector_count_t)-1;  /* No limit. */
 -      *min_size = (sector_count_t)(PAGE_SIZE * 10);   /* 10 page minimum. */
-+      *min_size = (sector_count_t)(getpagesize() * 10);       /* 10 page minimum. */
++      *min_size = (sector_count_t)(sysconf(_SC_PAGESIZE) * 10);       /* 10 page minimum. */
  
        LOG_EXTRA("Volume: %s, min: %"PRIu64", max: %"PRIu64"\n",
                  volume->name, *min_size, *max_volume_size);
-diff -Naur evms-2.5.5.orig/plugins/swap/swapfs.h evms-2.5.5/plugins/swap/swapfs.h
---- evms-2.5.5.orig/plugins/swap/swapfs.h      2007-03-06 23:14:01.000000000 +0100
-+++ evms-2.5.5/plugins/swap/swapfs.h   2007-03-06 23:14:42.000000000 +0100
-@@ -47,8 +47,8 @@
+Index: evms-2.5.5/plugins/swap/swapfs.h
+===================================================================
+--- evms-2.5.5.orig/plugins/swap/swapfs.h
++++ evms-2.5.5/plugins/swap/swapfs.h
+@@ -47,8 +47,8 @@ extern engine_functions_t *EngFncs;
  #define PUT 1
  #define SWAPFS_MAGIC_STRING   "SWAP_SPACE"
  #define SWAPFS_MAGIC_STRING2  "SWAPSPACE2"
 -#define SWAPFS_MIN_SIZE               (PAGE_SIZE / EVMS_VSECTOR_SIZE * 10)
 -#define SWAP_MAGIC_OFFSET_IN_BYTES    (PAGE_SIZE - 10) /* last 10 bytes of first page */
-+#define SWAPFS_MIN_SIZE               (getpagesize() / EVMS_VSECTOR_SIZE * 10)
-+#define SWAP_MAGIC_OFFSET_IN_BYTES    (getpagesize() - 10) /* last 10 bytes of first page */
++#define SWAPFS_MIN_SIZE               (sysconf(_SC_PAGESIZE) / EVMS_VSECTOR_SIZE * 10)
++#define SWAP_MAGIC_OFFSET_IN_BYTES    (sysconf(_SC_PAGESIZE) - 10) /* last 10 bytes of first page */
  
  #define EVMS_Task_swapon      EVMS_Task_Plugin_Function + 1
  #define EVMS_Task_swapoff     EVMS_Task_Plugin_Function + 2
-diff -Naur evms-2.5.5.orig/plugins/xfs/fsimxfs.h evms-2.5.5/plugins/xfs/fsimxfs.h
---- evms-2.5.5.orig/plugins/xfs/fsimxfs.h      2007-03-06 23:14:01.000000000 +0100
-+++ evms-2.5.5/plugins/xfs/fsimxfs.h   2007-03-06 23:16:00.000000000 +0100
+Index: evms-2.5.5/plugins/xfs/fsimxfs.h
+===================================================================
+--- evms-2.5.5.orig/plugins/xfs/fsimxfs.h
++++ evms-2.5.5/plugins/xfs/fsimxfs.h
 @@ -19,7 +19,7 @@
   */
  
  #include <uuid/uuid.h>
 -#include <asm/page.h>
-+#include <unistd.h> /* for getpagesize() */
++#include <unistd.h>
  
  extern plugin_record_t xfs_plugin_record;
  extern plugin_record_t * my_plugin_record;
-@@ -165,7 +165,7 @@
+@@ -165,7 +165,7 @@ typedef struct xfs_volume {
   * superblock.  This is not the same as the superblock structure, since all of
   * this space is not currently being used.
   */
 -#define SIZE_OF_SUPER         PAGE_SIZE
-+#define SIZE_OF_SUPER         getpagesize()
++#define SIZE_OF_SUPER         sysconf(_SC_PAGESIZE)
  
  /* Fixed byte offset of primary superblock */
  #define XFS_SUPER1_OFF                0x00
Unnamed repository; edit this file 'description' to name the repository.