mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-21 10:37:22 -08:00
Merge updates from master
This commit is contained in:
@@ -1,2 +1,3 @@
|
||||
DIST arno-iptables-firewall_2.0.1d.tar.gz 125329 SHA256 177343362063125985e8b0008fe69bc6ca8d3ba252cfa35a316e708f52fef9c6 SHA512 a99f4fcf4f84a47cc1bda26b39e4f3dc7e10b74f3aeaea8a2519bf18f43ff08ec0bfbd0f078ac36ce12da31d3ac0eabc51231b4559cadca13cd4d75e0940bf9d WHIRLPOOL 2dd56678015cf49ed9442c63c5455c70e72a6f252d9278a56ae1eaabda34d597c44f7fdb97695656882754776385778a5e67d83e7e35e4554e5765e3a0e68b13
|
||||
DIST arno-iptables-firewall_2.0.1e.tar.gz 126238 SHA256 fa7b865e5d9b8e077cba73b2f28695a2fd691092a0a7f9e1c16ee369fc27fe43 SHA512 244b3bbf08b2d97128908aece487388bb71ced002cc129885144f4eacf9cf6053c9eb1225a1cd33fdefc502f1e6822a85710d35a7884e99cfde35d34f3fd4f70 WHIRLPOOL f6c1b5ade8b4acdcc4c8e90e19a84335c3932d2a58bbba2221a91b7cbd228c4d6072af6e21836314d86ef005780b47c5ce85198219b345116af529178e2133c1
|
||||
DIST arno-iptables-firewall_2.0.1f-rc1.tar.gz 129834 SHA256 84f3e96bb85dbcad2916922d537aa0f188df59ece7ea9d9c0f669468938713e0 SHA512 cf7c2f97e74e01be48a8206be3116156740dfd2022df957651b587de1492157363249c067a778209c1e239f53c30426c32e6b1f901949c37ab2b5d690542d620 WHIRLPOOL 969e09b206cf1e132e93151461297fdb3b40ba849b4b4c9ff9e2ef8095526e4e8340b348e2bc97cfe9838b7de3f42cb1acae7c21d6261dcab5392e26ba81afc4
|
||||
|
||||
@@ -0,0 +1,93 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
inherit readme.gentoo systemd versionator
|
||||
|
||||
DESCRIPTION="Arno's iptables firewall script"
|
||||
HOMEPAGE="http://rocky.eld.leidenuniv.nl"
|
||||
|
||||
MY_PV=$(replace_version_separator 3 -)
|
||||
SRC_URI="http://rocky.eld.leidenuniv.nl/${PN}/${PN}_${MY_PV}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="+plugins"
|
||||
|
||||
# sys-apps/coreutils dependency wrt
|
||||
# https://bugs.gentoo.org/show_bug.cgi?id=448716
|
||||
|
||||
DEPEND=""
|
||||
RDEPEND="net-firewall/iptables
|
||||
>sys-apps/coreutils-8.20-r1
|
||||
sys-apps/iproute2
|
||||
plugins? ( net-dns/bind-tools )"
|
||||
|
||||
S="${WORKDIR}/${PN}_${MY_PV/rc/RC}"
|
||||
|
||||
DISABLE_AUTOFORMATTING="yes"
|
||||
DOC_CONTENTS="You will need to configure /etc/${PN}/firewall.conf
|
||||
before using this package. To start the script, run:
|
||||
|
||||
/etc/init.d/${PN} start (for OpenRC)
|
||||
systemctl start ${PN} (for systemd)
|
||||
|
||||
If you want to start this script at boot, run:
|
||||
|
||||
rc-update add ${PN} default (for OpenRC)
|
||||
systemctl enable ${PN} (for systemd)"
|
||||
|
||||
src_prepare() {
|
||||
sed -i -e 's:/usr/local/share/:/usr/libexec/:' \
|
||||
etc/"${PN}"/firewall.conf || die "Sed failed!"
|
||||
sed -i -e 's:/usr/local/sbin/:/usr/sbin/:' \
|
||||
lib/systemd/system/"${PN}.service" || die "Sed failed!"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
insinto /etc/"${PN}"
|
||||
doins etc/"${PN}"/firewall.conf
|
||||
doins etc/"${PN}"/custom-rules
|
||||
|
||||
doinitd "${FILESDIR}/${PN}"
|
||||
systemd_dounit lib/systemd/system/"${PN}.service"
|
||||
|
||||
dobin bin/arno-fwfilter
|
||||
dosbin bin/"${PN}"
|
||||
|
||||
insinto /usr/libexec/"${PN}"
|
||||
doins share/"${PN}"/environment
|
||||
|
||||
dodoc CHANGELOG README
|
||||
readme.gentoo_create_doc
|
||||
|
||||
if use plugins
|
||||
then
|
||||
insinto /etc/"${PN}"/plugins
|
||||
doins etc/"${PN}"/plugins/*
|
||||
|
||||
insinto /usr/libexec/"${PN}"/plugins
|
||||
doins share/"${PN}"/plugins/*.plugin
|
||||
|
||||
exeinto /usr/libexec/"${PN}"/plugins
|
||||
doexe share/"${PN}"/plugins/dyndns-host-open-helper
|
||||
doexe share/"${PN}"/plugins/traffic-accounting-helper
|
||||
doexe share/"${PN}"/plugins/traffic-accounting-log-rotate
|
||||
doexe share/"${PN}"/plugins/traffic-accounting-show
|
||||
|
||||
docinto plugins
|
||||
dodoc share/"${PN}"/plugins/*.CHANGELOG
|
||||
fi
|
||||
|
||||
doman share/man/man1/arno-fwfilter.1 \
|
||||
share/man/man8/"${PN}".8
|
||||
}
|
||||
|
||||
pkg_postinst () {
|
||||
ewarn "When you stop this script, all firewall rules are flushed!"
|
||||
ewarn "Make sure to not use multiple firewall scripts simultaneously"
|
||||
ewarn "unless you know what you are doing!"
|
||||
readme.gentoo_print_elog
|
||||
}
|
||||
@@ -48,8 +48,7 @@ LIB_DEPEND="
|
||||
selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
|
||||
skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] )
|
||||
ssl? (
|
||||
!bindist? ( >=dev-libs/openssl-0.9.8f:0[-bindist] )
|
||||
bindist? ( >=dev-libs/openssl-0.9.8f:0 )
|
||||
>=dev-libs/openssl-0.9.8f:0[bindist=]
|
||||
dev-libs/openssl[static-libs(+)]
|
||||
)
|
||||
>=sys-libs/zlib-1.2.3[static-libs(+)]"
|
||||
|
||||
@@ -48,8 +48,7 @@ LIB_DEPEND="
|
||||
selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
|
||||
skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] )
|
||||
ssl? (
|
||||
!bindist? ( >=dev-libs/openssl-0.9.8f:0[-bindist] )
|
||||
bindist? ( >=dev-libs/openssl-0.9.8f:0 )
|
||||
>=dev-libs/openssl-0.9.8f:0[bindist=]
|
||||
dev-libs/openssl[static-libs(+)]
|
||||
)
|
||||
>=sys-libs/zlib-1.2.3[static-libs(+)]"
|
||||
|
||||
@@ -48,8 +48,7 @@ LIB_DEPEND="
|
||||
selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
|
||||
skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] )
|
||||
ssl? (
|
||||
!bindist? ( >=dev-libs/openssl-0.9.8f:0[-bindist] )
|
||||
bindist? ( >=dev-libs/openssl-0.9.8f:0 )
|
||||
>=dev-libs/openssl-0.9.8f:0[bindist=]
|
||||
dev-libs/openssl[static-libs(+)]
|
||||
)
|
||||
>=sys-libs/zlib-1.2.3[static-libs(+)]"
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="5"
|
||||
|
||||
inherit eutils
|
||||
|
||||
MY_P="${PN}-dnh${PV}"
|
||||
|
||||
DESCRIPTION="Enhanced CTorrent is a BitTorrent console client written in C and C++"
|
||||
HOMEPAGE="http://www.rahul.net/dholmes/ctorrent/"
|
||||
SRC_URI="mirror://sourceforge/dtorrent/${MY_P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
|
||||
IUSE=""
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
DEPEND="dev-libs/openssl:="
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${PN}-CVE-2009-1759.patch
|
||||
epatch "${FILESDIR}"/${P}-negative-ints.patch
|
||||
epatch "${FILESDIR}"/${P}-empty-path-components.patch
|
||||
}
|
||||
@@ -0,0 +1,38 @@
|
||||
rTorrent sometimes creates invalid torrents which has empty path components.
|
||||
the bitorrent spec allows for "" strings, but they make no sense in paths.
|
||||
so instead of always adding a / in between, skip them. ugh.
|
||||
|
||||
for example:
|
||||
dict {
|
||||
'info' => dict {
|
||||
'name' => str = "some dir" (len = 8)
|
||||
'files' => list [
|
||||
dict {
|
||||
'length' => int = 12345567
|
||||
'path' => list [
|
||||
str = "" (len = 0)
|
||||
str = "foo.bin" (len = 7)
|
||||
]
|
||||
}
|
||||
...
|
||||
]
|
||||
...
|
||||
}
|
||||
...
|
||||
}
|
||||
|
||||
ctorrent will then try to fetch the file "/some dir/foo.bin" instead of
|
||||
"some dir/foo.bin" (relative to $PWD).
|
||||
|
||||
--- a/bencode.cpp
|
||||
+++ b/bencode.cpp
|
||||
@@ -258,7 +258,8 @@
|
||||
n -= r;
|
||||
if( 'e' == *pb ) break;
|
||||
if( pathname >= endmax ) return 0;
|
||||
- *pathname++ = PATH_SP;
|
||||
+ if (q)
|
||||
+ *pathname++ = PATH_SP;
|
||||
}
|
||||
*pathname = '\0';
|
||||
return (pb - b + 1);
|
||||
Reference in New Issue
Block a user