diff --git a/gnome-control-center-remove-password-options.patch b/gnome-control-center-remove-password-options.patch new file mode 100644 index 0000000..45a0007 --- /dev/null +++ b/gnome-control-center-remove-password-options.patch @@ -0,0 +1,37 @@ +From b6eae4c79add7d231ebcd776b0f80340773d4acd Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro +Date: Sat, 20 Apr 2013 10:54:47 -0500 +Subject: [PATCH] Remove password options + +* Choose password at next login +* Login without password + +We want to put these back, but for now they don't work + +bnc#779408 +--- + panels/user-accounts/data/password-dialog.ui | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/panels/user-accounts/data/password-dialog.ui b/panels/user-accounts/data/password-dialog.ui +index 81de04f..44dceaa 100644 +--- a/panels/user-accounts/data/password-dialog.ui ++++ b/panels/user-accounts/data/password-dialog.ui +@@ -15,14 +15,6 @@ + 0 + + +- Choose password at next login +- 1 +- +- +- Log in without a password +- 2 +- +- + Disable this account + 3 + +-- +1.8.1.4 + diff --git a/gnome-control-center.changes b/gnome-control-center.changes index c41041a..5764c04 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Apr 20 16:58:44 UTC 2013 - mike.catanzaro@gmail.com + +- Add gnome-control-center-remove-password-options.patch - users + will get locked out of their computers if they try to + 'Choose password at next login' or 'Login without password' + since these conflict with our PAM configuration (bnc#779408) + ------------------------------------------------------------------- Tue Apr 16 11:29:14 UTC 2013 - dimstar@opensuse.org diff --git a/gnome-control-center.spec b/gnome-control-center.spec index 918fb89..4ae5f49 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -34,6 +34,8 @@ Url: http://www.gnome.org Source: http://download.gnome.org/sources/gnome-control-center/3.8/%{name}-%{version}.tar.xz # PATCH-FEATURE-OPENSUSE gnome-control-center-allow-yast-in-shell.patch vuntz@opensuse.org -- Allow the launch of the yast shell from the g-c-c shell; it's quite ugly, but on the other hand, we don't want to change the behavior of the shell except for yast... Patch0: gnome-control-center-allow-yast-in-shell.patch +# PATCH-HACK-OPENSUSE gnome-control-center-remove-password-options.patch bnc#779408 mike.catanzaro@gmail.com -- users: Remove login options that don't work on openSUSE (leading to user being locked out of his system) +Patch1: gnome-control-center-remove-password-options.patch # PATCH-NEEDS-REBASE PATCH-HACK-OPENSUSE gnome-control-center-hide-region-system-tab.patch vuntz@opensuse.org -- Hide system tab in region panel until we really use the right files for system settings (see bnc#703833) Patch2: gnome-control-center-hide-region-system-tab.patch # PATCH-FIX-UPSTREAM gnome-control-center-fine-grained-tz-polkit.patch bgo#646185 bnc#749453 vuntz@opensuse.org -- Allow changing timezone without requiring privileges to change time @@ -158,6 +160,7 @@ various aspects of your desktop. %setup -q translation-update-upstream %patch0 -p1 +%patch1 -p1 #Needs rebase #patch2 -p1 %patch3 -p1