Merge pull request #2829 from dm0-/glsa

Fix GLSAs
This commit is contained in:
David Michael 2017-10-18 14:38:14 -07:00 committed by GitHub
commit 45e0f36fc1
9 changed files with 2 additions and 295 deletions

View File

@ -1,14 +0,0 @@
DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup
DEPEND=dbus? ( sys-apps/dbus ) idn? ( net-dns/libidn ) lua? ( dev-lang/lua:* ) conntrack? ( net-libs/libnetfilter_conntrack ) nls? ( sys-devel/gettext net-dns/libidn ) app-arch/xz-utils dnssec? ( dev-libs/nettle[gmp] static? ( dev-libs/nettle[static-libs(+)] ) ) virtual/pkgconfig virtual/pkgconfig
DESCRIPTION=Small forwarding DNS server
EAPI=6
HOMEPAGE=http://www.thekelleys.org.uk/dnsmasq/doc.html
IUSE=auth-dns conntrack dbus +dhcp dhcp-tools dnssec idn +inotify ipv6 lua nls script selinux static tftp linguas_de linguas_es linguas_fi linguas_fr linguas_id linguas_it linguas_no linguas_pl linguas_pt_BR linguas_ro
KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd
LICENSE=|| ( GPL-2 GPL-3 )
RDEPEND=dbus? ( sys-apps/dbus ) idn? ( net-dns/libidn ) lua? ( dev-lang/lua:* ) conntrack? ( net-libs/libnetfilter_conntrack ) nls? ( sys-devel/gettext net-dns/libidn ) dnssec? ( !static? ( dev-libs/nettle[gmp] ) ) selinux? ( sec-policy/selinux-dnsmasq )
REQUIRED_USE=dhcp-tools? ( dhcp ) lua? ( script )
SLOT=0
SRC_URI=http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.76.tar.xz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 61cad4fb5d800b29d484b27cb033f59b ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e systemd e12dd5e3cf1f359292cea2a70abeba5f toolchain-funcs 8fec6b1eb195836560e70b66d98fb163 user e4b567c44272a719fabf53f0f885d3f7
_md5_=e9cafbdb20075d2ecd7a325353ada8c5

View File

@ -1 +0,0 @@
DIST dnsmasq-2.76.tar.xz 480796 SHA256 4b92698dee19ca0cb2a8f2e48f1d2dffd01a21eb15d1fbed4cf085630c8c9f96 SHA512 8a930f3e7cdc0c291ce89bea8128a4b8438b9aa9e660a2ac037e0baa4c5c74f4482a8f83b0410066a759444b3c4e1cf62a9beb625e38509690227996de10e06a WHIRLPOOL e0710f879fd6f8e27581b8c400704660941601cd2077f32d7c2b3f9791c6be8404469770e74f7e1a03880507a32a30c19b89f6a953a757ad01305f829448f0bc

View File

@ -1,192 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit eutils toolchain-funcs flag-o-matic user systemd
DESCRIPTION="Small forwarding DNS server"
HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/doc.html"
SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz"
LICENSE="|| ( GPL-2 GPL-3 )"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec idn +inotify ipv6 lua nls script selinux static tftp"
DM_LINGUAS="de es fi fr id it no pl pt_BR ro"
for dm_lingua in ${DM_LINGUAS}; do
IUSE+=" linguas_${dm_lingua}"
done
CDEPEND="dbus? ( sys-apps/dbus )
idn? ( net-dns/libidn )
lua? ( dev-lang/lua:* )
conntrack? ( net-libs/libnetfilter_conntrack )
nls? (
sys-devel/gettext
net-dns/libidn
)
"
DEPEND="${CDEPEND}
app-arch/xz-utils
dnssec? (
dev-libs/nettle[gmp]
static? (
dev-libs/nettle[static-libs(+)]
)
)
virtual/pkgconfig"
RDEPEND="${CDEPEND}
dnssec? (
!static? (
dev-libs/nettle[gmp]
)
)
selinux? ( sec-policy/selinux-dnsmasq )
"
REQUIRED_USE="dhcp-tools? ( dhcp )
lua? ( script )"
use_have() {
local useflag no_only uword
if [[ $1 == '-n' ]]; then
no_only=1
shift
fi
useflag="${1}"
shift
uword="${1:-${useflag}}"
shift
while [[ ${uword} ]]; do
uword="${uword^^}"
if ! use "${useflag}"; then
echo -n " -DNO_${uword}"
elif [[ -z "${no_only}" ]]; then
echo -n " -DHAVE_${uword}"
fi
uword="${1}"
shift
done
}
pkg_pretend() {
if use static; then
einfo "Only sys-libs/gmp and dev-libs/nettle are statically linked."
use dnssec || einfo "Thus, ${P}[!dnssec,static] makes no sense; the static USE flag is ignored."
fi
}
pkg_setup() {
enewgroup dnsmasq
enewuser dnsmasq -1 -1 /dev/null dnsmasq
}
src_prepare() {
default
sed -i -r 's:lua5.[0-9]+:lua:' Makefile
sed -i "s:%%PREFIX%%:${EPREFIX}/usr:" dnsmasq.conf.example
}
src_configure() {
COPTS="$(use_have -n auth-dns auth)"
COPTS+="$(use_have conntrack)"
COPTS+="$(use_have dbus)"
COPTS+="$(use_have idn)"
COPTS+="$(use_have -n inotify)"
COPTS+="$(use_have -n dhcp dhcp dhcp6)"
COPTS+="$(use_have -n ipv6 ipv6 dhcp6)"
COPTS+="$(use_have lua luascript)"
COPTS+="$(use_have -n script)"
COPTS+="$(use_have -n tftp)"
COPTS+="$(use_have dnssec)"
COPTS+="$(use_have static dnssec_static)"
}
src_compile() {
emake \
PREFIX=/usr \
MANDIR=/usr/share/man \
CC="$(tc-getCC)" \
PKG_CONFIG="$(tc-getPKG_CONFIG)" \
CFLAGS="${CFLAGS}" \
LDFLAGS="${LDFLAGS}" \
COPTS="${COPTS}" \
CONFFILE="/etc/${PN}.conf" \
all$(use nls && echo "-i18n")
use dhcp-tools && emake -C contrib/lease-tools \
PREFIX=/usr \
MANDIR=/usr/share/man \
CC="$(tc-getCC)" \
PKG_CONFIG="$(tc-getPKG_CONFIG)" \
CFLAGS="${CFLAGS}" \
LDFLAGS="${LDFLAGS}" \
all
}
src_install() {
local lingua puid
emake \
PREFIX=/usr \
MANDIR=/usr/share/man \
COPTS="${COPTS}" \
DESTDIR="${D}" \
install-common
for lingua in ${DM_LINGUAS}; do
use linguas_${lingua} || rm -rf "${D}"/usr/share/locale/${lingua}
done
[[ -d "${D}"/usr/share/locale/ ]] && rmdir --ignore-fail-on-non-empty "${D}"/usr/share/locale/
dodoc CHANGELOG CHANGELOG.archive FAQ dnsmasq.conf.example
dodoc -r logo
docinto html/
dodoc *.html
newinitd "${FILESDIR}"/dnsmasq-init-r2 ${PN}
newconfd "${FILESDIR}"/dnsmasq.confd-r1 ${PN}
insinto /etc
newins dnsmasq.conf.example dnsmasq.conf
insinto /usr/share/dnsmasq
doins trust-anchors.conf
if use dhcp; then
dodir /var/lib/misc
newinitd "${FILESDIR}"/dnsmasq-init-dhcp-r1 ${PN}
fi
if use dbus; then
insinto /etc/dbus-1/system.d
doins dbus/dnsmasq.conf
fi
if use dhcp-tools; then
dosbin contrib/lease-tools/{dhcp_release,dhcp_lease_time}
doman contrib/lease-tools/{dhcp_release,dhcp_lease_time}.1
if use ipv6; then
dosbin contrib/lease-tools/dhcp_release6
doman contrib/lease-tools/dhcp_release6.1
fi
fi
systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
}
pkg_preinst() {
# temporary workaround to (hopefully) prevent leases file from being removed
[[ -f /var/lib/misc/dnsmasq.leases ]] && cp /var/lib/misc/dnsmasq.leases "${T}"
}
pkg_postinst() {
# temporary workaround to (hopefully) prevent leases file from being removed
[[ -f "${T}"/dnsmasq.leases ]] && cp "${T}"/dnsmasq.leases /var/lib/misc/dnsmasq.leases
}

View File

@ -1,29 +0,0 @@
#!/sbin/openrc-run
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License, v2 or later
extra_started_commands="reload"
pidfile="/var/run/dnsmasq.pid"
command="/usr/sbin/dnsmasq"
command_args="-x ${pidfile} ${DNSMASQ_OPTS}"
start_stop_daemon_args="--retry TERM/3/TERM/5"
depend() {
provide dns
need localmount net
after bootmisc
use logger
}
start_pre() {
checkpath --owner dnsmasq:dnsmasq \
--mode 0644 \
--file /var/lib/misc/dnsmasq.leases
}
reload() {
ebegin "Reloading ${RC_SVCNAME}"
kill -HUP $(cat "${pidfile}")
eend $?
}

View File

@ -1,23 +0,0 @@
#!/sbin/openrc-run
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License, v2 or later
extra_started_commands="reload"
pidfile="/var/run/dnsmasq.pid"
command="/usr/sbin/dnsmasq"
command_args="-x ${pidfile} ${DNSMASQ_OPTS}"
start_stop_daemon_args="--retry TERM/3/TERM/5"
depend() {
provide dns
need localmount net
after bootmisc
use logger
}
reload() {
ebegin "Reloading ${SVCNAME}"
kill -HUP $(cat "${pidfile}")
eend $?
}

View File

@ -1,4 +0,0 @@
# /etc/conf.d/dnsmasq: config file for /etc/init.d/dnsmasq
# See the dnsmasq(8) man page for possible options to put here.
DNSMASQ_OPTS="--user=dnsmasq --group=dnsmasq"

View File

@ -1,12 +0,0 @@
[Unit]
Description=A lightweight DHCP and caching DNS server
After=network.target
[Service]
Type=simple
ExecStartPre=/usr/sbin/dnsmasq --test
ExecStart=/usr/sbin/dnsmasq -k --user=dnsmasq --group=dnsmasq
ExecReload=/bin/kill -HUP $MAINPID
[Install]
WantedBy=multi-user.target

View File

@ -1,20 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>chutzpah@gentoo.org</email>
<name>Patrick McLean</name>
</maintainer>
<use>
<flag name="auth-dns">Add support for acting as an authorative DNS server.</flag>
<flag name="conntrack">Add support for Linux conntrack connection marking.</flag>
<flag name="dhcp-tools">Install extra command line tools for manually managing DHCP leases.</flag>
<flag name="dhcp">Enable support for acting as a DHCP server.</flag>
<flag name="dnssec">Enable support DNSSEC validation and caching.</flag>
<flag name="script">Enable support for calling scripts when leases change.</flag>
<flag name="tftp">Enables built in TFTP server for netbooting.</flag>
</use>
<upstream>
<remote-id type="cpe">cpe:/a:thekelleys:dnsmasq</remote-id>
</upstream>
</pkgmetadata>

View File

@ -3,6 +3,7 @@
=app-admin/sudo-1.8.20_p2 ~arm64
=app-arch/bzip2-1.0.6-r8 ~arm64
=app-arch/libarchive-3.3.1 ~arm64
=app-crypt/mit-krb5-1.14.2 ~arm64
=app-text/asciidoc-8.6.9-r3 ~arm64
=dev-cpp/gflags-2.1.2 ~arm64
@ -21,6 +22,7 @@
=net-analyzer/nmap-7.40 ~arm64
=net-analyzer/tcpdump-4.9.2 ~arm64
=net-dialup/minicom-2.7.1 ~arm64
=net-dns/dnsmasq-2.78 ~arm64
=net-firewall/ebtables-2.0.10.4-r1 ~arm64
=net-firewall/ipset-6.29 ~arm64
=net-libs/libmicrohttpd-0.9.52 **