pass only some GIT_ variables

Passing GIT_* variables can break some packages like gitolite (see
gitolite-env.patch) and gitolite3. Therefore pass only the ones which
are used by some developers and should be safe.

diff --git a/openssh-config.patch b/openssh-config.patch
index e124f108bca35c92b4268fa6f6f4c11b5abaf705..a25de2f78cafd83105f50e6941861e37daa60a5b 100644 (file)
--- a/openssh-config.patch
+++ b/openssh-config.patch
@@ -50,8 +50,8 @@
  # no default banner path
  #Banner /some/path
  
-+# Accept locale-related environment variables, also accept GIT vars
-+AcceptEnv LANG LC_* LANGUAGE TZ GIT_*
++# Accept locale-related environment variables, also accept some GIT vars
++AcceptEnv LANG LC_* LANGUAGE TZ GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL
 +
  # override default of no subsystems
  Subsystem     sftp    /usr/libexec/sftp-server
@@ -92,6 +92,6 @@
 +      ServerAliveInterval 60
 +      ServerAliveCountMax 10
 +      TCPKeepAlive no
-+# Send locale-related environment variables, also pass GIT vars
-+      SendEnv LANG LC_* LANGUAGE TZ GIT_*
++# Send locale-related environment variables, also pass some GIT vars
++      SendEnv LANG LC_* LANGUAGE TZ GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL
 +      HashKnownHosts yes

diff --git a/openssh.spec b/openssh.spec
index 4a69f5678e7d7d4fc99ca222ca7c151a4417c854..bc83dfee9f3b6d83afaf548c3531e7d65b804864 100644 (file)
--- a/openssh.spec
+++ b/openssh.spec
@@ -34,7 +34,7 @@ Summary(ru.UTF-8):    OpenSSH - свободная реализация прото
 Summary(uk.UTF-8):     OpenSSH - вільна реалізація протоколу Secure Shell (SSH)
 Name:          openssh
 Version:       6.2p2
-Release:       3
+Release:       4
 Epoch:         2
 License:       BSD
 Group:         Applications/Networking