From a0e224372f0210898cdbc28d454222bf72ffc46a96f49b9a8c650341231b9ea4 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Wed, 12 Aug 2009 23:47:12 +0000 Subject: [PATCH] Accepting request 17571 from filesystems Copy from filesystems/xfsdump based on submit request 17571 from user michal-m OBS-URL: https://build.opensuse.org/request/show/17571 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xfsdump?expand=0&rev=10 --- xfsdump-3.0.1.tar.bz2 | 3 + xfsdump-64k_pagesize.patch | 44 ---------- xfsdump-librmt.patch | 26 ------ xfsdump.changes | 12 +++ xfsdump.spec | 165 +------------------------------------ xfsdump_2.2.48-1.tar.bz2 | 3 - 6 files changed, 19 insertions(+), 234 deletions(-) create mode 100644 xfsdump-3.0.1.tar.bz2 delete mode 100644 xfsdump-64k_pagesize.patch delete mode 100644 xfsdump-librmt.patch delete mode 100644 xfsdump_2.2.48-1.tar.bz2 diff --git a/xfsdump-3.0.1.tar.bz2 b/xfsdump-3.0.1.tar.bz2 new file mode 100644 index 0000000..9d1d808 --- /dev/null +++ b/xfsdump-3.0.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0c30dcfa827d0b3a96e6bb90d2edaab7300abb33da420ca1cb56de8a66f2140e +size 679882 diff --git a/xfsdump-64k_pagesize.patch b/xfsdump-64k_pagesize.patch deleted file mode 100644 index eb39f57..0000000 --- a/xfsdump-64k_pagesize.patch +++ /dev/null @@ -1,44 +0,0 @@ -Index: dump/content.c -=================================================================== ---- dump/content.c.orig -+++ dump/content.c -@@ -210,7 +210,7 @@ typedef struct extent_group_context exte - - /* minimum sizes for extended attributes buffers - */ --#define EXTATTR_LISTBUF_SZ ( 4 * pgsz ) -+#define EXTATTR_LISTBUF_SZ ( XATTR_LIST_MAX ) - #define EXTATTR_RTRVARRAY_LEN ( 1 * pgsz ) - #define EXTATTR_DUMPBUF_SZ ( 4 * pgsz ) - -Index: restore/inomap.c -=================================================================== ---- restore/inomap.c.orig -+++ restore/inomap.c -@@ -197,8 +197,6 @@ inomap_restore_pers( drive_t *drivep, - */ - ASSERT( INOPERSEG == ( sizeof( (( seg_t * )0 )->lobits ) * NBBY )); - ASSERT( sizeof( hnk_t ) == HNKSZ ); -- ASSERT( HNKSZ >= pgsz ); -- ASSERT( ! ( HNKSZ % pgsz )); - ASSERT( sizeof( pers_t ) <= PERSSZ ); - - /* get inomap info from media hdr -@@ -224,8 +222,6 @@ inomap_restore_pers( drive_t *drivep, - - /* mmap the persistent hdr and space for the map - */ -- ASSERT( sizeof( hnk_t ) * ( size_t )hnkcnt >= pgsz ); -- ASSERT( ! ( sizeof( hnk_t ) * ( size_t )hnkcnt % pgsz )); - persp = ( pers_t * ) mmap_autogrow( - PERSSZ - + -@@ -355,8 +351,6 @@ inomap_sync_pers( char *hkdir ) - /* sanity checks - */ - ASSERT( sizeof( hnk_t ) == HNKSZ ); -- ASSERT( HNKSZ >= pgsz ); -- ASSERT( ! ( HNKSZ % pgsz )); - - /* only needed once per session - */ diff --git a/xfsdump-librmt.patch b/xfsdump-librmt.patch deleted file mode 100644 index 5414782..0000000 --- a/xfsdump-librmt.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: xfsdump/librmt/rmtopen.c -=================================================================== -RCS file: /cvs/xfs-cmds/xfsdump/librmt/rmtopen.c,v -retrieving revision 1.13 -retrieving revision 1.14 -diff -u -p -r1.13 -r1.14 ---- xfsdump/librmt/rmtopen.c 9 Nov 2005 05:04:17 -0000 1.13 -+++ xfsdump/librmt/rmtopen.c 18 Nov 2008 02:25:38 -0000 1.14 -@@ -171,7 +171,7 @@ static int _rmt_open (char *path, int of - } - - rmt_f = popen(cmd, "r"); -- if (rmt_f < 0) { -+ if (rmt_f == NULL) { - _rmt_msg(RMTWARN, _( - "rmtopen: failed to detect remote host type using \"%s\"\n"), - cmd); -@@ -183,7 +183,7 @@ static int _rmt_open (char *path, int of - char *c = fgets(uname, sizeof(uname), rmt_f); - pclose(rmt_f); - -- if (c < 0) { -+ if (c == NULL) { - _rmt_msg(RMTWARN, _( - "rmtopen: failed to detect remote host type reading \"%s\"\n"), - cmd); diff --git a/xfsdump.changes b/xfsdump.changes index 7b34ebc..9cf38e9 100644 --- a/xfsdump.changes +++ b/xfsdump.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Jun 23 12:13:33 CEST 2009 - mmarek@suse.cz + +- updated to 3.0.1 + - Bump major package version number to signify changed + dependencies and moved binaries (xfs_fsr and estimate + have moved into xfsprogs). + - xfsdump should no longer make use of internal XFS + headers and libraries, in particular no use of libxfs + is permitted in this package anymore (such detailed + on-disk format knowledge is the realm of xfsprogs). + ------------------------------------------------------------------- Mon Jan 12 15:25:37 CET 2009 - mmarek@suse.cz diff --git a/xfsdump.spec b/xfsdump.spec index ed9448a..d31450b 100644 --- a/xfsdump.spec +++ b/xfsdump.spec @@ -1,5 +1,5 @@ # -# spec file for package xfsdump (Version 2.2.48) +# spec file for package xfsdump (Version 3.0.1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,17 +20,15 @@ Name: xfsdump BuildRequires: e2fsprogs-devel libattr-devel ncurses-devel xfsprogs-devel -Version: 2.2.48 -Release: 46 +Version: 3.0.1 +Release: 1 AutoReqProv: on Group: System/Filesystems License: GPL v2 or later Url: http://oss.sgi.com/projects/xfs/ Summary: Administrative Utilities for the XFS File System -Source0: xfsdump_%version-1.tar.bz2 +Source0: xfsdump-%version.tar.bz2 Patch0: xfsdump-docdir.diff -Patch1: xfsdump-librmt.patch -Patch2: xfsdump-64k_pagesize.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -59,15 +57,10 @@ Authors: %prep %setup -q %patch0 -%patch1 -p1 -%patch2 %build -%{suse_update_config -f} export CFLAGS=$RPM_OPT_FLAGS export DEBUG=-DNDEBUG -aclocal --force -autoconf --force ./configure \ --prefix=/usr \ --exec-prefix=/ \ @@ -91,153 +84,3 @@ rm -rf $RPM_BUILD_ROOT /usr/share/man/man8/* %changelog -* Mon Jan 12 2009 mmarek@suse.cz -- fixed xfsdump on ia64 with 64k page size (bnc#450668) -* Tue Jan 06 2009 mmarek@suse.cz -- fixed two pointer comparison errors in librmt (bnc#433393) -* Thu Mar 20 2008 mmarek@suse.cz -- updated to 2.2.48 - * Prune dump sessions with 0 media files even when using -m. - * Correctly detect whether a tape device is in variable or - fixed block mode when using the TS tape driver. -* Tue Oct 23 2007 mmarek@suse.cz -- updated to 2.2.46 - * includes last fix -* Fri Aug 31 2007 mmarek@suse.cz -- fixed missing mode arguments to open() -* Fri Jun 22 2007 mmarek@suse.cz -- updated to 2.2.45 - * Change fsr's temp directory mode to 0700 to deny full access. - * Update fsr's usage text. - * Fix use of getopt's optopt variable. Thanks to Kouta Ooizumi. - * Initialize xfsdump's logging facility earlier. Thanks to - Kouta Ooizumi. - * Log a message for each quota file restored, not just the first. - * When using -z, check a file's size against the max dump file - size just before dumping the file, rather than only during the - initial scan, to account for changes during the dump. - * A sync needs to be issued before the first inode scan to avoid - potentially skipping modified files in an incremental dump. - * Change the inode scans to seek to the next inode of - interest, rather than always doing a full scan. Useful - for dumps that contain only a subset of the inodes - in a filesystem (incrementals, subtree dumps, etc.). - * Produce a more accurate dump size estimate when - it is worthwhile to do so (when using multiple dump - streams or when skipping files based on size). -- specfile cleanup -* Thu Mar 29 2007 mmarek@suse.de -- added ncurses-devel to BuildRequires (needed for xfsinvutil) -* Fri Oct 20 2006 mjancar@suse.cz -- update to 2.2.42 - * Rework code to remove the DMAPI build and run-time dependency. - * Fix issues with makedepend on libtool libraries. - * Fix annoying "ignores datarootdir" warning from configure. - * Fix issues with makedepend build infrastructure. - * Fix for parallel compiles, thanks to Robin H. Johnson. -* Thu Jul 27 2006 mjancar@suse.cz -- update to 2.2.38 - * Performance improvements for dumping subtrees. - * Fix xfs_fsr memory and file descriptor leaks. - * Fix xfs_fsr handling some of the extended inode flags - and fields (like project IDs, extsize, realtime, etc). - * Fix Debian packaging for libc-dev build dependency. - * Fix up auto lib64 install detection for x86_64 platforms. - * Use -O2 optimisation by default now like everywhere else. - * Default to using a single media file for each strategy. - Multiple media files can be enabled on tape strategies - by using the -d option. - * Fix a bug in restoring multiple links to files with the - immutable bit set. - * Fix a regression that caused xfsrestore to fail when - restoring files that were changing during the dump. - * Remove some overhead in restoring files that were dumped - in multiple extent groups (> 16 MiB). - * Add simple interface to HSM-specific code in xfsrestore, - similar to that already in xfsdump. - * Fix fsr mishandling directories given as arguments. - * Fix build dependency on recent xfsprogs header files. - * Minor man page fixups with respect to hyphenation. - * Optimizations to increase the performance of xfsdump and - xfsrestore, especially on filesystems with millions of inodes. - Many small changes were made to minimize the number of system - calls required per inode. - * Significant changes to xfsdump: - o Cache the gen number of each inode during the initial inode - scan so that a bulkstat single does not need to be done for - each inode when dumping directories. - o No longer retrieve the DMF attribute when estimating the dump - size of a file. Use information from the bulkstat instead. - o Retrieve DMF attribute by handle instead of doing - open/attr_getf/close. - o In determining where to split multi-stream dumps, take into - consideration the number of files and not just the file size. - This allows filesystems with large amounts of inodes but - relatively little data (DMF filesystem) to be split correctly. - * Significant changes to xfsrestore: - o Buffer writes to the namreg file to eliminate 2 very small - write system calls per directory entry. - o Buffer writes to dirattr file to eliminate a small write system - call per directory. - o Speedup the check to see if a particular window of the tree - file is mapped. This allows xfsrestore to use more, smaller - windows which is beneficial if we can't fit them all in memory - and have to start unmapping them. This also makes the -w - option obsolete so that option now has no effect. - o Change the hash function to give a better distribution among - the hash buckets. - o Do not make an unnecessary unlink call if the file being - restored does not already exist. -* Wed Jan 25 2006 mls@suse.de -- converted neededforbuild to BuildRequires -* Tue Jan 17 2006 mjancar@suse.cz -- update to 2.2.33 -* Thu Sep 29 2005 dmueller@suse.de -- add norootforbuild -* Tue Aug 02 2005 mjancar@suse.cz -- update to 2.2.30 -* Wed Jun 22 2005 agruen@suse.de -- xfs-restore-lazy-alloc.diff: Fix for ENOSPC errors on write - (91036). -* Tue Apr 05 2005 mmj@suse.de -- static char *progname -> char *progname -* Mon Feb 07 2005 mjancar@suse.cz -- update to 2.2.25 -* Fri Oct 01 2004 mjancar@suse.cz -- link dynamicaly aganist libuuid (#44531) -* Fri Aug 13 2004 mjancar@suse.cz -- update to 2.2.21 -* Thu Feb 26 2004 mjancar@suse.cz -- update to 2.2.16 -* Fri Aug 08 2003 ja@suse.cz -- Updated to 2.2.13. -- fix ST/TS tape driver compatibility issues in drive_scsitape. -- fix multiple backups to a single tape (TS AND ST). -* Fri Jun 20 2003 ja@suse.cz -- Upgrade to version 2.2.12. -* Tue Apr 29 2003 jderfina@suse.cz -- update to version 2.2.10 -- switch from using mktemp to using mkstemp for xfs_copy log. -- use a FHS compliant name for the xfs_copy log file. -- add initial support for TS tape driver. -- fix xfsdump -I option to set correct fsid. -* Wed Feb 12 2003 jderfina@suse.cz -- update to version 2.2.6 -- add initial internationalisation support. -- fix build fallout from macro changes in XFS headers. -* Fri Dec 13 2002 jderfina@suse.cz -- upgrade to version 2.2.4 -* Thu Oct 10 2002 jderfina@suse.cz -- upgrade to version 2.2.1 -* Tue Aug 20 2002 mge@suse.de -- update to 2.1.3 -* Sun Apr 21 2002 kukuk@suse.de -- Make compile on architectures with lib64 -* Tue Feb 26 2002 ro@suse.de -- update to 2.0.0 -* Tue Aug 21 2001 ro@suse.de -- added xfsprogs attr attr-devel to neededforbuild -* Tue Aug 21 2001 adostal@suse.cz -- split xfsdump-1.0.9 from package xfsprogs -- use DESTDIR from %%install (...destdir.patch) -- create ...dirs.patch diff --git a/xfsdump_2.2.48-1.tar.bz2 b/xfsdump_2.2.48-1.tar.bz2 deleted file mode 100644 index 71fdb39..0000000 --- a/xfsdump_2.2.48-1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:34876e7fb8e01b480f9597bf038fab36472d824c3b28d387df1bed7eea3b9b1f -size 470834