[gentoo-commits] repo/gentoo:master commit in: www-apps/tt-rss/, www-apps/tt-rss/files/

["James Le Cuirot" <chewi@gentoo.org>]

commit:     0a44f2b78a7d114b0de6cf05f8ae19f4d82bbf74
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 18 13:41:26 2018 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Jan 18 13:43:50 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a44f2b7

www-apps/tt-rss: Drop vulnerable 20160527 and 20160930 versions

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 www-apps/tt-rss/Manifest                           |  2 -
 .../tt-rss/files/postinstall-en-with-daemon.txt    | 19 -----
 www-apps/tt-rss/files/ttrssd.confd-r1              | 14 ----
 www-apps/tt-rss/files/ttrssd.initd-r2              | 83 --------------------
 www-apps/tt-rss/files/ttrssd.logrotated            |  9 ---
 www-apps/tt-rss/tt-rss-20160527.ebuild             | 88 ----------------------
 www-apps/tt-rss/tt-rss-20160930.ebuild             | 88 ----------------------
 7 files changed, 303 deletions(-)

diff --git a/www-apps/tt-rss/Manifest b/www-apps/tt-rss/Manifest
index 2c45842b727..1f555aa5e71 100644
--- a/www-apps/tt-rss/Manifest
+++ b/www-apps/tt-rss/Manifest
@@ -1,3 +1 @@
-DIST tt-rss-20160527.tar.bz2 2064633 BLAKE2B 406c2ff551e2ba616a8f4696d7deaf8a3f85e4f86f0b09f57507af7f4657930f11fc0aa9df467af5ad2c56657d95e12b75bae721da4d86480b06bbbc0ab72744 SHA512 8d482303868a08f4d65ef252f71f66ec3219d4f67e968a026a0302d29930cd5af45cedea81171db2ff0927497079d3bedd8fd70e4e9904f5d9987a92a6dfcb89
-DIST tt-rss-20160930.tar.bz2 2072888 BLAKE2B e6ca0a72730cdf9a1106d7098e6a6bfc9bf35f545a67e9b569552644b23543b4168000afe2e5fbf5a1fd81371e72e570e270a77d5345bca5f22d79c1a86409b0 SHA512 d420e7efdf7d17e153ef0aa487a330379afe20fe9e9a6209de40b797d36e425cbcbdf2280eaf5ada8b9bef1ae37146253556ff602bbff22a9a7c311ff525d9e2
 DIST tt-rss-20180105.tar.gz 3070929 BLAKE2B 2370104c70f5381d690a29b216269c749bf1f7c6b925eb9499b741e5df3e686d95fce430a144946fd915414481280b67e6d0c881edcdd13aee0fa344dc0bec3f SHA512 86ceec3646629ad7fd3fde2f3c3237e48ad96bd08b46e73c34c76507d9b17613ea309e1bd5e6e85a0d9eb96029e54b54e5ee367c56aab31be3dcec9169c5ada5

diff --git a/www-apps/tt-rss/files/postinstall-en-with-daemon.txt b/www-apps/tt-rss/files/postinstall-en-with-daemon.txt
deleted file mode 100644
index 25545842a38..00000000000
--- a/www-apps/tt-rss/files/postinstall-en-with-daemon.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Please read https://tt-rss.org/wiki/InstallationNotes.
-
-Once you have configured TT-RSS, put the path to this instance into
-the INSTANCE_DIRS variable in /etc/conf.d/ttrssd. Make sure that
-the ttrssd user can access the path, and then start the update daemon
-with
-
-  /etc/init.d/ttrssd start
-
-to get your feeds updated. Add the daemon to your default runlevel,
-so that it gets launched after a system restart:
-
-  rc-update add ttrssd default
-
-
-With the update to 1.7.0 the 'magpie' RSS parser has been removed.
-That means TT-RSS will use the 'simplepie' parser. If you have been
-using 'magpie' so far, the switch might cause lots of duplicate
-articles - it's a one-time thing for each instance.

diff --git a/www-apps/tt-rss/files/ttrssd.confd-r1 b/www-apps/tt-rss/files/ttrssd.confd-r1
deleted file mode 100644
index cf74794e22d..00000000000
--- a/www-apps/tt-rss/files/ttrssd.confd-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Path to TT-RSS instances which should have running update daemon.
-# EXAMPLE: INSTANCE_DIRS="/some/webhost/htdocs/tt-rss /some/otherwebhost/htdocs/newsreader"
-INSTANCE_DIRS=""
-
-# Path to log file. Remember to alter logrotate file if you change it here.
-LOGFILE="/var/log/ttrssd.log"
-
-# User and group which run the update daemon.
-# NOTE: you should really avoid running it as root.
-TTRSSD_USER="ttrssd"
-TTRSSD_GROUP="ttrssd"

diff --git a/www-apps/tt-rss/files/ttrssd.initd-r2 b/www-apps/tt-rss/files/ttrssd.initd-r2
deleted file mode 100644
index d46d5890a1f..00000000000
--- a/www-apps/tt-rss/files/ttrssd.initd-r2
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need logger net
-	after postgres mysql
-}
-
-LOGFILE=${LOGFILE:-"/var/log/ttrssd.log"}
-TTRSSD_USER=${TTRSSD_USER:-"ttrssd"}
-TTRSSD_GROUP=${TTRSSD_GROUP:-"ttrssd"}
-INSTANCE_FOLDERS="cache lock feed-icons"
-BASE_PID="/run/ttrssd"
-
-checkconfig() {
-	local instance instancepidname dir
-
-	# check instances
-	if [ -z "${INSTANCE_DIRS}" ]; then
-		eerror "There is no defined instance directory in /etc/conf.d/ttrssd"
-		return 1
-	fi
-
-	# verify log file accessibility
-	if [ ! -e "${LOGFILE}" ]; then
-		touch "${LOGFILE}" || return 1
-	fi
-	chown "${TTRSSD_USER}":"${TTRSSD_GROUP}" "${LOGFILE}" || return 1
-
-	mkdir -p "${BASE_PID}"
-
-	# check instances for errors
-	for instance in ${INSTANCE_DIRS}; do
-		instancepidname=$(echo "${instance}.pid" | sed -e 's|/||' -e 's|/|--|g')
-
-		if [ ! -f "${instance}/update_daemon2.php" ]; then
-			eerror "\"${instance}\" does not contain update_daemon2.php script."
-			eerror "Please check your installation or the INSTANCE_DIRS variable."
-			return 1
-		fi
-
-		# NOTE: This can't be done by webapp-config if we want runtime configurable TTRSSD_GROUP
-		for dir in ${INSTANCE_FOLDERS}; do
-			if [ -d "${instance}/${dir}" ]; then
-				chown -R ":${TTRSSD_GROUP}" "${instance}/${dir}" || return 1
-				chmod -R g+w "${instance}/${dir}" || return 1
-			fi
-		done
-	done
-}
-
-start () {
-	local instance instancepidname
-
-	checkconfig || return 1
-
-	for instance in ${INSTANCE_DIRS}; do
-		instancepidname=$(echo "${instance}.pid" | sed -e 's|/||' -e 's|/|--|g')
-		mypid="${BASE_PID}/${instancepidname}"
-		ebegin "Starting TT-RSS update daemon in \"${instance}\""
-		start-stop-daemon --start --user "${TTRSSD_USER}":"${TTRSSD_GROUP}" --background \
-			--stdout "${LOGFILE}" --stderr "${LOGFILE}" \
-			--make-pidfile --pidfile "${mypid}" \
-			--exec /usr/bin/php -- -f "${instance}/update_daemon2.php"
-		eend $?
-	done
-}
-
-stop() {
-	local instance instancepidname
-
-	for instance in ${INSTANCE_DIRS}; do
-		instancepidname=$(echo "${instance}.pid" | sed -e 's|/||' -e 's|/|--|g')
-		mypid="${BASE_PID}/${instancepidname}"
-		ebegin "Stopping TT-RSS update daemon in \"${instance}\""
-		start-stop-daemon --stop \
-			--pidfile "${mypid}" \
-			--exec /usr/bin/php -- -f "${instance}/update_daemon2.php"
-		eend $?
-		rm -f ${instance}/lock/*.lock
-	done
-}

diff --git a/www-apps/tt-rss/files/ttrssd.logrotated b/www-apps/tt-rss/files/ttrssd.logrotated
deleted file mode 100644
index 2bb0d0c1dd3..00000000000
--- a/www-apps/tt-rss/files/ttrssd.logrotated
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/ttrssd.log {
-	daily
-	delaycompress
-	missingok
-	notifempty
-	postrotate
-		/etc/init.d/ttrssd restart > /dev/null
-	endscript
-}

diff --git a/www-apps/tt-rss/tt-rss-20160527.ebuild b/www-apps/tt-rss/tt-rss-20160527.ebuild
deleted file mode 100644
index 5803aae4ddb..00000000000
--- a/www-apps/tt-rss/tt-rss-20160527.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit user eutils webapp vcs-snapshot
-
-DESCRIPTION="Tiny Tiny RSS - A web-based news feed (RSS/Atom) aggregator using AJAX"
-HOMEPAGE="http://tt-rss.org/"
-SRC_URI="https://dev.gentoo.org/~tomka/files/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~mips ~x86"
-IUSE="daemon +mysqli postgres"
-
-DEPEND="
-	daemon? ( dev-lang/php:*[mysqli?,postgres?,pcntl,curl] )
-	!daemon? ( dev-lang/php:*[mysqli?,postgres?,curl] )
-	virtual/httpd-php:*
-"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="|| ( mysqli postgres )"
-
-need_httpd_cgi  # From webapp.eclass
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	if use daemon; then
-			enewgroup ttrssd
-			enewuser ttrssd -1 /bin/sh /dev/null ttrssd
-	fi
-}
-
-src_prepare() {
-	# Customize config.php-dist so that the right 'DB_TYPE' is already set (according to the USE flag)
-	einfo "Customizing config.php-dist..."
-
-	if use mysqli && ! use postgres; then
-			sed -i \
-				-e "/define('DB_TYPE',/{s:pgsql:mysql:}" \
-				config.php-dist || die
-	fi
-
-	sed -i \
-		-e "/define('DB_TYPE',/{s:// \(or mysql\):// pgsql \1:}" \
-		config.php-dist || die
-
-	# per 462578
-	epatch_user
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "/${MY_HTDOCSDIR}"
-	doins -r *
-	keepdir "/${MY_HTDOCSDIR}"/feed-icons
-
-	for DIR in cache lock feed-icons; do
-			webapp_serverowned -R "${MY_HTDOCSDIR}/${DIR}"
-	done
-
-	# In the old days we put a config.php directly and tried to
-	# protect it with the following which did not work reliably.
-	# These days we only install the config.php-dist file.
-	# webapp_configfile "${MY_HTDOCSDIR}"/config.php
-
-	if use daemon; then
-			webapp_postinst_txt en "${FILESDIR}"/postinstall-en-with-daemon.txt
-			newinitd "${FILESDIR}"/ttrssd.initd-r2 ttrssd
-			newconfd "${FILESDIR}"/ttrssd.confd-r1 ttrssd
-			insinto /etc/logrotate.d/
-			newins "${FILESDIR}"/ttrssd.logrotated ttrssd
-
-			elog "After upgrading, please restart ttrssd"
-	else
-			webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	fi
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	elog "You need to merge config.php and config.php-dist manually now."
-	webapp_pkg_postinst
-}

diff --git a/www-apps/tt-rss/tt-rss-20160930.ebuild b/www-apps/tt-rss/tt-rss-20160930.ebuild
deleted file mode 100644
index 5803aae4ddb..00000000000
--- a/www-apps/tt-rss/tt-rss-20160930.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit user eutils webapp vcs-snapshot
-
-DESCRIPTION="Tiny Tiny RSS - A web-based news feed (RSS/Atom) aggregator using AJAX"
-HOMEPAGE="http://tt-rss.org/"
-SRC_URI="https://dev.gentoo.org/~tomka/files/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~mips ~x86"
-IUSE="daemon +mysqli postgres"
-
-DEPEND="
-	daemon? ( dev-lang/php:*[mysqli?,postgres?,pcntl,curl] )
-	!daemon? ( dev-lang/php:*[mysqli?,postgres?,curl] )
-	virtual/httpd-php:*
-"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="|| ( mysqli postgres )"
-
-need_httpd_cgi  # From webapp.eclass
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	if use daemon; then
-			enewgroup ttrssd
-			enewuser ttrssd -1 /bin/sh /dev/null ttrssd
-	fi
-}
-
-src_prepare() {
-	# Customize config.php-dist so that the right 'DB_TYPE' is already set (according to the USE flag)
-	einfo "Customizing config.php-dist..."
-
-	if use mysqli && ! use postgres; then
-			sed -i \
-				-e "/define('DB_TYPE',/{s:pgsql:mysql:}" \
-				config.php-dist || die
-	fi
-
-	sed -i \
-		-e "/define('DB_TYPE',/{s:// \(or mysql\):// pgsql \1:}" \
-		config.php-dist || die
-
-	# per 462578
-	epatch_user
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "/${MY_HTDOCSDIR}"
-	doins -r *
-	keepdir "/${MY_HTDOCSDIR}"/feed-icons
-
-	for DIR in cache lock feed-icons; do
-			webapp_serverowned -R "${MY_HTDOCSDIR}/${DIR}"
-	done
-
-	# In the old days we put a config.php directly and tried to
-	# protect it with the following which did not work reliably.
-	# These days we only install the config.php-dist file.
-	# webapp_configfile "${MY_HTDOCSDIR}"/config.php
-
-	if use daemon; then
-			webapp_postinst_txt en "${FILESDIR}"/postinstall-en-with-daemon.txt
-			newinitd "${FILESDIR}"/ttrssd.initd-r2 ttrssd
-			newconfd "${FILESDIR}"/ttrssd.confd-r1 ttrssd
-			insinto /etc/logrotate.d/
-			newins "${FILESDIR}"/ttrssd.logrotated ttrssd
-
-			elog "After upgrading, please restart ttrssd"
-	else
-			webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	fi
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	elog "You need to merge config.php and config.php-dist manually now."
-	webapp_pkg_postinst
-}