From nobody Fri Jul 1 13:10:01 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 0E748874C17; Fri, 1 Jul 2022 13:10:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LZFt16wNtz4S9r; Fri, 1 Jul 2022 13:10:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656681002; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ax52HzjfO3E8wKtKbnF5cVpVw7b0Rju31HBfaW5N/FM=; b=w27aMCRxwpbgP1qWhO0kW5kuEs/uf6CoLlxBZLd91fv9kfA+FE+0ilU0+nGQ1Mi5Gcej04 bTzVSRQvoHArkqrZXe3JUhQGlK9We/fe2YbBO/JI1crPrjzl/dY/nEFEugXZ6ZrZka5IvG lIDZd6sfQYPi5TLmQU/Ymnztl2GB9SGL2JTDVnInkNqPSb6WxulRdfG3IAhnTusAtGCa3E KZnmF/DfLKZYgkLZdgH4gkZtSEu5KhZoTgi58ol6CR8IljJwsR/FZtljM221gbI5zgOX/L ktY6Qy7e+2VEeFEINkOeAZkXOaJizVaVp4IzLbIdmDZCo4Ddq6+EisRqHIOSYQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C86791BF2B; Fri, 1 Jul 2022 13:10:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 261DA1bu010548; Fri, 1 Jul 2022 13:10:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 261DA1t9010547; Fri, 1 Jul 2022 13:10:01 GMT (envelope-from git) Date: Fri, 1 Jul 2022 13:10:01 GMT Message-Id: <202207011310.261DA1t9010547@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 48b8fc0b56fc - main - deskutils/i3status: fix looking up for network devices and memory List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 48b8fc0b56fcce527fc8bdbc1568c63f9d5d7318 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656681002; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ax52HzjfO3E8wKtKbnF5cVpVw7b0Rju31HBfaW5N/FM=; b=wsB/+zHc49msdV4H39HHWTvNMhZeLGzIHcMkqLGCU0zDCHxaa2lYe/XWtfhIMws8RnTzjb 7AKLaOCWeT+D0/2XuXfXnjJmIqrEfY50rJFzukzUAkKsfkSD+QIfWjCKmp3EWRSQ6UFVZT Csqv4PzPJAYwb11O50UYSZzLzSm4Cxi59Q0GJuTCeSN06i2eUAL6Mdw687wO93bHiVjjVL T6hrTobwEJM+h/mxRgBo1cKPPT33Uahys6Dw1lIAbXXpdoEUztBequ/o2zdZFDHSOyjmpp CE1rQINPdlB4EfLzoZ4mBtXf74jISqkjAxNIHTcC0eaBFCzKx+RUKSnVgZz02w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656681002; a=rsa-sha256; cv=none; b=sTuuSXX4sMq919VDM4zhB2ArJWYO3Pl82q2WaogP4s/gBUqffw+KOny4nZ3xhOrDZ6sRqw qx5tJo+NUQJmDiHhnULvppm5pfWoUyyB7srK2EGoPyKSDkB/hfHtkZJJB5mKoteL4Ldu49 cjBE56lvT+MmW89nkDl48frgFDf2cbMr9Xb99EoR0UcFO8l2LEjqu6uoubfhSLijaY4GH/ rqv0AYdjgIkT56eUbDOe3/DVflg6CEXhbbQyPLgNAPMqHCUAahdIwDN8DcTrGA0GopWrJf PXLdPtlHM39mpiFuuTc55foUIpSZ+ERtn7I58yuCsSZ9vPFeNbbbnfB6B3gSxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=48b8fc0b56fcce527fc8bdbc1568c63f9d5d7318 commit 48b8fc0b56fcce527fc8bdbc1568c63f9d5d7318 Author: Baptiste Daroussin AuthorDate: 2022-07-01 13:08:57 +0000 Commit: Baptiste Daroussin CommitDate: 2022-07-01 13:09:37 +0000 deskutils/i3status: fix looking up for network devices and memory --- deskutils/i3status/Makefile | 1 + .../files/patch-src_first__network__device.c | 57 +++++++++++ deskutils/i3status/files/patch-src_print__mem.c | 104 +++++++++++++++++++++ 3 files changed, 162 insertions(+) diff --git a/deskutils/i3status/Makefile b/deskutils/i3status/Makefile index b67848bc4bf8..cfa7da61a734 100644 --- a/deskutils/i3status/Makefile +++ b/deskutils/i3status/Makefile @@ -1,5 +1,6 @@ PORTNAME= i3status PORTVERSION= 2.14 +PORTREVISION= 1 CATEGORIES= deskutils MASTER_SITES= http://i3wm.org/i3status/ diff --git a/deskutils/i3status/files/patch-src_first__network__device.c b/deskutils/i3status/files/patch-src_first__network__device.c new file mode 100644 index 000000000000..a49a77e8e25f --- /dev/null +++ b/deskutils/i3status/files/patch-src_first__network__device.c @@ -0,0 +1,57 @@ +--- src/first_network_device.c.orig 2022-07-01 12:29:14 UTC ++++ src/first_network_device.c +@@ -4,13 +4,13 @@ + #include + #include + #include +-#if defined(__OpenBSD__) || defined(__DragonFly__) ++#if defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD__) + #include + #include + #include + #include + #endif +-#if defined(__OpenBSD__) ++#if defined(__OpenBSD__) || defined(__FreeBSD__) + #include + #include + #elif defined(__DragonFly__) +@@ -83,17 +83,17 @@ static net_type_t iface_type(const char *ifname) { + struct ifreq ifr; + struct ieee80211_bssid bssid; + struct ieee80211_nwid nwid; +-#elif defined(__DragonFly__) ++#elif defined(__DragonFly__) || defined(__FreeBSD__) + struct ieee80211req ifr; + #endif +-#if defined(__OpenBSD__) || defined(__DragonFly__) ++#if defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD__) + struct ifmediareq ifmr; + int s; + #endif + #if defined(__OpenBSD__) + int ibssid, inwid; + #endif +-#if defined(__OpenBSD__) || defined(__DragonFly__) ++#if defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD__) + if ((s = socket(AF_INET, SOCK_DGRAM, 0)) == -1) + return NET_TYPE_OTHER; + +@@ -112,7 +112,7 @@ static net_type_t iface_type(const char *ifname) { + close(s); + return NET_TYPE_WIRELESS; + } +-#elif defined(__DragonFly__) ++#elif defined(__DragonFly__) || defined(__FreeBSD__) + (void)strlcpy(ifr.i_name, ifname, sizeof(ifr.i_name)); + ifr.i_type = IEEE80211_IOC_NUMSSIDS; + if (ioctl(s, SIOCG80211, &ifr) == 0) { +@@ -120,7 +120,7 @@ static net_type_t iface_type(const char *ifname) { + return NET_TYPE_WIRELESS; + } + #endif +-#if defined(__OpenBSD__) || defined(__DragonFly__) ++#if defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD__) + (void)memset(&ifmr, 0, sizeof(ifmr)); + (void)strlcpy(ifmr.ifm_name, ifname, sizeof(ifmr.ifm_name)); + diff --git a/deskutils/i3status/files/patch-src_print__mem.c b/deskutils/i3status/files/patch-src_print__mem.c new file mode 100644 index 000000000000..50ef72f255b6 --- /dev/null +++ b/deskutils/i3status/files/patch-src_print__mem.c @@ -0,0 +1,104 @@ +--- src/print_mem.c.orig 2021-11-09 07:27:11 UTC ++++ src/print_mem.c +@@ -7,17 +7,21 @@ + #include + #include "i3status.h" + ++#if defined(__FreeBSD__) ++#include ++#endif ++ + #define MAX_DECIMALS 4 + #define STRING_SIZE ((sizeof "1023. TiB") + MAX_DECIMALS) + + #define BINARY_BASE 1024UL + +-#if defined(__linux__) ++#if defined(__linux__) || defined(__FreeBSD__) + static const char *const iec_symbols[] = {"B", "KiB", "MiB", "GiB", "TiB"}; + #define MAX_EXPONENT ((sizeof iec_symbols / sizeof *iec_symbols) - 1) + #endif + +-#if defined(__linux__) ++#if defined(__linux__) || defined(__FreeBSD__) + /* + * Prints the given amount of bytes in a human readable manner. + * +@@ -42,7 +46,7 @@ static int print_percentage(char *outwalk, float perce + } + #endif + +-#if defined(__linux__) ++#if defined(__linux__) || defined(__FreeBSD__) + /* + * Convert a string to its absolute representation based on the total + * memory of `mem_total`. +@@ -89,11 +93,10 @@ void print_memory(memory_ctx_t *ctx) { + void print_memory(memory_ctx_t *ctx) { + char *outwalk = ctx->buf; + +-#if defined(__linux__) ++#if defined(__linux__) || defined(__FreeBSD__) + const char *selected_format = ctx->format; + const char *output_color = NULL; + +- int unread_fields = 6; + unsigned long ram_total; + unsigned long ram_free; + unsigned long ram_available; +@@ -101,6 +104,8 @@ void print_memory(memory_ctx_t *ctx) { + unsigned long ram_cached; + unsigned long ram_shared; + ++#if defined(__linux__) ++ int unread_fields = 6; + FILE *file = fopen("/proc/meminfo", "r"); + if (!file) { + goto error; +@@ -130,7 +135,7 @@ void print_memory(memory_ctx_t *ctx) { + if (unread_fields > 0) { + goto error; + } +- ++ + // Values are in kB, convert them to B. + ram_total *= 1024UL; + ram_free *= 1024UL; +@@ -138,6 +143,25 @@ void print_memory(memory_ctx_t *ctx) { + ram_buffers *= 1024UL; + ram_cached *= 1024UL; + ram_shared *= 1024UL; ++#endif ++#if defined(__FreeBSD__) ++ size_t len; ++ unsigned long active_mem; ++ len = sizeof(unsigned long); ++ ram_total = ram_free = ram_cached = ram_buffers = ram_shared = 0; ++ sysctlbyname("hw.physmem", &ram_total, &len, NULL, 0); ++ sysctlbyname("hw.usermem", &ram_available, &len, NULL, 0); ++ int page_size = getpagesize(); ++ sysctlbyname("vm.stats.vm.v_cache_count", &ram_cached, &len, NULL, 0); ++ sysctlbyname("vm.stats.vm.v_buffer_count", &ram_buffers, &len, NULL, 0); ++ sysctlbyname("vm.stats.vm.v_wire_count", &ram_shared, &len, NULL, 0); ++ sysctlbyname("vm.stats.vm.v_active_count", &active_mem, &len, NULL, 0); ++ sysctlbyname("vm.stats.vm.v_free_count", &ram_free, &len, NULL, 0); ++ ram_cached *= page_size; ++ ram_buffers *= page_size; ++ ram_shared *= page_size; ++ ram_free *= page_size; ++#endif + + unsigned long ram_used; + if (BEGINS_WITH(ctx->memory_used_method, "memavailable")) { +@@ -211,9 +235,11 @@ void print_memory(memory_ctx_t *ctx) { + OUTPUT_FULL_TEXT(ctx->buf); + + return; ++#if defined(__linux__) + error: + OUTPUT_FULL_TEXT("can't read memory"); + fputs("i3status: Cannot read system memory using /proc/meminfo\n", stderr); ++#endif + #else + OUTPUT_FULL_TEXT(""); + fputs("i3status: Memory status information is not supported on this system\n", stderr);