libffi,psmisc,e2fsprogs,libidn upgrade

PATCH Applied Mei Lei 2 participants 7 messages Apr 15, 2011 – Apr 18, 2011

lore

Share & tools

lore

Mei Lei

author

2011-04-15 14:18 UTC #0 lore raw

cover libffi,psmisc,e2fsprogs,libidn upgrade

From: Mei Lei <[email protected]>

Hi Saul,
This pull request contain 4 recipes upgrade, please help to review it and pull.

Thanks,
Lei

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: lmei3/upgrade-0413
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=lmei3/upgrade-0413

Thanks,
Mei Lei <[email protected]>
---

Mei Lei (5):
libidn: upgrade from 1.19 to 1.20
e2fsprogs: Upgrade from 1.41.12 to 1.41.14
psmisc: Upgrade from 22.2 to 22.13
libffi: Upgrade from 3.0.9 to 3.0.10rc0 distro_tracking_fields.inc: update e2fsprogs,libidn,libffi,psmisc
information

 .../conf/distro/include/distro_tracking_fields.inc |   27 ++++++++++---------
 .../acinclude.m4                                   |    0
 .../mkdir.patch                                    |    3 ++
 .../quotefix.patch                                 |    4 +++
 .../{e2fsprogs_1.41.12.bb => e2fsprogs_1.41.14.bb} |    6 ++--
 .../libidn/{libidn_1.19.bb => libidn_1.20.bb}      |    8 +++---
 .../psmisc/files/libintl-link.patch                |   27 ++++++++++---------
 meta/recipes-extended/psmisc/psmisc_22.13.bb       |    7 +++++
 meta/recipes-extended/psmisc/psmisc_22.2.bb        |    7 -----
 .../{libffi_3.0.9.bb => libffi_3.0.10rc0.bb}       |    6 ++--
 10 files changed, 52 insertions(+), 43 deletions(-)
 rename meta/recipes-devtools/e2fsprogs/{e2fsprogs-1.41.12 => e2fsprogs-1.41.14}/acinclude.m4 (100%)
 rename meta/recipes-devtools/e2fsprogs/{e2fsprogs-1.41.12 => e2fsprogs-1.41.14}/mkdir.patch (91%)
 rename meta/recipes-devtools/e2fsprogs/{e2fsprogs-1.41.12 => e2fsprogs-1.41.14}/quotefix.patch (93%)
 rename meta/recipes-devtools/e2fsprogs/{e2fsprogs_1.41.12.bb => e2fsprogs_1.41.14.bb} (91%)
 rename meta/recipes-extended/libidn/{libidn_1.19.bb => libidn_1.20.bb} (68%)
 create mode 100644 meta/recipes-extended/psmisc/psmisc_22.13.bb
 delete mode 100644 meta/recipes-extended/psmisc/psmisc_22.2.bb
 rename meta/recipes-gnome/libffi/{libffi_3.0.9.bb => libffi_3.0.10rc0.bb} (79%)

Mei Lei

author

2011-04-15 14:17 UTC #1 lore raw

PATCH 1/5 libidn: upgrade from 1.19 to 1.20

From: Mei Lei <[email protected]>

Signed-off-by Mei Lei <[email protected]>

---
 .../libidn/{libidn_1.19.bb => libidn_1.20.bb}      |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
 rename meta/recipes-extended/libidn/{libidn_1.19.bb => libidn_1.20.bb} (68%)

meta/recipes-extended/libidn/libidn_1.20.bb renamed from meta/recipes-extended/libidn/libidn_1.19.bb +4 -4

similarity index 68%
rename from meta/recipes-extended/libidn/libidn_1.19.bb
rename to meta/recipes-extended/libidn/libidn_1.20.bb
index a90a739..fa8953b 100644
@@ -5,16 +5,16 @@ SECTION = "libs"
 LICENSE = "LGPLv2.1+ & GPLv3+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
                     file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \
-                    file://lib/idna.h;firstline=6;endline=18;md5=643beb30bf98d8c4aed59a51b86fe9ea \
-                    file://src/idn.c;firstline=6;endline=18;md5=07a57d46977b38a2557aac446dda35dd"
+                    file://lib/idna.h;endline=21;md5=dbd4426bbc38846d5a6b94c3570fd756 \
+                    file://src/idn.c;endline=20;md5=e7bc77cab53f7367b7e381aaa546e76c"
 PR = "r0"
 
 inherit pkgconfig autotools gettext
 
 SRC_URI = "${GNU_MIRROR}/libidn/${P}.tar.gz"
 
-SRC_URI[md5sum] = "a45142126d28162014c995f969bdb5a8"
-SRC_URI[sha256sum] = "8ed2e936b1ae3e30b45b54ca3672deaa83ee0f4d20db5ad83dc1af7222d39f41"
+SRC_URI[md5sum] = "03996d474a696e59fdddbee87fc9519c"
+SRC_URI[sha256sum] = "e1bff472e8dce11064508ef5acbd6ac72371d0028f15c65f4a91ed157bfca8b1"
 
 # command tool is under GPLv3+, while libidn itself is under LGPLv2.1+
 # so package command into a separate package

Signature · 1 line

1.6.3.3

Mei Lei

author

2011-04-15 14:17 UTC #2 lore raw

PATCH 2/5 e2fsprogs: Upgrade from 1.41.12 to 1.41.14

In reply to Mei Lei

From: Mei Lei <[email protected]>

Signed-off-by Mei Lei <[email protected]>

---
 .../acinclude.m4                                   |    0
 .../mkdir.patch                                    |    3 +++
 .../quotefix.patch                                 |    4 ++++
 .../{e2fsprogs_1.41.12.bb => e2fsprogs_1.41.14.bb} |    6 +++---
 4 files changed, 10 insertions(+), 3 deletions(-)
 rename meta/recipes-devtools/e2fsprogs/{e2fsprogs-1.41.12 => e2fsprogs-1.41.14}/acinclude.m4 (100%)
 rename meta/recipes-devtools/e2fsprogs/{e2fsprogs-1.41.12 => e2fsprogs-1.41.14}/mkdir.patch (91%)
 rename meta/recipes-devtools/e2fsprogs/{e2fsprogs-1.41.12 => e2fsprogs-1.41.14}/quotefix.patch (93%)
 rename meta/recipes-devtools/e2fsprogs/{e2fsprogs_1.41.12.bb => e2fsprogs_1.41.14.bb} (91%)

meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.14/acinclude.m4 renamed from meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.12/acinclude.m4 +0 -0

similarity index 100%
rename from meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.12/acinclude.m4
rename to meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.14/acinclude.m4

meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.14/mkdir.patch renamed from meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.12/mkdir.patch +3 -0

similarity index 91%
rename from meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.12/mkdir.patch
rename to meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.14/mkdir.patch
index b0577e3..e91ffa9 100644
@@ -1,3 +1,6 @@
+Upstream-Status: Inappropriate [configuration]
+Signed-off-by: Mei Lei <[email protected]>
+
 Index: e2fsprogs-1.41.5/po/Makefile.in.in
 ===================================================================
 --- e2fsprogs-1.41.5.orig/po/Makefile.in.in	2009-02-14 13:49:08.000000000 +0000

meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.14/quotefix.patch renamed from meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.12/quotefix.patch +4 -0

similarity index 93%
rename from meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.12/quotefix.patch
rename to meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.14/quotefix.patch
index 528e319..f260f03 100644
@@ -1,3 +1,7 @@
+Upstream-Status: Inappropriate [configuration]
+Signed-off-by: Mei Lei <[email protected]>
+
+
 These macros are underquoted and break with recent autoconf+automake
 combinations.

meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.14.bb renamed from meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.12.bb +3 -3

similarity index 91%
rename from meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.12.bb
rename to meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.14.bb
index 1c0f893..d493f6f 100644
@@ -1,12 +1,12 @@
 require e2fsprogs.inc
 
-PR = "r20"
+PR = "r0"
 
 SRC_URI += "file://quotefix.patch;patch=1 \
             file://acinclude.m4"
 
-SRC_URI[md5sum] = "1b24a21fc0c2381ef420961cbfec733f"
-SRC_URI[sha256sum] = "9c26d0dc20bfdafd0f27f3564791d6121d1c1876549d4f2ff1e41955c9bb9f20"
+SRC_URI[md5sum] = "05f70470aea2ef7efbb0845b2b116720"
+SRC_URI[sha256sum] = "3f8ac1fedd7c4bec480afcbe4acabdd4ac59ec0446a0fd50c8975cd0aad7b176"
 #file://no-hardlinks.patch;patch=1
 
 PARALLEL_MAKE = ""

Signature · 1 line

1.6.3.3

Mei Lei

author

2011-04-15 14:18 UTC #3 lore raw

PATCH 3/5 psmisc: Upgrade from 22.2 to 22.13

In reply to Mei Lei

From: Mei Lei <[email protected]>

Modify the libintl-link.patch because the upstream removed old fuser in 22.7

Signed-off-by Mei Lei <[email protected]>

---
 .../psmisc/files/libintl-link.patch                |   27 ++++++++++---------
 meta/recipes-extended/psmisc/psmisc_22.13.bb       |    7 +++++
 meta/recipes-extended/psmisc/psmisc_22.2.bb        |    7 -----
 3 files changed, 21 insertions(+), 20 deletions(-)
 create mode 100644 meta/recipes-extended/psmisc/psmisc_22.13.bb
 delete mode 100644 meta/recipes-extended/psmisc/psmisc_22.2.bb

meta/recipes-extended/psmisc/files/libintl-link.patch +14 ~~-13~~

index d9cdd90..698d98a 100644
@@ -1,29 +1,30 @@
+Upstream-Status: Inappropriate [configuration]
+Signed-off-by: Mei Lei <[email protected]>
+
 uClibc needs to link against an external libintl but it doesn't do this by
 default. The configure script correctly figures out if this is needed, but
 doesn't actually link to the libraries it decides on. This makes it link to
 them if they are needed:
 
---- psmisc-22.2/src/Makefile.am	2006/06/28 00:14:07	1.1
-+++ psmisc-22.2/src/Makefile.am	2006/06/28 00:14:24
-@@ -5,15 +5,19 @@
+--- psmisc-22.13/src/Makefile.am
++++ psmisc-22.13/src/Makefile.am
+@@ -25,16 +25,17 @@ endif
  
- oldfuser_SOURCES = oldfuser.c comm.h signals.c signals.h loop.h i18n.h
  
-+oldfuser_LDADD = @INTLLIBS@
-+
  fuser_SOURCES = fuser.c comm.h signals.c signals.h i18n.h fuser.h
- 
 +fuser_LDADD = @INTLLIBS@
-+
+
  killall_SOURCES = killall.c comm.h signals.c signals.h i18n.h
- 
+
 -killall_LDADD = @SELINUX_LIB@
 +killall_LDADD = @SELINUX_LIB@ @INTLLIBS@
- 
+
+ peekfd_SOURCES = peekfd.c
+
  pstree_SOURCES = pstree.c comm.h i18n.h
- 
+
 -pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@
 +pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@ @INTLLIBS@
- 
- BUILT_SOURCES = signames.h
+
+ prtstat_SOURCES = prtstat.c prtstat.h

meta/recipes-extended/psmisc/psmisc_22.13.bb new file +7 -0

new file mode 100644
index 0000000..598c144
@@ -0,0 +1,7 @@
+require psmisc.inc
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
+PR = "r0"
+
+SRC_URI[md5sum] = "e2c339e6b65b730042084023784a729e"
+SRC_URI[sha256sum] = "06d25e8ebb4722dbcede98a787c39a9ed341f8e58fde10c0b2d6b35990b35daa"

meta/recipes-extended/psmisc/psmisc_22.2.bb deleted +0 -7

deleted file mode 100644
index 3a7059a..0000000
@@ -1,7 +0,0 @@
-require psmisc.inc
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
-PR = "r1"
-
-SRC_URI[md5sum] = "77737c817a40ef2c160a7194b5b64337"
-SRC_URI[sha256sum] = "6bca237485a352362133792e000a3c8e367a26b0312c5c607db7c2a97717d15f"

Signature · 1 line

1.6.3.3

Mei Lei

author

2011-04-15 14:18 UTC #4 lore raw

PATCH 4/5 libffi: Upgrade from 3.0.9 to 3.0.10rc0

In reply to Mei Lei

From: Mei Lei <[email protected]>

Signed-off-by Mei Lei <[email protected]>

---
 .../{libffi_3.0.9.bb => libffi_3.0.10rc0.bb}       |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-gnome/libffi/{libffi_3.0.9.bb => libffi_3.0.10rc0.bb} (79%)

meta/recipes-gnome/libffi/libffi_3.0.10rc0.bb renamed from meta/recipes-gnome/libffi/libffi_3.0.9.bb +3 -3

similarity index 79%
rename from meta/recipes-gnome/libffi/libffi_3.0.9.bb
rename to meta/recipes-gnome/libffi/libffi_3.0.10rc0.bb
index b6c7c13..ddb2582 100644
@@ -7,10 +7,10 @@ library really only provides the lowest, machine dependent layer of a fully feat
 A layer must exist above `libffi' that handles type conversions for values passed between the two languages."
 SRC_URI = "ftp://sourceware.org/pub/libffi/${BPN}-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "1f300a7a7f975d4046f51c3022fa5ff1"
-SRC_URI[sha256sum] = "589d25152318bc780cd8919b14670793f4971d9838dab46ed38c32b3ee92c452"
+SRC_URI[md5sum] = "621da748b995428b9d40f5fb830f600a"
+SRC_URI[sha256sum] = "b5797fde9f3543d91af054bfd736136c319986d0a44f1a591bada28642acb732"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=fa09cb778aaba64dc9eac37ab7e4e5d8"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=0caa055e49a3fb6c57780595e995e2ab"
 inherit autotools
 
 BBCLASSEXTEND = "native"

Signature · 1 line

1.6.3.3

Mei Lei

author

2011-04-15 14:18 UTC #5 lore raw

PATCH 5/5 distro_tracking_fields.inc: update e2fsprogs, libidn, libffi, psmisc information

In reply to Mei Lei

From: Mei Lei <[email protected]>

Signed-off-by Mei Lei <[email protected]>

---
 .../conf/distro/include/distro_tracking_fields.inc |   27 ++++++++++---------
 1 files changed, 14 insertions(+), 13 deletions(-)

meta/conf/distro/include/distro_tracking_fields.inc +14 ~~-13~~

index 8469e96..0d730d0 100644
@@ -266,12 +266,12 @@ RECIPE_MAINTAINER_pn-libpng = "Kevin Tian <[email protected]>"
 
 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.20"
 RECIPE_INTEL_SECTION_pn-libidn = "base libs"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libidn = "3 months"
-RECIPE_LATEST_RELEASE_DATE_pn-libidn = "05/2010"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libidn = "9 months"
+RECIPE_LATEST_RELEASE_DATE_pn-libidn = "03/2011"
 RECIPE_COMMENTS_pn-libidn = ""
-RECIPE_LAST_UPDATE_pn-libidn = "Jul 20, 2010"
+RECIPE_LAST_UPDATE_pn-libidn = "Apr 13, 2011"
 RECIPE_MAINTAINER_pn-libidn = "Kevin Tian <[email protected]>"
 
 RECIPE_STATUS_pn-glibc = "green"

@@ -615,15 +615,15 @@ RECIPE_MAINTAINER_pn-dbus-wait= "Kevin Tian <[email protected]>"
 
 RECIPE_STATUS_pn-e2fsprogs = "yellow" # patch comment
 RECIPE_DEPENDENCY_CHECK_pn-e2fsprogs = "not done"
-RECIPE_LATEST_VERSION_pn-e2fsprogs = "1.41.12"
+RECIPE_LATEST_VERSION_pn-e2fsprogs = "1.41.14"
 RECIPE_PATCH_pn-e2fsprogs+quotefix = "to be pushed upstream"
 RECIPE_PATCH_pn-e2fsprogs+mkdir = "to be pushed upstream; no comment; MKINSTALLDIRS is not supported in new version autotool"
 RECIPE_PATCH_pn-e2fsprogs+acinclude = "to be pushed upstream;"
 RECIPE_INTEL_SECTION_pn-e2fsprogs = "base utils"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-e2fsprogs = "2 months"
-RECIPE_LATEST_RELEASE_DATE_pn-e2fsprogs = "05/2010"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-e2fsprogs = "9 days"
+RECIPE_LATEST_RELEASE_DATE_pn-e2fsprogs = "12/2010"
 RECIPE_COMMENTS_pn-e2fsprogs = ""
-RECIPE_LAST_UPDATE_pn-e2fsprogs = "Jun 1, 2010"
+RECIPE_LAST_UPDATE_pn-e2fsprogs = "Apr 13, 2011"
 RECIPE_MAINTAINER_pn-e2fsprogs = "Kevin Tian <[email protected]>"
 
 RECIPE_STATUS_pn-initramfs-boot = "green"

@@ -1115,10 +1115,10 @@ DISTRO_PN_ALIAS_pn-libatomics-ops = "Meego=libatomic-ops Debian=libatomic-ops Ub
 RECIPE_LAST_UPDATE_pn-libatomics-ops = "Nov 22, 2010"
 RECIPE_MAINTAINER_pn-libatomics-ops = "Scott Garman <[email protected]>"
 
-RECIPE_STATUS_pn-libffi  = "red"
-RECIPE_LATEST_VERSION_pn-libffi  = "3.0.9"
-RECIPE_LAST_UPDATE_pn-libffi = "Oct 15, 2010"
-RECIPE_MAINTAINER_pn-libffi  = "Kevin Tian <[email protected]>"
+RECIPE_STATUS_pn-libffi = "red"
+RECIPE_LATEST_VERSION_pn-libffi = "3.0.10rc0"
+RECIPE_LAST_UPDATE_pn-libffi = "Apr 13, 2011"
+RECIPE_MAINTAINER_pn-libffi = "Kevin Tian <[email protected]>"
 
 RECIPE_STATUS_pn-libgdbus = "green"
 RECIPE_DEPENDENCY_CHECK_pn-libgdbus = "not done"

@@ -1274,7 +1274,8 @@ RECIPE_MAINTAINER_pn-pm-utils = "Dongxiao Xu <[email protected]>"
 
 RECIPE_STATUS_pn-psmisc = "red"
 RECIPE_LATEST_VERSION_pn-psmisc = "22.13"
-RECIPE_LAST_UPDATE_pn-psmisc = "Jan 18, 2008"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-pm-utils = "58 days"
+RECIPE_LAST_UPDATE_pn-psmisc = "Apr 13, 2011"
 RECIPE_MAINTAINER_pn-psmisc = "Kevin Tian <[email protected]>"
 
 RECIPE_STATUS_pn-boost = "red"

Signature · 1 line

1.6.3.3

Richard Purdie

Applied

2011-04-18 10:02 UTC #6 lore raw

In reply to Mei Lei

Quoted 11 lines · Mei Lei

This pull request contain 4 recipes upgrade, please help to review it and pull.
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: lmei3/upgrade-0413
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=lmei3/upgrade-0413
Thanks,
Mei Lei <[email protected]>
---

Quoted 4 lines

Mei Lei (5):
libidn: upgrade from 1.19 to 1.20
e2fsprogs: Upgrade from 1.41.12 to 1.41.14
psmisc: Upgrade from 22.2 to 22.13

I merged these thanks.

Quoted 1 line

libffi: Upgrade from 3.0.9 to 3.0.10rc0

However this is an upgrade to an rc release. We should wait for the 3.0.10 stable release before we upgrade unless there is a pressing reason to do otherwise.

Quoted 2 lines

distro_tracking_fields.inc: update e2fsprogs,libidn,libffi,psmisc
information

I didn't take this as I didn't take the libffi update above.

Cheers,

Richard