From 886f4121130565cb2a7bd799308f0edaea4cd15d Mon Sep 17 00:00:00 2001 From: Sam James Date: Wed, 30 Jun 2021 19:40:05 +0100 Subject: dev-vcs/cvs: add missing libcrypt dependency Signed-off-by: Sam James --- dev-vcs/cvs/cvs-1.12.12-r13.ebuild | 99 ------------------------------------ dev-vcs/cvs/cvs-1.12.12-r14.ebuild | 100 +++++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+), 99 deletions(-) delete mode 100644 dev-vcs/cvs/cvs-1.12.12-r13.ebuild create mode 100644 dev-vcs/cvs/cvs-1.12.12-r14.ebuild diff --git a/dev-vcs/cvs/cvs-1.12.12-r13.ebuild b/dev-vcs/cvs/cvs-1.12.12-r13.ebuild deleted file mode 100644 index a2a40c346069..000000000000 --- a/dev-vcs/cvs/cvs-1.12.12-r13.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit pam toolchain-funcs - -DESCRIPTION="Concurrent Versions System - source code revision control tools" -HOMEPAGE="http://cvs.nongnu.org/" - -SRC_URI="mirror://gnu/non-gnu/cvs/source/feature/${PV}/${P}.tar.bz2 - doc? ( mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.html.tar.bz2 - mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.pdf - mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.ps )" - -LICENSE="GPL-2 LGPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -IUSE="crypt doc kerberos nls pam server" -RESTRICT="test" - -DEPEND=">=sys-libs/zlib-1.1.4 - kerberos? ( virtual/krb5 ) - pam? ( sys-libs/pam )" -RDEPEND="${DEPEND}" - -src_unpack() { - unpack ${P}.tar.bz2 - use doc && unpack cederqvist-${PV}.html.tar.bz2 -} - -PATCHES=( - "${FILESDIR}"/${P}-cvsbug-tmpfix.patch - "${FILESDIR}"/${P}-openat.patch - "${FILESDIR}"/${P}-block-requests.patch - "${FILESDIR}"/${P}-cvs-gnulib-vasnprintf.patch - "${FILESDIR}"/${P}-install-sh.patch - "${FILESDIR}"/${P}-hash-nameclash.patch # for AIX - "${FILESDIR}"/${P}-getdelim.patch # 314791 - "${FILESDIR}"/${PN}-1.12.12-rcs2log-coreutils.patch # 144114 - "${FILESDIR}"/${P}-mktime-x32.patch # 395641 - "${FILESDIR}"/${P}-fix-massive-leak.patch - "${FILESDIR}"/${P}-mktime-configure.patch #220040 #570208 - "${FILESDIR}"/${P}-CVE-2012-0804.patch - "${FILESDIR}"/${P}-format-security.patch - "${FILESDIR}"/${P}-musl.patch - "${FILESDIR}"/${P}-CVE-2017-12836-commandinjection.patch - ) -DOCS=( BUGS ChangeLog{,.zoo} DEVEL-CVS FAQ HACKING MINOR-BUGS NEWS \ - PROJECTS README TESTS TODO ) - -src_prepare() { - export CONFIG_SHELL=${BASH} # configure fails without - default - sed -i "/^AR/s:ar:$(tc-getAR):" diff/Makefile.in lib/Makefile.in || die -} - -src_configure() { - if tc-is-cross-compiler ; then - # Sane defaults when cross-compiling (as these tests want to - # try and execute code). - export cvs_cv_func_printf_ptr="yes" - fi - econf \ - --with-external-zlib \ - --with-tmpdir=${EPREFIX}/tmp \ - $(use_enable crypt encryption) \ - $(use_with kerberos gssapi) \ - $(use_enable nls) \ - $(use_enable pam) \ - $(use_enable server) -} - -src_install() { - # Not installed into emacs site-lisp because it clobbers the normal C - # indentations. - DOCS+=( cvs-format.el ) - - if use doc; then - DOCS+=( "${DISTDIR}"/cederqvist-${PV}.{pdf,ps} ) - HTML_DOCS=( ../cederqvist-${PV}.html/. ) - fi - - default - - use doc && dosym cvs.html /usr/share/doc/${PF}/html/index.html - - if use server; then - newdoc "${FILESDIR}"/cvs-1.12.12-cvs-custom.c cvs-custom.c - insinto /etc/xinetd.d - newins "${FILESDIR}"/cvspserver.xinetd.d cvspserver - newenvd "${FILESDIR}"/01-cvs-env.d 01cvs - fi - - if use pam; then - newpamd "${FILESDIR}"/cvs.pam-include-1.12.12 cvs - fi -} diff --git a/dev-vcs/cvs/cvs-1.12.12-r14.ebuild b/dev-vcs/cvs/cvs-1.12.12-r14.ebuild new file mode 100644 index 000000000000..3da8f4ec91e3 --- /dev/null +++ b/dev-vcs/cvs/cvs-1.12.12-r14.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit pam toolchain-funcs + +DESCRIPTION="Concurrent Versions System - source code revision control tools" +HOMEPAGE="http://cvs.nongnu.org/" + +SRC_URI="mirror://gnu/non-gnu/cvs/source/feature/${PV}/${P}.tar.bz2 + doc? ( mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.html.tar.bz2 + mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.pdf + mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.ps )" + +LICENSE="GPL-2 LGPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +IUSE="crypt doc kerberos nls pam server" +RESTRICT="test" + +DEPEND=">=sys-libs/zlib-1.1.4 + kerberos? ( virtual/krb5 ) + pam? ( sys-libs/pam ) + server? ( virtual/libcrypt:= )" +RDEPEND="${DEPEND}" + +src_unpack() { + unpack ${P}.tar.bz2 + use doc && unpack cederqvist-${PV}.html.tar.bz2 +} + +PATCHES=( + "${FILESDIR}"/${P}-cvsbug-tmpfix.patch + "${FILESDIR}"/${P}-openat.patch + "${FILESDIR}"/${P}-block-requests.patch + "${FILESDIR}"/${P}-cvs-gnulib-vasnprintf.patch + "${FILESDIR}"/${P}-install-sh.patch + "${FILESDIR}"/${P}-hash-nameclash.patch # for AIX + "${FILESDIR}"/${P}-getdelim.patch # 314791 + "${FILESDIR}"/${PN}-1.12.12-rcs2log-coreutils.patch # 144114 + "${FILESDIR}"/${P}-mktime-x32.patch # 395641 + "${FILESDIR}"/${P}-fix-massive-leak.patch + "${FILESDIR}"/${P}-mktime-configure.patch #220040 #570208 + "${FILESDIR}"/${P}-CVE-2012-0804.patch + "${FILESDIR}"/${P}-format-security.patch + "${FILESDIR}"/${P}-musl.patch + "${FILESDIR}"/${P}-CVE-2017-12836-commandinjection.patch + ) +DOCS=( BUGS ChangeLog{,.zoo} DEVEL-CVS FAQ HACKING MINOR-BUGS NEWS \ + PROJECTS README TESTS TODO ) + +src_prepare() { + export CONFIG_SHELL=${BASH} # configure fails without + default + sed -i "/^AR/s:ar:$(tc-getAR):" diff/Makefile.in lib/Makefile.in || die +} + +src_configure() { + if tc-is-cross-compiler ; then + # Sane defaults when cross-compiling (as these tests want to + # try and execute code). + export cvs_cv_func_printf_ptr="yes" + fi + econf \ + --with-external-zlib \ + --with-tmpdir=${EPREFIX}/tmp \ + $(use_enable crypt encryption) \ + $(use_with kerberos gssapi) \ + $(use_enable nls) \ + $(use_enable pam) \ + $(use_enable server) +} + +src_install() { + # Not installed into emacs site-lisp because it clobbers the normal C + # indentations. + DOCS+=( cvs-format.el ) + + if use doc; then + DOCS+=( "${DISTDIR}"/cederqvist-${PV}.{pdf,ps} ) + HTML_DOCS=( ../cederqvist-${PV}.html/. ) + fi + + default + + use doc && dosym cvs.html /usr/share/doc/${PF}/html/index.html + + if use server; then + newdoc "${FILESDIR}"/cvs-1.12.12-cvs-custom.c cvs-custom.c + insinto /etc/xinetd.d + newins "${FILESDIR}"/cvspserver.xinetd.d cvspserver + newenvd "${FILESDIR}"/01-cvs-env.d 01cvs + fi + + if use pam; then + newpamd "${FILESDIR}"/cvs.pam-include-1.12.12 cvs + fi +} -- cgit v1.2.3-65-gdbad