From 83237bdd1e09cd38817dc83a904f03be513b2dde Mon Sep 17 00:00:00 2001 From: lemmi Date: Wed, 1 Mar 2023 04:27:04 +0100 Subject: [PATCH] New package: passt-2023.02.27.c538ee8 --- srcpkgs/passt/patches/musl.patch | 96 ++++++++++++++++++++++++++++++++ srcpkgs/passt/template | 20 +++++++ srcpkgs/passt/update | 2 + 3 files changed, 118 insertions(+) create mode 100644 srcpkgs/passt/patches/musl.patch create mode 100644 srcpkgs/passt/template create mode 100644 srcpkgs/passt/update diff --git a/srcpkgs/passt/patches/musl.patch b/srcpkgs/passt/patches/musl.patch new file mode 100644 index 000000000000..810b501a1a74 --- /dev/null +++ b/srcpkgs/passt/patches/musl.patch @@ -0,0 +1,96 @@ +diff --git a/conf.c b/conf.c +index 0e512f4..3e38948 100644 +--- a/conf.c ++++ b/conf.c +@@ -1305,13 +1305,13 @@ void conf(struct ctx *c, int argc, char **argv) + if (logfile) + die("Can't log to both file and stderr"); + +- if (c->stderr) ++ if (c->_stderr) + die("Multiple --stderr options given"); + +- c->stderr = 1; ++ c->_stderr = 1; + break; + case 'l': +- if (c->stderr) ++ if (c->_stderr) + die("Can't log to both stderr and file"); + + if (logfile) +diff --git a/passt.c b/passt.c +index 5b8146e..6d6dfcb 100644 +--- a/passt.c ++++ b/passt.c +@@ -241,7 +241,7 @@ int main(int argc, char **argv) + conf(&c, argc, argv); + trace_init(c.trace); + +- if (c.stderr || isatty(fileno(stdout))) ++ if (c._stderr || isatty(fileno(stdout))) + __openlog(log_name, LOG_PERROR, LOG_DAEMON); + + quit_fd = pasta_netns_quit_init(&c); +diff --git a/passt.h b/passt.h +index e0383eb..697b8f0 100644 +--- a/passt.h ++++ b/passt.h +@@ -32,7 +32,7 @@ struct tap_l4_msg { + union epoll_ref; + + #include +- ++#include + #include "packet.h" + #include "icmp.h" + #include "port_fwd.h" +@@ -197,7 +197,7 @@ struct ctx { + int trace; + int quiet; + int foreground; +- int stderr; ++ int _stderr; + int nofile; + char sock_path[UNIX_PATH_MAX]; + char pcap[PATH_MAX]; +diff --git a/util.h b/util.h +index 570094c..7315ce2 100644 +--- a/util.h ++++ b/util.h +@@ -7,7 +7,10 @@ + #define UTIL_H + + #include ++#include + #include ++#include ++#include + + #include "log.h" + +@@ -88,6 +91,8 @@ + #define MAC_ZERO ((uint8_t [ETH_ALEN]){ 0 }) + #define MAC_IS_ZERO(addr) (!memcmp((addr), MAC_ZERO, ETH_ALEN)) + ++#if defined(__GLIBC__) || defined(__UCLIBC__) ++ + #if __BYTE_ORDER == __BIG_ENDIAN + #define htons_constant(x) (x) + #define htonl_constant(x) (x) +@@ -96,6 +101,15 @@ + #define htonl_constant(x) (__bswap_constant_32(x)) + #endif + ++#else ++ ++/* mainly musl fallback */ ++ ++#define htons_constant(x) (x) ++#define htonl_constant(x) (x) ++ ++#endif ++ + #define IN4_IS_ADDR_UNSPECIFIED(a) \ + ((a)->s_addr == htonl(INADDR_ANY)) + #define IN4_IS_ADDR_BROADCAST(a) \ diff --git a/srcpkgs/passt/template b/srcpkgs/passt/template new file mode 100644 index 000000000000..3adf19be4f6a --- /dev/null +++ b/srcpkgs/passt/template @@ -0,0 +1,20 @@ +# Template file for 'passt' +pkgname=passt +version=2023.02.27.c538ee8 +revision=1 +# upstream uses YYYY_MM_DD.COMMIT +_version=${version/./_} +_version=${_version/./_} +# https://bugs.passt.top/show_bug.cgi?id=4 +build_style=gnu-makefile +short_desc="Plug A Simple Socket Transport" +maintainer="lemmi " +license="AGPL-3.0-or-later, BSD-3-Clause" +homepage="https://passt.top" +distfiles="https://passt.top/passt/snapshot/passt-${_version}.tar.xz" +checksum=e09399ca10d1ddfb372580ac7e2540d00e417e1621d917b5f8ee1cd6adbd6772 + +post_install() { + vlicense LICENSES/AGPL-3.0-or-later.txt + vlicense LICENSES/BSD-3-Clause.txt +} diff --git a/srcpkgs/passt/update b/srcpkgs/passt/update new file mode 100644 index 000000000000..53a028708654 --- /dev/null +++ b/srcpkgs/passt/update @@ -0,0 +1,2 @@ +site="https://passt.top/passt" +pattern='passt-\K[\d._abcdef]+(?=.tar.xz)'