X apps/UX upgrade, edwin, Apr18, 2011

GIT PULL In review Zhai Edwin 3 participants 9 messages Apr 18, 2011 – Apr 25, 2011

lore

Share & tools

lore

Zhai Edwin

author

2011-04-18 13:13 UTC #0 lore raw

From: Zhai Edwin <[email protected]>

This is modified version of last upgrade by adding "Upstream-Status" and other minor format change.

Thanks,
edwin

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

Thanks,
Zhai Edwin <[email protected]>
---

Zhai Edwin (5):
tasks: Upgrade to 0.19 (from 0.18)
avahi: Upgrade to 0.6.30 (from 0.6.28)
consolekit: Upgrade to 0.4.4 (from 0.4.3)
libgpg-error: Upgrade to 1.10 (from 1.9)
jpeg: Upgrade to 8c (from 8b)

 meta/recipes-connectivity/avahi/avahi.inc          |    2 +-
 .../avahi/{avahi_0.6.28.bb => avahi_0.6.30.bb}     |    6 +++---
 .../avahi/files/initscript.patch                   |    2 ++
 .../{jpeg-8b => jpeg-8c}/debian-libjpeg7_7-1.diff  |    4 ++++
 meta/recipes-core/jpeg/{jpeg_8b.bb => jpeg_8c.bb}  |    8 ++++----
 .../pimlico/{tasks_0.18.bb => tasks_0.19.bb}       |    4 ++--
 .../{consolekit_0.4.3.bb => consolekit_0.4.4.bb}   |   10 ++++++----
 .../consolekit/files/nopolkit.patch                |    2 ++
 .../pkgconfig.patch                                |    2 ++
 .../{libgpg-error_1.9.bb => libgpg-error_1.10.bb}  |    6 +++---
 10 files changed, 29 insertions(+), 17 deletions(-)
 rename meta/recipes-connectivity/avahi/{avahi_0.6.28.bb => avahi_0.6.30.bb} (82%)
 rename meta/recipes-core/jpeg/{jpeg-8b => jpeg-8c}/debian-libjpeg7_7-1.diff (98%)
 rename meta/recipes-core/jpeg/{jpeg_8b.bb => jpeg_8c.bb} (82%)
 rename meta/recipes-sato/pimlico/{tasks_0.18.bb => tasks_0.19.bb} (78%)
 rename meta/recipes-support/consolekit/{consolekit_0.4.3.bb => consolekit_0.4.4.bb} (75%)
 rename meta/recipes-support/libgpg-error/{libgpg-error-1.9 => libgpg-error-1.10}/pkgconfig.patch (98%)
 rename meta/recipes-support/libgpg-error/{libgpg-error_1.9.bb => libgpg-error_1.10.bb} (82%)

Zhai Edwin

author

2011-04-18 13:13 UTC #1 lore raw

PATCH 1/5 tasks: Upgrade to 0.19 (from 0.18)

From: Zhai Edwin <[email protected]>

Signed-off-by Zhai Edwin <[email protected]>

---
 .../pimlico/{tasks_0.18.bb => tasks_0.19.bb}       |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-sato/pimlico/{tasks_0.18.bb => tasks_0.19.bb} (78%)

meta/recipes-sato/pimlico/tasks_0.19.bb renamed from meta/recipes-sato/pimlico/tasks_0.18.bb +2 -2

similarity index 78%
rename from meta/recipes-sato/pimlico/tasks_0.18.bb
rename to meta/recipes-sato/pimlico/tasks_0.19.bb
index fd7edb3..8326643 100644
@@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
 
 SRC_URI = "http://pimlico-project.org/sources/${BPN}/${BPN}-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "d40c0227e496b51be6fde10f387215ed"
-SRC_URI[sha256sum] = "08802003da2517c6e0b2defd66bcaf466edd0ce7188373f564d629af6b93cc91"
+SRC_URI[md5sum] = "0afd969758561599fd782e1effb39c08"
+SRC_URI[sha256sum] = "1a7fdc5f95a2193a1a25fdb13f071867fb7e42245ce19ccee4bcccb69e557f2e"
 
 OWL_poky = "--with-owl"

Signature · 1 line

1.7.1

Saul Wold

2011-04-18 23:58 UTC #2 lore raw

Re: [PATCH 1/5] tasks: Upgrade to 0.19 (from 0.18)

Quoted 16 lines · Zhai Edwin

From: Zhai Edwin<[email protected]>
Signed-off-by Zhai Edwin<[email protected]>
---
  .../pimlico/{tasks_0.18.bb =>  tasks_0.19.bb}       |    4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-sato/pimlico/{tasks_0.18.bb => tasks_0.19.bb} (78%)
meta/recipes-sato/pimlico/tasks_0.19.bb renamed from meta/recipes-sato/pimlico/tasks_0.18.bb +0 -0
similarity index 78%
rename from meta/recipes-sato/pimlico/tasks_0.18.bb
rename to meta/recipes-sato/pimlico/tasks_0.19.bb
index fd7edb3..8326643 100644

meta/recipes-sato/pimlico/tasks_0.19.bb LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ · line 14

Quoted 10 lines

meta/recipes-sato/pimlico/tasks_0.19.bb renamed from meta/recipes-sato/pimlico/tasks_0.18.bb +2 -2

@@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
 
  SRC_URI = "http://pimlico-project.org/sources/${BPN}/${BPN}-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "d40c0227e496b51be6fde10f387215ed"
-SRC_URI[sha256sum] = "08802003da2517c6e0b2defd66bcaf466edd0ce7188373f564d629af6b93cc91"
+SRC_URI[md5sum] = "0afd969758561599fd782e1effb39c08"
+SRC_URI[sha256sum] = "1a7fdc5f95a2193a1a25fdb13f071867fb7e42245ce19ccee4bcccb69e557f2e"
 
  OWL_poky = "--with-owl"

Where's the patch Upstream-Status for the tasks-owl.diff file? Or is it not required anymore, in which case we should remove it.

Sau!

Zhai, Edwin

author

2011-04-19 02:39 UTC #3 lore raw

Re: [PATCH 1/5] tasks: Upgrade to 0.19 (from 0.18)

Quoted 14 lines · Saul

Review
Quoted 1 line · Zhai Edwin
(quoted diff) +0 -0
b/meta/recipes-sato/pimlico/tasks_0.19.bb
meta/recipes-sato/pimlico/tasks_0.19.bb LIC_FILES_CHKSUM =
Quoted 7 lines
similarity index 78%
rename from meta/recipes-sato/pimlico/tasks_0.18.bb rename to meta/recipes-sato/pimlico/tasks_0.19.bb index fd7edb3..8326643 100644
meta/recipes-sato/pimlico/tasks_0.19.bb renamed from meta/recipes-sato/pimlico/tasks_0.18.bb +0 -0
@@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = 
"file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
Quoted 1 line

Quoted 6 lines

Quoted 1 line
SRC_URI =
"http://pimlico-project.org/sources/${BPN}/${BPN}-${PV}.tar.gz"
Where's the patch Upstream-Status for the tasks-owl.diff file? Or is it not required anymore, in which case we should remove it.

This patch has not been used for a long time. It's for enabling owl menu. I'll mark it as Inappropriate [enable feature] and rebase it in future.

Thanks,

Quoted 4 lines

Sau!

Zhai Edwin

author

2011-04-18 13:13 UTC #4 lore raw

PATCH 2/5 avahi: Upgrade to 0.6.30 (from 0.6.28)

In reply to Zhai Edwin

From: Zhai Edwin <[email protected]>

This upgrade fix the one security issue:
http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-1002
[YOCTO #975] fixed.

This should be included in the Bernard point-release.

Signed-off-by Zhai Edwin <[email protected]>

---
 meta/recipes-connectivity/avahi/avahi.inc          |    2 +-
 .../avahi/{avahi_0.6.28.bb => avahi_0.6.30.bb}     |    6 +++---
 .../avahi/files/initscript.patch                   |    2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)
 rename meta/recipes-connectivity/avahi/{avahi_0.6.28.bb => avahi_0.6.30.bb} (82%)

meta/recipes-connectivity/avahi/avahi.inc +1 -1

index 6d4b830..b2fa8ca 100644
@@ -24,7 +24,7 @@ RRECOMMENDS_${PN}_append_libc-glibc = "libnss-mdns"
 SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \
         file://00avahi-autoipd \
         file://99avahi-autoipd \
-        file://initscript.patch;patch=1"
+        file://initscript.patch"
 
 inherit autotools pkgconfig update-rc.d gettext

meta/recipes-connectivity/avahi/avahi_0.6.30.bb renamed from meta/recipes-connectivity/avahi/avahi_0.6.28.bb +3 -3

similarity index 82%
rename from meta/recipes-connectivity/avahi/avahi_0.6.28.bb
rename to meta/recipes-connectivity/avahi/avahi_0.6.30.bb
index 6e034b0..1084c04 100644
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
                     file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf"
 
 RDEPENDS_avahi-daemon = "sysvinit-pidof"
-PR = "r2"
+PR = "r0"
 
 EXTRA_OECONF += "--disable-gtk3"

@@ -15,5 +15,5 @@ FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \
                        ${sysconfdir}/avahi/avahi-autoipd.action \
 		       ${sysconfdir}/dhcp3/*/avahi-autoipd"
 
-SRC_URI[md5sum] = "d0143a5aa3265019072e53ab497818d0"
-SRC_URI[sha256sum] = "a0d80aac88212b9f9d5331c248091d3c9c9209f0e41985421636ebd14230fc91"
+SRC_URI[md5sum] = "e4db89a2a403ff4c47d66ac66fad1f43"
+SRC_URI[sha256sum] = "f9e4316c2339d0020726edd846d01bee0c39980906db0c247479e5807457ff1f"

meta/recipes-connectivity/avahi/files/initscript.patch +2 -0

index f76a965..193889e 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
 diff --git a/initscript/debian/avahi-daemon.in b/initscript/debian/avahi-daemon.in
 index 30a2c2f..b5848a8 100755
 --- a/initscript/debian/avahi-daemon.in

Signature · 1 line

1.7.1

Zhai Edwin

author

2011-04-18 13:13 UTC #5 lore raw

PATCH 3/5 consolekit: Upgrade to 0.4.4 (from 0.4.3)

In reply to Zhai Edwin

From: Zhai Edwin <[email protected]>

Signed-off-by Zhai Edwin <[email protected]>

---
 .../{consolekit_0.4.3.bb => consolekit_0.4.4.bb}   |   10 ++++++----
 .../consolekit/files/nopolkit.patch                |    2 ++
 2 files changed, 8 insertions(+), 4 deletions(-)
 rename meta/recipes-support/consolekit/{consolekit_0.4.3.bb => consolekit_0.4.4.bb} (75%)

meta/recipes-support/consolekit/consolekit_0.4.4.bb renamed from meta/recipes-support/consolekit/consolekit_0.4.3.bb +6 -4

similarity index 75%
rename from meta/recipes-support/consolekit/consolekit_0.4.3.bb
rename to meta/recipes-support/consolekit/consolekit_0.4.4.bb
index 5bf4c52..0aec639 100644
@@ -8,13 +8,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
 
 DEPENDS = "dbus"
 
+PR = "r0"
+
 inherit gnome
 
-SRC_URI = "http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-0.4.3.tar.bz2 \
-           file://nopolkit.patch;patch=1"
+SRC_URI = "http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-${PV}.tar.bz2 \
+           file://nopolkit.patch"
 
-SRC_URI[md5sum] = "4c39c6eacc75334b890f21eead1d2945"
-SRC_URI[sha256sum] = "fe02aca2b4c21df59aa5fbe6f28ea3ea4b3c9dd64c48c50634e9a53cf9c0dcc5"
+SRC_URI[md5sum] = "b57eb18eae8c4d3631d5f4f030218a29"
+SRC_URI[sha256sum] = "f0c00969fb6fe7d628071f0f43ac0d411982a5e798d7dc31747caa772c9716ae"
 S = "${WORKDIR}/ConsoleKit-${PV}"
 
 FILES_${PN} += "${libdir}/ConsoleKit ${datadir}/dbus-1 ${datadir}/PolicyKit"

meta/recipes-support/consolekit/files/nopolkit.patch +2 -0

index 7a1f02a..a0d9d06 100644
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
 Index: ConsoleKit-0.4.3/configure.ac
 ===================================================================
 --- ConsoleKit-0.4.3.orig/configure.ac	2010-10-26 22:34:03.000000000 +0800

Signature · 1 line

1.7.1

Zhai Edwin

author

2011-04-18 13:13 UTC #6 lore raw

PATCH 4/5 libgpg-error: Upgrade to 1.10 (from 1.9)

In reply to Zhai Edwin

From: Zhai Edwin <[email protected]>

Signed-off-by Zhai Edwin <[email protected]>

---
 .../pkgconfig.patch                                |    2 ++
 .../{libgpg-error_1.9.bb => libgpg-error_1.10.bb}  |    6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)
 rename meta/recipes-support/libgpg-error/{libgpg-error-1.9 => libgpg-error-1.10}/pkgconfig.patch (98%)
 rename meta/recipes-support/libgpg-error/{libgpg-error_1.9.bb => libgpg-error_1.10.bb} (82%)

meta/recipes-support/libgpg-error/libgpg-error-1.10/pkgconfig.patch renamed from meta/recipes-support/libgpg-error/libgpg-error-1.9/pkgconfig.patch +2 -0

similarity index 98%
rename from meta/recipes-support/libgpg-error/libgpg-error-1.9/pkgconfig.patch
rename to meta/recipes-support/libgpg-error/libgpg-error-1.10/pkgconfig.patch
index 49e47d8..2764012 100644
@@ -3,6 +3,8 @@
 # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
 #
 
+Upstream-Status: Pending
+
 Index: libgpg-error-1.8/configure.ac
 ===================================================================
 --- libgpg-error-1.8.orig/configure.ac	2010-05-06 06:01:08.000000000 -0700

meta/recipes-support/libgpg-error/libgpg-error_1.10.bb renamed from meta/recipes-support/libgpg-error/libgpg-error_1.9.bb +3 -3

similarity index 82%
rename from meta/recipes-support/libgpg-error/libgpg-error_1.9.bb
rename to meta/recipes-support/libgpg-error/libgpg-error_1.10.bb
index 560340b..6dea084 100644
@@ -13,10 +13,10 @@ SECTION = "libs"
 PR = "r0"
 
 SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${PV}.tar.bz2 \
-           file://pkgconfig.patch;"
+           file://pkgconfig.patch"
 
-SRC_URI[md5sum] = "521b98aa9395e7eaf0ef2236233a0796"
-SRC_URI[sha256sum] = "54d9326bfbd46c705963c507953f65a40576d04b374e131008dc5b732ff1e3c3"
+SRC_URI[md5sum] = "736a03daa9dc5873047d4eb4a9c22a16"
+SRC_URI[sha256sum] = "520629b4568b5c29b1991c8ffc267c8bdee5f223c7333c42a651b56f9b1c5431"
 
 # move libgpg-error-config into -dev package
 FILES_${PN} = "${libdir}/lib*.so.*"

Signature · 1 line

1.7.1

Zhai Edwin

author

2011-04-18 13:13 UTC #7 lore raw

PATCH 5/5 jpeg: Upgrade to 8c (from 8b)

In reply to Zhai Edwin

From: Zhai Edwin <[email protected]>

Signed-off-by Zhai Edwin <[email protected]>

---
 .../{jpeg-8b => jpeg-8c}/debian-libjpeg7_7-1.diff  |    4 ++++
 meta/recipes-core/jpeg/{jpeg_8b.bb => jpeg_8c.bb}  |    8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)
 rename meta/recipes-core/jpeg/{jpeg-8b => jpeg-8c}/debian-libjpeg7_7-1.diff (98%)
 rename meta/recipes-core/jpeg/{jpeg_8b.bb => jpeg_8c.bb} (82%)

meta/recipes-core/jpeg/jpeg-8c/debian-libjpeg7_7-1.diff renamed from meta/recipes-core/jpeg/jpeg-8b/debian-libjpeg7_7-1.diff +4 -0

similarity index 98%
rename from meta/recipes-core/jpeg/jpeg-8b/debian-libjpeg7_7-1.diff
rename to meta/recipes-core/jpeg/jpeg-8c/debian-libjpeg7_7-1.diff
index 2e4867a..3b8fa69 100755
@@ -1,3 +1,7 @@
+This is a well-known debian patch used by many Linux distribution, but not
+accepted by upstream yet.
+Upstream-Status: Pending
+
 --- libjpeg7-7.orig/config.sub
 +++ libjpeg7-7/config.sub
 @@ -1,4 +1,10 @@

meta/recipes-core/jpeg/jpeg_8c.bb renamed from meta/recipes-core/jpeg/jpeg_8b.bb +4 -4

similarity index 82%
rename from meta/recipes-core/jpeg/jpeg_8b.bb
rename to meta/recipes-core/jpeg/jpeg_8c.bb
index 8e2c24d..730cc0c 100644
@@ -5,7 +5,7 @@ BUGTRACKER = ""
 
 LICENSE ="jpeg"
 LIC_FILES_CHKSUM = "file://cdjpeg.h;endline=12;md5=78fa8dbac547bb5b2a0e6457a6cfe21d \
-                    file://jpeglib.h;endline=14;md5=dd06b5575519f735ec2565ed36ce62e7 \
+                    file://jpeglib.h;endline=14;md5=22f1e0f8fc71f6f7563146d3b210dbe5 \
                     file://djpeg.c;endline=13;md5=ca89254925da06fef47e4b6468233432"
 
 SECTION = "libs"

@@ -17,10 +17,10 @@ DEPENDS_virtclass-native = "libtool-native"
 PR = "r0"
 
 SRC_URI = "http://www.ijg.org/files/jpegsrc.v${PV}.tar.gz \
-	   file://debian-libjpeg7_7-1.diff;patch=1"
+	   file://debian-libjpeg7_7-1.diff;"
 
-SRC_URI[md5sum] = "e022acbc5b36cd2cb70785f5b575661e"
-SRC_URI[sha256sum] = "36e6208edec591bae8f2fc370ea4f991447badb6377a125c211ffa7b503174a7"
+SRC_URI[md5sum] = "a2c10c04f396a9ce72894beb18b4e1f9"
+SRC_URI[sha256sum] = "edfc0b3e004b2fe58ffeeec89f96e3a3c28972c46725ec127d01edf8a1cc7c9a"
 
 inherit autotools

Signature · 1 line

1.7.1

Saul Wold

2011-04-25 05:03 UTC #8 lore raw

In reply to Zhai Edwin

Quoted 42 lines · Zhai Edwin

From: Zhai Edwin<[email protected]>
This is modified version of last upgrade by adding "Upstream-Status" and other minor format change.
Thanks,
edwin
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: gzhai/upgrade04
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=gzhai/upgrade04
Thanks,
Zhai Edwin<[email protected]>
---
Zhai Edwin (5):
   tasks: Upgrade to 0.19 (from 0.18)
   avahi: Upgrade to 0.6.30 (from 0.6.28)
   consolekit: Upgrade to 0.4.4 (from 0.4.3)
   libgpg-error: Upgrade to 1.10 (from 1.9)
   jpeg: Upgrade to 8c (from 8b)
  meta/recipes-connectivity/avahi/avahi.inc          |    2 +-
  .../avahi/{avahi_0.6.28.bb =>  avahi_0.6.30.bb}     |    6 +++---
  .../avahi/files/initscript.patch                   |    2 ++
  .../{jpeg-8b =>  jpeg-8c}/debian-libjpeg7_7-1.diff  |    4 ++++
  meta/recipes-core/jpeg/{jpeg_8b.bb =>  jpeg_8c.bb}  |    8 ++++----
  .../pimlico/{tasks_0.18.bb =>  tasks_0.19.bb}       |    4 ++--
  .../{consolekit_0.4.3.bb =>  consolekit_0.4.4.bb}   |   10 ++++++----
  .../consolekit/files/nopolkit.patch                |    2 ++
  .../pkgconfig.patch                                |    2 ++
  .../{libgpg-error_1.9.bb =>  libgpg-error_1.10.bb}  |    6 +++---
  10 files changed, 29 insertions(+), 17 deletions(-)
rename meta/recipes-connectivity/avahi/{avahi_0.6.28.bb => avahi_0.6.30.bb} (82%) rename meta/recipes-core/jpeg/{jpeg-8b => jpeg-8c}/debian-libjpeg7_7-1.diff (98%) rename meta/recipes-core/jpeg/{jpeg_8b.bb => jpeg_8c.bb} (82%)
rename meta/recipes-sato/pimlico/{tasks_0.18.bb => tasks_0.19.bb} (78%)
rename meta/recipes-support/consolekit/{consolekit_0.4.3.bb => consolekit_0.4.4.bb} (75%) rename meta/recipes-support/libgpg-error/{libgpg-error-1.9 => libgpg-error-1.10}/pkgconfig.patch (98%) rename meta/recipes-support/libgpg-error/{libgpg-error_1.9.bb => libgpg-error_1.10.bb} (82%)

Quoted 5 lines

_______________________________________________
poky mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/poky

Pulled into oe-core and poky/master

Thanks
Sau!