Attachment 229040 Details for Bug 259281 – Patch for common/homedir.c, bump PORTREVISION in Makefile

[patch] Patch for common/homedir.c, bump PORTREVISION in Makefile

gnupg_2.3.3_1.patch (text/plain), 1.74 KB, created by FiLiS on 2021-10-26 08:58:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: FiLiS

Created: 2021-10-26 08:58:54 UTC

Size: 1.74 KB

patch

obsolete

>diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
>index 91975aedfb..c90761a001 100644
>--- a/security/gnupg/Makefile
>+++ b/security/gnupg/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	gnupg
> PORTVERSION=	2.3.3
>+PORTREVISION=	1
> CATEGORIES=	security
> MASTER_SITES=	GNUPG
> 
>diff --git a/security/gnupg/files/patch-common_homedir.c b/security/gnupg/files/patch-common_homedir.c
>new file mode 100644
>index 0000000000..619818f4ab
>--- /dev/null
>+++ b/security/gnupg/files/patch-common_homedir.c
>@@ -0,0 +1,30 @@
>+--- common/homedir.c.orig	2021-10-01 12:44:06.000000000 +0000
>++++ common/homedir.c	2021-10-26 08:14:01.320259000 +0000
>+@@ -68,7 +68,9 @@
>+  * text was read.  */
>+ #if __linux__
>+ # define MYPROC_SELF_EXE "/proc/self/exe"
>+-#else /* Assume *BSD*/
>++#elif defined(__NetBSD__)
>++# define MYPROC_SELF_EXE "/proc/curproc/exe"
>++#else /* Assume other BSDs */
>+ # define MYPROC_SELF_EXE "/proc/curproc/file"
>+ #endif
>+ 
>+@@ -495,13 +497,13 @@
>+           if (nread < 0)
>+             {
>+               err = gpg_error_from_syserror ();
>+-              log_info ("error reading symlink '%s': %s\n",
>+-                        MYPROC_SELF_EXE, gpg_strerror (err));
>+               buffer[0] = 0;
>+               if ((name = getenv ("GNUPG_BUILD_ROOT")) && *name == '/')
>+                 {
>+                   /* Try a fallback for systems w/o a supported /proc
>+-                   * file system.  */
>++                   * file system if we are running a regression test.  */
>++                  log_info ("error reading symlink '%s': %s\n",
>++                            MYPROC_SELF_EXE, gpg_strerror (err));
>+                   xfree  (buffer);
>+                   buffer = xstrconcat (name, "/bin/gpgconf", NULL);
>+                   log_info ("trying fallback '%s'\n", buffer);

Actions: View | Diff

Attachments on bug 259281: 229040