summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjschauma <jschauma>2004-05-12 20:56:14 +0000
committerjschauma <jschauma>2004-05-12 20:56:14 +0000
commitd654982a927b8f376f6b15da6b9e2bf8ed90528b (patch)
tree364c3751e72c7a3d274cd01474eaa9bfca1fe2e0
parent6d1eeb4907c67ce8202eb951d5d84380dc955f9e (diff)
downloadpkgsrc-d654982a927b8f376f6b15da6b9e2bf8ed90528b.tar.gz
On some systems (for example IRIX 5.3 with the IDO compilers), none of the
#ifdefs after this label leads to any code, so insert a no-op, just in case. Based on emails from Georg Schwarz to wiz, also noted in http://mail.gnu.org/archive/html/bug-bash/2003-04/msg00002.html.
-rw-r--r--shells/bash2/distinfo3
-rw-r--r--shells/bash2/patches/patch-af13
2 files changed, 15 insertions, 1 deletions
diff --git a/shells/bash2/distinfo b/shells/bash2/distinfo
index 214ba37ad38..cce16da68c0 100644
--- a/shells/bash2/distinfo
+++ b/shells/bash2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2003/06/30 08:35:57 uebayasi Exp $
+$NetBSD: distinfo,v 1.11 2004/05/12 20:56:14 jschauma Exp $
SHA1 (bash-2.05b.tar.gz) = b3e158877f94e66ec1c8ef604e994851ee388b09
Size (bash-2.05b.tar.gz) = 1956216 bytes
@@ -21,3 +21,4 @@ SHA1 (patch-ab) = 1a2fc87648b7e73a4987454bb249149ae15bed93
SHA1 (patch-ac) = 6528085df706bd8741b8d460e5766a4be6f95ca2
SHA1 (patch-ad) = 412b45000cbd26e5dbacb4c414351c70d73ae62f
SHA1 (patch-ae) = c0e5564d5e57a04d8458e67fb391df0d890e6f38
+SHA1 (patch-af) = 7f9cca6100fa6b24c1fb0d30958b2743679e46ee
diff --git a/shells/bash2/patches/patch-af b/shells/bash2/patches/patch-af
new file mode 100644
index 00000000000..47ac31faaa8
--- /dev/null
+++ b/shells/bash2/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2004/05/12 20:56:14 jschauma Exp $
+
+--- ./lib/malloc/malloc.c.orig Wed May 12 16:07:37 2004
++++ ./lib/malloc/malloc.c Wed May 12 16:20:47 2004
+@@ -880,6 +880,8 @@
+
+ free_return:
+
++ /* no-op in case nothing below is defined */;
++
+ #ifdef MALLOC_STATS
+ _mstats.nmalloc[nunits]--;
+ _mstats.nfre++;