forked from pool/git-bug
Compare commits
4 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
81e127b771
|
|||
|
8f0421350a
|
|||
|
fa9ed9d9af
|
|||
|
fb15c5e482
|
4
.gitignore
vendored
4
.gitignore
vendored
@@ -1,4 +1,6 @@
|
||||
.osc
|
||||
_scmsync.obsinfo
|
||||
build.specials.obscpio
|
||||
git-bug/
|
||||
.assets/
|
||||
_buildconfig-*
|
||||
_buildinfo-*.xml
|
||||
|
||||
4
.gitmodules
vendored
Normal file
4
.gitmodules
vendored
Normal file
@@ -0,0 +1,4 @@
|
||||
[submodule "upstream"]
|
||||
path = git-bug
|
||||
url = https://github.com/openSUSE-Python/git-bug.git
|
||||
branch = devel
|
||||
@@ -1,103 +0,0 @@
|
||||
---
|
||||
go.mod | 14 ++++++++------
|
||||
go.sum | 20 ++++++++++----------
|
||||
2 files changed, 18 insertions(+), 16 deletions(-)
|
||||
|
||||
Index: git-bug-0.8.0+git.1742269202.0ab94c9/go.mod
|
||||
===================================================================
|
||||
--- git-bug-0.8.0+git.1742269202.0ab94c9.orig/go.mod 2025-03-18 04:40:02.000000000 +0100
|
||||
+++ git-bug-0.8.0+git.1742269202.0ab94c9/go.mod 2025-03-25 16:42:47.276480680 +0100
|
||||
@@ -1,6 +1,8 @@
|
||||
module github.com/git-bug/git-bug
|
||||
|
||||
-go 1.22.5
|
||||
+go 1.23.0
|
||||
+
|
||||
+toolchain go1.24.1
|
||||
|
||||
// https://github.com/praetorian-inc/gokart/pull/84
|
||||
replace github.com/praetorian-inc/gokart v0.5.1 => github.com/selesy/gokart v0.5.2-rc1
|
||||
@@ -36,11 +38,11 @@
|
||||
github.com/vbauerster/mpb/v8 v8.8.2
|
||||
github.com/vektah/gqlparser/v2 v2.5.16
|
||||
gitlab.com/gitlab-org/api/client-go v0.116.0
|
||||
- golang.org/x/crypto v0.31.0
|
||||
+ golang.org/x/crypto v0.35.0
|
||||
golang.org/x/oauth2 v0.22.0
|
||||
- golang.org/x/sync v0.10.0
|
||||
- golang.org/x/sys v0.28.0
|
||||
- golang.org/x/text v0.21.0
|
||||
+ golang.org/x/sync v0.11.0
|
||||
+ golang.org/x/sys v0.30.0
|
||||
+ golang.org/x/text v0.22.0
|
||||
)
|
||||
|
||||
require (
|
||||
@@ -121,7 +123,7 @@
|
||||
golang.org/x/mod v0.19.0 // indirect
|
||||
golang.org/x/net v0.27.0 // indirect
|
||||
golang.org/x/telemetry v0.0.0-20240723021908-ccdfb411a0c4 // indirect
|
||||
- golang.org/x/term v0.27.0
|
||||
+ golang.org/x/term v0.29.0
|
||||
golang.org/x/tools v0.23.0 // indirect
|
||||
golang.org/x/vuln v1.1.3
|
||||
google.golang.org/protobuf v1.34.2 // indirect
|
||||
Index: git-bug-0.8.0+git.1742269202.0ab94c9/go.sum
|
||||
===================================================================
|
||||
--- git-bug-0.8.0+git.1742269202.0ab94c9.orig/go.sum 2025-03-18 04:40:02.000000000 +0100
|
||||
+++ git-bug-0.8.0+git.1742269202.0ab94c9/go.sum 2025-03-25 16:42:47.278128567 +0100
|
||||
@@ -331,8 +331,8 @@
|
||||
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
|
||||
golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
|
||||
golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
|
||||
-golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
|
||||
-golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
|
||||
+golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=
|
||||
+golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=
|
||||
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8=
|
||||
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
|
||||
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
|
||||
@@ -357,8 +357,8 @@
|
||||
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
-golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
|
||||
-golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
|
||||
+golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
|
||||
+golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
|
||||
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20181221143128-b4a75ba826a6/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
@@ -379,8 +379,8 @@
|
||||
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||
-golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
|
||||
-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||
+golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
|
||||
+golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||
golang.org/x/telemetry v0.0.0-20240723021908-ccdfb411a0c4 h1:ka7TMW0Mo8QYTXm2hXSQ9fFUXS7Zln3S4pe9aq4JC7w=
|
||||
golang.org/x/telemetry v0.0.0-20240723021908-ccdfb411a0c4/go.mod h1:amNmu/SBSm2GAF3X+9U2C0epLocdh+r5Z+7oMYO5cLM=
|
||||
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
||||
@@ -390,8 +390,8 @@
|
||||
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
|
||||
golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
|
||||
golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
|
||||
-golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
|
||||
-golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
|
||||
+golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=
|
||||
+golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=
|
||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
|
||||
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||
@@ -402,8 +402,8 @@
|
||||
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
|
||||
golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
|
||||
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
|
||||
-golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
|
||||
-golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
|
||||
+golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
|
||||
+golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
|
||||
golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
|
||||
golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||
13
_service
13
_service
@@ -1,16 +1,3 @@
|
||||
<services>
|
||||
<service name="obs_scm" mode="manual">
|
||||
<param name="versionprefix">0.8.0+git</param>
|
||||
<param name="url">https://github.com/git-bug/git-bug.git</param>
|
||||
<param name="scm">git</param>
|
||||
<param name="changesgenerate">enable</param>
|
||||
<param name="changesauthor">mcepl@cepl.eu</param>
|
||||
</service>
|
||||
<service name="tar" mode="buildtime"/>
|
||||
<service name="recompress" mode="buildtime">
|
||||
<param name="file">*.tar</param>
|
||||
<param name="compression">gz</param>
|
||||
</service>
|
||||
<service name="set_version" mode="manual"/>
|
||||
<service name="go_modules" mode="manual"/>
|
||||
</services>
|
||||
|
||||
1
git-bug
Submodule
1
git-bug
Submodule
Submodule git-bug added at 3f7e767ea7
BIN
git-bug-0.8.0+git.1742269202.0ab94c9.obscpio
(Stored with Git LFS)
BIN
git-bug-0.8.0+git.1742269202.0ab94c9.obscpio
(Stored with Git LFS)
Binary file not shown.
@@ -1,4 +0,0 @@
|
||||
name: git-bug
|
||||
version: 0.8.0+git.1742269202.0ab94c9
|
||||
mtime: 1742269202
|
||||
commit: 0ab94c9b7ac53ca9ab56febcf5cc3f26959e8b8a
|
||||
14
git-bug.spec
14
git-bug.spec
@@ -17,20 +17,14 @@
|
||||
|
||||
|
||||
Name: git-bug
|
||||
Version: 0.8.0+git.1742269202.0ab94c9
|
||||
Version: 0.8.1+git.1746484874.96c7a111
|
||||
Release: 0
|
||||
Summary: Distributed, offline-first bug tracker embedded in git, with bridges
|
||||
License: MIT
|
||||
URL: https://github.com/MichaelMure/git-bug
|
||||
# Source0: https://github.com/MichaelMure/%%{name}/archive/refs/tags/v%%{version}.tar.gz#/git-bug-%%{version}.tar.gz
|
||||
Source0: git-bug-%{version}.tar.gz
|
||||
#!CreateArchive: git-bug
|
||||
Source0: %{name}-%{version}.tar.xz
|
||||
Source1: vendor.tar.gz
|
||||
# PATCH-FIX-UPSTREAM remote-config.patch gh#MichaelMure/git-bug!1076 mcepl@suse.com
|
||||
# try reading git-bug.remote config value before defaulting to 'origin' when no explicit REMOTE argument
|
||||
Patch0: remote-config.patch
|
||||
# PATCH-FIX-UPSTREAM CVE-2025-22869-bump-go-crypto-ssh.patch bsc#1239494 mcepl@suse.com
|
||||
# bump golang.org/x/crypto to v0.35.0
|
||||
Patch2: CVE-2025-22869-bump-go-crypto-ssh.patch
|
||||
BuildRequires: golang(API) = 1.23
|
||||
# # PATCH-FEATURE-UPSTREAM 501-export.patch gh#MichaelMure/git-bug!501 mcepl@suse.com
|
||||
# # add a command to export bugs as raw operations
|
||||
@@ -91,7 +85,7 @@ BuildArch: noarch
|
||||
zsh shell completions for git-bug
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -a1
|
||||
%setup -q -a1
|
||||
|
||||
%build
|
||||
%make_build build
|
||||
|
||||
@@ -1,106 +0,0 @@
|
||||
From 65cfe2b3fff11d34b5ffc9f7e5d24aefb505497f Mon Sep 17 00:00:00 2001
|
||||
From: William Ahern <william@25thandClement.com>
|
||||
Date: Thu, 27 Jul 2023 22:06:45 -0700
|
||||
Subject: [PATCH] pull, push: try reading git-bug.remote config value before
|
||||
defaulting to 'origin' when no explicit REMOTE argument
|
||||
|
||||
---
|
||||
commands/pull.go | 16 +++++++++++-----
|
||||
commands/push.go | 16 +++++++++++-----
|
||||
repository/config.go | 11 +++++++++++
|
||||
3 files changed, 33 insertions(+), 10 deletions(-)
|
||||
|
||||
Index: git-bug-0.8.0+git.1742269202.0ab94c9/commands/pull.go
|
||||
===================================================================
|
||||
--- git-bug-0.8.0+git.1742269202.0ab94c9.orig/commands/pull.go 2025-03-18 04:40:02.000000000 +0100
|
||||
+++ git-bug-0.8.0+git.1742269202.0ab94c9/commands/pull.go 2025-03-25 16:36:27.048924722 +0100
|
||||
@@ -8,6 +8,7 @@
|
||||
"github.com/git-bug/git-bug/commands/completion"
|
||||
"github.com/git-bug/git-bug/commands/execenv"
|
||||
"github.com/git-bug/git-bug/entity"
|
||||
+ "github.com/git-bug/git-bug/repository"
|
||||
)
|
||||
|
||||
func newPullCommand(env *execenv.Env) *cobra.Command {
|
||||
@@ -25,13 +26,18 @@
|
||||
}
|
||||
|
||||
func runPull(env *execenv.Env, args []string) error {
|
||||
- if len(args) > 1 {
|
||||
+ var remote string
|
||||
+ switch {
|
||||
+ case len(args) > 1:
|
||||
return errors.New("Only pulling from one remote at a time is supported")
|
||||
- }
|
||||
-
|
||||
- remote := "origin"
|
||||
- if len(args) == 1 {
|
||||
+ case len(args) == 1:
|
||||
remote = args[0]
|
||||
+ default:
|
||||
+ v, err := repository.GetDefaultString("git-bug.remote", env.Repo.AnyConfig(), "origin")
|
||||
+ if err != nil {
|
||||
+ return err
|
||||
+ }
|
||||
+ remote = v
|
||||
}
|
||||
|
||||
env.Out.Println("Fetching remote ...")
|
||||
Index: git-bug-0.8.0+git.1742269202.0ab94c9/commands/push.go
|
||||
===================================================================
|
||||
--- git-bug-0.8.0+git.1742269202.0ab94c9.orig/commands/push.go 2025-03-18 04:40:02.000000000 +0100
|
||||
+++ git-bug-0.8.0+git.1742269202.0ab94c9/commands/push.go 2025-03-25 16:36:27.049118817 +0100
|
||||
@@ -7,6 +7,7 @@
|
||||
|
||||
"github.com/git-bug/git-bug/commands/completion"
|
||||
"github.com/git-bug/git-bug/commands/execenv"
|
||||
+ "github.com/git-bug/git-bug/repository"
|
||||
)
|
||||
|
||||
func newPushCommand(env *execenv.Env) *cobra.Command {
|
||||
@@ -24,13 +25,18 @@
|
||||
}
|
||||
|
||||
func runPush(env *execenv.Env, args []string) error {
|
||||
- if len(args) > 1 {
|
||||
+ var remote string
|
||||
+ switch {
|
||||
+ case len(args) > 1:
|
||||
return errors.New("Only pushing to one remote at a time is supported")
|
||||
- }
|
||||
-
|
||||
- remote := "origin"
|
||||
- if len(args) == 1 {
|
||||
+ case len(args) == 1:
|
||||
remote = args[0]
|
||||
+ default:
|
||||
+ v, err := repository.GetDefaultString("git-bug.remote", env.Repo.AnyConfig(), "origin")
|
||||
+ if err != nil {
|
||||
+ return err
|
||||
+ }
|
||||
+ remote = v
|
||||
}
|
||||
|
||||
stdout, err := env.Backend.Push(remote)
|
||||
Index: git-bug-0.8.0+git.1742269202.0ab94c9/repository/config.go
|
||||
===================================================================
|
||||
--- git-bug-0.8.0+git.1742269202.0ab94c9.orig/repository/config.go 2025-03-18 04:40:02.000000000 +0100
|
||||
+++ git-bug-0.8.0+git.1742269202.0ab94c9/repository/config.go 2025-03-25 16:36:27.049354801 +0100
|
||||
@@ -60,6 +60,17 @@
|
||||
RemoveAll(keyPrefix string) error
|
||||
}
|
||||
|
||||
+func GetDefaultString(key string, cfg ConfigRead, def string) (string, error) {
|
||||
+ val, err := cfg.ReadString(key)
|
||||
+ if err == nil {
|
||||
+ return val, nil
|
||||
+ } else if errors.Is(err, ErrNoConfigEntry) {
|
||||
+ return def, nil
|
||||
+ } else {
|
||||
+ return "", err
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
func ParseTimestamp(s string) (time.Time, error) {
|
||||
timestamp, err := strconv.Atoi(s)
|
||||
if err != nil {
|
||||
BIN
vendor.tar.gz
(Stored with Git LFS)
BIN
vendor.tar.gz
(Stored with Git LFS)
Binary file not shown.
Reference in New Issue
Block a user