Attachment #237538 for bug #267275

View | Details | Raw Unified | Return to bug 267275
Collapse All | Expand All




PORTNAME=	hyperhotp
DISTVERSIONPREFIX=	v
DISTVERSION=	0.1
CATEGORIES=	security comms

MAINTAINER=	fuz@fuz.su

USES=		cmake pkgconfig
USE_GITHUB=	yes
GH_ACCOUNT=	casept
#GH_PROJECT=	hyperhotp
GH_TAGNAME=	ad1f71d0e4669e7b693ae0fd794186204b1941e8

PLIST_FILES=	bin/hyperhotp \
		share/man/man1/hyperhotp.1.gz

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/security/hyperhotp/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1666202596	1	TIMESTAMP = 1666467446
2	SHA256 (casept-hyperhotp-g20211005-ad1f71d0e4669e7b693ae0fd794186204b1941e8_GH0.tar.gz) = 42f522de25252a78a92460651845aece35dfe6da827ce3bbd9a27c6f42d8fabd	2	SHA256 (casept-hyperhotp-v0.1_GH0.tar.gz) = 3787ec269d9cf85e882702872df9927d29e7c40699ebc0e96243b2c282ccbeda
3	SIZE (casept-hyperhotp-g20211005-ad1f71d0e4669e7b693ae0fd794186204b1941e8_GH0.tar.gz) = 29308	3	SIZE (casept-hyperhotp-v0.1_GH0.tar.gz) = 30594




--- 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)
 

Removed Link Here

(-)a/security/hyperhotp/files/patch-src_core_hyperhotp.c (-10 lines)
1	--- src/core/hyperhotp.c.orig 2021-10-05 10:43:22 UTC
2	+++ src/core/hyperhotp.c
3	@@ -1,6 +1,6 @@
4	#include "hyperhotp.h"
5
6	-#include <libusb-1.0/libusb.h>
7	+#include <libusb.h>
8	#include <stdbool.h>
9	#include <stdint.h>
10	#include <string.h>

Removed Link Here

(-)a/security/hyperhotp/files/patch-src_core_hyperhotp.h (-10 lines)
1	--- src/core/hyperhotp.h.orig 2021-10-05 10:43:22 UTC
2	+++ src/core/hyperhotp.h
3	@@ -1,6 +1,6 @@
4	#pragma once
5
6	-#include <libusb-1.0/libusb.h>
7	+#include <libusb.h>
8	#include <stdbool.h>
9
10	#include "u2fhid.h"

Removed Link Here

(-)a/security/hyperhotp/files/patch-src_core_log.c (-8 lines)
1	--- src/core/log.c.orig 2021-10-05 10:43:22 UTC
2	+++ src/core/log.c
3	@@ -1,4 +1,4 @@
4	-#include <libusb-1.0/libusb.h>
5	+#include <libusb.h>
6	#include <memory.h>
7	#include <stdbool.h>
8	#include <stdint.h>

Removed Link Here

(-)a/security/hyperhotp/files/patch-src_core_log.h (-10 lines)
1	--- src/core/log.h.orig 2021-10-05 10:43:22 UTC
2	+++ src/core/log.h
3	@@ -1,6 +1,6 @@
4	#pragma once
5
6	-#include <libusb-1.0/libusb.h>
7	+#include <libusb.h>
8	#include <stddef.h>
9
10	void log_fatal(const char* msg);

Removed Link Here

(-)a/security/hyperhotp/files/patch-src_core_u2fhid.c (-10 lines)
1	--- src/core/u2fhid.c.orig 2021-10-05 10:43:22 UTC
2	+++ src/core/u2fhid.c
3	@@ -1,6 +1,6 @@
4	#include "u2fhid.h"
5
6	-#include <libusb-1.0/libusb.h>
7	+#include <libusb.h>
8	#include <stdbool.h>
9	#include <stdio.h>
10	#include <string.h>

Removed Link Here

(-)a/security/hyperhotp/files/patch-src_core_u2fhid.h (-10 lines)
1	--- src/core/u2fhid.h.orig 2021-10-05 10:43:22 UTC
2	+++ src/core/u2fhid.h
3	@@ -1,6 +1,6 @@
4	#pragma once
5
6	-#include <libusb-1.0/libusb.h>
7	+#include <libusb.h>
8	#include <stdbool.h>
9	#include <stdint.h>
10

Removed Link Here

(-)a/security/hyperhotp/files/patch-src_core_usb.c (-10 lines)
1	--- src/core/usb.c.orig 2021-10-05 10:43:22 UTC
2	+++ src/core/usb.c
3	@@ -1,6 +1,6 @@
4	#include "usb.h"
5
6	-#include <libusb-1.0/libusb.h>
7	+#include <libusb.h>
8	#include <stdbool.h>
9	#include <stdio.h>
10	#include <stdlib.h>

Removed Link Here

(-)a/security/hyperhotp/files/patch-src_core_usb.h (-10 lines)
1	--- src/core/usb.h.orig 2021-10-05 10:43:22 UTC
2	+++ src/core/usb.h
3	@@ -1,6 +1,6 @@
4	#pragma once
5
6	-#include <libusb-1.0/libusb.h>
7	+#include <libusb.h>
8
9	/*
10	* Initialize the hyperFIDO usb device's libusb handle.

Removed Link Here

(-)a/security/hyperhotp/files/patch-src_gui_main.c (-10 lines)
1	--- src/gui/main.c.orig 2021-10-05 10:43:22 UTC
2	+++ src/gui/main.c
3	@@ -1,5 +1,5 @@
4	#include <gtk/gtk.h>
5	-#include <libusb-1.0/libusb.h>
6	+#include <libusb.h>
7	#include <pthread.h>
8	#include <stdio.h>
9	#include <stdlib.h>
10	-

Return to bug 267275

Lines 1-5 Link Here

(-)b/security/hyperhotp/Makefile (-4 / +4 lines)
1	PORTNAME= hyperhotp	1	PORTNAME= hyperhotp
2	DISTVERSION= g20211005	2	DISTVERSIONPREFIX= v
		3	DISTVERSION= 0.1
3	CATEGORIES= security comms	4	CATEGORIES= security comms
4		5
5	MAINTAINER= fuz@fuz.su	6	MAINTAINER= fuz@fuz.su
Lines 11-19 LICENSE= GPLv3 Link Here
11	USES= cmake pkgconfig	12	USES= cmake pkgconfig
12	USE_GITHUB= yes	13	USE_GITHUB= yes
13	GH_ACCOUNT= casept	14	GH_ACCOUNT= casept
14	#GH_PROJECT= hyperhotp
15	GH_TAGNAME= ad1f71d0e4669e7b693ae0fd794186204b1941e8
16		15
17	PLIST_FILES= bin/hyperhotp	16	PLIST_FILES= bin/hyperhotp \
		17	share/man/man1/hyperhotp.1.gz
18		18
19	.include <bsd.port.mk>	19	.include <bsd.port.mk>

Removed Link Here

(-)a/security/hyperhotp/files/patch-cmake_FindLibusb.cmake (-19 lines)
1	--- cmake/FindLibusb.cmake.orig 2022-10-19 18:04:24 UTC
2	+++ cmake/FindLibusb.cmake
3	@@ -12,14 +12,14 @@ mark_as_advanced(Libusb_VERSION)
4	# Find header path
5	find_path(
6	Libusb_INCLUDE_DIR
7	- NAMES libusb-1.0/libusb.h
8	+ NAMES libusb.h
9	HINTS ${PC_Libusb_INCLUDE_DIRS})
10	mark_as_advanced(Libusb_INCLUDE_DIR)
11
12	# Find lib path
13	find_library(
14	Libusb_LIBRARIES
15	- NAMES usb-1.0
16	+ NAMES usb
17	HINTS ${PC_Libusb_LIBRARY_DIRS})
18	mark_as_advanced(Libusb_LIBRARIES)
19