diff options
Diffstat (limited to 'security')
| -rw-r--r-- | security/openssh/distinfo | 6 | ||||
| -rw-r--r-- | security/openssh/patches/patch-ac | 16 | ||||
| -rw-r--r-- | security/openssh/patches/patch-as | 6 |
3 files changed, 14 insertions, 14 deletions
diff --git a/security/openssh/distinfo b/security/openssh/distinfo index 5544997c5fe..ff401c75611 100644 --- a/security/openssh/distinfo +++ b/security/openssh/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.46 2005/11/04 15:27:34 tv Exp $ +$NetBSD: distinfo,v 1.47 2005/11/04 15:45:03 tv Exp $ SHA1 (openssh-4.2p1.tar.gz) = 5e7231cfa8ec673ea856ce291b78fac8b380eb78 RMD160 (openssh-4.2p1.tar.gz) = e1f45333e66d0afceb9934ab73401b4ca06f03a6 Size (openssh-4.2p1.tar.gz) = 914165 bytes SHA1 (patch-aa) = cbe1d379a9ee8c9d907c132dcc4f090c3056b307 SHA1 (patch-ab) = 9fa222f3ec2be4dc7d2090d5ea9e1812544659f3 -SHA1 (patch-ac) = 3f693738d3e02aa6abd0687fbd22465db65abfc0 +SHA1 (patch-ac) = 8df0d13db445e2c0ca4fce5d095cc2b948b1471d SHA1 (patch-ad) = 23f73b7ce008c6ccd431d3d80692e59fcf33aa14 SHA1 (patch-ae) = 21b58d72f4dbf9affed65857518c26ab9277a0f8 SHA1 (patch-af) = e6a4c6dcf2f556c6175f1a3b0a010e4dcf34e239 @@ -21,7 +21,7 @@ SHA1 (patch-ao) = c08515b05456bb2840c2d5ce28622d2f47f12057 SHA1 (patch-ap) = c9101ae26b01a6b0cb9c9f5b7ddea77f3cf0c4b3 SHA1 (patch-aq) = 3786a41a974d6583f379350068a762a725b8334d SHA1 (patch-ar) = fe7d5b715ac51bece44d6f3ba9c3c6245d27d00d -SHA1 (patch-as) = ecb23bc4c07d8ac7599b6f6576ad39bb4dcedbab +SHA1 (patch-as) = 6af976b7c018c1a9b0841617edbffdb8b977a2d6 SHA1 (patch-at) = 2468567cc0e91ea375f43c9ebae57644f50a5f27 SHA1 (patch-au) = 052b0b6d8869ad09144e4fc9e1b3c5e03c669c44 SHA1 (patch-av) = 5efc471716cecfaa7317c05771ee6d6293ecd1e3 diff --git a/security/openssh/patches/patch-ac b/security/openssh/patches/patch-ac index 0132349bb2e..5467b632cc3 100644 --- a/security/openssh/patches/patch-ac +++ b/security/openssh/patches/patch-ac @@ -1,6 +1,6 @@ -$NetBSD: patch-ac,v 1.13 2005/09/21 18:07:09 reed Exp $ +$NetBSD: patch-ac,v 1.14 2005/11/04 15:45:03 tv Exp $ ---- defines.h.orig 2005-08-31 11:59:49.000000000 -0500 +--- defines.h.orig 2005-08-31 12:59:49.000000000 -0400 +++ defines.h @@ -30,6 +30,15 @@ @@ -18,18 +18,18 @@ $NetBSD: patch-ac,v 1.13 2005/09/21 18:07:09 reed Exp $ #ifndef SHUT_RDWR enum { -@@ -442,8 +451,8 @@ +@@ -442,10 +451,6 @@ struct winsize { # define __attribute__(x) #endif /* !defined(__GNUC__) || (__GNUC__ < 2) */ -#ifndef __dead -# define __dead __attribute__((noreturn)) -+#ifndef __noreturn -+# define __noreturn __attribute__((noreturn)) - #endif - +-#endif +- #if !defined(HAVE_ATTRIBUTE__SENTINEL__) && !defined(__sentinel__) -@@ -635,6 +644,24 @@ + # define __sentinel__ + #endif +@@ -635,6 +640,24 @@ struct winsize { # endif # endif #endif diff --git a/security/openssh/patches/patch-as b/security/openssh/patches/patch-as index f4e324659ad..715c09f3619 100644 --- a/security/openssh/patches/patch-as +++ b/security/openssh/patches/patch-as @@ -1,4 +1,4 @@ -$NetBSD: patch-as,v 1.3 2005/03/07 23:29:50 tv Exp $ +$NetBSD: patch-as,v 1.4 2005/11/04 15:45:03 tv Exp $ --- log.h.orig 2004-06-21 22:57:44.000000000 -0400 +++ log.h @@ -7,7 +7,7 @@ $NetBSD: patch-as,v 1.3 2005/03/07 23:29:50 tv Exp $ LogLevel log_level_number(char *); -void fatal(const char *, ...) __dead __attribute__((format(printf, 1, 2))); -+void fatal(const char *, ...) __noreturn __attribute__((format(printf, 1, 2))); ++void fatal(const char *, ...) __attribute__((noreturn)) __attribute__((format(printf, 1, 2))); void error(const char *, ...) __attribute__((format(printf, 1, 2))); void logit(const char *, ...) __attribute__((format(printf, 1, 2))); void verbose(const char *, ...) __attribute__((format(printf, 1, 2))); @@ -16,5 +16,5 @@ $NetBSD: patch-as,v 1.3 2005/03/07 23:29:50 tv Exp $ void do_log(LogLevel, const char *, va_list); -void cleanup_exit(int) __dead; -+void cleanup_exit(int) __noreturn; ++void cleanup_exit(int) __attribute__((noreturn)); #endif |