commit: 7c9ebf862eb9348514be5c3326eff4e7fc5444a0 Author: Wolfram Schlich <wschlich <AT> gentoo <DOT> org> AuthorDate: Thu Jan 21 16:41:20 2016 +0000 Commit: Wolfram Schlich <wschlich <AT> gentoo <DOT> org> CommitDate: Thu Jan 21 16:41:20 2016 +0000 URL: https://gitweb.gentoo.org/dev/wschlich.git/commit/?id=7c9ebf86
version bump including systemd support; removed old versions Package-Manager: portage-2.2.26 app-antivirus/skyldav/Manifest | 6 +- .../skyldav/files/skyldav-0.2_rc4-conf.patch | 21 ---- .../skyldav/files/skyldav-0.2_rc4-examples.patch | 11 --- .../skyldav-0.2_rc4-more-syslog-messages.patch | 16 --- .../skyldav/files/skyldav-0.2_rc4-sbin.patch | 19 ---- ...yldav-0.4-conf.patch => skyldav-0.5-conf.patch} | 8 +- .../skyldav/files/skyldav-0.5-examples.patch | 11 +++ .../skyldav/files/skyldav-0.5-syslog.patch | 22 +++++ app-antivirus/skyldav/files/skyldav.service | 14 +++ app-antivirus/skyldav/files/skyldav.service.conf | 3 + app-antivirus/skyldav/files/skyldav.tmpfilesd | 2 + app-antivirus/skyldav/skyldav-0.2.ebuild | 74 -------------- app-antivirus/skyldav/skyldav-0.2_rc4.ebuild | 74 -------------- .../skyldav/skyldav-0.2_rc4_p20130829.ebuild | 74 -------------- app-antivirus/skyldav/skyldav-0.4.ebuild | 73 -------------- app-antivirus/skyldav/skyldav-0.4_p20141106.ebuild | 73 -------------- app-antivirus/skyldav/skyldav-0.5.ebuild | 109 +++++++++++++++++++++ 17 files changed, 166 insertions(+), 444 deletions(-) diff --git a/app-antivirus/skyldav/Manifest b/app-antivirus/skyldav/Manifest index 3ed79e5..f729e27 100644 --- a/app-antivirus/skyldav/Manifest +++ b/app-antivirus/skyldav/Manifest @@ -1,5 +1 @@ -DIST skyldav-0.2.tar.gz 104415 SHA256 02c1b794c658fe9b6bfbdbf1d162cdb0f72872c7734f59ecbfc9fa5c7bd496ec SHA512 09d4bd99051c8a407ab005d8913c320c481afb44d32ffe8c573ecc0e63be6e632724e89672ff98b5baf4948fe5631c2ba9c8bb56aa84fa05b8ad0deb5ca4fd90 WHIRLPOOL e3e2cb9599c7fd2e55f11fa344bcab8da0ae93e1fe3887ca1a3336aaad178467d635fd13de36c48984602c247281d74bbfbf895fc14cacf0b80e5596bf37d0d2 -DIST skyldav-0.2_rc4_p20130829.tar.gz 104425 SHA256 f05e198553ff4deb60a06b4d3166bccf1099e2fcd86a180f74f9ee7069b7cdef SHA512 0961b068acb693f3225fbd0d58e29bc3346474ea05b0c513bafe12f16a8ddbe6ca6f97d833046b927cff346d4b9a64c213d4bca3199816dbfd8a63213b009a63 WHIRLPOOL 88a721d403d0f23c380b46b8b577f34434e028c63df931eb14ba27820cbd5ab953e35148bc16d2e4e6177884e9615a268a08455323c8703e867babb1f231c463 -DIST skyldav-0.2rc4.tar.gz 102690 SHA256 9752520ca4b50ee181541b4decddffacd17c192bcf059e5d89d5de5485747bc3 SHA512 ed62c459907afed619df362f08b2eb565cef70b2c10f1da7f64d72a0ee2767f776387b38b50c3729eaca33ac640b827bdd1cb02f117778944c512d8902f40858 WHIRLPOOL 90cae16a26122df1db9c4d0c4ba13fa5939febdbc2d2e61ed5a0755234f3fe2ec055bcd138c7f2fd9c2ad1827b0aa3789117d755c5100c1ba1e7f5863a004e09 -DIST skyldav-0.4.tar.gz 105352 SHA256 677f743db5810fd367a06ebb2591f20f6af4dd3fdc9d2bcf038d3576c598beec SHA512 4a98d2d87541b044eeb233e154a6dcbc0da0ed2cba3a38bb89cfb3e27bdea2ae4ee7edf363f6f5b1d3978d042e5a31cac1e04353fecedb52c0053fb888fd144a WHIRLPOOL b7b9b29bac94a76ada5574b72798e2ad125ea0929b99e9efe8fcadcbefe7c430fb5e4d84120677f9c3fdc2531f3f6f23ad390893c37bb675c695f3b28eba5cd1 -DIST skyldav-0.4_p20141106.tar.gz 105400 SHA256 34920336c558e7b88b1c6f934453eb6a626b1de5c8adde2c42f7018168680a7d SHA512 8ae7a33459cbd2e1d3706f10058e6a13bae14e1a42628d3e3a3faeaeb56c72375c4e15c2b2ac5bbb6d9f43492cb9431603a9f0aea10aba75f2fbe53f10480d0c WHIRLPOOL bd76825f3acf8e3ceed854c70dd27194915241b2fb3568d2883d443ef630804155585bf93e772dd6fbbb7a339a456d36b6ebdd297342d72900715f41be036b6d +DIST skyldav-0.5.tar.gz 105274 SHA256 308b7a15b920a33c2c381aeb607db5bece9560e0a85e3e65c2df0d153413f4cc SHA512 24b9e3805574a2498b1e250cde790d6263f6f751546ad906303099bad5e722430568b1081764843a3c52f38730e8f26132f32058bea33c18f19673ac9147c323 WHIRLPOOL 77e77c25eaf3d0d3add4e1b03366c75dd1acdf8152d2987af61418a4793b1b0873cd0088e2bfd00c9864316e3b6e068c4bc96bc064cfec706a1b1b0c318d3aa1 diff --git a/app-antivirus/skyldav/files/skyldav-0.2_rc4-conf.patch b/app-antivirus/skyldav/files/skyldav-0.2_rc4-conf.patch deleted file mode 100644 index d540b71..0000000 --- a/app-antivirus/skyldav/files/skyldav-0.2_rc4-conf.patch +++ /dev/null @@ -1,21 +0,0 @@ -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) - # EXCLUDE_PATH = /var/noscan, /opt/noscan -+#EXCLUDE_PATH = /usr/portage, /var/db/pkg, /var/tmp/portage, /var/tmp/binpkgs - - # File systems that are local, virus scan results may be cached. - # LOCAL_FS = ext3, ext4, iso9660, tmpfs, vfat --LOCAL_FS = ext3, ext4, iso9660, tmpfs, vfat -+LOCAL_FS = ext2, ext3, ext4, xfs, zfs, btrfs, reiserfs, vfat, ntfs, iso9660, tmpfs - - # File systems that shall not be marked for virus scan. - # NOMARK_FS = proc, sysfs --NOMARK_FS = proc, sysfs -+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 deleted file mode 100644 index bb6eb41..0000000 --- a/app-antivirus/skyldav/files/skyldav-0.2_rc4-examples.patch +++ /dev/null @@ -1,11 +0,0 @@ -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 deleted file mode 100644 index 0fe7d70..0000000 --- a/app-antivirus/skyldav/files/skyldav-0.2_rc4-more-syslog-messages.patch +++ /dev/null @@ -1,16 +0,0 @@ -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_rc4-sbin.patch b/app-antivirus/skyldav/files/skyldav-0.2_rc4-sbin.patch deleted file mode 100644 index c58e50c..0000000 --- a/app-antivirus/skyldav/files/skyldav-0.2_rc4-sbin.patch +++ /dev/null @@ -1,19 +0,0 @@ -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 - --bin_PROGRAMS = \ -+sbin_PROGRAMS = \ - skyldav - - skyldav_LDFLAGS = \ -@@ -41,4 +41,4 @@ - skyldav_SOURCES = skyldav.h main.cc - - check: -- ./skyldav --version -\ No newline at end of file -+ ./skyldav --version diff --git a/app-antivirus/skyldav/files/skyldav-0.4-conf.patch b/app-antivirus/skyldav/files/skyldav-0.5-conf.patch similarity index 81% rename from app-antivirus/skyldav/files/skyldav-0.4-conf.patch rename to app-antivirus/skyldav/files/skyldav-0.5-conf.patch index 337f415..8255f7a 100644 --- a/app-antivirus/skyldav/files/skyldav-0.4-conf.patch +++ b/app-antivirus/skyldav/files/skyldav-0.5-conf.patch @@ -1,6 +1,6 @@ -diff -urN skyldav-0.4.orig/examples/etc/skyldav.conf skyldav-0.4/examples/etc/skyldav.conf ---- skyldav-0.4.orig/examples/etc/skyldav.conf 2014-03-21 20:32:49.000000000 +0100 -+++ skyldav-0.4/examples/etc/skyldav.conf 2014-03-30 13:23:14.043578460 +0200 +diff -urN skyldav-0.5.orig/examples/etc/skyldav.conf skyldav-0.5/examples/etc/skyldav.conf +--- skyldav-0.5.orig/examples/etc/skyldav.conf 2015-02-15 20:32:57.000000000 +0100 ++++ skyldav-0.5/examples/etc/skyldav.conf 2016-01-21 14:02:27.656666425 +0100 @@ -19,14 +19,21 @@ # Directories that shall not be scanned (including subdirectories) @@ -21,7 +21,7 @@ diff -urN skyldav-0.4.orig/examples/etc/skyldav.conf skyldav-0.4/examples/etc/sk +# (https://github.com/xypron/skyldav/commit/63b01b912d3eed80f3db92aec8647770546f5c1c). +# Note that FUSE file systems are automatically excluded from scanning +# (https://github.com/xypron/skyldav/issues/3). -+NOMARK_FS = proc, sysfs, devpts, debugfs, securityfs, cgroup, rpc_pipefs, autofs, cifs ++NOMARK_FS = proc, sysfs, devpts, debugfs, securityfs, cgroup, rpc_pipefs, mqueue, autofs, cifs # Mounts that shall not be marked for virus scan. # NOMARK_MNT = /mnt/noscan diff --git a/app-antivirus/skyldav/files/skyldav-0.5-examples.patch b/app-antivirus/skyldav/files/skyldav-0.5-examples.patch new file mode 100644 index 0000000..5c61468 --- /dev/null +++ b/app-antivirus/skyldav/files/skyldav-0.5-examples.patch @@ -0,0 +1,11 @@ +diff -urN skyldav-0.5.orig/Makefile.am skyldav-0.5/Makefile.am +--- skyldav-0.5.orig/Makefile.am 2015-02-15 20:32:57.000000000 +0100 ++++ skyldav-0.5/Makefile.am 2016-01-21 14:11:14.883632470 +0100 +@@ -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.5-syslog.patch b/app-antivirus/skyldav/files/skyldav-0.5-syslog.patch new file mode 100644 index 0000000..2e72ce2 --- /dev/null +++ b/app-antivirus/skyldav/files/skyldav-0.5-syslog.patch @@ -0,0 +1,22 @@ +diff -urN skyldav-0.5.orig/src/skyldav/Messaging.cc skyldav-0.5/src/skyldav/Messaging.cc +--- skyldav-0.5.orig/src/skyldav/Messaging.cc 2015-02-15 20:32:57.000000000 +0100 ++++ skyldav-0.5/src/skyldav/Messaging.cc 2016-01-21 14:17:12.492010594 +0100 +@@ -118,15 +118,17 @@ + break; + case INFORMATION: + type = "I"; +- syslog(LOG_NOTICE, "%s", message.c_str()); ++ syslog(LOG_INFO, "%s", message.c_str()); + std::cout << message << std::endl; + break; + case DEBUG: + type = "D"; ++ syslog(LOG_DEBUG, "%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.service b/app-antivirus/skyldav/files/skyldav.service new file mode 100644 index 0000000..8d8ee5e --- /dev/null +++ b/app-antivirus/skyldav/files/skyldav.service @@ -0,0 +1,14 @@ +[Unit] +Description=SkyldAV anti-virus on-access scanning daemon based upon Clam AV and fanotify +Requires=local-fs.target clamd.service +After=local-fs.target clamd.service + +[Service] +Type=simple +Environment="SKYLDAV_MESSAGE_LEVEL=2" +ExecStart=/usr/sbin/skyldav -d -m ${SKYLDAV_MESSAGE_LEVEL} +#KillMode=process +#KillSignal=SIGTERM + +[Install] +WantedBy=multi-user.target diff --git a/app-antivirus/skyldav/files/skyldav.service.conf b/app-antivirus/skyldav/files/skyldav.service.conf new file mode 100644 index 0000000..79c23a3 --- /dev/null +++ b/app-antivirus/skyldav/files/skyldav.service.conf @@ -0,0 +1,3 @@ +[Service] +# skyldav message level (-m) +#Environment="SKYLDAV_MESSAGE_LEVEL=1" diff --git a/app-antivirus/skyldav/files/skyldav.tmpfilesd b/app-antivirus/skyldav/files/skyldav.tmpfilesd new file mode 100644 index 0000000..a4f7cdc --- /dev/null +++ b/app-antivirus/skyldav/files/skyldav.tmpfilesd @@ -0,0 +1,2 @@ +# skyldav runtime directory for skyldav.pid and log (used by skyldavnotify) +d /run/skyldav 0755 root root - diff --git a/app-antivirus/skyldav/skyldav-0.2.ebuild b/app-antivirus/skyldav/skyldav-0.2.ebuild deleted file mode 100644 index a7c78e3..0000000 --- a/app-antivirus/skyldav/skyldav-0.2.ebuild +++ /dev/null @@ -1,74 +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 - -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" - -## selfmade tarball -#MY_PVR=${PVR/_rc/rc} -#MY_P="${PN}-${MY_PVR}" -#SRC_URI="http://dev.gentoo.org/~wschlich/src/${CATEGORY}/${PN}/${MY_P}.tar.gz"; - -## github commit tarball -#MY_GIT_COMMIT="49bdb5e710b5a77c38ceb87da6015afb7009f1f9" -#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}" - -KEYWORDS="~amd64 ~x86" -SLOT="0" -LICENSE="Apache-2.0" -IUSE="libnotify" - -RDEPEND=">=app-antivirus/clamav-0.97.8 - 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}/${PN}-0.2_rc4-more-syslog-messages.patch" - "${FILESDIR}/${PN}-0.2_rc4-conf.patch" - "${FILESDIR}/${PN}-0.2_rc4-examples.patch" - "${FILESDIR}/${PN}-0.2_rc4-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_rc4.ebuild b/app-antivirus/skyldav/skyldav-0.2_rc4.ebuild deleted file mode 100644 index 64e7220..0000000 --- a/app-antivirus/skyldav/skyldav-0.2_rc4.ebuild +++ /dev/null @@ -1,74 +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 - -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" - -## selfmade tarball -#MY_PVR=${PVR/_rc/rc} -#MY_P="${PN}-${MY_PVR}" -#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" - -S="${WORKDIR}/${MY_P}" - -KEYWORDS="~amd64 ~x86" -SLOT="0" -LICENSE="Apache-2.0" -IUSE="libnotify" - -RDEPEND=">=app-antivirus/clamav-0.97.8 - 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}-more-syslog-messages.patch" - "${FILESDIR}/${P}-conf.patch" - "${FILESDIR}/${P}-examples.patch" - "${FILESDIR}/${P}-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_rc4_p20130829.ebuild b/app-antivirus/skyldav/skyldav-0.2_rc4_p20130829.ebuild deleted file mode 100644 index e3dce21..0000000 --- a/app-antivirus/skyldav/skyldav-0.2_rc4_p20130829.ebuild +++ /dev/null @@ -1,74 +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 - -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" - -## selfmade tarball -#MY_PVR=${PVR/_rc/rc} -#MY_P="${PN}-${MY_PVR}" -#SRC_URI="http://dev.gentoo.org/~wschlich/src/${CATEGORY}/${PN}/${MY_P}.tar.gz"; - -## github commit tarball -MY_GIT_COMMIT="49bdb5e710b5a77c38ceb87da6015afb7009f1f9" -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}" - -KEYWORDS="~amd64 ~x86" -SLOT="0" -LICENSE="Apache-2.0" -IUSE="libnotify" - -RDEPEND=">=app-antivirus/clamav-0.97.8 - 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}/${PN}-0.2_rc4-more-syslog-messages.patch" - "${FILESDIR}/${PN}-0.2_rc4-conf.patch" - "${FILESDIR}/${PN}-0.2_rc4-examples.patch" - "${FILESDIR}/${PN}-0.2_rc4-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.4.ebuild b/app-antivirus/skyldav/skyldav-0.4.ebuild deleted file mode 100644 index 602cf5c..0000000 --- a/app-antivirus/skyldav/skyldav-0.4.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2014 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 - -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" - -## selfmade tarball -#MY_PVR=${PVR/_rc/rc} -#MY_P="${PN}-${MY_PVR}" -#SRC_URI="http://dev.gentoo.org/~wschlich/src/${CATEGORY}/${PN}/${MY_P}.tar.gz"; - -## github commit tarball -#MY_GIT_COMMIT="49bdb5e710b5a77c38ceb87da6015afb7009f1f9" -#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}" - -KEYWORDS="~amd64 ~x86" -SLOT="0" -LICENSE="Apache-2.0" -IUSE="libnotify" - -RDEPEND=">=app-antivirus/clamav-0.97.8 - 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}/${PN}-0.2_rc4-more-syslog-messages.patch" - "${FILESDIR}/${PN}-0.2_rc4-examples.patch" - "${FILESDIR}/${P}-conf.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.4_p20141106.ebuild b/app-antivirus/skyldav/skyldav-0.4_p20141106.ebuild deleted file mode 100644 index eb988d6..0000000 --- a/app-antivirus/skyldav/skyldav-0.4_p20141106.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2014 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 - -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" - -## selfmade tarball -#MY_PVR=${PVR/_rc/rc} -#MY_P="${PN}-${MY_PVR}" -#SRC_URI="http://dev.gentoo.org/~wschlich/src/${CATEGORY}/${PN}/${MY_P}.tar.gz"; - -## github commit tarball -MY_GIT_COMMIT="a54c2520d8b3eafa6b68c1c577586a78a0989362" -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}" - -KEYWORDS="~amd64 ~x86" -SLOT="0" -LICENSE="Apache-2.0" -IUSE="libnotify" - -RDEPEND=">=app-antivirus/clamav-0.97.8 - 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}/${PN}-0.2_rc4-more-syslog-messages.patch" - "${FILESDIR}/${PN}-0.2_rc4-examples.patch" - "${FILESDIR}/${P%%_p*}-conf.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.5.ebuild b/app-antivirus/skyldav/skyldav-0.5.ebuild new file mode 100644 index 0000000..ddefa93 --- /dev/null +++ b/app-antivirus/skyldav/skyldav-0.5.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit flag-o-matic linux-info linux-mod autotools-utils readme.gentoo-r1 systemd + +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" + +## selfmade tarball +#MY_PVR=${PVR/_rc/rc} +#MY_P="${PN}-${MY_PVR}" +#SRC_URI="http://dev.gentoo.org/~wschlich/src/${CATEGORY}/${PN}/${MY_P}.tar.gz"; + +## github commit tarball +#MY_GIT_COMMIT="49bdb5e710b5a77c38ceb87da6015afb7009f1f9" +#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}" + +KEYWORDS="~amd64 ~x86" +SLOT="0" +LICENSE="Apache-2.0" +IUSE="libnotify systemd" + +RDEPEND=">=app-antivirus/clamav-0.97.8 + 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}-syslog.patch" + "${FILESDIR}/${P}-examples.patch" + "${FILESDIR}/${P}-conf.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 + + ## define contents for README.gentoo + if use systemd; then + DOC_CONTENTS='SkyldAV provides a systemd service.'$'\n' + DOC_CONTENTS+='Please edit the systemd service config file to match your needs:'$'\n' + DOC_CONTENTS+='/etc/systemd/system/skyldav.service.d/00gentoo.conf'$'\n' + DOC_CONTENTS+='# systemctl daemon-reload'$'\n' + DOC_CONTENTS+='# systemctl restart skyldav.service'$'\n' + DOC_CONTENTS+='Example for enabling the SkyldAV service:'$'\n' + DOC_CONTENTS+='# systemctl enable skyldav.service'$'\n' + else + DOC_CONTENTS='SkyldAV provides an init script for OpenRC.'$'\n' + DOC_CONTENTS+='Please edit the init script config file to match your needs:'$'\n' + DOC_CONTENTS+='/etc/conf.d/skyldav'$'\n' + DOC_CONTENTS+='Example for enabling the SkyldAV init script:'$'\n' + DOC_CONTENTS+='# rc-update add skyldav default'$'\n' + fi +} + +src_configure() { + local myeconfargs=( + $(use_with libnotify notification) + ) + autotools-utils_src_configure +} + +src_install() { + autotools-utils_src_install + + ## install systemd service or OpenRC init scripts + if use systemd; then + systemd_dounit "${FILESDIR}/skyldav.service" + systemd_install_serviced "${FILESDIR}"/skyldav.service.conf + systemd_newtmpfilesd "${FILESDIR}"/skyldav.tmpfilesd skyldav.conf + else + newinitd "${FILESDIR}/${PN}.initd" ${PN} + newconfd "${FILESDIR}/${PN}.confd" ${PN} + fi + + ## create README.gentoo from ${DOC_CONTENTS} + DISABLE_AUTOFORMATTING=1 readme.gentoo_create_doc +} + +pkg_postinst() { + ## workaround for /usr/lib/tmpfiles.d/skyldav.conf + ## not getting processed until the next reboot + if use systemd; then + install -d -m 0755 -o root -g root /run/skyldav + fi +}
