- do not daemonize sshd, upstart is not able to track it properly and locks up on...

[packages/openssh.git] / openssh-heimdal.patch

diff --git a/openssh-heimdal.patch b/openssh-heimdal.patch
index 92d36faaa78608b9b12914f2120a07a022679c78..b0881ef5352fc22bf96716f9040247afac353d79 100644 (file)
--- a/openssh-heimdal.patch
+++ b/openssh-heimdal.patch
@@ -1,24 +1,20 @@
-diff -urN openssh-3.6.1p2-orig/configure.ac openssh-3.6.1p2/configure.ac
---- openssh-3.6.1p2-orig/configure.ac  2003-07-26 16:45:10.000000000 -0600
-+++ openssh-3.6.1p2/configure.ac       2003-07-26 16:57:32.000000000 -0600
-@@ -1822,7 +1822,7 @@
-                                        [ char *tmp = heimdal_version; ],
-                                        [ AC_MSG_RESULT(yes)
-                                          AC_DEFINE(HEIMDAL)
--                                         K5LIBS="-lkrb5 -ldes -lcom_err -lasn1 -lroken"
-+                                         K5LIBS="-lkrb5 -lcom_err -lasn1 -lroken"
-                                        ],
-                                        [ AC_MSG_RESULT(no)
-                                          K5LIBS="-lkrb5 -lk5crypto -lcom_err"
-diff -urN openssh-3.6.1p2-orig/servconf.c openssh-3.6.1p2/servconf.c
---- openssh-3.6.1p2-orig/servconf.c    2003-02-23 18:04:34.000000000 -0700
-+++ openssh-3.6.1p2/servconf.c 2003-07-26 16:57:54.000000000 -0600
-@@ -17,7 +17,7 @@
- #endif
- #if defined(KRB5)
- #ifdef HEIMDAL
--#include <krb.h>
-+#include <krb5.h>
- #else
- /* Bodge - but then, so is using the kerberos IV KEYFILE to get a Kerberos V
-  * keytab */
+diff -urN openssh-3.9p1.org/configure.ac openssh-3.9p1/configure.ac
+--- openssh-3.9p1.org/configure.ac     2004-08-17 19:25:31.977492488 +0200
++++ openssh-3.9p1/configure.ac 2004-08-17 19:25:48.157032824 +0200
+@@ -2265,13 +2265,13 @@
+                                      [ char *tmp = heimdal_version; ],
+                                      [ AC_MSG_RESULT(yes)
+                                        AC_DEFINE(HEIMDAL)
+-                                       K5LIBS="-lkrb5 -ldes"
+-                                       K5LIBS="$K5LIBS -lcom_err -lasn1"
++                                       K5LIBS="-lkrb5"
++                                       K5LIBS="$K5LIBS -lasn1"
+                                        AC_CHECK_LIB(roken, net_write,
+                                          [K5LIBS="$K5LIBS -lroken"])
+                                      ],
+                                      [ AC_MSG_RESULT(no)
+-                                       K5LIBS="-lkrb5 -lk5crypto -lcom_err"
++                                       K5LIBS="-lkrb5 -lk5crypto"
+                                      ]
+                       )
+                       AC_SEARCH_LIBS(dn_expand, resolv)