diff --git a/anaconda.spec b/anaconda.spec index 0b93797fb857a8e7a212159d51c261103ae8f92d..c55518d51cf6d42788e508af2dee980294d356a4 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -3,7 +3,7 @@ Name: anaconda Version: 29.24.7 -Release: 25 +Release: 26 Summary: Graphical system installer License: GPLv2+ and MIT URL: https://fedoraproject.org/wiki/Anaconda @@ -47,6 +47,7 @@ Patch9029: anaconda-skip-checks-if-no-username-is-set.patch Patch9030: anaconda-modify-openeuler-in-welcome-to-lowercase.patch Patch9031: bugfix-setup-fail-in-decode.patch Patch9032: anaconda-modify-default-timezone-and-zh_CN_po.patch +Patch9033: bugfix-modify-network-hostname-dot-illegal.patch BuildRequires: audit-libs-devel libtool gettext-devel >= 0.19.8 gtk3-devel >= 3.22.17 BuildRequires: gtk-doc gtk3-devel-docs >= 3.22.17 glib2-doc gobject-introspection-devel @@ -219,6 +220,12 @@ update-desktop-database &> /dev/null || : %{_datadir}/gtk-doc %changelog +* Thu Feb 06 2020 openEuler Buildteam - 29.24.7-26 +- Type:bugfix +- Id:NA +- SUG:NA +- DESC:modify network hostname dot error + * Thu Jan 16 2020 openEuler Buildteam - 29.24.7-25 - Type:bugfix - Id:NA diff --git a/bugfix-modify-network-hostname-dot-illegal.patch b/bugfix-modify-network-hostname-dot-illegal.patch new file mode 100644 index 0000000000000000000000000000000000000000..a0bedd5d77e71571222fc05be1294d501fd0b27e --- /dev/null +++ b/bugfix-modify-network-hostname-dot-illegal.patch @@ -0,0 +1,38 @@ +From 1ce4ab95a64e64b7b4eab52c2172149816900572 Mon Sep 17 00:00:00 2001 +Date: Thu, 6 Feb 2020 12:08:08 +0800 +Subject: [PATCH] modify network hostname dot illegal + +--- + anaconda-29.24.7/pyanaconda/core/regexes.py | 2 +- + anaconda-29.24.7/pyanaconda/network.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pyanaconda/core/regexes.py b/pyanaconda/core/regexes.py +index 1f1da07..544d40e 100644 +--- a/pyanaconda/core/regexes.py ++++ b/pyanaconda/core/regexes.py +@@ -103,7 +103,7 @@ IPV4_NETMASK_WITH_ANCHORS = re.compile("^" + IPV4_NETMASK_WITHOUT_ANCHORS + "$") + # with a period, but it can end with one. + # This regex uses negative lookahead and lookback assertions to enforce the + # hyphen rules and make it way more confusing +-HOSTNAME_PATTERN_WITHOUT_ANCHORS = r'(?:(?!-)[A-Za-z0-9-]{1,63}(?