From 41b6a8528cb40eba58110f298a995fb794708fa7 Mon Sep 17 00:00:00 2001
From: branch-fixup <branch-fixup>
Date: Sat, 8 Mar 2008 01:10:27 +0000
Subject: [PATCH] Add files from parent branch HEAD: 
 sysutils/amanda-common/distinfo 
 sysutils/amanda-common/patches/patch-ah

---
 sysutils/amanda-common/distinfo         | 11 +++++++++++
 sysutils/amanda-common/patches/patch-ah | 18 ++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 sysutils/amanda-common/distinfo
 create mode 100644 sysutils/amanda-common/patches/patch-ah

diff --git a/sysutils/amanda-common/distinfo b/sysutils/amanda-common/distinfo
new file mode 100644
index 000000000000..1bc354f0f24d
--- /dev/null
+++ b/sysutils/amanda-common/distinfo
@@ -0,0 +1,11 @@
+$NetBSD: distinfo,v 1.8 2008/02/15 16:23:09 gdt Exp $
+
+SHA1 (amanda-2.5.2p1.tar.gz) = 0969376590a93b2c060dbe9d2573bf335614a4c2
+RMD160 (amanda-2.5.2p1.tar.gz) = 31a81a7c5c0d953a6dffa575a7c3edc14d41f236
+Size (amanda-2.5.2p1.tar.gz) = 1967240 bytes
+SHA1 (patch-ab) = 1b07671b54492c3e4826e09f66ba9f4b1c9e3e55
+SHA1 (patch-ac) = e67098e2fb0a0e85837d124e41fd9d1976675f89
+SHA1 (patch-ad) = 510e650c9e9976323b1d27a7895cee6281b89dcd
+SHA1 (patch-af) = 6f996ef8dacb75cf17a47df73024b91ad137315e
+SHA1 (patch-ag) = 6e79b0e71d37a44b03addae67e361178b537ad8d
+SHA1 (patch-ah) = aecd08fd2a1982ac8ab62aa85979958b73fd038c
diff --git a/sysutils/amanda-common/patches/patch-ah b/sysutils/amanda-common/patches/patch-ah
new file mode 100644
index 000000000000..68a265c35f7a
--- /dev/null
+++ b/sysutils/amanda-common/patches/patch-ah
@@ -0,0 +1,18 @@
+$NetBSD$
+
+Work around a problem linking to _environ in Mac OS X.
+
+--- common-src/alloc.c.orig	2007-05-07 16:46:45.000000000 -0400
++++ common-src/alloc.c
+@@ -37,6 +37,11 @@
+ #define MIN_ALLOC 64
+ static char *internal_vstralloc(const char *, va_list);
+ 
++#ifdef __APPLE__
++#include <crt_externs.h>
++#define environ (* _NSGetEnviron())
++#endif
++
+ /*
+  *=====================================================================
+  * debug_caller_loc -- keep track of all allocation callers
-- 
2.41.0