Version bump, HOMEPAGE and SRC_URI change, wrt bug #349411

(Portage version: 2.2.0_alpha144/cvs/Linux x86_64, unsigned Manifest commit)

5 files changed, 173 insertions, 2 deletions

diff --git a/www-apache/pwauth/ChangeLog b/www-apache/pwauth/ChangeLog
index 48c50a38d177..51e52f208288 100644
--- a/www-apache/pwauth/ChangeLog
+++ b/www-apache/pwauth/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apache/pwauth
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/pwauth/ChangeLog,v 1.7 2012/11/27 19:39:32 pacho Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/pwauth/ChangeLog,v 1.8 2013/01/01 16:26:42 pinkbyte Exp $
+
+*pwauth-2.3.10 (01 Jan 2013)
+
+  01 Jan 2013; Sergey Popov <pinkbyte@gentoo.org> +pwauth-2.3.10.ebuild,
+  +files/pwauth-2.3.10-config.patch, +files/pwauth-2.3.10-makefile.patch,
+  +files/pwauth-strchr.patch:
+  Version bump, HOMEPAGE and SRC_URI change, wrt bug #349411
 
   27 Nov 2012; Pacho Ramos <pacho@gentoo.org> -pwauth-2.3.2.ebuild,
   metadata.xml:
diff --git a/www-apache/pwauth/files/pwauth-2.3.10-config.patch b/www-apache/pwauth/files/pwauth-2.3.10-config.patch
new file mode 100644
index 000000000000..03ae3b876d99
--- /dev/null
+++ b/www-apache/pwauth/files/pwauth-2.3.10-config.patch
@@ -0,0 +1,38 @@
+--- config.h.orig	2013-01-01 19:33:54.053978814 +0400
++++ config.h	2013-01-01 19:35:09.764049695 +0400
+@@ -112,7 +112,7 @@
+ 
+ /* #define SHADOW_NONE		/**/
+ /* #define SHADOW_BSD		/* FreeBSD, NetBSD, OpenBSD, BSDI, OS X */
+-#define SHADOW_SUN		/* Linux, Solaris, IRIX */
++/* #define SHADOW_SUN		/* Linux, Solaris, IRIX */
+ /* #define SHADOW_JFH		/**/
+ /* #define SHADOW_MDW		/**/
+ /* #define SHADOW_AIX		/* AIX */
+@@ -245,7 +245,7 @@
+  * to change the uid list.
+  */
+ 
+-#define SERVER_UIDS 30		/* user "wwwrun" on the author's system */
++/* #define SERVER_UIDS 81		/* user "nobody" */
+ 
+ 
+ /* If MIN_UNIX_UID is defined to an integer, logins with uid numbers less than
+@@ -257,7 +257,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
+@@ -285,7 +285,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.lock"
+ 
+ 
+ /* If ENV_METHOD is defined, pwauth expects mod_auth_external to be configured
diff --git a/www-apache/pwauth/files/pwauth-2.3.10-makefile.patch b/www-apache/pwauth/files/pwauth-2.3.10-makefile.patch
new file mode 100644
index 000000000000..a211a06b7231
--- /dev/null
+++ b/www-apache/pwauth/files/pwauth-2.3.10-makefile.patch
@@ -0,0 +1,42 @@
+--- Makefile.orig	2013-01-01 20:19:30.061522843 +0400
++++ Makefile	2013-01-01 20:20:00.356551208 +0400
+@@ -2,19 +2,7 @@
+ # 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 or OS X
+-# LIB=-lpam
++#   LIBS=  libraries to link in.  -lcrypt, -lshadow, -lpam sometimes needed.
+ 
+ # -------------------- No User Servicable Parts Below -----------------------
+ 
+@@ -25,16 +13,14 @@
+ 
+ .PHONY: clean distclean
+ 
+-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) $(LIBS)
+ 
+ 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) $(LIBS)
+ 
+ main.o: main.c config.h pwauth.h fail_log.h
+ auth_aix.o: auth_aix.c config.h pwauth.h
diff --git a/www-apache/pwauth/files/pwauth-strchr.patch b/www-apache/pwauth/files/pwauth-strchr.patch
new file mode 100644
index 000000000000..0c5d6581c96b
--- /dev/null
+++ b/www-apache/pwauth/files/pwauth-strchr.patch
@@ -0,0 +1,11 @@
+--- main.c.orig	2013-01-01 19:45:32.389626661 +0400
++++ main.c	2013-01-01 19:45:50.524643637 +0400
+@@ -48,7 +48,7 @@
+     char *login, *passwd;
+ #else
+     char login[BFSZ+1], passwd[BFSZ+1];
+-    char *c, *strchr();
++    char *c;
+ #endif
+     int uid,i;
+     int status;
diff --git a/www-apache/pwauth/pwauth-2.3.10.ebuild b/www-apache/pwauth/pwauth-2.3.10.ebuild
new file mode 100644
index 000000000000..efd43b086524
--- /dev/null
+++ b/www-apache/pwauth/pwauth-2.3.10.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/pwauth/pwauth-2.3.10.ebuild,v 1.1 2013/01/01 16:26:41 pinkbyte Exp $
+
+EAPI=5
+
+inherit base flag-o-matic pam toolchain-funcs
+
+DESCRIPTION="A Unix Web Authenticator"
+HOMEPAGE="http://code.google.com/p/pwauth/"
+SRC_URI="http://pwauth.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="faillog pam ignore-case domain-aware"
+
+DEPEND="pam? ( virtual/pam )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-config.patch"
+	"${FILESDIR}/${P}-makefile.patch"
+	"${FILESDIR}/${PN}-strchr.patch"
+)
+
+pkg_setup() {
+	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}"
+
+	append-cflags "-DSERVER_UIDS=${PWAUTH_SERVERUIDS}"
+	append-cflags "-DMIN_UNIX_UID=${PWAUTH_MINUID}"
+
+	if use faillog; then
+		append-cflags -DFAILLOG_PWAUTH
+		append-cflags "-DPATH_FAILLOG=\"\\\"${PWAUTH_FAILLOG}\\\"\""
+	fi
+
+	if use pam; then
+		append-cflags -DPAM
+		append-libs pam
+	else
+		append-cflags -DSHADOW_SUN
+		append-libs crypt
+	fi
+
+	use ignore-case && append-cflags -DIGNORE_CASE
+	use domain-aware && append-cflags -DOMAIN_AWARE
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dosbin pwauth unixgroup
+	fperms 4755 /usr/sbin/pwauth
+
+	use pam && newpamd "${FILESDIR}"/pwauth.pam-include pwauth
+
+	dodoc CHANGES FORM_AUTH INSTALL README
+}