openpkg
/
openpkg-packages
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

upgrading package: gitea 1.12.2.20200713 -> 1.12.3.20200803

master
Dr. Ralf S. Engelschall 5 years ago
parent
1ac4ff5310
commit
f986a53cc6
2 changed files with 21 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 34
      gitea/gitea.patch
  2. 8
      gitea/gitea.spec

34
gitea/gitea.patch
Unescape View File

@ -1,37 +1,37 @@
Index: src/code.gitea.io/gitea/models/repo.go
--- src/code.gitea.io/gitea/models/repo.go.orig 2020-04-01 23:33:35.000000000 +0200
+++ src/code.gitea.io/gitea/models/repo.go 2020-04-01 23:36:43.980025000 +0200
@@ -885,11 +885,23 @@
--- src/code.gitea.io/gitea/models/repo.go.orig 2020-08-03 08:52:10.203478000 +0200
+++ src/code.gitea.io/gitea/models/repo.go 2020-08-03 12:48:16.803851000 +0200
@@ -980,11 +980,23 @@
}
cl := new(CloneLink)
if setting.SSH.Port != 22 {
- cl.SSH = fmt.Sprintf("ssh://%s@%s:%d/%s/%s.git", sshUser, setting.SSH.Domain, setting.SSH.Port, repo.OwnerName, repoName)
- cl.SSH = fmt.Sprintf("ssh://%s@%s/%s/%s.git", sshUser, net.JoinHostPort(setting.SSH.Domain, strconv.Itoa(setting.SSH.Port)), repo.OwnerName, repoName)
+ if setting.SSH.StartBuiltinServer {
+ cl.SSH = fmt.Sprintf("ssh://%s:%d/%s/%s.git", setting.SSH.Domain, setting.SSH.Port, repo.OwnerName, repoName)
+ cl.SSH = fmt.Sprintf("ssh://%s/%s/%s.git", net.JoinHostPort(setting.SSH.Domain, strconv.Itoa(setting.SSH.Port)), repo.OwnerName, repoName)
+ } else {
+ cl.SSH = fmt.Sprintf("ssh://%s@%s:%d/%s/%s.git", sshUser, setting.SSH.Domain, setting.SSH.Port, repo.OwnerName, repoName)
+ cl.SSH = fmt.Sprintf("ssh://%s@%s/%s/%s.git", sshUser, net.JoinHostPort(setting.SSH.Domain, strconv.Itoa(setting.SSH.Port)), repo.OwnerName, repoName)
+ }
} else if setting.Repository.UseCompatSSHURI {
- cl.SSH = fmt.Sprintf("ssh://%s@%s/%s/%s.git", sshUser, setting.SSH.Domain, repo.OwnerName, repoName)
- cl.SSH = fmt.Sprintf("ssh://%s@%s/%s/%s.git", sshUser, sshDomain, repo.OwnerName, repoName)
+ if setting.SSH.StartBuiltinServer {
+ cl.SSH = fmt.Sprintf("ssh://%s/%s/%s.git", setting.SSH.Domain, repo.OwnerName, repoName)
+ cl.SSH = fmt.Sprintf("ssh://%s/%s/%s.git", sshDomain, repo.OwnerName, repoName)
+ } else {
+ cl.SSH = fmt.Sprintf("ssh://%s@%s/%s/%s.git", sshUser, setting.SSH.Domain, repo.OwnerName, repoName)
+ cl.SSH = fmt.Sprintf("ssh://%s@%s/%s/%s.git", sshUser, sshDomain, repo.OwnerName, repoName)
+ }
} else {
- cl.SSH = fmt.Sprintf("%s@%s:%s/%s.git", sshUser, setting.SSH.Domain, repo.OwnerName, repoName)
- cl.SSH = fmt.Sprintf("%s@%s:%s/%s.git", sshUser, sshDomain, repo.OwnerName, repoName)
+ if setting.SSH.StartBuiltinServer {
+ cl.SSH = fmt.Sprintf("%s:%s/%s.git", setting.SSH.Domain, repo.OwnerName, repoName)
+ cl.SSH = fmt.Sprintf("%s:%s/%s.git", sshDomain, repo.OwnerName, repoName)
+ } else {
+ cl.SSH = fmt.Sprintf("%s@%s:%s/%s.git", sshUser, setting.SSH.Domain, repo.OwnerName, repoName)
+ cl.SSH = fmt.Sprintf("%s@%s:%s/%s.git", sshUser, sshDomain, repo.OwnerName, repoName)
+ }
}
cl.HTTPS = ComposeHTTPSCloneURL(repo.OwnerName, repoName)
return cl
Index: src/code.gitea.io/gitea/models/ssh_key.go
--- src/code.gitea.io/gitea/models/ssh_key.go.orig 2020-04-01 23:36:43.980614000 +0200
+++ src/code.gitea.io/gitea/models/ssh_key.go 2020-04-01 23:38:43.010391000 +0200
@@ -36,7 +36,7 @@
--- src/code.gitea.io/gitea/models/ssh_key.go.orig 2020-08-03 08:51:58.000000000 +0200
+++ src/code.gitea.io/gitea/models/ssh_key.go 2020-08-03 08:52:10.203851000 +0200
@@ -37,7 +37,7 @@
const (
tplCommentPrefix = `# gitea public key`
@ -40,7 +40,7 @@ Index: src/code.gitea.io/gitea/models/ssh_key.go
tplPublicKey = tplCommentPrefix + "\n" + `command=%q,no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty %s` + "\n"
)
@@ -82,7 +82,7 @@
@@ -83,7 +83,7 @@
// AuthorizedString returns formatted public key string for authorized_keys file.
func (key *PublicKey) AuthorizedString() string {

8
gitea/gitea.spec
Unescape View File

@ -22,9 +22,9 @@
##
# package information
%define V_gitea_base 1.12.2
%define V_gitea_dist 1.12.2
%define V_gitea_snap 20200713
%define V_gitea_base 1.12.3
%define V_gitea_dist 1.12.3
%define V_gitea_snap 20200803
# package information
Name: gitea
@ -37,7 +37,7 @@ Class: EVAL
Group: Database
License: MIT
Version: %{V_gitea_base}.%{V_gitea_snap}
Release: 20200713
Release: 20200803
# list of sources
Source0: http://download.openpkg.org/components/versioned/gitea/gitea-%{V_gitea_snap}.tar.xz

Write Preview
Loading…
Cancel
Save