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

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64

6 files changed, 180 insertions, 14 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/Manifest b/www-apache/pwauth/Manifest
index 3c3d8707d614..2bde4c169b32 100644
--- a/www-apache/pwauth/Manifest
+++ b/www-apache/pwauth/Manifest
@@ -1,16 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
+AUX pwauth-2.3.10-config.patch 1138 SHA256 074c4e6626b695c407862c206c64ae2b008724e0e89a7d5a0e2d6abbde4c2bce SHA512 54fc2be85259c4759017a1d9bb625e2327488f6c21876daf28ef039466d3dd3fd0322cd7fa939201f74bcf9a1e1399b234ad1e92dd9b32d10cf80e299c7df69e WHIRLPOOL e2768119b8de6c3db0496a0032bc67b09f562d97caeaedd92e249d6e452da1ec24d1f3196ce16248062818dfddcbb4d7d5ae20c64afc94307ba83dae3b28aefb
+AUX pwauth-2.3.10-makefile.patch 1468 SHA256 187f578a51d9a5bad5fd33540b95709319bddd8971dc90bad567c20013ac6d4f SHA512 59af2f921f443f8bbb872cb38d2d073cc80509295a9d643859b1fb1e71bffb9795688461f15bb77ab87f7f113df56638eb0ae4bf2b59ab860fc11aef4dc2a08c WHIRLPOOL d327f5aeb146dbaef0e1f3cef3595954a40444283fcf56f3df25db88785a33d376d2c6a8d3e511050db3d5656c4fb3322eab358a6ff260eb988130925ce3df2e
 AUX pwauth-gentoo.patch 2658 SHA256 9a0f24988ea1453af2f5fa961ed810b0ecab88ebb166fa0993f38081ec4b1b1a SHA512 35a7cce063aad9a0f29c150bbaf12227f8f80474b5eb47a46633cfd75db1711b8c32530d6cff8e1950f36604f5da2701f2fcc03567b67ccd5f3547237005edef WHIRLPOOL 3295d314f1a8d70a7e870a5f8e726a5b14e4ef038a2a7a3349b7a0fdf14a7e72c39d99f4d8a6d6b437cc39a9735b527f0a260a92626ee7d58df3960ba797c109
+AUX pwauth-strchr.patch 272 SHA256 40ea7e48ad9d2f1c01fb81e4fc7670afdc14fbda4d82498f8bbaefd8ccc971a4 SHA512 2717de2fd77bea0f2fbba2462b6a252cdb4acfd1e6a61cd3208cda4d283ed719b2f7f0c31090d5e0cde06aa8b6005e0fd78a660554827f0c65bfa8cd3af1e8f8 WHIRLPOOL 364cd5a18343f5bf5098708a0c920d6e3b9bf6adf8e5768f0fab2517c332dbb7ba6fcea6b3b5e7efbb594c1d2d45a269afab134476407c84acd9c57f124311c0
 AUX pwauth.pam-include 174 SHA256 351e55f39d90a4b25369b99fe0444fc6e9eb607fabedf70c8c43cd6192f75067 SHA512 0169ddc1945230570491c5a3e6d21ba521d2b44dde35ff84d5c4def07b7f09c51ddb99c03f401a02a4f913036e1cd8babdfbc38cd5eaa27cccd5c3618cbe17cd WHIRLPOOL 896ed3f78a0adf2dd3e7d67701ae2afed8d61bc100ad80490474b2a39345d2772ac653ce7cba280f6cbe5a1747aa004d073c65917e67b101ae66be5ad194c21a
-DIST pwauth-2.3.5.tar.gz 21234 SHA256 a51870c74e4717c4bc0f233524f8cc19332a900b08c40f54944467a0a8e64928
+DIST pwauth-2.3.10.tar.gz 23825 SHA256 267813acccc58d407b735ebfd32ee7ec52726379d0aa3670731d2ea4c9d85906 SHA512 a2f02f2c8b61d87cc0c034952e17f187bbc358506052a31107ccd38a938d59862f0ee18362c84984c900d2986bb35abbbd5877d4cf973a0215a6ec3656a23bff WHIRLPOOL 694fa855c2129c13fa18869bb58eef4a0ca6261e7aa84bf454a567270ae129929aada49474a372b082b9ee1d30c0af83cc44e2351be49eb70b123d5f977f6c8f
+DIST pwauth-2.3.5.tar.gz 21234 SHA256 a51870c74e4717c4bc0f233524f8cc19332a900b08c40f54944467a0a8e64928 SHA512 0031479c0f9e7b4eb5d1d41d2efb485e7b4c14c113e2317ddaa802d419a2dcb142ade84ecdc7d38b21e51ce04a5cd857b45b9730742d6aab485018def93b7900 WHIRLPOOL 4733487fe1df390cdb8698d28856c591fed7fc74b88a428e4296f2d428c7056c36373ee98addbec56c6453c37b3ee493ad3818205cad86788fde502e8753828f
+EBUILD pwauth-2.3.10.ebuild 2010 SHA256 6d51743ba325baa43439e582b89e68e99f0fed910184a1f4cf2e27fd39b08e3e SHA512 b8ae848b1d456c9d455422dcbd3472be850c2877a5c4fed4f21bc7a11f1357d54c9c71d953990d9bd743d8393edf2bbd3274cdeca82e81c28ac934c55fb4386f WHIRLPOOL ddb80969da08089b83ef45519eeec6a26d98638224764f6839b4fb342dc07bf9a2dbb94a0b191b4a941c9992b717de755c278759b8ba2244a58e27e5f33cb42c
 EBUILD pwauth-2.3.5.ebuild 1957 SHA256 647aec28fba1fc80b92700209e48f092192d1ca587ffac888b179c1303def2d0 SHA512 b66e07b3578b304ce2513a2b0fedaa054ce0f27ec82f2d85834f5bfcd0aeff38b3828a7f142b35cb7c24a47896b515de946c3d2442cc4d2b5afe21913b9eb7d7 WHIRLPOOL 86828d014a4c306cb5e0a5a5c4cf5c4f9b601369b1c7f8690e73b013319ef242b6b7c51b4f376f81c1f8648ec7b71002ca7bac5404288437075b8526d00f1ef6
-MISC ChangeLog 2385 SHA256 ade12e31f19821148e2b663d145bcc1d7d6614e03890db689e03873cb6da325d SHA512 1c3f556f80f982e2f795bc545dfee5f329b5ac1165e49b6b8038d6316da61262728dbcdedaaa7d1cd779caa0948b9e993031011e0e5d23ef282ee1cedb503c4b WHIRLPOOL af5f90640b6257507816a336b2951f5b4cde0902895785356e96222d93d90b2df1f81b0c0c88cecfbdcd02b468e31c76550dfbb21ef119c51afc8afc2d259499
+MISC ChangeLog 2657 SHA256 f6c5d314260fa2ef8792498e8db0bc60f55346472fbd96140bfa11dab70164e9 SHA512 4f72ed67525b47e2dceb16d26f88d19595bf452dc45cef96af4ac2953915b6de929f887745e1184bb1e46e1b122ea6f4ed1ff20a3f29eaeb5647eb11fe2b1c9e WHIRLPOOL 1077dfcb77cc3d503f95b75a394eba8083ef91989d9b66995569f981449d2ab856811b6094975e79bd5f2bf1691d153628ce4f12ceacf150f94220bcf4e245ef
 MISC metadata.xml 466 SHA256 31e16b51804f68b515cc674ecba42274689fc51eb04eb9f9f3983ceaedb4b685 SHA512 b9e4fc8a81a64d7ceb9f70d57f64643086a37c1bafdfe1f2d8ec017f8984acd913aa035888110200d22cf82278743b299f6d6a25c77f6087cbebacf1bf10bb61 WHIRLPOOL 60c8e138aaec08de3fe21a5f98cc0a3653848c7369e741415ae441ca9505b3a2826e1203845d039dc03a805ba11738830add7e1815ffdd4b7399109d3901f6d8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlC1FvUACgkQCaWpQKGI+9T1mwCfeZuuXIFVeW0wBInb2WGr00/D
-sCEAn2f7U1sGcnZX2a4H505cOC6Y0ovi
-=youi
------END PGP SIGNATURE-----
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
+}