Created attachment 443408 [details] diff3test.tar This also affects dispatch-conf, sometimes silently corrupting live configuration files. I attach a tarball with files from my system to reproduce the issue. localhost ~ # tar xpf diff3test.tar localhost diff3test # diff -v diff (GNU diffutils) 3.3 Packaged by Gentoo (3.3) Copyright (C) 2013 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Written by Paul Eggert, Mike Haertel, David Hayes, Richard Stallman, and Len Tower. localhost diff3test # ./test.sh ====3 1:85c 2:85c unix_sock_group = "libvirt" 3:85c #unix_sock_group = "libvirt" ====3 1:102c 2:102c unix_sock_rw_perms = "0770" 3:102c #unix_sock_rw_perms = "0770" ====3 1:245c 2:245c # A whitelist of allowed SASL usernames. The format for usernames 3:245c # A whitelist of allowed SASL usernames. The format for username ====3 1:261a 2:261a 3:262,268c # Override the compile time default TLS priority string. The # default is usually "NORMAL" unless overridden at build time. # Only set this is it is desired for libvirt to deviate from # the global default settings. # #tls_priority="NORMAL" ====3 1:279,280c 2:279,280c # authenticated clients. The default value is zero, meaning # the feature is disabled. 3:286,287c # authenticated clients. The default value is 20. Set this to # zero to turn this feature off. localhost diff3test # emerge -a =diffutils-3.4 ... localhost diff3test # diff -v diff (GNU diffutils) 3.4 Packaged by Gentoo (3.4) Copyright (C) 2016 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Written by Paul Eggert, Mike Haertel, David Hayes, Richard Stallman, and Len Tower. localhost diff3test # ./test.sh ====3 1:85c 2:85c UUUU \ No newline at end of file 3:85c U�P� Q� \ No newline at end of file ====3 1:102c 2:102c Q�@Q��Q��Q� \ No newline at end of file 3:102c #unix!hP� \ No newline at end of file ====3 1:245c 2:245c !hP�! \ No newline at end of file 3:245c !�P�! \ No newline at end of file ====3 1:261a 2:261a 3:262,268c ��fffff f R�`R��R�@R��R��R��R� # Only !�P�! !�P� ! \ No newline at end of file ====3 1:279,280c 2:279,280c P�!� ���� \ No newline at end of file 3:286,287c ���`S��S��S��S��S� T� T�his feat!� \ No newline at end of file localhost diff3test #
localhost diff3test # emerge --info =sys-apps/diffutils-3.4::gentoo Portage 2.2.28 (python 2.7.10-final-0, default/linux/amd64/13.0, gcc-4.9.3, glibc-2.22-r4, 4.4.6-gentoo x86_64) ================================================================= System Settings ================================================================= System uname: Linux-4.4.6-gentoo-x86_64-Intel-R-_Core-TM-_i5-2520M_CPU_@_2.50GHz-with-gentoo-2.2 KiB Mem: 4043380 total, 3815740 free KiB Swap: 0 total, 0 free Timestamp of repository gentoo: Mon, 15 Aug 2016 00:45:01 +0000 sh bash 4.3_p42-r1 ld GNU ld (Gentoo 2.25.1 p1.1) 2.25.1 app-shells/bash: 4.3_p42-r1::gentoo dev-lang/perl: 5.20.2::gentoo dev-lang/python: 2.7.10-r1::gentoo, 3.4.3-r1::gentoo dev-util/pkgconfig: 0.28-r2::gentoo sys-apps/baselayout: 2.2::gentoo sys-apps/openrc: 0.19.1::gentoo sys-apps/sandbox: 2.10-r1::gentoo sys-devel/autoconf: 2.69::gentoo sys-devel/automake: 1.14.1::gentoo, 1.15::gentoo sys-devel/binutils: 2.25.1-r1::gentoo sys-devel/gcc: 4.9.3::gentoo sys-devel/gcc-config: 1.7.3::gentoo sys-devel/libtool: 2.4.6::gentoo sys-devel/make: 4.1-r1::gentoo sys-kernel/linux-headers: 4.3::gentoo (virtual/os-headers) sys-libs/glibc: 2.22-r4::gentoo Repositories: gentoo location: /usr/portage sync-type: rsync sync-uri: rsync://rsync.gentoo.org/gentoo-portage priority: -1000 ACCEPT_KEYWORDS="amd64" ACCEPT_LICENSE="* -@EULA" CBUILD="x86_64-pc-linux-gnu" CFLAGS="-O2 -pipe" CHOST="x86_64-pc-linux-gnu" CONFIG_PROTECT="/etc" CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/env.d /etc/gconf /etc/gentoo-release /etc/sandbox.d /etc/terminfo" CXXFLAGS="-O2 -pipe" DISTDIR="/usr/portage/distfiles" FCFLAGS="-O2 -pipe" FEATURES="assume-digests binpkg-logs config-protect-if-modified distlocks ebuild-locks fixlafiles merge-sync news parallel-fetch preserve-libs protect-owned sandbox sfperms strict unknown-features-warn unmerge-logs unmerge-orphans userfetch userpriv usersandbox usersync xattr" FFLAGS="-O2 -pipe" GENTOO_MIRRORS="http://distfiles.gentoo.org" LDFLAGS="-Wl,-O1 -Wl,--as-needed" 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" USE="acl amd64 berkdb bindist bzip2 cli cracklib crypt cxx dri fortran gdbm iconv ipv6 mmx mmxext modules multilib ncurses nls nptl openmp pam pcre readline seccomp session sse sse2 ssl tcpd unicode xattr zlib" ABI_X86="64" ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1x ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 intel8x0m maestro3 trident usb-audio via82xx via82xx-modem ymfpci" 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" CPU_FLAGS_X86="mmx sse sse2" 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" INPUT_DEVICES="keyboard mouse evdev" 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="php5-5" PYTHON_SINGLE_TARGET="python2_7" PYTHON_TARGETS="python2_7 python3_4" RUBY_TARGETS="ruby20 ruby21" USERLAND="GNU" VIDEO_CARDS="amdgpu fbdev intel nouveau radeon radeonsi vesa dummy v4l" 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, LANG, LC_ALL, MAKEOPTS, PORTAGE_BUNZIP2_COMMAND, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS, USE_PYTHON ================================================================= Package Settings ================================================================= sys-apps/diffutils-3.4::gentoo was built with the following: USE="nls -static" ABI_X86="64" localhost diff3test # emerge -pvq =sys-apps/diffutils-3.4::gentoo [ebuild R ] sys-apps/diffutils-3.4 USE="nls -static" * IMPORTANT: 10 news items need reading for repository 'gentoo'. * Use eselect news read to view new items.
Example showing dispatch-conf corrupting configuration file: occam ~ # cat /etc/portage/package.unmask/diffmask ## *gentoo* # Alon Bar-Lev <alonbl@gentoo.org> (13 May 2016) # Force gnutls-3.4 testing so we can stabilize it. >=net-libs/gnutls-3.5.0 # Davide Pesavento <pesa@gentoo.org> (23 Jul 2015) # Standalone version of qtwebkit from the 2.3 upstream branch. # Needs revdep testing. Bug #388207. =dev-qt/qtwebkit-4.10* occam ~ # diffmask -a libav-12\* Unmasking media-video/libav-12_pre20160529. New package.unmask saved as /etc/portage/package.unmask/._cfg0000_diffmask. Please run dispatch-conf or etc-update to merge it. occam ~ # cat /etc/portage/package.unmask/._cfg0000_diffmask ## *gentoo* # Alon Bar-Lev <alonbl@gentoo.org> (13 May 2016) # Force gnutls-3.4 testing so we can stabilize it. >=net-libs/gnutls-3.5.0 # Davide Pesavento <pesa@gentoo.org> (23 Jul 2015) # Standalone version of qtwebkit from the 2.3 upstream branch. # Needs revdep testing. Bug #388207. =dev-qt/qtwebkit-4.10* # Luca Barbato <lu_zero@gentoo.org> (23 May 2016) # Masked for testing, vlc-2.2 configure rejects it. =media-video/libav-12* occam ~ # dispatch-conf occam ~ # echo $? 0 occam ~ # cat /etc/portage/package.unmask/diffmask ## *gentoo* # Alon Bar-Lev <alonbl@gentoo.org> (13 May 2016) # Force gnutls-3.4 testing so we can stabilize it. >=net-libs/gnutls-3.5.0 # Davide Pesavento <pesa@gentoo.org> (23 Jul 2015) # Standalone version of qtwebkit from the 2.3 upstream branch. # Needs revdep testing. Bug #388207. =dev-qt/qtwebkit-4.10* �తs it. 1;��>��occam ~ #
*probably* a dupe, based on the fix message. *** This bug has been marked as a duplicate of bug 591044 ***
This is caused by upstream commit 3b74a905c5[1], which has been reverted in commit 1a0df4396e[2] after the 3.4 release. 1: http://git.savannah.gnu.org/gitweb/?p=diffutils.git;a=commit;h=3b74a905c5460e7979c53273ac90345860d001a7 2: http://git.savannah.gnu.org/gitweb/?p=diffutils.git;a=commit;h=1a0df4396ebe3b9a58b882bb976cfce3f50d3cac
isn't that what I said *** This bug has been marked as a duplicate of bug 591044 ***
