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

Merge pull request #14814 from stintel/yubico

Browse source 
Fix typo Yuibco -> Yubico
This commit is contained in:
Stijn Tintel 2021-02-21 03:01:23 +01:00 committed by GitHub
commit c1857c2f64
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libs/libyubikey/Makefile
View file

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=libyubikey PKG_NAME:=libyubikey
PKG_VERSION:=1.13 PKG_VERSION:=1.13
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=libyubikey-$(PKG_VERSION).tar.gz PKG_SOURCE:=libyubikey-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://developers.yubico.com/yubico-c/Releases PKG_SOURCE_URL:=https://developers.yubico.com/yubico-c/Releases
@ -16,7 +16,7 @@ include $(INCLUDE_DIR)/package.mk
define Package/libyubikey define Package/libyubikey
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
TITLE:=The Yuibco yubikey c library TITLE:=The Yubico yubikey c library
URL:=https://developers.yubico.com/yubico-c/ URL:=https://developers.yubico.com/yubico-c/
endef endef

4
libs/yubico-pam/Makefile
View file

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=yubico-pam PKG_NAME:=yubico-pam
PKG_VERSION:=2.26 PKG_VERSION:=2.26
PKG_RELEASE:=2 PKG_RELEASE:=3
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
@ -21,7 +21,7 @@ include $(INCLUDE_DIR)/package.mk
define Package/yubico-pam define Package/yubico-pam
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
TITLE:=The Yuibco PAM module TITLE:=The Yubico PAM module
URL:=https://developers.yubico.com/yubico-pam/ URL:=https://developers.yubico.com/yubico-pam/
DEPENDS:=+ykclient +ykpers +libyubikey +libpam +curl DEPENDS:=+ykclient +ykpers +libyubikey +libpam +curl
endef endef

4
utils/ykclient/Makefile
View file

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ykclient PKG_NAME:=ykclient
PKG_VERSION:=2.15 PKG_VERSION:=2.15
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=ykclient-$(PKG_VERSION).tar.gz PKG_SOURCE:=ykclient-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://developers.yubico.com/yubico-c-client/Releases/ PKG_SOURCE_URL:=https://developers.yubico.com/yubico-c-client/Releases/
@ -17,7 +17,7 @@ include $(INCLUDE_DIR)/package.mk
define Package/ykclient define Package/ykclient
SECTION:=utils SECTION:=utils
CATEGORY:=Utilities CATEGORY:=Utilities
TITLE:=The Yuibco yubikey c client library TITLE:=The Yubico yubikey c client library
URL:=https://developers.yubico.com/yubico-c-client/ URL:=https://developers.yubico.com/yubico-c-client/
DEPENDS:=curl DEPENDS:=curl
endef endef

4
utils/ykpers/Makefile
View file

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ykpers PKG_NAME:=ykpers
PKG_VERSION:=1.20.0 PKG_VERSION:=1.20.0
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://developers.yubico.com/yubikey-personalization/Releases PKG_SOURCE_URL:=https://developers.yubico.com/yubikey-personalization/Releases
@ -20,7 +20,7 @@ include $(INCLUDE_DIR)/package.mk
define Package/ykpers define Package/ykpers
SECTION:=utils SECTION:=utils
CATEGORY:=Utilities CATEGORY:=Utilities
TITLE:=The Yuibco personalization package TITLE:=The Yubico personalization package
URL:=https://developers.yubico.com/yubikey-personalization/ URL:=https://developers.yubico.com/yubikey-personalization/
DEPENDS:=+curl +libyubikey +libjson-c +libusb-1.0 DEPENDS:=+curl +libyubikey +libjson-c +libusb-1.0
endef endef

10
utils/ykpers/patches/020-json-c-0.14.patch
View file

@ -9,8 +9,6 @@ Upstream removed the TRUE and FALSE defines in commit
ykpers-json.c | 18 +++++++++--------- ykpers-json.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-) 1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/ykpers-json.c b/ykpers-json.c
index a62e907..15ad380 100644
--- a/ykpers-json.c --- a/ykpers-json.c
+++ b/ykpers-json.c +++ b/ykpers-json.c
@@ -40,7 +40,7 @@ @@ -40,7 +40,7 @@
@ -22,7 +20,7 @@ index a62e907..15ad380 100644
#endif #endif
static void set_json_value(struct map_st *p, int mode, json_object *options, YKP_CONFIG *cfg) { static void set_json_value(struct map_st *p, int mode, json_object *options, YKP_CONFIG *cfg) {
@@ -50,7 +50,7 @@ static void set_json_value(struct map_st *p, int mode, json_object *options, YKP @@ -50,7 +50,7 @@ static void set_json_value(struct map_st
if(p->mode && (mode & p->mode) == mode) { if(p->mode && (mode & p->mode) == mode) {
json_object *joption; json_object *joption;
json_bool ret = yk_json_object_object_get(options, p->json_text, joption); json_bool ret = yk_json_object_object_get(options, p->json_text, joption);
@ -31,7 +29,7 @@ index a62e907..15ad380 100644
int value = json_object_get_boolean(joption); int value = json_object_get_boolean(joption);
if(value == 1) { if(value == 1) {
p->setter(cfg, true); p->setter(cfg, true);
@@ -230,20 +230,20 @@ int _ykp_json_import_cfg(YKP_CONFIG *cfg, const char *json, size_t len) { @@ -230,20 +230,20 @@ int _ykp_json_import_cfg(YKP_CONFIG *cfg
ykp_errno = YKP_EINVAL; ykp_errno = YKP_EINVAL;
goto out; goto out;
} }
@ -56,7 +54,7 @@ index a62e907..15ad380 100644
int target_config = json_object_get_int(jtarget); int target_config = json_object_get_int(jtarget);
int command; int command;
if(target_config == 1) { if(target_config == 1) {
@@ -275,13 +275,13 @@ int _ykp_json_import_cfg(YKP_CONFIG *cfg, const char *json, size_t len) { @@ -275,13 +275,13 @@ int _ykp_json_import_cfg(YKP_CONFIG *cfg
if(mode == MODE_OATH_HOTP) { if(mode == MODE_OATH_HOTP) {
json_object *jdigits, *jrandom; json_object *jdigits, *jrandom;
ykp_set_tktflag_OATH_HOTP(cfg, true); ykp_set_tktflag_OATH_HOTP(cfg, true);
@ -72,7 +70,7 @@ index a62e907..15ad380 100644
int random = json_object_get_boolean(jrandom); int random = json_object_get_boolean(jrandom);
int seed = 0; int seed = 0;
if(random == 1) { if(random == 1) {
@@ -290,7 +290,7 @@ int _ykp_json_import_cfg(YKP_CONFIG *cfg, const char *json, size_t len) { @@ -290,7 +290,7 @@ int _ykp_json_import_cfg(YKP_CONFIG *cfg
goto out; goto out;
} else { } else {
json_object *jseed; json_object *jseed;