Update xfsprogs to 3.1.4 to 3.1.7

Changelog at http://xfs.org/index.php/XFS_Status_Updates

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30965 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/xfsprogs/Makefile b/package/xfsprogs/Makefile
index c2538fd..998d824 100644 (file)
--- a/package/xfsprogs/Makefile
+++ b/package/xfsprogs/Makefile
@@ -1,5 +1,5 @@
 # 
 # 

-# Copyright (C) 2006-2008 OpenWrt.org
+# Copyright (C) 2006-2012 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.


@@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xfsprogs
 PKG_RELEASE:=1
 
 PKG_NAME:=xfsprogs
 PKG_RELEASE:=1

-PKG_VERSION:=3.1.4
-PKG_SOURCE_URL:=http://ftp.debian.org/pool/main/x/xfsprogs
-PKG_MD5SUM:=23568a603c913b80076abe3c23521573
+PKG_VERSION:=3.1.7
+PKG_SOURCE_URL:=ftp://oss.sgi.com/projects/xfs/cmd_tars
+PKG_MD5SUM:=049cf9873794ea49d0bb3f12d45748a4

 
 

-PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

 PKG_INSTALL:=1
 PKG_FIXUP:=autoreconf
 
 PKG_INSTALL:=1
 PKG_FIXUP:=autoreconf
 

diff --git a/package/xfsprogs/patches/001-automake-compat.patch b/package/xfsprogs/patches/001-automake-compat.patch
index 6d170d2..3003d6d 100644 (file)
--- a/package/xfsprogs/patches/001-automake-compat.patch
+++ b/package/xfsprogs/patches/001-automake-compat.patch
@@ -1,3 +1,38 @@
+commit 2222aa77e11b959e0e5a0ded3482e56799593bc2
+Author: Jens Muecke <jens@nons.de>
+Date:   Thu Jan 26 00:34:15 2012 +0100
+
+    001-automake-compat
+
+diff --git a/configure.in b/configure.in
+index 664c0e9..d91b6ec 100644
+--- a/configure.in
++++ b/configure.in
+@@ -2,7 +2,8 @@ AC_INIT(include/libxfs.h)
+ AC_PREREQ(2.50)
+ AC_CONFIG_AUX_DIR([.])
+ AC_CONFIG_MACRO_DIR([m4])
+-AC_CONFIG_HEADER(include/platform_defs.h)
++# Put a dummy here (http://www.mail-archive.com/automake@gnu.org/msg09241.html)
++AC_CONFIG_HEADERS([doesnotexist.h include/platform_defs.h])
+ AC_PREFIX_DEFAULT(/usr)
+ 
+ AC_PROG_LIBTOOL
+diff --git a/include/builddefs.in b/include/builddefs.in
+index 81ebfcd..5a4a0e8 100644
+--- a/include/builddefs.in
++++ b/include/builddefs.in
+@@ -20,6 +20,8 @@
+ ifndef _BUILDDEFS_INCLUDED_
+ _BUILDDEFS_INCLUDED_ = 1
+ 
++SHELL = @SHELL@
++
+ DEBUG = @debug_build@
+ OPTIMIZER = @opt_build@
+ MALLOCLIB = @malloc_lib@
+diff --git a/m4/package_types.m4 b/m4/package_types.m4
+index 0a0e087..66a136a 100644

 --- a/m4/package_types.m4
 +++ b/m4/package_types.m4
 @@ -9,7 +9,7 @@ AC_DEFUN([AC_TYPE_PSINT],
 --- a/m4/package_types.m4
 +++ b/m4/package_types.m4
 @@ -9,7 +9,7 @@ AC_DEFUN([AC_TYPE_PSINT],


@@ -47,36 +82,3 @@
 +      AC_DEFINE([HAVE_64BIT_PTR], [1], [Define if char* is 64bit])
      fi
    ])
 +      AC_DEFINE([HAVE_64BIT_PTR], [1], [Define if char* is 64bit])
      fi
    ])

---- a/include/builddefs.in
-+++ b/include/builddefs.in
-@@ -20,6 +20,8 @@
- ifndef _BUILDDEFS_INCLUDED_
- _BUILDDEFS_INCLUDED_ = 1
- 
-+SHELL = @SHELL@
-+
- DEBUG = @debug_build@
- OPTIMIZER = @opt_build@
- MALLOCLIB = @malloc_lib@
---- a/include/buildmacros
-+++ b/include/buildmacros
-@@ -32,7 +32,6 @@ OBJECTS = $(ASFILES:.s=.o) \
- 
- INSTALL       = $(TOPDIR)/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
- 
--SHELL = /bin/sh
- IMAGES_DIR = $(TOPDIR)/all-images
- DIST_DIR = $(TOPDIR)/dist
- 
---- a/configure.in
-+++ b/configure.in
-@@ -1,7 +1,8 @@
- AC_INIT(include/libxfs.h)
- AC_CONFIG_AUX_DIR([.])
- AC_CONFIG_MACRO_DIR([m4])
--AC_CONFIG_HEADER(include/platform_defs.h)
-+# Put a dummy here (http://www.mail-archive.com/automake@gnu.org/msg09241.html)
-+AC_CONFIG_HEADERS([doesnotexist.h include/platform_defs.h])
- AC_PREFIX_DEFAULT(/usr)
- 
- AC_PROG_LIBTOOL

diff --git a/package/xfsprogs/patches/100-no_aio.patch b/package/xfsprogs/patches/100-no_aio.patch
index b16faa8..30d36b4 100644 (file)
--- a/package/xfsprogs/patches/100-no_aio.patch
+++ b/package/xfsprogs/patches/100-no_aio.patch
@@ -1,6 +1,14 @@
+commit e72b7bd12fdef06c3494b919376bfe886aa8bb4d
+Author: Jens Muecke <jens@nons.de>
+Date:   Thu Jan 26 00:35:43 2012 +0100
+
+    100-no_aio
+
+diff --git a/configure.in b/configure.in
+index d91b6ec..8dc8b4a 100644

 --- a/configure.in
 +++ b/configure.in
 --- a/configure.in
 +++ b/configure.in

-@@ -87,8 +87,8 @@ AC_PACKAGE_GLOBALS(xfsprogs)
+@@ -92,8 +92,8 @@ AC_PACKAGE_GLOBALS(xfsprogs)

  AC_PACKAGE_UTILITIES(xfsprogs)
  AC_MULTILIB($enable_lib64)
  
  AC_PACKAGE_UTILITIES(xfsprogs)
  AC_MULTILIB($enable_lib64)
  

diff --git a/package/xfsprogs/patches/110-uclibc_no_ustat.patch b/package/xfsprogs/patches/110-uclibc_no_ustat.patch
index 9cd2dc2..c46e802 100644 (file)
--- a/package/xfsprogs/patches/110-uclibc_no_ustat.patch
+++ b/package/xfsprogs/patches/110-uclibc_no_ustat.patch
@@ -1,3 +1,11 @@
+commit 7b1d0a98e779170232c0a81b4749ab934ec67a7e
+Author: Jens Muecke <jens@nons.de>
+Date:   Thu Jan 26 00:36:42 2012 +0100
+
+    110-uclibc_no_ustat
+
+diff --git a/libxfs/linux.c b/libxfs/linux.c
+index 2e07d54..6a6c905 100644

 --- a/libxfs/linux.c
 +++ b/libxfs/linux.c
 @@ -21,7 +21,9 @@
 --- a/libxfs/linux.c
 +++ b/libxfs/linux.c
 @@ -21,7 +21,9 @@


@@ -18,7 +26,7 @@
        /* Pad ust; pre-2.6.28 linux copies out too much in 32bit compat mode */
        struct ustat    ust[2];
        struct stat64   st;
        /* Pad ust; pre-2.6.28 linux copies out too much in 32bit compat mode */
        struct ustat    ust[2];
        struct stat64   st;

-@@ -68,6 +71,7 @@ platform_check_ismounted(char *name, cha
+@@ -68,6 +71,7 @@ platform_check_ismounted(char *name, char *block, struct stat64 *s, int verbose)

                                progname, name);
                return 1;
        }
                                progname, name);
                return 1;
        }

diff --git a/package/xfsprogs/patches/120-portability.patch b/package/xfsprogs/patches/120-portability.patch
index d8bda81..1e9b533 100644 (file)
--- a/package/xfsprogs/patches/120-portability.patch
+++ b/package/xfsprogs/patches/120-portability.patch
@@ -1,6 +1,14 @@
+commit d2aef8b3967e53fe58178f5af50fef488ee0faed
+Author: Jens Muecke <jens@nons.de>
+Date:   Thu Jan 26 00:37:52 2012 +0100
+
+    120-portability
+
+diff --git a/copy/xfs_copy.c b/copy/xfs_copy.c
+index c01e0b9..2e2f320 100644

 --- a/copy/xfs_copy.c
 +++ b/copy/xfs_copy.c
 --- a/copy/xfs_copy.c
 +++ b/copy/xfs_copy.c

-@@ -463,6 +463,15 @@ read_ag_header(int fd, xfs_agnumber_t ag
+@@ -463,6 +463,15 @@ read_ag_header(int fd, xfs_agnumber_t agno, wbuf *buf, ag_header_t *ag,

  }
  
  
  }
  
  

diff --git a/package/xfsprogs/patches/130-uclibc_no_xattr.patch b/package/xfsprogs/patches/130-uclibc_no_xattr.patch
index 30cb861..b1ecda7 100644 (file)
--- a/package/xfsprogs/patches/130-uclibc_no_xattr.patch
+++ b/package/xfsprogs/patches/130-uclibc_no_xattr.patch
@@ -1,3 +1,11 @@
+commit 10d6058b24f18cb31889154f830b191849f45106
+Author: Jens Muecke <jens@nons.de>
+Date:   Thu Jan 26 00:38:27 2012 +0100
+
+    130-uclibc_no_xattr
+
+diff --git a/fsr/xfs_fsr.c b/fsr/xfs_fsr.c
+index 40c2e6f..4f54059 100644

 --- a/fsr/xfs_fsr.c
 +++ b/fsr/xfs_fsr.c
 @@ -35,7 +35,9 @@
 --- a/fsr/xfs_fsr.c
 +++ b/fsr/xfs_fsr.c
 @@ -35,7 +35,9 @@