From defd9df458f899b3c2cea25adf96387fbe2f1aff Mon Sep 17 00:00:00 2001 From: Donny Davies Date: Sat, 4 May 2002 23:23:02 +0000 Subject: Added LICENSE, SLOT, $Headers, pam_stack aware pam.d/ file. --- net-www/squid/ChangeLog | 8 +- net-www/squid/files/digest-squid-2.4.6 | 1 - net-www/squid/files/digest-squid-2.4.6-r1 | 1 + net-www/squid/files/squid.confd | 4 + net-www/squid/files/squid.pam | 13 ++-- net-www/squid/files/squid.pam.new | 7 -- net-www/squid/squid-2.4.6-r1.ebuild | 121 ++++++++++++++++++++++++++++++ net-www/squid/squid-2.4.6.ebuild | 120 ----------------------------- 8 files changed, 141 insertions(+), 134 deletions(-) delete mode 100644 net-www/squid/files/digest-squid-2.4.6 create mode 100644 net-www/squid/files/digest-squid-2.4.6-r1 delete mode 100644 net-www/squid/files/squid.pam.new create mode 100644 net-www/squid/squid-2.4.6-r1.ebuild delete mode 100644 net-www/squid/squid-2.4.6.ebuild (limited to 'net-www/squid') diff --git a/net-www/squid/ChangeLog b/net-www/squid/ChangeLog index 2860f41b7bde..6348d9dac431 100644 --- a/net-www/squid/ChangeLog +++ b/net-www/squid/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-www/squid # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/net-www/squid/ChangeLog,v 1.4 2002/03/21 01:23:36 woodchip Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/squid/ChangeLog,v 1.5 2002/05/04 23:23:02 woodchip Exp $ + +*squid-2.4.6-r1 (4 May 2002) + + 4 May 2002; Donny Davies : + + Added LICENSE, SLOT, $Headers, pam_stack aware pam.d/ file. *squid-2.4.6 (20 Mar 2002) diff --git a/net-www/squid/files/digest-squid-2.4.6 b/net-www/squid/files/digest-squid-2.4.6 deleted file mode 100644 index 26869494cb0b..000000000000 --- a/net-www/squid/files/digest-squid-2.4.6 +++ /dev/null @@ -1 +0,0 @@ -MD5 103fe9d03aca06f89218740f29730527 squid-2.4.STABLE6-src.tar.gz 1081327 diff --git a/net-www/squid/files/digest-squid-2.4.6-r1 b/net-www/squid/files/digest-squid-2.4.6-r1 new file mode 100644 index 000000000000..26869494cb0b --- /dev/null +++ b/net-www/squid/files/digest-squid-2.4.6-r1 @@ -0,0 +1 @@ +MD5 103fe9d03aca06f89218740f29730527 squid-2.4.STABLE6-src.tar.gz 1081327 diff --git a/net-www/squid/files/squid.confd b/net-www/squid/files/squid.confd index 2b66d32a0702..1e098b5d22a8 100644 --- a/net-www/squid/files/squid.confd +++ b/net-www/squid/files/squid.confd @@ -1,3 +1,7 @@ +# Copyright 1999-2002 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License, v2 or later +# $Header: /var/cvsroot/gentoo-x86/net-www/squid/files/squid.confd,v 1.3 2002/05/04 23:23:02 woodchip Exp $ + # Config file for /etc/init.d/squid SQUID_OPTS="-DYC" diff --git a/net-www/squid/files/squid.pam b/net-www/squid/files/squid.pam index 5a716d2a055a..400fd73655f8 100644 --- a/net-www/squid/files/squid.pam +++ b/net-www/squid/files/squid.pam @@ -1,5 +1,8 @@ -auth required pam_pwdb.so -auth required pam_nologin.so -account required pam_pwdb.so -session required pam_pwdb.so -session required pam_limits.so +#%PAM-1.0 +# $Header: /var/cvsroot/gentoo-x86/net-www/squid/files/squid.pam,v 1.2 2002/05/04 23:23:02 woodchip Exp $ +auth required /lib/security/pam_stack.so service=system-auth +auth required /lib/security/pam_nologin.so +account required /lib/security/pam_stack.so service=system-auth +password required /lib/security/pam_stack.so service=system-auth +session required /lib/security/pam_stack.so service=system-auth +session required /lib/security/pam_limits.so diff --git a/net-www/squid/files/squid.pam.new b/net-www/squid/files/squid.pam.new deleted file mode 100644 index 32d833633c68..000000000000 --- a/net-www/squid/files/squid.pam.new +++ /dev/null @@ -1,7 +0,0 @@ -#%PAM-1.0 -auth required /lib/security/pam_stack.so service=system-auth -auth required /lib/security/pam_nologin.so -account required /lib/security/pam_stack.so service=system-auth -password required /lib/security/pam_stack.so service=system-auth -session required /lib/security/pam_stack.so service=system-auth -session required /lib/security/pam_limits.so diff --git a/net-www/squid/squid-2.4.6-r1.ebuild b/net-www/squid/squid-2.4.6-r1.ebuild new file mode 100644 index 000000000000..88ffb95aa521 --- /dev/null +++ b/net-www/squid/squid-2.4.6-r1.ebuild @@ -0,0 +1,121 @@ +# Copyright 1999-2002 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License, v2 or later +# $Header: /var/cvsroot/gentoo-x86/net-www/squid/squid-2.4.6-r1.ebuild,v 1.1 2002/05/04 23:23:02 woodchip Exp $ + +# this could be cleaner.. +MY_P=${PN}-2.4.STABLE6 +S=${WORKDIR}/${MY_P} +DESCRIPTION="A caching web proxy, with advanced features" +SRC_URI="ftp://ftp.squid-cache.org/pub/squid-2/STABLE/${MY_P}-src.tar.gz + ftp://sunsite.auc.dk/pub/infosystems/squid/squid-2/STABLE/${MY_P}-src.tar.gz" +HOMEPAGE="http://www.squid-cache.org/" + +RDEPEND="virtual/glibc pam? ( >=sys-libs/pam-0.72 ) ldap? ( >=net-nds/openldap-2 )" +DEPEND="${RDEPEND} sys-devel/perl" +LICENSE="GPL-2" +SLOT="0" + +src_unpack() { + unpack ${A} + cd ${S} + # see the tops of these patches for details.. + patch -p1 < ${FILESDIR}/${P}-debian.diff || die + patch -p1 < ${FILESDIR}/${P}-gentoo.diff || die + if [ -z "$DEBUG" ] + then + mv configure.in configure.in.orig + sed -e 's%LDFLAGS="-g"%LDFLAGS=""%' configure.in.orig > configure.in + autoconf || die + fi +} + +src_compile() { + local myconf mymodules + mymodules="getpwnam,YP,NCSA,SMB,MSNT,multi-domain-NTLM" + use ldap && mymodules="LDAP,${mymodules}" + use pam && mymodules="PAM,${mymodules}" + use snmp && myconf="--enable-snmp" + + ./configure \ + --prefix=/usr \ + --bindir=/usr/sbin \ + --exec-prefix=/usr \ + --sbindir=/usr/sbin \ + --localstatedir=/var \ + --sysconfdir=/etc/squid \ + --libexecdir=/usr/lib/squid \ + --enable-storeio="ufs,diskd,coss,aufs,null" \ + --enable-removal-policies="lru,heap" \ + --enable-auth-modules=${mymodules} \ + --enable-linux-netfilter \ + --disable-ident-lookups \ + --enable-useragent-log \ + --enable-cache-digests \ + --enable-delay-pools \ + --enable-referer-log \ + --enable-async-io \ + --enable-truncate \ + --enable-arp-acl \ + --with-pthreads \ + --enable-htcp \ + --enable-carp \ + --enable-poll \ + --host=${CHOST} ${myconf} || die "bad ./configure" + #--enable-icmp + + mv include/autoconf.h include/autoconf.h.orig + sed -e "s:^#define SQUID_MAXFD.*:#define SQUID_MAXFD 4096:" \ + include/autoconf.h.orig > include/autoconf.h + + emake || die "compile problem" +} + +src_install() { + make \ + prefix=${D}/usr \ + bindir=${D}/usr/sbin \ + localstatedir=${D}/var \ + sysconfdir=${D}/etc/squid \ + libexecdir=${D}/usr/lib/squid \ + install || die + + #make -C src install-pinger libexecdir=${D}/usr/lib/squid || die + #chown root.squid ${D}/usr/lib/squid/pinger + #chmod 4750 ${D}/usr/lib/squid/pinger + + mv ${D}/usr/sbin/{*_auth*,Run*} ${D}/usr/lib/squid + chown root.squid ${D}/usr/lib/squid/pam_auth + chmod 2750 ${D}/usr/lib/squid/pam_auth + + rm -rf ${D}/etc/squid/errors ${D}/var/logs + cd errors + dodir /usr/lib/squid/errors + for i in * + do + if [ -d $i ] + then + insinto /usr/lib/squid/errors/$i + doins $i/* + fi + done + cd ${S} + dosym /usr/lib/squid/errors/English /etc/squid/errors + + dodoc README QUICKSTART CONTRIBUTORS COPYRIGHT + dodoc COPYING CREDITS ChangeLog TODO + newdoc auth_modules/SMB/README SMB.auth.readme + newdoc auth_modules/LDAP/README LDAP.auth.readme + doman auth_modules/LDAP/*.8 doc/tree.3 + docinto txt + dodoc doc/*.txt + + insinto /etc/pam.d ; newins ${FILESDIR}/squid.pam squid + exeinto /etc/init.d ; newexe ${FILESDIR}/squid.rc6 squid + insinto /etc/conf.d ; newins ${FILESDIR}/squid.confd squid +} + +pkg_postinst() { + # This helps if you had it installed, but never _ran_ it. + install -m0755 -o squid -g squid -d ${ROOT}/var/cache/squid + install -m0755 -o squid -g squid -d ${ROOT}/var/log/squid +} diff --git a/net-www/squid/squid-2.4.6.ebuild b/net-www/squid/squid-2.4.6.ebuild deleted file mode 100644 index ef4fc8d32f5a..000000000000 --- a/net-www/squid/squid-2.4.6.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Maintainer: Donny Davies -# $Header: /var/cvsroot/gentoo-x86/net-www/squid/squid-2.4.6.ebuild,v 1.3 2002/03/21 01:44:59 woodchip Exp $ - -# this could be cleaner.. -MY_P=${PN}-2.4.STABLE6 -S=${WORKDIR}/${MY_P} -DESCRIPTION="A caching web proxy, with advanced features" -SRC_URI="ftp://ftp.squid-cache.org/pub/squid-2/STABLE/${MY_P}-src.tar.gz - ftp://sunsite.auc.dk/pub/infosystems/squid/squid-2/STABLE/${MY_P}-src.tar.gz" -HOMEPAGE="http://www.squid-cache.org/" - -RDEPEND="virtual/glibc pam? ( >=sys-libs/pam-0.72 ) ldap? ( >=net-nds/openldap-2 )" -DEPEND="${RDEPEND} sys-devel/perl" - -src_unpack() { - unpack ${A} - cd ${S} - # see the tops of these patches for details.. - patch -p1 < ${FILESDIR}/${P}-debian.diff || die - patch -p1 < ${FILESDIR}/${P}-gentoo.diff || die - if [ -z "$DEBUG" ] - then - mv configure.in configure.in.orig - sed -e 's%LDFLAGS="-g"%LDFLAGS=""%' configure.in.orig > configure.in - autoconf || die - fi -} - -src_compile() { - local myconf mymodules - mymodules="getpwnam,YP,NCSA,SMB,MSNT,multi-domain-NTLM" - use ldap && mymodules="LDAP,${mymodules}" - use pam && mymodules="PAM,${mymodules}" - use snmp && myconf="--enable-snmp" - - ./configure \ - --prefix=/usr \ - --bindir=/usr/sbin \ - --exec-prefix=/usr \ - --sbindir=/usr/sbin \ - --localstatedir=/var \ - --sysconfdir=/etc/squid \ - --libexecdir=/usr/lib/squid \ - --enable-storeio="ufs,diskd,coss,aufs,null" \ - --enable-removal-policies="lru,heap" \ - --enable-auth-modules=${mymodules} \ - --enable-linux-netfilter \ - --disable-ident-lookups \ - --enable-useragent-log \ - --enable-cache-digests \ - --enable-delay-pools \ - --enable-referer-log \ - --enable-async-io \ - --enable-truncate \ - --enable-arp-acl \ - --with-pthreads \ - --enable-htcp \ - --enable-carp \ - --enable-poll \ - --host=${CHOST} ${myconf} || die "bad ./configure" - #--enable-icmp - - mv include/autoconf.h include/autoconf.h.orig - sed -e "s:^#define SQUID_MAXFD.*:#define SQUID_MAXFD 4096:" \ - include/autoconf.h.orig > include/autoconf.h - - emake || die "compile problem" -} - -src_install() { - make \ - prefix=${D}/usr \ - bindir=${D}/usr/sbin \ - localstatedir=${D}/var \ - sysconfdir=${D}/etc/squid \ - libexecdir=${D}/usr/lib/squid \ - install || die - - #make -C src install-pinger libexecdir=${D}/usr/lib/squid || die - #chown root.squid ${D}/usr/lib/squid/pinger - #chmod 4750 ${D}/usr/lib/squid/pinger - - mv ${D}/usr/sbin/{*_auth*,Run*} ${D}/usr/lib/squid - chown root.squid ${D}/usr/lib/squid/pam_auth - chmod 2750 ${D}/usr/lib/squid/pam_auth - - rm -rf ${D}/etc/squid/errors ${D}/var/logs - cd errors - dodir /usr/lib/squid/errors - for i in * - do - if [ -d $i ] - then - insinto /usr/lib/squid/errors/$i - doins $i/* - fi - done - cd ${S} - dosym /usr/lib/squid/errors/English /etc/squid/errors - - dodoc README QUICKSTART CONTRIBUTORS COPYRIGHT - dodoc COPYING CREDITS ChangeLog TODO - newdoc auth_modules/SMB/README SMB.auth.readme - newdoc auth_modules/LDAP/README LDAP.auth.readme - doman auth_modules/LDAP/*.8 doc/tree.3 - docinto txt - dodoc doc/*.txt - - insinto /etc/pam.d ; newins ${FILESDIR}/squid.pam squid - exeinto /etc/init.d ; newexe ${FILESDIR}/squid.rc6 squid - insinto /etc/conf.d ; newins ${FILESDIR}/squid.confd squid -} - -pkg_postinst() { - # This helps if you had it installed, but never _ran_ it. - install -m0755 -o squid -g squid -d ${ROOT}/var/cache/squid - install -m0755 -o squid -g squid -d ${ROOT}/var/log/squid -} -- cgit v1.2.3-65-gdbad