Skip to content

Commit

Permalink
Merge pull request #145 from michaelweiser/v2.0-rc1
Browse files Browse the repository at this point in the history 
First 2.0 release candidate
  • Loading branch information
@michaelweiser
michaelweiser authored Mar 19, 2020
2 parents 9796b4b + 67052c2 commit 29fac39
Show file tree
Hide file tree
Showing 28 changed files with 36 additions and 35 deletions.
2 changes: 1 addition & 1 deletion amavis/10-ask_peekaboo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 #
Expand Down
2 changes: 1 addition & 1 deletion bin/dummy_cuckoo.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 #
Expand Down
2 changes: 1 addition & 1 deletion bin/dummy_cuckoo_submit.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 #
Expand Down
2 changes: 1 addition & 1 deletion bin/peekaboo-util.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 #
Expand Down
2 changes: 1 addition & 1 deletion bin/scan_emailed_file.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 #
Expand Down
2 changes: 1 addition & 1 deletion peekaboo.conf.sample
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Peekaboo configuration file
# Copyright (C) 2016-2019 science + computing ag
# Copyright (C) 2016-2020 science + computing ag
#


Expand Down
17 changes: 9 additions & 8 deletions peekaboo/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 #
Expand All @@ -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'


Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion peekaboo/config.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 #
Expand Down
2 changes: 1 addition & 1 deletion peekaboo/daemon.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 #
Expand Down
2 changes: 1 addition & 1 deletion peekaboo/db.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 #
Expand Down
2 changes: 1 addition & 1 deletion peekaboo/exceptions.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 #
Expand Down
2 changes: 1 addition & 1 deletion peekaboo/locale/de/LC_MESSAGES/peekaboo.po
View file
Original file line number Diff line number Diff line change
@@ -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 <michael.weiser@gmx.de>
#
msgid ""
Expand Down
2 changes: 1 addition & 1 deletion peekaboo/queuing.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 #
Expand Down
2 changes: 1 addition & 1 deletion peekaboo/ruleset/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 #
Expand Down
2 changes: 1 addition & 1 deletion peekaboo/ruleset/engine.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 #
Expand Down
2 changes: 1 addition & 1 deletion peekaboo/ruleset/expressions.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
# #
Expand Down
2 changes: 1 addition & 1 deletion peekaboo/ruleset/rules.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 #
Expand Down
2 changes: 1 addition & 1 deletion peekaboo/sample.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 #
Expand Down
2 changes: 1 addition & 1 deletion peekaboo/server.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 #
Expand Down
2 changes: 1 addition & 1 deletion peekaboo/toolbox/cuckoo.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 #
Expand Down
2 changes: 1 addition & 1 deletion peekaboo/toolbox/file.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 #
Expand Down
2 changes: 1 addition & 1 deletion peekaboo/toolbox/ole.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 #
Expand Down
2 changes: 1 addition & 1 deletion peekaboo/toolbox/peekabooyar.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 #
Expand Down
2 changes: 1 addition & 1 deletion peekaboo_debug.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 #
Expand Down
2 changes: 1 addition & 1 deletion ruleset.conf.sample
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 #
Expand Down
2 changes: 1 addition & 1 deletion systemd/peekaboo.service
View file
Original file line number Diff line number Diff line change
@@ -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
#
Expand Down
2 changes: 1 addition & 1 deletion tests/test.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 #
Expand Down

0 comments on commit 29fac39

Please sign in to comment.