From ca34a3b04e01145dcc7fadbf91cb29da44e3e7be Mon Sep 17 00:00:00 2001 From: Jay Freeman Date: Wed, 3 Dec 2014 08:55:43 +0000 Subject: Updated openssl and openssh. git-svn-id: http://svn.telesphoreo.org/trunk@797 514c082c-b64e-11dc-b46d-3d985efe055d --- data/openssh/_metadata/version | 2 +- data/openssh/duplicate.diff | 24 ++++++++++++++++++++++++ data/openssh/install.diff | 12 ++++++++++++ data/openssh/openssh-6.1p1.tar.gz | Bin 1134820 -> 0 bytes data/openssh/openssh-6.7p1.tar.gz | Bin 0 -> 1351367 bytes data/openssh/utmp.diff | 23 ++++++++++++----------- data/openssl/_metadata/version | 2 +- data/openssl/openssl-0.9.8za.tar.gz | Bin 3787508 -> 0 bytes data/openssl/openssl-0.9.8zc.tar.gz | Bin 0 -> 3735406 bytes 9 files changed, 50 insertions(+), 13 deletions(-) create mode 100644 data/openssh/duplicate.diff create mode 100644 data/openssh/install.diff delete mode 100644 data/openssh/openssh-6.1p1.tar.gz create mode 100644 data/openssh/openssh-6.7p1.tar.gz delete mode 100644 data/openssl/openssl-0.9.8za.tar.gz create mode 100644 data/openssl/openssl-0.9.8zc.tar.gz diff --git a/data/openssh/_metadata/version b/data/openssh/_metadata/version index cec900936..2ce383e8c 100644 --- a/data/openssh/_metadata/version +++ b/data/openssh/_metadata/version @@ -1 +1 @@ -6.1p1 +6.7p1 diff --git a/data/openssh/duplicate.diff b/data/openssh/duplicate.diff new file mode 100644 index 000000000..6482334ac --- /dev/null +++ b/data/openssh/duplicate.diff @@ -0,0 +1,24 @@ +diff -ru openssh-6.7p1/ge25519.h openssh-6.7p1+iPhone/ge25519.h +--- openssh-6.7p1/ge25519.h 2013-12-18 06:48:11.000000000 +0000 ++++ openssh-6.7p1+iPhone/ge25519.h 2014-12-03 07:58:12.000000000 +0000 +@@ -28,7 +28,7 @@ + fe25519 t; + } ge25519; + +-const ge25519 ge25519_base; ++extern const ge25519 ge25519_base; + + int ge25519_unpackneg_vartime(ge25519 *r, const unsigned char p[32]); + +diff -ru openssh-6.7p1/umac.c openssh-6.7p1+iPhone/umac.c +--- openssh-6.7p1/umac.c 2014-07-22 23:43:42.000000000 +0000 ++++ openssh-6.7p1+iPhone/umac.c 2014-12-02 23:50:38.000000000 +0000 +@@ -1175,7 +1175,7 @@ + * time. The all-at-once is more optimaized than the sequential version and + * should be preferred when the sequential interface is not required. + */ +-struct umac_ctx { ++typedef struct umac_ctx { + uhash_ctx hash; /* Hash function for message compression */ + pdf_ctx pdf; /* PDF for hashed output */ + void *free_ptr; /* Address to free this struct via */ diff --git a/data/openssh/install.diff b/data/openssh/install.diff new file mode 100644 index 000000000..88866e26b --- /dev/null +++ b/data/openssh/install.diff @@ -0,0 +1,12 @@ +diff -ru openssh-6.7p1/Makefile.in openssh-6.7p1+iPhone/Makefile.in +--- openssh-6.7p1/Makefile.in 2014-08-30 06:23:07.000000000 +0000 ++++ openssh-6.7p1+iPhone/Makefile.in 2014-12-03 08:17:45.000000000 +0000 +@@ -270,7 +270,7 @@ + $(AUTORECONF) + -rm -rf autom4te.cache + +-install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config ++install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf + install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf + install-nosysconf: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files + diff --git a/data/openssh/openssh-6.1p1.tar.gz b/data/openssh/openssh-6.1p1.tar.gz deleted file mode 100644 index 8d4fbd8c7..000000000 Binary files a/data/openssh/openssh-6.1p1.tar.gz and /dev/null differ diff --git a/data/openssh/openssh-6.7p1.tar.gz b/data/openssh/openssh-6.7p1.tar.gz new file mode 100644 index 000000000..b23e9969a Binary files /dev/null and b/data/openssh/openssh-6.7p1.tar.gz differ diff --git a/data/openssh/utmp.diff b/data/openssh/utmp.diff index fcba24b7d..6a5cf8617 100644 --- a/data/openssh/utmp.diff +++ b/data/openssh/utmp.diff @@ -1,15 +1,16 @@ -diff -ru openssh-5.2p1/includes.h openssh-5.2p1+iPhone/includes.h ---- openssh-5.2p1/includes.h 2008-07-04 13:10:49.000000000 +0000 -+++ openssh-5.2p1+iPhone/includes.h 2009-04-06 09:36:35.000000000 +0000 -@@ -18,6 +18,7 @@ +diff -ru openssh-6.7p1/includes.h openssh-6.7p1+iPhone/includes.h +--- openssh-6.7p1/includes.h 2013-03-22 01:51:09.000000000 +0000 ++++ openssh-6.7p1+iPhone/includes.h 2014-12-03 08:07:53.000000000 +0000 +@@ -18,6 +18,8 @@ #include "config.h" +#define _UTMPX_COMPAT ++ + #ifndef _GNU_SOURCE #define _GNU_SOURCE /* activate extra prototypes for glibc */ - - #include -@@ -63,6 +64,10 @@ + #endif +@@ -66,6 +68,10 @@ # include #endif @@ -20,10 +21,10 @@ diff -ru openssh-5.2p1/includes.h openssh-5.2p1+iPhone/includes.h #ifdef HAVE_UTMP_H # include #endif -diff -ru openssh-5.2p1/loginrec.c openssh-5.2p1+iPhone/loginrec.c ---- openssh-5.2p1/loginrec.c 2009-02-12 02:12:22.000000000 +0000 -+++ openssh-5.2p1+iPhone/loginrec.c 2009-04-06 09:30:45.000000000 +0000 -@@ -188,12 +188,12 @@ +diff -ru openssh-6.7p1/loginrec.c openssh-6.7p1+iPhone/loginrec.c +--- openssh-6.7p1/loginrec.c 2014-01-17 01:23:24.000000000 +0000 ++++ openssh-6.7p1+iPhone/loginrec.c 2014-12-03 08:07:53.000000000 +0000 +@@ -184,12 +184,12 @@ ** prototypes for helper functions in this file **/ diff --git a/data/openssl/_metadata/version b/data/openssl/_metadata/version index c9749089e..ef2fbf0bc 100644 --- a/data/openssl/_metadata/version +++ b/data/openssl/_metadata/version @@ -1 +1 @@ -0.9.8za +0.9.8zc diff --git a/data/openssl/openssl-0.9.8za.tar.gz b/data/openssl/openssl-0.9.8za.tar.gz deleted file mode 100644 index 88ffba4e3..000000000 Binary files a/data/openssl/openssl-0.9.8za.tar.gz and /dev/null differ diff --git a/data/openssl/openssl-0.9.8zc.tar.gz b/data/openssl/openssl-0.9.8zc.tar.gz new file mode 100644 index 000000000..adfc84d34 Binary files /dev/null and b/data/openssl/openssl-0.9.8zc.tar.gz differ -- cgit v1.2.3