Date: Saturday, October 15, 2011 @ 18:54:05 Author: kevin Revision: 140501
archrelease: copy trunk to extra-i686, extra-x86_64 Added: squid/repos/extra-i686/PKGBUILD (from rev 140500, squid/trunk/PKGBUILD) squid/repos/extra-i686/squid (from rev 140500, squid/trunk/squid) squid/repos/extra-i686/squid.conf.d (from rev 140500, squid/trunk/squid.conf.d) squid/repos/extra-i686/squid.cron (from rev 140500, squid/trunk/squid.cron) squid/repos/extra-i686/squid.install (from rev 140500, squid/trunk/squid.install) squid/repos/extra-i686/squid.pam (from rev 140500, squid/trunk/squid.pam) squid/repos/extra-x86_64/PKGBUILD (from rev 140500, squid/trunk/PKGBUILD) squid/repos/extra-x86_64/squid (from rev 140500, squid/trunk/squid) squid/repos/extra-x86_64/squid.conf.d (from rev 140500, squid/trunk/squid.conf.d) squid/repos/extra-x86_64/squid.cron (from rev 140500, squid/trunk/squid.cron) squid/repos/extra-x86_64/squid.install (from rev 140500, squid/trunk/squid.install) squid/repos/extra-x86_64/squid.pam (from rev 140500, squid/trunk/squid.pam) Deleted: squid/repos/extra-i686/PKGBUILD squid/repos/extra-i686/squid squid/repos/extra-i686/squid.conf.d squid/repos/extra-i686/squid.cron squid/repos/extra-i686/squid.install squid/repos/extra-i686/squid.pam squid/repos/extra-x86_64/PKGBUILD squid/repos/extra-x86_64/squid squid/repos/extra-x86_64/squid.conf.d squid/repos/extra-x86_64/squid.cron squid/repos/extra-x86_64/squid.install squid/repos/extra-x86_64/squid.pam ----------------------------+ extra-i686/PKGBUILD | 130 +++++++++++++++++++++---------------------- extra-i686/squid | 104 +++++++++++++++++----------------- extra-i686/squid.conf.d | 8 +- extra-i686/squid.cron | 8 +- extra-i686/squid.install | 52 ++++++++--------- extra-i686/squid.pam | 8 +- extra-x86_64/PKGBUILD | 130 +++++++++++++++++++++---------------------- extra-x86_64/squid | 104 +++++++++++++++++----------------- extra-x86_64/squid.conf.d | 8 +- extra-x86_64/squid.cron | 8 +- extra-x86_64/squid.install | 52 ++++++++--------- extra-x86_64/squid.pam | 8 +- 12 files changed, 310 insertions(+), 310 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2011-10-15 21:31:13 UTC (rev 140500) +++ extra-i686/PKGBUILD 2011-10-15 22:54:05 UTC (rev 140501) @@ -1,65 +0,0 @@ -# $Id$ -# Maintainer: Kevin Piche <ke...@archlinux.org> -# Contributor: Tom Newsom <jeeps...@gmx.co.uk> - -pkgname=squid -pkgver=3.1.16 -pkgrel=1 -pkgdesc="A full-featured Web proxy cache server." -arch=(i686 x86_64) -url="http://www.squid-cache.org" -depends=('openssl' 'pam' 'cron' 'perl' 'libtool') -makedepends=('libcap>=2.16') -license=('GPL') -backup=(etc/squid/squid.conf etc/squid/mime.conf etc/conf.d/squid) -install=squid.install -source=(http://www.squid-cache.org/Versions/v3/3.1/${pkgname}-${pkgver}.tar.bz2 - squid squid.conf.d squid.pam squid.cron) -md5sums=('675aef4411d41f5b55b15a29ad6e5261' - 'd213b0cc1db72b749bb8c88716fdab39' - '2383772ef94efddc7b920628bc7ac5b0' - '270977cdd9b47ef44c0c427ab9034777' - '5e17df989e2a74e869790c066f61225b') - -build() { - cd "${srcdir}"/${pkgname}-${pkgver} - - # gcc 4.6 doesn't support -fhuge-objects. - sed '/^ HUGE_OBJECT_FLAG=/ s/"-fhuge-objects"//' -i configure - - # fix cache_dir, cache_dir size, and effective group. - sed '/^DEFAULT_SWAP_DIR/ s@/cache@/cache/squid@' -i src/Makefile.in - sed '/^#cache_dir/ s/100/256/ - /^NAME: cache_effective_group/ {n;n;s/none/proxy/}' -i src/cf.data.pre - - ./configure --prefix=/usr --datadir=/usr/share/squid \ - --sysconfdir=/etc/squid --libexecdir=/usr/lib/squid \ - --localstatedir=/var --with-logdir=/var/log/squid \ - --enable-auth="basic,digest,ntlm" --enable-removal-policies="lru,heap" \ - --enable-digest-auth-helpers="password" --enable-storeio="aufs,ufs,diskd" \ - --enable-basic-auth-helpers="getpwnam,YP,NCSA,SMB,MSNT,PAM,multi-domain-NTLM" \ - --enable-external-acl-helpers="ip_user,unix_group,wbinfo_group" \ - --enable-ntlm-auth-helpers="smb_lm,fakeauth,no_check" \ - --enable-delay-pools --enable-arp-acl --enable-ssl --enable-snmp \ - --enable-linux-netfilter --enable-ident-lookups \ - --enable-useragent-log --enable-cache-digests --enable-referer-log \ - --enable-arp-acl --enable-htcp --enable-carp --enable-epoll \ - --with-filedescriptors=4096 --with-large-files --enable-arp-acl \ - --with-default-user=proxy \ - --enable-async-io --enable-truncate -#some versions have build problems with both async and truncate enabled: -# --enable-async-io - - make -} - -package() { - cd "${srcdir}"/${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install - - install -D -m755 "${srcdir}"/squid "${pkgdir}"/etc/rc.d/squid - install -D -m755 "${srcdir}"/squid.cron "${pkgdir}"/etc/cron.weekly/squid - install -D -m644 "${srcdir}"/squid.conf.d "${pkgdir}"/etc/conf.d/squid - install -D -m644 "${srcdir}"/squid.pam "${pkgdir}"/etc/pam.d/squid -} -# vim: ts=2 sw=2 et ft=sh Copied: squid/repos/extra-i686/PKGBUILD (from rev 140500, squid/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2011-10-15 22:54:05 UTC (rev 140501) @@ -0,0 +1,65 @@ +# $Id$ +# Maintainer: Kevin Piche <ke...@archlinux.org> +# Contributor: Tom Newsom <jeeps...@gmx.co.uk> + +pkgname=squid +pkgver=3.1.16 +pkgrel=1 +pkgdesc="A full-featured Web proxy cache server." +arch=(i686 x86_64) +url="http://www.squid-cache.org" +depends=('openssl' 'pam' 'cron' 'perl' 'libtool') +makedepends=('libcap>=2.16') +license=('GPL') +backup=(etc/squid/squid.conf etc/squid/mime.conf etc/conf.d/squid) +install=squid.install +source=(http://www.squid-cache.org/Versions/v3/3.1/${pkgname}-${pkgver}.tar.bz2 + squid squid.conf.d squid.pam squid.cron) +md5sums=('675aef4411d41f5b55b15a29ad6e5261' + 'd213b0cc1db72b749bb8c88716fdab39' + '2383772ef94efddc7b920628bc7ac5b0' + '270977cdd9b47ef44c0c427ab9034777' + '5e17df989e2a74e869790c066f61225b') + +build() { + cd "${srcdir}"/${pkgname}-${pkgver} + + # gcc 4.6 doesn't support -fhuge-objects. + sed '/^ HUGE_OBJECT_FLAG=/ s/"-fhuge-objects"//' -i configure + + # fix cache_dir, cache_dir size, and effective group. + sed '/^DEFAULT_SWAP_DIR/ s@/cache@/cache/squid@' -i src/Makefile.in + sed '/^#cache_dir/ s/100/256/ + /^NAME: cache_effective_group/ {n;n;s/none/proxy/}' -i src/cf.data.pre + + ./configure --prefix=/usr --datadir=/usr/share/squid \ + --sysconfdir=/etc/squid --libexecdir=/usr/lib/squid \ + --localstatedir=/var --with-logdir=/var/log/squid \ + --enable-auth="basic,digest,ntlm" --enable-removal-policies="lru,heap" \ + --enable-digest-auth-helpers="password" --enable-storeio="aufs,ufs,diskd" \ + --enable-basic-auth-helpers="getpwnam,YP,NCSA,SMB,MSNT,PAM,multi-domain-NTLM" \ + --enable-external-acl-helpers="ip_user,unix_group,wbinfo_group" \ + --enable-ntlm-auth-helpers="smb_lm,fakeauth,no_check" \ + --enable-delay-pools --enable-arp-acl --enable-ssl --enable-snmp \ + --enable-linux-netfilter --enable-ident-lookups \ + --enable-useragent-log --enable-cache-digests --enable-referer-log \ + --enable-arp-acl --enable-htcp --enable-carp --enable-epoll \ + --with-filedescriptors=4096 --with-large-files --enable-arp-acl \ + --with-default-user=proxy \ + --enable-async-io --enable-truncate +#some versions have build problems with both async and truncate enabled: +# --enable-async-io + + make +} + +package() { + cd "${srcdir}"/${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install + + install -D -m755 "${srcdir}"/squid "${pkgdir}"/etc/rc.d/squid + install -D -m755 "${srcdir}"/squid.cron "${pkgdir}"/etc/cron.weekly/squid + install -D -m644 "${srcdir}"/squid.conf.d "${pkgdir}"/etc/conf.d/squid + install -D -m644 "${srcdir}"/squid.pam "${pkgdir}"/etc/pam.d/squid +} +# vim: ts=2 sw=2 et ft=sh Deleted: extra-i686/squid =================================================================== --- extra-i686/squid 2011-10-15 21:31:13 UTC (rev 140500) +++ extra-i686/squid 2011-10-15 22:54:05 UTC (rev 140501) @@ -1,52 +0,0 @@ -#!/bin/bash - -# source application-specific settings -SQUID_ARGS= -[ -f /etc/conf.d/squid ] && . /etc/conf.d/squid - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/squid` -case "$1" in - - start) - if [ ! -f /var/cache/squid/swap.state ]; then - stat_busy "Creating squid's swap directories" - /usr/sbin/squid -z - fi - stat_busy "Starting squid" - [ -z "$PID" ] && /usr/sbin/squid ${SQUID_ARGS} - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon squid - stat_done - fi - ;; - - stop) - stat_busy "Stopping squid" - [ ! -z "$PID" ] && /usr/sbin/squid -k shutdown &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - # wait for squid to shutdown so we can safely do a restart - while [ ! -z "`pidof -o %PPID /usr/sbin/squid`" ]; do - stat_append "." - sleep 3 - done - rm_daemon squid - stat_done - fi - ;; - - restart) - $0 stop - sleep 5 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 Copied: squid/repos/extra-i686/squid (from rev 140500, squid/trunk/squid) =================================================================== --- extra-i686/squid (rev 0) +++ extra-i686/squid 2011-10-15 22:54:05 UTC (rev 140501) @@ -0,0 +1,52 @@ +#!/bin/bash + +# source application-specific settings +SQUID_ARGS= +[ -f /etc/conf.d/squid ] && . /etc/conf.d/squid + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/squid` +case "$1" in + + start) + if [ ! -f /var/cache/squid/swap.state ]; then + stat_busy "Creating squid's swap directories" + /usr/sbin/squid -z + fi + stat_busy "Starting squid" + [ -z "$PID" ] && /usr/sbin/squid ${SQUID_ARGS} + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon squid + stat_done + fi + ;; + + stop) + stat_busy "Stopping squid" + [ ! -z "$PID" ] && /usr/sbin/squid -k shutdown &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + # wait for squid to shutdown so we can safely do a restart + while [ ! -z "`pidof -o %PPID /usr/sbin/squid`" ]; do + stat_append "." + sleep 3 + done + rm_daemon squid + stat_done + fi + ;; + + restart) + $0 stop + sleep 5 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 Deleted: extra-i686/squid.conf.d =================================================================== --- extra-i686/squid.conf.d 2011-10-15 21:31:13 UTC (rev 140500) +++ extra-i686/squid.conf.d 2011-10-15 22:54:05 UTC (rev 140501) @@ -1,4 +0,0 @@ -# -# Parameters to be passed to squid -# -SQUID_ARGS="-sYC" Copied: squid/repos/extra-i686/squid.conf.d (from rev 140500, squid/trunk/squid.conf.d) =================================================================== --- extra-i686/squid.conf.d (rev 0) +++ extra-i686/squid.conf.d 2011-10-15 22:54:05 UTC (rev 140501) @@ -0,0 +1,4 @@ +# +# Parameters to be passed to squid +# +SQUID_ARGS="-sYC" Deleted: extra-i686/squid.cron =================================================================== --- extra-i686/squid.cron 2011-10-15 21:31:13 UTC (rev 140500) +++ extra-i686/squid.cron 2011-10-15 22:54:05 UTC (rev 140501) @@ -1,4 +0,0 @@ -#!/bin/bash - -PID=`pidof -o %PPID /usr/sbin/squid` -[ -n "$PID" ] && /usr/sbin/squid -k rotate Copied: squid/repos/extra-i686/squid.cron (from rev 140500, squid/trunk/squid.cron) =================================================================== --- extra-i686/squid.cron (rev 0) +++ extra-i686/squid.cron 2011-10-15 22:54:05 UTC (rev 140501) @@ -0,0 +1,4 @@ +#!/bin/bash + +PID=`pidof -o %PPID /usr/sbin/squid` +[ -n "$PID" ] && /usr/sbin/squid -k rotate Deleted: extra-i686/squid.install =================================================================== --- extra-i686/squid.install 2011-10-15 21:31:13 UTC (rev 140500) +++ extra-i686/squid.install 2011-10-15 22:54:05 UTC (rev 140501) @@ -1,26 +0,0 @@ -post_install() { - if [ -z "$(grep ^proxy: /etc/group)" ]; then - usr/sbin/groupadd -g 15 proxy &>/dev/null - fi - - id proxy &>/dev/null || \ - usr/sbin/useradd -u 15 -g proxy -d /var/empty proxy - - chown proxy.proxy var/{cache,log}/squid - -# cat << EOF -#Release notes: http://www.squid-cache.org/Versions/v3/3.1/RELEASENOTES.html -#EOF -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/userdel proxy &> /dev/null - if [ ! -z "$(grep ^proxy: /etc/group)" ]; then - usr/sbin/groupdel proxy &>/dev/null - fi -} - Copied: squid/repos/extra-i686/squid.install (from rev 140500, squid/trunk/squid.install) =================================================================== --- extra-i686/squid.install (rev 0) +++ extra-i686/squid.install 2011-10-15 22:54:05 UTC (rev 140501) @@ -0,0 +1,26 @@ +post_install() { + if [ -z "$(grep ^proxy: /etc/group)" ]; then + usr/sbin/groupadd -g 15 proxy &>/dev/null + fi + + id proxy &>/dev/null || \ + usr/sbin/useradd -u 15 -g proxy -d /var/empty proxy + + chown proxy.proxy var/{cache,log}/squid + +# cat << EOF +#Release notes: http://www.squid-cache.org/Versions/v3/3.1/RELEASENOTES.html +#EOF +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + usr/sbin/userdel proxy &> /dev/null + if [ ! -z "$(grep ^proxy: /etc/group)" ]; then + usr/sbin/groupdel proxy &>/dev/null + fi +} + Deleted: extra-i686/squid.pam =================================================================== --- extra-i686/squid.pam 2011-10-15 21:31:13 UTC (rev 140500) +++ extra-i686/squid.pam 2011-10-15 22:54:05 UTC (rev 140501) @@ -1,4 +0,0 @@ -#/etc/pam.d/squid -# -auth required pam_unix.so -account required pam_unix.so Copied: squid/repos/extra-i686/squid.pam (from rev 140500, squid/trunk/squid.pam) =================================================================== --- extra-i686/squid.pam (rev 0) +++ extra-i686/squid.pam 2011-10-15 22:54:05 UTC (rev 140501) @@ -0,0 +1,4 @@ +#/etc/pam.d/squid +# +auth required pam_unix.so +account required pam_unix.so Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2011-10-15 21:31:13 UTC (rev 140500) +++ extra-x86_64/PKGBUILD 2011-10-15 22:54:05 UTC (rev 140501) @@ -1,65 +0,0 @@ -# $Id$ -# Maintainer: Kevin Piche <ke...@archlinux.org> -# Contributor: Tom Newsom <jeeps...@gmx.co.uk> - -pkgname=squid -pkgver=3.1.16 -pkgrel=1 -pkgdesc="A full-featured Web proxy cache server." -arch=(i686 x86_64) -url="http://www.squid-cache.org" -depends=('openssl' 'pam' 'cron' 'perl' 'libtool') -makedepends=('libcap>=2.16') -license=('GPL') -backup=(etc/squid/squid.conf etc/squid/mime.conf etc/conf.d/squid) -install=squid.install -source=(http://www.squid-cache.org/Versions/v3/3.1/${pkgname}-${pkgver}.tar.bz2 - squid squid.conf.d squid.pam squid.cron) -md5sums=('675aef4411d41f5b55b15a29ad6e5261' - 'd213b0cc1db72b749bb8c88716fdab39' - '2383772ef94efddc7b920628bc7ac5b0' - '270977cdd9b47ef44c0c427ab9034777' - '5e17df989e2a74e869790c066f61225b') - -build() { - cd "${srcdir}"/${pkgname}-${pkgver} - - # gcc 4.6 doesn't support -fhuge-objects. - sed '/^ HUGE_OBJECT_FLAG=/ s/"-fhuge-objects"//' -i configure - - # fix cache_dir, cache_dir size, and effective group. - sed '/^DEFAULT_SWAP_DIR/ s@/cache@/cache/squid@' -i src/Makefile.in - sed '/^#cache_dir/ s/100/256/ - /^NAME: cache_effective_group/ {n;n;s/none/proxy/}' -i src/cf.data.pre - - ./configure --prefix=/usr --datadir=/usr/share/squid \ - --sysconfdir=/etc/squid --libexecdir=/usr/lib/squid \ - --localstatedir=/var --with-logdir=/var/log/squid \ - --enable-auth="basic,digest,ntlm" --enable-removal-policies="lru,heap" \ - --enable-digest-auth-helpers="password" --enable-storeio="aufs,ufs,diskd" \ - --enable-basic-auth-helpers="getpwnam,YP,NCSA,SMB,MSNT,PAM,multi-domain-NTLM" \ - --enable-external-acl-helpers="ip_user,unix_group,wbinfo_group" \ - --enable-ntlm-auth-helpers="smb_lm,fakeauth,no_check" \ - --enable-delay-pools --enable-arp-acl --enable-ssl --enable-snmp \ - --enable-linux-netfilter --enable-ident-lookups \ - --enable-useragent-log --enable-cache-digests --enable-referer-log \ - --enable-arp-acl --enable-htcp --enable-carp --enable-epoll \ - --with-filedescriptors=4096 --with-large-files --enable-arp-acl \ - --with-default-user=proxy \ - --enable-async-io --enable-truncate -#some versions have build problems with both async and truncate enabled: -# --enable-async-io - - make -} - -package() { - cd "${srcdir}"/${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install - - install -D -m755 "${srcdir}"/squid "${pkgdir}"/etc/rc.d/squid - install -D -m755 "${srcdir}"/squid.cron "${pkgdir}"/etc/cron.weekly/squid - install -D -m644 "${srcdir}"/squid.conf.d "${pkgdir}"/etc/conf.d/squid - install -D -m644 "${srcdir}"/squid.pam "${pkgdir}"/etc/pam.d/squid -} -# vim: ts=2 sw=2 et ft=sh Copied: squid/repos/extra-x86_64/PKGBUILD (from rev 140500, squid/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2011-10-15 22:54:05 UTC (rev 140501) @@ -0,0 +1,65 @@ +# $Id$ +# Maintainer: Kevin Piche <ke...@archlinux.org> +# Contributor: Tom Newsom <jeeps...@gmx.co.uk> + +pkgname=squid +pkgver=3.1.16 +pkgrel=1 +pkgdesc="A full-featured Web proxy cache server." +arch=(i686 x86_64) +url="http://www.squid-cache.org" +depends=('openssl' 'pam' 'cron' 'perl' 'libtool') +makedepends=('libcap>=2.16') +license=('GPL') +backup=(etc/squid/squid.conf etc/squid/mime.conf etc/conf.d/squid) +install=squid.install +source=(http://www.squid-cache.org/Versions/v3/3.1/${pkgname}-${pkgver}.tar.bz2 + squid squid.conf.d squid.pam squid.cron) +md5sums=('675aef4411d41f5b55b15a29ad6e5261' + 'd213b0cc1db72b749bb8c88716fdab39' + '2383772ef94efddc7b920628bc7ac5b0' + '270977cdd9b47ef44c0c427ab9034777' + '5e17df989e2a74e869790c066f61225b') + +build() { + cd "${srcdir}"/${pkgname}-${pkgver} + + # gcc 4.6 doesn't support -fhuge-objects. + sed '/^ HUGE_OBJECT_FLAG=/ s/"-fhuge-objects"//' -i configure + + # fix cache_dir, cache_dir size, and effective group. + sed '/^DEFAULT_SWAP_DIR/ s@/cache@/cache/squid@' -i src/Makefile.in + sed '/^#cache_dir/ s/100/256/ + /^NAME: cache_effective_group/ {n;n;s/none/proxy/}' -i src/cf.data.pre + + ./configure --prefix=/usr --datadir=/usr/share/squid \ + --sysconfdir=/etc/squid --libexecdir=/usr/lib/squid \ + --localstatedir=/var --with-logdir=/var/log/squid \ + --enable-auth="basic,digest,ntlm" --enable-removal-policies="lru,heap" \ + --enable-digest-auth-helpers="password" --enable-storeio="aufs,ufs,diskd" \ + --enable-basic-auth-helpers="getpwnam,YP,NCSA,SMB,MSNT,PAM,multi-domain-NTLM" \ + --enable-external-acl-helpers="ip_user,unix_group,wbinfo_group" \ + --enable-ntlm-auth-helpers="smb_lm,fakeauth,no_check" \ + --enable-delay-pools --enable-arp-acl --enable-ssl --enable-snmp \ + --enable-linux-netfilter --enable-ident-lookups \ + --enable-useragent-log --enable-cache-digests --enable-referer-log \ + --enable-arp-acl --enable-htcp --enable-carp --enable-epoll \ + --with-filedescriptors=4096 --with-large-files --enable-arp-acl \ + --with-default-user=proxy \ + --enable-async-io --enable-truncate +#some versions have build problems with both async and truncate enabled: +# --enable-async-io + + make +} + +package() { + cd "${srcdir}"/${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install + + install -D -m755 "${srcdir}"/squid "${pkgdir}"/etc/rc.d/squid + install -D -m755 "${srcdir}"/squid.cron "${pkgdir}"/etc/cron.weekly/squid + install -D -m644 "${srcdir}"/squid.conf.d "${pkgdir}"/etc/conf.d/squid + install -D -m644 "${srcdir}"/squid.pam "${pkgdir}"/etc/pam.d/squid +} +# vim: ts=2 sw=2 et ft=sh Deleted: extra-x86_64/squid =================================================================== --- extra-x86_64/squid 2011-10-15 21:31:13 UTC (rev 140500) +++ extra-x86_64/squid 2011-10-15 22:54:05 UTC (rev 140501) @@ -1,52 +0,0 @@ -#!/bin/bash - -# source application-specific settings -SQUID_ARGS= -[ -f /etc/conf.d/squid ] && . /etc/conf.d/squid - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/squid` -case "$1" in - - start) - if [ ! -f /var/cache/squid/swap.state ]; then - stat_busy "Creating squid's swap directories" - /usr/sbin/squid -z - fi - stat_busy "Starting squid" - [ -z "$PID" ] && /usr/sbin/squid ${SQUID_ARGS} - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon squid - stat_done - fi - ;; - - stop) - stat_busy "Stopping squid" - [ ! -z "$PID" ] && /usr/sbin/squid -k shutdown &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - # wait for squid to shutdown so we can safely do a restart - while [ ! -z "`pidof -o %PPID /usr/sbin/squid`" ]; do - stat_append "." - sleep 3 - done - rm_daemon squid - stat_done - fi - ;; - - restart) - $0 stop - sleep 5 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 Copied: squid/repos/extra-x86_64/squid (from rev 140500, squid/trunk/squid) =================================================================== --- extra-x86_64/squid (rev 0) +++ extra-x86_64/squid 2011-10-15 22:54:05 UTC (rev 140501) @@ -0,0 +1,52 @@ +#!/bin/bash + +# source application-specific settings +SQUID_ARGS= +[ -f /etc/conf.d/squid ] && . /etc/conf.d/squid + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/squid` +case "$1" in + + start) + if [ ! -f /var/cache/squid/swap.state ]; then + stat_busy "Creating squid's swap directories" + /usr/sbin/squid -z + fi + stat_busy "Starting squid" + [ -z "$PID" ] && /usr/sbin/squid ${SQUID_ARGS} + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon squid + stat_done + fi + ;; + + stop) + stat_busy "Stopping squid" + [ ! -z "$PID" ] && /usr/sbin/squid -k shutdown &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + # wait for squid to shutdown so we can safely do a restart + while [ ! -z "`pidof -o %PPID /usr/sbin/squid`" ]; do + stat_append "." + sleep 3 + done + rm_daemon squid + stat_done + fi + ;; + + restart) + $0 stop + sleep 5 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 Deleted: extra-x86_64/squid.conf.d =================================================================== --- extra-x86_64/squid.conf.d 2011-10-15 21:31:13 UTC (rev 140500) +++ extra-x86_64/squid.conf.d 2011-10-15 22:54:05 UTC (rev 140501) @@ -1,4 +0,0 @@ -# -# Parameters to be passed to squid -# -SQUID_ARGS="-sYC" Copied: squid/repos/extra-x86_64/squid.conf.d (from rev 140500, squid/trunk/squid.conf.d) =================================================================== --- extra-x86_64/squid.conf.d (rev 0) +++ extra-x86_64/squid.conf.d 2011-10-15 22:54:05 UTC (rev 140501) @@ -0,0 +1,4 @@ +# +# Parameters to be passed to squid +# +SQUID_ARGS="-sYC" Deleted: extra-x86_64/squid.cron =================================================================== --- extra-x86_64/squid.cron 2011-10-15 21:31:13 UTC (rev 140500) +++ extra-x86_64/squid.cron 2011-10-15 22:54:05 UTC (rev 140501) @@ -1,4 +0,0 @@ -#!/bin/bash - -PID=`pidof -o %PPID /usr/sbin/squid` -[ -n "$PID" ] && /usr/sbin/squid -k rotate Copied: squid/repos/extra-x86_64/squid.cron (from rev 140500, squid/trunk/squid.cron) =================================================================== --- extra-x86_64/squid.cron (rev 0) +++ extra-x86_64/squid.cron 2011-10-15 22:54:05 UTC (rev 140501) @@ -0,0 +1,4 @@ +#!/bin/bash + +PID=`pidof -o %PPID /usr/sbin/squid` +[ -n "$PID" ] && /usr/sbin/squid -k rotate Deleted: extra-x86_64/squid.install =================================================================== --- extra-x86_64/squid.install 2011-10-15 21:31:13 UTC (rev 140500) +++ extra-x86_64/squid.install 2011-10-15 22:54:05 UTC (rev 140501) @@ -1,26 +0,0 @@ -post_install() { - if [ -z "$(grep ^proxy: /etc/group)" ]; then - usr/sbin/groupadd -g 15 proxy &>/dev/null - fi - - id proxy &>/dev/null || \ - usr/sbin/useradd -u 15 -g proxy -d /var/empty proxy - - chown proxy.proxy var/{cache,log}/squid - -# cat << EOF -#Release notes: http://www.squid-cache.org/Versions/v3/3.1/RELEASENOTES.html -#EOF -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/userdel proxy &> /dev/null - if [ ! -z "$(grep ^proxy: /etc/group)" ]; then - usr/sbin/groupdel proxy &>/dev/null - fi -} - Copied: squid/repos/extra-x86_64/squid.install (from rev 140500, squid/trunk/squid.install) =================================================================== --- extra-x86_64/squid.install (rev 0) +++ extra-x86_64/squid.install 2011-10-15 22:54:05 UTC (rev 140501) @@ -0,0 +1,26 @@ +post_install() { + if [ -z "$(grep ^proxy: /etc/group)" ]; then + usr/sbin/groupadd -g 15 proxy &>/dev/null + fi + + id proxy &>/dev/null || \ + usr/sbin/useradd -u 15 -g proxy -d /var/empty proxy + + chown proxy.proxy var/{cache,log}/squid + +# cat << EOF +#Release notes: http://www.squid-cache.org/Versions/v3/3.1/RELEASENOTES.html +#EOF +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + usr/sbin/userdel proxy &> /dev/null + if [ ! -z "$(grep ^proxy: /etc/group)" ]; then + usr/sbin/groupdel proxy &>/dev/null + fi +} + Deleted: extra-x86_64/squid.pam =================================================================== --- extra-x86_64/squid.pam 2011-10-15 21:31:13 UTC (rev 140500) +++ extra-x86_64/squid.pam 2011-10-15 22:54:05 UTC (rev 140501) @@ -1,4 +0,0 @@ -#/etc/pam.d/squid -# -auth required pam_unix.so -account required pam_unix.so Copied: squid/repos/extra-x86_64/squid.pam (from rev 140500, squid/trunk/squid.pam) =================================================================== --- extra-x86_64/squid.pam (rev 0) +++ extra-x86_64/squid.pam 2011-10-15 22:54:05 UTC (rev 140501) @@ -0,0 +1,4 @@ +#/etc/pam.d/squid +# +auth required pam_unix.so +account required pam_unix.so