From 8639375bda3565365c99add6ba35474ae7745d836ff3ef8711a0129b965b66a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Sat, 1 Oct 2011 15:41:09 +0000 Subject: [PATCH] Accepting request 85881 from home:elvigia:branches:Base:System - Fix build in arm, portability bug, applications MUST use sysconf(_SC_PAGESIZE) instead of constant PAGE_SIZE OBS-URL: https://build.opensuse.org/request/show/85881 OBS-URL: https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=59 --- nfs-utils-page_size.patch | 11 +++++++++++ nfs-utils.changes | 6 ++++++ nfs-utils.spec | 2 ++ 3 files changed, 19 insertions(+) create mode 100644 nfs-utils-page_size.patch diff --git a/nfs-utils-page_size.patch b/nfs-utils-page_size.patch new file mode 100644 index 0000000..0588276 --- /dev/null +++ b/nfs-utils-page_size.patch @@ -0,0 +1,11 @@ +--- utils/blkmapd/device-process.c.orig ++++ utils/blkmapd/device-process.c +@@ -296,7 +296,7 @@ decode_blk_volume(uint32_t **pp, uint32_ + off_t stripe_unit = vol->param.bv_stripe_unit; + /* Check limitations imposed by device-mapper */ + if ((stripe_unit & (stripe_unit - 1)) != 0 +- || stripe_unit < (off_t) (PAGE_SIZE >> 9)) ++ || stripe_unit < (off_t) (sysconf(_SC_PAGESIZE) >> 9)) + return -EIO; + BLK_READBUF(p, end, 4); + READ32(vol->bv_vol_n); diff --git a/nfs-utils.changes b/nfs-utils.changes index b2e651d..34d22de 100644 --- a/nfs-utils.changes +++ b/nfs-utils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Oct 1 15:24:33 UTC 2011 - crrodriguez@opensuse.org + +- Fix build in arm, portability bug, applications MUST + use sysconf(_SC_PAGESIZE) instead of constant PAGE_SIZE + ------------------------------------------------------------------- Sun Sep 25 08:28:53 UTC 2011 - nfbrown@suse.com diff --git a/nfs-utils.spec b/nfs-utils.spec index 1ba1b0e..04a5b06 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -54,6 +54,7 @@ Source12: start-statd Source13: nfs-utils.rpmlintrc Patch0: nfs-utils-1.0.7-bind-syntax.patch Patch1: warn-nfs-udp.patch +Patch2: nfs-utils-page_size.patch Suggests: python-base %description @@ -133,6 +134,7 @@ Authors: %setup -q -n nfs-utils-%{version} -a 1 %patch0 -p1 %patch1 -p1 +%patch2 cp %{S:6} . %build