diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-02-13 21:41:11 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-02-13 21:41:11 +0000 |
commit | c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 (patch) | |
tree | c44943ee0563a3fa957716de909fed683117fcb9 /app-antivirus | |
parent | 69051588e2f955485fe5d45d45e616bc60a2de57 (diff) |
gentoo (valentine's day) resync : 14.02.2021
Diffstat (limited to 'app-antivirus')
-rw-r--r-- | app-antivirus/Manifest.gz | bin | 717 -> 722 bytes | |||
-rw-r--r-- | app-antivirus/clamav/Manifest | 7 | ||||
-rw-r--r-- | app-antivirus/clamav/clamav-0.103.1.ebuild (renamed from app-antivirus/clamav/clamav-0.103.0-r2.ebuild) | 5 | ||||
-rw-r--r-- | app-antivirus/clamav/files/clamav-0.103.0-freshclam-db-test-fix.patch | 27 | ||||
-rw-r--r-- | app-antivirus/clamav/files/clamav-0.103.1-upstream-openrc.patch (renamed from app-antivirus/clamav/files/clamav-0.103.0-upstream-openrc.patch) | 79 | ||||
-rw-r--r-- | app-antivirus/clamtk/Manifest | 2 | ||||
-rw-r--r-- | app-antivirus/clamtk/clamtk-6.07.ebuild | 142 | ||||
-rw-r--r-- | app-antivirus/fangfrisch/Manifest | 8 | ||||
-rw-r--r-- | app-antivirus/fangfrisch/fangfrisch-1.3.0.ebuild | 4 | ||||
-rw-r--r-- | app-antivirus/fangfrisch/fangfrisch-1.4.0.ebuild (renamed from app-antivirus/fangfrisch/fangfrisch-1.2.0-r1.ebuild) | 6 | ||||
-rw-r--r-- | app-antivirus/fangfrisch/metadata.xml | 1 |
11 files changed, 216 insertions, 65 deletions
diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz Binary files differindex 4fdf3a0793e5..724150124b8b 100644 --- a/app-antivirus/Manifest.gz +++ b/app-antivirus/Manifest.gz diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest index e3621173fffa..88679aaaa32c 100644 --- a/app-antivirus/clamav/Manifest +++ b/app-antivirus/clamav/Manifest @@ -2,9 +2,8 @@ AUX clamav-0.101.2-tinfo.patch 854 BLAKE2B 46479552a2dffcf56c7b142062896e8ae34e3 AUX clamav-0.102.1-libxml2_pkgconfig.patch 4012 BLAKE2B 4c3e4fc3522d317c57bae942bbd1c9b91d11ddb782cfaa0593458180207ffb873f783cea892d8eefd2402f30b7a0c4dcbbd5b61e01a54f98432c1164b29e7d83 SHA512 ee6379c85f7d85e30bfa4efda728cf9207a5017905abed8a6241561825ca54ec58a6cec2c1a8452574a9356491c192e89f76d19c2e404602637dcc9576b3fdea AUX clamav-0.102.2-fix-curl-detection.patch 844 BLAKE2B a813b1f6003b9cff03fca8d72dbd44d6a4f700e3d60aee83f782a87893a3c6753698ca8715237155185660301dd81dc55bf6a6e3b9095f57b099607182c90bf5 SHA512 27e6aa5ad418eaa32b56ea7bbdab0b5b4cd649e55d34eb094b5f02d7e68d8913f39664ffd6bc4a07faf88f60bdbd15b0c381fbbd6d9c1c62cc36e72e34cabd19 AUX clamav-0.102.3-system-tomsfastmath.patch 3769 BLAKE2B 36c6580709a9f3319643e547c37753a65240aaa2ed612465982ea35c392d5031ba105e8ac67a42453fa4960977579a04f61ad9bb30a8e693908c25daa3085154 SHA512 8749a0e0b97570371a4a661b82c210ab1c9e6cba46b7fdf63474daa745bc280ffc84c3e4030a3c659814ba845f38946cbda0f437130057c8a73b3dc762b09ae3 -AUX clamav-0.103.0-freshclam-db-test-fix.patch 869 BLAKE2B b6e9f09217b122a695c929caa89d017a5d4eb72101506db5a8709a62f3a91a651ffe938388e3c3060ace255bdfaab44d053f6bb584b8edf4069dc58b7374808a SHA512 2f7b949a14b4fa95c238f3c261426a911ba469da8faac1cc3717508cf5a7dd71ffd792c08a22c8ed6f6158d2dcb686ca44a15a0833188da5dcc4254117bcec65 AUX clamav-0.103.0-system-tomsfastmath.patch 3725 BLAKE2B 85640ded83600adfdcc03e8f42e3153c71a8b6c5884ca4cbd79a69121943fd171bc528aed26ded895189293008924cef6762a22001b4ee098fe5f680c7619bf0 SHA512 b67df39bc7d60f6ea9bb06d12413f0e4774185d4f020a68bdfdf8fe1ca669f70a62699b0f1100702af5ec47e460a35625dcaa09cfc6ea6d2f3957de227e87306 -AUX clamav-0.103.0-upstream-openrc.patch 16572 BLAKE2B 51e6207482cdbe5b82e3cdd73e38a11f5c215edb3905a40a97b2446d582ac59bc7467c43a3c2e2af6ee34fd8402964b6e2017c20960235e47c97810f501f9af6 SHA512 f5a984b71e246713df58b8e83503b2c063d8b44b7e4a5ee6245744aac1284ca2b135d6a9a002c411d06ff43515355283505a76fa45f67e6d236c5870b30f4f8c +AUX clamav-0.103.1-upstream-openrc.patch 18249 BLAKE2B 305db3181a4a22acde5b28cef6c2d01b639be8c5b9e9c77737be1ebcb0553040b6eda117285e3e8b4bf06d2565a5d73225d7ce20ba1f115fd08bc822d779b370 SHA512 89e95057ee2f29bcdf5787f659ffe43b055b599d9bb80bf54794859113d760dad135b5b8d80c23e98f8c6b699dc839d4922c4c3b45edf97296f4eea668e62672 AUX clamav-milter.README.gentoo 2284 BLAKE2B 7afc18f3dad57c2d7595257b356943efb3d1af28d55ac8f09f0506430fd0dedf0820906ced666a7237e3af44a9bc1b43fff017c03faad844f96b132ca4c5dde6 SHA512 38eadf2d919a0c48345600ea5a39c90e766b62e8b1ffc7bb01969a8fd93c4545f2030058a470ac7efb75a1d6c74f9930438f58aeff5035e19e38241ed381f7b3 AUX clamav-milter.logrotate 1105 BLAKE2B 5bb2b00dbe6e74c51d4ed7233964cfddf0ef7fd8c913caad42a421fc152baa3ffc3e910f38f46ebb72a08a8b53eba880647a6988d38558ec52129afca8dddfad SHA512 cb6cbefc4a093fda5a3cdb52911ff13b04d641896271b844db9ca30a051cb4beb911ee973a5958df8bba59b7b922cfb23bfa69cdd4fe3c0c2b8abe76bf834c2f AUX clamav-milter.service 284 BLAKE2B 7fbdce10ffa1d85aa671616f17ad45683177916269b434283582ecb53000f7a9a8978119e6a8170ddad8f7c0f14f09398fd7b893aad5d718083b002f6371ff21 SHA512 442148ac3c42ecbb893de5c6edde337b72a745d20f6c5ffa33131f9a0b2daadcffac39b686ada986a5ab500ea7b9153c448abc1b819e15fef488da1812bb0cee @@ -21,7 +20,7 @@ AUX freshclamd.service 240 BLAKE2B 1b72ffee3b0b1b51811aa5f3c7a52678b3beb260f020d AUX freshclamd.service-r1 177 BLAKE2B 8c9304e8c43e03288dcb1c6897b53e7c36b6e6116bb5c43db1e9735cc5d7b50094d33679d2b42839a09c572ad631daf572f62c57e4a7b74bfad5ce40a5916364 SHA512 5243465d30de1e64697455b3af50f62e6d7f3d0df7e2ef9b60f89dc974d8118ff67df0b44fbbddd04dd196ca17cf4306ac99f1eec42a5a0ddd42a64c4cb992c8 AUX tmpfiles.d/clamav.conf 33 BLAKE2B 447c5ad4ad79bc70fc386833fa763451d30bf30f1ae26434039a3926ca5aae9734e0152c83b5b9aa5bed87b17c1b685c4ea9f41c9cb6b3197b1e78e800b71fd9 SHA512 eabe5a94c2679b82ea3e29272eb448b47e60b271381d3e97f3970b1a9e086d61662aff2d29887950a911025294aa7cea8bfd9003d257963566b251bcaeb5f6b2 DIST clamav-0.102.4.tar.gz 13234444 BLAKE2B 7109da3e2281472032777b8a9d14ca6ff345aead33e5aaf0b9d1ff4721459926062f789dd1f7e8637155e4b9f3bce9f78127bf450f32baf3f1006b8083d3431a SHA512 29893deb8d2d913dff72331875d3dc3a10356bfb254ddfe1c1933b3ea4f8b76c96a1b840f95e72be36cbc0e00b9ec35e395225ef264761f53e709bb1026a4f09 -DIST clamav-0.103.0.tar.gz 13357078 BLAKE2B 6c4b05043f560a56f967642094ba4a9f9bd52268994ac43a99446650a78dafe0ec851b9ebcfe95f3e216fd7942e4756f2e20bda67ca9187e55523fbba9ca56d8 SHA512 e0712ed3c068dc8dab1d31b7cbc19cd69c62875fdcf314abb28e6f42660daf162a3aae69e0a008919e7b809675b68d35f79d3cb98379442bcbc6f5c8ee4313bf +DIST clamav-0.103.1.tar.gz 13369791 BLAKE2B 974716a17e67240ef606b074584a1ac344f1d5915347aaa02b388570ea543981433c482423b99f5d07054bdf4dce8a0d043afdd52b42d49ace468f3d801c3353 SHA512 f13e9542898ef42c0db6f7826bcb220b9cb57de2a88bfedc6c991b76ff06c59290522d31119132eaa2093da58c5069d63103f6260e271497bda2b472c3cd6ffb EBUILD clamav-0.102.4.ebuild 6960 BLAKE2B 292ee4bf55f790a6002f10d4ea040272af557665e5251338d34a43760ffcb667c4fae1f581193425d3555c64b7dc71198621fe09309a9c2831b657162c71a5ed SHA512 8932730bfa50b9b467e3f59256b51054a51a12b52d9c54fb0b4c0b80ce06e8e897d4dd90b2b0044b3b8913a44d5c7aaaee3a177c821e7efe99af1fb4d52e3032 -EBUILD clamav-0.103.0-r2.ebuild 7420 BLAKE2B 75e538c284ba5d5a9eff7c9c967b3f43b73680b0efdb40eaa9eb54bd02d0ba6c016232d48062e082cd0e217bc103d6334250b3c21d391e39676f377534be438e SHA512 b61a1acf5b5e3c8f14b5f02786dfe9fd900451276657c719543a2ec9823d0276b74d1cee71a925b2c6f935b05eea0ac5cf8770eff69e59e730718fa8f786157e +EBUILD clamav-0.103.1.ebuild 7363 BLAKE2B c23f6231021920fa662b52eac841b61987193ae522647de9f176381d38963232933e21227ba2adebac9a6f0800ce11be6303abf222e11803819175fe11a3202a SHA512 43bde7b4bd5448930d8b439e7b8586908920ceea11b40bb11e686e275eb5bbad25837b490565becb952064e26d9bcebca1f9731c3640d4f2d1eb4e92adb5c4d4 MISC metadata.xml 933 BLAKE2B 867499e23131bf714cdddd911ef727dc6e487be8c6f0be1985611bc2ce8bfbee639e114f8ade6a6b9418095d03a45095030168912ab21484da81385c53255b05 SHA512 c0a3132dbfafbdb8852d621de187cfbd5daa30ab682593b88c77278e0c8a58fb57ed1427b9f8aa798926ccc94db4a19eeec77915f06de9b0cd182237aa77a892 diff --git a/app-antivirus/clamav/clamav-0.103.0-r2.ebuild b/app-antivirus/clamav/clamav-0.103.1.ebuild index 1ebe1bd96d9f..6829a29906af 100644 --- a/app-antivirus/clamav/clamav-0.103.0-r2.ebuild +++ b/app-antivirus/clamav/clamav-0.103.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -54,8 +54,7 @@ PATCHES=( "${FILESDIR}/${PN}-0.102.1-libxml2_pkgconfig.patch" #661328 "${FILESDIR}/${PN}-0.102.2-fix-curl-detection.patch" #709616 "${FILESDIR}/${PN}-0.103.0-system-tomsfastmath.patch" # 649394 - "${FILESDIR}/${PN}-0.103.0-upstream-openrc.patch" - "${FILESDIR}/${PN}-0.103.0-freshclam-db-test-fix.patch" + "${FILESDIR}/${PN}-0.103.1-upstream-openrc.patch" ) src_prepare() { diff --git a/app-antivirus/clamav/files/clamav-0.103.0-freshclam-db-test-fix.patch b/app-antivirus/clamav/files/clamav-0.103.0-freshclam-db-test-fix.patch deleted file mode 100644 index 25ae94b9fb85..000000000000 --- a/app-antivirus/clamav/files/clamav-0.103.0-freshclam-db-test-fix.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/freshclam/freshclam.c b/freshclam/freshclam.c -index 8db3b8001..8cde8c9a8 100644 ---- a/freshclam/freshclam.c -+++ b/freshclam/freshclam.c -@@ -280,6 +280,14 @@ fc_error_t download_complete_callback(const char *dbFilename, void *context) - goto done; - } - } else { -+ /* -+ * Attempt to test database in a child process. -+ */ -+ -+ /* We need to be able to wait for the child process ourselves. -+ * We'll re-enable wait in the global handler when we're done. */ -+ g_sigchildWait = 0; -+ - switch (pid = fork()) { - case -1: { - /* -@@ -391,6 +399,7 @@ done: - logg("!Database test FAILED.\n"); - } - -+ /* Re-enable the global handler's child process wait */ - g_sigchildWait = 1; - - return status; diff --git a/app-antivirus/clamav/files/clamav-0.103.0-upstream-openrc.patch b/app-antivirus/clamav/files/clamav-0.103.1-upstream-openrc.patch index a7676f0ab82a..a37d44fa934d 100644 --- a/app-antivirus/clamav/files/clamav-0.103.0-upstream-openrc.patch +++ b/app-antivirus/clamav/files/clamav-0.103.1-upstream-openrc.patch @@ -1,5 +1,37 @@ +From 7d7ca4f425909368cd78cd587120703754bcd608 Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky <michael@orlitzky.com> +Date: Tue, 9 Feb 2021 14:24:09 -0500 +Subject: [PATCH 1/1] Add OpenRC service scripts integrated with the build + system. + +--- + Makefile.am | 11 ++++++ + clamav-milter/Makefile.am | 21 ++++++++++++ + clamav-milter/openrc/clamav-milter.in.in | 34 +++++++++++++++++++ + clamd/Makefile.am | 19 +++++++++++ + clamd/openrc/clamd.in.in | 33 ++++++++++++++++++ + clamonacc/Makefile.am | 19 +++++++++++ + clamonacc/openrc/clamonacc.in.in | 18 ++++++++++ + configure.ac | 16 ++++++++- + etc/Makefile.am | 22 +++++++++++- + ...sample => clamav-milter.conf.sample.in.in} | 5 +-- + ...md.conf.sample => clamd.conf.sample.in.in} | 4 +-- + ...onf.sample => freshclam.conf.sample.in.in} | 2 +- + freshclam/Makefile.am | 20 +++++++++++ + freshclam/openrc/freshclam.in.in | 8 +++++ + m4/reorganization/libs/openrc.m4 | 8 +++++ + 15 files changed, 233 insertions(+), 7 deletions(-) + create mode 100644 clamav-milter/openrc/clamav-milter.in.in + create mode 100644 clamd/openrc/clamd.in.in + create mode 100644 clamonacc/openrc/clamonacc.in.in + rename etc/{clamav-milter.conf.sample => clamav-milter.conf.sample.in.in} (98%) + rename etc/{clamd.conf.sample => clamd.conf.sample.in.in} (99%) + rename etc/{freshclam.conf.sample => freshclam.conf.sample.in.in} (99%) + create mode 100644 freshclam/openrc/freshclam.in.in + create mode 100644 m4/reorganization/libs/openrc.m4 + diff --git a/Makefile.am b/Makefile.am -index 12e7fcc28..a3c47e23a 100644 +index 42a58e7..c4d82ad 100644 --- a/Makefile.am +++ b/Makefile.am @@ -52,6 +52,17 @@ nodist_include_HEADERS = clamav-types.h clamav-version.h @@ -21,7 +53,7 @@ index 12e7fcc28..a3c47e23a 100644 ($(MAKE); cd unit_tests; $(MAKE) lcov) quick-check: diff --git a/clamav-milter/Makefile.am b/clamav-milter/Makefile.am -index 1ec4afff6..c75c2b4a3 100644 +index 38d9b94..46885a7 100644 --- a/clamav-milter/Makefile.am +++ b/clamav-milter/Makefile.am @@ -35,6 +35,27 @@ clamav_milter_SOURCES = \ @@ -54,7 +86,7 @@ index 1ec4afff6..c75c2b4a3 100644 LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/shared/libshared.la @CLAMAV_MILTER_LIBS@ @THREAD_LIBS@ diff --git a/clamav-milter/openrc/clamav-milter.in.in b/clamav-milter/openrc/clamav-milter.in.in new file mode 100644 -index 000000000..71053564a +index 0000000..7105356 --- /dev/null +++ b/clamav-milter/openrc/clamav-milter.in.in @@ -0,0 +1,34 @@ @@ -93,7 +125,7 @@ index 000000000..71053564a + "@RUNSTATEDIR@/clamav" +} diff --git a/clamd/Makefile.am b/clamd/Makefile.am -index 12b872b1f..725bc2fc1 100644 +index c161586..b59d94c 100644 --- a/clamd/Makefile.am +++ b/clamd/Makefile.am @@ -44,6 +44,25 @@ if INSTALL_SYSTEMD_UNITS @@ -124,7 +156,7 @@ index 12b872b1f..725bc2fc1 100644 diff --git a/clamd/openrc/clamd.in.in b/clamd/openrc/clamd.in.in new file mode 100644 -index 000000000..5d38f9a84 +index 0000000..5d38f9a --- /dev/null +++ b/clamd/openrc/clamd.in.in @@ -0,0 +1,33 @@ @@ -162,10 +194,10 @@ index 000000000..5d38f9a84 + eend $? +} diff --git a/clamonacc/Makefile.am b/clamonacc/Makefile.am -index 181e22056..864a7fc2a 100644 +index 4cb4886..39c2e5d 100644 --- a/clamonacc/Makefile.am +++ b/clamonacc/Makefile.am -@@ -56,6 +56,25 @@ if INSTALL_SYSTEMD_UNITS +@@ -58,6 +58,25 @@ if INSTALL_SYSTEMD_UNITS systemdsystemunit_DATA = clamav-clamonacc.service endif @@ -193,7 +225,7 @@ index 181e22056..864a7fc2a 100644 diff --git a/clamonacc/openrc/clamonacc.in.in b/clamonacc/openrc/clamonacc.in.in new file mode 100644 -index 000000000..844cd49dd +index 0000000..844cd49 --- /dev/null +++ b/clamonacc/openrc/clamonacc.in.in @@ -0,0 +1,18 @@ @@ -216,7 +248,7 @@ index 000000000..844cd49dd + need clamd +} diff --git a/configure.ac b/configure.ac -index 7b2a777d4..8e0e810f8 100644 +index 33e252e..c8cd60f 100644 --- a/configure.ac +++ b/configure.ac @@ -79,6 +79,12 @@ if test "$enable_experimental" = "yes"; then @@ -232,7 +264,7 @@ index 7b2a777d4..8e0e810f8 100644 build_configure_args=`echo "$ac_configure_args" | sed -e 's/[\"]//g'` AC_SUBST([BUILD_CONFIGURE_FLAGS], [$build_configure_args]) -@@ -104,6 +110,7 @@ m4_include([m4/reorganization/libs/libz.m4]) +@@ -105,6 +111,7 @@ m4_include([m4/reorganization/libs/libz.m4]) m4_include([m4/reorganization/libs/bzip.m4]) m4_include([m4/reorganization/libs/unrar.m4]) m4_include([m4/reorganization/libs/systemd.m4]) @@ -240,7 +272,7 @@ index 7b2a777d4..8e0e810f8 100644 m4_include([m4/reorganization/code_checks/ipv6.m4]) m4_include([m4/reorganization/code_checks/dns.m4]) m4_include([m4/reorganization/code_checks/fanotify.m4]) -@@ -192,7 +199,10 @@ AC_CONFIG_FILES([ +@@ -193,7 +200,10 @@ AC_CONFIG_FILES([ libclamav.pc platform.h clamav-types.h @@ -250,9 +282,9 @@ index 7b2a777d4..8e0e810f8 100644 + etc/clamav-milter.conf.sample.in + etc/freshclam.conf.sample.in]) if test "x$enable_libclamav_only" != "xyes"; then - AC_CONFIG_FILES([ - clamscan/Makefile -@@ -202,10 +212,14 @@ if test "x$enable_libclamav_only" != "xyes"; then + if test "$have_curl" = "no"; then + AC_MSG_ERROR([libcurl not found. libcurl (e.g. libcurl-devel) is required in order to build freshclam and clamsubmit.]) +@@ -207,10 +217,14 @@ if test "x$enable_libclamav_only" != "xyes"; then clamd/Makefile clamd/clamav-daemon.service clamd/clamav-daemon.socket @@ -268,7 +300,7 @@ index 7b2a777d4..8e0e810f8 100644 sigtool/Makefile clamconf/Makefile diff --git a/etc/Makefile.am b/etc/Makefile.am -index 487c31429..bee68f1d0 100644 +index c694856..213a978 100644 --- a/etc/Makefile.am +++ b/etc/Makefile.am @@ -18,11 +18,31 @@ @@ -303,12 +335,12 @@ index 487c31429..bee68f1d0 100644 + rm -f $@ $@.tmp + $(editgnudirs) $@.in > $@.tmp + mv $@.tmp $@ -+>>>>>>> ea2f2442b... etc: convert conf files to templates and make @VARIABLE@ substitutions. ++ diff --git a/etc/clamav-milter.conf.sample b/etc/clamav-milter.conf.sample.in.in similarity index 98% rename from etc/clamav-milter.conf.sample rename to etc/clamav-milter.conf.sample.in.in -index bf46b4fc5..c3c5d2000 100644 +index bf46b4f..c3c5d20 100644 --- a/etc/clamav-milter.conf.sample +++ b/etc/clamav-milter.conf.sample.in.in @@ -17,7 +17,7 @@ Example @@ -341,7 +373,7 @@ diff --git a/etc/clamd.conf.sample b/etc/clamd.conf.sample.in.in similarity index 99% rename from etc/clamd.conf.sample rename to etc/clamd.conf.sample.in.in -index 828dd5ad9..0e0ea4b12 100644 +index a1ca9ec..82ef42c 100644 --- a/etc/clamd.conf.sample +++ b/etc/clamd.conf.sample.in.in @@ -74,7 +74,7 @@ Example @@ -366,7 +398,7 @@ diff --git a/etc/freshclam.conf.sample b/etc/freshclam.conf.sample.in.in similarity index 99% rename from etc/freshclam.conf.sample rename to etc/freshclam.conf.sample.in.in -index 2f7d14618..3af3a3485 100644 +index 8f4dd49..5a5c42b 100644 --- a/etc/freshclam.conf.sample +++ b/etc/freshclam.conf.sample.in.in @@ -51,7 +51,7 @@ Example @@ -379,7 +411,7 @@ index 2f7d14618..3af3a3485 100644 # By default when started freshclam drops privileges and switches to the # "clamav" user. This directive allows you to change the database owner. diff --git a/freshclam/Makefile.am b/freshclam/Makefile.am -index ab6ac8f1c..6b16b3d3e 100644 +index 9e48119..46ef224 100644 --- a/freshclam/Makefile.am +++ b/freshclam/Makefile.am @@ -32,6 +32,26 @@ if INSTALL_SYSTEMD_UNITS @@ -411,7 +443,7 @@ index ab6ac8f1c..6b16b3d3e 100644 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface -I$(top_srcdir)/libfreshclam @CURL_CPPFLAGS@ @SSL_CPPFLAGS@ @FRESHCLAM_CPPFLAGS@ @ZLIB_CFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ diff --git a/freshclam/openrc/freshclam.in.in b/freshclam/openrc/freshclam.in.in new file mode 100644 -index 000000000..9feb73747 +index 0000000..9feb737 --- /dev/null +++ b/freshclam/openrc/freshclam.in.in @@ -0,0 +1,8 @@ @@ -425,7 +457,7 @@ index 000000000..9feb73747 +command_args_background="--daemon" diff --git a/m4/reorganization/libs/openrc.m4 b/m4/reorganization/libs/openrc.m4 new file mode 100644 -index 000000000..1a73d1589 +index 0000000..1a73d15 --- /dev/null +++ b/m4/reorganization/libs/openrc.m4 @@ -0,0 +1,8 @@ @@ -437,3 +469,6 @@ index 000000000..1a73d1589 + [enable_openrc=no]) +AM_CONDITIONAL(INSTALL_OPENRC_SERVICES, + [test "x$enable_openrc" = "xyes"]) +-- +2.26.2 + diff --git a/app-antivirus/clamtk/Manifest b/app-antivirus/clamtk/Manifest index dfc6c990e236..304a27f15dcd 100644 --- a/app-antivirus/clamtk/Manifest +++ b/app-antivirus/clamtk/Manifest @@ -1,7 +1,9 @@ DIST clamtk-6.06.tar.xz 232024 BLAKE2B a9a7310410f685bb6cae24ae6cee45b31a524b88cf75c9346617614e5dba43f3942d39dd6d484d656906c3fbb2122ab3858ab017c0e79d5ed9271b2968b750d2 SHA512 ee4d09e0f3c703bef5a1b3e1bdc97d3d1d91998c98e82a2fb1e3326fa8fdff32d7bbef7d9e2bf2b6292fa1982b1efb3b5cdb4cdd7afb17f6ffd0e089d8b4539a +DIST clamtk-6.07.tar.xz 234112 BLAKE2B fc938bbf72af1ce0040c7211792e7effbd55ddfe1377364e0a0c8a8f456d50ad55888427ebed9d5558e65c6d9e122fdca70ef31860bd39fd698a76daeb48d409 SHA512 cb3c042f7b0b1f0b498f398d5074b5cdb3dbd1ae540a2a5009efc09eab8cfae83786ccafd3ebb846214cab6e82393a5aa3330ece717d8d4d0530f631f6036d5f DIST clamtk-gnome-0.05.tar.xz 15148 BLAKE2B d72ad0c9b3272c1a21d3722994152e23aeb01bd79d006cbcd3545c2689887b4f596daeeef72a13d9cdd9cfc89c4091963b4a1917824bbb06be4678f2c446a114 SHA512 a5d3b0e87889880272aa61a0feebca8e885c7fa964bad767351c826188c236f2152b3c43328b6aa720c5942b2bf1da69916d3664358c274813a6ac032ee4dea0 DIST clamtk-kde-0.18.tar.xz 17732 BLAKE2B ca82934417f2d869fd8c8e36a31ef4a52cf4ee73581c5d1d400c1b28908c5ea2524a8f5d1110b1e949038378613fb4d5607d5123eebe91df695a53d0dd489302 SHA512 145ddd349010e0bb6fe3295e50d6e15a2dd96e604babbd5de4cb49ba75169d2050777cac38e40ac6a64cb89ddf94025d610aca73136c75f81115d0a2d863d24e DIST nemo-sendto-clamtk-0.04.tar.xz 4228 BLAKE2B ce656d4f021bc30cd12fb2ee5f98a78c1f1fdb2460ed2cbba0b572408617f91b39b2ca2fe542b9cec7be79b4b9fdfd685f5553e1a671454ca1e6723241dcb805 SHA512 2b5d3abbc4ae5dbc71b1b7bc836df88ad51e6afa00d5e954b5c1355a70c0420b6fef895e1cb5cccb86a662aee2039cef6c01821c1347fa155b5da3529b25562c DIST thunar-sendto-clamtk-0.06.tar.xz 4416 BLAKE2B 6b9f8857fead9f175af0a5fd3585790c49865b07016ddbc0dfc21f761ecbac32d97a65731fdca0335fd4852af9efc93c06ecb994f769a5efeade35cb734e9924 SHA512 f3b6f296213ad5974f8134d682cce4e426d9730d1898e8f7ea474e27314ee47957b033bbd7f16196cabf054eccec844c05ff8c8f9a98ad013a7f89b899cee591 EBUILD clamtk-6.06.ebuild 3803 BLAKE2B 7d674a0e2d104b37823e70857ec9948e8de03a97f577aaa09baaf8b9a4066ac6acd884f42f512c0eeab0548d8b10ece39f611b5ddafa7e0dfee95094ed7f3d6f SHA512 254ac7f66ea2923d5882ebc84ebf070de75080f610b22b3887c490d3eaa1723bb60796bd49d312ee591573d6192cfd8e22ad4c6961f0f670b3be55d852aefa5e +EBUILD clamtk-6.07.ebuild 3805 BLAKE2B 56acde3d967d59ea2e176d18eb6c70ab50d571c914df8bf11764495facf24926fa712a95e0a4e7114c01aadf1871db57af6e4f3937d7d86597bd8021b3ef79ce SHA512 bc5f9437e23450ccb9c9e1d38ab1788a5815aed950362c32c4793a9aaef34c5263288736939ee005b17b9153e43a58acf28e8aed104ca26d568b0d9d7108bdb2 MISC metadata.xml 809 BLAKE2B 6c61c6d564fd120a1996f0620eb94af868a19a4a2178ebf694bda8f7a926b42848723911d2b45ed6a8199a969802d62e574422d22a76163fea2eb8d053553236 SHA512 984613fcdc7d6c2dd02475f3a9ca0f1e68e66c59961d9e43532722b5ac4c8022a4daff30742eec959da5317d4f3e10c2608538b50bad5b4d95af5ba7731f75b7 diff --git a/app-antivirus/clamtk/clamtk-6.07.ebuild b/app-antivirus/clamtk/clamtk-6.07.ebuild new file mode 100644 index 000000000000..6519a62f1c4b --- /dev/null +++ b/app-antivirus/clamtk/clamtk-6.07.ebuild @@ -0,0 +1,142 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) + +inherit desktop perl-functions python-single-r1 xdg-utils + +MY_PV_KDE="0.18" +MY_PV_NAUTILUS="0.05" +MY_PV_NEMO="0.04" +MY_PV_THUNAR="0.06" + +DESCRIPTION="A graphical front-end for ClamAV" +HOMEPAGE="https://gitlab.com/dave_m/clamtk/wikis/Home" +SRC_URI=" + https://bitbucket.org/davem_/${PN}-gtk3/downloads/${P}.tar.xz + kde? ( https://bitbucket.org/davem_/${PN}-kde/downloads/${PN}-kde-${MY_PV_KDE}.tar.xz ) + nautilus? ( https://bitbucket.org/davem_/${PN}-gnome/downloads/${PN}-gnome-${MY_PV_NAUTILUS}.tar.xz ) + nemo? ( https://bitbucket.org/davem_/nemo-sendto-${PN}/downloads/nemo-sendto-${PN}-${MY_PV_NEMO}.tar.xz ) + thunar? ( https://bitbucket.org/davem_/thunar-sendto-${PN}/downloads/thunar-sendto-${PN}-${MY_PV_THUNAR}.tar.xz ) +" + +LICENSE="|| ( Artistic GPL-1+ )" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="kde nautilus nemo +nls thunar" +REQUIRED_USE="nautilus? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + app-antivirus/clamav + dev-perl/File-chdir + dev-perl/Gtk3 + dev-perl/JSON + dev-perl/LWP-Protocol-https + dev-perl/LWP-UserAgent-Cached + dev-perl/Locale-gettext + dev-perl/Text-CSV + dev-perl/glib-perl + dev-perl/libwww-perl + virtual/perl-Digest-MD5 + virtual/perl-Digest-SHA + virtual/perl-Encode + virtual/perl-MIME-Base64 + virtual/perl-Time-Piece + nautilus? ( + ${PYTHON_DEPS} + dev-python/nautilus-python[${PYTHON_SINGLE_USEDEP}] + ) +" + +BDEPEND="nls? ( sys-devel/gettext )" + +DOCS=( "CHANGES" "credits.md" "DISCLAIMER" "README.md" ) + +pkg_setup() { + use nautilus && python-single-r1_pkg_setup +} + +src_unpack() { + default + + unpack "${S}"/clamtk.1.gz + + use kde && unpack "${S}"/../clamtk-kde-${MY_PV_KDE}/clamtk-kde.1.gz + use nautilus && unpack "${S}"/../clamtk-gnome-${MY_PV_NAUTILUS}/clamtk-gnome.1.gz + use nemo && unpack "${S}"/../nemo-sendto-clamtk-${MY_PV_NEMO}/nemo-sendto-clamtk.1.gz + use thunar && unpack "${S}"/../thunar-sendto-clamtk-${MY_PV_THUNAR}/thunar-sendto-clamtk.1.gz +} + +src_install() { + dobin clamtk + + perl_set_version + insinto "${VENDOR_LIB}"/ClamTk + doins lib/*.pm + + use nls && domo po/*.mo + + doicon images/clamtk.png images/clamtk.xpm + + domenu clamtk.desktop + + doman ../clamtk.1 + + if use kde; then + insinto /usr/share/kservices5/ServiceMenus + doins ../clamtk-kde-${MY_PV_KDE}/clamtk-kde.desktop + + doicon ../clamtk-kde-${MY_PV_KDE}/clamtk-kde.png ../clamtk-kde-${MY_PV_KDE}/clamtk-kde.xpm + + doman ../clamtk-kde.1 + + docinto dolphin + dodoc ../clamtk-kde-${MY_PV_KDE}/CHANGES ../clamtk-kde-${MY_PV_KDE}/README.md + fi + + if use nautilus; then + insinto /usr/share/nautilus-python/extensions + doins ../clamtk-gnome-${MY_PV_NAUTILUS}/clamtk-gnome.py + + doicon ../clamtk-gnome-${MY_PV_NAUTILUS}/images/clamtk-gnome.png + + doman ../clamtk-gnome.1 + + docinto nautilus + dodoc ../clamtk-gnome-${MY_PV_NAUTILUS}/CHANGES ../clamtk-gnome-${MY_PV_NAUTILUS}/DISCLAIMER ../clamtk-gnome-${MY_PV_NAUTILUS}/README.md + fi + + if use nemo; then + insinto /usr/share/nemo/actions/ + doins ../nemo-sendto-clamtk-${MY_PV_NEMO}/nemo-sendto-clamtk.nemo_action + + doman ../nemo-sendto-clamtk.1 + + docinto nemo + dodoc ../nemo-sendto-clamtk-${MY_PV_NEMO}/CHANGES ../nemo-sendto-clamtk-${MY_PV_NEMO}/DISCLAIMER ../nemo-sendto-clamtk-${MY_PV_NEMO}/README.md + fi + + if use thunar; then + insinto /usr/share/Thunar/sendto + doins ../thunar-sendto-clamtk-${MY_PV_THUNAR}/thunar-sendto-clamtk.desktop + + doman ../thunar-sendto-clamtk.1 + + docinto thunar + dodoc ../thunar-sendto-clamtk-${MY_PV_THUNAR}/CHANGES ../thunar-sendto-clamtk-${MY_PV_THUNAR}/DISCLAIMER ../thunar-sendto-clamtk-${MY_PV_THUNAR}/README + fi + + einstalldocs +} + +pkg_postinst() { + xdg_desktop_database_update + xdg_mimeinfo_database_update +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_mimeinfo_database_update +} diff --git a/app-antivirus/fangfrisch/Manifest b/app-antivirus/fangfrisch/Manifest index ab3fb67c017f..25da05e3230a 100644 --- a/app-antivirus/fangfrisch/Manifest +++ b/app-antivirus/fangfrisch/Manifest @@ -1,7 +1,7 @@ AUX fangfrisch.conf 512 BLAKE2B 1b1cd87fbf2095f8d6839fef2175b70cdf1c8d72bcfa8eb06e9abe5e88150f3d4414a64679d775f1fef4378a940334c6c1567f387dbf6ce7f8bb40f6070f31c0 SHA512 e3fff2b24a6bd05a709472e9b7b5416732807171539d31c9f2129e8b7c2ef2b5f047a7090818a2aae77941169030e7785be7a6cded1220f8a130e9e60ea05ce6 AUX fangfrisch.cron 170 BLAKE2B b2b3572bb468942eecc006749710900bb19e29d40ad444a4b1ee1575f2d4eda77e2b4c66f6ab75208bbb28c48f0d26075b2d0517982cd62d0f082aa657ff82f2 SHA512 46ba3a9bbdc93896387e9ca3a2fef1bbae6711b3680baa0afddf41c83b537e62d9425fe93d7d7befc60dd8a89aa4c70f9947b596594d5ca93024acec1f9bf454 -DIST fangfrisch-1.2.0.tar.gz 113088 BLAKE2B 9fb5f4b838e6337128c9e988f5749864cadacb74c9e3006f29cf8b976592af88c00ff5359cd70e4d6901e24cfc01b061861b7b1a563a82d66b2d71c970627c26 SHA512 6f6c0cfc4d840f99186c83e6109c6234ff5bfb44e19bcd3309056347392e46da56e17106259508864b05397d39ea92500ab6863b50d55efc790d88b59f88ee3b DIST fangfrisch-1.3.0.tar.gz 114361 BLAKE2B eca124f02f814d2915c4dbba45b6e4dc620e250730a32b34d3f5f5eaa33945e697d2d887f29251f1f8a3b1813476a54092091235a786e84695a3bc1cadebad28 SHA512 9c138737908a02efa5c9b4c6792a31e2a4908f8ab27e8cecab78612f812ab151afef75a405f47695779a949485aa88a3a5830efd02344ec334e6f37425cffe49 -EBUILD fangfrisch-1.2.0-r1.ebuild 1974 BLAKE2B aa48cb2d6beae1e5405deb60dfa0a68b9c7ccd7e5fa78ce8a0e66fb7241625ca3bbfef35f414e9a5c628792a3b944ec95ac5622a3a76872191c3fa42316ea7f7 SHA512 d02213e13ccca23c0fa667592e5f8e8d8c29fa3b7dac5183b6c5eba9742f4e493b98fd7daa0e583dbdc0d9c7a5132b2ab1b062e2ad297ed48d11e92b156306ad -EBUILD fangfrisch-1.3.0.ebuild 1978 BLAKE2B c5361c507f8df22bcdff023fa74b1e8c4348c4516f066346dc3e78cb47cea3e28e6d6084a7c50c1a831bb58c1b6f63d1b502b8ca116132c50f3223bcf70cb109 SHA512 c82a7e66eb89386519fbdda435d4ee494adda8f5fe5996b7af72d63aa4b3497a3dfa343ac04eff7a0da1385bb63abf7229c55c2c5f456ad5c79ceb05c9b65c3a -MISC metadata.xml 863 BLAKE2B f3324a0adbcf5979af8daf27906630edb5d6ae78cf74ef1abd7610297587a382981658381d22b8af6233f543b02903733d1dce13df27faa4c6eb243cc164b243 SHA512 b11935bd73f1d405292dbd80456380dcc1b390015158cbacb1023b12f755d41c2af656514ec1fc9e307752706166fa96651fdebc626f1e0e4134e0a0a9d01f82 +DIST fangfrisch-1.4.0.tar.gz 115303 BLAKE2B 6dea9305ad22e8beff0fc04219d24da995c36e0838e1be8b98d12b11db1f68d7ca4f6084d15270c09e8a4b8d94a7bdfe1b9bb336abef1767b1ded2d1751fa22b SHA512 5fca7b7e8d24daadfb450851c70391fce94943a718bbed4fc76efe08a730cce313d92e7d9a6a8324a0b0039871f8c77f1fcd3744c569826cc0d2e7a7fd4e9b32 +EBUILD fangfrisch-1.3.0.ebuild 1976 BLAKE2B 6ae2b185454375f005ce29c44e20905c46ea68a6b9f7b12b340aae679f643880cd43d5e03606355b62156569900ef14aa567179ed5d317563ab5612b4f2c30da SHA512 ae3ac41b250d230c1d47c30b38aaa7f70391731d546d73148d9ae00a8a867f7205d98e613737289929ecfa0f0c4937ee87fe2bc81644228829b979d3fb8019c6 +EBUILD fangfrisch-1.4.0.ebuild 1978 BLAKE2B 0bae4e9fca95089a1b05e0bf352f2d9a08bd9c0c75e062bdc794181524ffe7c533d67978731a37fe1d0b1c615abc7c6e0963a5546472e5bc6f5487367f46de82 SHA512 61f5ce2be798a99bfe8b79594756be9bd66c8694a5bb343bb1dc992f2ae7e8e973d7a1a531e0c09960ca54d682f7c0ef64fd75afef3d8033148a116a3ea566c8 +MISC metadata.xml 887 BLAKE2B f4decc99e10c900f69a373d854f0ef2eda5f729f2bb0b937d196d708cd2161b0af82363a1fdb0866e5e8c42dabdc91f6dafee627418a7b85b26eab1cf15db65e SHA512 af6ad5ffe5fa55cf0d0627479b23b0a24b7d811330b0a408b94e57365382581e0f7e6a37712e6ad1c827fc4d9bde5ac069fb05bd46770ab2fe3059327ee5b201 diff --git a/app-antivirus/fangfrisch/fangfrisch-1.3.0.ebuild b/app-antivirus/fangfrisch/fangfrisch-1.3.0.ebuild index 5de7fdc59bbd..f70138cc4b33 100644 --- a/app-antivirus/fangfrisch/fangfrisch-1.3.0.ebuild +++ b/app-antivirus/fangfrisch/fangfrisch-1.3.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -37,7 +37,7 @@ database tables, then run the initdb command as shown above." LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" DEPEND=">=dev-python/requests-2.22.0[${PYTHON_USEDEP}] >=dev-python/sqlalchemy-1.3.11[${PYTHON_USEDEP}]" diff --git a/app-antivirus/fangfrisch/fangfrisch-1.2.0-r1.ebuild b/app-antivirus/fangfrisch/fangfrisch-1.4.0.ebuild index 08c54e83ab3f..3c01329a331e 100644 --- a/app-antivirus/fangfrisch/fangfrisch-1.2.0-r1.ebuild +++ b/app-antivirus/fangfrisch/fangfrisch-1.4.0.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DISTUTILS_USE_SETUPTOOLS=rdepend -PYTHON_COMPAT=( python3_{7,8} ) +PYTHON_COMPAT=( python3_{7,8,9} ) inherit distutils-r1 readme.gentoo-r1 @@ -37,7 +37,7 @@ database tables, then run the initdb command as shown above." LICENSE="GPL-3+" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" DEPEND=">=dev-python/requests-2.22.0[${PYTHON_USEDEP}] >=dev-python/sqlalchemy-1.3.11[${PYTHON_USEDEP}]" diff --git a/app-antivirus/fangfrisch/metadata.xml b/app-antivirus/fangfrisch/metadata.xml index 86c7e98f50ea..6660de68af79 100644 --- a/app-antivirus/fangfrisch/metadata.xml +++ b/app-antivirus/fangfrisch/metadata.xml @@ -16,6 +16,7 @@ Sanesecurity, URLhaus and others. Fangfrisch was designed with security in mind, to be run by an unprivileged user only. </longdescription> + <stabilize-allarches/> <upstream> <remote-id type="github">rseichter/fangfrisch</remote-id> <remote-id type="pypi">fangfrisch</remote-id> |