[arch-commits] Commit in squid/repos (16 files)
Evangelos Foutras
foutrelis at nymeria.archlinux.org
Sat May 11 14:59:12 UTC 2013
Date: Saturday, May 11, 2013 @ 16:59:11
Author: foutrelis
Revision: 90324
archrelease: copy trunk to community-staging-x86_64, community-staging-i686
Added:
squid/repos/community-staging-i686/
squid/repos/community-staging-i686/PKGBUILD
(from rev 90323, squid/trunk/PKGBUILD)
squid/repos/community-staging-i686/squid
(from rev 90323, squid/trunk/squid)
squid/repos/community-staging-i686/squid.conf.d
(from rev 90323, squid/trunk/squid.conf.d)
squid/repos/community-staging-i686/squid.cron
(from rev 90323, squid/trunk/squid.cron)
squid/repos/community-staging-i686/squid.install
(from rev 90323, squid/trunk/squid.install)
squid/repos/community-staging-i686/squid.pam
(from rev 90323, squid/trunk/squid.pam)
squid/repos/community-staging-i686/squid.service
(from rev 90323, squid/trunk/squid.service)
squid/repos/community-staging-x86_64/
squid/repos/community-staging-x86_64/PKGBUILD
(from rev 90323, squid/trunk/PKGBUILD)
squid/repos/community-staging-x86_64/squid
(from rev 90323, squid/trunk/squid)
squid/repos/community-staging-x86_64/squid.conf.d
(from rev 90323, squid/trunk/squid.conf.d)
squid/repos/community-staging-x86_64/squid.cron
(from rev 90323, squid/trunk/squid.cron)
squid/repos/community-staging-x86_64/squid.install
(from rev 90323, squid/trunk/squid.install)
squid/repos/community-staging-x86_64/squid.pam
(from rev 90323, squid/trunk/squid.pam)
squid/repos/community-staging-x86_64/squid.service
(from rev 90323, squid/trunk/squid.service)
----------------------------------------+
community-staging-i686/PKGBUILD | 97 +++++++++++++++++++++++++++++++
community-staging-i686/squid | 49 +++++++++++++++
community-staging-i686/squid.conf.d | 4 +
community-staging-i686/squid.cron | 9 ++
community-staging-i686/squid.install | 26 ++++++++
community-staging-i686/squid.pam | 4 +
community-staging-i686/squid.service | 13 ++++
community-staging-x86_64/PKGBUILD | 97 +++++++++++++++++++++++++++++++
community-staging-x86_64/squid | 49 +++++++++++++++
community-staging-x86_64/squid.conf.d | 4 +
community-staging-x86_64/squid.cron | 9 ++
community-staging-x86_64/squid.install | 26 ++++++++
community-staging-x86_64/squid.pam | 4 +
community-staging-x86_64/squid.service | 13 ++++
14 files changed, 404 insertions(+)
Copied: squid/repos/community-staging-i686/PKGBUILD (from rev 90323, squid/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2013-05-11 14:59:11 UTC (rev 90324)
@@ -0,0 +1,97 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Mark Coolen <mark.coolen at gmail.com>
+# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+# Contributor: Kevin Piche <kevin at archlinux.org>
+
+pkgname=squid
+pkgver=3.3.3
+pkgrel=2
+pkgdesc='Full-featured Web proxy cache server'
+arch=('x86_64' 'i686')
+url='http://www.squid-cache.org'
+depends=('openssl' 'pam' 'cron' 'perl' 'libltdl')
+makedepends=('libcap')
+license=('GPL')
+options=('emptydirs')
+backup=('etc/squid/squid.conf'
+ 'etc/squid/mime.conf'
+ 'etc/conf.d/squid')
+install=$pkgname.install
+source=("http://www.squid-cache.org/Versions/v3/3.3/$pkgname-$pkgver.tar.bz2"
+ 'squid'
+ 'squid.conf.d'
+ 'squid.pam'
+ 'squid.cron'
+ 'squid.service')
+md5sums=('20f63ab34eae93b36969c9c7519f6462'
+ 'e90895ce22c0b618c89a46a9a181fe6c'
+ '2383772ef94efddc7b920628bc7ac5b0'
+ '270977cdd9b47ef44c0c427ab9034777'
+ 'b499c2b725aefd7bd60bec2f1a9de392'
+ '20e00e1aa1198786795f3da32db3c1d8')
+
+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
+
+ sed -i '1,1i#include <errno.h>' helpers/external_acl/file_userip/ext_file_userip_acl.cc
+
+ ./configure \
+ --prefix=/usr \
+ --datadir=/usr/share/squid \
+ --sysconfdir=/etc/squid \
+ --libexecdir=/usr/lib/squid \
+ --localstatedir=/var \
+ --with-logdir=/var/log/squid \
+ --with-pidfile=/run/squid.pid \
+ --enable-auth \
+ --enable-auth-basic \
+ --enable-auth-ntlm \
+ --enable-auth-digest \
+ --enable-auth-negotiate \
+ --enable-removal-policies="lru,heap" \
+ --enable-storeio="aufs,ufs,diskd" \
+ --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-large-files \
+ --enable-arp-acl \
+ --with-default-user=proxy \
+ --enable-async-io \
+ --enable-truncate \
+ --enable-icap-client
+ make
+}
+
+package() {
+ cd "$srcdir"
+
+ make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
+ install -Dm755 "$srcdir/squid" "$pkgdir/etc/rc.d/squid"
+ install -Dm755 "$srcdir/squid.cron" "$pkgdir/etc/cron.weekly/squid"
+ install -Dm755 "$srcdir/squid.conf.d" "$pkgdir/etc/conf.d/squid"
+ install -Dm644 "$srcdir/squid.pam" "$pkgdir/etc/pam.d/squid"
+ install -Dm644 "$srcdir/squid.service" \
+ "$pkgdir/usr/lib/systemd/system/squid.service"
+ rm -rf "$pkgdir/run" "$pkgdir/var/run"
+}
+
+# vim: ts=2 sw=2 et ft=sh
Copied: squid/repos/community-staging-i686/squid (from rev 90323, squid/trunk/squid)
===================================================================
--- community-staging-i686/squid (rev 0)
+++ community-staging-i686/squid 2013-05-11 14:59:11 UTC (rev 90324)
@@ -0,0 +1,49 @@
+#!/bin/bash
+
+# source application-specific settings
+[[ -f /etc/conf.d/squid ]] && . /etc/conf.d/squid
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+pidfile=/run/squid.pid
+{ read -r PID </run/squid.pid; } 2>/dev/null
+if [[ $PID && ! /proc/$PID/exe -ef /usr/sbin/squid ]]; then
+ rm /run/squid.pid
+ unset PID
+fi
+
+case $1 in
+ start)
+ stat_busy "Starting squid"
+ if [[ $PID ]] || ! squid $SQUID_ARGS; then
+ stat_fail
+ else
+ add_daemon squid
+ stat_done
+ fi
+ ;;
+
+ stop)
+ stat_busy "Stopping squid"
+ if [[ -z $PID ]] || ! squid -k shutdown &>/dev/null; then
+ stat_fail
+ else
+ # squid takes forever to shutdown all its listening FDs
+ while [[ /proc/$PID/exe -ef /usr/sbin/squid ]]; do
+ stat_append "."
+ sleep 3
+ done
+ rm_daemon squid
+ stat_done
+ fi
+ ;;
+
+ restart)
+ $0 stop
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
Copied: squid/repos/community-staging-i686/squid.conf.d (from rev 90323, squid/trunk/squid.conf.d)
===================================================================
--- community-staging-i686/squid.conf.d (rev 0)
+++ community-staging-i686/squid.conf.d 2013-05-11 14:59:11 UTC (rev 90324)
@@ -0,0 +1,4 @@
+#
+# Parameters to be passed to squid
+#
+SQUID_ARGS="-sYC"
Copied: squid/repos/community-staging-i686/squid.cron (from rev 90323, squid/trunk/squid.cron)
===================================================================
--- community-staging-i686/squid.cron (rev 0)
+++ community-staging-i686/squid.cron 2013-05-11 14:59:11 UTC (rev 90324)
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# exit without error if no pidfile exists
+{ read pid </run/squid.pid; } 2>/dev/null || exit 0
+
+# make sure found PID really is a squid process
+if [ /proc/$pid/exec -ef /usr/sbin/squid ]; then
+ /usr/sbin/squid -k rotate
+fi
Copied: squid/repos/community-staging-i686/squid.install (from rev 90323, squid/trunk/squid.install)
===================================================================
--- community-staging-i686/squid.install (rev 0)
+++ community-staging-i686/squid.install 2013-05-11 14:59:11 UTC (rev 90324)
@@ -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
+}
+
Copied: squid/repos/community-staging-i686/squid.pam (from rev 90323, squid/trunk/squid.pam)
===================================================================
--- community-staging-i686/squid.pam (rev 0)
+++ community-staging-i686/squid.pam 2013-05-11 14:59:11 UTC (rev 90324)
@@ -0,0 +1,4 @@
+#/etc/pam.d/squid
+#
+auth required pam_unix.so
+account required pam_unix.so
Copied: squid/repos/community-staging-i686/squid.service (from rev 90323, squid/trunk/squid.service)
===================================================================
--- community-staging-i686/squid.service (rev 0)
+++ community-staging-i686/squid.service 2013-05-11 14:59:11 UTC (rev 90324)
@@ -0,0 +1,13 @@
+[Unit]
+Description=Web Proxy Cache Server
+After=network.target
+
+[Service]
+Type=forking
+PIDFile=/run/squid.pid
+ExecStart=/usr/sbin/squid -sYC
+ExecStop=/usr/sbin/squid -k shutdown
+ExecReload=/usr/sbin/squid -k reconfigure
+
+[Install]
+WantedBy=multi-user.target
Copied: squid/repos/community-staging-x86_64/PKGBUILD (from rev 90323, squid/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2013-05-11 14:59:11 UTC (rev 90324)
@@ -0,0 +1,97 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Mark Coolen <mark.coolen at gmail.com>
+# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+# Contributor: Kevin Piche <kevin at archlinux.org>
+
+pkgname=squid
+pkgver=3.3.3
+pkgrel=2
+pkgdesc='Full-featured Web proxy cache server'
+arch=('x86_64' 'i686')
+url='http://www.squid-cache.org'
+depends=('openssl' 'pam' 'cron' 'perl' 'libltdl')
+makedepends=('libcap')
+license=('GPL')
+options=('emptydirs')
+backup=('etc/squid/squid.conf'
+ 'etc/squid/mime.conf'
+ 'etc/conf.d/squid')
+install=$pkgname.install
+source=("http://www.squid-cache.org/Versions/v3/3.3/$pkgname-$pkgver.tar.bz2"
+ 'squid'
+ 'squid.conf.d'
+ 'squid.pam'
+ 'squid.cron'
+ 'squid.service')
+md5sums=('20f63ab34eae93b36969c9c7519f6462'
+ 'e90895ce22c0b618c89a46a9a181fe6c'
+ '2383772ef94efddc7b920628bc7ac5b0'
+ '270977cdd9b47ef44c0c427ab9034777'
+ 'b499c2b725aefd7bd60bec2f1a9de392'
+ '20e00e1aa1198786795f3da32db3c1d8')
+
+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
+
+ sed -i '1,1i#include <errno.h>' helpers/external_acl/file_userip/ext_file_userip_acl.cc
+
+ ./configure \
+ --prefix=/usr \
+ --datadir=/usr/share/squid \
+ --sysconfdir=/etc/squid \
+ --libexecdir=/usr/lib/squid \
+ --localstatedir=/var \
+ --with-logdir=/var/log/squid \
+ --with-pidfile=/run/squid.pid \
+ --enable-auth \
+ --enable-auth-basic \
+ --enable-auth-ntlm \
+ --enable-auth-digest \
+ --enable-auth-negotiate \
+ --enable-removal-policies="lru,heap" \
+ --enable-storeio="aufs,ufs,diskd" \
+ --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-large-files \
+ --enable-arp-acl \
+ --with-default-user=proxy \
+ --enable-async-io \
+ --enable-truncate \
+ --enable-icap-client
+ make
+}
+
+package() {
+ cd "$srcdir"
+
+ make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
+ install -Dm755 "$srcdir/squid" "$pkgdir/etc/rc.d/squid"
+ install -Dm755 "$srcdir/squid.cron" "$pkgdir/etc/cron.weekly/squid"
+ install -Dm755 "$srcdir/squid.conf.d" "$pkgdir/etc/conf.d/squid"
+ install -Dm644 "$srcdir/squid.pam" "$pkgdir/etc/pam.d/squid"
+ install -Dm644 "$srcdir/squid.service" \
+ "$pkgdir/usr/lib/systemd/system/squid.service"
+ rm -rf "$pkgdir/run" "$pkgdir/var/run"
+}
+
+# vim: ts=2 sw=2 et ft=sh
Copied: squid/repos/community-staging-x86_64/squid (from rev 90323, squid/trunk/squid)
===================================================================
--- community-staging-x86_64/squid (rev 0)
+++ community-staging-x86_64/squid 2013-05-11 14:59:11 UTC (rev 90324)
@@ -0,0 +1,49 @@
+#!/bin/bash
+
+# source application-specific settings
+[[ -f /etc/conf.d/squid ]] && . /etc/conf.d/squid
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+pidfile=/run/squid.pid
+{ read -r PID </run/squid.pid; } 2>/dev/null
+if [[ $PID && ! /proc/$PID/exe -ef /usr/sbin/squid ]]; then
+ rm /run/squid.pid
+ unset PID
+fi
+
+case $1 in
+ start)
+ stat_busy "Starting squid"
+ if [[ $PID ]] || ! squid $SQUID_ARGS; then
+ stat_fail
+ else
+ add_daemon squid
+ stat_done
+ fi
+ ;;
+
+ stop)
+ stat_busy "Stopping squid"
+ if [[ -z $PID ]] || ! squid -k shutdown &>/dev/null; then
+ stat_fail
+ else
+ # squid takes forever to shutdown all its listening FDs
+ while [[ /proc/$PID/exe -ef /usr/sbin/squid ]]; do
+ stat_append "."
+ sleep 3
+ done
+ rm_daemon squid
+ stat_done
+ fi
+ ;;
+
+ restart)
+ $0 stop
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
Copied: squid/repos/community-staging-x86_64/squid.conf.d (from rev 90323, squid/trunk/squid.conf.d)
===================================================================
--- community-staging-x86_64/squid.conf.d (rev 0)
+++ community-staging-x86_64/squid.conf.d 2013-05-11 14:59:11 UTC (rev 90324)
@@ -0,0 +1,4 @@
+#
+# Parameters to be passed to squid
+#
+SQUID_ARGS="-sYC"
Copied: squid/repos/community-staging-x86_64/squid.cron (from rev 90323, squid/trunk/squid.cron)
===================================================================
--- community-staging-x86_64/squid.cron (rev 0)
+++ community-staging-x86_64/squid.cron 2013-05-11 14:59:11 UTC (rev 90324)
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# exit without error if no pidfile exists
+{ read pid </run/squid.pid; } 2>/dev/null || exit 0
+
+# make sure found PID really is a squid process
+if [ /proc/$pid/exec -ef /usr/sbin/squid ]; then
+ /usr/sbin/squid -k rotate
+fi
Copied: squid/repos/community-staging-x86_64/squid.install (from rev 90323, squid/trunk/squid.install)
===================================================================
--- community-staging-x86_64/squid.install (rev 0)
+++ community-staging-x86_64/squid.install 2013-05-11 14:59:11 UTC (rev 90324)
@@ -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
+}
+
Copied: squid/repos/community-staging-x86_64/squid.pam (from rev 90323, squid/trunk/squid.pam)
===================================================================
--- community-staging-x86_64/squid.pam (rev 0)
+++ community-staging-x86_64/squid.pam 2013-05-11 14:59:11 UTC (rev 90324)
@@ -0,0 +1,4 @@
+#/etc/pam.d/squid
+#
+auth required pam_unix.so
+account required pam_unix.so
Copied: squid/repos/community-staging-x86_64/squid.service (from rev 90323, squid/trunk/squid.service)
===================================================================
--- community-staging-x86_64/squid.service (rev 0)
+++ community-staging-x86_64/squid.service 2013-05-11 14:59:11 UTC (rev 90324)
@@ -0,0 +1,13 @@
+[Unit]
+Description=Web Proxy Cache Server
+After=network.target
+
+[Service]
+Type=forking
+PIDFile=/run/squid.pid
+ExecStart=/usr/sbin/squid -sYC
+ExecStop=/usr/sbin/squid -k shutdown
+ExecReload=/usr/sbin/squid -k reconfigure
+
+[Install]
+WantedBy=multi-user.target
More information about the arch-commits
mailing list