*** empty log message ***

4 files changed, 113 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 2b2afcf8d61e..08f1b0adafcc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 date 04 Feb 20001
 
+upd net-www/squid-2.3.4s-r1 to 2.3.4s-r2
+achim
+Added all patches for that version from www.squid-cache.org
+
 new media-libs/libao-0.5.0
 peter
 
diff --git a/current-packages.new b/current-packages.new
index 84ae4a48d6d6..425fe2f7aa25 100644
--- a/current-packages.new
+++ b/current-packages.new
@@ -394,7 +394,7 @@
 ./net-www/netscape-plugger/netscape-plugger-3.2.ebuild
 #./net-www/netscape/navigator-4.76-r1.ebuild
 ./net-www/netscape/netscape-4.76-r1.ebuild
-./net-www/squid/squid-2.3.4s-r1.ebuild
+./net-www/squid/squid-2.3.4s-r2.ebuild
 ./net-www/w3m/w3m-0.1.10-r1.ebuild
 ./sys-apps/at/at-3.1.8-r1.ebuild
 ./sys-apps/baselayout/baselayout-1.5-r2.ebuild
diff --git a/net-www/squid/files/digest-squid-2.3.4s-r2 b/net-www/squid/files/digest-squid-2.3.4s-r2
new file mode 100644
index 000000000000..d45ed898e22a
--- /dev/null
+++ b/net-www/squid/files/digest-squid-2.3.4s-r2
@@ -0,0 +1,8 @@
+MD5 c38c083f44c222a8d026fa129c30b98f squid-2.3.STABLE4-src.tar.gz
+MD5 f1383b24672f9a8317c2c16302a94eaa squid-2.3.stable4-ftp_icon_not_found.patch
+MD5 bec46f5a1fcbd9aa1deb9d518c5c11a5 squid-2.3.stable4-internal_dns_rcode_table_formatting.patch
+MD5 4453c53a712280a26fdca42c950bc94f squid-2.3.stable4-ipfw_configure.patch
+MD5 436eb77056bed5d45547c739d1123bd3 squid-2.3.stable4-invalid_ip_acl_entry.patch
+MD5 db8e4eb9c1712a4adde7e9aaed0b5249 squid-2.3.stable4-accel_only_access.patch
+MD5 68228709d011c93c2cccd9ac723fb462 squid-2.3.stable4-html_quoting.patch
+MD5 c3d48a2b4fc26c0d90eb4c30ae34d3d6 squid-2.3.stable4-carp-assertion.patch
diff --git a/net-www/squid/squid-2.3.4s-r2.ebuild b/net-www/squid/squid-2.3.4s-r2.ebuild
new file mode 100644
index 000000000000..1cf14d98ec8c
--- /dev/null
+++ b/net-www/squid/squid-2.3.4s-r2.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Achim Gottinger <achim@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/net-www/squid/squid-2.3.4s-r2.ebuild,v 1.1 2001/02/05 05:14:58 achim Exp $
+
+P=squid-2.3.STABLE4
+
+A0=squid-2.3.stable4-ftp_icon_not_found.patch
+A1=squid-2.3.stable4-internal_dns_rcode_table_formatting.patch
+A2=squid-2.3.stable4-ipfw_configure.patch
+A3=squid-2.3.stable4-invalid_ip_acl_entry.patch 
+A4=squid-2.3.stable4-accel_only_access.patch 
+A5=squid-2.3.stable4-html_quoting.patch 
+A6=squid-2.3.stable4-carp-assertion.patch
+
+S=${WORKDIR}/${P}
+DESCRIPTION="SQUID - Web Proxy Server"
+SRC_URI0="http://www.squid-cache.org/Versions/v2/2.3"
+SRC_URI="$SRC_URI0/${P}-src.tar.gz
+	 $SRC_URI0/bugs/$A0 $SRC_URI0/bugs/$A1 $SRC_URI0/bugs/$A2
+	 $SRC_URI0/bugs/$A3 $SRC_URI0/bugs/$A4 $SRC_URI0/bugs/$A5 
+	 $SRC_URI0/bugs/$A6"
+
+HOMEPAGE="http://www.squid-cache.org/"
+
+DEPEND=">=sys-libs/glibc-2.1.3
+	>=sys-libs/pam-0.72
+	>=net-nds/openldap-1.2.11"
+
+src_unpack() {
+  unpack ${P}-src.tar.gz
+  cd ${S}
+  patch -p0 < ${DISTDIR}/${A0}
+  patch -p0 < ${DISTDIR}/${A1} 
+  patch -p0 < ${DISTDIR}/${A2} 
+  patch -p0 < ${DISTDIR}/${A3} 
+  patch -p0 < ${DISTDIR}/${A4} 
+  patch -p0 < ${DISTDIR}/${A5} 
+
+}
+
+src_compile() {                           
+ cd ${S}
+ LDFLAGS="$LDFLAGS -lresolv" try ./configure --host=${CHOST} \
+	--prefix=/usr --sysconfdir=/etc/squid \
+	--localstatedir=/var/state/squid \
+	--enable-useragent-log \
+	--enable-async-io --enable-icmp
+ try make
+ cd ${S}/auth_modules/LDAP
+ try make
+ cd ../PAM
+ try make
+ cd ../SMB
+ try make
+ cd ../LDAP
+ try make
+ cd ../NCSA
+ try make
+
+}
+
+src_install() {                               
+  cd ${S}
+  rm -rf ${D}
+  dodir /usr/bin
+  dodir /etc/squid
+  dodir /var/squid
+  chown squid.daemon ${D}/var/squid
+  try make install prefix=${D}/usr sysconfdir=${D}/etc/squid \
+	localstatedir=${D}/var/state/squid 
+  into /usr
+  cd auth_modules
+  dobin LDAP/squid_ldap_auth PAM/pam_auth SMB/smb_auth NCSA/ncsa_auth
+  cd ../doc
+  doman tree.3
+  dodoc *.txt
+  cd ..
+  dodoc README QUICKSTART CONTRIBUTORS COPYRIGHT COPYING CREDITS
+  dodoc ChangeLog TODO
+  cp ${O}/files/squid.conf ${D}/etc/squid
+  dodir /etc/rc.d/init.d
+  cp ${O}/files/squid ${D}/etc/rc.d/init.d
+#  rm -r ${D}/var/squid
+  dodir /var/log/squid
+  dodir /var/cache/squid
+  fowners squid.daemon /var/log/squid
+  fowners squid.daemon /var/cache/squid
+  fperms 755 /var/log/squid
+  fperms 755 /var/cache/squid
+}
+
+pkg_config() {
+
+    . ${ROOT}/etc/rc.d/config/functions 
+
+  einfo "Generating symlinks..."
+  ${ROOT}/usr/sbin/rc-update add squid
+
+}