author | Tomas Kuthan <tomas.kuthan@oracle.com> |
Tue, 20 Sep 2016 03:54:40 -0700 | |
changeset 6930 | 31ef2580c45d |
permissions | -rw-r--r-- |
6930
31ef2580c45d
24525860 upgrade OpenSSH to 7.3p1
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
1 |
# |
31ef2580c45d
24525860 upgrade OpenSSH to 7.3p1
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
2 |
# Unbreak ./configure on Solaris. |
31ef2580c45d
24525860 upgrade OpenSSH to 7.3p1
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
3 |
# |
31ef2580c45d
24525860 upgrade OpenSSH to 7.3p1
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
4 |
# Patch source: upstream |
31ef2580c45d
24525860 upgrade OpenSSH to 7.3p1
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
5 |
# https://marc.info/?l=openssh-unix-dev&m=147011381114561&w=2 |
31ef2580c45d
24525860 upgrade OpenSSH to 7.3p1
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
6 |
# |
31ef2580c45d
24525860 upgrade OpenSSH to 7.3p1
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
7 |
--- orig/configure.ac Thu Aug 18 14:41:57 2016 |
31ef2580c45d
24525860 upgrade OpenSSH to 7.3p1
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
8 |
+++ new/configure.ac Thu Aug 18 14:44:59 2016 |
31ef2580c45d
24525860 upgrade OpenSSH to 7.3p1
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
9 |
@@ -751,6 +751,9 @@ |
31ef2580c45d
24525860 upgrade OpenSSH to 7.3p1
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
10 |
use_pie=auto |
31ef2580c45d
24525860 upgrade OpenSSH to 7.3p1
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
11 |
check_for_libcrypt_later=1 |
31ef2580c45d
24525860 upgrade OpenSSH to 7.3p1
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
12 |
check_for_openpty_ctty_bug=1 |
31ef2580c45d
24525860 upgrade OpenSSH to 7.3p1
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
13 |
+ dnl Target SUSv3/POSIX.1-2001 plus BSD specifics. |
31ef2580c45d
24525860 upgrade OpenSSH to 7.3p1
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
14 |
+ dnl _DEFAULT_SOURCE is the new name for _BSD_SOURCE |
31ef2580c45d
24525860 upgrade OpenSSH to 7.3p1
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
15 |
+ CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -D_DEFAULT_SOURCE" |
31ef2580c45d
24525860 upgrade OpenSSH to 7.3p1
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
16 |
AC_DEFINE([PAM_TTY_KLUDGE], [1], |
31ef2580c45d
24525860 upgrade OpenSSH to 7.3p1
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
17 |
[Work around problematic Linux PAM modules handling of PAM_TTY]) |
31ef2580c45d
24525860 upgrade OpenSSH to 7.3p1
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
18 |
AC_DEFINE([LOCKED_PASSWD_PREFIX], ["!"], |
31ef2580c45d
24525860 upgrade OpenSSH to 7.3p1
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
19 |
@@ -1790,11 +1793,8 @@ |
31ef2580c45d
24525860 upgrade OpenSSH to 7.3p1
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
20 |
warn \ |
31ef2580c45d
24525860 upgrade OpenSSH to 7.3p1
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
21 |
]) |
31ef2580c45d
24525860 upgrade OpenSSH to 7.3p1
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
22 |
|
31ef2580c45d
24525860 upgrade OpenSSH to 7.3p1
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
23 |
-dnl Wide character support. Linux man page says it needs _XOPEN_SOURCE. |
31ef2580c45d
24525860 upgrade OpenSSH to 7.3p1
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
24 |
-saved_CFLAGS="$CFLAGS" |
31ef2580c45d
24525860 upgrade OpenSSH to 7.3p1
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
25 |
-CFLAGS="$CFLAGS -D_XOPEN_SOURCE" |
31ef2580c45d
24525860 upgrade OpenSSH to 7.3p1
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
26 |
+dnl Wide character support. |
31ef2580c45d
24525860 upgrade OpenSSH to 7.3p1
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
27 |
AC_CHECK_FUNCS([mblen mbtowc nl_langinfo wcwidth]) |
31ef2580c45d
24525860 upgrade OpenSSH to 7.3p1
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
28 |
-CFLAGS="$saved_CFLAGS" |
31ef2580c45d
24525860 upgrade OpenSSH to 7.3p1
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
29 |
|
31ef2580c45d
24525860 upgrade OpenSSH to 7.3p1
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
30 |
AC_LINK_IFELSE( |
31ef2580c45d
24525860 upgrade OpenSSH to 7.3p1
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
31 |
[AC_LANG_PROGRAM( |