From nobody Sun Jan 22 20:33:09 2023 X-Original-To: dev-commits-ports-all@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 4P0Q0j513nz3bFHW; Sun, 22 Jan 2023 20:33:09 +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 4P0Q0j3fXqz4Cpd; Sun, 22 Jan 2023 20:33:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674419589; 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=cOVs1+mgRxPruQNwF1n7z3vhmm5rdAiu6OC1Kvsk8Rk=; b=B35dx8ELn4eMgiNDV+B2ZTkbxdU6r2A5N8+o/Myx9fZ9lm7CTgq2ysDnrvHUojmj/oU7ps IW37Y2A51IwNbMxI0BjyRlWcSkfh1YzO75KwJ1PGAGNEs4qlq46Esawb1FO1CYy0GWxiot PDX3vznrROrnqcUlpr48v0QfMJTGVaPkMoVPumq474EWWAm7XsLdsNMdiHV7L9iBVc7klW IpEfQ0BOLAQ5PSEkgq9bacQsOlVoupEFP2iHtEPq6igQboRORVTL5wf2TKTNEpxfVk8unz VolNywD8b+PhduZkefKIVqwnIbDgqASsisQMQpX4E0dq3c2LaWPlyrC8tnAASA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674419589; 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=cOVs1+mgRxPruQNwF1n7z3vhmm5rdAiu6OC1Kvsk8Rk=; b=WQkPUFpf15tgyRJ5kVc9YXZGIkGR3eu4ZROVWbQ+9sOyTYH0WJjRsfU7Zj7i7SpOOYprFF y/hYElA8nxfdmSl9J7dHdDkgeuKPddb5H/o2CDE1RL1Jv5jx8jWJc3f4tusSNx1z13WrIs gwtkY6/NGWke+A16eeBV2dnhbNUTSiq7s9phUlEF9b/XwW8LrcWJmejOBvTqi7XNcA5Vvg UpIhDillEJHOKDAvo+Yn30SOSSM5bdUFFv0i51Taoyv9pCIAUlIXkMIK5Do6drt7atbkJU I9VrtiYzaaEfS/ftkoG/FEismzhRMylVUktylowaQvIjNBKrzmpUvDZyAo37iA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674419589; a=rsa-sha256; cv=none; b=jK1xtVXh9D+sVSRX2q7AfiAP/1k4ppBHeEJW1UBPtY6NOyR8JbiHduUteRnm3ODCHIlr2N 1gc97pfPOf7ogVx6qnJTgPoKwjNNbhRO2AMcP603lNvyudUS8X2nNo+If1Sf3LSAZ4yMKN WeX44mpD7ERc1Vt4nXl8jR4Pnep8OMkQC8O3XPvM2eY4fKYJm4UxhLP3NQwVkZnn6dbfOk KRnAHkIiz63R2RUHAi3dXkvV1/b3edisRTT/btFUcy2V6wzQQY/mklgoXNoDiDO9Ff6rcb d4/gi0Dw+7MLpSzWE0DFPtWvypkAfG+o2p5dWuy+JD+/kZKh/shmCHN8+APOsQ== 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 4P0Q0j2m9lz12c7; Sun, 22 Jan 2023 20:33:09 +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 30MKX9kg010910; Sun, 22 Jan 2023 20:33:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30MKX9eu010909; Sun, 22 Jan 2023 20:33:09 GMT (envelope-from git) Date: Sun, 22 Jan 2023 20:33:09 GMT Message-Id: <202301222033.30MKX9eu010909@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 56ca26b6882f - main - ftp/axel: Fix build on some systems due to the conflict with if_t symbol List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 56ca26b6882feb87c3132fd0448cdb633aa1a679 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=56ca26b6882feb87c3132fd0448cdb633aa1a679 commit 56ca26b6882feb87c3132fd0448cdb633aa1a679 Author: Yuri Victorovich AuthorDate: 2023-01-22 20:32:07 +0000 Commit: Yuri Victorovich CommitDate: 2023-01-22 20:33:00 +0000 ftp/axel: Fix build on some systems due to the conflict with if_t symbol Reported by: fallout --- ftp/axel/files/patch-src_axel.h | 13 ++++++++++ ftp/axel/files/patch-src_conf.c | 54 +++++++++++++++++++++++++++++++++++++++++ ftp/axel/files/patch-src_conf.h | 13 ++++++++++ 3 files changed, 80 insertions(+) diff --git a/ftp/axel/files/patch-src_axel.h b/ftp/axel/files/patch-src_axel.h new file mode 100644 index 000000000000..c9133dda974d --- /dev/null +++ b/ftp/axel/files/patch-src_axel.h @@ -0,0 +1,13 @@ +- workaround for https://github.com/axel-download-accelerator/axel/issues/399 + +--- src/axel.h.orig 2023-01-22 20:28:34 UTC ++++ src/axel.h +@@ -101,7 +101,7 @@ typedef struct { + } message_t; + + typedef message_t url_t; +-typedef message_t if_t; ++typedef message_t if_t_; + + #include "abuf.h" + #include "conf.h" diff --git a/ftp/axel/files/patch-src_conf.c b/ftp/axel/files/patch-src_conf.c new file mode 100644 index 000000000000..aa1cd6d9f9e7 --- /dev/null +++ b/ftp/axel/files/patch-src_conf.c @@ -0,0 +1,54 @@ +- workaround for https://github.com/axel-download-accelerator/axel/issues/399 + +--- src/conf.c.orig 2023-01-22 20:28:48 UTC ++++ src/conf.c +@@ -276,7 +276,7 @@ conf_init(conf_t *conf) + "User-Agent", DEFAULT_USER_AGENT); + conf->add_header_count = HDR_count_init; + +- conf->interfaces = calloc(1, sizeof(if_t)); ++ conf->interfaces = calloc(1, sizeof(if_t_)); + if (!conf->interfaces) + return 0; + +@@ -329,11 +329,11 @@ int + parse_interfaces(conf_t *conf, char *s) + { + char *s2; +- if_t *iface; ++ if_t_ *iface; + + iface = conf->interfaces->next; + while (iface != conf->interfaces) { +- if_t *i; ++ if_t_ *i; + + i = iface->next; + free(iface); +@@ -342,7 +342,7 @@ parse_interfaces(conf_t *conf, char *s) + free(conf->interfaces); + + if (!*s) { +- conf->interfaces = calloc(1, sizeof(if_t)); ++ conf->interfaces = calloc(1, sizeof(if_t_)); + if (!conf->interfaces) + return 0; + +@@ -350,7 +350,7 @@ parse_interfaces(conf_t *conf, char *s) + return 1; + } + +- conf->interfaces = iface = malloc(sizeof(if_t)); ++ conf->interfaces = iface = malloc(sizeof(if_t_)); + if (!conf->interfaces) + return 0; + +@@ -365,7 +365,7 @@ parse_interfaces(conf_t *conf, char *s) + strlcpy(iface->text, s, sizeof(iface->text)); + s = s2 + 1; + if (*s) { +- iface->next = malloc(sizeof(if_t)); ++ iface->next = malloc(sizeof(if_t_)); + if (!iface->next) + return 0; + diff --git a/ftp/axel/files/patch-src_conf.h b/ftp/axel/files/patch-src_conf.h new file mode 100644 index 000000000000..fc8be24b838b --- /dev/null +++ b/ftp/axel/files/patch-src_conf.h @@ -0,0 +1,13 @@ +- workaround for https://github.com/axel-download-accelerator/axel/issues/399 + +--- src/conf.h.orig 2023-01-22 20:27:54 UTC ++++ src/conf.h +@@ -65,7 +65,7 @@ typedef struct { + AXEL_PROGRESS_STYLE_PERCENTAGE, + } progress_style; + +- if_t *interfaces; ++ if_t_ *interfaces; + + sa_family_t ai_family; +