reflect various build time options, fixes #121125

(Portage version: 2.1_rc3-r1)

4 files changed, 165 insertions, 1 deletions

diff --git a/net-www/pwauth/ChangeLog b/net-www/pwauth/ChangeLog
index 97b859dd4ba9..03e00ebcd79f 100644
--- a/net-www/pwauth/ChangeLog
+++ b/net-www/pwauth/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/pwauth
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/pwauth/ChangeLog,v 1.7 2006/06/05 19:21:13 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/pwauth/ChangeLog,v 1.8 2006/06/06 08:48:55 hollow Exp $
+
+*pwauth-2.3.1-r3 (06 Jun 2006)
+
+  06 Jun 2006; Benedikt Böhm <hollow@gentoo.org>
+  +files/pwauth-gentoo.patch, +pwauth-2.3.1-r3.ebuild:
+  reflect various build time options, fixes #121125
 
   05 Jun 2006; Benedikt Böhm <hollow@gentoo.org> -files/pwauth.pam,
   -pwauth-2.3.1.ebuild, -pwauth-2.3.1-r1.ebuild:
diff --git a/net-www/pwauth/files/digest-pwauth-2.3.1-r3 b/net-www/pwauth/files/digest-pwauth-2.3.1-r3
new file mode 100644
index 000000000000..1d7783888469
--- /dev/null
+++ b/net-www/pwauth/files/digest-pwauth-2.3.1-r3
@@ -0,0 +1,3 @@
+MD5 9fbb03fe024b51a02fd7a15ae04a35cb pwauth-2.3.1.tar.gz 20329
+RMD160 60ed7aeca033054fbc28f397e822120de53d617b pwauth-2.3.1.tar.gz 20329
+SHA256 8d0162836998a040351d16163b03dabd7824b23d5d4fc1207fec5e0245f091ac pwauth-2.3.1.tar.gz 20329
diff --git a/net-www/pwauth/files/pwauth-gentoo.patch b/net-www/pwauth/files/pwauth-gentoo.patch
new file mode 100644
index 000000000000..2f3a183d3ebd
--- /dev/null
+++ b/net-www/pwauth/files/pwauth-gentoo.patch
@@ -0,0 +1,78 @@
+diff -Nurp pwauth-2.3.1.orig/config.h pwauth-2.3.1/config.h
+--- pwauth-2.3.1.orig/config.h	2004-09-29 03:07:18.000000000 +0200
++++ pwauth-2.3.1/config.h	2006-06-06 09:01:37.044516000 +0200
+@@ -106,7 +106,7 @@
+ 
+ /* #define SHADOW_NONE		/**/
+ /* #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		/* AIX */
+@@ -238,7 +238,7 @@
+  * last).
+  */
+ 
+-#define SERVER_UIDS 72		/* user "nobody" */
++/* #define SERVER_UIDS 81		/* user "nobody" */
+ 
+ 
+ /* If MIN_UNIX_UID is defined to an integer, logins with uid numbers less than
+@@ -250,7 +250,7 @@
+  * given value will be accepted).
+  */
+ 
+-#define MIN_UNIX_UID 500	/**/
++/* #define MIN_UNIX_UID 500	/**/
+ 
+ 
+ /* If IGNORE_CASE is defined, the login given is checked in two different
+@@ -278,7 +278,7 @@
+  * SLEEP_LOCK.  SLEEP_TIME defaults to 2 seconds if not defined.
+  */
+ 
+-#define SLEEP_LOCK "/var/run/pwauth.lock"
++#define SLEEP_LOCK "/var/lock/pwauth"
+ 
+ 
+ /* If ENV_METHOD is defined, pwauth expects mod_auth_external to be configured
+diff -Nurp pwauth-2.3.1.orig/Makefile pwauth-2.3.1/Makefile
+--- pwauth-2.3.1.orig/Makefile	2004-09-28 15:40:19.000000000 +0200
++++ pwauth-2.3.1/Makefile	2006-06-06 09:26:14.620858750 +0200
+@@ -2,32 +2,18 @@
+ # system.  Most of the configurable stuff is in config.h
+ #
+ #   CC=       an ansi-C compiler.  If "cc" doesn't work, try "gcc".
+-#   LIB=      libraries to link in.  -lcrypt, -lshadow, -lpam sometimes needed.
+-#   LOCALFLAGS=   compiler flags.  Usually -g, -O, and stuff like that.
+-
+-# Settings for author's system (Redhat 6.1)
+-CC=gcc
+-LIB= -lcrypt
+-LOCALFLAGS= -g 
+-
+-# For PAM on Redhat Linux
+-# LIB=-lpam -ldl
+-
+-# For PAM on Solaris
+-# LIB=-lpam
++#   LDFLAGS=  libraries to link in.  -lcrypt, -lshadow, -lpam sometimes needed.
+ 
+ # -------------------- No User Servicable Parts Below -----------------------
+ 
+-CFLAGS= $(LOCALFLAGS)
+-
+ pwauth: main.o auth_aix.o auth_bsd.o auth_hpux.o auth_mdw.o auth_openbsd.o \
+ 	auth_pam.o auth_sun.o fail_log.o lastlog.o nologin.o snooze.o
+ 	$(CC) -o pwauth $(CFLAGS) main.o auth_aix.o auth_bsd.o auth_hpux.o \
+ 		auth_mdw.o auth_openbsd.o auth_pam.o auth_sun.o fail_log.o \
+-		lastlog.o nologin.o snooze.o $(LIB)
++		lastlog.o nologin.o snooze.o $(LDFLAGS)
+ 
+ checkfaillog: checkfaillog.o fail_check.o
+-	$(CC) -o checkfaillog $(CFLAGS) checkfaillog.o fail_check.o $(LIB)
++	$(CC) -o checkfaillog $(CFLAGS) checkfaillog.o fail_check.o $(LDFLAGS)
+ 
+ main.o: main.c config.h pwauth.h fail_log.h
+ auth_aix.o: auth_aix.c config.h pwauth.h
diff --git a/net-www/pwauth/pwauth-2.3.1-r3.ebuild b/net-www/pwauth/pwauth-2.3.1-r3.ebuild
new file mode 100644
index 000000000000..b63449d96747
--- /dev/null
+++ b/net-www/pwauth/pwauth-2.3.1-r3.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/pwauth/pwauth-2.3.1-r3.ebuild,v 1.1 2006/06/06 08:48:55 hollow Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A Unix Web Authenticator"
+HOMEPAGE="http://www.unixpapa.com/pwauth/"
+SRC_URI="http://www.unixpapa.com/software/${P}.tar.gz"
+
+LICENSE="Apache-1.1"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="faillog pam ignore-case domain-aware"
+SLOT="0"
+
+DEPEND="pam? ( virtual/pam )"
+
+pkg_setup() {
+	local OPTS
+
+	einfo "You can configure various build time options with ENV variables:"
+	einfo
+	einfo "    PWAUTH_FAILLOG      Path to logfile for login failures"
+	einfo "                        (default: /var/log/pwauth.log)"
+	einfo "    PWAUTH_SERVERUIDS   Comma seperated list of UIDs allowed to run pwauth"
+	einfo "                        (default: 81)"
+	einfo "    PWAUTH_MINUID       Minimum UID for which authentication will succeed"
+	einfo "                        (default: 1000)"
+	einfo
+
+	PWAUTH_FAILLOG="${PWAUTH_FAILLOG:-/var/log/pwauth.log}"
+	PWAUTH_SERVERUIDS="${PWAUTH_SERVERUIDS:-81}"
+	PWAUTH_MINUID="${PWAUTH_MINUID:-1000}"
+
+	OPTS="${OPTS} -DSERVER_UIDS=${PWAUTH_SERVERUIDS}"
+	OPTS="${OPTS} -DMIN_UNIX_UID=${PWAUTH_MINUID}"
+
+	if useq faillog; then
+		OPTS="${OPTS} -DFAILLOG_PWAUTH"
+		OPTS="${OPTS} -DPATH_FAILLOG=\"\\\"${PWAUTH_FAILLOG}\\\"\""
+	fi
+
+	if useq pam; then
+		OPTS="${OPTS} -DPAM"
+		LDFLAGS="-lpam"
+	else
+		OPTS="${OPTS} -DSHADOW_SUN"
+		LDFLAGS="-lcrypt"
+	fi
+
+	if useq ignore-case; then
+		OPTS="${OPTS} -DIGNORE_CASE"
+	fi
+
+	if useq domain-aware; then
+		OPTS="${OPTS} -DOMAIN_AWARE"
+	fi
+
+	CC=$(tc-getCC)
+	CFLAGS="${CFLAGS} ${OPTS}"
+}
+
+src_unpack() {
+	unpack ${A} || die "unpack failed"
+	cd ${S} || die "cd to $s failed"
+
+	epatch "${FILESDIR}"/pwauth-gentoo.patch
+}
+
+src_install() {
+	dosbin pwauth unixgroup
+	fperms 4755 /usr/sbin/pwauth
+
+	useq pam && newpamd ${FILESDIR}/pwauth.pam-include pwauth
+
+	dodoc CHANGES FORM_AUTH INSTALL README
+}