WL#16350: Update dnspython version

oscpache · oscpache · commit 30cdc6906e5a · 2024-05-13T13:50:22.000-06:00
Classic and XDevAPI connectors can be installed optionally with all the 3rd-party packages required by the dns-srv feature. The dnspython package is part of these 3rd-party requirements; however, the current installable versions of this package are unsecured - they are hit by the vulnerability `NVD CVE-2023-29483`. This work log updates the version range such that secure versions of dnspython are installable when exercising the dns-srv installation option. Change-Id: I14e895ac286b11da7a3ad550465926b363fac7f4
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -11,6 +11,7 @@ Full release notes:
 v9.0.0
 ======
 
+- WL#16350: Update dnspython version
 - BUG#36476195: Incorrect escaping in pure Python mode if sql_mode includes NO_BACKSLASH_ESCAPES
 
 v8.4.0
diff --git a/mysql-connector-python/cpydist/data/deb/control b/mysql-connector-python/cpydist/data/deb/control
@@ -15,7 +15,7 @@ Depends:
  ${python3-protobuf:Depends}
 Replaces: mysql-connector-python-cext-py3 (<< 8.0.22)
 Breaks: mysql-connector-python-cext-py3 (<< 8.0.22)
-Recommends: python3-dnspython (>= 1.16.0)
+Suggests: python3-dnspython (= 2.6.1)
 Conflicts: python3-mysql.connector, mysql-connector-python-commercial-py3
 Description: MySQL database driver written in pure Python 3
  @LICENSE@
diff --git a/mysql-connector-python/cpydist/data/rpm/mysql-connector-python.spec b/mysql-connector-python/cpydist/data/rpm/mysql-connector-python.spec
@@ -26,7 +26,7 @@
 # along with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
-%global wants_py_dnspython_version 1.16.0
+%global wants_py_dnspython_version 2.6.1
 
 %undefine _package_note_file
 
diff --git a/mysql-connector-python/setup.py b/mysql-connector-python/setup.py
@@ -131,7 +131,7 @@ def main() -> None:
         cmdclass=COMMAND_CLASSES,
         python_requires=">=3.8",
         extras_require={
-            "dns-srv": ["dnspython>=1.16.0,<=2.3.0"],
+            "dns-srv": ["dnspython==2.6.1"],
             "gssapi": ["gssapi>=1.6.9,<=1.8.2"],
             "opentelemetry": [
                 "Deprecated>=1.2.6",
diff --git a/mysqlx-connector-python/cpydist/data/deb/control b/mysqlx-connector-python/cpydist/data/deb/control
@@ -15,7 +15,7 @@ Depends:
  ${python3-protobuf:Depends}
 Replaces: mysqlx-connector-python-cext-py3 (<< 8.0.22)
 Breaks: mysqlx-connector-python-cext-py3 (<< 8.0.22)
-Recommends: python3-dnspython (>= 1.16.0)
+Suggests: python3-dnspython (= 2.6.1)
 Conflicts: mysqlx-connector-python-commercial-py3
 Description: MySQL database driver written in pure Python 3
  @LICENSE@
diff --git a/mysqlx-connector-python/cpydist/data/rpm/mysql-connector-python.spec b/mysqlx-connector-python/cpydist/data/rpm/mysql-connector-python.spec
@@ -26,7 +26,7 @@
 # along with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
-%global wants_py_dnspython_version 1.16.0
+%global wants_py_dnspython_version 2.6.1
 
 %undefine _package_note_file
 
diff --git a/mysqlx-connector-python/setup.py b/mysqlx-connector-python/setup.py
@@ -143,7 +143,7 @@ def main() -> None:
         python_requires=">=3.8",
         install_requires=["protobuf>=4.21.1,<=4.21.12"],
         extras_require={
-            "dns-srv": ["dnspython>=1.16.0,<=2.3.0"],
+            "dns-srv": ["dnspython==2.6.1"],
             "compression": ["lz4>=2.1.6,<=4.3.2", "zstandard>=0.12.0,<=0.19.0"],
         },
     )

Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ def main() -> None:`
`143`	`143`	`python_requires=">=3.8",`
`144`	`144`	`install_requires=["protobuf>=4.21.1,<=4.21.12"],`
`145`	`145`	`extras_require={`
`146`		`- "dns-srv": ["dnspython>=1.16.0,<=2.3.0"],`
	`146`	`+ "dns-srv": ["dnspython==2.6.1"],`
`147`	`147`	`"compression": ["lz4>=2.1.6,<=4.3.2", "zstandard>=0.12.0,<=0.19.0"],`
`148`	`148`	`},`
`149`	`149`	`)`