diff options
author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-10-07 11:57:20 +0000 |
---|---|---|
committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-10-07 11:57:20 +0000 |
commit | 725611a466f2edf12f809d22339b22223af4afe7 (patch) | |
tree | 4b825dc642cb6eb9a060e54bf8d69288fbee4904 /openwrt/package/openssh/patches | |
parent | f4dd5a6d7c4ebea48cd6292744cb9def6037de80 (diff) |
move old kamikaze out of trunk - will put buildroot-ng in there as soon as all the developers are ready
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@4944 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'openwrt/package/openssh/patches')
-rw-r--r-- | openwrt/package/openssh/patches/100-openssl-cipher.patch | 11 | ||||
-rw-r--r-- | openwrt/package/openssh/patches/cross-compile.patch | 103 |
2 files changed, 0 insertions, 114 deletions
diff --git a/openwrt/package/openssh/patches/100-openssl-cipher.patch b/openwrt/package/openssh/patches/100-openssl-cipher.patch deleted file mode 100644 index f8eb177c2..000000000 --- a/openwrt/package/openssh/patches/100-openssl-cipher.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nur openssh-4.2p1/cipher.c openssh-4.2p1.patched/cipher.c ---- openssh-4.2p1/cipher.c 2005-07-17 09:02:10.000000000 +0200 -+++ openssh-4.2p1.patched/cipher.c 2006-03-26 12:43:41.000000000 +0200 -@@ -67,7 +67,6 @@ - - { "3des-cbc", SSH_CIPHER_SSH2, 8, 24, 0, EVP_des_ede3_cbc }, - { "blowfish-cbc", SSH_CIPHER_SSH2, 8, 16, 0, EVP_bf_cbc }, -- { "cast128-cbc", SSH_CIPHER_SSH2, 8, 16, 0, EVP_cast5_cbc }, - { "arcfour", SSH_CIPHER_SSH2, 8, 16, 0, EVP_rc4 }, - { "arcfour128", SSH_CIPHER_SSH2, 8, 16, 1536, EVP_rc4 }, - { "arcfour256", SSH_CIPHER_SSH2, 8, 32, 1536, EVP_rc4 }, diff --git a/openwrt/package/openssh/patches/cross-compile.patch b/openwrt/package/openssh/patches/cross-compile.patch deleted file mode 100644 index 7178e32ac..000000000 --- a/openwrt/package/openssh/patches/cross-compile.patch +++ /dev/null @@ -1,103 +0,0 @@ -diff -Nur openssh-4.0p1/configure openssh-4.0p1.patched/configure ---- openssh-4.0p1/configure 2005-03-09 05:54:16.000000000 +0100 -+++ openssh-4.0p1.patched/configure 2005-06-02 13:35:06.000000000 +0200 -@@ -5524,7 +5524,7 @@ - *-*-linux*) - no_dev_ptmx=1 - check_for_libcrypt_later=1 -- check_for_openpty_ctty_bug=1 -+ check_for_openpty_ctty_bug=0 - cat >>confdefs.h <<\_ACEOF - #define DONT_TRY_OTHER_AF 1 - _ACEOF -@@ -12810,90 +12810,6 @@ - fi - fi - --if test ! -z "$check_for_openpty_ctty_bug"; then -- echo "$as_me:$LINENO: checking if openpty correctly handles controlling tty" >&5 --echo $ECHO_N "checking if openpty correctly handles controlling tty... $ECHO_C" >&6 -- if test "$cross_compiling" = yes; then -- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot run test program while cross compiling --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --#include <stdio.h> --#include <sys/fcntl.h> --#include <sys/types.h> --#include <sys/wait.h> -- --int --main() --{ -- pid_t pid; -- int fd, ptyfd, ttyfd, status; -- -- pid = fork(); -- if (pid < 0) { /* failed */ -- exit(1); -- } else if (pid > 0) { /* parent */ -- waitpid(pid, &status, 0); -- if (WIFEXITED(status)) -- exit(WEXITSTATUS(status)); -- else -- exit(2); -- } else { /* child */ -- close(0); close(1); close(2); -- setsid(); -- openpty(&ptyfd, &ttyfd, NULL, NULL, NULL); -- fd = open("/dev/tty", O_RDWR | O_NOCTTY); -- if (fd >= 0) -- exit(3); /* Acquired ctty: broken */ -- else -- exit(0); /* Did not acquire ctty: OK */ -- } --} -- --_ACEOF --rm -f conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -- --else -- echo "$as_me: program exited with status $ac_status" >&5 --echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --( exit $ac_status ) -- -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -- cat >>confdefs.h <<\_ACEOF --#define SSHD_ACQUIRES_CTTY 1 --_ACEOF -- -- -- --fi --rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext --fi --fi - - if test "x$ac_cv_func_getaddrinfo" = "xyes" -a "x$check_for_hpux_broken_getaddrinfo" = "x1"; then - echo "$as_me:$LINENO: checking if getaddrinfo seems to work" >&5 |