Attachment #253483 for bug #281387

Lines 3441-3443 net-im/telepathy-salut\|\|2024-08-22\|Has expired: Fails to build with libxml2 2.13 Link Here

(-)b/MOVED (+1 lines)
3441	audio/icecast-kh\|\|2024-08-22\|Has expired: Fails to build with libxml2 2.13.2 (PR 280159)	3441	audio/icecast-kh\|\|2024-08-22\|Has expired: Fails to build with libxml2 2.13.2 (PR 280159)
3442	net-im/pidgin-icyque\|\|2024-08-27\|Has expired: ICQ servers shut down	3442	net-im/pidgin-icyque\|\|2024-08-27\|Has expired: ICQ servers shut down
3443	security/fprint_demo\|security/libfprint\|2024-09-10\|Now a part of libfprint	3443	security/fprint_demo\|security/libfprint\|2024-09-10\|Now a part of libfprint
		3444	security/pam_fprint\|security/fprintd\|2024-09-10\|The PAM module is now built as part of fprintd

Lines 746-752 Link Here

(-)b/security/Makefile (-1 lines)
746	SUBDIR += pam-modules	746	SUBDIR += pam-modules
747	SUBDIR += pam-mysql	747	SUBDIR += pam-mysql
748	SUBDIR += pam-pgsql	748	SUBDIR += pam-pgsql
749	SUBDIR += pam_fprint
750	SUBDIR += pam_google_authenticator	749	SUBDIR += pam_google_authenticator
751	SUBDIR += pam_helper	750	SUBDIR += pam_helper
752	SUBDIR += pam_howdy	751	SUBDIR += pam_howdy




PORTNAME=	pam_fprint
DISTVERSION=	20080330
PORTREVISION=	1
CATEGORIES=	security

MAINTAINER=	Clockwork6400@protonmail.com
COMMENT=	PAM module offering finger print authentication using libfprint
WWW=		https://github.com/Clockwork6400/pam-fprint

LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/COPYING

LIB_DEPENDS=	libfprint.so:security/libfprint

GNU_CONFIGURE=	yes
USES=		autoreconf pkgconfig

USE_GITHUB=	yes
GH_ACCOUNT=	Clockwork6400

PLIST_FILES+=	bin/pam_fprint_enroll \
		lib/pam_fprint.so

SUB_FILES=	pkg-message

.include <bsd.port.mk>

Removed Link Here

(-)a/security/pam_fprint/distinfo (-3 lines)
1	TIMESTAMP = 1676392070
2	SHA256 (Clockwork6400-pam_fprint-20080330_GH0.tar.gz) = 35d9ed7a3e0d6d32db88da2b7ca5c70d656dff2548a3e417c1c49b8952ca650f
3	SIZE (Clockwork6400-pam_fprint-20080330_GH0.tar.gz) = 15853

Removed Link Here

(-)a/security/pam_fprint/files/patch-src_Makefile.am (-11 lines)
1	--- src/Makefile.am.orig 2023-02-14 15:43:27 UTC
2	+++ src/Makefile.am
3	@@ -1,7 +1,6 @@
4	-noinst_PROGRAMS = pamtest
5	bin_PROGRAMS = pam_fprint_enroll
6	pammod_PROGRAMS = pam_fprint.so
7	-pammoddir=/lib/security
8	+pammoddir=$(PREFIX)/lib
9
10	pam_fprint_so_SOURCES = pam_fprint.c
11	pam_fprint_so_CFLAGS = -fPIC $(FPRINT_CFLAGS)




--- src/pam_fprint.c.orig	2023-02-14 15:43:27 UTC
+++ src/pam_fprint.c
@@ -18,6 +18,7 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <pwd.h>
@@ -27,6 +28,7 @@
 
 #define PAM_SM_AUTH
 #include <security/pam_modules.h>
+#include <security/pam_appl.h>
 
 static int send_info_msg(pam_handle_t *pamh, char *msg)
 {
@@ -41,10 +43,10 @@ static int send_info_msg(pam_handle_t *pamh, char *msg
 
     r = pam_get_item(pamh, PAM_CONV, (const void **) &pc);
 	if (r != PAM_SUCCESS)
-		return;
+		return r;
 
 	if (!pc || !pc->conv)
-		return;
+		return PAM_BUF_ERR;
 
 	return pc->conv(1, &msgp, &resp, pc->appdata_ptr);
 }
@@ -62,10 +64,10 @@ static int send_err_msg(pam_handle_t *pamh, char *msg)
 
     r = pam_get_item(pamh, PAM_CONV, (const void **) &pc);
 	if (r != PAM_SUCCESS)
-		return;
+		return r;
 
 	if (!pc || !pc->conv)
-		return;
+		return PAM_BUF_ERR;
 
 	return pc->conv(1, &msgp, &resp, pc->appdata_ptr);
 }
@@ -102,7 +104,7 @@ static struct fp_print_data **find_dev_and_prints(stru
 	struct fp_print_data **gallery;
 
 	/* TODO: add device selection */
-	while (print = prints[i++]) {
+	while ((print = prints[i++])) {
 		if (!ddev) {
 			ddev = fp_dscv_dev_for_dscv_print(ddevs, print);
 			driver_id = fp_dscv_print_get_driver_id(print);
@@ -133,7 +135,7 @@ static struct fp_print_data **find_dev_and_prints(stru
 	}
 	
 	i = 0, j = 0;
-	while (print = prints[i++]) {
+	while ((print = prints[i++])) {
 		driver_id_cur = fp_dscv_print_get_driver_id(print);
 		if (driver_id_cur == driver_id) {
 			err = fp_print_data_from_dscv_print(print, & (gallery[j]));




--- src/pam_fprint_enroll.c.orig	2023-02-14 15:43:27 UTC
+++ src/pam_fprint_enroll.c
@@ -26,7 +26,7 @@
 #include <unistd.h>
 #include <getopt.h>
 
-#include <libfprint/fprint.h>
+#include <fprint.h>
 
 static const char *finger_names[] = {
 	[LEFT_THUMB] = "Left Thumb",
@@ -47,7 +47,7 @@ static struct fp_dscv_dev *discover_device(struct fp_d
 	struct fp_dscv_dev *ddev = NULL;
 	int i;
 
-	for (i = 0; ddev = discovered_devs[i]; i++) {
+	for (i = 0; (ddev = discovered_devs[i]); i++) {
 		struct fp_driver *drv = fp_dscv_dev_get_driver(ddev);
 		printf("Found device claimed by %s driver\n",
 			fp_driver_get_full_name(drv));




[
{ type: install
  message: <<EOM
The security/fprint_demo port contains the graphical `fprint_demo'
application that allows you to manage your finger prints in a comfortable
way.

After enrolling fingerprints for your user(s), you can enable finger
print authentication by adding the following line to the corresponding
PAM configuration file(s) (see the PAM documentation and the pam_fprint
web site for more information).

auth            sufficient      %%PREFIX%%/lib/pam_fprint.so

/etc/pam.d/system is used for system-wide defaults,
/etc/pam.d/{gdm, kde} are used by the GDM/KDM login managers.
EOM
}
]


Removed Link Here

(-)a/security/pam_fprint/pkg-descr (-3 lines)
1	pam_fprint is a simple PAM module which uses libfprint's fingerprint
2	processing and verification functionality for authentication. In other words,
3	instead of seeing a password prompt, you're asked to scan your fingerprint.

Return to bug 281387

Removed Link Here

(-)a/security/pam_fprint/Makefile (-26 lines)
1	PORTNAME= pam_fprint
2	DISTVERSION= 20080330
3	PORTREVISION= 1
4	CATEGORIES= security
5
6	MAINTAINER= Clockwork6400@protonmail.com
7	COMMENT= PAM module offering finger print authentication using libfprint
8	WWW= https://github.com/Clockwork6400/pam-fprint
9
10	LICENSE= GPLv2
11	LICENSE_FILE= ${WRKSRC}/COPYING
12
13	LIB_DEPENDS= libfprint.so:security/libfprint
14
15	GNU_CONFIGURE= yes
16	USES= autoreconf pkgconfig
17
18	USE_GITHUB= yes
19	GH_ACCOUNT= Clockwork6400
20
21	PLIST_FILES+= bin/pam_fprint_enroll \
22	lib/pam_fprint.so
23
24	SUB_FILES= pkg-message
25
26	.include <bsd.port.mk>

Removed Link Here

(-)a/security/pam_fprint/files/patch-src_pam__fprint.c (-62 lines)
1	--- src/pam_fprint.c.orig 2023-02-14 15:43:27 UTC
2	+++ src/pam_fprint.c
3	@@ -18,6 +18,7 @@
4	*/
5
6	#include <stdio.h>
7	+#include <stdlib.h>
8	#include <unistd.h>
9	#include <sys/types.h>
10	#include <pwd.h>
11	@@ -27,6 +28,7 @@
12
13	#define PAM_SM_AUTH
14	#include <security/pam_modules.h>
15	+#include <security/pam_appl.h>
16
17	static int send_info_msg(pam_handle_t pamh, char msg)
18	{
19	@@ -41,10 +43,10 @@ static int send_info_msg(pam_handle_t pamh, char msg
20
21	r = pam_get_item(pamh, PAM_CONV, (const void **) &pc);
22	if (r != PAM_SUCCESS)
23	- return;
24	+ return r;
25
26	if (!pc \|\| !pc->conv)
27	- return;
28	+ return PAM_BUF_ERR;
29
30	return pc->conv(1, &msgp, &resp, pc->appdata_ptr);
31	}
32	@@ -62,10 +64,10 @@ static int send_err_msg(pam_handle_t pamh, char msg)
33
34	r = pam_get_item(pamh, PAM_CONV, (const void **) &pc);
35	if (r != PAM_SUCCESS)
36	- return;
37	+ return r;
38
39	if (!pc \|\| !pc->conv)
40	- return;
41	+ return PAM_BUF_ERR;
42
43	return pc->conv(1, &msgp, &resp, pc->appdata_ptr);
44	}
45	@@ -102,7 +104,7 @@ static struct fp_print_data **find_dev_and_prints(stru
46	struct fp_print_data **gallery;
47
48	/* TODO: add device selection */
49	- while (print = prints[i++]) {
50	+ while ((print = prints[i++])) {
51	if (!ddev) {
52	ddev = fp_dscv_dev_for_dscv_print(ddevs, print);
53	driver_id = fp_dscv_print_get_driver_id(print);
54	@@ -133,7 +135,7 @@ static struct fp_print_data **find_dev_and_prints(stru
55	}
56
57	i = 0, j = 0;
58	- while (print = prints[i++]) {
59	+ while ((print = prints[i++])) {
60	driver_id_cur = fp_dscv_print_get_driver_id(print);
61	if (driver_id_cur == driver_id) {
62	err = fp_print_data_from_dscv_print(print, & (gallery[j]));

Removed Link Here

(-)a/security/pam_fprint/files/patch-src_pam__fprint__enroll.c (-20 lines)
1	--- src/pam_fprint_enroll.c.orig 2023-02-14 15:43:27 UTC
2	+++ src/pam_fprint_enroll.c
3	@@ -26,7 +26,7 @@
4	#include <unistd.h>
5	#include <getopt.h>
6
7	-#include <libfprint/fprint.h>
8	+#include <fprint.h>
9
10	static const char *finger_names[] = {
11	[LEFT_THUMB] = "Left Thumb",
12	@@ -47,7 +47,7 @@ static struct fp_dscv_dev *discover_device(struct fp_d
13	struct fp_dscv_dev *ddev = NULL;
14	int i;
15
16	- for (i = 0; ddev = discovered_devs[i]; i++) {
17	+ for (i = 0; (ddev = discovered_devs[i]); i++) {
18	struct fp_driver *drv = fp_dscv_dev_get_driver(ddev);
19	printf("Found device claimed by %s driver\n",
20	fp_driver_get_full_name(drv));

Removed Link Here

(-)a/security/pam_fprint/files/pkg-message.in (-20 lines)
1	[
2	{ type: install
3	message: <<EOM
4	The security/fprint_demo port contains the graphical `fprint_demo'
5	application that allows you to manage your finger prints in a comfortable
6	way.
7
8	After enrolling fingerprints for your user(s), you can enable finger
9	print authentication by adding the following line to the corresponding
10	PAM configuration file(s) (see the PAM documentation and the pam_fprint
11	web site for more information).
12
13	auth sufficient %%PREFIX%%/lib/pam_fprint.so
14
15	/etc/pam.d/system is used for system-wide defaults,
16	/etc/pam.d/{gdm, kde} are used by the GDM/KDM login managers.
17	EOM
18	}
19	]
20