From 84f19fcaecbf5f2eec9e777d61a5c53dd3f29fea3738af83f8d2cc619e79bf99 Mon Sep 17 00:00:00 2001 From: Danilo Spinella Date: Fri, 31 May 2024 07:32:52 +0000 Subject: [PATCH 1/4] Accepting request 1177110 from home:mcepl:branches:devel:tools:scm - remove dependency on /usr/bin/python3 using %python3_fix_shebang_path macro, [bsc#1212476] OBS-URL: https://build.opensuse.org/request/show/1177110 OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/git?expand=0&rev=645 --- git.changes | 6 ++++++ git.spec | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/git.changes b/git.changes index ebbaf16..de1615e 100644 --- a/git.changes +++ b/git.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon May 27 10:12:52 UTC 2024 - Matej Cepl + +- remove dependency on /usr/bin/python3 using + %python3_fix_shebang_path macro, [bsc#1212476] + ------------------------------------------------------------------- Tue May 14 22:38:09 UTC 2024 - Andreas Stieger diff --git a/git.spec b/git.spec index 046a4c7..a7619c7 100644 --- a/git.spec +++ b/git.spec @@ -71,6 +71,8 @@ BuildRequires: perl-Error BuildRequires: perl-MailTools BuildRequires: pkgconfig BuildRequires: python3-base +# for the %%python3_fix_shebang_path macro +BuildRequires: python-rpm-macros BuildRequires: systemd-rpm-macros BuildRequires: tcsh BuildRequires: update-desktop-files @@ -443,6 +445,10 @@ install -m 0644 %{SOURCE11} %{buildroot}%{_sysusersdir}/ %find_lang %{name} cat %{name}.lang >>bin-man-doc-files + +# fix shebang for git-p4 (and possibly others) +%python3_fix_shebang_path %{buildroot}%{gitexecdir}/* + # use symlinks instead of hardlinks in sub-commands %fdupes -s %{buildroot} From 231671a7e82ce8cdf94f24fa5e2118d01c3584b14a250faa63e9e9b0f791e38d Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Sat, 1 Jun 2024 14:59:22 +0000 Subject: [PATCH 2/4] Accepting request 1177988 from home:AndreasStieger:branches:devel:tools:scm git 2.45.2 OBS-URL: https://build.opensuse.org/request/show/1177988 OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/git?expand=0&rev=646 --- git-2.45.1.tar.sign | Bin 566 -> 0 bytes git-2.45.1.tar.xz | 3 --- git-2.45.2.tar.sign | Bin 0 -> 566 bytes git-2.45.2.tar.xz | 3 +++ git.changes | 7 +++++++ git.spec | 4 ++-- 6 files changed, 12 insertions(+), 5 deletions(-) delete mode 100644 git-2.45.1.tar.sign delete mode 100644 git-2.45.1.tar.xz create mode 100644 git-2.45.2.tar.sign create mode 100644 git-2.45.2.tar.xz diff --git a/git-2.45.1.tar.sign b/git-2.45.1.tar.sign deleted file mode 100644 index efdb7d44fd6f8465493b1adc140aa0064e95bbf33e5410f3ed00fac008ab7ced..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SEvc79j-T@HVmj=OQ1+c^OKC zEfW(al0aVv&mJ-yLr%0x*{9HC;#@&iuHBkzS>N6Fq41++(Ngt$DoOIS|G|^|<9o!y=V0$LMs7*o| z?453V|1qIYf;jLD{K5bcVWKWatK=`k^`|7jT2K*NEs2J`GH&z$btBbL{jL}jLjSB-|z<#RBja z;|Q?QLPy%#KcsdAyV1tPH={td2(1hiD}=lqNHD{JK&xyNRjvtl^;U)a1q*xJ`u$wl z7p{hEpZdNE^~M=v-M7c$TQ^9E2#{Wrld>{sa8lLouPaT|$FSr(h+4?#H$3#;Pz6*z zPzyUI_+?-M09Fq;8k)eIC%@NdpNqdoiB#{2cm~;cJzIWf7qaAi2X*NdUmJJ)vBb}6 Ew#p+7@c;k- diff --git a/git-2.45.1.tar.xz b/git-2.45.1.tar.xz deleted file mode 100644 index 7596e5b..0000000 --- a/git-2.45.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e64d340a8e627ae22cfb8bcc651cca0b497cf1e9fdf523735544ff4a732f12bf -size 7490268 diff --git a/git-2.45.2.tar.sign b/git-2.45.2.tar.sign new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..f6a8139e9010dbe19cc3d7697b1d22f031001a9da0bf00f1742505902538ba69 GIT binary patch literal 566 zcmV-60?GY}0y6{v0SEvc79j-T@HVmj=OQ1+cfkcaLkDJF~WFF2&i%)Ydi>TXG}Z!8Ul&ZP`+aZ zwg*Ocba^V{I%#n!Pqmiou1wWX!p`**W1spO?yO~YK%{g2e_JxfgtvjL$ zpLc52rPQ6FI$KqMjriY4h~n$Cr2wZFSaOg;h70bA@qJTaeg_J!CWK4+0)u@cTJ;Z2 z_MMp1m&TS%%BJ%rRTnn4eLzH-+4ILyMSoxQ5m*%Wz5K|X!wLm>JT}CmF5vWRe9t+J z#;p!vM+ulrHwjELErb&S32|t>wg%K0)R2yKzsF}w{v_X%!u3JHaNWuvxJ(P%&KHWk z`wBsfQ!meV&rInCRvXIEDd<_KykYGde5ZN`QwGma++yxK6djRMtKd@up<+U(YssXa zF}WgHa`ZGNwFK! + +- update to 2.45.2: + * Revert "defense in depth" fixes from 2.45.1 broke 'git lfs' and + 'git annex' + ------------------------------------------------------------------- Mon May 27 10:12:52 UTC 2024 - Matej Cepl diff --git a/git.spec b/git.spec index a7619c7..f729548 100644 --- a/git.spec +++ b/git.spec @@ -36,7 +36,7 @@ %bcond_with asciidoctor %endif Name: git -Version: 2.45.1 +Version: 2.45.2 Release: 0 Summary: Fast, scalable, distributed revision control system License: GPL-2.0-only @@ -70,9 +70,9 @@ BuildRequires: pcre2-devel BuildRequires: perl-Error BuildRequires: perl-MailTools BuildRequires: pkgconfig -BuildRequires: python3-base # for the %%python3_fix_shebang_path macro BuildRequires: python-rpm-macros +BuildRequires: python3-base BuildRequires: systemd-rpm-macros BuildRequires: tcsh BuildRequires: update-desktop-files From 96f58b36fc3cef10f511bf55f04a1b1967952416f545e6d81a2a05d16027d00c Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Sat, 1 Jun 2024 14:59:36 +0000 Subject: [PATCH 3/4] Accepting request 1178001 from home:darix:apps - only call the %python3_fix_shebang_path if it is actually defined. This fixes the build on 15.x OBS-URL: https://build.opensuse.org/request/show/1178001 OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/git?expand=0&rev=647 --- git.changes | 6 ++++++ git.spec | 2 ++ 2 files changed, 8 insertions(+) diff --git a/git.changes b/git.changes index 33e3f5e..580229a 100644 --- a/git.changes +++ b/git.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri May 31 22:42:57 UTC 2024 - Marcus Rueckert + +- only call the %python3_fix_shebang_path if it is actually + defined. This fixes the build on 15.x + ------------------------------------------------------------------- Fri May 31 21:04:34 UTC 2024 - Andreas Stieger diff --git a/git.spec b/git.spec index f729548..b437467 100644 --- a/git.spec +++ b/git.spec @@ -446,8 +446,10 @@ install -m 0644 %{SOURCE11} %{buildroot}%{_sysusersdir}/ %find_lang %{name} cat %{name}.lang >>bin-man-doc-files +%if %{defined python3_fix_shebang_path} # fix shebang for git-p4 (and possibly others) %python3_fix_shebang_path %{buildroot}%{gitexecdir}/* +%endif # use symlinks instead of hardlinks in sub-commands %fdupes -s %{buildroot} From 26739b1f7278cdfc24af133b21ef22c5f1222eb05ecd493ad78685d7dc46aa16 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sun, 2 Jun 2024 09:56:00 +0000 Subject: [PATCH 4/4] Accepting request 1178014 from home:mcepl:branches:devel:tools:scm - Compat stub for %python3_fix_shebang_path OBS-URL: https://build.opensuse.org/request/show/1178014 OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/git?expand=0&rev=648 --- git.changes | 5 +++++ git.spec | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/git.changes b/git.changes index 580229a..a42ebca 100644 --- a/git.changes +++ b/git.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri May 31 22:57:33 UTC 2024 - Matej Cepl + +- Compat stub for %python3_fix_shebang_path + ------------------------------------------------------------------- Fri May 31 22:42:57 UTC 2024 - Marcus Rueckert diff --git a/git.spec b/git.spec index b437467..0fa6d30 100644 --- a/git.spec +++ b/git.spec @@ -28,6 +28,13 @@ %if ! %{defined _fillupdir} %define _fillupdir %{_localstatedir}/adm/fillup-templates %endif +# Compat stub for python3_fix_shebang_path +%{?!python3_fix_shebang_path:%define python3_fix_shebang_path(+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-=) \\\ + myargs="%{**}" \ + for f in ${myargs}; do \ + [ -f "$f" ] && sed -i -e "1s@#\\!.*python.*@#\\!$(realpath %__python3)@" $f \ + done + } %bcond_without git_libsecret %bcond_without docs %if 0%{?suse_version} >= 1500 && %{with docs}