[CONSOLIDATED PULL 00/26] Some Package Updates and Fixes

[CONSOLIDATED PULL 00/26] Some Package Updates and Fixes

[Saul Wold]

Richard & Community:

Here are some package updates along with fixes from various folks
that have been pending for a couple of days. BTW, this does build
world and gpl, although I have heard about some gettext issue I am
still working.

FYI: things might slow down a little over the next week as various
people (like RP & Saul) take some needed down time during the holiday
season.

Happy Holidays to everyone.

Sau!


The following changes since commit db446421933d640528328e46a29f828a36d6649b:

  multilib.conf: Enable shadow-sysroot and libffi (2011-12-21 17:24:37 +0000)

are available in the git repository at:
  git://git.openembedded.org/openembedded-core-contrib sgw/stage
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage

Dexuan Cui (2):
  socat: add the latest stable version 1.7.2.0
  wget: fix a host intrusion issue introduced by adding
    --with-ssl=openssl.

H.J. Lu (1):
  gmp: Don't check "$CC $CFLAGS" for x32 in gmp configure

Ilya Yanok (1):
  arch-powerpc: set PACKAGE_EXTRA_ARCHS

Nitin A Kamble (3):
  bitbake.conf multilib.conf: move the definition of baselib
  binutils: fix building on distros with matching binutils version
  image-types: add btrfs as a supported fstype

Paul Eggleton (1):
  libsync: move to git.yoctoproject.org

Saul Wold (10):
  distro tracking: update man-pages, gts-plugin-bluetooth, usbutils,
  python-pycairo: Upgrade to 1.10.0
  augeas: Upgrade to 0.10.0
  libidn: Upgrade to 1.23
  mc: Add version 4.8.1 now GPLv3
  texi2html: Upgrade to 5.0
  libdrm: Upgrade to 2.4.29
  distro_tracking: Mark Upgrade Info
  zypper: add patch from libxml2
  bash: Add SRC_URI Checksums for GPLv2

Scott Garman (8):
  ncurses: move libraries to base_libdir
  libcap: move library to base_libdir
  util-linux: move libraries to base_libdir
  e2fsprogs: move libraries to base_libdir
  libusb1: move libraries to base_libdir
  libusb-compat: move libraries to base_libdir
  prelink: update to latest git version
  insane.bbclass: add QA tests for unsafe references to exec_prefix

 .../opensync/{libsync_svn.bb => libsync_git.bb}    |    9 +-
 meta/classes/image_types.bbclass                   |    2 +-
 meta/classes/insane.bbclass                        |  111 +++-
 meta/conf/bitbake.conf                             |    2 +-
 .../conf/distro/include/distro_tracking_fields.inc |   77 +-
 meta/conf/machine/include/powerpc/arch-powerpc.inc |    6 +-
 meta/conf/machine/include/tune-ppc603e.inc         |    2 +-
 meta/conf/machine/include/tune-ppce300c2.inc       |    2 +-
 meta/conf/machine/include/tune-ppce500mc.inc       |    2 +-
 meta/conf/multilib.conf                            |    2 -
 .../recipes-connectivity/socat/files/compile.patch |  946 ++++++++++++++++++++
 meta/recipes-connectivity/socat/socat_1.7.2.0.bb   |   28 +
 meta/recipes-core/ncurses/ncurses.inc              |   26 +-
 meta/recipes-core/util-linux/util-linux.inc        |   20 +-
 meta/recipes-core/util-linux/util-linux_2.19.1.bb  |    2 +-
 .../binutils/binutils-cross-canadian_2.22.bb       |    2 +-
 .../binutils/binutils-crosssdk_2.22.bb             |    2 +-
 meta/recipes-devtools/binutils/binutils.inc        |    2 +-
 meta/recipes-devtools/binutils/binutils_2.22.bb    |    2 +-
 .../e2fsprogs/e2fsprogs_1.41.14.bb                 |   29 +-
 meta/recipes-devtools/prelink/prelink_git.bb       |    2 +-
 .../python/python-pycairo_1.10.0.bb                |   39 +
 .../python/python-pycairo_1.8.10.bb                |   31 -
 meta/recipes-extended/augeas/augeas_0.10.0.bb      |    6 +
 meta/recipes-extended/augeas/augeas_0.9.0.bb       |    7 -
 meta/recipes-extended/bash/bash_3.2.48.bb          |    3 +
 .../libidn/{libidn_1.22.bb => libidn_1.23.bb}      |    5 +-
 meta/recipes-extended/mc/mc_4.8.1.bb               |   25 +
 .../texi2html-5.0/fix_gettext_version.patch        |   44 +
 .../{texi2html_1.82.bb => texi2html_5.0.bb}        |   19 +-
 meta/recipes-extended/wget/wget.inc                |    4 +-
 .../zypper/zypper/cmake_libxml2.patch              |   28 +
 meta/recipes-extended/zypper/zypper_git.bb         |    3 +-
 .../drm/{libdrm_2.4.27.bb => libdrm_2.4.29.bb}     |    8 +-
 meta/recipes-support/gmp/gmp/gmp_fix_for_x32.patch |   24 +-
 meta/recipes-support/libcap/libcap.inc             |   15 +-
 meta/recipes-support/libcap/libcap_2.22.bb         |    2 +-
 meta/recipes-support/libusb/libusb-compat_0.1.3.bb |   12 +-
 meta/recipes-support/libusb/libusb1_1.0.8.bb       |   16 +-
 39 files changed, 1417 insertions(+), 150 deletions(-)
 rename meta-demoapps/recipes-connectivity/opensync/{libsync_svn.bb => libsync_git.bb} (72%)
 create mode 100644 meta/recipes-connectivity/socat/files/compile.patch
 create mode 100644 meta/recipes-connectivity/socat/socat_1.7.2.0.bb
 create mode 100644 meta/recipes-devtools/python/python-pycairo_1.10.0.bb
 delete mode 100644 meta/recipes-devtools/python/python-pycairo_1.8.10.bb
 create mode 100644 meta/recipes-extended/augeas/augeas_0.10.0.bb
 delete mode 100644 meta/recipes-extended/augeas/augeas_0.9.0.bb
 rename meta/recipes-extended/libidn/{libidn_1.22.bb => libidn_1.23.bb} (86%)
 create mode 100644 meta/recipes-extended/mc/mc_4.8.1.bb
 create mode 100644 meta/recipes-extended/texi2html/texi2html-5.0/fix_gettext_version.patch
 rename meta/recipes-extended/texi2html/{texi2html_1.82.bb => texi2html_5.0.bb} (43%)
 create mode 100644 meta/recipes-extended/zypper/zypper/cmake_libxml2.patch
 rename meta/recipes-graphics/drm/{libdrm_2.4.27.bb => libdrm_2.4.29.bb} (54%)

-- 
1.7.6.4

[CONSOLIDATED PULL 01/26] distro tracking: update man-pages, gts-plugin-bluetooth, usbutils,

[Saul Wold]

and libcap

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../conf/distro/include/distro_tracking_fields.inc |   25 ++++++++++++++-----
 1 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index ba261be..fc54e33 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -531,14 +531,15 @@ RECIPE_INTEL_SECTION_pn-attr = "base libs"
 RECIPE_LATEST_RELEASE_DATE_pn-attr = "Aug 01, 2009"
 
 RECIPE_STATUS_pn-libcap = "yellow"   # hand crafted Makefiles
-RECIPE_LAST_UPDATE_pn-libcap = "Jul 7, 2010"
+RECIPE_LATEST_VERSION_pn-libcap = "2.22"
+RECIPE_LATEST_RELEASE_DATE_pn-libcap = "Jan 01, 2010"
+RECIPE_LAST_UPDATE_pn-libcap = "Jul 25, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-libcap = "Dec 15, 2011"
 RECIPE_MAINTAINER_pn-libcap = "Saul Wold <sgw@linux.intel.com>"
 RECIPE_DEPENDENCY_CHECK_pn-libcap = "done"
-RECIPE_LATEST_VERSION_pn-libcap = "2.19"
 RECIPE_INTEL_SECTION_pn-libcap = "base libs"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libcap = "1 month"
-RECIPE_LATEST_RELEASE_DATE_pn-libcap = "Jan 01, 2010"
-RECIPE_COMMENTS_pn-libcap = ""
+RECIPE_COMMENTS_pn-libcap = "Not available on kernel.org right now"
 
 RECIPE_STATUS_pn-libevent = "green"
 RECIPE_LAST_UPDATE_pn-libevent = "Jul 7, 2010"
@@ -1795,15 +1796,15 @@ RECIPE_MANUAL_CHECK_DATE_pn-util-linux = "Dec 01, 2011"
 RECIPE_COMMENTS_pn-util-linux = "kernel.org still has this off-line"
 
 RECIPE_STATUS_pn-usbutils = "green"
+RECIPE_LATEST_VERSION_pn-usbutils = "0.91"
+RECIPE_LATEST_RELEASE_DATE_pn-usbutils = "Oct 22, 2010"
 RECIPE_LAST_UPDATE_pn-usbutils = "May 20, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-usbutils = "May 24, 2011"
 RECIPE_MAINTAINER_pn-usbutils = "Saul Wold <sgw@linux.intel.com>"
 RECIPE_DEPENDENCY_CHECK_pn-usbutils = "done"
-RECIPE_LATEST_VERSION_pn-usbutils = "0.91"
 RECIPE_INTEL_SECTION_pn-usbutils = "base utils"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-usbutils = "2 months"
-RECIPE_LATEST_RELEASE_DATE_pn-usbutils = "Oct 22, 2010"
 RECIPE_COMMENTS_pn-usbutils = ""
-RECIPE_MANUAL_CHECK_DATE_pn-usbutils = "May 24, 2011"
 
 RECIPE_STATUS_pn-pciutils = "yellow"    # custom build system, several hacks
 RECIPE_LAST_UPDATE_pn-pciutils = "Nov 10, 2010"
@@ -5828,9 +5829,19 @@ RECIPE_LAST_UPDATE_pn-libgdata = "Dec 29, 2010"
 RECIPE_MAINTAINER_pn-libgdata = "Zhai Edwin <edwin.zhai@intel.com>"
 
 RECIPE_LATEST_VERSION_pn-man-pages = "3.32"
+RECIPE_LATEST_RELEASE_DATE_pn-man-pages = "Sep 02, 2011"
+RECIPE_LAST_UPDATE_pn-man-pages = "Dec 29, 2010"
+RECIPE_MANUAL_CHECK_DATE_pn-man-pages = "Dec 15, 2011"
+RECIPE_COMMENTS_pn-man-pages = "Kernel.org is down"
 RECIPE_LATEST_VERSION_pn-sysprof = "6b5b8432711ef5c747f8375073cd9af88922d3c6"
 RECIPE_LATEST_VERSION_pn-table = "d42a44938699ee30a998fc42bc149aebf69389db"
 
+RECIPE_LATEST_VERSION_pn-gst-plugin-bluetooh = "4.96"
+RECIPE_LATEST_RELEASE_DATE_pn-gst-plugin-bluetooh = "Sep 02, 2011"
+RECIPE_LAST_UPDATE_pn-gst-plugin-bluetooh = "Dec 29, 2010"
+RECIPE_MANUAL_CHECK_DATE_pn-gst-plugin-bluetooh = "Dec 15, 2011"
+RECIPE_COMMENTS_pn-gst-plugin-bluetooth = "Kernel.org is down"
+
 RECIPE_STATUS_pn-qmmp = "green"
 RECIPE_LATEST_VERSION_pn-qmmp = "0.5.2"
 RECIPE_LATEST_RELEASE_DATE_pn-qmmp = "Sep 02, 2011"
-- 
1.7.6.4

[CONSOLIDATED PULL 02/26] python-pycairo: Upgrade to 1.10.0

[Saul Wold]

tweak the pycairo.pc correctly.

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../python/python-pycairo_1.10.0.bb                |   39 ++++++++++++++++++++
 .../python/python-pycairo_1.8.10.bb                |   31 ----------------
 2 files changed, 39 insertions(+), 31 deletions(-)
 create mode 100644 meta/recipes-devtools/python/python-pycairo_1.10.0.bb
 delete mode 100644 meta/recipes-devtools/python/python-pycairo_1.8.10.bb

diff --git a/meta/recipes-devtools/python/python-pycairo_1.10.0.bb b/meta/recipes-devtools/python/python-pycairo_1.10.0.bb
new file mode 100644
index 0000000..812acfb
--- /dev/null
+++ b/meta/recipes-devtools/python/python-pycairo_1.10.0.bb
@@ -0,0 +1,39 @@
+DESCRIPTION = "Python Bindings for the Cairo canvas library"
+HOMEPAGE = "http://cairographics.org/pycairo"
+BUGTRACKER = "http://bugs.freedesktop.org"
+SECTION = "python-devel"
+LICENSE = "LGPLv1.1 & MPL-1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=f2e071ab72978431b294a0d696327421 \
+                    file://COPYING-LGPL-2.1;md5=fad9b3332be894bab9bc501572864b29 \
+                    file://COPYING-MPL-1.1;md5=bfe1f75d606912a4111c90743d6c7325"
+
+# cairo >= 1.8.8
+DEPENDS = "cairo"
+PR = "r0"
+
+SRC_URI = "http://cairographics.org/releases/py2cairo-${PV}.tar.bz2"
+
+SRC_URI[md5sum] = "20337132c4ab06c1146ad384d55372c5"
+SRC_URI[sha256sum] = "d30439f06c2ec1a39e27464c6c828b6eface3b22ee17b2de05dc409e429a7431"
+
+S = "${WORKDIR}/py2cairo-${PV}"
+
+inherit distutils pkgconfig
+
+do_configure() {
+	BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} ./waf configure --prefix=${D}${prefix}
+}
+
+do_compile() {
+	./waf build
+}
+
+do_install() {
+	./waf install
+	sed \
+		-e 's:@prefix@:${prefix}:' \
+		-e 's:@VERSION@:${PV}:' \
+		-e 's:@includedir@:${includedir}:' \
+		pycairo.pc.in > pycairo.pc
+	install -m 0644 pycairo.pc ${D}${libdir}/pkgconfig/
+}
diff --git a/meta/recipes-devtools/python/python-pycairo_1.8.10.bb b/meta/recipes-devtools/python/python-pycairo_1.8.10.bb
deleted file mode 100644
index 02ec353..0000000
--- a/meta/recipes-devtools/python/python-pycairo_1.8.10.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-DESCRIPTION = "Python Bindings for the Cairo canvas library"
-HOMEPAGE = "http://cairographics.org/pycairo"
-BUGTRACKER = "http://bugs.freedesktop.org"
-SECTION = "python-devel"
-LICENSE = "LGPLv2.1 & MPL-1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=f2e071ab72978431b294a0d696327421"
-# cairo >= 1.8.8
-DEPENDS = "cairo"
-PR = "r2"
-
-SRC_URI = "http://cairographics.org/releases/py2cairo-${PV}.tar.gz"
-
-SRC_URI[md5sum] = "87421a6a70304120555ba7ba238f3dc3"
-SRC_URI[sha256sum] = "b15f71019e42e06d86f7e8fe5587f07c3de5a59a6c3a071b25fe100796dbcd56"
-S = "${WORKDIR}/pycairo-${PV}"
-
-inherit distutils pkgconfig
-
-do_compile_prepend() {
-#fix the installation path of __init__.py
-#It was going in the sysroot instead of target install location
-	sed -i -e "s#dsy.get_python_lib()#'${D}${PYTHON_SITEPACKAGES_DIR}'#" ${S}/setup.py
-}
-
-do_install_append () {
-	install -d ${D}${includedir}
-	install -d ${D}${libdir}
-	mv ${D}${datadir}/include/* ${D}${includedir}
-	mv ${D}${datadir}/lib/* ${D}${libdir}
-	sed -i -e 's#prefix=.*#prefix=${prefix}#' ${D}${libdir}/pkgconfig/pycairo.pc
-}
-- 
1.7.6.4

[CONSOLIDATED PULL 03/26] augeas: Upgrade to 0.10.0

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-extended/augeas/augeas_0.10.0.bb |    6 ++++++
 meta/recipes-extended/augeas/augeas_0.9.0.bb  |    7 -------
 2 files changed, 6 insertions(+), 7 deletions(-)
 create mode 100644 meta/recipes-extended/augeas/augeas_0.10.0.bb
 delete mode 100644 meta/recipes-extended/augeas/augeas_0.9.0.bb

diff --git a/meta/recipes-extended/augeas/augeas_0.10.0.bb b/meta/recipes-extended/augeas/augeas_0.10.0.bb
new file mode 100644
index 0000000..734d171
--- /dev/null
+++ b/meta/recipes-extended/augeas/augeas_0.10.0.bb
@@ -0,0 +1,6 @@
+require augeas.inc
+
+PR = "r0"
+
+SRC_URI[md5sum] = "fe1834e90a066c3208ac0214622c7352"
+SRC_URI[sha256sum] = "ec111af06186216930176ebe5ecccdf7bf528528aee9acde1d5d70088484afca"
diff --git a/meta/recipes-extended/augeas/augeas_0.9.0.bb b/meta/recipes-extended/augeas/augeas_0.9.0.bb
deleted file mode 100644
index 4531560..0000000
--- a/meta/recipes-extended/augeas/augeas_0.9.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require augeas.inc
-
-PR = "r0"
-
-SRC_URI[md5sum] = "5ef0ce53ce4c75f59ab2523506731084"
-SRC_URI[sha256sum] = "55d2f482d02ac4cb38a80d95c53d2f73de435df7df1022827e7cba20bb4bb9b8"
-
-- 
1.7.6.4

[CONSOLIDATED PULL 04/26] libidn: Upgrade to 1.23

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../libidn/{libidn_1.22.bb => libidn_1.23.bb}      |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
 rename meta/recipes-extended/libidn/{libidn_1.22.bb => libidn_1.23.bb} (86%)

diff --git a/meta/recipes-extended/libidn/libidn_1.22.bb b/meta/recipes-extended/libidn/libidn_1.23.bb
similarity index 86%
rename from meta/recipes-extended/libidn/libidn_1.22.bb
rename to meta/recipes-extended/libidn/libidn_1.23.bb
index 9bdb322..851b5fc 100644
--- a/meta/recipes-extended/libidn/libidn_1.22.bb
+++ b/meta/recipes-extended/libidn/libidn_1.23.bb
@@ -12,8 +12,9 @@ PR = "r0"
 inherit pkgconfig autotools gettext
 
 SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz"
-SRC_URI[md5sum] = "893a1df0cf3b28b72d248382eaeaca71"
-SRC_URI[sha256sum] = "2f765e868795f5478900ec9f42cb0ecc6ca22e2a85a62763c0b13c7da2f588ed"
+
+SRC_URI[md5sum] = "f9a417270cc9b6bf763ae1f88e60191c"
+SRC_URI[sha256sum] = "25b42d75851ebae52e1c969353b74eefd3d6817f41c8d2a6db258f5ec60c5e6a"
 
 # command tool is under GPLv3+, while libidn itself is under LGPLv2.1+
 # so package command into a separate package
-- 
1.7.6.4

[CONSOLIDATED PULL 05/26] mc: Add version 4.8.1 now GPLv3

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-extended/mc/mc_4.8.1.bb |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-extended/mc/mc_4.8.1.bb

diff --git a/meta/recipes-extended/mc/mc_4.8.1.bb b/meta/recipes-extended/mc/mc_4.8.1.bb
new file mode 100644
index 0000000..de7fe7a
--- /dev/null
+++ b/meta/recipes-extended/mc/mc_4.8.1.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "Midnight Commander is an ncurses based file manager."
+HOMEPAGE = "http://www.midnight-commander.org/"
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=270bbafe360e73f9840bd7981621f9c2"
+SECTION = "console/utils"
+DEPENDS = "ncurses glib-2.0"
+RDEPENDS_${PN} = "ncurses-terminfo"
+
+PR = "r0"
+
+SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2"
+
+SRC_URI[md5sum] = "7d60c87d87b359831d976fa28034935e"
+SRC_URI[sha256sum] = "8f9bd09750c65a7786197a8f7e5a10a6dabf8c8737c564079ca393d8ecaf944d"
+
+inherit autotools gettext
+
+EXTRA_OECONF = "--with-screen=ncurses --without-gpm-mouse --without-x --without-samba"
+
+FILES_${PN}-dbg += "${libexecdir}/mc/.debug/"
+
+do_install_append () {
+	sed -i -e '1s,#!.*perl,#!${bindir}/env perl,' ${D}${libexecdir}/mc/extfs.d/*
+	rm -rf ${D}${libdir}
+}
-- 
1.7.6.4

[CONSOLIDATED PULL 06/26] texi2html: Upgrade to 5.0

[Saul Wold]

Add patch to update GETTEXT_MACRO_VERSION to 0.18

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../texi2html-5.0/fix_gettext_version.patch        |   44 ++++++++++++++++++++
 .../{texi2html_1.82.bb => texi2html_5.0.bb}        |   19 +++++++--
 2 files changed, 59 insertions(+), 4 deletions(-)
 create mode 100644 meta/recipes-extended/texi2html/texi2html-5.0/fix_gettext_version.patch
 rename meta/recipes-extended/texi2html/{texi2html_1.82.bb => texi2html_5.0.bb} (43%)

diff --git a/meta/recipes-extended/texi2html/texi2html-5.0/fix_gettext_version.patch b/meta/recipes-extended/texi2html/texi2html-5.0/fix_gettext_version.patch
new file mode 100644
index 0000000..35c119b
--- /dev/null
+++ b/meta/recipes-extended/texi2html/texi2html-5.0/fix_gettext_version.patch
@@ -0,0 +1,44 @@
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Saul Wold <sgw@linux.intel.com>
+
+Index: texi2html-5.0/po_document/Makefile.in.in
+===================================================================
+--- texi2html-5.0.orig/po_document/Makefile.in.in
++++ texi2html-5.0/po_document/Makefile.in.in
+@@ -9,7 +9,7 @@
+ # General Public License and is *not* in the public domain.
+ #
+ # Origin: gettext-0.17
+-GETTEXT_MACRO_VERSION = 0.17
++GETTEXT_MACRO_VERSION = 0.18
+ 
+ PACKAGE = @PACKAGE@
+ VERSION = @VERSION@
+Index: texi2html-5.0/po_messages/Makefile.in.in
+===================================================================
+--- texi2html-5.0.orig/po_messages/Makefile.in.in
++++ texi2html-5.0/po_messages/Makefile.in.in
+@@ -9,7 +9,7 @@
+ # General Public License and is *not* in the public domain.
+ #
+ # Origin: gettext-0.17
+-GETTEXT_MACRO_VERSION = 0.17
++GETTEXT_MACRO_VERSION = 0.18
+ 
+ PACKAGE = @PACKAGE@
+ VERSION = @VERSION@
+Index: texi2html-5.0/m4/po.m4
+===================================================================
+--- texi2html-5.0.orig/m4/po.m4
++++ texi2html-5.0/m4/po.m4
+@@ -29,7 +29,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
+ 
+   dnl Release version of the gettext macros. This is used to ensure that
+   dnl the gettext macros and po/Makefile.in.in are in sync.
+-  AC_SUBST([GETTEXT_MACRO_VERSION], [0.17])
++  AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
+ 
+   dnl Perform the following tests also if --disable-nls has been given,
+   dnl because they are needed for "make dist" to work.
diff --git a/meta/recipes-extended/texi2html/texi2html_1.82.bb b/meta/recipes-extended/texi2html/texi2html_5.0.bb
similarity index 43%
rename from meta/recipes-extended/texi2html/texi2html_1.82.bb
rename to meta/recipes-extended/texi2html/texi2html_5.0.bb
index f19b576..068f8bc 100644
--- a/meta/recipes-extended/texi2html/texi2html_1.82.bb
+++ b/meta/recipes-extended/texi2html/texi2html_5.0.bb
@@ -6,9 +6,20 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 
 PR = "r0"
 
-SRC_URI     = "http://download.savannah.gnu.org/releases/texi2html/${P}.tar.bz2"
+SRC_URI     = "http://download.savannah.gnu.org/releases/texi2html/${P}.tar.bz2 \
+               file://fix_gettext_version.patch"
 
-SRC_URI[md5sum] = "a8a9193c0ac1bec2f3ca7be40a5a82eb"
-SRC_URI[sha256sum] = "d69c1effc416896409003ea64fdb21152cc0a9a7c665d437a0a3bef9b588b4f1"
+SRC_URI[md5sum] = "f15ac876fcdc8be865b16535f480aa54"
+SRC_URI[sha256sum] = "e8a98b0ee20c495a6ab894398a065ef580272dbd5a15b1b19e8bd1bc89d9f9fa"
 
-inherit autotools
+inherit autotools gettext
+
+do_configure_prepend() {
+	# Make a directory for the old gettext setup
+	mkdir ${S}/po
+}
+
+do_configure_append() {
+	# Clean up the phony po directory
+	rm -rf ${S}/po
+}
-- 
1.7.6.4

[CONSOLIDATED PULL 07/26] libdrm: Upgrade to 2.4.29

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../drm/{libdrm_2.4.27.bb => libdrm_2.4.29.bb}     |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
 rename meta/recipes-graphics/drm/{libdrm_2.4.27.bb => libdrm_2.4.29.bb} (54%)

diff --git a/meta/recipes-graphics/drm/libdrm_2.4.27.bb b/meta/recipes-graphics/drm/libdrm_2.4.29.bb
similarity index 54%
rename from meta/recipes-graphics/drm/libdrm_2.4.27.bb
rename to meta/recipes-graphics/drm/libdrm_2.4.29.bb
index 473520e..d02b914 100644
--- a/meta/recipes-graphics/drm/libdrm_2.4.27.bb
+++ b/meta/recipes-graphics/drm/libdrm_2.4.29.bb
@@ -2,9 +2,9 @@ require libdrm.inc
 
 LIC_FILES_CHKSUM = "file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c530816761e949dc71"
 
-SRC_URI += "file://installtests.patch"
+PR = "r0"
 
-SRC_URI[md5sum] = "0fba4f42735cd3d24dd7a8cde0023fbd"
-SRC_URI[sha256sum] = "ea6b04dd3298e36c7a43aadd5f80f48baeafe4caaabcf78b01dc919c5c757973"
+SRC_URI += "file://installtests.patch"
 
-PR = "r0"
+SRC_URI[md5sum] = "96d5e3e9edd55f4b016fe3b5dd0a1953"
+SRC_URI[sha256sum] = "e2432dc93e933479132123a1dca382294c30f55bc895bb737b6bdd6f2b8c452e"
-- 
1.7.6.4

[CONSOLIDATED PULL 08/26] distro_tracking: Mark Upgrade Info

[Saul Wold]

Updated the following:
 - libdrm
 - texi2html
 - mc
 - libidn
 - augeas
 - python-pycairo

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../conf/distro/include/distro_tracking_fields.inc |   50 +++++++++++--------
 1 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index fc54e33..3c4eca4 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -269,13 +269,12 @@ RECIPE_MANUAL_CHECK_DATE_pn-libpng = "Nov 14, 2011"
 RECIPE_MAINTAINER_pn-libpng = "Scott Garman <scott.a.garman@intel.com>"
 
 RECIPE_STATUS_pn-libidn = "green"
-RECIPE_DEPENDENCY_CHECK_pn-libidn = "not done"
-RECIPE_LATEST_VERSION_pn-libidn = "1.19"
+RECIPE_LATEST_VERSION_pn-libidn = "1.23"
+RECIPE_LATEST_RELEASE_DATE_pn-libidn = "Nov 25, 2010"
+RECIPE_LAST_UPDATE_pn-libidn = "Dec 18, 2011"
 RECIPE_INTEL_SECTION_pn-libidn = "base libs"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libidn = "3 months"
-RECIPE_LATEST_RELEASE_DATE_pn-libidn = "May 01, 2010"
 RECIPE_COMMENTS_pn-libidn = ""
-RECIPE_LAST_UPDATE_pn-libidn = "Jul 20, 2010"
 RECIPE_MAINTAINER_pn-libidn = "Saul Wold <sgw@linux.intel.com>"
 
 RECIPE_STATUS_pn-glibc = "green"
@@ -601,12 +600,12 @@ DISTRO_PN_ALIAS_pn-libcheck = "Ubuntu=check Fedora=check OpenSuSE=check"
 
 RECIPE_STATUS_pn-augeas = "green"
 RECIPE_DEPENDENCY_CHECK_pn-augeas = "done"
-RECIPE_LAST_UPDATE_pn-augeas = "Aug 20, 2010"
+RECIPE_LATEST_VERSION_pn-augeas = "0.10.0"
+RECIPE_LATEST_RELEASE_DATE_pn-augeas = "Dec 02, 2011"
+RECIPE_LAST_UPDATE_pn-augeas = "Dec 20, 2011"
 RECIPE_MAINTAINER_pn-augeas = "Saul Wold <sgw@linux.intel.com>"
-RECIPE_LATEST_VERSION_pn-augeas = "0.7.3"
 RECIPE_INTEL_SECTION_pn-augeas = "base libs"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-augeas = "1 month"
-RECIPE_LATEST_RELEASE_DATE_pn-augeas = "Aug 01, 2010"
 RECIPE_COMMENTS_pn-augeas = ""
 DISTRO_PN_ALIAS_pn-augeas = "Ubuntu=libaugeas0 Debian=libaugeas0"
 
@@ -1170,6 +1169,7 @@ RECIPE_LATEST_VERSION_pn-libffi  = "3.0.10"
 RECIPE_LATEST_RELEASE_DATE_pn-libffi = "Aug 23, 2011"
 RECIPE_LAST_UPDATE_pn-libffi = "Nov 29, 2011"
 RECIPE_MAINTAINER_pn-libffi  = "Saul Wold <sgw@linux.intel.com>"
+RECIPE_NO_UPDATE_REASON_pn-libffi="3.0.11 is still RC"
 
 RECIPE_STATUS_pn-libgdbus = "green"
 RECIPE_DEPENDENCY_CHECK_pn-libgdbus = "not done"
@@ -3618,23 +3618,23 @@ RECIPE_LAST_UPDATE_pn-xf86-input-vmmouse = "Nov 12, 2010"
 RECIPE_MAINTAINER_pn-xf86-input-vmmouse="Saul Wold <sgw@linux.intel.com>"
 
 RECIPE_STATUS_pn-libdrm="green" # no update needed
-RECIPE_LATEST_VERSION_pn-libdrm="2.4.27"
-RECIPE_LATEST_RELEASE_DATE_pn-libdrm="Oct 29, 2011"
-RECIPE_LAST_UPDATE_pn-libdrm = "Nov 28, 2011"
+RECIPE_LATEST_VERSION_pn-libdrm="2.4.29"
+RECIPE_LATEST_RELEASE_DATE_pn-libdrm="Dec 13, 2011"
+RECIPE_LAST_UPDATE_pn-libdrm = "Dec 18, 2011"
 RECIPE_NO_OF_PATCHES_pn-libdrm="1"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libdrm="1 month"
 RECIPE_INTEL_SECTION_pn-libdrm="graphic core"
 RECIPE_MAINTAINER_pn-libdrm="Saul Wold <sgw@linux.intel.com>"
 
 RECIPE_STATUS_pn-python-pycairo="green" # no upgrade needed
-DISTRO_PN_ALIAS_pn-python-pycairo = "Meego=pycairo Fedora=pycairo Ubuntu=pycairo Debian=pycairo"
-RECIPE_LATEST_VERSION_pn-python-pycairo="1.8.10"
+RECIPE_LATEST_VERSION_pn-python-pycairo="1.10.0"
+RECIPE_LATEST_RELEASE_DATE_pn-python-pycairo="Apr 18, 2011"
+RECIPE_LAST_UPDATE_pn-python-pycairo = "Dec 19, 2011"
 RECIPE_NO_OF_PATCHES_pn-python-pycairo="0"
-RECIPE_LATEST_RELEASE_DATE_pn-python-pycairo="May 20, 2010"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-python-pycairo="9 months"
 RECIPE_INTEL_SECTION_pn-python-pycairo="graphic core"
-RECIPE_LAST_UPDATE_pn-python-pycairo = "Aug 16, 2010"
 RECIPE_MAINTAINER_pn-python-pycairo="Saul Wold <sgw@linux.intel.com>"
+DISTRO_PN_ALIAS_pn-python-pycairo = "Meego=pycairo Fedora=pycairo Ubuntu=pycairo Debian=pycairo"
 
 RECIPE_STATUS_pn-libxfontcache="green" # no update neededd
 RECIPE_LATEST_VERSION_pn-libxfontcache="1.0.5"
@@ -5727,7 +5727,6 @@ RECIPE_STATUS_pn-dtc = "red"
 RECIPE_STATUS_pn-gcalctool = "red"
 RECIPE_STATUS_pn-swabber = "red"
 RECIPE_STATUS_pn-man = "red"
-RECIPE_STATUS_pn-man-pages = "red"
 RECIPE_STATUS_pn-guilt-native = "red"
 RECIPE_STATUS_pn-icon-naming-utils = "red"
 RECIPE_STATUS_pn-groff = "red"
@@ -5828,8 +5827,9 @@ RECIPE_LATEST_VERSION_pn-libgdata = "0.8.0"
 RECIPE_LAST_UPDATE_pn-libgdata = "Dec 29, 2010"
 RECIPE_MAINTAINER_pn-libgdata = "Zhai Edwin <edwin.zhai@intel.com>"
 
+RECIPE_STATUS_pn-man-pages = "red"
 RECIPE_LATEST_VERSION_pn-man-pages = "3.32"
-RECIPE_LATEST_RELEASE_DATE_pn-man-pages = "Sep 02, 2011"
+RECIPE_LATEST_RELEASE_DATE_pn-man-pages = "Dec 03, 2010"
 RECIPE_LAST_UPDATE_pn-man-pages = "Dec 29, 2010"
 RECIPE_MANUAL_CHECK_DATE_pn-man-pages = "Dec 15, 2011"
 RECIPE_COMMENTS_pn-man-pages = "Kernel.org is down"
@@ -5837,8 +5837,8 @@ RECIPE_LATEST_VERSION_pn-sysprof = "6b5b8432711ef5c747f8375073cd9af88922d3c6"
 RECIPE_LATEST_VERSION_pn-table = "d42a44938699ee30a998fc42bc149aebf69389db"
 
 RECIPE_LATEST_VERSION_pn-gst-plugin-bluetooh = "4.96"
-RECIPE_LATEST_RELEASE_DATE_pn-gst-plugin-bluetooh = "Sep 02, 2011"
-RECIPE_LAST_UPDATE_pn-gst-plugin-bluetooh = "Dec 29, 2010"
+RECIPE_LATEST_RELEASE_DATE_pn-gst-plugin-bluetooh = "Jul 31, 2011"
+RECIPE_LAST_UPDATE_pn-gst-plugin-bluetooh = "Aug 12, 2010"
 RECIPE_MANUAL_CHECK_DATE_pn-gst-plugin-bluetooh = "Dec 15, 2011"
 RECIPE_COMMENTS_pn-gst-plugin-bluetooth = "Kernel.org is down"
 
@@ -5853,7 +5853,13 @@ RECIPE_LATEST_RELEASE_DATE_pn-texinfo = "Sep 22, 2008"
 RECIPE_LAST_UPDATE_pn-texinfo = "Sep 16, 2011"
 RECIPE_MANUAL_CHECK_DATE_pn-texinfo = "Nov 22, 2011"
 RECIPE_NO_UPDATE_REASON_pn-texinfo = "Checking script parses directory wrong"
-RECIPE_MAINTAINER_pn-squashfs-tools = "Saul Wold <sgw@linux.intel.com>"
+RECIPE_MAINTAINER_pn-texinfo = "Saul Wold <sgw@linux.intel.com>"
+
+RECIPE_LATEST_VERSION_pn-texi2html = "5.0
+RECIPE_LATEST_RELEASE_DATE_pn-texi2html = "Jul 01, 2010"
+RECIPE_LAST_UPDATE_pn-texi2html = "Dec 18, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-texi2html = "Dec 18, 2011"
+RECIPE_MAINTAINER_pn-texi2html = "Saul Wold <sgw@linux.intel.com>"
 
 RECIPE_LATEST_VERSION_pn-blktrace = "a788dfde86dfaff8f1c277a233f92c1822e06b76"
 RECIPE_LATEST_VERSION_pn-dtc = "37c0b6a0916c31a5eae0a9ddfcc5d0b8fb4569c6"
@@ -5863,9 +5869,11 @@ RECIPE_NO_UPDATE_REASON_pn-bind = "Latest Stable version, newer versions are Alp
 RECIPE_LATEST_VERSION_pn-man = "1.6f"
 
 RECIPE_STATUS_pn-mc = "red"
-RECIPE_LATEST_VERSION_pn-mc = "4.8.0-pre2"
+RECIPE_LATEST_VERSION_pn-mc = "4.8.1"
+RECIPE_LATEST_RELEASE_DATE_pn-mc = 
+RECIPE_LAST_UPDATE_pn-pc = "Dec 19, 2011"
 RECIPE_MAINTAINER_pn-mc = "Saul Wold <sgw@linux.intel.com>"
-RECIPE_NO_UPDATE_REASON_pn-mc = "4.7.5.5 is latest stable version, 4.8.0-pre2 is Alpha/Beta"
+RECIPE_NO_UPDATE_REASON_pn-mc = ""
 
 RECIPE_STATUS_pn-sgml-common = "green"
 RECIPE_DEPENDENCY_CHECK_pn-sgml-common = "not done"
-- 
1.7.6.4

[CONSOLIDATED PULL 09/26] libsync: move to git.yoctoproject.org

[Saul Wold]

From: Paul Eggleton <paul.eggleton@linux.intel.com>

* Repositories on svn.o-hand.com have been converted to Git and are now
  hosted on git.yoctoproject.org.
* Set LICENSE to LGPLv2 as there is an LGPLv2 COPYING file but no notice
  with "or later" in the source code

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 .../opensync/{libsync_svn.bb => libsync_git.bb}    |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)
 rename meta-demoapps/recipes-connectivity/opensync/{libsync_svn.bb => libsync_git.bb} (72%)

diff --git a/meta-demoapps/recipes-connectivity/opensync/libsync_svn.bb b/meta-demoapps/recipes-connectivity/opensync/libsync_git.bb
similarity index 72%
rename from meta-demoapps/recipes-connectivity/opensync/libsync_svn.bb
rename to meta-demoapps/recipes-connectivity/opensync/libsync_git.bb
index 34115ff..4986206 100644
--- a/meta-demoapps/recipes-connectivity/opensync/libsync_svn.bb
+++ b/meta-demoapps/recipes-connectivity/opensync/libsync_git.bb
@@ -1,16 +1,17 @@
 SUMMARY = "GObject-based sync library"
 DESCRIPTION = "LibSync is a GObject-based framework for more convenient use of \
 OpenSync in GLib applications."
-LICENSE = "LGPL"
+LICENSE = "LGPLv2"
 SECTION = "x11"
 DEPENDS = "glib-2.0 gtk+ libglade libopensync avahi"
 RRECOMMENDS_${PN} = "\
 	libopensync-plugin-file \
 	"
-PV = "0.0+svnr${SRCPV}"
-PR = "r1"
+SRCREV = "3f375969d56028505db97cd25ef1679a167cfc59"
+PV = "0.0+gitr${SRCPV}"
+PR = "r2"
 
-SRC_URI = "svn://svn.o-hand.com/repos/sync/trunk;module=sync;proto=http"
+SRC_URI = "git://git.yoctoproject.org/sync;protocol=git"
 
 inherit autotools pkgconfig
 
-- 
1.7.6.4

[CONSOLIDATED PULL 10/26] socat: add the latest stable version 1.7.2.0

[Saul Wold]

From: Dexuan Cui <dexuan.cui@intel.com>

socat is useful for the self-hosted-image work.

The original recipe is from OE:
http://git.openembedded.org/openembedded/tree/recipes/socat/
and I upgraded it to 1.7.2.0.

Thank Koen Kooi <koen@dominion.thruhere.net> for suggesting
how to assign the LICENSE field with a proper value.

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
---
 .../recipes-connectivity/socat/files/compile.patch |  946 ++++++++++++++++++++
 meta/recipes-connectivity/socat/socat_1.7.2.0.bb   |   28 +
 2 files changed, 974 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-connectivity/socat/files/compile.patch
 create mode 100644 meta/recipes-connectivity/socat/socat_1.7.2.0.bb

diff --git a/meta/recipes-connectivity/socat/files/compile.patch b/meta/recipes-connectivity/socat/files/compile.patch
new file mode 100644
index 0000000..4d1a0b6
--- /dev/null
+++ b/meta/recipes-connectivity/socat/files/compile.patch
@@ -0,0 +1,946 @@
+Upstream-Status: Inappropriate [configuration]
+
+The patch is from http://git.openembedded.org/openembedded/tree/recipes/socat/files/compile.patch
+and was rebased to socat-1.7.2.0.
+
+Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
+Fri Dec 16 17:12:17 CST 2011
+
+diff -Nru socat-1.7.2.0.orig/configure.in socat-1.7.2.0/configure.in
+--- socat-1.7.2.0.orig/configure.in	2011-12-04 21:34:16.000000000 +0800
++++ socat-1.7.2.0/configure.in	2011-12-16 17:08:59.698367071 +0800
+@@ -88,7 +88,7 @@
+ 
+ 
+ dnl Check for extra socket library (for Solaris)
+-AC_CHECK_FUNC(hstrerror,  , AC_CHECK_LIB(resolv, hstrerror, [LIBS="$LIBS -lresolv"; AC_DEFINE(HAVE_HSTRERROR)]))
++AC_CHECK_FUNC(hstrerror,  , AC_CHECK_LIB(resolv, hstrerror, [LIBS="$LIBS -lresolv"; AC_DEFINE(HAVE_HSTRERROR, [1], [STRERROR])]))
+ AC_CHECK_FUNC(gethostent, , AC_CHECK_LIB(nsl, gethostent))
+ AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt))
+ 
+@@ -102,7 +102,7 @@
+  [sc_cv_have_prototype_hstrerror=yes]);
+  CFLAGS="$CFLAGS1"])
+ if test $sc_cv_have_prototype_hstrerror = yes; then
+-   AC_DEFINE(HAVE_PROTOTYPE_HSTRERROR)
++   AC_DEFINE(HAVE_PROTOTYPE_HSTRERROR, [1], [Has Strerror])
+ fi
+ AC_MSG_RESULT($sc_cv_have_prototype_hstrerror)
+ 
+@@ -111,83 +111,83 @@
+ AC_ARG_ENABLE(help, [  --disable-help          disable help],
+ 	      [case "$enableval" in
+ 	       no) AC_MSG_RESULT(no);;
+-	       *) AC_DEFINE(WITH_HELP) AC_MSG_RESULT(yes);;
++	       *) AC_DEFINE(WITH_HELP, [1], [With help]) AC_MSG_RESULT(yes);;
+ 	       esac],
+-	       [AC_DEFINE(WITH_HELP) AC_MSG_RESULT(yes)])
++	       [AC_DEFINE(WITH_HELP, [1], [With help]) AC_MSG_RESULT(yes)])
+ 
+ AC_MSG_CHECKING(whether to include STDIO support)
+ AC_ARG_ENABLE(stdio, [  --disable-stdio         disable STDIO support],
+ 	      [case "$enableval" in
+ 	       no) AC_MSG_RESULT(no);;
+-	       *) AC_DEFINE(WITH_STDIO) AC_MSG_RESULT(yes);;
++	       *) AC_DEFINE(WITH_STDIO, [1], [With stdio]) AC_MSG_RESULT(yes);;
+ 	       esac],
+-	       [AC_DEFINE(WITH_STDIO) AC_MSG_RESULT(yes)])
++	       [AC_DEFINE(WITH_STDIO, [1], [With stdio]) AC_MSG_RESULT(yes)])
+ 
+ AC_MSG_CHECKING(whether to include FD-number support)
+ AC_ARG_ENABLE(fdnum, [  --disable-fdnum         disable FD-number support],
+ 	      [case "$enableval" in
+ 	       no) AC_MSG_RESULT(no);;
+-	       *) AC_DEFINE(WITH_FDNUM) AC_MSG_RESULT(yes);;
++	       *) AC_DEFINE(WITH_FDNUM, [1], [With fdnum]) AC_MSG_RESULT(yes);;
+ 	       esac],
+-	       [AC_DEFINE(WITH_FDNUM) AC_MSG_RESULT(yes)])
++	       [AC_DEFINE(WITH_FDNUM, [1], [With fdnum]) AC_MSG_RESULT(yes)])
+ 
+ AC_MSG_CHECKING(whether to include direct file support)
+ AC_ARG_ENABLE(file, [  --disable-file          disable direct file support],
+ 	      [case "$enableval" in
+ 	       no) AC_MSG_RESULT(no);;
+-	       *) AC_DEFINE(WITH_FILE) AC_MSG_RESULT(yes);;
++	       *) AC_DEFINE(WITH_FILE, [1], [With file]) AC_MSG_RESULT(yes);;
+ 	       esac],
+-	       [AC_DEFINE(WITH_FILE) AC_MSG_RESULT(yes)])
++	       [AC_DEFINE(WITH_FILE, [1], [With file]) AC_MSG_RESULT(yes)])
+ 
+ AC_MSG_CHECKING(whether to include direct create support)
+ AC_ARG_ENABLE(creat, [  --disable-creat         disable direct create support],
+ 	      [case "$enableval" in
+ 	       no) AC_MSG_RESULT(no);;
+-	       *) AC_DEFINE(WITH_CREAT) AC_MSG_RESULT(yes);;
++	       *) AC_DEFINE(WITH_CREAT, [1], [With creat]) AC_MSG_RESULT(yes);;
+ 	       esac],
+-	       [AC_DEFINE(WITH_CREAT) AC_MSG_RESULT(yes)])
++	       [AC_DEFINE(WITH_CREAT, [1], [With creat]) AC_MSG_RESULT(yes)])
+ 
+ AC_MSG_CHECKING(whether to include gopen support)
+ AC_ARG_ENABLE(gopen, [  --disable-gopen         disable open for UNIX socket support],
+ 	      [case "$enableval" in
+ 	       no) AC_MSG_RESULT(no);;
+-	       *) AC_DEFINE(WITH_GOPEN) AC_MSG_RESULT(yes);;
++	       *) AC_DEFINE(WITH_GOPEN, [1], [With gopen]) AC_MSG_RESULT(yes);;
+ 	       esac],
+-	       [AC_DEFINE(WITH_GOPEN) AC_MSG_RESULT(yes)])
++	       [AC_DEFINE(WITH_GOPEN, [1], [With gopen]) AC_MSG_RESULT(yes)])
+ 
+ AC_MSG_CHECKING(whether to include explicit pipe support)
+ AC_ARG_ENABLE(pipe, [  --disable-pipe          disable pipe support],
+ 	      [case "$enableval" in
+ 	       no) AC_MSG_RESULT(no);;
+-	       *) AC_DEFINE(WITH_PIPE) AC_MSG_RESULT(yes);;
++	       *) AC_DEFINE(WITH_PIPE, [1], [With pipe]) AC_MSG_RESULT(yes);;
+ 	       esac],
+-	       [AC_DEFINE(WITH_PIPE) AC_MSG_RESULT(yes)])
++	       [AC_DEFINE(WITH_PIPE, [1], [With pipe]) AC_MSG_RESULT(yes)])
+ 
+ AC_MSG_CHECKING(whether to include explicit termios support)
+ AC_ARG_ENABLE(termios, [  --disable-termios       disable termios support],
+ 	      [case "$enableval" in
+ 	       no) AC_MSG_RESULT(no);;
+-	       *) AC_DEFINE(WITH_TERMIOS) AC_MSG_RESULT(yes);;
++	       *) AC_DEFINE(WITH_TERMIOS, [1], [With termios]) AC_MSG_RESULT(yes);;
+ 	       esac],
+-	       [AC_DEFINE(WITH_TERMIOS) AC_MSG_RESULT(yes)])
++	       [AC_DEFINE(WITH_TERMIOS, [1], [With termios]) AC_MSG_RESULT(yes)])
+ 
+ AC_MSG_CHECKING(whether to include UNIX socket support)
+ AC_ARG_ENABLE(unix, [  --disable-unix          disable UNIX domain socket support],
+ 	      [case "$enableval" in
+ 	       no) AC_MSG_RESULT(no);;
+-	       *) AC_DEFINE(WITH_UNIX) AC_MSG_RESULT(yes);;
++	       *) AC_DEFINE(WITH_UNIX, [1], [With unix]) AC_MSG_RESULT(yes);;
+ 	       esac],
+-	       [AC_DEFINE(WITH_UNIX) AC_MSG_RESULT(yes)])
++	       [AC_DEFINE(WITH_UNIX, [1], [With unix]) AC_MSG_RESULT(yes)])
+ 
+ AC_MSG_CHECKING(whether to include abstract UNIX socket support)
+ AC_ARG_ENABLE(abstract_unixsocket, [  --disable-abstract-unixsocket   disable abstract UNIX domain socket support],
+ 	      [case "$enableval" in
+ 	       no) AC_MSG_RESULT(no);;
+-	       *) AC_DEFINE(WITH_ABSTRACT_UNIXSOCKET) AC_MSG_RESULT(yes);;
++	       *) AC_DEFINE(WITH_ABSTRACT_UNIXSOCKET, [1], [With abstract unix socket]) AC_MSG_RESULT(yes);;
+ 	       esac],
+ 	      [ case "`uname`" in
+ 	        Linux)
+-		    AC_DEFINE(WITH_ABSTRACT_UNIXSOCKET) AC_MSG_RESULT(yes);;
++		    AC_DEFINE(WITH_ABSTRACT_UNIXSOCKET, [1], [With abstract unix socket]) AC_MSG_RESULT(yes);;
+ 		*)
+ 		    AC_MSG_RESULT(no);;
+ 		esac])
+@@ -196,9 +196,9 @@
+ AC_ARG_ENABLE(ip4, [  --disable-ip4           disable IPv4 support],
+ 	      [case "$enableval" in
+ 	       no) AC_MSG_RESULT(no);;
+-	       *) AC_DEFINE(WITH_IP4) AC_MSG_RESULT(yes);;
++	       *) AC_DEFINE(WITH_IP4, [1], [with ipv4]) AC_MSG_RESULT(yes);;
+ 	       esac],
+-	       [AC_DEFINE(WITH_IP4) AC_MSG_RESULT(yes)])
++	       [AC_DEFINE(WITH_IP4, [1], [with ipv4]) AC_MSG_RESULT(yes)])
+ 
+ AC_MSG_CHECKING(whether to include IPv6 support)
+ AC_ARG_ENABLE(ip6, [  --disable-ip6           disable IPv6 support],
+@@ -209,7 +209,7 @@
+ 	      [ AC_MSG_RESULT(yes);  WITH_IP6=1 ])
+ if test "$WITH_IP6"; then
+   AC_CHECK_HEADERS([netinet/ip6.h],
+-    [AC_DEFINE(HAVE_NETINET_IP6_H) AC_DEFINE(WITH_IP6)],
++    [AC_DEFINE(HAVE_NETINET_IP6_H) AC_DEFINE(WITH_IP6, [1], [with ipv6])],
+     [AC_MSG_WARN([include file netinet/ip6.h not found, disabling IP6])],
+     [AC_INCLUDES_DEFAULT
+      #ifdef HAVE_NETINET_IN_H
+@@ -242,17 +242,17 @@
+ AC_ARG_ENABLE(rawip, [  --disable-rawip         disable raw IP support],
+ 	      [case "$enableval" in
+ 	       no) AC_MSG_RESULT(no);;
+-	       *) AC_DEFINE(WITH_RAWIP) AC_MSG_RESULT(yes);;
++	       *) AC_DEFINE(WITH_RAWIP, [1], [With reawip]) AC_MSG_RESULT(yes);;
+ 	       esac],
+-	       [AC_DEFINE(WITH_RAWIP) AC_MSG_RESULT(yes)])
++	       [AC_DEFINE(WITH_RAWIP, [1], [With rawip]) AC_MSG_RESULT(yes)])
+ 
+ AC_MSG_CHECKING(whether to include generic socket support)
+ AC_ARG_ENABLE(rawsocket, [  --disable-genericsocket disable generic socket support],
+ 	      [case "$enableval" in
+ 	       no) AC_MSG_RESULT(no);;
+-	       *) AC_DEFINE(WITH_GENERICSOCKET) AC_MSG_RESULT(yes);;
++	       *) AC_DEFINE(WITH_GENERICSOCKET, [1], [With genericsocket]) AC_MSG_RESULT(yes);;
+ 	       esac],
+-	       [AC_DEFINE(WITH_GENERICSOCKET) AC_MSG_RESULT(yes)])
++	       [AC_DEFINE(WITH_GENERICSOCKET, [1], [With genericsocket]) AC_MSG_RESULT(yes)])
+ AC_MSG_CHECKING(whether to include raw network interface support)
+ AC_ARG_ENABLE(interface, [  --disable-interface  disable network interface support],
+ 	      [case "$enableval" in
+@@ -262,35 +262,35 @@
+ 	       [AC_MSG_RESULT(yes);  WITH_INTERFACE=1 ])
+ if test "$WITH_INTERFACE"; then
+   AC_CHECK_HEADER(netpacket/packet.h,
+-    AC_DEFINE(HAVE_NETPACKET_PACKET_H),
++    AC_DEFINE(HAVE_NETPACKET_PACKET_H, [1], [Has packet.h]),
+     [WITH_INTERFACE=;
+      AC_MSG_WARN([include file netpacket/packet.h not found, disabling interface])])
+ fi
+ if test "$WITH_INTERFACE"; then
+   AC_CHECK_HEADER(netinet/if_ether.h,
+-    AC_DEFINE(HAVE_NETINET_IF_ETHER_H),
++    AC_DEFINE(HAVE_NETINET_IF_ETHER_H, [1], [Has if_ether.h]),
+     [WITH_INTERFACE=;
+      AC_MSG_WARN([include file netinet/if_ether.h not found, disabling interface])])
+ fi
+ if test "$WITH_INTERFACE"; then
+-   AC_DEFINE(WITH_INTERFACE)
++   AC_DEFINE(WITH_INTERFACE, [1], [Wither interface])
+ fi
+ 
+ AC_MSG_CHECKING(whether to include TCP support)
+ AC_ARG_ENABLE(tcp, [  --disable-tcp           disable TCP support],
+ 	      [case "$enableval" in
+ 	       no) AC_MSG_RESULT(no);;
+-	       *) AC_DEFINE(WITH_TCP) AC_MSG_RESULT(yes);;
++	       *) AC_DEFINE(WITH_TCP, [1], [With TCP]) AC_MSG_RESULT(yes);;
+ 	       esac],
+-	       [AC_DEFINE(WITH_TCP) AC_MSG_RESULT(yes)])
++	       [AC_DEFINE(WITH_TCP, [1], [With TCP]) AC_MSG_RESULT(yes)])
+ 
+ AC_MSG_CHECKING(whether to include UDP support)
+ AC_ARG_ENABLE(udp, [  --disable-udp           disable UDP support],
+ 	      [case "$enableval" in
+ 	       no) AC_MSG_RESULT(no);;
+-	       *) AC_DEFINE(WITH_UDP) AC_MSG_RESULT(yes);;
++	       *) AC_DEFINE(WITH_UDP, [1], [With UDP]) AC_MSG_RESULT(yes);;
+ 	       esac],
+-	       [AC_DEFINE(WITH_UDP) AC_MSG_RESULT(yes)])
++	       [AC_DEFINE(WITH_UDP, [1], [With UDP]) AC_MSG_RESULT(yes)])
+ 
+ AC_MSG_CHECKING(whether to include SCTP support)
+ AC_ARG_ENABLE(sctp, [  --disable-sctp           disable SCTP support],
+@@ -310,7 +310,7 @@
+ [sc_cv_define_ipproto_sctp=no])])
+ AC_MSG_RESULT($sc_cv_define_ipproto_sctp)
+ if test $sc_cv_define_ipproto_sctp = yes; then
+-   AC_DEFINE(WITH_SCTP)
++   AC_DEFINE(WITH_SCTP, [1], [With SCTP])
+ else
+    AC_MSG_WARN([IPPROTO_SCTP undefined, disabling SCTP support])
+ fi
+@@ -320,65 +320,65 @@
+ AC_ARG_ENABLE(listen, [  --disable-listen        disable listen support],
+ 	      [case "$enableval" in
+ 	       no) AC_MSG_RESULT(no);;
+-	       *) AC_DEFINE(WITH_LISTEN) AC_MSG_RESULT(yes);;
++	       *) AC_DEFINE(WITH_LISTEN, [1], [With listen]) AC_MSG_RESULT(yes);;
+ 	       esac],
+-	       [AC_DEFINE(WITH_LISTEN) AC_MSG_RESULT(yes)])
++	       [AC_DEFINE(WITH_LISTEN, [1], [With listen]) AC_MSG_RESULT(yes)])
+ 
+ AC_MSG_CHECKING(whether to include socks4 support)
+ AC_ARG_ENABLE(socks4, [  --disable-socks4        disable socks4 support],
+ 	      [case "$enableval" in
+ 	       no) AC_MSG_RESULT(no);;
+-	       *) AC_DEFINE(WITH_SOCKS4) AC_MSG_RESULT(yes);;
++	       *) AC_DEFINE(WITH_SOCKS4, [1], [With socks]) AC_MSG_RESULT(yes);;
+ 	       esac],
+-	       [AC_DEFINE(WITH_SOCKS4) AC_MSG_RESULT(yes)])
++	       [AC_DEFINE(WITH_SOCKS4, [1], [With socks]) AC_MSG_RESULT(yes)])
+ 
+ AC_MSG_CHECKING(whether to include socks4a support)
+ AC_ARG_ENABLE(socks4a, [  --disable-socks4a       disable socks4a support],
+ 	      [case "$enableval" in
+ 	       no) AC_MSG_RESULT(no);;
+-	       *) AC_DEFINE(WITH_SOCKS4A) AC_MSG_RESULT(yes);;
++	       *) AC_DEFINE(WITH_SOCKS4A, [1], [With socks4a]) AC_MSG_RESULT(yes);;
+ 	       esac],
+-	       [AC_DEFINE(WITH_SOCKS4A) AC_MSG_RESULT(yes)])
++	       [AC_DEFINE(WITH_SOCKS4A, [1], [With socks4a]) AC_MSG_RESULT(yes)])
+ 
+ AC_MSG_CHECKING(whether to include proxy connect support)
+ AC_ARG_ENABLE(proxy, [  --disable-proxy         disable proxy connect support],
+ 	      [case "$enableval" in
+ 	       no) AC_MSG_RESULT(no);;
+-	       *) AC_DEFINE(WITH_PROXY) AC_MSG_RESULT(yes);;
++	       *) AC_DEFINE(WITH_PROXY, [1], [With proxy]) AC_MSG_RESULT(yes);;
+ 	       esac],
+-	       [AC_DEFINE(WITH_PROXY) AC_MSG_RESULT(yes)])
++	       [AC_DEFINE(WITH_PROXY, [1], [With proxy]) AC_MSG_RESULT(yes)])
+ 
+ AC_MSG_CHECKING(whether to include exec support)
+ AC_ARG_ENABLE(exec, [  --disable-exec          disable exec support],
+ 	      [case "$enableval" in
+ 	       no) AC_MSG_RESULT(no);;
+-	       *) AC_DEFINE(WITH_EXEC) AC_MSG_RESULT(yes);;
++	       *) AC_DEFINE(WITH_EXEC, [1], [With exec]) AC_MSG_RESULT(yes);;
+ 	       esac],
+-	       [AC_DEFINE(WITH_EXEC) AC_MSG_RESULT(yes)])
++	       [AC_DEFINE(WITH_EXEC, [1], [With exec]) AC_MSG_RESULT(yes)])
+ 
+ AC_MSG_CHECKING([whether to include system (shell) support])
+ AC_ARG_ENABLE(system, [  --disable-system        disable system (shell) support],
+ 	      [case "$enableval" in
+ 	       no) AC_MSG_RESULT(no);;
+-	       *) AC_DEFINE(WITH_SYSTEM) AC_MSG_RESULT(yes);;
++	       *) AC_DEFINE(WITH_SYSTEM, [1], [With system]) AC_MSG_RESULT(yes);;
+ 	       esac],
+-	       [AC_DEFINE(WITH_SYSTEM) AC_MSG_RESULT(yes)])
++	       [AC_DEFINE(WITH_SYSTEM, [1], [With system]) AC_MSG_RESULT(yes)])
+ 
+ AC_MSG_CHECKING(whether to include pty address support)
+ AC_ARG_ENABLE(pty, [  --disable-pty           disable pty support],
+ 	      [case "$enableval" in
+ 	       no) AC_MSG_RESULT(no);;
+-	       *) AC_DEFINE(WITH_PTY) AC_MSG_RESULT(yes);;
++	       *) AC_DEFINE(WITH_PTY, [1], [With pty]) AC_MSG_RESULT(yes);;
+ 	       esac],
+-	       [AC_DEFINE(WITH_PTY) AC_MSG_RESULT(yes)])
++	       [AC_DEFINE(WITH_PTY, [1], [With pty]) AC_MSG_RESULT(yes)])
+ 
+ AC_MSG_CHECKING(whether to include ext2 fs attributes support)
+ AC_ARG_ENABLE(ext2, [  --disable-ext2          disable ext2 fs attributes support],
+ 	      [case "$enableval" in
+ 	       no) AC_MSG_RESULT(no);;
+-	       *) AC_DEFINE(WITH_EXT2) AC_MSG_RESULT(yes);;
++	       *) AC_DEFINE(WITH_EXT2, [1], [With ext2]) AC_MSG_RESULT(yes);;
+ 	       esac],
+-	       [AC_DEFINE(WITH_EXT2) AC_MSG_RESULT(yes)])
++	       [AC_DEFINE(WITH_EXT2, [1], [With ext2]) AC_MSG_RESULT(yes)])
+ 
+ AC_MSG_CHECKING(whether to include readline support)
+ AC_ARG_ENABLE(readline, [  --disable-readline      disable readline support],
+@@ -423,10 +423,10 @@
+     
+     if test -n "$sc_usable_readline_found"; then
+       AC_MSG_RESULT(yes)
+-      AC_DEFINE(HAVE_READLINE_READLINE_H,1)
+-      AC_DEFINE(HAVE_READLINE_HISTORY_H,1)
+-      AC_DEFINE(HAVE_LIBREADLINE,1)
+-      AC_DEFINE(WITH_READLINE,1)
++      AC_DEFINE(HAVE_READLINE_READLINE_H,1, [have readline])
++      AC_DEFINE(HAVE_READLINE_HISTORY_H,1, [have history])
++      AC_DEFINE(HAVE_LIBREADLINE,1, [have readline])
++      AC_DEFINE(WITH_READLINE,1, [with readline])
+       break
+     else
+       AC_MSG_RESULT(no)
+@@ -469,7 +469,7 @@
+       done])
+   ])
+   if test "$sc_cv_have_openssl_ssl_h" = "yes"; then
+-    AC_DEFINE(HAVE_OPENSSL_SSL_H)
++    AC_DEFINE(HAVE_OPENSSL_SSL_H, [1], [have openssl.h])
+   fi
+   AC_MSG_NOTICE(checked for openssl/ssl.h... $sc_cv_have_openssl_ssl_h)
+ fi	# end checking for openssl/ssl.h
+@@ -501,7 +501,7 @@
+     ]
+   )
+   if test "$sc_cv_have_libssl" = 'yes'; then
+-    AC_DEFINE(HAVE_LIBSSL)
++    AC_DEFINE(HAVE_LIBSSL, [1], [libssl])
+   fi
+   AC_MSG_RESULT($sc_cv_have_libssl)
+ fi
+@@ -529,7 +529,7 @@
+ #fi
+ if test -n "$WITH_OPENSSL"; then
+   if test "$sc_cv_have_openssl_ssl_h" = "yes" -a "$sc_cv_have_libssl" = "yes"; then
+-    AC_DEFINE(WITH_OPENSSL)
++    AC_DEFINE(WITH_OPENSSL, [1], [With openssl])
+   else
+     AC_MSG_WARN([not all components of OpenSSL found, disabling it]);
+   fi
+@@ -577,7 +577,7 @@
+     )]
+   )
+   if test "$sv_cv_have_openssl_fips_h" = "yes"; then
+-    AC_DEFINE(HAVE_OPENSSL_FIPS_H)
++    AC_DEFINE(HAVE_OPENSSL_FIPS_H, [1], [OpenSSL fips.h])
+   fi
+   AC_MSG_NOTICE(checked for openssl/fips.h... $sc_cv_have_openssl_ssl_h)
+ fi
+@@ -608,15 +608,15 @@
+     ]
+   )
+   if test "$sc_cv_have_libcrypto" = 'yes'; then
+-    AC_DEFINE(HAVE_LIBCRYPTO)
++    AC_DEFINE(HAVE_LIBCRYPTO, [1], [libcrypto])
+   fi
+   AC_MSG_RESULT($sc_cv_have_libcrypto)
+ fi
+ 
+ if test -n "$WITH_FIPS"; then
+   if test "$sc_cv_have_openssl_fips_h" = 'yes' -a "$sc_cv_have_libcrypto" = 'yes'; then
+-    AC_DEFINE(WITH_FIPS)
+-    AC_DEFINE(OPENSSL_FIPS)
++    AC_DEFINE(WITH_FIPS, [1], [With fips])
++    AC_DEFINE(OPENSSL_FIPS, [1], [openssl fips])
+   else
+     AC_MSG_WARN([not all components of OpenSSL FIPS found, disabling it]);
+   fi
+@@ -637,17 +637,17 @@
+ fi
+ #
+ if test -n "$WITH_TUN"; then
+-  AC_DEFINE(WITH_TUN)
++  AC_DEFINE(WITH_TUN, [1], [with tun])
+ fi
+ 
+ AC_MSG_CHECKING(whether to include system call tracing)
+ AC_ARG_ENABLE(sycls, [  --disable-sycls         disable system call tracing],
+ 	      [case "$enableval" in
+ 	       no) SYCLS=""; SSLCLS=""; AC_MSG_RESULT(no);;
+-	       *) AC_DEFINE(WITH_SYCLS)
++	       *) AC_DEFINE(WITH_SYCLS, [1], [syscls])
+ 		 SYCLS="sycls.c"; SSLCLS="sslcls.c"; AC_MSG_RESULT(yes);;
+ 	       esac],
+-	       [AC_DEFINE(WITH_SYCLS)
++	       [AC_DEFINE(WITH_SYCLS, [1], [syscls])
+ 		 SYCLS="sycls.c"; SSLCLS="sslcls.c"; AC_MSG_RESULT(yes)])
+ AC_SUBST(SYCLS)
+ AC_SUBST(SSLCLS)
+@@ -656,31 +656,31 @@
+ AC_ARG_ENABLE(filan, [  --disable-filan         disable file descriptor analyzer],
+ 	      [case "$enableval" in
+ 	       no) FILAN=""; AC_MSG_RESULT(no);;
+-	       *) AC_DEFINE(WITH_FILAN) FILAN="filan.c"; AC_MSG_RESULT(yes);;
++	       *) AC_DEFINE(WITH_FILAN, [1], [filan]) FILAN="filan.c"; AC_MSG_RESULT(yes);;
+ 	       esac],
+-	       [AC_DEFINE(WITH_FILAN) FILAN="filan.c"; AC_MSG_RESULT(yes)])
++	       [AC_DEFINE(WITH_FILAN, [1], [filan]) FILAN="filan.c"; AC_MSG_RESULT(yes)])
+ AC_SUBST(FILAN)
+ 
+ AC_MSG_CHECKING(whether to include retry support)
+ AC_ARG_ENABLE(retry, [  --disable-retry         disable retry support],
+ 	      [case "$enableval" in
+ 	       no) AC_MSG_RESULT(no);;
+-	       *) AC_DEFINE(WITH_RETRY) AC_MSG_RESULT(yes);;
++	       *) AC_DEFINE(WITH_RETRY, [1], [retry]) AC_MSG_RESULT(yes);;
+ 	       esac],
+-	       [AC_DEFINE(WITH_RETRY) AC_MSG_RESULT(yes)])
++	       [AC_DEFINE(WITH_RETRY, [1], [retry]) AC_MSG_RESULT(yes)])
+ 
+ AC_MSG_CHECKING(included message level)
+ AC_ARG_ENABLE(msglevel, [  --enable-msglevel=N     set max verbosity to debug,info,notice,warn,error,fatal],
+ 	      [case "$enableval" in
+-	       debug) AC_DEFINE(WITH_MSGLEVEL,0) AC_MSG_RESULT(debug);;
+-	       info)  AC_DEFINE(WITH_MSGLEVEL,1) AC_MSG_RESULT(info);;
+-	       notice) AC_DEFINE(WITH_MSGLEVEL,2) AC_MSG_RESULT(notice);;
+-	       warn) AC_DEFINE(WITH_MSGLEVEL,3) AC_MSG_RESULT(warn);;
+-	       error) AC_DEFINE(WITH_MSGLEVEL,4) AC_MSG_RESULT(error);;
+-	       fatal) AC_DEFINE(WITH_MSGLEVEL,5) AC_MSG_RESULT(fatal);;
+-	       *) AC_DEFINE(WITH_MSGLEVEL,0) AC_MSG_RESULT(debug);;
++	       debug) AC_DEFINE(WITH_MSGLEVEL,0, [msglevel]) AC_MSG_RESULT(debug);;
++	       info)  AC_DEFINE(WITH_MSGLEVEL,1, [msglevel]) AC_MSG_RESULT(info);;
++	       notice) AC_DEFINE(WITH_MSGLEVEL,2, [msglevel]) AC_MSG_RESULT(notice);;
++	       warn) AC_DEFINE(WITH_MSGLEVEL,3, [msglevel]) AC_MSG_RESULT(warn);;
++	       error) AC_DEFINE(WITH_MSGLEVEL,4, [msglevel]) AC_MSG_RESULT(error);;
++	       fatal) AC_DEFINE(WITH_MSGLEVEL,5, [msglevel]) AC_MSG_RESULT(fatal);;
++	       *) AC_DEFINE(WITH_MSGLEVEL,0, [msglevel]) AC_MSG_RESULT(debug);;
+ 	       esac],
+-	       [AC_DEFINE(WITH_MSGLEVEL,0) AC_MSG_RESULT(debug)])
++	       [AC_DEFINE(WITH_MSGLEVEL,0, [msglevel]) AC_MSG_RESULT(debug)])
+ 
+ #AC_SUBST(V_INCL)
+ 
+@@ -697,7 +697,7 @@
+ AC_HEADER_TIME
+ 
+ dnl Check for extra realtime library (for Solaris)
+-AC_CHECK_FUNC(nanosleep, AC_DEFINE(HAVE_NANOSLEEP), AC_CHECK_LIB(rt, nanosleep, [LIBS="-lrt $LIBS"; AC_DEFINE(HAVE_NANOSLEEP)]))
++AC_CHECK_FUNC(nanosleep, AC_DEFINE(HAVE_NANOSLEEP, [1], [have nanosleep]), AC_CHECK_LIB(rt, nanosleep, [LIBS="-lrt $LIBS"; AC_DEFINE(HAVE_NANOSLEEP, [1], [have nanosleep])]))
+ #AC_CHECK_FUNC(nanosleep, , AC_CHECK_LIB(rt, nanosleep))
+ 
+ dnl Checks for library functions.
+@@ -719,7 +719,7 @@
+ [sc_cv_type_longlong=yes],
+ [sc_cv_type_longlong=no])])
+ if test $sc_cv_type_longlong = yes; then
+-   AC_DEFINE(HAVE_TYPE_LONGLONG)
++   AC_DEFINE(HAVE_TYPE_LONGLONG, [1], [have type long long])
+ fi
+ AC_MSG_RESULT($sc_cv_type_longlong)
+ 
+@@ -735,7 +735,7 @@
+ [sc_cv_type_socklen=yes],
+ [sc_cv_type_socklen=no])])
+ if test $sc_cv_type_socklen = yes; then
+-   AC_DEFINE(HAVE_TYPE_SOCKLEN)
++   AC_DEFINE(HAVE_TYPE_SOCKLEN, [1], [Has Socklen])
+ fi
+ AC_MSG_RESULT($sc_cv_type_socklen)
+ 
+@@ -745,7 +745,7 @@
+ [sc_cv_type_stat64=yes],
+ [sc_cv_type_stat64=no])])
+ if test $sc_cv_type_stat64 = yes; then
+-   AC_DEFINE(HAVE_TYPE_STAT64)
++   AC_DEFINE(HAVE_TYPE_STAT64, [1], [Has stat64])
+ fi
+ AC_MSG_RESULT($sc_cv_type_stat64)
+ 
+@@ -755,7 +755,7 @@
+ [sc_cv_type_off64=yes],
+ [sc_cv_type_off64=no])])
+ if test $sc_cv_type_off64 = yes; then
+-   AC_DEFINE(HAVE_TYPE_OFF64)
++   AC_DEFINE(HAVE_TYPE_OFF64, [1], [have off64])
+ fi
+ AC_MSG_RESULT($sc_cv_type_off64)
+ 
+@@ -765,7 +765,7 @@
+ [sc_cv_type_sighandler=yes],
+ [sc_cv_type_sighandler=no])])
+ if test $sc_cv_type_sighandler = yes; then
+-   AC_DEFINE(HAVE_TYPE_SIGHANDLER)
++   AC_DEFINE(HAVE_TYPE_SIGHANDLER, [1], [have type sighandler])
+ fi
+ AC_MSG_RESULT($sc_cv_type_socklen)
+ 
+@@ -783,7 +783,7 @@
+ [sc_cv_type_uint8=yes],
+ [sc_cv_type_uint8=no])])
+ if test $sc_cv_type_uint8 = yes; then
+-   AC_DEFINE(HAVE_TYPE_UINT8)
++   AC_DEFINE(HAVE_TYPE_UINT8, [1], [have uint8])
+ fi
+ AC_MSG_RESULT($sc_cv_type_uint8)
+ 
+@@ -801,7 +801,7 @@
+ [sc_cv_type_uint16=yes],
+ [sc_cv_type_uint16=no])])
+ if test $sc_cv_type_uint16 = yes; then
+-   AC_DEFINE(HAVE_TYPE_UINT16)
++   AC_DEFINE(HAVE_TYPE_UINT16, [1], [have uint16t])
+ fi
+ AC_MSG_RESULT($sc_cv_type_uint16)
+ 
+@@ -819,7 +819,7 @@
+ [sc_cv_type_uint32=yes],
+ [sc_cv_type_uint32=no])])
+ if test $sc_cv_type_uint32 = yes; then
+-   AC_DEFINE(HAVE_TYPE_UINT32)
++   AC_DEFINE(HAVE_TYPE_UINT32, [1], [have uint32])
+ fi
+ AC_MSG_RESULT($sc_cv_type_uint32)
+ 
+@@ -837,7 +837,7 @@
+ [sc_cv_type_uint64=yes],
+ [sc_cv_type_uint64=no])])
+ if test $sc_cv_type_uint64 = yes; then
+-   AC_DEFINE(HAVE_TYPE_UINT64)
++   AC_DEFINE(HAVE_TYPE_UINT64, [1], [have uint64] )
+ fi
+ AC_MSG_RESULT($sc_cv_type_uint64)
+ 
+@@ -859,7 +859,7 @@
+ #include <sys/select.h>
+ #endif],
+ [fd_set s; s.fds_bits[0]=0;],
+-[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_FDS_BITS)],
++[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_FDS_BITS, [1], [have fds bits])],
+ [AC_MSG_RESULT(no);])
+ 
+ AC_MSG_CHECKING(for sa_family_t)
+@@ -870,7 +870,7 @@
+ [sc_cv_type_sa_family_t=yes],
+ [sc_cv_type_sa_family_t=no])])
+ if test $sc_cv_type_sa_family_t = yes; then
+-   AC_DEFINE(HAVE_TYPE_SA_FAMILY_T)
++   AC_DEFINE(HAVE_TYPE_SA_FAMILY_T, [1], [have sa family_t type])
+ fi
+ AC_MSG_RESULT($sc_cv_type_sa_family_t)
+ 
+@@ -880,7 +880,7 @@
+ [sc_cv_struct_sigaction_sa_sigaction=yes],
+ [sc_cv_struct_sigaction_sa_sigaction=no])])
+ if test $sc_cv_struct_sigaction_sa_sigaction = yes; then
+-   AC_DEFINE(HAVE_STRUCT_SIGACTION_SA_SIGACTION)
++   AC_DEFINE(HAVE_STRUCT_SIGACTION_SA_SIGACTION, [1], [sigaction])
+ fi
+ AC_MSG_RESULT($sc_cv_struct_sigaction_sa_sigaction)
+ 
+@@ -888,11 +888,11 @@
+ AC_MSG_CHECKING(for termios.c_ispeed)
+ AC_CACHE_VAL(sc_cv_termios_ispeed,
+ [AC_TRY_COMPILE([#include <termios.h>],
+-[struct termios t; t.c_ispeed=0;],
++[struct termios t; t.c_ispeed=ISPEED_OFFSET; t.c_ospeed=OSPEED_OFFSET;],
+ [sc_cv_termios_ispeed=yes],
+ [sc_cv_termios_ispeed=no])])
+ if test $sc_cv_termios_ispeed = yes; then
+-   AC_DEFINE(HAVE_TERMIOS_ISPEED)
++   AC_DEFINE(HAVE_TERMIOS_ISPEED, [1], [have ispeed])
+ fi
+ AC_MSG_RESULT($sc_cv_termios_ispeed)
+ 
+@@ -923,7 +923,7 @@
+ LIBS="$LIBS1"
+ AC_MSG_RESULT($ac_cv_ispeed_offset)
+  if test $ac_cv_ispeed_offset -ge 0; then
+-   AC_DEFINE_UNQUOTED(ISPEED_OFFSET, $ac_cv_ispeed_offset)
++   AC_DEFINE_UNQUOTED(ISPEED_OFFSET, $ac_cv_ispeed_offset, [have ispeed])
+  fi
+ fi
+ 
+@@ -942,7 +942,7 @@
+  )]
+ )])
+ if test $ac_cv_svid3 = yes; then
+-  AC_DEFINE(_SVID3)
++  AC_DEFINE(_SVID3, [1], [svid3])
+ fi
+ AC_MSG_RESULT($ac_cv_svid3)
+ 
+@@ -957,7 +957,7 @@
+ [sc_cv_struct_timespec=yes],
+ [sc_cv_struct_timespec=no])])
+ if test $sc_cv_struct_timespec = yes; then
+-   AC_DEFINE(HAVE_STRUCT_TIMESPEC)
++   AC_DEFINE(HAVE_STRUCT_TIMESPEC, [1], [struct timespec])
+ fi
+ AC_MSG_RESULT($sc_cv_struct_timespec)
+ 
+@@ -970,7 +970,7 @@
+ [sc_cv_struct_linger=yes],
+ [sc_cv_struct_linger=no])])
+ if test $sc_cv_struct_linger = yes; then
+-   AC_DEFINE(HAVE_STRUCT_LINGER)
++   AC_DEFINE(HAVE_STRUCT_LINGER, [1], [struct linger])
+ fi
+ AC_MSG_RESULT($sc_cv_struct_linger)
+ 
+@@ -984,7 +984,7 @@
+ [sc_cv_struct_ip_mreq=yes],
+ [sc_cv_struct_ip_mreq=no])])
+ if test $sc_cv_struct_ip_mreq = yes; then
+-   AC_DEFINE(HAVE_STRUCT_IP_MREQ)
++   AC_DEFINE(HAVE_STRUCT_IP_MREQ, [1], [have struct ip mreq])
+ fi
+ AC_MSG_RESULT($sc_cv_struct_ip_mreq)
+ 
+@@ -997,7 +997,7 @@
+ [sc_cv_struct_ip_mreqn=yes],
+ [sc_cv_struct_ip_mreqn=no])])
+ if test $sc_cv_struct_ip_mreqn = yes; then
+-   AC_DEFINE(HAVE_STRUCT_IP_MREQN)
++   AC_DEFINE(HAVE_STRUCT_IP_MREQN, [1], [have struct ip mreqn])
+ fi
+ AC_MSG_RESULT($sc_cv_struct_ip_mreqn)
+ 
+@@ -1010,7 +1010,7 @@
+ [sc_cv_struct_ipv6_mreq=yes],
+ [sc_cv_struct_ipv6_mreq=no])])
+ if test $sc_cv_struct_ipv6_mreq = yes; then
+-   AC_DEFINE(HAVE_STRUCT_IPV6_MREQ)
++   AC_DEFINE(HAVE_STRUCT_IPV6_MREQ, [1], [have struct ipv5 mreq])
+ fi
+ AC_MSG_RESULT($sc_cv_struct_ipv6_mreq)
+ 
+@@ -1024,7 +1024,7 @@
+ [sc_cv_struct_ifreq=yes],
+ [sc_cv_struct_ifreq=no])])
+ if test $sc_cv_struct_ifreq = yes; then
+-   AC_DEFINE(HAVE_STRUCT_IFREQ)
++   AC_DEFINE(HAVE_STRUCT_IFREQ, [1], [have struct ifreq])
+ fi
+ AC_MSG_RESULT($sc_cv_struct_ifreq)
+ 
+@@ -1039,7 +1039,7 @@
+ [sc_cv_struct_ifreq_ifr_index=yes],
+ [sc_cv_struct_ifreq_ifr_index=no])])
+ if test $sc_cv_struct_ifreq_ifr_index = yes; then
+-   AC_DEFINE(HAVE_STRUCT_IFREQ_IFR_INDEX)
++   AC_DEFINE(HAVE_STRUCT_IFREQ_IFR_INDEX, [1], [have struct ifreq ifr])
+ fi
+ AC_MSG_RESULT($sc_cv_struct_ifreq_ifr_index)
+ 
+@@ -1054,7 +1054,7 @@
+ [sc_cv_struct_ifreq_ifr_ifindex=yes],
+ [sc_cv_struct_ifreq_ifr_ifindex=no])])
+ if test $sc_cv_struct_ifreq_ifr_ifindex = yes; then
+-   AC_DEFINE(HAVE_STRUCT_IFREQ_IFR_IFINDEX)
++   AC_DEFINE(HAVE_STRUCT_IFREQ_IFR_IFINDEX, [1], [have struct ifreq ifindex])
+ fi
+ AC_MSG_RESULT($sc_cv_struct_ifreq_ifr_ifindex)
+ 
+@@ -1069,7 +1069,7 @@
+ [sc_cv_struct_sockaddr_salen=yes],
+ [sc_cv_struct_sockaddr_salen=no])])
+ if test $sc_cv_struct_sockaddr_salen = yes; then
+-   AC_DEFINE(HAVE_STRUCT_SOCKADDR_SALEN)
++   AC_DEFINE(HAVE_STRUCT_SOCKADDR_SALEN, [1], [sockaddr salen])
+ fi
+ AC_MSG_RESULT($sc_cv_struct_sockaddr_salen)
+ 
+@@ -1080,31 +1080,31 @@
+ #include <netinet/in.h>],
+ [struct sockaddr_in6 sa6;sa6.sin6_addr.s6_addr[0]=0;],
+ [AC_MSG_RESULT(s6_addr);
+- AC_DEFINE(HAVE_IP6_SOCKADDR, 0)],
++ AC_DEFINE(HAVE_IP6_SOCKADDR, 0, [ip6 sockaddr])],
+ [AC_TRY_COMPILE([#include <sys/types.h>
+ #include <netinet/in.h>],
+  [struct sockaddr_in6 sa6;sa6.sin6_addr.u6_addr.u6_addr16[0]=0;],
+  [AC_MSG_RESULT(u6_addr.u6_addr16);
+-  AC_DEFINE(HAVE_IP6_SOCKADDR, 1)],
++  AC_DEFINE(HAVE_IP6_SOCKADDR, 1, [ip6 sockaddr])],
+  [AC_TRY_COMPILE([#include <sys/types.h>
+ #include <netinet/in.h>],
+   [struct sockaddr_in6 sa6;sa6.sin6_addr.u6_addr16[0]=0;],
+-  [AC_MSG_RESULT(u6_addr16); AC_DEFINE(HAVE_IP6_SOCKADDR, 2)],
++  [AC_MSG_RESULT(u6_addr16); AC_DEFINE(HAVE_IP6_SOCKADDR, 2, [ip6 sockaddr])],
+   [AC_TRY_COMPILE([#include <sys/types.h>
+ #include <netinet/in.h>],
+    [struct sockaddr_in6 sa6;sa6.sin6_addr.in6_u.u6_addr16[0]=0;],
+    [AC_MSG_RESULT(in6_u.u6_addr16);
+-    AC_DEFINE(HAVE_IP6_SOCKADDR, 3)],
++    AC_DEFINE(HAVE_IP6_SOCKADDR, 3, [ip6 sockaddr])],
+    [AC_TRY_COMPILE([#include <sys/types.h>
+ #include <netinet/in.h>],
+     [struct sockaddr_in6 sa6;sa6.sin6_addr._S6_un._S6_u32[0]=0;],
+     [AC_MSG_RESULT(_S6_un._S6_u32);
+-     AC_DEFINE(HAVE_IP6_SOCKADDR, 4)],
++     AC_DEFINE(HAVE_IP6_SOCKADDR, 4, [ip6 sockaddr])],
+     [AC_TRY_COMPILE([#include <sys/types.h>
+ #include <netinet/in.h>],
+      [struct sockaddr_in6 sa6;sa6.sin6_addr.__u6_addr.__u6_addr32[0]=0;],
+      [AC_MSG_RESULT(__u6_addr.__u6_addr32);
+-      AC_DEFINE(HAVE_IP6_SOCKADDR, 5)],
++      AC_DEFINE(HAVE_IP6_SOCKADDR, 5, [ip6 sockaddr])],
+ 
+     [AC_MSG_RESULT([none or unknown])]
+ )])])])])])
+@@ -1116,7 +1116,7 @@
+ [sc_cv_struct_iovec=yes],
+ [sc_cv_struct_iovec=no])])
+ if test $sc_cv_struct_iovec = yes; then
+-   AC_DEFINE(HAVE_STRUCT_IOVEC)
++   AC_DEFINE(HAVE_STRUCT_IOVEC, [1], [have struct iovec])
+ fi
+ AC_MSG_RESULT($sc_cv_struct_iovec)
+ 
+@@ -1129,7 +1129,7 @@
+ [sc_cv_struct_msghdr_msgcontrol=yes],
+ [sc_cv_struct_msghdr_msgcontrol=no])])
+ if test $sc_cv_struct_msghdr_msgcontrol = yes; then
+-   AC_DEFINE(HAVE_STRUCT_MSGHDR_MSGCONTROL)
++   AC_DEFINE(HAVE_STRUCT_MSGHDR_MSGCONTROL, [1], [have struct msgcontrol])
+ fi
+ AC_MSG_RESULT($sc_cv_struct_msghdr_msgcontrol)
+ 
+@@ -1142,7 +1142,7 @@
+ [sc_cv_struct_msghdr_msgcontrollen=yes],
+ [sc_cv_struct_msghdr_msgcontrollen=no])])
+ if test $sc_cv_struct_msghdr_msgcontrollen = yes; then
+-   AC_DEFINE(HAVE_STRUCT_MSGHDR_MSGCONTROLLEN)
++   AC_DEFINE(HAVE_STRUCT_MSGHDR_MSGCONTROLLEN, [1], [have struct msghdr msgcontrollen])
+ fi
+ AC_MSG_RESULT($sc_cv_struct_msghdr_msgcontrollen)
+ 
+@@ -1155,7 +1155,7 @@
+ [sc_cv_struct_msghdr_msgflags=yes],
+ [sc_cv_struct_msghdr_msgflags=no])])
+ if test $sc_cv_struct_msghdr_msgflags = yes; then
+-   AC_DEFINE(HAVE_STRUCT_MSGHDR_MSGFLAGS)
++   AC_DEFINE(HAVE_STRUCT_MSGHDR_MSGFLAGS, [1], [msgflags])
+ fi
+ AC_MSG_RESULT($sc_cv_struct_msghdr_msgflags)
+ 
+@@ -1168,7 +1168,7 @@
+ [sc_cv_struct_cmsghdr=yes],
+ [sc_cv_struct_cmsghdr=no])])
+ if test $sc_cv_struct_cmsghdr = yes; then
+-   AC_DEFINE(HAVE_STRUCT_CMSGHDR)
++   AC_DEFINE(HAVE_STRUCT_CMSGHDR, [1], [have cmshdr])
+ fi
+ AC_MSG_RESULT($sc_cv_struct_cmsghdr)
+ 
+@@ -1181,7 +1181,7 @@
+ [sc_cv_struct_in_pktinfo=yes],
+ [sc_cv_struct_in_pktinfo=no])])
+ if test $sc_cv_struct_in_pktinfo = yes; then
+-   AC_DEFINE(HAVE_STRUCT_IN_PKTINFO)
++   AC_DEFINE(HAVE_STRUCT_IN_PKTINFO, [1], [pktinfo])
+ fi
+ AC_MSG_RESULT($sc_cv_struct_in_pktinfo)
+ 
+@@ -1211,7 +1211,7 @@
+ [sc_cv_struct_ip_ip_hl=yes],
+ [sc_cv_struct_ip_ip_hl=no])])
+ if test $sc_cv_struct_ip_ip_hl = yes; then
+-   AC_DEFINE(HAVE_STRUCT_IP_IP_HL)
++   AC_DEFINE(HAVE_STRUCT_IP_IP_HL, [1], [foo])
+ fi
+ AC_MSG_RESULT($sc_cv_struct_ip_ip_hl)
+ 
+@@ -1219,19 +1219,19 @@
+ dnl Library function checks
+ 
+ dnl Check sigaction()
+-AC_CHECK_FUNC(sigaction, AC_DEFINE(HAVE_SIGACTION))
++AC_CHECK_FUNC(sigaction, AC_DEFINE(HAVE_SIGACTION, [1], [foo]))
+ 
+ dnl Check for 64bit versions of system calls
+-AC_CHECK_FUNC(stat64, AC_DEFINE(HAVE_STAT64))
+-AC_CHECK_FUNC(fstat64, AC_DEFINE(HAVE_FSTAT64))
+-AC_CHECK_FUNC(lstat64, AC_DEFINE(HAVE_LSTAT64))
+-AC_CHECK_FUNC(lseek64, AC_DEFINE(HAVE_LSEEK64))
+-AC_CHECK_FUNC(truncate64, AC_DEFINE(HAVE_TRUNCATE64))
+-AC_CHECK_FUNC(ftruncate64, AC_DEFINE(HAVE_FTRUNCATE64))
+-
+-AC_CHECK_FUNC(strtoll, AC_DEFINE(HAVE_STRTOLL))
+-AC_CHECK_FUNC(hstrerror, AC_DEFINE(HAVE_HSTRERROR))
+-AC_CHECK_FUNC(inet_ntop, AC_DEFINE(HAVE_INET_NTOP))
++AC_CHECK_FUNC(stat64, AC_DEFINE(HAVE_STAT64, [1], [foo]))
++AC_CHECK_FUNC(fstat64, AC_DEFINE(HAVE_FSTAT64, [1], [foo]))
++AC_CHECK_FUNC(lstat64, AC_DEFINE(HAVE_LSTAT64, [1], [foo]))
++AC_CHECK_FUNC(lseek64, AC_DEFINE(HAVE_LSEEK64, [1], [foo]))
++AC_CHECK_FUNC(truncate64, AC_DEFINE(HAVE_TRUNCATE64, [1], [foo]))
++AC_CHECK_FUNC(ftruncate64, AC_DEFINE(HAVE_FTRUNCATE64, [1], [foo]))
++
++AC_CHECK_FUNC(strtoll, AC_DEFINE(HAVE_STRTOLL, [1], [foo]))
++AC_CHECK_FUNC(hstrerror, AC_DEFINE(HAVE_HSTRERROR, [1], [foo]))
++AC_CHECK_FUNC(inet_ntop, AC_DEFINE(HAVE_INET_NTOP, [1], [foo]))
+ 
+ #if test "$ac_cv_func_hstrerror" = "yes"; then
+ #  AC_MSG_CHECKING(if _XOPEN_SOURCE_EXTENDED is helpful)
+@@ -1254,25 +1254,26 @@
+ 
+ dnl Search for openpty()
+ # MacOS
+-AC_CHECK_FUNC(openpty, AC_DEFINE(HAVE_OPENPTY))
++AC_CHECK_FUNC(openpty, AC_DEFINE(HAVE_OPENPTY, [1], [foo]))
+ # AIX
+ AC_CHECK_LIB(bsd, openpty,
+-  [LIBS="-lbsd $LIBS"; AC_DEFINE(HAVE_OPENPTY)])
++  [LIBS="-lbsd $LIBS"; AC_DEFINE(HAVE_OPENPTY, [1], [foo])])
+ # Linux 2.4
+ AC_CHECK_LIB(util, openpty,
+-  [LIBS="-lutil $LIBS"; AC_DEFINE(HAVE_OPENPTY)])
++  [LIBS="-lutil $LIBS"; AC_DEFINE(HAVE_OPENPTY, [1], [foo])])
++
+ 
+ dnl Search for flock()
+ # with Linux it's in libc, with AIX in libbsd
+-AC_CHECK_FUNC(flock, AC_DEFINE(HAVE_FLOCK),
++AC_CHECK_FUNC(flock, AC_DEFINE(HAVE_FLOCK, [1], [have flock]),
+ 	AC_CHECK_LIB(bsd, flock, [LIBS="-lbsd $LIBS"]))
+ 
+ dnl Search for setenv()
+-AC_CHECK_FUNC(setenv, AC_DEFINE(HAVE_SETENV),
++AC_CHECK_FUNC(setenv, AC_DEFINE(HAVE_SETENV, [1], [have setenv]),
+ 	AC_CHECK_LIB(isode, setenv, [LIBS="-lisode $LIBS"]))
+ 
+ dnl Search for unsetenv()
+-AC_CHECK_FUNC(unsetenv, AC_DEFINE(HAVE_UNSETENV))
++AC_CHECK_FUNC(unsetenv, AC_DEFINE(HAVE_UNSETENV, [1], [have unsetenv]))
+ 
+ dnl Search for SSLv2_client_method, SSLv2_server_method
+ AC_CHECK_FUNC(SSLv3_client_method, AC_DEFINE(HAVE_SSLv3_client_method), AC_CHECK_LIB(crypt, SSLv3_client_method, [LIBS=-lcrypt $LIBS]))
+@@ -1295,7 +1296,7 @@
+ [ac_cv_have_z_modifier=no],
+ [ac_cv_have_z_modifier=no])])
+ if test $ac_cv_have_z_modifier = yes; then
+-   AC_DEFINE(HAVE_FORMAT_Z)
++   AC_DEFINE(HAVE_FORMAT_Z, [1], [have format z])
+ fi
+ AC_MSG_RESULT($ac_cv_have_z_modifier)
+ 
+@@ -1334,7 +1335,8 @@
+  [$2=-1]
+ )
+  LIBS="$LIBS1"])
+-AC_DEFINE_UNQUOTED($1_SHIFT, ${$2})
++SHIFT_NAME="$1"_SHIFT
++AC_DEFINE_UNQUOTED($SHIFT_NAME, ${$2}, [foo])
+ if test "$2" = -1; then
+ AC_MSG_WARN(please determine $1_SHIFT manually)
+ fi
+@@ -1374,7 +1376,7 @@
+         [$4="0 /* unknown, taking default */"
+ ]) ]) ]) ]) ]) ]) ]) ])
+  CFLAGS="$CFLAGS1" ])
+-AC_DEFINE_UNQUOTED($3, ${$4})
++AC_DEFINE_UNQUOTED($3, ${$4}, [foo])
+ ])
+ 
+ dnl find what physical type (basic C type) describes the given struct or union
+@@ -1406,7 +1408,7 @@
+        [$5="0 /* unknown, taking default */"
+ ]) ]) ]) ]) ]) ]) ]) ])
+  CFLAGS="$CFLAGS1" ])
+-AC_DEFINE_UNQUOTED($4, ${$5})
++AC_DEFINE_UNQUOTED($4, ${$5}, [foo])
+ ])
+ 
+ AC_BASIC_TYPE([#include <stdlib.h>], size_t, HAVE_BASIC_SIZE_T, sc_cv_type_sizet_basic)
+@@ -1465,13 +1467,13 @@
+ 
+ AC_MSG_CHECKING(for /dev/ptmx)
+ if test -c /dev/ptmx; then
+-  AC_DEFINE(HAVE_DEV_PTMX, 1)
++  AC_DEFINE(HAVE_DEV_PTMX, 1, [ptmx])
+   AC_MSG_RESULT(yes)
+ else
+   AC_MSG_RESULT(no)
+   AC_MSG_CHECKING(for /dev/ptc)
+   if test -c /dev/ptc; then
+-    AC_DEFINE(HAVE_DEV_PTC)
++    AC_DEFINE(HAVE_DEV_PTC, 1, [ptc])
+     AC_MSG_RESULT(yes)
+   else
+     AC_MSG_RESULT(no)
+@@ -1480,7 +1482,7 @@
+ 
+ AC_MSG_CHECKING(for /proc)
+ if test -d /proc; then
+-  AC_DEFINE(HAVE_PROC_DIR, 1)
++  AC_DEFINE(HAVE_PROC_DIR, 1, [procdir])
+   AC_MSG_RESULT(yes)
+ else
+   AC_MSG_RESULT(no)
+@@ -1488,7 +1490,7 @@
+ 
+ AC_MSG_CHECKING(for /proc/*/fd)
+ if test -d /proc/$$/fd; then
+-  AC_DEFINE(HAVE_PROC_DIR_FD, 1)
++  AC_DEFINE(HAVE_PROC_DIR_FD, 1, [procdir fd])
+   AC_MSG_RESULT(yes)
+ else
+   AC_MSG_RESULT(no)
+@@ -1528,7 +1530,7 @@
+       done])
+   ])
+   if test "$sc_cv_have_tcpd_h" = "yes"; then
+-    AC_DEFINE(HAVE_TCPD_H)
++    AC_DEFINE(HAVE_TCPD_H, [1], [have tcpd])
+   fi
+   AC_MSG_NOTICE(checked for tcpd.h... $sc_cv_have_tcpd_h)
+ fi	# end checking for tcpd.h
+@@ -1561,14 +1563,14 @@
+     ]
+   )
+   if test "$sc_cv_have_libwrap" = 'yes'; then
+-    AC_DEFINE(HAVE_LIBWRAP)
++    AC_DEFINE(HAVE_LIBWRAP, [1], [libwrap])
+   fi
+   AC_MSG_RESULT($sc_cv_have_libwrap)
+ fi
+ #
+ if test -n "$WITH_LIBWRAP"; then
+   if test "$sc_cv_have_tcpd_h" = "yes" -a "$sc_cv_have_libwrap" = "yes"; then
+-    AC_DEFINE(WITH_LIBWRAP)
++    AC_DEFINE(WITH_LIBWRAP, [1], [libwrap])
+   else
+     AC_MSG_WARN([not all components of tcp wrappers found, disabling it]);
+   fi
+@@ -1583,7 +1585,7 @@
+       [sc_cv_have_hosts_allow_table=yes],
+       [sc_cv_have_hosts_allow_table=no])])
+   if test $sc_cv_have_hosts_allow_table = yes; then
+-    AC_DEFINE(HAVE_HOSTS_ALLOW_TABLE)
++    AC_DEFINE(HAVE_HOSTS_ALLOW_TABLE, [1], [hosts allow table])
+   fi
+   AC_MSG_RESULT($sc_cv_have_hosts_allow_table)
+ fi # test -n "$WITH_LIBWRAP"
diff --git a/meta/recipes-connectivity/socat/socat_1.7.2.0.bb b/meta/recipes-connectivity/socat/socat_1.7.2.0.bb
new file mode 100644
index 0000000..1273dcf
--- /dev/null
+++ b/meta/recipes-connectivity/socat/socat_1.7.2.0.bb
@@ -0,0 +1,28 @@
+DESCRIPTION = "Socat is a relay for bidirectional data \
+transfer between two independent data channels."
+HOMEPAGE = "http://www.dest-unreach.org/socat/"
+
+SECTION = "console/network"
+
+DEPENDS = "openssl"
+
+LICENSE = "GPL-2.0+-with-OpenSSL-exception"
+
+PR = "r0"
+SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2;name=src \
+           file://compile.patch"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760 \
+                    file://README;beginline=252;endline=282;md5=79246f11a1db0b6ccec54d1fb711c01e"
+
+SRC_URI[src.md5sum] = "eb563dd00b9d39a49fb62a677fc941fe"
+SRC_URI[src.sha256sum] = "59b3bde927c14fbc3f9e42c782971710da8a89bbf46f7531f09a681754041802"
+
+EXTRA_OECONF = " --disable-termios "
+
+inherit autotools
+
+do_install_prepend () {
+    mkdir -p ${D}${bindir}
+    install -d ${D}${bindir} ${D}${mandir}/man1
+}
-- 
1.7.6.4

[CONSOLIDATED PULL 11/26] wget: fix a host intrusion issue introduced by adding --with-ssl=openssl.

[Saul Wold]

From: Dexuan Cui <dexuan.cui@intel.com>

On my x86-64 Ubuntu 11.04, with MACHINE=qemux86, "bitbake wget" fails. The
config.log shows:

configure:30072: i586-poky-linux-gcc  -m32   -march=i586
 --sysroot=/distro/dcui/1212/p1/build/tmp/sysroots/qemux86 -o conftest -O2
 -pipe -g -feliminate-unused-debug-types  -Wl,-O1 -Wl,--hash-style=gnu
 -Wl,--as-needed conftest.c -ldl -lz  /usr/lib/libssl.so /usr/lib/libcrypto.so
 -lz >&5
/usr/lib/libssl.so: could not read symbols: File in wrong format

The patch fixes the issue by specifying libssl-prefix.

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
---
 meta/recipes-extended/wget/wget.inc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-extended/wget/wget.inc b/meta/recipes-extended/wget/wget.inc
index 7083569..25f36c8 100644
--- a/meta/recipes-extended/wget/wget.inc
+++ b/meta/recipes-extended/wget/wget.inc
@@ -4,11 +4,11 @@ LICENSE = "GPL"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 DEPENDS = "openssl"
 
-INC_PR = "r12"
+INC_PR = "r13"
 
 inherit autotools gettext update-alternatives
 
-EXTRA_OECONF = "--with-libc --enable-ipv6 --with-ssl=openssl"
+EXTRA_OECONF = "--with-libc --enable-ipv6 --with-libssl-prefix=${STAGING_DIR_HOST} --with-ssl=openssl"
 
 do_install_append () {
 	mv ${D}${bindir}/wget ${D}${bindir}/wget.${PN}
-- 
1.7.6.4

[CONSOLIDATED PULL 12/26] ncurses: move libraries to base_libdir

[Saul Wold]

From: Scott Garman <scott.a.garman@intel.com>

Various utilities (including bash and the util-linux programs) located
in base_bindir (/bin) or base_sbindir (/sbin) dynamically link against
many of the ncurses libraries. So move these libraries from libdir
(/usr/lib) to base_libdir (/lib).

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
---
 meta/recipes-core/ncurses/ncurses.inc |   26 +++++++++++++++++---------
 1 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc
index 583dad7..8c55631 100644
--- a/meta/recipes-core/ncurses/ncurses.inc
+++ b/meta/recipes-core/ncurses/ncurses.inc
@@ -26,6 +26,8 @@ ENABLE_WIDEC ?= "true"
 # builds.
 BUILD_CPPFLAGS += "-D_GNU_SOURCE"
 
+BUILD_LDFLAGS += "-Wl,-rpath,${base_libdir}"
+
 # Helper function for do_configure to allow multiple configurations
 # $1 the directory to run configure in
 # $@ the arguments to pass to configure
@@ -41,6 +43,7 @@ ncurses_configure() {
 	        --enable-hard-tabs \
 	        --enable-xmc-glitch \
 	        --enable-colorfgbg \
+	        --libdir=${base_libdir} \
 	        --with-termpath='${sysconfdir}/termcap:${datadir}/misc/termcap' \
 	        --with-terminfo-dirs='${sysconfdir}/terminfo:${datadir}/terminfo' \
 	        --with-shared \
@@ -120,7 +123,6 @@ do_install() {
         ! ${ENABLE_WIDEC} || \
             oe_runmake -C widec ${_install_opts}
 
-
         cd narrowc
 
         # include some basic terminfo files
@@ -155,28 +157,29 @@ do_install() {
         # else when '-Wl,--no-copy-dt-needed-entries' has been set in
         # linker flags.
         for i in libncurses libncursesw; do
-		f=${D}${libdir}/$i.so
+                f=${D}${base_libdir}/$i.so
                 test -h $f || continue
                 rm -f $f
                 echo '/* GNU ld script */'  >$f
                 echo "INPUT($i.so.5 AS_NEEDED(-ltinfo))" >>$f
         done
-	# Make sure that libcurses is linked so that it gets -ltinfo
-	# also, this should be addressed upstream really.
-	ln -sf libncurses.so ${D}${libdir}/libcurses.so
+
+        # Make sure that libcurses is linked so that it gets -ltinfo
+        # also, this should be addressed upstream really.
+        ln -sf libncurses.so ${D}${base_libdir}/libcurses.so
 
         # create libtermcap.so linker script for backward compatibility
-        f=${D}${libdir}/libtermcap.so
+        f=${D}${base_libdir}/libtermcap.so
         echo '/* GNU ld script */' >$f
         echo 'INPUT(AS_NEEDED(-ltinfo))' >>$f
 
-	oe_multilib_header curses.h
+        oe_multilib_header curses.h
 }
 
 python populate_packages_prepend () {
-        libdir = bb.data.expand("${libdir}", d)
+        base_libdir = bb.data.expand("${base_libdir}", d)
         pnbase = bb.data.expand("${PN}-lib%s", d)
-        do_split_packages(d, libdir, '^lib(.*)\.so\..*', pnbase, 'ncurses %s library', prepend=True, extra_depends = '', allow_links=True)
+        do_split_packages(d, base_libdir, '^lib(.*)\.so\..*', pnbase, 'ncurses %s library', prepend=True, extra_depends = '', allow_links=True)
 }
 
 
@@ -210,6 +213,10 @@ FILES_${PN} = "\
   ${datadir}/tabset \
 "
 
+FILES_${PN}-dev += "\
+ ${base_libdir}/*.so \
+"
+
 # This keeps only tput/tset in ncurses
 # clear/reset are in already busybox
 FILES_${PN}-tools = "\
@@ -223,6 +230,7 @@ FILES_${PN}-tools = "\
   ${bindir}/tack \
   ${bindir}/tabs \
 "
+
 # 'reset' is a symlink to 'tset' which is in the 'ncurses' package
 RDEPENDS_${PN}-tools = "${PN}"
 
-- 
1.7.6.4

[CONSOLIDATED PULL 13/26] libcap: move library to base_libdir

[Saul Wold]

From: Scott Garman <scott.a.garman@intel.com>

ls from coreutils links to libcap, so move the libcap library
from libdir (/usr/lib) to base_libdir (/lib).

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
---
 meta/recipes-support/libcap/libcap.inc     |   15 +++++++++++++--
 meta/recipes-support/libcap/libcap_2.22.bb |    2 +-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-support/libcap/libcap.inc b/meta/recipes-support/libcap/libcap.inc
index 184b58a..9418abf 100644
--- a/meta/recipes-support/libcap/libcap.inc
+++ b/meta/recipes-support/libcap/libcap.inc
@@ -21,6 +21,8 @@ do_configure() {
 	sed -e 's,BUILD_CFLAGS ?=,BUILD_CFLAGS := $(BUILD_CFLAGS),' -i Make.Rules
 }
 
+BUILD_LDFLAGS_virtclass_native += "-Wl,rpath=${base_libdir}"
+
 EXTRA_OEMAKE = " \
   LIBATTR=yes \
   PAM_CAP=${@base_contains('DISTRO_FEATURES', 'pam', 'yes', 'no', d)} \
@@ -42,8 +44,17 @@ do_install() {
 	oe_runmake install DESTDIR="${D}" prefix="${prefix}"
 }
 
+do_install_append() {
+	# Move the library to base_libdir
+	install -d ${D}${base_libdir}
+	mv ${D}${libdir}/* ${D}${base_libdir}
+	rmdir ${D}${libdir}
+}
+
+FILES_${PN}-dev += "${base_libdir}/*.so"
+
 # pam files
-FILES_${PN} += "${libdir}/security/*.so"
-FILES_${PN}-dbg += "${libdir}/security/.debug/*.so"
+FILES_${PN} += "${base_libdir}/security/*.so"
+FILES_${PN}-dbg += "${base_libdir}/security/.debug/*.so"
 
 BBCLASSEXTEND = "native"
diff --git a/meta/recipes-support/libcap/libcap_2.22.bb b/meta/recipes-support/libcap/libcap_2.22.bb
index dd63d9e..be1df54 100644
--- a/meta/recipes-support/libcap/libcap_2.22.bb
+++ b/meta/recipes-support/libcap/libcap_2.22.bb
@@ -1,6 +1,6 @@
 require libcap.inc
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI[md5sum] = "ce64058bdb3f086ddbfca8ce6c919845"
 SRC_URI[sha256sum] = "73ebbd4877b5f69dd28b72098e510c5b318bc480f8201c4061ac98b78c04050f"
-- 
1.7.6.4

[CONSOLIDATED PULL 14/26] util-linux: move libraries to base_libdir

[Saul Wold]

From: Scott Garman <scott.a.garman@intel.com>

Various util-linux programs in base_sbindir (/sbin) linked to libraries
located under exec_prefix (/usr). Since this is not safe, move these
libraries from libdir (/usr/lib) to base_libdir (/lib).

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
---
 meta/recipes-core/util-linux/util-linux.inc       |   20 +++++++++++---------
 meta/recipes-core/util-linux/util-linux_2.19.1.bb |    2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index acc4a39..0ed6775 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -17,7 +17,6 @@ inherit autotools gettext pkgconfig
 DEPENDS = "zlib ncurses"
 DEPENDS_virtclass-native = " lzo-native"
 
-
 SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux-ng/v${MAJOR_VERSION}/util-linux-${PV}.tar.bz2 \
            file://MCONFIG \
            file://swapargs.h \
@@ -30,11 +29,14 @@ PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfd
              util-linux-mount util-linux-readprofile util-linux-libblkid \
              util-linux-libblkid-dev util-linux-libuuid util-linux-libuuid-dev \
              util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid \
-	     util-linux-chkdupexe util-linux-mkfs util-linux-mcookie"
+             util-linux-chkdupexe util-linux-mkfs util-linux-mcookie"
 
-EXTRA_OECONF = "--disable-use-tty-group --disable-makeinstall-chown --enable-elvtune --enable-init --enable-kill --enable-last \
- --enable-mesg --enable-partx --enable-raw --enable-rdev --enable-reset \
-  --disable-login-utils --enable-write --enable-arch --enable-mount --with-fsprobe=builtin --enable-libuuid --enable-libblkid --enable-fsck"
+EXTRA_OECONF = "--libdir=${base_libdir} --disable-use-tty-group \
+                --disable-makeinstall-chown --enable-elvtune --enable-init \
+                --enable-kill --enable-last --enable-mesg --enable-partx \
+                --enable-raw --enable-rdev --enable-reset --disable-login-utils \
+                --enable-write --enable-arch --enable-mount --with-fsprobe=builtin \
+                --enable-libuuid --enable-libblkid --enable-fsck"
 
 FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*"
 
@@ -50,10 +52,10 @@ FILES_util-linux-umount = "${base_bindir}/umount.${PN}"
 FILES_util-linux-readprofile = "${base_sbindir}/readprofile.${PN}"
 FILES_util-linux-uuidgen = "${bindir}/uuidgen"
 
-FILES_util-linux-libblkid = "${libdir}/libblkid.so.*"
-FILES_util-linux-libblkid-dev = "${libdir}/libblkid.so ${libdir}/libblkid.a ${libdir}/libblkid.la ${includedir}/blkid"
-FILES_util-linux-libuuid = "${libdir}/libuuid.so.*"
-FILES_util-linux-libuuid-dev = "${libdir}/libuuid.so ${libdir}/libuuid.a ${libdir}/libuuid.la ${includedir}/uuid"
+FILES_util-linux-libblkid = "${base_libdir}/libblkid.so.*"
+FILES_util-linux-libblkid-dev = "${base_libdir}/libblkid.so ${base_libdir}/libblkid.a ${base_libdir}/libblkid.la ${includedir}/blkid"
+FILES_util-linux-libuuid = "${base_libdir}/libuuid.so.*"
+FILES_util-linux-libuuid-dev = "${base_libdir}/libuuid.so ${base_libdir}/libuuid.a ${base_libdir}/libuuid.la ${includedir}/uuid"
 FILES_util-linux-lscpu = "${bindir}/lscpu"
 
 FILES_util-linux-fsck = "${base_sbindir}/fsck*"
diff --git a/meta/recipes-core/util-linux/util-linux_2.19.1.bb b/meta/recipes-core/util-linux/util-linux_2.19.1.bb
index 82040ef..f012907 100644
--- a/meta/recipes-core/util-linux/util-linux_2.19.1.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.19.1.bb
@@ -1,5 +1,5 @@
 MAJOR_VERSION = "2.19"
-PR = "r12"
+PR = "r13"
 require util-linux.inc
 
 # note that `lscpu' is under GPLv3+
-- 
1.7.6.4

[CONSOLIDATED PULL 15/26] e2fsprogs: move libraries to base_libdir

[Saul Wold]

From: Scott Garman <scott.a.garman@intel.com>

The e2fsprogs utilities are installed into base_sbindir (/sbin)
and should not link to libraries under exec_prefix (/usr). So move
these libraries from libdir (/usr/lib) to base_libdir (/lib).

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
---
 .../e2fsprogs/e2fsprogs_1.41.14.bb                 |   29 ++++++++++++-------
 1 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.14.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.14.bb
index c6c1f0d..0bd0c67 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.14.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.14.bb
@@ -1,6 +1,6 @@
 require e2fsprogs.inc
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI += "file://quotefix.patch \
             file://acinclude.m4"
@@ -11,9 +11,9 @@ SRC_URI[sha256sum] = "3f8ac1fedd7c4bec480afcbe4acabdd4ac59ec0446a0fd50c8975cd0aa
 
 PARALLEL_MAKE = ""
 
-EXTRA_OECONF += " --sbindir=${base_sbindir} --enable-elf-shlibs --disable-libuuid"
-EXTRA_OECONF_darwin = "--sbindir=${base_sbindir} --enable-bsd-shlibs"
-EXTRA_OECONF_darwin8 = "--sbindir=${base_sbindir} --enable-bsd-shlibs"
+EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-elf-shlibs --disable-libuuid"
+EXTRA_OECONF_darwin = "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-bsd-shlibs"
+EXTRA_OECONF_darwin8 = "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-bsd-shlibs"
 
 do_configure_prepend () {
 	cp ${WORKDIR}/acinclude.m4 ${S}/
@@ -28,9 +28,16 @@ do_install () {
 	oe_runmake 'DESTDIR=${D}' install
 	oe_runmake 'DESTDIR=${D}' install-libs
 	# We use blkid from util-linux now so remove from here
-	rm -f ${D}${libdir}/libblkid*
+	rm -f ${D}${base_libdir}/libblkid*
 	rm -rf ${D}${includedir}/blkid
-	rm -f ${D}${libdir}/pkgconfig/blkid.pc
+	rm -f ${D}${base_libdir}/pkgconfig/blkid.pc
+}
+
+do_install_append () {
+	# e2initrd_helper and the pkgconfig files belong in libdir
+	install -d ${D}${libdir}
+	mv ${D}${base_libdir}/e2initrd_helper ${D}${libdir}
+	mv ${D}${base_libdir}/pkgconfig ${D}${libdir}
 }
 
 # blkid used to be part of e2fsprogs but is useful outside, add it
@@ -47,10 +54,10 @@ FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext*"
 FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext* ${sysconfdir}/mke2fs.conf"
 FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs ${base_sbindir}/e2label ${base_sbindir}/findfs"
 FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks"
-FILES_libcomerr = "${libdir}/libcom_err.so.*"
-FILES_libss = "${libdir}/libss.so.*"
-FILES_libe2p = "${libdir}/libe2p.so.*"
-FILES_libext2fs = "${libdir}/e2initrd_helper ${libdir}/libext2fs.so.*"
-FILES_${PN}-dev += "${datadir}/*/*.awk ${datadir}/*/*.sed"
+FILES_libcomerr = "${base_libdir}/libcom_err.so.*"
+FILES_libss = "${base_libdir}/libss.so.*"
+FILES_libe2p = "${base_libdir}/libe2p.so.*"
+FILES_libext2fs = "${libdir}/e2initrd_helper ${base_libdir}/libext2fs.so.*"
+FILES_${PN}-dev += "${datadir}/*/*.awk ${datadir}/*/*.sed ${base_libdir}/*.so"
 
 BBCLASSEXTEND = "native"
-- 
1.7.6.4

[CONSOLIDATED PULL 16/26] libusb1: move libraries to base_libdir

[Saul Wold]

From: Scott Garman <scott.a.garman@intel.com>

udev links to libusb1, and so these libraries need to be in
base_libdir (/lib) instead of libdir (/usr/lib).

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
---
 meta/recipes-support/libusb/libusb1_1.0.8.bb |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-support/libusb/libusb1_1.0.8.bb b/meta/recipes-support/libusb/libusb1_1.0.8.bb
index 302a8be..5a921e0 100644
--- a/meta/recipes-support/libusb/libusb1_1.0.8.bb
+++ b/meta/recipes-support/libusb/libusb1_1.0.8.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "userspace library to access USB (version 1.0)"
+DESCRIPTION = "Userspace library to access USB (version 1.0)"
 HOMEPAGE = "http://libusb.sf.net"
 BUGTRACKER = "http://www.libusb.org/report"
 SECTION = "libs"
@@ -6,7 +6,7 @@ SECTION = "libs"
 LICENSE = "LGPLv2.1+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2"
 
@@ -15,3 +15,15 @@ SRC_URI[sha256sum] = "21d0d3a5710f7f4211c595102c6b9eccb42435a17a4f5bd2c3f4166ab1
 S = "${WORKDIR}/libusb-${PV}"
 
 inherit autotools pkgconfig
+
+EXTRA_OECONF = "--libdir=${base_libdir}"
+
+do_install_append() {
+	install -d ${D}${libdir}
+	mv ${D}${base_libdir}/*.la ${D}${libdir}
+	mv ${D}${base_libdir}/pkgconfig ${D}${libdir}
+}
+
+FILES_${PN} += "${base_libdir}/*.so.*"
+
+FILES_${PN}-dev += "${base_libdir}/*.so"
-- 
1.7.6.4

[CONSOLIDATED PULL 17/26] libusb-compat: move libraries to base_libdir

[Saul Wold]

From: Scott Garman <scott.a.garman@intel.com>

udev links to libusb-compat, and so this library needs to be in
base_libdir (/lib) instead of libdir (/usr/lib).

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
---
 meta/recipes-support/libusb/libusb-compat_0.1.3.bb |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-support/libusb/libusb-compat_0.1.3.bb b/meta/recipes-support/libusb/libusb-compat_0.1.3.bb
index ef8552b..e070463 100644
--- a/meta/recipes-support/libusb/libusb-compat_0.1.3.bb
+++ b/meta/recipes-support/libusb/libusb-compat_0.1.3.bb
@@ -15,7 +15,7 @@ DEPENDS = "libusb1"
 PROVIDES = "libusb"
 
 PE = "1"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-compat-${PV}.tar.bz2 \
            file://0.1.0-beta1-gcc3.4-fix.patch"
@@ -24,3 +24,13 @@ SRC_URI[md5sum] = "570ac2ea085b80d1f74ddc7c6a93c0eb"
 SRC_URI[sha256sum] = "a590a03b6188030ee1ca1a0af55685fcde005ca807b963970f839be776031d94"
 
 inherit autotools pkgconfig binconfig
+
+EXTRA_OECONF = "--libdir=${base_libdir}"
+
+do_install_append() {
+	install -d ${D}${libdir}
+	mv ${D}${base_libdir}/*.la ${D}${libdir}
+	mv ${D}${base_libdir}/pkgconfig ${D}${libdir}
+}
+
+FILES_${PN}-dev += "${base_libdir}/*.so"
-- 
1.7.6.4

[CONSOLIDATED PULL 18/26] prelink: update to latest git version

[Saul Wold]

From: Scott Garman <scott.a.garman@intel.com>

New version includes:

2011-12-08 Mark Hatle <mark.hatle@windriver.com>
    * rtld/rtld.c: Fix an issue where missing objects would trigger
      an assert in dl-version.c
    * rtld/rtld.h: Add _dl_new_object prototype
    * rtld/rtld.c: Add support for $ORIGIN, $PLATFORM and $LIB.
      Note: $PLATFORM = ""

These fixes are needed to prevent prelink-rtld from crashing when
running the new unsafe-references-in-binaries QA test.

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
---
 .../conf/distro/include/distro_tracking_fields.inc |    8 ++++----
 meta/recipes-devtools/prelink/prelink_git.bb       |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index 3c4eca4..0346ea3 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -3068,10 +3068,10 @@ RECIPE_LAST_UPDATE_pn-perl = "Oct 22, 2011"
 RECIPE_MANUAL_CHECK_DATE_pn-perl = "Nov 16, 2011"
 RECIPE_MAINTAINER_pn-perl = "Nitin A Kamble <nitin.a.kamble@intel.com>"
 
-RECIPE_STATUS_pn-prelink="red" 
-RECIPE_LATEST_VERSION_pn-prelink="1.0+git0+0x909470ee441237563d6236c505cb2d02ddc48704"
-RECIPE_LAST_UPDATE_pn-prelink = "Jul 23, 2010"
-RECIPE_MANUAL_CHECK_DATE_pn-prelink = "Dec 01, 2011"
+RECIPE_STATUS_pn-prelink="green" 
+RECIPE_LATEST_VERSION_pn-prelink="1.0+git0+0xbb1b660c5e3859b6c5a2ac8d739713e9989a4dd7"
+RECIPE_LAST_UPDATE_pn-prelink = "Dec 15, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-prelink = "Dec 15, 2011"
 RECIPE_MAINTAINER_pn-prelink = "Mark Hatle <mark.hatle@windriver.com>"
 
 RECIPE_STATUS_pn-python-dbus="green" 
diff --git a/meta/recipes-devtools/prelink/prelink_git.bb b/meta/recipes-devtools/prelink/prelink_git.bb
index af6de8e..31c22ef 100644
--- a/meta/recipes-devtools/prelink/prelink_git.bb
+++ b/meta/recipes-devtools/prelink/prelink_git.bb
@@ -8,7 +8,7 @@ and executables, so that far fewer relocations need to be resolved at \
 runtime and thus programs come up faster."
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b"
-SRCREV = "3e3f9b0876aa5ac83a783a95b8bab52cb38ed785"
+SRCREV = "bb1b660c5e3859b6c5a2ac8d739713e9989a4dd7"
 PV = "1.0+git${SRCPV}"
 PR = "r7"
 
-- 
1.7.6.4

[CONSOLIDATED PULL 19/26] insane.bbclass: add QA tests for unsafe references to exec_prefix

[Saul Wold]

From: Scott Garman <scott.a.garman@intel.com>

Files under exec_prefix (commonly /usr) may not be available during
system recovery. exec_prefix may also be kept on a separate partition
that is mounted late in the boot process.

This QA test throws an warning if a binary in base_[bindir|sbindir|libdir]
is dynamically linked to a file under exec_prefix. The intention is to
turn this into an error in the near future.

It also checks executable non-binaries (e.g, shell scripts) in the above
base directories with a simple grep test to look for references to
exec_prefix. This test only produces a warning, since false positives
are likely.

This fixes [YOCTO #1008]

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
---
 meta/classes/insane.bbclass |  111 ++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 109 insertions(+), 2 deletions(-)

diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 5726e69..b8d4507 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -11,6 +11,10 @@
 #  -Check if packages contains .debug directories or .so files
 #   where they should be in -dev or -dbg
 #  -Check if config.log contains traces to broken autoconf tests
+#  -Ensure that binaries in base_[bindir|sbindir|libdir] do not link
+#   into exec_prefix
+#  -Check that scripts in base_[bindir|sbindir|libdir] do not reference
+#   files under exec_prefix
 
 
 #
@@ -19,9 +23,14 @@
 # The package.bbclass can help us here.
 #
 inherit package
-PACKAGE_DEPENDS += "pax-utils-native desktop-file-utils-native"
+PACKAGE_DEPENDS += "pax-utils-native desktop-file-utils-native ${QADEPENDS}"
 PACKAGEFUNCS += " do_package_qa "
 
+# unsafe-references-in-binaries requires prelink-rtld from
+# prelink-native, but we don't want this DEPENDS for -native builds
+QADEPENDS = "prelink-native"
+QADEPENDS_virtclass-native = ""
+QADEPENDS_virtclass-nativesdk = ""
 
 #
 # dictionary for elf headers
@@ -100,7 +109,7 @@ def package_qa_get_machine_dict():
 
 
 # Currently not being used by default "desktop"
-WARN_QA ?= "ldflags useless-rpaths rpaths"
+WARN_QA ?= "ldflags useless-rpaths rpaths unsafe-references-in-binaries unsafe-references-in-scripts"
 ERROR_QA ?= "dev-so debug-deps dev-deps debug-files arch la2 pkgconfig la perms"
 
 def package_qa_clean_path(path,d):
@@ -201,6 +210,104 @@ def package_qa_check_perm(path,name,d, elf, messages):
     """
     return
 
+QAPATHTEST[unsafe-references-in-binaries] = "package_qa_check_unsafe_references_in_binaries"
+def package_qa_check_unsafe_references_in_binaries(path, name, d, elf, messages):
+	"""
+	Ensure binaries in base_[bindir|sbindir|libdir] do not link to files under exec_prefix
+	"""
+	if unsafe_references_skippable(path, name, d):
+		return
+
+	if elf:
+		import subprocess as sub
+		pn = d.getVar('PN', True)
+
+		exec_prefix = d.getVar('exec_prefix', True)
+		sysroot_path = d.getVar('STAGING_DIR_TARGET', True)
+		sysroot_path_usr = sysroot_path + exec_prefix
+
+		try:
+			ldd_output = sub.check_output(["prelink-rtld", "--root", sysroot_path, path])
+		except sub.CalledProcessError as e:
+			if e.returncode != 127:
+				error_msg = pn + ": prelink-rtld aborted when processing %s" % path
+				package_qa_handle_error("unsafe-references-in-binaries", error_msg, d)
+				return False
+			else:
+				# Sometimes this is done deliberately (e.g, e2fsprogs), so only warn
+				bb.warn("%s has missing library dependencies" % path)
+				return
+		if sysroot_path_usr in ldd_output:
+			error_msg = pn + ": %s links to something under exec_prefix" % path
+			package_qa_handle_error("unsafe-references-in-binaries", error_msg, d)
+			error_msg = "ldd reports: %s" % ldd_output
+			package_qa_handle_error("unsafe-references-in-binaries", error_msg, d)
+			return False
+
+QAPATHTEST[unsafe-references-in-scripts] = "package_qa_check_unsafe_references_in_scripts"
+def package_qa_check_unsafe_references_in_scripts(path, name, d, elf, messages):
+	"""
+	Warn if scripts in base_[bindir|sbindir|libdir] reference files under exec_prefix
+	"""
+	if unsafe_references_skippable(path, name, d):
+		return
+
+	if not elf:
+		import stat
+		pn = d.getVar('PN', True)
+
+		# Ensure we're checking an executable script
+		statinfo = os.stat(path)
+		if bool(statinfo.st_mode & stat.S_IXUSR):
+			# grep shell scripts for possible references to /exec_prefix/
+			exec_prefix = d.getVar('exec_prefix', True)
+			statement = "grep -e '%s/' %s > /dev/null" % (exec_prefix, path)
+			if os.system(statement) == 0:
+				error_msg = pn + ": Found a reference to %s/ in %s" % (exec_prefix, path)
+				package_qa_handle_error("unsafe-references-in-scripts", error_msg, d)
+				error_msg = "Shell scripts in base_bindir and base_sbindir should not reference anything in exec_prefix"
+				package_qa_handle_error("unsafe-references-in-scripts", error_msg, d)
+
+def unsafe_references_skippable(path, name, d):
+	if bb.data.inherits_class('native', d) or bb.data.inherits_class('nativesdk', d):
+		return True
+
+	if "-dbg" in name or "-dev" in name:
+		return True
+
+	# Other package names to skip:
+	if name.startswith("kernel-module-"):
+		return True
+
+	# Skip symlinks
+	if os.path.islink(path):
+		return True
+
+	# Skip unusual rootfs layouts which make these tests irrelevant
+	exec_prefix = d.getVar('exec_prefix', True)
+	if exec_prefix == "":
+		return True
+
+	pkgdest = d.getVar('PKGDEST', True)
+	pkgdest = pkgdest + "/" + name
+	pkgdest = os.path.abspath(pkgdest)
+	base_bindir = pkgdest + d.getVar('base_bindir', True)
+	base_sbindir = pkgdest + d.getVar('base_sbindir', True)
+	base_libdir = pkgdest + d.getVar('base_libdir', True)
+	bindir = pkgdest + d.getVar('bindir', True)
+	sbindir = pkgdest + d.getVar('sbindir', True)
+	libdir = pkgdest + d.getVar('libdir', True)
+
+	if base_bindir == bindir and base_sbindir == sbindir and base_libdir == libdir:
+		return True
+
+	# Skip files not in base_[bindir|sbindir|libdir]
+	path = os.path.abspath(path)
+	if not (base_bindir in path or base_sbindir in path or base_libdir in path):
+		return True
+
+	return False
+
 QAPATHTEST[arch] = "package_qa_check_arch"
 def package_qa_check_arch(path,name,d, elf, messages):
     """
-- 
1.7.6.4

[CONSOLIDATED PULL 20/26] gmp: Don't check "$CC $CFLAGS" for x32 in gmp configure

[Saul Wold]

From: "H.J. Lu" <hjl.tools@gmail.com>

There is no need to check "$CC $CFLAGS" for x32 in gmp configure.  The
way GMP works is that it makes all the ABIs available for the user to
pick from based on the target, but the final ABI is selected based on
the $ABI variable or if compiler passes the ABI test.  The test for
x32 ABI is

any_x32_testlist="sizeof-long-4"

GMP will select x32 ABI only if long is 4byte, which will only be set
to 4 by -mx32 passed in "$CC $CFLAGS".

Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 meta/recipes-support/gmp/gmp/gmp_fix_for_x32.patch |   24 ++++++++-----------
 1 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/meta/recipes-support/gmp/gmp/gmp_fix_for_x32.patch b/meta/recipes-support/gmp/gmp/gmp_fix_for_x32.patch
index b8e22aa..76d3a00 100644
--- a/meta/recipes-support/gmp/gmp/gmp_fix_for_x32.patch
+++ b/meta/recipes-support/gmp/gmp/gmp_fix_for_x32.patch
@@ -8,7 +8,7 @@ Signed Off By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/11/21
 
 --- gmp-4.3.2/configure.in.x32	2011-08-12 15:03:06.143548291 -0700
 +++ gmp-4.3.2/configure.in	2011-08-12 15:06:20.580595316 -0700
-@@ -1499,6 +1499,25 @@ case $host in
+@@ -1499,6 +1499,21 @@ case $host in
  	    path_64="x86_64/atom x86_64"
  	    ;;
  	esac
@@ -16,19 +16,15 @@ Signed Off By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/11/21
 +	# X32 support.
 +	case x"$path_64" in
 +	  xx86_64*)
-+	    case x"$CC $CFLAGS" in
-+	      x*-mx32*)
-+		abilist="x32 64 32"
-+		path_x32="$path_64"
-+		limb_x32=longlong
-+		cclist_x32="gcc"
-+		gcc_x32_cflags="-O2 -mx32"
-+		any_x32_testlist="sizeof-long-4"
-+		CALLING_CONVENTIONS_OBJS_x32='amd64call.lo amd64check$U.lo'
-+		SPEED_CYCLECOUNTER_OBJ_x32=x86_64.lo
-+		cyclecounter_size_x32=2
-+		;;
-+	    esac
++	    abilist="x32 64 32"
++	    path_x32="$path_64"
++	    limb_x32=longlong
++	    cclist_x32="gcc"
++	    gcc_x32_cflags="-O2 -mx32"
++	    any_x32_testlist="sizeof-long-4"
++	    CALLING_CONVENTIONS_OBJS_x32='amd64call.lo amd64check$U.lo'
++	    SPEED_CYCLECOUNTER_OBJ_x32=x86_64.lo
++	    cyclecounter_size_x32=2
 +	    ;;
 +	esac
  	;;
-- 
1.7.6.4

[CONSOLIDATED PULL 21/26] bitbake.conf multilib.conf: move the definition of baselib

[Saul Wold]

From: Nitin A Kamble <nitin.a.kamble@intel.com>

The baselib value varies with tune, even when multilib is not
configured. This commit makes the logic to find value of baselib
based on the tune available outside of multilib setup.

This Fixes bug: [YOCTO #1854]

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 meta/conf/bitbake.conf  |    2 +-
 meta/conf/multilib.conf |    2 --
 2 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 1c21616..700a40a 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -9,7 +9,7 @@
 # Used by multilib code to change the library paths
 baselib = "${BASELIB}"
 baselib[vardepvalue] = "${baselib}"
-BASELIB = "lib"
+BASELIB = "${@d.getVar('BASE_LIB_tune-' + (d.getVar('DEFAULTTUNE', True) or 'INVALID'), True) or 'lib'}"
 BASELIB_powerpc64 = "lib64"
 
 # Path prefixes
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index 87a3d86..a9448df 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -1,6 +1,4 @@
 
-baselib = "${@d.getVar('BASE_LIB_tune-' + (d.getVar('DEFAULTTUNE', True) or 'INVALID'), True) or 'lib'}"
-
 MULTILIB_VARIANTS = "${@extend_variants(d,'MULTILIBS','multilib')}"
 MULTILIB_SAVE_VARNAME = "DEFAULTTUNE"
 
-- 
1.7.6.4

[CONSOLIDATED PULL 22/26] binutils: fix building on distros with matching binutils version

[Saul Wold]

From: Nitin A Kamble <nitin.a.kamble@intel.com>

x86_64 opensuse 11.4 has bintuils version 2.21, and when
binutils_2.21 recipe is built for x86_64 target then, the invocation
of distro gcc fails with errors like this:

/usr/lib64/gcc/x86_64-suse-linux/4.5/../../../../x86_64-suse-linux/bin/as:
symbol lookup error: /usr/lib64/gcc/x86_64-suse-linux/4.5/..
make[2]: *** [sysinfo.o] Error 1

The issue rootcaused as incompatible LD_LIBRARY_PATH while running
the distro gcc.

As per Martin Jansa gentoo also sees similar issue with binutils 2.22
recipe.

This commit fixes the issue by clearing the LD_LIBRARY_PATH for
distro gcc (CC_FOR_BUILD)

This Fixes bug: [YOCTO #1833]

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 .../binutils/binutils-cross-canadian_2.22.bb       |    2 +-
 .../binutils/binutils-crosssdk_2.22.bb             |    2 +-
 meta/recipes-devtools/binutils/binutils.inc        |    2 +-
 meta/recipes-devtools/binutils/binutils_2.22.bb    |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.22.bb b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.22.bb
index e91e7dc..a49aded 100644
--- a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.22.bb
+++ b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.22.bb
@@ -1,3 +1,3 @@
 require binutils_${PV}.bb
 require binutils-cross-canadian.inc
-PR = "r1"
+PR = "r2"
diff --git a/meta/recipes-devtools/binutils/binutils-crosssdk_2.22.bb b/meta/recipes-devtools/binutils/binutils-crosssdk_2.22.bb
index 21289cd..0e8b6e4 100644
--- a/meta/recipes-devtools/binutils/binutils-crosssdk_2.22.bb
+++ b/meta/recipes-devtools/binutils/binutils-crosssdk_2.22.bb
@@ -4,7 +4,7 @@ inherit crosssdk
 
 PROVIDES = "virtual/${TARGET_PREFIX}binutils-crosssdk"
 
-PR = "r1"
+PR = "r2"
 
 do_configure_prepend () {
 	sed -i 's#/usr/local/lib /lib /usr/lib#${SDKPATHNATIVE}/lib ${SDKPATHNATIVE}/usr/lib /usr/local/lib /lib /usr/lib#' ${S}/ld/configure.tgt
diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc
index 5cb2cc9..30a0416 100644
--- a/meta/recipes-devtools/binutils/binutils.inc
+++ b/meta/recipes-devtools/binutils/binutils.inc
@@ -76,7 +76,7 @@ export RANLIB_FOR_TARGET = "${TARGET_PREFIX}ranlib"
 export CC_FOR_HOST = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
 export CXX_FOR_HOST = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
 
-export CC_FOR_BUILD = "${BUILD_CC}"
+export CC_FOR_BUILD = "LD_LIBRARY_PATH= ${BUILD_CC}"
 export CPP_FOR_BUILD = "${BUILD_CPP}"
 export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"
 
diff --git a/meta/recipes-devtools/binutils/binutils_2.22.bb b/meta/recipes-devtools/binutils/binutils_2.22.bb
index f1e7e12..41a30ee 100644
--- a/meta/recipes-devtools/binutils/binutils_2.22.bb
+++ b/meta/recipes-devtools/binutils/binutils_2.22.bb
@@ -1,6 +1,6 @@
 require binutils.inc
 
-PR = "r1"
+PR = "r2"
 
 LIC_FILES_CHKSUM="\
     file://src-release;endline=17;md5=4830a9ef968f3b18dd5e9f2c00db2d35\
-- 
1.7.6.4

[CONSOLIDATED PULL 23/26] image-types: add btrfs as a supported fstype

[Saul Wold]

From: Nitin A Kamble <nitin.a.kamble@intel.com>

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 meta/classes/image_types.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 489fbe1..6893e38 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -160,4 +160,4 @@ IMAGE_DEPENDS_ubi = "mtd-utils-native"
 IMAGE_DEPENDS_ubifs = "mtd-utils-native"
 
 # This variable is available to request which values are suitable for IMAGE_FSTYPES
-IMAGE_TYPES = "jffs2 sum.jffs2 cramfs ext2 ext2.gz ext2.bz2 ext3 ext3.gz ext2.lzma live squashfs squashfs-lzma ubi tar tar.gz tar.bz2 tar.xz cpio cpio.gz cpio.xz cpio.lzma"
+IMAGE_TYPES = "jffs2 sum.jffs2 cramfs ext2 ext2.gz ext2.bz2 ext3 ext3.gz ext2.lzma btrfs live squashfs squashfs-lzma ubi tar tar.gz tar.bz2 tar.xz cpio cpio.gz cpio.xz cpio.lzma"
-- 
1.7.6.4

[CONSOLIDATED PULL 24/26] arch-powerpc: set PACKAGE_EXTRA_ARCHS

[Saul Wold]

From: Ilya Yanok <yanok@emcraft.com>

Set PACKAGE_EXTRA_ARCHS for the generic tunes ("powerpc" and
"powerpc-nf") thus allowing to use them instead of tuning to the
specific CPU.

Signed-off-by: Ilya Yanok <yanok@emcraft.com>
---
 meta/conf/machine/include/powerpc/arch-powerpc.inc |    6 ++++--
 meta/conf/machine/include/tune-ppc603e.inc         |    2 +-
 meta/conf/machine/include/tune-ppce300c2.inc       |    2 +-
 meta/conf/machine/include/tune-ppce500mc.inc       |    2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/meta/conf/machine/include/powerpc/arch-powerpc.inc b/meta/conf/machine/include/powerpc/arch-powerpc.inc
index da1a1d6..8347f86 100644
--- a/meta/conf/machine/include/powerpc/arch-powerpc.inc
+++ b/meta/conf/machine/include/powerpc/arch-powerpc.inc
@@ -25,9 +25,11 @@ TUNE_PKGARCH ?= "${PPCPKGARCH}"
 
 # Basic tune definitions
 AVAILTUNES += "powerpc powerpc-nf" 
-TUNE_FEATURES_tune-powerpc ?= "m32 fpu-hard"
-BASE_LIB_tune-powerpc = "lib"
 TUNE_FEATURES_tune-powerpc-nf ?= "m32 fpu-soft"
 BASE_LIB_tune-powerpc-nf = "lib"
+PACKAGE_EXTRA_ARCHS_tune-powerpc-nf = "powerpc-nf"
+TUNE_FEATURES_tune-powerpc ?= "m32 fpu-hard"
+BASE_LIB_tune-powerpc = "lib"
+PACKAGE_EXTRA_ARCHS_tune-powerpc = "${PACKAGE_EXTRA_ARCHS_tune-powerpc-nf} powerpc"
 
 
diff --git a/meta/conf/machine/include/tune-ppc603e.inc b/meta/conf/machine/include/tune-ppc603e.inc
index c743dde..663f220 100644
--- a/meta/conf/machine/include/tune-ppc603e.inc
+++ b/meta/conf/machine/include/tune-ppc603e.inc
@@ -8,7 +8,7 @@ TUNE_PKGARCH = "${@bb.utils.contains('TUNE_FEATURES', 'ppc603e', 'ppc603e', '${P
 
 AVAILTUNES = "ppc603e"
 TUNE_FEATURES_tune-ppc603e = "m32 fpu-hard ppc603e"
-PACKAGE_EXTRA_ARCHS_tune-ppc603e = "powerpc ppc603e"
+PACKAGE_EXTRA_ARCHS_tune-ppc603e = "${PACKAGE_EXTRA_ARCHS_tune-powerpc} ppc603e"
 
 # glibc configure options to get 603e specific library (for sqrt)
 GLIBC_EXTRA_OECONF += "${@bb.utils.contains("TUNE_FEATURES", "ppc603e", "-with-cpu=603e", "", d)}"
diff --git a/meta/conf/machine/include/tune-ppce300c2.inc b/meta/conf/machine/include/tune-ppce300c2.inc
index 5eea4a6..bdca1aa 100644
--- a/meta/conf/machine/include/tune-ppce300c2.inc
+++ b/meta/conf/machine/include/tune-ppce300c2.inc
@@ -8,4 +8,4 @@ TUNE_PKGARCH = "${@bb.utils.contains("TUNE_FEATURES", "ppce300c2", "ppce300c2",
 
 AVAILTUNES += "ppce300c2"
 TUNE_FEATURES_tune-ppce300c2 = "m32 fpu-soft ppce300c2"
-PACKAGE_EXTRA_ARCHS_tune-ppce300c2 = "powerpc-nf ppce300c2"
+PACKAGE_EXTRA_ARCHS_tune-ppce300c2 = "${PACKAGE_EXTRA_ARCHS_tune-powerpc-nf} ppce300c2"
diff --git a/meta/conf/machine/include/tune-ppce500mc.inc b/meta/conf/machine/include/tune-ppce500mc.inc
index 33820ef..950c46d 100644
--- a/meta/conf/machine/include/tune-ppce500mc.inc
+++ b/meta/conf/machine/include/tune-ppce500mc.inc
@@ -8,7 +8,7 @@ TUNE_PKGARCH = "${@bb.utils.contains("TUNE_FEATURES", "ppce500mc", "ppce500mc",
 
 AVAILTUNES = "ppce500mc"
 TUNE_FEATURES_tune-ppce500mc = "m32 fpu-hard ppce500mc"
-PACKAGE_EXTRA_ARCHS_tune-ppce500mc = "powerpc ppce500mc"
+PACKAGE_EXTRA_ARCHS_tune-ppce500mc = "${PACKAGE_EXTRA_ARCHS_tune-powerpc} ppce500mc"
 
 # glibc configure options to get e500mc specific library (for sqrt)
 GLIBC_EXTRA_OECONF += "${@bb.utils.contains("TUNE_FEATURES", "ppce500mc", "-with-cpu=e500mc", "", d)}"
-- 
1.7.6.4

[CONSOLIDATED PULL 25/26] zypper: add patch from libxml2

[Saul Wold]

Due to Augaes adding the libxml2 requirement.

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../zypper/zypper/cmake_libxml2.patch              |   28 ++++++++++++++++++++
 meta/recipes-extended/zypper/zypper_git.bb         |    3 +-
 2 files changed, 30 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-extended/zypper/zypper/cmake_libxml2.patch

diff --git a/meta/recipes-extended/zypper/zypper/cmake_libxml2.patch b/meta/recipes-extended/zypper/zypper/cmake_libxml2.patch
new file mode 100644
index 0000000..8cda7a4
--- /dev/null
+++ b/meta/recipes-extended/zypper/zypper/cmake_libxml2.patch
@@ -0,0 +1,28 @@
+Upstream-Status: Pending
+
+Signed-off-by: Saul Wold <sgw@linux.intel.com>
+
+Index: git/CMakeLists.txt
+===================================================================
+--- git.orig/CMakeLists.txt	2011-12-20 15:13:59.851209493 -0800
++++ git/CMakeLists.txt	2011-12-20 15:14:51.167211302 -0800
+@@ -25,6 +25,9 @@
+ PKG_CHECK_MODULES(RPM REQUIRED rpm)
+ INCLUDE_DIRECTORIES( ${RPM_INCLUDE_DIRS} )
+ 
++PKG_CHECK_MODULES(LIBXML REQUIRED libxml-2.0)
++INCLUDE_DIRECTORIES( ${LIBXML_INCLUDE_DIRS} )
++
+ FIND_PACKAGE( Zypp REQUIRED )
+ IF( ZYPP_FOUND )
+   INCLUDE_DIRECTORIES(${ZYPP_INCLUDE_DIR})
+@@ -70,6 +73,9 @@
+ INCLUDE(CTest)
+ ENABLE_TESTING()
+ 
++# New Augeas requires libxml now
++PKG_CHECK_MODULES(LIBXML REQUIRED libxml-2.0)
++INCLUDE_DIRECTORIES( ${LIBXML_INCLUDE_DIRS} )
+ 
+ # documentation too important to be hidden in doc:
+ INSTALL(
diff --git a/meta/recipes-extended/zypper/zypper_git.bb b/meta/recipes-extended/zypper/zypper_git.bb
index 4f4fc4d..e5963be 100644
--- a/meta/recipes-extended/zypper/zypper_git.bb
+++ b/meta/recipes-extended/zypper/zypper_git.bb
@@ -5,13 +5,14 @@ LICENSE  = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=3201406e350b39e05a82e28b5020f413"
 
 DEPENDS  = "libzypp augeas"
-PR = "r6"
+PR = "r1"
 SRCREV = "2c5bb6ceb99ecd950ef993e43d77bf0569ea0582"
 
 inherit cmake
 
 SRC_URI = "git://github.com/openSUSE/zypper.git;protocol=git \
            file://cmake.patch \
+           file://cmake_libxml2.patch \
            file://dso_linking_change_build_fix.patch \
            file://rpm5-flag.patch \
           "
-- 
1.7.6.4

[CONSOLIDATED PULL 26/26] bash: Add SRC_URI Checksums for GPLv2

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-extended/bash/bash_3.2.48.bb |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/meta/recipes-extended/bash/bash_3.2.48.bb b/meta/recipes-extended/bash/bash_3.2.48.bb
index 1f70263..f10f687 100644
--- a/meta/recipes-extended/bash/bash_3.2.48.bb
+++ b/meta/recipes-extended/bash/bash_3.2.48.bb
@@ -22,6 +22,9 @@ SRC_URI[patch002.sha256sum] = "081bb03c580ecee63ba03b40beb3caf509eca29515b2e8dd3
 SRC_URI[patch003.md5sum] = "15c6653042e9814aa87120098fc7a849"
 SRC_URI[patch003.sha256sum] = "354886097cd95b4def77028f32ee01e2e088d58a98184fede9d3ce9320e218ef"
 
+SRC_URI[md5sum] = "338dcf975a93640bb3eaa843ca42e3f8"
+SRC_URI[sha256sum] = "128d281bd5682ba5f6953122915da71976357d7a76490d266c9173b1d0426348"
+
 inherit autotools gettext
 
 PARALLEL_MAKE = ""
-- 
1.7.6.4

Re: [CONSOLIDATED PULL 12/26] ncurses: move libraries to base_libdir

[Phil Blundell]

On Wed, 2011-12-21 at 23:55 -0800, Saul Wold wrote:
> +BUILD_LDFLAGS += "-Wl,-rpath,${base_libdir}"

Why is that required?

p.

Re: [CONSOLIDATED PULL 19/26] insane.bbclass: add QA tests for unsafe references to exec_prefix

[Phil Blundell]

On Wed, 2011-12-21 at 23:55 -0800, Saul Wold wrote:
> +		exec_prefix = d.getVar('exec_prefix', True)
> +		sysroot_path = d.getVar('STAGING_DIR_TARGET', True)
> +		sysroot_path_usr = sysroot_path + exec_prefix
> +
> +		try:
> +			ldd_output = sub.check_output(["prelink-rtld", "--root", sysroot_path, path])
> +		except sub.CalledProcessError as e:
> +			if e.returncode != 127:
> +				error_msg = pn + ": prelink-rtld aborted when processing %s" % path
> +				package_qa_handle_error("unsafe-references-in-binaries", error_msg, d)
> +				return False
> +			else:
> +				# Sometimes this is done deliberately (e.g, e2fsprogs), so only warn
> +				bb.warn("%s has missing library dependencies" % path)
> +				return
> +		if sysroot_path_usr in ldd_output:
> +			error_msg = pn + ": %s links to something under exec_prefix" % path
> +			package_qa_handle_error("unsafe-references-in-binaries", error_msg, d)
> +			error_msg = "ldd reports: %s" % ldd_output
> +			package_qa_handle_error("unsafe-references-in-binaries", error_msg, d)
> +			return False

Is that going to do the right thing if ${prefix} == ${exec_prefix}?
It's not obvious to me that it will handle that case correctly.

p.

Re: [CONSOLIDATED PULL 00/26] Some Package Updates and Fixes

[Richard Purdie]

On Wed, 2011-12-21 at 23:55 -0800, Saul Wold wrote:
> Dexuan Cui (2):
>   socat: add the latest stable version 1.7.2.0
>   wget: fix a host intrusion issue introduced by adding
>     --with-ssl=openssl.
> 
> H.J. Lu (1):
>   gmp: Don't check "$CC $CFLAGS" for x32 in gmp configure
> 
> Ilya Yanok (1):
>   arch-powerpc: set PACKAGE_EXTRA_ARCHS
> 
> Nitin A Kamble (3):
>   bitbake.conf multilib.conf: move the definition of baselib

I didn't take the above, this is a major layout change for x86-64 but
Nitin makes no comment on that in the commit :(

>   binutils: fix building on distros with matching binutils version
>   image-types: add btrfs as a supported fstype
> 
> Paul Eggleton (1):
>   libsync: move to git.yoctoproject.org
> 
> Saul Wold (10):
>   distro tracking: update man-pages, gts-plugin-bluetooth, usbutils,
>   python-pycairo: Upgrade to 1.10.0
>   augeas: Upgrade to 0.10.0
>   libidn: Upgrade to 1.23
>   mc: Add version 4.8.1 now GPLv3
>   texi2html: Upgrade to 5.0
>   libdrm: Upgrade to 2.4.29
>   distro_tracking: Mark Upgrade Info
>   zypper: add patch from libxml2
>   bash: Add SRC_URI Checksums for GPLv2
> 
> Scott Garman (8):
>   ncurses: move libraries to base_libdir
>   libcap: move library to base_libdir
>   util-linux: move libraries to base_libdir
>   e2fsprogs: move libraries to base_libdir
>   libusb1: move libraries to base_libdir
>   libusb-compat: move libraries to base_libdir
>   prelink: update to latest git version
>   insane.bbclass: add QA tests for unsafe references to exec_prefix

Were Scott's changes tested with prefix == exec_prefix == base_prefix?
We need to verify this doesn't break in that case.

Cheers,

Richard

Re: [CONSOLIDATED PULL 12/26] ncurses: move libraries to base_libdir

[Scott Garman]

On 12/22/2011 12:50 AM, Phil Blundell wrote:
> On Wed, 2011-12-21 at 23:55 -0800, Saul Wold wrote:
>> +BUILD_LDFLAGS += "-Wl,-rpath,${base_libdir}"
>
> Why is that required?

It's actually needed only for the -native case, so that the tic command 
(and possibly others) can be run.

I take it I should have done:

BUILD_LDFLAGS_virtclass_native +=

instead?

Scott

-- 
Scott Garman
Embedded Linux Engineer - Yocto Project
Intel Open Source Technology Center

Re: [CONSOLIDATED PULL 19/26] insane.bbclass: add QA tests for unsafe references to exec_prefix

[Scott Garman]

On 12/22/2011 01:02 AM, Phil Blundell wrote:
> On Wed, 2011-12-21 at 23:55 -0800, Saul Wold wrote:
>> +		exec_prefix = d.getVar('exec_prefix', True)
>> +		sysroot_path = d.getVar('STAGING_DIR_TARGET', True)
>> +		sysroot_path_usr = sysroot_path + exec_prefix
>> +
>> +		try:
>> +			ldd_output = sub.check_output(["prelink-rtld", "--root", sysroot_path, path])
>> +		except sub.CalledProcessError as e:
>> +			if e.returncode != 127:
>> +				error_msg = pn + ": prelink-rtld aborted when processing %s" % path
>> +				package_qa_handle_error("unsafe-references-in-binaries", error_msg, d)
>> +				return False
>> +			else:
>> +				# Sometimes this is done deliberately (e.g, e2fsprogs), so only warn
>> +				bb.warn("%s has missing library dependencies" % path)
>> +				return
>> +		if sysroot_path_usr in ldd_output:
>> +			error_msg = pn + ": %s links to something under exec_prefix" % path
>> +			package_qa_handle_error("unsafe-references-in-binaries", error_msg, d)
>> +			error_msg = "ldd reports: %s" % ldd_output
>> +			package_qa_handle_error("unsafe-references-in-binaries", error_msg, d)
>> +			return False
>
> Is that going to do the right thing if ${prefix} == ${exec_prefix}?
> It's not obvious to me that it will handle that case correctly.

The function unsafe_references_skippable checks if exec_prefix == "" and 
also if base_bindir == bindir and base_sbindir == sbindir and 
base_libdir == libdir. Would that cover this case, or should this check 
be made explicit?

Scott

-- 
Scott Garman
Embedded Linux Engineer - Yocto Project
Intel Open Source Technology Center

Re: [CONSOLIDATED PULL 12/26] ncurses: move libraries to base_libdir

[Scott Garman]

On 12/22/2011 08:12 AM, Scott Garman wrote:
> On 12/22/2011 12:50 AM, Phil Blundell wrote:
>> On Wed, 2011-12-21 at 23:55 -0800, Saul Wold wrote:
>>> +BUILD_LDFLAGS += "-Wl,-rpath,${base_libdir}"
>>
>> Why is that required?
>
> It's actually needed only for the -native case, so that the tic command
> (and possibly others) can be run.
>
> I take it I should have done:
>
> BUILD_LDFLAGS_virtclass_native +=

Having tested this, it actually doesn't work.

Scott

-- 
Scott Garman
Embedded Linux Engineer - Yocto Project
Intel Open Source Technology Center

Re: [CONSOLIDATED PULL 12/26] ncurses: move libraries to base_libdir

[Paul Eggleton]

On Thursday 22 December 2011 21:30:56 Scott Garman wrote:
> On 12/22/2011 08:12 AM, Scott Garman wrote:
> > On 12/22/2011 12:50 AM, Phil Blundell wrote:
> >> On Wed, 2011-12-21 at 23:55 -0800, Saul Wold wrote:
> >>> +BUILD_LDFLAGS += "-Wl,-rpath,${base_libdir}"
> >> 
> >> Why is that required?
> > 
> > It's actually needed only for the -native case, so that the tic command
> > (and possibly others) can be run.
> > 
> > I take it I should have done:
> > 
> > BUILD_LDFLAGS_virtclass_native +=
> 
> Having tested this, it actually doesn't work.

Were you doing virtclass_native or virtclass-native? If the former I think the 
latter is what you need.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre

Re: [CONSOLIDATED PULL 12/26] ncurses: move libraries to base_libdir

[Scott Garman]

On 12/23/2011 12:18 AM, Paul Eggleton wrote:
> On Thursday 22 December 2011 21:30:56 Scott Garman wrote:
>> On 12/22/2011 08:12 AM, Scott Garman wrote:
>>> On 12/22/2011 12:50 AM, Phil Blundell wrote:
>>>> On Wed, 2011-12-21 at 23:55 -0800, Saul Wold wrote:
>>>>> +BUILD_LDFLAGS += "-Wl,-rpath,${base_libdir}"
>>>>
>>>> Why is that required?
>>>
>>> It's actually needed only for the -native case, so that the tic command
>>> (and possibly others) can be run.
>>>
>>> I take it I should have done:
>>>
>>> BUILD_LDFLAGS_virtclass_native +=
>>
>> Having tested this, it actually doesn't work.
>
> Were you doing virtclass_native or virtclass-native? If the former I think the
> latter is what you need.

Whoops, you're right.

Scott

-- 
Scott Garman
Embedded Linux Engineer - Yocto Project
Intel Open Source Technology Center