cdrtools recipe cleanup

PATCH In review Scott Garman 3 participants 7 messages Apr 25, 2011 – May 6, 2011

lore

Share & tools

lore

Scott Garman

author

2011-04-25 20:08 UTC #0 lore raw

cover cdrtools recipe cleanup

From: Scott Garman <[email protected]>

Hi Saul,

Looking closer at the existing cdrtools recipe we have, in fact the CVE advisory does not apply, since the problematic utility (rscsi) is staged in ${sbindir} and the custom do_install() function only packages ${bindir}.

So instead I took the opportunity to do some recipe cleanup, updated the patches, and added distro tracking information.

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

Thanks,
Scott Garman <[email protected]>
---

Scott Garman (2):
cdrtools: recipe and patch cleanup
distro_tracking_fields.inc: add cdrtools recipe

 .../conf/distro/include/distro_tracking_fields.inc |   11 ++++++++++
 .../cdrtools-native/glibc-conflict-rename.patch    |    8 +++++++
 .../cdrtools/cdrtools-native/no_usr_src.patch      |    7 ++++++
 .../cdrtools/cdrtools-native_2.01.bb               |   21 ++++++++++---------
 4 files changed, 37 insertions(+), 10 deletions(-)

Scott Garman

author

2011-04-25 20:08 UTC #1 lore raw

PATCH 1/2 cdrtools: recipe and patch cleanup

From: Scott Garman <[email protected]>

* Recipe cleanup, added missing metadata fields and fixed whitespace issues
* Added Upstream-Status to patches
* Confirmed that CVE-2003-0655 does not apply to this recipe as rscsi is not packaged

Signed-off-by Scott Garman <[email protected]>

---
 .../cdrtools-native/glibc-conflict-rename.patch    |    8 +++++++
 .../cdrtools/cdrtools-native/no_usr_src.patch      |    7 ++++++
 .../cdrtools/cdrtools-native_2.01.bb               |   21 ++++++++++---------
 3 files changed, 26 insertions(+), 10 deletions(-)

meta/recipes-devtools/cdrtools/cdrtools-native/glibc-conflict-rename.patch +8 -0

index 0b9b892..2fd5696 100644
@@ -1,3 +1,11 @@
+This patch fixes collisions between locally defined functions
+and glibc's fexecve() and getline() functions.
+
+Upstream-Status: Inappropriate [Other]
+Upstream no longer maintains a GPL version of this utility.
+
+Signed-off-by: Scott Garman <[email protected]>
+
 Index: cdrtools-2.01/include/schily.h
 ===================================================================
 --- cdrtools-2.01.orig/include/schily.h	2009-06-18 11:30:45.000000000 +0100

meta/recipes-devtools/cdrtools/cdrtools-native/no_usr_src.patch +7 -0

index 0318d31..82e57d1 100644
@@ -1,3 +1,10 @@
+Remove hard-coded references to /usr/src/linux/include to avoid
+host contamination.
+
+Upstream-Status: [Other (build-system specific)]
+
+Signed-off-by: Scott Garman <[email protected]>
+
 Index: cdrtools-2.01/DEFAULTS/Defaults.gnu
 ===================================================================
 --- cdrtools-2.01.orig/DEFAULTS/Defaults.gnu	2008-09-22 12:42:12.000000000 +0100

meta/recipes-devtools/cdrtools/cdrtools-native_2.01.bb +11 ~~-10~~

index 769e5e2..edebf57 100644
@@ -1,21 +1,22 @@
 # cdrtools-native OE build file
 # Copyright (C) 2004-2006, Advanced Micro Devices, Inc.  All Rights Reserved
 # Released under the MIT license (see packages/COPYING)
-
-LICENSE="GPL"
-DESCRIPTION="A set of tools for CD recording, including cdrecord"
-HOMEPAGE="http://cdrecord.berlios.de/old/private/cdrecord.html"
-PR = "r2"
-
+SUMMARY = "A set of tools for CD recording, including cdrecord"
+DESCRIPTION = "A set of tools for CD recording, including cdrecord"
+HOMEPAGE = "http://cdrecord.berlios.de/private/cdrecord.html"
+SECTION = "console/utils"
+PRIORITY = "optional"
+LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+PR = "r2"
 
-SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/cdrtools-${PV}.tar.bz2 \
-         file://no_usr_src.patch;patch=1 \
-         file://glibc-conflict-rename.patch;patch=1"
+SRC_URI = "ftp://ftp.berlios.de/pub/cdrecord/cdrtools-${PV}.tar.bz2 \
+           file://no_usr_src.patch \
+           file://glibc-conflict-rename.patch"
 
 inherit native
 
-STAGE_TEMP="${WORKDIR}/image-temp"
+STAGE_TEMP = "${WORKDIR}/image-temp"
 
 do_install() {
 	install -d ${STAGE_TEMP}

Signature · 1 line

1.7.1

Saul Wold

2011-04-26 00:22 UTC #2 lore raw

Re: [PATCH 1/2] cdrtools: recipe and patch cleanup

Quoted 8 lines · Scott Garman

From: Scott Garman<[email protected]>
* Recipe cleanup, added missing metadata fields and fixed whitespace issues
* Added Upstream-Status to patches
* Confirmed that CVE-2003-0655 does not apply to this recipe as rscsi is not packaged

Scott,

You need to add SRC_URI to this recipe.

Thanks

Sau!

Quoted 75 lines

Signed-off-by Scott Garman<[email protected]>

---
  .../cdrtools-native/glibc-conflict-rename.patch    |    8 +++++++
  .../cdrtools/cdrtools-native/no_usr_src.patch      |    7 ++++++
  .../cdrtools/cdrtools-native_2.01.bb               |   21 ++++++++++---------
  3 files changed, 26 insertions(+), 10 deletions(-)

meta/recipes-devtools/cdrtools/cdrtools-native/glibc-conflict-rename.patch +8 -0

index 0b9b892..2fd5696 100644
@@ -1,3 +1,11 @@
+This patch fixes collisions between locally defined functions
+and glibc's fexecve() and getline() functions.
+
+Upstream-Status: Inappropriate [Other]
+Upstream no longer maintains a GPL version of this utility.
+
+Signed-off-by: Scott Garman<[email protected]>
+
  Index: cdrtools-2.01/include/schily.h
  ===================================================================
  --- cdrtools-2.01.orig/include/schily.h	2009-06-18 11:30:45.000000000 +0100

meta/recipes-devtools/cdrtools/cdrtools-native/no_usr_src.patch +7 -0

index 0318d31..82e57d1 100644
@@ -1,3 +1,10 @@
+Remove hard-coded references to /usr/src/linux/include to avoid
+host contamination.
+
+Upstream-Status: [Other (build-system specific)]
+
+Signed-off-by: Scott Garman<[email protected]>
+
  Index: cdrtools-2.01/DEFAULTS/Defaults.gnu
  ===================================================================
  --- cdrtools-2.01.orig/DEFAULTS/Defaults.gnu	2008-09-22 12:42:12.000000000 +0100

meta/recipes-devtools/cdrtools/cdrtools-native_2.01.bb +11 ~~-10~~

index 769e5e2..edebf57 100644
@@ -1,21 +1,22 @@
  # cdrtools-native OE build file
  # Copyright (C) 2004-2006, Advanced Micro Devices, Inc.  All Rights Reserved
  # Released under the MIT license (see packages/COPYING)
-
-LICENSE="GPL"
-DESCRIPTION="A set of tools for CD recording, including cdrecord"
-HOMEPAGE="http://cdrecord.berlios.de/old/private/cdrecord.html"
-PR = "r2"
-
+SUMMARY = "A set of tools for CD recording, including cdrecord"
+DESCRIPTION = "A set of tools for CD recording, including cdrecord"
+HOMEPAGE = "http://cdrecord.berlios.de/private/cdrecord.html"
+SECTION = "console/utils"
+PRIORITY = "optional"
+LICENSE = "GPLv2"
  LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+PR = "r2"
 
-SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/cdrtools-${PV}.tar.bz2 \
-         file://no_usr_src.patch;patch=1 \
-         file://glibc-conflict-rename.patch;patch=1"
+SRC_URI = "ftp://ftp.berlios.de/pub/cdrecord/cdrtools-${PV}.tar.bz2 \
+           file://no_usr_src.patch \
+           file://glibc-conflict-rename.patch"
 
  inherit native
 
-STAGE_TEMP="${WORKDIR}/image-temp"
+STAGE_TEMP = "${WORKDIR}/image-temp"
 
  do_install() {
  	install -d ${STAGE_TEMP}

Scott Garman

author

2011-04-26 00:24 UTC #3 lore raw

Re: [PATCH 1/2] cdrtools: recipe and patch cleanup

Quoted 9 lines · Saul

Quoted 8 lines · Scott Garman
From: Scott Garman<[email protected]>
* Recipe cleanup, added missing metadata fields and fixed whitespace issues
* Added Upstream-Status to patches
* Confirmed that CVE-2003-0655 does not apply to this recipe as rscsi is not packaged

Quoted 3 lines

Scott,
You need to add SRC_URI to this recipe.

The recipe has SRC_URI. Was that a typo?

Scott

Quoted 82 lines

Thanks

Sau!

Quoted 75 lines

Signed-off-by Scott Garman<[email protected]>

---
   .../cdrtools-native/glibc-conflict-rename.patch    |    8 +++++++
   .../cdrtools/cdrtools-native/no_usr_src.patch      |    7 ++++++
   .../cdrtools/cdrtools-native_2.01.bb               |   21 ++++++++++---------
   3 files changed, 26 insertions(+), 10 deletions(-)

meta/recipes-devtools/cdrtools/cdrtools-native/glibc-conflict-rename.patch +8 -0

index 0b9b892..2fd5696 100644
@@ -1,3 +1,11 @@
+This patch fixes collisions between locally defined functions
+and glibc's fexecve() and getline() functions.
+
+Upstream-Status: Inappropriate [Other]
+Upstream no longer maintains a GPL version of this utility.
+
+Signed-off-by: Scott Garman<[email protected]>
+
   Index: cdrtools-2.01/include/schily.h
   ===================================================================
   --- cdrtools-2.01.orig/include/schily.h	2009-06-18 11:30:45.000000000 +0100

meta/recipes-devtools/cdrtools/cdrtools-native/no_usr_src.patch +7 -0

index 0318d31..82e57d1 100644
@@ -1,3 +1,10 @@
+Remove hard-coded references to /usr/src/linux/include to avoid
+host contamination.
+
+Upstream-Status: [Other (build-system specific)]
+
+Signed-off-by: Scott Garman<[email protected]>
+
   Index: cdrtools-2.01/DEFAULTS/Defaults.gnu
   ===================================================================
   --- cdrtools-2.01.orig/DEFAULTS/Defaults.gnu	2008-09-22 12:42:12.000000000 +0100

meta/recipes-devtools/cdrtools/cdrtools-native_2.01.bb +11 ~~-10~~

index 769e5e2..edebf57 100644
@@ -1,21 +1,22 @@
   # cdrtools-native OE build file
   # Copyright (C) 2004-2006, Advanced Micro Devices, Inc.  All Rights Reserved
   # Released under the MIT license (see packages/COPYING)
-
-LICENSE="GPL"
-DESCRIPTION="A set of tools for CD recording, including cdrecord"
-HOMEPAGE="http://cdrecord.berlios.de/old/private/cdrecord.html"
-PR = "r2"
-
+SUMMARY = "A set of tools for CD recording, including cdrecord"
+DESCRIPTION = "A set of tools for CD recording, including cdrecord"
+HOMEPAGE = "http://cdrecord.berlios.de/private/cdrecord.html"
+SECTION = "console/utils"
+PRIORITY = "optional"
+LICENSE = "GPLv2"
   LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+PR = "r2"
 
-SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/cdrtools-${PV}.tar.bz2 \
-         file://no_usr_src.patch;patch=1 \
-         file://glibc-conflict-rename.patch;patch=1"
+SRC_URI = "ftp://ftp.berlios.de/pub/cdrecord/cdrtools-${PV}.tar.bz2 \
+           file://no_usr_src.patch \
+           file://glibc-conflict-rename.patch"
 
   inherit native
 
-STAGE_TEMP="${WORKDIR}/image-temp"
+STAGE_TEMP = "${WORKDIR}/image-temp"
 
   do_install() {
   	install -d ${STAGE_TEMP}

Signature · 3 lines

Scott Garman
Embedded Linux Engineer - Yocto Project
Intel Open Source Technology Center

Saul Wold

2011-04-26 00:37 UTC #4 lore raw

Re: [PATCH 1/2] cdrtools: recipe and patch cleanup

Quoted 10 lines · Scott A

Quoted 9 lines · Saul
Quoted 8 lines · Scott Garman
From: Scott Garman<[email protected]>
* Recipe cleanup, added missing metadata fields and fixed whitespace issues
* Added Upstream-Status to patches
* Confirmed that CVE-2003-0655 does not apply to this recipe as rscsi is not packaged

Quoted 6 lines

Quoted 3 lines
Scott,
You need to add SRC_URI to this recipe.
The recipe has SRC_URI. Was that a typo?

Yeah, the typo was SRC_URI Checksums! They are missing from this recipe.

Sau!

Quoted 87 lines

Scott

Quoted 82 lines

Thanks

Sau!

Quoted 75 lines

Signed-off-by Scott Garman<[email protected]>

---
    .../cdrtools-native/glibc-conflict-rename.patch    |    8 +++++++
    .../cdrtools/cdrtools-native/no_usr_src.patch      |    7 ++++++
    .../cdrtools/cdrtools-native_2.01.bb               |   21 ++++++++++---------
    3 files changed, 26 insertions(+), 10 deletions(-)

meta/recipes-devtools/cdrtools/cdrtools-native/glibc-conflict-rename.patch +8 -0

index 0b9b892..2fd5696 100644
@@ -1,3 +1,11 @@
+This patch fixes collisions between locally defined functions
+and glibc's fexecve() and getline() functions.
+
+Upstream-Status: Inappropriate [Other]
+Upstream no longer maintains a GPL version of this utility.
+
+Signed-off-by: Scott Garman<[email protected]>
+
    Index: cdrtools-2.01/include/schily.h
    ===================================================================
    --- cdrtools-2.01.orig/include/schily.h	2009-06-18 11:30:45.000000000 +0100

meta/recipes-devtools/cdrtools/cdrtools-native/no_usr_src.patch +7 -0

index 0318d31..82e57d1 100644
@@ -1,3 +1,10 @@
+Remove hard-coded references to /usr/src/linux/include to avoid
+host contamination.
+
+Upstream-Status: [Other (build-system specific)]
+
+Signed-off-by: Scott Garman<[email protected]>
+
    Index: cdrtools-2.01/DEFAULTS/Defaults.gnu
    ===================================================================
    --- cdrtools-2.01.orig/DEFAULTS/Defaults.gnu	2008-09-22 12:42:12.000000000 +0100

meta/recipes-devtools/cdrtools/cdrtools-native_2.01.bb +11 ~~-10~~

index 769e5e2..edebf57 100644
@@ -1,21 +1,22 @@
    # cdrtools-native OE build file
    # Copyright (C) 2004-2006, Advanced Micro Devices, Inc.  All Rights Reserved
    # Released under the MIT license (see packages/COPYING)
-
-LICENSE="GPL"
-DESCRIPTION="A set of tools for CD recording, including cdrecord"
-HOMEPAGE="http://cdrecord.berlios.de/old/private/cdrecord.html"
-PR = "r2"
-
+SUMMARY = "A set of tools for CD recording, including cdrecord"
+DESCRIPTION = "A set of tools for CD recording, including cdrecord"
+HOMEPAGE = "http://cdrecord.berlios.de/private/cdrecord.html"
+SECTION = "console/utils"
+PRIORITY = "optional"
+LICENSE = "GPLv2"
    LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+PR = "r2"
 
-SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/cdrtools-${PV}.tar.bz2 \
-         file://no_usr_src.patch;patch=1 \
-         file://glibc-conflict-rename.patch;patch=1"
+SRC_URI = "ftp://ftp.berlios.de/pub/cdrecord/cdrtools-${PV}.tar.bz2 \
+           file://no_usr_src.patch \
+           file://glibc-conflict-rename.patch"
 
    inherit native
 
-STAGE_TEMP="${WORKDIR}/image-temp"
+STAGE_TEMP = "${WORKDIR}/image-temp"
 
    do_install() {
    	install -d ${STAGE_TEMP}

Scott Garman

author

2011-04-25 20:08 UTC #5 lore raw

PATCH 2/2 distro_tracking_fields.inc: add cdrtools recipe

In reply to Scott Garman

From: Scott Garman <[email protected]>

Signed-off-by Scott Garman <[email protected]>

---
 .../conf/distro/include/distro_tracking_fields.inc |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

meta/conf/distro/include/distro_tracking_fields.inc +11 -0

index e7201b0..d491d97 100644
@@ -5672,3 +5672,14 @@ RECIPE_STATUS_pn-createrepo = "green"
 RECIPE_LATEST_VERSION_pn-createrepo = "2.2.3"
 RECIPE_MAINTAINER_pn-createrepo = "Qing He <[email protected]>"
 RECIPE_LAST_UPDATE_pn-createrepo = "Apr 6, 2011"
+
+RECIPE_STATUS_pn-cdrtools = "green"
+RECIPE_DEPENDENCY_CHECK_pn-cdrtools = "not done"
+RECIPE_LATEST_VERSION_pn-cdrtools = "3.00"
+RECIPE_NO_UPDATE_REASON_pn-cdrtools = "v3.x uses incompatible CDDL license"
+RECIPE_NO_OF_PATCHES_pn-cdrtools = "2"
+RECIPE_LATEST_RELEASE_DATE_pn-cdrtools = "2010/06/02"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-cdrtools = "6 years 2 months"
+RECIPE_COMMENTS_pn-cdrtools = "This is the last GPL licensed version of cdrtools"
+RECIPE_LAST_UPDATE_pn-cdrtools = "Apr 25, 2011"
+RECIPE_MAINTAINER_pn-cdrtools = "Scott Garman <[email protected]>"

Signature · 1 line

1.7.1

Saul Wold

2011-05-06 22:38 UTC #6 lore raw

In reply to Scott Garman

Quoted 31 lines · Scott Garman

From: Scott Garman<[email protected]>
Hi Saul,
Looking closer at the existing cdrtools recipe we have, in fact the CVE advisory does not apply, since the problematic utility (rscsi) is staged in ${sbindir} and the custom do_install() function only packages ${bindir}.
So instead I took the opportunity to do some recipe cleanup, updated the patches, and added distro tracking information.
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: sgarman/cdrtools-cve
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=sgarman/cdrtools-cve
Thanks,
Scott Garman<[email protected]>
---
Scott Garman (2):
cdrtools: recipe and patch cleanup distro_tracking_fields.inc: add cdrtools recipe
  .../conf/distro/include/distro_tracking_fields.inc |   11 ++++++++++
  .../cdrtools-native/glibc-conflict-rename.patch    |    8 +++++++
  .../cdrtools/cdrtools-native/no_usr_src.patch      |    7 ++++++
  .../cdrtools/cdrtools-native_2.01.bb               |   21 ++++++++++---------
  4 files changed, 37 insertions(+), 10 deletions(-)

Quoted 5 lines

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

Pulled into Master

Thanks
Sau!