diff options
author | Juergen Daubert <jue@jue.li> | 2020-06-10 08:33:18 +0000 |
---|---|---|
committer | Juergen Daubert <jue@jue.li> | 2020-06-10 08:33:18 +0000 |
commit | 47b9b61d70869157ee7193aa5846e28255abf5a9 (patch) | |
tree | 25c57a9ba23057d5a319ef44b4efd136a8386951 /git | |
parent | 0bf181d9bcb6bbd8e4f65676608741018d009a26 (diff) | |
parent | 14fac675058a372d7c70e7b47603195dff470e83 (diff) | |
download | opt-47b9b61d70869157ee7193aa5846e28255abf5a9.tar.gz opt-47b9b61d70869157ee7193aa5846e28255abf5a9.tar.xz |
Merge branch '3.5' into 3.6
Diffstat (limited to 'git')
-rw-r--r-- | git/.footprint | 4 | ||||
-rw-r--r-- | git/.signature | 10 | ||||
-rw-r--r-- | git/Pkgfile | 4 |
3 files changed, 10 insertions, 8 deletions
diff --git a/git/.footprint b/git/.footprint index f5f09d48c..fb0e474db 100644 --- a/git/.footprint +++ b/git/.footprint @@ -27,6 +27,7 @@ drwxr-xr-x root/root usr/lib/git-core/ -rwxr-xr-x root/root usr/lib/git-core/git-bisect--helper -rwxr-xr-x root/root usr/lib/git-core/git-blame -rwxr-xr-x root/root usr/lib/git-core/git-branch +-rwxr-xr-x root/root usr/lib/git-core/git-bugreport -rwxr-xr-x root/root usr/lib/git-core/git-bundle -rwxr-xr-x root/root usr/lib/git-core/git-cat-file -rwxr-xr-x root/root usr/lib/git-core/git-check-attr @@ -88,7 +89,6 @@ drwxr-xr-x root/root usr/lib/git-core/ -rwxr-xr-x root/root usr/lib/git-core/git-init-db -rwxr-xr-x root/root usr/lib/git-core/git-instaweb -rwxr-xr-x root/root usr/lib/git-core/git-interpret-trailers --rwxr-xr-x root/root usr/lib/git-core/git-legacy-stash -rwxr-xr-x root/root usr/lib/git-core/git-log -rwxr-xr-x root/root usr/lib/git-core/git-ls-files -rwxr-xr-x root/root usr/lib/git-core/git-ls-remote @@ -341,6 +341,7 @@ drwxr-xr-x root/root usr/share/man/man1/ -rw-r--r-- root/root usr/share/man/man1/git-bisect.1.gz -rw-r--r-- root/root usr/share/man/man1/git-blame.1.gz -rw-r--r-- root/root usr/share/man/man1/git-branch.1.gz +-rw-r--r-- root/root usr/share/man/man1/git-bugreport.1.gz -rw-r--r-- root/root usr/share/man/man1/git-bundle.1.gz -rw-r--r-- root/root usr/share/man/man1/git-cat-file.1.gz -rw-r--r-- root/root usr/share/man/man1/git-check-attr.1.gz @@ -501,6 +502,7 @@ drwxr-xr-x root/root usr/share/man/man7/ -rw-r--r-- root/root usr/share/man/man7/gitcvs-migration.7.gz -rw-r--r-- root/root usr/share/man/man7/gitdiffcore.7.gz -rw-r--r-- root/root usr/share/man/man7/giteveryday.7.gz +-rw-r--r-- root/root usr/share/man/man7/gitfaq.7.gz -rw-r--r-- root/root usr/share/man/man7/gitglossary.7.gz -rw-r--r-- root/root usr/share/man/man7/gitnamespaces.7.gz -rw-r--r-- root/root usr/share/man/man7/gitremote-helpers.7.gz diff --git a/git/.signature b/git/.signature index 479206b9a..bc53352f9 100644 --- a/git/.signature +++ b/git/.signature @@ -1,8 +1,8 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/TsnYh7IQSoF4tZC0hjDnCPuEbeSesG+NwMenDjVdG329cP33BKSyioWtIea3P++4b+7a2bacq48+jY/+5VNBAQ= -SHA256 (Pkgfile) = 14a1658d1c6c1913e2c99f7a908f815efe1937e996b60cd53e18c33fbf365c95 -SHA256 (.footprint) = 51e0ded94500e87aa83b80e7577d7bbe41921975412303895e2e32a59f6b43b0 -SHA256 (git-2.26.2.tar.xz) = 6d65132471df9e531807cb2746f8be317e22a343b9385bbe11c9ce7f0d2fc848 -SHA256 (git-manpages-2.26.2.tar.xz) = 433de104f74a855b7074d88a27e77bf6f0764074e449ffc863f987c124716465 +RWSE3ohX2g5d/XYPur0pg6kBikFg0yXeBBS7THWT+u7oDZsgbQso94rJYzZVuygfAKpD2X4e7WcElpC6BUh3H5rXDdYoKUmvJgE= +SHA256 (Pkgfile) = 86928a2131c28ed733a8f51ad4d1482c6e4da4f73759faa56ba0797e33ae6ab9 +SHA256 (.footprint) = 7232a7709db361459794e260e628039e36e47a08a927aaebcf0ba366ed8fe90e +SHA256 (git-2.27.0.tar.xz) = 73ca9774d7fa226e1d87c1909401623f96dca6a044e583b9a762e84d7d1a73f9 +SHA256 (git-manpages-2.27.0.tar.xz) = e6cbab49b04c975886fdddf46eb24c5645c6799224208db8b01143091d9bd49c SHA256 (git) = 432108f8c5f5abeb429cab25181b43ee42060d46fa7fbe7e4b02790b56f61e8a SHA256 (gitd.rc) = 3a7a13fcfbf493890e58a3c1c8a71de08518b35fa6fe6109120a03cd8beeac25 diff --git a/git/Pkgfile b/git/Pkgfile index 61efab8b9..3f0474422 100644 --- a/git/Pkgfile +++ b/git/Pkgfile @@ -6,8 +6,8 @@ # Nice to have: tk name=git -version=2.26.2 -release=2 +version=2.27.0 +release=1 source=(https://www.kernel.org/pub/software/scm/git/git-{,manpages-}$version.tar.xz git gitd.rc) |