summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorapb <apb@pkgsrc.org>2011-08-01 08:42:39 +0000
committerapb <apb@pkgsrc.org>2011-08-01 08:42:39 +0000
commit908a761e32fcbee408b9988a91aebea5464e8c6b (patch)
treefebba182128ca70c34f444595d24c14a08e8fe1f /net
parentcef26ee32506202165594185f5a63e8df98f2109 (diff)
downloadpkgsrc-908a761e32fcbee408b9988a91aebea5464e8c6b.tar.gz
Fix an infinite loop in the configure script's test for
"checking for replacing readdir using getdirentries()". The functions in samba-3.5.10/lib/replace/repdir_getdirentries.c fail on NetBSD 5.99.54, and the test code in samba-3.5.10/lib/replace/test/os2_delete.c did not handle the failure. Not bumping PKGREVISION, because this affects only the configure script, and the package did not build on NetBSD-current before.
Diffstat (limited to 'net')
-rw-r--r--net/samba35/distinfo3
-rw-r--r--net/samba35/patches/patch-aa15
2 files changed, 17 insertions, 1 deletions
diff --git a/net/samba35/distinfo b/net/samba35/distinfo
index c83f65e2645..1c4bdf59858 100644
--- a/net/samba35/distinfo
+++ b/net/samba35/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.5 2011/07/27 00:52:20 taca Exp $
+$NetBSD: distinfo,v 1.6 2011/08/01 08:42:39 apb Exp $
SHA1 (samba-3.5.10.tar.gz) = de63b1a7e2fa6bcae91dbf7d2cbdfb38d0f97c00
RMD160 (samba-3.5.10.tar.gz) = 8dd4c500b0c967d70e750830443ea3c4f1d864b9
Size (samba-3.5.10.tar.gz) = 30753696 bytes
+SHA1 (patch-aa) = 6c8497adce78e8b1dea2a0402d4a980b67b57b8e
SHA1 (patch-ab) = 0372ff2e3caca866dacd6ed25ae1d02e34a5b567
SHA1 (patch-ac) = 5b1c0fdb781cb75f81af71ed2695144d4a35e032
SHA1 (patch-ad) = 447aaf4ea4cc98f0ccd5a3a22e1ffec0e69a3971
diff --git a/net/samba35/patches/patch-aa b/net/samba35/patches/patch-aa
new file mode 100644
index 00000000000..17e40f4bdb7
--- /dev/null
+++ b/net/samba35/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.3 2011/08/01 08:42:39 apb Exp $
+
+Avoid an infinite loop in the configure script after
+"checking for replacing readdir using getdirentries()..."
+
+--- ../lib/replace/test/os2_delete.c.orig 2011-07-24 20:04:44.000000000 +0000
++++ ../lib/replace/test/os2_delete.c 2011-08-01 08:09:59.000000000 +0000
+@@ -116,6 +116,7 @@
+ while (1) {
+ int n = os2_delete(d);
+ if (n == 0) break;
++ if (test_readdir_os2_delete_ret != 0) break; /* if FAILED */
+ total_deleted += n;
+ }
+ closedir(d);