From 0702602332ad63c2cfaa207516497bb0b75bfdf3 Mon Sep 17 00:00:00 2001 From: Scott Garman Date: Sun, 15 May 2011 20:04:27 -0700 Subject: recipes: Add Upstream-Status to various recipe patches Add Upstream-Status tag to patches for the following recipes: openssh dbus-glib expat opensp sgml-common at cpio (GPLv3 version) libpam icu Signed-off-by: Scott Garman --- meta/recipes-connectivity/openssh/openssh-5.6p1/nostrip.patch | 9 ++++++--- meta/recipes-core/dbus/dbus-glib-0.92/no-examples.patch | 9 ++++++--- meta/recipes-core/expat/expat-2.0.1/autotools.patch | 10 +++++++--- meta/recipes-devtools/opensp/opensp/attributevalue.patch | 3 +++ meta/recipes-devtools/opensp/opensp/fix-docdir.patch | 3 +++ meta/recipes-devtools/opensp/opensp/m4.patch | 3 +++ meta/recipes-devtools/opensp/opensp/rangmap-fix.patch | 3 +++ .../sgml-common/sgml-common-0.6.3/autohell.patch | 3 +++ .../sgml-common/sgml-common-0.6.3/license.patch | 3 +++ meta/recipes-extended/at/at-3.1.12/configure.patch | 8 ++++++-- .../at/at-3.1.12/fix_parallel_build_error.patch | 4 ++++ meta/recipes-extended/cpio/cpio-2.11/statdef.patch | 8 ++++++-- meta/recipes-extended/pam/libpam/pam-no-innetgr.patch | 5 +++++ meta/recipes-extended/sudo/files/libtool.patch | 10 +++++++--- meta/recipes-support/icu/files/gccfix.patch | 6 ++++++ meta/recipes-support/icu/files/noldlibpath.patch | 5 +++++ meta/recipes-support/icu/files/use-g++-for-linking.patch | 7 +++++++ 17 files changed, 83 insertions(+), 16 deletions(-) diff --git a/meta/recipes-connectivity/openssh/openssh-5.6p1/nostrip.patch b/meta/recipes-connectivity/openssh/openssh-5.6p1/nostrip.patch index a88e18e354..7970b6d05a 100644 --- a/meta/recipes-connectivity/openssh/openssh-5.6p1/nostrip.patch +++ b/meta/recipes-connectivity/openssh/openssh-5.6p1/nostrip.patch @@ -1,6 +1,9 @@ -# Disable stripping binaries during make install. -# -# Signed-off-by: Scott Garman +Disable stripping binaries during make install. + +Upstream-Status: Inappropriate [Other] +Build system specific. + +Signed-off-by: Scott Garman diff -ur openssh-5.6p1.orig/Makefile.in openssh-5.6p1/Makefile.in --- openssh-5.6p1.orig/Makefile.in 2010-05-11 23:51:39.000000000 -0700 diff --git a/meta/recipes-core/dbus/dbus-glib-0.92/no-examples.patch b/meta/recipes-core/dbus/dbus-glib-0.92/no-examples.patch index 32609b9b9c..fbb4967828 100644 --- a/meta/recipes-core/dbus/dbus-glib-0.92/no-examples.patch +++ b/meta/recipes-core/dbus/dbus-glib-0.92/no-examples.patch @@ -1,6 +1,9 @@ -# disable compiling examples -# -# comment added by Kevin Tian , 2010-07-10 +Disable compiling examples + +Upstream-Status: Inappropriate [disable feature] + +Signed-off-by: Kevin Tian +Signed-off-by: Scott Garman --- dbus-glib-0.70/dbus/Makefile.am.orig 2006-07-23 16:04:43.000000000 +0200 +++ dbus-glib-0.70/dbus/Makefile.am 2006-07-23 16:04:52.000000000 +0200 diff --git a/meta/recipes-core/expat/expat-2.0.1/autotools.patch b/meta/recipes-core/expat/expat-2.0.1/autotools.patch index ff1578f47e..c0ac10b757 100644 --- a/meta/recipes-core/expat/expat-2.0.1/autotools.patch +++ b/meta/recipes-core/expat/expat-2.0.1/autotools.patch @@ -1,6 +1,10 @@ -# avoid to use expat's own *.m4 -# -# comment added by Kevin Tian , 2010-07-07 +Avoid using expat's m4 files + +Upstream-Status: Inappropriate [Other] +Workaround specific to our build system. + +Signed-off-by: Kevin Tian +Signed-off-by: Scott Garman diff -bur expat-2.0.0~orig/configure.in expat-2.0.0/configure.in --- expat-2.0.0~orig/configure.in 2006-01-10 19:10:46.000000000 -0600 diff --git a/meta/recipes-devtools/opensp/opensp/attributevalue.patch b/meta/recipes-devtools/opensp/opensp/attributevalue.patch index 4f3507e19b..92f5898f47 100644 --- a/meta/recipes-devtools/opensp/opensp/attributevalue.patch +++ b/meta/recipes-devtools/opensp/opensp/attributevalue.patch @@ -1,6 +1,9 @@ Patch obtained from OpenEmbedded. +Upstream-Status: Pending + Signed-off-by: Scott Garman + --- 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 @@ diff --git a/meta/recipes-devtools/opensp/opensp/fix-docdir.patch b/meta/recipes-devtools/opensp/opensp/fix-docdir.patch index 5e2fc8b745..c78b9ad749 100644 --- a/meta/recipes-devtools/opensp/opensp/fix-docdir.patch +++ b/meta/recipes-devtools/opensp/opensp/fix-docdir.patch @@ -1,6 +1,9 @@ Patch obtained from OpenEmbedded. +Upstream-Status: Pending + Signed-off-by: Scott Garman + Index: OpenSP-1.5/doc/Makefile.am =================================================================== --- OpenSP-1.5.orig/doc/Makefile.am 2000-05-06 09:10:32.000000000 +1000 diff --git a/meta/recipes-devtools/opensp/opensp/m4.patch b/meta/recipes-devtools/opensp/opensp/m4.patch index a8504c5818..96a782cf62 100644 --- a/meta/recipes-devtools/opensp/opensp/m4.patch +++ b/meta/recipes-devtools/opensp/opensp/m4.patch @@ -1,6 +1,9 @@ Patch obtained from OpenEmbedded. +Upstream-Status: Pending + Signed-off-by: Scott Garman + --- /dev/null 2003-09-23 18:19:32.000000000 -0400 +++ OpenSP-1.5/m4/codeset.m4 2004-01-20 03:01:28.000000000 -0500 @@ -0,0 +1,23 @@ diff --git a/meta/recipes-devtools/opensp/opensp/rangmap-fix.patch b/meta/recipes-devtools/opensp/opensp/rangmap-fix.patch index cc849ca3a8..da31411495 100644 --- a/meta/recipes-devtools/opensp/opensp/rangmap-fix.patch +++ b/meta/recipes-devtools/opensp/opensp/rangmap-fix.patch @@ -1,6 +1,9 @@ Patch obtained from OpenEmbedded. +Upstream-Status: Pending + Signed-off-by: Scott Garman + Index: OpenSP-1.5/include/RangeMap.cxx =================================================================== --- OpenSP-1.5.orig/include/RangeMap.cxx 2000-02-26 03:55:21.000000000 +1100 diff --git a/meta/recipes-devtools/sgml-common/sgml-common-0.6.3/autohell.patch b/meta/recipes-devtools/sgml-common/sgml-common-0.6.3/autohell.patch index 1366adabd8..1f39b03300 100644 --- a/meta/recipes-devtools/sgml-common/sgml-common-0.6.3/autohell.patch +++ b/meta/recipes-devtools/sgml-common/sgml-common-0.6.3/autohell.patch @@ -1,6 +1,9 @@ Patch obtained from OpenEmbedded. +Upstream-Status: Pending + Signed-off-by: Scott Garman + --- sgml-common-0.6.3/bin/Makefile.am~autohell.patch 2001-01-30 15:42:21.000000000 +0100 +++ sgml-common-0.6.3/bin/Makefile.am 2004-06-17 11:51:11.000000000 +0200 @@ -1,6 +1,5 @@ diff --git a/meta/recipes-devtools/sgml-common/sgml-common-0.6.3/license.patch b/meta/recipes-devtools/sgml-common/sgml-common-0.6.3/license.patch index ec66aaefa2..54b3f54494 100644 --- a/meta/recipes-devtools/sgml-common/sgml-common-0.6.3/license.patch +++ b/meta/recipes-devtools/sgml-common/sgml-common-0.6.3/license.patch @@ -7,7 +7,10 @@ Upstream was notified about this on 2011-01-24. When upgrading this recipe, this should be fixed and you should remove this patch. +Upstream-Status: Pending + Signed-off-by: Scott Garman + diff -urN sgml-common-0.6.3.orig/LICENSE-GPLv2 sgml-common-0.6.3/LICENSE-GPLv2 --- sgml-common-0.6.3.orig/LICENSE-GPLv2 1969-12-31 16:00:00.000000000 -0800 +++ sgml-common-0.6.3/LICENSE-GPLv2 2011-01-28 17:05:17.299528001 -0800 diff --git a/meta/recipes-extended/at/at-3.1.12/configure.patch b/meta/recipes-extended/at/at-3.1.12/configure.patch index 2458ef357a..079a6b4497 100644 --- a/meta/recipes-extended/at/at-3.1.12/configure.patch +++ b/meta/recipes-extended/at/at-3.1.12/configure.patch @@ -1,5 +1,9 @@ -# Fix cross-compilation issues in configure.ac -# Derived from an OE patch for at-3.1.8 +Fix cross-compilation issues in configure.ac +Derived from an OE patch for at-3.1.8 + +Upstream-Status: Pending + +Signed-off-by: Scott Garman Index: at-3.1.12/configure.ac =================================================================== diff --git a/meta/recipes-extended/at/at-3.1.12/fix_parallel_build_error.patch b/meta/recipes-extended/at/at-3.1.12/fix_parallel_build_error.patch index 6383660e80..877be35aaf 100644 --- a/meta/recipes-extended/at/at-3.1.12/fix_parallel_build_error.patch +++ b/meta/recipes-extended/at/at-3.1.12/fix_parallel_build_error.patch @@ -9,6 +9,10 @@ Fixed the issue by adding a dependancy in the makefile. Nitin 2010/09/02 +Upstream-Status: Pending + +Signed-off-by: Scott Garman + Index: at-3.1.12/Makefile.in =================================================================== --- at-3.1.12.orig/Makefile.in diff --git a/meta/recipes-extended/cpio/cpio-2.11/statdef.patch b/meta/recipes-extended/cpio/cpio-2.11/statdef.patch index dfa0d9150a..a6b8e82a0b 100644 --- a/meta/recipes-extended/cpio/cpio-2.11/statdef.patch +++ b/meta/recipes-extended/cpio/cpio-2.11/statdef.patch @@ -1,5 +1,9 @@ -# Avoid multiple stat definitions -# Patch taken from cpio mailing list posting 2010-03-19 +Avoid multiple stat definitions +Patch taken from cpio mailing list posting 2010-03-19 + +Upstream-Status: Pending + +Signed-off-by: Scott Garman diff -urN cpio-2.11.orig/src/filetypes.h cpio-2.11/src/filetypes.h --- cpio-2.11.orig/src/filetypes.h 2010-02-12 02:19:23.000000000 -0800 diff --git a/meta/recipes-extended/pam/libpam/pam-no-innetgr.patch b/meta/recipes-extended/pam/libpam/pam-no-innetgr.patch index e622a0d246..5e551ac48f 100644 --- a/meta/recipes-extended/pam/libpam/pam-no-innetgr.patch +++ b/meta/recipes-extended/pam/libpam/pam-no-innetgr.patch @@ -2,6 +2,11 @@ innetgr may not be there so make sure that when innetgr is not present then we inform about it and not use it. -Khem + +Upstream-Status: Pending + +Signed-off-by: Scott Garman + Index: Linux-PAM-1.1.3/modules/pam_group/pam_group.c =================================================================== --- Linux-PAM-1.1.3.orig/modules/pam_group/pam_group.c diff --git a/meta/recipes-extended/sudo/files/libtool.patch b/meta/recipes-extended/sudo/files/libtool.patch index 2375fc60c3..22fda535d6 100644 --- a/meta/recipes-extended/sudo/files/libtool.patch +++ b/meta/recipes-extended/sudo/files/libtool.patch @@ -1,6 +1,10 @@ -# Fix path to libtool scripts so autoreconf can succeed. -# -# Signed-off-by: Scott Garman +Fix path to libtool scripts so autoreconf can succeed. + +Upstream-Status: Inappropriate [Other] +Workaround specific to our build system. + +Signed-off-by: Scott Garman + diff -urN sudo-1.7.4p4.orig//aclocal.m4 sudo-1.7.4p4//aclocal.m4 --- sudo-1.7.4p4.orig//aclocal.m4 2010-08-06 07:17:36.000000000 -0700 +++ sudo-1.7.4p4//aclocal.m4 2010-11-22 14:38:20.360957038 -0800 diff --git a/meta/recipes-support/icu/files/gccfix.patch b/meta/recipes-support/icu/files/gccfix.patch index 9291e921d3..755341f186 100644 --- a/meta/recipes-support/icu/files/gccfix.patch +++ b/meta/recipes-support/icu/files/gccfix.patch @@ -1,3 +1,9 @@ +Fixes an error which prevents compilation + +Upstream-Status: Pending + +Signed-off-by: Scott Garman + Index: source/layoutex/ParagraphLayout.cpp =================================================================== --- source.orig/layoutex/ParagraphLayout.cpp 2009-06-30 11:48:47.000000000 +0100 diff --git a/meta/recipes-support/icu/files/noldlibpath.patch b/meta/recipes-support/icu/files/noldlibpath.patch index eba3d805d4..8543044b2c 100644 --- a/meta/recipes-support/icu/files/noldlibpath.patch +++ b/meta/recipes-support/icu/files/noldlibpath.patch @@ -4,6 +4,11 @@ harmless. This is a hack. RP 10/6/2010 +Upstream-Status: Inappropriate [Other] +Hacky workaround not likely to be accepted upstream. + +Signed-off-by: Scott Garman + Index: source/config/Makefile.inc.in =================================================================== --- source.orig/config/Makefile.inc.in 2010-06-10 21:49:19.000000000 +0100 diff --git a/meta/recipes-support/icu/files/use-g++-for-linking.patch b/meta/recipes-support/icu/files/use-g++-for-linking.patch index 4702abc065..f477dadee9 100644 --- a/meta/recipes-support/icu/files/use-g++-for-linking.patch +++ b/meta/recipes-support/icu/files/use-g++-for-linking.patch @@ -1,3 +1,10 @@ +Use g++ for linking. + +Upstream-Status: Inappropriate [Other] +Build system specific + +Signed-off-by: Scott Garman + --- tools/genccode/Makefile.in | 2 +- tools/gencmn/Makefile.in | 2 +- -- cgit 1.2.3-korg