From 12a81e859f38f85f5143e72b56b5a1f974c53576 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 4 Jun 2007 11:25:53 +0000 Subject: refresh all package patches in the buildroot using quilt git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7490 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/dropbear/patches/100-pubkey_path.patch | 6 ++-- package/dropbear/patches/110-change_user.patch | 9 +++--- package/dropbear/patches/120-hostkey_prompt.patch | 6 ++-- .../patches/130-ssh_ignore_o_and_x_args.patch | 11 +++---- package/dropbear/patches/140-use_dev_urandom.patch | 9 +++--- .../patches/150-dbconvert_standalone.patch | 6 ++-- package/dropbear/patches/160-tty_close.patch | 35 ++++++++-------------- 7 files changed, 40 insertions(+), 42 deletions(-) (limited to 'package/dropbear/patches') diff --git a/package/dropbear/patches/100-pubkey_path.patch b/package/dropbear/patches/100-pubkey_path.patch index cbe525bcc3..3f76e3a743 100644 --- a/package/dropbear/patches/100-pubkey_path.patch +++ b/package/dropbear/patches/100-pubkey_path.patch @@ -1,5 +1,7 @@ ---- dropbear.old/svr-authpubkey.c.orig 2006-06-03 14:54:43.000000000 +0000 -+++ dropbear.dev/svr-authpubkey.c 2006-06-03 15:03:19.000000000 +0000 +Index: dropbear-0.49/svr-authpubkey.c +=================================================================== +--- dropbear-0.49.orig/svr-authpubkey.c 2007-06-04 13:21:39.475975408 +0200 ++++ dropbear-0.49/svr-authpubkey.c 2007-06-04 13:21:39.542965224 +0200 @@ -176,6 +176,8 @@ goto out; } diff --git a/package/dropbear/patches/110-change_user.patch b/package/dropbear/patches/110-change_user.patch index ac617e2806..9a9a6afda1 100644 --- a/package/dropbear/patches/110-change_user.patch +++ b/package/dropbear/patches/110-change_user.patch @@ -1,7 +1,8 @@ -diff -urN dropbear.old/svr-chansession.c dropbear.dev/svr-chansession.c ---- dropbear.old/svr-chansession.c 2005-12-09 06:42:33.000000000 +0100 -+++ dropbear.dev/svr-chansession.c 2005-12-12 01:42:38.982034750 +0100 -@@ -860,12 +860,12 @@ +Index: dropbear-0.49/svr-chansession.c +=================================================================== +--- dropbear-0.49.orig/svr-chansession.c 2007-06-04 13:21:39.455978448 +0200 ++++ dropbear-0.49/svr-chansession.c 2007-06-04 13:21:39.751933456 +0200 +@@ -908,12 +908,12 @@ /* We can only change uid/gid as root ... */ if (getuid() == 0) { diff --git a/package/dropbear/patches/120-hostkey_prompt.patch b/package/dropbear/patches/120-hostkey_prompt.patch index d18bff86a2..3a34771bed 100644 --- a/package/dropbear/patches/120-hostkey_prompt.patch +++ b/package/dropbear/patches/120-hostkey_prompt.patch @@ -1,5 +1,7 @@ ---- dropbear-0.49/cli-kex.c.orig 2007-02-22 09:51:36.000000000 -0600 -+++ dropbear-0.49/cli-kex.c 2007-03-22 13:45:57.000000000 -0500 +Index: dropbear-0.49/cli-kex.c +=================================================================== +--- dropbear-0.49.orig/cli-kex.c 2007-06-04 13:21:39.435981488 +0200 ++++ dropbear-0.49/cli-kex.c 2007-06-04 13:21:39.937905184 +0200 @@ -126,7 +126,7 @@ m_free(fp); return; diff --git a/package/dropbear/patches/130-ssh_ignore_o_and_x_args.patch b/package/dropbear/patches/130-ssh_ignore_o_and_x_args.patch index 9b79e4864e..b8a7d44e81 100644 --- a/package/dropbear/patches/130-ssh_ignore_o_and_x_args.patch +++ b/package/dropbear/patches/130-ssh_ignore_o_and_x_args.patch @@ -1,7 +1,8 @@ -diff -ruN dropbear-0.48-old/cli-runopts.c dropbear-0.48-new/cli-runopts.c ---- dropbear-0.48-old/cli-runopts.c 2006-03-09 16:06:03.000000000 +0100 -+++ dropbear-0.48-new/cli-runopts.c 2006-03-11 12:28:54.000000000 +0100 -@@ -188,6 +188,10 @@ +Index: dropbear-0.49/cli-runopts.c +=================================================================== +--- dropbear-0.49.orig/cli-runopts.c 2007-06-04 13:21:39.414984680 +0200 ++++ dropbear-0.49/cli-runopts.c 2007-06-04 13:21:40.122877064 +0200 +@@ -203,6 +203,10 @@ debug_trace = 1; break; #endif @@ -12,7 +13,7 @@ diff -ruN dropbear-0.48-old/cli-runopts.c dropbear-0.48-new/cli-runopts.c case 'F': case 'e': case 'c': -@@ -199,7 +203,6 @@ +@@ -214,7 +218,6 @@ #ifndef ENABLE_CLI_LOCALTCPFWD case 'L': #endif diff --git a/package/dropbear/patches/140-use_dev_urandom.patch b/package/dropbear/patches/140-use_dev_urandom.patch index e1424f59a3..61deff8540 100644 --- a/package/dropbear/patches/140-use_dev_urandom.patch +++ b/package/dropbear/patches/140-use_dev_urandom.patch @@ -1,7 +1,8 @@ -diff -urN dropbear-0.45.old/options.h dropbear-0.45/options.h ---- dropbear-0.45.old/options.h 2005-03-14 17:12:22.000000000 +0100 -+++ dropbear-0.45/options.h 2005-03-14 17:13:49.000000000 +0100 -@@ -143,7 +143,7 @@ +Index: dropbear-0.49/options.h +=================================================================== +--- dropbear-0.49.orig/options.h 2007-06-04 13:21:39.394987720 +0200 ++++ dropbear-0.49/options.h 2007-06-04 13:21:40.305849248 +0200 +@@ -159,7 +159,7 @@ * however significantly reduce the security of your ssh connections * if the PRNG state becomes guessable - make sure you know what you are * doing if you change this. */ diff --git a/package/dropbear/patches/150-dbconvert_standalone.patch b/package/dropbear/patches/150-dbconvert_standalone.patch index 50c035ae8c..d8e283e4de 100644 --- a/package/dropbear/patches/150-dbconvert_standalone.patch +++ b/package/dropbear/patches/150-dbconvert_standalone.patch @@ -1,5 +1,7 @@ ---- dropbear-0.47.old/options.h 2006-01-31 13:36:25.301562500 +0100 -+++ dropbear-0.47.dev/options.h 2006-01-31 13:37:41.846346250 +0100 +Index: dropbear-0.49/options.h +=================================================================== +--- dropbear-0.49.orig/options.h 2007-06-04 13:21:40.305849248 +0200 ++++ dropbear-0.49/options.h 2007-06-04 13:21:40.493820672 +0200 @@ -5,6 +5,11 @@ #ifndef _OPTIONS_H_ #define _OPTIONS_H_ diff --git a/package/dropbear/patches/160-tty_close.patch b/package/dropbear/patches/160-tty_close.patch index c85429ce89..0fd9ef684d 100644 --- a/package/dropbear/patches/160-tty_close.patch +++ b/package/dropbear/patches/160-tty_close.patch @@ -1,28 +1,17 @@ -diff -ur db.old/common-channel.c db.dev/common-channel.c ---- db.old/common-channel.c 2007-02-22 17:17:15.000000000 +0100 -+++ db.dev/common-channel.c 2007-05-06 19:50:19.154943528 +0200 -@@ -309,15 +309,15 @@ - && (ERRFD_IS_WRITE(channel) || channel->errfd == FD_CLOSED)) { +Index: dropbear-0.49/common-channel.c +=================================================================== +--- dropbear-0.49.orig/common-channel.c 2007-06-04 13:21:39.354993800 +0200 ++++ dropbear-0.49/common-channel.c 2007-06-04 13:21:40.676792856 +0200 +@@ -310,10 +310,10 @@ send_msg_channel_eof(channel); } -- + - /* And if we can't receive any more data from them either, close up */ -- if (!channel->sent_close -- && channel->readfd == FD_CLOSED -- && (ERRFD_IS_WRITE(channel) || channel->errfd == FD_CLOSED) -- && !write_pending(channel)) { -- TRACE(("sending close, readfd is closed")) -- send_msg_channel_close(channel); -- } -+ + /* And if we can't receive any more data from them either, close up (server only) */ -+ if (!channel->sent_close -+ && channel->readfd == FD_CLOSED + if (!channel->sent_close + && channel->readfd == FD_CLOSED +- && (ERRFD_IS_WRITE(channel) || channel->errfd == FD_CLOSED) + && !ERRFD_IS_WRITE(channel) -+ && !write_pending(channel)) { -+ TRACE(("sending close, readfd is closed")) -+ send_msg_channel_close(channel); -+ } - } - - /* Check whether a deferred (EINPROGRESS) connect() was successful, and + && !write_pending(channel)) { + TRACE(("sending close, readfd is closed")) + send_msg_channel_close(channel); -- cgit v1.2.3