diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-12-15 18:09:03 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-12-15 18:09:03 +0000 |
| commit | 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch) | |
| tree | 4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /net-misc/scponly | |
| parent | b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff) | |
gentoo resync : 15.12.2019
Diffstat (limited to 'net-misc/scponly')
| -rw-r--r-- | net-misc/scponly/Manifest | 4 | ||||
| -rw-r--r-- | net-misc/scponly/files/scponly-4.8-gcc4.4.0.patch | 6 | ||||
| -rw-r--r-- | net-misc/scponly/scponly-4.8-r6.ebuild (renamed from net-misc/scponly/scponly-4.8-r5.ebuild) | 27 |
3 files changed, 20 insertions, 17 deletions
diff --git a/net-misc/scponly/Manifest b/net-misc/scponly/Manifest index cf660fc0b2b0..d63ee2342967 100644 --- a/net-misc/scponly/Manifest +++ b/net-misc/scponly/Manifest @@ -1,5 +1,5 @@ -AUX scponly-4.8-gcc4.4.0.patch 571 BLAKE2B 8934806f75ebf80afabe11bb5d63ce1d1716fdba12c7dd31875c0ac0d5664fe254e80d4d4880b0c875487600ff8825104517df9f16a1b7d07a66e5ebf7d80268 SHA512 2e215ab2c39bb0550345725d3d509354be88144000072e5e14eda9f0ecb1bcc4c418e76d9db85ef6d6568962efc4472fe28d855e15adfe2bc5ba78c69d293a12 +AUX scponly-4.8-gcc4.4.0.patch 555 BLAKE2B 0eff2d5cd94f60540dd1bbb6b6f9f1486abbb25e4a32d6eab5c94e55a3d14b77e4724b7c1e70f8a39369becc554d20953bc9f43d44923582f41ed02adc37f665 SHA512 fd9727364591d528e17845eb3e103728382fa7b476b9c0331f16f3e09dc469df7068412047a30b554578887e7897e80574ac820314ec0dae5d58909e3bb5f7de AUX scponly-4.8-rsync.patch 7838 BLAKE2B 1d6191aee86b0e3e75e527dbb1f8dbf631940a34da3f29f36b0e55577555dc9ad02e2e787a8cd53aeab5a28d93da7dd528a486f1133fd7a04b91971774b4b2a1 SHA512 37885c9b46422ac034182f9c9f230b4e806ce8c894ebb6c621f0e2b3d5f46c91db902c2dae6aefe5471907025d400320e4eff37cc7c5cc4c6f7d8c88a38e53f8 DIST scponly-4.8.tgz 101687 BLAKE2B aa7250464fa3b51a439d35418c64d49f8595eaac6ffe710137c7c53b96bcf66a5ead38e9520b2cead7a829b57520f988f873eb713d5f52045cba4ef02c8e9b61 SHA512 134c008a7377cef7b8e0be483df8413e162a515967147f561d23b72bdef3dfbe70a8313811dfff6372b88f15c1ac8a4385831fcf329261276993c64d5040f29b -EBUILD scponly-4.8-r5.ebuild 6848 BLAKE2B 743b3fd102a128968d4bf9aee0575fd8b36bc93b5e942a2145dfa72fdd464ac75b26b297daf6a307d51988cc25338f0b56fdeb8a6dc46f1f6b10fb50377a287b SHA512 da4fd7c60c5b268823f9d5083b8578ae22d3678963f44cbc2ad0420522f5a28843b78f21d39e1decca4d9b462a0f426cb74cb349055515f3e81970f21274e266 +EBUILD scponly-4.8-r6.ebuild 6872 BLAKE2B 157742b3ba96711c41389bf038c112438de483145cfc30357499b3e2ddfb3cd9a1d7e5cdfa1c839cd7faaf9a0f82f938adb8f2f135ef7a6ca7ea1ba70728adb3 SHA512 a51fe4efa6d1aaf45aea4ad8c221e02f07533d5dbfff50b0bf34da73252ef5f6be80def1236611375bdbe18862dc60e5dbde24b7af3d56e664981247d34b2aa1 MISC metadata.xml 1443 BLAKE2B 2a5a24d22c30cfafe590841b6d6e4eb73d9c42dddc469e617c79585eaa05a3a7b1bf31b6cc6fc0f7b1c521610d969e6c40d197af08e3dcce37b7ce65f67d259b SHA512 b44a26ac0944e8b0b99bfd62a21684b9846a52e416a2874a1af9bbcdf270ff337dd26a55a24c6b4dd131ba51ef3b7b40e1375478a14049392782a5adbb1fed07 diff --git a/net-misc/scponly/files/scponly-4.8-gcc4.4.0.patch b/net-misc/scponly/files/scponly-4.8-gcc4.4.0.patch index d08ce28b93b5..8bb689f5914d 100644 --- a/net-misc/scponly/files/scponly-4.8-gcc4.4.0.patch +++ b/net-misc/scponly/files/scponly-4.8-gcc4.4.0.patch @@ -1,5 +1,7 @@ ---- helper.c.orig 2009-05-11 00:33:08.000000000 -0600 -+++ helper.c 2009-05-11 00:39:59.000000000 -0600 +https://bugs.gentoo.org/269242 + +--- scponly-4.8.orig/helper.c ++++ scponly-4.8/helper.c @@ -259,11 +259,11 @@ PROG_RSYNC, logstamp()); return 1; diff --git a/net-misc/scponly/scponly-4.8-r5.ebuild b/net-misc/scponly/scponly-4.8-r6.ebuild index 2e53a29f0870..c7b2b8ba88d0 100644 --- a/net-misc/scponly/scponly-4.8-r5.ebuild +++ b/net-misc/scponly/scponly-4.8-r6.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils multilib readme.gentoo toolchain-funcs user +EAPI=7 + +inherit multilib readme.gentoo-r1 toolchain-funcs user DESCRIPTION="A tiny pseudoshell which only permits scp and sftp" HOMEPAGE="https://github.com/scponly/scponly" @@ -22,6 +23,7 @@ RDEPEND=" quota? ( sys-fs/quota ) rsync? ( net-misc/rsync ) subversion? ( dev-vcs/subversion ) + unison? ( net-misc/unison:= ) " DEPEND="${RDEPEND}" @@ -29,6 +31,11 @@ myuser="scponly" myhome="/home/${myuser}" mysubdir="/pub" +PATCHES=( + "${FILESDIR}/${P}-rsync.patch" + "${FILESDIR}/${P}-gcc4.4.0.patch" +) + DOC_CONTENTS=" You might want to run\n emerge --config =${CATEGORY}/${PF}\n @@ -37,12 +44,6 @@ DOC_CONTENTS=" the SECURITY file. " -src_prepare() { - epatch "${FILESDIR}/${P}-rsync.patch" - # bug #269242 - epatch "${FILESDIR}/${P}-gcc4.4.0.patch" -} - src_configure() { CFLAGS="${CFLAGS} ${LDFLAGS}" econf \ --with-sftp-server="/usr/$(get_libdir)/misc/sftp-server" \ @@ -72,9 +73,9 @@ src_install() { dodoc AUTHOR BUILDING-JAILS.TXT CHANGELOG CONTRIB README SECURITY TODO + ( docinto chroot; dodoc setup_chroot.sh config.h ) # don't compress setup-script, so it is usable if necessary - insinto /usr/share/doc/${PF}/chroot - doins setup_chroot.sh config.h + docompress -x /usr/share/doc/${PF}/chroot readme.gentoo_create_doc } @@ -126,7 +127,7 @@ pkg_config() { # passwd compatibility if has_version "=${CATEGORY}/${PF}[passwd]" ; then - BINARIES="${BINARIES} /bin/passwd" + BINARIES="${BINARIES} /usr/bin/passwd" fi # quota compatibility @@ -197,7 +198,7 @@ pkg_config() { for BIN in ${BINARIES}; do einfo "Install ${BIN}" install -o0 -g0 -m0755 -d "${myhome}$(dirname ${BIN})" - if [ "${BIN}" = "/bin/passwd" ]; then # needs suid + if [ "${BIN}" = "/usr/bin/passwd" ]; then # needs suid install -p -o0 -g0 -m04711 "${BIN}" "${myhome}/${BIN}" else install -p -o0 -g0 -m0755 "${BIN}" "${myhome}/${BIN}" |