Skip to content

Commit fd191c9

Browse files
zpc0hnyman
authored andcommitted
freeradius3: drop yubikey support
FreeRADIUS yubikey plugin depends on obsolete libyubikey. libyubikey has been removed from repo due to upstream EoL. (9ea1711) This commit will fix libyubikey dependency problem. Signed-off-by: Yanase Yuki <[email protected]>
1 parent 8a51592 commit fd191c9

File tree

1 file changed

+2
-21
lines changed

1 file changed

+2
-21
lines changed

net/freeradius3/Makefile

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
1010
PKG_NAME:=freeradius3
1111
PKG_VERSION:=3.2.7
1212
PKG_VERSION_UNDERSCORE:=$(subst .,_,${PKG_VERSION})
13-
PKG_RELEASE:=2
13+
PKG_RELEASE:=3
1414

1515
PKG_SOURCE:=freeradius-server-$(PKG_VERSION).tar.gz
1616
PKG_SOURCE_URL:=https://github.com/FreeRADIUS/freeradius-server/releases/download/release_$(PKG_VERSION_UNDERSCORE)/
@@ -708,16 +708,6 @@ define Package/freeradius3-mod-wimax/conffiles
708708
/etc/freeradius3/mods-available/wimax
709709
endef
710710

711-
define Package/freeradius3-mod-yubikey
712-
$(call Package/freeradius3/Default)
713-
DEPENDS:=freeradius3 +libyubikey +ykclient
714-
TITLE:=Yubikey Authentication
715-
endef
716-
717-
define Package/freeradius3-mod-yubikey/conffiles
718-
/etc/freeradius3/mods-available/yubikey
719-
endef
720-
721711
define Package/freeradius3-utils
722712
$(call Package/freeradius3/Default)
723713
DEPENDS:=+freeradius3-common
@@ -759,6 +749,7 @@ CONFIGURE_ARGS+= \
759749
--without-rlm_sql_freetds \
760750
--without-rlm_sql_iodbc \
761751
--without-rlm_sql_oracle \
752+
--without-rlm_yubikey \
762753

763754
CONFIGURE_LIBS+= -latomic
764755

@@ -962,15 +953,6 @@ else
962953
CONFIGURE_ARGS+= --without-rlm_unix
963954
endif
964955

965-
ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius3-mod-yubikey),)
966-
CONFIGURE_ARGS+= \
967-
--with-rlm_yubikey \
968-
--with-rlm_yubikey-include-dir="$(STAGING_DIR)/usr/include" \
969-
--with-rlm_yubikey-lib-dir="$(STAGING_DIR)/usr/lib"
970-
else
971-
CONFIGURE_ARGS+= --without-rlm_yubikey
972-
endif
973-
974956
ifeq ($(CONFIG_USE_GLIBC),y)
975957
TARGET_CFLAGS+= -DLIBBSD_OVERLAY -I$(STAGING_DIR)/usr/include/bsd \
976958
-D_RPC_NETDB_H
@@ -1138,5 +1120,4 @@ $(eval $(call BuildPlugin,freeradius3-mod-unix,rlm_unix,))
11381120
$(eval $(call BuildPlugin,freeradius3-mod-unpack,rlm_unpack,))
11391121
$(eval $(call BuildPlugin,freeradius3-mod-utf8,rlm_utf8,))
11401122
$(eval $(call BuildPlugin,freeradius3-mod-wimax,rlm_wimax,))
1141-
$(eval $(call BuildPlugin,freeradius3-mod-yubikey,rlm_yubikey,))
11421123
$(eval $(call BuildPackage,freeradius3-utils))

0 commit comments

Comments
 (0)