RE: [squid-users] Build patch fails to apply on Squid 2.7 stable6

Hi Henrik,

Can you please (or anyone else who can do this) regenerate the squid 2.7
build patch to reflect the changes that Amos mentioned in the autoconf
toolchain.

Thank you for your time.

Ragheb Rustom

-----Original Message-----
From: Amos Jeffries [mailto:squid3_at_treenet.co.nz]
Sent: Sunday, February 08, 2009 11:11 PM
To: Ragheb Rustom
Cc: squid-users_at_squid-cache.org
Subject: Re: [squid-users] Build patch fails to apply on Squid 2.7 stable6

> Hi,
>
>
>
> I have been trying to compile squid 2.7-stable6 on Fedora Core 9 x86-64
> system. I have already done all the changes I need in the spec file in
> order
> to create my system rpms but I noticed that when the rpmbuild try to build
> the rpm it fails when it tries to apply the squid2.6Stable2 build patch
> with
> the following errors. I have even tried to do the compile process manually
> but also the same error appears when I manually try to apply the same
> patch.
> All other patches have been installed successfully only the build patch
> fails to apply. Below are the error messages I get from the build patching
> process
>
>
> + echo 'Patch #201 (squid-2.5.STABLE11-config.patch):'
>
> Patch #201 (squid-2.5.STABLE11-config.patch):
>
> + patch -p1 -b --suffix .config -s
>
> + echo 'Patch #202 (squid-2.5.STABLE4-location.patch):'
>
> Patch #202 (squid-2.5.STABLE4-location.patch):
>
> + patch -p1 -b --suffix .location -s
>
> + echo 'Patch #203 (squid-2.6.STABLE2-build.patch):'
>
> Patch #203 (squid-2.6.STABLE2-build.patch):
>
> + patch -p1 -b --suffix .build -s
>
> 1 out of 2 hunks FAILED -- saving rejects to file src/Makefile.in.rej
>
> error: Bad exit status from /var/tmp/rpm-tmp.93888 (%prep)
>
>
>
>
>
> RPM build errors:
>
> Bad exit status from /var/tmp/rpm-tmp.93888 (%prep)
>
> D: May free Score board((nil))
>
>
>
> Now these are the errors I get from the manual application of the build
> patch
>
>
>
> patching file errors/Makefile.in
>
> Hunk #1 succeeded at 235 with fuzz 1 (offset 14 lines).
>
> Hunk #2 succeeded at 417 (offset 4 lines).
>
> Hunk #3 succeeded at 450 (offset 14 lines).
>
> patching file icons/Makefile.in
>
> Hunk #1 succeeded at 272 (offset 14 lines).
>
> patching file src/Makefile.in
>
> Hunk #1 FAILED at 586.
>
> Hunk #2 succeeded at 926 (offset 84 lines).
>
> 1 out of 2 hunks FAILED -- saving rejects to file src/Makefile.in.rej
>
>
>
> Here are the contents of the src/Makefile.in.rej
>
>
>
> ***************
>
> *** 586,603 ****
>
> DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf
>
> DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf
>
> DEFAULT_DNSSERVER = $(libexecdir)/`echo dnsserver | sed
> '$(transform);s/$$/$(EXEEXT)/'`
>
> - DEFAULT_LOG_PREFIX = $(localstatedir)/logs
>
> DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
>
> DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log
>
> DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
>
> - DEFAULT_PID_FILE = $(DEFAULT_LOG_PREFIX)/squid.pid
>
> - DEFAULT_SWAP_DIR = $(localstatedir)/cache
>
> DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed
> '$(transform);s/$$/$(EXEEXT)/'`
>
> DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed
> '$(transform);s/$$/$(EXEEXT)/'`
>
> DEFAULT_DISKD = $(libexecdir)/`echo diskd-daemon | sed
> '$(transform);s/$$/$(EXEEXT)/'`
>
> - DEFAULT_ICON_DIR = $(datadir)/icons
>
> - DEFAULT_ERROR_DIR = $(datadir)/errors/@ERR_DEFAULT_LANGUAGE@
>
> - DEFAULT_MIB_PATH = $(datadir)/mib.txt
>
> DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@
>
>
>
> # Don't automatically uninstall config files
>
> --- 586,603 ----
>
> DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf
>
> DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf
>
> DEFAULT_DNSSERVER = $(libexecdir)/`echo dnsserver | sed
> '$(transform);s/$$/$(EXEEXT)/'`
>
> + DEFAULT_LOG_PREFIX = $(localstatedir)/log/squid
>
> DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
>
> DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log
>
> DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
>
> + DEFAULT_PID_FILE = $(localstatedir)/run/squid.pid
>
> + DEFAULT_SWAP_DIR = $(localstatedir)/spool/squid
>
> DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed
> '$(transform);s/$$/$(EXEEXT)/'`
>
> DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed
> '$(transform);s/$$/$(EXEEXT)/'`
>
> DEFAULT_DISKD = $(libexecdir)/`echo diskd-daemon | sed
> '$(transform);s/$$/$(EXEEXT)/'`
>
> + DEFAULT_ICON_DIR = $(pkgdatadir)/icons
>
> + DEFAULT_ERROR_DIR = $(pkgdatadir)/errors/@ERR_DEFAULT_LANGUAGE@
>
> + DEFAULT_MIB_PATH = $(sysconfdir)/mib.txt
>
> DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@
>
>
>
> # Don't automatically uninstall config files
>
>
>
> From what I could see is that the above changes are not being done to the
> src/Makefile.in but I cannot understand why this is happening. I would
> really appreciate your help guys on this.
>

We have recently upgraded the autoconf toolchain used to generate
Makefile.in and configure scripts. The Makefile.in files are quite
different.

If you are the maintainer you will need to regenerate the patches.

If you are just trying to build the prepared package, then please contact
the maintainer to get the package updated.

Amos
Received on Mon Feb 09 2009 - 22:24:39 MST