[PATCH 0/5] Small fixes

[PATCH 0/5] Small fixes

[Martin Jansa]

The following changes since commit e876a44fa8ed0aa2e09084c1e7ddfc876c3f981b:

  cml1/kernel: Update do_menuconfig to use oe.terminal() (2011-09-15 11:22:39 +0100)

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

Martin Jansa (5):
  openssh: update init script to create ECDSA keys if needed
  task-core-boot: allow distributions to define login and init manager
  subversion: remove neon-detection.patch and --with-neon option
  abiword: be carefull with # comments ending with backslash
  claws-mail: be carefull with # comments ending with backslash

 .../recipes-gnome/abiword/abiword-2.5.inc          |    5 +++--
 meta-demoapps/recipes-gnome/abiword/abiword.inc    |    3 ++-
 .../recipes-sato/claws-mail/claws-mail.inc         |    5 +++--
 .../openssh/openssh-5.8p2/init                     |    4 ++++
 meta/recipes-connectivity/openssh/openssh_5.8p2.bb |    2 +-
 meta/recipes-core/tasks/task-core-boot.bb          |    8 ++++++--
 .../subversion/subversion/neon-detection.patch     |   15 ---------------
 .../subversion/subversion_1.6.15.bb                |    5 ++---
 8 files changed, 21 insertions(+), 26 deletions(-)
 delete mode 100644 meta/recipes-devtools/subversion/subversion/neon-detection.patch

-- 
1.7.6.1

[PATCH 1/5] openssh: update init script to create ECDSA keys if needed

[Martin Jansa]

* Starting with openssh-5.8p1, the server will default to a newer key
  algorithm (ECDSA).

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../openssh/openssh-5.8p2/init                     |    4 ++++
 meta/recipes-connectivity/openssh/openssh_5.8p2.bb |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-connectivity/openssh/openssh-5.8p2/init b/meta/recipes-connectivity/openssh/openssh-5.8p2/init
index b16cbd6..055dd22 100644
--- a/meta/recipes-connectivity/openssh/openssh-5.8p2/init
+++ b/meta/recipes-connectivity/openssh/openssh-5.8p2/init
@@ -36,6 +36,10 @@ check_keys() {
 		echo "  generating ssh RSA key..."
 		ssh-keygen -q -f /etc/ssh/ssh_host_rsa_key -N '' -t rsa
 	fi
+	if [ ! -f /etc/ssh/ssh_host_ecdsa_key ]; then
+		echo "  generating ssh ECDSA key..."
+		ssh-keygen -q -f /etc/ssh/ssh_host_ecdsa_key -N '' -t ecdsa
+	fi
 	if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then
 		echo "  generating ssh DSA key..."
 		ssh-keygen -q -f /etc/ssh/ssh_host_dsa_key -N '' -t dsa
diff --git a/meta/recipes-connectivity/openssh/openssh_5.8p2.bb b/meta/recipes-connectivity/openssh/openssh_5.8p2.bb
index 89b011d..030a83b 100644
--- a/meta/recipes-connectivity/openssh/openssh_5.8p2.bb
+++ b/meta/recipes-connectivity/openssh/openssh_5.8p2.bb
@@ -7,7 +7,7 @@ SECTION = "console/network"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://LICENCE;md5=bae9a689be41581503bcf95d8fb42c4e"
 
-PR = "r1"
+PR = "r2"
 
 DEPENDS = "zlib openssl"
 DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
-- 
1.7.6.1

[PATCH 2/5] task-core-boot: allow distributions to define login and init manager

[Martin Jansa]

* for example someone prefers shadow instead of tinylogin and upstart instead of sysvinit

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-core/tasks/task-core-boot.bb |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/tasks/task-core-boot.bb b/meta/recipes-core/tasks/task-core-boot.bb
index 9116c38..9e63ebb 100644
--- a/meta/recipes-core/tasks/task-core-boot.bb
+++ b/meta/recipes-core/tasks/task-core-boot.bb
@@ -19,6 +19,10 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
 
 # Distro can override dev_manager provider
 VIRTUAL-RUNTIME_dev_manager ?= "udev"
+# Distro can override login_manager provider
+VIRTUAL-RUNTIME_login_manager ?= "tinylogin"
+# Distro can override init_manager provider
+VIRTUAL-RUNTIME_init_manager ?= "sysvinit"
 
 PACKAGES = "\
     task-core-boot \
@@ -34,8 +38,8 @@ RDEPENDS_task-core-boot = "\
     ${@base_contains("MACHINE_FEATURES", "keyboard", "keymaps", "", d)} \
     modutils-initscripts \
     netbase \
-    sysvinit \
-    tinylogin \
+    ${VIRTUAL-RUNTIME_login_manager} \
+    ${VIRTUAL-RUNTIME_init_manager} \
     ${VIRTUAL-RUNTIME_dev_manager} \
     ${VIRTUAL-RUNTIME_update-alternatives} \
     ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}"
-- 
1.7.6.1

[PATCH 3/5] subversion: remove neon-detection.patch and --with-neon option

[Martin Jansa]

* upstream detection seems to be doing its job right now
* I don't see how this is supposed to work
  --      neon_config="$withval/bin/neon-config"
  -+      neon_config="env env PKG_CONFIG_PATH=${withval}:${PKG_CONFIG_PATH} pkg-config neon"
  when neon_config should be sysroots/nokia900/usr/bin/crossscripts/neon-config
"

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../subversion/subversion/neon-detection.patch     |   15 ---------------
 .../subversion/subversion_1.6.15.bb                |    5 ++---
 2 files changed, 2 insertions(+), 18 deletions(-)
 delete mode 100644 meta/recipes-devtools/subversion/subversion/neon-detection.patch

diff --git a/meta/recipes-devtools/subversion/subversion/neon-detection.patch b/meta/recipes-devtools/subversion/subversion/neon-detection.patch
deleted file mode 100644
index 2a9cf1f..0000000
--- a/meta/recipes-devtools/subversion/subversion/neon-detection.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-Index: subversion-1.6.13/build/ac-macros/neon.m4
-===================================================================
---- subversion-1.6.13.orig/build/ac-macros/neon.m4
-+++ subversion-1.6.13/build/ac-macros/neon.m4
-@@ -42,7 +42,7 @@ AC_DEFUN(SVN_LIB_NEON,
-         AC_MSG_ERROR([--with-neon requires an argument.])
-       fi
-     else
--      neon_config="$withval/bin/neon-config"
-+      neon_config="env env PKG_CONFIG_PATH=${withval}:${PKG_CONFIG_PATH} pkg-config neon"
-     fi
- 
-     SVN_NEON_CONFIG()
diff --git a/meta/recipes-devtools/subversion/subversion_1.6.15.bb b/meta/recipes-devtools/subversion/subversion_1.6.15.bb
index 4e77e2e..9a9484f 100644
--- a/meta/recipes-devtools/subversion/subversion_1.6.15.bb
+++ b/meta/recipes-devtools/subversion/subversion_1.6.15.bb
@@ -5,11 +5,10 @@ RDEPENDS_${PN} = "neon"
 LICENSE = "Apache-2"
 HOMEPAGE = "http://subversion.tigris.org"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://subversion.tigris.org/downloads/${BPN}-${PV}.tar.bz2 \
            file://disable-revision-install.patch \
-	   file://neon-detection.patch \
 	   file://libtool2.patch"
 
 SRC_URI[md5sum] = "113fca1d9e4aa389d7dc2b210010fa69"
@@ -17,7 +16,7 @@ SRC_URI[sha256sum] = "b2919d603a5f3c19f42e3265c4b930e2376c43b3969b90ef9c42b2f72d
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=2a69fef414e2cb907b4544298569300b"
 
-EXTRA_OECONF = "--with-neon=${STAGING_EXECPREFIXDIR} \
+EXTRA_OECONF = " \
                 --without-berkeley-db --without-apxs --without-apache \
                 --without-swig --with-apr=${STAGING_BINDIR_CROSS} \
                 --with-apr-util=${STAGING_BINDIR_CROSS}"
-- 
1.7.6.1

[PATCH 4/5] abiword: be carefull with # comments ending with backslash

[Martin Jansa]

* next line after #foo \ is not parsed correctly!
* but http://bugzilla.pokylinux.org/show_bug.cgi?id=813 says NOTABUG, so be *very carefull*

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-gnome/abiword/abiword-2.5.inc          |    5 +++--
 meta-demoapps/recipes-gnome/abiword/abiword.inc    |    3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/meta-demoapps/recipes-gnome/abiword/abiword-2.5.inc b/meta-demoapps/recipes-gnome/abiword/abiword-2.5.inc
index e3f6a9d..ce537df 100644
--- a/meta-demoapps/recipes-gnome/abiword/abiword-2.5.inc
+++ b/meta-demoapps/recipes-gnome/abiword/abiword-2.5.inc
@@ -17,8 +17,6 @@ FILES_${PN} += " \
 		${datadir}/abiword-${SHRT_VER}/scripts \
 		${datadir}/abiword-${SHRT_VER}/system.profile-en \
 		${datadir}/abiword-${SHRT_VER}/system.profile-en_GB \
-#		${datadir}/abiword-${SHRT_VER}/templates/A4.awt \
-#		${datadir}/abiword-${SHRT_VER}/templates/US-Letter.awt \
 		${datadir}/abiword-${SHRT_VER}/templates/normal.awt \
 		${datadir}/abiword-${SHRT_VER}/templates/normal.awt-en_GB \
 		${datadir}/abiword-${SHRT_VER}/templates/Employee-Directory.awt \
@@ -29,6 +27,9 @@ FILES_${PN} += " \
 		${datadir}/abiword-${SHRT_VER}/templates/Memo.awt \
 		${datadir}/abiword-${SHRT_VER}/templates/Press-Release.awt "
 
+#		${datadir}/abiword-${SHRT_VER}/templates/A4.awt \
+#		${datadir}/abiword-${SHRT_VER}/templates/US-Letter.awt \
+
 inherit autotools pkgconfig
 
 PARALLEL_MAKE = ""
diff --git a/meta-demoapps/recipes-gnome/abiword/abiword.inc b/meta-demoapps/recipes-gnome/abiword/abiword.inc
index 5d7e3ce..b1b0f67 100644
--- a/meta-demoapps/recipes-gnome/abiword/abiword.inc
+++ b/meta-demoapps/recipes-gnome/abiword/abiword.inc
@@ -25,9 +25,10 @@ FILES_${PN} += " \
 		${datadir}/abiword-${SHRT_VER}/glade \
 		${datadir}/abiword-${SHRT_VER}/system.profile-en \
 		${datadir}/abiword-${SHRT_VER}/system.profile-en-GB \
+  "
+
 #		${datadir}/abiword-${SHRT_VER}/templates/normal.awt \
 #		${datadir}/abiword-${SHRT_VER}/templates/normal.awt-en_GB \
-  "
 
 inherit autotools pkgconfig
 
-- 
1.7.6.1

[PATCH 5/5] claws-mail: be carefull with # comments ending with backslash

[Martin Jansa]

* next line after #foo \ is not parsed correctly!
* but http://bugzilla.pokylinux.org/show_bug.cgi?id=813 says NOTABUG, so
  be *very carefull*

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-sato/claws-mail/claws-mail.inc         |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta-demoapps/recipes-sato/claws-mail/claws-mail.inc b/meta-demoapps/recipes-sato/claws-mail/claws-mail.inc
index 04401df..b9fa4d9 100644
--- a/meta-demoapps/recipes-sato/claws-mail/claws-mail.inc
+++ b/meta-demoapps/recipes-sato/claws-mail/claws-mail.inc
@@ -22,7 +22,6 @@ FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications"
 EXTRA_OECONF = "--disable-aspell-test 		\
 		--disable-aspell 		\
 		--disable-manual		\
-#  		--disable-openssl 		\
 		--disable-crash-dialog		\
 		--disable-jpilot		\
 		--disable-trayicon-plugin	\
@@ -33,12 +32,14 @@ EXTRA_OECONF = "--disable-aspell-test 		\
 		--disable-pgpinline-plugin	\
   		--disable-dillo-viewer-plugin	\
 		--disable-clamav-plugin		\
-#		--disable-libetpan		\
 		--disable-gnomeprint		\
 		--disable-valgrind		\
     --disable-static    \
 		"
 
+#  		--disable-openssl 		\
+#		--disable-libetpan		\
+
 CFLAGS += "-D_GNU_SOURCE"
 
 inherit autotools pkgconfig gettext
-- 
1.7.6.1

Re: [PATCH 0/5] Small fixes

[Richard Purdie]

On Thu, 2011-09-15 at 16:24 +0200, Martin Jansa wrote:
> The following changes since commit e876a44fa8ed0aa2e09084c1e7ddfc876c3f981b:
> 
>   cml1/kernel: Update do_menuconfig to use oe.terminal() (2011-09-15 11:22:39 +0100)
> 
> are available in the git repository at:
>   git://git.openembedded.org/openembedded-core-contrib jansa/pull
>   http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/pull
> 
> Martin Jansa (5):
>   openssh: update init script to create ECDSA keys if needed
>   task-core-boot: allow distributions to define login and init manager
>   subversion: remove neon-detection.patch and --with-neon option
>   abiword: be carefull with # comments ending with backslash
>   claws-mail: be carefull with # comments ending with backslash

Merged to master, thanks.

Richard