diff options
author | joerg <joerg@pkgsrc.org> | 2007-07-03 13:54:45 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2007-07-03 13:54:45 +0000 |
commit | e24209d1455027ac9e39ab799fbdc2c1e21f9cfc (patch) | |
tree | f0384614f91c073d547064a3c7e0dd2d67393d7e /mail/libspf-alt | |
parent | fa3e8e36f943b91d9e0ce955b1413de422524561 (diff) | |
download | pkgsrc-e24209d1455027ac9e39ab799fbdc2c1e21f9cfc.tar.gz |
Add common handling for libresolv similiar to dlopen(3) wrapping.
For now, DragonFly and FreeBSD use the libc version, it is not reentrant,
but thread-safe. NetBSD 3.0+ and Darwin 8.0+ use libresolv from base
(the BIND9 resolver), all other fall back to net/bind9. Feel free to add
your favorite platform if it has a thread-safe resolver in base.
Modify mail/libspf-alf, mail/milter-greylist, mail/spamdyke and
net/nocol accordingly. Testing on !DragonFly and feedback from tron@
Diffstat (limited to 'mail/libspf-alt')
-rw-r--r-- | mail/libspf-alt/Makefile | 4 | ||||
-rw-r--r-- | mail/libspf-alt/buildlink3.mk | 4 | ||||
-rw-r--r-- | mail/libspf-alt/distinfo | 3 | ||||
-rw-r--r-- | mail/libspf-alt/patches/patch-aa | 56 |
4 files changed, 62 insertions, 5 deletions
diff --git a/mail/libspf-alt/Makefile b/mail/libspf-alt/Makefile index 309fa2e6a58..60083601cde 100644 --- a/mail/libspf-alt/Makefile +++ b/mail/libspf-alt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/10/04 21:47:16 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2007/07/03 13:54:45 joerg Exp $ DISTNAME= libspf_alt-0.4.0 PKGREVISION= 3 @@ -15,5 +15,5 @@ GNU_CONFIGURE= YES CONFIGURE_ARGS+=--with-bind=${BUILDLINK_PREFIX.bind} .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../net/bind9/buildlink3.mk" +.include "../../mk/resolv.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/libspf-alt/buildlink3.mk b/mail/libspf-alt/buildlink3.mk index 53bc698e008..242d4af2373 100644 --- a/mail/libspf-alt/buildlink3.mk +++ b/mail/libspf-alt/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:57 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2007/07/03 13:54:45 joerg Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBSPF_ALT_BUILDLINK3_MK:= ${LIBSPF_ALT_BUILDLINK3_MK}+ @@ -18,6 +18,6 @@ BUILDLINK_PKGSRCDIR.libspf_alt?= ../../mail/libspf-alt .endif # LIBSPF_ALT_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../net/bind9/buildlink3.mk" +.include "../../mk/resolv.buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/mail/libspf-alt/distinfo b/mail/libspf-alt/distinfo index 9a5e945292d..16f666e5b99 100644 --- a/mail/libspf-alt/distinfo +++ b/mail/libspf-alt/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.2 2005/02/24 09:59:23 agc Exp $ +$NetBSD: distinfo,v 1.3 2007/07/03 13:54:45 joerg Exp $ SHA1 (libspf_alt-0.4.0.tar.gz) = ba269d7508daebf42e9e20720f410c9409207558 RMD160 (libspf_alt-0.4.0.tar.gz) = 67a789cfbc4df391fd6938e81ce90e3b24264615 Size (libspf_alt-0.4.0.tar.gz) = 598003 bytes +SHA1 (patch-aa) = c2663da02cd12ff6c148f4dd2d9670e5ce71d3cb diff --git a/mail/libspf-alt/patches/patch-aa b/mail/libspf-alt/patches/patch-aa new file mode 100644 index 00000000000..82997b35131 --- /dev/null +++ b/mail/libspf-alt/patches/patch-aa @@ -0,0 +1,56 @@ +$NetBSD: patch-aa,v 1.1 2007/07/03 13:54:45 joerg Exp $ + +--- configure.orig 2007-07-02 14:03:12.000000000 +0000 ++++ configure +@@ -19389,13 +19389,13 @@ echo "${ECHO_T}$ac_cv_lib_bind_res_query + if test $ac_cv_lib_bind_res_query = yes; then + LIBS="$LIBS -lbind" + else +- echo "$as_me:$LINENO: checking for res_query in -lresolv" >&5 +-echo $ECHO_N "checking for res_query in -lresolv... $ECHO_C" >&6 ++ echo "$as_me:$LINENO: checking for res_query in ${RESOLV_LDFLAGS}" >&5 ++echo $ECHO_N "checking for res_query in ${RESOLV_LDFLAGS}... $ECHO_C" >&6 + if test "${ac_cv_lib_resolv_res_query+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lresolv $LIBS" ++LIBS="${RESOLV_LDFLAGS} $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -19453,7 +19453,7 @@ fi + echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_query" >&5 + echo "${ECHO_T}$ac_cv_lib_resolv_res_query" >&6 + if test $ac_cv_lib_resolv_res_query = yes; then +- LIBS="$LIBS -lresolv" ++ LIBS="$LIBS ${RESOLV_LDFLAGS}" + else + echo "cannot find resolver library"; exit 1; + fi +@@ -19464,13 +19464,13 @@ fi + + else + +-echo "$as_me:$LINENO: checking for res_query in -lresolv" >&5 +-echo $ECHO_N "checking for res_query in -lresolv... $ECHO_C" >&6 ++echo "$as_me:$LINENO: checking for res_query in ${RESOLV_LDFLAGS}" >&5 ++echo $ECHO_N "checking for res_query in ${RESOLV_LDFLAGS}... $ECHO_C" >&6 + if test "${ac_cv_lib_resolv_res_query+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lresolv $LIBS" ++LIBS="${RESOLV_LDFLAGS} $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -19532,7 +19532,7 @@ if test $ac_cv_lib_resolv_res_query = ye + #define HAVE_LIBRESOLV 1 + _ACEOF + +- LIBS="-lresolv $LIBS" ++ LIBS="${RESOLV_LDFLAGS} $LIBS" + + fi + |