diff options
| -rw-r--r-- | net-misc/scponly/ChangeLog | 9 | ||||
| -rw-r--r-- | net-misc/scponly/Manifest | 3 | ||||
| -rw-r--r-- | net-misc/scponly/scponly-4.8-r4.ebuild | 300 |
3 files changed, 309 insertions, 3 deletions
diff --git a/net-misc/scponly/ChangeLog b/net-misc/scponly/ChangeLog index 0fa253c9d569..17cd927cb9e1 100644 --- a/net-misc/scponly/ChangeLog +++ b/net-misc/scponly/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-misc/scponly -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/scponly/ChangeLog,v 1.45 2009/09/23 19:44:01 patrick Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/scponly/ChangeLog,v 1.46 2010/01/23 03:18:06 matsuu Exp $ + +*scponly-4.8-r4 (23 Jan 2010) + + 23 Jan 2010; MATSUU Takuto <matsuu@gentoo.org> +scponly-4.8-r4.ebuild: + Fixed chroot issue, bug #299521. 23 Sep 2009; Patrick Lauer <patrick@gentoo.org> scponly-4.8.ebuild, scponly-4.8-r3.ebuild: diff --git a/net-misc/scponly/Manifest b/net-misc/scponly/Manifest index 0448ce7bd170..d698d8be6cc3 100644 --- a/net-misc/scponly/Manifest +++ b/net-misc/scponly/Manifest @@ -2,6 +2,7 @@ AUX scponly-4.8-gcc4.4.0.patch 571 RMD160 acb834c4fba11b7f412c930b74ffba6782acf5 AUX scponly-4.8-rsync.patch 7838 RMD160 fc7464eeab781ed51ba85b8120489e10b9db1442 SHA1 992e58ddc5ea7334cf9b72324a96f149b298c210 SHA256 bfab1408ad8cfdfd8fc7f9b583c57a5c6b73be36cb3955db46e4c892acd7e55e DIST scponly-4.8.tgz 101687 RMD160 de6b58fcb8108d42a1576c69003e9136b9417869 SHA1 154de34901ce22fd9d406f6e02cddc440c435afc SHA256 1693dd678355749c5d9e48ecdd4628dbfe71d82955afde950ee8d88b5adc01cf EBUILD scponly-4.8-r3.ebuild 9036 RMD160 2569e02a5e006b9fc35b6a38cf464c1f62be2425 SHA1 cdaca67a9070b5f473a01d369f42aa5f41c55dcd SHA256 62aad2169a0daa1162702fa67f9b436e69688a1b01f6cdc9f6b74d76dec9e53a +EBUILD scponly-4.8-r4.ebuild 9104 RMD160 d170f7846388dc05bbbbc56f53e61f466d15de1b SHA1 815b683da23734e53a36960a35acbcee080751ee SHA256 db3f640f2cd11bebc6ac0455d6c0a52a16ce9b663615512d9f6df5f2ad4142aa EBUILD scponly-4.8.ebuild 4272 RMD160 fa867f6b18d4b086a15a58f772e9a40d6756e555 SHA1 9eaa6c730302b45833d0e6f2b6848633eacb397c SHA256 4fc0918f74c2f5f8253647a5162678cdf1107985c51375fce1cd625f157ab205 -MISC ChangeLog 6705 RMD160 8a17a0331c814935bdcf30bebd94ea3633ee29c1 SHA1 554862bfb2feed8bc30f35d89365c6d402e125d4 SHA256 0f35ac0d9a5c34878363a458b503f1063aff09e043767468d0a66d96ef8eeeda +MISC ChangeLog 6844 RMD160 620bf3d56503a543bed2e5e9c5239489d85b3952 SHA1 8325590d5b7654f1501de48682dcd6925703bbcd SHA256 2483f23328626393c53dc794e17e3f4cb21952deb1a7d4fe22cf055a9597a33f MISC metadata.xml 1424 RMD160 bedfada17f8ebfb8964a627769b1f6f96114ada4 SHA1 c7063171c58a7d6195e291232b96820957df8fbf SHA256 39e481515e78825063291d053dd92d5652d0c824b706e67dadaccecdcad491e2 diff --git a/net-misc/scponly/scponly-4.8-r4.ebuild b/net-misc/scponly/scponly-4.8-r4.ebuild new file mode 100644 index 000000000000..360d012e4795 --- /dev/null +++ b/net-misc/scponly/scponly-4.8-r4.ebuild @@ -0,0 +1,300 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/scponly/scponly-4.8-r4.ebuild,v 1.1 2010/01/23 03:18:06 matsuu Exp $ + +EAPI="1" +inherit eutils multilib toolchain-funcs + +DESCRIPTION="A tiny pseudoshell which only permits scp and sftp" +HOMEPAGE="http://www.sublimation.org/scponly/" +SRC_URI="mirror://sourceforge/scponly/${P}.tgz" + +LICENSE="as-is" +SLOT="0" +KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86" +IUSE="+sftp scp winscp gftp rsync unison subversion wildcards quota passwd logging" + +RDEPEND="sys-apps/sed + net-misc/openssh + quota? ( sys-fs/quota ) + !mips? ( passwd? ( sys-apps/shadow ) ) + rsync? ( net-misc/rsync ) + !mips? ( unison? ( net-misc/unison ) ) + subversion? ( dev-util/subversion )" +DEPEND="${RDEPEND}" + +myuser="scponly" +myhome="/home/${myuser}" +mysubdir="/pub" + +pkg_setup() { + if use mips; then + if use unison || use passwd; then + eerror + eerror "unison and passwd use-flags are not supported on mips yet!" + die "unsupported use-flags for your arch" + fi + fi + + if use unison; then + if [ ! -e "${ROOT}usr/bin/unison" ]; then + eerror + eerror "please run 'eselect unison set <version>' first!" + die "can't find /usr/bin/unison" + fi + fi + + if ! use subversion && ! use unison && ! use rsync && \ + ! use sftp && ! use scp && ! use winscp; then + eerror + eerror "you have to enable at least one of the following use-flags:" + eerror "sftp scp winscp rsync unison subversion" + die "your build will quite useless without any compatibility mode" + fi + + if use subversion || use unison || use rsync || use wildcards || use scp || use winscp; then + ewarn + ewarn "NOTE THE FOLLOWING SECURITY RISKS:" + ewarn + if use wildcards; then + ewarn "-- by enabling wildcards, there is a slightly higher chance of an exploit" + fi + if use scp || use winscp; then + ewarn "-- by enabling scp and/or winscp compatibility, more programs will need" + ewarn " to be installed in the chroot which increases the risk." + fi + if use subversion; then + ewarn "-- CAUTION: by enabling subversion the user WILL BE ABLE TO EXECUTE" + ewarn " SCRIPTS OR PROGRAMS INDIRECTLY! svn and svnserve will try to execute" + ewarn " pre-commit, post-commit hooks, as well as a few others. These files" + ewarn " have specific filenames at specific locations relative to the svn" + ewarn " repository root. Thus, unless you are *very* careful about security," + ewarn " the user WILL BE ABLE TO EXECUTE SCRIPTS OR PROGRAMS INDIRECTLY!" + ewarn " This can be prevented by a careful configuration." + fi + if use subversion || use unison || use rsync; then + ewarn "-- The following programs use configuration files that might allow the" + ewarn " user to bypass security restrictions placed on command line arguments:" + ewarn " svn, svnserve, rsync, unison" + fi + ewarn + ewarn "please read /usr/share/doc/${PF}/SECURITY* after install!" + ewarn + ebeep 5 + fi +} + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}/${P}-rsync.patch" + # bug #269242 + epatch "${FILESDIR}/${P}-gcc4.4.0.patch" +} + +src_compile() { + CFLAGS="${CFLAGS} ${LDFLAGS}" econf \ + --with-sftp-server="/usr/$(get_libdir)/misc/sftp-server" \ + --with-default-chdir="/" \ + --disable-restrictive-names \ + --enable-chrooted-binary \ + --enable-chroot-checkdir \ + $(use_enable winscp winscp-compat) \ + $(use_enable gftp gftp-compat) \ + $(use_enable scp scp-compat) \ + $(use_enable sftp sftp) \ + $(use_enable quota quota-compat) \ + $(use_enable passwd passwd-compat) \ + $(use_enable rsync rsync-compat) \ + $(use_enable unison unison-compat) \ + $(use_enable subversion svn-compat) \ + $(use_enable subversion svnserv-compat) \ + $(use_enable logging sftp-logging-compat) \ + $(use_enable wildcards wildcards) \ + || die "econf failed" + emake CC=$(tc-getCC) || die "emake failed" +} + +src_install() { + emake DESTDIR="${D}" install || die + + dodoc AUTHOR BUILDING-JAILS.TXT CHANGELOG CONTRIB README SECURITY TODO + + # don't compress setup-script, so it is usable if necessary + insinto /usr/share/doc/${PF}/chroot + doins setup_chroot.sh config.h +} + +pkg_postinst() { + elog + elog "You might want to run" + elog " emerge --config =${CATEGORY}/${PF}" + elog "to setup the chroot. Otherwise you will have to setup chroot manually." + elog + elog "Please read the docs in /usr/share/doc/${PF} for more informations!" + elog + + # two slashes ('//') are used by scponlyc to determine the chroot point. + enewgroup "${myuser}" + enewuser "${myuser}" -1 /usr/sbin/scponlyc "${myhome}//" "${myuser}" +} + +pkg_config() { + # pkg_postinst is based on ${S}/setup_chroot.sh. + + einfo "Collecting binaries and libraries..." + + # Binaries launched in sftp compat mode + if built_with_use =${CATEGORY}/${PF} sftp; then + BINARIES="/usr/$(get_libdir)/misc/sftp-server" + fi + + # Binaries launched by vanilla- and WinSCP modes + if built_with_use =${CATEGORY}/${PF} scp || \ + built_with_use =${CATEGORY}/${PF} winscp; then + BINARIES="${BINARIES} /usr/bin/scp /bin/ls /bin/rm /bin/ln /bin/mv" + BINARIES="${BINARIES} /bin/chmod /bin/chown /bin/chgrp /bin/mkdir /bin/rmdir" + fi + + # Binaries launched in WinSCP compatibility mode + if built_with_use =${CATEGORY}/${PF} winscp; then + BINARIES="${BINARIES} /bin/pwd /bin/groups /usr/bin/id /bin/echo" + fi + + # Rsync compatability mode + if built_with_use =${CATEGORY}/${PF} rsync; then + BINARIES="${BINARIES} /usr/bin/rsync" + fi + + # Unison compatability mode + if built_with_use =${CATEGORY}/${PF} unison; then + BINARIES="${BINARIES} /usr/bin/unison" + fi + + # subversion cli/svnserv compatibility + if built_with_use =${CATEGORY}/${PF} subversion; then + BINARIES="${BINARIES} /usr/bin/svn /usr/bin/svnserve" + fi + + # passwd compatibility + if built_with_use =${CATEGORY}/${PF} passwd; then + BINARIES="${BINARIES} /bin/passwd" + fi + + # quota compatibility + if built_with_use =${CATEGORY}/${PF} quota; then + BINARIES="${BINARIES} /usr/bin/quota" + fi + + # build lib dependencies + LIB_LIST=$(ldd ${BINARIES} | sed -n 's:.* => \(/[^ ]\+\).*:\1:p' | sort -u) + + # search and add ld*.so + for LIB in /$(get_libdir)/ld.so /libexec/ld-elf.so /libexec/ld-elf.so.1 \ + /usr/libexec/ld.so /$(get_libdir)/ld-linux*.so.2 /usr/libexec/ld-elf.so.1; do + [ -f "${LIB}" ] && LIB_LIST="${LIB_LIST} ${LIB}" + done + + # search and add libnss_*.so + for LIB in /$(get_libdir)/libnss_{compat,files}*.so.*; do + [ -f "${LIB}" ] && LIB_LIST="${LIB_LIST} ${LIB}" + done + + # create base dirs + if [ ! -d "${myhome}" ]; then + einfo "Creating ${myhome}" + install -o0 -g0 -m0755 -d "${myhome}" + else + einfo "Setting owner for ${myhome}" + chown 0:0 "${myhome}" + fi + + if [ ! -d "${myhome}/etc" ]; then + einfo "Creating ${myhome}/etc" + install -o0 -g0 -m0755 -d "${myhome}/etc" + fi + + if [ ! -d "${myhome}/$(get_libdir)" ]; then + einfo "Creating ${myhome}/$(get_libdir)" + install -o0 -g0 -m0755 -d "${myhome}/$(get_libdir)" + fi + + if [ ! -e "${myhome}/lib" ]; then + einfo "Creating ${myhome}/lib" + ln -snf $(get_libdir) "${myhome}/lib" + fi + + if [ ! -d "${myhome}/usr/$(get_libdir)" ]; then + einfo "Creating ${myhome}/usr/$(get_libdir)" + install -o0 -g0 -m0755 -d "${myhome}/usr/$(get_libdir)" + fi + + if [ ! -e "${myhome}/usr/lib" ]; then + einfo "Creating ${myhome}/usr/lib" + ln -snf $(get_libdir) "${myhome}/usr/lib" + fi + + if [ ! -d "${myhome}${mysubdir}" ]; then + einfo "Creating ${myhome}${mysubdir} directory for uploading files" + install -o${myuser} -g${myuser} -m0755 -d "${myhome}${mysubdir}" + fi + + # create /dev/null (Bug 135505) + if [ ! -e "${myhome}/dev/null" ]; then + install -o0 -g0 -m0755 -d "${myhome}/dev" + mknod -m0777 "${myhome}/dev/null" c 1 3 + fi + + # install binaries + for BIN in ${BINARIES}; do + einfo "Install ${BIN}" + install -o0 -g0 -m0755 -d "${myhome}$(dirname ${BIN})" + if [ "${BIN}" = "/bin/passwd" ]; then # needs suid + install -p -o0 -g0 -m04711 "${BIN}" "${myhome}/${BIN}" + else + install -p -o0 -g0 -m0755 "${BIN}" "${myhome}/${BIN}" + fi + done + + # install libs + for LIB in ${LIB_LIST}; do + einfo "Install ${LIB}" + install -o0 -g0 -m0755 -d "${myhome}$(dirname ${LIB})" + install -p -o0 -g0 -m0755 "${LIB}" "${myhome}/${LIB}" + done + + # create ld.so.conf + einfo "Creating /etc/ld.so.conf" + for LIB in ${LIB_LIST}; do + dirname ${LIB} + done | sort -u | while read DIR; do + if ! grep 2>/dev/null -q "^${DIR}$" "${myhome}/etc/ld.so.conf"; then + echo "${DIR}" >> "${myhome}/etc/ld.so.conf" + fi + done + ldconfig -r "${myhome}" + + # update shells + einfo "Updating /etc/shells" + grep 2>/dev/null -q "^/usr/bin/scponly$" /etc/shells \ + || echo "/usr/bin/scponly" >> /etc/shells + + grep 2>/dev/null -q "^/usr/sbin/scponlyc$" /etc/shells \ + || echo "/usr/sbin/scponlyc" >> /etc/shells + + # create /etc/passwd + if [ ! -e "${myhome}/etc/passwd" ]; then + ( + echo "root:x:0:0:root:/:/bin/sh" + sed -n "s|^\(${myuser}:[^:]*:[^:]*:[^:]*:[^:]*:\).*|\1${mysubdir}:/bin/sh|p" /etc/passwd + ) > "${myhome}/etc/passwd" + fi + + # create /etc/group + if [ ! -e "${myhome}/etc/group" ]; then + ( + echo "root:x:0:" + sed -n "s|^\(${myuser}:[^:]*:[^:]*:\).*|\1|p" /etc/group + ) > "${myhome}/etc/group" + fi +} |