RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (dtucker) [configure.ac] bz#2111: don't try to use lastlog on Android. 

Patch from Nathan Osman.
This commit is contained in:
Darren Tucker 2013-06-03 02:03:25 +10:00
parent ef4901c3eb
commit 898ac935e5
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -9,7 +9,9 @@
[ssh-agent.c] [ssh-agent.c]
Make parent_alive_interval time_t to avoid signed/unsigned comparison Make parent_alive_interval time_t to avoid signed/unsigned comparison
- (dtucker) [configure.ac] sys/un.h needs sys/socket.h on some platforms - (dtucker) [configure.ac] sys/un.h needs sys/socket.h on some platforms
to prevent noise from configure. Patch from Nathan Osman. to prevent noise from configure. Patch from Nathan Osman. (bz#2114).
- (dtucker) [configure.ac] bz#2111: don't try to use lastlog on Android.
Patch from Nathan Osman.
20130601 20130601
- (dtucker) [configure.ac openbsd-compat/xcrypt.c] bz#2112: fall back to - (dtucker) [configure.ac openbsd-compat/xcrypt.c] bz#2112: fall back to

8
configure.ac
View File

@ -1,4 +1,4 @@
# $Id: configure.ac,v 1.529 2013/06/02 15:59:13 dtucker Exp $ # $Id: configure.ac,v 1.530 2013/06/02 16:03:26 dtucker Exp $
# #
# Copyright (c) 1999-2004 Damien Miller # Copyright (c) 1999-2004 Damien Miller
# #
@ -15,7 +15,7 @@
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org])
AC_REVISION($Revision: 1.529 $) AC_REVISION($Revision: 1.530 $)
AC_CONFIG_SRCDIR([ssh.c]) AC_CONFIG_SRCDIR([ssh.c])
AC_LANG([C]) AC_LANG([C])
@ -491,6 +491,10 @@ case "$host" in
AC_DEFINE([PTY_ZEROREAD], [1], [read(1) can return 0 for a non-closed fd]) AC_DEFINE([PTY_ZEROREAD], [1], [read(1) can return 0 for a non-closed fd])
AC_DEFINE([PLATFORM_SYS_DIR_UID], 2, [System dirs owned by bin (uid 2)]) AC_DEFINE([PLATFORM_SYS_DIR_UID], 2, [System dirs owned by bin (uid 2)])
;; ;;
*-*-android*)
AC_DEFINE([DISABLE_UTMP], [1], [Define if you don't want to use utmp])
AC_DEFINE([DISABLE_WTMP], [1], [Define if you don't want to use wtmp])
;;
*-*-cygwin*) *-*-cygwin*)
check_for_libcrypt_later=1 check_for_libcrypt_later=1
LIBS="$LIBS /usr/lib/textreadmode.o" LIBS="$LIBS /usr/lib/textreadmode.o"