Browse Source

upgrading package: teleport 2.7.4.20180817 -> 3.0.0.20181002

master
parent
commit
0689968a6c
  1. 35
      teleport/teleport.patch
  2. 6
      teleport/teleport.spec

35
teleport/teleport.patch

@ -1,6 +1,6 @@
Index: src/github.com/gravitational/teleport/Makefile
--- src/github.com/gravitational/teleport/Makefile.orig 2018-08-07 07:37:03.000000000 +0200
+++ src/github.com/gravitational/teleport/Makefile 2018-08-07 07:46:52.950766000 +0200
--- src/github.com/gravitational/teleport/Makefile.orig 2018-10-02 20:26:16.000000000 +0200
+++ src/github.com/gravitational/teleport/Makefile 2018-10-02 20:37:14.659605000 +0200
@@ -16,7 +16,7 @@
BUILDDIR ?= build
BINDIR ?= /usr/local/bin
@ -10,11 +10,12 @@ Index: src/github.com/gravitational/teleport/Makefile
PWD ?= `pwd`
GOCACHEDIR ?= `go env GOCACHE`
TELEPORT_DEBUG ?= no
@@ -123,19 +123,7 @@
@@ -123,20 +123,7 @@
# tctl, and tsh.
#
.PHONY:
-release-unix: clean full
- @echo "---> Creating OSS release archive."
- mkdir teleport
- cp -rf $(BUILDDIR)/* \
- examples \
@ -25,15 +26,14 @@ Index: src/github.com/gravitational/teleport/Makefile
- echo $(GITTAG) > teleport/VERSION
- tar -czf $(RELEASE).tar.gz teleport
- rm -rf teleport
- @echo "\nCREATED: $(RELEASE).tar.gz"
- @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 2018-08-07 07:37:03.000000000 +0200
+++ src/github.com/gravitational/teleport/lib/pam/pam.go 2018-08-07 07:44:26.070076000 +0200
--- src/github.com/gravitational/teleport/lib/pam/pam.go.orig 2018-10-02 20:26:17.000000000 +0200
+++ src/github.com/gravitational/teleport/lib/pam/pam.go 2018-10-02 20:35:30.582012000 +0200
@@ -18,7 +18,7 @@
package pam
@ -43,10 +43,9 @@ Index: src/github.com/gravitational/teleport/lib/pam/pam.go
// #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 2018-08-07 07:37:03.000000000 +0200
+++ src/github.com/gravitational/teleport/lib/srv/exec.go 2018-08-07 07:44:26.070284000 +0200
@@ -17,11 +17,9 @@
--- src/github.com/gravitational/teleport/lib/srv/exec.go.orig 2018-10-02 20:26:17.000000000 +0200
+++ src/github.com/gravitational/teleport/lib/srv/exec.go 2018-10-02 20:35:30.582309000 +0200
@@ -17,7 +17,6 @@
package srv
import (
@ -54,11 +53,7 @@ Index: src/github.com/gravitational/teleport/lib/srv/exec.go
"fmt"
"io"
"net"
- "os"
"os/exec"
"os/user"
"path/filepath"
@@ -43,7 +41,7 @@
@@ -43,7 +42,7 @@
)
const (
@ -67,7 +62,7 @@ Index: src/github.com/gravitational/teleport/lib/srv/exec.go
defaultEnvPath = "PATH=" + defaultPath
defaultTerm = "xterm"
defaultLoginDefsPath = "/etc/login.defs"
@@ -509,52 +507,5 @@
@@ -531,53 +530,6 @@
// looks like "PATH=/usr/bin:/bin"
func getDefaultEnvPath(uid string, loginDefsPath string) string {
envPath := defaultEnvPath
@ -120,9 +115,9 @@ Index: src/github.com/gravitational/teleport/lib/srv/exec.go
- }
return envPath
}
Index: src/github.com/gravitational/teleport/version.mk
--- src/github.com/gravitational/teleport/version.mk.orig 2018-08-07 07:37:03.000000000 +0200
+++ src/github.com/gravitational/teleport/version.mk 2018-08-07 07:44:26.070406000 +0200
--- src/github.com/gravitational/teleport/version.mk.orig 2018-10-02 20:26:17.000000000 +0200
+++ src/github.com/gravitational/teleport/version.mk 2018-10-02 20:35:30.582476000 +0200
@@ -1,4 +1,4 @@
-GITREF=`git describe --dirty --long --tags`
+GITREF=0000

6
teleport/teleport.spec

@ -22,8 +22,8 @@
##
# package information
%define V_teleport_base 2.7.4
%define V_teleport_snap 20180817
%define V_teleport_base 3.0.0
%define V_teleport_snap 20181002
# package information
Name: teleport
@ -36,7 +36,7 @@ Class: EVAL
Group: Networking
License: Apache
Version: %{V_teleport_base}.%{V_teleport_snap}
Release: 20180817
Release: 20181002
# list of sources
Source0: http://download.openpkg.org/components/versioned/teleport/teleport-%{V_teleport_snap}.tar.xz

Loading…
Cancel
Save