i would appreciate if somebody can do cleaner fix for this hack

On 13.05.2014 17:40, glen wrote:
commit 621739ab2a22c5136a198a0a5e2dada6391f137f
Author: Elan Ruusamäe <g...@delfi.ee>
Date:   Tue May 13 17:39:52 2014 +0300

     add limits.h hack for ac in openbsd-compat

  limits.h.patch | 28 ++++++++++++++++++++++++++++
  openssh.spec   |  2 ++
  2 files changed, 30 insertions(+)
---
diff --git a/openssh.spec b/openssh.spec
index ac6ed1c..d1357c9 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -67,6 +67,7 @@ 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
@@ -537,6 +538,7 @@ openldap-a.
  %{?with_hpn:%patch9 -p1}
  %patch10 -p1
  %patch11 -p1
+%patch12 -p1
%patch14 -p1
  %{!?with_ldap:%patch15 -p1}
diff --git a/limits.h.patch b/limits.h.patch
new file mode 100644
index 0000000..5798141
--- /dev/null
+++ b/limits.h.patch
@@ -0,0 +1,28 @@
+--- 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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/openssh.git/commitdiff/621739ab2a22c5136a198a0a5e2dada6391f137f

_______________________________________________
pld-cvs-commit mailing list
pld-cvs-com...@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit


--
glen

_______________________________________________
pld-devel-en mailing list
pld-devel-en@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-devel-en

Reply via email to