summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron>2013-02-24 23:25:29 +0000
committertron <tron>2013-02-24 23:25:29 +0000
commit519ce77200202f9cfc7c109c7d8092c940bb66f4 (patch)
tree8b019e5bb46a6e5231670a8990db4c163e6e489a
parentee71e55084debde18f0467bcf352fc963d0ec218 (diff)
downloadpkgsrc-519ce77200202f9cfc7c109c7d8092c940bb66f4.tar.gz
Pullup ticket #4077 - requested by markd
net/netatalk: build fix Revisions pulled up: - net/netatalk/distinfo 1.48 - net/netatalk/patches/patch-etc_uams_uams_gss.c 1.1 --- Module Name: pkgsrc Committed By: markd Date: Fri Feb 22 22:41:32 UTC 2013 Modified Files: pkgsrc/net/netatalk: distinfo Added Files: pkgsrc/net/netatalk/patches: patch-etc_uams_uams_gss.c Log Message: Dont override the value of GSS_C_NT_HOSTBASED_SERVICE that recent Heimdal's set.
-rw-r--r--net/netatalk/distinfo3
-rw-r--r--net/netatalk/patches/patch-etc_uams_uams_gss.c17
2 files changed, 19 insertions, 1 deletions
diff --git a/net/netatalk/distinfo b/net/netatalk/distinfo
index 6a07d3bbb5f..6ebcc29ae1f 100644
--- a/net/netatalk/distinfo
+++ b/net/netatalk/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.47 2012/07/25 11:33:49 fhajny Exp $
+$NetBSD: distinfo,v 1.47.4.1 2013/02/24 23:25:29 tron Exp $
SHA1 (netatalk-2.2.1.tar.bz2) = e588b89eced7769f65e213bc4b1b1e4f8035c8b3
RMD160 (netatalk-2.2.1.tar.bz2) = bc55a591fe134d3bf05ca442aa5b5246fd766b8c
@@ -19,4 +19,5 @@ SHA1 (patch-bj) = abbc2809b6b7fe75ec2d2f8f2fa8d6cd9d6de7b0
SHA1 (patch-bk) = c3fb7c3a42f148171fa99b6121b099dd4998947a
SHA1 (patch-etc_afpd_afp_config.c) = 37813324c503fae05af12dba8dad5741a21ea4ed
SHA1 (patch-etc_afpd_quota_c) = 5005abb6528c0b3160a587fbe9fb285f485e6759
+SHA1 (patch-etc_uams_uams_gss.c) = b9ff59c368e01d3f269e95f5eaeb239dc17e701c
SHA1 (patch-macros_quota-check.m4) = b1484f83a2a6ba5bd50623ab525d5366bb71abaa
diff --git a/net/netatalk/patches/patch-etc_uams_uams_gss.c b/net/netatalk/patches/patch-etc_uams_uams_gss.c
new file mode 100644
index 00000000000..b7ae0baeca5
--- /dev/null
+++ b/net/netatalk/patches/patch-etc_uams_uams_gss.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-etc_uams_uams_gss.c,v 1.1.2.2 2013/02/24 23:25:29 tron Exp $
+
+Dont override the value that recent Heimdal's set.
+
+--- etc/uams/uams_gss.c.orig 2011-07-22 04:30:42.000000000 +0000
++++ etc/uams/uams_gss.c
+@@ -64,8 +64,10 @@ char *strchr (), *strrchr ();
+ /* We work around something I don't entirely understand... */
+ /* BF: This is a Heimdal/MIT compatibility fix */
+ #ifndef HAVE_GSS_C_NT_HOSTBASED_SERVICE
++#ifndef GSS_C_NT_HOSTBASED_SERVICE
+ #define GSS_C_NT_HOSTBASED_SERVICE gss_nt_service_name
+ #endif
++#endif
+
+ #ifdef MIN
+ #undef MIN