Bug#990935: unblock: zsh-antigen/2.2.3-4
On Sun, Jul 11, 2021 at 03:06:35PM +0300, Adrian Bunk wrote:
> Package: release.debian.org
> Severity: normal
> User: release.debian.org@packages.debian.org
> Usertags: unblock
>
> Please unblock package zsh-antigen
>
> * Add patch to replace PWD in Makefile (Closes: #906757).
> (change by Michael Fladischer)
>
>
> The effect of this bug was that /usr/share/zsh-antigen/antigen.zsh
> was being misbuilt.
>
>
> Quoting from a comment in #906757:
> It looks like the make command from antigen builds the antigen script by
> copying files from it's source directory into bin/antigen.zsh.
>
> When it does that, it uses a GLOB variable, that accumulatees the files
> to copy. This in turn is filled by the COMMANDS, HELPERS and LIB
> variables (Makefile.in lines 48-50).
>
>
> diffoscope between 2.2.3-3 and 2.2.3-4 confirms this.
>
>
> "source /usr/share/zsh-antigen/antigen.zsh" fails with the package
> in bullseye but appears to work with the package in unstable.
And now with a non-empty debdiff...
cu
Adrian
diff -Nru zsh-antigen-2.2.3/debian/changelog zsh-antigen-2.2.3/debian/changelog
--- zsh-antigen-2.2.3/debian/changelog 2020-12-04 22:21:35.000000000 +0200
+++ zsh-antigen-2.2.3/debian/changelog 2021-03-09 17:37:29.000000000 +0200
@@ -1,3 +1,9 @@
+zsh-antigen (2.2.3-4) unstable; urgency=medium
+
+ * Add patch to replace PWD in Makefile (Closes: #906757).
+
+ -- Michael Fladischer <fladi@debian.org> Tue, 09 Mar 2021 16:37:29 +0100
+
zsh-antigen (2.2.3-3) unstable; urgency=medium
* Update patch to use UTC timestamp and Debian revision to support
diff -Nru zsh-antigen-2.2.3/debian/patches/0002-Replace-PWD-environment-with-PROJECT-variable-Closes.patch zsh-antigen-2.2.3/debian/patches/0002-Replace-PWD-environment-with-PROJECT-variable-Closes.patch
--- zsh-antigen-2.2.3/debian/patches/0002-Replace-PWD-environment-with-PROJECT-variable-Closes.patch 1970-01-01 02:00:00.000000000 +0200
+++ zsh-antigen-2.2.3/debian/patches/0002-Replace-PWD-environment-with-PROJECT-variable-Closes.patch 2021-03-09 17:37:29.000000000 +0200
@@ -0,0 +1,25 @@
+From: Michael Fladischer <FladischerMichael@fladi.at>
+Date: Tue, 9 Mar 2021 16:25:31 +0100
+Subject: Replace PWD environment with PROJECT variable (Closes: #906757).
+
+---
+ Makefile.in | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index ad1ac59..de32824 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -45,9 +45,9 @@ GLOB += ${SRC}/boot.zsh
+ EXTENSIONS += ${SRC}/ext/cache.zsh
+ endif
+
+-LIB = $(filter-out ${SRC}/lib/log.zsh,$(sort $(wildcard ${PWD}/src/lib/*.zsh)))
+-HELPERS = $(sort $(wildcard ${PWD}/src/helpers/*.zsh))
+-COMMANDS= $(sort $(wildcard ${PWD}/src/commands/*.zsh))
++LIB = $(filter-out ${SRC}/lib/log.zsh,$(sort $(wildcard ${PROJECT}/src/lib/*.zsh)))
++HELPERS = $(sort $(wildcard ${PROJECT}/src/helpers/*.zsh))
++COMMANDS= $(sort $(wildcard ${PROJECT}/src/commands/*.zsh))
+ GLOB += ${SRC}/antigen.zsh ${HELPERS} ${LIB} ${COMMANDS} ${EXTENSIONS}
+
+ ifeq (${WITH_COMPLETION}, yes)
diff -Nru zsh-antigen-2.2.3/debian/patches/series zsh-antigen-2.2.3/debian/patches/series
--- zsh-antigen-2.2.3/debian/patches/series 2020-12-04 22:21:35.000000000 +0200
+++ zsh-antigen-2.2.3/debian/patches/series 2021-03-09 17:37:29.000000000 +0200
@@ -1 +1,2 @@
0001-Use-package-specific-revision-and-date-for-build.patch
+0002-Replace-PWD-environment-with-PROJECT-variable-Closes.patch
Reply to: