diff options
author | Andrew G. Morgan <morgan@kernel.org> | 2021-02-04 22:15:03 -0800 |
---|---|---|
committer | Andrew G. Morgan <morgan@kernel.org> | 2021-02-04 22:19:16 -0800 |
commit | 75a5a9e4dd897890ee6be679477cb9086b45c47f (patch) | |
tree | 081ba0fd53b42820f38d2d9571dc021a35b399c7 | |
parent | cfd4c3b031966638d64928169f89c25e3979ae6c (diff) | |
download | libcap2-75a5a9e4dd897890ee6be679477cb9086b45c47f.tar.gz |
Upgrade cap and psx Go modules to version 1.2.48psx/v1.2.48cap/v1.2.48
Go has its own notion of major version, and this commit raises
it from 0 to 1. That is, these modules should now be considered
stable.
The sources for the 1.2.48 and the 0.2.48 modules are otherwise
identical.
Signed-off-by: Andrew G. Morgan <morgan@kernel.org>
-rw-r--r-- | Make.Rules | 10 | ||||
-rw-r--r-- | Makefile | 4 | ||||
-rw-r--r-- | cap/go.mod | 2 | ||||
-rw-r--r-- | contrib/seccomp/go.mod | 2 | ||||
-rw-r--r-- | goapps/gowns/go.mod | 2 | ||||
-rw-r--r-- | goapps/setid/go.mod | 4 | ||||
-rw-r--r-- | goapps/web/go.mod | 2 |
7 files changed, 13 insertions, 13 deletions
@@ -43,11 +43,11 @@ LIBDIR=$(lib_prefix)/$(lib) PKGCONFIGDIR=$(LIBDIR)/pkgconfig GOPKGDIR=$(prefix)/share/gocode/src -# Once go1.16 is released, I plan to set this value to 1 and keep it -# there. The Go packages should always remain backwardly compatible, -# but I may have to up it if Go's syntax dramatically changes in a -# backwards incompatible manner. (Let's hope not.) -GOMAJOR=0 +# From here on out, the Go module packages should always remain +# backwardly compatible. I will only resort to using major version 2 +# etc if Go's syntax dramatically changes in a backwards incompatible +# manner. (Let's hope not.) +GOMAJOR=1 # Compilation specifics @@ -82,8 +82,8 @@ morganrelease: distcheck git tag -u E2CCF3F4 -s libcap-korg-$(VERSION).$(MINOR) -m "This is libcap-$(VERSION).$(MINOR)" @echo "The following are for the Go module tracking." git tag -u D41A6DF2 -s v$(GOMAJOR).$(VERSION).$(MINOR) -m "This is the version tag for the 'libcap' Go base directory associated with libcap-$(VERSION).$(MINOR)." - git tag -u D41A6DF2 -s psx/v$(GOMAJOR).$(VERSION).$(MINOR) -m "This is the version tag for the 'psx' Go package associated with libcap-$(VERSION).$(MINOR)." - git tag -u D41A6DF2 -s cap/v$(GOMAJOR).$(VERSION).$(MINOR) -m "This is the version tag for the 'cap' Go package associated with libcap-$(VERSION).$(MINOR)." + git tag -u D41A6DF2 -s psx/v$(GOMAJOR).$(VERSION).$(MINOR) -m "This is the (stable) version tag for the 'psx' Go package associated with libcap-$(VERSION).$(MINOR)." + git tag -u D41A6DF2 -s cap/v$(GOMAJOR).$(VERSION).$(MINOR) -m "This is the (stable) version tag for the 'cap' Go package associated with libcap-$(VERSION).$(MINOR)." $(MAKE) release @echo "sign the tar file using korg key" cd .. && gpg -sba -u E2CCF3F4 libcap-$(VERSION).$(MINOR).tar @@ -2,4 +2,4 @@ module kernel.org/pub/linux/libs/security/libcap/cap go 1.11 -require kernel.org/pub/linux/libs/security/libcap/psx v0.2.48 +require kernel.org/pub/linux/libs/security/libcap/psx v1.2.48 diff --git a/contrib/seccomp/go.mod b/contrib/seccomp/go.mod index 86e40c6..589d8ec 100644 --- a/contrib/seccomp/go.mod +++ b/contrib/seccomp/go.mod @@ -2,4 +2,4 @@ module explore go 1.14 -require kernel.org/pub/linux/libs/security/libcap/psx v0.2.48 +require kernel.org/pub/linux/libs/security/libcap/psx v1.2.48 diff --git a/goapps/gowns/go.mod b/goapps/gowns/go.mod index bc534af..22f7b28 100644 --- a/goapps/gowns/go.mod +++ b/goapps/gowns/go.mod @@ -2,4 +2,4 @@ module gowns go 1.15 -require kernel.org/pub/linux/libs/security/libcap/cap v0.2.48 +require kernel.org/pub/linux/libs/security/libcap/cap v1.2.48 diff --git a/goapps/setid/go.mod b/goapps/setid/go.mod index cd2282d..f18c921 100644 --- a/goapps/setid/go.mod +++ b/goapps/setid/go.mod @@ -3,6 +3,6 @@ module setid go 1.11 require ( - kernel.org/pub/linux/libs/security/libcap/cap v0.2.48 - kernel.org/pub/linux/libs/security/libcap/psx v0.2.48 + kernel.org/pub/linux/libs/security/libcap/cap v1.2.48 + kernel.org/pub/linux/libs/security/libcap/psx v1.2.48 ) diff --git a/goapps/web/go.mod b/goapps/web/go.mod index f7ae28b..f05f82d 100644 --- a/goapps/web/go.mod +++ b/goapps/web/go.mod @@ -2,4 +2,4 @@ module web go 1.11 -require kernel.org/pub/linux/libs/security/libcap/cap v0.2.48 +require kernel.org/pub/linux/libs/security/libcap/cap v1.2.48 |