clean old version and matching init files, prompt by maintainer in bug #551520

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

5 files changed, 12 insertions, 198 deletions

diff --git a/app-admin/ulogd/ChangeLog b/app-admin/ulogd/ChangeLog
index 9ab42c11205a..e4f1ab9efc3f 100644
--- a/app-admin/ulogd/ChangeLog
+++ b/app-admin/ulogd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/ulogd
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v 1.104 2015/07/23 20:00:11 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v 1.105 2015/07/28 12:20:04 idella4 Exp $
+
+  28 Jul 2015; Ian Delaney <idella4@gentoo.org> -files/ulogd-2-ng.init,
+  -files/ulogd-2.logrotate, -ulogd-2.0.4.ebuild:
+  clean old version and matching init files, prompt by maintainer in bug #551520
 
   23 Jul 2015; Pacho Ramos <pacho@gentoo.org> ulogd-2.0.4-r1.ebuild:
   ppc stable wrt bug #551520
diff --git a/app-admin/ulogd/Manifest b/app-admin/ulogd/Manifest
index 38c7a0dc83bf..58b827d74739 100644
--- a/app-admin/ulogd/Manifest
+++ b/app-admin/ulogd/Manifest
@@ -1,24 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX ulogd-2-ng.init 1003 SHA256 e041c468f9fe48200035dae9b2f6681611c3fbe89414738d68d26f5d3c1a2df3 SHA512 7f1b1d2a87daa98990724e44db8ad4421084d447a98dbab9fef886cd40fac56516639d4417d49984a4af10a75f67ba9d726a351845c13f1b2c6092e58cbaa708 WHIRLPOOL 001cce9019e9cac5030274f4a48e52b263ea088593fc898931dc365bb33e828b428dcc68af1ec79b15f7b82f93d8f2b2c814bc18c0ed0dc680f95c282ca51714
 AUX ulogd-2.0.4-linux-headers-3.17-ipt_ulog.patch 3187 SHA256 aa1226e726e255024862436533f3ca03673cb60b9b71ecca956f2390e5d76202 SHA512 b1dda5ff80913d104941be9bf67fa72a07729b93de297a18a754c6ee41398d603e410324ffb39932142cb6b7a58d681a3d7c4a1bcefa9fa781b452ac2ba42d42 WHIRLPOOL 2255640dc07e6b7a81f72b44b71510c341b49f4918c1b36321778d57f4bca06e74e4972cccdb8853e328d046a3dbc3f5f7be0ef82d958187cde0ef9c4d9cc64e
 AUX ulogd-2.0.5-remove-db-automagic.patch 1464 SHA256 40188b4d15f59b63d4a7d5aa2852546f78e7d0b101afb9a13c4145c48bf65921 SHA512 9bf3c5c1c8ecf0d8d40f2eb56004ce8843d5aa40273539f6b34b163db60fc90bb4305e1f9b680ccefcdce33aa47e0e248df314578fc6dfb94beb346c63163897 WHIRLPOOL e4ae6b3c027215d2eac98daea795f1b4d73de07c424a1bbe5bcbd05ad5397214f0f14cb3ab65fea588f3afc58f888f8b49c4f18c98219ed876c28663813b9bdf
-AUX ulogd-2.logrotate 212 SHA256 df0f73b4dd4b0c1f6afaf3efc98c99b972e068bcbf8ea768f6522cbebd339669 SHA512 1c29316f42903a8893a110e74c171f2b8b4c9bb2d63221b65e601f077549c7447941ce6257259b4f1042076c1e4b5bfba0bf7c85289519aab6edb27edf6ffc95 WHIRLPOOL 8f2290e7de1e8958c1fc5cf1f075170a691304d1ddbf53a2f14b989925d5da6996ab409442ee9a92852a711f56a2bfe05bd97a55ab2d6be3fd1cca346cd0dd93
 AUX ulogd.init 1005 SHA256 d3bb0244aad499b77ec5b8eaadfcc4b1189645423116d5af01f1777b1ee8bc50 SHA512 0fa76a0dbeb570f1b1e5c168729b2afe3c5ada855f421fe278d04e543f24624fc1fe2344cc226c95ff0283675481283a3d9dd4b806b3456915fc9e53e4e56981 WHIRLPOOL 8721814537e12e58168b6ca8fa8d800bdc7aea6ce8baf0aac44405e9121ce7487e59aee48b2257efb3d61197837334b88df98b4291cd5a09be42b425dee4d9a5
 AUX ulogd.logrotate 193 SHA256 f5253a7906b2dc08c3ff5afe2c07f51aa77541c1ba65a5d2292099893827f66c SHA512 be62a8c63d567d90ab07d9a9e86fb85d868683c385de598b81fa369fd13581a144a0be1aedd2b899d653d94475679eee1fd4939ae72a35777d75208584b2f17a WHIRLPOOL c10c9003fbfc367ae556ccef60eb453f736235c01e6fcf7252ed0bb7626ecf80fc2858408accc08987340008450a4405425bba93c13c25b6b47150e3702fcd25
 AUX ulogd.service 356 SHA256 4227eb4b48ab4cb1428a4f86d9e919a568239f6de8e66cca75cef28f3c0c1b08 SHA512 322e2ee9a7c9f0df51368dd8790a2c45277727de47c19f4c62ed8df3badfdeb483cfa97d62c01a9095f85cc1ab67c4bdadb90b2f2deb9152fde699c422544568 WHIRLPOOL 83b3569a09c583ffe481632a893daf21a71eac6a053bd09887611491f7ac9e51f053006bcfac032c8834169b2d98cd3503ba427e58ac5d55a495eb340f740b1a
 DIST ulogd-2.0.4.tar.bz2 452234 SHA256 56b30a13a8832e97178f39b7bb173a0b1dfe173dbb60d99a1a386c0962a2effd SHA512 08e88661fcfbcfd327b03b7a883dc239991f47d5a4e4561f3ada5f6acc8f2349f3bd38c1c67f28e42bbccf4cad63b2b7c3b732c23bf24b7c5f05320d27977773 WHIRLPOOL 94ee731cee8b95295d1c675bb3904be1a5b27a1e901d462f248116c865e79d52703b5330882110d7212bda1bb964fc0c97c3e704589071f47fab4475e1c91161
 DIST ulogd-2.0.5.tar.bz2 456258 SHA256 a221cb9f77347c0ca00d0937e27c1b90e3291a553cc62a4139b788e2e420e8c0 SHA512 bf00b8adaad7bd04077a83521b0d7accc26e644c8f3386819e7f91476178b6733f1c6554fb82dd0d3913398c83a61d65f61dc973f199f610bfaadc6251504819 WHIRLPOOL fe499ac7b4070581439a05f4f2245f7a42fe5630da5dc32b9b069511ed1faa15fe482eee08d50477d3fb1d0bf0d3855a69fc82fb0f3e8eecdf082fb642519f91
 EBUILD ulogd-2.0.4-r1.ebuild 3499 SHA256 db34b8736cb38628d60167f87d0ae874b8d3eecec371bfd01f32b4bde0541268 SHA512 8a76a179b312a947f85fd17be9ebeb1cf5f284acbf5036574ff4cdf5580be50bb251e9f738210c1e033e384efcb80ba3f92b2f78fa900651a132346b660f6d80 WHIRLPOOL efd7e9a771fd39a409d437704cfa80c7a1320852bb7f9802a674643efd4d521e25abb3522de137d9826d997d9a5f126d2396e96d300425a33194e16dbcbd3d3f
-EBUILD ulogd-2.0.4.ebuild 3445 SHA256 37232ff4bc482649326d5b8d3715765f3f5f134c56b3e591e3a8a6ff2125d632 SHA512 3401c80ccaa55d49d289d6b09c28ced256214b138ddca0e1902dfb96c75e540b846ec9227afd5ae86f94b32c355174c77d2149c4e3f8d2b47ea39252377e67ad WHIRLPOOL 759eff342120195984c3c9f4c1d0554878855a4ab4769c29c97625d7328fd5e5efd4ed1c7a26948cce5cf69247d11bd1e973a1c9a3a4cef9d7fa678940d5a980
 EBUILD ulogd-2.0.5.ebuild 3472 SHA256 ddbc342533b8ebfa1422945e2465c0284cc1bf71f31c4bce8d5399d47e72dfd2 SHA512 159d612cb8ac94783b5cdac64304a76aef78932ab7a5040757976a7025aa9866de82ffdee926e744d53460981319a53ea43bbce6529d4f9a3bc2cbab9d0dba0b WHIRLPOOL 3cbf16e966be16da8bf9408ff6e2737b607cde9fd8653eec6e10cd09ff0e3fb87e7a4a8a186ca7afc934f5d9e35e73ff563fd7ec7e5104fca41ed7a567c662ba
-MISC ChangeLog 17284 SHA256 fa30817488c1350a09a51b07440e950c3ebdedff27bcd22c09bbe5bd99cf0e7f SHA512 0a000f49888ee5d53f3e4e3f1ad713040ced47952c93e07bcd9682056854a03d0e48c716b2d727d8afe51eb2622e62285c66cf996cd4ab081eff259ac69dd0d2 WHIRLPOOL 38b60b4f50cf1373910da624153bc31d500f20976ea52a821d6f48ff1f7b611b4430f3ce5a8e31cbb8b137215d14ea7a6e7825ff1f3652e3f4c881a4226048aa
+MISC ChangeLog 17489 SHA256 5925f0259a2590e6765b6596931c5d97313a412e82149e876d9490812b302aa4 SHA512 71c0aa15523ad3543f77ab0a655334551198d9ff929ce6d1abe746dd518633691b21f5f601e7cc1c3790fccad35f115ed3dca3e9f18f2c2a8361013baf2b15d6 WHIRLPOOL 6ceffc38f9dbc168b2c7e59831fddde6129cdbe2253a9f24a6be6cfb570af2fc4468cc937cdf5e8cde54441ff5d8cc06079038f0bcca12099ba6df87bbf77c1c
 MISC metadata.xml 1164 SHA256 199c65b8f7c8707d65b9e2fa420cd454e71402f7600b8b8aea65a2c77d5e8746 SHA512 59df9b90185affa7ecc29f2e077b13de46fd3d5005918c47fd8617bfd7bfd9aa90ced8626c91601d3c814ccbf8d0455e179aa723883b1563e9851825261849c0 WHIRLPOOL f270a3066574bddf5be56703ccc206667c59b15933a294ea7c91ce0b6e6cc29a61b8c6d5eecb748e44584aeab95ca21ab900bb853a803a650a8b35932fd33f2e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEUEAREIAAYFAlWxR8wACgkQCaWpQKGI+9Sq5ACeIX7gfKuFcR+y4Ukke2flIw05
-2YkAljlYMt5DnsL2mUx6vC8cwsAB9U8=
-=Bo+4
+iKYEAREIAGYFAlW3c3ZfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldDdDQUM1OUY0ODkzMERBREU1NUQ1RjJBRkIy
+OEVDMjEzQjgwNzJCMEQACgkQso7CE7gHKw22YACeNJpjNymqAvS5hjIf+p/yR5On
+PqkAnjVGYxOoS4jmGAUnXIvt+h3ZtLeI
+=ynb0
 -----END PGP SIGNATURE-----
diff --git a/app-admin/ulogd/files/ulogd-2-ng.init b/app-admin/ulogd/files/ulogd-2-ng.init
deleted file mode 100644
index 3a0fc4d613d4..000000000000
--- a/app-admin/ulogd/files/ulogd-2-ng.init
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/files/ulogd-2-ng.init,v 1.4 2015/06/01 02:15:36 idella4 Exp $
-
-ULOGD_PIDFILE="/run/ulogd.pid"
-ULOGD_BINARY="/usr/sbin/ulogd"
-ULOGD_OPTS="--daemon --uid ulogd --pidfile ${ULOGD_PIDFILE}"
-
-extra_started_commands="reload reopen_logs"
-
-depend() {
-	before iptables ip6tables ebtables firewall
-	after mysql postgresql
-}
-
-start() {
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start \
-		--exec ${ULOGD_BINARY} --pidfile ${ULOGD_PIDFILE} \
-		-- ${ULOGD_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --pidfile ${ULOGD_PIDFILE}
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading ${SVCNAME} configuration"
-	start-stop-daemon --signal USR1 --pidfile ${ULOGD_PIDFILE}
-	eend $?
-}
-
-reopen_logs() {
-	ebegin "Reopening ${SVCNAME} logfiles"
-	start-stop-daemon --signal HUP --pidfile ${ULOGD_PIDFILE}
-	eend $?
-}
diff --git a/app-admin/ulogd/files/ulogd-2.logrotate b/app-admin/ulogd/files/ulogd-2.logrotate
deleted file mode 100644
index 787f49b6fcb0..000000000000
--- a/app-admin/ulogd/files/ulogd-2.logrotate
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/ulogd/ulogd.log /var/log/ulogd/ulogd_syslogemu.log {
-    sharedscripts
-    missingok
-    notifempty
-    create 0640 ulogd
-    postrotate
-        /etc/init.d/ulogd reopen_logs > /dev/null
-    endscript
-}
diff --git a/app-admin/ulogd/ulogd-2.0.4.ebuild b/app-admin/ulogd/ulogd-2.0.4.ebuild
deleted file mode 100644
index 33980c346361..000000000000
--- a/app-admin/ulogd/ulogd-2.0.4.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-2.0.4.ebuild,v 1.9 2015/01/28 10:26:01 ago Exp $
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-inherit autotools-utils eutils linux-info readme.gentoo user
-
-DESCRIPTION="A userspace logging daemon for netfilter/iptables related logging"
-HOMEPAGE="http://netfilter.org/projects/ulogd/index.html"
-SRC_URI="ftp://ftp.netfilter.org/pub/${PN}/${P}.tar.bz2
-		http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc x86"
-IUSE="dbi doc json mysql nfacct +nfct +nflog pcap postgres sqlite"
-
-RDEPEND="net-firewall/iptables
-	>=net-libs/libnfnetlink-1.0.1
-	dbi? ( dev-db/libdbi )
-	json? ( dev-libs/jansson )
-	nfacct? (
-		>=net-libs/libmnl-1.0.3
-		>=net-libs/libnetfilter_acct-1.0.1
-	)
-	nfct? ( >=net-libs/libnetfilter_conntrack-1.0.2 )
-	nflog? ( >=net-libs/libnetfilter_log-1.0.0 )
-	mysql? ( virtual/mysql )
-	pcap? ( net-libs/libpcap )
-	postgres? ( dev-db/postgresql )
-	sqlite? ( dev-db/sqlite:3 )"
-
-DEPEND="${RDEPEND}
-	doc? (
-		app-text/linuxdoc-tools
-		app-text/texlive-core
-		virtual/latex-base
-	)"
-
-DOCS=( AUTHORS README TODO )
-DOC_CONTENTS="You must have at least one logging stack enabled to make ulogd work.
-Please edit example configuration located at /etc/ulogd.conf"
-
-pkg_setup() {
-	enewgroup ulogd
-	enewuser ulogd -1 -1 /var/log/ulogd ulogd
-
-	linux-info_pkg_setup
-
-	if kernel_is lt 2 6 14; then
-		die "ulogd2 requires kernel newer than 2.6.14"
-	fi
-
-	if kernel_is lt 2 6 18; then
-		ewarn
-		ewarn "You are using kernel older than 2.6.18"
-		ewarn "Some ulogd2 features may be unavailable"
-		ewarn
-	fi
-
-	if use nfacct && kernel_is lt 3 3 0; then
-		ewarn "NFACCT input plugin requires kernel newer than 3.3.0"
-	fi
-
-	if ! use nfacct && ! use nfct && ! use nflog && kernel_is gt 3 17 0; then
-		ewarn "ULOG target was removed since 3.17.0 kernel release"
-		ewarn "Consider enabling NFACCT, NFCT or NFLOG support"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-linux-headers-3.17-ipt_ulog.patch"
-
-	# - make all logs to be kept in a single dir /var/log/ulogd
-	# - place sockets in /run instead of /tmp
-	sed -i \
-		-e 's:var/log:var/log/ulogd:g' \
-		-e 's:tmp:run:g' \
-		ulogd.conf.in || die 'sed on ulogd.conf.in failed'
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with dbi)
-		$(use_with json jansson)
-		$(use_enable nfacct)
-		$(use_enable nfct)
-		$(use_enable nflog)
-		$(use_with mysql)
-		$(use_with pcap)
-		$(use_with postgres pgsql)
-		$(use_with sqlite)
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-
-	if use doc ; then
-		# prevent access violations from generation of bitmap font files
-		export VARTEXFONTS="${T}"/fonts
-		emake -C doc
-	fi
-}
-
-src_install() {
-	autotools-utils_src_install
-	readme.gentoo_create_doc
-	prune_libtool_files --modules
-
-	if use doc ; then
-		dohtml doc/${PN}.html
-		dodoc doc/${PN}.dvi doc/${PN}.txt doc/${PN}.ps
-	fi
-
-	use sqlite && dodoc doc/sqlite3.table
-	use mysql && dodoc doc/mysql-*.sql
-	use postgres && dodoc doc/pgsql-*.sql
-	doman ${PN}.8
-
-	insinto /etc
-	doins ${PN}.conf
-	fowners root:ulogd /etc/ulogd.conf
-	fperms 640 /etc/ulogd.conf
-
-	newinitd "${FILESDIR}/${PN}-2-ng.init" ${PN}
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}-2.logrotate" ${PN}
-
-	diropts -o ulogd -g ulogd
-	keepdir /var/log/ulogd
-}