ports/161225: security/pam_fprint: Updates to the last git version
Zhihao Yuan
lichray at gmail.com
Sun Nov 13 08:30:13 UTC 2011
The following reply was made to PR ports/161225; it has been noted by GNATS.
From: Zhihao Yuan <lichray at gmail.com>
To: bug-followup at FreeBSD.org
Cc:
Subject: Re: ports/161225: security/pam_fprint: Updates to the last git
version
Date: Sun, 13 Nov 2011 02:27:29 -0600
--1LKvkjL3sHcu1TtY
Content-Type: multipart/mixed; boundary="gKMricLos+KVdGMg"
Content-Disposition: inline
--gKMricLos+KVdGMg
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
Fixes build with clang. Removes a temp file :(
--=20
Zhihao Yuan, nickname lichray
The best way to predict the future is to invent it.
___________________________________________________
4BSD -- http://4bsd.biz/
--gKMricLos+KVdGMg
Content-Type: text/x-diff; charset=iso-8859-1
Content-Disposition: attachment; filename="pam_fprint-20080330-1.patch"
Content-Transfer-Encoding: quoted-printable
diff -ruN --exclude=3DCVS /usr/ports/security/pam_fprint.orig/Makefile /usr=
/ports/security/pam_fprint/Makefile
--- /usr/ports/security/pam_fprint.orig/Makefile 2010-03-28 01:43:27.000000=
000 -0500
+++ /usr/ports/security/pam_fprint/Makefile 2011-11-13 01:59:17.292693602 -=
0600
@@ -6,28 +6,35 @@
#
=20
PORTNAME=3D pam_fprint
-PORTVERSION=3D 0.2
-PORTREVISION=3D 4
+PORTVERSION=3D 20080330
CATEGORIES=3D security
-MASTER_SITES=3D SF/fprint/${PORTNAME}/v${PORTVERSION}
+MASTER_SITES=3D ${MASTER_SITE_DEBIAN}
+MASTER_SITE_SUBDIR=3D pool/main/p/${PORTNAME:C/_/-/}
+DISTNAME=3D ${PORTNAME:C/_/-/}_${PORTVERSION}+git.orig
=20
MAINTAINER=3D ports at FreeBSD.org
COMMENT=3D PAM module offering finger print authentication using libfprint
=20
LIB_DEPENDS=3D fprint:${PORTSDIR}/security/libfprint
=20
+USE_AUTOTOOLS=3D autoconf automake
+AUTOMAKE_ARGS=3D -a
CONFIGURE_ENV+=3D FPRINT_CFLAGS=3D-I${LOCALBASE}/include
GNU_CONFIGURE=3D yes
=20
-USE_BZIP2=3D yes
USE_GNOME=3D pkgconfig
=20
+WRKSRC=3D ${WRKDIR}
+
PLIST_FILES+=3D bin/pam_fprint_enroll \
lib/pam_fprint.so
=20
SUB_FILES=3D pkg-message
PKGMESSAGE=3D ${WRKDIR}/pkg-message
=20
+pre-configure:
+ cd ${WRKDIR} && aclocal
+
post-install:
@${ECHO}
@${ECHO} =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D
diff -ruN --exclude=3DCVS /usr/ports/security/pam_fprint.orig/distinfo /usr=
/ports/security/pam_fprint/distinfo
--- /usr/ports/security/pam_fprint.orig/distinfo 2011-07-03 09:03:22.000000=
000 -0500
+++ /usr/ports/security/pam_fprint/distinfo 2011-11-13 01:59:17.293695418 -=
0600
@@ -1,2 +1,2 @@
-SHA256 (pam_fprint-0.2.tar.bz2) =3D 57cba8a951d4127e5be4c3b2ced0c1c6fac020=
1a08c833f1644f0ea2e3fa8a72
-SIZE (pam_fprint-0.2.tar.bz2) =3D 72781
+SHA256 (pam-fprint_20080330+git.orig.tar.gz) =3D c8204f47f49d0d931bef8226c=
8d3c6b7c72c31e20bbf59039c4e2ec7660805f3
+SIZE (pam-fprint_20080330+git.orig.tar.gz) =3D 16000
diff -ruN --exclude=3DCVS /usr/ports/security/pam_fprint.orig/files/patch-s=
rc_Makefile.am /usr/ports/security/pam_fprint/files/patch-src_Makefile.am
--- /usr/ports/security/pam_fprint.orig/files/patch-src_Makefile.am 1969-12=
-31 18:00:00.000000000 -0600
+++ /usr/ports/security/pam_fprint/files/patch-src_Makefile.am 2011-11-13 0=
1:59:17.297693740 -0600
@@ -0,0 +1,11 @@
+--- src/Makefile.am~ 2009-01-08 15:31:21.000000000 -0600
++++ src/Makefile.am 2011-10-02 01:51:52.845401986 -0500
+@@ -1,7 +1,6 @@
+-noinst_PROGRAMS =3D pamtest
+ bin_PROGRAMS =3D pam_fprint_enroll
+ pammod_PROGRAMS =3D pam_fprint.so
+-pammoddir=3D/lib/security
++pammoddir=3D$(PREFIX)/lib
+=20
+ pam_fprint_so_SOURCES =3D pam_fprint.c
+ pam_fprint_so_CFLAGS =3D -fPIC $(FPRINT_CFLAGS)
diff -ruN --exclude=3DCVS /usr/ports/security/pam_fprint.orig/files/patch-s=
rc_Makefile.in /usr/ports/security/pam_fprint/files/patch-src_Makefile.in
--- /usr/ports/security/pam_fprint.orig/files/patch-src_Makefile.in 2008-04=
-15 16:15:09.000000000 -0500
+++ /usr/ports/security/pam_fprint/files/patch-src_Makefile.in 2011-11-13 0=
1:59:17.298694159 -0600
@@ -1,20 +0,0 @@
---- src/Makefile.in.orig 2007-11-19 20:15:11.000000000 +0100
-+++ src/Makefile.in 2008-04-12 18:44:55.000000000 +0200
-@@ -30,7 +30,7 @@
- NORMAL_UNINSTALL =3D :
- PRE_UNINSTALL =3D :
- POST_UNINSTALL =3D :
--noinst_PROGRAMS =3D pamtest$(EXEEXT)
-+noinst_PROGRAMS =3D
- bin_PROGRAMS =3D pam_fprint_enroll$(EXEEXT)
- pammod_PROGRAMS =3D pam_fprint.so$(EXEEXT)
- subdir =3D src
-@@ -163,7 +163,7 @@
- target_alias =3D @target_alias@
- top_builddir =3D @top_builddir@
- top_srcdir =3D @top_srcdir@
--pammoddir =3D /lib/security
-+pammoddir =3D ${PREFIX}/lib
- pam_fprint_so_SOURCES =3D pam_fprint.c
- pam_fprint_so_CFLAGS =3D -fPIC $(FPRINT_CFLAGS)
- pam_fprint_so_LDFLAGS =3D -shared
diff -ruN --exclude=3DCVS /usr/ports/security/pam_fprint.orig/files/patch-s=
rc_pam__fprint__enroll.c /usr/ports/security/pam_fprint/files/patch-src_pam=
__fprint__enroll.c
--- /usr/ports/security/pam_fprint.orig/files/patch-src_pam__fprint__enroll=
=2Ec 1969-12-31 18:00:00.000000000 -0600
+++ /usr/ports/security/pam_fprint/files/patch-src_pam__fprint__enroll.c 20=
11-11-13 02:16:40.123631106 -0600
@@ -0,0 +1,11 @@
+--- src/pam_fprint_enroll.c~ 2009-01-08 15:31:21.000000000 -0600
++++ src/pam_fprint_enroll.c 2011-11-13 02:15:43.976691333 -0600
+@@ -47,7 +47,7 @@ static struct fp_dscv_dev *discover_devi
+ struct fp_dscv_dev *ddev =3D NULL;
+ int i;
+=20
+- for (i =3D 0; ddev =3D discovered_devs[i]; i++) {
++ for (i =3D 0; (ddev =3D discovered_devs[i]); i++) {
+ struct fp_driver *drv =3D fp_dscv_dev_get_driver(ddev);
+ printf("Found device claimed by %s driver\n",
+ fp_driver_get_full_name(drv));
diff -ruN --exclude=3DCVS /usr/ports/security/pam_fprint.orig/files/patch-s=
rc_pam_fprint.c /usr/ports/security/pam_fprint/files/patch-src_pam_fprint.c
--- /usr/ports/security/pam_fprint.orig/files/patch-src_pam_fprint.c 2008-0=
4-15 16:15:09.000000000 -0500
+++ /usr/ports/security/pam_fprint/files/patch-src_pam_fprint.c 2011-11-13 =
02:14:46.250727191 -0600
@@ -1,6 +1,12 @@
---- src/pam_fprint.c.orig 2008-04-12 18:33:50.000000000 +0200
-+++ src/pam_fprint.c 2008-04-12 18:34:31.000000000 +0200
-@@ -23,7 +23,7 @@
+--- src/pam_fprint.c.orig 2009-01-08 15:31:21.000000000 -0600
++++ src/pam_fprint.c 2011-11-13 02:14:44.221692989 -0600
+@@ -18,15 +18,17 @@
+ */
+=20
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <unistd.h>
+ #include <sys/types.h>
#include <pwd.h>
#include <string.h>
=20
@@ -9,3 +15,51 @@
=20
#define PAM_SM_AUTH
#include <security/pam_modules.h>
++#include <security/pam_appl.h>
+=20
+ static int send_info_msg(pam_handle_t *pamh, char *msg)
+ {
+@@ -41,10 +43,10 @@ static int send_info_msg(pam_handle_t *p
+=20
+ r =3D pam_get_item(pamh, PAM_CONV, (const void **) &pc);
+ if (r !=3D PAM_SUCCESS)
+- return;
++ return r;
+=20
+ if (!pc || !pc->conv)
+- return;
++ return PAM_BUF_ERR;
+=20
+ return pc->conv(1, &msgp, &resp, pc->appdata_ptr);
+ }
+@@ -62,10 +64,10 @@ static int send_err_msg(pam_handle_t *pa
+=20
+ r =3D pam_get_item(pamh, PAM_CONV, (const void **) &pc);
+ if (r !=3D PAM_SUCCESS)
+- return;
++ return r;
+=20
+ if (!pc || !pc->conv)
+- return;
++ return PAM_BUF_ERR;
+=20
+ return pc->conv(1, &msgp, &resp, pc->appdata_ptr);
+ }
+@@ -102,7 +104,7 @@ static struct fp_print_data **find_dev_a
+ struct fp_print_data **gallery;
+=20
+ /* TODO: add device selection */
+- while (print =3D prints[i++]) {
++ while ((print =3D prints[i++])) {
+ if (!ddev) {
+ ddev =3D fp_dscv_dev_for_dscv_print(ddevs, print);
+ driver_id =3D fp_dscv_print_get_driver_id(print);
+@@ -133,7 +135,7 @@ static struct fp_print_data **find_dev_a
+ }
+ =09
+ i =3D 0, j =3D 0;
+- while (print =3D prints[i++]) {
++ while ((print =3D prints[i++])) {
+ driver_id_cur =3D fp_dscv_print_get_driver_id(print);
+ if (driver_id_cur =3D=3D driver_id) {
+ err =3D fp_print_data_from_dscv_print(print, & (gallery[j]));
diff -ruN --exclude=3DCVS /usr/ports/security/pam_fprint.orig/files/pkg-mes=
sage.in /usr/ports/security/pam_fprint/files/pkg-message.in
--- /usr/ports/security/pam_fprint.orig/files/pkg-message.in 2008-07-31 15:=
35:48.000000000 -0500
+++ /usr/ports/security/pam_fprint/files/pkg-message.in 2011-11-13 01:59:17=
=2E298694159 -0600
@@ -1,25 +1,3 @@
-In order to enroll new finger prints, you must have r/w access to the
-usb device node(s) of your finger print reader (i.e., /dev/{ugen, usb*})
-(tested with UPEK finger print reader as found in Lenovo T61).
-
-It is recommended to use devfs.rules(5) and a dedicated group to manage
-access to your finger print reader.
-
-You can use `usbdevs -v' to see if your sensor is accessible.
-
-Example configuration:
-- /etc/rc.conf:
-devfs_system_ruleset=3D"localrules"
-
-- /etc/devfs.rules:
-[localrules=3D10]
-add path 'ugen0*' mode 0660 group operator
-add path 'usb0*' mode 0660 group operator
-
-# /etc/rc.d/devfs restart
-
-Read `pam_fprint_enroll --help' to learn about enrolling fingers.
-
The security/fprint_demo port contains the graphical `fprint_demo'
application that allows you to manage your finger prints in a comfortable
way.
--gKMricLos+KVdGMg--
--1LKvkjL3sHcu1TtY
Content-Type: application/pgp-signature
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (FreeBSD)
iQEcBAEBAgAGBQJOv39xAAoJEDM1qsGtFE5ZZUQH/382n9fNMyyCCjiOPadhjSuL
AuxJLglTug5YpumsBYscCgaDOZ2NvQMC4CKrOVNrErN5aS6xeEcWtX3ThFvoPlnB
tKDCpjpPGICylikNPyQSA/lanqQh3ulv+hn5UI+MM0cp280l8RnesT5uoAqp9WvU
waFpOYPGs3cJb0btY3V/5V4q5seNdkKQynkLAzvWkwY+679HOQ346iCrvJa5kQL6
tqpVqqQ/dzSM3dv1+J72r28LPCFkOnEm8/J9grJPuiK4aSZ0ufalOYuf5FshIBFn
hAv3Xk3Vw8rq1KVdDOuwKB5DuM3nOEoJQpkTzEEKylPLIDnk+FcjW//KGQTaVNY=
=0NrR
-----END PGP SIGNATURE-----
--1LKvkjL3sHcu1TtY--
More information about the freebsd-ports-bugs
mailing list