diff options
author | Colin Watson <cjwatson@debian.org> | 2012-05-18 12:16:05 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2012-05-18 12:16:05 +0100 |
commit | dabbdfacc9f6995b0739772a47704186dcf34ea5 (patch) | |
tree | 0a0b306a637bc85eb719261b74884f0b9573ec41 /debian/patches/cross-pkg-config.patch | |
parent | 1e0d51b642cac9a6bfb719e6320905625aa5f943 (diff) | |
parent | dd5ed53e20d218607260916a6b04d1c8c5b3d88f (diff) |
* New upstream release (http://www.openssh.org/txt/release-6.0).
- Fix IPQoS not being set on non-mapped v4-in-v6 addressed connections
(closes: #643312, #650512).
- Add a new privilege separation sandbox implementation for Linux's new
seccomp sandbox, automatically enabled on platforms that support it.
(Note: privilege separation sandboxing is still experimental.)
Diffstat (limited to 'debian/patches/cross-pkg-config.patch')
-rw-r--r-- | debian/patches/cross-pkg-config.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/debian/patches/cross-pkg-config.patch b/debian/patches/cross-pkg-config.patch index 87818cd95..c25d2a6e5 100644 --- a/debian/patches/cross-pkg-config.patch +++ b/debian/patches/cross-pkg-config.patch | |||
@@ -8,7 +8,7 @@ Index: b/configure | |||
8 | =================================================================== | 8 | =================================================================== |
9 | --- a/configure | 9 | --- a/configure |
10 | +++ b/configure | 10 | +++ b/configure |
11 | @@ -8739,8 +8739,9 @@ | 11 | @@ -9194,8 +9194,9 @@ |
12 | if test "${with_libedit+set}" = set; then : | 12 | if test "${with_libedit+set}" = set; then : |
13 | withval=$with_libedit; if test "x$withval" != "xno" ; then | 13 | withval=$with_libedit; if test "x$withval" != "xno" ; then |
14 | if test "x$withval" = "xyes" ; then | 14 | if test "x$withval" = "xyes" ; then |
@@ -20,7 +20,7 @@ Index: b/configure | |||
20 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 20 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
21 | $as_echo_n "checking for $ac_word... " >&6; } | 21 | $as_echo_n "checking for $ac_word... " >&6; } |
22 | if ${ac_cv_path_PKGCONFIG+:} false; then : | 22 | if ${ac_cv_path_PKGCONFIG+:} false; then : |
23 | @@ -8766,7 +8767,6 @@ | 23 | @@ -9221,7 +9222,6 @@ |
24 | done | 24 | done |
25 | IFS=$as_save_IFS | 25 | IFS=$as_save_IFS |
26 | 26 | ||
@@ -28,7 +28,7 @@ Index: b/configure | |||
28 | ;; | 28 | ;; |
29 | esac | 29 | esac |
30 | fi | 30 | fi |
31 | @@ -8780,6 +8780,63 @@ | 31 | @@ -9235,6 +9235,63 @@ |
32 | fi | 32 | fi |
33 | 33 | ||
34 | 34 | ||
@@ -96,7 +96,7 @@ Index: b/configure.ac | |||
96 | =================================================================== | 96 | =================================================================== |
97 | --- a/configure.ac | 97 | --- a/configure.ac |
98 | +++ b/configure.ac | 98 | +++ b/configure.ac |
99 | @@ -1349,7 +1349,7 @@ | 99 | @@ -1434,7 +1434,7 @@ |
100 | [ --with-libedit[[=PATH]] Enable libedit support for sftp], | 100 | [ --with-libedit[[=PATH]] Enable libedit support for sftp], |
101 | [ if test "x$withval" != "xno" ; then | 101 | [ if test "x$withval" != "xno" ; then |
102 | if test "x$withval" = "xyes" ; then | 102 | if test "x$withval" = "xyes" ; then |