Merge commit 'ncopa/master'

5 files changed, 22 insertions, 33 deletions

diff --git a/extra/clamsmtp/APKBUILD b/extra/clamsmtp/APKBUILD
index 2620e611e4..5402d09368 100644
--- a/extra/clamsmtp/APKBUILD
+++ b/extra/clamsmtp/APKBUILD
@@ -31,4 +31,4 @@ build() {
 
 md5sums="b068ba6e444859782bbdd88f290c1abf  clamsmtp-1.10.tar.gz
 e84205681f64c07af9ec5b6a3dd8bc38  clamsmtp.confd
-601d13d29f4426735be9a0599bb94a77  clamsmtp.initd"
+161baf2fb444b67d8a08fbfe4375a12c  clamsmtp.initd"
diff --git a/extra/libsoup/APKBUILD b/extra/libsoup/APKBUILD
deleted file mode 100644
index 59165b1921..0000000000
--- a/extra/libsoup/APKBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=libsoup
-pkgver=2.26.0
-pkgrel=0
-pkgdesc="Gnome HTTP Library"
-url="http://www.gnome.org"
-license="LGPL"
-subpackages="$pkgname-dev $pkgname-doc"
-depends="glib gnutls libxml2 uclibc libiconv"
-makedepends="glib-dev gnutls-dev libxml2-dev libiconv-dev"
-source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2"
-
-depends_dev="glib-dev libxml2-dev gnutls-dev"
-build () 
-{ 
-	cd "$srcdir"/$pkgname-$pkgver
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--disable-static \
-		--without-gnome \
-		|| return 1
-	make || return 1
-	make DESTDIR="$pkgdir" install || return 1
-}
-md5sums="9df9d2b3304213641d3214a774d75ee1  libsoup-2.26.0.tar.bz2"
diff --git a/extra/python/APKBUILD b/extra/python/APKBUILD
index f0fd187d51..852fb889be 100644
--- a/extra/python/APKBUILD
+++ b/extra/python/APKBUILD
@@ -1,13 +1,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=python
 pkgver=2.6.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A high-level scripting language"
 url="http://www.python.org"
 license="custom"
 subpackages="$pkgname-dev $pkgname-doc"
-depends="db expat openssl zlib ncurses"
-makedepends="db-dev expat-dev openssl-dev zlib-dev ncurses-dev"
+depends="db expat openssl zlib ncurses uclibc"
+makedepends="db-dev expat-dev openssl-dev zlib-dev ncurses-dev bzip2-dev !gettext"
 source="http://www.$pkgname.org/ftp/$pkgname/$pkgver/Python-$pkgver.tar.bz2
 	$pkgname-2.6-internal-expat.patch
 	"
diff --git a/extra/squid/APKBUILD b/extra/squid/APKBUILD
index a4f72a5cc5..62a8b63043 100644
--- a/extra/squid/APKBUILD
+++ b/extra/squid/APKBUILD
@@ -3,11 +3,11 @@
 pkgname=squid
 pkgver=2.7.6
 _ver=2.7.STABLE6
-pkgrel=1
+pkgrel=2
 pkgdesc="A full-featured Web proxy cache server."
 url="http://www.squid-cache.org"
 license="GPL-2"
-depends="openssl $pkgname-errors-english"
+depends="openssl $pkgname-errors-english logrotate"
 makedepends="openssl-dev perl-dev"
 subpackages="$pkgname-doc
 	$pkgname-errors-armenian:errors_armenian
@@ -49,6 +49,7 @@ source="http://www.squid-cache.org/Versions/v2/2.7/${pkgname}-${_ver}.tar.bz2
 	squid.initd
 	squid.confd
 	squid-2.7-gentoo.patch
+	$pkgname.logrotate
 	"
 
 build() {
@@ -76,6 +77,8 @@ build() {
 
 	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
 	install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
+	install -m644 -D "$srcdir"/$pkgname.logrotate \
+		"$pkgdir"/etc/logrotate.d/squid
 }
 
 
@@ -262,4 +265,5 @@ errors_ukrainian_utf8() {
 md5sums="6de3a6a7a56a7ecae092f2d31a04f039  squid-2.7.STABLE6.tar.bz2
 d31f293cf10a90bc3d60aa6428889db5  squid.initd
 44b052db7910f386ef88ddcf69c9ba4e  squid.confd
-1d33108353d788b238d9a8877bf2e401  squid-2.7-gentoo.patch"
+1d33108353d788b238d9a8877bf2e401  squid-2.7-gentoo.patch
+58823e0b86bc2dc71d270208b7b284b4  squid.logrotate"
diff --git a/extra/squid/squid.logrotate b/extra/squid/squid.logrotate
new file mode 100644
index 0000000000..fb3279e013
--- /dev/null
+++ b/extra/squid/squid.logrotate
@@ -0,0 +1,11 @@
+/var/log/squid/*.log {
+	daily
+	compress
+	rotate 5
+	missingok
+	nocreate
+	sharedscripts
+	postrotate
+	/usr/sbin/squid -k rotate
+	endscript
+}