wok-next rev 21166
Update git
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Mon Mar 25 11:19:27 2019 +0200 (2019-03-25) |
| parents | f1e6b2262ec2 |
| children | 467b0fd437e0 |
| files | git-gui/.hidden git/.icon.png git/receipt git/stuff/git-daemon.confd git/stuff/git-daemon.initd git/stuff/patches/dont-test-other-encodings.patch git/stuff/patches/series |
line diff
1.1 Binary file git/.icon.png has changed
2.1 --- a/git/receipt Sat Mar 23 12:48:28 2019 +0200 2.2 +++ b/git/receipt Mon Mar 25 11:19:27 2019 +0200 2.3 @@ -1,9 +1,9 @@ 2.4 # SliTaz package receipt v2. 2.5 2.6 PACKAGE="git" 2.7 -VERSION="2.20.1" 2.8 +VERSION="2.21.0" 2.9 CATEGORY="development" 2.10 -SHORT_DESC="Fast version control system" 2.11 +SHORT_DESC="A distributed version control system" 2.12 MAINTAINER="devel@slitaz.org" 2.13 LICENSE="GPL2" 2.14 WEB_SITE="https://git-scm.com/" 2.15 @@ -11,27 +11,89 @@ 2.16 2.17 TARBALL="$PACKAGE-$VERSION.tar.xz" 2.18 WGET_URL="https://www.kernel.org/pub/software/scm/git/$TARBALL" 2.19 -TARBALL_SHA1="58dca49db21f4bebf56f8861f15800f1c57c5ee3" 2.20 +TARBALL_SHA512="83f57c3950a07f6773a3aea66611d22daba0e5599e5d8f0751a16f6fdbeab0f3844d942a39a5642051212df99d1d4513253c36829b1454b4f0977cc6026fd973" 2.21 2.22 -BUILD_DEPENDS="zlib-dev openssl-dev curl-dev expat-dev perl python-dev tar \ 2.23 +aBUILD_DEPENDS="zlib-dev openssl-dev curl-dev expat-dev perl python-dev tar \ 2.24 bzip2 gettext" 2.25 -DEPENDS="zlib openssl curl expat" 2.26 +BUILD_DEPENDS="openssl-dev zlib-dev pcre2-dev curl-dev expat-dev gettext perl \ 2.27 +asciidoctor xmlto" 2.28 2.29 -CONFIG_FILES="/etc/gitconfig /etc/daemons.conf.d/git-daemon.conf" 2.30 2.31 compile_rules() { 2.32 - ./configure \ 2.33 - --prefix=/usr \ 2.34 - --with-gitconfig=/etc/gitconfig \ 2.35 - --without-tcltk \ 2.36 - $CONFIGURE_ARGS && 2.37 - make THREADED_DELTA_SEARCH=1 && 2.38 + cat >> config.mak <<-EOF 2.39 + NO_GETTEXT=YesPlease 2.40 + NO_SVN_TESTS=YesPlease 2.41 + NO_REGEX=YesPlease 2.42 + USE_ASCIIDOCTOR=1 2.43 + USE_LIBPCRE2=YesPlease 2.44 + NO_NSEC=YesPlease 2.45 + NO_SYS_POLL_H=1 2.46 + CFLAGS=$CFLAGS 2.47 + EOF 2.48 + 2.49 + make prefix=/usr DESTDIR=$install || return 1 2.50 + 2.51 make \ 2.52 - THREADED_DELTA_SEARCH=1 \ 2.53 - INSTALL_SYMLINKS=1 \ 2.54 - DESTDIR=$install install || return 1 2.55 + -j1 \ 2.56 + prefix=/usr \ 2.57 + DESTDIR=$install \ 2.58 + INSTALLDIRS=vendor \ 2.59 + install || return 1 2.60 2.61 + mkdir -p $install/var/git 2.62 +# install -Dm755 $stuff/git-daemon.initd $install/etc/init.d/git-daemon 2.63 +# install -Dm644 $stuff/git-daemon.confd $install/etc/conf.d/git-daemon 2.64 + 2.65 + make \ 2.66 + prefix=/usr \ 2.67 + DESTDIR=$install \ 2.68 + install-man || return 1 2.69 + find $install -name perllocal.pod -delete 2.70 + 2.71 + # SliTaz stuff: 2.72 install -Dm755 $stuff/git-daemon $install/etc/init.d/git-daemon 2.73 install -Dm644 $stuff/git-daemon.conf $install/etc/daemons.conf.d/git-daemon.conf 2.74 - mkdir -p $install/var/www/git/ 2.75 } 2.76 + 2.77 +SPLIT="$PACKAGE-email $PACKAGE-fast-import $PACKAGE-cvs $PACKAGE-svn \ 2.78 +$PACKAGE-p4 $PACKAGE-daemon $PACKAGE-gitweb $PACKAGE-gui $PACKAGE-perl $PACKAGE" 2.79 + 2.80 +COPY_email="git-imap-send git-send-email" 2.81 +DEPENDS_email="libcurl libpcre2-8 openssl zlib perl perl-authen-sasl perl-net-smtp-ssl" 2.82 +CAT_email="development|sending email" 2.83 + 2.84 +COPY_fast_import="git-fast-import" 2.85 +DEPENDS_fast_import="libpcre2-8 zlib $PACKAGE" 2.86 +CAT_fast_import="development|backend for fast Git data importers" 2.87 + 2.88 +COPY_cvs="git-cvsserver git-cvsexportcommit git-cvsimport" 2.89 +DEPENDS_cvs="cvs perl perl-dbd-sqlite" 2.90 +CAT="development|importing CVS repositories" 2.91 + 2.92 +COPY_svn="git-svn git-remote-testsvn" 2.93 +DEPENDS_svn="libpcre2-8 zlib perl $PACKAGE" 2.94 +CAT_svn="development|operations between Subversion and Git" 2.95 + 2.96 +COPY_p4="git-p4 p4merge" 2.97 +DEPENDS_p4="python $PACKAGE $PACKAGE-fast-import" 2.98 +CAT_p4="development|working with Perforce depots" 2.99 + 2.100 +COPY_daemon="git-daemon git-http-backend git-shell git-daemon.conf" 2.101 +DEPENDS_daemon="libpcre2-8 zlib $PACKAGE" 2.102 +CAT_daemon="development|git protocol daemon" 2.103 +CONFIG_FILES_std="/etc/daemons.conf.d/git-daemon.conf" 2.104 + 2.105 +COPY_gitweb="gitweb/ git-instaweb" 2.106 +DEPENDS_gitweb="$PACKAGE perl" 2.107 +CAT_gitweb="development|simple web interface to git repositories" 2.108 + 2.109 +COPY_gui="git-gui git-gui--askpass git-gui/ gitk gitk/ git-citool" 2.110 +DEPENDS_gui="$PACKAGE tcl tk" 2.111 +CAT_gui="development|GUI" 2.112 + 2.113 +COPY_perl="perl5/ git-add--interactive git-archimport" 2.114 +DEPENDS_perl="$PACKAGE perl" 2.115 +CAT_perl="development|Perl tools" 2.116 + 2.117 +DEPENDS_std="expat libcurl libpcre2-8 zlib" 2.118 +CONFIG_FILES_std="/etc/gitconfig"
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/git/stuff/git-daemon.confd Mon Mar 25 11:19:27 2019 +0200 3.3 @@ -0,0 +1,19 @@ 3.4 +# conf.d file for git-daemon 3.5 +# 3.6 +# Please check man 1 git-daemon for more information about the options 3.7 +# git-daemon accepts. You MUST edit this to include your repositories you wish 3.8 +# to serve. 3.9 +# 3.10 +# Some of the meaningful options are: 3.11 +# --syslog --- Enables syslog logging 3.12 +# --verbose --- Enables verbose logging 3.13 +# --export-all --- Exports all repositories 3.14 +# --port=XXXX --- Starts in port XXXX instead of 9418 3.15 +# 3.16 +GITDAEMON_OPTS="--syslog --base-path=/var/git" 3.17 + 3.18 +# To run an anonymous git safely, the following user should be able to only 3.19 +# read your Git repositories. It should not be able to write to anywhere on 3.20 +# your system, esp. not the repositories. 3.21 +GIT_USER="nobody" 3.22 +GIT_GROUP="nobody"
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 4.2 +++ b/git/stuff/git-daemon.initd Mon Mar 25 11:19:27 2019 +0200 4.3 @@ -0,0 +1,13 @@ 4.4 +#!/sbin/openrc-run 4.5 +# Copyright 1999-2014 Gentoo Foundation 4.6 +# Distributed under the terms of the GNU General Public License v2 4.7 +# $Id$ 4.8 + 4.9 +pidfile="/var/run/git-daemon.pid" 4.10 +command="/usr/bin/git" 4.11 +command_args="daemon ${GITDAEMON_OPTS}" 4.12 +start_stop_daemon_args="-e HOME= -e XDG_CONFIG_HOME= -b -m -p ${pidfile} -u ${GIT_USER:-nobody}:${GIT_GROUP:-nobody}" 4.13 + 4.14 +depend() { 4.15 + use logger 4.16 +}
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 5.2 +++ b/git/stuff/patches/dont-test-other-encodings.patch Mon Mar 25 11:19:27 2019 +0200 5.3 @@ -0,0 +1,252 @@ 5.4 +We can't support Japanese people using musl 5.5 + 5.6 +--- git-2.14.1/t/t3900-i18n-commit.sh.old 2017-08-09 14:54:31.000000000 -0500 5.7 ++++ git-2.14.1/t/t3900-i18n-commit.sh 2017-09-10 21:10:09.269860087 -0500 5.8 +@@ -76,132 +76,4 @@ 5.9 + test_i18ngrep "did not conform" "$HOME"/stderr 5.10 + ' 5.11 + 5.12 +-for H in ISO8859-1 eucJP ISO-2022-JP 5.13 +-do 5.14 +- test_expect_success "$H setup" ' 5.15 +- git config i18n.commitencoding $H && 5.16 +- git checkout -b $H C0 && 5.17 +- echo $H >F && 5.18 +- git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt 5.19 +- ' 5.20 +-done 5.21 +- 5.22 +-for H in ISO8859-1 eucJP ISO-2022-JP 5.23 +-do 5.24 +- test_expect_success "check encoding header for $H" ' 5.25 +- E=$(git cat-file commit '$H' | sed -ne "s/^encoding //p") && 5.26 +- test "z$E" = "z'$H'" 5.27 +- ' 5.28 +-done 5.29 +- 5.30 +-test_expect_success 'config to remove customization' ' 5.31 +- git config --unset-all i18n.commitencoding && 5.32 +- if Z=$(git config --get-all i18n.commitencoding) 5.33 +- then 5.34 +- echo Oops, should have failed. 5.35 +- false 5.36 +- else 5.37 +- test z = "z$Z" 5.38 +- fi && 5.39 +- git config i18n.commitencoding UTF-8 5.40 +-' 5.41 +- 5.42 +-test_expect_success 'ISO8859-1 should be shown in UTF-8 now' ' 5.43 +- compare_with ISO8859-1 "$TEST_DIRECTORY"/t3900/1-UTF-8.txt 5.44 +-' 5.45 +- 5.46 +-for H in eucJP ISO-2022-JP 5.47 +-do 5.48 +- test_expect_success "$H should be shown in UTF-8 now" ' 5.49 +- compare_with '$H' "$TEST_DIRECTORY"/t3900/2-UTF-8.txt 5.50 +- ' 5.51 +-done 5.52 +- 5.53 +-test_expect_success 'config to add customization' ' 5.54 +- git config --unset-all i18n.commitencoding && 5.55 +- if Z=$(git config --get-all i18n.commitencoding) 5.56 +- then 5.57 +- echo Oops, should have failed. 5.58 +- false 5.59 +- else 5.60 +- test z = "z$Z" 5.61 +- fi 5.62 +-' 5.63 +- 5.64 +-for H in ISO8859-1 eucJP ISO-2022-JP 5.65 +-do 5.66 +- test_expect_success "$H should be shown in itself now" ' 5.67 +- git config i18n.commitencoding '$H' && 5.68 +- compare_with '$H' "$TEST_DIRECTORY"/t3900/'$H'.txt 5.69 +- ' 5.70 +-done 5.71 +- 5.72 +-test_expect_success 'config to tweak customization' ' 5.73 +- git config i18n.logoutputencoding UTF-8 5.74 +-' 5.75 +- 5.76 +-test_expect_success 'ISO8859-1 should be shown in UTF-8 now' ' 5.77 +- compare_with ISO8859-1 "$TEST_DIRECTORY"/t3900/1-UTF-8.txt 5.78 +-' 5.79 +- 5.80 +-for H in eucJP ISO-2022-JP 5.81 +-do 5.82 +- test_expect_success "$H should be shown in UTF-8 now" ' 5.83 +- compare_with '$H' "$TEST_DIRECTORY"/t3900/2-UTF-8.txt 5.84 +- ' 5.85 +-done 5.86 +- 5.87 +-for J in eucJP ISO-2022-JP 5.88 +-do 5.89 +- if test "$J" = ISO-2022-JP 5.90 +- then 5.91 +- ICONV=$J 5.92 +- else 5.93 +- ICONV= 5.94 +- fi 5.95 +- git config i18n.logoutputencoding $J 5.96 +- for H in eucJP ISO-2022-JP 5.97 +- do 5.98 +- test_expect_success "$H should be shown in $J now" ' 5.99 +- compare_with '$H' "$TEST_DIRECTORY"/t3900/'$J'.txt $ICONV 5.100 +- ' 5.101 +- done 5.102 +-done 5.103 +- 5.104 +-for H in ISO8859-1 eucJP ISO-2022-JP 5.105 +-do 5.106 +- test_expect_success "No conversion with $H" ' 5.107 +- compare_with "--encoding=none '$H'" "$TEST_DIRECTORY"/t3900/'$H'.txt 5.108 +- ' 5.109 +-done 5.110 +- 5.111 +-test_commit_autosquash_flags () { 5.112 +- H=$1 5.113 +- flag=$2 5.114 +- test_expect_success "commit --$flag with $H encoding" ' 5.115 +- git config i18n.commitencoding $H && 5.116 +- git checkout -b $H-$flag C0 && 5.117 +- echo $H >>F && 5.118 +- git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt && 5.119 +- test_tick && 5.120 +- echo intermediate stuff >>G && 5.121 +- git add G && 5.122 +- git commit -a -m "intermediate commit" && 5.123 +- test_tick && 5.124 +- echo $H $flag >>F && 5.125 +- git commit -a --$flag HEAD~1 && 5.126 +- E=$(git cat-file commit '$H-$flag' | 5.127 +- sed -ne "s/^encoding //p") && 5.128 +- test "z$E" = "z$H" && 5.129 +- git config --unset-all i18n.commitencoding && 5.130 +- git rebase --autosquash -i HEAD^^^ && 5.131 +- git log --oneline >actual && 5.132 +- test_line_count = 3 actual 5.133 +- ' 5.134 +-} 5.135 +- 5.136 +-test_commit_autosquash_flags eucJP fixup 5.137 +- 5.138 +-test_commit_autosquash_flags ISO-2022-JP squash 5.139 +- 5.140 + test_done 5.141 +--- git-2.14.1/t/t5100-mailinfo.sh.old 2017-08-09 14:54:31.000000000 -0500 5.142 ++++ git-2.14.1/t/t5100-mailinfo.sh 2017-09-10 23:26:39.206126739 -0500 5.143 +@@ -27,6 +27,7 @@ 5.144 + 5.145 + for mail in 00* 5.146 + do 5.147 ++ if [ $mail == 0004 ]; then continue; fi 5.148 + test_expect_success "mailinfo $mail" ' 5.149 + check_mailinfo "$mail" "" && 5.150 + if test -f "$DATA/msg$mail--scissors" 5.151 +--- git-2.14.1/t/t8005-blame-i18n.sh.old 2017-08-09 14:54:31.000000000 -0500 5.152 ++++ git-2.14.1/t/t8005-blame-i18n.sh 2017-09-16 00:42:35.123728809 -0500 5.153 +@@ -24,43 +24,10 @@ 5.154 + git commit --author "$SJIS_NAME <sjis@localhost>" -m "$SJIS_MSG" 5.155 + ' 5.156 + 5.157 +-cat >expected <<EOF 5.158 +-author $SJIS_NAME 5.159 +-summary $SJIS_MSG 5.160 +-author $SJIS_NAME 5.161 +-summary $SJIS_MSG 5.162 +-author $SJIS_NAME 5.163 +-summary $SJIS_MSG 5.164 +-EOF 5.165 +- 5.166 + filter_author_summary () { 5.167 + sed -n -e '/^author /p' -e '/^summary /p' "$@" 5.168 + } 5.169 + 5.170 +-test_expect_success !MINGW \ 5.171 +- 'blame respects i18n.commitencoding' ' 5.172 +- git blame --incremental file >output && 5.173 +- filter_author_summary output >actual && 5.174 +- test_cmp expected actual 5.175 +-' 5.176 +- 5.177 +-cat >expected <<EOF 5.178 +-author $EUC_JAPAN_NAME 5.179 +-summary $EUC_JAPAN_MSG 5.180 +-author $EUC_JAPAN_NAME 5.181 +-summary $EUC_JAPAN_MSG 5.182 +-author $EUC_JAPAN_NAME 5.183 +-summary $EUC_JAPAN_MSG 5.184 +-EOF 5.185 +- 5.186 +-test_expect_success !MINGW \ 5.187 +- 'blame respects i18n.logoutputencoding' ' 5.188 +- git config i18n.logoutputencoding eucJP && 5.189 +- git blame --incremental file >output && 5.190 +- filter_author_summary output >actual && 5.191 +- test_cmp expected actual 5.192 +-' 5.193 +- 5.194 + cat >expected <<EOF 5.195 + author $UTF8_NAME 5.196 + summary $UTF8_MSG 5.197 +--- git-2.21.0/t/t0028-working-tree-encoding.sh.old 2019-02-24 16:31:46.000000000 +0000 5.198 ++++ git-2.21.0/t/t0028-working-tree-encoding.sh 2019-03-08 00:49:07.580000000 +0000 5.199 +@@ -71,14 +71,6 @@ 5.200 + test_cmp_bin test.utf8.raw test.utf16.git 5.201 + ' 5.202 + 5.203 +-test_expect_success 're-encode to UTF-16 on checkout' ' 5.204 +- test_when_finished "rm -f test.utf16.raw" && 5.205 +- 5.206 +- rm test.utf16 && 5.207 +- git checkout test.utf16 && 5.208 +- test_cmp_bin test.utf16.raw test.utf16 5.209 +-' 5.210 +- 5.211 + test_expect_success 're-encode to UTF-16-LE-BOM on checkout' ' 5.212 + rm test.utf16lebom && 5.213 + git checkout test.utf16lebom && 5.214 +@@ -143,41 +135,6 @@ 5.215 + test_i18ngrep "fatal: BOM is required .* utf-${i}" err.out && 5.216 + test_i18ngrep "use UTF-${i}BE or UTF-${i}LE" err.out 5.217 + ' 5.218 +- 5.219 +- test_expect_success "eol conversion for UTF-${i} encoded files on checkout" ' 5.220 +- test_when_finished "rm -f crlf.utf${i}.raw lf.utf${i}.raw" && 5.221 +- test_when_finished "git reset --hard HEAD^" && 5.222 +- 5.223 +- cat lf.utf8.raw | write_utf${i} >lf.utf${i}.raw && 5.224 +- cat crlf.utf8.raw | write_utf${i} >crlf.utf${i}.raw && 5.225 +- cp crlf.utf${i}.raw eol.utf${i} && 5.226 +- 5.227 +- cat >expectIndexLF <<-EOF && 5.228 +- i/lf w/-text attr/text eol.utf${i} 5.229 +- EOF 5.230 +- 5.231 +- git add eol.utf${i} && 5.232 +- git commit -m eol && 5.233 +- 5.234 +- # UTF-${i} with CRLF (Windows line endings) 5.235 +- rm eol.utf${i} && 5.236 +- git -c core.eol=crlf checkout eol.utf${i} && 5.237 +- test_cmp_bin crlf.utf${i}.raw eol.utf${i} && 5.238 +- 5.239 +- # Although the file has CRLF in the working tree, 5.240 +- # ensure LF in the index 5.241 +- git ls-files --eol eol.utf${i} >actual && 5.242 +- test_cmp expectIndexLF actual && 5.243 +- 5.244 +- # UTF-${i} with LF (Unix line endings) 5.245 +- rm eol.utf${i} && 5.246 +- git -c core.eol=lf checkout eol.utf${i} && 5.247 +- test_cmp_bin lf.utf${i}.raw eol.utf${i} && 5.248 +- 5.249 +- # The file LF in the working tree, ensure LF in the index 5.250 +- git ls-files --eol eol.utf${i} >actual && 5.251 +- test_cmp expectIndexLF actual 5.252 +- ' 5.253 + done 5.254 + 5.255 + test_expect_success 'check unsupported encodings' '