Date: Fri, 30 Apr 2021 13:53:27 GMT From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: f42cc79bcfa0 - main - security/sedutil: fix build on FreeBSD 13+ Message-ID: <202104301353.13UDrRl5098447@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=f42cc79bcfa0eeb79111a443e0e1c4225b90b609 commit f42cc79bcfa0eeb79111a443e0e1c4225b90b609 Author: Dmitry Marakasov <amdmi3@FreeBSD.org> AuthorDate: 2021-04-30 12:26:12 +0000 Commit: Dmitry Marakasov <amdmi3@FreeBSD.org> CommitDate: 2021-04-30 13:51:58 +0000 security/sedutil: fix build on FreeBSD 13+ Approved by: portmgr blanket --- security/sedutil/Makefile | 4 ++-- security/sedutil/files/patch-Common_DtaAnnotatedDump.h | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/security/sedutil/Makefile b/security/sedutil/Makefile index 0d8f64855d24..577a4dbbff79 100644 --- a/security/sedutil/Makefile +++ b/security/sedutil/Makefile @@ -14,11 +14,11 @@ GH_ACCOUNT= kendmerry GH_PROJECT= sedutil GH_TAGNAME= 3122ba0 -WRKSRC_SUBDIR= freebsd/CLI +BUILD_WRKSRC= ${WRKSRC}/freebsd/CLI ALL_TARGET= build PLIST_FILES+= bin/sedutil-cli -SEDUTIL_SD= ${WRKSRC}/dist/Release/CLang-Generic +SEDUTIL_SD= ${BUILD_WRKSRC}/dist/Release/CLang-Generic SEDUTIL_PROG= sedutil-cli do-install: diff --git a/security/sedutil/files/patch-Common_DtaAnnotatedDump.h b/security/sedutil/files/patch-Common_DtaAnnotatedDump.h new file mode 100644 index 000000000000..588fbe6fae34 --- /dev/null +++ b/security/sedutil/files/patch-Common_DtaAnnotatedDump.h @@ -0,0 +1,11 @@ +--- Common/DtaAnnotatedDump.h.orig 2017-05-17 20:10:01 UTC ++++ Common/DtaAnnotatedDump.h +@@ -17,7 +17,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #pragma once + #pragma pack(push,1) + +-typedef union ++typedef union TAG_CAtomHeader + { + // four bytes in big endian (network) byte order + uint8_t all[4];
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104301353.13UDrRl5098447>