[lighttpd/f15: 6/6] Merge branch 'master' into f15

[Matthias Saou]

commit eebc914c603ffa9a4322f034dd62afbffb733466
Merge: 4b71965 9359cb6
Author: Matthias Saou <thias at marmotte.net>
Date:   Mon Jul 11 20:52:52 2011 +0200

    Merge branch 'master' into f15

 .gitignore                        |    4 +-
 lighttpd-1.4.23-defaultconf.patch |   59 ---------
 lighttpd-1.4.23-ssl-2157.patch    |   13 --
 lighttpd-1.4.28-defaultconf.patch |   32 +++++
 lighttpd-1.4.29-mod_geoip.patch   |  111 +++++++++++++++++
 lighttpd.service                  |   13 ++
 lighttpd.spec                     |  242 ++++++++++++++++++++++++++++---------
 sources                           |    3 +-
 8 files changed, 344 insertions(+), 133 deletions(-)
---
diff --cc lighttpd.spec
index b94bd27,9e0db38..71ee045
--- a/lighttpd.spec
+++ b/lighttpd.spec
@@@ -231,9 -350,14 +350,14 @@@ f
  * Wed Mar 23 2011 Dan Horák <dan at danny.cz> - 1.4.26-4
  - rebuilt for mysql 5.5.10 (soname bump in libmysqlclient)
  
 -* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 
 +* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.26-3
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
  
+ * Mon Nov  8 2010 Matthias Saou <http://freshrpms.net/> 1.4.28-1
+ - Update to 1.4.28.
+ - Update defaultconf patch.
+ - Remove upstreamed ssl-2157 patch.
+ 
  * Fri Apr 16 2010 Matthias Saou <http://freshrpms.net/> 1.4.26-2
  - Update to 1.4.26.
  - Update the geoip patch.