diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
commit | d934827bf44b7cfcf6711964418148fa60877668 (patch) | |
tree | 0625f358789b5e015e49db139cc1dbc9be00428f /net-vpn/peervpn | |
parent | 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff) |
gentoo resync : 25.11.2020
Diffstat (limited to 'net-vpn/peervpn')
-rw-r--r-- | net-vpn/peervpn/Manifest | 7 | ||||
-rw-r--r-- | net-vpn/peervpn/files/peervpn-0.044-strncpy-null-terminator.patch | 91 | ||||
-rw-r--r-- | net-vpn/peervpn/files/peervpn.initd | 21 | ||||
-rw-r--r-- | net-vpn/peervpn/files/peervpn.logrotated | 7 | ||||
-rw-r--r-- | net-vpn/peervpn/files/peervpn.service | 12 | ||||
-rw-r--r-- | net-vpn/peervpn/metadata.xml | 8 | ||||
-rw-r--r-- | net-vpn/peervpn/peervpn-0.044-r5.ebuild | 75 |
7 files changed, 0 insertions, 221 deletions
diff --git a/net-vpn/peervpn/Manifest b/net-vpn/peervpn/Manifest deleted file mode 100644 index 864486820550..000000000000 --- a/net-vpn/peervpn/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -AUX peervpn-0.044-strncpy-null-terminator.patch 3556 BLAKE2B 94b2a64b72b8486f600dd423d17b6a0762195d999d2e3509bc92225aef755d5e33e5ef8cb0851a8e5491a9f237495eb4d960650e97f22c4a2d619a96b0724b7d SHA512 d09686271ead53a5433a60b7b6551fea23661d5a76f55f7c6c2d94b1c8946c83d51990388d5e77049ccce2ad64292ce8ab815ffec94eacb53738be34584370c6 -AUX peervpn.initd 590 BLAKE2B 39a2ec06a71eb99de9a37cd42b05c63fd07af042b8b48652e07ecc182e4413391cd4135a4e776af509660801cbc5c3f13fbd9b8a15e3dfe55aaad84ca12f5f9d SHA512 68ef4c4de590ff6be19135f86fb9cbac88f80dac7a5094d262281404d8fa3aac2b22f532f65834a6d2da95818d55eb2a451d4724e1c4c783be60fb410bfbaa33 -AUX peervpn.logrotated 87 BLAKE2B c6b72aed372a87d766a9ba0e69b48929fd2484743c5576f9d87333be3a241479794f83d201e366483dee30aee48a4e5a2ad9fb7e6864f84bb9e4b47556dfaf67 SHA512 474d2cd0c92786d5b7b45604a235a9102197e9e3520c812db86c1183bc0ab0963dbbb538ff684a44bc47184eb3e87d77e6b2ddab72c52fccca529cc16f56f515 -AUX peervpn.service 256 BLAKE2B 51abeea30d4ebe81a7b9acf1ae0e5e8b65ddcaedd4ae2c3f0e6ab3e4524d75d9848328bfed737f8b39effeedd68e7d7ed9f1376ac144ae27c4d77b0603fdd496 SHA512 d2d7336ed77324f30d3a4d83fe47b43bbafc3340525eac862bd7637e3a72a70dba1dc9ea21ed59e1606c8d1c03c3ee5ab9da73b49e71cf70e536369ae9ecf01c -DIST peervpn-0.044.tar.gz 81948 BLAKE2B 7fcf4805846b304c8d26ab06a5f56fa7aa281eab05860f192e635ba12173954cd00502328239771b1882b0b74c8f24f796c51e86fd5d39765f51d2aa26953c6b SHA512 5dd8e056287a905f3aaddf93d6dad917047e6f7da30942f412ff7b2846afd26fb9f4e500cfcb76966b4045db2a37096f1aa43b87e777ff31c2e467aa0415cdba -EBUILD peervpn-0.044-r5.ebuild 1984 BLAKE2B 06f2d9ccae4306a25c09cc6f4e88667cf99512f15bb8e44160e3a4abcb047780dae809b80886719550a5d9726af45ea06d4e76916904b9ce4efcff528a33892a SHA512 aa5dbbe642f80062f87e0696ca24cb6e0b5b6972c6e21ebcca8f1967adc2ab42566b3087f1c370e6c4be9ffe019a09c475a3a09f2af92a106a65091a167ce21a -MISC metadata.xml 252 BLAKE2B 8efaf3584f131c0b67db417959443281e33ebeed3f51ed5032692c2ce88d38528a099940e970b171502aebdb8f0d203406350a9c46d6e700d75e8c40210b07d6 SHA512 b1d67eead7ededffaba731f36dca9165a9d55ac8fcde9fb15e136b7e4d10931eb3e2af6ffa0a6b8f1a4a2085145f3f30a87e32f3c01359a42a9365279457e119 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 e16d0ef80239..000000000000 --- 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 <zmedico@gentoo.org> -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 77d98a9558b0..000000000000 --- 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 e99669c91358..000000000000 --- 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 13c5310f517b..000000000000 --- 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 3e0eb5a02d53..000000000000 --- 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 a768d8ee2efb..000000000000 --- 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 -} |