Merge branch 'main' into add-management-commands

Author: furlongm

debian/copyright

@@ -6,7 +6,7 @@ Source: https://github.com/furlongm/patchman
 Files: *
 Copyright: 2011-2012 VPAC http://www.vpac.org
            2013-2021 Marcus Furlong <[email protected]>
-License: GPL-3.0
+License: GPL-3.0-only
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation; version 3 only.

hosts/templatetags/report_alert.py

@@ -1,19 +1,18 @@
-# Copyright 2016-2021 Marcus Furlong <[email protected]>
+# Copyright 2016-2025 Marcus Furlong <[email protected]>
 #
 # This file is part of Patchman.
 #
 # Patchman is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation, version 3 only.
 #
 # Patchman is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Patchman  If not, see <http://www.gnu.org/licenses/>.
+# along with Patchman. If not, see <http://www.gnu.org/licenses/>
 
 from datetime import timedelta
 

modules/utils.py

@@ -23,7 +23,7 @@
 
 def get_or_create_module(name, stream, version, context, arch, repo):
     """ Get or create a module object
-        Returns the module and a boolean for created
+        Returns the module
     """
     created = False
     m_arch, c = PackageArchitecture.objects.get_or_create(name=arch)
@@ -46,7 +46,7 @@ def get_or_create_module(name, stream, version, context, arch, repo):
             arch=m_arch,
             repo=repo,
         )
-    return module, created
+    return module
 
 
 def get_matching_modules(name, stream, version, context, arch):

packages/models.py

@@ -195,11 +195,11 @@ def __str__(self):
             rel = f'-{self.release}'
         else:
             rel = ''
-        if self.packagetype == self.GENTOO:
+        if self.packagetype == Package.GENTOO:
             return f'{self.category}/{self.name}-{epo}{self.version}{rel}-{self.arch}.{self.get_packagetype_display()}'
-        elif self.packagetype in [self.DEB, self.ARCH]:
+        elif self.packagetype in [Package.DEB, Package.ARCH]:
             return f'{self.name}_{epo}{self.version}{rel}_{self.arch}.{self.get_packagetype_display()}'
-        elif self.packagetype == self.RPM:
+        elif self.packagetype == Package.RPM:
             return f'{self.name}-{epo}{self.version}{rel}-{self.arch}.{self.get_packagetype_display()}'
         else:
             return f'{self.name}-{epo}{self.version}{rel}-{self.arch}.{self.get_packagetype_display()}'

repos/repo_types/yum.py

@@ -91,7 +91,7 @@ def extract_module_metadata(data, url, repo):
                 packages.add(package)
 
             from modules.utils import get_or_create_module
-            module, created = get_or_create_module(m_name, m_stream, m_version, m_context, arch, repo)
+            module = get_or_create_module(m_name, m_stream, m_version, m_context, arch, repo)
 
             package_ids = []
             for package in packages:

requirements.txt

@@ -1,12 +1,11 @@
-Django==4.2.20
+Django==4.2.25
 django-taggit==4.0.0
 django-extensions==3.2.3
 django-bootstrap3==23.1
 python-debian==1.0.1
 defusedxml==0.7.1
 PyYAML==6.0.2
-chardet==5.2.0
-requests==2.32.3
+requests==2.32.4
 colorama==0.4.6
 djangorestframework==3.15.2
 django-filter==25.1
@@ -16,7 +15,7 @@ python-magic==0.4.27
 gitpython==3.1.44
 tenacity==8.2.3
 celery==5.4.0
-redis==5.2.1
+redis==6.4.0
 django-celery-beat==2.7.0
 tqdm==4.67.1
 cvss==3.4

setup.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright 2013-2021 Marcus Furlong <[email protected]>
+# Copyright 2013-2025 Marcus Furlong <[email protected]>
 #
 # This file is part of Patchman.
 #

util/__init__.py

@@ -20,6 +20,7 @@
 import magic
 import zlib
 import lzma
+import os
 from datetime import datetime, timezone
 from enum import Enum
 from hashlib import md5, sha1, sha256, sha512
@@ -28,17 +29,23 @@
 from time import time
 from tqdm import tqdm
 
-from patchman.signals import error_message, info_message, debug_message
-
 from django.utils.timezone import make_aware
 from django.utils.dateparse import parse_datetime
 from django.conf import settings
 
+from patchman.signals import error_message, info_message, debug_message
 
 pbar = None
 verbose = None
 Checksum = Enum('Checksum', 'md5 sha sha1 sha256 sha512')
 
+http_proxy = os.getenv('http_proxy')
+https_proxy = os.getenv('https_proxy')
+proxies = {
+   'http': http_proxy,
+   'https': https_proxy,
+}
+
 
 def get_verbosity():
     """ Get the global verbosity level
@@ -113,7 +120,7 @@ def get_url(url, headers={}, params={}):
     response = None
     try:
         debug_message.send(sender=None, text=f'Trying {url} headers:{headers} params:{params}')
-        response = requests.get(url, headers=headers, params=params, stream=True, timeout=30)
+        response = requests.get(url, headers=headers, params=params, stream=True, proxies=proxies, timeout=30)
         debug_message.send(sender=None, text=f'{response.status_code}: {response.headers}')
         if response.status_code in [403, 404]:
             return response

util/filterspecs.py

@@ -1,20 +1,19 @@
 # Copyright 2010 VPAC
-# Copyright 2014-2021 Marcus Furlong <[email protected]>
+# Copyright 2014-2025 Marcus Furlong <[email protected]>
 #
 # This file is part of Patchman.
 #
 # Patchman is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation, version 3 only.
 #
 # Patchman is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Patchman  If not, see <http://www.gnu.org/licenses/>.
+# along with Patchman. If not, see <http://www.gnu.org/licenses/>
 
 from django.utils.safestring import mark_safe
 from django.db.models.query import QuerySet

util/templatetags/common.py

@@ -1,20 +1,18 @@
-# Copyright 2010 VPAC
-# Copyright 2013-2021 Marcus Furlong <[email protected]>
+# Copyright 2013-2025 Marcus Furlong <[email protected]>
 #
 # This file is part of Patchman.
 #
 # Patchman is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation, version 3 only.
 #
 # Patchman is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Patchman  If not, see <http://www.gnu.org/licenses/>.
+# along with Patchman. If not, see <http://www.gnu.org/licenses/>
 
 import re