diff --git a/security/pam-modules/Makefile b/security/pam-modules/Makefile index f6ddc291a0a7..5ccf8315e535 100644 --- a/security/pam-modules/Makefile +++ b/security/pam-modules/Makefile @@ -1,44 +1,42 @@ PORTNAME= pam-modules PORTVERSION= 2.5 CATEGORIES= security MASTER_SITES= ftp://download.gnu.org.ua/pub/release/pam-modules/ MAINTAINER= cy@FreeBSD.org COMMENT= Collection of modules for PAM WWW= https://puszcza.gnu.org.ua/software/pam-modules/pam-modules.html LICENSE= GPLv3 USES= libtool USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-fshadow INFO= pam-modules OPTIONS_DEFINE= GROUPMEMBER MYSQL NIS PGSQL REGEX SYSLOG OPTIONS_DEFAULT= GROUPMEMBER REGEX SYSLOG OPTIONS_SUB= yes GROUPMEMBER_DESC= Build pam_groupmember MYSQL_DESC= Build pam_mysql NIS_DESC= Build pam_innetgr PGSQL_DESC= Build pam_pgsql REGEX_DESC= Build pam_regex SYSLOG_DESC= Build pam_log GROUPMEMBER_CONFIGURE_ENABLE= groupmember MYSQL_USES= mysql MYSQL_CONFIGURE_ENABLE= mysql MYSQL_CFLAGS+= -I${LOCALBASE}/include NIS_CONFIGURE_ENABLE= NIS PGSQL_USES= pgsql PGSQL_CONFIGURE_ENABLE= pgsql PGSQL_VARS= WANT_PGSQL=client REGEX_CONFIGURE_ENABLE= regex SYSLOG_CONFIGURE_ENABLE= log -.include - .include diff --git a/security/pam-modules/files/patch-pam__innetgr_pam__innetgr.c b/security/pam-modules/files/patch-pam__innetgr_pam__innetgr.c index 8d0193e20744..286bdc7d4e2d 100644 --- a/security/pam-modules/files/patch-pam__innetgr_pam__innetgr.c +++ b/security/pam-modules/files/patch-pam__innetgr_pam__innetgr.c @@ -1,11 +1,26 @@ ---- pam_innetgr/pam_innetgr.c.orig 2022-02-04 07:04:47.000000000 -0800 -+++ pam_innetgr/pam_innetgr.c 2023-08-28 06:57:10.213329000 -0700 -@@ -131,7 +131,7 @@ +--- pam_innetgr/pam_innetgr.c.orig 2022-02-04 15:04:47 UTC ++++ pam_innetgr/pam_innetgr.c +@@ -121,6 +121,14 @@ stripdomain(char *hostname, char const *domainname) + return -1; + } + ++#if HAVE_GETDOMAINNAME ++static int ++getdomainname_size_t(char *name, size_t namelen) ++{ ++ return getdomainname(name, (int)namelen); ++} ++#endif ++ + int + get_host_domain_names(char **host_name_ptr, char **domain_name_ptr) + { +@@ -131,7 +139,7 @@ get_host_domain_names(char **host_name_ptr, char **dom return -1; #if HAVE_GETDOMAINNAME if (use_getdomainname) { - if (xgetname(getdomainname, &domainname)) { -+ if (xgetname((long int *) getdomainname, &domainname)) { ++ if (xgetname(getdomainname_size_t, &domainname)) { _pam_log(LOG_ERR, "getdomainname: %s", strerror(errno)); } else if (strcmp (domainname, "(none)") == 0) { free(domainname);