public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-proxy/polipo/files/, net-proxy/polipo/
@ 2015-12-07 12:40 Andrew Savchenko
  0 siblings, 0 replies; 5+ messages in thread
From: Andrew Savchenko @ 2015-12-07 12:40 UTC (permalink / raw
  To: gentoo-commits

commit:     b40f47bc15453de494f0d19a33cd1e8f9828d606
Author:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  7 12:39:58 2015 +0000
Commit:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Mon Dec  7 12:39:58 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b40f47bc

net-proxy/polipo: fix bug 567660

Replace bash-specific test expression by a POSIX compatible one.

Package-Manager: portage-2.2.26
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>

 net-proxy/polipo/files/polipo.initd-3   | 66 +++++++++++++++++++++++++++++++++
 net-proxy/polipo/polipo-1.1.1-r2.ebuild | 62 +++++++++++++++++++++++++++++++
 2 files changed, 128 insertions(+)

diff --git a/net-proxy/polipo/files/polipo.initd-3 b/net-proxy/polipo/files/polipo.initd-3
new file mode 100644
index 0000000..48cd738
--- /dev/null
+++ b/net-proxy/polipo/files/polipo.initd-3
@@ -0,0 +1,66 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+CONFFILE="/etc/polipo/config${SVCNAME#polipo}"
+PIDFILE="/var/run/${SVCNAME}.pid"
+
+depend() {
+	need net
+}
+
+checkconfig() {
+	{ polipo -v -c "${CONFFILE}" || return 1 ; } | {
+		local retvalue=0
+		local name type value desc
+		while read name type value desc ; do
+			case ${name} in
+			configFile)
+				if [ "${value}" = "(none)" ] ; then
+					eerror "Unable to read configuration file /etc/polipo/config"
+					retvalue=1
+				fi
+				;;
+			daemonise)
+				if [ "${value}" != "false" ] ; then
+					eerror "Configuration option not supported by this init script: ${name}=${value}"
+					retvalue=1
+				fi
+				;;
+			pidFile)
+				if [ "${value}" != "(none)" ] ; then
+					eerror "Configuration option not supported by this init script: ${name}=${value}"
+					retvalue=1
+				fi
+				;;
+			diskCacheRoot)
+				if [ "${value}" != "(none)" ] ; then
+					# Ensure that cache directory exists and have proper permissions
+					if ! [ -d "{value}" ]; then
+						mkdir -p -m 0750 "${value}"
+						chown polipo:polipo "${value}"
+					fi
+				fi
+				;;
+			esac
+		done
+		return ${retvalue}
+	}
+}
+
+start() {
+	checkconfig || return 1
+
+	ebegin "Starting Polipo HTTP proxy"
+	start-stop-daemon --start --user polipo \
+		--background --pidfile "${PIDFILE}" --make-pidfile \
+		--exec /usr/bin/polipo -- -c "${CONFFILE}"
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Polipo HTTP proxy"
+	start-stop-daemon --stop --pidfile "${PIDFILE}"
+	eend $?
+}

diff --git a/net-proxy/polipo/polipo-1.1.1-r2.ebuild b/net-proxy/polipo/polipo-1.1.1-r2.ebuild
new file mode 100644
index 0000000..bc266a3
--- /dev/null
+++ b/net-proxy/polipo/polipo-1.1.1-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+if [[ ${PV} == "9999" ]] ; then
+	_GIT=git-r3
+	EGIT_REPO_URI="https://github.com/jech/${PN}.git"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://www.pps.jussieu.fr/~jch/software/files/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+inherit ${_GIT} toolchain-funcs user systemd
+
+DESCRIPTION="A caching web proxy"
+HOMEPAGE="http://www.pps.jussieu.fr/~jch/software/polipo/"
+LICENSE="MIT GPL-2"
+SLOT="0"
+IUSE="systemd"
+
+DEPEND="sys-apps/texinfo"
+RDEPEND=""
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/cache/${PN} ${PN}
+}
+
+src_compile() {
+	tc-export CC
+	emake PREFIX=/usr "CDEBUGFLAGS=${CFLAGS}" all
+}
+
+src_install() {
+	einstall PREFIX=/usr MANDIR=/usr/share/man INFODIR=/usr/share/info "TARGET=${D}"
+
+	newinitd "${FILESDIR}/${PN}.initd-3" ${PN}
+	insinto /etc/${PN} ; doins "${FILESDIR}/config"
+	systemd_newunit "${FILESDIR}/${PN}_at.service" "${PN}@.service"
+	if ! use systemd; then
+		exeinto /etc/cron.weekly ; newexe "${FILESDIR}/${PN}.crond-2" ${PN}
+	fi
+
+	dodoc CHANGES README
+	dohtml html/*
+}
+
+pkg_postinst() {
+	elog "Do not forget to read the manual."
+	elog "Change the config file in /etc/${PN} to suit your needs."
+	elog ""
+	elog "Polipo init scripts can now be multiplexed:"
+	elog "1. create /etc/${PN}/config.foo"
+	elog "2. symlink /etc/init.d/{${PN}.foo -> ${PN}}"
+	elog "  a. if you are using OpenRC, symlink /etc/init.d/{${PN}.foo -> ${PN}}"
+	elog "  b. if you are using systemd, execute \"systemctl enable polipo@config.foo\""
+	elog "3. make sure all instances use unique ip:port pair and cachedir, if any"
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-proxy/polipo/files/, net-proxy/polipo/
@ 2016-04-22 12:11 Andrew Savchenko
  0 siblings, 0 replies; 5+ messages in thread
From: Andrew Savchenko @ 2016-04-22 12:11 UTC (permalink / raw
  To: gentoo-commits

commit:     ef7f42bb90ae70f2c4ca34ba737640434af2c4c2
Author:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 22 12:11:10 2016 +0000
Commit:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Fri Apr 22 12:11:39 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef7f42bb

net-proxy/polipo: honor multiple instances at init script

Use ${SVCNAME} for ebegin/eend messages.

Package-Manager: portage-2.2.28
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>

 net-proxy/polipo/files/polipo.initd-4              | 66 ++++++++++++++++++++++
 .../{polipo-9999.ebuild => polipo-1.1.1-r3.ebuild} |  4 +-
 net-proxy/polipo/polipo-9999.ebuild                |  4 +-
 3 files changed, 70 insertions(+), 4 deletions(-)

diff --git a/net-proxy/polipo/files/polipo.initd-4 b/net-proxy/polipo/files/polipo.initd-4
new file mode 100644
index 0000000..705185e
--- /dev/null
+++ b/net-proxy/polipo/files/polipo.initd-4
@@ -0,0 +1,66 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+CONFFILE="/etc/polipo/config${SVCNAME#polipo}"
+PIDFILE="/var/run/${SVCNAME}.pid"
+
+depend() {
+	need net
+}
+
+checkconfig() {
+	{ polipo -v -c "${CONFFILE}" || return 1 ; } | {
+		local retvalue=0
+		local name type value desc
+		while read name type value desc ; do
+			case ${name} in
+			configFile)
+				if [ "${value}" = "(none)" ] ; then
+					eerror "Unable to read configuration file /etc/polipo/config"
+					retvalue=1
+				fi
+				;;
+			daemonise)
+				if [ "${value}" != "false" ] ; then
+					eerror "Configuration option not supported by this init script: ${name}=${value}"
+					retvalue=1
+				fi
+				;;
+			pidFile)
+				if [ "${value}" != "(none)" ] ; then
+					eerror "Configuration option not supported by this init script: ${name}=${value}"
+					retvalue=1
+				fi
+				;;
+			diskCacheRoot)
+				if [ "${value}" != "(none)" ] ; then
+					# Ensure that cache directory exists and have proper permissions
+					if ! [ -d "{value}" ]; then
+						mkdir -p -m 0750 "${value}"
+						chown polipo:polipo "${value}"
+					fi
+				fi
+				;;
+			esac
+		done
+		return ${retvalue}
+	}
+}
+
+start() {
+	checkconfig || return 1
+
+	ebegin "Starting ${SVCNAME} HTTP proxy"
+	start-stop-daemon --start --user polipo \
+		--background --pidfile "${PIDFILE}" --make-pidfile \
+		--exec /usr/bin/polipo -- -c "${CONFFILE}"
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME} HTTP proxy"
+	start-stop-daemon --stop --pidfile "${PIDFILE}"
+	eend $?
+}

diff --git a/net-proxy/polipo/polipo-9999.ebuild b/net-proxy/polipo/polipo-1.1.1-r3.ebuild
similarity index 94%
copy from net-proxy/polipo/polipo-9999.ebuild
copy to net-proxy/polipo/polipo-1.1.1-r3.ebuild
index 8882b5d..559a3ed 100644
--- a/net-proxy/polipo/polipo-9999.ebuild
+++ b/net-proxy/polipo/polipo-1.1.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -38,7 +38,7 @@ src_compile() {
 src_install() {
 	einstall PREFIX=/usr MANDIR=/usr/share/man INFODIR=/usr/share/info "TARGET=${D}"
 
-	newinitd "${FILESDIR}/${PN}.initd-2" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-4" ${PN}
 	insinto /etc/${PN} ; doins "${FILESDIR}/config"
 	systemd_newunit "${FILESDIR}/${PN}_at.service" "${PN}@.service"
 	if ! use systemd; then

diff --git a/net-proxy/polipo/polipo-9999.ebuild b/net-proxy/polipo/polipo-9999.ebuild
index 8882b5d..559a3ed 100644
--- a/net-proxy/polipo/polipo-9999.ebuild
+++ b/net-proxy/polipo/polipo-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -38,7 +38,7 @@ src_compile() {
 src_install() {
 	einstall PREFIX=/usr MANDIR=/usr/share/man INFODIR=/usr/share/info "TARGET=${D}"
 
-	newinitd "${FILESDIR}/${PN}.initd-2" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-4" ${PN}
 	insinto /etc/${PN} ; doins "${FILESDIR}/config"
 	systemd_newunit "${FILESDIR}/${PN}_at.service" "${PN}@.service"
 	if ! use systemd; then


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-proxy/polipo/files/, net-proxy/polipo/
@ 2016-04-22 12:26 Andrew Savchenko
  0 siblings, 0 replies; 5+ messages in thread
From: Andrew Savchenko @ 2016-04-22 12:26 UTC (permalink / raw
  To: gentoo-commits

commit:     74b7da165dc0858d156e55fee72926c570dac585
Author:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 22 12:25:35 2016 +0000
Commit:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Fri Apr 22 12:26:30 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74b7da16

net-proxy/polipo: remove old

Package-Manager: portage-2.2.28
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>

 net-proxy/polipo/files/polipo.initd-3   | 66 ---------------------------------
 net-proxy/polipo/polipo-1.1.1-r1.ebuild | 62 -------------------------------
 net-proxy/polipo/polipo-1.1.1-r2.ebuild | 62 -------------------------------
 3 files changed, 190 deletions(-)

diff --git a/net-proxy/polipo/files/polipo.initd-3 b/net-proxy/polipo/files/polipo.initd-3
deleted file mode 100644
index 48cd738..0000000
--- a/net-proxy/polipo/files/polipo.initd-3
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2015 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-CONFFILE="/etc/polipo/config${SVCNAME#polipo}"
-PIDFILE="/var/run/${SVCNAME}.pid"
-
-depend() {
-	need net
-}
-
-checkconfig() {
-	{ polipo -v -c "${CONFFILE}" || return 1 ; } | {
-		local retvalue=0
-		local name type value desc
-		while read name type value desc ; do
-			case ${name} in
-			configFile)
-				if [ "${value}" = "(none)" ] ; then
-					eerror "Unable to read configuration file /etc/polipo/config"
-					retvalue=1
-				fi
-				;;
-			daemonise)
-				if [ "${value}" != "false" ] ; then
-					eerror "Configuration option not supported by this init script: ${name}=${value}"
-					retvalue=1
-				fi
-				;;
-			pidFile)
-				if [ "${value}" != "(none)" ] ; then
-					eerror "Configuration option not supported by this init script: ${name}=${value}"
-					retvalue=1
-				fi
-				;;
-			diskCacheRoot)
-				if [ "${value}" != "(none)" ] ; then
-					# Ensure that cache directory exists and have proper permissions
-					if ! [ -d "{value}" ]; then
-						mkdir -p -m 0750 "${value}"
-						chown polipo:polipo "${value}"
-					fi
-				fi
-				;;
-			esac
-		done
-		return ${retvalue}
-	}
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting Polipo HTTP proxy"
-	start-stop-daemon --start --user polipo \
-		--background --pidfile "${PIDFILE}" --make-pidfile \
-		--exec /usr/bin/polipo -- -c "${CONFFILE}"
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Polipo HTTP proxy"
-	start-stop-daemon --stop --pidfile "${PIDFILE}"
-	eend $?
-}

diff --git a/net-proxy/polipo/polipo-1.1.1-r1.ebuild b/net-proxy/polipo/polipo-1.1.1-r1.ebuild
deleted file mode 100644
index 8882b5d..0000000
--- a/net-proxy/polipo/polipo-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-if [[ ${PV} == "9999" ]] ; then
-	_GIT=git-r3
-	EGIT_REPO_URI="https://github.com/jech/${PN}.git"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://www.pps.jussieu.fr/~jch/software/files/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-inherit ${_GIT} toolchain-funcs user systemd
-
-DESCRIPTION="A caching web proxy"
-HOMEPAGE="http://www.pps.jussieu.fr/~jch/software/polipo/"
-LICENSE="MIT GPL-2"
-SLOT="0"
-IUSE="systemd"
-
-DEPEND="sys-apps/texinfo"
-RDEPEND=""
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/cache/${PN} ${PN}
-}
-
-src_compile() {
-	tc-export CC
-	emake PREFIX=/usr "CDEBUGFLAGS=${CFLAGS}" all
-}
-
-src_install() {
-	einstall PREFIX=/usr MANDIR=/usr/share/man INFODIR=/usr/share/info "TARGET=${D}"
-
-	newinitd "${FILESDIR}/${PN}.initd-2" ${PN}
-	insinto /etc/${PN} ; doins "${FILESDIR}/config"
-	systemd_newunit "${FILESDIR}/${PN}_at.service" "${PN}@.service"
-	if ! use systemd; then
-		exeinto /etc/cron.weekly ; newexe "${FILESDIR}/${PN}.crond-2" ${PN}
-	fi
-
-	dodoc CHANGES README
-	dohtml html/*
-}
-
-pkg_postinst() {
-	elog "Do not forget to read the manual."
-	elog "Change the config file in /etc/${PN} to suit your needs."
-	elog ""
-	elog "Polipo init scripts can now be multiplexed:"
-	elog "1. create /etc/${PN}/config.foo"
-	elog "2. symlink /etc/init.d/{${PN}.foo -> ${PN}}"
-	elog "  a. if you are using OpenRC, symlink /etc/init.d/{${PN}.foo -> ${PN}}"
-	elog "  b. if you are using systemd, execute \"systemctl enable polipo@config.foo\""
-	elog "3. make sure all instances use unique ip:port pair and cachedir, if any"
-}

diff --git a/net-proxy/polipo/polipo-1.1.1-r2.ebuild b/net-proxy/polipo/polipo-1.1.1-r2.ebuild
deleted file mode 100644
index bc266a3..0000000
--- a/net-proxy/polipo/polipo-1.1.1-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-if [[ ${PV} == "9999" ]] ; then
-	_GIT=git-r3
-	EGIT_REPO_URI="https://github.com/jech/${PN}.git"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://www.pps.jussieu.fr/~jch/software/files/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-inherit ${_GIT} toolchain-funcs user systemd
-
-DESCRIPTION="A caching web proxy"
-HOMEPAGE="http://www.pps.jussieu.fr/~jch/software/polipo/"
-LICENSE="MIT GPL-2"
-SLOT="0"
-IUSE="systemd"
-
-DEPEND="sys-apps/texinfo"
-RDEPEND=""
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/cache/${PN} ${PN}
-}
-
-src_compile() {
-	tc-export CC
-	emake PREFIX=/usr "CDEBUGFLAGS=${CFLAGS}" all
-}
-
-src_install() {
-	einstall PREFIX=/usr MANDIR=/usr/share/man INFODIR=/usr/share/info "TARGET=${D}"
-
-	newinitd "${FILESDIR}/${PN}.initd-3" ${PN}
-	insinto /etc/${PN} ; doins "${FILESDIR}/config"
-	systemd_newunit "${FILESDIR}/${PN}_at.service" "${PN}@.service"
-	if ! use systemd; then
-		exeinto /etc/cron.weekly ; newexe "${FILESDIR}/${PN}.crond-2" ${PN}
-	fi
-
-	dodoc CHANGES README
-	dohtml html/*
-}
-
-pkg_postinst() {
-	elog "Do not forget to read the manual."
-	elog "Change the config file in /etc/${PN} to suit your needs."
-	elog ""
-	elog "Polipo init scripts can now be multiplexed:"
-	elog "1. create /etc/${PN}/config.foo"
-	elog "2. symlink /etc/init.d/{${PN}.foo -> ${PN}}"
-	elog "  a. if you are using OpenRC, symlink /etc/init.d/{${PN}.foo -> ${PN}}"
-	elog "  b. if you are using systemd, execute \"systemctl enable polipo@config.foo\""
-	elog "3. make sure all instances use unique ip:port pair and cachedir, if any"
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-proxy/polipo/files/, net-proxy/polipo/
@ 2016-04-26  4:28 Andrew Savchenko
  0 siblings, 0 replies; 5+ messages in thread
From: Andrew Savchenko @ 2016-04-26  4:28 UTC (permalink / raw
  To: gentoo-commits

commit:     88902c0975557bccd36d67f8c23341c7187aa8f4
Author:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 26 03:02:46 2016 +0000
Commit:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Tue Apr 26 03:02:46 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88902c09

net-proxy/polipo: unloosing net dependency

use net is sufficient and requires in some use cases

Package-Manager: portage-2.2.28
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>

 net-proxy/polipo/files/polipo.initd-5              | 66 ++++++++++++++++++++++
 .../{polipo-9999.ebuild => polipo-1.1.1-r4.ebuild} |  2 +-
 net-proxy/polipo/polipo-9999.ebuild                |  2 +-
 3 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/net-proxy/polipo/files/polipo.initd-5 b/net-proxy/polipo/files/polipo.initd-5
new file mode 100644
index 0000000..e0cabe6
--- /dev/null
+++ b/net-proxy/polipo/files/polipo.initd-5
@@ -0,0 +1,66 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+CONFFILE="/etc/polipo/config${SVCNAME#polipo}"
+PIDFILE="/var/run/${SVCNAME}.pid"
+
+depend() {
+	use net
+}
+
+checkconfig() {
+	{ polipo -v -c "${CONFFILE}" || return 1 ; } | {
+		local retvalue=0
+		local name type value desc
+		while read name type value desc ; do
+			case ${name} in
+			configFile)
+				if [ "${value}" = "(none)" ] ; then
+					eerror "Unable to read configuration file /etc/polipo/config"
+					retvalue=1
+				fi
+				;;
+			daemonise)
+				if [ "${value}" != "false" ] ; then
+					eerror "Configuration option not supported by this init script: ${name}=${value}"
+					retvalue=1
+				fi
+				;;
+			pidFile)
+				if [ "${value}" != "(none)" ] ; then
+					eerror "Configuration option not supported by this init script: ${name}=${value}"
+					retvalue=1
+				fi
+				;;
+			diskCacheRoot)
+				if [ "${value}" != "(none)" ] ; then
+					# Ensure that cache directory exists and have proper permissions
+					if ! [ -d "{value}" ]; then
+						mkdir -p -m 0750 "${value}"
+						chown polipo:polipo "${value}"
+					fi
+				fi
+				;;
+			esac
+		done
+		return ${retvalue}
+	}
+}
+
+start() {
+	checkconfig || return 1
+
+	ebegin "Starting ${SVCNAME} HTTP proxy"
+	start-stop-daemon --start --user polipo \
+		--background --pidfile "${PIDFILE}" --make-pidfile \
+		--exec /usr/bin/polipo -- -c "${CONFFILE}"
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME} HTTP proxy"
+	start-stop-daemon --stop --pidfile "${PIDFILE}"
+	eend $?
+}

diff --git a/net-proxy/polipo/polipo-9999.ebuild b/net-proxy/polipo/polipo-1.1.1-r4.ebuild
similarity index 97%
copy from net-proxy/polipo/polipo-9999.ebuild
copy to net-proxy/polipo/polipo-1.1.1-r4.ebuild
index 559a3ed..84b743e 100644
--- a/net-proxy/polipo/polipo-9999.ebuild
+++ b/net-proxy/polipo/polipo-1.1.1-r4.ebuild
@@ -38,7 +38,7 @@ src_compile() {
 src_install() {
 	einstall PREFIX=/usr MANDIR=/usr/share/man INFODIR=/usr/share/info "TARGET=${D}"
 
-	newinitd "${FILESDIR}/${PN}.initd-4" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-5" ${PN}
 	insinto /etc/${PN} ; doins "${FILESDIR}/config"
 	systemd_newunit "${FILESDIR}/${PN}_at.service" "${PN}@.service"
 	if ! use systemd; then

diff --git a/net-proxy/polipo/polipo-9999.ebuild b/net-proxy/polipo/polipo-9999.ebuild
index 559a3ed..84b743e 100644
--- a/net-proxy/polipo/polipo-9999.ebuild
+++ b/net-proxy/polipo/polipo-9999.ebuild
@@ -38,7 +38,7 @@ src_compile() {
 src_install() {
 	einstall PREFIX=/usr MANDIR=/usr/share/man INFODIR=/usr/share/info "TARGET=${D}"
 
-	newinitd "${FILESDIR}/${PN}.initd-4" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-5" ${PN}
 	insinto /etc/${PN} ; doins "${FILESDIR}/config"
 	systemd_newunit "${FILESDIR}/${PN}_at.service" "${PN}@.service"
 	if ! use systemd; then


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-proxy/polipo/files/, net-proxy/polipo/
@ 2017-01-09 17:13 Andrew Savchenko
  0 siblings, 0 replies; 5+ messages in thread
From: Andrew Savchenko @ 2017-01-09 17:13 UTC (permalink / raw
  To: gentoo-commits

commit:     c652c4d2cc8f427e4ff82a476e898216524fb2fc
Author:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  9 16:58:11 2017 +0000
Commit:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Mon Jan  9 16:58:11 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c652c4d2

net-proxy/polipo: remove old

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>

 net-proxy/polipo/files/polipo.initd-4   | 66 ---------------------------------
 net-proxy/polipo/polipo-1.1.1-r3.ebuild | 62 -------------------------------
 2 files changed, 128 deletions(-)

diff --git a/net-proxy/polipo/files/polipo.initd-4 b/net-proxy/polipo/files/polipo.initd-4
deleted file mode 100644
index 10960e6..00000000
--- a/net-proxy/polipo/files/polipo.initd-4
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-CONFFILE="/etc/polipo/config${SVCNAME#polipo}"
-PIDFILE="/var/run/${SVCNAME}.pid"
-
-depend() {
-	need net
-}
-
-checkconfig() {
-	{ polipo -v -c "${CONFFILE}" || return 1 ; } | {
-		local retvalue=0
-		local name type value desc
-		while read name type value desc ; do
-			case ${name} in
-			configFile)
-				if [ "${value}" = "(none)" ] ; then
-					eerror "Unable to read configuration file /etc/polipo/config"
-					retvalue=1
-				fi
-				;;
-			daemonise)
-				if [ "${value}" != "false" ] ; then
-					eerror "Configuration option not supported by this init script: ${name}=${value}"
-					retvalue=1
-				fi
-				;;
-			pidFile)
-				if [ "${value}" != "(none)" ] ; then
-					eerror "Configuration option not supported by this init script: ${name}=${value}"
-					retvalue=1
-				fi
-				;;
-			diskCacheRoot)
-				if [ "${value}" != "(none)" ] ; then
-					# Ensure that cache directory exists and have proper permissions
-					if ! [ -d "{value}" ]; then
-						mkdir -p -m 0750 "${value}"
-						chown polipo:polipo "${value}"
-					fi
-				fi
-				;;
-			esac
-		done
-		return ${retvalue}
-	}
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting ${SVCNAME} HTTP proxy"
-	start-stop-daemon --start --user polipo \
-		--background --pidfile "${PIDFILE}" --make-pidfile \
-		--exec /usr/bin/polipo -- -c "${CONFFILE}"
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME} HTTP proxy"
-	start-stop-daemon --stop --pidfile "${PIDFILE}"
-	eend $?
-}

diff --git a/net-proxy/polipo/polipo-1.1.1-r3.ebuild b/net-proxy/polipo/polipo-1.1.1-r3.ebuild
deleted file mode 100644
index 559a3ed..00000000
--- a/net-proxy/polipo/polipo-1.1.1-r3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-if [[ ${PV} == "9999" ]] ; then
-	_GIT=git-r3
-	EGIT_REPO_URI="https://github.com/jech/${PN}.git"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://www.pps.jussieu.fr/~jch/software/files/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-inherit ${_GIT} toolchain-funcs user systemd
-
-DESCRIPTION="A caching web proxy"
-HOMEPAGE="http://www.pps.jussieu.fr/~jch/software/polipo/"
-LICENSE="MIT GPL-2"
-SLOT="0"
-IUSE="systemd"
-
-DEPEND="sys-apps/texinfo"
-RDEPEND=""
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/cache/${PN} ${PN}
-}
-
-src_compile() {
-	tc-export CC
-	emake PREFIX=/usr "CDEBUGFLAGS=${CFLAGS}" all
-}
-
-src_install() {
-	einstall PREFIX=/usr MANDIR=/usr/share/man INFODIR=/usr/share/info "TARGET=${D}"
-
-	newinitd "${FILESDIR}/${PN}.initd-4" ${PN}
-	insinto /etc/${PN} ; doins "${FILESDIR}/config"
-	systemd_newunit "${FILESDIR}/${PN}_at.service" "${PN}@.service"
-	if ! use systemd; then
-		exeinto /etc/cron.weekly ; newexe "${FILESDIR}/${PN}.crond-2" ${PN}
-	fi
-
-	dodoc CHANGES README
-	dohtml html/*
-}
-
-pkg_postinst() {
-	elog "Do not forget to read the manual."
-	elog "Change the config file in /etc/${PN} to suit your needs."
-	elog ""
-	elog "Polipo init scripts can now be multiplexed:"
-	elog "1. create /etc/${PN}/config.foo"
-	elog "2. symlink /etc/init.d/{${PN}.foo -> ${PN}}"
-	elog "  a. if you are using OpenRC, symlink /etc/init.d/{${PN}.foo -> ${PN}}"
-	elog "  b. if you are using systemd, execute \"systemctl enable polipo@config.foo\""
-	elog "3. make sure all instances use unique ip:port pair and cachedir, if any"
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2017-01-09 17:13 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-22 12:11 [gentoo-commits] repo/gentoo:master commit in: net-proxy/polipo/files/, net-proxy/polipo/ Andrew Savchenko
  -- strict thread matches above, loose matches on Subject: below --
2017-01-09 17:13 Andrew Savchenko
2016-04-26  4:28 Andrew Savchenko
2016-04-22 12:26 Andrew Savchenko
2015-12-07 12:40 Andrew Savchenko

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox