Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 770841 - app-text/asciidoc: upstream reorganization has broken ebuild (changed tarballs)
Summary: app-text/asciidoc: upstream reorganization has broken ebuild (changed tarballs)
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal major (vote)
Assignee: Marc Joliet
URL:
Whiteboard:
Keywords: PATCH, PullRequest
: 771174 (view as bug list)
Depends on:
Blocks: 769209
  Show dependency tree
 
Reported: 2021-02-15 21:52 UTC by Scott Alfter
Modified: 2021-03-29 20:59 UTC (History)
5 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Scott Alfter 2021-02-15 21:52:55 UTC
asciidoc has been reorganized, probably to remove Python 2 support.  The tarballs they're serving up have changed, breaking the Portage manifest.  Also, the tarball unpacks to asciidoc-py-9.0.4, not asciidoc-py3-9.0.4, so a change to the definition of S in the ebuild is also necessary:

--- asciidoc-9.0.4.ebuild       2021-02-15 13:13:27.020000000 -0800
+++ asciidoc-9.0.4.ebuild       2021-02-15 13:45:23.490000000 -0800
@@ -46,7 +46,7 @@
           docbook-xsl/asciidoc-docbook-xsl.txt dblatex/dblatex-readme.txt
           filters/code/code-filter-readme.txt )

-S="${WORKDIR}/${PN}-py3-${PV/_/}"
+S="${WORKDIR}/${PN}-py-${PV/_/}"

 src_prepare() {
        default


Reproducible: Always

Steps to Reproduce:
emerge -1 asciidoc
Actual Results:  
fails to build with an invalid checksum, or something to that effect

Expected Results:  
should be built
Comment 1 Marc Joliet 2021-02-16 10:23:13 UTC
Confirmed.  I remember there being a reason why I can't use the assets attached to the AsciiDoc releases, but I'll investigate this when I have time later today.  In the meantime, can you please check whether the other versions also broke, if you have the time?

(Also, why can't I mark this as confirmed?)
Comment 2 Scott Alfter 2021-02-16 15:30:58 UTC
(In reply to Marc Joliet from comment #1)
> In the meantime, can you please check whether the other
> versions also broke, if you have the time?

I tried building v9.0.5 as a workaround; it failed in the same manner.  That was when I copied the v9.0.4 ebuild into my overlay and fixed it.  I would assume the same fix would apply to the newer version as well.

(Just tested...same fix applies to the older and newer ebuilds.  The only difference between ebuilds is the KEYWORDS enabled in each.)
Comment 3 Marc Joliet 2021-02-16 20:29:07 UTC
OK, so I won't have time to solve this until tomorrow after all.  However, this should be mitigated by the fact that the files are automatically mirrored.  In fact, just now while trying to test using a different source archive I couldn't convince ebuild(5) to *not* use the distfile mirror, and I'm too tired to figure it out (I'm probably doing something wrong with/in my test container, but don't know what exactly).
Comment 4 Sam James archtester Gentoo Infrastructure gentoo-dev Security 2021-02-17 21:50:40 UTC
*** Bug 771174 has been marked as a duplicate of this bug. ***
Comment 5 Sam James archtester Gentoo Infrastructure gentoo-dev Security 2021-02-17 21:51:09 UTC
(In reply to Marc Joliet from comment #3)
> OK, so I won't have time to solve this until tomorrow after all.  However,
> this should be mitigated by the fact that the files are automatically
> mirrored.  In fact, just now while trying to test using a different source
> archive I couldn't convince ebuild(5) to *not* use the distfile mirror, and
> I'm too tired to figure it out (I'm probably doing something wrong with/in
> my test container, but don't know what exactly).

GENTOO_MIRRORS="" ebuild foo.ebuild clean test
Comment 6 Marc Joliet 2021-02-18 11:46:23 UTC
(In reply to Sam James from comment #5)
[...]
> 
> GENTOO_MIRRORS="" ebuild foo.ebuild clean test

Thanks, that worked.  I'm just surprised that neither RESTRICT="mirror" nor RESTRICT="fetch" worked.

Assuming I handled the PR correctly, how do I handle bug #769209?  Do I just edit the package list once the new revisions are in?
Comment 7 Sam James archtester Gentoo Infrastructure gentoo-dev Security 2021-03-01 23:13:34 UTC
(In reply to Marc Joliet from comment #6)
> (In reply to Sam James from comment #5)
> [...]
> > 
> > GENTOO_MIRRORS="" ebuild foo.ebuild clean test
> 
> Thanks, that worked.  I'm just surprised that neither RESTRICT="mirror" nor
> RESTRICT="fetch" worked.
> 
> Assuming I handled the PR correctly, how do I handle bug #769209?  Do I just
> edit the package list once the new revisions are in?

Yeah, just nudge it to the new revisions. :)
Comment 8 Larry the Git Cow gentoo-dev 2021-03-29 20:59:36 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66358a5d95c84fcf8958098b5e71076d4622ecfc

commit 66358a5d95c84fcf8958098b5e71076d4622ecfc
Author:     Marc Joliet <marcec@gmx.de>
AuthorDate: 2021-02-18 11:16:43 +0000
Commit:     Sam James <sam@gentoo.org>
CommitDate: 2021-03-29 20:14:49 +0000

    app-text/asciidoc: switch to more stable distfiles
    
    Switch away from the automatically generated source archives to those
    provided by upstream.  This should prevent any future checksum errors.
    
    Closes: https://bugs.gentoo.org/770841
    Package-Manager: Portage-3.0.13, Repoman-3.0.2
    RepoMan-Options: --force
    Signed-off-by: Marc Joliet <marcec@gmx.de>
    Closes: https://github.com/gentoo/gentoo/pull/19517
    Signed-off-by: Sam James <sam@gentoo.org>

 app-text/asciidoc/Manifest                                          | 6 +++---
 .../asciidoc/{asciidoc-9.0.2.ebuild => asciidoc-9.0.2-r1.ebuild}    | 4 +---
 .../asciidoc/{asciidoc-9.0.4.ebuild => asciidoc-9.0.4-r1.ebuild}    | 4 +---
 .../asciidoc/{asciidoc-9.0.5.ebuild => asciidoc-9.0.5-r1.ebuild}    | 4 +---
 4 files changed, 6 insertions(+), 12 deletions(-)