Fix by Leho Kraav for username locale matching issues #412941.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

5 files changed, 112 insertions, 7 deletions

diff --git a/sys-auth/pam_blue/ChangeLog b/sys-auth/pam_blue/ChangeLog
index d7c572ae2581..b744a04ff62b 100644
--- a/sys-auth/pam_blue/ChangeLog
+++ b/sys-auth/pam_blue/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-auth/pam_blue
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_blue/ChangeLog,v 1.7 2010/06/11 11:06:48 ssuominen Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_blue/ChangeLog,v 1.8 2015/07/08 06:45:46 vapier Exp $
+
+*pam_blue-0.9.0-r1 (08 Jul 2015)
+
+  08 Jul 2015; Mike Frysinger <vapier@gentoo.org>
+  +files/pam_blue-0.9.0-bad-log.patch, +files/pam_blue-0.9.0-char-locales.patch,
+  +pam_blue-0.9.0-r1.ebuild:
+  Fix by Leho Kraav for username locale matching issues #412941.
 
   11 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> pam_blue-0.9.0.ebuild:
   Drop bluez-libs support wrt #301630.
@@ -35,4 +42,3 @@
   25 May 2007; Jakub Moc <jakub@gentoo.org> +pam_blue-0.9.0.ebuild,
   +metadata.xml:
   New ebuild for KingTaco. Bug 180325.
-
diff --git a/sys-auth/pam_blue/Manifest b/sys-auth/pam_blue/Manifest
index 91dd7c2179ee..1d405e7e3ce8 100644
--- a/sys-auth/pam_blue/Manifest
+++ b/sys-auth/pam_blue/Manifest
@@ -1,4 +1,27 @@
-DIST pam_blue-0.9.0.tar.bz2 251688 RMD160 8bb1085ee9e9402598227641e5a4338b4790a050 SHA1 e06b27b306b4a4b0c4ef02e208d4bf3349c79f85 SHA256 4ff0f6528d29ae77cf890defcbaf16ee2065dc85fe8edd2e6e53d48e7f27b535
-EBUILD pam_blue-0.9.0.ebuild 1203 RMD160 467981101e25cd1f8f17f11e09afb38b7dfa0c5d SHA1 4da4b96e94e8a5611f94e1ce1029b940b1a719a4 SHA256 94f9f402187bb4c13ea600e56b3eba10b38ffece389c87fdfe8b9fef067bc659
-MISC ChangeLog 1365 RMD160 37a3c0b966718c1a2c4e7bb6d44ca283d7fafb02 SHA1 c6d62839643898c87c4afe1c2cc286790f080c23 SHA256 c95d92cecb8f972808e88040c20c0873d66592f1e686ee35aa9486950c8ea16f
-MISC metadata.xml 631 RMD160 564507298536417b6ee21be39b3b9306d86d29e0 SHA1 ce1eaad4bcec220235d54257b755de257c9c2a28 SHA256 272c046115a76154f1b8487414827cacdc8c65715c61c2664a3a802d5c510ad1
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX pam_blue-0.9.0-bad-log.patch 357 SHA256 88f659d5baf34419c8da68c6636543fa3caed6e7132848c1be678654bcba9be5 SHA512 cba81accf65e980f47433b6df808b9cdfcd881c222ab599d0d8aec1b487089b38eba6ebaf89272ba5b821b0367e61e8073973e7098f53d81fd6eabccaab87daf WHIRLPOOL 2dad7321a710f12df7996a2b59acf39f22b02a645d360983ddeaf8b1ff6d9da6d4a85f73470fcdb87ea9648002b4ad1d60a0fbd4c52f1e4bf4710949f09f21ac
+AUX pam_blue-0.9.0-char-locales.patch 666 SHA256 96ea53534714939e7c83ad6911f9ba2d952978343240a2f5ab56b47a09394e53 SHA512 2a7bcc2f3d6b260a9b4803b0657114a194af90828bd5926ee1887f04304e30d2bfb46c000f190ab1de88f4646620e2c15ab8cf60fa35fb38a1d12f46cf138fe2 WHIRLPOOL be2444ac6b691462813ae3937ad97bf6eca88da51d7dba80dc80cb9df5738a67d3df604ec471c6c1e23212eac87e83bda5f1142fa1acc54efdf750d13a00ce1f
+DIST pam_blue-0.9.0.tar.bz2 251688 SHA256 4ff0f6528d29ae77cf890defcbaf16ee2065dc85fe8edd2e6e53d48e7f27b535 SHA512 f611b6e3b509d2b917dd15a82f6fa3219ce554cdbf3bd224981c740bb3161dea67db9275b9bc13cd54644e0cb546eb2bb32dbff7e510170a0911b40d81f2d620 WHIRLPOOL 51a9d6f920b3420187c29a009020d4a9aa3f2598a8ce07bd440e871ab4e493e09bce3cb4cf2d6cef63e734be20f29b1ee2ea2aa0ed6f14add7aa9704f23a8eec
+EBUILD pam_blue-0.9.0-r1.ebuild 1287 SHA256 b45ff32d77b3c9d95b96a8f3e684505c55f633bfab21605ef3a2900f5a93a266 SHA512 1e624e088c943416282e63804b4f373a8b7f7332a3e9195f927187dc6b5bf39d0d0a14bb4508c6704ec4cbb926d2a22ed3d7e4c0c3da455eafb0d7cddbf5458d WHIRLPOOL 0ef64c0c552c905d78b12ecdbbe4f9a20ea218481c9fa2f311e54633d581d10a89409680ff2043a179426f44e2c7b41155b3d63a2cb74ad2f1384f2670a3348b
+EBUILD pam_blue-0.9.0.ebuild 1203 SHA256 94f9f402187bb4c13ea600e56b3eba10b38ffece389c87fdfe8b9fef067bc659 SHA512 78e1c4c7a3d82985545030245d2594bfda6ce589fd0184ce28df7e6cb34299713589f2f2ac3420c70a53ab59a1d43c76a922a3d99b62468cbdb072634917fcf5 WHIRLPOOL 0f49042888aa5d28fee1ef1cedb44763612a03860f30e959db40061bf210bd80461aaf68cbccb182b2bee32be890c3cc8c306a618759da32c42c398943125205
+MISC ChangeLog 1621 SHA256 28aff5374546d39d80246dd8bbc6bb1f067d7f17cdf2651c4aef484f7f100031 SHA512 998387d17642a413af6943edb7808ff6bcac188de1edcb800f5726ca38d4bd1f567d55ec32e5c466b8afc0c829b46b69710f77e8d5f644d43d87c0a45e178360 WHIRLPOOL 4fc481629aaac926d28be944daa87984cdb35c45c9ae320896e30c103efaa817cb83e305bd44156f8e3fc188065bdfd534e2e3dba3f23ac9426039301fba895e
+MISC metadata.xml 631 SHA256 272c046115a76154f1b8487414827cacdc8c65715c61c2664a3a802d5c510ad1 SHA512 5825f015d366605c713e4329c4d8a193b46fdfad1c58b5df0b5059757b381bdc52e7b79f124d941cccbf902b59054d8a7878b90e10237114a67aa449d6100bbf WHIRLPOOL 37b2a1a471d5855fabe400a84195154ab0aabab1d5bb223d4657ab902dbd44e493a6b48f6123d07284edc3788cc10b0f678bc2a8465d07d5ba4b560cb3811d4d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJVnMcbAAoJEPGu1DbS6WIAMT0P/RuX5x13eJ+mLPukYiG4Yw+n
+59GMH+u6FOA+a7EDOL5K9edXRVxOHdGizLW3AonT1B1fpxnA+paK6EIFeZAc0uCq
+Ib4rs/XmZCywqlgi+Nu11SzlL80zSiCd9wDhYHDRo9you9e9/vu1U6fUxB6mbOwu
+bEQjB751Y7nAKLZFH0+w0wogVpOeSvmuZm26EYdObrYEEuckQxPPE7vCarGFXHjJ
+7XwTm1apxdYSWyNmwklj5ro3X4O5TX1hIj4V+DWst9RE+zseFjgvO+ng4ux9Gj28
+sjzjRUbvJpCVhyI4y5tmVU5lLz6IpmuiudMC+CXMUhglfGgr4cDHlD8V5sVME9ZJ
+Shum+g5DcCZuzF1RV7BF9VKwrehKYHjrz/P2EV6FqNRvAJ7SIXWVlojIHSuPdvK/
+YTkfQcg99j4KtEKT3VduNw35r4zM3GWFunVSLyGWFv/TeOI+G9AVooF8vsomN09i
+e4ey50lf/2ZkqOM29tU2523M0LN/OyXETnYetv/wdZlNhJi63iTkg1VXI0YbV6ex
+p8Tj9YZKK3/UQAzoNMQKbc2sKx31IGTIz6hvrK6m5MRnCKDsPi1L3kK4+8gXUI44
+atpi1o/Eaql4IJRM1/W51WJfJGzEy0askTLULYwyiS9ifSfkQhZpVs6Q8M1V/Clj
+L20VIaT2T20MD2J6UTVo
+=azLh
+-----END PGP SIGNATURE-----
diff --git a/sys-auth/pam_blue/files/pam_blue-0.9.0-bad-log.patch b/sys-auth/pam_blue/files/pam_blue-0.9.0-bad-log.patch
new file mode 100644
index 000000000000..5f2a2628e4b0
--- /dev/null
+++ b/sys-auth/pam_blue/files/pam_blue-0.9.0-bad-log.patch
@@ -0,0 +1,11 @@
+--- a/src/bluepmain.c
++++ b/src/bluepmain.c
+@@ -88,7 +88,7 @@
+ 
+   if ( (lst = parse_rc()) == NULL) { /* something goes wrong (no config file, ...) */
+     user = NULL;
+-    syslog (LOG_ERR, "Can't parse configuration file [%s]!" CONFIG_FILE);
++    syslog (LOG_ERR, "Can't parse configuration file [%s]!", CONFIG_FILE);
+     return PAM_AUTH_ERR;
+   }
+     
diff --git a/sys-auth/pam_blue/files/pam_blue-0.9.0-char-locales.patch b/sys-auth/pam_blue/files/pam_blue-0.9.0-char-locales.patch
new file mode 100644
index 000000000000..40d2810f486c
--- /dev/null
+++ b/sys-auth/pam_blue/files/pam_blue-0.9.0-char-locales.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/412941
+
+fix matching in various locales
+
+patch by Leho Kraav <leho@kraav.com>
+
+--- a/src/lexer.l
++++ b/src/lexer.l
+@@ -28,7 +28,7 @@
+ bluemac                   { return BLUEMAC; }
+ @                         { return AT;}
+ ;                         { return SEMICOLON; }
+-[a-zA-Z][a-zA-Z0-9_]*     { yylval.word  = (char *) strdup(yytext); return WORD; }
++[[:alpha:]][[:alnum:]_-]* { yylval.word  = (char *) strdup(yytext); return WORD; }
+ {HXDIGD}{HXDIGD}{HXDIG}   { yylval.word  = (char *) strdup(yytext); return MAC; }
+ [0-9][0-9]*               { yylval.value = atoi(yytext);   return DIGIT; }
+ =                         { return EQUAL; }
diff --git a/sys-auth/pam_blue/pam_blue-0.9.0-r1.ebuild b/sys-auth/pam_blue/pam_blue-0.9.0-r1.ebuild
new file mode 100644
index 000000000000..cb72ada6bf30
--- /dev/null
+++ b/sys-auth/pam_blue/pam_blue-0.9.0-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_blue/pam_blue-0.9.0-r1.ebuild,v 1.1 2015/07/08 06:45:46 vapier Exp $
+
+EAPI="5"
+
+inherit pam autotools multilib
+
+DESCRIPTION="Linux PAM module providing ability to authenticate via a bluetooth compatible device"
+HOMEPAGE="http://pam.0xdef.net/"
+SRC_URI="http://pam.0xdef.net/source/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="virtual/pam
+	net-wireless/bluez"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-char-locales.patch #412941
+	epatch "${FILESDIR}"/${P}-bad-log.patch
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_configure() {
+	econf --libdir="$(getpam_mod_dir)"
+}
+
+src_install() {
+	# manual install to avoid sandbox violation and installing useless .la file
+	dopammod src/.libs/pam_blue.so
+	newpamsecurity . data/sample.conf bluesscan.conf.sample
+
+	dodoc AUTHORS NEWS README ChangeLog
+	doman doc/${PN}.7
+}
+
+pkg_postinst() {
+	elog "For configuration info, see /etc/security/bluesscan.conf.sample"
+	elog "http://pam.0xdef.net/doc.html and http://pam.0xdef.net/faq.html"
+	elog "Edit the file as required and copy/rename to bluesscan.conf when done."
+}