From owner-svn-ports-all@FreeBSD.ORG Tue Jul 17 18:01:35 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 521E81065674; Tue, 17 Jul 2012 18:01:35 +0000 (UTC) (envelope-from johans@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3C80C8FC1D; Tue, 17 Jul 2012 18:01:35 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6HI1ZZ3078524; Tue, 17 Jul 2012 18:01:35 GMT (envelope-from johans@svn.freebsd.org) Received: (from johans@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6HI1ZJY078523; Tue, 17 Jul 2012 18:01:35 GMT (envelope-from johans@svn.freebsd.org) Message-Id: <201207171801.q6HI1ZJY078523@svn.freebsd.org> From: Johan van Selst Date: Tue, 17 Jul 2012 18:01:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r301018 - in head/security/shishi: . files X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Jul 2012 18:01:35 -0000 Author: johans Date: Tue Jul 17 18:01:34 2012 New Revision: 301018 URL: http://svn.freebsd.org/changeset/ports/301018 Log: - [1] Fix the use of SRV resource queries via DNS; caused by failure to detect resolv.h and res_query() http://lists.gnu.org/archive/html/help-shishi/2012-07/msg00001.html - Minor style cleanups - Bump PORTREVISION Submitted by: Mats Erik Andersson [1] Added: head/security/shishi/files/patch-configure (contents, props changed) Modified: head/security/shishi/Makefile head/security/shishi/pkg-plist Modified: head/security/shishi/Makefile ============================================================================== --- head/security/shishi/Makefile Tue Jul 17 16:37:38 2012 (r301017) +++ head/security/shishi/Makefile Tue Jul 17 18:01:34 2012 (r301018) @@ -8,16 +8,17 @@ PORTNAME= shishi PORTVERSION= 1.0.1 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= GNU MAINTAINER= johans@FreeBSD.org COMMENT= A free implementation of the Kerberos 5 network security system -LIB_DEPENDS= idn.17:${PORTSDIR}/dns/libidn \ - tasn1.4:${PORTSDIR}/security/libtasn1 \ - gcrypt.18:${PORTSDIR}/security/libgcrypt \ - gnutls.47:${PORTSDIR}/security/gnutls +LIB_DEPENDS= idn:${PORTSDIR}/dns/libidn \ + tasn1:${PORTSDIR}/security/libtasn1 \ + gcrypt:${PORTSDIR}/security/libgcrypt \ + gnutls:${PORTSDIR}/security/gnutls USE_AUTOTOOLS= libtool USE_PERL5_BUILD= yes Added: head/security/shishi/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/shishi/files/patch-configure Tue Jul 17 18:01:34 2012 (r301018) @@ -0,0 +1,59 @@ +The upstream configuration is not able to properly detect +the use of "resolv.h" and res_query() on BSD systems. +As a consequence of this the built library libshishi.so +is not able to question a DNS server for SRV resources. + +http://lists.gnu.org/archive/html/help-shishi/2012-07/msg00001.html + +--- configure.bak 2012-07-17 17:41:29.000000000 +0200 ++++ configure 2012-07-17 17:48:44.000000000 +0200 +@@ -6688,10 +6688,11 @@ + + fi + +-for ac_header in termios.h pwd.h syslog.h resolv.h arpa/nameser.h netinet/in6.h ++for ac_header in termios.h pwd.h syslog.h arpa/nameser.h netinet/in6.h + do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" ++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default ++" + if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +@@ -6701,6 +6702,15 @@ + + done + ++# Check for resolv.h ++ac_fn_c_check_header_mongrel "$LINENO" "resolv.h" "as_ac_resolv_h" "$ac_includes_default ++#include ++#include " ++if test "x$as_ac_resolv_h" = x"yes"; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_RESOLV_H 1 ++_ACEOF ++fi + + # Used when creating libshishi-XX.def. + SOVERSION=`expr ${LT_CURRENT} - ${LT_AGE}` +@@ -33526,7 +33536,7 @@ + fi + + # Checks for library functions. +-for ac_func in signal select ngettext gethostbyname getpwnam getuid ++for ac_func in signal select ngettext gethostbyname getpwnam getuid res_query + do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +--- lib/resolv.c.bak 2012-02-08 13:17:44.000000000 +0100 ++++ lib/resolv.c 2012-07-17 17:41:29.000000000 +0200 +@@ -30,7 +30,7 @@ + + #include "internal.h" + +-#ifdef HAVE_LIBRESOLV ++#ifdef HAVE_RES_QUERY + + /* the largest packet we'll send and receive */ + #if PACKETSZ > 1024 Modified: head/security/shishi/pkg-plist ============================================================================== --- head/security/shishi/pkg-plist Tue Jul 17 16:37:38 2012 (r301017) +++ head/security/shishi/pkg-plist Tue Jul 17 18:01:34 2012 (r301018) @@ -35,4 +35,4 @@ libdata/pkgconfig/shishi.pc @dirrmtry etc/shishi @dirrmtry lib/security @exec mkdir -m 0700 -p /var/shishi -@dirrmtry /var/shishi +@unexec rmdir /var/shishi 2>/dev/null || true