File: 0004-Don-t-mess-with-RUBYLIB-when-calling-autosign-script.patch

package info (click to toggle)
puppetserver 8.7.0-5
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid, trixie
  • size: 5,456 kB
  • sloc: ruby: 5,764; sh: 997; java: 221; xml: 111; makefile: 94
file content (27 lines) | stat: -rw-r--r-- 1,318 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
From: =?utf-8?b?SsOpcsO0bWUgQ2hhcmFvdWk=?= <jerome@riseup.net>
Date: Tue, 10 Jan 2023 11:56:18 -0500
Subject: Don't mess with RUBYLIB when calling autosign script

Since Debian installs Puppet and Facter libraries in the system-wide
path, there is no need to modify RUBYLIB in the exec environment. Doing
so causes errors because of the overlapping namespaces: "warning:
already initialized constant [..]"

Forwarded: not-needed
---
 src/clj/puppetlabs/puppetserver/certificate_authority.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: puppetserver/src/clj/puppetlabs/puppetserver/certificate_authority.clj
===================================================================
--- puppetserver.orig/src/clj/puppetlabs/puppetserver/certificate_authority.clj
+++ puppetserver/src/clj/puppetlabs/puppetserver/certificate_authority.clj
@@ -1451,7 +1451,7 @@
                  executable
                  {:args [subject]
                   :in csr-stream
-                  :env (merge env {"RUBYLIB" rubylib "GEM_PATH" gempath})})]
+                  :env (merge env {"GEM_PATH" gempath})})]
     (log/debug (i18n/trs "Autosign command ''{0} {1}'' exit status: {2}"
                 executable subject (:exit-code results)))
     (log/debug (i18n/trs "Autosign command ''{0} {1}'' output on stdout: {2}"