version bump, removed old versions

Package-Manager: portage-2.2.1

9 files changed, 57 insertions, 93 deletions

diff --git a/app-antivirus/skyldav/ChangeLog b/app-antivirus/skyldav/ChangeLog
index 4def468..89e6bdf 100644
--- a/app-antivirus/skyldav/ChangeLog
+++ b/app-antivirus/skyldav/ChangeLog
@@ -1,3 +1,15 @@
+*skyldav-0.2_rc4 (25 Aug 2013)
+
+  25 Aug 2013; Wolfram Schlich <wschlich@gentoo.org>
+  +files/skyldav-0.2_rc4-conf.patch, +files/skyldav-0.2_rc4-examples.patch,
+  +files/skyldav-0.2_rc4-more-syslog-messages.patch,
+  +files/skyldav-0.2_rc4-sbin.patch, +skyldav-0.2_rc4.ebuild,
+  -files/skyldav-0.2_rc3-sbin.patch,
+  -files/skyldav-0.2_rc3_p20130821-examples.patch,
+  -files/skyldav-0.2_rc3_p20130824-conf.patch,
+  -skyldav-0.2_rc3_p20130824.ebuild, -skyldav-0.2_rc3_p20130825.ebuild:
+  version bump, removed old versions
+
 *skyldav-0.2_rc3_p20130825 (25 Aug 2013)
 
   25 Aug 2013; Wolfram Schlich <wschlich@gentoo.org>
diff --git a/app-antivirus/skyldav/Manifest b/app-antivirus/skyldav/Manifest
index bcbfd85..ce75daa 100644
--- a/app-antivirus/skyldav/Manifest
+++ b/app-antivirus/skyldav/Manifest
@@ -1,2 +1 @@
-DIST skyldav-0.2_rc3_p20130825.tar.gz 101683 SHA256 290dcc7abba2f6da000f0910ef44f3672ca09a304f4702631ba487f359386894 SHA512 cf1537c81ebce00b19d057fa87bc4074413469a132e69b5d568a34f381dd1ff646efb620f117eab7201b0bf57c850f90f380bde6f93e9c4b32127dafa6387717 WHIRLPOOL 9d811f9e8668cbf796ae7ecf7d33fbb2b79ab1c9eb96d4c91bb0523076b8376bcfabba9ada44814235b048cd4f948562acdcc5c52b4c439a589d7aefd1754bd1
-DIST skyldav-0.2rc3_p20130824.tar.gz 100909 SHA256 580729fd196fbdc8bea151e1aac31f5870d803601fd3da96c4092ce7613ad0c1 SHA512 eacbeead5b097cffb2587375ee63e14163cbd6e0fe7a21bf1ef8947e630bab28dbfe0f51ec2ba3d646533514e0f4b9d4d1b10137315d72c9aebdb4c4e72b1ebe WHIRLPOOL 35c608f1c30710e7f32f72d30664d91f9c2d007e69c03a183fe3ec5747f7acd623daa3ee8e9630dd03f8325bae74ad56bad233e4251da10408ec9a4b385de44b
+DIST skyldav-0.2rc4.tar.gz 102690 SHA256 9752520ca4b50ee181541b4decddffacd17c192bcf059e5d89d5de5485747bc3 SHA512 ed62c459907afed619df362f08b2eb565cef70b2c10f1da7f64d72a0ee2767f776387b38b50c3729eaca33ac640b827bdd1cb02f117778944c512d8902f40858 WHIRLPOOL 90cae16a26122df1db9c4d0c4ba13fa5939febdbc2d2e61ed5a0755234f3fe2ec055bcd138c7f2fd9c2ad1827b0aa3789117d755c5100c1ba1e7f5863a004e09
diff --git a/app-antivirus/skyldav/files/skyldav-0.2_rc3_p20130821-examples.patch b/app-antivirus/skyldav/files/skyldav-0.2_rc3_p20130821-examples.patch
deleted file mode 100644
index 03bcb33..0000000
--- a/app-antivirus/skyldav/files/skyldav-0.2_rc3_p20130821-examples.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN skyldav-0.2rc3_p20130821.orig/Makefile.am skyldav-0.2rc3_p20130821/Makefile.am
---- skyldav-0.2rc3_p20130821.orig/Makefile.am	2013-08-21 06:56:18.000000000 +0200
-+++ skyldav-0.2rc3_p20130821/Makefile.am	2013-08-21 07:26:49.435950000 +0200
-@@ -9,7 +9,6 @@
- 	rm -rf doc/doxygen
- 
- install-data-local: \
--  install-skyldav-examples \
-   install-skyldav-conf \
-   install-skyldavnotify-desktop
- 
diff --git a/app-antivirus/skyldav/files/skyldav-0.2_rc3_p20130824-conf.patch b/app-antivirus/skyldav/files/skyldav-0.2_rc4-conf.patch
index 646d148..d540b71 100644
--- a/app-antivirus/skyldav/files/skyldav-0.2_rc3_p20130824-conf.patch
+++ b/app-antivirus/skyldav/files/skyldav-0.2_rc4-conf.patch
@@ -1,6 +1,6 @@
-diff -urN skyldav-0.2rc3_p20130824.orig/examples/etc/skyldav.conf skyldav-0.2rc3_p20130824/examples/etc/skyldav.conf
---- skyldav-0.2rc3_p20130824.orig/examples/etc/skyldav.conf	2013-08-22 20:30:09.000000000 +0200
-+++ skyldav-0.2rc3_p20130824/examples/etc/skyldav.conf	2013-08-24 23:24:50.432728000 +0200
+diff -urN skyldav-0.2rc4.orig/examples/etc/skyldav.conf skyldav-0.2rc4/examples/etc/skyldav.conf
+--- skyldav-0.2rc4.orig/examples/etc/skyldav.conf	2013-08-25 13:20:14.000000000 +0200
++++ skyldav-0.2rc4/examples/etc/skyldav.conf	2013-08-25 21:58:02.243407000 +0200
 @@ -19,14 +19,15 @@
  
  # Directories that shall not be scanned (including subdirectories)
@@ -15,7 +15,7 @@ diff -urN skyldav-0.2rc3_p20130824.orig/examples/etc/skyldav.conf skyldav-0.2rc3
  # File systems that shall not be marked for virus scan.
  # NOMARK_FS = proc, sysfs
 -NOMARK_FS = proc, sysfs
-+NOMARK_FS = proc, sysfs, devtmpfs, devpts, configfs, securityfs, cgroup, rpc_pipefs
++NOMARK_FS = proc, sysfs, devtmpfs, devpts, debugfs, configfs, securityfs, cgroup, rpc_pipefs
  
  # Mounts that shall not be marked for virus scan.
  # NOMARK_MNT = /mnt/noscan
diff --git a/app-antivirus/skyldav/files/skyldav-0.2_rc4-examples.patch b/app-antivirus/skyldav/files/skyldav-0.2_rc4-examples.patch
new file mode 100644
index 0000000..bb6eb41
--- /dev/null
+++ b/app-antivirus/skyldav/files/skyldav-0.2_rc4-examples.patch
@@ -0,0 +1,11 @@
+diff -urN skyldav-0.2rc4.orig/Makefile.am skyldav-0.2rc4/Makefile.am
+--- skyldav-0.2rc4.orig/Makefile.am	2013-08-25 13:20:14.000000000 +0200
++++ skyldav-0.2rc4/Makefile.am	2013-08-25 21:59:35.374015000 +0200
+@@ -9,7 +9,6 @@
+ 	rm -rf doc/doxygen
+ 
+ install-data-local: \
+-  install-skyldav-examples \
+   install-skyldav-conf \
+   install-skyldavnotify-desktop
+ 
diff --git a/app-antivirus/skyldav/files/skyldav-0.2_rc4-more-syslog-messages.patch b/app-antivirus/skyldav/files/skyldav-0.2_rc4-more-syslog-messages.patch
new file mode 100644
index 0000000..0fe7d70
--- /dev/null
+++ b/app-antivirus/skyldav/files/skyldav-0.2_rc4-more-syslog-messages.patch
@@ -0,0 +1,16 @@
+diff -urN skyldav-0.2rc4.orig/src/skyldav/Messaging.cc skyldav-0.2rc4/src/skyldav/Messaging.cc
+--- skyldav-0.2rc4.orig/src/skyldav/Messaging.cc	2013-08-25 13:20:14.000000000 +0200
++++ skyldav-0.2rc4/src/skyldav/Messaging.cc	2013-08-25 21:49:02.856257000 +0200
+@@ -105,10 +105,12 @@
+             break;
+         case DEBUG:
+             type = "D";
++            syslog(LOG_NOTICE, "%s", message.c_str());
+             std::cout << message << std::endl;
+             return;
+         default:
+             type = " ";
++            syslog(LOG_NOTICE, "%s", message.c_str());
+             std::cout << message << std::endl;
+             break;
+     }
diff --git a/app-antivirus/skyldav/files/skyldav-0.2_rc3-sbin.patch b/app-antivirus/skyldav/files/skyldav-0.2_rc4-sbin.patch
index e984252..c58e50c 100644
--- a/app-antivirus/skyldav/files/skyldav-0.2_rc3-sbin.patch
+++ b/app-antivirus/skyldav/files/skyldav-0.2_rc4-sbin.patch
@@ -1,6 +1,6 @@
-diff -urN skyldav-0.2rc3.orig/src/skyldav/Makefile.am skyldav-0.2rc3/src/skyldav/Makefile.am
---- skyldav-0.2rc3.orig/src/skyldav/Makefile.am	2013-07-20 14:36:43.000000000 +0200
-+++ skyldav-0.2rc3/src/skyldav/Makefile.am	2013-08-16 11:17:41.489230000 +0200
+diff -urN skyldav-0.2rc4.orig/src/skyldav/Makefile.am skyldav-0.2rc4/src/skyldav/Makefile.am
+--- skyldav-0.2rc4.orig/src/skyldav/Makefile.am	2013-08-25 13:20:14.000000000 +0200
++++ skyldav-0.2rc4/src/skyldav/Makefile.am	2013-08-25 21:59:08.894078000 +0200
 @@ -32,7 +32,7 @@
    ThreadPool.cc \
    VirusScan.cc
diff --git a/app-antivirus/skyldav/skyldav-0.2_rc3_p20130824.ebuild b/app-antivirus/skyldav/skyldav-0.2_rc3_p20130824.ebuild
deleted file mode 100644
index 3ca9d4a..0000000
--- a/app-antivirus/skyldav/skyldav-0.2_rc3_p20130824.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit flag-o-matic linux-info linux-mod autotools-utils
-
-MY_PV=${PV/_rc/rc}
-MY_P="${PN}-${MY_PV}"
-#MY_PVR=${PVR/_rc/rc}
-#MY_P="${PN}-${MY_PVR}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Skyld AV: on-access scanning daemon for ClamAV using fanotify"
-#SRC_URI="https://github.com/xypron/skyldav/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-SRC_URI="http://dev.gentoo.org/~wschlich/src/${CATEGORY}/${PN}/${MY_P}.tar.gz"
-HOMEPAGE="http://xypron.github.io/skyldav/"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="Apache-2.0"
-IUSE="libnotify"
-
-RDEPEND="app-antivirus/clamav
-	sys-apps/util-linux
-	sys-libs/libcap
-	libnotify? (
-		media-libs/libcanberra[gtk]
-		x11-libs/libnotify
-		x11-libs/gtk+:2
-	)"
-DEPEND="${RDEPEND}
-	sys-devel/autoconf-archive"
-
-## autotools-utils.eclass settings
-AUTOTOOLS_AUTORECONF="1"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-DOCS=( AUTHORS NEWS README )
-PATCHES=(
-	"${FILESDIR}/${P}-conf.patch"
-	"${FILESDIR}/${PN}-0.2_rc3_p20130821-examples.patch"
-	"${FILESDIR}/${PN}-0.2_rc3-sbin.patch"
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-	kernel_is ge 3 8 0 || die "Linux 3.8.0 or newer recommended"
-	CONFIG_CHECK="FANOTIFY FANOTIFY_ACCESS_PERMISSIONS"
-	check_extra_config
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with libnotify notification)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-}
diff --git a/app-antivirus/skyldav/skyldav-0.2_rc3_p20130825.ebuild b/app-antivirus/skyldav/skyldav-0.2_rc4.ebuild
index 9932b97..64e7220 100644
--- a/app-antivirus/skyldav/skyldav-0.2_rc3_p20130825.ebuild
+++ b/app-antivirus/skyldav/skyldav-0.2_rc4.ebuild
@@ -10,9 +10,9 @@ DESCRIPTION="Skyld AV: on-access scanning daemon for ClamAV using fanotify"
 HOMEPAGE="http://xypron.github.io/skyldav/"
 
 ## github release tarball
-#MY_PV=${PV/_rc/rc}
-#MY_P="${PN}-${MY_PV}"
-#SRC_URI="https://github.com/xypron/skyldav/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+MY_PV=${PV/_rc/rc}
+MY_P="${PN}-${MY_PV}"
+SRC_URI="https://github.com/xypron/skyldav/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
 
 ## selfmade tarball
 #MY_PVR=${PVR/_rc/rc}
@@ -20,9 +20,9 @@ HOMEPAGE="http://xypron.github.io/skyldav/"
 #SRC_URI="http://dev.gentoo.org/~wschlich/src/${CATEGORY}/${PN}/${MY_P}.tar.gz"
 
 ## github commit tarball
-MY_GIT_COMMIT="3d875c4e361cba43a16d6e564f7b7461ffb5beab"
-MY_P="xypron-${PN}-${MY_GIT_COMMIT:0:7}"
-SRC_URI="https://github.com/xypron/${PN}/tarball/${MY_GIT_COMMIT} -> ${PF}.tar.gz"
+#MY_GIT_COMMIT="3d875c4e361cba43a16d6e564f7b7461ffb5beab"
+#MY_P="xypron-${PN}-${MY_GIT_COMMIT:0:7}"
+#SRC_URI="https://github.com/xypron/${PN}/tarball/${MY_GIT_COMMIT} -> ${PF}.tar.gz"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -47,9 +47,10 @@ AUTOTOOLS_AUTORECONF="1"
 AUTOTOOLS_IN_SOURCE_BUILD="1"
 DOCS=( AUTHORS NEWS README )
 PATCHES=(
-	"${FILESDIR}/${PN}-0.2_rc3_p20130824-conf.patch"
-	"${FILESDIR}/${PN}-0.2_rc3_p20130821-examples.patch"
-	"${FILESDIR}/${PN}-0.2_rc3-sbin.patch"
+	"${FILESDIR}/${P}-more-syslog-messages.patch"
+	"${FILESDIR}/${P}-conf.patch"
+	"${FILESDIR}/${P}-examples.patch"
+	"${FILESDIR}/${P}-sbin.patch"
 )
 
 pkg_setup() {