From cc98b4d325e504f4259ae9e6719bd8d153df5e53 Mon Sep 17 00:00:00 2001 From: byeX012 Date: Tue, 17 Dec 2019 18:04:31 +0800 Subject: [PATCH] add openeuler pam config --- 6000-add-openeuler-pam-config.patch | 11 +++++++++++ gdm.spec | 7 ++++--- 2 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 6000-add-openeuler-pam-config.patch diff --git a/6000-add-openeuler-pam-config.patch b/6000-add-openeuler-pam-config.patch new file mode 100644 index 0000000..729208f --- /dev/null +++ b/6000-add-openeuler-pam-config.patch @@ -0,0 +1,11 @@ +diff -ru gdm-3.30.1-origin/configure.ac gdm-3.30.1/configure.ac +--- gdm-3.30.1-origin/configure.ac 2019-12-17 15:33:13.656357443 +0800 ++++ gdm-3.30.1/configure.ac 2019-12-17 17:19:34.848463487 +0800 +@@ -200,6 +200,7 @@ + AS_HELP_STRING([--with-default-pam-config: One of redhat, openembedded, exherbo, lfs, arch, none @<:@default=auto@:>@])) + dnl If not given, try autodetecting from release files (see NetworkManager source) + if test x$with_default_pam_config = x; then ++ AC_CHECK_FILE(/etc/openEuler-release,with_default_pam_config="redhat") + AC_CHECK_FILE(/etc/redhat-release,with_default_pam_config="redhat") + AC_CHECK_FILE(/etc/fedora-release,with_default_pam_config="redhat") + AC_CHECK_FILE(/etc/exherbo-release,with_default_pam_config="exherbo") diff --git a/gdm.spec b/gdm.spec index 18e6029..2c1582f 100644 --- a/gdm.spec +++ b/gdm.spec @@ -13,6 +13,7 @@ Patch0002: 0001-manager-correct-display-confusion.patch Patch0003: 0001-local-display-factory-defer-initialization-for-CanGr.patch Patch0004: 0001-manager-do-initial-setup-post-work-in-manager-code.patch Patch0005: system-dconf.patch +Patch6000: 6000-add-openeuler-pam-config.patch BuildRequires: pam-devel >= 0:0.99.8.1-11 desktop-file-utils >= 0.2.90 BuildRequires: libtool automake autoconf libattr-devel gettext-devel libdmx-devel @@ -32,7 +33,7 @@ Requires(postun): systemd Requires: accountsservice audit-libs >= 1.0.6 dconf gnome-keyring-pam gnome-session Requires: gnome-session-wayland-session gnome-settings-daemon >= 3.27.90 gnome-shell iso-codes Requires: libXau >= 1.0.4-4 pam >= 0:0.99.8.1-11 util-linux setxkbmap systemd >= 186 -Requires: system-logos xorg-x11-server-utils xorg-x11-xinit +Requires: system-logos xorg-x11-server-utils xorg-x11-xinit pam-devel Provides: service(graphical-login) = %{name} Provides: gdm-libs%{?_isa} = %{epoch}:%{version}-%{release} @@ -69,7 +70,7 @@ autoreconf -if %configure --with-pam-prefix=%{_sysconfdir} --with-run-dir=/run/gdm \ --with-default-path=/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin \ --enable-split-authentication --enable-profiling --enable-console-helper \ - --with-selinux --with-default-pam-config=arch + --with-selinux sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool sed -i -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool @@ -172,5 +173,5 @@ fi %{_libdir}/pkgconfig/*.pc %changelog -* Wed Nov 23 2019 Jiangping Hu - 1:3.30.1-3 +* Tue Dec 17 2019 Jiangping Hu - 1:3.30.1-3 - Package init