diff options
| -rw-r--r-- | security/pwauth/Makefile | 6 | ||||
| -rw-r--r-- | security/pwauth/distinfo | 4 | ||||
| -rw-r--r-- | security/pwauth/files/extra-patch-utmpx | 33 | ||||
| -rw-r--r-- | security/pwauth/files/patch-checkfaillog.c | 10 | ||||
| -rw-r--r-- | security/pwauth/files/patch-config.h | 36 |
5 files changed, 68 insertions, 21 deletions
diff --git a/security/pwauth/Makefile b/security/pwauth/Makefile index b49ba98b0339..d24d7cc911fb 100644 --- a/security/pwauth/Makefile +++ b/security/pwauth/Makefile @@ -6,7 +6,7 @@ # PORTNAME= pwauth -PORTVERSION= 2.3.7 +PORTVERSION= 2.3.10 CATEGORIES= security www MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \ http://www.unixpapa.com/software/ @@ -21,8 +21,8 @@ MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" LIB="-lcrypt -lpam" .include <bsd.port.pre.mk> -.if ${OSVERSION} > 900006 -BROKEN= does not compile on 9.X +.if ${OSVERSION} >= 900007 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-utmpx .endif WWWUID!= ${ID} -u ${WWWOWN} diff --git a/security/pwauth/distinfo b/security/pwauth/distinfo index 5f7e712495a6..bd86e8f9d15b 100644 --- a/security/pwauth/distinfo +++ b/security/pwauth/distinfo @@ -1,2 +1,2 @@ -SHA256 (pwauth-2.3.7.tar.gz) = b7062011d4f7b7c69a876c40ae959d6aaf1744d5ef51e2bd97c745a84e4c1d1f -SIZE (pwauth-2.3.7.tar.gz) = 21608 +SHA256 (pwauth-2.3.10.tar.gz) = 267813acccc58d407b735ebfd32ee7ec52726379d0aa3670731d2ea4c9d85906 +SIZE (pwauth-2.3.10.tar.gz) = 23825 diff --git a/security/pwauth/files/extra-patch-utmpx b/security/pwauth/files/extra-patch-utmpx new file mode 100644 index 000000000000..eef7e8e9b3a5 --- /dev/null +++ b/security/pwauth/files/extra-patch-utmpx @@ -0,0 +1,33 @@ +--- checkfaillog.c.orig 2012-02-11 13:18:31.000000000 +0200 ++++ checkfaillog.c 2012-02-11 13:18:50.000000000 +0200 +@@ -33,7 +33,7 @@ + + #include <stdio.h> + #include <sys/types.h> +-#include <utmp.h> ++#include <utmpx.h> + #include <pwd.h> + + #include "config.h" +--- fail_check.c.orig 2012-02-11 13:18:36.000000000 +0200 ++++ fail_check.c 2012-02-11 13:18:59.000000000 +0200 +@@ -35,7 +35,7 @@ + #include <sys/types.h> + #include <sys/stat.h> + #include <fcntl.h> +-#include <utmp.h> ++#include <utmpx.h> + + #include "config.h" + #include "fail_log.h" +--- pwauth.h.orig 2012-02-11 13:18:41.000000000 +0200 ++++ pwauth.h 2012-02-11 13:19:08.000000000 +0200 +@@ -71,7 +71,7 @@ + + #ifdef UNIX_LASTLOG + # define NEED_UID +-# include <utmp.h> ++# include <utmpx.h> + # ifdef HAVE_LASTLOG_H + # include <lastlog.h> + # endif diff --git a/security/pwauth/files/patch-checkfaillog.c b/security/pwauth/files/patch-checkfaillog.c new file mode 100644 index 000000000000..320a51faf92a --- /dev/null +++ b/security/pwauth/files/patch-checkfaillog.c @@ -0,0 +1,10 @@ +--- checkfaillog.c.orig 2012-02-11 13:22:09.000000000 +0200 ++++ checkfaillog.c 2012-02-11 13:22:42.000000000 +0200 +@@ -32,6 +32,7 @@ + */ + + #include <stdio.h> ++#include <stdlib.h> + #include <sys/types.h> + #include <utmp.h> + #include <pwd.h> diff --git a/security/pwauth/files/patch-config.h b/security/pwauth/files/patch-config.h index e78bc9d3036a..5a56d6bd5a6b 100644 --- a/security/pwauth/files/patch-config.h +++ b/security/pwauth/files/patch-config.h @@ -1,6 +1,6 @@ ---- config.h.orig 2008-05-19 21:59:42.000000000 +0300 -+++ config.h 2009-02-17 23:01:51.000000000 +0200 -@@ -112,13 +112,13 @@ +--- config.h.orig 2012-02-11 15:52:24.000000000 +0200 ++++ config.h 2012-02-11 15:52:06.000000000 +0200 +@@ -123,7 +123,7 @@ /* #define SHADOW_NONE /**/ /* #define SHADOW_BSD /* FreeBSD, NetBSD, OpenBSD, BSDI, OS X */ @@ -8,38 +8,42 @@ +/* #define SHADOW_SUN /* Linux, Solaris, IRIX */ /* #define SHADOW_JFH /**/ /* #define SHADOW_MDW /**/ - /* #define SHADOW_AIX /* AIX */ - /* #define SHADOW_HPUX /* HPUX ? */ + /* #define SHADOW_AIX /* AIX (see also AUTHENTICATE_AIX) */ +@@ -131,7 +131,7 @@ --/* #define PAM /* Linux PAM or OpenPAM*/ -+ #define PAM /* Linux PAM or OpenPAM*/ - /* #define PAM_OS_X /* PAM on OS X */ + /* HIGH-LEVEL OPTIONS */ + +-/* #define PAM /* Linux PAM or OpenPAM */ ++ #define PAM /* Linux PAM or OpenPAM */ + /* #define PAM_OLD_OS_X /* PAM on OS X version 10.5 or older */ /* #define PAM_SOLARIS /* PAM on Solaris other than 2.6 */ /* #define PAM_SOLARIS_26 /* PAM on Solaris 2.6 */ -@@ -200,7 +200,7 @@ +@@ -213,8 +213,8 @@ + * uid numbers. */ - #define UNIX_LASTLOG /**/ +-#define UNIX_LASTLOG /**/ -#define HAVE_LASTLOG_H /**/ ++//#define UNIX_LASTLOG /**/ +//#define HAVE_LASTLOG_H /**/ /* If NOLOGIN_FILE is defined to the full path name of a file, then the -@@ -245,7 +245,7 @@ - * last). +@@ -278,7 +278,7 @@ + * to change the uid list. */ --#define SERVER_UIDS 72 /* user "nobody" */ -+#define SERVER_UIDS %%UIDS%% /* user "nobody" */ +-#define SERVER_UIDS 30 /* user "wwwrun" on the author's system */ ++#define SERVER_UIDS %%UIDS%% /**/ /* If MIN_UNIX_UID is defined to an integer, logins with uid numbers less than -@@ -257,7 +257,7 @@ +@@ -290,7 +290,7 @@ * given value will be accepted). */ -#define MIN_UNIX_UID 500 /**/ -+#define MIN_UNIX_UID %%MINUID%% /**/ ++#define MIN_UNIX_UID %%MINUID%% /**/ /* If IGNORE_CASE is defined, the login given is checked in two different |