From b98b1f3529e6c31c6161d88a8ee7d64eb3f09bd4 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 6 Sep 2011 22:37:35 +0200 Subject: [PATCH] openssh: update to openssh-5.9p1 Signed-off-by: Stephan Raue --- packages/network/openssh/build | 2 +- packages/network/openssh/meta | 2 +- .../openssh-5.8p2-000-crosscompiling.patch | 53 ------------------- .../openssh-5.8p2-001-abstract_socket.patch | 49 ----------------- 4 files changed, 2 insertions(+), 104 deletions(-) delete mode 100644 packages/network/openssh/patches/openssh-5.8p2-000-crosscompiling.patch delete mode 100644 packages/network/openssh/patches/openssh-5.8p2-001-abstract_socket.patch diff --git a/packages/network/openssh/build b/packages/network/openssh/build index 62b0c5cc8a..f986231254 100755 --- a/packages/network/openssh/build +++ b/packages/network/openssh/build @@ -26,7 +26,7 @@ export LD="$TARGET_CC" export LDFLAGS="$TARGET_CFLAGS $TARGET_LDFLAGS" cd $PKG_BUILD -ac_cv_have_space_for_dirent_d_name=yes \ +#ac_cv_have_space_for_dirent_d_name=yes \ ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/network/openssh/meta b/packages/network/openssh/meta index e9abd1b200..941f4db942 100644 --- a/packages/network/openssh/meta +++ b/packages/network/openssh/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="openssh" -PKG_VERSION="5.8p2" +PKG_VERSION="5.9p1" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" diff --git a/packages/network/openssh/patches/openssh-5.8p2-000-crosscompiling.patch b/packages/network/openssh/patches/openssh-5.8p2-000-crosscompiling.patch deleted file mode 100644 index 95cc6c85cc..0000000000 --- a/packages/network/openssh/patches/openssh-5.8p2-000-crosscompiling.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff -Naur openssh-5.8p1-old/configure.ac openssh-5.8p1-new/configure.ac ---- openssh-5.8p1-old/configure.ac 2011-02-21 17:41:23.000000000 -0800 -+++ openssh-5.8p1-new/configure.ac 2011-02-21 17:42:20.000000000 -0800 -@@ -41,7 +41,7 @@ - AC_PROG_RANLIB - AC_PROG_INSTALL - AC_PROG_EGREP --AC_PATH_PROG(AR, ar) -+AC_PATH_TOOL(AR, ar) - AC_PATH_PROG(CAT, cat) - AC_PATH_PROG(KILL, kill) - AC_PATH_PROGS(PERL, perl5 perl) -@@ -1188,25 +1188,25 @@ - - AC_CHECK_DECLS(GLOB_NOMATCH, , , [#include ]) - --AC_MSG_CHECKING([whether struct dirent allocates space for d_name]) --AC_RUN_IFELSE( -- [AC_LANG_SOURCE([[ -+AC_CACHE_CHECK( -+ [whether struct dirent allocates space for d_name], -+ [ac_cv_have_space_for_dirent_d_name], -+ [AC_RUN_IFELSE( -+ [AC_LANG_SOURCE([[ - #include - #include - int main(void){struct dirent d;exit(sizeof(d.d_name)<=sizeof(char));} -- ]])], -- [AC_MSG_RESULT(yes)], -- [ -- AC_MSG_RESULT(no) -- AC_DEFINE(BROKEN_ONE_BYTE_DIRENT_D_NAME, 1, -- [Define if your struct dirent expects you to -- allocate extra space for d_name]) -- ], -- [ -- AC_MSG_WARN([cross compiling: assuming BROKEN_ONE_BYTE_DIRENT_D_NAME]) -- AC_DEFINE(BROKEN_ONE_BYTE_DIRENT_D_NAME) -- ] -+ ]])], -+ [ ac_cv_have_space_for_dirent_d_name="yes" ], -+ [ ac_cv_have_space_for_dirent_d_name="no" ], -+ [ ac_cv_have_space_for_dirent_d_name="no" ] -+ )] - ) -+if test "x$ac_cv_have_space_for_dirent_d_name" = "xno" ; then -+ AC_DEFINE(BROKEN_ONE_BYTE_DIRENT_D_NAME, 1, -+ [Define if your struct dirent expects you to -+ allocate extra space for d_name]) -+fi - - AC_MSG_CHECKING([for /proc/pid/fd directory]) - if test -d "/proc/$$/fd" ; then diff --git a/packages/network/openssh/patches/openssh-5.8p2-001-abstract_socket.patch b/packages/network/openssh/patches/openssh-5.8p2-001-abstract_socket.patch deleted file mode 100644 index 934cd1c343..0000000000 --- a/packages/network/openssh/patches/openssh-5.8p2-001-abstract_socket.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -Naur openssh-5.8p1-old/channels.c openssh-5.8p1-new/channels.c ---- openssh-5.8p1-old/channels.c 2010-11-30 17:02:35.000000000 -0800 -+++ openssh-5.8p1-new/channels.c 2011-02-21 17:41:34.000000000 -0800 -@@ -61,6 +61,7 @@ - #include - #include - #include -+#include - - #include "openbsd-compat/sys-queue.h" - #include "xmalloc.h" -@@ -3353,6 +3354,8 @@ - { - int sock; - struct sockaddr_un addr; -+ int abstract = 0; -+ int addrsize = 0; - - sock = socket(AF_UNIX, SOCK_STREAM, 0); - if (sock < 0) -@@ -3360,8 +3363,15 @@ - memset(&addr, 0, sizeof(addr)); - addr.sun_family = AF_UNIX; - strlcpy(addr.sun_path, pathname, sizeof addr.sun_path); -- if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) == 0) -+ addrsize = offsetof(struct sockaddr_un, sun_path) + strlen(addr.sun_path); -+ if (addr.sun_path[0] = '@') -+ abstract = 1; -+ if (abstract) -+ addr.sun_path[0] = '\0'; -+ if (connect(sock, (struct sockaddr *)&addr, addrsize) == 0) - return sock; -+ if (abstract) -+ addr.sun_path[0] = '@'; - close(sock); - error("connect %.100s: %.100s", addr.sun_path, strerror(errno)); - return -1; -diff -Naur openssh-5.8p1-old/defines.h openssh-5.8p1-new/defines.h ---- openssh-5.8p1-old/defines.h 2011-01-17 02:15:31.000000000 -0800 -+++ openssh-5.8p1-new/defines.h 2011-02-21 17:41:34.000000000 -0800 -@@ -411,7 +411,7 @@ - # ifdef __hpux - # define X_UNIX_PATH "/var/spool/sockets/X11/%u" - # else --# define X_UNIX_PATH "/tmp/.X11-unix/X%u" -+# define X_UNIX_PATH "@/tmp/.X11-unix/X%u" - # endif - #endif /* X_UNIX_PATH */ - #define _PATH_UNIX_X X_UNIX_PATH