svn commit: r537157 - in head/security/pam_ssh_agent_auth: . files

[Matthew Seaman]

Author: matthew
Date: Sun May 31 11:54:27 2020
New Revision: 537157
URL: https://svnweb.freebsd.org/changeset/ports/537157

Log:
  Take maintainership.
  
  Switch to Github for the master site.
  
  Upstream rarely puts out releases, and doesn't seem to tag releases at
  GitHub.  Since the previous release, most of the patches from this
  port have been incorporated upstream.  Therefore, select the latest
  commit (approximately 11 months ago as I write) to build from.
  
  Add some small patches to fix compilation.

Added:
  head/security/pam_ssh_agent_auth/files/patch-ed25519-donna_ed25519-donna-portable.h   (contents, props changed)
  head/security/pam_ssh_agent_auth/files/patch-userauth__pubkey__from__pam.c   (contents, props changed)
Deleted:
  head/security/pam_ssh_agent_auth/files/patch-OpenSSL-1.1.1
  head/security/pam_ssh_agent_auth/files/patch-pam_user_authorized_keys.c
Modified:
  head/security/pam_ssh_agent_auth/Makefile
  head/security/pam_ssh_agent_auth/distinfo

Modified: head/security/pam_ssh_agent_auth/Makefile
==============================================================================
--- head/security/pam_ssh_agent_auth/Makefile	Sun May 31 11:29:36 2020	(r537156)
+++ head/security/pam_ssh_agent_auth/Makefile	Sun May 31 11:54:27 2020	(r537157)
@@ -3,12 +3,16 @@
 
 PORTNAME=	pam_ssh_agent_auth
 PORTVERSION=	0.10.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
-MASTER_SITES=	SF/pamsshagentauth/${PORTNAME}/v${PORTVERSION}/
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	matthew at FreeBSD.org
 COMMENT=	PAM module which permits authentication via ssh-agent
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	jbeverly
+GH_TAGNAME=	7ff7858
+GH_TUPLE=	floodyberry:ed25519-donna:8757bd4:floodyberry_ed25519_donna/ed25519-donna
 
 BROKEN_mips64=		fails to compile: ed25519-donna-portable.h:85:4: Need a uint128_t implementation!
 BROKEN_FreeBSD_11_powerpc64=	fails to compile on powerpc64 elfv1: ed25519-donna-portable.h: warning: ALIGN redefined

Modified: head/security/pam_ssh_agent_auth/distinfo
==============================================================================
--- head/security/pam_ssh_agent_auth/distinfo	Sun May 31 11:29:36 2020	(r537156)
+++ head/security/pam_ssh_agent_auth/distinfo	Sun May 31 11:54:27 2020	(r537157)
@@ -1,3 +1,5 @@
-TIMESTAMP = 1479105140
-SHA256 (pam_ssh_agent_auth-0.10.3.tar.bz2) = 3c53d358d6eaed1b211239df017c27c6f9970995d14102ae67bae16d4f47a763
-SIZE (pam_ssh_agent_auth-0.10.3.tar.bz2) = 1066393
+TIMESTAMP = 1590919268
+SHA256 (jbeverly-pam_ssh_agent_auth-0.10.3-7ff7858_GH0.tar.gz) = 57b9d93c5ddfa157fe795a48dc8f913a8fb35d22085997d5062595020d5811c2
+SIZE (jbeverly-pam_ssh_agent_auth-0.10.3-7ff7858_GH0.tar.gz) = 307123
+SHA256 (floodyberry-ed25519-donna-8757bd4_GH0.tar.gz) = bc0d6c06ee9b23b03a47f11c75fbe88abcaac08834ced07e297d0674f0710bff
+SIZE (floodyberry-ed25519-donna-8757bd4_GH0.tar.gz) = 1169879

Added: head/security/pam_ssh_agent_auth/files/patch-ed25519-donna_ed25519-donna-portable.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/pam_ssh_agent_auth/files/patch-ed25519-donna_ed25519-donna-portable.h	Sun May 31 11:54:27 2020	(r537157)
@@ -0,0 +1,12 @@
+--- ed25519-donna/ed25519-donna-portable.h.orig	2015-03-16 23:50:38 UTC
++++ ed25519-donna/ed25519-donna-portable.h
+@@ -20,6 +20,9 @@
+ 	#include <sys/param.h>
+ 	#define DONNA_INLINE inline __attribute__((always_inline))
+ 	#define DONNA_NOINLINE __attribute__((noinline))
++	#if defined(ALIGN)
++		#undef ALIGN
++	#endif
+ 	#define ALIGN(x) __attribute__((aligned(x)))
+ 	#define ROTL32(a,b) (((a) << (b)) | ((a) >> (32 - b)))
+ 	#define ROTR32(a,b) (((a) >> (b)) | ((a) << (32 - b)))

Added: head/security/pam_ssh_agent_auth/files/patch-userauth__pubkey__from__pam.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/pam_ssh_agent_auth/files/patch-userauth__pubkey__from__pam.c	Sun May 31 11:54:27 2020	(r537157)
@@ -0,0 +1,10 @@
+--- userauth_pubkey_from_pam.c.orig	2020-05-31 10:22:03 UTC
++++ userauth_pubkey_from_pam.c
+@@ -31,6 +31,7 @@
+ #include "config.h"
+ 
+ #include <string.h>
++#include <sys/types.h>
+ 
+ #include "defines.h"
+ #include "key.h"