[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/squid/devel squid-2.5.STABLE10-64bit.patch, NONE, 1.1 squid-2.5.STABLE10-libbind.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 sources, 1.14, 1.15 squid.spec, 1.33, 1.34



Author: stransky

Update of /cvs/dist/rpms/squid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23048

Modified Files:
	.cvsignore sources squid.spec 
Added Files:
	squid-2.5.STABLE10-64bit.patch 
	squid-2.5.STABLE10-libbind.patch 
Log Message:
- new upstream version
- enabled fakeauth utility (#154020)
- enabled digest authentication scheme (#155882)
- all error pages marked as config (#127836)
- patch for 64bit statvfs interface (#153274)
- added httpd config file for cachemgr.cgi (#112725)


squid-2.5.STABLE10-64bit.patch:
 Makefile.am                |    1 
 Makefile.in                |    6 +-
 fs/aufs/store_dir_aufs.c   |   19 ++++++++
 fs/diskd/store_dir_diskd.c |   19 ++++++++
 fs/ufs/store_dir_ufs.c     |   19 ++++++++
 protos.h                   |    3 -
 store_dir.c                |   57 -------------------------
 store_dir_stat.c           |  101 +++++++++++++++++++++++++++++++++++++++++++++
 store_dir_stat.h           |   57 +++++++++++++++++++++++++
 tools.c                    |    6 ++
 10 files changed, 227 insertions(+), 61 deletions(-)

--- NEW FILE squid-2.5.STABLE10-64bit.patch ---
--- squid-2.5.STABLE10/src/Makefile.am.statvfs	2005-04-23 03:32:27.000000000 +0200
+++ squid-2.5.STABLE10/src/Makefile.am	2005-07-06 16:15:04.000000000 +0200
@@ -190,6 +190,7 @@
 	store_client.c \
 	store_digest.c \
 	store_dir.c \
+	store_dir_stat.c \
 	store_key_md5.c \
 	store_log.c \
 	store_rebuild.c \
--- squid-2.5.STABLE10/src/tools.c.statvfs	2005-04-22 22:45:12.000000000 +0200
+++ squid-2.5.STABLE10/src/tools.c	2005-07-06 16:15:04.000000000 +0200
@@ -738,6 +738,12 @@
     return b ? (100.0 * a / b) : 0.0;
 }
 
+unsigned long long
+llpercent(unsigned long long a, unsigned long long b)
+{
+    return b ? ((unsigned long long) (100.0 * a / b + 0.5)) : 0;
+}
+
 void
 squid_signal(int sig, SIGHDLR * func, int flags)
 {
--- squid-2.5.STABLE10/src/store_dir.c.statvfs	2005-03-26 03:50:54.000000000 +0100
+++ squid-2.5.STABLE10/src/store_dir.c	2005-07-06 16:15:04.000000000 +0200
@@ -486,60 +486,3 @@
     ndir++;
 }
 
-int
-storeDirGetBlkSize(const char *path, int *blksize)
-{
-#if HAVE_STATVFS
-    struct statvfs sfs;
-    if (statvfs(path, &sfs)) {
-	debug(50, 1) ("%s: %s\n", path, xstrerror());
-	*blksize = 2048;
-	return 1;
-    }
-    *blksize = (int) sfs.f_frsize;
-#else
-    struct statfs sfs;
-    if (statfs(path, &sfs)) {
-	debug(50, 1) ("%s: %s\n", path, xstrerror());
-	*blksize = 2048;
-	return 1;
-    }
-    *blksize = (int) sfs.f_bsize;
-#endif
-    /*
-     * Sanity check; make sure we have a meaningful value.
-     */
-    if (*blksize < 512)
-	*blksize = 2048;
-    return 0;
-}
-
-#define fsbtoblk(num, fsbs, bs) \
-    (((fsbs) != 0 && (fsbs) < (bs)) ? \
-            (num) / ((bs) / (fsbs)) : (num) * ((fsbs) / (bs)))
-int
-storeDirGetUFSStats(const char *path, int *totl_kb, int *free_kb, int *totl_in, int *free_in)
-{
-#if HAVE_STATVFS
-    struct statvfs sfs;
-    if (statvfs(path, &sfs)) {
-	debug(50, 1) ("%s: %s\n", path, xstrerror());
-	return 1;
-    }
-    *totl_kb = (int) fsbtoblk(sfs.f_blocks, sfs.f_frsize, 1024);
-    *free_kb = (int) fsbtoblk(sfs.f_bfree, sfs.f_frsize, 1024);
-    *totl_in = (int) sfs.f_files;
-    *free_in = (int) sfs.f_ffree;
-#else
-    struct statfs sfs;
-    if (statfs(path, &sfs)) {
-	debug(50, 1) ("%s: %s\n", path, xstrerror());
-	return 1;
-    }
-    *totl_kb = (int) fsbtoblk(sfs.f_blocks, sfs.f_bsize, 1024);
-    *free_kb = (int) fsbtoblk(sfs.f_bfree, sfs.f_bsize, 1024);
-    *totl_in = (int) sfs.f_files;
-    *free_in = (int) sfs.f_ffree;
-#endif
-    return 0;
-}
--- squid-2.5.STABLE10/src/Makefile.in.statvfs	2005-07-06 16:15:04.000000000 +0200
+++ squid-2.5.STABLE10/src/Makefile.in	2005-07-06 16:15:04.000000000 +0200
@@ -286,6 +286,7 @@
 	store_client.c \
 	store_digest.c \
 	store_dir.c \
+	store_dir_stat.c \
 	store_key_md5.c \
 	store_log.c \
 	store_rebuild.c \
@@ -505,7 +506,7 @@
 	ssl.$(OBJEXT) $(am__objects_8) stat.$(OBJEXT) \
 	StatHist.$(OBJEXT) String.$(OBJEXT) stmem.$(OBJEXT) \
 	store.$(OBJEXT) store_io.$(OBJEXT) store_client.$(OBJEXT) \
-	store_digest.$(OBJEXT) store_dir.$(OBJEXT) \
+	store_digest.$(OBJEXT) store_dir.$(OBJEXT) store_dir_stat.$(OBJEXT) \
 	store_key_md5.$(OBJEXT) store_log.$(OBJEXT) \
 	store_rebuild.$(OBJEXT) store_swapin.$(OBJEXT) \
 	store_swapmeta.$(OBJEXT) store_swapout.$(OBJEXT) \
@@ -576,7 +577,7 @@
 @AMDEP_TRUE@	$(DEPDIR)/ssl_support.Po $(DEPDIR)/stat.Po \
 @AMDEP_TRUE@	$(DEPDIR)/stmem.Po $(DEPDIR)/store.Po \
 @AMDEP_TRUE@	$(DEPDIR)/store_client.Po $(DEPDIR)/store_digest.Po \
- AMDEP_TRUE@	$(DEPDIR)/store_dir.Po $(DEPDIR)/store_io.Po \
+ AMDEP_TRUE@	$(DEPDIR)/store_dir.Po $(DEPDIR)/store_dir_stat.Po $(DEPDIR)/store_io.Po \
 @AMDEP_TRUE@	$(DEPDIR)/store_key_md5.Po $(DEPDIR)/store_log.Po \
 @AMDEP_TRUE@	$(DEPDIR)/store_modules.Po \
 @AMDEP_TRUE@	$(DEPDIR)/store_rebuild.Po \
@@ -807,6 +808,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote $(DEPDIR)/store_client Po am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote $(DEPDIR)/store_digest Po am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote $(DEPDIR)/store_dir Po am__quote@
+ AMDEP_TRUE@@am__include@ @am__quote $(DEPDIR)/store_dir_stat Po am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote $(DEPDIR)/store_io Po am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote $(DEPDIR)/store_key_md5 Po am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote $(DEPDIR)/store_log Po am__quote@
--- /dev/null	2005-07-06 10:26:47.607584424 +0200
+++ squid-2.5.STABLE10/src/store_dir_stat.h	2005-07-06 16:15:04.000000000 +0200
@@ -0,0 +1,57 @@
+
+/*
+ * $Id: store_dir_stat.h,v 1.420.2.34 2005/04/19 22:19:27 hno Exp $
+ *
+ *
+ * SQUID Web Proxy Cache          http://www.squid-cache.org/
+ * ----------------------------------------------------------
+ *
+ *  Squid is the result of efforts by numerous individuals from
+ *  the Internet community; see the CONTRIBUTORS file for full
+ *  details.   Many organizations have provided support for Squid's
+ *  development; see the SPONSORS file for full details.  Squid is
+ *  Copyrighted (C) 2001 by the Regents of the University of
+ *  California; see the COPYRIGHT file for full details.  Squid
+ *  incorporates software developed and/or copyrighted by other
+ *  sources; see the CREDITS file for full details.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *  
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *  
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+ *
+ */
+
+#ifndef SQUID_STORE_DIR_STAT_H
+#define SQUID_STORE_DIR_STAT_H
+
+#include "squid.h"
+
+#ifdef HAVE_STATVFS
+#define _FILE_OFFSET_BITS 64
+#define _LARGEFILE64_SOURCE 1
+#include <sys/statvfs.h>
+#endif
+/* Windows uses sys/vfs.h */
+#if HAVE_SYS_VFS_H
+#include <sys/vfs.h>
+#endif
+
+int storeDirGetBlkSize(const char *path, int *blksize);
+
+#ifdef HAVE_STATVFS
+extern int storeDirGetUFSStats(const char *, fsblkcnt_t *, fsblkcnt_t *, fsfilcnt_t *, fsfilcnt_t *);
+#else
+extern int storeDirGetUFSStats(const char *path, int *totl_kb, int *free_kb, int *totl_in, int *free_in);
+#endif
+
+#endif /* SQUID_STORE_DIR_STAT_H */
--- /dev/null	2005-07-06 10:26:47.607584424 +0200
+++ squid-2.5.STABLE10/src/store_dir_stat.c	2005-07-06 16:15:04.000000000 +0200
@@ -0,0 +1,101 @@
+
+/*
+ * $Id: store_dir_stat.c,v 1.135.2.3 2005/03/26 02:50:54 hno Exp $
+ *
+ * DEBUG: section 47    Store Directory Routines
+ * AUTHOR: Duane Wessels
+ *
+ * SQUID Web Proxy Cache          http://www.squid-cache.org/
+ * ----------------------------------------------------------
+ *
+ *  Squid is the result of efforts by numerous individuals from
+ *  the Internet community; see the CONTRIBUTORS file for full
+ *  details.   Many organizations have provided support for Squid's
+ *  development; see the SPONSORS file for full details.  Squid is
+ *  Copyrighted (C) 2001 by the Regents of the University of
+ *  California; see the COPYRIGHT file for full details.  Squid
+ *  incorporates software developed and/or copyrighted by other
+ *  sources; see the CREDITS file for full details.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *  
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *  
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+ *
+ */
+
+#include "squid.h"
+#include "store_dir_stat.h"
+
+int
+storeDirGetBlkSize(const char *path, int *blksize)
+{
+#if HAVE_STATVFS
+    struct statvfs sfs;
+    if (statvfs(path, &sfs)) {
+	debug(50, 1) ("%s: %s\n", path, xstrerror());
+	*blksize = 2048;
+	return 1;
+    }
+    *blksize = (int) sfs.f_frsize;
+#else
+    struct statfs sfs;
+    if (statfs(path, &sfs)) {
+	debug(50, 1) ("%s: %s\n", path, xstrerror());
+	*blksize = 2048;
+	return 1;
+    }
+    *blksize = (int) sfs.f_bsize;
+#endif
+    /*
+     * Sanity check; make sure we have a meaningful value.
+     */
+    if (*blksize < 512)
+	*blksize = 2048;
+    return 0;
+}
+
+#define fsbtoblk(num, fsbs, bs) \
+    (((fsbs) != 0 && (fsbs) < (bs)) ? \
+            (num) / ((bs) / (fsbs)) : (num) * ((fsbs) / (bs)))
+
+#if HAVE_STATVFS
+int
+storeDirGetUFSStats(const char *path, fsblkcnt_t *totl_kb, fsblkcnt_t *free_kb, fsfilcnt_t *totl_in, fsfilcnt_t *free_in)
+#else
+int
+storeDirGetUFSStats(const char *path, int *totl_kb, int *free_kb, int *totl_in, int *free_in)
+#endif
+{
+#if HAVE_STATVFS
+    struct statvfs sfs;
+    if (statvfs(path, &sfs)) {
+	debug(50, 1) ("%s: %s\n", path, xstrerror());
+	return 1;
+    }
+    *totl_kb = fsbtoblk(sfs.f_blocks, sfs.f_frsize, 1024);
+    *free_kb = fsbtoblk(sfs.f_bfree, sfs.f_frsize, 1024);
+    *totl_in = sfs.f_files;
+    *free_in = sfs.f_ffree;
+#else
+    struct statfs sfs;
+    if (statfs(path, &sfs)) {
+	debug(50, 1) ("%s: %s\n", path, xstrerror());
+	return 1;
+    }
+    *totl_kb = fsbtoblk(sfs.f_blocks, sfs.f_bsize, 1024);
+    *free_kb = fsbtoblk(sfs.f_bfree, sfs.f_bsize, 1024);
+    *totl_in = sfs.f_files;
+    *free_in = sfs.f_ffree;
+#endif
+    return 0;
+}
--- squid-2.5.STABLE10/src/fs/diskd/store_dir_diskd.c.statvfs	2005-05-01 12:48:07.000000000 +0200
+++ squid-2.5.STABLE10/src/fs/diskd/store_dir_diskd.c	2005-07-06 16:21:13.000000000 +0200
@@ -40,6 +40,7 @@
 #include <sys/shm.h>
 
 #include "store_diskd.h"
+#include "store_dir_stat.h"
 
 #define DefaultLevelOneDirs     16
 #define DefaultLevelTwoDirs     256
@@ -1959,10 +1960,17 @@
 storeDiskdDirStats(SwapDir * SD, StoreEntry * sentry)
 {
     diskdinfo_t *diskdinfo = SD->fsdata;
+#ifdef HAVE_STATVFS
+    fsblkcnt_t totl_kb = 0;
+    fsblkcnt_t free_kb = 0;
+    fsfilcnt_t totl_in = 0;
+    fsfilcnt_t free_in = 0;
+#else
     int totl_kb = 0;
     int free_kb = 0;
     int totl_in = 0;
     int free_in = 0;
+#endif
     int x;
     storeAppendPrintf(sentry, "First level subdirectories: %d\n", diskdinfo->l1);
     storeAppendPrintf(sentry, "Second level subdirectories: %d\n", diskdinfo->l2);
@@ -1975,6 +1983,16 @@
 	percent(diskdinfo->map->n_files_in_map, diskdinfo->map->max_n_files));
     x = storeDirGetUFSStats(SD->path, &totl_kb, &free_kb, &totl_in, &free_in);
     if (0 == x) {
+#ifdef HAVE_STATVFS
+       storeAppendPrintf(sentry, "Filesystem Space in use: %llu/%llu KB (%llu%%)\n",
+           (unsigned long long)(totl_kb - free_kb),
+           (unsigned long long)totl_kb,
+           llpercent(totl_kb - free_kb, totl_kb));
+       storeAppendPrintf(sentry, "Filesystem Inodes in use: %llu/%llu (%llu%%)\n",
+           (unsigned long long)(totl_in - free_in),
+           (unsigned long long)totl_in,
+           llpercent(totl_in - free_in, totl_in));
+#else
 	storeAppendPrintf(sentry, "Filesystem Space in use: %d/%d KB (%d%%)\n",
 	    totl_kb - free_kb,
 	    totl_kb,
@@ -1983,6 +2001,7 @@
 	    totl_in - free_in,
 	    totl_in,
 	    percent(totl_in - free_in, totl_in));
+#endif
     }
     storeAppendPrintf(sentry, "Flags:");
     if (SD->flags.selected)
--- squid-2.5.STABLE10/src/fs/ufs/store_dir_ufs.c.statvfs	2005-03-27 00:27:11.000000000 +0100
+++ squid-2.5.STABLE10/src/fs/ufs/store_dir_ufs.c	2005-07-06 16:15:04.000000000 +0200
@@ -36,6 +36,7 @@
 #include "squid.h"
 
 #include "store_ufs.h"
+#include "store_dir_stat.h"
 
 #define DefaultLevelOneDirs     16
 #define DefaultLevelTwoDirs     256
@@ -1701,10 +1702,17 @@
 storeUfsDirStats(SwapDir * SD, StoreEntry * sentry)
 {
     ufsinfo_t *ufsinfo = SD->fsdata;
+#ifdef HAVE_STATVFS
+    fsblkcnt_t totl_kb = 0;
+    fsblkcnt_t free_kb = 0;
+    fsfilcnt_t totl_in = 0;
+    fsfilcnt_t free_in = 0;
+#else
     int totl_kb = 0;
     int free_kb = 0;
     int totl_in = 0;
     int free_in = 0;
+#endif
     int x;
     storeAppendPrintf(sentry, "First level subdirectories: %d\n", ufsinfo->l1);
     storeAppendPrintf(sentry, "Second level subdirectories: %d\n", ufsinfo->l2);
@@ -1717,6 +1725,16 @@
 	percent(ufsinfo->map->n_files_in_map, ufsinfo->map->max_n_files));
     x = storeDirGetUFSStats(SD->path, &totl_kb, &free_kb, &totl_in, &free_in);
     if (0 == x) {
+#ifdef HAVE_STATVFS
+       storeAppendPrintf(sentry, "Filesystem Space in use: %llu/%llu KB (%llu%%)\n",
+           (unsigned long long)(totl_kb - free_kb),
+           (unsigned long long)totl_kb,
+           llpercent(totl_kb - free_kb, totl_kb));
+       storeAppendPrintf(sentry, "Filesystem Inodes in use: %llu/%llu (%llu%%)\n",
+           (unsigned long long)(totl_in - free_in),
+           (unsigned long long)totl_in,
+           llpercent(totl_in - free_in, totl_in));
+#else
 	storeAppendPrintf(sentry, "Filesystem Space in use: %d/%d KB (%d%%)\n",
 	    totl_kb - free_kb,
 	    totl_kb,
@@ -1725,6 +1743,7 @@
 	    totl_in - free_in,
 	    totl_in,
 	    percent(totl_in - free_in, totl_in));
+#endif
     }
     storeAppendPrintf(sentry, "Flags:");
     if (SD->flags.selected)
--- squid-2.5.STABLE10/src/fs/aufs/store_dir_aufs.c.statvfs	2005-03-27 00:27:10.000000000 +0100
+++ squid-2.5.STABLE10/src/fs/aufs/store_dir_aufs.c	2005-07-06 16:15:04.000000000 +0200
@@ -36,6 +36,7 @@
 #include "squid.h"
 
 #include "store_asyncufs.h"
+#include "store_dir_stat.h"
 
 #define DefaultLevelOneDirs     16
 #define DefaultLevelTwoDirs     256
@@ -1692,10 +1693,17 @@
 storeAufsDirStats(SwapDir * SD, StoreEntry * sentry)
 {
     squidaioinfo_t *aioinfo = SD->fsdata;
+#ifdef HAVE_STATVFS
+    fsblkcnt_t totl_kb;
+    fsblkcnt_t free_kb;
+    fsfilcnt_t totl_in;
+    fsfilcnt_t free_in;
+#else
     int totl_kb = 0;
     int free_kb = 0;
     int totl_in = 0;
     int free_in = 0;
+#endif
     int x;
     storeAppendPrintf(sentry, "First level subdirectories: %d\n", aioinfo->l1);
     storeAppendPrintf(sentry, "Second level subdirectories: %d\n", aioinfo->l2);
@@ -1708,6 +1716,16 @@
 	percent(aioinfo->map->n_files_in_map, aioinfo->map->max_n_files));
     x = storeDirGetUFSStats(SD->path, &totl_kb, &free_kb, &totl_in, &free_in);
     if (0 == x) {
+#ifdef HAVE_STATVFS
+       storeAppendPrintf(sentry, "Filesystem Space in use: %llu/%llu KB (%llu%%)\n",
+           (unsigned long long)(totl_kb - free_kb),
+           (unsigned long long)totl_kb,
+           llpercent(totl_kb - free_kb, totl_kb));
+       storeAppendPrintf(sentry, "Filesystem Inodes in use: %llu/%llu (%llu%%)\n",
+           (unsigned long long)(totl_in - free_in),
+           (unsigned long long)totl_in,
+           llpercent(totl_in - free_in, totl_in));
+#else
 	storeAppendPrintf(sentry, "Filesystem Space in use: %d/%d KB (%d%%)\n",
 	    totl_kb - free_kb,
 	    totl_kb,
@@ -1716,6 +1734,7 @@
 	    totl_in - free_in,
 	    totl_in,
 	    percent(totl_in - free_in, totl_in));
+#endif
     }
     storeAppendPrintf(sentry, "Flags:");
     if (SD->flags.selected)
--- squid-2.5.STABLE10/src/protos.h.statvfs	2005-04-20 00:19:27.000000000 +0200
+++ squid-2.5.STABLE10/src/protos.h	2005-07-06 16:15:04.000000000 +0200
@@ -1005,8 +1005,6 @@
 extern void storeDirCallback(void);
 extern void storeDirLRUDelete(StoreEntry *);
 extern void storeDirLRUAdd(StoreEntry *);
-extern int storeDirGetBlkSize(const char *path, int *blksize);
-extern int storeDirGetUFSStats(const char *, int *, int *, int *, int *);
 
 /*
  * store_swapmeta.c
@@ -1074,6 +1072,7 @@
 extern time_t getCurrentTime(void);
 extern int percent(int, int);
 extern double dpercent(double, double);
+extern unsigned long long llpercent(unsigned long long, unsigned long long);
 extern void squid_signal(int sig, SIGHDLR *, int flags);
 extern pid_t readPidFile(void);
 extern struct in_addr inaddrFromHostent(const struct hostent *hp);

squid-2.5.STABLE10-libbind.patch:
 configure |   94 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 47 insertions(+), 47 deletions(-)

--- NEW FILE squid-2.5.STABLE10-libbind.patch ---
--- squid-2.5.STABLE10/configure.libbind	2005-05-17 00:41:14.000000000 +0200
+++ squid-2.5.STABLE10/configure	2005-07-04 13:16:40.000000000 +0200
@@ -7063,53 +7063,53 @@
   echo "$ac_t""no" 1>&6
 fi
 
-echo $ac_n "checking for gethostbyname in -lbind""... $ac_c" 1>&6
-echo "configure:7068: checking for gethostbyname in -lbind" >&5
-ac_lib_var=`echo bind'_'gethostbyname | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lbind  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 7076 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char gethostbyname();
-
-int main() {
-gethostbyname()
-; return 0; }
-EOF
-if { (eval echo configure:7087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_lib=HAVE_LIB`echo bind | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-  LIBS="-lbind $LIBS"
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
+#echo $ac_n "checking for gethostbyname in -lbind""... $ac_c" 1>&6
+#echo "configure:7068: checking for gethostbyname in -lbind" >&5
+#ac_lib_var=`echo bind'_'gethostbyname | sed 'y%./+-%__p_%'`
+#if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+#  echo $ac_n "(cached) $ac_c" 1>&6
+#else
+#  ac_save_LIBS="$LIBS"
+#LIBS="-lbind  $LIBS"
+#cat > conftest.$ac_ext <<EOF
+##line 7076 "configure"
+##include "confdefs.h"
+#/* Override any gcc2 internal prototype to avoid an error.  */
+#/* We use char because int might match the return type of a gcc2
+#    builtin and then its argument prototype would still apply.  */
+#char gethostbyname();
+#
+#int main() {
+#gethostbyname()
+#; return 0; }
+#EOF
+#if { (eval echo configure:7087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+#  rm -rf conftest*
+#  eval "ac_cv_lib_$ac_lib_var=yes"
+#else
+#  echo "configure: failed program was:" >&5
+#  cat conftest.$ac_ext >&5
+#  rm -rf conftest*
+#  eval "ac_cv_lib_$ac_lib_var=no"
+#fi
+#rm -f conftest*
+#LIBS="$ac_save_LIBS"
+#
+#fi
+#if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+#  echo "$ac_t""yes" 1>&6
+#    ac_tr_lib=HAVE_LIB`echo bind | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+#    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+#  cat >> confdefs.h <<EOF
+##define $ac_tr_lib 1
+#EOF
+#
+#  LIBS="-lbind $LIBS"
+#
+#else
+#  echo "$ac_t""no" 1>&6
+#fi
+ac_cv_lib_bind_gethostbyname="no"
 if test $ac_cv_lib_bind_gethostbyname = "no" ; then
     case "$host" in
 	i386-*-freebsd*)


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/squid/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	16 Mar 2005 15:07:34 -0000	1.14
+++ .cvsignore	7 Jul 2005 10:52:58 -0000	1.15
@@ -1 +1,2 @@
 squid-2.5.STABLE9.tar.bz2
+squid-2.5.STABLE10.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/squid/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	16 Mar 2005 15:07:34 -0000	1.14
+++ sources	7 Jul 2005 10:52:58 -0000	1.15
@@ -1 +1 @@
-5a34a303dcab8851c7ab20e24af69b61  squid-2.5.STABLE9.tar.bz2
+e6db8bdfc783b3baed7de803c9a39e55  squid-2.5.STABLE10.tar.bz2


Index: squid.spec
===================================================================
RCS file: /cvs/dist/rpms/squid/devel/squid.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- squid.spec	16 May 2005 18:25:39 -0000	1.33
+++ squid.spec	7 Jul 2005 10:52:58 -0000	1.34
@@ -4,8 +4,8 @@
 
 Summary: The Squid proxy caching server.
 Name: squid
-Version: 2.5.STABLE9
-Release: 7
+Version: 2.5.STABLE10
+Release: 1
 Epoch: 7
 License: GPL
 Group: System Environment/Daemons
@@ -19,49 +19,7 @@
 ## Source99: filter-requires-squid.sh
 
 # Upstream patches
-Patch100: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-setcookie.patch
-Patch101: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-ftp_EPLF.patch
-Patch102: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-ftp_base_href.patch
-Patch103: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-acl_error.patch
-Patch104: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-date.patch
-Patch105: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-reload_into_ims.patch
-Patch106: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-delay_access_doc.patch
-Patch107: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-config_overflow.patch
-Patch108: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-bzero.patch
-Patch109: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-pid_t.patch
-Patch110: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-ctype.patch
-Patch111: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-defer_digest_fetch.patch
-Patch112: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-dup_content_length.patch
-Patch113: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-excess_data.patch
-Patch114: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-aufs.patch
-Patch115: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-long_basic_auth.patch
-Patch116: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-CONNECT_truncated.patch
-Patch117: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-LDAP_SUN_SDK.patch
-Patch118: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-disable_hostname_checks.patch
-Patch119: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-aufs_shutdown.patch
-Patch120: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-2GB.patch
-Patch121: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-rename_cleanup.patch
-Patch122: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-cachemgr_objects.patch
-Patch123: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-extaclauth.patch
-Patch124: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-syslog.patch
-Patch125: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-errpage_user.patch
-Patch126: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-debug_newlines.patch
-Patch127: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-transparent_port.patch
-Patch128: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-squid_k_nohostname.patch
-Patch129: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-config_CRLF.patch
-Patch130: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-forwardcc.patch
-Patch131: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-authinfo.patch
-Patch132: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-chroot_pidfile.patch
-Patch133: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-cachemgr_conf.patch
-Patch134: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-aufs_improvement.patch
-Patch135: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9_2GB-hot_cache.patch
-Patch136: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-diskd.patch
-Patch137: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-snmp.patch
-Patch138: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-arpacl.patch
-Patch139: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-dstdomain_ip.patch
-Patch140: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-dns_query-5.patch
-Patch141: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-2GB_assert.patch
-Patch142: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE9-always_direct_documentation.patch
+
 
 # Local patches
 # Applying upstream patches first makes it less likely that local patches
@@ -71,7 +29,8 @@
 Patch203: squid-2.5.STABLE7-build.patch
 Patch204: squid-2.5.STABLE4-perlpath.patch
 Patch205: squid-2.5.STABLE5-pipe.patch
-Patch206: squid-2.5.STABLE9-libbind.patch
+Patch206: squid-2.5.STABLE10-libbind.patch
+Patch207: squid-2.5.STABLE10-64bit.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prereq: /sbin/chkconfig logrotate shadow-utils
@@ -94,56 +53,13 @@
 %prep
 %setup -q
 
-%patch100 -p1
-%patch101 -p1
-%patch102 -p1
-%patch103 -p1
-%patch104 -p1
-%patch105 -p1
-%patch106 -p1
-%patch107 -p1
-%patch108 -p1
-%patch109 -p1
-%patch110 -p1
-%patch111 -p1
-%patch112 -p1
-%patch113 -p1
-%patch114 -p1
-%patch115 -p1
-%patch116 -p1
-%patch117 -p1
-%patch118 -p1
-%patch119 -p1
-%patch120 -p1
-%patch121 -p1
-%patch122 -p1
-%patch123 -p1
-%patch124 -p1
-%patch125 -p1
-%patch126 -p1
-%patch127 -p1
-%patch128 -p1
-%patch129 -p1
-%patch130 -p1
-%patch131 -p1
-%patch132 -p1
-%patch133 -p1
-%patch134 -p1
-%patch135 -p1
-%patch136 -p1
-%patch137 -p1
-%patch138 -p1
-%patch139 -p1
-%patch140 -p1
-%patch141 -p1
-%patch142 -p1
-
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
 %patch203 -p1 -b .build
 %patch204 -p1 -b .perlpath
 %patch205 -p1 -b .pipe
 %patch206 -p1 -b .libbind
+%patch207 -p1 -b .statvfs
 
 %build
  export CFLAGS="-fPIE -Os -g -pipe -fsigned-char" ; export LDFLAGS=-pie ;
@@ -162,9 +78,10 @@
    --enable-delay-pools \
    --enable-linux-netfilter \
    --with-pthreads \
-   --enable-ntlm-auth-helpers="SMB,winbind" \
+   --enable-ntlm-auth-helpers="SMB,winbind,fakeauth" \
    --enable-external-acl-helpers="ip_user,ldap_group,unix_group,wbinfo_group,winbind_group" \
-   --enable-auth="basic,ntlm" \
+   --enable-auth="basic,digest,ntlm" \
+   --enable-digest-auth-helpers="password" \
    --with-winbind-auth-challenge \
    --enable-useragent-log \
    --enable-referer-log \
@@ -194,6 +111,22 @@
 	bindir=$RPM_BUILD_ROOT/%{_sbindir} \
 	libexecdir=$RPM_BUILD_ROOT/%{_libdir}/squid
 
+echo "
+#
+# This is /etc/httpd/conf.d/squid.conf
+#
+
+ScriptAlias /Squid/cgi-bin/cachemgr.cgi %{_libdir}/squid/cachemgr.cgi
+
+# Only allow access from localhost by default
+<Location /Squid/cgi-bin/cachemgr.cgi>
+ order allow,deny
+ allow from localhost.localdomain
+ # Add additional allowed hosts as needed
+ # allow from .example.com
+</Location>" > $RPM_BUILD_ROOT/squid.httpd.tmp
+
+
 ln -s %{_datadir}/squid/errors/English $RPM_BUILD_ROOT/etc/squid/errors
 ln -s %{_datadir}/squid/icons $RPM_BUILD_ROOT/etc/squid/icons
 
@@ -201,15 +134,18 @@
 mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
 mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
 mkdir -p $RPM_BUILD_ROOT/etc/pam.d
+mkdir -p $RPM_BUILD_ROOT/etc/httpd/conf.d/
 install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/squid
 install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/squid
 install -m 644 %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/squid
 install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/etc/pam.d/squid
+install -m 644 $RPM_BUILD_ROOT/squid.httpd.tmp $RPM_BUILD_ROOT/etc/httpd/conf.d/squid.conf
 mkdir -p $RPM_BUILD_ROOT/var/log/squid
 mkdir -p $RPM_BUILD_ROOT/var/spool/squid
 
 # remove unpackaged files from the buildroot
 rm -f $RPM_BUILD_ROOT%{_sbindir}/{RunAccel,RunCache}
+rm -f $RPM_BUILD_ROOT/squid.httpd.tmp
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -224,6 +160,7 @@
 %attr(750,squid,squid) %dir /var/log/squid
 %attr(750,squid,squid) %dir /var/spool/squid
 %attr(644,root,root) /etc/pam.d/squid
+%config(noreplace) %attr(644,root,root) /etc/httpd/conf.d/squid.conf
 %config(noreplace) %attr(640,root,squid) /etc/squid/squid.conf
 %config(noreplace) %attr(640,root,squid) /etc/squid/cachemgr.conf
 %config(noreplace) /etc/squid/mime.conf
@@ -233,9 +170,9 @@
 /etc/squid/msntauth.conf.default
 /etc/squid/squid.conf.default
 /etc/squid/mime.conf.default
-%config(noreplace) /etc/squid/errors
 
-%{_datadir}/squid
+%config(noreplace) %{_datadir}/squid/errors
+%{_datadir}/squid/icons
 %{_sbindir}/squid
 %{_sbindir}/squidclient
 %config(noreplace) /etc/squid/icons
@@ -364,6 +301,14 @@
 chgrp squid /var/cache/samba/winbindd_privileged > /dev/null 2>& 1 || true
 
 %changelog
+* Fri Jul 7 2005 Martin Stransky <stransky redhat com> 7:2.5.STABLE10-1
+- new upstream version
+- enabled fakeauth utility (#154020)
+- enabled digest authentication scheme (#155882)
+- all error pages marked as config (#127836)
+- patch for 64bit statvfs interface (#153274)
+- added httpd config file for cachemgr.cgi (#112725)
+
 * Mon May 16 2005 Jay Fenlason <fenlason redhat com> 7:2.5.STABLE9-7
 - Upgrade the upstream -dns_query patch from -4 to -5
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]