Gentoo Archives: gentoo-commits

From: Wolfram Schlich <wschlich@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/wschlich:master commit in: app-antivirus/skyldav/files/, app-antivirus/skyldav/
Date: Mon, 01 Feb 2016 08:05:05
Message-Id: 1454313894.055a577cf89c306ce4e596dd69bdfb74d00cc73b.wschlich@gentoo
1 commit: 055a577cf89c306ce4e596dd69bdfb74d00cc73b
2 Author: Wolfram Schlich <wschlich <AT> gentoo <DOT> org>
3 AuthorDate: Mon Feb 1 08:04:54 2016 +0000
4 Commit: Wolfram Schlich <wschlich <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 1 08:04:54 2016 +0000
6 URL: https://gitweb.gentoo.org/dev/wschlich.git/commit/?id=055a577c
7
8 app-antivirus/skyldav: moved to gentoo portage
9
10 app-antivirus/skyldav/ChangeLog | 80 ---------------
11 app-antivirus/skyldav/Manifest | 1 -
12 app-antivirus/skyldav/files/skyldav-0.5-conf.patch | 27 -----
13 .../skyldav/files/skyldav-0.5-examples.patch | 11 ---
14 .../skyldav/files/skyldav-0.5-syslog.patch | 22 -----
15 app-antivirus/skyldav/files/skyldav.confd | 11 ---
16 app-antivirus/skyldav/files/skyldav.initd | 26 -----
17 app-antivirus/skyldav/files/skyldav.service-r1 | 15 ---
18 app-antivirus/skyldav/files/skyldav.service.conf | 3 -
19 app-antivirus/skyldav/files/skyldav.tmpfilesd | 2 -
20 app-antivirus/skyldav/metadata.xml | 12 ---
21 app-antivirus/skyldav/skyldav-0.5-r1.ebuild | 109 ---------------------
22 12 files changed, 319 deletions(-)
23
24 diff --git a/app-antivirus/skyldav/ChangeLog b/app-antivirus/skyldav/ChangeLog
25 deleted file mode 100644
26 index 30b2cb8..0000000
27 --- a/app-antivirus/skyldav/ChangeLog
28 +++ /dev/null
29 @@ -1,80 +0,0 @@
30 -*skyldav-0.4_p20141106 (06 Nov 2014)
31 -
32 - 06 Nov 2014; Wolfram Schlich <wschlich@g.o>
33 - +skyldav-0.4_p20141106.ebuild:
34 - patch bump
35 -
36 - 26 Apr 2014; Wolfram Schlich <wschlich@g.o> metadata.xml:
37 - fix typo
38 -
39 -*skyldav-0.4 (30 Mar 2014)
40 -
41 - 30 Mar 2014; Wolfram Schlich <wschlich@g.o>
42 - +files/skyldav-0.4-conf.patch, +skyldav-0.4.ebuild:
43 - version bump
44 -
45 -*skyldav-0.2 (13 Sep 2013)
46 -
47 - 13 Sep 2013; Wolfram Schlich <wschlich@g.o> +skyldav-0.2.ebuild:
48 - version bump
49 -
50 -*skyldav-0.2_rc4_p20130829 (03 Sep 2013)
51 -
52 - 03 Sep 2013; Wolfram Schlich <wschlich@g.o>
53 - +skyldav-0.2_rc4_p20130829.ebuild:
54 - version bump
55 -
56 -*skyldav-0.2_rc4 (25 Aug 2013)
57 -
58 - 25 Aug 2013; Wolfram Schlich <wschlich@g.o>
59 - +files/skyldav-0.2_rc4-conf.patch, +files/skyldav-0.2_rc4-examples.patch,
60 - +files/skyldav-0.2_rc4-more-syslog-messages.patch,
61 - +files/skyldav-0.2_rc4-sbin.patch, +skyldav-0.2_rc4.ebuild,
62 - -files/skyldav-0.2_rc3-sbin.patch,
63 - -files/skyldav-0.2_rc3_p20130821-examples.patch,
64 - -files/skyldav-0.2_rc3_p20130824-conf.patch,
65 - -skyldav-0.2_rc3_p20130824.ebuild, -skyldav-0.2_rc3_p20130825.ebuild:
66 - version bump, removed old versions
67 -
68 -*skyldav-0.2_rc3_p20130825 (25 Aug 2013)
69 -
70 - 25 Aug 2013; Wolfram Schlich <wschlich@g.o>
71 - +skyldav-0.2_rc3_p20130825.ebuild:
72 - added clamav version dependency
73 -
74 - 24 Aug 2013; Wolfram Schlich <wschlich@g.o>
75 - -files/skyldav-0.2_rc3-conf.patch, -files/skyldav-0.2_rc3-examples.patch,
76 - -files/skyldav-0.2_rc3-openlog.patch,
77 - -files/skyldav-0.2_rc3_p20130816-syslog.patch,
78 - -files/skyldav-0.2_rc3_p20130817-disable-skyldavnotify.patch,
79 - -skyldav-0.2_rc3.ebuild, -skyldav-0.2_rc3_p20130816.ebuild,
80 - -skyldav-0.2_rc3_p20130817-r1.ebuild, -skyldav-0.2_rc3_p20130817.ebuild,
81 - -skyldav-0.2_rc3_p20130821-r1.ebuild, -skyldav-0.2_rc3_p20130821.ebuild:
82 - removed old versions
83 -
84 -*skyldav-0.2_rc3_p20130824 (24 Aug 2013)
85 -
86 - 24 Aug 2013; Wolfram Schlich <wschlich@g.o>
87 - +files/skyldav-0.2_rc3_p20130824-conf.patch,
88 - +skyldav-0.2_rc3_p20130824.ebuild:
89 - update from upstream
90 -
91 -*skyldav-0.2_rc3_p20130821-r1 (21 Aug 2013)
92 -
93 - 21 Aug 2013; Wolfram Schlich <wschlich@g.o>
94 - +skyldav-0.2_rc3_p20130821-r1.ebuild:
95 - update from upstream
96 -
97 -*skyldav-0.2_rc3_p20130821 (21 Aug 2013)
98 -
99 - 21 Aug 2013; Wolfram Schlich <wschlich@g.o>
100 - +files/skyldav-0.2_rc3_p20130821-examples.patch,
101 - +skyldav-0.2_rc3_p20130821.ebuild:
102 - update from upstream
103 -
104 -*skyldav-0.2_rc3_p20130817-r1 (17 Aug 2013)
105 -
106 - 17 Aug 2013; Wolfram Schlich <wschlich@g.o>
107 - +files/skyldav-0.2_rc3_p20130817-disable-skyldavnotify.patch,
108 - +skyldav-0.2_rc3_p20130817-r1.ebuild:
109 - added libnotify USE flag.
110
111 diff --git a/app-antivirus/skyldav/Manifest b/app-antivirus/skyldav/Manifest
112 deleted file mode 100644
113 index f729e27..0000000
114 --- a/app-antivirus/skyldav/Manifest
115 +++ /dev/null
116 @@ -1 +0,0 @@
117 -DIST skyldav-0.5.tar.gz 105274 SHA256 308b7a15b920a33c2c381aeb607db5bece9560e0a85e3e65c2df0d153413f4cc SHA512 24b9e3805574a2498b1e250cde790d6263f6f751546ad906303099bad5e722430568b1081764843a3c52f38730e8f26132f32058bea33c18f19673ac9147c323 WHIRLPOOL 77e77c25eaf3d0d3add4e1b03366c75dd1acdf8152d2987af61418a4793b1b0873cd0088e2bfd00c9864316e3b6e068c4bc96bc064cfec706a1b1b0c318d3aa1
118
119 diff --git a/app-antivirus/skyldav/files/skyldav-0.5-conf.patch b/app-antivirus/skyldav/files/skyldav-0.5-conf.patch
120 deleted file mode 100644
121 index 8255f7a..0000000
122 --- a/app-antivirus/skyldav/files/skyldav-0.5-conf.patch
123 +++ /dev/null
124 @@ -1,27 +0,0 @@
125 -diff -urN skyldav-0.5.orig/examples/etc/skyldav.conf skyldav-0.5/examples/etc/skyldav.conf
126 ---- skyldav-0.5.orig/examples/etc/skyldav.conf 2015-02-15 20:32:57.000000000 +0100
127 -+++ skyldav-0.5/examples/etc/skyldav.conf 2016-01-21 14:02:27.656666425 +0100
128 -@@ -19,14 +19,21 @@
129 -
130 - # Directories that shall not be scanned (including subdirectories)
131 - # EXCLUDE_PATH = /var/noscan, /opt/noscan
132 -+EXCLUDE_PATH = /usr/portage, /var/db/pkg, /var/tmp/portage, /var/tmp/binpkgs
133 -
134 - # File systems that are local, virus scan results may be cached.
135 - # LOCAL_FS = ext3, ext4, iso9660, tmpfs, vfat
136 --LOCAL_FS = ext3, ext4, iso9660, tmpfs, vfat
137 -+LOCAL_FS = ext2, ext3, ext4, xfs, zfs, btrfs, reiserfs, vfat, ntfs, iso9660, tmpfs
138 -
139 - # File systems that shall not be marked for virus scan.
140 - # NOMARK_FS = proc, sysfs
141 --NOMARK_FS = proc, sysfs, cifs
142 -+#
143 -+# Do not exclude devtmpfs and configs, as userspace could write malware onto them.
144 -+# CIFS is also known to cause problems due to a background daemon, so we exclude it here
145 -+# (https://github.com/xypron/skyldav/commit/63b01b912d3eed80f3db92aec8647770546f5c1c).
146 -+# Note that FUSE file systems are automatically excluded from scanning
147 -+# (https://github.com/xypron/skyldav/issues/3).
148 -+NOMARK_FS = proc, sysfs, devpts, debugfs, securityfs, cgroup, rpc_pipefs, mqueue, autofs, cifs
149 -
150 - # Mounts that shall not be marked for virus scan.
151 - # NOMARK_MNT = /mnt/noscan
152
153 diff --git a/app-antivirus/skyldav/files/skyldav-0.5-examples.patch b/app-antivirus/skyldav/files/skyldav-0.5-examples.patch
154 deleted file mode 100644
155 index 5c61468..0000000
156 --- a/app-antivirus/skyldav/files/skyldav-0.5-examples.patch
157 +++ /dev/null
158 @@ -1,11 +0,0 @@
159 -diff -urN skyldav-0.5.orig/Makefile.am skyldav-0.5/Makefile.am
160 ---- skyldav-0.5.orig/Makefile.am 2015-02-15 20:32:57.000000000 +0100
161 -+++ skyldav-0.5/Makefile.am 2016-01-21 14:11:14.883632470 +0100
162 -@@ -9,7 +9,6 @@
163 - rm -rf doc/doxygen
164 -
165 - install-data-local: \
166 -- install-skyldav-examples \
167 - install-skyldav-conf \
168 - install-skyldavnotify-desktop
169 -
170
171 diff --git a/app-antivirus/skyldav/files/skyldav-0.5-syslog.patch b/app-antivirus/skyldav/files/skyldav-0.5-syslog.patch
172 deleted file mode 100644
173 index 2e72ce2..0000000
174 --- a/app-antivirus/skyldav/files/skyldav-0.5-syslog.patch
175 +++ /dev/null
176 @@ -1,22 +0,0 @@
177 -diff -urN skyldav-0.5.orig/src/skyldav/Messaging.cc skyldav-0.5/src/skyldav/Messaging.cc
178 ---- skyldav-0.5.orig/src/skyldav/Messaging.cc 2015-02-15 20:32:57.000000000 +0100
179 -+++ skyldav-0.5/src/skyldav/Messaging.cc 2016-01-21 14:17:12.492010594 +0100
180 -@@ -118,15 +118,17 @@
181 - break;
182 - case INFORMATION:
183 - type = "I";
184 -- syslog(LOG_NOTICE, "%s", message.c_str());
185 -+ syslog(LOG_INFO, "%s", message.c_str());
186 - std::cout << message << std::endl;
187 - break;
188 - case DEBUG:
189 - type = "D";
190 -+ syslog(LOG_DEBUG, "%s", message.c_str());
191 - std::cout << message << std::endl;
192 - return;
193 - default:
194 - type = " ";
195 -+ syslog(LOG_NOTICE, "%s", message.c_str());
196 - std::cout << message << std::endl;
197 - break;
198 - }
199
200 diff --git a/app-antivirus/skyldav/files/skyldav.confd b/app-antivirus/skyldav/files/skyldav.confd
201 deleted file mode 100644
202 index aad4d23..0000000
203 --- a/app-antivirus/skyldav/files/skyldav.confd
204 +++ /dev/null
205 @@ -1,11 +0,0 @@
206 -# Copyright 1999-2013 Gentoo Foundation
207 -# Distributed under the terms of the GNU General Public License v2
208 -# $Header: $
209 -
210 -# Config file for /etc/init.d/skyldav
211 -
212 -# Options to pass to the skyldav daemon.
213 -# Option -d for daemonizing is always passed!
214 -# See the skyldav(1) man page for more info.
215 -
216 -#SKYLDAV_OPTS="-m 1"
217
218 diff --git a/app-antivirus/skyldav/files/skyldav.initd b/app-antivirus/skyldav/files/skyldav.initd
219 deleted file mode 100755
220 index fd4bf09..0000000
221 --- a/app-antivirus/skyldav/files/skyldav.initd
222 +++ /dev/null
223 @@ -1,26 +0,0 @@
224 -#!/sbin/runscript
225 -# Copyright 1999-2013 Gentoo Foundation
226 -# Distributed under the terms of the GNU General Public License v2
227 -# $Header: $
228 -
229 -SKYLDAV_BIN="/usr/sbin/skyldav"
230 -SKYLDAV_OPTS="${SKYLDAV_OPTS:--m 2}"
231 -SKYLDAV_CONFIGFILE="/etc/skyldav.conf"
232 -SKYLDAV_PIDFILE_DIR="${SKYLDAV_PIDFILE_DIR:-/var/run/${RC_SVCNAME}}"
233 -SKYLDAV_PIDFILE="${SKYLDAV_PIDFILE:-${SKYLDAV_PIDFILE_DIR}/${RC_SVCNAME}.pid}"
234 -
235 -name="${SKYLDAV_BIN##*/}"
236 -command="${SKYLDAV_BIN}"
237 -command_args="-d ${SKYLDAV_OPTS}"
238 -pidfile="${SKYLDAV_PIDFILE}"
239 -description="Skyld AV is an anti-virus on-access scanner based upon Clam AV and fanotify"
240 -required_files="${SKYLDAV_CONFIG}"
241 -
242 -depend() {
243 - use logger
244 - need localmount
245 -}
246 -
247 -start_pre() {
248 - checkpath -d -m 0755 -o root:root "${SKYLDAV_PIDFILE_DIR}"
249 -}
250
251 diff --git a/app-antivirus/skyldav/files/skyldav.service-r1 b/app-antivirus/skyldav/files/skyldav.service-r1
252 deleted file mode 100644
253 index decd788..0000000
254 --- a/app-antivirus/skyldav/files/skyldav.service-r1
255 +++ /dev/null
256 @@ -1,15 +0,0 @@
257 -[Unit]
258 -Description=SkyldAV anti-virus on-access scanning daemon based upon Clam AV and fanotify
259 -Requires=local-fs.target clamd.service
260 -After=local-fs.target clamd.service
261 -Before=multi-user.target
262 -
263 -[Service]
264 -Type=simple
265 -Environment="SKYLDAV_MESSAGE_LEVEL=2"
266 -ExecStart=/usr/sbin/skyldav -d -m ${SKYLDAV_MESSAGE_LEVEL}
267 -#KillMode=process
268 -#KillSignal=SIGTERM
269 -
270 -[Install]
271 -WantedBy=multi-user.target
272
273 diff --git a/app-antivirus/skyldav/files/skyldav.service.conf b/app-antivirus/skyldav/files/skyldav.service.conf
274 deleted file mode 100644
275 index 79c23a3..0000000
276 --- a/app-antivirus/skyldav/files/skyldav.service.conf
277 +++ /dev/null
278 @@ -1,3 +0,0 @@
279 -[Service]
280 -# skyldav message level (-m)
281 -#Environment="SKYLDAV_MESSAGE_LEVEL=1"
282
283 diff --git a/app-antivirus/skyldav/files/skyldav.tmpfilesd b/app-antivirus/skyldav/files/skyldav.tmpfilesd
284 deleted file mode 100644
285 index a4f7cdc..0000000
286 --- a/app-antivirus/skyldav/files/skyldav.tmpfilesd
287 +++ /dev/null
288 @@ -1,2 +0,0 @@
289 -# skyldav runtime directory for skyldav.pid and log (used by skyldavnotify)
290 -d /run/skyldav 0755 root root -
291
292 diff --git a/app-antivirus/skyldav/metadata.xml b/app-antivirus/skyldav/metadata.xml
293 deleted file mode 100644
294 index 80153a2..0000000
295 --- a/app-antivirus/skyldav/metadata.xml
296 +++ /dev/null
297 @@ -1,12 +0,0 @@
298 -<?xml version="1.0" encoding="UTF-8"?>
299 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
300 -<pkgmetadata>
301 - <maintainer>
302 - <email>wschlich@g.o</email>
303 - <name>Wolfram Schlich</name>
304 - <description>Primary maintainer</description>
305 - </maintainer>
306 - <upstream>
307 - <remote-id type="github">xypron/skyldav</remote-id>
308 - </upstream>
309 -</pkgmetadata>
310
311 diff --git a/app-antivirus/skyldav/skyldav-0.5-r1.ebuild b/app-antivirus/skyldav/skyldav-0.5-r1.ebuild
312 deleted file mode 100644
313 index 3175fc8..0000000
314 --- a/app-antivirus/skyldav/skyldav-0.5-r1.ebuild
315 +++ /dev/null
316 @@ -1,109 +0,0 @@
317 -# Copyright 1999-2016 Gentoo Foundation
318 -# Distributed under the terms of the GNU General Public License v2
319 -# $Id$
320 -
321 -EAPI=5
322 -
323 -inherit flag-o-matic linux-info linux-mod autotools-utils readme.gentoo-r1 systemd
324 -
325 -DESCRIPTION="Skyld AV: on-access scanning daemon for ClamAV using fanotify"
326 -HOMEPAGE="http://xypron.github.io/skyldav/"
327 -
328 -## github release tarball
329 -MY_PV=${PV/_rc/rc}
330 -MY_P="${PN}-${MY_PV}"
331 -SRC_URI="https://github.com/xypron/skyldav/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
332 -
333 -## selfmade tarball
334 -#MY_PVR=${PVR/_rc/rc}
335 -#MY_P="${PN}-${MY_PVR}"
336 -#SRC_URI="http://dev.gentoo.org/~wschlich/src/${CATEGORY}/${PN}/${MY_P}.tar.gz"
337 -
338 -## github commit tarball
339 -#MY_GIT_COMMIT="49bdb5e710b5a77c38ceb87da6015afb7009f1f9"
340 -#MY_P="xypron-${PN}-${MY_GIT_COMMIT:0:7}"
341 -#SRC_URI="https://github.com/xypron/${PN}/tarball/${MY_GIT_COMMIT} -> ${PF}.tar.gz"
342 -
343 -S="${WORKDIR}/${MY_P}"
344 -
345 -KEYWORDS="~amd64 ~x86"
346 -SLOT="0"
347 -LICENSE="Apache-2.0"
348 -IUSE="libnotify systemd"
349 -
350 -RDEPEND=">=app-antivirus/clamav-0.97.8
351 - sys-apps/util-linux
352 - sys-libs/libcap
353 - libnotify? (
354 - media-libs/libcanberra[gtk]
355 - x11-libs/libnotify
356 - x11-libs/gtk+:2
357 - )"
358 -DEPEND="${RDEPEND}
359 - sys-devel/autoconf-archive"
360 -
361 -## autotools-utils.eclass settings
362 -AUTOTOOLS_AUTORECONF="1"
363 -AUTOTOOLS_IN_SOURCE_BUILD="1"
364 -DOCS=( AUTHORS NEWS README )
365 -PATCHES=(
366 - "${FILESDIR}/${P}-syslog.patch"
367 - "${FILESDIR}/${P}-examples.patch"
368 - "${FILESDIR}/${P}-conf.patch"
369 -)
370 -
371 -pkg_setup() {
372 - linux-info_pkg_setup
373 - kernel_is ge 3 8 0 || die "Linux 3.8.0 or newer recommended"
374 - CONFIG_CHECK="FANOTIFY FANOTIFY_ACCESS_PERMISSIONS"
375 - check_extra_config
376 -
377 - ## define contents for README.gentoo
378 - if use systemd; then
379 - DOC_CONTENTS='SkyldAV provides a systemd service.'$'\n'
380 - DOC_CONTENTS+='Please edit the systemd service config file to match your needs:'$'\n'
381 - DOC_CONTENTS+='/etc/systemd/system/skyldav.service.d/00gentoo.conf'$'\n'
382 - DOC_CONTENTS+='# systemctl daemon-reload'$'\n'
383 - DOC_CONTENTS+='# systemctl restart skyldav.service'$'\n'
384 - DOC_CONTENTS+='Example for enabling the SkyldAV service:'$'\n'
385 - DOC_CONTENTS+='# systemctl enable skyldav.service'$'\n'
386 - else
387 - DOC_CONTENTS='SkyldAV provides an init script for OpenRC.'$'\n'
388 - DOC_CONTENTS+='Please edit the init script config file to match your needs:'$'\n'
389 - DOC_CONTENTS+='/etc/conf.d/skyldav'$'\n'
390 - DOC_CONTENTS+='Example for enabling the SkyldAV init script:'$'\n'
391 - DOC_CONTENTS+='# rc-update add skyldav default'$'\n'
392 - fi
393 -}
394 -
395 -src_configure() {
396 - local myeconfargs=(
397 - $(use_with libnotify notification)
398 - )
399 - autotools-utils_src_configure
400 -}
401 -
402 -src_install() {
403 - autotools-utils_src_install
404 -
405 - ## install systemd service or OpenRC init scripts
406 - if use systemd; then
407 - systemd_newunit "${FILESDIR}/skyldav.service-r1" skyldav.service
408 - systemd_install_serviced "${FILESDIR}"/skyldav.service.conf
409 - systemd_newtmpfilesd "${FILESDIR}"/skyldav.tmpfilesd skyldav.conf
410 - else
411 - newinitd "${FILESDIR}/${PN}.initd" ${PN}
412 - newconfd "${FILESDIR}/${PN}.confd" ${PN}
413 - fi
414 -
415 - ## create README.gentoo from ${DOC_CONTENTS}
416 - DISABLE_AUTOFORMATTING=1 readme.gentoo_create_doc
417 -}
418 -
419 -pkg_postinst() {
420 - ## workaround for /usr/lib/tmpfiles.d/skyldav.conf
421 - ## not getting processed until the next reboot
422 - if use systemd; then
423 - install -d -m 0755 -o root -g root /run/skyldav
424 - fi
425 -}