Index: src/github.com/gravitational/teleport/Makefile
--- src/github.com/gravitational/teleport/Makefile.orig	2019-12-14 09:59:06.000000000 +0100
+++ src/github.com/gravitational/teleport/Makefile	2019-12-14 10:55:11.391334000 +0100
@@ -18,7 +18,7 @@
 BUILDDIR ?= build
 BINDIR ?= /usr/local/bin
 DATADIR ?= /usr/local/share/teleport
-ADDFLAGS ?=
+ADDFLAGS ?= -v
 PWD ?= `pwd`
 GOPKGDIR ?= `go env GOPATH`/pkg/`go env GOHOSTOS`_`go env GOARCH`/github.com/gravitational/teleport*
 TELEPORT_DEBUG ?= no
@@ -141,20 +141,7 @@
 # tctl, and tsh.
 #
 .PHONY:
-release-unix: clean full
-	@echo "---> Creating OSS release archive."
-	mkdir teleport
-	cp -rf $(BUILDDIR)/* \
-		examples \
-		build.assets/install\
-		README.md \
-		CHANGELOG.md \
-		teleport/
-	echo $(GITTAG) > teleport/VERSION
-	tar -czf $(RELEASE).tar.gz teleport
-	rm -rf teleport
-	@echo "---> Created $(RELEASE).tar.gz."
-	@if [ -f e/Makefile ]; then $(MAKE) -C e release; fi
+release-unix: full
 
 #
 # make release-windows - Produces a binary release tarball containing teleport,
Index: src/github.com/gravitational/teleport/lib/pam/pam.go
--- src/github.com/gravitational/teleport/lib/pam/pam.go.orig	2019-12-14 09:59:06.000000000 +0100
+++ src/github.com/gravitational/teleport/lib/pam/pam.go	2019-12-14 10:55:11.391722000 +0100
@@ -18,7 +18,7 @@
 
 package pam
 
-// #cgo LDFLAGS: -ldl
+// #cgo linux LDFLAGS: -ldl
 // #include <stdio.h>
 // #include <stdlib.h>
 // #include <string.h>
Index: src/github.com/gravitational/teleport/lib/srv/exec.go
--- src/github.com/gravitational/teleport/lib/srv/exec.go.orig	2019-12-14 09:59:06.000000000 +0100
+++ src/github.com/gravitational/teleport/lib/srv/exec.go	2019-12-14 10:55:46.511327000 +0100
@@ -17,7 +17,6 @@
 package srv
 
 import (
-	"bufio"
 	"bytes"
 	"context"
 	"encoding/json"
@@ -50,7 +49,7 @@
 )
 
 const (
-	defaultPath          = "/bin:/usr/bin:/usr/local/bin:/sbin"
+	defaultPath          = "/bin:/sbin:/usr/bin:/usr/sbin:@l_prefix@/bin:@l_prefix@/sbin"
 	defaultEnvPath       = "PATH=" + defaultPath
 	defaultTerm          = "xterm"
 	defaultLoginDefsPath = "/etc/login.defs"
@@ -853,53 +852,6 @@
 // looks like "PATH=/usr/bin:/bin"
 func getDefaultEnvPath(uid string, loginDefsPath string) string {
 	envPath := defaultEnvPath
-	envSuPath := defaultEnvPath
-
-	// open file, if it doesn't exist return a default path and move on
-	f, err := os.Open(loginDefsPath)
-	if err != nil {
-		log.Infof("Unable to open %q: %v: returning default path: %q", loginDefsPath, err, defaultEnvPath)
-		return defaultEnvPath
-	}
-	defer f.Close()
-
-	// read path to login.defs file /etc/login.defs line by line:
-	scanner := bufio.NewScanner(f)
-	for scanner.Scan() {
-		line := strings.TrimSpace(scanner.Text())
-
-		// skip comments and empty lines:
-		if line == "" || line[0] == '#' {
-			continue
-		}
-
-		// look for a line that starts with ENV_SUPATH or ENV_PATH
-		fields := strings.Fields(line)
-		if len(fields) > 1 {
-			if fields[0] == "ENV_PATH" {
-				envPath = fields[1]
-			}
-			if fields[0] == "ENV_SUPATH" {
-				envSuPath = fields[1]
-			}
-		}
-	}
-
-	// if any error occurs while reading the file, return the default value
-	err = scanner.Err()
-	if err != nil {
-		log.Warnf("Unable to read %q: %v: returning default path: %q", loginDefsPath, err, defaultEnvPath)
-		return defaultEnvPath
-	}
-
-	// if requesting path for uid 0 and no ENV_SUPATH is given, fallback to
-	// ENV_PATH first, then the default path.
-	if uid == "0" {
-		if envSuPath == defaultEnvPath {
-			return envPath
-		}
-		return envSuPath
-	}
 	return envPath
 }
 
Index: src/github.com/gravitational/teleport/version.mk
--- src/github.com/gravitational/teleport/version.mk.orig	2019-12-14 09:59:06.000000000 +0100
+++ src/github.com/gravitational/teleport/version.mk	2019-12-14 10:55:11.392623000 +0100
@@ -1,4 +1,4 @@
-GITREF=`git describe --dirty --long --tags`
+GITREF=0000
 
 # $(VERSION_GO) will be written to version.go
 VERSION_GO="/* DO NOT EDIT THIS FILE. IT IS GENERATED BY 'make setver'*/\n\n\
