commit: 4b7dbb98b43ee519c1d2440bd9de06f2b923893a Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Mon Oct 12 08:54:16 2020 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Mon Oct 12 08:54:27 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b7dbb98
net-vpn/peervpn: Remove last-rited pkg Closes: https://bugs.gentoo.org/741614 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> net-vpn/peervpn/Manifest | 1 - .../peervpn-0.044-strncpy-null-terminator.patch | 91 ---------------------- net-vpn/peervpn/files/peervpn.initd | 21 ----- net-vpn/peervpn/files/peervpn.logrotated | 7 -- net-vpn/peervpn/files/peervpn.service | 12 --- net-vpn/peervpn/metadata.xml | 8 -- net-vpn/peervpn/peervpn-0.044-r5.ebuild | 75 ------------------ profiles/package.mask | 5 -- profiles/updates/1Q-2017 | 1 - 9 files changed, 221 deletions(-) diff --git a/net-vpn/peervpn/Manifest b/net-vpn/peervpn/Manifest deleted file mode 100644 index e12fef1f83f..00000000000 --- a/net-vpn/peervpn/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST peervpn-0.044.tar.gz 81948 BLAKE2B 7fcf4805846b304c8d26ab06a5f56fa7aa281eab05860f192e635ba12173954cd00502328239771b1882b0b74c8f24f796c51e86fd5d39765f51d2aa26953c6b SHA512 5dd8e056287a905f3aaddf93d6dad917047e6f7da30942f412ff7b2846afd26fb9f4e500cfcb76966b4045db2a37096f1aa43b87e777ff31c2e467aa0415cdba diff --git a/net-vpn/peervpn/files/peervpn-0.044-strncpy-null-terminator.patch b/net-vpn/peervpn/files/peervpn-0.044-strncpy-null-terminator.patch deleted file mode 100644 index e16d0ef8023..00000000000 --- a/net-vpn/peervpn/files/peervpn-0.044-strncpy-null-terminator.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 5dda3477ed31888b86792ed05c17d80a77fe0b03 Mon Sep 17 00:00:00 2001 -From: Zac Medico <[email protected]> -Date: Thu, 30 Mar 2017 16:03:27 -0700 -Subject: [PATCH] config.ic: fix strncpy calls to copy null terminator for 512 - byte strings - -This problem caused a 512 byte psk setting to trigger authentication -failure, since the strlen call used to set password_len would return -an unpredictable result on each peer. - -https://github.com/peervpn/peervpn/pull/20 ---- - config.ic | 26 +++++++++++++------------- - 1 file changed, 13 insertions(+), 13 deletions(-) - -diff --git a/config.ic b/config.ic -index e0eba35..405e9de 100644 ---- a/config.ic -+++ b/config.ic -@@ -147,55 +147,55 @@ static int parseConfigLine(char *line, int len, struct s_initconfig *cs) { - return 1; - } - else if(parseConfigLineCheckCommand(line,len,"local",&vpos)) { -- strncpy(cs->sourceip,&line[vpos],CONFPARSER_NAMEBUF_SIZE); -+ strncpy(cs->sourceip,&line[vpos],CONFPARSER_NAMEBUF_SIZE+1); - return 1; - } - else if(parseConfigLineCheckCommand(line,len,"port",&vpos)) { -- strncpy(cs->sourceport,&line[vpos],CONFPARSER_NAMEBUF_SIZE); -+ strncpy(cs->sourceport,&line[vpos],CONFPARSER_NAMEBUF_SIZE+1); - return 1; - } - else if(parseConfigLineCheckCommand(line,len,"user",&vpos)) { -- strncpy(cs->userstr,&line[vpos],CONFPARSER_NAMEBUF_SIZE); -+ strncpy(cs->userstr,&line[vpos],CONFPARSER_NAMEBUF_SIZE+1); - return 1; - } - else if(parseConfigLineCheckCommand(line,len,"group",&vpos)) { -- strncpy(cs->groupstr,&line[vpos],CONFPARSER_NAMEBUF_SIZE); -+ strncpy(cs->groupstr,&line[vpos],CONFPARSER_NAMEBUF_SIZE+1); - return 1; - } - else if(parseConfigLineCheckCommand(line,len,"chroot",&vpos)) { -- strncpy(cs->chrootstr,&line[vpos],CONFPARSER_NAMEBUF_SIZE); -+ strncpy(cs->chrootstr,&line[vpos],CONFPARSER_NAMEBUF_SIZE+1); - return 1; - } - else if(parseConfigLineCheckCommand(line,len,"networkname",&vpos)) { -- strncpy(cs->networkname,&line[vpos],CONFPARSER_NAMEBUF_SIZE); -+ strncpy(cs->networkname,&line[vpos],CONFPARSER_NAMEBUF_SIZE+1); - return 1; - } - else if(parseConfigLineCheckCommand(line,len,"interface",&vpos)) { -- strncpy(cs->tapname,&line[vpos],CONFPARSER_NAMEBUF_SIZE); -+ strncpy(cs->tapname,&line[vpos],CONFPARSER_NAMEBUF_SIZE+1); - return 1; - } - else if(parseConfigLineCheckCommand(line,len,"ifconfig4",&vpos)) { -- strncpy(cs->ifconfig4,&line[vpos],CONFPARSER_NAMEBUF_SIZE); -+ strncpy(cs->ifconfig4,&line[vpos],CONFPARSER_NAMEBUF_SIZE+1); - return 1; - } - else if(parseConfigLineCheckCommand(line,len,"ifconfig6",&vpos)) { -- strncpy(cs->ifconfig6,&line[vpos],CONFPARSER_NAMEBUF_SIZE); -+ strncpy(cs->ifconfig6,&line[vpos],CONFPARSER_NAMEBUF_SIZE+1); - return 1; - } - else if(parseConfigLineCheckCommand(line,len,"upcmd",&vpos)) { -- strncpy(cs->upcmd,&line[vpos],CONFPARSER_NAMEBUF_SIZE); -+ strncpy(cs->upcmd,&line[vpos],CONFPARSER_NAMEBUF_SIZE+1); - return 1; - } - else if(parseConfigLineCheckCommand(line,len,"initpeers",&vpos)) { -- strncpy(cs->initpeers,&line[vpos],CONFPARSER_NAMEBUF_SIZE); -+ strncpy(cs->initpeers,&line[vpos],CONFPARSER_NAMEBUF_SIZE+1); - return 1; - } - else if(parseConfigLineCheckCommand(line,len,"engine",&vpos)) { -- strncpy(cs->engines,&line[vpos],CONFPARSER_NAMEBUF_SIZE); -+ strncpy(cs->engines,&line[vpos],CONFPARSER_NAMEBUF_SIZE+1); - return 1; - } - else if(parseConfigLineCheckCommand(line,len,"psk",&vpos)) { -- strncpy(cs->password,&line[vpos],CONFPARSER_NAMEBUF_SIZE); -+ strncpy(cs->password,&line[vpos],CONFPARSER_NAMEBUF_SIZE+1); - cs->password_len = strlen(cs->password); - return 1; - } --- -2.10.2 - diff --git a/net-vpn/peervpn/files/peervpn.initd b/net-vpn/peervpn/files/peervpn.initd deleted file mode 100644 index 77d98a9558b..00000000000 --- a/net-vpn/peervpn/files/peervpn.initd +++ /dev/null @@ -1,21 +0,0 @@ -#!/sbin/openrc-run -# Copyright 2016-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="peervpn server" -pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"} -logfile=${logfile:-"/var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"} -user=${RC_SVCNAME} -group=${RC_SVCNAME} - -command="/usr/sbin/${RC_SVCNAME}" -command_args="${command_args:-/etc/peervpn/peervpn.conf}" -command_background="true" -# peervpn will drop privileges based on user and group config file settings -start_stop_daemon_args=" - --stdout ${logfile} - --stderr ${logfile}" - -depend() { - need net -} diff --git a/net-vpn/peervpn/files/peervpn.logrotated b/net-vpn/peervpn/files/peervpn.logrotated deleted file mode 100644 index e99669c9135..00000000000 --- a/net-vpn/peervpn/files/peervpn.logrotated +++ /dev/null @@ -1,7 +0,0 @@ -/var/log/peervpn/peervpn.log { - missingok - size 5M - rotate 3 - compress - copytruncate -} diff --git a/net-vpn/peervpn/files/peervpn.service b/net-vpn/peervpn/files/peervpn.service deleted file mode 100644 index 13c5310f517..00000000000 --- a/net-vpn/peervpn/files/peervpn.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=peervpn server -Requires=network-online.target -After=network-online.target - -[Service] -Environment=PEERVPN_OPTS="/etc/peervpn/peervpn.conf" -ExecStart=/usr/sbin/peervpn $PEERVPN_OPTS -Restart=on-failure - -[Install] -WantedBy=multi-user.target diff --git a/net-vpn/peervpn/metadata.xml b/net-vpn/peervpn/metadata.xml deleted file mode 100644 index 3e0eb5a02d5..00000000000 --- a/net-vpn/peervpn/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="github">peervpn/peervpn</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-vpn/peervpn/peervpn-0.044-r5.ebuild b/net-vpn/peervpn/peervpn-0.044-r5.ebuild deleted file mode 100644 index a768d8ee2ef..00000000000 --- a/net-vpn/peervpn/peervpn-0.044-r5.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit systemd toolchain-funcs user - -DESCRIPTION="P2P mesh VPN" -HOMEPAGE="https://github.com/peervpn/peervpn"; -EGIT_COMMIT="eb35174277fbf745c5ee0d5875d659dad819adfc" -SRC_URI="https://github.com/peervpn/peervpn/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="libressl" -RDEPEND="libressl? ( dev-libs/libressl:0= ) - !libressl? ( <dev-libs/openssl-1.1:0= )" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${PN}-${EGIT_COMMIT} - -PATCHES=( - "${FILESDIR}/${P}-strncpy-null-terminator.patch" -) - -pkg_setup() { - enewgroup ${PN} - enewuser ${PN} -1 -1 -1 ${PN} -} - -src_prepare() { - default - sed -e 's|^CFLAGS+=-O2||' -i Makefile || die -} - -src_compile() { - emake CC=$(tc-getCC) -} - -src_install() { - dosbin ${PN} - - insinto /etc/${PN} - newins peervpn.conf peervpn.conf.example - # read-only group access for bug 629418 - fowners root:${PN} /etc/${PN} - fperms 0750 /etc/${PN} - - newinitd "${FILESDIR}/${PN}.initd" "${PN}" - systemd_dounit "${FILESDIR}/${PN}.service" - - keepdir /var/log/${PN} - insinto /etc/logrotate.d - newins "${FILESDIR}/${PN}.logrotated" "${PN}" -} - -pkg_preinst() { - if ! has_version '>=net-vpn/peervpn-0.044-r4' && \ - [[ -d ${EROOT}/etc/${PN} && ! -L ${EROOT}/etc/${PN} && - $(find "${EROOT}/etc/${PN}" -maxdepth 1 -user "${PN}" ! -type l -print) ]]; then - ewarn "Tightening '${EROOT}/etc/${PN}' permissions for bug 629418" - # Tighten the parent directory permissions first, in - # order to protect against race conditions involving a - # less-privileged user. - chown root:${PN} "${EROOT}/etc/${PN}" - chmod g+rX-w,o-rwx "${EROOT}/etc/${PN}" - # Don't chown/chmod the referent of a symlink - # owned by a less-privileged user. - while read -r -d ''; do - chown root:${PN} "${REPLY}" || die - chmod g+rX-w,o-rwx "${REPLY}" || die - done < <(find "${EROOT}/etc/${PN}" -mindepth 1 -maxdepth 1 -user "${PN}" ! -type l -print0) - fi -} diff --git a/profiles/package.mask b/profiles/package.mask index aa9fcd38865..cc24c694063 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -483,11 +483,6 @@ dev-tex/dvipost # Former dependency of app-admin/supervisor. dev-python/meld3 -# Zac Medico <[email protected]> (2020-09-11) -# Upstream is inactive and does not support OpenSSL 1.1. -# Removal in 30 days. Bug #741614. -net-vpn/peervpn - # Thomas Deutschmann <[email protected]> (2020-09-11) # These versions are not compatible with current stable # dev-libs/openssl version, bug #741622. diff --git a/profiles/updates/1Q-2017 b/profiles/updates/1Q-2017 index eec7f221577..dce848ac34c 100644 --- a/profiles/updates/1Q-2017 +++ b/profiles/updates/1Q-2017 @@ -11,7 +11,6 @@ move net-misc/logmein-hamachi net-vpn/logmein-hamachi move net-misc/openconnect net-vpn/openconnect move net-misc/openfortivpn net-vpn/openfortivpn move net-misc/openvpn net-vpn/openvpn -move net-misc/peervpn net-vpn/peervpn move net-misc/strongswan net-vpn/strongswan move net-misc/tinc net-vpn/tinc move net-misc/vpnc net-vpn/vpnc
