Wed Jun 1 09:57:23 2011 UTC ()
Fix building with Clang


(adam)
diff -r1.29 -r1.30 pkgsrc/security/mit-krb5/distinfo
diff -r0 -r1.1 pkgsrc/security/mit-krb5/patches/patch-lib_krb5_asn.1_asn1buf.h
cvs diff -r1.29 -r1.30 pkgsrc/security/mit-krb5/distinfo (expand / switch to unified diff)

--- pkgsrc/security/mit-krb5/distinfo 2011/04/14 19:37:26 1.29
+++ pkgsrc/security/mit-krb5/distinfo 2011/06/01 09:57:23 1.30
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.29 2011/04/14 19:37:26 tez Exp $ 1$NetBSD: distinfo,v 1.30 2011/06/01 09:57:23 adam Exp $
2 2
3SHA1 (2010-006-patch.txt) = 600f0890de65f96112f267b56317a4fd0166cba0 3SHA1 (2010-006-patch.txt) = 600f0890de65f96112f267b56317a4fd0166cba0
4RMD160 (2010-006-patch.txt) = fc262a23e9aa118262a4258f74832445062444e4 4RMD160 (2010-006-patch.txt) = fc262a23e9aa118262a4258f74832445062444e4
5Size (2010-006-patch.txt) = 1066 bytes 5Size (2010-006-patch.txt) = 1066 bytes
6SHA1 (2010-007-patch.txt) = a6fbc3b6ab15ca98c1aa1521fd42dad1f5003ee8 6SHA1 (2010-007-patch.txt) = a6fbc3b6ab15ca98c1aa1521fd42dad1f5003ee8
7RMD160 (2010-007-patch.txt) = 848b776218473200e5a54beb4f3adfc3db915cf4 7RMD160 (2010-007-patch.txt) = 848b776218473200e5a54beb4f3adfc3db915cf4
8Size (2010-007-patch.txt) = 7908 bytes 8Size (2010-007-patch.txt) = 7908 bytes
9SHA1 (2011-001-patch.txt) = 79ece8b1c140deb2c01bfb64af575636b9bc7704 9SHA1 (2011-001-patch.txt) = 79ece8b1c140deb2c01bfb64af575636b9bc7704
10RMD160 (2011-001-patch.txt) = 62a7b2b0d4acbca919fd9df52e707bf0b9fff076 10RMD160 (2011-001-patch.txt) = 62a7b2b0d4acbca919fd9df52e707bf0b9fff076
11Size (2011-001-patch.txt) = 632 bytes 11Size (2011-001-patch.txt) = 632 bytes
12SHA1 (2011-002-patch-r18.txt) = 574a3c82ad7d3c9a1c9c62c6ff95c2d6f0e0fc96 12SHA1 (2011-002-patch-r18.txt) = 574a3c82ad7d3c9a1c9c62c6ff95c2d6f0e0fc96
13RMD160 (2011-002-patch-r18.txt) = 23cb2560f0d87e6128cdbb12f1e7d8aae85f85f5 13RMD160 (2011-002-patch-r18.txt) = 23cb2560f0d87e6128cdbb12f1e7d8aae85f85f5
14Size (2011-002-patch-r18.txt) = 6130 bytes 14Size (2011-002-patch-r18.txt) = 6130 bytes
@@ -27,13 +27,14 @@ SHA1 (patch-ae) = c7395b9de5baf6612b8787 @@ -27,13 +27,14 @@ SHA1 (patch-ae) = c7395b9de5baf6612b8787
27SHA1 (patch-af) = 245b6dea2eff9da9911ac6eabf2ebdbe7fdac305 27SHA1 (patch-af) = 245b6dea2eff9da9911ac6eabf2ebdbe7fdac305
28SHA1 (patch-ag) = f8daf2dd247365d506e117cb49c5d0f50e9822ed 28SHA1 (patch-ag) = f8daf2dd247365d506e117cb49c5d0f50e9822ed
29SHA1 (patch-ah) = 922542765f73dc25c464715c29c8d63c9cd9c718 29SHA1 (patch-ah) = 922542765f73dc25c464715c29c8d63c9cd9c718
30SHA1 (patch-aj) = 8a00ca30db3c9c3c9a2f7506cdc4c5b20f7f42c6 30SHA1 (patch-aj) = 8a00ca30db3c9c3c9a2f7506cdc4c5b20f7f42c6
31SHA1 (patch-ak) = 9ba29870084dfcd3f6f66e801b42d6577cda004a 31SHA1 (patch-ak) = 9ba29870084dfcd3f6f66e801b42d6577cda004a
32SHA1 (patch-al) = 8660b932c999d5b3ac63be27fc1013cceff368b9 32SHA1 (patch-al) = 8660b932c999d5b3ac63be27fc1013cceff368b9
33SHA1 (patch-ce) = 72ec322894facfd75a010f82372cfa9ef96afb5f 33SHA1 (patch-ce) = 72ec322894facfd75a010f82372cfa9ef96afb5f
34SHA1 (patch-cf) = 651f223a5c3dff566d0b5c5279d47538576c5979 34SHA1 (patch-cf) = 651f223a5c3dff566d0b5c5279d47538576c5979
35SHA1 (patch-cg) = 8c89dd960ebbe444534a849827c78f077cce499b 35SHA1 (patch-cg) = 8c89dd960ebbe444534a849827c78f077cce499b
36SHA1 (patch-ch) = 0e36012b43c498b8920f204bab2ba9a68f8c851a 36SHA1 (patch-ch) = 0e36012b43c498b8920f204bab2ba9a68f8c851a
37SHA1 (patch-ci) = 4e310f0a4dfe27cf94d0e63d623590691b6c5970 37SHA1 (patch-ci) = 4e310f0a4dfe27cf94d0e63d623590691b6c5970
38SHA1 (patch-cj) = 78342f649f8e9d3a3b5a4f83e65b6c46f589586b 38SHA1 (patch-cj) = 78342f649f8e9d3a3b5a4f83e65b6c46f589586b
39SHA1 (patch-ck) = 87b7704ca9de02880ef8b3dbb097e87d0252bd4b 39SHA1 (patch-ck) = 87b7704ca9de02880ef8b3dbb097e87d0252bd4b
 40SHA1 (patch-lib_krb5_asn.1_asn1buf.h) = a1e46ca9256aea4facc1d41841b1707b044a69e7
File Added: pkgsrc/security/mit-krb5/patches/Attic/patch-lib_krb5_asn.1_asn1buf.h
$NetBSD: patch-lib_krb5_asn.1_asn1buf.h,v 1.1 2011/06/01 09:57:23 adam Exp $

Clang does not like this kind of inlines.

--- lib/krb5/asn.1/asn1buf.h.orig	2011-06-01 09:47:31.000000000 +0000
+++ lib/krb5/asn.1/asn1buf.h
@@ -147,7 +147,7 @@ asn1_error_code asn1buf_insert_octet(asn
  * effects   Inserts o into the buffer *buf, expanding the buffer if
  *           necessary.  Returns ENOMEM memory is exhausted.
  */
-#if ((__GNUC__ >= 2) && !defined(ASN1BUF_OMIT_INLINE_FUNCS)) && !defined(CONFIG_SMALL)
+#if ((__GNUC__ >= 2) && !defined(__clang__) && !defined(ASN1BUF_OMIT_INLINE_FUNCS)) && !defined(CONFIG_SMALL)
 extern __inline__ asn1_error_code asn1buf_insert_octet(asn1buf *buf, const int o)
 {
     asn1_error_code retval;