From 4972ae1be7501d9acc84269262ea5d642127eb5b Mon Sep 17 00:00:00 2001 From: Austin English Date: Tue, 26 Apr 2016 17:49:38 -0500 Subject: www-servers/webfs: use #!/sbin/openrc-run instead of #!/sbin/runscript Gentoo-Bug: https://bugs.gentoo.org/573846 Package-Manager: portage-2.2.26 --- www-servers/webfs/files/webfs.initd-r1 | 4 +-- www-servers/webfs/webfs-1.21-r4.ebuild | 53 ---------------------------------- www-servers/webfs/webfs-1.21-r5.ebuild | 53 ++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 55 deletions(-) delete mode 100644 www-servers/webfs/webfs-1.21-r4.ebuild create mode 100644 www-servers/webfs/webfs-1.21-r5.ebuild (limited to 'www-servers/webfs') diff --git a/www-servers/webfs/files/webfs.initd-r1 b/www-servers/webfs/files/webfs.initd-r1 index 1327756145aa..bcf7b492d77f 100644 --- a/www-servers/webfs/files/webfs.initd-r1 +++ b/www-servers/webfs/files/webfs.initd-r1 @@ -1,5 +1,5 @@ -#!/sbin/runscript -# Copyright 1999-2013 Gentoo Foundation +#!/sbin/openrc-run +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/www-servers/webfs/webfs-1.21-r4.ebuild b/www-servers/webfs/webfs-1.21-r4.ebuild deleted file mode 100644 index 219938b780d0..000000000000 --- a/www-servers/webfs/webfs-1.21-r4.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils - -DESCRIPTION="Lightweight HTTP server for static content" -SRC_URI="http://dl.bytesex.org/releases/${PN}/${P}.tar.gz" -HOMEPAGE="http://linux.bytesex.org/misc/webfs.html" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~arm-linux ~x86-linux" -IUSE="libressl ssl threads" - -DEPEND=" - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - )" - -RDEPEND="${DEPEND} - app-misc/mime-types" - -src_prepare() { - epatch "${FILESDIR}/${P}-Variables.mk-dont-strip-binaries-on-install.patch" - epatch "${FILESDIR}/${P}-CVE-2013-0347.patch" - sed -e "s:/etc/mime.types:${EPREFIX}\\0:" -i GNUmakefile || die "sed failed" -} - -src_compile() { - local myconf - use ssl || myconf="${myconf} USE_SSL=no" - use threads && myconf="${myconf} USE_THREADS=yes" - - emake prefix="${EPREFIX}/usr" ${myconf} -} - -src_install() { - local myconf - use ssl || myconf="${myconf} USE_SSL=no" - use threads && myconf="${myconf} USE_THREADS=yes" - einstall ${myconf} mandir="${ED}/usr/share/man" - newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN} - newconfd "${FILESDIR}"/${PN}.confd ${PN} - dodoc README -} - -pkg_preinst() { - # Fix existing log permissions for bug #458892. - chmod 0600 "${EROOT}/var/log/webfsd.log" 2>/dev/null -} diff --git a/www-servers/webfs/webfs-1.21-r5.ebuild b/www-servers/webfs/webfs-1.21-r5.ebuild new file mode 100644 index 000000000000..2f65449135c6 --- /dev/null +++ b/www-servers/webfs/webfs-1.21-r5.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils + +DESCRIPTION="Lightweight HTTP server for static content" +SRC_URI="http://dl.bytesex.org/releases/${PN}/${P}.tar.gz" +HOMEPAGE="http://linux.bytesex.org/misc/webfs.html" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86 ~arm-linux ~x86-linux" +IUSE="libressl ssl threads" + +DEPEND=" + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:= ) + )" + +RDEPEND="${DEPEND} + app-misc/mime-types" + +src_prepare() { + epatch "${FILESDIR}/${P}-Variables.mk-dont-strip-binaries-on-install.patch" + epatch "${FILESDIR}/${P}-CVE-2013-0347.patch" + sed -e "s:/etc/mime.types:${EPREFIX}\\0:" -i GNUmakefile || die "sed failed" +} + +src_compile() { + local myconf + use ssl || myconf="${myconf} USE_SSL=no" + use threads && myconf="${myconf} USE_THREADS=yes" + + emake prefix="${EPREFIX}/usr" ${myconf} +} + +src_install() { + local myconf + use ssl || myconf="${myconf} USE_SSL=no" + use threads && myconf="${myconf} USE_THREADS=yes" + einstall ${myconf} mandir="${ED}/usr/share/man" + newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN} + newconfd "${FILESDIR}"/${PN}.confd ${PN} + dodoc README +} + +pkg_preinst() { + # Fix existing log permissions for bug #458892. + chmod 0600 "${EROOT}/var/log/webfsd.log" 2>/dev/null +} -- cgit v1.2.3-65-gdbad