commit: d6b99b298e4cb8560f53d0b991d6c51228bd52c7 Author: Stefan Strogin <steils <AT> gentoo <DOT> org> AuthorDate: Tue May 7 02:13:42 2019 +0000 Commit: Stefan Strogin <steils <AT> gentoo <DOT> org> CommitDate: Fri May 17 17:40:34 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6b99b29
net-libs/cvm: bump version to 0.97 Termporarily mask it since it depends on masked >=dev-libs/bglibs-2.04. Closes: https://bugs.gentoo.org/685238 Closes: https://github.com/gentoo/gentoo/pull/11923 Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Stefan Strogin <steils <AT> gentoo.org> net-libs/cvm/Manifest | 1 + net-libs/cvm/cvm-0.97.ebuild | 122 +++++++++++++++++++++++++++++++++++++++++++ profiles/package.mask | 4 ++ 3 files changed, 127 insertions(+) diff --git a/net-libs/cvm/Manifest b/net-libs/cvm/Manifest index 20d601ec49f..e10607f7355 100644 --- a/net-libs/cvm/Manifest +++ b/net-libs/cvm/Manifest @@ -1,2 +1,3 @@ DIST cvm-0.76.tar.gz 91957 BLAKE2B 4b1ff780fa0842f2dba7afafe98479b76b95c3dc71ea3fe0321c92039697fde1fa69a99ee78450cadae6b23941344c48f4d4c845f9c3fcc8a69a5f8f208fbee6 SHA512 f3634be766e1381a95c09514547679f458e92b5f4de468b5d3b4e5f7e8f1eb8d1aa7eb5e2b15a374cbf51cc5f6e6269e7f5e7d9daf8d2adfaed37d2e11f472fa DIST cvm-0.96.tar.gz 127999 BLAKE2B bf6a0f26538f4f10dafe9d021e6f3ef22ee57230f64cf50cba95be3cb5ddf54a0479d033936d26ee9526745ead61fc6af7bfd1fdc3da10a6915108b2d873772c SHA512 23adf39571bf414fa61084ac824a54b3cb37ef32a46c72ad50734743fb66bb923168eb866d72fba7f88397b37831e2ce7603c7d543996b28761ed1d5b053d73d +DIST cvm-0.97.tar.gz 127759 BLAKE2B 857a30ae52e7edc5e8bc66dfbe7e2ada6ba7763260b073eabbca6ee289b68ceece92442dffc5aa1d358faec24f90993d88d3555dd9399837f25e9f689ab6d66b SHA512 b04ca9edb8c84e06628ed1a827d28bf7d787c3853bec1e064fc1eb7e3082ad81998e7c902e029c0f01c346a52a4419e3c9890e2a7a75ab38625e0078dc4e9891 diff --git a/net-libs/cvm/cvm-0.97.ebuild b/net-libs/cvm/cvm-0.97.ebuild new file mode 100644 index 00000000000..9f7bfe2f738 --- /dev/null +++ b/net-libs/cvm/cvm-0.97.ebuild @@ -0,0 +1,122 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +DESCRIPTION="Credential Validation Modules by Bruce Guenter" +HOMEPAGE="http://untroubled.org/cvm/"; +SRC_URI="http://untroubled.org/cvm/archive/${P}.tar.gz"; + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +IUSE="mysql postgres test vpopmail" +RESTRICT="!test? ( test )" + +RDEPEND="dev-db/cdb:= + >=dev-libs/bglibs-2.04:0=" +DEPEND="${RDEPEND} + mysql? ( dev-db/mysql-connector-c:0= ) + postgres? ( dev-db/postgresql[server] ) + vpopmail? ( net-mail/vpopmail ) + test? ( + app-editors/vim + dev-db/sqlite + )" +# some of the testcases use +# - ex/vi/xxd +# - cdbmake +# - sqlite + +PATCHES=( "${FILESDIR}"/${PN}-0.96-fix-test-padding.patch ) + +src_prepare() { + default + # disable this test, as it breaks under Portage + # and there is no easy fix + sed -i.orig \ + -e '/qmail-lookup-nodomain/,/^END_OF_TEST_RESULTS/d' \ + tests.sh || die "sed failed" + # Fix the vpopmail build + sed -i.orig \ + -e '/.\/ltload cvm-vchkpw/s,-lmysqlclient,,g' \ + -e '/.\/ltload cvm-vchkpw/s,-L/usr/local/vpopmail/lib,,g' \ + -e '/.\/ltload cvm-vchkpw/s,-L/var/vpopmail/lib,,g' \ + -e '/.\/ltload cvm-vchkpw/s,-L/usr/local/lib/mysql,,g' \ + -e '/.\/ltload cvm-vchkpw/s,\.la,.la `cat /var/vpopmail/etc/lib_deps`,g' \ + Makefile \ + || die "Failed to fix vpopmail linking parts of Makefile" + sed -i.orig \ + -e '/.\/compile cvm-vchkpw/s,$, `cat /var/vpopmail/etc/inc_deps`,g' \ + Makefile \ + || die "Failed to fix vpopmail compiling parts of Makefile" + sed -i '/\-rpath/s|conf\-lib|conf\-rpath|' Makefile || die +} + +src_configure() { + echo "${ED}/usr/include" > conf-include || die + echo "${ED}/usr/$(get_libdir)" > conf-lib || die + echo "${ED}/usr/bin" > conf-bin || die + echo "${EPREFIX}/usr/$(get_libdir)" > conf-rpath || die + echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die + echo "$(tc-getCC) ${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir)/bglibs -lcrypt" > conf-ld || die +} + +src_compile() { + default + + if use mysql; then + einfo "Building MySQL support" + emake mysql + fi + + if use postgres; then + einfo "Building Postgresql support" + emake pgsql + fi + + if use vpopmail; then + einfo "Building vpopmail support" + emake cvm-vchkpw + fi +} + +src_test() { + # bug 624384 + # the test suite tests stuff that isn't potentially enabled + emake -j1 sqlite + sh tests.sh || die "Testing Failed" +} + +src_install() { + # Upstreams installer is incredibly broken + dolib.a .libs/*.a + dolib.so .libs/*.so* + + local i + for i in a so; do + dosym libcvm-v2client.${i} /usr/$(get_libdir)/libcvm-client.${i} + done + + for i in {bench,test}client chain checkpassword pwfile qmail unix \ + vmailmgr{,-local,-udp} v1{benchclient,checkpassword,testclient} \ + ; do + dobin .libs/cvm-${i} + done + use mysql && dobin .libs/cvm-mysql{,-local,-udp} + use postgres && dobin .libs/cvm-pgsql{,-local,-udp} + use vpopmail && dobin .libs/cvm-vchkpw + + insinto /usr/include/cvm + doins {credentials,errors,facts,module,protocol,sasl,v1client,v2client}.h + dosym v1client.h /usr/include/cvm/client.h + dosym cvm/sasl.h /usr/include/cvm-sasl.h + + dodoc ANNOUNCEMENT NEWS{,.sql,.vmailmgr} + dodoc README{,.vchkpw,.vmailmgr} + dodoc TODO VERSION ChangeLog* + docinto html + dodoc *.html +} diff --git a/profiles/package.mask b/profiles/package.mask index 074146aec93..f40e022a5ad 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -28,6 +28,10 @@ ## app-misc/some-package #--- END OF EXAMPLES --- +# +# Stefan Strogin <[email protected]> (17 May 2019) +# Depends on >=dev-libs/bglibs-2.04. Bug #685238. +>=net-libs/cvm-0.97 # Matt Turner <[email protected]> (16 May 2019) # Not supported by the Xserver since v1.6.0 (2008)
