Merge branch 'master' of git+ssh://openadk.org/git/openadk

3 files changed, 18 insertions, 79 deletions

diff --git a/package/util-linux/patches/patch-Makefile_am b/package/util-linux/patches/patch-Makefile_am
index cc6c3516d..c9145e03c 100644
--- a/package/util-linux/patches/patch-Makefile_am
+++ b/package/util-linux/patches/patch-Makefile_am
@@ -1,6 +1,6 @@
---- util-linux-2.25.2.orig/Makefile.am	2014-10-24 04:21:20.304387835 -0500
-+++ util-linux-2.25.2/Makefile.am	2014-12-27 12:28:09.631516950 -0600
-@@ -60,7 +60,7 @@ CHECK_LOCALS =
+--- util-linux-2.26.orig/Makefile.am	2015-02-10 03:49:46.340584289 -0600
++++ util-linux-2.26/Makefile.am	2015-03-08 18:40:34.721545548 -0500
+@@ -61,7 +61,7 @@ CHECK_LOCALS =
  EXTRA_DIST =
  CLEANFILES =
  
diff --git a/package/util-linux/patches/patch-configure_ac b/package/util-linux/patches/patch-configure_ac
index b2f23a55c..0b8adafb5 100644
--- a/package/util-linux/patches/patch-configure_ac
+++ b/package/util-linux/patches/patch-configure_ac
@@ -1,8 +1,8 @@
---- util-linux-2.25.2.orig/configure.ac	2014-10-24 05:24:02.952545559 -0500
-+++ util-linux-2.25.2/configure.ac	2014-12-28 02:49:26.739043554 -0600
-@@ -53,16 +53,6 @@ LIBSMARTCOLS_LT_MINOR=1
- LIBSMARTCOLS_LT_MICRO=0
- LIBSMARTCOLS_VERSION_INFO=`expr $LIBSMARTCOLS_LT_MAJOR + $LIBSMARTCOLS_LT_MINOR`:$LIBSMARTCOLS_LT_MICRO:$LIBSMARTCOLS_LT_MINOR
+--- util-linux-2.26.orig/configure.ac	2015-02-19 06:11:13.146192401 -0600
++++ util-linux-2.26/configure.ac	2015-03-09 17:43:49.200785697 -0500
+@@ -60,16 +60,6 @@ LIBFDISK_LT_MINOR=1
+ LIBFDISK_LT_MICRO=0
+ LIBFDISK_VERSION_INFO=`expr $LIBFDISK_LT_MAJOR + $LIBFDISK_LT_MINOR`:$LIBFDISK_LT_MICRO:$LIBFDISK_LT_MINOR
  
 -# Check whether exec_prefix=/usr:
 -AS_CASE([$exec_prefix:$prefix],
@@ -17,7 +17,7 @@
  AS_CASE([$prefix:$localstatedir],
    [NONE:'${prefix}/var' | /usr:'${prefix}/var'],
      [localstatedir=/run
-@@ -160,16 +150,6 @@ UL_SET_ARCH([HPPA], [hppa*])
+@@ -168,16 +158,6 @@ UL_SET_ARCH([HPPA], [hppa*])
  
  AC_SYS_LARGEFILE
  
@@ -34,7 +34,15 @@
  AC_CHECK_HEADERS([linux/compiler.h linux/blkpg.h linux/major.h], [], [], [
  #ifdef HAVE_LINUX_COMPILER_H
  #include <linux/compiler.h>
-@@ -1811,7 +1791,9 @@ libmount/src/libmount.h
+@@ -230,7 +210,6 @@ AC_CHECK_HEADERS([ \
+ 	sys/swap.h \
+ 	sys/syscall.h \
+ 	sys/time.h \
+-	sys/timex.h \
+ 	sys/ttydefaults.h \
+ 	sys/types.h \
+ 	sys/un.h \
+@@ -1900,7 +1879,9 @@ libmount/src/libmount.h
  libsmartcols/docs/Makefile
  libsmartcols/docs/version.xml
  libsmartcols/src/libsmartcols.h
diff --git a/package/util-linux/patches/patch-m4_libtool_m4 b/package/util-linux/patches/patch-m4_libtool_m4
deleted file mode 100644
index 86f48d620..000000000
--- a/package/util-linux/patches/patch-m4_libtool_m4
+++ /dev/null
@@ -1,69 +0,0 @@
---- util-linux-2.25.2.orig/m4/libtool.m4	2014-06-25 02:25:47.000000000 -0500
-+++ util-linux-2.25.2/m4/libtool.m4	2014-12-27 12:19:20.527521791 -0600
-@@ -1312,7 +1312,7 @@ ia64-*-hpux*)
-   rm -rf conftest*
-   ;;
- 
--x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
-+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
- s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-   # Find out which ABI we are using.
-   echo 'int i;' > conftest.$ac_ext
-@@ -1326,10 +1326,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
- 	  x86_64-*linux*)
- 	    LD="${LD-ld} -m elf_i386"
- 	    ;;
--	  powerpc64le-*linux*)
--	    LD="${LD-ld} -m elf32lppclinux"
--	    ;;
--	  powerpc64-*linux*)
-+	  ppc64-*linux*|powerpc64-*linux*)
- 	    LD="${LD-ld} -m elf32ppclinux"
- 	    ;;
- 	  s390x-*linux*)
-@@ -1348,10 +1345,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
- 	  x86_64-*linux*)
- 	    LD="${LD-ld} -m elf_x86_64"
- 	    ;;
--	  powerpcle-*linux*)
--	    LD="${LD-ld} -m elf64lppc"
--	    ;;
--	  powerpc-*linux*)
-+	  ppc*-*linux*|powerpc*-*linux*)
- 	    LD="${LD-ld} -m elf64ppc"
- 	    ;;
- 	  s390*-*linux*|s390*-*tpf*)
-@@ -2675,14 +2669,10 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
-   # before this can be enabled.
-   hardcode_into_libs=yes
- 
--  # Add ABI-specific directories to the system library path.
--  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
--
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
-     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
--    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
--
-+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-   fi
- 
-   # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -4602,7 +4592,7 @@ m4_if([$1], [CXX], [
-   _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-   _LT_TAGVAR(export_dynamic_flag_spec, $1)=
-   _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
--  _LT_TAGVAR(hardcode_automatic, $1)=no
-+  _LT_TAGVAR(hardcode_automatic, $1)=yes
-   _LT_TAGVAR(hardcode_direct, $1)=no
-   _LT_TAGVAR(hardcode_direct_absolute, $1)=no
-   _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-@@ -5850,7 +5840,7 @@ _LT_TAGVAR(hardcode_libdir_flag_spec, $1
- _LT_TAGVAR(hardcode_libdir_separator, $1)=
- _LT_TAGVAR(hardcode_minus_L, $1)=no
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
--_LT_TAGVAR(hardcode_automatic, $1)=no
-+_LT_TAGVAR(hardcode_automatic, $1)=yes
- _LT_TAGVAR(inherit_rpath, $1)=no
- _LT_TAGVAR(module_cmds, $1)=
- _LT_TAGVAR(module_expsym_cmds, $1)=