PATCH COMMAND: patch -p1 -g0 -E --no-backup-if-mismatch < '/usr/portage/net-analyzer/zabbix/files/zabbix-1.8.3-as-needed.patch' ======================================== patching file configure.in Hunk #1 FAILED at 1221. 1 out of 1 hunk FAILED -- saving rejects to file configure.in.rej patching file m4/ldap.m4 patching file m4/ax_lib_postgresql.m4 patch program exited with status 1 ======================================== Reproducible: Always Steps to Reproduce: 1. emerge =net-analyzer/zabbix-1.8.9 Actual Results: * Package: net-analyzer/zabbix-1.8.9 * Repository: gentoo * Maintainer: patrick@gentoo.org mattm@gentoo.org * USE: amd64 consolekit curl elibc_glibc ipv6 jabber kernel_linux ldap multilib mysql policykit sqlite3 ssh userland_GNU * FEATURES: sandbox * Adding group 'zabbix' to your system ... * - Groupid: next available * Adding user 'zabbix' to your system ... * - Userid: 120 * - Shell: /sbin/nologin * - Home: /var/lib/zabbix/home * - Groups: zabbix * - GECOS: added by portage for zabbix * - Creating /var/lib/zabbix/home in / >>> Unpacking source... >>> Unpacking zabbix-1.8.9.tar.gz to /var/tmp/portage/net-analyzer/zabbix-1.8.9/work >>> Source unpacked in /var/tmp/portage/net-analyzer/zabbix-1.8.9/work >>> Preparing source in /var/tmp/portage/net-analyzer/zabbix-1.8.9/work/zabbix-1.8.9 ... * Applying zabbix-1.8.3-as-needed.patch ... * Failed Patch: zabbix-1.8.3-as-needed.patch ! * ( /usr/portage/net-analyzer/zabbix/files/zabbix-1.8.3-as-needed.patch ) * * Include in your bugreport the contents of: * * /var/tmp/portage/net-analyzer/zabbix-1.8.9/temp/zabbix-1.8.3-as-needed.patch.out * ERROR: net-analyzer/zabbix-1.8.9 failed (prepare phase): * Failed Patch: zabbix-1.8.3-as-needed.patch! * * Call stack: * ebuild.sh, line 84: Called src_prepare * environment, line 3889: Called epatch '/usr/portage/net-analyzer/zabbix/files/zabbix-1.8.3-as-needed.patch' * environment, line 1903: Called die * The specific snippet of code: * die "Failed Patch: ${patchname}!"; * * If you need support, post the output of 'emerge --info =net-analyzer/zabbix-1.8.9', * the complete build log and the output of 'emerge -pqv =net-analyzer/zabbix-1.8.9'. * The complete build log is located at '/var/tmp/portage/net-analyzer/zabbix-1.8.9/temp/build.log'. * The ebuild environment file is located at '/var/tmp/portage/net-analyzer/zabbix-1.8.9/temp/environment'. * S: '/var/tmp/portage/net-analyzer/zabbix-1.8.9/work/zabbix-1.8.9'
Created attachment 294103 [details] The requested file for the bugreport Because Vadim forgot to add this file, I'll add it. Running into exactly the same problem.
Thanks for the feedback guys...sorry that we didn't catch this right away. It looks like all the patch requests are failing due to the target file not existing or having a different path - we'll have to figure out what zabbix did different in this release.
ok, opening up zabbix 1.8.9, the configure files seem to be relatively the same place and the same names as the prior releases....manually patching (using p1 during test) matt@hyperion /tmp/foo/zabbix-1.8.9 $ patch -p1 -g0 -E --no-backup-if-mismatch < '/usr/portage/net-analyzer/zabbix/files/zabbix-1.8.3-as-needed.patch' patching file configure.in Hunk #1 FAILED at 1221. 1 out of 1 hunk FAILED -- saving rejects to file configure.in.rej patching file m4/ldap.m4 patching file m4/ax_lib_postgresql.m4 matt@hyperion /tmp/foo/zabbix-1.8.9 $ more configure.in.rej *************** *** 1221,1226 **** fi CFLAGS="${CFLAGS} ${LDAP_CPPFLAGS}" LDFLAGS="${LDFLAGS} ${LDAP_LDFLAGS}" found_iconv="no" dnl Check for libiconv [by default - skip] --- 1221,1227 ---- fi CFLAGS="${CFLAGS} ${LDAP_CPPFLAGS}" LDFLAGS="${LDFLAGS} ${LDAP_LDFLAGS}" + LIBS="${LIBS} ${LDAP_LIBS}" found_iconv="no" dnl Check for libiconv [by default - skip] So, it appears we have a problem just with this part
created new patch file - zabbix-1.8.9-as-needed.patch: matt@hyperion ~/dev/gentoo-x86/net-analyzer/zabbix/files $ diff zabbix-1.8.3-as-needed.patch zabbix-1.8.9-as-needed.patch 17c17 < @@ -1221,6 +1221,7 @@ if test "x$want_ldap" = "xyes"; then --- > @@ -1281,6 +1281,7 @@ if test "x$want_ldap" = "xyes"; then 20c20 < LDFLAGS="${LDFLAGS} ${LDAP_LDFLAGS}" --- > SERVER_LDFLAGS="${SERVER_LDFLAGS} ${LDAP_LDFLAGS}" 21a22,23 > PROXY_LDFLAGS="${PROXY_LDFLAGS} ${LDAP_LDFLAGS}" > AGENT_LDFLAGS="${AGENT_LDFLAGS} ${LDAP_LDFLAGS}"
The new 1.8.9 patch applies cleanly for me: matt@hyperion /tmp/foo/zabbix-1.8.9 $ !patch patch -p1 -g0 -E --no-backup-if-mismatch < ../zabbix-1.8.9-as-needed.patch patching file configure.in patching file m4/ldap.m4 patching file m4/ax_lib_postgresql.m4 Updating Zabbix 1.8.9 ebuild, creating an r1 update which uses the 1.8.9 patch rather than 1.8.3. I'll also remove all keywords on the r0 ebuild and remove it in the near future if r1 tests well. r1 commited: +*zabbix-1.8.9-r1 (29 Nov 2011) + + 29 Nov 2011; Matthew Marlowe <mattm@gentoo.org> zabbix-1.8.9.ebuild, + +zabbix-1.8.9-r1.ebuild, +files/zabbix-1.8.9-as-needed.patch: + Updated as needed patch for zabbix 1.8.9, deprecated r0 ebuild which uses old + patch, fix in 1.8.9-r1 +
