use -std=gnu99

diff --git a/limits.h.patch b/limits.h.patch
deleted file mode 100644 (file)
index 5798141..0000000
--- a/limits.h.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- openssh-6.6p1/openbsd-compat/fmt_scaled.c~ 2014-05-13 17:23:35.999776940 +0300
-+++ openssh-6.6p1/openbsd-compat/fmt_scaled.c  2014-05-13 17:23:40.989697403 +0300
-@@ -49,6 +49,11 @@
- #include <ctype.h>
- #include <limits.h>
- 
-+#if !defined(LLONG_MAX)
-+#   define LLONG_MAX  9223372036854775807LL
-+#   define LLONG_MIN  (-LLONG_MAX - 1LL)
-+#endif
-+
- typedef enum {
-       NONE = 0, KILO = 1, MEGA = 2, GIGA = 3, TERA = 4, PETA = 5, EXA = 6
- } unit_type;
---- openssh-6.6p1/openbsd-compat/strtonum.c~   2006-08-05 09:27:20.000000000 +0300
-+++ openssh-6.6p1/openbsd-compat/strtonum.c    2014-05-13 17:31:27.715592099 +0300
-@@ -26,6 +26,11 @@
- #include <limits.h>
- #include <errno.h>
- 
-+#if !defined(LLONG_MAX)
-+#   define LLONG_MAX   9223372036854775807LL
-+#   define LLONG_MIN   (-LLONG_MAX - 1LL)
-+#endif
-+
- #define INVALID       1
- #define TOOSMALL      2
- #define TOOLARGE      3

diff --git a/openssh.spec b/openssh.spec
index d1357c9b17304c2e638041ceb4fa3fdf60916e49..d96d5a28cf7220643ec67adca7829c62144b9392 100644 (file)
--- a/openssh.spec
+++ b/openssh.spec
@@ -67,7 +67,6 @@ Patch8:               ldap-helper-sigpipe.patch
 Patch9:                %{name}-5.2p1-hpn13v6.diff
 Patch10:       %{name}-include.patch
 Patch11:       %{name}-chroot.patch
-Patch12:       limits.h.patch
 
 Patch14:       %{name}-bind.patch
 Patch15:       %{name}-disable_ldap.patch
@@ -538,7 +537,6 @@ openldap-a.
 %{?with_hpn:%patch9 -p1}
 %patch10 -p1
 %patch11 -p1
-%patch12 -p1
 
 %patch14 -p1
 %{!?with_ldap:%patch15 -p1}
@@ -559,7 +557,7 @@ cp /usr/share/automake/config.sub .
 %{__aclocal}
 %{__autoconf}
 %{__autoheader}
-CPPFLAGS="-DCHROOT"
+CPPFLAGS="%{rpmcppflags} -DCHROOT -std=gnu99"
 %configure \
        PERL=%{__perl} \
        --disable-strip \