Received: by mail.netbsd.org (Postfix, from userid 605) id 8123B84D45; Mon, 19 Sep 2022 15:15:51 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id B27B484D31 for ; Mon, 19 Sep 2022 15:15:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 4peM9tpoYths for ; Mon, 19 Sep 2022 15:15:50 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 2ADD784CEF for ; Mon, 19 Sep 2022 15:15:50 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 242A5FA90; Mon, 19 Sep 2022 15:15:50 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1663600550115330" MIME-Version: 1.0 Date: Mon, 19 Sep 2022 15:15:50 +0000 From: "Amitai Schleier" Subject: CVS commit: pkgsrc/mail/nullmailer To: pkgsrc-changes@NetBSD.org Reply-To: schmonz@netbsd.org X-Mailer: log_accum Message-Id: <20220919151550.242A5FA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1663600550115330 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: schmonz Date: Mon Sep 19 15:15:50 UTC 2022 Modified Files: pkgsrc/mail/nullmailer: distinfo Added Files: pkgsrc/mail/nullmailer/patches: patch-lib_mergelib.sh Log Message: Work around Xcode 14 errors linking libnullmailer.a into e.g. protocols/smtp: archive member '__.SYMDEF SORTED' is not mach-o or llvm bitcode file (likewise for '__.SYMDEF') To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 pkgsrc/mail/nullmailer/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/mail/nullmailer/patches/patch-lib_mergelib.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1663600550115330 Content-Disposition: inline Content-Length: 2071 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/mail/nullmailer/distinfo diff -u pkgsrc/mail/nullmailer/distinfo:1.23 pkgsrc/mail/nullmailer/distinfo:1.24 --- pkgsrc/mail/nullmailer/distinfo:1.23 Tue Oct 26 10:54:10 2021 +++ pkgsrc/mail/nullmailer/distinfo Mon Sep 19 15:15:49 2022 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.23 2021/10/26 10:54:10 nia Exp $ +$NetBSD: distinfo,v 1.24 2022/09/19 15:15:49 schmonz Exp $ BLAKE2s (nullmailer-2.2.tar.gz) = 2341e461f23373f325336b603c7e8136883c6e4c3d07b1c0da08d406baa8fe7d SHA512 (nullmailer-2.2.tar.gz) = 21b29d59f3c386c13ce4541ae11dc5cd69f842085479d7fc9a69a540abc608ce5c1825f06bd3566536b392931f7eeb1b2d35addd816849e6f431877bb18c8268 @@ -7,6 +7,7 @@ SHA1 (patch-Makefile.in) = 56ce789f85f4f SHA1 (patch-doc_nullmailer-queue.8) = 6d2651b4ebc2500504ce4f5620842ffc6bf0c2f6 SHA1 (patch-doc_nullmailer-send.8) = 1ab434a1a3293c11db87781217a1694798ba6f23 SHA1 (patch-lib_fdbuf_fdobuf.h) = 716854a1421ef2021f5383f3e63bd19ece900a23 +SHA1 (patch-lib_mergelib.sh) = f4160cd0e0981b2d3dcb7a2b09d06e775bb71f38 SHA1 (patch-lib_selfpipe.cc) = a5d7e24bfbf3fa823cbd4e696a1c6488586e3512 SHA1 (patch-test_Makefile.am) = 744771972ca47f154fbc4d8a59dc0fc9b3c616f8 SHA1 (patch-test_Makefile.in) = 5250f65a0758a9442aa6aec076b67af18ea2444c Added files: Index: pkgsrc/mail/nullmailer/patches/patch-lib_mergelib.sh diff -u /dev/null pkgsrc/mail/nullmailer/patches/patch-lib_mergelib.sh:1.1 --- /dev/null Mon Sep 19 15:15:50 2022 +++ pkgsrc/mail/nullmailer/patches/patch-lib_mergelib.sh Mon Sep 19 15:15:49 2022 @@ -0,0 +1,19 @@ +$NetBSD: patch-lib_mergelib.sh,v 1.1 2022/09/19 15:15:49 schmonz Exp $ + +Work around Xcode 14 errors linking libnullmailer.a into e.g. +protocols/smtp: + +archive member '__.SYMDEF SORTED' is not mach-o or llvm bitcode file + +(likewise for '__.SYMDEF') + +--- lib/mergelib.sh.orig 2017-10-24 00:12:30.000000000 +0000 ++++ lib/mergelib.sh +@@ -10,6 +10,7 @@ for input in "$@"; do + mkdir "$dir" + cd "$dir" + "${AR:-ar}" x ../../"$input" ++ rm -f "__.SYMDEF SORTED" "__.SYMDEF" + cd .. + done + "${AR:-ar}" rc ../"$archive" */* --_----------=_1663600550115330--