summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--package/pam/Makefile32
-rw-r--r--package/pam/patches/patch-Makefile_am11
-rw-r--r--package/pam/patches/patch-configure_in34
-rw-r--r--package/pam/patches/patch-modules_Makefile_am11
-rw-r--r--package/pam/patches/patch-modules_pam_group_pam_group_c17
-rw-r--r--package/pam/patches/patch-modules_pam_lastlog_pam_lastlog_c21
-rw-r--r--package/pam/patches/patch-modules_pam_succeed_if_pam_succeed_if_c23
-rw-r--r--package/pam/patches/patch-modules_pam_time_pam_time_c14
8 files changed, 17 insertions, 146 deletions
diff --git a/package/pam/Makefile b/package/pam/Makefile
index 1030dd69a..933101e47 100644
--- a/package/pam/Makefile
+++ b/package/pam/Makefile
@@ -4,37 +4,39 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= pam
-PKG_VERSION:= 1.1.8
-PKG_RELEASE:= 3
-PKG_HASH:= 4183409a450708a976eca5af561dbf4f0490141a08e86e4a1e649c7c1b094876
+PKG_VERSION:= 1.7.0
+PKG_RELEASE:= 1
+PKG_HASH:= 1dad9cb50b4a19accd7d7b9716777caf5a0f33d26f018f27d63e9e095998f12b
PKG_DESCR:= pluggable authentication modules
-PKG_BUILDDEP:= flex
+PKG_BUILDDEP:= flex meson-host
PKG_SECTION:= sys/misc
PKG_URL:= http://www.linux-pam.org/
-PKG_SITES:= http://www.linux-pam.org/library/
+PKG_SITES:= https://github.com/linux-pam/linux-pam/archive/refs/tags/
PKG_OPTS:= dev
-DISTFILES:= Linux-PAM-$(PKG_VERSION).tar.gz
-WRKDIST= ${WRKDIR}/Linux-PAM-${PKG_VERSION}
+DISTFILES:= v$(PKG_VERSION).tar.gz
+WRKDIST= ${WRKDIR}/linux-pam-${PKG_VERSION}
include $(ADK_TOPDIR)/mk/package.mk
$(eval $(call PKG_template,PAM,pam,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-AUTOTOOL_STYLE:= autoreconf
-CONFIGURE_ARGS+= --disable-nis \
- --disable-regenerate-docu \
- --enable-db=no
+WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj
+
+MESON_FLAGS+= -Ddocs=disabled
+CONFIG_STYLE:= meson
+BUILD_STYLE:= meson
+INSTALL_STYLE:= meson
pam-install:
$(INSTALL_DIR) $(STAGING_TARGET_DIR)/usr/lib
- $(CP) $(WRKINST)/lib/libpam*.so* \
+ $(CP) $(WRKINST)/usr/lib/libpam*.so* \
$(STAGING_TARGET_DIR)/usr/lib
$(INSTALL_DIR) $(IDIR_PAM)/etc/security
$(CP) $(WRKINST)/etc/security/* $(IDIR_PAM)/etc/security
- $(INSTALL_DIR) $(IDIR_PAM)/lib/security
- $(CP) $(WRKINST)/lib/libpam*.so* $(IDIR_PAM)/lib
- $(CP) $(WRKINST)/lib/security/*.so* $(IDIR_PAM)/lib/security
+ $(INSTALL_DIR) $(IDIR_PAM)/usr/lib/security
+ $(CP) $(WRKINST)/usr/lib/libpam*.so* $(IDIR_PAM)/usr/lib
+ $(CP) $(WRKINST)/usr/lib/security/*.so* $(IDIR_PAM)/usr/lib/security
$(CP) ./files/pam.conf $(IDIR_PAM)/etc
include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/pam/patches/patch-Makefile_am b/package/pam/patches/patch-Makefile_am
deleted file mode 100644
index d43150124..000000000
--- a/package/pam/patches/patch-Makefile_am
+++ /dev/null
@@ -1,11 +0,0 @@
---- Linux-PAM-1.1.8.orig/Makefile.am 2013-06-18 16:11:21.000000000 +0200
-+++ Linux-PAM-1.1.8/Makefile.am 2014-05-27 07:49:28.180418627 +0200
-@@ -4,7 +4,7 @@
-
- AUTOMAKE_OPTIONS = 1.9 gnu dist-bzip2 check-news
-
--SUBDIRS = libpam tests libpamc libpam_misc modules po conf doc examples xtests
-+SUBDIRS = libpam libpamc libpam_misc modules conf
-
- CLEANFILES = *~
-
diff --git a/package/pam/patches/patch-configure_in b/package/pam/patches/patch-configure_in
deleted file mode 100644
index 9f3b68ca2..000000000
--- a/package/pam/patches/patch-configure_in
+++ /dev/null
@@ -1,34 +0,0 @@
---- Linux-PAM-1.1.8.orig/configure.in 2013-09-18 14:30:13.000000000 +0200
-+++ Linux-PAM-1.1.8/configure.in 2014-05-27 07:50:43.868499284 +0200
-@@ -28,12 +28,7 @@ dnl If we use /usr as prefix, use /etc f
- fi
- if test ${libdir} = '${exec_prefix}/lib'
- then
-- case "`uname -m`" in
-- x86_64|ppc64|s390x|sparc64)
-- libdir="/lib64" ;;
-- *)
-- libdir="/lib" ;;
-- esac
-+ libdir="/lib"
- fi
- if test ${sbindir} = '${exec_prefix}/sbin'
- then
-@@ -404,7 +399,7 @@ AS_IF([test "x$ac_cv_header_xcrypt_h" =
- [crypt_libs="crypt"])
-
- BACKUP_LIBS=$LIBS
--AC_SEARCH_LIBS([crypt],[$crypt_libs], LIBCRYPT="-l$ac_lib", LIBCRYPT="")
-+AC_SEARCH_LIBS([crypt],[$crypt_libs], LIBCRYPT="-lcrypt", LIBCRYPT="")
- AC_CHECK_FUNCS(crypt_r crypt_gensalt_r)
- LIBS=$BACKUP_LIBS
- AC_SUBST(LIBCRYPT)
-@@ -565,8 +560,6 @@ AM_CONDITIONAL(ENABLE_REGENERATE_MAN, te
- AM_CONDITIONAL(ENABLE_GENERATE_PDF, test ! -z "$FO2PDF")
-
-
--AM_GNU_GETTEXT_VERSION([0.15])
--AM_GNU_GETTEXT([external])
- AC_CHECK_FUNCS(dngettext)
-
- AH_BOTTOM([#ifdef ENABLE_NLS
diff --git a/package/pam/patches/patch-modules_Makefile_am b/package/pam/patches/patch-modules_Makefile_am
deleted file mode 100644
index b70eaef1b..000000000
--- a/package/pam/patches/patch-modules_Makefile_am
+++ /dev/null
@@ -1,11 +0,0 @@
---- Linux-PAM-1.1.8.orig/modules/Makefile.am 2013-06-18 16:11:21.000000000 +0200
-+++ Linux-PAM-1.1.8/modules/Makefile.am 2014-05-25 20:13:15.415984289 +0200
-@@ -7,7 +7,7 @@ SUBDIRS = pam_access pam_cracklib pam_de
- pam_group pam_issue pam_keyinit pam_lastlog pam_limits \
- pam_listfile pam_localuser pam_loginuid pam_mail \
- pam_mkhomedir pam_motd pam_namespace pam_nologin \
-- pam_permit pam_pwhistory pam_rhosts pam_rootok pam_securetty \
-+ pam_permit pam_pwhistory pam_rootok pam_securetty \
- pam_selinux pam_sepermit pam_shells pam_stress \
- pam_succeed_if pam_tally pam_tally2 pam_time pam_timestamp \
- pam_tty_audit pam_umask \
diff --git a/package/pam/patches/patch-modules_pam_group_pam_group_c b/package/pam/patches/patch-modules_pam_group_pam_group_c
deleted file mode 100644
index bbf25bcfd..000000000
--- a/package/pam/patches/patch-modules_pam_group_pam_group_c
+++ /dev/null
@@ -1,17 +0,0 @@
---- Linux-PAM-1.1.8.orig/modules/pam_group/pam_group.c 2013-06-18 16:11:21.000000000 +0200
-+++ Linux-PAM-1.1.8/modules/pam_group/pam_group.c 2013-12-21 18:30:19.000000000 +0100
-@@ -655,10 +655,13 @@ static int check_account(pam_handle_t *p
- continue;
- }
- /* If buffer starts with @, we are using netgroups */
-+#ifdef HAVE_INNETGR
- if (buffer[0] == '@')
- good &= innetgr (&buffer[1], NULL, user, NULL);
- /* otherwise, if the buffer starts with %, it's a UNIX group */
-- else if (buffer[0] == '%')
-+ else
-+#endif
-+ if (buffer[0] == '%')
- good &= pam_modutil_user_in_group_nam_nam(pamh, user, &buffer[1]);
- else
- good &= logic_field(pamh,user, buffer, count, is_same);
diff --git a/package/pam/patches/patch-modules_pam_lastlog_pam_lastlog_c b/package/pam/patches/patch-modules_pam_lastlog_pam_lastlog_c
deleted file mode 100644
index b20bd413d..000000000
--- a/package/pam/patches/patch-modules_pam_lastlog_pam_lastlog_c
+++ /dev/null
@@ -1,21 +0,0 @@
---- Linux-PAM-1.1.8.orig/modules/pam_lastlog/pam_lastlog.c 2013-06-18 16:11:21.000000000 +0200
-+++ Linux-PAM-1.1.8/modules/pam_lastlog/pam_lastlog.c 2013-12-21 18:34:07.000000000 +0100
-@@ -10,6 +10,7 @@
-
- #include "config.h"
-
-+#include <paths.h>
- #include <fcntl.h>
- #include <time.h>
- #include <errno.h>
-@@ -50,6 +51,10 @@ struct lastlog {
- # define _PATH_BTMP "/var/log/btmp"
- #endif
-
-+#ifndef __GLIBC__
-+#define logwtmp(args...)
-+#endif
-+
- /* XXX - time before ignoring lock. Is 1 sec enough? */
- #define LASTLOG_IGNORE_LOCK_TIME 1
-
diff --git a/package/pam/patches/patch-modules_pam_succeed_if_pam_succeed_if_c b/package/pam/patches/patch-modules_pam_succeed_if_pam_succeed_if_c
deleted file mode 100644
index 2d51fab3f..000000000
--- a/package/pam/patches/patch-modules_pam_succeed_if_pam_succeed_if_c
+++ /dev/null
@@ -1,23 +0,0 @@
---- Linux-PAM-1.1.8.orig/modules/pam_succeed_if/pam_succeed_if.c 2013-06-18 16:11:21.000000000 +0200
-+++ Linux-PAM-1.1.8/modules/pam_succeed_if/pam_succeed_if.c 2014-05-24 10:49:28.000000000 +0200
-@@ -233,16 +233,20 @@ evaluate_notingroup(pam_handle_t *pamh,
- static int
- evaluate_innetgr(const char *host, const char *user, const char *group)
- {
-+#ifdef HAVE_INNETGR
- if (innetgr(group, host, user, NULL) == 1)
- return PAM_SUCCESS;
-+#endif
- return PAM_AUTH_ERR;
- }
- /* Return PAM_SUCCESS if the (host,user) is NOT in the netgroup. */
- static int
- evaluate_notinnetgr(const char *host, const char *user, const char *group)
- {
-+#ifdef HAVE_INNETGR
- if (innetgr(group, host, user, NULL) == 0)
- return PAM_SUCCESS;
-+#endif
- return PAM_AUTH_ERR;
- }
-
diff --git a/package/pam/patches/patch-modules_pam_time_pam_time_c b/package/pam/patches/patch-modules_pam_time_pam_time_c
deleted file mode 100644
index e122cece5..000000000
--- a/package/pam/patches/patch-modules_pam_time_pam_time_c
+++ /dev/null
@@ -1,14 +0,0 @@
---- Linux-PAM-1.1.8.orig/modules/pam_time/pam_time.c 2013-06-18 16:11:21.000000000 +0200
-+++ Linux-PAM-1.1.8/modules/pam_time/pam_time.c 2014-05-24 10:49:28.000000000 +0200
-@@ -554,9 +554,11 @@ check_account(pam_handle_t *pamh, const
- continue;
- }
- /* If buffer starts with @, we are using netgroups */
-+#ifdef HAVE_INNETGR
- if (buffer[0] == '@')
- good &= innetgr (&buffer[1], NULL, user, NULL);
- else
-+#endif
- good &= logic_field(pamh, user, buffer, count, is_same);
- D(("with user: %s", good ? "passes":"fails" ));
-
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-14 06:48:38 +0000