Merge pull request #315 from clausing/main

[20251103-000] fix 3.12 deprecation warning for datetime.utcnow()

Author: jullrich

srv/dshield/fwlogparser.py

@@ -11,7 +11,7 @@
 from time import strptime
 from time import mktime
 from time import time
-from datetime import datetime
+from datetime import datetime, timezone
 from DShield import DshieldSubmit
 
 maxlines=100000;
@@ -105,7 +105,10 @@ def checklock(lockfile):
 lastdir="/var/tmp/dshield/"
 config = "/etc/dshield.ini"
 startdate = 0
-now = datetime.utcnow()
+if sys.version_info < (3, 12):
+    now = datetime.utcnow()
+else:
+    now = datetime.now(timezone.utc)
 fieldmap = {'SRC': 'sip', 'DST': 'dip', 'PROTO': 'proto', 'TYPE': 'sport',
             'CODE': 'dport', 'SPT': 'sport', 'DPT': 'dport'}
 protomap = {'ICMP': 1, 'IGMP': 2, 'TCP': 6, 'UDP': 17, 'ESP': 50, 'AH': 51, 'ICMPv6': 58}