Skip to content

Commit

Permalink
MFH: r405346, r408063, r409422, r409430
Browse files Browse the repository at this point in the history 
r405346:
Update devel/git to 2.7.0

r408063:
Lighten up the Perl dependencies.

git uses Perl for two things: Perl hooks into git, and the
git-send-email(1) script.

The Perl hooks only use p5-Error. The other modules dependencies,
p5-Authen-SASL and p5-Net-SMTP-SSL (which bring in a number of other
perl module dependencies) are only required for git-send-email(1).

This commit adds a SEND_EMAIL option, defaulted to on, that auto-enables
the PERL option and installs the git-send-email(1) script with the
extra perl modules.

With the PERL option on and SEND_EMAIL off, only the p5-Error module
is required.

No PORTREVISION bump as the default dependencies and plist haven't changed.

PR:		206901
Approved by:	garga (maintainer)
Differential Revision:	https://reviews.freebsd.org/D5179

r409422:
Update devel/git to 2.7.2

r409430:
Fix plist with NLS on after r409422.

PR:		208074
Reported by:	Sevan Janiyan <venture37@geeklan.co.uk> (via PR)
Reported by:	Tony Tung <tonytung@merly.org> (via email)
Security:	CVE-2016-2315
Security:	https://vuxml.FreeBSD.org/freebsd/93ee802e-ebde-11e5-92ce-002590263bf5.html
Approved by:	ports-secteam (with hat)
  • Loading branch information
@junovitch
junovitch committed Mar 17, 2016
1 parent fa21289 commit 0aee0b8
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 16 deletions.
16 changes: 10 additions & 6 deletions devel/git/Makefile
View file
Expand Up @@ -2,7 +2,8 @@
# $FreeBSD$

PORTNAME= git
DISTVERSION= 2.6.4
DISTVERSION= 2.7.2
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= KERNEL_ORG/software/scm/git
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
Expand Down Expand Up @@ -41,8 +42,8 @@ SHEBANG_FILES= *.perl */*.perl */*/*.perl */*.pl */*/*.pl */*/*/*.pl \
CONFIGURE_ARGS= --enable-pthreads=-pthread ac_cv_header_libcharset_h=no

OPTIONS_DEFINE= GUI SVN GITWEB CONTRIB P4 CVS HTMLDOCS PERL ICONV CURL \
ETCSHELLS NLS
OPTIONS_DEFAULT= CONTRIB P4 CVS PERL ICONV CURL ETCSHELLS NLS
ETCSHELLS SEND_EMAIL NLS
OPTIONS_DEFAULT= CONTRIB P4 CVS PERL ICONV CURL ETCSHELLS SEND_EMAIL NLS
OPTIONS_SUB= yes

GITWEB_DESC= Install gitweb
Expand All @@ -51,18 +52,21 @@ P4_DESC= Enable Perforce support
CVS_DESC= Enable CVS support
HTMLDOCS_DESC= Install additional documentation
ETCSHELLS_DESC= Modify /etc/shells
SEND_EMAIL_DESC=Enable the git-send-email(1) script

NLS_USES= gettext
NLS_MAKE_ARGS_OFF= NO_GETTEXT=yes

PERL_USES= perl5
PERL_MAKE_ENV= PERL_PATH=${PERL}
PERL_BUILD_DEPENDS= p5-Error>=0:${PORTSDIR}/lang/p5-Error
PERL_RUN_DEPENDS= p5-Error>=0:${PORTSDIR}/lang/p5-Error \
p5-Net-SMTP-SSL>=0:${PORTSDIR}/mail/p5-Net-SMTP-SSL \
p5-Authen-SASL>=0:${PORTSDIR}/security/p5-Authen-SASL
PERL_RUN_DEPENDS= p5-Error>=0:${PORTSDIR}/lang/p5-Error
PERL_MAKE_ARGS_OFF= NO_PERL=1

SEND_EMAIL_IMPLIES= PERL
SEND_EMAIL_RUN_DEPENDS= p5-Net-SMTP-SSL>=0:${PORTSDIR}/mail/p5-Net-SMTP-SSL \
p5-Authen-SASL>=0:${PORTSDIR}/security/p5-Authen-SASL

ICONV_USES= iconv
ICONV_MAKE_ARGS_OFF= NO_ICONV=1

Expand Down
12 changes: 6 additions & 6 deletions devel/git/distinfo
View file
@@ -1,6 +1,6 @@
SHA256 (git-2.6.4.tar.xz) = 1c0170952163e0b240256bc47388b95c617cf8cf446c93261df83d42cf5dd466
SIZE (git-2.6.4.tar.xz) = 3820804
SHA256 (git-manpages-2.6.4.tar.xz) = 9a71b60396789196d1c52665a8f12eda3f1f0b53ab91968de9d33572700e924c
SIZE (git-manpages-2.6.4.tar.xz) = 381548
SHA256 (git-htmldocs-2.6.4.tar.xz) = 03c43f8ce24e9ffe3b7f3066d0ffb4036a67b2ac5d0914b788379341c742167b
SIZE (git-htmldocs-2.6.4.tar.xz) = 1021204
SHA256 (git-2.7.2.tar.xz) = b20479ce523031c37581b763b4442b25b9d606f2f416049aea4e463dc150cf20
SIZE (git-2.7.2.tar.xz) = 3907296
SHA256 (git-manpages-2.7.2.tar.xz) = 19a6254a34da516e1ec67bfcbc6da7a1483440a2e8416b30e736f96c3404ff4b
SIZE (git-manpages-2.7.2.tar.xz) = 384440
SHA256 (git-htmldocs-2.7.2.tar.xz) = fabf3afa674931c70d6bb2e37497b46046f554c8d5520f0ccb126ce5e748f724
SIZE (git-htmldocs-2.7.2.tar.xz) = 1031152
17 changes: 13 additions & 4 deletions devel/git/pkg-plist
View file
Expand Up @@ -120,7 +120,7 @@ man/man1/git-rev-list.1.gz
man/man1/git-rev-parse.1.gz
man/man1/git-revert.1.gz
man/man1/git-rm.1.gz
man/man1/git-send-email.1.gz
%%SEND_EMAIL%%man/man1/git-send-email.1.gz
man/man1/git-send-pack.1.gz
man/man1/git-sh-setup.1.gz
man/man1/git-sh-i18n.1.gz
Expand Down Expand Up @@ -315,7 +315,7 @@ libexec/git-core/git-rev-list
libexec/git-core/git-rev-parse
libexec/git-core/git-revert
libexec/git-core/git-rm
libexec/git-core/git-send-email
%%SEND_EMAIL%%libexec/git-core/git-send-email
libexec/git-core/git-send-pack
libexec/git-core/git-sh-i18n
libexec/git-core/git-sh-i18n--envsubst
Expand All @@ -333,6 +333,7 @@ libexec/git-core/git-stash
libexec/git-core/git-status
libexec/git-core/git-stripspace
libexec/git-core/git-submodule
libexec/git-core/git-submodule--helper
%%CONTRIB%%libexec/git-core/git-subtree
%%SVN%%libexec/git-core/git-svn
libexec/git-core/git-symbolic-ref
Expand Down Expand Up @@ -398,6 +399,7 @@ lib/xemacs/site-lisp/git/git-blame.el
%%NLS%%share/locale/fr/LC_MESSAGES/git.mo
%%NLS%%share/locale/is/LC_MESSAGES/git.mo
%%NLS%%share/locale/it/LC_MESSAGES/git.mo
%%NLS%%share/locale/ko/LC_MESSAGES/git.mo
%%NLS%%share/locale/pt_PT/LC_MESSAGES/git.mo
%%NLS%%share/locale/ru/LC_MESSAGES/git.mo
%%NLS%%share/locale/sv/LC_MESSAGES/git.mo
Expand Down Expand Up @@ -603,7 +605,7 @@ share/git-core/templates/info/exclude
%%HTMLDOCS%%%%DOCSDIR%%/git-rev-parse.html
%%HTMLDOCS%%%%DOCSDIR%%/git-revert.html
%%HTMLDOCS%%%%DOCSDIR%%/git-rm.html
%%HTMLDOCS%%%%DOCSDIR%%/git-send-email.html
%%SEND_EMAIL%%%%HTMLDOCS%%%%DOCSDIR%%/git-send-email.html
%%HTMLDOCS%%%%DOCSDIR%%/git-send-pack.html
%%HTMLDOCS%%%%DOCSDIR%%/git-sh-i18n.html
%%HTMLDOCS%%%%DOCSDIR%%/git-sh-i18n--envsubst.html
Expand Down Expand Up @@ -961,7 +963,7 @@ share/git-core/templates/info/exclude
%%HTMLDOCS%%%%DOCSDIR%%/git-check-attr.txt
%%HTMLDOCS%%%%DOCSDIR%%/config.txt
%%HTMLDOCS%%%%DOCSDIR%%/git-http-fetch.txt
%%HTMLDOCS%%%%DOCSDIR%%/git-send-email.txt
%%SEND_EMAIL%%%%HTMLDOCS%%%%DOCSDIR%%/git-send-email.txt
%%HTMLDOCS%%%%DOCSDIR%%/git-annotate.txt
%%HTMLDOCS%%%%DOCSDIR%%/gitmodules.txt
%%HTMLDOCS%%%%DOCSDIR%%/pull-fetch-param.txt
Expand Down Expand Up @@ -1256,6 +1258,10 @@ share/git-core/templates/info/exclude
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.6.2.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.6.3.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.6.4.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.6.5.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.7.0.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.7.1.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.7.2.txt
%%GITWEB%%%%EXAMPLESDIR%%/gitweb/gitweb.cgi
%%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.js
%%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.css
Expand Down Expand Up @@ -1340,9 +1346,12 @@ share/git-core/templates/info/exclude
%%CONTRIB%%share/git-core/contrib/hg-to-git/hg-to-git.py
%%CONTRIB%%share/git-core/contrib/hg-to-git/hg-to-git.txt
%%CONTRIB%%share/git-core/contrib/hooks/multimail/CHANGES
%%CONTRIB%%share/git-core/contrib/hooks/multimail/CONTRIBUTING.rst
%%CONTRIB%%share/git-core/contrib/hooks/multimail/README
%%CONTRIB%%share/git-core/contrib/hooks/multimail/README.Git
%%CONTRIB%%share/git-core/contrib/hooks/multimail/README.migrate-from-post-receive-email
%%CONTRIB%%share/git-core/contrib/hooks/multimail/doc/gerrit.rst
%%CONTRIB%%share/git-core/contrib/hooks/multimail/doc/gitolite.rst
%%CONTRIB%%share/git-core/contrib/hooks/multimail/git_multimail.py
%%CONTRIB%%share/git-core/contrib/hooks/multimail/migrate-mailhook-config
%%CONTRIB%%share/git-core/contrib/hooks/multimail/post-receive.example
Expand Down

0 comments on commit 0aee0b8

Please sign in to comment.