The change that this patch makes was mostly included in the glibc 2.11.2 release - the only difference is that the version in the patch is not commented out. Nevertheless, the patch still applies, but with a fuzz of 2. It should be changed so that it only changes the existing text by uncommenting it, instead of adding more stuff. By the way, it would be nice if epatch printed out info which patch reports like the fuzz factor and line offset used. It might help in spotting this sort of stuff sooner. I had to manually run patch in order to see that it was using a fuzzy match. Reproducible: Always Steps to Reproduce: 1. emerge =sys-libs/glibc-2.11.2, updating from an older version 2. etc-update 3. Actual Results: Observe that the new gai.conf has two copies of basically the same text. Expected Results: Only one copy.
Please attach your emerge --info and the part of build.log ( just to see the epatch output )
I'm not sure why, but alright... * Applying Gentoo Glibc Patchset 2.11.2-2 ... * 0020_all_glibc-tweak-rfc1918-lookup.patch ... [ ok ] * 0030_all_glibc-respect-env-CPPFLAGS.patch ... [ ok ] * 0044_all_glibc-2.10-resolv-nameserver-fallback.patch ... [ ok ] * 0085_all_glibc-disable-ldconfig.patch ... [ ok ] * 1010_all_glibc-queue-header-updates.patch ... [ ok ] * 1020_all_glibc-longjmp-chk-hidden-fortify.patch ... [ ok ] * 1030_all_glibc-manual-no-perl.patch ... [ ok ] * 1040_all_2.3.3-localedef-fix-trampoline.patch ... [ ok ] * 1055_all_glibc-resolv-dynamic.patch ... [ ok ] * 1060_all_glibc-localedef-mmap.patch ... [ ok ] * 1070_all_glibc-fadvise64_64.patch ... [ ok ] * 1073_all_glibc-ldbl-nexttowardf.patch ... [ ok ] * 1075_all_glibc-section-comments.patch ... [ ok ] * 1080_all_glibc-no-inline-gmon.patch ... [ ok ] * 1085_all_glibc-2.9-check_native-headers.patch ... [ ok ] * 1090_all_glibc-2.3.6-fix-pr631.patch ... [ ok ] * 1095_all_glibc-2.9-assume-pipe2.patch ... [ ok ] * 1100_all_glibc-2.3.3-china.patch ... [ ok ] * 1103_all_glibc-new-valencian-locale.patch ... [ ok ] * 1120_all_glibc-2.11-longjmp-chk-fallback.patch ... [ ok ] * 1130_all_glibc-2.4-undefine-__i686.patch ... [ ok ] * 1160_all_glibc-2.8-nscd-one-fork.patch ... [ ok ] * 1508_all_glibc-2.11-hppa-SOCK_CLOEXEC.patch ... [ ok ] * 1530_all_glibc-m68k-sys-user.patch ... [ ok ] * 3000_all_2.3.6-dl_execstack-PaX-support.patch ... [ ok ] * 3010_all_2.3.3_pre20040117-pt_pax.patch ... [ ok ] * 3020_all_glibc-tests-sandbox-libdl-paths.patch ... [ ok ] * 5021_all_2.9-fnmatch.patch ... [ ok ] * 5063_all_glibc-dont-build-timezone.patch ... [ ok ] * 6001_all_alpha-glibc-2.4-xstat.patch ... [ ok ] * 6015_all_alpha-glibc-2.5-no-page-header.patch ... [ ok ] * 6017_all_alpha-glibc-2.8-creat.patch ... [ ok ] * 6018_all_alpha-glibc-2.8-cache-shape.patch ... [ ok ] * 6019_all_alpha-glibc-ptr-mangling.patch ... [ ok ] * 6020_all_alpha-fix-gcc-4.1-warnings.patch ... [ ok ] * 6020_all_alpha-floor_ceil_fix.patch ... [ ok ] * 6021_all_alpha-add-dl-procinfo-support.patch ... [ ok ] * 6023_all_alpha-fcntl-updates.patch ... [ ok ] * 6024_all_alpha-settime-typo.patch ... [ ok ] * 6026_all_alpha-fix-rtld-fPIC.patch ... [ ok ] * 6027_all_alpha-fix-memchr.patch ... [ ok ] * 6028_all_alpha-fix-SOCK_NONBLOCK.patch ... [ ok ] * 6120_all_ppc-glibc-2.9-atomic.patch ... [ ok ] * 6130_all_ppc-glibc-2.11-cell-vector.patch ... [ ok ] * 6220_all_glibc-2.4-arm-cirrus-ep93xx-maverick-crunch-fpu.patch ... [ ok ] * 6240_all_glibc-2.8-nptl-lowlevellock.patch ... [ ok ] * 6418_all_sh-glibc-2.9-set-fpscr-proto.patch ... [ ok ] * 6605_all_glibc-2.4-fpu-cw-mips.patch ... [ ok ] * 6610_all_glibc-r10k-workarounds.patch ... [ ok ] * Done with patching Portage 2.1.8.3 (default/linux/x86/10.0, gcc-4.3.4, glibc-2.11.2-r0, 2.6.31-gentoo-r6 x86_64) ================================================================= System uname: Linux-2.6.31-gentoo-r6-x86_64-Intel-R-_Core-TM-2_Duo_CPU_T7500_@_2.20GHz-with-gentoo-1.12.13 Timestamp of tree: Mon, 05 Jul 2010 03:00:01 +0000 app-shells/bash: 4.0_p37 dev-lang/python: 2.6.5-r2 sys-apps/baselayout: 1.12.13 sys-apps/sandbox: 1.6-r2 sys-devel/autoconf: 2.65 sys-devel/automake: 1.9.6-r3, 1.10.3, 1.11.1 sys-devel/binutils: 2.20.1-r1 sys-devel/gcc: 4.3.4 sys-devel/gcc-config: 1.4.1 sys-devel/libtool: 2.2.6b virtual/os-headers: 2.6.30-r1 ACCEPT_KEYWORDS="x86" ACCEPT_LICENSE="* -@EULA" CBUILD="i686-pc-linux-gnu" CFLAGS="-O2 -march=core2 -pipe" CHOST="i686-pc-linux-gnu" CONFIG_PROTECT="/etc /usr/share/X11/xkb /var/lib/hsqldb" CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/env.d /etc/fonts/fonts.conf /etc/gconf /etc/revdep-rebuild /etc/sandbox.d /etc/terminfo" CXXFLAGS="-O2 -march=core2 -pipe" DISTDIR="/usr/portage/distfiles" FEATURES="assume-digests distlocks fixpackages news nodoc noinfo noman parallel-fetch protect-owned sandbox sfperms strict unmerge-logs unmerge-orphans userfetch" GENTOO_MIRRORS="http://distfiles.gentoo.org" LANG="en_US.UTF-8" LDFLAGS="-Wl,-O1" MAKEOPTS="-j2" PKGDIR="/usr/portage/packages" PORTAGE_CONFIGROOT="/" PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --compress --force --whole-file --delete --stats --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages" PORTAGE_TMPDIR="/var/tmp" PORTDIR="/usr/portage" SYNC="rsync://rsync.gentoo.org/gentoo-portage" USE="acl alsa berkdb bzip2 cli cracklib crypt cxx dbus dri expat fontconfig fortran gdbm gnutls gpm iconv ipv6 jpeg modules mp3 mudflap ncurses nls nptl nptlonly openmp pam pcre perl png pppd python readline reflection session spl ssl sysfs tcpd unicode x86 xcomposite xml xorg zlib" ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1 emu10k1x ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 intel8x0m maestro3 trident usb-audio via82xx via82xx-modem ymfpci" ALSA_PCM_PLUGINS="adpcm alaw asym copy dmix dshare dsnoop empty extplug file hooks iec958 ioplug ladspa lfloat linear meter mmap_emul mulaw multi null plug rate route share shm softvol" APACHE2_MODULES="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 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" ELIBC="glibc" INPUT_DEVICES="keyboard mouse evdev" KERNEL="linux" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" RUBY_TARGETS="ruby18" USERLAND="GNU" VIDEO_CARDS="intel" 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: CPPFLAGS, CTARGET, EMERGE_DEFAULT_OPTS, FFLAGS, INSTALL_MASK, LC_ALL, LINGUAS, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS, PORTDIR_OVERLAY
http://sources.gentoo.org/gentoo/src/patchsets/glibc/2.11.2/0020_all_glibc-tweak-rfc1918-lookup.patch?r1=1.1&r2=1.2
