From e19be28875714ec0d07cf2e861668b508642d060 Mon Sep 17 00:00:00 2001
From: Jay Freeman <saurik@saurik.com>
Date: Tue, 15 May 2012 09:12:51 +0000
Subject: Finally get around to committing 5.8p1.

git-svn-id: http://svn.telesphoreo.org/trunk@768 514c082c-b64e-11dc-b46d-3d985efe055d
---
 data/openssh/_metadata/extrainst_   |   4 ++++
 data/openssh/_metadata/version      |   2 +-
 data/openssh/com.openssh.sshd.plist |   6 ------
 data/openssh/extern.diff            |  12 ------------
 data/openssh/openssh-5.2p1.tar.gz   | Bin 1016612 -> 0 bytes
 data/openssh/openssh-5.8p1.tar.gz   | Bin 0 -> 1113798 bytes
 6 files changed, 5 insertions(+), 19 deletions(-)
 delete mode 100644 data/openssh/extern.diff
 delete mode 100644 data/openssh/openssh-5.2p1.tar.gz
 create mode 100644 data/openssh/openssh-5.8p1.tar.gz

(limited to 'data/openssh')

diff --git a/data/openssh/_metadata/extrainst_ b/data/openssh/_metadata/extrainst_
index f1e8ec5a3..afdc6d157 100755
--- a/data/openssh/_metadata/extrainst_
+++ b/data/openssh/_metadata/extrainst_
@@ -1,5 +1,9 @@
 #!/bin/sh
 
+if [[ $1 == upgrade ]]; then
+    /bin/launchctl unload /Library/LaunchDaemons/com.openssh.sshd.plist
+fi
+
 if [[ $1 == install || $1 == upgrade ]]; then
     /bin/launchctl load /Library/LaunchDaemons/com.openssh.sshd.plist
 fi
diff --git a/data/openssh/_metadata/version b/data/openssh/_metadata/version
index 5d11f1120..f77315b89 100644
--- a/data/openssh/_metadata/version
+++ b/data/openssh/_metadata/version
@@ -1 +1 @@
-5.2p1
+5.8p1
diff --git a/data/openssh/com.openssh.sshd.plist b/data/openssh/com.openssh.sshd.plist
index 6866f3804..d9c86d972 100644
--- a/data/openssh/com.openssh.sshd.plist
+++ b/data/openssh/com.openssh.sshd.plist
@@ -22,12 +22,6 @@
     <dict>
         <key>Listeners</key>
         <dict>
-            <key>Bonjour</key>
-            <array>
-                <string>ssh</string>
-                <string>sftp-ssh</string>
-            </array>
-
             <key>SockServiceName</key>
             <string>ssh</string>
         </dict>
diff --git a/data/openssh/extern.diff b/data/openssh/extern.diff
deleted file mode 100644
index 278676e12..000000000
--- a/data/openssh/extern.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru openssh-5.2p1/mux.c openssh-5.2p1+iPhone/mux.c
---- openssh-5.2p1/mux.c	2008-06-13 23:01:54.000000000 +0000
-+++ openssh-5.2p1+iPhone/mux.c	2011-02-14 21:58:09.000000000 +0000
-@@ -85,7 +85,7 @@
- extern Options options;
- extern int stdin_null_flag;
- extern char *host;
--int subsystem_flag;
-+extern int subsystem_flag;
- extern Buffer command;
- 
- /* Context for session open confirmation callback */
diff --git a/data/openssh/openssh-5.2p1.tar.gz b/data/openssh/openssh-5.2p1.tar.gz
deleted file mode 100644
index 053008ef2..000000000
Binary files a/data/openssh/openssh-5.2p1.tar.gz and /dev/null differ
diff --git a/data/openssh/openssh-5.8p1.tar.gz b/data/openssh/openssh-5.8p1.tar.gz
new file mode 100644
index 000000000..61fe3de3d
Binary files /dev/null and b/data/openssh/openssh-5.8p1.tar.gz differ
-- 
cgit v1.2.3