10 files changed, 56 insertions, 71 deletions
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
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 -