commit btrfsprogs for openSUSE:11.4

21 Mar 2011

Hello community,

here is the log from the commit of package btrfsprogs for openSUSE:11.4
checked in at Tue Mar 22 00:03:42 CET 2011.



--------

--- old-versions/11.4/all/btrfsprogs/btrfsprogs.changes	2010-05-26 17:14:56.000000000 +0200
+++ 11.4/btrfsprogs/btrfsprogs.changes	2011-03-21 13:01:35.000000000 +0100
@@ -1,0 +2,22 @@
+Mon Mar 21 13:01:23 CET 2011 - dmueller@suse.de
+
+- change to a hardlink
+
+-------------------------------------------------------------------
+Mon Mar 14 19:19:34 CET 2011 - dmueller@suse.de
+
+- add link for fsck.btrfs (bnc#665899)
+
+-------------------------------------------------------------------
+Thu Dec 16 20:53:19 CET 2010 - dmueller@suse.de
+
+- update to v0.19-35-g1b444cd:
+  * used space accounting fix for the converter
+  * Add btrfs-list for listing subvolumes
+  * Add new util: 'btrfs' 
+  * multidevice support for check_mounted
+  * check slash in deleting subvolumes
+  * Add btrfsck option to select the super block copy
+  * btrfs-debug-tree: add -d option to print only the device mapping
+
+-------------------------------------------------------------------

Package does not exist at destination yet. Using Fallback old-versions/11.4/all/btrfsprogs
Destination is old-versions/11.4/UPDATES/all/btrfsprogs
calling whatdependson for 11.4-i586


Old:
----
  0001-used-space-accounting-fix-for-the-converter.patch
  0002-btrfsctl-add-snapshot-subvolume-destroy-ioctl.patch
  0003-btrfsck-check-root-back-forward-references.patch
  0004-Add-btrfs-map-logical-program-to-map-and-read-logica.patch
  0005-fix-use-after-free.patch
  btrfs-progs-0.19.tar.bz2

New:
----
  btrfs-progs-v0.19-35-g1b444cd.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ btrfsprogs.spec ++++++
--- /var/tmp/diff_new_pack.4pNFJA/_old	2011-03-22 00:03:07.000000000 +0100
+++ /var/tmp/diff_new_pack.4pNFJA/_new	2011-03-22 00:03:07.000000000 +0100
@@ -1,7 +1,7 @@
 #
-# spec file for package btrfsprogs (Version 0.19)
+# spec file for package btrfsprogs
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,35 +20,28 @@
 Name:           btrfsprogs
 Url:            http://oss.oracle.com/~mason/btrfs/
 Version:        0.19
-Release:        9
+Release:        17.<RELEASE18>
+%define tar_version v0.19-35-g1b444cd
 Summary:        Btrfs File System Utilities
 License:        GNU General Public License (GPL)
 Group:          System/Filesystems
 Supplements:    filesystem(btrfs)
-Source:         http://ftp.kernel.org/pub/linux/kernel/people/mason/btrfs/btrfs-progs-%{version}.tar.bz2
+Source:         btrfs-progs-%{tar_version}.tar.bz2
 Patch0:         memleak-fix.diff
-Patch1:         0001-used-space-accounting-fix-for-the-converter.patch
-Patch2:         0002-btrfsctl-add-snapshot-subvolume-destroy-ioctl.patch
-Patch3:         0003-btrfsck-check-root-back-forward-references.patch
-Patch4:         0004-Add-btrfs-map-logical-program-to-map-and-read-logica.patch
-Patch5:         0001-Plug-Memory-leak-in-find_and_setup_log_root.patch
-Patch6:         0005-fix-use-after-free.patch
+Patch1:         0001-Plug-Memory-leak-in-find_and_setup_log_root.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  libacl-devel libext2fs-devel libuuid-devel zlib-devel
+# for /bin/true
+Requires:       coreutils
 
 %description
-This package contains utilities for creating, checking, and debugging btrfs
-file systems.
+This package contains utilities for creating, checking, and
+debugging btrfs file systems.
 
 %prep
-%setup -q -n btrfs-progs-%{version}
+%setup -q -n btrfs-progs-%{tar_version}
 %patch0
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
 
 %build
 make %{?jobs:-j%jobs} CFLAGS="%{optflags}" all convert
@@ -57,9 +50,11 @@
 make install DESTDIR=${RPM_BUILD_ROOT} prefix=%{_prefix} bindir=/sbin mandir=%{_mandir}
 # command line options are not compatible (bnc#599224)
 #ln ${RPM_BUILD_ROOT}/sbin/btrfsck ${RPM_BUILD_ROOT}/sbin/fsck.btrfs
+ln /bin/true ${RPM_BUILD_ROOT}/sbin/fsck.btrfs
 
 %files
 %defattr(-, root, root)
+/sbin/btrfs
 /sbin/btrfs-debug-tree
 /sbin/btrfs-show
 /sbin/btrfs-vol
@@ -67,13 +62,14 @@
 /sbin/btrfsck
 /sbin/btrfsctl
 /sbin/mkfs.btrfs
-#/sbin/fsck.btrfs
+/sbin/fsck.btrfs
 /sbin/btrfs-map-logical
 %_mandir/man8/btrfs-image.8.gz
 %_mandir/man8/btrfs-show.8.gz
 %_mandir/man8/btrfsck.8.gz
 %_mandir/man8/btrfsctl.8.gz
 %_mandir/man8/mkfs.btrfs.8.gz
+%_mandir/man8/btrfs.8.gz
 
 %clean
 rm -rf $RPM_BUILD_ROOT

++++++ 0001-Plug-Memory-leak-in-find_and_setup_log_root.patch ++++++
--- /var/tmp/diff_new_pack.4pNFJA/_old	2011-03-22 00:03:07.000000000 +0100
+++ /var/tmp/diff_new_pack.4pNFJA/_new	2011-03-22 00:03:07.000000000 +0100
@@ -1,33 +1,28 @@
-From 4145e527ba81c288aa081073e1ce68fa0ceb4107 Mon Sep 17 00:00:00 2001
-From: Dirk Mueller <dmueller@suse.de>
-Date: Fri, 26 Mar 2010 11:25:43 +0100
-Subject: [PATCH] Plug Memory leak in find_and_setup_log_root()
+commit a2fe2e1b978f724f53d025461e65adb4e030d043
+Author: Dirk Mueller <dmueller@suse.de>
+Date:   Thu Dec 16 20:40:34 2010 +0100
 
-The error path forgets to free a previously allocated
-memory structure.
----
- disk-io.c |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
+    [PATCH] Plug Memory leak in find_and_setup_log_root()
+    
+    The error path forgets to free a previously allocated
+    memory structure.
 
 diff --git a/disk-io.c b/disk-io.c
-index addebe1..eab3f0b 100644
+index a6e1000..2b5e1d5 100644
 --- a/disk-io.c
 +++ b/disk-io.c
-@@ -422,12 +422,13 @@ static int find_and_setup_log_root(struct btrfs_root *tree_root,
- 			       struct btrfs_super_block *disk_super)
+@@ -423,11 +423,13 @@ static int find_and_setup_log_root(struct btrfs_root *tree_root,
  {
  	u32 blocksize;
-+	struct btrfs_root *log_root;
  	u64 blocknr = btrfs_super_log_root(disk_super);
 -	struct btrfs_root *log_root = malloc(sizeof(struct btrfs_root));
++	struct btrfs_root *log_root;
  
  	if (blocknr == 0)
  		return 0;
  
 +	log_root = malloc(sizeof(struct btrfs_root));
++
  	blocksize = btrfs_level_size(tree_root,
  			     btrfs_super_log_root_level(disk_super));
  
--- 
-1.7.0.2
-


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠hilbert.suse.de

tags

participants (1)