reflect various build time options, fixes #121125

Package-Manager: portage-2.1_rc3-r1

5 files changed, 183 insertions, 8 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/Manifest b/net-www/pwauth/Manifest
index ef5525dace84..0b42825787e8 100644
--- a/net-www/pwauth/Manifest
+++ b/net-www/pwauth/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX pwauth-gentoo.patch 2658 RMD160 f864529a23da0ee77524e0d8f55521eb7a798eaa SHA1 3c158d4f9770622636d6dff4dbc4fd4b3f7affbc SHA256 9a0f24988ea1453af2f5fa961ed810b0ecab88ebb166fa0993f38081ec4b1b1a
+MD5 9927c753366d73b236dfe41cb4ee8841 files/pwauth-gentoo.patch 2658
+RMD160 f864529a23da0ee77524e0d8f55521eb7a798eaa files/pwauth-gentoo.patch 2658
+SHA256 9a0f24988ea1453af2f5fa961ed810b0ecab88ebb166fa0993f38081ec4b1b1a files/pwauth-gentoo.patch 2658
 AUX pwauth.pam-include 174 RMD160 e96c92b0ad462cf92e5bca0b97a41aaa41b9ac2f SHA1 3d06e77f864465d1282f316a565a0b810cd5ca6d SHA256 5fef4f1719b6b43a2707c89abedd3fe256ecb26ae0cdca81ba4361a9a5b10db6
 MD5 380f50919d1a20a1a26cd8c18dfc54fc files/pwauth.pam-include 174
 RMD160 e96c92b0ad462cf92e5bca0b97a41aaa41b9ac2f files/pwauth.pam-include 174
@@ -10,10 +14,14 @@ EBUILD pwauth-2.3.1-r2.ebuild 736 RMD160 650b3e164eb871038048335f0801e39f6e28ec1
 MD5 650d2a7d7bdbd5d8fc031f8be99487ed pwauth-2.3.1-r2.ebuild 736
 RMD160 650b3e164eb871038048335f0801e39f6e28ec1d pwauth-2.3.1-r2.ebuild 736
 SHA256 cc0008d11eaa4ee6abd46661c196cc961f5c57d96ca880643aaf15dd0398b3a5 pwauth-2.3.1-r2.ebuild 736
-MISC ChangeLog 1175 RMD160 d7357b617e3a98e7a76a230dce724dc28ad6a60d SHA1 3adbc5576ff2a0f188b43b570e2c773a83282e0b SHA256 8d39902128d824748f0add507e01f8d5c3fff5444a89e3d0c632c4068cef7370
-MD5 3976b1901bcc119cb4710b176898910b ChangeLog 1175
-RMD160 d7357b617e3a98e7a76a230dce724dc28ad6a60d ChangeLog 1175
-SHA256 8d39902128d824748f0add507e01f8d5c3fff5444a89e3d0c632c4068cef7370 ChangeLog 1175
+EBUILD pwauth-2.3.1-r3.ebuild 2003 RMD160 e0e2f9a821b2dc64138c668e82649a110a404900 SHA1 9448b03b4846282142e24f74f1ce13f830372ce0 SHA256 da8eb4ca06633839f4ab07c2ccefffe2f10c9e410ab5f645ee5bfc525d4d493e
+MD5 3d361395c9eea7571e434e6515005585 pwauth-2.3.1-r3.ebuild 2003
+RMD160 e0e2f9a821b2dc64138c668e82649a110a404900 pwauth-2.3.1-r3.ebuild 2003
+SHA256 da8eb4ca06633839f4ab07c2ccefffe2f10c9e410ab5f645ee5bfc525d4d493e pwauth-2.3.1-r3.ebuild 2003
+MISC ChangeLog 1365 RMD160 75537ffdc3ec770d93b927ee98c7af15d0ba59ea SHA1 a30827be10193bbf5ec3e870327fb3e8d895032a SHA256 14ab0d1641ff5f83541a32c983e340efa2bdb263f1593892bde50f80b4309461
+MD5 8c870dd8c980a04dd39633e28bd52cae ChangeLog 1365
+RMD160 75537ffdc3ec770d93b927ee98c7af15d0ba59ea ChangeLog 1365
+SHA256 14ab0d1641ff5f83541a32c983e340efa2bdb263f1593892bde50f80b4309461 ChangeLog 1365
 MISC metadata.xml 226 RMD160 d11ce73e47adf4b3d91309ec6489fded2f4d4e0e SHA1 fe9f7ce6f2281683065abb3255c8b731665c82ac SHA256 376a327f91f69eb96f0c1b05cc1481dd7017a0570f631a03b1f6d14d58215ca8
 MD5 7272d8b6d09e3e301b6a08aa9c912eb0 metadata.xml 226
 RMD160 d11ce73e47adf4b3d91309ec6489fded2f4d4e0e metadata.xml 226
@@ -21,10 +29,13 @@ SHA256 376a327f91f69eb96f0c1b05cc1481dd7017a0570f631a03b1f6d14d58215ca8 metadata
 MD5 e5119e4878c12f2238b8cfb9d8a5a62f files/digest-pwauth-2.3.1-r2 235
 RMD160 dc0337c6870b1ae2c3bd5222a40e9a67f0035c64 files/digest-pwauth-2.3.1-r2 235
 SHA256 1cc2571435bdd377dd9ba32b93e209528a44cdcd09c02b4c7aa22b356b47115a files/digest-pwauth-2.3.1-r2 235
+MD5 e5119e4878c12f2238b8cfb9d8a5a62f files/digest-pwauth-2.3.1-r3 235
+RMD160 dc0337c6870b1ae2c3bd5222a40e9a67f0035c64 files/digest-pwauth-2.3.1-r3 235
+SHA256 1cc2571435bdd377dd9ba32b93e209528a44cdcd09c02b4c7aa22b356b47115a files/digest-pwauth-2.3.1-r3 235
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEhIRYmPFBzbX68WERAjcUAJ4gf3VJKwhaAuOH4cLsys+chwL9mACgmI0T
-e8fqYDtDb1JStVW313khZWw=
-=k2Qd
+iD8DBQFEhUGAmPFBzbX68WERAmGWAJ96c0+wV5GEy1BKWWqROg0EmM/7SACfdvB0
+B5Y8NpL+oedIEJuiB8987ik=
+=L3T5
 -----END PGP SIGNATURE-----
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
+}