Attachment 206965 Details for Bug 228291 – patch

[patch] patch

security_plasma5-kwallet-pam.diff (text/plain), 3.61 KB, created by Mikael Urankar on 2019-08-28 09:48:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikael Urankar

Created: 2019-08-28 09:48:01 UTC

Size: 3.61 KB

patch

obsolete

>Index: security/plasma5-kwallet-pam/Makefile
>===================================================================
>--- security/plasma5-kwallet-pam/Makefile	(revision 509873)
>+++ security/plasma5-kwallet-pam/Makefile	(working copy)
>@@ -13,8 +13,14 @@
> 		libgpg-error.so:security/libgpg-error
> 
> USES=		cmake cpe gettext kde:5 qt:5 tar:xz
>-USE_KDE=	ecm wallet
>+USE_KDE=	ecm wallet wallet_run
> USE_QT=		gui \
> 		buildtools_build qmake_build
> 
>+post-patch:
>+	@${REINPLACE_CMD} -e 's,socat,nc,' -e 's,/security,,' \
>+		${WRKSRC}/CMakeLists.txt
>+	@${REINPLACE_CMD} 's,/usr/bin/kwalletd,${LOCALBASE}/bin/kwalletd,' \
>+		${WRKSRC}/pam_kwallet.c
>+
> .include <bsd.port.mk>
>Index: security/plasma5-kwallet-pam/files/patch-pam__kwallet.c
>===================================================================
>--- security/plasma5-kwallet-pam/files/patch-pam__kwallet.c	(nonexistent)
>+++ security/plasma5-kwallet-pam/files/patch-pam__kwallet.c	(working copy)
>@@ -0,0 +1,21 @@
>+---pam_kwallet.c	2019-08-28 10:45:20.619019000 +0200
>++++ pam_kwallet.c	2019-08-28 10:47:11.632255000 +0200
>+@@ -390,7 +390,7 @@ static void execute_kwallet(pam_handle_t *pamh, struct
>+     struct sockaddr_un local;
>+     local.sun_family = AF_UNIX;
>+ 
>+-    if (strlen(fullSocket) > sizeof(local.sun_path)) {
>++    if (strlen(fullSocket) >= sizeof(local.sun_path)) {
>+         syslog(LOG_ERR, "%s: socket path %s too long to open",
>+                    logPrefix, fullSocket);
>+         free(fullSocket);
>+@@ -403,8 +403,7 @@ static void execute_kwallet(pam_handle_t *pamh, struct
>+ 
>+     syslog(LOG_DEBUG, "%s: final socket path: %s", logPrefix, local.sun_path);
>+ 
>+-    size_t len = strlen(local.sun_path) + sizeof(local.sun_family);
>+-    if (bind(envSocket, (struct sockaddr *)&local, len) == -1) {
>++    if (bind(envSocket, (struct sockaddr *)&local, sizeof(local)) == -1) {
>+         syslog(LOG_INFO, "%s-kwalletd: Couldn't bind to local file\n", logPrefix);
>+         goto cleanup;
>+     }
>
>Property changes on: security/plasma5-kwallet-pam/files/patch-pam__kwallet.c
>___________________________________________________________________
>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: security/plasma5-kwallet-pam/files/patch-pam__kwallet__init
>===================================================================
>--- security/plasma5-kwallet-pam/files/patch-pam__kwallet__init	(nonexistent)
>+++ security/plasma5-kwallet-pam/files/patch-pam__kwallet__init	(working copy)
>@@ -0,0 +1,10 @@
>+--- pam_kwallet_init.orig	2019-08-09 12:51:25.200806000 +0200
>++++ pam_kwallet_init	2019-08-09 12:51:41.765221000 +0200
>+@@ -1,6 +1,6 @@
>+ #!/bin/sh
>+ 
>+ if test -n "$PAM_KWALLET5_LOGIN" ; then
>+-    env | socat STDIN UNIX-CONNECT:$PAM_KWALLET5_LOGIN
>++    env | nc -U "$PAM_KWALLET5_LOGIN" | :
>+ fi
>+ 
>
>Property changes on: security/plasma5-kwallet-pam/files/patch-pam__kwallet__init
>___________________________________________________________________
>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: security/plasma5-kwallet-pam/pkg-plist
>===================================================================
>--- security/plasma5-kwallet-pam/pkg-plist	(revision 509873)
>+++ security/plasma5-kwallet-pam/pkg-plist	(working copy)
>@@ -1,3 +1,3 @@
> etc/xdg/autostart/pam_kwallet_init.desktop
> lib/libexec/pam_kwallet_init
>-lib/security/pam_kwallet5.so
>+lib/pam_kwallet5.so

Actions: View | Diff

Attachments on bug 228291: 193457 | 206965