Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #7812 from neheb/pam2

Browse source 
libpam: Update to 1.3.1
This commit is contained in:
Nikos Mavrogiannopoulos 2019-01-02 08:45:04 +01:00 committed by GitHub
commit 86e8cf603d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 38 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
libs/libpam/Makefile
View file

@ -8,18 +8,23 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=libpam PKG_NAME:=libpam
PKG_VERSION:=1.3.0 PKG_VERSION:=1.3.1
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=Linux-PAM-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=Linux-PAM-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=http://www.linux-pam.org/library/ PKG_SOURCE_URL:=https://github.com/linux-pam/linux-pam/releases/download/v$(PKG_VERSION)
PKG_HASH:=241aed1ef522f66ed672719ecf2205ec513fd0075ed80cda8e086a5b1a01d1bb PKG_HASH:=eff47a4ecd833fbf18de9686632a70ee8d0794b79aecb217ebd0ce11db4cd0db
PKG_INSTALL:=1
PKG_FIXUP:=autoreconf
PKG_MAINTAINER:=Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
PKG_BUILD_DIR:=$(BUILD_DIR)/Linux-PAM-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/Linux-PAM-$(PKG_VERSION)
PKG_MAINTAINER:=Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
PKG_LICENSE:=BSD-3c GPL
PKG_LICENSE_FILES:=COPYING Copyright
PKG_CPE_ID:=cpe:/a:kernel:linux-pam
PKG_FIXUP:=autoreconf
PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
define Package/libpam define Package/libpam
@ -33,23 +38,22 @@ define Package/libpam/description
The Linux-PAM Pluggable Authentication Modules. The Linux-PAM Pluggable Authentication Modules.
endef endef
TARGET_CFLAGS += $(FPIC) CONFIGURE_ARGS += \
--enable-pamlocking \
define Build/Configure
$(call Build/Configure/Default, \
--enable-shared \ --enable-shared \
--enable-static \ --enable-static \
--enable-pamlocking \ --disable-audit \
--disable-cracklib \
--disable-db \
--disable-prelude \ --disable-prelude \
--disable-lckpwdf \ --disable-lckpwdf \
--disable-selinux \
--disable-nls \
--disable-rpath \
--disable-nis \ --disable-nis \
--disable-regenerate-docu \ --disable-regenerate-docu \
--enable-db=no \ --disable-rpath \
) --disable-selinux \
endef --with-gnu-ld \
--without-mailspool \
--without-xauth
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(1)/lib $(INSTALL_DIR) $(1)/lib

2
libs/libpam/patches/0005-build-fix-doc-build.patch
View file

@ -26,7 +26,7 @@ index 3db4e37..5e6592a 100644
+++ b/Makefile.am +++ b/Makefile.am
@@ -4,7 +4,10 @@ @@ -4,7 +4,10 @@
AUTOMAKE_OPTIONS = 1.9 gnu dist-bzip2 check-news AUTOMAKE_OPTIONS = 1.9 gnu dist-bzip2 dist-xz check-news
-SUBDIRS = libpam tests libpamc libpam_misc modules po conf doc examples xtests -SUBDIRS = libpam tests libpamc libpam_misc modules po conf doc examples xtests
+if ENABLE_REGENERATE_MAN +if ENABLE_REGENERATE_MAN

9
libs/libpam/patches/0007-Replace-strndupa-with-strcpy.patch
View file

@ -23,21 +23,22 @@ index 0ab6548..2fbab4f 100644
pid_t pid; pid_t pid;
int fds[2]; int fds[2];
int stdout_fds[2]; int stdout_fds[2];
@@ -178,11 +178,11 @@ call_exec (const char *pam_type, pam_handle_t *pamh, @@ -180,12 +180,12 @@ call_exec (const char *pam_type, pam_handle_t *pamh,
} if (resp)
{
pam_set_item (pamh, PAM_AUTHTOK, resp); pam_set_item (pamh, PAM_AUTHTOK, resp);
- authtok = strndupa (resp, PAM_MAX_RESP_SIZE); - authtok = strndupa (resp, PAM_MAX_RESP_SIZE);
+ strcpy (authtok, resp); + strcpy (authtok, resp);
_pam_drop (resp); _pam_drop (resp);
} }
}
else else
- authtok = strndupa (void_pass, PAM_MAX_RESP_SIZE); - authtok = strndupa (void_pass, PAM_MAX_RESP_SIZE);
+ strcpy (authtok, void_pass); + strcpy (authtok, void_pass);
if (pipe(fds) != 0) if (pipe(fds) != 0)
{ {
@@ -222,23 +222,14 @@ call_exec (const char *pam_type, pam_handle_t *pamh, @@ -225,23 +225,14 @@ call_exec (const char *pam_type, pam_handle_t *pamh,
if (expose_authtok) /* send the password to the child */ if (expose_authtok) /* send the password to the child */
{ {