Failed to emerge x11-misc/xscreensaver-5.44 while applying offensive.patch with The specific snippet of code: * die "$@" Reproducible: Didn't try emerge output: >>> Failed to emerge x11-misc/xscreensaver-5.44, Log file: >>> '/var/tmp/portage/portage/x11-misc/xscreensaver-5.44/temp/build.log' * Package: x11-misc/xscreensaver-5.44 * Repository: gentoo * Maintainer: desktop-misc@gentoo.org * Upstream: jwz@jwz.org * USE: abi_x86_64 amd64 elibc_glibc jpeg kernel_linux opengl pam perl userland_GNU * FEATURES: network-sandbox preserve-libs sandbox userpriv usersandbox * Applying xscreensaver-5.05-interix.patch ... [ ok ] * Applying xscreensaver-5.20-blurb-hndl-test-passwd.patch ... patching file driver/test-passwd.c Hunk #1 succeeded at 69 with fuzz 1 (offset 3 lines). [ ok ] * Applying xscreensaver-5.31-pragma.patch ... [ ok ] * Applying xscreensaver-5.43-gentoo.patch ... patching file driver/XScreenSaver.ad.in Hunk #2 succeeded at 63 with fuzz 2. [ ok ] * Applying xscreensaver-5.43-offensive.patch ... patching file hacks/barcode.c Hunk #1 succeeded at 121 with fuzz 1 (offset 3 lines). Hunk #2 FAILED at 130. Hunk #3 succeeded at 278 (offset 14 lines). Hunk #4 FAILED at 331. 2 out of 4 hunks FAILED -- saving rejects to file hacks/barcode.c.rej patching file hacks/glx/glsnake.c Hunk #1 succeeded at 569 (offset 4 lines). Hunk #2 succeeded at 999 (offset 4 lines). [ !! ] * ERROR: x11-misc/xscreensaver-5.44::gentoo failed (prepare phase): * patch -p1 failed with /var/tmp/portage/portage/x11-misc/xscreensaver-5.44/files/xscreensaver-5.43-offensive.patch * * Call stack: * ebuild.sh, line 125: Called src_prepare * environment, line 2480: Called eapply '/var/tmp/portage/portage/x11-misc/xscreensaver-5.44/files/xscreensaver-5.43-offensive.patch' * environment, line 1060: Called _eapply_patch '/var/tmp/portage/portage/x11-misc/xscreensaver-5.44/files/xscreensaver-5.43-offensive.patch' * environment, line 998: Called __helpers_die 'patch -p1 failed with /var/tmp/portage/portage/x11-misc/xscreensaver-5.44/files/xscreensaver-5.43-offensive.patch' * isolated-functions.sh, line 112: Called die * The specific snippet of code: * die "$@" * * If you need support, post the output of `emerge --info '=x11-misc/xscreensaver-5.44::gentoo'`, * the complete build log and the output of `emerge -pqv '=x11-misc/xscreensaver-5.44::gentoo'`. * The complete build log is located at '/var/tmp/portage/portage/x11-misc/xscreensaver-5.44/temp/build.log'. * The ebuild environment file is located at '/var/tmp/portage/portage/x11-misc/xscreensaver-5.44/temp/environment'. * Working directory: '/var/tmp/portage/portage/x11-misc/xscreensaver-5.44/work/xscreensaver-5.44' * S: '/var/tmp/portage/portage/x11-misc/xscreensaver-5.44/work/xscreensaver-5.44' * Messages for package x11-misc/xscreensaver-5.44: * ERROR: x11-misc/xscreensaver-5.44::gentoo failed (prepare phase): * patch -p1 failed with /var/tmp/portage/portage/x11-misc/xscreensaver-5.44/files/xscreensaver-5.43-offensive.patch * * Call stack: * ebuild.sh, line 125: Called src_prepare * environment, line 2480: Called eapply '/var/tmp/portage/portage/x11-misc/xscreensaver-5.44/files/xscreensaver-5.43-offensive.patch' * environment, line 1060: Called _eapply_patch '/var/tmp/portage/portage/x11-misc/xscreensaver-5.44/files/xscreensaver-5.43-offensive.patch' * environment, line 998: Called __helpers_die 'patch -p1 failed with /var/tmp/portage/portage/x11-misc/xscreensaver-5.44/files/xscreensaver-5.43-offensive.patch' * isolated-functions.sh, line 112: Called die * The specific snippet of code: * die "$@" * * If you need support, post the output of `emerge --info '=x11-misc/xscreensaver-5.44::gentoo'`, * the complete build log and the output of `emerge -pqv '=x11-misc/xscreensaver-5.44::gentoo'`. * The complete build log is located at '/var/tmp/portage/portage/x11-misc/xscreensaver-5.44/temp/build.log'. * The ebuild environment file is located at '/var/tmp/portage/portage/x11-misc/xscreensaver-5.44/temp/environment'. * Working directory: '/var/tmp/portage/portage/x11-misc/xscreensaver-5.44/work/xscreensaver-5.44' * S: '/var/tmp/portage/portage/x11-misc/xscreensaver-5.44/work/xscreensaver-5.44' * * The following package has failed to build, install, or execute postinst: * * (x11-misc/xscreensaver-5.44:0/0::gentoo, ebuild scheduled for merge), Log file: * '/var/tmp/portage/portage/x11-misc/xscreensaver-5.44/temp/build.log' * ######################### emerge --info: emerge --info Portage 2.3.94 (python 3.6.10-final-0, default/linux/amd64/17.1/desktop/gnome/systemd, gcc-9.3.0, glibc-2.30-r6, 5.4.26 x86_64) ================================================================= System uname: Linux-5.4.26-x86_64-Intel-R-_Core-TM-_i7-4710HQ_CPU_@_2.50GHz-with-gentoo-2.7 KiB Mem: 16346656 total, 10927668 free KiB Swap: 16379900 total, 16370428 free Timestamp of repository gentoo: Sat, 21 Mar 2020 11:00:01 +0000 Head commit of repository gentoo: 8cfe4af016f34465f371c7afc1496876d9524d6c sh bash 5.0_p16 ld GNU ld (Gentoo 2.34 p1) 2.34.0 app-shells/bash: 5.0_p16::gentoo dev-lang/perl: 5.30.1::gentoo dev-lang/python: 2.7.17-r1::gentoo, 3.6.10::gentoo, 3.7.7::gentoo, 3.8.2::gentoo dev-util/cmake: 3.17.0::gentoo sys-apps/baselayout: 2.7::gentoo sys-apps/sandbox: 2.18::gentoo sys-devel/autoconf: 2.13-r1::gentoo, 2.69-r5::gentoo sys-devel/automake: 1.16.1-r2::gentoo sys-devel/binutils: 2.34::gentoo sys-devel/gcc: 9.1.0-r1::gentoo, 9.3.0::gentoo sys-devel/gcc-config: 2.2.1::gentoo sys-devel/libtool: 2.4.6-r6::gentoo sys-devel/make: 4.3::gentoo sys-kernel/linux-headers: 5.5::gentoo (virtual/os-headers) sys-libs/glibc: 2.30-r6::gentoo Repositories: gentoo location: /usr/portage sync-type: rsync sync-uri: rsync://rsync.gentoo.org/gentoo-portage priority: -1000 sync-rsync-extra-opts: sync-rsync-verify-jobs: 1 sync-rsync-verify-max-age: 24 sync-rsync-verify-metamanifest: yes flatpak-overlay location: /var/lib/layman/flatpak-overlay masters: gentoo priority: 50 ACCEPT_KEYWORDS="amd64 ~amd64" ACCEPT_LICENSE="*" CBUILD="x86_64-pc-linux-gnu" CFLAGS="-march=haswell -O2 -pipe" CHOST="x86_64-pc-linux-gnu" CONFIG_PROTECT="/etc /usr/share/gnupg/qualified.txt /var/bind" CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/dconf /etc/env.d /etc/fonts/fonts.conf /etc/gconf /etc/gentoo-release /etc/revdep-rebuild /etc/sandbox.d /etc/terminfo" CXXFLAGS="-march=haswell -O2 -pipe" DISTDIR="/usr/portage/distfiles" ENV_UNSET="DBUS_SESSION_BUS_ADDRESS DISPLAY GOBIN PERL5LIB PERL5OPT PERLPREFIX PERL_CORE PERL_MB_OPT PERL_MM_OPT XAUTHORITY XDG_CACHE_HOME XDG_CONFIG_HOME XDG_DATA_HOME XDG_RUNTIME_DIR" FCFLAGS="-march=haswell -O2 -pipe" FEATURES="assume-digests binpkg-docompress binpkg-dostrip binpkg-logs config-protect-if-modified distlocks ebuild-locks fixlafiles ipc-sandbox merge-sync multilib-strict network-sandbox news parallel-fetch pid-sandbox preserve-libs protect-owned qa-unresolved-soname-deps sandbox sfperms strict unknown-features-warn unmerge-logs unmerge-orphans userfetch userpriv usersandbox usersync xattr" FFLAGS="-march=haswell -O2 -pipe" GENTOO_MIRRORS="http://ftp.ntua.gr/pub/linux/gentoo/" LANG="en_US.UTF-8" LDFLAGS="-Wl,-O1 -Wl,--as-needed" MAKEOPTS="-j4" PKGDIR="/usr/portage/packages" PORTAGE_CONFIGROOT="/" PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --omit-dir-times --compress --force --whole-file --delete --stats --human-readable --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages --exclude=/.git" PORTAGE_TMPDIR="/var/tmp/portage" USE="X a52 aac acl acpi alsa amd64 berkdb bluetooth branding bzip2 cairo cdda cdr cli colord crypt cups dbus dlz dri dts dvd dvdr eds emboss encode evo exif flac fortran gdbm gif gnome gnome-keyring gnome-online-accounts gpm gstreamer gtk iconv icu introspection ipv6 jpeg lcms ldap libnotify libsecret libtirpc mad mng mp3 mp4 mpeg multilib nautilus ncurses networkmanager nls nptl ogg opengl openmp pam pango pcre pdf png policykit ppds pulseaudio readline sdl seccomp spell split-usr ssl startup-notification svg systemd tcpd tiff tracker truetype udev udisks unicode upower usb vaapi vorbis wxwidgets x264 xattr xcb xml xv xvid zlib" ABI_X86="64" ADA_TARGET="gnat_2018" ALSA_CARDS="hda-intel" APACHE2_MODULES="authn_core authz_core socache_shmcb unixd actions alias auth_basic authn_alias authn_anon authn_dbm authn_default authn_file authz_dbm authz_default authz_groupfile authz_host authz_owner authz_user autoindex cache cgi cgid dav dav_fs dav_lock deflate dir disk_cache env expires ext_filter file_cache filter headers include info log_config logio mem_cache mime mime_magic negotiation rewrite setenvif speling status unique_id userdir usertrack vhost_alias" CALLIGRA_FEATURES="karbon sheets words" COLLECTD_PLUGINS="df interface irq load memory rrdtool swap syslog" CPU_FLAGS_X86="mmx mmxext sse sse2 aes avx avx2 f16c fma3 pclmul popcnt sse3 sse4_1 sse4_2 ssse3" ELIBC="glibc" GPSD_PROTOCOLS="ashtech aivdm earthmate evermore fv18 garmin garmintxt gpsclock greis isync itrax mtk3301 nmea ntrip navcom oceanserver oldstyle oncore rtcm104v2 rtcm104v3 sirf skytraq superstar2 timing tsip tripmate tnt ublox ubx" GRUB_PLATFORMS="efi-64" INPUT_DEVICES="libinput keyboard mouse synaptics" KERNEL="linux" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer" OFFICE_IMPLEMENTATION="libreoffice" PHP_TARGETS="php7-2" POSTGRES_TARGETS="postgres10 postgres11" PYTHON_SINGLE_TARGET="python3_6" PYTHON_TARGETS="python2_7 python3_6" RUBY_TARGETS="ruby27" USERLAND="GNU" VIDEO_CARDS="nouveau intel i965" XFCE_PLUGINS="brightness clock trash battery" XTABLES_ADDONS="quota2 psd pknock lscan length2 ipv4options ipset ipp2p iface geoip fuzzy condition tee tarpit sysrq steal rawnat logmark ipmark dhcpmac delude chaos account" Unset: CC, CPPFLAGS, CTARGET, CXX, EMERGE_DEFAULT_OPTS, INSTALL_MASK, LC_ALL, LINGUAS, PORTAGE_BINHOST, PORTAGE_BUNZIP2_COMMAND, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS
emerge --info Portage 2.3.94 (python 3.6.10-final-0, default/linux/amd64/17.1/desktop/gnome/systemd, gcc-9.3.0, glibc-2.30-r6, 5.4.26 x86_64) ================================================================= System uname: Linux-5.4.26-x86_64-Intel-R-_Core-TM-_i7-4710HQ_CPU_@_2.50GHz-with-gentoo-2.7 KiB Mem: 16346656 total, 10927668 free KiB Swap: 16379900 total, 16370428 free Timestamp of repository gentoo: Sat, 21 Mar 2020 11:00:01 +0000 Head commit of repository gentoo: 8cfe4af016f34465f371c7afc1496876d9524d6c sh bash 5.0_p16 ld GNU ld (Gentoo 2.34 p1) 2.34.0 app-shells/bash: 5.0_p16::gentoo dev-lang/perl: 5.30.1::gentoo dev-lang/python: 2.7.17-r1::gentoo, 3.6.10::gentoo, 3.7.7::gentoo, 3.8.2::gentoo dev-util/cmake: 3.17.0::gentoo sys-apps/baselayout: 2.7::gentoo sys-apps/sandbox: 2.18::gentoo sys-devel/autoconf: 2.13-r1::gentoo, 2.69-r5::gentoo sys-devel/automake: 1.16.1-r2::gentoo sys-devel/binutils: 2.34::gentoo sys-devel/gcc: 9.1.0-r1::gentoo, 9.3.0::gentoo sys-devel/gcc-config: 2.2.1::gentoo sys-devel/libtool: 2.4.6-r6::gentoo sys-devel/make: 4.3::gentoo sys-kernel/linux-headers: 5.5::gentoo (virtual/os-headers) sys-libs/glibc: 2.30-r6::gentoo Repositories: gentoo location: /usr/portage sync-type: rsync sync-uri: rsync://rsync.gentoo.org/gentoo-portage priority: -1000 sync-rsync-extra-opts: sync-rsync-verify-jobs: 1 sync-rsync-verify-max-age: 24 sync-rsync-verify-metamanifest: yes flatpak-overlay location: /var/lib/layman/flatpak-overlay masters: gentoo priority: 50 ACCEPT_KEYWORDS="amd64 ~amd64" ACCEPT_LICENSE="*" CBUILD="x86_64-pc-linux-gnu" CFLAGS="-march=haswell -O2 -pipe" CHOST="x86_64-pc-linux-gnu" CONFIG_PROTECT="/etc /usr/share/gnupg/qualified.txt /var/bind" CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/dconf /etc/env.d /etc/fonts/fonts.conf /etc/gconf /etc/gentoo-release /etc/revdep-rebuild /etc/sandbox.d /etc/terminfo" CXXFLAGS="-march=haswell -O2 -pipe" DISTDIR="/usr/portage/distfiles" ENV_UNSET="DBUS_SESSION_BUS_ADDRESS DISPLAY GOBIN PERL5LIB PERL5OPT PERLPREFIX PERL_CORE PERL_MB_OPT PERL_MM_OPT XAUTHORITY XDG_CACHE_HOME XDG_CONFIG_HOME XDG_DATA_HOME XDG_RUNTIME_DIR" FCFLAGS="-march=haswell -O2 -pipe" FEATURES="assume-digests binpkg-docompress binpkg-dostrip binpkg-logs config-protect-if-modified distlocks ebuild-locks fixlafiles ipc-sandbox merge-sync multilib-strict network-sandbox news parallel-fetch pid-sandbox preserve-libs protect-owned qa-unresolved-soname-deps sandbox sfperms strict unknown-features-warn unmerge-logs unmerge-orphans userfetch userpriv usersandbox usersync xattr" FFLAGS="-march=haswell -O2 -pipe" GENTOO_MIRRORS="http://ftp.ntua.gr/pub/linux/gentoo/" LANG="en_US.UTF-8" LDFLAGS="-Wl,-O1 -Wl,--as-needed" MAKEOPTS="-j4" PKGDIR="/usr/portage/packages" PORTAGE_CONFIGROOT="/" PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --omit-dir-times --compress --force --whole-file --delete --stats --human-readable --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages --exclude=/.git" PORTAGE_TMPDIR="/var/tmp/portage" USE="X a52 aac acl acpi alsa amd64 berkdb bluetooth branding bzip2 cairo cdda cdr cli colord crypt cups dbus dlz dri dts dvd dvdr eds emboss encode evo exif flac fortran gdbm gif gnome gnome-keyring gnome-online-accounts gpm gstreamer gtk iconv icu introspection ipv6 jpeg lcms ldap libnotify libsecret libtirpc mad mng mp3 mp4 mpeg multilib nautilus ncurses networkmanager nls nptl ogg opengl openmp pam pango pcre pdf png policykit ppds pulseaudio readline sdl seccomp spell split-usr ssl startup-notification svg systemd tcpd tiff tracker truetype udev udisks unicode upower usb vaapi vorbis wxwidgets x264 xattr xcb xml xv xvid zlib" ABI_X86="64" ADA_TARGET="gnat_2018" ALSA_CARDS="hda-intel" APACHE2_MODULES="authn_core authz_core socache_shmcb unixd actions alias auth_basic authn_alias authn_anon authn_dbm authn_default authn_file authz_dbm authz_default authz_groupfile authz_host authz_owner authz_user autoindex cache cgi cgid dav dav_fs dav_lock deflate dir disk_cache env expires ext_filter file_cache filter headers include info log_config logio mem_cache mime mime_magic negotiation rewrite setenvif speling status unique_id userdir usertrack vhost_alias" CALLIGRA_FEATURES="karbon sheets words" COLLECTD_PLUGINS="df interface irq load memory rrdtool swap syslog" CPU_FLAGS_X86="mmx mmxext sse sse2 aes avx avx2 f16c fma3 pclmul popcnt sse3 sse4_1 sse4_2 ssse3" ELIBC="glibc" GPSD_PROTOCOLS="ashtech aivdm earthmate evermore fv18 garmin garmintxt gpsclock greis isync itrax mtk3301 nmea ntrip navcom oceanserver oldstyle oncore rtcm104v2 rtcm104v3 sirf skytraq superstar2 timing tsip tripmate tnt ublox ubx" GRUB_PLATFORMS="efi-64" INPUT_DEVICES="libinput keyboard mouse synaptics" KERNEL="linux" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer" OFFICE_IMPLEMENTATION="libreoffice" PHP_TARGETS="php7-2" POSTGRES_TARGETS="postgres10 postgres11" PYTHON_SINGLE_TARGET="python3_6" PYTHON_TARGETS="python2_7 python3_6" RUBY_TARGETS="ruby27" USERLAND="GNU" VIDEO_CARDS="nouveau intel i965" XFCE_PLUGINS="brightness clock trash battery" XTABLES_ADDONS="quota2 psd pknock lscan length2 ipv4options ipset ipp2p iface geoip fuzzy condition tee tarpit sysrq steal rawnat logmark ipmark dhcpmac delude chaos account" Unset: CC, CPPFLAGS, CTARGET, CXX, EMERGE_DEFAULT_OPTS, INSTALL_MASK, LC_ALL, LINGUAS, PORTAGE_BINHOST, PORTAGE_BUNZIP2_COMMAND, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS
Created attachment 623824 [details] fixed xscreensaver ebuild
Created attachment 623826 [details, diff] fixed xscreensaver 5.44 offensive patch
added fix for xscreensaver-5.44 - removed line(s) from offensive.patch which breaks the build - chaanges ebuild to use the new offensive.patch Signed-off-by Hans Ulli Kroll <elektroman@ulli-kroll.de>
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efa9f2b010f21e54d07e9e6070ee94253038b41c commit efa9f2b010f21e54d07e9e6070ee94253038b41c Author: Jeroen Roovers <jer@gentoo.org> AuthorDate: 2020-03-22 07:32:44 +0000 Commit: Jeroen Roovers <jer@gentoo.org> CommitDate: 2020-03-22 07:33:12 +0000 x11-misc/xscreensaver: Update patches Package-Manager: Portage-2.3.94, Repoman-2.3.21 Closes: https://bugs.gentoo.org/713788 Signed-off-by: Jeroen Roovers <jer@gentoo.org> .../xscreensaver-5.44-blurb-hndl-test-passwd.patch | 10 ++++ .../files/xscreensaver-5.44-gentoo.patch | 47 +++++++++++++++ .../files/xscreensaver-5.44-offensive.patch | 68 ++++++++++++++++++++++ x11-misc/xscreensaver/xscreensaver-5.44-r1.ebuild | 6 +- 4 files changed, 128 insertions(+), 3 deletions(-)
The bug has been referenced in the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92a5fff7f88c315b7bdbeed017a090ba1d9ad79f commit 92a5fff7f88c315b7bdbeed017a090ba1d9ad79f Author: Jeroen Roovers <jer@gentoo.org> AuthorDate: 2020-03-22 08:05:22 +0000 Commit: Jeroen Roovers <jer@gentoo.org> CommitDate: 2020-03-22 08:05:42 +0000 x11-misc/xscreensaver: Replace patch with sed scripts Package-Manager: Portage-2.3.94, Repoman-2.3.21 Bug: https://bugs.gentoo.org/713788 Signed-off-by: Jeroen Roovers <jer@gentoo.org> .../files/xscreensaver-5.44-offensive.patch | 68 ---------------------- x11-misc/xscreensaver/xscreensaver-5.44-r1.ebuild | 12 +++- 2 files changed, 11 insertions(+), 69 deletions(-)
