From b50aa06f6ca42a0bc93e6261381f5fe3ffc5ea757042c15f083ad939388fe217 Mon Sep 17 00:00:00 2001
From: Jeff Mahoney <jeffm@suse.com>
Date: Wed, 18 Nov 2015 21:13:09 +0000
Subject: [PATCH] Accepting request 345120 from
 home:jeff_mahoney:branches:filesystems

Update to 4.2.0

OBS-URL: https://build.opensuse.org/request/show/345120
OBS-URL: https://build.opensuse.org/package/show/filesystems/xfsprogs?expand=0&rev=39
---
 xfsprogs-3.2.4.tar.gz     |   3 --
 xfsprogs-3.2.4.tar.gz.sig | Bin 543 -> 0 bytes
 xfsprogs-4.2.0.tar.gz     |   3 ++
 xfsprogs-4.2.0.tar.gz.sig | Bin 0 -> 543 bytes
 xfsprogs.changes          |  88 ++++++++++++++++++++++++++++++++++++++
 xfsprogs.spec             |  20 +++------
 6 files changed, 98 insertions(+), 16 deletions(-)
 delete mode 100644 xfsprogs-3.2.4.tar.gz
 delete mode 100644 xfsprogs-3.2.4.tar.gz.sig
 create mode 100644 xfsprogs-4.2.0.tar.gz
 create mode 100644 xfsprogs-4.2.0.tar.gz.sig

diff --git a/xfsprogs-3.2.4.tar.gz b/xfsprogs-3.2.4.tar.gz
deleted file mode 100644
index 8b3df79..0000000
--- a/xfsprogs-3.2.4.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dde65ead82d3cbfa9b4ded9796b6d22095d7d759a22d41ae6f1a4ec458bb0465
-size 1482424
diff --git a/xfsprogs-3.2.4.tar.gz.sig b/xfsprogs-3.2.4.tar.gz.sig
deleted file mode 100644
index 8c77733bc6301bd926d9b37609260fd1296783ef655aa6af84a0ace4e14ff1cd..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 543
zcmV+)0^t3L0vrSY0RjL91p-yMZ0!IF2@tL5DM$2m`W>pf5CE!#USV|lqzv7ElBSAp
zZ*OZS4F6`9qMN#4uTp(I3@|KT<N2a($Y0&0x`r-8Y};jY0*pT?Ohep9CRbzWvnxhF
zD{+uzw5Tgo`V^ZHZ1GplE(|Z6JlO$wr{V#QU|~>_vH?%Dr9jPpwH#@Q>HHh386i<F
z{aeVPj|N7Q=Cc-~#q7y_p`SK>K>5F|M$_8HZfQ)35q(b98aQl&C-CQtIe)5xRvh_x
z78`(rtkClf!!FS+aj_FgDpt;m`yArp>wYR+i#n%y@xX$5k-ALbJSL?`1%5%vd2S~&
zuhPo#B2r_!5G4lMDJU+;_Pm}_X(vke&Ps_zY7H__y+2zvWA`3(U+huMP9l9AmA%zY
zvv{<cn`npZ)pV3Cap)WL2695Th~T7B5!T7Y|2N5<M}$wdYC|cJxZ}cGR#teklgoeq
zb)!tbkBfV4z}Q)RMYAb6RiAB@kPTMyJ6OumqurwSC31r>F)|2he{XStmZ;ogJP99#
zelZ@)yxd+bqNMl4ZJjt{urbC2M4l)=o+f@Hy;fdzYr|UN`VeyDaTVI1eUR>PLeM||
z9;44cu!VSh`3Nm8Duz^zcUgMFRSTNb)jEQN|C};oM*fQ#-+z*0>Ujw(N4Djo$|t&J
hL12(uvpBW@fAVEPS=X`BPAQu%p4|55rJ8q@wSBqU1myq#

diff --git a/xfsprogs-4.2.0.tar.gz b/xfsprogs-4.2.0.tar.gz
new file mode 100644
index 0000000..eac57a3
--- /dev/null
+++ b/xfsprogs-4.2.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3deab1ad0f4635e54053aa45add27bd48cd87a188c16ac60f4789e01730e5260
+size 1487831
diff --git a/xfsprogs-4.2.0.tar.gz.sig b/xfsprogs-4.2.0.tar.gz.sig
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..d6db07fc2b94cf5fdcc036dfdd6bd1067b91774ed2549f8eae65bbca6dc80074
GIT binary patch
literal 543
zcmV+)0^t3L0vrSY0RjL91p-y=91j2r2@tL5DM$2m`W@1v5B@XPfdXF6-C#*(Au>sU
zlEIdMJXaW-^hkEW^j(4(*4{k*OXtpiNl|bC?-s1AcdWeT@~axgO3aAIVunr+G6Kau
z^6kINZ2Rm!5gw4Mw?b(yfWB(wcUj**%B(=1^#_VOopBT=6@!h?!k^%ee~M*F&N#b2
z>#A8@4(Pzz6(iF<!zWZn7;B4Ef)PfVq!gK64qyYBALreyu2a>uq7|8l*ZfxEs~&;a
zbuj(mb?95W&s15fQp<s?@U9T=sAHb3MrGi(^q#eAy&0_AYf{qsk15P;1DV_E%mZ@(
zw4c~)&gVp1(`<|wfy(=)RT}!|I!G2+)~i9S6PDqAhjl-z(89*Pukzj3?#bNN(*WHI
z4&=v=kt?`K1_3E1d(5GTtGi>x8Lnce&<osdHsfFZieuc)CQqp;BS4mSZ=hZkU3D?V
zrL}qT*?2{dqE^&rV|o66aJFT{hE7Zn|C!MD&G;(K$6s^Dq@&0C{b$VKMU*cjD)_4C
ze~+YV<d&Fvs`!#s=SGcJi)P)Sb{d(K8`}UXr4R~d>hRh#5|uAW!TVQye;$RD?P+HQ
zPL-=C&eW!(OY(5m11-|$r(a;D6|ov1K+a<kue2?ZQ`T~1B-A{6QG5Vgm|>>=Pp*OO
h4aApUSada-V!EVM%wOT~PVqZRFaw9%aaIbC>cs>I6><Oo

literal 0
HcmV?d00001

diff --git a/xfsprogs.changes b/xfsprogs.changes
index c187b1d..5714864 100644
--- a/xfsprogs.changes
+++ b/xfsprogs.changes
@@ -1,3 +1,91 @@
+-------------------------------------------------------------------
+Wed Nov 18 20:06:03 UTC 2015 - jeffm@suse.com
+
+- Update to 4.2.0
+  * db: show sparse inodes feature state in version command output
+  * db: support sparse inode chunk inobt record and sb fields
+  * growfs: display sparse inode status from xfs_info
+  * libxfs: clear buffer state flags in libxfs_getbuf and variants
+  * libxfs: error negation rework
+  * libxfs: Fix attr leaf block definition
+  * libxfs: Fix file type directory corruption for btree directories
+  * libxfs: fix memory leasks in libxfs_umount()
+  * libxfs: fix uuid check durign inode allocation
+  * libxfs: fix XFS_WANT_CORRUPTED_* macros to return negative error codes
+  * libxfs: readahead of dir3 data blocks should use the read verifier
+  * libxfs: v3 inodes are only valid on crc-enabled filesystems
+  * libxfs: verifier should set buffer error when da block has a bad magic
+    number
+  * metadump: reorder inode record sanity checks and inode buffer read
+  * metadump: support sparse inode records
+  * mkfs: sparse inode chunk support
+  * mkfs.xfs: always use underlying fs sector size when mkfs'ing a file
+  * repair: access helpers for on-disk inobt record freecount
+  * repair: do not account sparse inodes in phase 5 cursor init.
+  * repair: do not prefetch holes in sparse inode chunks
+  * repair: factor out sparse inodes from finobt reconstruction
+  * repair: fix wrong logic when validating node magic number
+  * repair: handle sparse format inobt record freecount correctly
+  * repair: handle sparse inode alignment
+  * repair: helper for inode chunk alignment and start/end ino number
+    verification
+  * repair: helper to import on-disk inobt records to in-core trees
+  * repair: helper to transition inode blocks to inode state
+  * repair: process sparse inode records correctly
+  * repair: reconstruct sparse inode records correctly on disk
+  * repair: remove duplicate field from aghdr_cnts
+  * repair: scan and track sparse inode chunks correctly
+  * repair: scan sparse finobt records correctly
+  * repair: use ir_count for filesystems with sparse inode support
+  * repair: use sb_meta_uuid for checking of metadata headers
+  * repair: validate ir_count field for sparse format records
+  * xfs: add fs geometry bit for sparse inode chunks
+  * xfs: add sparse inode chunk alignment superblock field
+  * xfs: allocate sparse inode chunks on full chunk allocation failure
+  * xfs: always log the inode on unwritten extent conversion
+  * xfs: check min blks for random debug mode sparse allocations
+  * xfs: clean up XFS_MIN_FREELIST macros
+  * xfs_copy: fix copy of hard 4k devices
+  * xfs_copy: fix up initial sb buffer read on CRC fs
+  * xfs: create individual inode alloc. helper
+  * xfs_db: don't crash on a corrupt inode
+  * xfs: enable sparse inode chunks for v5 superblocks
+  * xfs: extent size hints can round up extents past MAXEXTLEN
+  * xfs: filter out sparse regions from individual inode allocation
+  * xfs_fsr: Fix parentheses around truth value
+  * xfs: helper to convert holemask to inode alloc. bitmap
+  * xfs: introduce inode record hole mask for sparse inode chunks
+  * xfs: kill unsupported superblock versions
+  * xfs: only free allocated regions of inode chunks
+  * xfs: pass inode count through ordered icreate log item
+  * xfs: randomly do sparse inode allocations in DEBUG mode
+  * xfs: remote attribute headers contain an invalid LSN
+  * xfs: remote attributes need to be considered data
+  * xfs_repair: automatically enable -f (file) mode when needed
+  * xfs_repair: call IRELE(ip) after libxfs_trans_iget calls
+  * xfs_repair: check v5 filesystem attr block header sanity
+  * xfs_repair: fix broken EFSBADCRC/EFSCORRUPTED usage with buffer errors
+  * xfs_repair: Fix malloc size of rt_ext_tree_ptr
+  * xfs_repair: force not-so-bad bmbt blocks back through the verifier
+  * xfs_repair: free msgbuf on exit
+  * xfs_repair: ignore "repaired" flag after we decide to clear xattr block
+  * xfs_repair: include any realloc'ed buffers in final putbuf
+  * xfs_repair: refuse to unset lazycount on V5 filesystems
+  * xfs_repair: release corrupt directory node buffer
+  * xfs_repair: set args.geo in dir2_kill_block
+  * xfs_repair: set args.geo in longform_dir2_entry_check_data
+  * xfs_repair: unconditionally free blockmaps when threads complete
+  * xfs_repair: update btree ptr when attr node level moves to next buffer
+  * xfs: skip unallocated regions of inode chunks in xfs_ifree_cluster()
+  * xfs: support min/max agbno args in block allocator
+  * xfs: update free inode record logic to support sparse inode records
+  * xfs: xfs_alloc_fix_freelist() can use incore perag structures
+  * xfs: xfs_attr_inactive leaves inconsistent attr fork state behind
+  * xfs: xfs_bunmapi() does not need XFS_BMAPI_METADATA flag
+  * Other minor fixes and build system rework
+
+- Added new dependency on libblkid-devel.
+
 -------------------------------------------------------------------
 Fri Jul 31 10:21:06 UTC 2015 - jack@suse.cz
 
diff --git a/xfsprogs.spec b/xfsprogs.spec
index 53a14fe..828116c 100644
--- a/xfsprogs.spec
+++ b/xfsprogs.spec
@@ -17,7 +17,7 @@
 
 
 Name:           xfsprogs
-Version:        3.2.4
+Version:        4.2.0
 Release:        0
 Summary:        Utilities for managing the XFS file system
 License:        GPL-2.0+
@@ -28,6 +28,7 @@ Source1:        ftp://oss.sgi.com/projects/xfs/cmd_tars/xfsprogs-%{version}.tar.
 Source2:        %{name}.keyring
 Patch0:         xfsprogs-docdir.diff
 Patch1:         xfsprogs-ppc64.diff
+BuildRequires:  libblkid-devel
 BuildRequires:  readline-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version} > 0
@@ -76,7 +77,7 @@ want to install xfsprogs.
 %if 0%{?suse_version}
 %patch0
 %endif
-%patch1
+#%patch1
 
 %build
 export OPTIMIZER="-fPIC"
@@ -89,18 +90,11 @@ make %{?_smp_mflags}
 export DIST_ROOT=%{buildroot}
 make install
 make install-dev
-# remove devel stuff from /lib
-rm %{buildroot}/%{_lib}/libhandle.so
-# move things to usr
-mv %{buildroot}/sbin/* %{buildroot}%{_sbindir}
+# Move libhandle to usr, libhandle.{a,la} are symlinks to usr/lib* already so
+# remove them first.
+rm %{buildroot}/%{_lib}/libhandle.a
+rm %{buildroot}/%{_lib}/libhandle.la
 mv %{buildroot}/%{_lib}/* %{buildroot}%{_libdir}
-#UsrMerge
-ln -s %{_sbindir}/{fsck.xfs,mkfs.xfs,xfs_repair} %{buildroot}/sbin
-#EndUserMerge
-pushd %{buildroot}%{_libdir}
-	ln -s libhandle.so.[0-9] libhandle.so
-popd
-chmod 755 %{buildroot}/%{_sbindir}/fsck.xfs
 %find_lang %{name}
 
 %post -p /sbin/ldconfig