public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/cinnamon] rawhide: Remove commented-out Patch1 and dead patch file
@ 2026-07-26 14:03 Michal Schorm
  0 siblings, 0 replies; only message in thread
From: Michal Schorm @ 2026-07-26 14:03 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/cinnamon
            Branch : rawhide
            Commit : e6bdd4f18d675a1f8b849f064c4d3c134523250d
            Author : Michal Schorm <mschorm@redhat.com>
            Date   : 2026-07-26T15:44:04+02:00
            Stats  : +3/-34 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/cinnamon/c/e6bdd4f18d675a1f8b849f064c4d3c134523250d?branch=rawhide

            Log:
            Remove commented-out Patch1 and dead patch file

'revert_25aef37.patch' reverted upstream commit 25aef37 which
tightened username and group name validation in
'cinnamon-settings-users.py' to reject uppercase characters
(fixing upstream issue #3461):
https://github.com/linuxmint/cinnamon/commit/25aef37f2767b64bf9c29ead78f7c2856e75779f

The patch was a Fedora-only carry that relaxed that validation
back to spaces-only checks. It was:
- Added in 2014 (commit f15ce0b, Cinnamon 2.4.x era)
- Active through Cinnamon 5.0.0 (commit a0697cc, 2021-06-07)
- Commented out in Cinnamon 5.0.3 (commit fa806b8, 2021-06-25)
- Dead since then — over 4 years, through 10+ major versions

The patch targeted 'Cinnamon-3.6.6' paths and would not apply to
the current 6.7.x source in any case. Current upstream retains
the strict validation (uppercase + special character rejection):
https://github.com/linuxmint/cinnamon/blob/6.7.4-unstable/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py#L84-L89
https://github.com/linuxmint/cinnamon/blob/6.7.4-unstable/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py#L403-L406

The strict validation is correct behavior — 'adduser' rejects
uppercase usernames, so the UI should too.

Renumber remaining patches to close the gap.

Co-Authored-By: Claude AI <noreply@anthropic.com>

---
diff --git a/cinnamon.spec b/cinnamon.spec
index 73f3450..c155e35 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -21,10 +21,9 @@ Source2:        10_cinnamon-apps.gschema.override.in
 Source3:        22_fedora.styles
 
 Patch0:         set_wheel.patch
-#Patch1:         revert_25aef37.patch
-Patch2:         default_panal_launcher.patch
-Patch3:         remove_crap_from_menu.patch
-Patch4:         set_menu_defaults.patch
+Patch1:         default_panal_launcher.patch
+Patch2:         remove_crap_from_menu.patch
+Patch3:         set_menu_defaults.patch
 
 ExcludeArch:    %{ix86}
 

diff --git a/revert_25aef37.patch b/revert_25aef37.patch
deleted file mode 100644
index 6934ac8..0000000
--- a/revert_25aef37.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: Cinnamon-3.6.6/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
-===================================================================
---- Cinnamon-3.6.6.orig/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
-+++ Cinnamon-3.6.6/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
-@@ -53,10 +53,9 @@
-             print(detail)
- 
-     def _on_entry_changed(self, entry):
--        name = entry.get_text()
--        if " " in name or name.lower() != name:
-+        if " " in entry.get_text():
-             entry.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, "dialog-warning-symbolic")
--            entry.set_icon_tooltip_text(Gtk.EntryIconPosition.SECONDARY, _("The group name cannot contain upper-case or space characters"))
-+            entry.set_icon_tooltip_text(Gtk.EntryIconPosition.SECONDARY, _("The group name cannot contain space characters"))
-             self.set_response_sensitive(Gtk.ResponseType.OK, False)
-         else:
-             entry.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, None)
-@@ -405,9 +405,9 @@
-         fullname = self.realname_entry.get_text()
-         username = self.username_entry.get_text()
-         valid = True
--        if re.search('[^a-z0-9_.-]', username):
-+        if " " in username:
-             self.username_entry.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, "dialog-warning-symbolic")
--            self.username_entry.set_icon_tooltip_text(Gtk.EntryIconPosition.SECONDARY, _("Invalid username"))
-+            self.username_entry.set_icon_tooltip_text(Gtk.EntryIconPosition.SECONDARY, _("The username cannot contain space characters"))
-             valid = False
-         elif self.user_exists(username):
-             self.username_entry.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, "dialog-warning-symbolic")
-

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-07-26 14:03 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-26 14:03 [rpms/cinnamon] rawhide: Remove commented-out Patch1 and dead patch file Michal Schorm

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox