Attachment #237408 for bug #267152

View | Details | Raw Unified | Return to bug 267152
Collapse All | Expand All

Lines 1-6 Link Here

(-)b/security/gnupg/Makefile (-2 / +1 lines)
1	PORTNAME= gnupg	1	PORTNAME= gnupg
2	PORTVERSION= 2.3.3	2	PORTVERSION= 2.3.8
3	PORTREVISION= 3
4	CATEGORIES= security	3	CATEGORIES= security
5	MASTER_SITES= GNUPG	4	MASTER_SITES= GNUPG
6		5

Lines 1-3 Link Here

(-)b/security/gnupg/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1634135268	1	TIMESTAMP = 1666020426
2	SHA256 (gnupg-2.3.3.tar.bz2) = 5789b86da6a1a6752efb38598f16a77af51170a8494039c3842b085032e8e937	2	SHA256 (gnupg-2.3.8.tar.bz2) = 540b7a40e57da261fb10ef521a282e0021532a80fd023e75fb71757e8a4969ed
3	SIZE (gnupg-2.3.3.tar.bz2) = 7590874	3	SIZE (gnupg-2.3.8.tar.bz2) = 7644926




--- common/homedir.c.orig	2021-10-01 12:44:06 UTC
+++ common/homedir.c
@@ -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 @@ unix_rootdir (int want_sysconfdir)
           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);




--- dirmngr/server.c.orig	2022-10-07 15:23:50.000000000 +0200
+++ dirmngr/server.c	2022-10-17 17:05:47.417734000 +0200
@@ -3137,8 +3137,10 @@
                ctrl->refcount);
   else
     {
+#if USE_LDAP
       ks_ldap_free_state (ctrl->ks_get_state);
       ctrl->ks_get_state = NULL;
+#endif /*USE_LDAP*/
       release_ctrl_ocsp_certs (ctrl);
       xfree (ctrl->server_local);
       dirmngr_deinit_default_ctrl (ctrl);

Removed Link Here

(-)a/security/gnupg/files/patch-tools_gpgconf-comp.c (-11 lines)
1	--- tools/gpgconf-comp.c.orig 2021-10-10 16:28:51 UTC
2	+++ tools/gpgconf-comp.c
3	@@ -676,6 +676,8 @@ static struct
4	{ TPM2DAEMON_NAME, TPM2DAEMON_DISP_NAME, "gnupg", N_("TPM"),
5	GNUPG_MODULE_NAME_TPM2DAEMON, TPM2DAEMON_NAME ".conf",
6	known_options_tpm2daemon, NULL, tpm2daemon_runtime_change},
7	+#else
8	+ { NULL }, /* Another dummy, to keep the enum in sync with this table */
9	#endif
10
11	{ DIRMNGR_NAME, DIRMNGR_DISP_NAME, "gnupg", N_("Network"),

Lines 17-22 bin/gpgv2 Link Here

(-)b/security/gnupg/pkg-plist (+2 lines)
17	bin/kbxutil	17	bin/kbxutil
18	bin/watchgnupg	18	bin/watchgnupg
19	%%DIRMNGRLDAP%%libexec/dirmngr_ldap	19	%%DIRMNGRLDAP%%libexec/dirmngr_ldap
		20	libexec/gpg-auth
20	libexec/gpg-check-pattern	21	libexec/gpg-check-pattern
21	libexec/gpg-pair-tool	22	libexec/gpg-pair-tool
22	libexec/gpg-preset-passphrase	23	libexec/gpg-preset-passphrase
Lines 60-65 sbin/applygnupgdefaults Link Here
60	%%PORTDOCS%%%%DOCSDIR%%/examples/common.conf	61	%%PORTDOCS%%%%DOCSDIR%%/examples/common.conf
61	%%PORTDOCS%%%%DOCSDIR%%/examples/debug.prf	62	%%PORTDOCS%%%%DOCSDIR%%/examples/debug.prf
62	%%PORTDOCS%%%%DOCSDIR%%/examples/gpgconf.conf	63	%%PORTDOCS%%%%DOCSDIR%%/examples/gpgconf.conf
		64	%%PORTDOCS%%%%DOCSDIR%%/examples/gpgconf.rnames
63	%%PORTDOCS%%%%DOCSDIR%%/examples/pwpattern.list	65	%%PORTDOCS%%%%DOCSDIR%%/examples/pwpattern.list
64	%%PORTDOCS%%%%DOCSDIR%%/examples/qualified.txt	66	%%PORTDOCS%%%%DOCSDIR%%/examples/qualified.txt
65	%%PORTDOCS%%%%DOCSDIR%%/examples/scd-event	67	%%PORTDOCS%%%%DOCSDIR%%/examples/scd-event

Return to bug 267152

Removed Link Here

(-)a/security/gnupg/files/patch-common_homedir.c (-30 lines)
1	--- common/homedir.c.orig 2021-10-01 12:44:06 UTC
2	+++ common/homedir.c
3	@@ -68,7 +68,9 @@
4	* text was read. */
5	#if __linux__
6	# define MYPROC_SELF_EXE "/proc/self/exe"
7	-#else /* Assume BSD/
8	+#elif defined(__NetBSD__)
9	+# define MYPROC_SELF_EXE "/proc/curproc/exe"
10	+#else /* Assume other BSDs */
11	# define MYPROC_SELF_EXE "/proc/curproc/file"
12	#endif
13
14	@@ -495,13 +497,13 @@ unix_rootdir (int want_sysconfdir)
15	if (nread < 0)
16	{
17	err = gpg_error_from_syserror ();
18	- log_info ("error reading symlink '%s': %s\n",
19	- MYPROC_SELF_EXE, gpg_strerror (err));
20	buffer[0] = 0;
21	if ((name = getenv ("GNUPG_BUILD_ROOT")) && *name == '/')
22	{
23	/* Try a fallback for systems w/o a supported /proc
24	- * file system. */
25	+ * file system if we are running a regression test. */
26	+ log_info ("error reading symlink '%s': %s\n",
27	+ MYPROC_SELF_EXE, gpg_strerror (err));
28	xfree (buffer);
29	buffer = xstrconcat (name, "/bin/gpgconf", NULL);
30	log_info ("trying fallback '%s'\n", buffer);

Added Link Here

(-)b/security/gnupg/files/patch-dirmngr_server.c (+13 lines)
1	--- dirmngr/server.c.orig 2022-10-07 15:23:50.000000000 +0200
2	+++ dirmngr/server.c 2022-10-17 17:05:47.417734000 +0200
3	@@ -3137,8 +3137,10 @@
4	ctrl->refcount);
5	else
6	{
7	+#if USE_LDAP
8	ks_ldap_free_state (ctrl->ks_get_state);
9	ctrl->ks_get_state = NULL;
10	+#endif /USE_LDAP/
11	release_ctrl_ocsp_certs (ctrl);
12	xfree (ctrl->server_local);
13	dirmngr_deinit_default_ctrl (ctrl);