merge of 5ea9eb6f097fe0b646889d1b3a1312d9d7fc796e

     and 67adbb4efb9e9642f8b5476abd6692720c8cd642

6 files changed, 13 insertions, 84 deletions

diff --git a/packages/esmtp/esmtp_0.4.1.bb b/packages/esmtp/esmtp_0.5.1.bb
index 081c7ab208..2ab587a505 100644
--- a/packages/esmtp/esmtp_0.4.1.bb
+++ b/packages/esmtp/esmtp_0.5.1.bb
@@ -1,10 +1,10 @@
-SECTION = "console/network"
-LICENSE = "GPL"
-DEPENDS = "libesmtp"
 DESCRIPTION = "ESMTP is a user-configurable relay-only MTA \
 with a sendmail-compatible syntax, based on libESMTP and \
 supporting the AUTH (including the CRAM-MD5 and NTLM SASL \
 mechanisms) and StartTLS SMTP extensions."
+SECTION = "console/network"
+LICENSE = "GPL"
+DEPENDS = "libesmtp"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/esmtp/esmtp-${PV}.tar.bz2"
 
diff --git a/packages/libesmtp/libesmtp-1.0.1/.mtn2git_empty b/packages/libesmtp/libesmtp-1.0.1/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/libesmtp/libesmtp-1.0.1/.mtn2git_empty
+++ /dev/null
diff --git a/packages/libesmtp/libesmtp-1.0.1/configure.patch b/packages/libesmtp/libesmtp-1.0.1/configure.patch
deleted file mode 100644
index 5058db4b99..0000000000
--- a/packages/libesmtp/libesmtp-1.0.1/configure.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- libesmtp-1.0.1/configure.in~configure	2003-09-11 17:23:26.000000000 -0400
-+++ libesmtp-1.0.1/configure.in	2004-01-20 11:59:35.000000000 -0500
-@@ -231,7 +231,7 @@
- 	if test x$enable_emulate_getaddrinfo != xyes ; then
- 		AC_MSG_ERROR([getaddrinfo not found: try --with-lwres or --enable-emulate-getaddrinfo])
- 	fi
--	LIBOBJS="$LIBOBJS getaddrinfo.o"
-+	AC_LIBOBJ([getaddrinfo])
- fi
- 
- if test x"$enable_emulate_getaddrinfo" != xno ; then
-@@ -259,7 +259,7 @@
- 	AC_SEARCH_LIBS(gethostbyname, resolv bind nsl, ,
- 		       [AC_MSG_ERROR([cannot find gethostbyname])])
-     fi
--    LIBOBJS="$LIBOBJS gethostbyname.o"
-+    AC_LIBOBJ([gethostbyname])
- 
-     AC_CACHE_CHECK([for IPv6 support], acx_cv_sys_use_ipv6, [
- 	    AC_TRY_COMPILE([
-@@ -572,7 +572,7 @@
- dnl #########################################################################
- dnl Check that snprintf works correctly.
- dnl #########################################################################
--ACX_SNPRINTF(,[LIBOBJS="$LIBOBJS snprintf.o"])
-+ACX_SNPRINTF(,[AC_LIBOBJ([snprintf])])
- 
- dnl #########################################################################
- dnl Make substitutions
-@@ -588,8 +588,8 @@
- AC_SUBST(RANLIB)
- AC_SUBST(subdirs)
- 
--LTLIBOBJS=`echo "$LIBOBJS" | sed ['s/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/']`
--AC_SUBST(LTLIBOBJS)
-+#LTLIBOBJS=`echo "$LIBOBJS" | sed ['s/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/']`
-+#AC_SUBST(LTLIBOBJS)
- LTALLOCA=`echo "$ALLOCA" | sed ['s/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/']`
- AC_SUBST(LTALLOCA)
- 
diff --git a/packages/libesmtp/libesmtp_1.0.1.bb b/packages/libesmtp/libesmtp_1.0.1.bb
deleted file mode 100644
index fe6d958f1b..0000000000
--- a/packages/libesmtp/libesmtp_1.0.1.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-SECTION = "libs"
-DEPENDS = "openssl"
-DESCRIPTION = "LibESMTP is a library to manage posting \
-(or submission of) electronic mail using SMTP to a \
-preconfigured Mail Transport Agent (MTA) such as Exim."
-FILES_libesmtp_append = " ${libdir}/esmtp-plugins"
-
-SRC_URI = "http://www.stafford.uklinux.net/libesmtp/libesmtp-${PV}.tar.bz2  \
-           file://configure.patch;patch=1"
-LICENSE = "LGPL GPL"
-inherit autotools 
-
-EXTRA_OECONF = "--disable-isoc --with-openssl=${STAGING_LIBDIR}/.."
-
-do_stage () {
-	oe_libinstall -a -so libesmtp ${STAGING_LIBDIR}
-
-        install -d ${STAGING_INCDIR}
-	install -m 644 auth-client.h ${STAGING_INCDIR}
-	install -m 644 auth-plugin.h ${STAGING_INCDIR}
-	install -m 644 libesmtp.h ${STAGING_INCDIR}
-}
diff --git a/packages/libesmtp/libesmtp_1.0.3r1.bb b/packages/libesmtp/libesmtp_1.0.4.bb
index baff0d8931..294333c579 100644
--- a/packages/libesmtp/libesmtp_1.0.3r1.bb
+++ b/packages/libesmtp/libesmtp_1.0.4.bb
@@ -1,22 +1,19 @@
-LICENSE = "GPL"
-SECTION = "libs"
-DEPENDS = "openssl"
 DESCRIPTION = "LibESMTP is a library to manage posting \
 (or submission of) electronic mail using SMTP to a \
-preconfigured Mail Transport Agent (MTA) such as Exim."
-FILES_libesmtp_append = " ${libdir}/esmtp-plugins"
+preconfigured Mail Transport Agent (MTA) such as Exim or PostFix."
+LICENSE = "GPL"
+SECTION = "libs/network"
+DEPENDS = "openssl"
+PR = "r1"
 
 SRC_URI = "http://www.stafford.uklinux.net/libesmtp/libesmtp-${PV}.tar.bz2"
 
-inherit autotools 
+inherit autotools binconfig
 
 EXTRA_OECONF = "--disable-isoc --with-openssl=${STAGING_LIBDIR}/.."
 
-do_stage () {
-	oe_libinstall -a -so libesmtp ${STAGING_LIBDIR}
-
-        install -d ${STAGING_INCDIR}
-	install -m 644 auth-client.h ${STAGING_INCDIR}
-	install -m 644 auth-plugin.h ${STAGING_INCDIR}
-	install -m 644 libesmtp.h ${STAGING_INCDIR}
+do_stage() {
+	autotools_stage_all
 }
+
+FILES_libesmtp_append = " ${libdir}/esmtp-plugins"
diff --git a/packages/sudo/sudo.inc b/packages/sudo/sudo.inc
index 92d3c47266..0dfb22ba8a 100644
--- a/packages/sudo/sudo.inc
+++ b/packages/sudo/sudo.inc
@@ -1,4 +1,3 @@
-SECTION = "base"
 DESCRIPTION = "Sudo (superuser do) allows a system \
 administrator to give certain users (or groups of \
 users) the ability to run some (or all) commands \