Date: Wed, 16 Oct 2013 15:35:09 +0200 (CEST) From: Jimmy Olgeni <olgeni@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Cc: wxs@FreeBSD.org Subject: ports/183027: upgrade devel/git to 1.8.4.1 Message-ID: <201310161335.r9GDZ9tT035365@olgeni.olgeni> Resent-Message-ID: <201310161340.r9GDe1b5002437@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 183027
>Category: ports
>Synopsis: upgrade devel/git to 1.8.4.1
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Oct 16 13:40:01 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Jimmy Olgeni
>Release: FreeBSD 9.1-STABLE amd64
>Organization:
>Environment:
System: FreeBSD olgeni 9.1-STABLE FreeBSD 9.1-STABLE #1 r249688: Sat Apr 20 13:28:27 CEST 2013 root@olgeni:/usr/obj/usr/src/sys/RELENG_9.amd64 amd64
>Description:
Upgrade devel/git to 1.8.4.1.
This version has a FreeBSD-specific fix:
In FreeBSD's and NetBSD's "sh", a return in a dot script in a
function returns from the function, not only in the dot script,
breaking "git rebase" on these platforms (regression introduced in
1.8.4-rc1).
>How-To-Repeat:
>Fix:
Index: Makefile
===================================================================
--- Makefile (revision 330500)
+++ Makefile (working copy)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= git
-PORTVERSION= 1.8.4
+PORTVERSION= 1.8.4.1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
Index: distinfo
===================================================================
--- distinfo (revision 330500)
+++ distinfo (working copy)
@@ -1,6 +1,6 @@
-SHA256 (git-1.8.4.tar.gz) = 51e8522c256ef8091c6fd5846b9cef8ba4e764819193b5b6cec570f530e6cb94
-SIZE (git-1.8.4.tar.gz) = 4657759
-SHA256 (git-manpages-1.8.4.tar.gz) = 854552e693b22a7ff1c25d2d710d87c8f7dad14888c946c10be60893fdee091f
-SIZE (git-manpages-1.8.4.tar.gz) = 564928
-SHA256 (git-htmldocs-1.8.4.tar.gz) = 5afc0d00e476975075c3658ffb628c2d4c4f11940ff379b600e2fdf8018d622a
-SIZE (git-htmldocs-1.8.4.tar.gz) = 2202854
+SHA256 (git-1.8.4.1.tar.gz) = f05c513a4a1d9d1ca1182ff43cfbccc1e8da0120f781aca415a5e3e1132451d3
+SIZE (git-1.8.4.1.tar.gz) = 4669033
+SHA256 (git-manpages-1.8.4.1.tar.gz) = 1466dcec43f27729cb368769fa2f50945b7323fd01c8b623bc7c6092a6e9e09d
+SIZE (git-manpages-1.8.4.1.tar.gz) = 565610
+SHA256 (git-htmldocs-1.8.4.1.tar.gz) = 36d18b0ca09b80dff20d9a7937022e7f123fcbe07562146230c7e5eaad4e2f74
+SIZE (git-htmldocs-1.8.4.1.tar.gz) = 2183784
Index: pkg-plist
===================================================================
--- pkg-plist (revision 330500)
+++ pkg-plist (working copy)
@@ -1122,6 +1122,7 @@
%%CONTRIB%%share/git-core/contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh
%%CONTRIB%%share/git-core/contrib/mw-to-git/t/t9363-mw-to-git-export-import.sh
%%CONTRIB%%share/git-core/contrib/mw-to-git/t/t9364-pull-by-rev.sh
+%%CONTRIB%%share/git-core/contrib/mw-to-git/t/t9365-continuing-queries.sh
%%CONTRIB%%share/git-core/contrib/mw-to-git/t/test-gitmw-lib.sh
%%CONTRIB%%share/git-core/contrib/mw-to-git/t/test-gitmw.pl
%%CONTRIB%%share/git-core/contrib/mw-to-git/t/.gitignore
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310161335.r9GDZ9tT035365>