[arch-commits] Commit in squid/trunk (PKGBUILD squid squid.conf.d)

[Sergej Pupykin]

    Date: Monday, May 13, 2013 @ 12:57:07
  Author: spupykin
Revision: 90614

Modified:
  squid/trunk/PKGBUILD
Deleted:
  squid/trunk/squid
  squid/trunk/squid.conf.d

--------------+
 PKGBUILD     |    7 ++-----
 squid        |   49 -------------------------------------------------
 squid.conf.d |    4 ----
 3 files changed, 2 insertions(+), 58 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-13 10:55:37 UTC (rev 90613)
+++ PKGBUILD	2013-05-13 10:57:07 UTC (rev 90614)
@@ -6,7 +6,7 @@
 
 pkgname=squid
 pkgver=3.3.4
-pkgrel=1
+pkgrel=3
 pkgdesc='Full-featured Web proxy cache server'
 arch=('x86_64' 'i686')
 url='http://www.squid-cache.org'
@@ -15,8 +15,7 @@
 license=('GPL')
 options=('emptydirs')
 backup=('etc/squid/squid.conf'
-        'etc/squid/mime.conf'
-        'etc/conf.d/squid')
+        'etc/squid/mime.conf')
 install=$pkgname.install
 source=("http://www.squid-cache.org/Versions/v3/3.3/$pkgname-$pkgver.tar.bz2"
         'squid'
@@ -85,9 +84,7 @@
   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"

Deleted: squid
===================================================================
--- squid	2013-05-13 10:55:37 UTC (rev 90613)
+++ squid	2013-05-13 10:57:07 UTC (rev 90614)
@@ -1,49 +0,0 @@
-#!/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

Deleted: squid.conf.d
===================================================================
--- squid.conf.d	2013-05-13 10:55:37 UTC (rev 90613)
+++ squid.conf.d	2013-05-13 10:57:07 UTC (rev 90614)
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to squid
-#
-SQUID_ARGS="-sYC"