5 files changed, 35 insertions, 53 deletions

diff --git a/security/pwauth/Makefile b/security/pwauth/Makefile
index 8013d68f26f1..cad33f84aac9 100644
--- a/security/pwauth/Makefile
+++ b/security/pwauth/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pwauth
-PORTVERSION=	2.2.8
+PORTVERSION=	2.3.1
 CATEGORIES=	security www
 MASTER_SITES=	http://www.unixpapa.com/software/
 
@@ -14,7 +14,10 @@ MAINTAINER=	clement@FreeBSD.org
 COMMENT=	A Unix Web Authenticator
 
 USE_REINPLACE=	yes
-PLIST_FILES=	bin/pwauth
+PLIST_FILES=	bin/pwauth bin/checkfaillog
+
+ALL_TARGET=	pwauth checkfaillog
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" LIB="-lcrypt -lpam"
 
 .include <bsd.port.pre.mk>
 
@@ -27,6 +30,7 @@ post-patch:
 do-install:
 	-@${MKDIR} -p ${PREFIX}/bin
 	@${INSTALL_PROGRAM} ${WRKSRC}/pwauth ${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/checkfaillog ${PREFIX}/bin
 	@${CHMOD} u=rxs ${PREFIX}/bin/pwauth
 
 .include <bsd.port.post.mk>
diff --git a/security/pwauth/distinfo b/security/pwauth/distinfo
index feac78bdcddf..dc83f118c42f 100644
--- a/security/pwauth/distinfo
+++ b/security/pwauth/distinfo
@@ -1,2 +1,2 @@
-MD5 (pwauth-2.2.8.tar.gz) = 1cdeeea6b7fd9b5cd72c455b9a9e32be
-SIZE (pwauth-2.2.8.tar.gz) = 13965
+MD5 (pwauth-2.3.1.tar.gz) = 9fbb03fe024b51a02fd7a15ae04a35cb
+SIZE (pwauth-2.3.1.tar.gz) = 20329
diff --git a/security/pwauth/files/patch-Makefile b/security/pwauth/files/patch-Makefile
deleted file mode 100644
index d9a6b56dbb52..000000000000
--- a/security/pwauth/files/patch-Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
---- Makefile.orig	Thu Oct 14 10:01:13 2004
-+++ Makefile	Thu Oct 14 10:09:38 2004
-@@ -6,9 +6,7 @@
- #   LOCALFLAGS=   compiler flags.  Usually -g, -O, and stuff like that.
- 
- # Settings for author's system (Redhat 6.1)
--CC=gcc
--LIB= -lcrypt
--LOCALFLAGS= -g 
-+LIB= -lcrypt -lpam
- 
- # For PAM on Redhat Linux
- # LIB=-lpam -ldl
-@@ -18,7 +16,7 @@
- 
- # -------------------- No User Servicable Parts Below -----------------------
- 
--CFLAGS= $(LOCALFLAGS)
-+all: pwauth
- 
- pwauth: pwauth.o
- 	$(CC) -o pwauth $(CFLAGS) pwauth.o $(LIB)
diff --git a/security/pwauth/files/patch-config.c b/security/pwauth/files/patch-config.c
index f92d8c739107..aecf52555ba9 100644
--- a/security/pwauth/files/patch-config.c
+++ b/security/pwauth/files/patch-config.c
@@ -1,34 +1,45 @@
---- config.h.orig	Thu Oct 14 10:18:19 2004
-+++ config.h	Thu Oct 14 10:17:07 2004
-@@ -93,11 +93,11 @@
+--- config.h.orig	Wed Sep 29 01:07:18 2004
++++ config.h	Sun Oct 30 13:49:52 2005
+@@ -106,13 +106,13 @@
  
  /* #define SHADOW_NONE		/**/
- /* #define SHADOW_BSD		/**/
--#define SHADOW_SUN		/**/
-+/* #define SHADOW_SUN		/**/
+ /* #define SHADOW_BSD		/* FreeBSD, NetBSD, OpenBSD, BSDI */
+-#define SHADOW_SUN		/* Linux, Solaris, IRIX */
++/* #define SHADOW_SUN		/* Linux, Solaris, IRIX */
  /* #define SHADOW_JFH		/**/
  /* #define SHADOW_MDW		/**/
- /* #define SHADOW_AIX		/**/
--/* #define PAM			/**/
-+#define PAM			/**/
- /* #define PAM_SOLARIS_26	/**/
+ /* #define SHADOW_AIX		/* AIX */
+ /* #define SHADOW_HPUX		/* HPUX ? */
+ 
+-/* #define PAM			/* Linux PAM or OpenPAM*/
++   #define PAM			/* Linux PAM or OpenPAM*/
+ /* #define PAM_SOLARIS		/* PAM on Solaris other than 2.6 */
+ /* #define PAM_SOLARIS_26	/* PAM on Solaris 2.6 */
+ /* #define LOGIN_CONF_OPENBSD	/**/
+@@ -193,7 +193,7 @@
+  */
+ 
+ #define UNIX_LASTLOG		/**/
+-#define HAVE_LASTLOG_H		/**/
++//#define HAVE_LASTLOG_H		/**/
  
  
-@@ -145,7 +145,7 @@
+ /* If NOLOGIN_FILE is defined to the full path name of a file, then the
+@@ -238,7 +238,7 @@
   * last).
   */
  
--#define SERVER_UIDS 99		/* user "nobody" */
-+#define SERVER_UIDS %%UIDS%%	/* user "nobody" */
+-#define SERVER_UIDS 72		/* user "nobody" */
++#define SERVER_UIDS %%UIDS%%	/* user "www" */
  
  
  /* If MIN_UNIX_UID is defined to an integer, logins with uid numbers less than
-@@ -156,7 +156,7 @@
+@@ -250,7 +250,7 @@
   * given value will be accepted).
   */
  
 -#define MIN_UNIX_UID 500	/**/
-+#define MIN_UNIX_UID %%MINUID%%	/**/
++#define MIN_UNIX_UID 1000	/**/
  
  
- /* On failed authentications, pwauth will sleep for SLEEP_TIME seconds, using
+ /* If IGNORE_CASE is defined, the login given is checked in two different
diff --git a/security/pwauth/files/patch-pwauth.c b/security/pwauth/files/patch-pwauth.c
deleted file mode 100644
index 669ad82fa182..000000000000
--- a/security/pwauth/files/patch-pwauth.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- pwauth.c.orig	Thu Oct 14 10:23:59 2004
-+++ pwauth.c	Thu Oct 14 10:24:11 2004
-@@ -141,7 +141,7 @@
- #ifdef UNIX_LASTLOG
- #define NEED_UID
- #include <utmp.h>
--#include <lastlog.h>
-+//#include <lastlog.h>
- #ifndef UT_LINESIZE
- #define UT_LINESIZE 8
- #endif