From d891d26b600c0a2d09510706502e7702411ecdcc79fba0f759a7f4e9f19ff842 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 7 Jun 2017 07:54:24 +0000 Subject: [PATCH] Accepting request 501116 from devel:tools:scm git 2.13.1 (forwarded request 501115 from AndreasStieger) OBS-URL: https://build.opensuse.org/request/show/501116 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=198 --- git-2.13.0.tar.sign | Bin 543 -> 0 bytes git-2.13.0.tar.xz | 3 --- git-2.13.1.tar.sign | Bin 0 -> 543 bytes git-2.13.1.tar.xz | 3 +++ git.changes | 24 ++++++++++++++++++++++++ git.spec | 33 ++++++++++----------------------- 6 files changed, 37 insertions(+), 26 deletions(-) delete mode 100644 git-2.13.0.tar.sign delete mode 100644 git-2.13.0.tar.xz create mode 100644 git-2.13.1.tar.sign create mode 100644 git-2.13.1.tar.xz diff --git a/git-2.13.0.tar.sign b/git-2.13.0.tar.sign deleted file mode 100644 index 65f1caffa96db3160294ba0db77b7ce9d9db8a016b53394b9b6fb9045ddd01fd..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 543 zcmV+)0^t3L0vrSY0RjL91p-+S*BAf_2@tTg=!TZB=F6wR5B@FtEF`FuXkBjShp;$i z`d|}#-Oo)=hlN*qqd}GmdON+(!tX-PGPMr%go9IwLWQSFOTCT96qjtTNF`@}dORl) zMPtk{L7Y1Av66dUHY)$r|4=OR!E8%KUwI=~hi9JtQViztUKM5hy}*OFrk7&P&g9b3 z$X|ELztKy4vwz(`xzsqC|1Lf#2`}ZY`H?bLq|n*6&URC z(c})tl30gtUGXa1(VIVRe9H;eJwym3XJHOk+m4T{atU22uww>vOE&>zCgL{q2&{n) zgQgf}b^u@@|8`(9|2AFNt_*Z@8t-StMMBn33;fLj@U9p~5QUJnx;CLQsw-9|W^{Gz z>$sa2jEg)7HhxOUnUwlse=ZE_%Mg7|hUCrnlB%Q0xQD@A3X!$#!BXct+2Xr`-)S;7 zTt;9o7mqWjo$J9F?YUGGGIN)oGdlqbrabe6*)a!xf*?=f&>iY3BkpRS0hrumv@U`) zhUu`_KNf6HHMnf@7Xe`bw_k&qV~#w=+S->n&C6>pIqNANyaI5v)RH>Y4zHvLEp--@ h*k1`@&p`xr0Cw*!j`~Jv!d!o(aKl*X$&F(h_ZI_?|GxkL diff --git a/git-2.13.0.tar.xz b/git-2.13.0.tar.xz deleted file mode 100644 index 50b9fe1..0000000 --- a/git-2.13.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4bbf2ab6f2341253a38f95306ec7936833eb1c42572da5c1fa61f0abb2191258 -size 4744388 diff --git a/git-2.13.1.tar.sign b/git-2.13.1.tar.sign new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..0bfa4e6b5e3478d8a0c32f559c2c481eb28da7b177ed3d5d242a5b5af226fdc0 GIT binary patch literal 543 zcmV+)0^t3L0vrSY0RjL91p-+#vKIgf2@tTg=!TZB=F9$=5CDkbTkeU7bk%6U+EnfN zFd3J_k$mrr)zfyJK7p^ z&^Tvt&$Io??fCXR6&2rx-@I{>0(}S1zDK5|-JIR^Q{e%KGpdbs4CGx}=LFOuu!bP= zL=uCKhf@Lk?Fm=D5Tm8m@e!?YARo#-;enr%Xy7RNnO+bfW1?MU^l(=d)K=>CZzYYM zS=Hrp^r|ukaBt3+=p%Sun<);N>efcK#gi4AjD~kUutl>b!-;<2?*S+@N}| z9w~}uj)_|kWjB#&t+X3P83jaYn%Du%K8SzO0=_DKvc`|{ec95*iz4fWa|lc#IK!%? zH-aStUD1ct0F@-5;RXb^kicQPxQuZT3bh`{$HesP#(wVq3_CKVo_3Ye+_SkXRBaP@ zmSL6rln6*zrAlPO?qxKY8 z5Q9VCNM-2<+A6`|4GB9I`&s4cuOWjR-!3(9LQ^V}N}lB^!@qC^vHW>UuVzToui8E& zo=n|=#=J)P>&FO93_9{jV|R%y*3#>3DORGE;UKG52`Z0)2DqtZuTo8_8#qqs(b!_( h8$1S++96R1^ZH=cQx8}lXGQ8Ee{y}?nBDkEe>8m+3UvSg literal 0 HcmV?d00001 diff --git a/git-2.13.1.tar.xz b/git-2.13.1.tar.xz new file mode 100644 index 0000000..dc5e72a --- /dev/null +++ b/git-2.13.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3bc1becd983f77ab154a46801624369dbc40c3dd04b4c4b07ad026f5684688fe +size 4746640 diff --git a/git.changes b/git.changes index b35f03b..d5bb719 100644 --- a/git.changes +++ b/git.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Mon Jun 5 08:43:05 UTC 2017 - astieger@suse.com + +- git 2.13.1: + * Setting "log.decorate=false" in the configuration file did not + take effect in v2.13, which has been corrected. + * corrections to documentation and command help output + * garbage collection fixes + * memory leaks fixed + * receive-pack now makes sure that the push certificate records + the same set of push options used for pushing + * shell completion corrections for git stash + * fix "git clone --config var=val" with empty strings + * internal efficiency improvements + * Update sha1 collision detection code for big-endian platforms + and platforms not supporting unaligned fetches + +------------------------------------------------------------------- +Sat May 27 12:49:47 UTC 2017 - schwab@linux-m68k.org + +- Fix packaging of documentation + ------------------------------------------------------------------- Wed May 10 21:09:53 UTC 2017 - astieger@suse.com @@ -12,6 +34,8 @@ Wed May 10 21:09:53 UTC 2017 - astieger@suse.com * now avoid blindly falling back to ".git" when the setup sequence indicated otherwise * many workflow features, improvements and bug fixes + * add a hardened implementation of SHA1 in response to practical + collision attacks (CVE-2005-4900, bsc#1042640) ------------------------------------------------------------------- Wed May 10 07:54:52 UTC 2017 - astieger@suse.com diff --git a/git.spec b/git.spec index c8a266c..26f8764 100644 --- a/git.spec +++ b/git.spec @@ -26,7 +26,7 @@ %endif Name: git -Version: 2.13.0 +Version: 2.13.1 Release: 0 Summary: Fast, scalable, distributed revision control system License: GPL-2.0 @@ -263,7 +263,7 @@ make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \ V=1 \ prefix=%{_prefix} mandir=%{_mandir} \ gitexecdir=%{gitexecdir} \ - htmldir=%{_docdir}/git-core \ + htmldir=%{_docdir}/git \ "$@" EOF # @@ -301,7 +301,7 @@ install -m 644 %{S:6} $RPM_BUILD_ROOT/%{_fwdefdir}/git-daemon %{!?_without_docs: ./.make -C contrib/subtree install-doc} (find $RPM_BUILD_ROOT%{_bindir} -type f -o -type l | grep -vE "archimport|svn|cvs|email|gitk|git-daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files (find $RPM_BUILD_ROOT%{gitexecdir} ! -type d | grep -vE "archimport|svn|cvs|email|gitk|git-daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@) >> bin-man-doc-files -(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk|git-daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files +(find $RPM_BUILD_ROOT%{_mandir} -type f | grep -vE "archimport|svn|git-cvs|email|gitk|git-daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files ( pushd perl perl Makefile.PL make -f perl.mak DESTDIR=%{buildroot} install_vendor @@ -341,9 +341,13 @@ if ! test -f $RPM_BUILD_ROOT%{gitexecdir}/git-add; then exit 1 fi -mkdir -p "%buildroot/%_docdir/git" +mkdir -p "%buildroot/%_docdir/git" "%buildroot/%_docdir/git/howto" "%buildroot/%_docdir/git/technical" cp -a README.md COPYING Documentation/*.txt "%buildroot/%_docdir/git/" +cp -a Documentation/howto/*.txt "%buildroot/%_docdir/git/howto/" +cp -a Documentation/technical/*.txt "%buildroot/%_docdir/git/technical/" %{!?_without_docs: cp -a Documentation/*.html "%buildroot/%_docdir/git/"} +%{!?_without_docs: cp -a Documentation/howto/*.html "%buildroot/%_docdir/git/howto/"} +%{!?_without_docs: cp -a Documentation/technical/*.html "%buildroot/%_docdir/git/technical/"} install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/applications install -m 644 %{SOURCE9} $RPM_BUILD_ROOT%{_datadir}/applications @@ -383,21 +387,18 @@ fi %defattr(-,root,root) %_docdir/%name/ %exclude %_docdir/%name/README.md +%exclude %_docdir/%name/COPYING %files svn %defattr(-,root,root) %{gitexecdir}/*svn* -%doc Documentation/*svn*.txt %{!?_without_docs: %{_mandir}/man1/*svn*.1*} -%{!?_without_docs: %doc Documentation/*svn*.html } %files cvs %defattr(-,root,root) -%doc Documentation/*git-cvs*.txt %{_bindir}/git-cvs* %{gitexecdir}/*cvs* %{!?_without_docs: %{_mandir}/man1/*cvs*.1*} -%{!?_without_docs: %doc Documentation/*git-cvs*.html } %if %{with git_gnome_keyring} %files credential-gnome-keyring @@ -407,46 +408,36 @@ fi %files arch %defattr(-,root,root) -%doc Documentation/git-archimport.txt %{gitexecdir}/git-archimport %{!?_without_docs: %{_mandir}/man1/git-archimport.1*} -%{!?_without_docs: %doc Documentation/git-archimport.html } %files email %defattr(-,root,root) -%doc Documentation/*email*.txt %{gitexecdir}/*email* %{!?_without_docs: %{_mandir}/man1/*email*.1*} -%{!?_without_docs: %doc Documentation/*email*.html } %files daemon %defattr(-,root,root) -%doc Documentation/git-daemon.txt %{gitexecdir}/git-daemon /etc/init.d/git-daemon %{_sbindir}/rcgit-daemon %dir /srv/git /var/adm/fillup-templates/sysconfig.git-daemon %{!?_without_docs: %{_mandir}/man1/git-daemon.1*} -%{!?_without_docs: %doc Documentation/git-daemon.html } %config(noreplace) /etc/xinetd.d/git %config %{_fwdefdir}/* %files -n gitk %defattr(-,root,root) -%doc Documentation/*gitk*.txt %{_bindir}/gitk /usr/share/gitk %{!?_without_docs: %{_mandir}/man1/*gitk*.1*} -%{!?_without_docs: %doc Documentation/*gitk*.html } %files gui %defattr(-,root,root) -%doc Documentation/*gui*.txt %{gitexecdir}/git-gui* /usr/share/git-gui %{!?_without_docs: %{_mandir}/man1/*gui*.1*} -%{!?_without_docs: %doc Documentation/*gui*.html } %{_datadir}/applications/%{name}-gui.desktop %{_datadir}/pixmaps/%{name}-gui.png @@ -459,7 +450,6 @@ fi %files core -f bin-man-doc-files %defattr(-,root,root) -%doc %{_docdir}/git-core/ %{_datadir}/git-core/ %dir %{gitexecdir} %dir %{gitexecdir}/mergetools @@ -474,9 +464,6 @@ fi /usr/share/tcsh /etc/profile.d/*.csh /etc/zsh_completion.d -%doc README.md COPYING Documentation/*.txt - -%{!?_without_docs: %doc Documentation/*.html Documentation/howto} -%{!?_without_docs: %doc Documentation/technical} +%doc %{_docdir}/%name/COPYING %changelog