openbsd/ports
1
0
Fork 0
mirror of https://github.com/openbsd/ports.git synced 2026-06-17 23:13:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

simple update 7.1.0 -> 7.1.2

Browse Source 
get rid of the patches that were accepted upstream
This commit is contained in:
sebastia
2026-02-09 09:35:09 +00:00
parent 8951e2b93b
commit e96e3e12b6
6 changed files with 3 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
security/hcxtools/Makefile
+1 -1
View File
@@ -2,7 +2,7 @@ COMMENT = convert pcap dumps to hashcat or John the Ripper input
GH_ACCOUNT = ZerBea
GH_PROJECT = hcxtools
GH_TAGNAME = 7.1.0
GH_TAGNAME = 7.1.2
DISTNAME = hcxtools-${GH_TAGNAME}
CATEGORIES = security
security/hcxtools/distinfo
+2 -2
View File
@@ -1,2 +1,2 @@
SHA256 (hcxtools-7.1.0.tar.gz) = LvOpJNLNccEedhjmFXaNUaX8eq91IUwT75X9oQ1hmrg=
SIZE (hcxtools-7.1.0.tar.gz) = 159065
SHA256 (hcxtools-7.1.2.tar.gz) = xya5PfMu/TKYh0syT4INk8sIpNrgPZFEsNUGLAA/138=
SIZE (hcxtools-7.1.2.tar.gz) = 159651
security/hcxtools/patches/patch-Makefile
-13
View File
@@ -1,13 +0,0 @@
https://github.com/ZerBea/hcxtools/pull/369
Index: Makefile
--- Makefile.orig
+++ Makefile
@@ -49,7 +49,7 @@ TOOLS+=hcxpmktool
hcxpmktool_libs=$(OPENSSL_LIBS)
hcxpmktool_cflags=$(OPENSSL_CFLAGS)
TOOLS+=hcxpottool
-hcxpottool_libs=$(OPENSSL_LIBS)
+hcxpottool_libs=$(OPENSSL_LIBS) -lpthread
hcxpottool_cflags=$(OPENSSL_CFLAGS)
TOOLS+=hcxeiutool
TOOLS+=hcxwltool
security/hcxtools/patches/patch-hcxpcapngtool_c
-33
View File
@@ -1,33 +0,0 @@
https://github.com/ZerBea/hcxtools/pull/366
Index: hcxpcapngtool.c
--- hcxpcapngtool.c.orig
+++ hcxpcapngtool.c
@@ -1088,8 +1088,8 @@ strftime(timestringmin, 32, "%d.%m.%Y %H:%M:%S", gmtim
tvmax = timestampmax /1000000000;
timestampdiff = timestampmax - timestampmin;
strftime(timestringmax, 32, "%d.%m.%Y %H:%M:%S", gmtime(&tvmax));
-fprintf(stdout, "timestamp minimum (timestamp)............: %s (%ld)\n", timestringmin, tvmin);
-fprintf(stdout, "timestamp maximum (timestamp)............: %s (%ld)\n", timestringmax, tvmax);
+fprintf(stdout, "timestamp minimum (timestamp)............: %s (%jd)\n", timestringmin, (intmax_t)tvmin);
+fprintf(stdout, "timestamp maximum (timestamp)............: %s (%jd)\n", timestringmax, (intmax_t)tvmax);
if(timestampdiff > 0)
{
if(timestampdiff > 60000000000) fprintf(stdout, "duration of the dump tool (minutes)......: %" PRIu64 "\n", timestampdiff / 60000000000);
@@ -4476,7 +4476,7 @@ if(fh_lts != NULL)
if(naf == false)
{
tvproberesponse = proberesponsetimestamp /1000000000;
- fprintf(fh_lts, "%ld\t%d\t%02x%02x%02x%02x%02x%02x\t%.*s\n", tvproberesponse, rssi, macap[0], macap[1], macap[2], macap[3], macap[4], macap[5], tags.essidlen, tags.essid);
+ fprintf(fh_lts, "%jd\t%d\t%02x%02x%02x%02x%02x%02x\t%.*s\n", (intmax_t)tvproberesponse, rssi, macap[0], macap[1], macap[2], macap[3], macap[4], macap[5], tags.essidlen, tags.essid);
}
}
}
@@ -4604,7 +4604,7 @@ if(fh_lts != NULL)
if(naf == false)
{
tvbeacon = beacontimestamp /1000000000;
- fprintf(fh_lts, "%ld\t%d\t%02x%02x%02x%02x%02x%02x\t%.*s\n", tvbeacon, rssi, macap[0], macap[1], macap[2], macap[3], macap[4], macap[5], tags.essidlen, tags.essid);
+ fprintf(fh_lts, "%jd\t%d\t%02x%02x%02x%02x%02x%02x\t%.*s\n", (intmax_t)tvbeacon, rssi, macap[0], macap[1], macap[2], macap[3], macap[4], macap[5], tags.essidlen, tags.essid);
}
}
}
security/hcxtools/patches/patch-hcxpottool_c
-24
View File
@@ -1,24 +0,0 @@
https://github.com/ZerBea/hcxtools/pull/367
Index: hcxpottool.c
--- hcxpottool.c.orig
+++ hcxpottool.c
@@ -16,7 +16,6 @@
#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
- #include <sys/sysinfo.h>
#include <sys/types.h>
#include <unistd.h>
#include <utime.h>
@@ -822,7 +821,9 @@ static int ret;
static void *res;
static thread_info tinfo[CPU_MAX];
-cpucount = get_nprocs();
+long n = sysconf(_SC_NPROCESSORS_ONLN);
+cpucount = (n > 0) ? (int)n : 1;
+
if(cpucount > CPU_MAX) cpucount = CPU_MAX;
fprintf(stdout, "%d threads started to calculate PMKs...\n", cpucount);
for(c = 0; c < cpucount; c++)
security/hcxtools/patches/patch-include_types_h
-20
View File
@@ -1,20 +0,0 @@
https://github.com/ZerBea/hcxtools/pull/368
Index: include/types.h
--- include/types.h.orig
+++ include/types.h
@@ -8,6 +8,14 @@ typedef int16_t i16;
typedef int32_t i32;
typedef int64_t i64;
+/*
+ * __bitwise is a Linux kernel annotation used by sparse.
+ * It has no meaning in userspace or on non-Linux systems.
+ */
+#ifndef __bitwise
+#define __bitwise
+#endif
+
typedef u16 __bitwise be16;
typedef u16 __bitwise le16;
typedef u32 __bitwise be32;