Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 536082 - net-proxy/privoxy-3.0.22 fails to apply privoxy-3.0.22-force.patch
Summary: net-proxy/privoxy-3.0.22 fails to apply privoxy-3.0.22-force.patch
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Andrew Savchenko
URL:
Whiteboard:
Keywords:
Depends on: CVE-2015-1030
Blocks:
  Show dependency tree
 
Reported: 2015-01-09 07:49 UTC by Justin Lecher (RETIRED)
Modified: 2015-01-09 13:41 UTC (History)
2 users (show)

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


Attachments
fail log for patching (privoxy-3.0.22-force.patch.out,2.66 KB, text/plain)
2015-01-09 07:51 UTC, Justin Lecher (RETIRED)
Details

Note You need to log in before you can comment on or make changes to this bug.
Description Justin Lecher (RETIRED) gentoo-dev 2015-01-09 07:49:28 UTC
>>> Unpacking privoxy-3.0.22-stable-src.tar.gz to /var/tmp/portage/net-proxy/privoxy-3.0.22/work
>>> Source unpacked in /var/tmp/portage/net-proxy/privoxy-3.0.22/work
>>> Preparing source in /var/tmp/portage/net-proxy/privoxy-3.0.22/work/privoxy-3.0.22-stable ...
 * Applying privoxy-3.0.19-gentoo.patch ...                                                                                                           [ ok ]
 * Applying privoxy-3.0.22-force.patch ...

 * Failed Patch: privoxy-3.0.22-force.patch !
 *  ( /local/home/justin/tree/net-proxy/privoxy/files/privoxy-3.0.22-force.patch )
 * 
 * Include in your bugreport the contents of:
 * 
 *   /var/tmp/portage/net-proxy/privoxy-3.0.22/temp/privoxy-3.0.22-force.patch.out

 * ERROR: net-proxy/privoxy-3.0.22::gentoo failed (prepare phase):
 *   Failed Patch: privoxy-3.0.22-force.patch!
 * 
 * Call stack:
 *     ebuild.sh, line   93:  Called src_prepare
 *   environment, line 3250:  Called epatch '/local/home/justin/tree/net-proxy/privoxy/files/privoxy-3.0.22-force.patch'
 *   environment, line 1940:  Called die
 * The specific snippet of code:
 *               die "Failed Patch: ${patchname}!";
 * 
 * If you need support, post the output of `emerge --info '=net-proxy/privoxy-3.0.22::gentoo'`,
 * the complete build log and the output of `emerge -pqv '=net-proxy/privoxy-3.0.22::gentoo'`.
 * The complete build log is located at '/var/log/portage/build/net-proxy/privoxy-3.0.22:20150109-074706.log'.
 * For convenience, a symlink to the build log is located at '/var/tmp/portage/net-proxy/privoxy-3.0.22/temp/build.log'.
 * The ebuild environment file is located at '/var/tmp/portage/net-proxy/privoxy-3.0.22/temp/environment'.
 * Working directory: '/var/tmp/portage/net-proxy/privoxy-3.0.22/work/privoxy-3.0.22-stable'
 * S: '/var/tmp/portage/net-proxy/privoxy-3.0.22/work/privoxy-3.0.22-stable'



$ einfo =net-proxy/privoxy-3.0.22
Portage 2.2.15 (python 2.7.9-final-0, default/linux/amd64/13.0/no-emul-linux-x86, gcc-4.9.2-asneeded, glibc-2.20-r1, 3.18.0-lh x86_64)
=================================================================
                         System Settings
=================================================================
System uname: Linux-3.18.0-lh-x86_64-Intel-R-_Core-TM-_i7-2600_CPU_@_3.40GHz-with-gentoo-2.2
KiB Mem:    16400264 total,    183256 free
KiB Swap:    8388600 total,   8388600 free
Timestamp of tree: Fri, 09 Jan 2015 07:00:01 +0000
sh bash 4.3_p33
ld GNU ld (Gentoo 2.24 p1.4) 2.24
ccache version 3.2.1 [enabled]
app-shells/bash:          4.3_p33
dev-java/java-config:     2.2.0
dev-lang/perl:            5.20.1-r4
dev-lang/python:          2.7.9-r1, 3.3.5-r1, 3.4.2
dev-util/ccache:          3.2.1-r1
dev-util/cmake:           3.0.2
dev-util/pkgconfig:       0.28-r2
sys-apps/baselayout:      2.2
sys-apps/openrc:          0.13.6
sys-apps/sandbox:         2.6-r1
sys-devel/autoconf:       2.13, 2.69
sys-devel/automake:       1.11.6-r1, 1.12.6, 1.14.1, 1.15
sys-devel/binutils:       2.24-r3
sys-devel/gcc:            4.1.2, 4.8.4, 4.9.2
sys-devel/gcc-config:     1.8
sys-devel/libtool:        2.4.4
sys-devel/make:           4.1-r1
sys-kernel/linux-headers: 3.18 (virtual/os-headers)
sys-libs/glibc:           2.20-r1
Repositories: gentoo sunrise betagarden dummy science last-hope
ACCEPT_KEYWORDS="amd64 ~amd64"
ACCEPT_LICENSE="*"
CBUILD="x86_64-pc-linux-gnu"
CFLAGS="-O2 -pipe -ftracer   -march=native -frecord-gcc-switches -g -fdiagnostics-color=always -Wimplicit-function-declaration -Wformat-security"
CHOST="x86_64-pc-linux-gnu"
CONFIG_PROTECT="/etc /usr/lib64/libreoffice/program/sofficerc /usr/share/eselect/ /usr/share/gnupg/qualified.txt /usr/share/nano/ /var/lib/hsqldb /var/spool/munin-async/.ssh /var/spool/torque"
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="-O2 -pipe -ftracer   -march=native -frecord-gcc-switches -g -fdiagnostics-color=always -Wenum-compare -Wformat-security"
DISTDIR="/var/cache/distfiles"
EMERGE_DEFAULT_OPTS=" -vt --keep-going --autounmask-write --autounmask --quiet-build=n --autounmask-unrestricted-atoms=y"
FCFLAGS="-O2 -pipe -ftracer   -march=native -frecord-gcc-switches -g -fdiagnostics-color=always"
FEATURES="assume-digests binpkg-logs buildsyspkg ccache cgroup collision-protect compressdebug distlocks ebuild-locks fixlafiles ipc-sandbox merge-sync multilib-strict network-sandbox news noinfo parallel-fetch parallel-install preserve-libs protect-owned sandbox sfperms sign split-log splitdebug strict unknown-features-warn unmerge-logs unmerge-orphans userfetch userpriv usersandbox usersync xattr"
FFLAGS="-O2 -pipe -ftracer   -march=native -frecord-gcc-switches -g -fdiagnostics-color=always"
GENTOO_MIRRORS=" /mnt/tmpfs/ http://gentoo.j-schmitz.net/mirror/ ftp://sunsite.informatik.rwth-aachen.de/pub/Linux/gentoo ftp://ftp.tu-clausthal.de/pub/linux/gentoo/"
LANG="en_GB.utf8"
LDFLAGS="-Wl,-O1 -Wl,--as-needed -Wl,-O1 -Wl,--hash-style=gnu -Wl,--sort-common"
MAKEOPTS="-j12 -l8"
PKGDIR="/var/cache/packages"
PORTAGE_COMPRESS="xz"
PORTAGE_COMPRESS_FLAGS="-z -e -9 -v"
PORTAGE_CONFIGROOT="/"
PORTAGE_RSYNC_EXTRA_OPTS="--omit-dir-times"
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"
PORTAGE_TMPDIR="/var/tmp"
PORTDIR="/var/db/portage"
PORTDIR_OVERLAY="/var/lib/layman/sunrise /local/overlays/betagarden /local/overlays/dummy /local/overlays/sci /local/overlays/lh-overlay"
SYNC="rsync://rsync.gentoo.org/gentoo-portage"
USE="X acl alsa amd64 avx bash-completion berkdb branding bzip2 cairo caps cli cracklib crypt cups cxx dbus dri fortran gdbm gif gmp gstreamer gtk gtk3 iconv icu ipv6 jpeg jpeg2k ldap logrotate mmx mmxext modules multilib ncurses network-cron nls nptl nsplugin numa opengl openmp pam pcre pgo png pulseaudio qt3support readline session smp sse sse2 sse2_4way sse2check sse3 sse4 sse41 sse4_1 sse4_2 sse4a sse5 ssl ssse3 startup-notification tcpd threads tiff truetype unicode vaapi vdpau xattr xinerama zlib" ABI_X86="64" 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="kexi words flow plan sheets stage tables krita karbon braindump author" CAMERAS="ptp2" COLLECTD_PLUGINS="df interface irq load memory rrdtool swap syslog" DRACUT_MODULES="plymouth" ELIBC="glibc" GPSD_PROTOCOLS="ashtech aivdm earthmate evermore fv18 garmin garmintxt gpsclock itrax mtk3301 nmea ntrip navcom oceanserver oldstyle oncore rtcm104v2 rtcm104v3 sirf superstar2 timing tsip tripmate tnt ublox ubx" GRUB_PLATFORMS="efi-32 efi-64" INPUT_DEVICES="evdev" KERNEL="linux" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer pdfimport scripting-javascript wiki-publisher nlpsolver" LINGUAS="en" NGINX_MODULES_HTTP="access auth_basic autoindex browser charset empty_gif fastcgi geo gzip limit_conn limit_req map memcached proxy referer rewrite scgi split_clients ssi upstream_ip_hash userid uwsgi stub_status" OFFICE_IMPLEMENTATION="libreoffice" PHP_TARGETS="php5-5" PYTHON_SINGLE_TARGET="python2_7" PYTHON_TARGETS="python2_7 python3_3 python3_4 pypy" QEMU_SOFTMMU_TARGETS="i386 x86_64 arm armeb" QEMU_USER_TARGETS="i386 x86_64 arm armeb" RUBY_TARGETS="ruby19" USERLAND="GNU" VIDEO_CARDS="nvidia" XFCE_PLUGINS="clock trash power" 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"
USE_PYTHON="2.7 3.3 3.4"
Unset:  CPPFLAGS, CTARGET, INSTALL_MASK, LC_ALL, PORTAGE_BUNZIP2_COMMAND
Comment 1 Justin Lecher (RETIRED) gentoo-dev 2015-01-09 07:50:45 UTC
We talked about this in the review session. In the patch you have the CVS tag which gets changed after committing on the server side.
Comment 2 Justin Lecher (RETIRED) gentoo-dev 2015-01-09 07:51:23 UTC
Created attachment 393510 [details]
fail log for patching
Comment 3 Andrew Savchenko gentoo-dev 2015-01-09 13:41:00 UTC
Thanks for note. I forgot that CVS may mangle patches :/

Fixed in CVS. I just removed offending chunk as it is not needed to fix original issue (upstream patch is just dirty).