9 files changed, 400 insertions, 97 deletions
diff --git a/package/xfsprogs/Config.in b/package/xfsprogs/Config.in
deleted file mode 100644
index 729c249e0..000000000
--- a/package/xfsprogs/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_PACKAGE_XFSPROGS
-	prompt "xfsprogs.......................... Utilities to create and check XFS filesystems"
-	tristate
-	select ADK_PACKAGE_LIBUUID
-	select ADK_PACKAGE_LIBPTHREAD
-	default n
-	help
-           Utilities to create and check XFS filesystems.
diff --git a/package/xfsprogs/Makefile b/package/xfsprogs/Makefile
index bdb09fe91..30da515e0 100644
--- a/package/xfsprogs/Makefile
+++ b/package/xfsprogs/Makefile
@@ -4,12 +4,13 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		xfsprogs
-PKG_VERSION:=		3.0.0
+PKG_VERSION:=		3.1.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		ec734f935ec87ebb8be890d29380a3e6
+PKG_MD5SUM:=		c2308b46ee707597ac50aae418d321b8
 PKG_DESCR:=		Utilities to create and check XFS filesystems
 PKG_SECTION:=		admin
 PKG_DEPENDS:=		libuuid libpthread
+PKG_BUILDDEP+=		e2fsprogs
 PKG_URL:=		http://oss.sgi.com/projects/xfs
 PKG_SITES:=		ftp://oss.sgi.com/projects/xfs/cmd_tars/ \
 			ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/
@@ -18,17 +19,16 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,XFSPROGS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	autoconf gnu
+INSTALL_STYLE:=		manual
+
 CONFIGURE_ARGS+=	--enable-gettext=no \
 			--with-gnu-ld
 CONFIGURE_ENV+=		DEBUG=" " OPTIMIZER=" "
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
 ALL_TARGET=		
 
-post-install:
-	${INSTALL_DIR} ${IDIR_XFSPROGS}/sbin
-	${CP} ${WRKINST}/usr/sbin/mkfs.xfs ${IDIR_XFSPROGS}/sbin/
-	${CP} ${WRKINST}/usr/sbin/xfs_repair ${IDIR_XFSPROGS}/sbin/
+do-install:
+	${INSTALL_DIR} ${IDIR_XFSPROGS}/usr/sbin
+	${INSTALL_BIN} ${WRKBUILD}/mkfs/mkfs.xfs ${IDIR_XFSPROGS}/usr/sbin/
+	${INSTALL_BIN} ${WRKBUILD}/repair/xfs_repair ${IDIR_XFSPROGS}/usr/sbin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xfsprogs/patches/patch-configure b/package/xfsprogs/patches/patch-configure
new file mode 100644
index 000000000..e8068cfba
--- /dev/null
+++ b/package/xfsprogs/patches/patch-configure
@@ -0,0 +1,370 @@
+--- xfsprogs-3.1.1.orig/configure	2010-01-29 21:33:34.000000000 +0100
++++ xfsprogs-3.1.1/configure	2010-02-14 00:02:10.000000000 +0100
+@@ -6404,7 +6404,7 @@ fi
+ LIBTOOL_DEPS="$ltmain"
+
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++LIBTOOL='$(CONFIG_SHELL) $(top_builddir)/libtool'
+
+
+
+@@ -11216,7 +11216,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+     test -z "$DISTRIBUTION" || pkg_distribution="$DISTRIBUTION"
+
+
+-    pkg_platform=`uname -s | tr 'A-Z' 'a-z' | sed -e 's/irix64/irix/'`
++    pkg_platform=linux
+     test -z "$PLATFORM" || pkg_platform="$PLATFORM"
+
+
+@@ -12602,349 +12602,6 @@ fi
+
+
+
+-for ac_header in aio.h
+-do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-else
+-  # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  ac_header_compiler=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_header_compiler=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
+-
+-# Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <$ac_header>
+-_ACEOF
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null && {
+-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       }; then
+-  ac_header_preproc=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-  ac_header_preproc=no
+-fi
+-
+-rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
+-
+-# So?  What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  eval "$as_ac_Header=\$ac_header_preproc"
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-
+-fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+-
+-done
+-
+-    if test $ac_cv_header_aio_h = no; then
+-	echo
+-	echo 'FATAL ERROR: could not find a valid <aio.h> header.'
+-	exit 1
+-    fi
+-
+-
+-for ac_func in lio_listio
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  eval "$as_ac_var=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=no"
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+-done
+-
+-    if test $ac_cv_func_lio_listio = yes; then
+-	librt=""
+-    else
+-
+-{ $as_echo "$as_me:$LINENO: checking for lio_listio in -lrt" >&5
+-$as_echo_n "checking for lio_listio in -lrt... " >&6; }
+-if test "${ac_cv_lib_rt_lio_listio+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lrt  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char lio_listio ();
+-int
+-main ()
+-{
+-return lio_listio ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  ac_cv_lib_rt_lio_listio=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_rt_lio_listio=no
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_rt_lio_listio" >&5
+-$as_echo "$ac_cv_lib_rt_lio_listio" >&6; }
+-if test "x$ac_cv_lib_rt_lio_listio" = x""yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBRT 1
+-_ACEOF
+-
+-  LIBS="-lrt $LIBS"
+-
+-else
+-
+-	    echo
+-	    echo 'FATAL ERROR: could not find a library with lio_listio.'
+-	    exit 1
+-fi
+-
+-	librt="-lrt"
+-    fi
+-
+-
+-
+-
+-
+-
+ for ac_header in uuid.h sys/uuid.h uuid/uuid.h
+ do
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
diff --git a/package/xfsprogs/patches/patch-configure_in b/package/xfsprogs/patches/patch-configure_in
deleted file mode 100644
index 78bb9c4b8..000000000
--- a/package/xfsprogs/patches/patch-configure_in
+++ /dev/null
@@ -1,20 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- xfsprogs-3.0.0.orig/configure.in	2009-02-04 23:29:48.000000000 +0100
-+++ xfsprogs-3.0.0/configure.in	2009-03-27 11:40:33.000000000 +0100
-@@ -46,16 +46,12 @@ AC_PACKAGE_GLOBALS(xfsprogs)
- AC_PACKAGE_UTILITIES(xfsprogs)
- AC_MULTILIB($enable_lib64)
- 
--AC_PACKAGE_NEED_AIO_H
--AC_PACKAGE_NEED_LIO_LISTIO
--
- AC_PACKAGE_NEED_UUID_H
- AC_PACKAGE_NEED_UUIDCOMPARE
- 
- AC_PACKAGE_NEED_PTHREAD_H
- AC_PACKAGE_NEED_PTHREADMUTEXINIT
- 
--AC_HAVE_FADVISE
- AC_HAVE_MADVISE
- AC_HAVE_MINCORE
- AC_HAVE_SENDFILE
diff --git a/package/xfsprogs/patches/patch-include_builddefs_in b/package/xfsprogs/patches/patch-include_builddefs_in
deleted file mode 100644
index 452817404..000000000
--- a/package/xfsprogs/patches/patch-include_builddefs_in
+++ /dev/null
@@ -1,35 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- xfsprogs-2.10.1.orig/include/builddefs.in	2007-09-11 04:01:15.000000000 +0200
-+++ xfsprogs-2.10.1/include/builddefs.in	2008-11-12 11:28:41.000000000 +0100
-@@ -25,7 +25,7 @@ OPTIMIZER = @opt_build@
- MALLOCLIB = @malloc_lib@
- LOADERFLAGS = @LDFLAGS@
- 
--LIBRT = @librt@
-+LIBRT = -lrt
- LIBUUID = @libuuid@
- LIBPTHREAD = @libpthread@
- LIBTERMCAP = @libtermcap@
-@@ -50,14 +50,14 @@ PKG_RELEASE	= @pkg_release@
- PKG_VERSION	= @pkg_version@
- PKG_PLATFORM	= @pkg_platform@
- PKG_DISTRIBUTION= @pkg_distribution@
--PKG_BIN_DIR	= @bindir@
--PKG_SBIN_DIR	= @sbindir@
--PKG_LIB_DIR	= @libdir@@libdirsuffix@
--PKG_DEVLIB_DIR	= @libexecdir@@libdirsuffix@
--PKG_INC_DIR	= @includedir@/xfs
--PKG_MAN_DIR	= @mandir@
--PKG_DOC_DIR	= @datadir@/doc/@pkg_name@
--PKG_LOCALE_DIR	= @datadir@/locale
-+PKG_BIN_DIR	= $(DESTDIR)@bindir@
-+PKG_SBIN_DIR	= $(DESTDIR)@sbindir@
-+PKG_LIB_DIR	= $(DESTDIR)@libdir@@libdirsuffix@
-+PKG_DEVLIB_DIR	= $(DESTDIR)@libexecdir@@libdirsuffix@
-+PKG_INC_DIR	= $(DESTDIR)@includedir@/xfs
-+PKG_MAN_DIR	= $(DESTDIR)@mandir@
-+PKG_DOC_DIR	= $(DESTDIR)@datadir@/doc/@pkg_name@
-+PKG_LOCALE_DIR	= $(DESTDIR)@datadir@/locale
- 
- CC		= @cc@
- AWK		= @awk@
diff --git a/package/xfsprogs/patches/patch-include_buildmacros b/package/xfsprogs/patches/patch-include_buildmacros
index f163f3f2b..ad07f23d2 100644
--- a/package/xfsprogs/patches/patch-include_buildmacros
+++ b/package/xfsprogs/patches/patch-include_buildmacros
@@ -1,12 +1,11 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- xfsprogs-3.0.0.orig/include/buildmacros	2009-02-04 23:29:25.000000000 +0100
-+++ xfsprogs-3.0.0/include/buildmacros	2009-03-27 11:45:29.000000000 +0100
-@@ -48,7 +48,7 @@ LTINSTALL = $(LIBTOOL) --mode=install $(
- LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CCF)
+--- xfsprogs-3.1.1.orig/include/buildmacros	2010-01-29 20:46:13.000000000 +0100
++++ xfsprogs-3.1.1/include/buildmacros	2010-02-13 23:57:06.000000000 +0100
+@@ -32,7 +32,7 @@ OBJECTS = $(ASFILES:.s=.o) \
  
- ifeq ($(ENABLE_SHARED),yes)
--LTLDFLAGS += -rpath $(PKG_LIB_DIR)
-+#LTLDFLAGS += -rpath $(PKG_LIB_DIR)
- LTLDFLAGS += -version-info $(LTVERSION)
- endif
+ INSTALL	= $(TOPDIR)/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
+
+-SHELL = /bin/sh
++SHELL ?= bash
+ IMAGES_DIR = $(TOPDIR)/all-images
+ DIST_DIR = $(TOPDIR)/dist
  
diff --git a/package/xfsprogs/patches/patch-libhandle_Makefile b/package/xfsprogs/patches/patch-libhandle_Makefile
deleted file mode 100644
index 2c16921e1..000000000
--- a/package/xfsprogs/patches/patch-libhandle_Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- xfsprogs-2.10.1.orig/libhandle/Makefile	2007-09-11 04:01:17.000000000 +0200
-+++ xfsprogs-2.10.1/libhandle/Makefile	2008-12-09 19:02:03.000000000 +0100
-@@ -17,7 +17,7 @@ default:  $(LTLIBRARY)
- include $(BUILDRULES)
- 
- install: default
--	$(INSTALL_LTLIB)
-+	#$(INSTALL_LTLIB)
- 
- install-dev: default
- 	$(INSTALL_LTLIB_DEV)
diff --git a/package/xfsprogs/patches/patch-libxfs_linux_c b/package/xfsprogs/patches/patch-libxfs_linux_c
index 9d0a95f75..a2cd55bd4 100644
--- a/package/xfsprogs/patches/patch-libxfs_linux_c
+++ b/package/xfsprogs/patches/patch-libxfs_linux_c
@@ -1,6 +1,5 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- xfsprogs-3.0.0.orig/libxfs/linux.c	2009-02-04 23:29:25.000000000 +0100
-+++ xfsprogs-3.0.0/libxfs/linux.c	2009-03-27 11:43:17.000000000 +0100
+--- xfsprogs-3.1.1.orig/libxfs/linux.c	2010-01-29 20:46:13.000000000 +0100
++++ xfsprogs-3.1.1/libxfs/linux.c	2010-02-13 23:45:27.000000000 +0100
 @@ -20,8 +20,6 @@
  #include <xfs/libxfs.h>
  #include <mntent.h>
diff --git a/package/xfsprogs/patches/patch-repair_Makefile b/package/xfsprogs/patches/patch-repair_Makefile
new file mode 100644
index 000000000..43b1964ad
--- /dev/null
+++ b/package/xfsprogs/patches/patch-repair_Makefile
@@ -0,0 +1,10 @@
+--- xfsprogs-3.1.1.orig/repair/Makefile	2010-01-29 20:46:13.000000000 +0100
++++ xfsprogs-3.1.1/repair/Makefile	2010-02-14 00:07:38.000000000 +0100
+@@ -20,7 +20,7 @@ CFILES = agheader.c attr_repair.c avl.c
+	progress.c prefetch.c rt.c sb.c scan.c threads.c \
+	versions.c xfs_repair.c
+
+-LLDLIBS = $(LIBXFS) $(LIBXLOG) $(LIBUUID) $(LIBRT) $(LIBPTHREAD)
++LLDLIBS = $(LIBXFS) $(LIBXLOG) $(LIBUUID) $(LIBRT) $(LIBPTHREAD) -lrt
+ LTDEPENDENCIES = $(LIBXFS) $(LIBXLOG)
+ LLDFLAGS = -static