git: a5aabfcb3401 - main - security/hyperhotp: update to 0.1

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Li-Wen Hsu <lwhsu_at_FreeBSD.org>
Date: Sat, 22 Oct 2022 19:55:53 UTC
The branch main has been updated by lwhsu:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a5aabfcb3401a492ef2eeae1d49c0f9cf73ce5eb

commit a5aabfcb3401a492ef2eeae1d49c0f9cf73ce5eb
Author:     Robert Clausecker <fuz@fuz.su>
AuthorDate: 2022-10-22 19:40:52 +0000
Commit:     Li-Wen Hsu <lwhsu@FreeBSD.org>
CommitDate: 2022-10-22 19:52:35 +0000

    security/hyperhotp: update to 0.1
    
    Upstream changes:
    
     - add man page
     - integrate FreeBSD patches
     - improve usability
    
    PR:             267275
---
 security/hyperhotp/Makefile                           |  8 ++++----
 security/hyperhotp/distinfo                           |  6 +++---
 security/hyperhotp/files/patch-cmake_FindLibusb.cmake | 19 -------------------
 security/hyperhotp/files/patch-src_core_hyperhotp.c   | 10 ----------
 security/hyperhotp/files/patch-src_core_hyperhotp.h   | 10 ----------
 security/hyperhotp/files/patch-src_core_log.c         |  8 --------
 security/hyperhotp/files/patch-src_core_log.h         | 10 ----------
 security/hyperhotp/files/patch-src_core_u2fhid.c      | 10 ----------
 security/hyperhotp/files/patch-src_core_u2fhid.h      | 10 ----------
 security/hyperhotp/files/patch-src_core_usb.c         | 10 ----------
 security/hyperhotp/files/patch-src_core_usb.h         | 10 ----------
 security/hyperhotp/files/patch-src_gui_main.c         |  9 ---------
 12 files changed, 7 insertions(+), 113 deletions(-)

diff --git a/security/hyperhotp/Makefile b/security/hyperhotp/Makefile
index 05a68e54fb8b..2370f2a059fe 100644
--- a/security/hyperhotp/Makefile
+++ b/security/hyperhotp/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	hyperhotp
-DISTVERSION=	g20211005
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.1
 CATEGORIES=	security comms
 
 MAINTAINER=	fuz@fuz.su
@@ -11,9 +12,8 @@ LICENSE=	GPLv3
 USES=		cmake pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	casept
-#GH_PROJECT=	hyperhotp
-GH_TAGNAME=	ad1f71d0e4669e7b693ae0fd794186204b1941e8
 
-PLIST_FILES=	bin/hyperhotp
+PLIST_FILES=	bin/hyperhotp \
+		share/man/man1/hyperhotp.1.gz
 
 .include <bsd.port.mk>
diff --git a/security/hyperhotp/distinfo b/security/hyperhotp/distinfo
index 910c8ea4a91f..93d55e831ec0 100644
--- a/security/hyperhotp/distinfo
+++ b/security/hyperhotp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1666202596
-SHA256 (casept-hyperhotp-g20211005-ad1f71d0e4669e7b693ae0fd794186204b1941e8_GH0.tar.gz) = 42f522de25252a78a92460651845aece35dfe6da827ce3bbd9a27c6f42d8fabd
-SIZE (casept-hyperhotp-g20211005-ad1f71d0e4669e7b693ae0fd794186204b1941e8_GH0.tar.gz) = 29308
+TIMESTAMP = 1666467446
+SHA256 (casept-hyperhotp-v0.1_GH0.tar.gz) = 3787ec269d9cf85e882702872df9927d29e7c40699ebc0e96243b2c282ccbeda
+SIZE (casept-hyperhotp-v0.1_GH0.tar.gz) = 30594
diff --git a/security/hyperhotp/files/patch-cmake_FindLibusb.cmake b/security/hyperhotp/files/patch-cmake_FindLibusb.cmake
deleted file mode 100644
index 6a1c4fadafbf..000000000000
--- a/security/hyperhotp/files/patch-cmake_FindLibusb.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
---- cmake/FindLibusb.cmake.orig	2022-10-19 18:04:24 UTC
-+++ cmake/FindLibusb.cmake
-@@ -12,14 +12,14 @@ mark_as_advanced(Libusb_VERSION)
- # Find header path
- find_path(
-   Libusb_INCLUDE_DIR
--  NAMES libusb-1.0/libusb.h
-+  NAMES libusb.h
-   HINTS ${PC_Libusb_INCLUDE_DIRS})
- mark_as_advanced(Libusb_INCLUDE_DIR)
- 
- # Find lib path
- find_library(
-   Libusb_LIBRARIES
--  NAMES usb-1.0
-+  NAMES usb
-   HINTS ${PC_Libusb_LIBRARY_DIRS})
- mark_as_advanced(Libusb_LIBRARIES)
- 
diff --git a/security/hyperhotp/files/patch-src_core_hyperhotp.c b/security/hyperhotp/files/patch-src_core_hyperhotp.c
deleted file mode 100644
index ecdaa53d8380..000000000000
--- a/security/hyperhotp/files/patch-src_core_hyperhotp.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/core/hyperhotp.c.orig	2021-10-05 10:43:22 UTC
-+++ src/core/hyperhotp.c
-@@ -1,6 +1,6 @@
- #include "hyperhotp.h"
- 
--#include <libusb-1.0/libusb.h>
-+#include <libusb.h>
- #include <stdbool.h>
- #include <stdint.h>
- #include <string.h>
diff --git a/security/hyperhotp/files/patch-src_core_hyperhotp.h b/security/hyperhotp/files/patch-src_core_hyperhotp.h
deleted file mode 100644
index 9b39ee3600da..000000000000
--- a/security/hyperhotp/files/patch-src_core_hyperhotp.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/core/hyperhotp.h.orig	2021-10-05 10:43:22 UTC
-+++ src/core/hyperhotp.h
-@@ -1,6 +1,6 @@
- #pragma once
- 
--#include <libusb-1.0/libusb.h>
-+#include <libusb.h>
- #include <stdbool.h>
- 
- #include "u2fhid.h"
diff --git a/security/hyperhotp/files/patch-src_core_log.c b/security/hyperhotp/files/patch-src_core_log.c
deleted file mode 100644
index 6be4ce656086..000000000000
--- a/security/hyperhotp/files/patch-src_core_log.c
+++ /dev/null
@@ -1,8 +0,0 @@
---- src/core/log.c.orig	2021-10-05 10:43:22 UTC
-+++ src/core/log.c
-@@ -1,4 +1,4 @@
--#include <libusb-1.0/libusb.h>
-+#include <libusb.h>
- #include <memory.h>
- #include <stdbool.h>
- #include <stdint.h>
diff --git a/security/hyperhotp/files/patch-src_core_log.h b/security/hyperhotp/files/patch-src_core_log.h
deleted file mode 100644
index 2e80eae4f101..000000000000
--- a/security/hyperhotp/files/patch-src_core_log.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/core/log.h.orig	2021-10-05 10:43:22 UTC
-+++ src/core/log.h
-@@ -1,6 +1,6 @@
- #pragma once
- 
--#include <libusb-1.0/libusb.h>
-+#include <libusb.h>
- #include <stddef.h>
- 
- void log_fatal(const char* msg);
diff --git a/security/hyperhotp/files/patch-src_core_u2fhid.c b/security/hyperhotp/files/patch-src_core_u2fhid.c
deleted file mode 100644
index 288996dea31c..000000000000
--- a/security/hyperhotp/files/patch-src_core_u2fhid.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/core/u2fhid.c.orig	2021-10-05 10:43:22 UTC
-+++ src/core/u2fhid.c
-@@ -1,6 +1,6 @@
- #include "u2fhid.h"
- 
--#include <libusb-1.0/libusb.h>
-+#include <libusb.h>
- #include <stdbool.h>
- #include <stdio.h>
- #include <string.h>
diff --git a/security/hyperhotp/files/patch-src_core_u2fhid.h b/security/hyperhotp/files/patch-src_core_u2fhid.h
deleted file mode 100644
index 76a6ea5ebf14..000000000000
--- a/security/hyperhotp/files/patch-src_core_u2fhid.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/core/u2fhid.h.orig	2021-10-05 10:43:22 UTC
-+++ src/core/u2fhid.h
-@@ -1,6 +1,6 @@
- #pragma once
- 
--#include <libusb-1.0/libusb.h>
-+#include <libusb.h>
- #include <stdbool.h>
- #include <stdint.h>
- 
diff --git a/security/hyperhotp/files/patch-src_core_usb.c b/security/hyperhotp/files/patch-src_core_usb.c
deleted file mode 100644
index 41f0df850149..000000000000
--- a/security/hyperhotp/files/patch-src_core_usb.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/core/usb.c.orig	2021-10-05 10:43:22 UTC
-+++ src/core/usb.c
-@@ -1,6 +1,6 @@
- #include "usb.h"
- 
--#include <libusb-1.0/libusb.h>
-+#include <libusb.h>
- #include <stdbool.h>
- #include <stdio.h>
- #include <stdlib.h>
diff --git a/security/hyperhotp/files/patch-src_core_usb.h b/security/hyperhotp/files/patch-src_core_usb.h
deleted file mode 100644
index dacee1d53911..000000000000
--- a/security/hyperhotp/files/patch-src_core_usb.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/core/usb.h.orig	2021-10-05 10:43:22 UTC
-+++ src/core/usb.h
-@@ -1,6 +1,6 @@
- #pragma once
- 
--#include <libusb-1.0/libusb.h>
-+#include <libusb.h>
- 
- /*
-  * Initialize the hyperFIDO usb device's libusb handle.
diff --git a/security/hyperhotp/files/patch-src_gui_main.c b/security/hyperhotp/files/patch-src_gui_main.c
deleted file mode 100644
index ecf6c37be410..000000000000
--- a/security/hyperhotp/files/patch-src_gui_main.c
+++ /dev/null
@@ -1,9 +0,0 @@
---- src/gui/main.c.orig	2021-10-05 10:43:22 UTC
-+++ src/gui/main.c
-@@ -1,5 +1,5 @@
- #include <gtk/gtk.h>
--#include <libusb-1.0/libusb.h>
-+#include <libusb.h>
- #include <pthread.h>
- #include <stdio.h>
- #include <stdlib.h>