fix full repository installation conflicts - #4964
Conversation
758c78f to
41825c5
Compare
noraj
left a comment
There was a problem hiding this comment.
Thanks, this is interesting. Libsoup will probably need some adaptation from the AUR.
Thanks. The libsoup PKGBUILD in this PR is based on the current AUR libsoup 2.74.3-4 recipe. I kept the AUR source tag, dependency/provides set, docs split, and CVE cherry-pick, and adapted it for BlackArch style/aarch64. The flaky test disable is applied inline in prepare() instead of carrying the AUR patch file. Happy to adjust it closer to the AUR version if preferred. |
| install -Dm 644 -t "$pkgdir/usr/share/doc/$pkgname/" README.md | ||
| install -Dm 644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" | ||
| } | ||
|
|
There was a problem hiding this comment.
your editor must be auto-removing the trailing blank like and no following EditorConfig (https://github.com/BlackArch/blackarch/blob/master/.editorconfig), please make your IDE follows EditorConfig
| # Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org> | ||
| # Contributor: Jan de Groot <jgc@archlinux.org> | ||
|
|
||
| pkgbase=libsoup |
There was a problem hiding this comment.
Could you explain why would we need to package old libsoup 2.x while AL is already officially packaging libsoup 3.x?
There was a problem hiding this comment.
Ah yes for https://github.com/BlackArch/blackarch/blob/master/packages/webkit2gtk/PKGBUILD, @noptrix, could you tell why you added webkit2gtk?
There was a problem hiding this comment.
Anyway the AUR package is outdated, webkit2gtk requires libsoup 3 not libsoup 2: https://github.com/search?q=repo%3AWebKit%2FWebKit%20libsoup&type=code
There was a problem hiding this comment.
Also @noptrix can't we just rely on webkit2gtk-4.1? https://aur.archlinux.org/pkgbase/webkit2gtk is outdated
There was a problem hiding this comment.
Amm... yeah, sorry about the blank lines, I will restore those.
Now, about libsoup, I added libsoup 2 because the current BlackArch packages/webkit2gtk/PKGBUILD still builds with -D USE_SOUP2=ON and provides the legacy libwebkit2gtk-4.0.so, so the existing BlackArch package currently requires libsoup 2 rather than libsoup3.
That said, I agree this is only a compatibility fix. If the preferred direction is to rely on Arch’s webkit2gtk-4.1/libsoup3 instead, I can remove the libsoup addition from this PR and keep only the npm/root-module and viproy/metasploit conflict fixes
There was a problem hiding this comment.
commit 7208fc6 updates webkit2gtk to use libsoup3 and removes the obsolete USE_SOUP2 option
41825c5 to
ab8486d
Compare
Summary
webkit2gtk.npm --user rootarguments that created conflictingrootmodules.viproy-voipkitfrom owning paths belonging tometasploit.Testing
bash -nandmakepkg --printsrcinfo.padoracleandviproy-voipkit.makepkg --verifysource.Fixes #4960