diff --git a/common/shlibs b/common/shlibs index 929988a99bc..1edb649e61d 100644 --- a/common/shlibs +++ b/common/shlibs @@ -521,6 +521,7 @@ libkrb5support.so.0 mit-krb5-libs-1.8_1 libverto.so.0 mit-krb5-libs-1.8_1 libverto-k5ev.so.0 mit-krb5-libs-1.8_1 libmenu-cache.so.1 menu-cache-0.2.6_1 +libupower-glib.so.1 libupower-glib1-0.9.23_4 libupower-glib.so.2 libupower-glib2-0.99.0_2 libcanberra.so.0 libcanberra-0.23_1 libcanberra-gtk.so.0 libcanberra-0.23_1 diff --git a/srcpkgs/gdm/files/gdm-autologin.pam b/srcpkgs/gdm/files/gdm-autologin.pam index ba621cfd960..fd3aa09a57b 100644 --- a/srcpkgs/gdm/files/gdm-autologin.pam +++ b/srcpkgs/gdm/files/gdm-autologin.pam @@ -14,6 +14,7 @@ password required pam_deny.so session required pam_loginuid.so session optional pam_keyinit.so revoke session optional pam_gnome_keyring.so -session optional pam_systemd.so +-session optional pam_systemd.so +-session optional pam_ck_connector.so nox11 session required pam_unix.so session required pam_limits.so diff --git a/srcpkgs/gdm/files/gdm-fingerprint.pam b/srcpkgs/gdm/files/gdm-fingerprint.pam index ac8be3eee63..7349ca52c4f 100644 --- a/srcpkgs/gdm/files/gdm-fingerprint.pam +++ b/srcpkgs/gdm/files/gdm-fingerprint.pam @@ -14,6 +14,7 @@ password required pam_deny.so session required pam_loginuid.so session optional pam_keyinit.so revoke session optional pam_gnome_keyring.so -session optional pam_systemd.so +-session optional pam_systemd.so +-session optional pam_ck_connector.so nox11 session required pam_unix.so session required pam_limits.so diff --git a/srcpkgs/gdm/files/gdm-launch-environment.pam b/srcpkgs/gdm/files/gdm-launch-environment.pam index d8a03845c78..3ec5e94e957 100644 --- a/srcpkgs/gdm/files/gdm-launch-environment.pam +++ b/srcpkgs/gdm/files/gdm-launch-environment.pam @@ -9,5 +9,6 @@ password required pam_deny.so session required pam_loginuid.so session optional pam_gnome_keyring.so -session optional pam_systemd.so +-session optional pam_systemd.so +-session optional pam_ck_connector.so nox11 session optional pam_keyinit.so force revoke diff --git a/srcpkgs/gdm/files/gdm-password.pam b/srcpkgs/gdm/files/gdm-password.pam index 00e5d3c9870..f8cc9fd2730 100644 --- a/srcpkgs/gdm/files/gdm-password.pam +++ b/srcpkgs/gdm/files/gdm-password.pam @@ -16,5 +16,6 @@ session required pam_loginuid.so session optional pam_keyinit.so revoke session required pam_unix.so session required pam_limits.so -session optional pam_gnome_keyring.so auto_start -session optional pam_systemd.so +-session optional pam_gnome_keyring.so auto_start +-session optional pam_systemd.so +-session optional pam_ck_connector.so nox11 diff --git a/srcpkgs/gdm/files/gdm-smartcard.pam b/srcpkgs/gdm/files/gdm-smartcard.pam index dec63a4660e..9b0a0bbec72 100644 --- a/srcpkgs/gdm/files/gdm-smartcard.pam +++ b/srcpkgs/gdm/files/gdm-smartcard.pam @@ -13,7 +13,8 @@ password required pam_pkcs11.so session required pam_loginuid.so session optional pam_keyinit.so revoke -session optional pam_gnome_keyring.so -session optional pam_systemd.so +-session optional pam_gnome_keyring.so +-session optional pam_systemd.so +-session optional pam_ck_connector.so nox11 session required pam_unix.so session required pam_limits.so diff --git a/srcpkgs/gdm/files/gdm.pam b/srcpkgs/gdm/files/gdm.pam index 37a72c0e336..fc5f005ed7d 100644 --- a/srcpkgs/gdm/files/gdm.pam +++ b/srcpkgs/gdm/files/gdm.pam @@ -5,7 +5,8 @@ auth required pam_unix.so auth optional pam_gnome_keyring.so account required pam_unix.so session required pam_unix.so -session optional pam_gnome_keyring.so auto_start -session optional pam_systemd.so +-session optional pam_gnome_keyring.so auto_start +-session optional pam_systemd.so +-session optional pam_ck_connector.so nox11 session required pam_limits.so password required pam_unix.so diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template index db42ed7009a..81185ae99bb 100644 --- a/srcpkgs/gdm/template +++ b/srcpkgs/gdm/template @@ -1,7 +1,7 @@ # Template file for 'gdm' pkgname=gdm version=3.12.2 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-schemas-compile --disable-static --with-at-spi-registryd-directory=/usr/libexec --without-tcp-wrappers @@ -9,8 +9,9 @@ configure_args="--disable-schemas-compile --disable-static --with-xauth-dir=/run/gdm --with-pid-file=/run/gdm/gdm.pid --with-systemdsystemunitdir=/usr/lib/systemd/system" hostmakedepends="pkg-config itstool intltool which gnome-doc-utils" -makedepends="pam-devel nss-devel accountsservice-devel gtk+3-devel>=3.10 upower-devel - libcanberra-devel xrdb dconf>=0.20 hicolor-icon-theme +makedepends=" + pam-devel nss-devel accountsservice-devel gtk+3-devel>=3.10 upower-devel + libSM-devel libcanberra-devel xrdb dconf>=0.20 hicolor-icon-theme xorg-server gnome-session>=3.12 gnome-settings-daemon>=3.12" conf_files=" /etc/gdm/custom.conf @@ -50,10 +51,10 @@ else fi if [ "$build_option_systemd" ]; then - configure_args+=" --enable-systemd --with-initial-vt=1" + configure_args+=" --with-systemd --enable-systemd-journal --with-initial-vt=1" makedepends+=" systemd-devel" else - configure_args+=" --disable-systemd --with-initial-vt=7" + configure_args+=" --without-systemd --disable-systemd-journal --with-initial-vt=7" fi post_install() { diff --git a/srcpkgs/libupower-glib1 b/srcpkgs/libupower-glib1 new file mode 120000 index 00000000000..b20547cf957 --- /dev/null +++ b/srcpkgs/libupower-glib1 @@ -0,0 +1 @@ +upower0 \ No newline at end of file diff --git a/srcpkgs/upower0/template b/srcpkgs/upower0/template index 0ebf2d0d802..11b94532ba5 100644 --- a/srcpkgs/upower0/template +++ b/srcpkgs/upower0/template @@ -1,7 +1,7 @@ # Template file for 'upower0' pkgname=upower0 version=0.9.23 -revision=3 +revision=4 wrksrc="upower-${version}" build_style=gnu-configure configure_args="--disable-static --enable-deprecated --with-backend=linux --without-idevice --with-udevrulesdir=/usr/lib/udev/rules.d" @@ -39,6 +39,14 @@ pre_configure() { sed -e 's,/usr/sbin,/usr/bin,g' -i src/linux/up-backend.c } +libupower-glib1_package() { + replaces="upower0<0.9.23_4" + short_desc+=" - runtime library" + pkg_install() { + vmove usr/lib/*.so.* + } +} + upower0-devel_package() { provides="upower-devel-${version}_${revision}" replaces="upower-devel>=0"