From owner-svn-ports-head@FreeBSD.ORG Tue Feb 19 16:05:20 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 29C17B7B; Tue, 19 Feb 2013 16:05:20 +0000 (UTC) (envelope-from miwi@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 0C5E9F99; Tue, 19 Feb 2013 16:05:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1JG5Je6065988; Tue, 19 Feb 2013 16:05:19 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1JG5J5B065983; Tue, 19 Feb 2013 16:05:19 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201302191605.r1JG5J5B065983@svn.freebsd.org> From: Martin Wilke Date: Tue, 19 Feb 2013 16:05:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r312579 - in head/security/pam_ssh_agent_auth: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Feb 2013 16:05:20 -0000 Author: miwi Date: Tue Feb 19 16:05:18 2013 New Revision: 312579 URL: http://svnweb.freebsd.org/changeset/ports/312579 Log: - Unbreak PAM initialize - While here trim header PR: 176264 Submitted by: Constantin Stefanov Added: head/security/pam_ssh_agent_auth/files/patch-openbsd (contents, props changed) Modified: head/security/pam_ssh_agent_auth/Makefile Modified: head/security/pam_ssh_agent_auth/Makefile ============================================================================== --- head/security/pam_ssh_agent_auth/Makefile Tue Feb 19 15:48:36 2013 (r312578) +++ head/security/pam_ssh_agent_auth/Makefile Tue Feb 19 16:05:18 2013 (r312579) @@ -7,6 +7,7 @@ PORTNAME= pam_ssh_agent_auth PORTVERSION= 0.9.4 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= SF/pamsshagentauth/${PORTNAME}/v${PORTVERSION}/ Added: head/security/pam_ssh_agent_auth/files/patch-openbsd ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/pam_ssh_agent_auth/files/patch-openbsd Tue Feb 19 16:05:18 2013 (r312579) @@ -0,0 +1,85 @@ +diff -ur openbsd-compat/base64.h openbsd-compat/base64.h +--- openbsd-compat/base64.h 2013-02-19 17:52:53.000000000 +0400 ++++ openbsd-compat/base64.h 2013-02-19 17:49:44.000000000 +0400 +@@ -54,6 +54,7 @@ + # endif /* !HAVE_B64_NTOP */ + # define pamsshagentauth___b64_ntop(a,b,c,d) b64_ntop(a,b,c,d) + #endif /* HAVE___B64_NTOP */ ++#define pamsshagentauth___b64_ntop(a,b,c,d) __b64_ntop(a,b,c,d) + + #ifndef HAVE___B64_PTON + # ifndef HAVE_B64_PTON +@@ -61,5 +62,6 @@ + # endif /* !HAVE_B64_PTON */ + # define pamsshagentauth___b64_pton(a,b,c) b64_pton(a,b,c) + #endif /* HAVE___B64_PTON */ ++#define pamsshagentauth___b64_pton(a,b,c) __b64_pton(a,b,c) + + #endif /* _BSD_BASE64_H */ +diff -ur openbsd-compat/bsd-arc4random.c openbsd-compat/bsd-arc4random.c +--- openbsd-compat/bsd-arc4random.c 2012-06-28 05:47:49.000000000 +0400 ++++ openbsd-compat/bsd-arc4random.c 2013-02-19 18:02:38.000000000 +0400 +@@ -82,4 +82,17 @@ + + rc4_ready = REKEY_BYTES; + } ++#else /* HAVE_ARC4RANDOM */ ++ ++unsigned int ++pamsshagentauth_arc4random(void) ++{ ++ return arc4random(); ++} ++ ++void ++pamsshagentauth_arc4random_stir(void) ++{ ++ arc4random_stir(); ++} + #endif /* !HAVE_ARC4RANDOM */ +diff -ur openbsd-compat/strlcat.c openbsd-compat/strlcat.c +--- openbsd-compat/strlcat.c 2012-06-28 05:47:49.000000000 +0400 ++++ openbsd-compat/strlcat.c 2013-02-19 18:03:34.000000000 +0400 +@@ -59,4 +59,10 @@ + return(dlen + (s - src)); /* count does not include NUL */ + } + ++#else /* HAVE_STRLCAT */ ++size_t ++pamsshagentauth_strlcat(char *dst, const char *src, size_t siz) ++{ ++ return strlcat(dst, src, siz); ++} + #endif /* !HAVE_STRLCAT */ +diff -ur openbsd-compat/strlcpy.c openbsd-compat/strlcpy.c +--- openbsd-compat/strlcpy.c 2012-06-28 05:47:49.000000000 +0400 ++++ openbsd-compat/strlcpy.c 2013-02-19 18:04:18.000000000 +0400 +@@ -55,4 +55,10 @@ + return(s - src - 1); /* count does not include NUL */ + } + ++#else /* HAVE_STRLCPY */ ++size_t ++pamsshagentauth_strlcpy(char *dst, const char *src, size_t siz) ++{ ++ return strlcpy(dst, src, siz); ++} + #endif /* !HAVE_STRLCPY */ +diff -ur openbsd-compat/strtonum.c openbsd-compat/strtonum.c +--- openbsd-compat/strtonum.c 2012-06-28 05:47:49.000000000 +0400 ++++ openbsd-compat/strtonum.c 2013-02-19 18:05:16.000000000 +0400 +@@ -69,4 +69,11 @@ + return (ll); + } + +-#endif /* HAVE_STRTONUM */ ++#else /* HAVE_STRTONUM */ ++long long ++pamsshagentauth_strtonum(const char *numstr, long long minval, long long maxval, ++ const char **errstrp) ++{ ++ return strtonum(numstr, minval, maxval, errstrp); ++} ++#endif /* i!HAVE_STRTONUM */ + +