From nobody Sun Jun 18 08:25:41 2023 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 4QkQvT3tQKz4g5Lj; Sun, 18 Jun 2023 08:25:41 +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 4QkQvT3Fq6z450y; Sun, 18 Jun 2023 08:25:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687076741; 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=9LyaKRTOf9kNAUcavWMvaIpkosy9VcePEqDeS/+Q25w=; b=MnUlAGdNDZmfYiY9TA6hmZYyQLXF8n7YUFeePYCClUDZcoteqtFGy2l7ghpsHJGE1fDQtX danoH+h182QRmaVo2GM9QtSSluHAaOS7dmid3IlIqQTvTBJjuiu89GhOWxr8vK0DZ3uGsw J9vodDneBEWCp7Vo8qqdFHpo9yYQjz8VNdBODnoSZSkiXVppaJ30ft3wS22Dyj0QIkC9x/ i2g/2BhrvQe4WDELGqslKlaaN2QfGFHKdYUtIzSOw1NGh6ZcxPtJNIqXr0k6Ogz9gUilYK L6jov08ecATuNgtK4+gprmy3Foqhdn3Qv7Kfe+vz2nHQRGNAJlSdPwAtHuZBmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687076741; 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=9LyaKRTOf9kNAUcavWMvaIpkosy9VcePEqDeS/+Q25w=; b=d817JuydWqtNwGtL+wjXQM4ogwKWeR7xD94au71olwbbU7vH6NAx6D3BfjMO1LoXjGdY+N yBHm9Xft6ToHFknqvvJqoJlH3vGU0VasscRezO12Q1YKhNdqou1sAa0bww0HkX3mWbktqN vXVG3WTAHv7nkFi/avS8Y/idEdXaYfDdS/77eM1yPd2lJXd9PMzRdV5h58xRUuvKyfksx5 dPoDzA0ET4H+li+62RH6fbL6JVVVRXJXgnD085eb73p2XQlx8hKurmH6BgRg8j7NqNzzoV RcLA1jfe7gbCph7icZB29wJWwP9P3EsPZ/yVXvt016PUOUf/4ce3fHVnaV2zvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687076741; a=rsa-sha256; cv=none; b=CTQYB+/yMlovDorHIV6blqiY6+knkOh7C3LAbj2GzRRTEK7WeK2a1nLy3PwKNOdMeZEu0Z qwY9S1dEqo1gqwBJEfIHFK+TPBbegKENwlwB0zhTHmIGBqAqSBLukJUWCaF25ccDW4PgEl Ixb/QrVypkTX2f20zPEAUiDAGlD9CJQcHQjMvxJO74C2bZcY0hXmczAaiKNdFJuvjVtMUS DKmw/sUqlstdvTbfwpbxsAJXJh7LWmZGPpJ2YnEiqM6a7xUb/SpV1Ggtxw84ukXk9FICET kbjG/LyYRdg3NP1uLDhJ2m+hFECJOfi6Km+1RRIMoGcBs1ntiUO8NYoBIWMSkA== 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 4QkQvT2KRMzSvx; Sun, 18 Jun 2023 08:25:41 +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 35I8PfAk000155; Sun, 18 Jun 2023 08:25:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35I8Pfk3000154; Sun, 18 Jun 2023 08:25:41 GMT (envelope-from git) Date: Sun, 18 Jun 2023 08:25:41 GMT Message-Id: <202306180825.35I8Pfk3000154@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Eugene Grosbein Subject: git: 476e63e7b4e0 - main - net/ng_mikrotik_eoip: unbreak build for FreeBSD before 14.0 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: eugen X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 476e63e7b4e0f397ee2f371e0bd1ea75fb0a1758 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/ports/commit/?id=476e63e7b4e0f397ee2f371e0bd1ea75fb0a1758 commit 476e63e7b4e0f397ee2f371e0bd1ea75fb0a1758 Author: Eugene Grosbein AuthorDate: 2023-06-18 08:24:06 +0000 Commit: Eugene Grosbein CommitDate: 2023-06-18 08:25:34 +0000 net/ng_mikrotik_eoip: unbreak build for FreeBSD before 14.0 PR: 266392 Fixes: c9665e214f726d9a6e62af00d81b94567ebe2572 --- net/ng_mikrotik_eoip/Makefile | 2 -- net/ng_mikrotik_eoip/files/patch-ng__mikrotik__eoip.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/net/ng_mikrotik_eoip/Makefile b/net/ng_mikrotik_eoip/Makefile index b1450a92f9cc..e419c78eb4bf 100644 --- a/net/ng_mikrotik_eoip/Makefile +++ b/net/ng_mikrotik_eoip/Makefile @@ -10,8 +10,6 @@ WWW= http://imax.in.ua/ng_mikrotik_eoip/ LICENSE= BSD2CLAUSE -BROKEN= compilation fails due to a C error: id = *((unsigned int *)id; error: cast to 'unsigned int *' from smaller integer type 'uint16_t' - USES= kmod uidfix OPTIONS_DEFINE= PTABLE diff --git a/net/ng_mikrotik_eoip/files/patch-ng__mikrotik__eoip.c b/net/ng_mikrotik_eoip/files/patch-ng__mikrotik__eoip.c index 4649334fe687..327d32335e6d 100644 --- a/net/ng_mikrotik_eoip/files/patch-ng__mikrotik__eoip.c +++ b/net/ng_mikrotik_eoip/files/patch-ng__mikrotik__eoip.c @@ -25,7 +25,7 @@ +#if __FreeBSD_version >= 1400057 + id = data->id; +#else -+ id = *((unsigned int *)id; ++ id = *((unsigned int *)arg); +#endif + if (info != NULL && info->id == id) { +#if __FreeBSD_version >= 1400057