Skip to contentSkip to conversation

opensp and openssh recipe upgrades

PATCH Applied Scott Garman 2 participants 5 messages May 7, 2012 – May 8, 2012

lore
Share & tools
lore
#0 lore raw

cover opensp and openssh recipe upgrades

Hello,

This pull request includes upgrades for the opensp and openssh recipes. They have been build-tested on all 5 of our QEMU architectures. The distro tracking updates include a couple of recipes that I missed in previous pull requests.

Scott

The following changes since commit 2929e7d590862d9649458c90804e79a1dce40423:

glib-2.0: Fix issues with libelf dependency creeping in (2012-05-07 10:53:24 +0100)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib sgarman/recipe-upgrades-oe
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=sgarman/recipe-upgrades-oe

Scott Garman (3):
openssh: upgrade to 6.0p1
opensp: upgrade to 1.5.2
distro_tracking: updates for upgraded recipes

 .../conf/distro/include/distro_tracking_fields.inc |   25 +-
 .../openssh/{openssh-5.9p1 => openssh-6.0p1}/init  |    0
 .../{openssh-5.9p1 => openssh-6.0p1}/nostrip.patch |    0
 .../{openssh-5.9p1 => openssh-6.0p1}/ssh_config    |    0
 .../openssh/{openssh-5.9p1 => openssh-6.0p1}/sshd  |    0
 .../{openssh-5.9p1 => openssh-6.0p1}/sshd_config   |    0
 .../openssh/{openssh_5.9p1.bb => openssh_6.0p1.bb} |    8 +-
 .../opensp/opensp/attributevalue.patch             |   65 -
 .../opensp/opensp/fix-docdir.patch                 |   17 -
 meta/recipes-devtools/opensp/opensp/m4.patch       | 1928 --------------------
 .../opensp/opensp/rangmap-fix.patch                |   18 -
 .../opensp/{opensp_1.5.bb => opensp_1.5.2.bb}      |   20 +-
 12 files changed, 23 insertions(+), 2058 deletions(-)
 rename meta/recipes-connectivity/openssh/{openssh-5.9p1 => openssh-6.0p1}/init (100%)
 rename meta/recipes-connectivity/openssh/{openssh-5.9p1 => openssh-6.0p1}/nostrip.patch (100%)
 rename meta/recipes-connectivity/openssh/{openssh-5.9p1 => openssh-6.0p1}/ssh_config (100%)
 rename meta/recipes-connectivity/openssh/{openssh-5.9p1 => openssh-6.0p1}/sshd (100%)
 rename meta/recipes-connectivity/openssh/{openssh-5.9p1 => openssh-6.0p1}/sshd_config (100%)
 rename meta/recipes-connectivity/openssh/{openssh_5.9p1.bb => openssh_6.0p1.bb} (94%)
 delete mode 100644 meta/recipes-devtools/opensp/opensp/attributevalue.patch
 delete mode 100644 meta/recipes-devtools/opensp/opensp/fix-docdir.patch
 delete mode 100644 meta/recipes-devtools/opensp/opensp/m4.patch
 delete mode 100644 meta/recipes-devtools/opensp/opensp/rangmap-fix.patch
 rename meta/recipes-devtools/opensp/{opensp_1.5.bb => opensp_1.5.2.bb} (71%)
Signature · 1 line
1.7.5.4
#1 lore raw

PATCH 1/3 openssh: upgrade to 6.0p1

LICENSE checksum changed due to a trivial difference in the credits list.

---
 .../openssh/{openssh-5.9p1 => openssh-6.0p1}/init  |    0
 .../{openssh-5.9p1 => openssh-6.0p1}/nostrip.patch |    0
 .../{openssh-5.9p1 => openssh-6.0p1}/ssh_config    |    0
 .../openssh/{openssh-5.9p1 => openssh-6.0p1}/sshd  |    0
 .../{openssh-5.9p1 => openssh-6.0p1}/sshd_config   |    0
 .../openssh/{openssh_5.9p1.bb => openssh_6.0p1.bb} |    8 ++++----
 6 files changed, 4 insertions(+), 4 deletions(-)
 rename meta/recipes-connectivity/openssh/{openssh-5.9p1 => openssh-6.0p1}/init (100%)
 rename meta/recipes-connectivity/openssh/{openssh-5.9p1 => openssh-6.0p1}/nostrip.patch (100%)
 rename meta/recipes-connectivity/openssh/{openssh-5.9p1 => openssh-6.0p1}/ssh_config (100%)
 rename meta/recipes-connectivity/openssh/{openssh-5.9p1 => openssh-6.0p1}/sshd (100%)
 rename meta/recipes-connectivity/openssh/{openssh-5.9p1 => openssh-6.0p1}/sshd_config (100%)
 rename meta/recipes-connectivity/openssh/{openssh_5.9p1.bb => openssh_6.0p1.bb} (94%)
meta/recipes-connectivity/openssh/openssh-6.0p1/init renamed from meta/recipes-connectivity/openssh/openssh-5.9p1/init +0 -0
similarity index 100%
rename from meta/recipes-connectivity/openssh/openssh-5.9p1/init
rename to meta/recipes-connectivity/openssh/openssh-6.0p1/init
meta/recipes-connectivity/openssh/openssh-6.0p1/nostrip.patch renamed from meta/recipes-connectivity/openssh/openssh-5.9p1/nostrip.patch +0 -0
similarity index 100%
rename from meta/recipes-connectivity/openssh/openssh-5.9p1/nostrip.patch
rename to meta/recipes-connectivity/openssh/openssh-6.0p1/nostrip.patch
meta/recipes-connectivity/openssh/openssh-6.0p1/ssh_config renamed from meta/recipes-connectivity/openssh/openssh-5.9p1/ssh_config +0 -0
similarity index 100%
rename from meta/recipes-connectivity/openssh/openssh-5.9p1/ssh_config
rename to meta/recipes-connectivity/openssh/openssh-6.0p1/ssh_config
meta/recipes-connectivity/openssh/openssh-6.0p1/sshd renamed from meta/recipes-connectivity/openssh/openssh-5.9p1/sshd +0 -0
similarity index 100%
rename from meta/recipes-connectivity/openssh/openssh-5.9p1/sshd
rename to meta/recipes-connectivity/openssh/openssh-6.0p1/sshd
meta/recipes-connectivity/openssh/openssh-6.0p1/sshd_config renamed from meta/recipes-connectivity/openssh/openssh-5.9p1/sshd_config +0 -0
similarity index 100%
rename from meta/recipes-connectivity/openssh/openssh-5.9p1/sshd_config
rename to meta/recipes-connectivity/openssh/openssh-6.0p1/sshd_config
meta/recipes-connectivity/openssh/openssh_6.0p1.bb renamed from meta/recipes-connectivity/openssh/openssh_5.9p1.bb +4 -4
similarity index 94%
rename from meta/recipes-connectivity/openssh/openssh_5.9p1.bb
rename to meta/recipes-connectivity/openssh/openssh_6.0p1.bb
index 749f89e..dba08a1 100644
@@ -5,9 +5,9 @@ and for executing commands on a remote machine."
 HOMEPAGE = "http://openssh.org"
 SECTION = "console/network"
 LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://LICENCE;md5=bae9a689be41581503bcf95d8fb42c4e"
+LIC_FILES_CHKSUM = "file://LICENCE;md5=e326045657e842541d3f35aada442507"
 
-PR = "r3"
+PR = "r0"
 
 DEPENDS = "zlib openssl"
 DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
@@ -26,8 +26,8 @@ SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.
            ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}"
 
 PAM_SRC_URI = "file://sshd"
-SRC_URI[md5sum] = "afe17eee7e98d3b8550cc349834a85d0"
-SRC_URI[sha256sum] = "8d3e8b6b6ff04b525a6dfa6fdeb6a99043ccf6c3310cc32eba84c939b07777d5"
+SRC_URI[md5sum] = "3c9347aa67862881c5da3f3b1c08da7b"
+SRC_URI[sha256sum] = "589d48e952d6c017e667873486b5df63222f9133d417d0002bd6429d9bd882de"
 
 inherit useradd update-rc.d
 
Signature · 1 line
1.7.5.4
#2 lore raw

PATCH 2/3 opensp: upgrade to 1.5.2

In reply to Scott Garman

Removed all patches, they've been integrated upstream. :)

Added --disable-doc-build to prevent creation of docs, which otherwise fails with the following configure error:

could not find xmlto; set XMLTO or consider --disable-doc-build

Removed configure_prepend step that was deleting the m4/ directory, since some macros needed for the build are defined there, and I've not encountered any problems with keeping them there in my testing.

---
 .../opensp/opensp/attributevalue.patch             |   65 -
 .../opensp/opensp/fix-docdir.patch                 |   17 -
 meta/recipes-devtools/opensp/opensp/m4.patch       | 1928 --------------------
 .../opensp/opensp/rangmap-fix.patch                |   18 -
 .../opensp/{opensp_1.5.bb => opensp_1.5.2.bb}      |   20 +-
 5 files changed, 7 insertions(+), 2041 deletions(-)
 delete mode 100644 meta/recipes-devtools/opensp/opensp/attributevalue.patch
 delete mode 100644 meta/recipes-devtools/opensp/opensp/fix-docdir.patch
 delete mode 100644 meta/recipes-devtools/opensp/opensp/m4.patch
 delete mode 100644 meta/recipes-devtools/opensp/opensp/rangmap-fix.patch
 rename meta/recipes-devtools/opensp/{opensp_1.5.bb => opensp_1.5.2.bb} (71%)
meta/recipes-devtools/opensp/opensp/attributevalue.patch deleted +0 -65
deleted file mode 100644
index 92f5898..0000000
@@ -1,65 +0,0 @@
-Patch obtained from OpenEmbedded.
-
-Upstream-Status: Pending
-
-Signed-off-by: Scott Garman <[email protected]>
-
---- OpenSP-1.5/include/Attribute.h~attributevalue	2000-03-09 13:30:56.000000000 -0500
-+++ OpenSP-1.5/include/Attribute.h	2004-01-20 14:11:36.000000000 -0500
-@@ -31,6 +31,28 @@
- class AttributeContext;
- class Syntax;
- 
-+class SP_API AttributeValue : public Resource {
-+public:
-+  enum Type {
-+    implied,
-+    cdata,
-+    tokenized
-+    };
-+  AttributeValue();
-+  virtual ~AttributeValue();
-+  virtual AttributeSemantics *makeSemantics(const DeclaredValue *,
-+					    AttributeContext &,
-+					    const StringC &,
-+					    unsigned &,
-+					    unsigned &) const;
-+  virtual Type info(const Text *&, const StringC *&) const = 0;
-+  virtual const Text *text() const;
-+  virtual Boolean recoverUnquoted(const StringC &, const Location &,
-+				  AttributeContext &, const StringC &);
-+  static Boolean handleAsUnterminated(const Text &, AttributeContext &);
-+};
-+
-+
- class SP_API AttributeDefinitionDesc {
- public:
-   AttributeDefinitionDesc() { }
-@@ -380,27 +402,6 @@
-   ConstPtr<Notation> notation_;
- };
- 
--class SP_API AttributeValue : public Resource {
--public:
--  enum Type {
--    implied,
--    cdata,
--    tokenized
--    };
--  AttributeValue();
--  virtual ~AttributeValue();
--  virtual AttributeSemantics *makeSemantics(const DeclaredValue *,
--					    AttributeContext &,
--					    const StringC &,
--					    unsigned &,
--					    unsigned &) const;
--  virtual Type info(const Text *&, const StringC *&) const = 0;
--  virtual const Text *text() const;
--  virtual Boolean recoverUnquoted(const StringC &, const Location &,
--				  AttributeContext &, const StringC &);
--  static Boolean handleAsUnterminated(const Text &, AttributeContext &);
--};
--
- class SP_API ImpliedAttributeValue : public AttributeValue {
- public:
-   ImpliedAttributeValue();
meta/recipes-devtools/opensp/opensp/fix-docdir.patch deleted +0 -17
deleted file mode 100644
index c78b9ad..0000000
@@ -1,17 +0,0 @@
-Patch obtained from OpenEmbedded.
-
-Upstream-Status: Pending
-
-Signed-off-by: Scott Garman <[email protected]>
-
-Index: OpenSP-1.5/doc/Makefile.am
-===================================================================
---- OpenSP-1.5.orig/doc/Makefile.am	2000-05-06 09:10:32.000000000 +1000
-+++ OpenSP-1.5/doc/Makefile.am	2007-06-02 12:46:50.000000000 +1000
-@@ -1,6 +1,5 @@
- ## Process this file with automake to produce Makefile.in
- 
--docdir = $(prefix)/doc
- pkgdocdir = $(docdir)/@PACKAGE@
- 
- MAINTAINERCLEANFILES = Makefile.in
meta/recipes-devtools/opensp/opensp/m4.patch deleted +0 -1928

1,928 lines not on this page · raw message

meta/recipes-devtools/opensp/opensp/rangmap-fix.patch deleted +0 -18
deleted file mode 100644
index da31411..0000000
@@ -1,18 +0,0 @@
-Patch obtained from OpenEmbedded.
-
-Upstream-Status: Pending
-
-Signed-off-by: Scott Garman <[email protected]>
-
-Index: OpenSP-1.5/include/RangeMap.cxx
-===================================================================
---- OpenSP-1.5.orig/include/RangeMap.cxx	2000-02-26 03:55:21.000000000 +1100
-+++ OpenSP-1.5/include/RangeMap.cxx	2007-06-02 11:48:17.000000000 +1000
-@@ -7,6 +7,7 @@
- #include "RangeMap.h"
- #include "ISet.h"
- #include "types.h"
-+#include "constant.h"
- 
- #ifdef SP_NAMESPACE
- namespace SP_NAMESPACE {
meta/recipes-devtools/opensp/opensp_1.5.2.bb renamed from meta/recipes-devtools/opensp/opensp_1.5.bb +7 -13
similarity index 71%
rename from meta/recipes-devtools/opensp/opensp_1.5.bb
rename to meta/recipes-devtools/opensp/opensp_1.5.2.bb
index e225add..ecf8a37 100644
@@ -5,35 +5,29 @@ SECTION = "libs"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=641ff1e4511f0a87044ad42f87cb1045"
 
-PR = "r2"
+PR = "r0"
 
 # At -Os it encounters calls to some inline functions which are then
 # not found in any other objects with gcc 4.5
 FULL_OPTIMIZATION += "-O2"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/openjade/OpenSP-${PV}.tar.gz \
-           file://m4.patch \
-           file://attributevalue.patch \
-           file://rangmap-fix.patch \
-           file://fix-docdir.patch"
+SRC_URI = "${SOURCEFORGE_MIRROR}/openjade/OpenSP-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "87f56e79ae0c20397f4207d61d154303"
-SRC_URI[sha256sum] = "987eeb9460185950e066e5db3b5fa531e53e213742b545288405552a5a7bb704"
+SRC_URI[md5sum] = "670b223c5d12cee40c9137be86b6c39b"
+SRC_URI[sha256sum] = "57f4898498a368918b0d49c826aa434bb5b703d2c3b169beb348016ab25617ce"
 
 S = "${WORKDIR}/OpenSP-${PV}"
 
 inherit autotools gettext
 
+EXTRA_OECONF = "--disable-doc-build"
+
 EXTRA_OECONF_virtclass-native = "\
+	--disable-doc-build \
 	--enable-default-catalog=${sysconfdir}/sgml/catalog \
 	--enable-default-search-path=${datadir}/sgml \
 	"
 
-do_configure_prepend () {
-	# Stale m4 macros cause a variety of problems
-	rm -rf ${S}/m4/*
-}
-
 do_install_append() {
 	# Set up symlinks to often-used alternate names. See
 	# http://www.linuxfromscratch.org/blfs/view/stable/pst/opensp.html
Signature · 1 line
1.7.5.4
#3 lore raw

PATCH 3/3 distro_tracking: updates for upgraded recipes

In reply to Scott Garman

libpng, openssl, openssh, and opensp

---
 .../conf/distro/include/distro_tracking_fields.inc |   25 +++++++++----------
 1 files changed, 12 insertions(+), 13 deletions(-)
meta/conf/distro/include/distro_tracking_fields.inc +12 -13
index f74c8d3..8b8eeaa 100644
@@ -308,8 +308,8 @@ RECIPE_INTEL_SECTION_pn-libpng = "base libs"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libpng = "unknown"
 RECIPE_LATEST_RELEASE_DATE_pn-libpng = "Mar 29, 2012"
 RECIPE_COMMENTS_pn-libpng = ""
-RECIPE_LAST_UPDATE_pn-libpng = "Jul 18, 2011"
-RECIPE_MANUAL_CHECK_DATE_pn-libpng = "Apr 20, 2012"
+RECIPE_LAST_UPDATE_pn-libpng = "Apr 25, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-libpng = "May 7, 2012"
 RECIPE_MAINTAINER_pn-libpng = "Scott Garman <[email protected]>"
 
 RECIPE_STATUS_pn-libidn = "green"
@@ -520,12 +520,12 @@ RECIPE_COMMENTS_pn-libtasn1 = ""
 RECIPE_MANUAL_CHECK_DATE_pn-libtasn1 = "Nov 29, 2011"
 
 RECIPE_STATUS_pn-openssl = "green"
-RECIPE_LATEST_VERSION_pn-openssl = "1.0.1"
-RECIPE_LATEST_RELEASE_DATE_pn-openssl = "Mar 14, 2012"
-RECIPE_LAST_UPDATE_pn-openssl = "Mar 20, 2012"
+RECIPE_LATEST_VERSION_pn-openssl = "1.0.1b"
+RECIPE_LATEST_RELEASE_DATE_pn-openssl = "Apr 26, 2012"
+RECIPE_LAST_UPDATE_pn-openssl = "Apr 25, 2012"
 RECIPE_MAINTAINER_pn-openssl = "Saul Wold <[email protected]>"
 RECIPE_INTEL_SECTION_pn-openssl = "base libs"
-RECIPE_NO_UPDATE_REASON_pn-openssl = "1.0.1 is beta 1.0.0h is latest"
+RECIPE_NO_UPDATE_REASON_pn-openssl = "1.0.1 is beta 1.0.0i is latest"
 
 RECIPE_STATUS_pn-libnss-mdns = "green"
 DISTRO_PN_ALIAS_pn-libnss-mdns = "Meego=nss-mdns OpenSuSE=nss-mdns Ubuntu=nss-mdns Mandriva=nss_mdns Debian=nss-mdns"
@@ -2177,12 +2177,12 @@ RECIPE_MAINTAINER_pn-grep = "Scott Garman <[email protected]>"
 
 RECIPE_STATUS_pn-openssh = "green"
 RECIPE_DEPENDENCY_CHECK_pn-openssh = "not done"
-RECIPE_LATEST_VERSION_pn-openssh = "5.9p1"
+RECIPE_LATEST_VERSION_pn-openssh = "6.0p1"
 RECIPE_INTEL_SECTION_pn-openssh = "base"
 RECIPE_NO_OF_PATCHES_pn-openssh = "1"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-openssh = "4 months"
-RECIPE_LATEST_RELEASE_DATE_pn-openssh = "Sep 01, 2011"
-RECIPE_LAST_UPDATE_pn-openssh = "Oct 25, 2011"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-openssh = "8 months"
+RECIPE_LATEST_RELEASE_DATE_pn-openssh = "Apr 22, 2012"
+RECIPE_LAST_UPDATE_pn-openssh = "May 7, 2012"
 RECIPE_MAINTAINER_pn-openssh = "Scott Garman <[email protected]>"
 
 RECIPE_STATUS_pn-tar = "green"
@@ -6224,12 +6224,11 @@ DISTRO_PN_ALIAS_pn-sgmlspl = "Debian=sgmlspl Ubuntu=sgmlspl"
 RECIPE_STATUS_pn-opensp = "green"
 RECIPE_DEPENDENCY_CHECK_pn-opensp = "not done"
 RECIPE_LATEST_VERSION_pn-opensp = "1.5.2"
-RECIPE_NO_OF_PATCHES_pn-opensp = "4"
 RECIPE_LATEST_RELEASE_DATE_pn-opensp = "Dec 23, 2005"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-opensp = "2 years"
 RECIPE_COMMENTS_pn-opensp = ""
-RECIPE_LAST_UPDATE_pn-opensp = "Jan 26, 2011"
-RECIPE_MANUAL_CHECK_DATE_pn-opensp = "Apr 20, 2012"
+RECIPE_LAST_UPDATE_pn-opensp = "May 7, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-opensp = "May 7, 2012"
 RECIPE_MAINTAINER_pn-opensp = "Scott Garman <[email protected]>"
 
 RECIPE_STATUS_pn-openjade = "green"
Signature · 1 line
1.7.5.4
#4 lore raw
In reply to Scott Garman
Quoted 13 lines · Scott Garman

Hello,

This pull request includes upgrades for the opensp and openssh recipes. They have been build-tested on all 5 of our QEMU architectures. The distro tracking updates include a couple of recipes that I missed in previous pull requests.

Scott

The following changes since commit 2929e7d590862d9649458c90804e79a1dce40423:

glib-2.0: Fix issues with libelf dependency creeping in (2012-05-07 10:53:24 +0100)

Quoted 8 lines

are available in the git repository at:
git://git.pokylinux.org/poky-contrib sgarman/recipe-upgrades-oe
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=sgarman/recipe-upgrades-oe

Scott Garman (3):
openssh: upgrade to 6.0p1
opensp: upgrade to 1.5.2
distro_tracking: updates for upgraded recipes

Merged to master, thanks.

Richard