From 11dabbd7d5731c8ccf9bc375602c22db8fb1de18 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Tue, 13 May 2014 20:50:36 +0300 Subject: [PATCH] use -std=gnu99 --- limits.h.patch | 28 ---------------------------- openssh.spec | 4 +--- 2 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 limits.h.patch diff --git a/limits.h.patch b/limits.h.patch deleted file mode 100644 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 - #include - -+#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 - #include - -+#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 d1357c9..d96d5a2 100644 --- 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 \ -- 2.43.0