Updated Consolidated pull

new file mode 100644
index 0000000..672155b
@@ -0,0 +1,26 @@
+Upstream-Status: Pending
+
+the test should be skipped for cross compiling.
+
+Signed-off-by: Qing He <[email protected]>
+
+diff --git a/configure.ac b/configure.ac
+index 026a36c..8af591b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -245,6 +245,7 @@ fi
+ QUILT_COMPAT_PROG_PATH(DIFF, diff)
+ QUILT_COMPAT_PROG_PATH(PATCH, patch)
+ 
++if test "x$cross_compiling" != "xyes"; then
+ # Sun diff and others will not work because GNU patch options are used.
+ AC_MSG_CHECKING([the version of $DIFF])
+ if $DIFF --version 2>/dev/null | grep GNU >/dev/null; then
+@@ -293,6 +294,7 @@ current version of patch from ftp.gnu.org, or if you already have GNU patch
+ then you can supply its path with the '--with-patch=' option.
+ ])
+ fi
++fi
+ 
+ QUILT_COMPAT_PROG_PATH(FIND, find)
+ 

index 20a708d..124e2cd 100644
@@ -2,8 +2,10 @@ require quilt.inc
 LICENSE="GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 RDEPENDS_${PN} += "patch diffstat bzip2 util-linux"
-PR = "r0"
-SRC_URI += "file://aclocal.patch"
+PR = "r1"
+SRC_URI += "file://aclocal.patch \
+            file://gnu_patch_test_fix_target.patch \
+           "
 
 SRC_URI[md5sum] = "f77adda60039ffa753f3c584a286f12b"
 SRC_URI[sha256sum] = "73fd760d3b5cbf06417576591dc37d67380d189392db9000c21b7cbebee49ffc"

similarity index 81%
rename from meta/recipes-extended/sat-solver/sat-solver/sat-solver_poky.patch
rename to meta/recipes-extended/sat-solver/sat-solver/sat-solver_core.patch
index b762bac..11bf5b0 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [distribution]
+
 Fix "arch" integration with Poky.
 
 Add a missing "any" architecture type and update the semantics to use it.

@@ -5,8 +7,27 @@ Add a missing "any" architecture type and update the semantics to use it.
 Disable the built-in archpolicies structure, and replace it with one
 we generate in the recipe.
 
+Also add poky semantics option in CMake.
+
 Signed-off-by: Mark Hatle <[email protected]>
+Signed-off-by: Qing He <[email protected]>
 
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 443281e..4456a87 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -45,6 +45,11 @@ MESSAGE(STATUS "Building for Debian")
+ ADD_DEFINITIONS( -DDEBIAN -DDEBIAN_SEMANTICS)
+ ENDIF ( DEBIAN )
+ 
++IF ( OE_CORE )
++MESSAGE(STATUS "Building for OE core")
++ADD_DEFINITIONS( -DOE_CORE -DOE_CORE_SEMANTICS)
++ENDIF ( OE_CORE )
++
+ IF ( MULTI_SEMANTICS )
+ MESSAGE(STATUS "Enabling multi dist support")
+ ADD_DEFINITIONS( -DMULTI_SEMANTICS)
 diff --git a/src/knownid.h b/src/knownid.h
 index 7757ae0..4b8bee7 100644
 --- a/src/knownid.h

@@ -27,7 +48,7 @@ index 55c8677..3356ff8 100644
      }
  
    /* we allow changes to/from noarch */
-+#ifdef POKY_SEMANTICS
++#ifdef OE_CORE_SEMANTICS
 +  if (a1 == a2 || 
 +	a1 == ARCH_NOARCH || a2 == ARCH_NOARCH ||
 +	a1 == ARCH_ANY || a2 == ARCH_ANY ||

@@ -86,7 +107,7 @@ index 34a14a3..2d7cd70 100644
 -  0
 -};
 +/* Provide the const char *archpolicies structure */
-+#include "poky-arch.h"
++#include "core-arch.h"
  
  void
  pool_setarch(Pool *pool, const char *arch)

@@ -97,7 +118,7 @@ index 34a14a3..2d7cd70 100644
 -#ifndef DEBIAN_SEMANTICS
 -  id = ARCH_NOARCH;
 -#else
-+#if defined(DEBIAN_SEMANTICS) || defined(POKY_SEMANTICS)
++#if defined(DEBIAN_SEMANTICS) || defined(OE_CORE_SEMANTICS)
    id = ARCH_ALL;
 +#else
 +  id = ARCH_NOARCH;

index a693776..2d4d299 100644
@@ -7,19 +7,19 @@ LIC_FILES_CHKSUM = "file://LICENSE.BSD;md5=62272bd11c97396d4aaf1c41bc11f7d8"
 DEPENDS = "libcheck rpm zlib expat db"
 
 PV = "0.0-git${SRCPV}"
-PR = "r8"
+PR = "r9"
 
 SRC_URI = "git://gitorious.org/opensuse/sat-solver.git;protocol=git \
            file://sat-solver_rpm5.patch \
            file://sat-solver_obsolete.patch \
            file://cmake.patch \
            file://db5.patch \
-           file://sat-solver_poky.patch \
+           file://sat-solver_core.patch \
           "
 
 S = "${WORKDIR}/git"
 
-EXTRA_OECMAKE += "-DLIB=lib -DRPM5=RPM5"
+EXTRA_OECMAKE += "-DLIB=lib -DRPM5=RPM5 -DOE_CORE=OE_CORE"
 
 inherit cmake pkgconfig
 

@@ -38,18 +38,18 @@ do_archgen () {
 		INSTALL_PLATFORM_ARCHS="$each_arch $INSTALL_PLATFORM_ARCHS"
 	done
 
-	echo "/* Automatically generated by the sat-solver recipe */" > src/poky-arch.h
-	echo "const char *archpolicies[] = {" >> src/poky-arch.h
+	echo "/* Automatically generated by the sat-solver recipe */" > src/core-arch.h
+	echo "const char *archpolicies[] = {" >> src/core-arch.h
 
         set -- $INSTALL_PLATFORM_ARCHS
 
         save_IFS=$IFS
         IFS=:
-        while [ $# -gt 0 ]; do echo "  \"$1\",	"\""$*"\", >> src/poky-arch.h ; shift; done
+        while [ $# -gt 0 ]; do echo "  \"$1\",	"\""$*"\", >> src/core-arch.h ; shift; done
         IFS=$save_IFS
 
-	echo "  0" >> src/poky-arch.h
-	echo "};" >> src/poky-arch.h
+	echo "  0" >> src/core-arch.h
+	echo "};" >> src/core-arch.h
 }
 
 addtask archgen before do_configure after do_patch

index 5e7ab66..73494b5 100644
@@ -182,7 +182,7 @@ SRCREV_pn-u-boot ??= "v2010.12"
 SRCREV_pn-ubootchart ??= "10"
 SRCREV_pn-webkit-gtk ??= "72836"
 SRCREV_pn-web-webkit ??= "130"
-SRCREV_pn-web ??= "129"
+SRCREV_pn-web ??= "131"
 SRCREV_pn-xcb-proto ??= "d81ca233e98be8fa59e8c90d262c0516944c5a66"
 SRCREV_pn-xcb-proto-native ??= "d81ca233e98be8fa59e8c90d262c0516944c5a66"
 SRCREV_pn-xf86-video-intel ??= "87ea531c5dc5b39809395b277c330854aaaaf019"

new file mode 100644
index 0000000..b1b2de6
@@ -0,0 +1,22 @@
+Upstream-Status="Inappropriate [bugfix: http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2010-0624]"
+
+This patch avoids heap overflow reported by :
+http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2010-0624
+
+This is a clean patch for the GPLv2 tar recipe.
+
+Nitin A Kamble <[email protected]> 2011/04/25
+
+Index: tar-1.17/lib/rtapelib.c
+===================================================================
+--- tar-1.17.orig/lib/rtapelib.c
++++ tar-1.17/lib/rtapelib.c
+@@ -570,7 +570,7 @@ rmt_read__ (int handle, char *buffer, si
+ 
+   sprintf (command_buffer, "R%lu\n", (unsigned long) length);
+   if (do_command (handle, command_buffer) == -1
+-      || (status = get_status (handle)) == SAFE_READ_ERROR)
++      || ((status = get_status (handle)) == SAFE_READ_ERROR) || (status > length))
+     return SAFE_READ_ERROR;
+ 
+   for (counter = 0; counter < status; counter += rlen, buffer += rlen)

index be74542..138ea71 100644
@@ -3,10 +3,11 @@ require tar.inc
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI += "file://m4extensions.patch \
     file://gcc43build.patch \
+    file://avoid_heap_overflow.patch \
     "
 
 SRC_URI[md5sum] = "c6c4f1c075dbf0f75c29737faa58f290"

new file mode 100644
index 0000000..cf068fa
@@ -0,0 +1,25 @@
+Upstream-Status="Inappropriate [bugfix: http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2010-0624]"
+
+This patch avoids heap overflow reported by :
+http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2010-0624
+
+This is a clean patch for the GPLv2 tar recipe.
+
+the GPLv2 tar recipe patch is also applicable to this GPLv2 cpio 
+recipe, as they share code.
+
+Nitin A Kamble <[email protected]> 2011/04/25
+
+Index: tar-1.17/lib/rtapelib.c
+===================================================================
+--- tar-1.17.orig/lib/rtapelib.c
++++ tar-1.17/lib/rtapelib.c
+@@ -570,7 +570,7 @@ rmt_read__ (int handle, char *buffer, si
+ 
+   sprintf (command_buffer, "R%lu\n", (unsigned long) length);
+   if (do_command (handle, command_buffer) == -1
+-      || (status = get_status (handle)) == SAFE_READ_ERROR)
++      || ((status = get_status (handle)) == SAFE_READ_ERROR) || (status > length))
+     return SAFE_READ_ERROR;
+ 
+   for (counter = 0; counter < status; counter += rlen, buffer += rlen)

index 412d19f..006e4f6 100644
@@ -3,9 +3,11 @@ require cpio_v2.inc
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b7f772ea3a2489231cb4872656cac34b"
 
-PR = "r0"
+PR = "r1"
 
-SRC_URI += "file://m4extensions.patch"
+SRC_URI += "file://m4extensions.patch \
+    file://avoid_heap_overflow.patch \
+    "
 
 SRC_URI[md5sum] = "0caa356e69e149fb49b76bacc64615a1"
 SRC_URI[sha256sum] = "1b203248874c3b5a728b351f06513e5282f73e0170b7f207fbf8c39f28f6b4ad"

similarity index 87%
rename from meta/recipes-devtools/perl/perl-5.12.2/09_fix_installperl.patch
rename to meta/recipes-devtools/perl/perl-5.12.3/09_fix_installperl.patch
index cfe0047..a80d17c 100644
@@ -6,10 +6,10 @@ are under lib.
 Ensure that POSIX/SigAction is kept with the rest of the POSIX module
 under archlib.
 
-Index: perl-5.12.2/installperl
+Index: perl-5.12.3/installperl
 ===================================================================
---- perl-5.12.2.orig/installperl
-+++ perl-5.12.2/installperl
+--- perl-5.12.3.orig/installperl
++++ perl-5.12.3/installperl
 @@ -750,7 +750,7 @@ sub installlib {
      }
  

similarity index 89%
rename from meta/recipes-devtools/perl/perl-5.12.2/Configure-multilib.patch
rename to meta/recipes-devtools/perl/perl-5.12.3/Configure-multilib.patch
index 6a4125b..ef2be3d 100644
@@ -1,9 +1,9 @@
 Upstream-Status:Pending
 
-Index: perl-5.12.2/Configure
+Index: perl-5.12.3/Configure
 ===================================================================
---- perl-5.12.2.orig/Configure
-+++ perl-5.12.2/Configure
+--- perl-5.12.3.orig/Configure
++++ perl-5.12.3/Configure
 @@ -1316,8 +1316,9 @@ loclibpth="/usr/local/lib /opt/local/lib
  loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib"
  

151 lines not on this page · raw message

similarity index 95%
rename from meta/recipes-devtools/perl/perl-5.12.2/Makefile.patch
rename to meta/recipes-devtools/perl/perl-5.12.3/Makefile.patch
index 2c374ed..8a279a5 100644
@@ -1,9 +1,9 @@
 Upstream-Status:Inappropriate [embedded specific]
 
-Index: perl-5.12.2/Cross/Makefile
+Index: perl-5.12.3/Cross/Makefile
 ===================================================================
---- perl-5.12.2.orig/Cross/Makefile
-+++ perl-5.12.2/Cross/Makefile
+--- perl-5.12.3.orig/Cross/Makefile
++++ perl-5.12.3/Cross/Makefile
 @@ -2,7 +2,8 @@
  #
  ## $Id: Makefile,v 1.5 2003/12/12 00:48:19 red Exp red $

similarity index 77%
rename from meta/recipes-devtools/perl/perl-5.12.2/asm-pageh-fix.patch
rename to meta/recipes-devtools/perl/perl-5.12.3/asm-pageh-fix.patch
index 251beb9..c65b1a1 100644
@@ -5,10 +5,10 @@ has been definied in unistd.h since glibc 2.1. Some recent version of linux
 libc headers removed the asm/page.h resulting in failures here for some
 people.
 
-Index: perl-5.12.2/cpan/IPC-SysV/SysV.xs
+Index: perl-5.12.3/cpan/IPC-SysV/SysV.xs
 ===================================================================
---- perl-5.12.2.orig/cpan/IPC-SysV/SysV.xs	2001-07-01 04:46:07.000000000 +1000
-+++ perl-5.12.2/cpan/IPC-SysV/SysV.xs	2001-07-01 04:46:07.000000000 +1000
+--- perl-5.12.3.orig/cpan/IPC-SysV/SysV.xs	2001-07-01 04:46:07.000000000 +1000
++++ perl-5.12.3/cpan/IPC-SysV/SysV.xs	2001-07-01 04:46:07.000000000 +1000
 @@ -3,9 +3,6 @@
  #include "XSUB.h"
  

138 lines not on this page · raw message

similarity index 100%
rename from meta/recipes-devtools/perl/perl-5.12.2/config.sh-32
rename to meta/recipes-devtools/perl/perl-5.12.3/config.sh-32

similarity index 100%
rename from meta/recipes-devtools/perl/perl-5.12.2/config.sh-32-be
rename to meta/recipes-devtools/perl/perl-5.12.3/config.sh-32-be

similarity index 100%
rename from meta/recipes-devtools/perl/perl-5.12.2/config.sh-32-le
rename to meta/recipes-devtools/perl/perl-5.12.3/config.sh-32-le

similarity index 100%
rename from meta/recipes-devtools/perl/perl-5.12.2/config.sh-64
rename to meta/recipes-devtools/perl/perl-5.12.3/config.sh-64

similarity index 100%
rename from meta/recipes-devtools/perl/perl-5.12.2/config.sh-64-be
rename to meta/recipes-devtools/perl/perl-5.12.3/config.sh-64-be

similarity index 100%
rename from meta/recipes-devtools/perl/perl-5.12.2/config.sh-64-le
rename to meta/recipes-devtools/perl/perl-5.12.3/config.sh-64-le

similarity index 100%
rename from meta/recipes-devtools/perl/perl-5.12.2/cross-generate_uudmap.patch
rename to meta/recipes-devtools/perl/perl-5.12.3/cross-generate_uudmap.patch

similarity index 92%
rename from meta/recipes-devtools/perl/perl-5.12.2/debian/arm_optim.diff
rename to meta/recipes-devtools/perl/perl-5.12.3/debian/arm_optim.diff
index c86ddc9..b5b952e 100644
@@ -31,4 +31,4 @@ index a5d71b9..6914ba6 100755
      toke) ;;
      universal) ;;
 -- 
-tg: (c823880..) debian/arm_optim (depends on: upstream)
+tg: (a508b62..) debian/arm_optim (depends on: upstream)

similarity index 90%
rename from meta/recipes-devtools/perl/perl-5.12.2/debian/arm_thread_stress_timeout.diff
rename to meta/recipes-devtools/perl/perl-5.12.3/debian/arm_thread_stress_timeout.diff
index c4b4c13..700b344 100644
@@ -22,4 +22,4 @@ index adfd1ed..652a3e6 100755
      my $mutex = 1;
      share($mutex);
 -- 
-tg: (c823880..) debian/arm_thread_stress_timeout (depends on: upstream)
+tg: (a508b62..) debian/arm_thread_stress_timeout (depends on: upstream)

similarity index 92%
rename from meta/recipes-devtools/perl/perl-5.12.2/debian/cpan_config_path.diff
rename to meta/recipes-devtools/perl/perl-5.12.3/debian/cpan_config_path.diff
index 4a349b4..27b4a45 100644
@@ -21,4 +21,4 @@ index 76cd81e..65a3b27 100644
          my($configpmtest) = File::Spec->catfile($configpmdir,"Config.pm");
          my $inc_key;
 -- 
-tg: (c823880..) debian/cpan_config_path (depends on: upstream)
+tg: (a508b62..) debian/cpan_config_path (depends on: upstream)

similarity index 95%
rename from meta/recipes-devtools/perl/perl-5.12.2/debian/cpan_definstalldirs.diff
rename to meta/recipes-devtools/perl/perl-5.12.3/debian/cpan_definstalldirs.diff
index 3e3e53f..3931c2d 100644
@@ -34,4 +34,4 @@ index 53ffbf1..53976ff 100644
  
      if (exists $CPAN::HandleConfig::keys{mbuild_install_build_command}
 -- 
-tg: (c823880..) debian/cpan_definstalldirs (depends on: upstream)
+tg: (a508b62..) debian/cpan_definstalldirs (depends on: upstream)

similarity index 96%
rename from meta/recipes-devtools/perl/perl-5.12.2/debian/cpanplus_config_path.diff
rename to meta/recipes-devtools/perl/perl-5.12.3/debian/cpanplus_config_path.diff
index 6510119..8f2f5d2 100644
@@ -42,4 +42,4 @@ index 1a38200..6ee0d82 100644
                                      require File::Basename;
                                      my $dir = File::Basename::dirname(
 -- 
-tg: (c823880..) debian/cpanplus_config_path (depends on: upstream)
+tg: (a508b62..) debian/cpanplus_config_path (depends on: upstream)

similarity index 95%
rename from meta/recipes-devtools/perl/perl-5.12.2/debian/cpanplus_definstalldirs.diff
rename to meta/recipes-devtools/perl/perl-5.12.3/debian/cpanplus_definstalldirs.diff
index 2ec063c..bd5fe80 100644
@@ -51,4 +51,4 @@ index 0000000..5e6e11e
 +
 +1;
 -- 
-tg: (c823880..) debian/cpanplus_definstalldirs (depends on: upstream)
+tg: (a508b62..) debian/cpanplus_definstalldirs (depends on: upstream)

similarity index 95%
rename from meta/recipes-devtools/perl/perl-5.12.2/debian/db_file_ver.diff
rename to meta/recipes-devtools/perl/perl-5.12.3/debian/db_file_ver.diff
index a974d08..e9aa60a 100644
@@ -31,4 +31,4 @@ index 47158d3..67ccdff 100644
      /* check that libdb is recent enough  -- we need 2.3.4 or greater */
      if (Major == 2 && (Minor < 3 || (Minor ==  3 && Patch < 4)))
 -- 
-tg: (c823880..) debian/db_file_ver (depends on: upstream)
+tg: (a508b62..) debian/db_file_ver (depends on: upstream)

similarity index 97%
rename from meta/recipes-devtools/perl/perl-5.12.2/debian/deprecate-with-apt.diff
rename to meta/recipes-devtools/perl/perl-5.12.3/debian/deprecate-with-apt.diff
index e580466..ad0b0cf 100644
@@ -58,4 +58,4 @@ index 7b92e0b..9db7330 100644
  	    return;
  	}
 -- 
-tg: (c823880..) debian/deprecate-with-apt (depends on: upstream)
+tg: (a508b62..) debian/deprecate-with-apt (depends on: upstream)

similarity index 93%
rename from meta/recipes-devtools/perl/perl-5.12.2/debian/devel-ppport-ia64-optim.diff
rename to meta/recipes-devtools/perl/perl-5.12.3/debian/devel-ppport-ia64-optim.diff
index c656010..e57a315 100644
@@ -31,4 +31,4 @@ index 67eebc1..f1ef7a2 100644
      $PL_FILES{'apicheck_c.PL'} = 'apicheck.c';
      push @C_FILES, qw{ apicheck.c };
 -- 
-tg: (c823880..) debian/devel-ppport-ia64-optim (depends on: upstream)
+tg: (a508b62..) debian/devel-ppport-ia64-optim (depends on: upstream)

similarity index 92%
rename from meta/recipes-devtools/perl/perl-5.12.2/debian/disable-zlib-bundling.diff
rename to meta/recipes-devtools/perl/perl-5.12.3/debian/disable-zlib-bundling.diff
index e036dc5..44349a5 100644
@@ -28,4 +28,4 @@ index c56cc03..2c6659b 100644
  OLD_ZLIB        = False
  GZIP_OS_CODE    = AUTO_DETECT
 -- 
-tg: (c823880..) debian/disable-zlib-bundling (depends on: upstream)
+tg: (a508b62..) debian/disable-zlib-bundling (depends on: upstream)

similarity index 88%
rename from meta/recipes-devtools/perl/perl-5.12.2/debian/doc_info.diff
rename to meta/recipes-devtools/perl/perl-5.12.3/debian/doc_info.diff
index 2f5d9a4..be75f30 100644
@@ -10,10 +10,10 @@ Indicate that the user needs to install the perl-doc package.
  1 files changed, 10 insertions(+), 2 deletions(-)
 
 diff --git a/pod/perl.pod b/pod/perl.pod
-index e48e526..3b0bbf6 100644
+index e67f062..3b8ae83 100644
 --- a/pod/perl.pod
 +++ b/pod/perl.pod
-@@ -241,8 +241,16 @@ For ease of access, the Perl manual has been split up into several sections.
+@@ -242,8 +242,16 @@ For ease of access, the Perl manual has been split up into several sections.
      perlwin32		Perl notes for Windows
  
  

@@ -33,4 +33,4 @@ index e48e526..3b0bbf6 100644
  In general, if something strange has gone wrong with your program and you're
  not sure where you should look for help, try the B<-w> switch first.  It will
 -- 
-tg: (c823880..) debian/doc_info (depends on: upstream)
+tg: (a508b62..) debian/doc_info (depends on: upstream)

similarity index 82%
rename from meta/recipes-devtools/perl/perl-5.12.2/debian/enc2xs_inc.diff
rename to meta/recipes-devtools/perl/perl-5.12.3/debian/enc2xs_inc.diff
index e96d53d..4cac4b7 100644
@@ -5,14 +5,15 @@ Bug-Debian: http://bugs.debian.org/290336
 
 - ignore missing directories,
 - follow symlinks (/usr/share/perl/5.8 -> 5.8.4).
-
+- filter "." out when running "enc2xs -C", it's unnecessary and causes
+  issues with follow => 1 (see #603686 and [rt.cpan.org #64585])
 
 ---
  cpan/Encode/bin/enc2xs |    8 ++++----
  1 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/cpan/Encode/bin/enc2xs b/cpan/Encode/bin/enc2xs
-index 773c0a0..049ecf9 100644
+index 773c0a0..bc1ae1b 100644
 --- a/cpan/Encode/bin/enc2xs
 +++ b/cpan/Encode/bin/enc2xs
 @@ -924,11 +924,11 @@ use vars qw(

@@ -43,9 +44,9 @@ index 773c0a0..049ecf9 100644
  	}
      };
 -    File::Find::find({wanted => $wanted}, @INC);
-+    File::Find::find({wanted => $wanted, follow => 1}, grep -d, @INC);
++    File::Find::find({wanted => $wanted, follow => 1}, grep -d && !/^\./, @INC);
      $_ModLines = "";
      for my $enc ( sort keys %LocalMod ) {
          $_ModLines .=
 -- 
-tg: (c823880..) debian/enc2xs_inc (depends on: upstream)
+tg: (a508b62..) debian/enc2xs_inc (depends on: upstream)

similarity index 94%
rename from meta/recipes-devtools/perl/perl-5.12.2/debian/errno_ver.diff
rename to meta/recipes-devtools/perl/perl-5.12.3/debian/errno_ver.diff
index b28b4bc..de73ed5 100644
@@ -31,4 +31,4 @@ index 124b8fc..b554cd4 100644
  \$VERSION = eval \$VERSION;
  \@ISA = qw(Exporter);
 -- 
-tg: (c823880..) debian/errno_ver (depends on: upstream)
+tg: (a508b62..) debian/errno_ver (depends on: upstream)

similarity index 99%
rename from meta/recipes-devtools/perl/perl-5.12.2/debian/extutils_hacks.diff
rename to meta/recipes-devtools/perl/perl-5.12.3/debian/extutils_hacks.diff
index 1fb635d..e1cbdb5 100644
@@ -312,4 +312,4 @@ index 24ae909..12d421d 100644
  
  ExtUtils::Embed exports the following functions:
 -- 
-tg: (c823880..) debian/extutils_hacks (depends on: upstream)
+tg: (a508b62..) debian/extutils_hacks (depends on: upstream)

similarity index 93%
rename from meta/recipes-devtools/perl/perl-5.12.2/debian/fakeroot.diff
rename to meta/recipes-devtools/perl/perl-5.12.3/debian/fakeroot.diff
index 380955b..2c8def5 100644
@@ -15,7 +15,7 @@ rule where the Makefile is created, but is for the clean/binary* targets.
  1 files changed, 2 insertions(+), 7 deletions(-)
 
 diff --git a/Makefile.SH b/Makefile.SH
-index c039938..15184d8 100755
+index fc13b2b..d420229 100755
 --- a/Makefile.SH
 +++ b/Makefile.SH
 @@ -50,12 +50,7 @@ case "$useshrplib" in

@@ -42,4 +42,4 @@ index c039938..15184d8 100755
  	    case "$osname" in
  	    os2)
 -- 
-tg: (c823880..) debian/fakeroot (depends on: upstream)
+tg: (a508b62..) debian/fakeroot (depends on: upstream)

similarity index 98%
rename from meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/autodie-flock.diff
rename to meta/recipes-devtools/perl/perl-5.12.3/debian/fixes/autodie-flock.diff
index 1e2c1ad..375ae41 100644
@@ -97,4 +97,4 @@ index a7550ba..6421a56 100755
  is($@, "", "Non-blocking flock should not fail on EWOULDBLOCK");
  
 -- 
-tg: (c823880..) fixes/autodie-flock (depends on: upstream)
+tg: (a508b62..) fixes/autodie-flock (depends on: upstream)

similarity index 91%
rename from meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/concat-stack-corruption.diff
rename to meta/recipes-devtools/perl/perl-5.12.3/debian/fixes/concat-stack-corruption.diff
index ef21261..40437f3 100644
@@ -15,7 +15,7 @@ and the like.
  1 files changed, 3 insertions(+), 0 deletions(-)
 
 diff --git a/pp_hot.c b/pp_hot.c
-index 3371e88..e9cccf3 100644
+index ee699ef..c5ed14e 100644
 --- a/pp_hot.c
 +++ b/pp_hot.c
 @@ -271,6 +271,8 @@ PP(pp_concat)

@@ -36,4 +36,4 @@ index 3371e88..e9cccf3 100644
      sv_catpvn_nomg(TARG, rpv, rlen);
  
 -- 
-tg: (c823880..) fixes/concat-stack-corruption (depends on: upstream)
+tg: (a508b62..) fixes/concat-stack-corruption (depends on: upstream)

similarity index 94%
rename from meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/cpanplus-without-home.diff
rename to meta/recipes-devtools/perl/perl-5.12.3/debian/fixes/cpanplus-without-home.diff
index 798b7c2..e7ff57c 100644
@@ -29,4 +29,4 @@ index 27d2abc..8475c36 100644
  use Params::Check               qw[check];
  use Module::Load::Conditional   qw[can_load];
 -- 
-tg: (c823880..) fixes/cpanplus-without-home (depends on: upstream)
+tg: (a508b62..) fixes/cpanplus-without-home (depends on: upstream)

similarity index 98%
rename from meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/h2ph-gcc-4.5.diff
rename to meta/recipes-devtools/perl/perl-5.12.3/debian/fixes/h2ph-gcc-4.5.diff
index 49d797c..9faab81 100644
@@ -105,4 +105,4 @@ index 8f56db4..1255807 100644
  		print PREAMBLE
  		    "unless (defined &$_) { sub $_() { \"",
 -- 
-tg: (c823880..) fixes/h2ph-gcc-4.5 (depends on: upstream)
+tg: (a508b62..) fixes/h2ph-gcc-4.5 (depends on: upstream)

similarity index 92%
rename from meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/hurd-ccflags.diff
rename to meta/recipes-devtools/perl/perl-5.12.3/debian/fixes/hurd-ccflags.diff
index d7b43e9..8868c64 100644
@@ -25,4 +25,4 @@ index 2cfce54..c1ba2db 100644
  # The following routines are only available as stubs in GNU libc.
  # XXX remove this once metaconf detects the GNU libc stubs.
 -- 
-tg: (c823880..) fixes/hurd-ccflags (depends on: upstream)
+tg: (a508b62..) fixes/hurd-ccflags (depends on: upstream)

similarity index 98%
rename from meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/lc-numeric-docs.diff
rename to meta/recipes-devtools/perl/perl-5.12.3/debian/fixes/lc-numeric-docs.diff
index ece4989..67a55da 100644
@@ -94,4 +94,4 @@ index 0dbabe7..0bec423 100644
  =head2 Freely available locale definitions
  
 -- 
-tg: (c823880..) fixes/lc-numeric-docs (depends on: upstream)
+tg: (a508b62..) fixes/lc-numeric-docs (depends on: upstream)

similarity index 93%
rename from meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/lc-numeric-sprintf.diff
rename to meta/recipes-devtools/perl/perl-5.12.3/debian/fixes/lc-numeric-sprintf.diff
index b150e72..9fe07eb 100644
@@ -28,4 +28,4 @@ index e94f158..3c6badb 100644
  	if (PL_hints & HINT_LOCALE)
  	    goto nope;
 -- 
-tg: (c823880..) fixes/lc-numeric-sprintf (depends on: upstream)
+tg: (a508b62..) fixes/lc-numeric-sprintf (depends on: upstream)

similarity index 91%
rename from meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/net_smtp_docs.diff
rename to meta/recipes-devtools/perl/perl-5.12.3/debian/fixes/net_smtp_docs.diff
index f7b5e42..2307a09 100644
@@ -22,4 +22,4 @@ index a28496d..07b2498 100644
  Example:
  
 -- 
-tg: (c823880..) fixes/net_smtp_docs (depends on: upstream)
+tg: (a508b62..) fixes/net_smtp_docs (depends on: upstream)

similarity index 95%
rename from meta/recipes-devtools/perl/perl-5.12.2/debian/fixes/processPL.diff
rename to meta/recipes-devtools/perl/perl-5.12.3/debian/fixes/processPL.diff
index 3b645d1..fa2d7c3 100644
@@ -42,4 +42,4 @@ index 239d6df..294d266 100644
  
  	}
 -- 
-tg: (c823880..) fixes/processPL (depends on: upstream)
+tg: (a508b62..) fixes/processPL (depends on: upstream)

similarity index 93%
rename from meta/recipes-devtools/perl/perl-5.12.2/debian/instmodsh_doc.diff
rename to meta/recipes-devtools/perl/perl-5.12.3/debian/instmodsh_doc.diff
index cfc57fa..5555dfc 100644
@@ -25,4 +25,4 @@ index 5874aa6..6a2f03e 100644
  
  ExtUtils::Installed
 -- 
-tg: (c823880..) debian/instmodsh_doc (depends on: upstream)
+tg: (a508b62..) debian/instmodsh_doc (depends on: upstream)

similarity index 93%
rename from meta/recipes-devtools/perl/perl-5.12.2/debian/ld_run_path.diff
rename to meta/recipes-devtools/perl/perl-5.12.3/debian/ld_run_path.diff
index ced1e8f..02610d3 100644
@@ -22,4 +22,4 @@ index b807e97..6c955d7 100644
  
  	# Handle possible linker path arguments.
 -- 
-tg: (c823880..) debian/ld_run_path (depends on: upstream)
+tg: (a508b62..) debian/ld_run_path (depends on: upstream)

similarity index 95%
rename from meta/recipes-devtools/perl/perl-5.12.2/debian/libnet_config_path.diff
rename to meta/recipes-devtools/perl/perl-5.12.3/debian/libnet_config_path.diff
index ef0f369..a38e78a 100644
@@ -34,4 +34,4 @@ index db51c1f..8404593 100644
  should return a reference to a HASH containing the keys described below.
  For example
 -- 
-tg: (c823880..) debian/libnet_config_path (depends on: upstream)
+tg: (a508b62..) debian/libnet_config_path (depends on: upstream)

similarity index 95%
rename from meta/recipes-devtools/perl/perl-5.12.2/debian/m68k_thread_stress.diff
rename to meta/recipes-devtools/perl/perl-5.12.3/debian/m68k_thread_stress.diff
index d27a677..675c9aa 100644
@@ -42,4 +42,4 @@ index e3a1086..633374e 100755
  
  use ExtUtils::testlib;
 -- 
-tg: (c823880..) debian/m68k_thread_stress (depends on: upstream)
+tg: (a508b62..) debian/m68k_thread_stress (depends on: upstream)

similarity index 97%
rename from meta/recipes-devtools/perl/perl-5.12.2/debian/mod_paths.diff
rename to meta/recipes-devtools/perl/perl-5.12.3/debian/mod_paths.diff
index 96fe4df..26d8ed0 100644
@@ -97,4 +97,4 @@ index 05cea40..023d6a0 100644
      S_incpush_use_sep(aTHX_ STR_WITH_LEN(PERL_OTHERLIBDIRS),
  		      INCPUSH_ADD_OLD_VERS|INCPUSH_ADD_ARCHONLY_SUB_DIRS
 -- 
-tg: (c823880..) debian/mod_paths (depends on: upstream)
+tg: (a508b62..) debian/mod_paths (depends on: upstream)

similarity index 96%
rename from meta/recipes-devtools/perl/perl-5.12.2/debian/module_build_man_extensions.diff
rename to meta/recipes-devtools/perl/perl-5.12.3/debian/module_build_man_extensions.diff
index bc7fd9e..63c8441 100644
@@ -30,4 +30,4 @@ index 5bd8ec7..b4e606a 100644
  	          $self->config( 'man3ext' );
      my $outfile = File::Spec->catfile( $mandir, $manpage);
 -- 
-tg: (c823880..) debian/module_build_man_extensions (depends on: upstream)
+tg: (a508b62..) debian/module_build_man_extensions (depends on: upstream)

45 lines not on this page · raw message

similarity index 96%
rename from meta/recipes-devtools/perl/perl-5.12.2/debian/perlivp.diff
rename to meta/recipes-devtools/perl/perl-5.12.3/debian/perlivp.diff
index ebe942c..304e4c1 100644
@@ -37,4 +37,4 @@ index 9783261..156146f 100644
          next if $_ eq ':'; # skip -d test here
          next if $_ eq 'Dev:Pseudo:'; # why is this in @INC?
 -- 
-tg: (c823880..) debian/perlivp (depends on: upstream)
+tg: (a508b62..) debian/perlivp (depends on: upstream)

similarity index 96%
rename from meta/recipes-devtools/perl/perl-5.12.2/debian/prune_libs.diff
rename to meta/recipes-devtools/perl/perl-5.12.3/debian/prune_libs.diff
index 0f49895..5bb072c 100644
@@ -35,4 +35,4 @@ index 3a8732b..6013c86 100755
  	    perllibs="$*"
  	    ;;
 -- 
-tg: (c823880..) debian/prune_libs (depends on: upstream)
+tg: (a508b62..) debian/prune_libs (depends on: upstream)

new file mode 100644
index 0000000..5425bc6
@@ -0,0 +1,34 @@
+debian/arm_thread_stress_timeout.diff -p1
+debian/cpan_config_path.diff -p1
+debian/cpan_definstalldirs.diff -p1
+debian/db_file_ver.diff -p1
+debian/doc_info.diff -p1
+debian/enc2xs_inc.diff -p1
+debian/errno_ver.diff -p1
+debian/extutils_hacks.diff -p1
+debian/fakeroot.diff -p1
+debian/instmodsh_doc.diff -p1
+debian/ld_run_path.diff -p1
+debian/libnet_config_path.diff -p1
+debian/m68k_thread_stress.diff -p1
+debian/mod_paths.diff -p1
+debian/module_build_man_extensions.diff -p1
+debian/prune_libs.diff -p1
+fixes/net_smtp_docs.diff -p1
+fixes/processPL.diff -p1
+debian/perlivp.diff -p1
+debian/disable-zlib-bundling.diff -p1
+debian/cpanplus_definstalldirs.diff -p1
+debian/cpanplus_config_path.diff -p1
+fixes/autodie-flock.diff -p1
+debian/devel-ppport-ia64-optim.diff -p1
+fixes/cpanplus-without-home.diff -p1
+debian/arm_optim.diff -p1
+debian/deprecate-with-apt.diff -p1
+fixes/hurd-ccflags.diff -p1
+debian/squelch-locale-warnings.diff -p1
+fixes/lc-numeric-docs.diff -p1
+fixes/lc-numeric-sprintf.diff -p1
+fixes/concat-stack-corruption.diff -p1
+fixes/h2ph-gcc-4.5.diff -p1
+patchlevel -p1

similarity index 96%
rename from meta/recipes-devtools/perl/perl-5.12.2/debian/squelch-locale-warnings.diff
rename to meta/recipes-devtools/perl/perl-5.12.3/debian/squelch-locale-warnings.diff
index 68c1a35..eac0fc3 100644
@@ -52,4 +52,4 @@ index 0dbabe7..60b7bab 100644
  
  The following environment variables are not specific to Perl: They are
 -- 
-tg: (c823880..) debian/squelch-locale-warnings (depends on: upstream)
+tg: (a508b62..) debian/squelch-locale-warnings (depends on: upstream)

similarity index 100%
rename from meta/recipes-devtools/perl/perl-5.12.2/generate-sh.patch
rename to meta/recipes-devtools/perl/perl-5.12.3/generate-sh.patch

similarity index 81%
rename from meta/recipes-devtools/perl/perl-5.12.2/installperl.patch
rename to meta/recipes-devtools/perl/perl-5.12.3/installperl.patch
index 276eb3d..4560123 100644
@@ -1,9 +1,9 @@
 Upstream-Status:Inappropriate [embedded specific]
 
-Index: perl-5.12.2/installperl
+Index: perl-5.12.3/installperl
 ===================================================================
---- perl-5.12.2.orig/installperl
-+++ perl-5.12.2/installperl
+--- perl-5.12.3.orig/installperl
++++ perl-5.12.3/installperl
 @@ -3,8 +3,8 @@
  BEGIN {
      require 5.004;

similarity index 92%
rename from meta/recipes-devtools/perl/perl-5.12.2/letgcc-find-errno.patch
rename to meta/recipes-devtools/perl/perl-5.12.3/letgcc-find-errno.patch
index 268cb53..5161e4c 100644
@@ -10,10 +10,10 @@ external toolchain since perl will search in ${STAGING_INCDIR} for
 errno.h (when using gcc) and that isn't where it's located - its
 wherever the external toolchain keeps it's headers.
 
-Index: perl-5.12.2/ext/Errno/Errno_pm.PL
+Index: perl-5.12.3/ext/Errno/Errno_pm.PL
 ===================================================================
---- perl-5.12.2.orig/ext/Errno/Errno_pm.PL
-+++ perl-5.12.2/ext/Errno/Errno_pm.PL
+--- perl-5.12.3.orig/ext/Errno/Errno_pm.PL
++++ perl-5.12.3/ext/Errno/Errno_pm.PL
 @@ -17,8 +17,18 @@ unlink "Errno.tmp" if -f "Errno.tmp";
  open OUT, ">Errno.tmp" or die "Cannot open Errno.tmp: $!";
  select OUT;

similarity index 94%
rename from meta/recipes-devtools/perl/perl-5.12.2/native-nopacklist.patch
rename to meta/recipes-devtools/perl/perl-5.12.3/native-nopacklist.patch
index 8d5b819..389c334 100644
@@ -2,10 +2,10 @@ Upstream-Status:Inappropriate [debian patch]
 
 Part of 52_debian_extutils_hacks.patch just to exclude the installation of .packlist files
 
-Index: perl-5.12.2/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
+Index: perl-5.12.3/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
 ===================================================================
---- perl-5.12.2.orig/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-+++ perl-5.12.2/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
+--- perl-5.12.3.orig/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
++++ perl-5.12.3/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
 @@ -2047,8 +2047,6 @@ doc__install : doc_site_install
  
  pure_perl_install :: all

similarity index 88%
rename from meta/recipes-devtools/perl/perl-5.12.2/native-perlinc.patch
rename to meta/recipes-devtools/perl/perl-5.12.3/native-perlinc.patch
index ffaf326..f0bb1f6 100644
@@ -2,8 +2,8 @@ Upstream-Status:Inappropriate [embedded specific]
 
 Index: perl-5.8.8/lib/ExtUtils/MM_Unix.pm
 ===================================================================
---- perl-5.12.2.orig/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm	2008-10-31 22:01:35.000000000 +0000
-+++ perl-5.12.2/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm	2008-10-31 22:01:35.000000000 +0000
+--- perl-5.12.3.orig/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm	2008-10-31 22:01:35.000000000 +0000
++++ perl-5.12.3/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm	2008-10-31 22:01:35.000000000 +0000
 @@ -1597,6 +1597,19 @@
  	$self->{PERL_LIB}     ||= $Config{privlibexp};
  	$self->{PERL_ARCHLIB} ||= $Config{archlibexp};

similarity index 100%
rename from meta/recipes-devtools/perl/perl-5.12.2/native-ssp.patch
rename to meta/recipes-devtools/perl/perl-5.12.3/native-ssp.patch

similarity index 100%
rename from meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_1.patch
rename to meta/recipes-devtools/perl/perl-5.12.3/parallel_build_fix_1.patch

similarity index 100%
rename from meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_2.patch
rename to meta/recipes-devtools/perl/perl-5.12.3/parallel_build_fix_2.patch

similarity index 100%
rename from meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_3.patch
rename to meta/recipes-devtools/perl/perl-5.12.3/parallel_build_fix_3.patch

similarity index 100%
rename from meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_4.patch
rename to meta/recipes-devtools/perl/perl-5.12.3/parallel_build_fix_4.patch

116 lines not on this page · raw message

similarity index 89%
rename from meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_6.patch
rename to meta/recipes-devtools/perl/perl-5.12.3/parallel_build_fix_6.patch
index cacf9fa..4267739 100644
@@ -13,10 +13,10 @@ Date:   Mon Feb 14 20:36:36 2011 +0000
     simplifies many [Mm]akefile* rules, which previously had a special case to
     copy it early.
 
-Index: perl-5.12.2/Cross/Makefile-cross-SH
+Index: perl-5.12.3/Cross/Makefile-cross-SH
 ===================================================================
---- perl-5.12.2.orig/Cross/Makefile-cross-SH
-+++ perl-5.12.2/Cross/Makefile-cross-SH
+--- perl-5.12.3.orig/Cross/Makefile-cross-SH
++++ perl-5.12.3/Cross/Makefile-cross-SH
 @@ -727,7 +727,7 @@ fi
  $spitshell >>$Makefile <<'!NO!SUBS!'
  

@@ -46,10 +46,10 @@ Index: perl-5.12.2/Cross/Makefile-cross-SH
  	- cd t && (rm -f perl$(EXE_EXT); $(LNS) ../miniperl$(EXE_EXT) perl$(EXE_EXT)) \
  		&& $(LDLIBPTH) ./perl TEST -minitest base/*.t comp/*.t cmd/*.t run/*.t io/*.t op/*.t uni/*.t </dev/tty
  
-Index: perl-5.12.2/Makefile.SH
+Index: perl-5.12.3/Makefile.SH
 ===================================================================
---- perl-5.12.2.orig/Makefile.SH
-+++ perl-5.12.2/Makefile.SH
+--- perl-5.12.3.orig/Makefile.SH
++++ perl-5.12.3/Makefile.SH
 @@ -970,7 +970,7 @@ esac
  $spitshell >>$Makefile <<'!NO!SUBS!'
  

@@ -88,10 +88,10 @@ Index: perl-5.12.2/Makefile.SH
  	- cd t && (rm -f $(PERL_EXE); $(LNS) ../$(MINIPERL_EXE) $(PERL_EXE)) \
  		&& $(RUN_PERL) TEST -minitest base/*.t comp/*.t cmd/*.t run/*.t io/*.t re/*.t op/*.t uni/*.t </dev/tty
  
-Index: perl-5.12.2/vms/descrip_mms.template
+Index: perl-5.12.3/vms/descrip_mms.template
 ===================================================================
---- perl-5.12.2.orig/vms/descrip_mms.template
-+++ perl-5.12.2/vms/descrip_mms.template
+--- perl-5.12.3.orig/vms/descrip_mms.template
++++ perl-5.12.3/vms/descrip_mms.template
 @@ -360,7 +360,7 @@ CRTLOPTS =,$(CRTL)/Options
  unidatadirs = lib/unicore/To lib/unicore/lib
  

@@ -120,10 +120,10 @@ Index: perl-5.12.2/vms/descrip_mms.template
  	@ PERL_TEST_DRIVER == "minitest"
  	- @[.vms]test.com "$(E)" "$(__DEBUG__)"
  
-Index: perl-5.12.2/win32/Makefile
+Index: perl-5.12.3/win32/Makefile
 ===================================================================
---- perl-5.12.2.orig/win32/Makefile
-+++ perl-5.12.2/win32/Makefile
+--- perl-5.12.3.orig/win32/Makefile
++++ perl-5.12.3/win32/Makefile
 @@ -918,7 +918,6 @@ $(CONFIGPM) : $(MINIPERL) ..\config.sh c
  	if exist lib\* $(RCOPY) lib\*.* ..\lib\$(NULL)
  	$(XCOPY) ..\*.h $(COREDIR)\*.*

@@ -132,10 +132,10 @@ Index: perl-5.12.2/win32/Makefile
  	$(RCOPY) include $(COREDIR)\*.*
  	-$(MINIPERL) -I..\lib $(ICWD) config_h.PL "INST_VER=$(INST_VER)"
  	if errorlevel 1 $(MAKE) /$(MAKEFLAGS) $(CONFIGPM)
-Index: perl-5.12.2/win32/makefile.mk
+Index: perl-5.12.3/win32/makefile.mk
 ===================================================================
---- perl-5.12.2.orig/win32/makefile.mk
-+++ perl-5.12.2/win32/makefile.mk
+--- perl-5.12.3.orig/win32/makefile.mk
++++ perl-5.12.3/win32/makefile.mk
 @@ -1210,7 +1210,6 @@ $(CONFIGPM) : $(MINIPERL) ..\config.sh c
  	if exist lib\* $(RCOPY) lib\*.* ..\lib\$(NULL)
  	$(XCOPY) ..\*.h $(COREDIR)\*.*

@@ -144,10 +144,10 @@ Index: perl-5.12.2/win32/makefile.mk
  	$(RCOPY) include $(COREDIR)\*.*
  	$(MINIPERL) -I..\lib $(ICWD) config_h.PL "INST_VER=$(INST_VER)" \
  	    || $(MAKE) $(MAKEMACROS) $(CONFIGPM) $(MAKEFILE)
-Index: perl-5.12.2/write_buildcustomize.pl
+Index: perl-5.12.3/write_buildcustomize.pl
 ===================================================================
---- perl-5.12.2.orig/write_buildcustomize.pl
-+++ perl-5.12.2/write_buildcustomize.pl
+--- perl-5.12.3.orig/write_buildcustomize.pl
++++ perl-5.12.3/write_buildcustomize.pl
 @@ -24,6 +24,7 @@ my @toolchain = qw(cpan/AutoLoader/lib
  		   cpan/ExtUtils-MakeMaker/lib
  		   dist/ExtUtils-Manifest/lib

similarity index 100%
rename from meta/recipes-devtools/perl/perl-5.12.2/perl-configpm-switch.patch
rename to meta/recipes-devtools/perl/perl-5.12.3/perl-configpm-switch.patch

similarity index 95%
rename from meta/recipes-devtools/perl/perl-5.12.2/perl-configure.sh
rename to meta/recipes-devtools/perl/perl-5.12.3/perl-configure.sh
index c29e966..e72ce49 100755
@@ -15,7 +15,7 @@ echo sh Configure -des \
         -Dprefix=/usr \
         -Dvendorprefix=/usr \
         -Dsiteprefix=/usr \
-        -Dotherlibdirs=/usr/lib/perl5/5.12.2 \
+        -Dotherlibdirs=/usr/lib/perl5/5.12.3 \
         -Duseshrplib \
         -Dusethreads \
         -Duseithreads \

similarity index 90%
rename from meta/recipes-devtools/perl/perl-5.12.2/perl-dynloader.patch
rename to meta/recipes-devtools/perl/perl-5.12.3/perl-dynloader.patch
index 21d8bb9..d5ea00f 100644
@@ -7,8 +7,8 @@ system.
 
 Update by Nitin A Kamble <[email protected]> 2011/04/21
 
---- perl-5.12.2/dist/XSLoader/XSLoader_pm.PL	2007/04/20 09:03:08	1.1
-+++ perl-5.12.2/dist/XSLoader/XSLoader_pm.PL	2007/04/20 09:03:08
+--- perl-5.12.3/dist/XSLoader/XSLoader_pm.PL	2007/04/20 09:03:08	1.1
++++ perl-5.12.3/dist/XSLoader/XSLoader_pm.PL	2007/04/20 09:03:08
 @@ -65,6 +65,19 @@
  print OUT <<'EOT';
      my $modpname = join('/',@modparts);

similarity index 100%
rename from meta/recipes-devtools/perl/perl-5.12.2/perl-enable-gdbm.patch
rename to meta/recipes-devtools/perl/perl-5.12.3/perl-enable-gdbm.patch

similarity index 100%
rename from meta/recipes-devtools/perl/perl-5.12.2/perl-moreconfig.patch
rename to meta/recipes-devtools/perl/perl-5.12.3/perl-moreconfig.patch

similarity index 94%
rename from meta/recipes-devtools/perl/perl-native_5.12.2.bb
rename to meta/recipes-devtools/perl/perl-native_5.12.3.bb
index c9882a9..0b0c949 100644
@@ -4,7 +4,7 @@ SECTION = "libs"
 LICENSE = "Artistic|GPL"
 LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \
 		    file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8"
-PR = "r8"
+PR = "r0"
 
 LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \
                     file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8"

@@ -21,8 +21,8 @@ SRC_URI = "http://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \
            file://native-nopacklist.patch;patch=1 \
            file://native-perlinc.patch;patch=1"
 
-SRC_URI[md5sum] = "af2df531d46b77fdf0d97eecb03eddb2"
-SRC_URI[sha256sum] = "cf888340021d5a2d1238bbd9b8b55aaf420a848d46e4d317cb8567f86ceb1022"
+SRC_URI[md5sum] = "29975a69dce54e47fcd6331c085c6c99"
+SRC_URI[sha256sum] = "5678bfd5c2cd59253a26171bf3e681235433b00c730eea8a8046e1b225c11d2f"
 
 S = "${WORKDIR}/perl-${PV}"
 

@@ -96,7 +96,7 @@ do_install () {
 		install $i ${D}${libdir}/perl/${PV}/CORE
 	done
 
-	create_wrapper ${D}${bindir}/perl PERL5LIB='$PERL5LIB:${STAGING_LIBDIR}/perl/5.12.2:${STAGING_LIBDIR}/perl/'
+	create_wrapper ${D}${bindir}/perl PERL5LIB='$PERL5LIB:${STAGING_LIBDIR}/perl/${PV}:${STAGING_LIBDIR}/perl/'
 }
 do_install_append_nylon() {
 	# get rid of definitions not supported by the gcc version we use for nylon...

similarity index 100%
rename from meta/recipes-devtools/perl/perl-rdepends_5.12.2.inc
rename to meta/recipes-devtools/perl/perl-rdepends_5.12.3.inc

similarity index 100%
rename from meta/recipes-devtools/perl/perl-rprovides_5.12.2.inc
rename to meta/recipes-devtools/perl/perl-rprovides_5.12.3.inc

105 lines not on this page · raw message

index 84e36ba..95a38b5 100644
@@ -29,7 +29,10 @@ EXPAT = "--without-expat"
 
 EXTRA_OECONF = "--disable-gdbtk --disable-tui --disable-x \
                 --with-curses --disable-multilib --with-system-readline --disable-sim \
-                ${GDBPROPREFIX} --with-libelf=${STAGING_DIR_TARGET} ${EXPAT}"
+                ${GDBPROPREFIX} --with-libelf=${STAGING_DIR_TARGET} ${EXPAT} \
+                --without-ust \
+               "
+
 GDBPROPREFIX = "--program-prefix=''"
 
 do_configure () {

similarity index 69%
rename from meta/recipes-connectivity/bluez/bluez-hcidump_1.42.bb
rename to meta/recipes-connectivity/bluez/bluez-hcidump_2.0.bb
index 7291548..67dd2c6 100644
@@ -7,13 +7,13 @@ PRIORITY = "optional"
 DEPENDS = "bluez4"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
-                    file://src/hcidump.c;beginline=1;endline=23;md5=22f51010959a0cd483c4d7f0bd77aaa3"
+                    file://src/hcidump.c;beginline=1;endline=23;md5=3bee3a162dff43a5be7470710b99fbcf"
 PR = "r0"
 
-SRC_URI = "http://bluez.sourceforge.net/download/bluez-hcidump-${PV}.tar.gz"
+SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/bluez-hcidump-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "5704737aaf72104eeaf77335218a1827"
-SRC_URI[sha256sum] = "689e39f9432ab90af5f390d86cb46e06c35693d01ea29aec4e41c4f9e315f49f"
+SRC_URI[md5sum] = "5c2e3ef0a68b2845047867ba51ff8ac9"
+SRC_URI[sha256sum] = "b3b64fd0b18301df07d3aaf34c037c1e4808b4aaf702294822d62b5424f617fd"
 S = "${WORKDIR}/bluez-hcidump-${PV}"
 
 EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR}"

new file mode 100644
index 0000000..6f319d4
@@ -0,0 +1,82 @@
+require gcc-common.inc
+
+DEPENDS =+ "mpfr gmp libmpc"
+NATIVEDEPS = "mpfr-native gmp-native gettext-native libmpc-native"
+
+LICENSE="GCC RUNTIME LIBRARY EXCEPTION & GPLv3"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
+                   file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \
+                   file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \
+                   file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+		   file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8"
+
+SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
+	   file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \
+	   file://100-uclibc-conf.patch \
+           file://gcc-uclibc-locale-ctype_touplow_t.patch \
+	   file://cache-amnesia.patch \
+	   file://gcc-flags-for-build.patch \
+           file://103-uclibc-conf-noupstream.patch  \
+           file://200-uclibc-locale.patch  \
+           file://203-uclibc-locale-no__x.patch;striplevel=1 \
+           file://204-uclibc-locale-wchar_fix.patch;striplevel=1 \
+           file://205-uclibc-locale-update.patch;striplevel=1 \
+           file://301-missing-execinfo_h.patch  \
+           file://302-c99-snprintf.patch  \
+           file://303-c99-complex-ugly-hack.patch  \
+           file://304-index_macro.patch  \
+           file://305-libmudflap-susv3-legacy.patch  \
+           file://306-libstdc++-namespace.patch  \
+           file://740-sh-pr24836.patch  \
+           file://800-arm-bigendian.patch  \
+           file://904-flatten-switch-stmt-00.patch  \
+           file://arm-nolibfloat.patch  \
+           file://arm-softfloat.patch \
+           file://zecke-xgcc-cpp.patch \
+           file://gcc-poison-system-directories.patch \
+           file://gcc-poison-dir-extend.patch \
+           file://gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch \
+	   file://64bithack.patch \
+	   file://optional_libstdc.patch \
+	   file://disable_relax_pic_calls_flag.patch \
+	   file://gcc-poison-parameters.patch \
+	   file://GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch \
+	   file://COLLECT_GCC_OPTIONS.patch \
+	  "
+SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch;patch=1 "
+
+SRC_URI[md5sum] = "93d1c436bf991564524701259b6285a2"
+SRC_URI[sha256sum] = "23bd0013d76ac6fb4537e5e8f4e5947129362dcc32f0d08563b7d4d9e44c0e17"
+
+
+# Language Overrides
+FORTRAN = ""
+JAVA = ""
+
+#EXTRA_OECONF_BASE = "  --enable-cheaders=c_std \
+#			--enable-libssp \
+#			--disable-bootstrap \
+#			--disable-libgomp \
+#			--disable-libmudflap"
+EXTRA_OECONF_BASE = " --enable-lto \
+			--enable-libssp \
+			--disable-bootstrap \
+			--disable-libgomp \
+			--disable-libmudflap \
+			--enable-cheaders=c_global "
+
+EXTRA_OECONF_INITIAL = "--disable-libmudflap \
+			--disable-libgomp \
+			--disable-libssp \
+			--disable-libquadmath \
+			--enable-decimal-float=no"
+
+EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap \
+				--disable-libgomp \
+				--disable-libquadmath \
+				--disable-libssp"
+
+EXTRA_OECONF_append_linux-uclibc = " --disable-decimal-float "
+EXTRA_OECONF_append_linux-uclibceabi = " --disable-decimal-float "
+EXTRA_OECONF_append_linux-uclibcspe = " --disable-decimal-float "

new file mode 100644
index 0000000..313b828
@@ -0,0 +1,37 @@
+Index: gcc-4.6.0/contrib/regression/objs-gcc.sh
+===================================================================
+--- gcc-4.6.0.orig/contrib/regression/objs-gcc.sh
++++ gcc-4.6.0/contrib/regression/objs-gcc.sh
+@@ -106,6 +106,10 @@ if [ $H_REAL_TARGET = $H_REAL_HOST -a $H
+  then
+   make all-gdb all-dejagnu all-ld || exit 1
+   make install-gdb install-dejagnu install-ld || exit 1
++elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
++ then
++  make all-gdb all-dejagnu all-ld || exit 1
++  make install-gdb install-dejagnu install-ld || exit 1
+ elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
+   make bootstrap || exit 1
+   make install || exit 1
+Index: gcc-4.6.0/libjava/classpath/ltconfig
+===================================================================
+--- gcc-4.6.0.orig/libjava/classpath/ltconfig
++++ gcc-4.6.0/libjava/classpath/ltconfig
+@@ -603,7 +603,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-
+ 
+ # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
+ case $host_os in
+-linux-gnu*) ;;
++linux-gnu*|linux-uclibc*) ;;
+ linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
+ esac
+ 
+@@ -1247,7 +1247,7 @@ linux-gnuoldld* | linux-gnuaout* | linux
+   ;;
+ 
+ # This must be Linux ELF.
+-linux-gnu*)
++linux*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no

new file mode 100644
index 0000000..b28fac2
@@ -0,0 +1,15 @@
+Corrects sub machine arch corectly
+
+Index: gcc-4.6.0/gcc/config.gcc
+===================================================================
+--- gcc-4.6.0.orig/gcc/config.gcc
++++ gcc-4.6.0/gcc/config.gcc
+@@ -2316,7 +2316,7 @@ score-*-elf)
+         ;;
+ sh-*-elf* | sh[12346l]*-*-elf* | \
+ sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
+-  sh-*-linux* | sh[2346lbe]*-*-linux* | \
++  sh*-*-linux* | sh[2346lbe]*-*-linux* | \
+   sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \
+    sh64-*-netbsd* | sh64l*-*-netbsd*)
+ 	tmake_file="${tmake_file} sh/t-sh sh/t-elf"

2,840 lines not on this page · raw message

26 lines not on this page · raw message

52 lines not on this page · raw message

519 lines not on this page · raw message

new file mode 100644
index 0000000..99bd229

Lines of this file are not shown. View the raw message.

new file mode 100644
index 0000000..9f841ae

Lines of this file are not shown. View the raw message.

new file mode 100644
index 0000000..47ae88e

Lines of this file are not shown. View the raw message.

new file mode 100644
index 0000000..f6eedb3

Lines of this file are not shown. View the raw message.

49 lines not on this page · raw message

new file mode 100644
index 0000000..1fbf043

Lines of this file are not shown. View the raw message.

new file mode 100644
index 0000000..774fcfa

Lines of this file are not shown. View the raw message.

new file mode 100644
index 0000000..23fce75

Lines of this file are not shown. View the raw message.

new file mode 100644
index 0000000..11cbbed

Lines of this file are not shown. View the raw message.

new file mode 100644
index 0000000..89a3934

Lines of this file are not shown. View the raw message.

new file mode 100644
index 0000000..50088cf

Lines of this file are not shown. View the raw message.

74 lines not on this page · raw message

new file mode 100644
index 0000000..8b53b83

Lines of this file are not shown. View the raw message.

new file mode 100644
index 0000000..ffb2267

Lines of this file are not shown. View the raw message.

new file mode 100644
index 0000000..7ac61a6

Lines of this file are not shown. View the raw message.

new file mode 100644
index 0000000..2175519

Lines of this file are not shown. View the raw message.

new file mode 100644
index 0000000..908e2d8

Lines of this file are not shown. View the raw message.

new file mode 100644
index 0000000..7bb8887

Lines of this file are not shown. View the raw message.

new file mode 100644
index 0000000..3a98b02

Lines of this file are not shown. View the raw message.

46 lines not on this page · raw message

new file mode 100644
index 0000000..348c770

Lines of this file are not shown. View the raw message.

319 lines not on this page · raw message

new file mode 100644
index 0000000..d249c1c

Lines of this file are not shown. View the raw message.

114 lines not on this page · raw message

new file mode 100644
index 0000000..280b903

Lines of this file are not shown. View the raw message.

178 lines not on this page · raw message

331 lines not on this page · raw message

new file mode 100644
index 0000000..d477105

Lines of this file are not shown. View the raw message.

74 lines not on this page · raw message

221 lines not on this page · raw message

70 lines not on this page · raw message

71 lines not on this page · raw message

84 lines not on this page · raw message

179 lines not on this page · raw message

new file mode 100644
index 0000000..da610f5

Lines of this file are not shown. View the raw message.

new file mode 100644
index 0000000..b3f02dc

Lines of this file are not shown. View the raw message.

new file mode 100644
index 0000000..1639511

Lines of this file are not shown. View the raw message.

new file mode 100644
index 0000000..42fd0f0

Lines of this file are not shown. View the raw message.

new file mode 100644
index 0000000..97a0c81

Lines of this file are not shown. View the raw message.

new file mode 100644
index 0000000..9708248

Lines of this file are not shown. View the raw message.

new file mode 100644
index 0000000..d235969

Lines of this file are not shown. View the raw message.

new file mode 100644
index 0000000..568b5af

Lines of this file are not shown. View the raw message.

new file mode 100644
index 0000000..bfaec86

Lines of this file are not shown. View the raw message.

46 lines not on this page · raw message

similarity index 94%
rename from meta/recipes-devtools/valgrind/valgrind-3.6.0/fix_issue_caused_by_ccache.patch
rename to meta/recipes-devtools/valgrind/valgrind-3.6.1/fix_issue_caused_by_ccache.patch
index a5c273c..4658567 100644
@@ -3,6 +3,8 @@ The script does not expect use of ccache, hence fix it to recognise it.
 2010/08/17
 Nitin A Kamble <[email protected]>
 
+Upstream-Status: Inappropriate [configuration]
+
 Index: valgrind-3.5.0/coregrind/link_tool_exe_linux.in
 ===================================================================
 --- valgrind-3.5.0.orig/coregrind/link_tool_exe_linux.in

similarity index 97%
rename from meta/recipes-devtools/valgrind/valgrind-3.6.0/fixed-perl-path.patch
rename to meta/recipes-devtools/valgrind/valgrind-3.6.1/fixed-perl-path.patch
index 2a0440a..b054d05 100644
@@ -9,6 +9,8 @@ a better fix would need:
 
 8/31/2010 - created by Qing He <[email protected]>
 
+Upstream-Status: Inappropriate [configuration]
+
 diff --git a/cachegrind/cg_annotate.in b/cachegrind/cg_annotate.in
 index 9dc9565..cc4ef05 100644
 --- a/cachegrind/cg_annotate.in

similarity index 86%
rename from meta/recipes-devtools/valgrind/valgrind_3.6.0.bb
rename to meta/recipes-devtools/valgrind/valgrind_3.6.1.bb
index a33a540..4dbc628 100644
@@ -13,8 +13,8 @@ SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \
 	   file://fix_issue_caused_by_ccache.patch \
            file://fixed-perl-path.patch"
 
-SRC_URI[md5sum] = "b289c5f4ab8e39741602445f1dd09b34"
-SRC_URI[sha256sum] = "bc0f0153b5a47b986f1d8efa2c488e0aea85a1cf2c4b11c52be127903080285f"
+SRC_URI[md5sum] = "2c3aa122498baecc9d69194057ca88f5"
+SRC_URI[sha256sum] = "49bdcc4fbcf060049b5f0dcfd8a187a6e90e0b0e57309f633b64e44430726a0e"
 
 COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
 

deleted file mode 100644
index 86f82ee..0000000
@@ -1,20 +0,0 @@
---- ../rxvt-unicode-cvs-r0/rxvt-unicode/Makefile.in	2004-08-12 22:32:40 +01:00
-+++ rxvt-unicode/Makefile.in	2004-12-24 03:09:00 +00:00
-@@ -9,7 +9,7 @@
- first_rule: all
- dummy:
- 
--subdirs = src doc src/test
-+subdirs = src src/test
- allsubdirs = W11 $(subdirs)
- 
- DIST =	INSTALL README.configure configure Makefile Makefile.in ChangeLog
-@@ -24,7 +24,7 @@
- 
- #-------------------------------------------------------------------------
- 
--all allbin alldoc tags:
-+all allbin tags:
- 	@if test x@host_os@ = xcygwin; then (cd W11; ${MAKE} $@) || exit 1; fi
- 	@for I in ${subdirs}; do (cd $$I; ${MAKE} $@) || exit 1; done
- 

deleted file mode 100644
index a419c98..0000000
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Terminal
-Comment=When all else fails.
-Exec=/usr/bin/rxvt
-Icon=utilities-terminal.png
-Terminal=false
-Type=Application
-Categories=Utility
-StartupNotify=false
-

deleted file mode 100644
index 6faa175..0000000
@@ -1,11 +0,0 @@
---- ../rxvt-unicode-cvs-r0/rxvt-unicode/src/command.C	2004-12-21 06:43:00 +00:00
-+++ rxvt-unicode/src/command.C	2004-12-24 02:31:36 +00:00
-@@ -1862,7 +1862,7 @@
- #endif				/* NO_SCROLLBAR_REPORT */
- 
-         {
--          char            upordown = 0;
-+          signed char            upordown = 0;
- 
-           if (scrollBar.style == R_SB_NEXT)
-             {

deleted file mode 100644
index 7cf5965..0000000
@@ -1,28 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- rxvt-unicode-4.8/src/screen.C~xwc.c
-+++ rxvt-unicode-4.8/src/screen.C
-@@ -3058,7 +3058,7 @@
-   else
-     rxvt_warn ("can't get primary selection, ignoring.\n");
- 
--#if 0
-+#ifdef HAVE_XWC
-   XTextProperty ct;
- 
-   if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
-@@ -3632,9 +3632,11 @@
-         }
-       else
- #endif
-+#ifdef HAVE_XWC
-       if (XwcTextListToTextProperty (display->display, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
-         freect = 1;
-       else
-+#endif
-         {
-           /* if we failed to convert then send it raw */
-           ct.value = (unsigned char *)cl;

deleted file mode 100644
index eb87b84..0000000
@@ -1,24 +0,0 @@
-diff -urNd ../rxvt-unicode-5.3-r2/rxvt-unicode-5.3/src/screen.C rxvt-unicode-5.3/src/screen.C
---- ../rxvt-unicode-5.3-r2/rxvt-unicode-5.3/src/screen.C	2005-02-22 21:39:10 +00:00
-+++ rxvt-unicode-5.3/src/screen.C	2005-04-05 22:12:45 +01:00
-@@ -3064,7 +3064,7 @@
-   else
-     rxvt_warn ("can't get primary selection, ignoring.\n");
- 
--#if 0
-+#ifdef HAVE_XWC
-   XTextProperty ct;
- 
-   if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
-@@ -3648,9 +3648,11 @@
-         }
-       else
- #endif
-+#ifdef HAVE_XWC
-       if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
-         freect = 1;
-       else
-+#endif
-         {
-           /* if we failed to convert then send it raw */
-           ct.value = (unsigned char *)cl;

new file mode 100644
index 0000000..882ea41
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=1.0
+Name=Terminal
+Comment=A unicode capable rxvt clone
+Exec=rxvt
+Icon=terminal
+Terminal=false
+Type=Application
+Categories=Utility;TerminalEmulator;

similarity index 100%
rename from meta/recipes-sato/rxvt-unicode/files/rxvt.png
rename to meta/recipes-sato/rxvt-unicode/rxvt-unicode-9.10/rxvt.png

new file mode 100644
index 0000000..16efeef
@@ -0,0 +1,26 @@
+Upstream-Status: Pending
+
+diff -ruN rxvt-unicode-9.10-orig//src/screen.C rxvt-unicode-9.10/src/screen.C
+--- rxvt-unicode-9.10-orig//src/screen.C	2011-04-19 13:34:01.327664984 +0800
++++ rxvt-unicode-9.10/src/screen.C	2011-04-19 13:34:47.037665001 +0800
+@@ -3152,7 +3152,7 @@
+       return false;
+     }
+ 
+-#if 0
++#if HAVE_XWC
+   XTextProperty ct;
+ 
+   if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
+@@ -3734,9 +3734,11 @@
+         }
+       else
+ #endif
++#ifdef HAVE_XWC
+       if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
+         freect = 1;
+       else
++#endif
+         {
+           /* if we failed to convert then send it raw */
+           ct.value = (unsigned char *)cl;

similarity index 69%
rename from meta/recipes-sato/rxvt-unicode/rxvt-unicode_5.6.bb
rename to meta/recipes-sato/rxvt-unicode/rxvt-unicode_9.10.bb
index d130895..9657e21 100644
@@ -5,13 +5,14 @@ terminal emulator rxvt, modified to store text in Unicode \
 (either UCS-2 or UCS-4) and to use locale-correct input and \
 output. It also supports mixing multiple fonts at the \
 same time, including Xft fonts."
-LICENSE = "GPL"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
+                    file://src/main.C;beginline=1;endline=31;md5=633e23cdeb89fe980ded9a3af4f335c2"
 SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \
-	   file://xwc.patch;patch=1 \
-	   file://signedchar.patch;patch=1 \
+	   file://xwc.patch \
 	   file://rxvt.desktop \
 	   file://rxvt.png"
-PR = "r5"
+PR = "r0"
 
 inherit autotools update-alternatives
 

@@ -35,29 +36,18 @@ EXTRA_OECONF = "--enable-menubar --enable-xim \
 		--enable-text-blink --enable-rxvt-scroll \
 		--enable-combining --enable-shared \
 		--enable-xgetdefault \
+                --disable-perl \
 		--with-x=${STAGING_DIR_HOST}${prefix}"
-EXTRA_OEMAKE = "'XINC=-I${STAGING_INCDIR}' \
-		'XLIB=-L${STAGING_LIBDIR} -lX11'"
 
-do_configure () {
-	mv autoconf/configure.in . || true
-	rm autoconf/libtool.m4
-	libtoolize --force
-	autotools_do_configure
-	echo '#define RXVT_UTMP_FILE "${localstatedir}/run/utmp"' >> config.h
-	echo '#define RXVT_WTMP_FILE "${localstatedir}/log/wtmp"' >> config.h
-	echo '#define RXVT_LASTLOG_FILE "${localstatedir}/log/lastlog"' >> config.h
-	echo '#define HAVE_XLOCALE 1' >> config.h
+do_configure_prepend () {
+	cp aclocal.m4 acinclude.m4
 }
 
-do_compile () {
-	if test -e ${S}/${HOST_SYS}-libtool; then
-		LIBTOOL=${S}/${HOST_SYS}-libtool
-	else
-		LIBTOOL=${S}/libtool
-	fi
-	# docs need "yodl" and I have no idea what that is
-	oe_runmake -C src "LIBTOOL=$LIBTOOL"
+do_compile_prepend () {
+	echo '#define UTMP_FILE "${localstatedir}/run/utmp"' >> config.h
+	echo '#define WTMP_FILE "${localstatedir}/log/wtmp"' >> config.h
+	echo '#define LASTLOG_FILE "${localstatedir}/log/lastlog"' >> config.h
+	echo '#define HAVE_XLOCALE 1' >> config.h
 }
 
 do_install_append () {

@@ -70,3 +60,6 @@ do_install_append () {
 }
 
 FILES_${PN} += "${datadir}/applications/rxvt.desktop ${datadir}/pixmaps/rxvt.png"
+
+SRC_URI[md5sum] = "a23aa40b31e843878b6f9c44768de430"
+SRC_URI[sha256sum] = "1c238f7e545b1a8da81239b826fb2a7d196c73effbcbd211db7a50995a0a067a"

similarity index 77%
rename from meta/recipes-connectivity/gupnp/gupnp-av_0.7.0.bb
rename to meta/recipes-connectivity/gupnp/gupnp-av_0.8.0.bb
index fef907e..ce9ca30 100644
@@ -11,5 +11,5 @@ PR = "r0"
 
 inherit autotools pkgconfig
 
-SRC_URI[md5sum] = "6eace748e9869cddb27daab46eb50635"
-SRC_URI[sha256sum] = "e13018d24abec9fafd75ef59c365adbb2ea3712fe5e69fff8c7284dc3f13cdeb"
+SRC_URI[md5sum] = "8a41a3bb60b50fceb5ece71c0dc4dcfb"
+SRC_URI[sha256sum] = "e6aa032377488cedc4e347519bd30701c583780b7c54f00bab083f2316a93dc9"

index 8195bd4..b65a474 100644
@@ -2,6 +2,8 @@ copy from OE, said to borrow from Ubuntu. Not in glib-2.0 upstream yet. Add for
 Added to poky by Kevin Tian <[email protected]>, 06/25/2010
 Rebased for glib-2.27.3 by Dongxiao Xu <[email protected]>, 11/16/2010
 
+Upstream-Status: Inappropriate [patches for test code]
+
 diff -ruN glib-2.27.3-orig/tests/threadpool-test.c glib-2.27.3/tests/threadpool-test.c
 --- glib-2.27.3-orig/tests/threadpool-test.c	2009-04-01 07:04:21.000000000 +0800
 +++ glib-2.27.3/tests/threadpool-test.c	2010-11-16 12:28:09.002172678 +0800

index 7c170be..c21e378 100644
@@ -4,6 +4,8 @@
 # from PATH though
 # Rebased to glib-2.27.3 by Dongxiao Xu <[email protected]>
 
+Upstream-Status: Inappropriate [configuration]
+
 diff -ruN glib-2.27.3-orig/configure.ac glib-2.27.3/configure.ac
 --- glib-2.27.3-orig/configure.ac	2010-11-03 11:02:05.000000000 +0800
 +++ glib-2.27.3/configure.ac	2010-11-16 12:38:12.610485990 +0800

index a2a506c..2eaa19b 100644
@@ -7,6 +7,8 @@ http://www.mail-archive.com/[email protected]/msg005
 
 Signed-off-by: Darren Hart <[email protected]>
 
+Upstream-Status: Pending
+
 Index: glib-2.27.5/glib/gthread.h
 ===================================================================
 --- glib-2.27.5.orig/glib/gthread.h

index e54a8e5..ee43511 100644
@@ -8,6 +8,8 @@
 # by Kevin Tian <[email protected]>, 06/25/2010
 # Rebased by Dongxiao Xu <[email protected]>, 11/16/2010
 
+Upstream-Status: Inappropriate [configuration]
+
 diff -ruN glib-2.27.3-orig/glib-gettextize.in glib-2.27.3/glib-gettextize.in
 --- glib-2.27.3-orig/glib-gettextize.in	2009-04-01 07:04:20.000000000 +0800
 +++ glib-2.27.3/glib-gettextize.in	2010-11-16 12:55:06.874605916 +0800

similarity index 59%
rename from meta/recipes-core/glib-2.0/glib-2.0_2.26.1.bb
rename to meta/recipes-core/glib-2.0/glib-2.0_2.28.6.bb
index 6a1fb6c..6b6c1f5 100644
@@ -3,14 +3,14 @@ require glib.inc
 PE = "1"
 PR = "r0"
 
-SRC_URI = "${GNOME_MIRROR}/glib/2.26/glib-${PV}.tar.bz2 \
+SRC_URI = "${GNOME_MIRROR}/glib/2.28/glib-${PV}.tar.bz2 \
            file://configure-libtool.patch \
            file://60_wait-longer-for-threads-to-die.patch \
            file://g_once_init_enter.patch \
           "
 
-SRC_URI[md5sum] = "17535accceef55bcb17a74d73f9c2aef"
-SRC_URI[sha256sum] = "7a74ff12b6b9dee1f2d0e520b56b68b621920c4f4250bdf23468e515625c28d5"
+SRC_URI[md5sum] = "7d8fc15ae70d5111c0cf2a79d50ef717"
+SRC_URI[sha256sum] = "557fb7c39d21b9359fbac51fd6b0b883bc97a2561c0166eef993a4078312f578"
 
 SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch"
 BBCLASSEXTEND = "native"

index 5ebff68..9b6e17b 100644
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
                     file://gmodule/COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
                     file://gmodule/gmodule.h;startline=4;endline=17;md5=76ab161b37202cd004073c42fac276ed \
                     file://glib/pcre/COPYING;md5=266ebc3ff74ee9ce6fad65577667c0f4 \
-                    file://glib/pcre/pcre.h;startline=11;endline=35;md5=cc0858840d3c312ec3e45b28077eb0d8 \
+                    file://glib/pcre/pcre.h;startline=11;endline=35;md5=ce867cf87ebbd2bb55e980d90328390d \
                     file://docs/reference/COPYING;md5=f51a5100c17af6bae00735cd791e1fcc"
 BUGTRACKER = "http://bugzilla.gnome.org"
 SECTION = "libs"

deleted file mode 100644
index 46a21c1..0000000
@@ -1,26 +0,0 @@
-Fix m4 quoting to avoid an infinite loop in m4 with recent autoconf/automake
-
-RP 1/2/10
-
-Index: libsndfile-1.0.17/acinclude.m4
-===================================================================
---- libsndfile-1.0.17.orig/acinclude.m4	2010-02-01 14:53:35.517826746 +0000
-+++ libsndfile-1.0.17/acinclude.m4	2010-02-01 14:53:51.409122706 +0000
-@@ -255,7 +255,7 @@
- 
- )
- ]
--
-+[
- if test $ac_cv_c_byte_order = big ; then
- 	ac_cv_c_big_endian=1
- 	ac_cv_c_little_endian=0
-@@ -272,7 +272,7 @@
- 	AC_MSG_WARN([[*** src/config.h may need to be hand editied.                    ]])
- 	AC_MSG_WARN([[*****************************************************************]])
- 	fi
--
-+]
- )# AC_C_FIND_ENDIAN
- 
- 

deleted file mode 100644
index da0c401..0000000
@@ -1,18 +0,0 @@
----
- configure.ac |    1 +
- 1 file changed, 1 insertion(+)
-
---- libsndfile-1.0.17.orig/configure.ac
-+++ libsndfile-1.0.17/configure.ac
-@@ -29,10 +29,11 @@ AC_LANG([C])
- #     to 0.
- 
- SHARED_VERSION_INFO="1:17:0"
- 
- AC_PROG_CC
-+AC_PROG_CXX
- AM_PROG_LIBTOOL
- 
- AC_CHECK_PROG(autogen, autogen, yes, no)
- 
- AC_PROG_INSTALL

similarity index 80%
rename from meta/recipes-multimedia/libsndfile/libsndfile1_1.0.23.bb
rename to meta/recipes-multimedia/libsndfile/libsndfile1_1.0.24.bb
index 4d12a42..a547d76 100644
@@ -8,8 +8,8 @@ PR = "r0"
 
 SRC_URI = "http://www.mega-nerd.com/libsndfile/files/libsndfile-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "d0e22b5ff2ef945615db33960376d733"
-SRC_URI[sha256sum] = "54c9c375598538263395a691f9b30987a2faa3d8a166d27e6a09ba4700223d4d"
+SRC_URI[md5sum] = "8f823c30c1d8d44830db6ab845d6679e"
+SRC_URI[sha256sum] = "b6050e6fbfbb72c8bfbc895104697a4af1d49077a64e4846e0be7af87c9e56a4"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=e77fe93202736b47c07035910f47974a"
 

new file mode 100644
index 0000000..fade195
@@ -0,0 +1,11 @@
+diff -ruN libfm-0.1.14-orig//src/Makefile.am libfm-0.1.14/src/Makefile.am
+--- libfm-0.1.14-orig//src/Makefile.am	2011-04-26 10:01:44.297664993 +0800
++++ libfm-0.1.14/src/Makefile.am	2011-04-26 10:02:10.637665004 +0800
+@@ -285,7 +285,6 @@
+ 	$(GIO_CFLAGS) \
+ 	-DGIO_MODULE_DIR=\"$(giomodulesdir)\"	\
+ 	-DGVFS_LOCALEDIR=\""$(localedir)"\"	\
+-	-DG_DISABLE_DEPRECATED \
+ 	$(NULL)
+ 
+ libgiofm_la_LDFLAGS = 	\

index c56ad33..5c7e95c 100644
@@ -10,9 +10,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
 SECTION = "x11/libs"
 DEPENDS = "gtk+ menu-cache intltool"
 
-PR = "r2"
+PR = "r3"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.gz \
+           file://use_deprecate_func.patch"
 
 SRC_URI[md5sum] = "d55e51dced6bb9ef46665243b079761f"
 SRC_URI[sha256sum] = "e97bf3f9ed4f33b9f0be73e67d360b89337cccf816361faacd8422722269806b"

similarity index 71%
rename from meta/recipes-multimedia/gstreamer/gst-fluendo-mpegdemux_0.10.62.bb
rename to meta/recipes-multimedia/gstreamer/gst-fluendo-mpegdemux_0.10.67.bb
index b0b4bc2..85ebb43 100644
@@ -9,5 +9,5 @@ acpaths = "-I ${S}/common/m4 -I ${S}/m4"
 
 PR = "r0"
 
-SRC_URI[md5sum] = "de2a22760f73ba678b7cb51e9f94bc21"
-SRC_URI[sha256sum] = "c4ba24502f59849fc2f3948389213c99e23a0986506111cc22cce3a64a33ac05"
+SRC_URI[md5sum] = "4ee0353eaa386f9b1c5570298d204357"
+SRC_URI[sha256sum] = "410897527f8bd8f007c9915c9450113c9e73c76f89aee3d36da825422a83a621"

new file mode 100644
index 0000000..878f969
@@ -0,0 +1,22 @@
+Upstream-Status: Pending
+
+diff -ruN libsamplerate-0.1.7-orig//acinclude.m4 libsamplerate-0.1.7/acinclude.m4
+--- libsamplerate-0.1.7-orig//acinclude.m4	2011-04-20 15:04:25.147664992 +0800
++++ libsamplerate-0.1.7/acinclude.m4	2011-04-20 15:04:45.397665029 +0800
+@@ -135,7 +135,6 @@
+ 	fi
+ 
+ )
+-]
+ 
+ if test $ac_cv_c_byte_order = big ; then
+ 	ac_cv_c_big_endian=1
+@@ -154,7 +153,7 @@
+ 	AC_MSG_WARN([[*****************************************************************]])
+ 	fi
+ 
+-)# AC_C_FIND_ENDIAN
++])# AC_C_FIND_ENDIAN
+ 
+ 
+ 

similarity index 59%
rename from meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.2.bb
rename to meta/recipes-multimedia/libsamplerate/libsamplerate0_0.1.7.bb
index 85eb7bc..d08640f 100644
@@ -2,14 +2,15 @@ DESCRIPTION = "An audio Sample Rate Conversion library"
 SECTION = "libs"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
-                    file://src/samplerate.c;beginline=1;endline=17;md5=2deac26142757e825d957e5ac149b292"
+                    file://src/samplerate.c;beginline=1;endline=17;md5=ed4dfdaa3bdf0f817ebc70cee0cccc88"
 DEPENDS = "flac"
-PR = "r3"
+PR = "r0"
 
-SRC_URI = "http://www.mega-nerd.com/SRC/libsamplerate-${PV}.tar.gz"
+SRC_URI = "http://www.mega-nerd.com/SRC/libsamplerate-${PV}.tar.gz \
+           file://libsamplerate-0.1.7-macro-quoting.patch"
 
-SRC_URI[md5sum] = "06861c2c6b8e5273c9b80cf736b9fd0e"
-SRC_URI[sha256sum] = "98b8766323c78b7b718dfd4ef6b9292bbf0796b742abb2319b8278cbeee731d4"
+SRC_URI[md5sum] = "6731a81cb0c622c483b28c0d7f90867d"
+SRC_URI[sha256sum] = "78ed5d9ff1bf162c4a078f6a3e7432a537dd2f22dc58872b081fb01156027fcc"
 S = "${WORKDIR}/libsamplerate-${PV}"
 
 inherit autotools pkgconfig

similarity index 74%
rename from meta/recipes-extended/cwautomacros/cwautomacros_20090610.bb
rename to meta/recipes-extended/cwautomacros/cwautomacros_20110201.bb
index bc588d7..18efced 100644
@@ -8,8 +8,8 @@ SRC_URI = http://download.berlios.de/cwautomacros/cwautomacros-${PV}.tar.bz2
 
 PR = "r0"
 
-SRC_URI[md5sum] = "352b295897ddb30c0d7d0acdd0b2313a"
-SRC_URI[sha256sum] = "8f683713baa63e6b5c2ea72067f77cbacf0bee7d4efa907951c6bb5ac1ffd6b0"
+SRC_URI[md5sum] = "074afcb50d0a8bff10786a2954b2b02d"
+SRC_URI[sha256sum] = "3115603b891f3a163c0bbb5fea2f3742113a183fa6745ee5e89e5f6d0e9f6121"
 
 do_install() {
 	oe_runmake CWAUTOMACROSPREFIX=${D}${prefix} install

similarity index 70%
rename from meta/recipes-multimedia/alsa/alsa-utils-1.0.23/ncursesfix.patch
rename to meta/recipes-multimedia/alsa/alsa-utils-1.0.24.2/ncursesfix.patch
index 0009c1a..9936ded 100644
@@ -1,11 +1,13 @@
-# alsa-utils: Fix ncurses build failures
-# Richard Purdie <[email protected]>
-# Rebased to 1.0.23, Dongxiao Xu <[email protected]>
+Rebase the patch to fit 1.0.24.2
 
-diff -ruN alsa-utils-1.0.23-orig/configure.in alsa-utils-1.0.23/configure.in
---- alsa-utils-1.0.23-orig/configure.in	2010-04-16 19:19:12.000000000 +0800
-+++ alsa-utils-1.0.23/configure.in	2010-06-22 15:22:06.731202478 +0800
-@@ -109,34 +109,16 @@
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Dongxiao Xu <[email protected]>
+
+diff -ruN alsa-utils-1.0.24.2-orig//configure.in alsa-utils-1.0.24.2/configure.in
+--- alsa-utils-1.0.24.2-orig//configure.in	2011-04-13 13:51:20.337665010 +0800
++++ alsa-utils-1.0.24.2/configure.in	2011-04-13 13:51:54.437664986 +0800
+@@ -127,34 +127,16 @@
    NCURSESLIBSUFFIX=""
    CURSES_NLS="no"
    if test "$curseslib" = "ncursesw" -o \( "$curseslib" = "auto" -a "$USE_NLS" = "yes" \); then

@@ -17,7 +19,7 @@ diff -ruN alsa-utils-1.0.23-orig/configure.in alsa-utils-1.0.23/configure.in
 -      CURSES_CFLAGS=`ncursesw5-config --cflags`
 -      curseslib="ncursesw"
 -    else
-       AC_CHECK_LIB(ncursesw, initscr, 
+       AC_CHECK_LIB(ncursesw, initscr,
                   [ CURSESINC='<ncurses.h>'; CURSESLIB='-lncursesw'; curseslib="ncursesw"])
 -    fi
      if test -n "$CURSESINC"; then

@@ -34,9 +36,9 @@ diff -ruN alsa-utils-1.0.23-orig/configure.in alsa-utils-1.0.23/configure.in
 -      CURSES_CFLAGS=`ncurses5-config --cflags`
 -      curseslib="ncurses"
 -    else
-       AC_CHECK_LIB(ncurses, initscr, 
+       AC_CHECK_LIB(ncurses, initscr,
                   [ CURSESINC='<ncurses.h>'; CURSESLIB='-lncurses'; curseslib="ncurses"])
 -    fi
    fi
    if test "$curseslib" = "curses" -o "$curseslib" = "auto"; then
-     AC_CHECK_LIB(curses, initscr, 
+     AC_CHECK_LIB(curses, initscr,

similarity index 95%
rename from meta/recipes-multimedia/alsa/alsa-utils_1.0.23.bb
rename to meta/recipes-multimedia/alsa/alsa-utils_1.0.24.2.bb
index 46283cc..953a3ac 100644
@@ -11,8 +11,8 @@ PR = "r0"
 SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
            file://ncursesfix.patch;patch=1 "
 
-SRC_URI[md5sum] = "cb0cf46029ac9549cf3a31bff6a4f4e1"
-SRC_URI[sha256sum] = "b7d05e915e25f8540ad151c6dd558cf0fc1e9bb0ee23052d531c983666a1f7b0"
+SRC_URI[md5sum] = "8238cd57cb301d1c36bcf0ecb59ce6b2"
+SRC_URI[sha256sum] = "95127f740291086486c06c28118cabca0814bde48fd14dac041a9812a5ac1be2"
 
 # lazy hack. needs proper fixing in gettext.m4, see
 # http://bugs.openembedded.org/show_bug.cgi?id=2348

index e7201b0..767c05b 100644
@@ -169,16 +169,15 @@ RECIPE_MAINTAINER_pn-libdaemon = "Yu Ke <[email protected]>"
 RECIPE_STATUS_pn-glib-2.0 = "green"
 DISTRO_PN_ALIAS_pn-glib-2.0 = "Meego=glib2 Fedora=glib2 OpenSuSE=glib2 Ubuntu=glib2.0 Mandriva=glib2.0 Debian=glib2.0"
 RECIPE_DEPENDENCY_CHECK_pn-glib-2.0 = "not done"
-RECIPE_LATEST_VERSION_pn-glib-2.0 = "2.27.5"
+RECIPE_LATEST_VERSION_pn-glib-2.0 = "2.28.6"
 RECIPE_PATCH_pn-glib-2.0+60_wait-longer-for-threads-to-die = "to be pushed upstream"
 RECIPE_PATCH_pn-glib-2.0+configure-libtool = "local"
 RECIPE_PATCH_pn-glib-2.0+glib-gettextize-dir = "marked as REMOVAL"
 RECIPE_INTEL_SECTION_pn-glib-2.0 = "base libs"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-glib-2.0 = "1 month"
-RECIPE_LATEST_RELEASE_DATE_pn-glib-2.0 = "2010/12/20"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-glib-2.0 = "15 days"
+RECIPE_LATEST_RELEASE_DATE_pn-glib-2.0 = "2011/04/14"
 RECIPE_COMMENTS_pn-glib-2.0 = ""
-RECIPE_LAST_UPDATE_pn-glib-2.0 = "Dec 30, 2010"
-RECIPE_NO_UPDATE_REASON_pn-glib-2.0 ="do not upgrade to 2.27.5 because it is unstable version"
+RECIPE_LAST_UPDATE_pn-glib-2.0 = "Apr 26, 2011"
 RECIPE_MAINTAINER_pn-glib-2.0 = "Dongxiao Xu <[email protected]>"
 
 RECIPE_STATUS_pn-libpam = "green"

@@ -761,12 +760,12 @@ DISTRO_PN_ALIAS_pn-opkg-utils = "OSPDT upstream=http://svn.openmoko.org/trunk/sr
 
 RECIPE_STATUS_pn-polkit = "green"
 RECIPE_DEPENDENCY_CHECK_pn-polkit = "not done"
-RECIPE_LATEST_VERSION_pn-polkit = "0.99"
+RECIPE_LATEST_VERSION_pn-polkit = "0.101"
 RECIPE_INTEL_SECTION_pn-polkit = "base utils"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-polkit = "1 months"
-RECIPE_LATEST_RELEASE_DATE_pn-polkit = "2010/09/15"
+RECIPE_LATEST_RELEASE_DATE_pn-polkit = "2011/03/03"
 RECIPE_COMMENTS_pn-polkit = ""
-RECIPE_LAST_UPDATE_pn-polkit = "Nov 18, 2010"
+RECIPE_LAST_UPDATE_pn-polkit = "Apr 26, 2011"
 RECIPE_MAINTAINER_pn-polkit = "Dongxiao Xu <[email protected]>"
 
 RECIPE_STATUS_pn-psplash = "not done"

@@ -916,12 +915,12 @@ RECIPE_MAINTAINER_pn-gperf = "Scott Garman <[email protected]>"
 
 RECIPE_STATUS_pn-valgrind = "green"
 RECIPE_DEPENDENCY_CHECK_pn-valgrind = "not done"
-RECIPE_LATEST_VERSION_pn-valgrind = "3.6.0"
+RECIPE_LATEST_VERSION_pn-valgrind = "3.6.1"
 RECIPE_INTEL_SECTION_pn-valgrind = "base utils"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-valgrind = "6 months"
-RECIPE_LATEST_RELEASE_DATE_pn-valgrind = "2010/10/21"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-valgrind = "4 months"
+RECIPE_LATEST_RELEASE_DATE_pn-valgrind = "2011/02/16"
 RECIPE_COMMENTS_pn-valgrind = ""
-RECIPE_LAST_UPDATE_pn-valgrind = "Nov 16, 2010"
+RECIPE_LAST_UPDATE_pn-valgrind = "Apr 26, 2011"
 RECIPE_MAINTAINER_pn-valgrind = "Dongxiao Xu <[email protected]>"
 
 RECIPE_STATUS_pn-formfactor = "green"

@@ -946,12 +945,12 @@ RECIPE_MAINTAINER_pn-makedevs = "Dongxiao Xu <[email protected]>"
 
 RECIPE_STATUS_pn-cwautomacros = "green"
 RECIPE_DEPENDENCY_CHECK_pn-cwautomacros = "not done"
-RECIPE_LATEST_VERSION_pn-cwautomacros = "20090610"
+RECIPE_LATEST_VERSION_pn-cwautomacros = "20110201"
 RECIPE_INTEL_SECTION_pn-cwautomacros = "base utils"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-cwautomacros = "6 months"
-RECIPE_LATEST_RELEASE_DATE_pn-cwautomacros = "06/2009"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-cwautomacros = "3 days"
+RECIPE_LATEST_RELEASE_DATE_pn-cwautomacros = "2011/02/01"
 RECIPE_COMMENTS_pn-cwautomacros = ""
-RECIPE_LAST_UPDATE_pn-cwautomacros = "Aug 6, 2010"
+RECIPE_LAST_UPDATE_pn-cwautomacros = "Apr 26, 2011"
 RECIPE_MAINTAINER_pn-cwautomacros = "Dongxiao Xu <[email protected]>"
 DISTRO_PN_ALIAS_pn-cwautomacros= "OSPDT upstream=http://cwautomacros.berlios.de/"
 

@@ -2093,12 +2092,11 @@ RECIPE_LAST_UPDATE_pn-gupnp = "Apr 15, 2011"
 RECIPE_MAINTAINER_pn-gupnp= "Dongxiao Xu <[email protected]>"
 
 RECIPE_STATUS_pn-gupnp-av = "green"
-RECIPE_LATEST_VERSION_pn-gupnp-av = "0.7.1"
+RECIPE_LATEST_VERSION_pn-gupnp-av = "0.8.0"
 RECIPE_NO_OF_PATCHES_pn-gupnp-av= "0"
-RECIPE_LATEST_RELEASE_DATE_pn-gupnp-av= "2010/11/08"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-gupnp-av= "15 days"
-RECIPE_LAST_UPDATE_pn-gupnp-av = "Nov 25, 2010"
-RECIPE_MANUAL_CHECK_DATE_pn-gupnp-av = "Jan 30, 2011"
+RECIPE_LATEST_RELEASE_DATE_pn-gupnp-av= "2011/04/08"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-gupnp-av= "4 months"
+RECIPE_LAST_UPDATE_pn-gupnp-av = "Apr 26, 2011"
 RECIPE_MAINTAINER_pn-gupnp-av = "Dongxiao Xu <[email protected]>"
 
 RECIPE_STATUS_pn-gupnp-tools = "green"

@@ -2182,9 +2180,12 @@ RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-telepathy-python="4 months"
 RECIPE_LAST_UPDATE_pn-telepathy-python = "Dec 30, 2010"
 RECIPE_MAINTAINER_pn-telepathy-python = "Dongxiao Xu <[email protected]>"
 
-RECIPE_STATUS_pn-bluez-hcidump = "red"
-RECIPE_LATEST_VERSION_pn-bluez-hcidump = "1.42"
-RECIPE_LAST_UPDATE_pn-bluez-hcidump = "Nov 7, 2008"
+RECIPE_STATUS_pn-bluez-hcidump = "green"
+RECIPE_LATEST_VERSION_pn-bluez-hcidump = "2.0"
+RECIPE_NO_OF_PATCHES_pn-bluez-hcidump = "0"
+RECIPE_LATEST_RELEASE_DATE_pn-bluez-hcidump = "2011/01/27"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-bluez-hcidump = "4 months"
+RECIPE_LAST_UPDATE_pn-bluez-hcidump = "Apr 26, 2011"
 RECIPE_MAINTAINER_pn-bluez-hcidump = "Dongxiao Xu <[email protected]>"
 
 RECIPE_STATUS_pn-ppp-dialin = "red"

@@ -2624,10 +2625,13 @@ RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-gst-ffmpeg = "4 months"
 RECIPE_LAST_UPDATE_pn-gst-ffmpeg = "Dec 14, 2010"
 RECIPE_MAINTAINER_pn-gst-ffmpeg = "Dongxiao Xu <[email protected]>"
 
-RECIPE_STATUS_pn-libsndfile1 = "red"
+RECIPE_STATUS_pn-libsndfile1 = "green"
 DISTRO_PN_ALIAS_pn-libsndfile1 = "Meego=libsndfile Fedora=libsndfile OpenSuSE=libsndfile Ubuntu=libsndfile Mandriva=libsndfile Debian=libsndfile"
-RECIPE_LATEST_VERSION_pn-libsndfile1 = "1.0.21 "
-RECIPE_LAST_UPDATE_pn-libsndfile1 = "Nov 11, 2010"
+RECIPE_LATEST_VERSION_pn-libsndfile1 = "1.0.24"
+RECIPE_NO_OF_PATCHES_pn-libsndfile1 = "0"
+RECIPE_LATEST_RELEASE_DATE_pn-libsndfile1 = "2011/03/23"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libsndfile1 = "5 months"
+RECIPE_LAST_UPDATE_pn-libsndfile1 = "Apr 26, 2011"
 RECIPE_MAINTAINER_pn-libsndfile1 = "Dongxiao Xu <[email protected]>"
 
 RECIPE_STATUS_pn-pulseaudio = "green"

@@ -2662,11 +2666,11 @@ RECIPE_MAINTAINER_pn-gst-fluendo-mp3 = "Dongxiao Xu <[email protected]>"
 DISTRO_PN_ALIAS_pn-gst-fluendo-mp3 = "Debian=gstreamer0.10-fluendo-mp3  Ubuntu=gstreamer0.10-fluendo-mp3"
 
 RECIPE_STATUS_pn-gst-fluendo-mpegdemux = "green"
-RECIPE_LATEST_VERSION_pn-gst-fluendo-mpegdemux = "0.10.20"
+RECIPE_LATEST_VERSION_pn-gst-fluendo-mpegdemux = "0.10.67"
 RECIPE_NO_OF_PATCHES_pn-gst-fluendo-mpegdemux = "0"
-RECIPE_LATEST_RELEASE_DATE_pn-gst-fluendo-mpegdemux = "2010/10/20"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-gst-fluendo-mpegdemux = "1 months"
-RECIPE_LAST_UPDATE_pn-gst-fluendo-mpegdemux = "Dec 7, 2010"
+RECIPE_LATEST_RELEASE_DATE_pn-gst-fluendo-mpegdemux = "2011/03/17"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-gst-fluendo-mpegdemux = "6 days"
+RECIPE_LAST_UPDATE_pn-gst-fluendo-mpegdemux = "Apr 26, 2011"
 RECIPE_MAINTAINER_pn-gst-fluendo-mpegdemux = "Dongxiao Xu <[email protected]>"
 DISTRO_PN_ALIAS_pn-gst-fluendo-mpegdemux = "Ubuntu=gstreamer0.10-fluendo-mpegdemux Debian=gstreamer0.10-fluendo-mpegdemux"
 

@@ -2676,11 +2680,11 @@ RECIPE_LAST_UPDATE_pn-libomxil = "Jan 11, 2008"
 RECIPE_MAINTAINER_pn-libomxil = "Dongxiao Xu <[email protected]>"
 DISTRO_PN_ALIAS_pn-libomxil = "OSPDT upstream=http://omxil.sourceforge.net/"
 
-RECIPE_STATUS_pn-libsamplerate0 = "red"
+RECIPE_STATUS_pn-libsamplerate0 = "green"
 DISTRO_PN_ALIAS_pn-libsamplerate0 = "Meego=libsamplerate Fedora=libsamplerate OpenSuSE=libsamplerate Ubuntu=libsamplerate Mandriva=libsamplerate Debian=libsamplerate"
 RECIPE_LATEST_VERSION_pn-libsamplerate0 = "0.1.7"
-RECIPE_LAST_UPDATE_pn-libsamplerate0 = "Nov 22, 2010"
-RECIPE_MANUAL_CHECK_DATE_pn-libsamplerate0 = "Jan 30, 2011"
+RECIPE_LAST_UPDATE_pn-libsamplerate0 = "Apr 26, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-libsamplerate0 = "Apr 26, 2011"
 RECIPE_MAINTAINER_pn-libsamplerate0 = "Dongxiao Xu <[email protected]>"
 
 RECIPE_STATUS_pn-oprofileui = "green"

index be650c4..553c6a2 100644
@@ -1,6 +1,6 @@
 SSTATE_VERSION = "2"
 
-SSTATE_MANIFESTS = "${TMPDIR}/sstate-control"
+SSTATE_MANIFESTS ?= "${TMPDIR}/sstate-control"
 SSTATE_MANFILEBASE = "${SSTATE_MANIFESTS}/manifest-${SSTATE_MANMACH}-"
 SSTATE_MANFILEPREFIX = "${SSTATE_MANFILEBASE}${PN}"
 

new file mode 100644
index 0000000..2b24894
@@ -0,0 +1,48 @@
+It adds the variables that are needed
+for autoconf 2.65 to reconfigure libiconv and defines the m4 macros 
+directory. Its imported from OE.
+
+Signed-off-by: Khem Raj <[email protected]>
+
+Index: libiconv-1.11.1/configure.ac
+===================================================================
+--- libiconv-1.11.1.orig/configure.ac
++++ libiconv-1.11.1/configure.ac
+@@ -23,7 +23,7 @@ AC_CONFIG_AUX_DIR(build-aux)
+ AM_INIT_AUTOMAKE(libiconv, 1.11)
+ AC_CONFIG_HEADERS(config.h lib/config.h)
+ AC_PROG_MAKE_SET
+-
++AC_CONFIG_MACRO_DIR([m4])
+ dnl           checks for basic programs
+ 
+ AC_PROG_CC
+Index: libiconv-1.11.1/libcharset/configure.ac
+===================================================================
+--- libiconv-1.11.1.orig/libcharset/configure.ac
++++ libiconv-1.11.1/libcharset/configure.ac
+@@ -16,17 +16,17 @@ dnl along with the GNU CHARSET Library;
+ dnl write to the Free Software Foundation, Inc., 51 Franklin Street,
+ dnl Fifth Floor, Boston, MA 02110-1301, USA.
+ 
+-AC_PREREQ(2.13)
++AC_PREREQ(2.61)
++AC_INIT([libcharset],[1.4] )
++AC_CONFIG_SRCDIR([lib/localcharset.c])
+ 
+-PACKAGE=libcharset
+-VERSION=1.4
+-
+-AC_INIT(lib/localcharset.c)
+ AC_CONFIG_AUX_DIR(build-aux)
+ AC_CONFIG_HEADER(config.h)
+ AC_PROG_MAKE_SET
+-AC_SUBST(PACKAGE)
+-AC_SUBST(VERSION)
++dnl AC_SUBST(PACKAGE)
++dnl AC_SUBST(VERSION)
++
++AC_CONFIG_MACRO_DIR([m4])
+ 
+ dnl           checks for basic programs
+ 

new file mode 100644
index 0000000..a913dad
@@ -0,0 +1,24 @@
+With libtool generating shared and static version of libraries needs -fPIC flags
+without this it will not generate the commands to create shared linked library
+Its more enforced by libtool 2.4. I have not checked it with older libtool
+libiconv 1.11.x is relatively old release and libtool 2.4 did not exist when it
+was released these kind of problem are more likely
+
+Signed-off-by: Khem Raj <[email protected]>
+
+Index: libiconv-1.11.1/lib/Makefile.in
+===================================================================
+--- libiconv-1.11.1.orig/lib/Makefile.in
++++ libiconv-1.11.1/lib/Makefile.in
+@@ -70,9 +70,9 @@ preloadable_libiconv.so : preloadable_li
+ 
+ preloadable_libiconv_linux.so : $(SOURCES)
+ 	if test -n "@GCC@"; then \
+-	  $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -fPIC -DPIC -DLIBICONV_PLUG $(SOURCES) -shared -o preloadable_libiconv_linux.so; \
++	  $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -fPIC -DPIC -DLIBICONV_PLUG $(SOURCES) -rpath $(libdir) -o libpreload_iconv.la && cp .libs/libpreload_iconv.so preloadable_libiconv_linux.so; \
+ 	else \
+-	  $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -KPIC -DPIC -DLIBICONV_PLUG $(SOURCES) -shared -o preloadable_libiconv_linux.so; \
++	  $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -KPIC -DPIC -DLIBICONV_PLUG $(SOURCES) -rpath $(libdir) -o libpreload_iconv.la && cp .libs/libpreload_iconv.so preloadable_libiconv_linux.so; \
+ 	fi
+ 
+ preloadable_libiconv_solaris.so : $(SOURCES)

new file mode 100644
index 0000000..28c70c8
@@ -0,0 +1,30 @@
+DESCRIPTION = "GNU libiconv - libiconv is for you if your application needs to support \
+multiple character encodings, but that support lacks from your system."
+HOMEPAGE = "http://www.gnu.org/software/libiconv"
+SECTION = "libs"
+PRIORITY = "optional"
+NOTES = "Needs to be stripped down to: ascii iso8859-1 eucjp iso-2022jp gb utf8"
+PROVIDES = "virtual/libiconv"
+PR = "r0"
+LICENSE = "LGPL"
+LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 \
+                    file://libcharset/COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674"
+SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \
+           file://autoconf.patch \
+	   file://shared_preloadable_libiconv_linux.patch \
+          "
+
+SRC_URI[md5sum] = "d42b97f6ef5dd0ba4469d520ed732fed"
+SRC_URI[sha256sum] = "e78c347a1a0cb15f2648519e9799151f4b4a934b61ad9ee7424478efe2b8257f"
+
+S = "${WORKDIR}/libiconv-${PV}"
+
+inherit autotools pkgconfig gettext
+
+EXTRA_OECONF += "--enable-shared --enable-static --enable-relocatable"
+
+LEAD_SONAME = "libiconv.so"
+
+do_configure_prepend () {
+	rm -f m4/libtool.m4 libcharset/m4/libtool.m4
+}

deleted file mode 100644
index dac9e3c..0000000
@@ -1,21 +0,0 @@
-DESCRIPTION = "GNU libiconv - libiconv is for you if your application needs to support \
-multiple character encodings, but that support lacks from your system."
-HOMEPAGE = "http://www.gnu.org/software/libiconv"
-SECTION = "libs"
-PRIORITY = "optional"
-NOTES = "Needs to be stripped down to: ascii iso8859-1 eucjp iso-2022jp gb utf8"
-PROVIDES = "virtual/libiconv"
-PR = "r4"
-LICENSE = "LGPL"
-SRC_URI = "${GNU_MIRROR}/libiconv/libiconv-${PV}.tar.gz"
-
-S = "${WORKDIR}/libiconv-${PV}"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF += "--enable-shared --enable-static"
-
-do_configure () {
-	rm -f m4/libtool.m4 libcharset/m4/libtool.m4
-	autotools_do_configure
-}

new file mode 100644
index 0000000..e1e4ad0
@@ -0,0 +1,23 @@
+uclibc does not export __mempcpy like glibc so we alias it here.
+This patch may make sense for upstream but elfutils uses more
+glibc specific features like obstack_printf which are missing in
+uclibc they need to be fixed along to make it work all the way
+
+Upstream-status: Inappropriate[Elfutils uses more glibc specific features]
+
+Signed-off-by: Khem Raj <[email protected]>
+
+Index: elfutils-0.148/libelf/elf_begin.c
+===================================================================
+--- elfutils-0.148.orig/libelf/elf_begin.c
++++ elfutils-0.148/libelf/elf_begin.c
+@@ -68,6 +68,9 @@
+ #include "libelfP.h"
+ #include "common.h"
+ 
++#ifdef __UCLIBC__
++#define __mempcpy mempcpy
++#endif
+ 
+ /* Create descriptor for archive in memory.  */
+ static inline Elf *

index a55b98d..df933f6 100644
@@ -28,8 +28,8 @@ SRC_URI += "\
         file://elf_additions.diff \
 	file://elfutils-fsize.patch \
 	file://remove-unused.patch \
+	file://mempcpy.patch \
 "
-
 # The buildsystem wants to generate 2 .h files from source using a binary it just built,
 # which can not pass the cross compiling, so let's work around it by adding 2 .h files
 # along with the do_configure_prepend()

@@ -38,7 +38,6 @@ SRC_URI += "\
         file://i386_dis.h \
         file://x86_64_dis.h \
 "
-
 inherit autotools
 
 EXTRA_OECONF = "--program-prefix=eu-"

@@ -49,6 +48,9 @@ do_configure_prepend() {
 	cp ${WORKDIR}/*dis.h ${S}/libcpu
 }
 
+# Only append ldflags for target recipe
+TARGET_LDFLAGS_libc-uclibc += "${@['', '-lintl -luargp']['${PN}' == '${BPN}']}"
+
 BBCLASSEXTEND = "native nativesdk"
 
 # Package utilities separately

index 79078ef..793008b 100644
@@ -6,10 +6,12 @@ both client-side and server-side."
 
 require xorg-lib-common.inc
 
+inherit gettext
+
 LICENSE = "MIT-style"
 LIC_FILES_CHKSUM = "file://COPYING;md5=7908e342491198401321cec1956807ec"
 
-DEPENDS += " xproto gettext"
+DEPENDS += " xproto"
 PROVIDES = "xau"
 
 PR = "r0"

index d897dab..483dce3 100644
@@ -8,6 +8,8 @@ autonomous display."
 
 require xorg-lib-common.inc
 
+inherit gettext
+
 LICENSE = "MIT-style"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d559fb26e129626022e052a5e6e0e123"
 

@@ -17,8 +19,6 @@ PROVIDES = "xdmcp"
 PR = "r0"
 PE = "1"
 
-DEPENDS += "gettext"
-
 XORG_PN = "libXdmcp"
 
 BBCLASSEXTEND = "native nativesdk"

index 335f020..19abe5a 100644
@@ -16,7 +16,8 @@ PE = "1"
 PR = "r0"
 
 RDEPENDS_${PN}-dev = ""
-DEPENDS += "gettext"
+
+inherit gettext
 
 BBCLASSEXTEND = "native nativesdk"
 

index 584d643..07b8eac 100644
@@ -134,6 +134,12 @@ do_configure() {
                        -e "s,\(getnetent_r_proto=\)'\w+',\1'0',g" \
                        -e "s,\(d_sockatmark=\)'define',\1'undef',g" \
                        -e "s,\(d_sockatmarkproto=\)'\w+',\1'0',g" \
+                       -e "s,\(d_eaccess=\)'define',\1'undef',g" \
+                       -e "s,\(d_stdio_ptr_lval=\)'define',\1'undef',g" \
+                       -e "s,\(d_stdio_ptr_lval_sets_cnt=\)'define',\1'undef',g" \
+                       -e "s,\(d_stdiobase=\)'define',\1'undef',g" \
+                       -e "s,\(d_stdstdio=\)'define',\1'undef',g" \
+                       -e "s,-fstack-protector,-fno-stack-protector,g" \
                     config.sh-${TARGET_ARCH}-${TARGET_OS}
         fi
 

@@ -148,6 +154,16 @@ do_configure() {
 	       -e 's,/perl5,/perl,g' \
             config.sh-${TARGET_ARCH}-${TARGET_OS}
 
+	case "${TARGET_ARCH}" in
+		x86_64 | powerpc | s390)
+			sed -i -e "s,\(need_va_copy=\)'undef',\1'define',g" \
+				config.sh-${TARGET_ARCH}-${TARGET_OS}
+			;;
+		arm)
+			sed -i -e "s,\(d_u32align=\)'undef',\1'define',g" \
+				config.sh-${TARGET_ARCH}-${TARGET_OS}
+			;;
+	esac
         # These are strewn all over the source tree
         for foo in `grep -I -m1 \/usr\/include\/.*\\.h ${WORKDIR}/* -r | cut -f 1 -d ":"` ; do
             echo Fixing: $foo

index c110340..b2ed9a1 100644
@@ -20,3 +20,7 @@ do_install_append() {
 	sed -i ${D}${libdir}/libattr.la -e \
 	    s,^libdir=\'${base_libdir}\'$,libdir=\'${libdir}\',
 }
+
+# Only append ldflags for target recipe
+LDFLAGS_libc-uclibc += "${@['', '-lintl']['${PN}' == '${BPN}']}"
+

index bc93107..a09c31c 100644
@@ -1,11 +1,9 @@
 # this build system is mostly shared by attr and acl
 
-DEPENDS =+ "gettext"
-
 SRC_URI += "file://relative-libdir.patch;striplevel=0 \
             file://no-fixed-prog-path.patch"
 
-inherit autotools
+inherit autotools gettext
 
 # the package comes with a custom config.h.in, it cannot be
 # overwritten by autoheader

index d64c9be..ef81650 100644
@@ -1,6 +1,11 @@
 # included by kernel recipes if they want to build/provide
 # perf functionality from their tree.
-
+do_compile_perf_libc-uclibc () {
+	:
+}
+do_install_perf_libc-uclibc () {
+	:
+}
 do_compile_perf() {
 	oe_runmake -C ${S}/tools/perf CC="${CC}" LD="${LD}" prefix=${prefix} NO_NEWT=1 NO_DWARF=1
 }

@@ -14,6 +19,10 @@ do_install_perf() {
 addtask compile_perf after do_compile before do_install
 addtask install_perf after do_install before do_package
 
-do_compile_perf[depends] =  "virtual/libc:do_populate_sysroot"
-do_compile_perf[depends] =+ "elfutils:do_populate_sysroot"
-RDEPENDS_perf += "python perl elfutils"
+
+PERFDEPENDS = "virtual/libc:do_populate_sysroot elfutils:do_populate_sysroot"
+PERFDEPENDS_libc-uclibc = ""
+PERFRDEPENDS = "python perl elfutils"
+PERFRDEPENDS_libc-uclibc = ""
+do_compile_perf[depends] = "${PERFDEPENDS}"
+RDEPENDS_perf += "${PERFRDEPENDS}"

new file mode 100644
index 0000000..8de5694
@@ -0,0 +1,58 @@
+This fixes configure issues with recent autoconf, e.g:
+  autoreconf: Entering directory `Modules/_ctypes/libffi'
+  autoreconf: configure.ac: not using Gettext
+  autoreconf: running: aclocal --force
+  configure.ac:26: error: m4_copy: won't overwrite defined macro: _AC_ARG_VAR_PRECIOUS
+  configure.ac:26: the top level
+
+The problem is still present in python-2.6.5 but fixed in python-svn.
+
+Upstream-Status: Accepted [python-svn]
+
+Signed-off-by: Antonio Ospite <[email protected]>
+Acked-by: Martin Jansa <[email protected]>
+Signed-off-by: Martin Jansa <[email protected]>
+Signed-off-by: Saul Wold <[email protected]>
+
+diff -pruN Python-2.6.4.orig//Modules/_ctypes/libffi/configure.ac Python-2.6.4/Modules/_ctypes/libffi/configure.ac
+--- Python-2.6.4.orig//Modules/_ctypes/libffi/configure.ac      2009-04-28 22:01:18.000000000 +0200
++++ Python-2.6.4/Modules/_ctypes/libffi/configure.ac    2010-04-20 22:46:02.000000000 +0200
+@@ -23,6 +23,7 @@ AM_INIT_AUTOMAKE
+ m4_rename([_AC_ARG_VAR_PRECIOUS],[real_PRECIOUS])
+ m4_define([_AC_ARG_VAR_PRECIOUS],[])
+ AC_PROG_CC
++m4_undefine([_AC_ARG_VAR_PRECIOUS])
+ m4_rename([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS])
+ 
+ AC_SUBST(CFLAGS)
+@@ -366,7 +367,7 @@ test -d src/$TARGETDIR || mkdir src/$TAR
+ 
+ AC_CONFIG_LINKS(include/ffitarget.h:src/$TARGETDIR/ffitarget.h)
+ 
+-AC_CONFIG_FILES(include/ffi.h)
++AC_CONFIG_FILES(include/ffi.h include/Makefile Makefile)
+ 
+ AC_CONFIG_LINKS(include/ffi_common.h:include/ffi_common.h)
+ 
+diff -pruN Python-2.6.4.orig//Modules/_ctypes/libffi/Makefile.am Python-2.6.4/Modules/_ctypes/libffi/Makefile.am
+--- Python-2.6.4.orig//Modules/_ctypes/libffi/Makefile.am       2008-03-04 21:09:11.000000000 +0100
++++ Python-2.6.4/Modules/_ctypes/libffi/Makefile.am     2010-04-20 22:54:03.000000000 +0200
+@@ -2,7 +2,7 @@
+ 
+ AUTOMAKE_OPTIONS = foreign subdir-objects
+ 
+-SUBDIRS = include testsuite man
++SUBDIRS = include
+ 
+ EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj configure.host \
+        src/alpha/ffi.c src/alpha/osf.S src/alpha/ffitarget.h \
+@@ -32,8 +32,6 @@ EXTRA_DIST = LICENSE ChangeLog.v1 Change
+        src/frv/ffi.c src/frv/eabi.S src/frv/ffitarget.h src/dlmalloc.c \
+        libtool-version ChangeLog.libffi
+ 
+-info_TEXINFOS = doc/libffi.texi
+-
+ ## ################################################################
+ 
+ ##
+

index 2939df4..3a0a056 100644
@@ -1,7 +1,7 @@
 require python.inc
 DEPENDS = "python-native db gdbm openssl readline sqlite3 zlib"
 DEPENDS_sharprom = "python-native db readline zlib gdbm openssl"
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=38fdd546420fab09ac6bd3d8a1c83eb6"
 
 DISTRO_SRC_URI ?= "file://sitecustomize.py"

@@ -13,6 +13,7 @@ SRC_URI = "\
   file://03-fix-tkinter-detection.patch \
   file://04-default-is-optimized.patch \
   file://05-enable-ctypes-cross-build.patch \
+  file://06-ctypes-libffi-fix-configure.patch \
   file://06-avoid_usr_lib_termcap_path_in_linking.patch \
   file://99-ignore-optimization-flag.patch \
   ${DISTRO_SRC_URI} \

new file mode 100644
index 0000000..58c27ab
@@ -0,0 +1,104 @@
+Copied from gobject-introspection/m4/introspection.m4
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-By: Dongxiao Xu <[email protected]>
+
+diff -ruN polkit-0.101-orig/m4/introspection.m4 polkit-0.101/m4/introspection.m4
+--- polkit-0.101-orig/m4/introspection.m4	1970-01-01 08:00:00.000000000 +0800
++++ polkit-0.101/m4/introspection.m4	2010-12-06 11:08:16.000000000 +0800
+@@ -0,0 +1,94 @@
++dnl -*- mode: autoconf -*-
++dnl Copyright 2009 Johan Dahlin
++dnl
++dnl This file is free software; the author(s) gives unlimited
++dnl permission to copy and/or distribute it, with or without
++dnl modifications, as long as this notice is preserved.
++dnl
++
++# serial 1
++
++m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
++[
++    AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
++    AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
++    AC_BEFORE([LT_INIT],[$0])dnl setup libtool first
++
++    dnl enable/disable introspection
++    m4_if([$2], [require],
++    [dnl
++        enable_introspection=yes
++    ],[dnl
++        AC_ARG_ENABLE(introspection,
++                  AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
++                                 [Enable introspection for this build]),, 
++                                 [enable_introspection=auto])
++    ])dnl
++
++    AC_MSG_CHECKING([for gobject-introspection])
++
++    dnl presence/version checking
++    AS_CASE([$enable_introspection],
++    [no], [dnl
++        found_introspection="no (disabled, use --enable-introspection to enable)"
++    ],dnl
++    [yes],[dnl
++        PKG_CHECK_EXISTS([gobject-introspection-1.0],,
++                         AC_MSG_ERROR([gobject-introspection-1.0 is not installed]))
++        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1],
++                         found_introspection=yes,
++                         AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))
++    ],dnl
++    [auto],[dnl
++        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
++    ],dnl
++    [dnl	
++        AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
++    ])dnl
++
++    AC_MSG_RESULT([$found_introspection])
++
++    INTROSPECTION_SCANNER=
++    INTROSPECTION_COMPILER=
++    INTROSPECTION_GENERATE=
++    INTROSPECTION_GIRDIR=
++    INTROSPECTION_TYPELIBDIR=
++    if test "x$found_introspection" = "xyes"; then
++       INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
++       INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
++       INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
++       INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
++       INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
++       INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
++       INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
++       INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
++    fi
++    AC_SUBST(INTROSPECTION_SCANNER)
++    AC_SUBST(INTROSPECTION_COMPILER)
++    AC_SUBST(INTROSPECTION_GENERATE)
++    AC_SUBST(INTROSPECTION_GIRDIR)
++    AC_SUBST(INTROSPECTION_TYPELIBDIR)
++    AC_SUBST(INTROSPECTION_CFLAGS)
++    AC_SUBST(INTROSPECTION_LIBS)
++    AC_SUBST(INTROSPECTION_MAKEFILE)
++
++    AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
++])
++
++
++dnl Usage:
++dnl   GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version])
++
++AC_DEFUN([GOBJECT_INTROSPECTION_CHECK],
++[
++  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1])
++])
++
++dnl Usage:
++dnl   GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version])
++
++
++AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE],
++[
++  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require])
++])

similarity index 77%
rename from meta/recipes-extended/polkit/polkit_0.99.bb
rename to meta/recipes-extended/polkit/polkit_0.101.bb
index 7f96979..6769914 100644
@@ -4,10 +4,11 @@ HOMEPAGE = "http://code.google.com/p/polkit/"
 LICENSE = "LGPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb \
                     file://src/polkit/polkit.h;beginline=1;endilne=20;md5=9f797b8912dac8a806be820c14e783f8 \
-                    file://docs/polkit/html/license.html;md5=54750ec6ece444c50b823234d445dd99"
+                    file://docs/polkit/html/license.html;md5=07ddbf5f29e44c80c99be19c1690ec1f"
 
-SRC_URI = "http://hal.freedesktop.org/releases/polkit-${PV}.tar.gz"
-PR = "r1"
+SRC_URI = "http://hal.freedesktop.org/releases/polkit-${PV}.tar.gz \
+           file://introspection.patch"
+PR = "r0"
 DEPENDS = "libpam expat dbus-glib eggdbus intltool"
 RDEPENDS_${PN} = "libpam"
 EXTRA_OECONF = "--with-authfw=pam --with-os-type=moblin --disable-man-pages --disable-gtk-doc --disable-introspection"

@@ -19,5 +20,5 @@ FILES_${PN} += "${libdir}/${PN}-1/extensions/*.so \
                 ${datadir}/dbus-1/system-services/*"
 FILES_${PN}-dbg += "${libdir}/${PN}-1/extensions/.debug/*.so"
 
-SRC_URI[md5sum] = "fcc4d7b19c08ad54d3ce0eae0ab12398"
-SRC_URI[sha256sum] = "f612c7c26ec822f67751420057a4ae113fc50ab51070758faacf2ad30bb3583f"
+SRC_URI[md5sum] = "f925ac93aba3c072977370c1e27feb7f"
+SRC_URI[sha256sum] = "927f65760e4fce23d7cdeae90245c22986eb0a39335a344915302158f73f9f1b"

index 0b9b892..2fd5696 100644
@@ -1,3 +1,11 @@
+This patch fixes collisions between locally defined functions
+and glibc's fexecve() and getline() functions.
+
+Upstream-Status: Inappropriate [Other]
+Upstream no longer maintains a GPL version of this utility.
+
+Signed-off-by: Scott Garman <[email protected]>
+
 Index: cdrtools-2.01/include/schily.h
 ===================================================================
 --- cdrtools-2.01.orig/include/schily.h	2009-06-18 11:30:45.000000000 +0100

index 0318d31..82e57d1 100644
@@ -1,3 +1,10 @@
+Remove hard-coded references to /usr/src/linux/include to avoid
+host contamination.
+
+Upstream-Status: [Other (build-system specific)]
+
+Signed-off-by: Scott Garman <[email protected]>
+
 Index: cdrtools-2.01/DEFAULTS/Defaults.gnu
 ===================================================================
 --- cdrtools-2.01.orig/DEFAULTS/Defaults.gnu	2008-09-22 12:42:12.000000000 +0100

index 769e5e2..aba6a45 100644
@@ -1,21 +1,25 @@
 # cdrtools-native OE build file
 # Copyright (C) 2004-2006, Advanced Micro Devices, Inc.  All Rights Reserved
 # Released under the MIT license (see packages/COPYING)
-
-LICENSE="GPL"
-DESCRIPTION="A set of tools for CD recording, including cdrecord"
-HOMEPAGE="http://cdrecord.berlios.de/old/private/cdrecord.html"
+SUMMARY = "A set of tools for CD recording, including cdrecord"
+DESCRIPTION = "A set of tools for CD recording, including cdrecord"
+HOMEPAGE = "http://cdrecord.berlios.de/private/cdrecord.html"
+SECTION = "console/utils"
+PRIORITY = "optional"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 PR = "r2"
 
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+SRC_URI = "ftp://ftp.berlios.de/pub/cdrecord/cdrtools-${PV}.tar.bz2 \
+           file://no_usr_src.patch \
+           file://glibc-conflict-rename.patch"
 
-SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/cdrtools-${PV}.tar.bz2 \
-         file://no_usr_src.patch;patch=1 \
-         file://glibc-conflict-rename.patch;patch=1"
+SRC_URI[md5sum] = "d44a81460e97ae02931c31188fe8d3fd"
+SRC_URI[sha256sum] = "728b6175069a77c4d7d92ae60108cbda81fbbf7bc7aa02e25153ccf2092f6c22"
 
 inherit native
 
-STAGE_TEMP="${WORKDIR}/image-temp"
+STAGE_TEMP = "${WORKDIR}/image-temp"
 
 do_install() {
 	install -d ${STAGE_TEMP}

index 767c05b..d9fe02c 100644
@@ -5676,3 +5676,14 @@ RECIPE_STATUS_pn-createrepo = "green"
 RECIPE_LATEST_VERSION_pn-createrepo = "2.2.3"
 RECIPE_MAINTAINER_pn-createrepo = "Qing He <[email protected]>"
 RECIPE_LAST_UPDATE_pn-createrepo = "Apr 6, 2011"
+
+RECIPE_STATUS_pn-cdrtools = "green"
+RECIPE_DEPENDENCY_CHECK_pn-cdrtools = "not done"
+RECIPE_LATEST_VERSION_pn-cdrtools = "3.00"
+RECIPE_NO_UPDATE_REASON_pn-cdrtools = "v3.x uses incompatible CDDL license"
+RECIPE_NO_OF_PATCHES_pn-cdrtools = "2"
+RECIPE_LATEST_RELEASE_DATE_pn-cdrtools = "2010/06/02"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-cdrtools = "6 years 2 months"
+RECIPE_COMMENTS_pn-cdrtools = "This is the last GPL licensed version of cdrtools"
+RECIPE_LAST_UPDATE_pn-cdrtools = "Apr 25, 2011"
+RECIPE_MAINTAINER_pn-cdrtools = "Scott Garman <[email protected]>"

index 44fab53..7ca396d 100644
@@ -53,15 +53,15 @@ oefatal() {
 }
 
 oedebug() {
-	test $# -ge 2 || {
+	if [ $# -lt 2]; then
 		echo "Usage: oedebug level \"message\""
 		exit 1
-	}
+	fi
 
-	test ${OEDEBUG:-0} -ge $1 && {
+	if [ ${OEDEBUG:-0} -ge $1 ]; then
 		shift
 		echo "DEBUG:" $*
-	}
+	fi
 }
 
 oe_runmake() {

index 5ba1b06..ba92df8 100644
@@ -115,8 +115,6 @@ PACKAGE_DEBUG_SPLIT_STYLE = '.debug'
 # SELECTED_OPTIMIZATION = "${PROFILE_OPTIMIZATION}"
 # LDFLAGS =+ "-pg"
 
-# Uncomment this if you want BitBake to emit debugging output
-# BBDEBUG = "yes"
 # Uncomment this if you want BitBake to emit the log if a build fails.
 BBINCLUDELOGS = "yes"
 

index a40e74f..f7b84ec 100644
@@ -1,17 +1,31 @@
 def gettext_after_parse(d):
-    # Remove the NLS bits if USE_NLS is no.
-    if bb.data.getVar('USE_NLS', d, 1) == 'no':
-        cfg = oe_filter_out('^--(dis|en)able-nls$', bb.data.getVar('EXTRA_OECONF', d, 1) or "", d)
-        cfg += " --disable-nls"
-        depends = bb.data.getVar('DEPENDS', d, 1) or ""
-        bb.data.setVar('DEPENDS', oe_filter_out('^(virtual/libiconv|virtual/libintl)$', depends, d), d)
-        bb.data.setVar('EXTRA_OECONF', cfg, d)
-
+   # Remove the NLS bits if USE_NLS is no.
+   if bb.data.getVar('USE_NLS', d, True) == 'no':
+       cfg = oe_filter_out('^--(dis|en)able-nls$', bb.data.getVar('EXTRA_OECONF', d, 1) or "", d)
+       cfg += " --disable-nls"
+       depends = bb.data.getVar('DEPENDS', d, True) or ""
+       depends = oe_filter_out('^(virtual/libiconv|virtual/libintl|virtual/gettext|gettext)$', depends, d)
+       if not oe.utils.inherits(d, 'native', 'nativesdk', 'cross', 'crosssdk'):
+           depends = oe_filter_out('^(gettext-native)$', depends, d)
+       bb.data.setVar('DEPENDS', depends, d)
+       bb.data.setVar('EXTRA_OECONF', cfg, d)
+   # check if INHIBIT_DEFAULT_DEPS is 1 then we forcibly remove dependencies
+   # added by this class through DEPENDS_GETTEXT
+   if bb.data.getVar('INHIBIT_DEFAULT_DEPS', d, True):
+       depends_native = bb.data.getVar('DEPENDS_virtclass-native', d, True) or ""
+       depends_nativesdk = bb.data.getVar('DEPENDS_virtclass-nativesdk', d, True) or ""
+       depends = bb.data.getVar('DEPENDS', d, True) or ""
+       gettext_deps = bb.data.getVar('DEPENDS_GETTEXT', d, True).replace(' ','|')
+       gettext_deps = '^(' + gettext_deps + ')$'
+       depends_native = oe_filter_out(gettext_deps, depends_native, d)
+       depends_nativesdk = oe_filter_out(gettext_deps, depends_nativesdk, d)
+       depends = oe_filter_out(gettext_deps, depends, d)
+       bb.data.setVar('DEPENDS_virtclass-native', depends, d)
+       bb.data.setVar('DEPENDS_virtclass-nativesdk', depends, d)
+       bb.data.setVar('DEPENDS', depends, d)
 python () {
     gettext_after_parse(d)
 }
-
-DEPENDS_GETTEXT = "gettext gettext-native"
-
-DEPENDS =+ "${DEPENDS_GETTEXT}"
 EXTRA_OECONF += "--enable-nls"
+DEPENDS_GETTEXT ?= "virtual/gettext"
+DEPENDS_append = " ${DEPENDS_GETTEXT} "

index 22a5086..98acf7f 100644
@@ -554,9 +554,6 @@ python do_package_qa () {
 }
 
 
-# The Staging Func, to check all staging
-#addtask qa_staging after do_populate_sysroot before do_build
-do_populate_sysroot[postfuncs] += "do_qa_staging "
 python do_qa_staging() {
     bb.note("QA checking staging")
 

@@ -564,10 +561,6 @@ python do_qa_staging() {
         bb.fatal("QA staging was broken by the package built above")
 }
 
-# Check broken config.log files, for packages requiring Gettext which don't
-# have it in DEPENDS and for correct LIC_FILES_CHKSUM
-#addtask qa_configure after do_configure before do_compile
-do_configure[postfuncs] += "do_qa_configure "
 python do_qa_configure() {
     configs = []
     workdir = bb.data.getVar('WORKDIR', d, True)

@@ -603,3 +596,11 @@ Missing inherit gettext?""" % config)
     if not package_qa_check_license(workdir, d):
         bb.fatal("Licensing Error: LIC_FILES_CHKSUM does not match, please fix")
 }
+# The Staging Func, to check all staging
+#addtask qa_staging after do_populate_sysroot before do_build
+do_populate_sysroot[postfuncs] += "do_qa_staging "
+
+# Check broken config.log files, for packages requiring Gettext which don't
+# have it in DEPENDS and for correct LIC_FILES_CHKSUM
+#addtask qa_configure after do_configure before do_compile
+do_configure[postfuncs] += "do_qa_configure "

index 7ca396d..eafad7e 100644
@@ -8,6 +8,7 @@ inherit utils
 inherit utility-tasks
 inherit metadata_scm
 inherit buildstats
+inherit logging
 
 python sys_path_eh () {
     if isinstance(e, bb.event.ConfigParsed):

72 lines not on this page · raw message

index 98acf7f..742be5e 100644
@@ -578,20 +578,21 @@ Rerun configure task after fixing this. The path was '%s'""" % root)
         if "configure.in" in files:
             configs.append(os.path.join(root, "configure.in"))
 
-    if "gettext" not in bb.data.getVar('P', d, True) and "gcc-runtime" not in bb.data.getVar('P', d, True):
+    cnf = bb.data.getVar('EXTRA_OECONF', d, True) or ""
+    if "gettext" not in bb.data.getVar('P', d, True) and "gcc-runtime" not in bb.data.getVar('P', d, True) and "--disable-nls" not in cnf:
        if bb.data.inherits_class('native', d) or bb.data.inherits_class('cross', d) or bb.data.inherits_class('crosssdk', d) or bb.data.inherits_class('nativesdk', d):
           gt = "gettext-native"
        elif bb.data.inherits_class('cross-canadian', d):
           gt = "gettext-nativesdk"
        else:
-          gt = "gettext"
+          gt = "virtual/gettext"
        deps = bb.utils.explode_deps(bb.data.getVar('DEPENDS', d, True) or "")
        if gt not in deps:
           for config in configs:
               gnu = "grep \"^[[:space:]]*AM_GNU_GETTEXT\" %s >/dev/null" % config
               if os.system(gnu) == 0:
-                 bb.fatal("""Gettext required but not in DEPENDS for file %s.
-Missing inherit gettext?""" % config)
+                 bb.fatal("""%s required but not in DEPENDS for file %s.
+Missing inherit gettext?""" % (gt, config))
 
     if not package_qa_check_license(workdir, d):
         bb.fatal("Licensing Error: LIC_FILES_CHKSUM does not match, please fix")

index bfcb5ea..ce5fc3e 100644
@@ -8,9 +8,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 PR = "r5"
 DEPENDS = "gettext-native virtual/libiconv ncurses expat"
 DEPENDS_virtclass-native = ""
-PROVIDES = "virtual/libintl"
+PROVIDES = "virtual/libintl virtual/gettext"
 PROVIDES_virtclass-native = ""
-
+CONFLICTS_${PN} = "proxy-libintl"
 SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
            file://autotools.patch;patch=1 \
            file://wchar-uclibc.patch;patch=1 \

index 3ec5e1d..91985b3 100644
@@ -14,6 +14,7 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs = "gcc-runtime"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "${POKYLIBC}-initial"
 PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-for-gcc-nativesdk ?= "${POKYLIBC}-nativesdk"
 
+PREFERRED_PROVIDER_virtual/gettext ??= "gettext"
 
 GCCVERSION ?= "4.5.1"
 SDKGCCVERSION ?= "4.5.1"

index 2ef14b8..e64a62e 100644
@@ -14,6 +14,9 @@ SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
 	   file://kernel-asm-page.patch;patch=1 "
 S = "${WORKDIR}/SDL-${PV}"
 
+SRC_URI[md5sum] = "418b42956b7cd103bfab1b9077ccc149"
+SRC_URI[sha256sum] = "6985823287b224b57390b1c1b6cbc54cc9a7d7757fbf9934ed20754b4cd23730"
+
 inherit autotools binconfig pkgconfig nativesdk
 
 EXTRA_OECONF = "--disable-static --disable-debug --disable-cdrom --enable-threads --enable-timers --enable-endian \

index 7ebf833..cbd2e96 100644
@@ -127,17 +127,18 @@ autotools_do_configure() {
 			else
 			  CONFIGURE_AC=configure.ac
 			fi
-			if grep "^[[:space:]]*AM_GLIB_GNU_GETTEXT" $CONFIGURE_AC >/dev/null; then
-			  if grep "sed.*POTFILES" $CONFIGURE_AC >/dev/null; then
-			    : do nothing -- we still have an old unmodified configure.ac
-			  else
-			    oenote Executing glib-gettextize --force --copy
-			    echo "no" | glib-gettextize --force --copy
+			if ! echo ${EXTRA_OECONF} | grep -q "\-\-disable-nls"; then
+			  if grep "^[[:space:]]*AM_GLIB_GNU_GETTEXT" $CONFIGURE_AC >/dev/null; then
+			    if grep "sed.*POTFILES" $CONFIGURE_AC >/dev/null; then
+			      : do nothing -- we still have an old unmodified configure.ac
+			    else
+			      oenote Executing glib-gettextize --force --copy
+			      echo "no" | glib-gettextize --force --copy
+			    fi
+			  else if grep "^[[:space:]]*AM_GNU_GETTEXT" $CONFIGURE_AC >/dev/null; then
+			    cp ${STAGING_DATADIR}/gettext/config.rpath ${S}/
 			  fi
-			else if grep "^[[:space:]]*AM_GNU_GETTEXT" $CONFIGURE_AC >/dev/null; then
-			  cp ${STAGING_DATADIR}/gettext/config.rpath ${S}/
 			fi
-
 			fi
 			mkdir -p m4
 			if grep "^[[:space:]]*[AI][CT]_PROG_INTLTOOL" $CONFIGURE_AC >/dev/null; then

new file mode 100644
index 0000000..cca57d4
@@ -0,0 +1,104 @@
+We provide dummy implementation of iconv functionality if it does not find
+iconv which will be case with uclibc. We remove the check for iconv in configure
+
+This is needed when libintl and libiconv is not available. It wont have any
+impact on case when they are available.
+
+Signed-off-by: Khem Raj <[email protected]>
+
+
+Index: glib-2.26.1/glib/gconvert.c
+===================================================================
+--- glib-2.26.1.orig/glib/gconvert.c
++++ glib-2.26.1/glib/gconvert.c
+@@ -23,7 +23,7 @@
+ #include "config.h"
+ #include "glibconfig.h"
+ 
+-#ifndef G_OS_WIN32
++#if !defined G_OS_WIN32 && defined HAVE_ICONV_H
+ #include <iconv.h>
+ #endif
+ #include <errno.h>
+@@ -65,6 +65,28 @@
+ #error GNU libiconv not in use but included iconv.h is from libiconv
+ #endif
+ 
++#ifndef HAVE_ICONV_H
++typedef void *iconv_t;
++
++iconv_t iconv_open(const char *tocode, const char *fromcode)
++{
++	return (iconv_t)(-1);
++}
++
++int iconv_close(iconv_t cd)
++{
++	free(cd);
++
++	return 0;
++}
++size_t iconv (iconv_t __cd, char **__inbuf,
++                     size_t *__inbytesleft,
++                     char **__outbuf,
++                     size_t *__outbytesleft)
++{
++	return 0;
++}
++#endif
+ 
+ /**
+  * SECTION:conversions
+Index: glib-2.26.1/configure.ac
+===================================================================
+--- glib-2.26.1.orig/configure.ac
++++ glib-2.26.1/configure.ac
+@@ -373,46 +373,8 @@ dnl *** Tests for iconv ***
+ dnl ***********************
+ dnl
+ dnl We do this before the gettext checks, to avoid distortion
+-
+-dnl On Windows we use a native implementation
+-
+-if test x"$glib_native_win32" = xyes; then
+-  with_libiconv=native
+-else
+-  AC_ARG_WITH(libiconv,
+-	      [AC_HELP_STRING([--with-libiconv=@<:@no/gnu/native@:>@],
+-			      [use the libiconv library])],,
+-	      [with_libiconv=maybe])
+-
+-  found_iconv=no
+-  case $with_libiconv in
+-    maybe)
+-      # Check in the C library first
+-      AC_CHECK_FUNC(iconv_open, [with_libiconv=no; found_iconv=yes])
+-      # Check if we have GNU libiconv
+-      if test $found_iconv = "no"; then
+-	AC_CHECK_LIB(iconv, libiconv_open, [with_libiconv=gnu; found_iconv=yes])
+-      fi
+-      # Check if we have a iconv in -liconv, possibly from vendor
+-      if test $found_iconv = "no"; then
+-	AC_CHECK_LIB(iconv, iconv_open, [with_libiconv=native; found_iconv=yes])
+-      fi
+-      ;;
+-    no)
+-      AC_CHECK_FUNC(iconv_open, [with_libiconv=no; found_iconv=yes])
+-      ;;
+-    gnu|yes)
+-      AC_CHECK_LIB(iconv, libiconv_open, [with_libiconv=gnu; found_iconv=yes])
+-      ;;
+-    native)
+-      AC_CHECK_LIB(iconv, iconv_open, [with_libiconv=native; found_iconv=yes])
+-      ;;
+-  esac
+-
+-  if test "x$found_iconv" = "xno" ; then
+-     AC_MSG_ERROR([*** No iconv() implementation found in C library or libiconv])
+-  fi
+-fi
++found_iconv=yes
++with_libiconv=no
+ 
+ gl_GLIBC21
+ AC_ARG_ENABLE(iconv-cache, 

index 4014a1b..776284e 100644
@@ -1,6 +1,6 @@
 require glib.inc
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "${GNOME_MIRROR}/glib/2.27/glib-${PV}.tar.bz2 \
            file://configure-libtool.patch \

@@ -13,6 +13,9 @@ SRC_URI[sha256sum] = "aad3038db865b762e01b1dc455ffd601b4083c069018d290e5fdfe1a61
 
 SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch"
 
+# Only apply this patch for target recipe on uclibc
+SRC_URI_append_libc-uclibc = " ${@['', 'file://no-iconv.patch']['${PN}' == '${BPN}']}"
+
 BBCLASSEXTEND = "native nativesdk"
 
 DEFAULT_PREFERENCE = "-1"

index 6b6c1f5..ca5f4c8 100644
@@ -1,13 +1,15 @@
 require glib.inc
 
 PE = "1"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${GNOME_MIRROR}/glib/2.28/glib-${PV}.tar.bz2 \
            file://configure-libtool.patch \
            file://60_wait-longer-for-threads-to-die.patch \
            file://g_once_init_enter.patch \
           "
+# Only apply this patch for target recipe on uclibc
+SRC_URI_append_libc-uclibc = " ${@['', 'file://no-iconv.patch']['${PN}' == '${BPN}']}"
 
 SRC_URI[md5sum] = "7d8fc15ae70d5111c0cf2a79d50ef717"
 SRC_URI[sha256sum] = "557fb7c39d21b9359fbac51fd6b0b883bc97a2561c0166eef993a4078312f578"

index 9b6e17b..83f1990 100644
@@ -15,7 +15,7 @@ SECTION = "libs"
 
 require glib-2.0.inc
 
-DEPENDS = "glib-2.0-native gtk-doc-native virtual/libiconv virtual/libintl zip dbus"
+DEPENDS = "glib-2.0-native gtk-doc-native zip dbus"
 DEPENDS_virtclass-native = "gtk-doc-native pkgconfig-native gettext-native dbus-native"
 DEPENDS_virtclass-nativesdk = "libtool-nativesdk"
 PACKAGES =+ "glib-2.0-utils "

index 913bb1b..447e5b7 100644
@@ -13,10 +13,10 @@ LIC_FILES_CHKSUM = "file://README.licensing;md5=1530e36fe1304d4535513de90a290df9
                     file://licenses/COPYING.UCB;md5=263860f8968d8bafa5392cab74285262 \
                     file://getopt/COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
 
-DEPENDS = "zlib ncurses virtual/libintl"
-DEPENDS_virtclass-native = "zlib-native ncurses-native lzo-native gettext-native"
-
 inherit autotools gettext
+DEPENDS = "zlib ncurses"
+DEPENDS_virtclass-native_append = " lzo-native"
+
 
 SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux-ng/v${MAJOR_VERSION}/util-linux-ng-${PV}.tar.bz2 \
            file://MCONFIG \

index b9c4e1c..bfcb5ea 100644
@@ -53,9 +53,36 @@ acpaths = '-I ${S}/autoconf-lib-link/m4/ \
 # 1300    KiB /ep93xx/uclibc-dev_0.9.29-r8_ep93xx.ipk
 # 140     KiB /armv4t/gettext-dev_0.14.1-r6_armv4t.ipk
 # 4       KiB /ep93xx/libgcc-s-dev_4.2.2-r2_ep93xx.ipk
+PACKAGES =+ "gettext-runtime gettext-runtime-dev gettext-runtime-doc"
 
-PACKAGES =+ "libgettextlib libgettextsrc"
-FILES_libgettextlib = "${libdir}/libgettextlib-*.so*"
-FILES_libgettextsrc = "${libdir}/libgettextsrc-*.so*"
-
+FILES_gettext-runtime = "${bindir}/gettext \
+                         ${bindir}/ngettext \
+                         ${bindir}/envsubst \
+                         ${bindir}/gettext.sh \
+                         ${libdir}/libasprintf.so* \
+                         ${libdir}/GNU.Gettext.dll \
+                        "
+FILES_gettext-runtime_append_libc-uclibc = " ${libdir}/libintl.so* \
+                                             ${libdir}/charset.alias \
+                                           "
+FILES_gettext-runtime-dev += "${libdir}/libasprintf.a \
+                      ${includedir}/autosprintf.h \
+                     "
+FILES_gettext-runtime-dev_append_libc-uclibc = " ${libdir}/libintl.a \
+                                                 ${includedir}/libintl.h \
+                                               "
+FILES_gettext-runtime-doc = "${mandir}/man1/gettext.* \
+                             ${mandir}/man1/ngettext.* \
+                             ${mandir}/man1/envsubst.* \
+                             ${mandir}/man1/.* \
+                             ${mandir}/man3/* \
+                             ${docdir}/gettext/gettext.* \
+                             ${docdir}/gettext/ngettext.* \
+                             ${docdir}/gettext/envsubst.* \
+                             ${docdir}/gettext/*.3.html \
+                             ${datadir}/gettext/ABOUT-NLS \
+                             ${docdir}/gettext/csharpdoc/* \
+                             ${docdir}/libasprintf/autosprintf.html \
+                             ${infodir}/autosprintf.info \
+                            "
 BBCLASSEXTEND = "native nativesdk"

index cad8cfc..ad94aa5 100644
@@ -2,6 +2,8 @@ require clutter-box2d.inc
 
 PR = "r0"
 
+DEPENDS += "clutter-1.6"
+
 SRC_URI = "http://source.clutter-project.org/sources/clutter-box2d/0.10/clutter-box2d-${PV}.tar.bz2 \
            file://fix-disable-introspection.patch"
 

index 953a3ac..c882bfd 100644
@@ -5,11 +5,11 @@ SECTION = "console/utils"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \
                     file://alsactl/utils.c;beginline=1;endline=20;md5=fe9526b055e246b5558809a5ae25c0b9"
-DEPENDS = "alsa-lib ncurses gettext"
+DEPENDS = "alsa-lib ncurses"
 PR = "r0"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
-           file://ncursesfix.patch;patch=1 "
+           file://ncursesfix.patch"
 
 SRC_URI[md5sum] = "8238cd57cb301d1c36bcf0ecb59ce6b2"
 SRC_URI[sha256sum] = "95127f740291086486c06c28118cabca0814bde48fd14dac041a9812a5ac1be2"

@@ -19,10 +19,9 @@ SRC_URI[sha256sum] = "95127f740291086486c06c28118cabca0814bde48fd14dac041a9812a5
 # please close bug and remove this comment when properly fixed
 #
 EXTRA_OECONF = "--disable-xmlto"
-EXTRA_OECONF_linux-uclibc = "--disable-nls"
-EXTRA_OECONF_linux-uclibcgnueabi = "--disable-nls"
+EXTRA_OECONF_append_libc-uclibc = " --disable-nls"
 
-inherit autotools
+inherit autotools gettext
 
 # This are all packages that we need to make. Also, the now empty alsa-utils
 # ipk depend on them.

similarity index 100%
rename from meta/recipes-graphics/clutter/table.inc
rename to meta-demoapps/recipes-graphics/clutter/table.inc

similarity index 100%
rename from meta/recipes-graphics/clutter/table/fixes.patch
rename to meta-demoapps/recipes-graphics/clutter/table/fixes.patch

similarity index 100%
rename from meta/recipes-graphics/clutter/table_git.bb
rename to meta-demoapps/recipes-graphics/clutter/table_git.bb

similarity index 100%
rename from meta/recipes-graphics/clutter/tidy.inc
rename to meta-demoapps/recipes-graphics/clutter/tidy.inc

similarity index 100%
rename from meta/recipes-graphics/clutter/tidy/autofoo.patch
rename to meta-demoapps/recipes-graphics/clutter/tidy/autofoo.patch

similarity index 100%
rename from meta/recipes-graphics/clutter/tidy/tidy-enable-tests.patch
rename to meta-demoapps/recipes-graphics/clutter/tidy/tidy-enable-tests.patch

similarity index 100%
rename from meta/recipes-graphics/clutter/tidy_git.bb
rename to meta-demoapps/recipes-graphics/clutter/tidy_git.bb

index 2565f87..4ae7650 100644
@@ -1,13 +1,16 @@
 #
 # Exclude known broken packages
 #
-EXCLUDE_FROM_WORLD_pn-psb-kernel-source = "1"
 EXCLUDE_FROM_WORLD_pn-gobject-introspection = "1"
 
 # Need bzr
 EXCLUDE_FROM_WORLD_pn-eds-tools = "1"
 
 # Need Updates from Clutter 0.8
-EXCLUDE_FROM_WORLD_pn-tidy = "1"
-EXCLUDE_FROM_WORLD_pn-table = "1"
 EXCLUDE_FROM_WORLD_pn-clutter-box2d = "1"
+
+# Don't build older versions of clutter
+EXCLUDE_FROM_WORLD_pn-clutter = "1"
+EXCLUDE_FROM_WORLD_pn-clutter-1.4 = "1"
+EXCLUDE_FROM_WORLD_pn-clutter-gst-1.4 = "1"
+EXCLUDE_FROM_WORLD_pn-clutter-gtk-1.4 = "1"

new file mode 100644
index 0000000..1f34f07
@@ -0,0 +1,41 @@
+diff -u -r qemu-0.14.0/Makefile.target qemu-0.14.0-fixed/Makefile.target
+--- qemu-0.14.0/Makefile.target 2011-04-26 21:22:17.627637741 -0700
++++ qemu-0.14.0-fixed/Makefile.target   2011-04-26 21:23:02.767637747 -0700
+@@ -82,8 +82,10 @@
+ libobj-$(TARGET_I386) += helper_opengl.o opengl_exec.o
+ libobj-$(TARGET_X86_64) += helper_opengl.o opengl_exec.o
+ else
++ifdef CONFIG_SDL
+ libobj-$(TARGET_I386) += dummygl.o
+ libobj-$(TARGET_X86_64) += dummygl.o
++endif
+ endif #CONFIG_LINUX_USER
+ libobj-$(TARGET_ARM) += dummygl.o
+ libobj-$(TARGET_MIPS) += dummygl.o
+Only in qemu-0.14.0-fixed: config.log
+diff -u -r qemu-0.14.0/target-i386/helper.h qemu-0.14.0-fixed/target-i386/helper.h
+--- qemu-0.14.0/target-i386/helper.h    2011-04-26 21:22:11.418637742 -0700
++++ qemu-0.14.0-fixed/target-i386/helper.h      2011-04-26 21:23:02.539637747 -0700
+@@ -217,6 +217,9 @@
+ DEF_HELPER_2(rcrq, tl, tl, tl)
+ #endif
+ 
++#ifdef CONFIG_SDL
+ DEF_HELPER_0(opengl, void)
++#endif
++
+ 
+ #include "def-helper.h"
+diff -u -r qemu-0.14.0/target-i386/translate.c qemu-0.14.0-fixed/target-i386/translate.c
+--- qemu-0.14.0/target-i386/translate.c 2011-04-26 21:22:21.600637743 -0700
++++ qemu-0.14.0-fixed/target-i386/translate.c   2011-04-26 21:23:02.538637747 -0700
+@@ -2659,7 +2659,7 @@
+ static void gen_interrupt(DisasContext *s, int intno,
+                           target_ulong cur_eip, target_ulong next_eip)
+ {
+-#if !defined(CONFIG_USER_ONLY)
++#if !defined(CONFIG_USER_ONLY) && defined(CONFIG_SDL)
+     if (enable_gl && intno == 0x99) {
+         gen_helper_opengl();
+         return;
+

index 362e9f3..49bcf8e 100644
@@ -16,6 +16,8 @@ EXTRA_OECONF += "--target-list=${@get_qemu_target_list(d)} --disable-werror --di
 
 #EXTRA_OECONF += "--disable-sdl"
 
+COMPATIBLE_MACHINES = "qemux86 qemuppc"
+
 inherit autotools
 
 # For our gl powered QEMU you need libGL and SDL headers

index e440759..f0a4bea 100644
@@ -3,7 +3,7 @@ require qemu.inc
 LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
                     file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913"
 
-PR = "r0"
+PR = "r1"
 
 FILESPATH = "${FILE_DIRNAME}/qemu-${PV}"
 FILESDIR = "${WORKDIR}"

@@ -25,6 +25,7 @@ SRC_URI = "\
     file://Detect-and-use-GCC-atomic-builtins-for-locking.patch \
     file://larger_default_ram_size.patch \
     file://qemugl-fix.patch \
+    file://opengl-sdl-fix.patch \
     "
 SRC_URI[md5sum] = "f9d145d5c09de9f0984ffe9bd1229970"
 SRC_URI[sha256sum] = "ba21e84d7853217830e167dae9999cdbff481189c6a0bb600ac7fb7201453108"

deleted file mode 100644
index e1e6f08..0000000
@@ -1,16 +0,0 @@
-Upstream-Status:Inappropriate [embedded specific]
-
-Fix for compiling with ssp enabled gcc:
-See http://bugs.openembedded.net/show_bug.cgi?id=1980
-
-diff -Naur perl-5.8.7.orig/cflags.SH perl-5.8.7/cflags.SH
---- perl-5.8.7.orig/cflags.SH	2002-09-30 10:59:07.000000000 +0000
-+++ perl-5.8.7/cflags.SH	2005-10-02 04:08:39.000000000 +0000
-@@ -165,6 +165,8 @@
- esac
- 
-     : Can we perhaps use $ansi2knr here
-+    [[ $file == regcomp ]] && export ccflags="${ccflags} -fno-stack-protector"
-+    [[ $file == regexec ]] && export ccflags="${ccflags} -fno-stack-protector"
-     echo "$cc -c -DPERL_CORE $ccflags $optimize $warn"
-     eval "$also "'"$cc -DPERL_CORE -c $ccflags $optimize $warn"'

index 07b8eac..847ee59 100644
@@ -58,13 +58,13 @@ SRC_URI = "http://www.cpan.org/src/5.0/perl-${PV}.tar.gz \
         file://parallel_build_fix_4.patch \
         file://parallel_build_fix_5.patch \
         file://parallel_build_fix_6.patch \
-        file://Makefile.SH.patch;patch=1 \
-        file://installperl.patch;patch=1 \
-        file://perl-dynloader.patch;patch=1 \
-        file://perl-moreconfig.patch;patch=1 \
-        file://letgcc-find-errno.patch;patch=1 \
-        file://generate-sh.patch;patch=1 \
-        file://09_fix_installperl.patch;patch=1 \
+        file://Makefile.SH.patch \
+        file://installperl.patch \
+        file://perl-dynloader.patch \
+        file://perl-moreconfig.patch \
+        file://letgcc-find-errno.patch \
+        file://generate-sh.patch \
+        file://09_fix_installperl.patch \
         file://native-perlinc.patch \
         file://perl-enable-gdbm.patch \
         file://cross-generate_uudmap.patch \

index 789b68e..4a65b91 100644
@@ -2,9 +2,15 @@ BROKEN = "1"
 
 DESCRIPTION = "Alsa Tools"
 SECTION = "console/utils"
-LICENSE = "GPL"
+LICENSE = "GPLv2"
 DEPENDS = "alsa-lib ncurses"
 
+LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+
 SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/alsa-tools-${PV}.tar.bz2"
 
+SRC_URI[md5sum] = "6b9d146af621dd712472b3ebb519c596"
+SRC_URI[sha256sum] = "2a05047363b20f16820f36198ed3b139d1c55f55464750ea11d350e00b09cb86"
+
+
 inherit autotools