rpms/squid
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Workaround for Fedora-13 build failure

Browse Source 
for some reason Fedora-13 fails to link ufsdump. Luckily it's not needed so
    we can just disable it in the build (never installed, only compiled)
This commit is contained in:
Henrik Nordström 2010-02-18 22:32:51 +00:00
parent 2b55ee071a
commit fd65b4c79a
2 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
squid-3.1.0.16-noufsdump.patch Normal file
View File

@ -0,0 +1,35 @@
diff -up squid-3.1.0.16/src/Makefile.am.noufsdump squid-3.1.0.16/src/Makefile.am
--- squid-3.1.0.16/src/Makefile.am.noufsdump 2010-02-18 23:14:16.000000000 +0100
+++ squid-3.1.0.16/src/Makefile.am 2010-02-18 23:15:51.000000000 +0100
@@ -172,14 +172,14 @@ EXTRA_PROGRAMS = \
recv-announce \
tests/testUfs \
tests/testCoss \
- tests/testNull
+ tests/testNull \
+ ufsdump
## cfgen is used when building squid
## ufsdump is a debug utility, it is possibly useful for end users with cache
## corruption, but at this point we do not install it.
noinst_PROGRAMS = \
- cf_gen \
- ufsdump
+ cf_gen
sbin_PROGRAMS = \
squid
diff -up squid-3.1.0.16/src/Makefile.in.noufsdump squid-3.1.0.16/src/Makefile.in
--- squid-3.1.0.16/src/Makefile.in.noufsdump 2010-02-18 23:12:26.000000000 +0100
+++ squid-3.1.0.16/src/Makefile.in 2010-02-18 23:13:16.000000000 +0100
@@ -57,8 +57,8 @@ check_PROGRAMS = tests/testAuth$(EXEEXT)
EXTRA_PROGRAMS = DiskIO/DiskDaemon/diskd$(EXEEXT) unlinkd$(EXEEXT) \
dnsserver$(EXEEXT) recv-announce$(EXEEXT) \
tests/testUfs$(EXEEXT) tests/testCoss$(EXEEXT) \
- tests/testNull$(EXEEXT)
-noinst_PROGRAMS = cf_gen$(EXEEXT) ufsdump$(EXEEXT)
+ tests/testNull$(EXEEXT) ufsdump$(EXEEXT)
+noinst_PROGRAMS = cf_gen$(EXEEXT)
sbin_PROGRAMS = squid$(EXEEXT)
bin_PROGRAMS =
libexec_PROGRAMS = $(am__EXEEXT_1) $(DISK_PROGRAMS) $(am__EXEEXT_2)

8
squid.spec
View File

@ -4,7 +4,7 @@
Name: squid
Version: 3.1.0.16
Release: 6%{?dist}
Release: 7%{?dist}
Summary: The Squid proxy caching server
Epoch: 7
License: GPLv2
@ -32,6 +32,8 @@ Patch202: squid-3.1.0.9-location.patch
Patch204: squid-3.0.STABLE1-perlpath.patch
Patch205: squid-3.1.0.15-smb-path.patch
Patch208: squid-3.0.STABLE7-from_manpg.patch
# ufsdump is never actually installed, and fails to build on F-13
Patch209: squid-3.1.0.16-noufsdump.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: bash >= 2.0
@ -77,6 +79,7 @@ lookup program (dnsserver), a program for retrieving FTP data
%patch204 -p1 -b .perlpath
%patch205 -p1 -b .smb-path
%patch208 -p1 -b .from_manpg
%patch209 -p1 -b .noufsdump
%build
%configure \
@ -261,6 +264,9 @@ fi
%changelog
* Thu Feb 18 2010 Henrik Nordstrom <henrik@henriknordstrom.net> - 3.1.0.16-7
- Workaround for Fedora-13 build failure
* Sun Feb 14 2010 Henrik Nordstrom <henrik@henriknordstrom.net> - 7:3.1.0.16-6
- Patch for Squid security advisory SQUID-2010:2, denial of service
issue in HTCP processing