From nobody Wed Nov 22 16:12:38 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 4Sb5qq05LNz529Nw; Wed, 22 Nov 2023 16:12:39 +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 4Sb5qp6k2rz3FlL; Wed, 22 Nov 2023 16:12:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700669558; 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=K396aOWO8Be7y3rxZZQOiroGDpf3uYaqfRMfFqNNZuk=; b=TkpDVRVKNpjv7Fuj4q/Aey3OXt6/jahVYZXSjbY/ivBHigLzhSHWPzc7K/Nf0vtq1ZKtMb WFk+4cS0aUT2rUXpaBa/8N26/nJG79xelm6viaevqeay00G6fxlJ09TsSC3KEvdGhUV+xB gABY6jSJaPIXjTs4Rly4AG3NvGwgxeIGcqX7BAOhSOdJtWynJdFEuWDO6IsHyWmfFfvof6 SPtD/Zqxqd4PW5DI9jeEbU/5TvynzpyXBxJzUtt89yJb2DQOVcBzK84hhzLSxlaQwsKj7c cYkCzUJXpio9WV3CDQ+UC2368CBIiM37kXmXSD0v/s2nYNRv9VzOo/SxA/uu2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700669558; 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=K396aOWO8Be7y3rxZZQOiroGDpf3uYaqfRMfFqNNZuk=; b=KjgKVd3GNy2n/H23T44/QpkQocxjp2qYGl1hrjw7XgKS5a0DChz2884vQNJnfwgo40ve5V vwqwFbDi8ZQLdYZIwZJWTNm/b+auwsLAnT8HMFxLvubayXH9tlyzQaw2YvrWSLUaH/zw75 z/9dgMFPNaSWniBx7U0+t5elRZSnElBh+RnHhb8JLj3WOxYOv/4kmTL3igdRhZ/GK5L+l1 5HAtPmA1mSOyOrUpjvQcvYQ64SfxT5EQkqsElp3B1EK2LlXGuK0iyThvMnAoOOiELLBqjy ESu14iiq4JJuLwaw6c/pJ91GfxcgUhzKpOPmK+YdWk0qCwWvlwiFVyecvxOZeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700669558; a=rsa-sha256; cv=none; b=qmAihoo9OW4HlD2mpq+uTzZ+piAe0OdycnBUp+awaYfSkNa/nZrEn4mPWgPSTIz1JDvWFB ZmFAYso7tLoLh+Vh7CLlHK1/b7TaWATZF0+XQydveYShB7iVQsKoFLwyS7IRY9g6Mvfp57 3trz5kWszMgRlEQog7XPaJHrwebgQdYhnYkygYOvlHceJhTTMebECJ8ztcwkCB93IWo29x xgxirI3EXKCrSecoeP/jPNkbkYyANfnDSdbVzBpq5U1vA4thES7usISdm4HkjEOM8P0wbN U8Craj7J5Q3Gmps4FoXU90efAk+zPXLp9CRw/Y8nyKQTYpeizQBL79rEKB39mw== 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 4Sb5qp5mp5z9yr; Wed, 22 Nov 2023 16:12:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AMGCcvD018024; Wed, 22 Nov 2023 16:12:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AMGCcaT018021; Wed, 22 Nov 2023 16:12:38 GMT (envelope-from git) Date: Wed, 22 Nov 2023 16:12:38 GMT Message-Id: <202311221612.3AMGCcaT018021@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Joe Marcus Clarke Subject: git: 4f1b8980a5ab - main - net/netatalk3: Fix build on 14.X 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: marcus X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4f1b8980a5ab4c0b987d38acca809030e9a88adc Auto-Submitted: auto-generated The branch main has been updated by marcus: URL: https://cgit.FreeBSD.org/ports/commit/?id=4f1b8980a5ab4c0b987d38acca809030e9a88adc commit 4f1b8980a5ab4c0b987d38acca809030e9a88adc Author: Joe Marcus Clarke AuthorDate: 2023-11-22 16:10:44 +0000 Commit: Joe Marcus Clarke CommitDate: 2023-11-22 16:10:44 +0000 net/netatalk3: Fix build on 14.X PR: 275261 With a little help from: girgen --- net/netatalk3/files/patch-etc_uams_uams__dhx2__pam.c | 11 +++++++++++ net/netatalk3/files/patch-etc_uams_uams__dhx__pam.c | 19 +++++++++++++++++++ net/netatalk3/files/patch-etc_uams_uams__pam.c | 11 +++++++++++ 3 files changed, 41 insertions(+) diff --git a/net/netatalk3/files/patch-etc_uams_uams__dhx2__pam.c b/net/netatalk3/files/patch-etc_uams_uams__dhx2__pam.c new file mode 100644 index 000000000000..51c31679b6c8 --- /dev/null +++ b/net/netatalk3/files/patch-etc_uams_uams__dhx2__pam.c @@ -0,0 +1,11 @@ +--- etc/uams/uams_dhx2_pam.c.orig 2023-11-22 15:19:12 UTC ++++ etc/uams/uams_dhx2_pam.c +@@ -136,7 +136,7 @@ error: + * echo off means password. + */ + static int PAM_conv (int num_msg, +-#ifdef LINUX ++#if defined(LINUX) || (defined(FREEBSD) && __FreeBSD_version >= 1400000) + const struct pam_message **msg, + #else + struct pam_message **msg, diff --git a/net/netatalk3/files/patch-etc_uams_uams__dhx__pam.c b/net/netatalk3/files/patch-etc_uams_uams__dhx__pam.c new file mode 100644 index 000000000000..ec176f5a80d0 --- /dev/null +++ b/net/netatalk3/files/patch-etc_uams_uams__dhx__pam.c @@ -0,0 +1,19 @@ +--- etc/uams/uams_dhx_pam.c.orig 2023-11-22 15:18:15 UTC ++++ etc/uams/uams_dhx_pam.c +@@ -8,6 +8,7 @@ + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif /* HAVE_CONFIG_H */ ++#include + + #if defined(USE_PAM) && defined(UAM_DHX) + #include +@@ -80,7 +80,7 @@ static char *PAM_password; + * echo off means password. + */ + static int PAM_conv (int num_msg, +-#ifdef LINUX ++#if defined(LINUX) || (defined(__FreeBSD_version) && __FreeBSD_version >= 1400000) + const struct pam_message **msg, + #else + struct pam_message **msg, diff --git a/net/netatalk3/files/patch-etc_uams_uams__pam.c b/net/netatalk3/files/patch-etc_uams_uams__pam.c new file mode 100644 index 000000000000..8bec8c72a221 --- /dev/null +++ b/net/netatalk3/files/patch-etc_uams_uams__pam.c @@ -0,0 +1,11 @@ +--- etc/uams/uams_pam.c.orig 2023-11-22 15:00:28 UTC ++++ etc/uams/uams_pam.c +@@ -53,7 +53,7 @@ extern UAM_MODULE_EXPORT void append(struct papfile *, + * echo off means password. + */ + static int PAM_conv (int num_msg, +-#ifdef LINUX ++#if defined(LINUX) || (defined(FREEBSD) && __FreeBSD_version >= 1400000) + const struct pam_message **msg, + #else + struct pam_message **msg,