Date: Thu, 10 May 2012 19:05:21 GMT From: Edmondas Girkantas <eg@fbsd.lt> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/167781: [UPDATE] security/pwauth Message-ID: <201205101905.q4AJ5LCZ043588@red.freebsd.org> Resent-Message-ID: <201205101910.q4AJADSd063130@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 167781
>Category: ports
>Synopsis: [UPDATE] security/pwauth
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu May 10 19:10:13 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Edmondas Girkantas
>Release: FreeBSD 9.0-RELEASE
>Organization:
>Environment:
FreeBSD ports.fbsd.lt 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan 3 07:15:25 UTC 2012 root@obrian.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386
>Description:
- updated to the latest 2.3.10 version
- unbreak building on FreeBSD 9.X
>How-To-Repeat:
>Fix:
apply given patch
Patch attached with submission follows:
diff -ruN pwauth.orig/Makefile pwauth/Makefile
--- pwauth.orig/Makefile 2012-05-10 22:00:54.000000000 +0300
+++ pwauth/Makefile 2012-02-11 15:55:51.000000000 +0200
@@ -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 @@
.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 -ruN pwauth.orig/distinfo pwauth/distinfo
--- pwauth.orig/distinfo 2012-05-10 22:00:54.000000000 +0300
+++ pwauth/distinfo 2012-02-11 15:55:51.000000000 +0200
@@ -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 -ruN pwauth.orig/files/extra-patch-utmpx pwauth/files/extra-patch-utmpx
--- pwauth.orig/files/extra-patch-utmpx 1970-01-01 02:00:00.000000000 +0200
+++ pwauth/files/extra-patch-utmpx 2012-02-11 14:27:14.000000000 +0200
@@ -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 -ruN pwauth.orig/files/patch-checkfaillog.c pwauth/files/patch-checkfaillog.c
--- pwauth.orig/files/patch-checkfaillog.c 1970-01-01 02:00:00.000000000 +0200
+++ pwauth/files/patch-checkfaillog.c 2012-02-11 14:27:14.000000000 +0200
@@ -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 -ruN pwauth.orig/files/patch-config.h pwauth/files/patch-config.h
--- pwauth.orig/files/patch-config.h 2012-05-10 22:00:54.000000000 +0300
+++ pwauth/files/patch-config.h 2012-02-11 15:55:51.000000000 +0200
@@ -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
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201205101905.q4AJ5LCZ043588>