Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 784335 - mail-filter/rspamd-9999: patch -p1 failed with /var/tmp/portage/mail-filter/rspamd-9999/files/rspamd-2.7-cmake-lua-version.patch
Summary: mail-filter/rspamd-9999: patch -p1 failed with /var/tmp/portage/mail-filter/...
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal
Assignee: Christian Roessner
URL:
Whiteboard:
Keywords: PullRequest
Depends on:
Blocks:
 
Reported: 2021-04-20 08:28 UTC by Joonas Niilola
Modified: 2021-08-22 02:50 UTC (History)
2 users (show)

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


Attachments
rspamd-9999.ebuild (rspamd-9999.ebuild,2.75 KB, text/plain)
2021-08-21 02:27 UTC, Kim B. Sindalsen
Details

Note You need to log in before you can comment on or make changes to this bug.
Description Joonas Niilola gentoo-dev 2021-04-20 08:28:28 UTC
* Package:    mail-filter/rspamd-9999
 * Repository: gentoo
 * Maintainer: c@roessner.co arkamar@atlas.cz,proxy-maint@gentoo.org
 * USE:        abi_x86_64 amd64 blas cpu_flags_x86_ssse3 elibc_glibc jemalloc kernel_linux lua_single_target_lua5-2 userland_GNU
 * FEATURES:   network-sandbox preserve-libs sandbox userpriv usersandbox
 * Using lua5.2 to build
>>> Unpacking source...
hint: Using 'master' as the name for the initial branch. This default branch name
hint: is subject to change. To configure the initial branch name to use in all
hint: of your new repositories, which will suppress this warning, call:
hint: 
hint: 	git config --global init.defaultBranch <name>
hint: 
hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and
hint: 'development'. The just-created branch can be renamed via this command:
hint: 
hint: 	git branch -m <name>
Initialized empty Git repository in /var/cache/distfiles/git3-src/rspamd_rspamd.git/
 * Repository id: rspamd_rspamd.git
 * To override fetched repository properties, use:
 *   EGIT_OVERRIDE_REPO_RSPAMD_RSPAMD
 *   EGIT_OVERRIDE_BRANCH_RSPAMD_RSPAMD
 *   EGIT_OVERRIDE_COMMIT_RSPAMD_RSPAMD
 *   EGIT_OVERRIDE_COMMIT_DATE_RSPAMD_RSPAMD
 * 
 * Fetching https://github.com/rspamd/rspamd.git ...
git fetch https://github.com/rspamd/rspamd.git +HEAD:refs/git-r3/HEAD
remote: Enumerating objects: 109605, done.
remote: Counting objects: 100% (614/614), done.
remote: Compressing objects: 100% (439/439), done.
remote: Total 109605 (delta 331), reused 361 (delta 172), pack-reused 108991
Receiving objects: 100% (109605/109605), 56.79 MiB | 9.54 MiB/s, done.
Resolving deltas: 100% (80780/80780), done.
From https://github.com/rspamd/rspamd
 * [new ref]                        -> refs/git-r3/HEAD
 * [new tag]             0.2.7      -> 0.2.7
 * [new tag]             0.3.0      -> 0.3.0
 * [new tag]             0.3.1      -> 0.3.1
 * [new tag]             0.3.10     -> 0.3.10
 * [new tag]             0.3.11     -> 0.3.11
 * [new tag]             0.3.12     -> 0.3.12
 * [new tag]             0.3.13     -> 0.3.13
 * [new tag]             0.3.14     -> 0.3.14
 * [new tag]             0.3.2      -> 0.3.2
 * [new tag]             0.3.3      -> 0.3.3
 * [new tag]             0.3.7      -> 0.3.7
 * [new tag]             0.3.8      -> 0.3.8
 * [new tag]             0.3.9      -> 0.3.9
 * [new tag]             0.4.0      -> 0.4.0
 * [new tag]             0.4.1      -> 0.4.1
 * [new tag]             0.4.2      -> 0.4.2
 * [new tag]             0.4.3      -> 0.4.3
 * [new tag]             0.4.4      -> 0.4.4
 * [new tag]             0.4.5      -> 0.4.5
 * [new tag]             0.4.6      -> 0.4.6
 * [new tag]             0.4.7      -> 0.4.7
 * [new tag]             0.5.0      -> 0.5.0
 * [new tag]             0.5.1      -> 0.5.1
 * [new tag]             0.5.2      -> 0.5.2
 * [new tag]             0.5.3      -> 0.5.3
 * [new tag]             0.5.4      -> 0.5.4
 * [new tag]             0.5.5      -> 0.5.5
 * [new tag]             0.5.6      -> 0.5.6
 * [new tag]             0.6.0      -> 0.6.0
 * [new tag]             0.6.1      -> 0.6.1
 * [new tag]             0.6.2      -> 0.6.2
 * [new tag]             0.6.3      -> 0.6.3
 * [new tag]             0.6.4      -> 0.6.4
 * [new tag]             0.6.5      -> 0.6.5
 * [new tag]             0.6.6      -> 0.6.6
 * [new tag]             0.6.7      -> 0.6.7
 * [new tag]             0.7.0      -> 0.7.0
 * [new tag]             0.7.1      -> 0.7.1
 * [new tag]             0.7.2      -> 0.7.2
 * [new tag]             0.7.3      -> 0.7.3
 * [new tag]             0.7.4      -> 0.7.4
 * [new tag]             0.7.5      -> 0.7.5
 * [new tag]             0.7.6      -> 0.7.6
 * [new tag]             0.8.0      -> 0.8.0
 * [new tag]             0.9.0      -> 0.9.0
 * [new tag]             0.9.1      -> 0.9.1
 * [new tag]             0.9.2      -> 0.9.2
 * [new tag]             0.9.3      -> 0.9.3
 * [new tag]             0.9.4      -> 0.9.4
 * [new tag]             1.0.0      -> 1.0.0
 * [new tag]             1.0.1      -> 1.0.1
 * [new tag]             1.0.2      -> 1.0.2
 * [new tag]             1.0.3      -> 1.0.3
 * [new tag]             1.0.4      -> 1.0.4
 * [new tag]             1.0.5      -> 1.0.5
 * [new tag]             1.0.6      -> 1.0.6
 * [new tag]             1.0.7      -> 1.0.7
 * [new tag]             1.0.8      -> 1.0.8
 * [new tag]             1.0.9      -> 1.0.9
 * [new tag]             1.1.0      -> 1.1.0
 * [new tag]             1.1.1      -> 1.1.1
 * [new tag]             1.1.2      -> 1.1.2
 * [new tag]             1.1.3      -> 1.1.3
 * [new tag]             1.2.0      -> 1.2.0
 * [new tag]             1.2.1      -> 1.2.1
 * [new tag]             1.2.2      -> 1.2.2
 * [new tag]             1.2.3      -> 1.2.3
 * [new tag]             1.2.4      -> 1.2.4
 * [new tag]             1.3.0      -> 1.3.0
 * [new tag]             1.3.1      -> 1.3.1
 * [new tag]             1.3.2      -> 1.3.2
 * [new tag]             1.3.4      -> 1.3.4
 * [new tag]             1.4.0      -> 1.4.0
 * [new tag]             1.4.1      -> 1.4.1
 * [new tag]             1.5.1      -> 1.5.1
 * [new tag]             1.5.2      -> 1.5.2
 * [new tag]             1.5.3      -> 1.5.3
 * [new tag]             1.5.4      -> 1.5.4
 * [new tag]             1.5.6      -> 1.5.6
 * [new tag]             1.6.0      -> 1.6.0
 * [new tag]             1.6.1      -> 1.6.1
 * [new tag]             1.6.2      -> 1.6.2
 * [new tag]             1.7.0      -> 1.7.0
 * [new tag]             1.7.1      -> 1.7.1
 * [new tag]             1.7.2      -> 1.7.2
 * [new tag]             1.7.3      -> 1.7.3
 * [new tag]             1.7.4      -> 1.7.4
 * [new tag]             1.7.5      -> 1.7.5
 * [new tag]             1.7.6      -> 1.7.6
 * [new tag]             1.7.7      -> 1.7.7
 * [new tag]             1.7.8      -> 1.7.8
 * [new tag]             1.7.9      -> 1.7.9
 * [new tag]             1.8.0      -> 1.8.0
 * [new tag]             1.8.1      -> 1.8.1
 * [new tag]             1.8.2      -> 1.8.2
 * [new tag]             1.8.3      -> 1.8.3
 * [new tag]             1.9.0      -> 1.9.0
 * [new tag]             1.9.1      -> 1.9.1
 * [new tag]             1.9.2      -> 1.9.2
 * [new tag]             1.9.3      -> 1.9.3
 * [new tag]             2.0        -> 2.0
 * [new tag]             2.1        -> 2.1
 * [new tag]             2.2        -> 2.2
 * [new tag]             2.3        -> 2.3
 * [new tag]             2.4        -> 2.4
 * [new tag]             2.5        -> 2.5
 * [new tag]             2.6        -> 2.6
 * [new tag]             2.7        -> 2.7
git symbolic-ref refs/git-r3/mail-filter/rspamd/0/__main__ refs/git-r3/HEAD
 * Checking out https://github.com/rspamd/rspamd.git to /var/tmp/portage/mail-filter/rspamd-9999/work/rspamd-9999 ...
git checkout --quiet refs/git-r3/HEAD
GIT NEW branch -->
   repository:               https://github.com/rspamd/rspamd.git
   at the commit:            3c98e697e188bb25c26818d38e0311af0b011443
>>> Source unpacked in /var/tmp/portage/mail-filter/rspamd-9999/work
>>> Preparing source in /var/tmp/portage/mail-filter/rspamd-9999/work/rspamd-9999 ...
 * Applying rspamd-2.7-cmake-lua-version.patch ...
patching file CMakeLists.txt
Hunk #1 FAILED at 141.
1 out of 1 hunk FAILED -- saving rejects to file CMakeLists.txt.rej
 [ !! ]
 * ERROR: mail-filter/rspamd-9999::gentoo failed (prepare phase):
 *   patch -p1  failed with /var/tmp/portage/mail-filter/rspamd-9999/files/rspamd-2.7-cmake-lua-version.patch
 * 
 * Call stack:
 *               ebuild.sh, line  125:  Called src_prepare
 *             environment, line 3272:  Called cmake_src_prepare
 *             environment, line 1466:  Called default_src_prepare
 *      phase-functions.sh, line  920:  Called __eapi6_src_prepare
 *             environment, line  276:  Called eapply '/var/tmp/portage/mail-filter/rspamd-9999/files/rspamd-2.7-cmake-lua-version.patch' '/var/tmp/portage/mail-filter/rspamd-9999/files/rspamd-2.6-unbundle-lua.patch' '/var/tmp/portage/mail-filter/rspamd-9999/files/rspamd-2.7-unbundle-zstd.patch' '/var/tmp/portage/mail-filter/rspamd-9999/files/rspamd-2.5-unbundle-snowball.patch'
 *             environment, line 1631:  Called _eapply_patch '/var/tmp/portage/mail-filter/rspamd-9999/files/rspamd-2.7-cmake-lua-version.patch'
 *             environment, line 1569:  Called __helpers_die 'patch -p1  failed with /var/tmp/portage/mail-filter/rspamd-9999/files/rspamd-2.7-cmake-lua-version.patch'
 *   isolated-functions.sh, line  112:  Called die
 * The specific snippet of code:
 *   		die "$@"
 * 
 * If you need support, post the output of `emerge --info '=mail-filter/rspamd-9999::gentoo'`,
 * the complete build log and the output of `emerge -pqv '=mail-filter/rspamd-9999::gentoo'`.
 * The complete build log is located at '/var/tmp/portage/vbslogs/build/mail-filter/rspamd-9999:20210420-082603.log'.
 * For convenience, a symlink to the build log is located at '/var/tmp/portage/mail-filter/rspamd-9999/temp/build.log'.
 * The ebuild environment file is located at '/var/tmp/portage/mail-filter/rspamd-9999/temp/environment'.
 * Working directory: '/var/tmp/portage/mail-filter/rspamd-9999/work/rspamd-9999'
 * S: '/var/tmp/portage/mail-filter/rspamd-9999/work/rspamd-9999'
Comment 1 Kim B. Sindalsen 2021-08-21 02:26:55 UTC
The patches here - https://bugs.gentoo.org/809308 + updating the 9999.ebuild seems to work.
Comment 2 Kim B. Sindalsen 2021-08-21 02:27:50 UTC
Created attachment 734683 [details]
rspamd-9999.ebuild
Comment 3 Larry the Git Cow gentoo-dev 2021-08-22 02:50:07 UTC
The bug has been closed via the following commit(s):

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

commit fd0e7ad32ff1064db8cd4ba4149cf33e2ffdeb5a
Author:     Petr Vaněk <arkamar@atlas.cz>
AuthorDate: 2021-08-21 20:53:20 +0000
Commit:     Sam James <sam@gentoo.org>
CommitDate: 2021-08-22 02:49:02 +0000

    mail-filter/rspamd: sync live
    
    Closes: https://bugs.gentoo.org/784335
    Signed-off-by: Petr Vaněk <arkamar@atlas.cz>
    Signed-off-by: Sam James <sam@gentoo.org>

 mail-filter/rspamd/rspamd-9999.ebuild | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)