From nobody Mon Jun 26 23:30:47 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 4Qqkc74Tn7z4kNGN; Mon, 26 Jun 2023 23:30:47 +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 4Qqkc740qbz3wXN; Mon, 26 Jun 2023 23:30:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687822247; 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=ebeydperuV7atJSi6iHs7xIqb/YbBh9HEHkGSH1LUcQ=; b=ttOn04OMM1IhoHjco6NmDDOetBMD5t9OqRJqgwNmHP1QFAClGBM2V0bDyxhDJLnkxBiSqj 8yOcURr2Kg/H+JUV9qFcUeQHJ5cgdKaZ1HIVg/jzeM2DQzaeHN0p/0F8HJq7MoebSxWU6u EtoF9XIpkBX/ESohpCxs+i+TPHymf9lyXCNHV7uSfD+I+tvYAnCVASRPCh7b50ZuimYtH7 J/R6GlWTyXx4FSyejbMbBDq5y6uC9hSzhigmZriMpJC/6Ku5x/jOAEq7017QBJwKLiTWnq 7ceWbl6IcPPhz3A/u58WDJcjCbKKID1dj4QteNvYnG8rryzn7mSerH67xteQYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687822247; 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=ebeydperuV7atJSi6iHs7xIqb/YbBh9HEHkGSH1LUcQ=; b=uyIAjEGNvPxgjysud80mRwlMjmJ1nqY3C17WfpdPtyvHHlvSQ2m9fpC1m80dJgKK2PZ9e5 zfommoaliQtU/QTxE/RnuFirdFsBhlH/js9DR9b6QV0L56yXMcwPUpN7vTTeqo4CfDvneM wfQqBkrdN8XF/4FI/03tPDIjc9Hi+ONb3iH2/wbZJP2YZOgBhHe2sejqnRaizH5B7j5Bq0 fyJswgz/EkC3/hrbH6ck6KDitTjinLIzD+WL6x/vjbKKv11Ue8730zS4G0zcreKUU2O2H6 7WsBmJ5elqAQt4HqWwjn+Aoz765YqEiZcgZh+hddaUHHF03t22ZmcpymAWUrJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687822247; a=rsa-sha256; cv=none; b=m5lTG1+A3Ga+E6JgKW3WexTdkXoLVoIm+V0UlkJbRsHuWgbYRdu9K3vRIAFJCWHgQWv5UL /wdwdM3acXF8Cbzzz/PIIyiK83ZIe8S5R1Cxyku5wiKuUMBEkH6XWR6LwltvXL/L+vnQZs nJ+m9RD0DvBv8rgGZL0MpC3Es638CtTPgB8CeE1keyS3qje+AtkZZSLkvUw0rZr8ga5DWn bDMpBhyr5ys6Un086mldo5fZrS1Wq13B3ijWJ+M9hJlJIYdygf5cz+Zh9csLcPStU4bRY8 lWmSrOULAy5TRfEwPxahMi9SGO+mPgRnCqX9vCRTrIhhhcp4ys5MHyKD2iRaTw== 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 4Qqkc733S9zV2q; Mon, 26 Jun 2023 23:30:47 +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 35QNUlrM025773; Mon, 26 Jun 2023 23:30:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35QNUlaf025772; Mon, 26 Jun 2023 23:30:47 GMT (envelope-from git) Date: Mon, 26 Jun 2023 23:30:47 GMT Message-Id: <202306262330.35QNUlaf025772@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 0ef9bba39893 - main - ftp/wzdftpd: fix build with LLVM 16 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: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0ef9bba398930d4f8cd4b512188b5b8f3e8d4527 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=0ef9bba398930d4f8cd4b512188b5b8f3e8d4527 commit 0ef9bba398930d4f8cd4b512188b5b8f3e8d4527 Author: Robert Clausecker AuthorDate: 2023-06-26 15:16:17 +0000 Commit: Robert Clausecker CommitDate: 2023-06-26 23:30:29 +0000 ftp/wzdftpd: fix build with LLVM 16 Also fix staging violation. Reported by: fallout --- ftp/wzdftpd/Makefile | 2 +- ftp/wzdftpd/files/patch-backends_pam_libpam__main.c | 10 ++++++++++ ftp/wzdftpd/files/patch-libwzd-core_wzd__data.c | 20 ++++++++++++++++++++ ftp/wzdftpd/files/patch-libwzd-core_wzd__tls.c | 10 ++++++++-- ftp/wzdftpd/files/patch-wzdftpd_Makefile.am | 13 +++++++++++++ 5 files changed, 52 insertions(+), 3 deletions(-) diff --git a/ftp/wzdftpd/Makefile b/ftp/wzdftpd/Makefile index 92e66fd04320..e4333430f59b 100644 --- a/ftp/wzdftpd/Makefile +++ b/ftp/wzdftpd/Makefile @@ -1,6 +1,6 @@ PORTNAME= wzdftpd PORTVERSION= 0.8.3 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= ftp MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-sources/${PORTNAME}-${PORTVERSION:R} diff --git a/ftp/wzdftpd/files/patch-backends_pam_libpam__main.c b/ftp/wzdftpd/files/patch-backends_pam_libpam__main.c new file mode 100644 index 000000000000..361ceb1e3b49 --- /dev/null +++ b/ftp/wzdftpd/files/patch-backends_pam_libpam__main.c @@ -0,0 +1,10 @@ +--- backends/pam/libpam_main.c.orig 2023-06-26 15:12:29 UTC ++++ backends/pam/libpam_main.c +@@ -47,6 +47,7 @@ + #include + #include + #include ++#include + #include + + #include diff --git a/ftp/wzdftpd/files/patch-libwzd-core_wzd__data.c b/ftp/wzdftpd/files/patch-libwzd-core_wzd__data.c new file mode 100644 index 000000000000..879c3ed9799b --- /dev/null +++ b/ftp/wzdftpd/files/patch-libwzd-core_wzd__data.c @@ -0,0 +1,20 @@ +--- libwzd-core/wzd_data.c.orig 2023-06-26 15:01:55 UTC ++++ libwzd-core/wzd_data.c +@@ -529,7 +529,7 @@ int data_start_thread_retr(wzd_context_t * context) + int ret; + + thread = malloc(sizeof(wzd_thread_t)); +- ret = wzd_thread_create(thread, NULL, do_local_retr, context); ++ ret = wzd_thread_create(thread, NULL, (void *(*)(void *))do_local_retr, context); + + context->transfer_thread = thread; + +@@ -544,7 +544,7 @@ int data_start_thread_stor(wzd_context_t * context) + int ret; + + thread = malloc(sizeof(wzd_thread_t)); +- ret = wzd_thread_create(thread, NULL, do_local_stor, context); ++ ret = wzd_thread_create(thread, NULL, (void *(*)(void *))do_local_stor, context); + + context->transfer_thread = thread; + diff --git a/ftp/wzdftpd/files/patch-libwzd-core_wzd__tls.c b/ftp/wzdftpd/files/patch-libwzd-core_wzd__tls.c index ef82b2db639b..83ef3b62b204 100644 --- a/ftp/wzdftpd/files/patch-libwzd-core_wzd__tls.c +++ b/ftp/wzdftpd/files/patch-libwzd-core_wzd__tls.c @@ -9,14 +9,20 @@ } SSL_CTX_set_session_cache_mode(tls_ctx, SSL_SESS_CACHE_CLIENT); -@@ -779,7 +779,6 @@ void * ssl_get_obj(wzd_context_t * context) +@@ -777,12 +777,11 @@ void * ssl_get_obj(wzd_context_t * context) + + #include #include ++#include #include -#include #include #include - GCRY_THREAD_OPTION_PTHREAD_IMPL; +-GCRY_THREAD_OPTION_PTHREAD_IMPL; + + #include + @@ -892,7 +891,6 @@ int tls_init(void) /* The order matters. diff --git a/ftp/wzdftpd/files/patch-wzdftpd_Makefile.am b/ftp/wzdftpd/files/patch-wzdftpd_Makefile.am new file mode 100644 index 000000000000..33ce38c3c874 --- /dev/null +++ b/ftp/wzdftpd/files/patch-wzdftpd_Makefile.am @@ -0,0 +1,13 @@ +--- wzdftpd/Makefile.am.orig 2023-06-26 15:25:11 UTC ++++ wzdftpd/Makefile.am +@@ -22,10 +22,8 @@ dist_sysconf_DATA = wzd.cfg.sample wzd.pem \ + users.sample + + install-data-hook: +- ${INSTALL_PROGRAM} -m 775 -d $(localstatedir)/log/wzdftpd || true + + uninstall-hook: +- rmdir --ignore-fail-on-non-empty $(localstatedir)/log/wzdftpd || true + + EXTRA_DIST = KNOWN_BUGS TODO wzd.cfg.sample.in +