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

Merge pull request #12744 from neheb/yubi

Browse source 
yubico-pam: fix compilation with fixed ykpers
This commit is contained in:
Rosen Penev 2020-07-07 15:01:10 -07:00 committed by GitHub
commit f39291a068
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
libs/yubico-pam/Makefile
View file

@ -2,17 +2,19 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=yubico-pam PKG_NAME:=yubico-pam
PKG_VERSION:=2.26 PKG_VERSION:=2.26
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=pam_yubico-$(PKG_VERSION).tar.gz PKG_SOURCE:=pam_yubico-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://developers.yubico.com/yubico-pam/Releases PKG_SOURCE_URL:=https://developers.yubico.com/yubico-pam/Releases
PKG_HASH:=2de96495963fefd72b98243952ca5d5ec513e702c596e54bc667ef6b5e252966 PKG_HASH:=2de96495963fefd72b98243952ca5d5ec513e702c596e54bc667ef6b5e252966
PKG_BUILD_DIR:=$(BUILD_DIR)/pam_yubico-$(PKG_VERSION)
PKG_MAINTAINER:=Stuart B. Wilkins <stuwilkins@mac.com> PKG_MAINTAINER:=Stuart B. Wilkins <stuwilkins@mac.com>
PKG_BUILD_DEPENDS:=ykclient ykpers libyubikey libpam curl
PKG_LICENSE_FILES:=COPYING PKG_LICENSE_FILES:=COPYING
PKG_LICENSE:=BSD-2-Clause PKG_LICENSE:=BSD-2-Clause
PKG_BUILD_DIR:=$(BUILD_DIR)/pam_yubico-$(PKG_VERSION) PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -25,27 +27,18 @@ define Package/yubico-pam
endef endef
define Package/yubico-pam/description define Package/yubico-pam/description
The Yubico PAM module provides an easy way to integrate the YubiKey The Yubico PAM module provides an easy way to integrate the YubiKey
into your existing user authentication infrastructure. into your existing user authentication infrastructure.
endef endef
CONFIGURE_VARS += YKPERS_CFLAGS=-I$(STAGING_DIR)/usr/include \
YKPERS_LIBS=-L$(STAGING_DIR)/usr/lib \
LDFLAGS="-Wl,-rpath-link,$(STAGING_DIR)/usr/lib \
-L$(STAGING_DIR)/usr/lib"
CONFIGURE_ARGS += --without-ldap \ CONFIGURE_ARGS += \
--enable-shared \ --enable-shared \
--disable-static \ --disable-static \
--without-ldap
define Build/Compile
$(call Build/Compile/Default, \
LDFLAGS="-L$(STAGING_DIR)/usr/lib -lykpers-1")
endef
define Package/yubico-pam/install define Package/yubico-pam/install
$(INSTALL_DIR) $(1)/lib/security $(INSTALL_DIR) $(1)/usr/lib/security
$(CP) $(PKG_BUILD_DIR)/.libs/pam_yubico.so* $(1)/lib/security $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/security/pam_yubico.so $(1)/usr/lib/security
endef endef
$(eval $(call BuildPackage,yubico-pam,+ykclient,+ykpers,+libyubikey)) $(eval $(call BuildPackage,yubico-pam))