summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/openssh/_metadata/version2
-rw-r--r--data/openssh/dirent.diff28
-rw-r--r--data/openssh/make.sh2
-rw-r--r--data/openssh/openssh-5.8p1.tar.gzbin1113798 -> 0 bytes
-rw-r--r--data/openssh/openssh-6.0p1.tar.gzbin0 -> 1126034 bytes
5 files changed, 17 insertions, 15 deletions
diff --git a/data/openssh/_metadata/version b/data/openssh/_metadata/version
index f77315b89..f15d87c84 100644
--- a/data/openssh/_metadata/version
+++ b/data/openssh/_metadata/version
@@ -1 +1 @@
-5.8p1
+6.0p1
diff --git a/data/openssh/dirent.diff b/data/openssh/dirent.diff
index 3808d5073..68f851767 100644
--- a/data/openssh/dirent.diff
+++ b/data/openssh/dirent.diff
@@ -1,29 +1,31 @@
-diff -ru openssh-4.7p1/configure.ac openssh-4.7p1+iPhone/configure.ac
---- openssh-4.7p1/configure.ac 2007-08-10 04:36:12.000000000 +0000
-+++ openssh-4.7p1+iPhone/configure.ac 2008-02-09 09:58:08.000000000 +0000
-@@ -1023,24 +1023,7 @@
- AC_CHECK_DECLS(GLOB_NOMATCH, , , [#include <glob.h>])
+diff -ru openssh-6.0p1/configure.ac openssh-6.0p1+iPhone/configure.ac
+--- openssh-6.0p1/configure.ac 2012-04-19 11:46:38.000000000 +0000
++++ openssh-6.0p1+iPhone/configure.ac 2012-05-15 09:18:25.000000000 +0000
+@@ -1235,26 +1235,7 @@
+ 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_LANG_PROGRAM([[
-#include <sys/types.h>
--#include <dirent.h>
--int main(void){struct dirent d;exit(sizeof(d.d_name)<=sizeof(char));}
+-#include <dirent.h>]],
+- [[
+- struct dirent d;
+- exit(sizeof(d.d_name)<=sizeof(char));
- ]])],
-- [AC_MSG_RESULT(yes)],
+- [AC_MSG_RESULT([yes])],
- [
-- AC_MSG_RESULT(no)
-- AC_DEFINE(BROKEN_ONE_BYTE_DIRENT_D_NAME, 1,
+- 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_DEFINE([BROKEN_ONE_BYTE_DIRENT_D_NAME])
- ]
-)
-+AC_MSG_RESULT(yes)
++AC_MSG_RESULT([yes])
AC_MSG_CHECKING([for /proc/pid/fd directory])
if test -d "/proc/$$/fd" ; then
diff --git a/data/openssh/make.sh b/data/openssh/make.sh
index d31209c6f..8b4fe0272 100644
--- a/data/openssh/make.sh
+++ b/data/openssh/make.sh
@@ -1,6 +1,6 @@
pkg:setup
autoconf
-pkg:configure --disable-strip --sysconfdir=/etc/ssh --disable-libutil --disable-utmp --disable-wtmp ac_cv_path_AR=arm-apple-darwin9-ar
+pkg:configure --disable-strip --sysconfdir=/etc/ssh --disable-libutil --disable-utmp --disable-wtmp ac_cv_path_AR=arm-apple-darwin9-ar --
pkg:make
pkg:install INSTALL_SSH_RAND_HELPER=yes
pkg: cp -a %/sshd-keygen-wrapper /usr/libexec
diff --git a/data/openssh/openssh-5.8p1.tar.gz b/data/openssh/openssh-5.8p1.tar.gz
deleted file mode 100644
index 61fe3de3d..000000000
--- a/data/openssh/openssh-5.8p1.tar.gz
+++ /dev/null
Binary files differ
diff --git a/data/openssh/openssh-6.0p1.tar.gz b/data/openssh/openssh-6.0p1.tar.gz
new file mode 100644
index 000000000..dad3907ab
--- /dev/null
+++ b/data/openssh/openssh-6.0p1.tar.gz
Binary files differ