Merge branch '2.8' into 3.0

gkrellm/.footprint

@@ -1,19 +0,0 @@
-drwxr-xr-x	root/root	usr/
-drwxr-xr-x	root/root	usr/bin/
--rwxr-xr-x	root/root	usr/bin/gkrellm
--rwxr-xr-x	root/root	usr/bin/gkrellmd
-drwxr-xr-x	root/root	usr/include/
-drwxr-xr-x	root/root	usr/include/gkrellm2/
--rw-r--r--	root/root	usr/include/gkrellm2/gkrellm-public-proto.h
--rw-r--r--	root/root	usr/include/gkrellm2/gkrellm.h
--rw-r--r--	root/root	usr/include/gkrellm2/gkrellmd.h
--rw-r--r--	root/root	usr/include/gkrellm2/log.h
-drwxr-xr-x	root/root	usr/lib/
-drwxr-xr-x	root/root	usr/lib/gkrellm2/
-drwxr-xr-x	root/root	usr/lib/gkrellm2/plugins/
-drwxr-xr-x	root/root	usr/lib/pkgconfig/
--rw-r--r--	root/root	usr/lib/pkgconfig/gkrellm.pc
-drwxr-xr-x	root/root	usr/man/
-drwxr-xr-x	root/root	usr/man/man1/
--rw-r--r--	root/root	usr/man/man1/gkrellm.1.gz
--rw-r--r--	root/root	usr/man/man1/gkrellmd.1.gz

gkrellm/.md5sum

@@ -1 +0,0 @@
-e43a9416a6975e3be63d591bdeb33b04  gkrellm-2.3.5.tar.bz2

gkrellm/Pkgfile

@@ -1,18 +0,0 @@
-# Description: GTK+ system monitor and more
-# URL:         http://www.gkrellm.net
-# Maintainer:  Juergen Daubert, jue at crux dot nu
-# Packager:    Daniel Mueller, daniel at danm dot de
-# Depends on:  gtk, openssl
-
-name=gkrellm
-version=2.3.5
-release=1
-source=(http://members.dslextreme.com/users/billw/$name/$name-$version.tar.bz2)
-
-build () {
-    cd $name-$version
-    export PREFIX=/usr
-    make enable_nls=0
-    make enable_nls=0 DESTDIR=$PKG MANDIR=$PKG/usr/man/man1 install
-    install -d $PKG/usr/lib/gkrellm2/plugins 
-}

squid/.md5sum

@@ -1,2 +1,3 @@
 dd94bf3ea23e552153b5ee03fc523a4e  squid
-b26171dfd397defd9ee113d555691b86  squid-3.2.3.tar.bz2
+f76f55bd0302adbc33a8029fb71eaa26  squid-3.2-11738.patch
+5fd7d120c429aaeacdf008938a36cb94  squid-3.2.4.tar.bz2

squid/Pkgfile

@@ -3,14 +3,17 @@
 # Maintainer:  Juergen Daubert, jue at crux dot nu
 
 name=squid
-version=3.2.3
+version=3.2.4
 release=1
-source=(ftp://mirror.switch.ch/mirror/squid/$name-$version.tar.bz2 \
+source=(ftp://mirror.switch.ch/mirror/squid/$name-$version.tar.bz2
+        http://www.squid-cache.org/Versions/v3/3.2/changesets/squid-3.2-11738.patch 
         squid)
 
 build () {
     cd $name-$version
 
+    patch -p0 -i $SRC/$name-3.2-11738.patch
+
     ./configure --prefix=/usr \
                 --mandir=/usr/man \
                 --sysconfdir=/etc/squid \