Apply fix by kouyu for missing return value #236654.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26.2 x86_64

4 files changed, 113 insertions, 6 deletions

diff --git a/sys-auth/bioapi/ChangeLog b/sys-auth/bioapi/ChangeLog
index 1d4ff03a9efd..16708e168e93 100644
--- a/sys-auth/bioapi/ChangeLog
+++ b/sys-auth/bioapi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-auth/bioapi
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/bioapi/ChangeLog,v 1.7 2008/02/27 10:24:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/bioapi/ChangeLog,v 1.8 2008/09/06 05:29:07 vapier Exp $
+
+*bioapi-1.2.3-r1 (06 Sep 2008)
+
+  06 Sep 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/bioapi-1.2.3-enroll-ret.patch, +bioapi-1.2.3-r1.ebuild:
+  Apply fix by kouyu for missing return value #236654.
 
   27 Feb 2008; Mike Frysinger <vapier@gentoo.org> bioapi-1.2.3.ebuild:
   Add missing eutils inherit for enewgroup as pointed out by Shufeng Zheng.
diff --git a/sys-auth/bioapi/Manifest b/sys-auth/bioapi/Manifest
index eb0509569bbb..efdeea87e66a 100644
--- a/sys-auth/bioapi/Manifest
+++ b/sys-auth/bioapi/Manifest
@@ -1,14 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX bioapi-1.2.3-enroll-ret.patch 278 RMD160 d07ae277ec29877f43f2cec7cddc14ecc8b1e159 SHA1 a8c408afc7ea6d8b3cd9faa1710a49ced84b9f19 SHA256 b98227cef30d4573728985758b9cd548b5fb1ac66cdb07b5c415ec7aadee7460
 DIST bioapi_1.2.3.tar.gz 1634237 RMD160 5a5e93e7ffd7136527e713185d10857f8eda5e5c SHA1 6873e090c2ace1e3835837895b9cf172b9ef50ff SHA256 c780c0d2e0c676be50de8ff537653580dd5b27fe1478846d22a017e52c6b6c2e
+EBUILD bioapi-1.2.3-r1.ebuild 2160 RMD160 cd54bc8981fc0a8fd14f811cc0aaf1e0dc1d4f9e SHA1 7bcb3692bfadb9915309049ba1313e4785f16402 SHA256 17a0aa747acf3e17aead7e712474e99481b95d7ce2cad2b8222577ff9294f8ee
 EBUILD bioapi-1.2.3.ebuild 2063 RMD160 22aba173f98b4ae07f212e2db7c6d0f90bf26483 SHA1 339cb4e6736b4fe7bb67cbfd472e30b5fb12469b SHA256 444278b3c9d8d79c7f4e95ea92319378864dcd3f731d9da7640ab72df32db206
-MISC ChangeLog 1264 RMD160 dc9cc3be54aff4b41e63625066c0fa7393de8b03 SHA1 0da7690228968be7cf58e2ee66ed8af98201d8fd SHA256 26c942149ca9408469daed48faf8a68f699510ebcd67e0f2467bfdf7fa4b3764
+MISC ChangeLog 1467 RMD160 a06672025d6b14f3cf2b2948d6863fce7f940957 SHA1 292f0c9604f0a1d7fb796554b57e0b66ed66b839 SHA256 39a412f5bd8dca990cea416c089a8c96a4b47efc2fc931777701bece6e73848d
 MISC metadata.xml 252 RMD160 34a164bfc96b8845a8308e85a214d633284b763b SHA1 c3aabeacb7af064df74acfddbfda2ae0497ff8a5 SHA256 445ab0e7fb8f15ad8dea05dabee14ecc25c6b81bfb9a6213ff3d9ea81f759154
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFHxTxbj9hvisErhMIRArusAJ911+hq7c8auHf2v9YOb/qH0Dhd9ACeIPoG
-bZS7hFL4i2ZTWF64YzT+c4E=
-=4dF8
+iEYEARECAAYFAkjCFSgACgkQ67wieSYcaxeN/wCgy8lNejT3HaslrBQ5NF4bM87d
+ZFAAoNmmwhkAjnWSjWwM8NEKLnePJzDS
+=qnFK
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/bioapi/bioapi-1.2.3-r1.ebuild b/sys-auth/bioapi/bioapi-1.2.3-r1.ebuild
new file mode 100644
index 000000000000..a2edc1d4d5ec
--- /dev/null
+++ b/sys-auth/bioapi/bioapi-1.2.3-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/bioapi/bioapi-1.2.3-r1.ebuild,v 1.1 2008/09/06 05:29:07 vapier Exp $
+
+inherit eutils multilib
+
+DESCRIPTION="Framework for biometric-based authentication"
+HOMEPAGE="http://code.google.com/p/bioapi-linux/"
+SRC_URI="http://bioapi-linux.googlecode.com/files/${PN}_${PV}.tar.gz"
+
+LICENSE="bioapi"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="qt3"
+
+DEPEND="qt3? ( =x11-libs/qt-3* )"
+
+S=${WORKDIR}/bioapi-linux
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-enroll-ret.patch #236654
+}
+
+src_compile() {
+	econf $(use_with qt3 Qt-dir /usr/qt/3) || die "./configure failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake SKIPCONFIG=true DESTDIR="${D}" install || die "install failed"
+	dodoc README
+	dohtml *.htm
+
+	# rename generic binaries
+	mv "${D}"/usr/bin/{,BioAPI}Sample || die
+	if use qt3 ; then
+		mv "${D}"/usr/bin/{,BioAPI}QSample || die
+	fi
+}
+
+pkg_config() {
+	mds_install -s /usr/$(get_libdir)
+	mod_install -fi /usr/$(get_libdir)/libbioapi100.so
+	mod_install -fi /usr/$(get_libdir)/libbioapi_dummy100.so
+	mod_install -fi /usr/$(get_libdir)/libpwbsp.so
+	use qt3 && mod_install -fi /usr/$(get_libdir)/libqtpwbsp.so
+}
+
+pkg_preinst() {
+	if [[ -e ${ROOT}/var/bioapi ]] && [[ ! -e ${ROOT}/var/lib/bioapi ]] ; then
+		einfo "Moving /var/bioapi to /var/lib/bioapi"
+		dodir /var/lib
+		mv "${ROOT}"/var/bioapi "${ROOT}"/var/lib/bioapi
+	fi
+}
+
+pkg_postinst() {
+	einfo "Some generic-named programs have been renamed:"
+	einfo "  Sample -> BioAPISample"
+	einfo "  QSample -> BioAPIQSample"
+
+	if [[ ${ROOT} == "/" ]] ; then
+		pkg_config
+	else
+		ewarn "You will need to run 'emerge --config bioapi' before"
+		ewarn " you can use bioapi properly."
+	fi
+
+	# XXX: this can't be correct ...
+	enewgroup bioapi
+	chgrp bioapi "${ROOT}"/var/lib/bioapi -R
+	chmod g+w,o= "${ROOT}"/var/lib/bioapi -R
+	einfo "Note: users using bioapi must be in group bioapi."
+}
+
+pkg_prerm() {
+	mod_install -fu libbioapi100.so
+	mod_install -fu libbioapi_dummy100.so
+	mod_install -fu libpwbsp.so
+	use qt3 && mod_install -fu libqtpwbsp.so
+}
diff --git a/sys-auth/bioapi/files/bioapi-1.2.3-enroll-ret.patch b/sys-auth/bioapi/files/bioapi-1.2.3-enroll-ret.patch
new file mode 100644
index 000000000000..e077c135d63f
--- /dev/null
+++ b/sys-auth/bioapi/files/bioapi-1.2.3-enroll-ret.patch
@@ -0,0 +1,16 @@
+http://bugs.gentoo.org/236654
+
+make sure we return 0 when things work
+
+patch by kouyu
+
+--- bioapi-linux/apps/NonGUI_Sample/main.c
++++ bioapi-linux/apps/NonGUI_Sample/main.c
+@@ -234,6 +234,7 @@
+     }
+     
+     OutputToFile(userName, EnrolledTemplate);
++    return 0;
+   }
+ }
+