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

noufsdump patch is now upstream

Browse Source
This commit is contained in:
Henrik Nordström 2010-03-30 09:21:24 +00:00
parent bda4065216
commit d39ddfae74
2 changed files with 2 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
squid-3.1.0.16-noufsdump.patch
View File

@ -1,35 +0,0 @@
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)

6
squid.spec
View File

@ -4,7 +4,7 @@
Name: squid
Version: 3.1.1
Release: 1%{?dist}
Release: 2%{?dist}
Summary: The Squid proxy caching server
Epoch: 7
License: GPLv2
@ -32,7 +32,6 @@ 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,7 +76,6 @@ 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 \
@ -262,7 +260,7 @@ fi
%changelog
* Tue Mar 30 2010 Henrik Nordstrom <henrik@henriknordstrom.net> - 7:3.1.1-1
* Tue Mar 30 2010 Henrik Nordstrom <henrik@henriknordstrom.net> - 7:3.1.1-2
- Update to 3.1.1 Squid bug #2827 crash with assertion failed:
FilledChecklist.cc:90: "conn() != NULL" under high load.