diff --git a/amavis/10-ask_peekaboo b/amavis/10-ask_peekaboo index ef547860..230a9a65 100644 --- a/amavis/10-ask_peekaboo +++ b/amavis/10-ask_peekaboo @@ -5,7 +5,7 @@ # 10-ask_peekaboo ############################################################################### # # -# Copyright (C) 2016-2019 science + computing ag # +# Copyright (C) 2016-2020 science + computing ag # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/bin/dummy_cuckoo.py b/bin/dummy_cuckoo.py index 5403449c..67da02dd 100755 --- a/bin/dummy_cuckoo.py +++ b/bin/dummy_cuckoo.py @@ -7,7 +7,7 @@ # dummy_cuckoo.py # ############################################################################### # # -# Copyright (C) 2016-2019 science + computing ag # +# Copyright (C) 2016-2020 science + computing ag # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/bin/dummy_cuckoo_submit.py b/bin/dummy_cuckoo_submit.py index a3fd196d..13eb38ca 100755 --- a/bin/dummy_cuckoo_submit.py +++ b/bin/dummy_cuckoo_submit.py @@ -7,7 +7,7 @@ # dummy_cuckoo_submit.py # ############################################################################### # # -# Copyright (C) 2016-2019 science + computing ag # +# Copyright (C) 2016-2020 science + computing ag # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/bin/peekaboo-util.py b/bin/peekaboo-util.py index 5217d593..074c53d1 100755 --- a/bin/peekaboo-util.py +++ b/bin/peekaboo-util.py @@ -8,7 +8,7 @@ # peekaboo-util.py # ############################################################################### # # -# Copyright (C) 2016-2019 science + computing ag # +# Copyright (C) 2016-2020 science + computing ag # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/bin/scan_emailed_file.py b/bin/scan_emailed_file.py index fe8c217e..e7dbe068 100755 --- a/bin/scan_emailed_file.py +++ b/bin/scan_emailed_file.py @@ -7,7 +7,7 @@ # scan_emailed_file.py # ############################################################################### # # -# Copyright (C) 2016-2019 science + computing ag # +# Copyright (C) 2016-2020 science + computing ag # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/peekaboo.conf.sample b/peekaboo.conf.sample index a65b97dd..e55153ff 100644 --- a/peekaboo.conf.sample +++ b/peekaboo.conf.sample @@ -1,6 +1,6 @@ # # Peekaboo configuration file -# Copyright (C) 2016-2019 science + computing ag +# Copyright (C) 2016-2020 science + computing ag # diff --git a/peekaboo/__init__.py b/peekaboo/__init__.py index ea9872ef..4c03ca8a 100644 --- a/peekaboo/__init__.py +++ b/peekaboo/__init__.py @@ -5,7 +5,7 @@ # __init__.py # ############################################################################### # # -# Copyright (C) 2016-2019 science + computing ag # +# Copyright (C) 2016-2020 science + computing ag # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -25,12 +25,13 @@ """ Peekaboo constant module data. """ -VERSION = (1, 7) +VERSION = (2, '0rc1') __version__ = '.'.join(map(str, VERSION)) __author__ = 'Felix Bauer' __description__ = 'Peekaboo Extended Email Attachment Behavior Observation Owl' -__copyright__ = 'Copyright (C) 2016-2019 science + computing ag. All rights reserved.' +__copyright__ = ( + 'Copyright (C) 2016-2020 science + computing ag. All rights reserved.') __license__ = 'GPLv3' @@ -46,11 +47,11 @@ -*Xa_a_a_WUW##KUL_a_a_aX7' _aXUXUUU4UUX4XX444UUUUUUXLa, _UXXUXUXU47'!'!'!'!*X444U4UXX, - ?XU4U4'' _ _____ -'UUXUUi - ?4U4' / ||___ | 'UUXi - *Xi | | / / ?X7 - *L | |_ / / j7 - *a |_(_)_/ jY + ?XU4U4'' ____ ___-'UUXUUi + ?4U4' |___ \ / _ \ 'UUXi + *Xi __) || | | | ?X7 + *L / __/ | |_| | j7 + *a |_____(_)___/ jY -L, _/' 'l, _/' j7_a_; aaa/4 diff --git a/peekaboo/config.py b/peekaboo/config.py index 7b2683e0..56bd62cc 100644 --- a/peekaboo/config.py +++ b/peekaboo/config.py @@ -5,7 +5,7 @@ # config.py # ############################################################################### # # -# Copyright (C) 2016-2019 science + computing ag # +# Copyright (C) 2016-2020 science + computing ag # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/peekaboo/daemon.py b/peekaboo/daemon.py index 2235c3e8..d0ec8447 100644 --- a/peekaboo/daemon.py +++ b/peekaboo/daemon.py @@ -5,7 +5,7 @@ # daemon.py # ############################################################################### # # -# Copyright (C) 2016-2019 science + computing ag # +# Copyright (C) 2016-2020 science + computing ag # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/peekaboo/db.py b/peekaboo/db.py index 67b4ee68..8ea4d0d4 100644 --- a/peekaboo/db.py +++ b/peekaboo/db.py @@ -5,7 +5,7 @@ # db.py # ############################################################################### # # -# Copyright (C) 2016-2019 science + computing ag # +# Copyright (C) 2016-2020 science + computing ag # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/peekaboo/exceptions.py b/peekaboo/exceptions.py index 298cd213..6d9f319a 100644 --- a/peekaboo/exceptions.py +++ b/peekaboo/exceptions.py @@ -5,7 +5,7 @@ # exceptions.py # ############################################################################### # # -# Copyright (C) 2016-2019 science + computing ag # +# Copyright (C) 2016-2020 science + computing ag # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/peekaboo/locale/de/LC_MESSAGES/peekaboo.po b/peekaboo/locale/de/LC_MESSAGES/peekaboo.po index 460a01c9..8b5e1226 100644 --- a/peekaboo/locale/de/LC_MESSAGES/peekaboo.po +++ b/peekaboo/locale/de/LC_MESSAGES/peekaboo.po @@ -1,5 +1,5 @@ # Peekaboo translations of client-visible strings -# Copyright (C) 2019 science + computing ag +# Copyright (C) 2019-2020 science + computing ag # Michael Weiser # msgid "" diff --git a/peekaboo/queuing.py b/peekaboo/queuing.py index 4746fcf0..1b7b0392 100644 --- a/peekaboo/queuing.py +++ b/peekaboo/queuing.py @@ -5,7 +5,7 @@ # queuing.py # ############################################################################### # # -# Copyright (C) 2016-2019 science + computing ag # +# Copyright (C) 2016-2020 science + computing ag # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/peekaboo/ruleset/__init__.py b/peekaboo/ruleset/__init__.py index 7a49209a..11cee33f 100644 --- a/peekaboo/ruleset/__init__.py +++ b/peekaboo/ruleset/__init__.py @@ -6,7 +6,7 @@ # __init__.py # ############################################################################### # # -# Copyright (C) 2016-2019 science + computing ag # +# Copyright (C) 2016-2020 science + computing ag # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/peekaboo/ruleset/engine.py b/peekaboo/ruleset/engine.py index d673bc83..db24522e 100644 --- a/peekaboo/ruleset/engine.py +++ b/peekaboo/ruleset/engine.py @@ -6,7 +6,7 @@ # engine.py # ############################################################################### # # -# Copyright (C) 2016-2019 science + computing ag # +# Copyright (C) 2016-2020 science + computing ag # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/peekaboo/ruleset/expressions.py b/peekaboo/ruleset/expressions.py index 68d33333..3ec14ae3 100644 --- a/peekaboo/ruleset/expressions.py +++ b/peekaboo/ruleset/expressions.py @@ -6,7 +6,7 @@ # expressions.py # ############################################################################### # # -# Copyright (C) 2016-2019 science + computing ag # +# Copyright (C) 2016-2020 science + computing ag # # Based on pyparsing's eval_arith.py. # Copyright 2009, 2011 Paul McGuire # # diff --git a/peekaboo/ruleset/rules.py b/peekaboo/ruleset/rules.py index 9c8a9e03..4a9fbbda 100644 --- a/peekaboo/ruleset/rules.py +++ b/peekaboo/ruleset/rules.py @@ -6,7 +6,7 @@ # rules.py # ############################################################################### # # -# Copyright (C) 2016-2019 science + computing ag # +# Copyright (C) 2016-2020 science + computing ag # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/peekaboo/sample.py b/peekaboo/sample.py index 2f47146b..5889910b 100644 --- a/peekaboo/sample.py +++ b/peekaboo/sample.py @@ -5,7 +5,7 @@ # sample.py # ############################################################################### # # -# Copyright (C) 2016-2019 science + computing ag # +# Copyright (C) 2016-2020 science + computing ag # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/peekaboo/server.py b/peekaboo/server.py index e0a3e60b..bf39af90 100644 --- a/peekaboo/server.py +++ b/peekaboo/server.py @@ -5,7 +5,7 @@ # server.py # ############################################################################### # # -# Copyright (C) 2016-2019 science + computing ag # +# Copyright (C) 2016-2020 science + computing ag # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/peekaboo/toolbox/cuckoo.py b/peekaboo/toolbox/cuckoo.py index 47815bba..5388d028 100644 --- a/peekaboo/toolbox/cuckoo.py +++ b/peekaboo/toolbox/cuckoo.py @@ -6,7 +6,7 @@ # cuckoo.py # ############################################################################### # # -# Copyright (C) 2016-2019 science + computing ag # +# Copyright (C) 2016-2020 science + computing ag # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/peekaboo/toolbox/file.py b/peekaboo/toolbox/file.py index 0c6234c4..50707ec8 100644 --- a/peekaboo/toolbox/file.py +++ b/peekaboo/toolbox/file.py @@ -6,7 +6,7 @@ # files.py # ############################################################################### # # -# Copyright (C) 2016-2019 science + computing ag # +# Copyright (C) 2016-2020 science + computing ag # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/peekaboo/toolbox/ole.py b/peekaboo/toolbox/ole.py index 8f8a456b..afd5f42d 100644 --- a/peekaboo/toolbox/ole.py +++ b/peekaboo/toolbox/ole.py @@ -6,7 +6,7 @@ # ole.py # ############################################################################### # # -# Copyright (C) 2016-2019 science + computing ag # +# Copyright (C) 2016-2020 science + computing ag # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/peekaboo/toolbox/peekabooyar.py b/peekaboo/toolbox/peekabooyar.py index 4d3d4a3b..64c43fe6 100644 --- a/peekaboo/toolbox/peekabooyar.py +++ b/peekaboo/toolbox/peekabooyar.py @@ -6,7 +6,7 @@ # peekabooyar.py # ############################################################################### # # -# Copyright (C) 2016-2019 science + computing ag # +# Copyright (C) 2016-2020 science + computing ag # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/peekaboo_debug.py b/peekaboo_debug.py index 474b5b3e..8fac538e 100755 --- a/peekaboo_debug.py +++ b/peekaboo_debug.py @@ -7,7 +7,7 @@ # peekaboo_debug.py # ############################################################################### # # -# Copyright (C) 2016-2019 science + computing ag # +# Copyright (C) 2016-2020 science + computing ag # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/ruleset.conf.sample b/ruleset.conf.sample index e804b80e..56cd933e 100644 --- a/ruleset.conf.sample +++ b/ruleset.conf.sample @@ -1,6 +1,6 @@ # # Peekaboo ruleset configuration file -# Copyright (C) 2016-2019 science + computing ag +# Copyright (C) 2016-2020 science + computing ag # # list of rules to run on samples diff --git a/setup.py b/setup.py index 256a2e3e..43f95b2e 100755 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ # setup.py # ############################################################################### # # -# Copyright (C) 2016-2019 science + computing ag # +# Copyright (C) 2016-2020 science + computing ag # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/systemd/peekaboo.service b/systemd/peekaboo.service index 9d697b96..8e43a353 100644 --- a/systemd/peekaboo.service +++ b/systemd/peekaboo.service @@ -1,6 +1,6 @@ # # Peekaboo Extended Email Attachment Behavior Observation Owl -# Copyright (c) 2016-2019 science + computing ag. +# Copyright (c) 2016-2020 science + computing ag. # # Install as /etc/systemd/system/peekaboo.service # diff --git a/tests/test.py b/tests/test.py index b7f270cc..7241a847 100755 --- a/tests/test.py +++ b/tests/test.py @@ -7,7 +7,7 @@ # test.py # ############################################################################### # # -# Copyright (C) 2016-2019 science + computing ag # +# Copyright (C) 2016-2020 science + computing ag # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by #