mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-30 22:26:42 +00:00
openssh: update to openssh-5.9p1
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
parent
04ae8293eb
commit
b98b1f3529
@ -26,7 +26,7 @@ export LD="$TARGET_CC"
|
|||||||
export LDFLAGS="$TARGET_CFLAGS $TARGET_LDFLAGS"
|
export LDFLAGS="$TARGET_CFLAGS $TARGET_LDFLAGS"
|
||||||
|
|
||||||
cd $PKG_BUILD
|
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 \
|
./configure --host=$TARGET_NAME \
|
||||||
--build=$HOST_NAME \
|
--build=$HOST_NAME \
|
||||||
--prefix=/usr \
|
--prefix=/usr \
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="openssh"
|
PKG_NAME="openssh"
|
||||||
PKG_VERSION="5.8p2"
|
PKG_VERSION="5.9p1"
|
||||||
PKG_REV="1"
|
PKG_REV="1"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="OSS"
|
PKG_LICENSE="OSS"
|
||||||
|
@ -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 <glob.h>])
|
|
||||||
|
|
||||||
-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 <sys/types.h>
|
|
||||||
#include <dirent.h>
|
|
||||||
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
|
|
@ -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 <termios.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
#include <stdarg.h>
|
|
||||||
+#include <stddef.h>
|
|
||||||
|
|
||||||
#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
|
|
Loading…
x
Reference in New Issue
Block a user