r1133 - trunk/web/patches/upstream-only
Author: rmh
Date: 2006-02-05 17:08:13 +0000 (Sun, 05 Feb 2006)
New Revision: 1133
Added:
trunk/web/patches/upstream-only/openssh.diff
Removed:
trunk/web/patches/upstream-only/openssh_4.1p1-6.diff
Log:
Update openssh.diff.
Copied: trunk/web/patches/upstream-only/openssh.diff (from rev 1109, trunk/web/patches/upstream-only/openssh_4.1p1-6.diff)
===================================================================
--- trunk/web/patches/upstream-only/openssh_4.1p1-6.diff 2006-01-26 08:04:23 UTC (rev 1109)
+++ trunk/web/patches/upstream-only/openssh.diff 2006-02-05 17:08:13 UTC (rev 1133)
@@ -0,0 +1,23 @@
+
+Author: aurel32
+Status: sent to openssh-unix-dev@mindrot.org on 20060205.
+Description: diffed against snapshot from 20060204.
+
+diff -ur openssh.old/configure.ac openssh/configure.ac
+--- openssh.old/configure.ac 2006-02-03 04:11:56.000000000 +0100
++++ openssh/configure.ac 2006-02-05 18:02:40.000000000 +0100
+@@ -310,6 +310,14 @@
+ AC_DEFINE(WITH_ABBREV_NO_TTY)
+ AC_DEFINE(LOCKED_PASSWD_STRING, "*LK*")
+ ;;
++*-*-k*bsd*-gnu)
++ check_for_libcrypt_later=1
++ AC_DEFINE(PAM_TTY_KLUDGE)
++ AC_DEFINE(LOCKED_PASSWD_PREFIX, "!")
++ AC_DEFINE(SPT_TYPE,SPT_REUSEARGV)
++ AC_DEFINE(_PATH_BTMP, "/var/log/btmp", [log for bad login attempts])
++ AC_DEFINE(USE_BTMP, 1, [Use btmp to log bad logins])
++ ;;
+ *-*-linux*)
+ no_dev_ptmx=1
+ check_for_libcrypt_later=1
Deleted: trunk/web/patches/upstream-only/openssh_4.1p1-6.diff
===================================================================
--- trunk/web/patches/upstream-only/openssh_4.1p1-6.diff 2006-02-05 16:24:35 UTC (rev 1132)
+++ trunk/web/patches/upstream-only/openssh_4.1p1-6.diff 2006-02-05 17:08:13 UTC (rev 1133)
@@ -1,52 +0,0 @@
-diff -u openssh-4.1p1/configure.ac openssh-4.1p1/configure.ac
---- openssh-4.1p1/configure.ac
-+++ openssh-4.1p1/configure.ac
-@@ -250,6 +250,14 @@
- AC_DEFINE(WITH_ABBREV_NO_TTY)
- AC_DEFINE(LOCKED_PASSWD_STRING, "*LK*")
- ;;
-+*-*-k*bsd*-gnu)
-+ check_for_libcrypt_later=1
-+ AC_DEFINE(PAM_TTY_KLUDGE)
-+ AC_DEFINE(LOCKED_PASSWD_PREFIX, "!")
-+ AC_DEFINE(SPT_TYPE,SPT_REUSEARGV)
-+ AC_DEFINE(_PATH_BTMP, "/var/log/btmp", [log for bad login attempts])
-+ AC_DEFINE(USE_BTMP, 1, [Use btmp to log bad logins])
-+ ;;
- *-*-linux*)
- no_dev_ptmx=1
- check_for_libcrypt_later=1
-diff -u openssh-4.1p1/configure openssh-4.1p1/configure
---- openssh-4.1p1/configure
-+++ openssh-4.1p1/configure
-@@ -5562,6 +5562,29 @@
- _ACEOF
-
- ;;
-+*-*-k*bsd*-gnu)
-+ check_for_libcrypt_later=1
-+ cat >>confdefs.h <<\_ACEOF
-+#define PAM_TTY_KLUDGE 1
-+_ACEOF
-+
-+ cat >>confdefs.h <<\_ACEOF
-+#define LOCKED_PASSWD_PREFIX "!"
-+_ACEOF
-+
-+ cat >>confdefs.h <<\_ACEOF
-+#define SPT_TYPE SPT_REUSEARGV
-+_ACEOF
-+
-+
-+ cat >>confdefs.h <<\_ACEOF
-+#define _PATH_BTMP "/var/log/btmp"
-+_ACEOF
-+
-+ cat >>confdefs.h <<\_ACEOF
-+#define USE_BTMP 1
-+_ACEOF
-+ ;;
- *-*-linux*)
- no_dev_ptmx=1
- check_for_libcrypt_later=1
-
Reply to: