ports/opt (3.4): [notify] git: 2.15.1 -> 2.17.1, fixes CVE-2018-11233 and CVE-2018-11235

crux at crux.nu crux at crux.nu
Tue May 29 22:52:08 UTC 2018


commit e21712cced6c6194e346eb63b9f3d39849dcec30
Author: Thomas Penteker <tek at serverop.de>
Date:   Wed May 30 00:51:00 2018 +0200

    [notify] git: 2.15.1 -> 2.17.1, fixes CVE-2018-11233 and CVE-2018-11235

diff --git a/git/.footprint b/git/.footprint
index 2ca750429..1854c4d9c 100644
--- a/git/.footprint
+++ b/git/.footprint
@@ -208,30 +208,34 @@ drwxr-xr-x	root/root	usr/lib/git-core/mergetools/
 -rw-r--r--	root/root	usr/lib/git-core/mergetools/winmerge
 -rw-r--r--	root/root	usr/lib/git-core/mergetools/xxdiff
 drwxr-xr-x	root/root	usr/lib/perl5/
-drwxr-xr-x	root/root	usr/lib/perl5/5.26/
-drwxr-xr-x	root/root	usr/lib/perl5/5.26/linux-thread-multi/
 drwxr-xr-x	root/root	usr/lib/perl5/site_perl/
 drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.26/
--r--r--r--	root/root	usr/lib/perl5/site_perl/5.26/Error.pm
--r--r--r--	root/root	usr/lib/perl5/site_perl/5.26/Git.pm
+drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.26/FromCPAN/
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.26/FromCPAN/Error.pm
+drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.26/FromCPAN/Mail/
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.26/FromCPAN/Mail/Address.pm
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.26/Git.pm
 drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.26/Git/
--r--r--r--	root/root	usr/lib/perl5/site_perl/5.26/Git/I18N.pm
--r--r--r--	root/root	usr/lib/perl5/site_perl/5.26/Git/IndexInfo.pm
--r--r--r--	root/root	usr/lib/perl5/site_perl/5.26/Git/SVN.pm
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.26/Git/I18N.pm
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.26/Git/IndexInfo.pm
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.26/Git/LoadCPAN.pm
+drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.26/Git/LoadCPAN/
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.26/Git/LoadCPAN/Error.pm
+drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.26/Git/LoadCPAN/Mail/
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.26/Git/LoadCPAN/Mail/Address.pm
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.26/Git/Packet.pm
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.26/Git/SVN.pm
 drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.26/Git/SVN/
--r--r--r--	root/root	usr/lib/perl5/site_perl/5.26/Git/SVN/Editor.pm
--r--r--r--	root/root	usr/lib/perl5/site_perl/5.26/Git/SVN/Fetcher.pm
--r--r--r--	root/root	usr/lib/perl5/site_perl/5.26/Git/SVN/GlobSpec.pm
--r--r--r--	root/root	usr/lib/perl5/site_perl/5.26/Git/SVN/Log.pm
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.26/Git/SVN/Editor.pm
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.26/Git/SVN/Fetcher.pm
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.26/Git/SVN/GlobSpec.pm
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.26/Git/SVN/Log.pm
 drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.26/Git/SVN/Memoize/
--r--r--r--	root/root	usr/lib/perl5/site_perl/5.26/Git/SVN/Memoize/YAML.pm
--r--r--r--	root/root	usr/lib/perl5/site_perl/5.26/Git/SVN/Migration.pm
--r--r--r--	root/root	usr/lib/perl5/site_perl/5.26/Git/SVN/Prompt.pm
--r--r--r--	root/root	usr/lib/perl5/site_perl/5.26/Git/SVN/Ra.pm
--r--r--r--	root/root	usr/lib/perl5/site_perl/5.26/Git/SVN/Utils.pm
-drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.26/linux-thread-multi/
-drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.26/linux-thread-multi/auto/
-drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.26/linux-thread-multi/auto/Git/
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.26/Git/SVN/Memoize/YAML.pm
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.26/Git/SVN/Migration.pm
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.26/Git/SVN/Prompt.pm
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.26/Git/SVN/Ra.pm
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.26/Git/SVN/Utils.pm
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/git-core/
 drwxr-xr-x	root/root	usr/share/git-core/templates/
@@ -240,6 +244,7 @@ drwxr-xr-x	root/root	usr/share/git-core/templates/branches/
 drwxr-xr-x	root/root	usr/share/git-core/templates/hooks/
 -rwxr-xr-x	root/root	usr/share/git-core/templates/hooks/applypatch-msg.sample
 -rwxr-xr-x	root/root	usr/share/git-core/templates/hooks/commit-msg.sample
+-rwxr-xr-x	root/root	usr/share/git-core/templates/hooks/fsmonitor-watchman.sample
 -rwxr-xr-x	root/root	usr/share/git-core/templates/hooks/post-update.sample
 -rwxr-xr-x	root/root	usr/share/git-core/templates/hooks/pre-applypatch.sample
 -rwxr-xr-x	root/root	usr/share/git-core/templates/hooks/pre-commit.sample
@@ -469,16 +474,6 @@ drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/gitk.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/gitremote-helpers.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/gitweb.1.gz
-drwxr-xr-x	root/root	usr/share/man/man3/
--r--r--r--	root/root	usr/share/man/man3/Git.3pm.gz
--r--r--r--	root/root	usr/share/man/man3/Git::I18N.3pm.gz
--r--r--r--	root/root	usr/share/man/man3/Git::SVN::Editor.3pm.gz
--r--r--r--	root/root	usr/share/man/man3/Git::SVN::Fetcher.3pm.gz
--r--r--r--	root/root	usr/share/man/man3/Git::SVN::Memoize::YAML.3pm.gz
--r--r--r--	root/root	usr/share/man/man3/Git::SVN::Prompt.3pm.gz
--r--r--r--	root/root	usr/share/man/man3/Git::SVN::Ra.3pm.gz
--r--r--r--	root/root	usr/share/man/man3/Git::SVN::Utils.3pm.gz
--r--r--r--	root/root	usr/share/man/man3/private-Error.3pm.gz
 drwxr-xr-x	root/root	usr/share/man/man5/
 -rw-r--r--	root/root	usr/share/man/man5/gitattributes.5.gz
 -rw-r--r--	root/root	usr/share/man/man5/githooks.5.gz
diff --git a/git/.md5sum b/git/.md5sum
index 4fd33fd76..ad6fa691c 100644
--- a/git/.md5sum
+++ b/git/.md5sum
@@ -1,4 +1,4 @@
 07297ac00d466c0c7c94afeaa16bc903  git
-48f7904c4401864751de7d52949f5de5  git-2.15.1.tar.xz
-2cb428071c08c7df513cfc103610536e  git-manpages-2.15.1.tar.xz
+5179245515c637357b4a134e8d4e9a6f  git-2.17.1.tar.xz
+f1d5dfc1459c9f2885f790c5af7473d1  git-manpages-2.17.1.tar.xz
 3de52107e3cf0fae68bc0798add324dd  gitd.rc
diff --git a/git/.signature b/git/.signature
index 93989a0b2..85aa990de 100644
--- a/git/.signature
+++ b/git/.signature
@@ -1,8 +1,8 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/esTxS0HekeUvW62hrkzEtHkru9PtwLY1pXe4i0IqgiaSOWNPYZfyaokODBqqwciZZyzKQslNSjV2ehJl4mKpAg=
-SHA256 (Pkgfile) = f1dd1773125427799f4b4c98bb4877046a519c66e32659a6c9e6a7849c968d75
-SHA256 (.footprint) = 85a6ad8f80c83c15df82bbfcd7e3acfc87ac9b276a2a901b1edd7229a3ef99da
-SHA256 (git-2.15.1.tar.xz) = 999c90fd7d45066992cdb87dda35bdff6dfc1d01496118ea718dfb866da4045c
-SHA256 (git-manpages-2.15.1.tar.xz) = 6c6bcf7d53aec8a498a1f5af558ae8f83daf892c3565188ee81ce34f6f022656
+RWSE3ohX2g5d/aJwmAPa/Yh4M7euiFWKlB3r4YJsOiDLeCXG8uiKX8COyvH2VMkASKKe197wPo8O96gDgTafkVHJayp1pgHa6w8=
+SHA256 (Pkgfile) = 90bf1ebbbb05a9d206ddc0625599a27325620b8015a889eb6a3bcbc65d37c8fc
+SHA256 (.footprint) = 676276f38a334a06dde26c9e16469d3e31a66f22a195b5da6aef5a3359d5deb3
+SHA256 (git-2.17.1.tar.xz) = 79136e7aa83abae4d8a25c8111f113d3c5a63aeb5fd93cc72c26d49c6d5ba65e
+SHA256 (git-manpages-2.17.1.tar.xz) = 83d54786ea634488458486f262cb5157629a898f9d45f5d86b302aac79ceef54
 SHA256 (git) = 432108f8c5f5abeb429cab25181b43ee42060d46fa7fbe7e4b02790b56f61e8a
 SHA256 (gitd.rc) = 3a7a13fcfbf493890e58a3c1c8a71de08518b35fa6fe6109120a03cd8beeac25
diff --git a/git/Pkgfile b/git/Pkgfile
index 59d34dd2e..35eebec30 100644
--- a/git/Pkgfile
+++ b/git/Pkgfile
@@ -6,7 +6,7 @@
 # Nice to have: tk
 
 name=git
-version=2.15.1
+version=2.17.1
 release=1
 source=(https://www.kernel.org/pub/software/scm/git/git-{,manpages-}$version.tar.xz
         git gitd.rc)
@@ -14,12 +14,12 @@ source=(https://www.kernel.org/pub/software/scm/git/git-{,manpages-}$version.tar
 build() {
   cd $name-$version
 
-  # install Error.pm. this pretty much sucks, but i'm too lazy to
-  # investigate whether there's a better way.
-  sed -i -e '47d' -e '49d' perl/Makefile.PL
-
-  make CFLAGS="$CFLAGS" prefix=/usr gitexecdir=/usr/lib/git-core \
-       INSTALLSITEMAN3DIR=/usr/share/man/man3 DESTDIR=$PKG install
+  make CFLAGS="$CFLAGS" \
+       prefix=/usr \
+       gitexecdir=/usr/lib/git-core \
+       INSTALLSITEMAN3DIR=/usr/share/man/man3 \
+       perllibdir=/usr/lib/perl5/site_perl/5.26 \
+       DESTDIR=$PKG install
 
   cd $SRC
 


More information about the CRUX mailing list