* [PATCH] ipsec-tools: Update patch status
@ 2014-04-12 19:14 Paul Barker
2014-04-12 19:14 ` [PATCH] vim: Upgrade to v7.4.258 Paul Barker
2014-04-20 12:53 ` [PATCH] ipsec-tools: Update patch status Martin Jansa
0 siblings, 2 replies; 4+ messages in thread
From: Paul Barker @ 2014-04-12 19:14 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
---
.../ipsec-tools/ipsec-tools/0002-Don-t-link-against-libfl.patch | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0002-Don-t-link-against-libfl.patch b/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0002-Don-t-link-against-libfl.patch
index 674331d..13e9d73 100644
--- a/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0002-Don-t-link-against-libfl.patch
+++ b/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0002-Don-t-link-against-libfl.patch
@@ -9,7 +9,8 @@ need to link against libfl and so no longer get errors about undefined
references to yylex.
Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
-Upstream-status: Pending
+Upstream-status: Submitted 2014-03-11
+ see http://sourceforge.net/p/ipsec-tools/mailman/ipsec-tools-devel/thread/CANyK_8ewmxGA3vBVJW6s1APXPmxPR%2BDFWZ61EL8pCt288aKQ6w%40mail.gmail.com/#msg32088797
---
src/libipsec/Makefile.am | 1 -
src/racoon/Makefile.am | 2 +-
--
1.9.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] vim: Upgrade to v7.4.258
2014-04-12 19:14 [PATCH] ipsec-tools: Update patch status Paul Barker
@ 2014-04-12 19:14 ` Paul Barker
2014-04-20 11:19 ` Martin Jansa
2014-04-20 12:53 ` [PATCH] ipsec-tools: Update patch status Martin Jansa
1 sibling, 1 reply; 4+ messages in thread
From: Paul Barker @ 2014-04-12 19:14 UTC (permalink / raw)
To: openembedded-devel
The patch against configure.in was resubmitted to the vim mailing list and was
merged into the upstream sources so is no longer needed.
Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
---
.../vim/files/configure.in_remove_CC_quotes.patch | 17 -----------------
.../vim/{vim_7.4.155.bb => vim_7.4.258.bb} | 5 ++---
2 files changed, 2 insertions(+), 20 deletions(-)
delete mode 100644 meta-oe/recipes-support/vim/files/configure.in_remove_CC_quotes.patch
rename meta-oe/recipes-support/vim/{vim_7.4.155.bb => vim_7.4.258.bb} (96%)
diff --git a/meta-oe/recipes-support/vim/files/configure.in_remove_CC_quotes.patch b/meta-oe/recipes-support/vim/files/configure.in_remove_CC_quotes.patch
deleted file mode 100644
index c8cfe8e..0000000
--- a/meta-oe/recipes-support/vim/files/configure.in_remove_CC_quotes.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-upstream: http://groups.google.com/group/vim_dev/browse_thread/thread/5685c3b859e3c793#
-status: reported upstream
---- vim72-orig/src/configure.in 2010-09-29 19:13:33.000000000 +0200
-+++ vim72/src/configure.in 2010-09-29 19:17:07.000000000 +0200
-@@ -35,10 +35,10 @@
- fi
- if test "$GCC" = yes; then
- dnl method that should work for nearly all versions
-- gccversion=`"$CC" -dumpversion`
-+ gccversion=`$CC -dumpversion`
- if test "x$gccversion" = "x"; then
- dnl old method; fall-back for when -dumpversion doesn't work
-- gccversion=`"$CC" --version | sed -e '2,$d' -e 's/darwin.//' -e 's/^[[^0-9]]*\([[0-9]]\.[[0-9.]]*\).*$/\1/g'`
-+ gccversion=`$CC --version | sed -e '2,$d' -e 's/darwin.//' -e 's/^[[^0-9]]*\([[0-9]]\.[[0-9.]]*\).*$/\1/g'`
- fi
- dnl version 4.0.1 was reported to cause trouble on Macintosh by Marcin Dalecki
- if test "$gccversion" = "3.0.1" -o "$gccversion" = "3.0.2" -o "$gccversion" = "4.0.1"; then
diff --git a/meta-oe/recipes-support/vim/vim_7.4.155.bb b/meta-oe/recipes-support/vim/vim_7.4.258.bb
similarity index 96%
rename from meta-oe/recipes-support/vim/vim_7.4.155.bb
rename to meta-oe/recipes-support/vim/vim_7.4.258.bb
index 0d98e7a..878c79e 100644
--- a/meta-oe/recipes-support/vim/vim_7.4.155.bb
+++ b/meta-oe/recipes-support/vim/vim_7.4.258.bb
@@ -6,9 +6,8 @@ RSUGGESTS_${PN} = "diffutils"
LICENSE = "vim"
LIC_FILES_CHKSUM = "file://../runtime/doc/uganda.txt;md5=b779e18be6ed77facc770691c967b8f8"
-SRC_URI = "hg://vim.googlecode.com/hg/;protocol=https;module=vim \
- file://configure.in_remove_CC_quotes.patch;patchdir=.."
-SRCREV = "v7-4-155"
+SRC_URI = "hg://vim.googlecode.com/hg/;protocol=https;module=vim"
+SRCREV = "v7-4-258"
S = "${WORKDIR}/${PN}/src"
--
1.9.2
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] vim: Upgrade to v7.4.258
2014-04-12 19:14 ` [PATCH] vim: Upgrade to v7.4.258 Paul Barker
@ 2014-04-20 11:19 ` Martin Jansa
0 siblings, 0 replies; 4+ messages in thread
From: Martin Jansa @ 2014-04-20 11:19 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 3139 bytes --]
On Sat, Apr 12, 2014 at 08:14:09PM +0100, Paul Barker wrote:
> The patch against configure.in was resubmitted to the vim mailing list and was
> merged into the upstream sources so is no longer needed.
Merged, thanks!
>
> Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
> ---
> .../vim/files/configure.in_remove_CC_quotes.patch | 17 -----------------
> .../vim/{vim_7.4.155.bb => vim_7.4.258.bb} | 5 ++---
> 2 files changed, 2 insertions(+), 20 deletions(-)
> delete mode 100644 meta-oe/recipes-support/vim/files/configure.in_remove_CC_quotes.patch
> rename meta-oe/recipes-support/vim/{vim_7.4.155.bb => vim_7.4.258.bb} (96%)
>
> diff --git a/meta-oe/recipes-support/vim/files/configure.in_remove_CC_quotes.patch b/meta-oe/recipes-support/vim/files/configure.in_remove_CC_quotes.patch
> deleted file mode 100644
> index c8cfe8e..0000000
> --- a/meta-oe/recipes-support/vim/files/configure.in_remove_CC_quotes.patch
> +++ /dev/null
> @@ -1,17 +0,0 @@
> -upstream: http://groups.google.com/group/vim_dev/browse_thread/thread/5685c3b859e3c793#
> -status: reported upstream
> ---- vim72-orig/src/configure.in 2010-09-29 19:13:33.000000000 +0200
> -+++ vim72/src/configure.in 2010-09-29 19:17:07.000000000 +0200
> -@@ -35,10 +35,10 @@
> - fi
> - if test "$GCC" = yes; then
> - dnl method that should work for nearly all versions
> -- gccversion=`"$CC" -dumpversion`
> -+ gccversion=`$CC -dumpversion`
> - if test "x$gccversion" = "x"; then
> - dnl old method; fall-back for when -dumpversion doesn't work
> -- gccversion=`"$CC" --version | sed -e '2,$d' -e 's/darwin.//' -e 's/^[[^0-9]]*\([[0-9]]\.[[0-9.]]*\).*$/\1/g'`
> -+ gccversion=`$CC --version | sed -e '2,$d' -e 's/darwin.//' -e 's/^[[^0-9]]*\([[0-9]]\.[[0-9.]]*\).*$/\1/g'`
> - fi
> - dnl version 4.0.1 was reported to cause trouble on Macintosh by Marcin Dalecki
> - if test "$gccversion" = "3.0.1" -o "$gccversion" = "3.0.2" -o "$gccversion" = "4.0.1"; then
> diff --git a/meta-oe/recipes-support/vim/vim_7.4.155.bb b/meta-oe/recipes-support/vim/vim_7.4.258.bb
> similarity index 96%
> rename from meta-oe/recipes-support/vim/vim_7.4.155.bb
> rename to meta-oe/recipes-support/vim/vim_7.4.258.bb
> index 0d98e7a..878c79e 100644
> --- a/meta-oe/recipes-support/vim/vim_7.4.155.bb
> +++ b/meta-oe/recipes-support/vim/vim_7.4.258.bb
> @@ -6,9 +6,8 @@ RSUGGESTS_${PN} = "diffutils"
> LICENSE = "vim"
> LIC_FILES_CHKSUM = "file://../runtime/doc/uganda.txt;md5=b779e18be6ed77facc770691c967b8f8"
>
> -SRC_URI = "hg://vim.googlecode.com/hg/;protocol=https;module=vim \
> - file://configure.in_remove_CC_quotes.patch;patchdir=.."
> -SRCREV = "v7-4-155"
> +SRC_URI = "hg://vim.googlecode.com/hg/;protocol=https;module=vim"
> +SRCREV = "v7-4-258"
>
> S = "${WORKDIR}/${PN}/src"
>
> --
> 1.9.2
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ipsec-tools: Update patch status
2014-04-12 19:14 [PATCH] ipsec-tools: Update patch status Paul Barker
2014-04-12 19:14 ` [PATCH] vim: Upgrade to v7.4.258 Paul Barker
@ 2014-04-20 12:53 ` Martin Jansa
1 sibling, 0 replies; 4+ messages in thread
From: Martin Jansa @ 2014-04-20 12:53 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 1500 bytes --]
On Sat, Apr 12, 2014 at 08:14:08PM +0100, Paul Barker wrote:
> Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
> ---
> .../ipsec-tools/ipsec-tools/0002-Don-t-link-against-libfl.patch | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
Merged, thanks!
>
> diff --git a/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0002-Don-t-link-against-libfl.patch b/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0002-Don-t-link-against-libfl.patch
> index 674331d..13e9d73 100644
> --- a/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0002-Don-t-link-against-libfl.patch
> +++ b/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0002-Don-t-link-against-libfl.patch
> @@ -9,7 +9,8 @@ need to link against libfl and so no longer get errors about undefined
> references to yylex.
>
> Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
> -Upstream-status: Pending
> +Upstream-status: Submitted 2014-03-11
> + see http://sourceforge.net/p/ipsec-tools/mailman/ipsec-tools-devel/thread/CANyK_8ewmxGA3vBVJW6s1APXPmxPR%2BDFWZ61EL8pCt288aKQ6w%40mail.gmail.com/#msg32088797
> ---
> src/libipsec/Makefile.am | 1 -
> src/racoon/Makefile.am | 2 +-
> --
> 1.9.2
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-04-20 12:53 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-04-12 19:14 [PATCH] ipsec-tools: Update patch status Paul Barker
2014-04-12 19:14 ` [PATCH] vim: Upgrade to v7.4.258 Paul Barker
2014-04-20 11:19 ` Martin Jansa
2014-04-20 12:53 ` [PATCH] ipsec-tools: Update patch status Martin Jansa
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox