FreeBSD Bugzilla – Attachment 193236 Details for
Bug 228116
[patch] x11/sddm: consolekit + PAM support
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
patch
sddm.patch (text/plain), 9.14 KB, created by
Tijl Coosemans
on 2018-05-10 15:28:28 UTC
(
hide
)
Description:
patch
Filename:
MIME Type:
Creator:
Tijl Coosemans
Created:
2018-05-10 15:28:28 UTC
Size:
9.14 KB
patch
obsolete
>Index: x11/plasma5-plasma-workspace/Makefile >=================================================================== >--- x11/plasma5-plasma-workspace/Makefile (revision 469543) >+++ x11/plasma5-plasma-workspace/Makefile (working copy) >@@ -2,7 +2,7 @@ > > PORTNAME= plasma-workspace > DISTVERSION= ${KDE_PLASMA_VERSION} >-PORTREVISION= 1 >+PORTREVISION= 2 > CATEGORIES= x11 kde kde-plasma > > MAINTAINER= kde@FreeBSD.org >Index: x11/plasma5-plasma-workspace/files/patch-plasma.desktop.cmake >=================================================================== >--- x11/plasma5-plasma-workspace/files/patch-plasma.desktop.cmake (revision 469543) >+++ x11/plasma5-plasma-workspace/files/patch-plasma.desktop.cmake (nonexistent) >@@ -1,10 +0,0 @@ >---- plasma.desktop.cmake.orig 2018-05-05 17:27:16 UTC >-+++ plasma.desktop.cmake >-@@ -1,6 +1,6 @@ >- [Desktop Entry] >- Type=XSession >--Exec=${CMAKE_INSTALL_FULL_BINDIR}/startkde >-+Exec=ck-launch-session ${CMAKE_INSTALL_FULL_BINDIR}/startkde >- TryExec=${CMAKE_INSTALL_FULL_BINDIR}/startkde >- DesktopNames=KDE >- Name=Plasma > >Property changes on: x11/plasma5-plasma-workspace/files/patch-plasma.desktop.cmake >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property >Index: x11/sddm/Makefile >=================================================================== >--- x11/sddm/Makefile (revision 469543) >+++ x11/sddm/Makefile (working copy) >@@ -3,12 +3,13 @@ > PORTNAME= sddm > PORTVERSION= 0.14.0 > DISTVERSIONPREFIX= v >+PORTREVISION= 1 > CATEGORIES= x11 > > MAINTAINER= kde@FreeBSD.org > COMMENT= QML based login manager > >-USES= cmake:outsource desktop-file-utils kde:5 >+USES= cmake:outsource kde:5 > USE_KDE= ecm > USE_QT5= concurrent core dbus gui linguisttools multimedia network \ > printsupport qml quick script sql webkit widgets \ >@@ -18,10 +19,6 @@ USE_XORG= xcb > CMAKE_ARGS= -DUID_MIN=1000 \ > -DUID_MAX=65000 \ > -DCMAKE_INSTALL_SYSCONFDIR:PATH=${LOCALBASE}/etc >-# We need to disable PAM at the moment and use the passwd-based backend; >-# the two backend are mutually exclusive, and we have to investigate how >-# to make it compatible with OpenPAM. >-CMAKE_ARGS+= -DENABLE_PAM:BOOL=FALSE > > USE_RC_SUBR= sddm > >@@ -31,11 +28,9 @@ GROUPS= sddm > USE_GITHUB= yes > > post-patch: >-# Patch in the correct location for X11 startup files, and make the session start >-# script of sddm use the value of ${STARTUP} defined by 90-consolekit >- ${REINPLACE_CMD} -e 's#/etc/X11#${LOCALBASE}/etc/X11#g' \ >- -e '/exec.*session/s#exec#exec $${STARTUP}#g' \ >- ${PATCH_WRKSRC}/data/scripts/Xsession >+# Patch in the correct location for X11 startup files. >+ @${REINPLACE_CMD} 's#/etc/X11#${LOCALBASE}/etc/X11#' \ >+ ${WRKSRC}/data/scripts/Xsession > > post-install: > # Install xsession.desktop to launch .xinitrc via sddm. >Index: x11/sddm/files/patch-data_scripts_Xsession >=================================================================== >--- x11/sddm/files/patch-data_scripts_Xsession (nonexistent) >+++ x11/sddm/files/patch-data_scripts_Xsession (working copy) >@@ -0,0 +1,13 @@ >+--- data/scripts/Xsession.orig 2016-08-28 11:54:03 UTC >++++ data/scripts/Xsession >+@@ -88,8 +88,8 @@ if [ -f "$USERXSESSION" ]; then >+ . "$USERXSESSION" >+ fi >+ >+-if [ -z "$@" ]; then >++if [ -z "$1" ]; then >+ exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session." >+ else >+- exec $@ >++ exec $STARTUP "$@" >+ fi > >Property changes on: x11/sddm/files/patch-data_scripts_Xsession >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: x11/sddm/files/patch-services_sddm-autologin.pam >=================================================================== >--- x11/sddm/files/patch-services_sddm-autologin.pam (nonexistent) >+++ x11/sddm/files/patch-services_sddm-autologin.pam (working copy) >@@ -0,0 +1,17 @@ >+--- services/sddm-autologin.pam.orig 2016-08-28 11:54:03 UTC >++++ services/sddm-autologin.pam >+@@ -1,11 +1,5 @@ >+ #%PAM-1.0 >+-auth required pam_env.so >+-auth required pam_tally.so file=/var/log/faillog onerr=succeed >+-auth required pam_shells.so >+-auth required pam_nologin.so >+ auth required pam_permit.so >+--auth optional pam_gnome_keyring.so >+-account include system-local-login >+-password include system-local-login >+-session include system-local-login >+--session optional pam_gnome_keyring.so auto_start >++account include login >++password required pam_deny.so >++session include login > >Property changes on: x11/sddm/files/patch-services_sddm-autologin.pam >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: x11/sddm/files/patch-services_sddm-greeter.pam >=================================================================== >--- x11/sddm/files/patch-services_sddm-greeter.pam (nonexistent) >+++ x11/sddm/files/patch-services_sddm-greeter.pam (working copy) >@@ -0,0 +1,18 @@ >+--- services/sddm-greeter.pam.orig 2016-08-28 11:54:03 UTC >++++ services/sddm-greeter.pam >+@@ -1,8 +1,5 @@ >+ #%PAM-1.0 >+ >+-# Load environment from /etc/environment and ~/.pam_environment >+-auth required pam_env.so >+- >+ # Always let the greeter start without authentication >+ auth required pam_permit.so >+ >+@@ -13,5 +10,4 @@ account required pam_permit.so >+ password required pam_deny.so >+ >+ # Setup session >+-session required pam_unix.so >+-session optional pam_systemd.so >++session required pam_permit.so > >Property changes on: x11/sddm/files/patch-services_sddm-greeter.pam >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: x11/sddm/files/patch-services_sddm.pam >=================================================================== >--- x11/sddm/files/patch-services_sddm.pam (nonexistent) >+++ x11/sddm/files/patch-services_sddm.pam (working copy) >@@ -0,0 +1,13 @@ >+--- services/sddm.pam.orig 2016-08-28 11:54:03 UTC >++++ services/sddm.pam >+@@ -1,6 +1,6 @@ >+ #%PAM-1.0 >+ >+-auth include system-login >+-account include system-login >+-password include system-login >+-session include system-login >++auth include login >++account include login >++password include login >++session include login > >Property changes on: x11/sddm/files/patch-services_sddm.pam >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: x11/sddm/files/patch-src_helper_backend_PasswdBackend.cpp >=================================================================== >--- x11/sddm/files/patch-src_helper_backend_PasswdBackend.cpp (revision 469543) >+++ x11/sddm/files/patch-src_helper_backend_PasswdBackend.cpp (nonexistent) >@@ -1,46 +0,0 @@ >-Implement password authentication on FreeBSD. >-This needs review :) >- >---- src/helper/backend/PasswdBackend.cpp.orig 2016-07-06 14:00:10 UTC >-+++ src/helper/backend/PasswdBackend.cpp >-@@ -27,8 +27,13 @@ >- >- #include <sys/types.h> >- #include <pwd.h> >-+#if defined(Q_OS_LINUX) >- #include <shadow.h> >- #include <crypt.h> >-+#endif >-+#if defined(Q_OS_FREEBSD) >-+#include <unistd.h> >-+#endif >- >- namespace SDDM { >- PasswdBackend::PasswdBackend(HelperApp *parent) >-@@ -72,6 +77,17 @@ namespace SDDM { >- return false; >- } >- >-+#if defined(Q_OS_FREEBSD) >-+ if (!*pw->pw_passwd) >-+ { >-+ //empty password >-+ return true; >-+ } >-+ char *crypted = crypt(qPrintable(password), pw->pw_passwd); >-+ if (0 == strcmp(crypted, pw->pw_passwd)) { >-+ return true; >-+ } >-+#else >- struct spwd *spw = getspnam(pw->pw_name); >- if (!spw) { >- qWarning() << "[Passwd] Could get passwd but not shadow"; >-@@ -85,7 +101,7 @@ namespace SDDM { >- if (0 == strcmp(crypted, spw->sp_pwdp)) { >- return true; >- } >-- >-+#endif >- m_app->error(QStringLiteral("Wrong user/password combination"), Auth::ERROR_AUTHENTICATION); >- return false; >- } > >Property changes on: x11/sddm/files/patch-src_helper_backend_PasswdBackend.cpp >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 228116
:
193236
|
193248
|
193430