Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/comix/PKGBUILD
	community/geany/PKGBUILD
	community/gnome-do-docklets/PKGBUILD
	community/gnome-do-plugins/PKGBUILD
	community/gnome-system-tools/PKGBUILD
	community/gnustep-make/PKGBUILD
	community/gtweakui/PKGBUILD
	community/hwinfo/PKGBUILD
	community/kungfu/PKGBUILD
	community/liboauth/PKGBUILD
	community/liboobs/PKGBUILD
	community/lua-lzlib/PKGBUILD
	community/mcdp/PKGBUILD
	community/mingw32-gcc-base/PKGBUILD
	community/mingw32-runtime/PKGBUILD
	community/mplayer2/PKGBUILD
	community/pdf2svg/PKGBUILD
	community/perl-data-dumper/PKGBUILD
	community/perl-digest-md5/PKGBUILD
	community/perl-perlio-eol/PKGBUILD
	community/perl-xml-libxslt/PKGBUILD
	community/python-cherrypy/PKGBUILD
	community/python-pexpect/PKGBUILD
	community/python-pyro/PKGBUILD
	community/python2-cherrypy/PKGBUILD
	community/rexima/PKGBUILD
	community/shp2svg/PKGBUILD
	community/system-tools-backends/PKGBUILD
	community/tracker/PKGBUILD
	community/virtualbox/PKGBUILD
	core/bridge-utils/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/beagle/PKGBUILD
	extra/bug-buddy/PKGBUILD
	extra/dssi/PKGBUILD
	extra/evolution-sharp/PKGBUILD
	extra/evolution-webcal/PKGBUILD
	extra/feh/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/gnome-mag/PKGBUILD
	extra/gnome-python-desktop/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/gok/PKGBUILD
	extra/gpsd/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/hyphen/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/keytouch-editor/PKGBUILD
	extra/keytouch/PKGBUILD
	extra/koffice/PKGBUILD
	extra/krusader/PKGBUILD
	extra/libbeagle/PKGBUILD
	extra/libffi/PKGBUILD
	extra/libgnomeuimm/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/m17n-lib/PKGBUILD
	extra/mtr/PKGBUILD
	extra/openbabel/PKGBUILD
	extra/poppler/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/rox/PKGBUILD
	extra/transmission/PKGBUILD
	extra/xf86-input-synaptics/PKGBUILD
	extra/xorg-server/PKGBUILD
	extra/xorg-xinit/PKGBUILD
	kde-unstable/calligra/PKGBUILD
	libre/icecat/PKGBUILD
	libre/linux-libre/PKGBUILD
	multilib/lib32-ncurses/PKGBUILD
	multilib/lib32-openssl/PKGBUILD
	multilib/lib32-talloc/PKGBUILD
	multilib/wine/PKGBUILD

2 files changed, 35 insertions, 9 deletions

diff --git a/community/cherokee/PKGBUILD b/community/cherokee/PKGBUILD
index 0e5498b2c..6f7fbb9c7 100644
--- a/community/cherokee/PKGBUILD
+++ b/community/cherokee/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 55615 2011-09-16 00:44:29Z foutrelis $
+# $Id: PKGBUILD 56833 2011-10-14 14:02:14Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Link Dupont <link@subpop.net>
 
 pkgname=cherokee
-pkgver=1.2.99
-pkgrel=3
+pkgver=1.2.100
+pkgrel=2
 pkgdesc="A very fast, flexible and easy to configure Web Server"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.cherokee-project.com/"
@@ -20,16 +20,19 @@ optdepends=('python2: cherokee-admin (administrative web interface)'
             'geoip: GeoIP rule module'
             'rrdtool: RRDtool based information collector')
 backup=('etc/cherokee/cherokee.conf'
-        'etc/logrotate.d/cherokee')
+        'etc/logrotate.d/cherokee'
+        'etc/pam.d/cherokee')
 options=('!libtool')
 source=(http://www.cherokee-project.com/download/1.2/$pkgver/cherokee-$pkgver.tar.gz
         cherokee.rc
         cherokee.logrotate
-        fix-ctk-path-handler-match.patch)
-md5sums=('c83115c3eebb29e6f2b4cc6fe699affe'
-         'a2d2b69c6220fab57cda4f531b680f9f'
-         '8d69341bd4002bffd69c6e82ff6c905f'
-         'e9475edd26ee24d035783e5999244857')
+        fix-ctk-path-handler-match.patch
+        cherokee-admin-socket-bind.patch)
+sha1sums=('2ed95504c7f156227f9b688a901608be21cf3dff'
+          '85e24ccc94e6e97858226222ac62cca79c17bc80'
+          '266064ab6d3ebd206d7207e1d97b003d2021b2e4'
+          '6d64371dfb23f43c29a24e37e7ae99e08a0c84cc'
+          '3c0b407e7282542657125d7cfb1c64eb3521ed8c')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/cherokee/cherokee-admin-socket-bind.patch b/community/cherokee/cherokee-admin-socket-bind.patch
new file mode 100644
index 000000000..0b266a245
--- /dev/null
+++ b/community/cherokee/cherokee-admin-socket-bind.patch
@@ -0,0 +1,23 @@
+diff --git a/cherokee/main_admin.c b/cherokee/main_admin.c
+index 861473f..e52b2d6 100644
+--- a/cherokee/main_admin.c
++++ b/cherokee/main_admin.c
+@@ -89,9 +89,9 @@ find_empty_port (int starting, int *port)
+ 	cherokee_buffer_add_str (&bind_, "127.0.0.1");
+ 
+ 	cherokee_socket_init (&s);
+-	cherokee_socket_create_fd (&s, AF_INET);
+ 
+ 	while (true) {
++		cherokee_socket_create_fd (&s, AF_INET);
+ 		ret = cherokee_socket_bind (&s, p, &bind_);
+ 		if (ret == ret_ok)
+ 			break;
+@@ -104,6 +104,7 @@ find_empty_port (int starting, int *port)
+ 		}
+ 	}
+ 
++	cherokee_socket_close (&s);
+ 	cherokee_socket_mrproper (&s);
+ 	cherokee_buffer_mrproper (&bind_);
+