Date: Sun, 21 Jan 2024 03:32:23 GMT From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 21c2ec4b2c84 - 2024Q1 - security/libxcrypt: Unbreak on 15 Message-ID: <202401210332.40L3WNwo063656@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2024Q1 has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=21c2ec4b2c84068ccacc01b0d729b44064f95026 commit 21c2ec4b2c84068ccacc01b0d729b44064f95026 Author: Yuri Victorovich <yuri@FreeBSD.org> AuthorDate: 2024-01-21 03:30:51 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> CommitDate: 2024-01-21 03:32:18 +0000 security/libxcrypt: Unbreak on 15 The project uses the *.map file with symbols that don't exist. This was a warning on 14 and earlier systems, but it is an error on 15. Reported by: fallout (cherry picked from commit e787af0475b21b961316a7fb5c61f75e8a1e031b) --- security/libxcrypt/Makefile | 3 ++- security/libxcrypt/files/patch-Makefile.am | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/security/libxcrypt/Makefile b/security/libxcrypt/Makefile index f7703c108e1b..6bb8ff9e9cfe 100644 --- a/security/libxcrypt/Makefile +++ b/security/libxcrypt/Makefile @@ -1,6 +1,7 @@ PORTNAME= libxcrypt DISTVERSIONPREFIX= v DISTVERSION= 4.4.36 +PORTREVISION= 1 CATEGORIES= security MAINTAINER= yuri@FreeBSD.org @@ -9,7 +10,7 @@ WWW= https://github.com/besser82/libxcrypt LICENSE= LGPL21 -USES= autoreconf gmake libtool +USES= autoreconf gmake libtool pkgconfig USE_LDCONFIG= yes USE_GITHUB= yes diff --git a/security/libxcrypt/files/patch-Makefile.am b/security/libxcrypt/files/patch-Makefile.am new file mode 100644 index 000000000000..a68a0d9d1aa6 --- /dev/null +++ b/security/libxcrypt/files/patch-Makefile.am @@ -0,0 +1,22 @@ +- workaround for symbol map containing missing symbols, see https://github.com/besser82/libxcrypt/issues/181 + +--- Makefile.am.orig 2024-01-21 03:27:38 UTC ++++ Makefile.am +@@ -154,12 +154,12 @@ libcrypt_la_LDFLAGS = -version-info $(libcrypt_la_VERS + + libcrypt_la_LDFLAGS = -version-info $(libcrypt_la_VERSION) + +-if HAVE_VSCRIPT +-libcrypt_la_LDFLAGS += $(VSCRIPT_LDFLAGS),$(builddir)/libcrypt.map +-APPLY_SYMVERS = yes +-else ++#if HAVE_VSCRIPT ++#libcrypt_la_LDFLAGS += $(VSCRIPT_LDFLAGS),$(builddir)/libcrypt.map ++#APPLY_SYMVERS = yes ++#else + APPLY_SYMVERS = no +-endif ++#endif + + libcrypt_la_LDFLAGS += $(UNDEF_FLAG) $(TEXT_RELOC_FLAG) $(AM_LDFLAGS) +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401210332.40L3WNwo063656>