[Pound/el6/master] - Rebased to new upstream release

[Lubomir Rintel]

commit 7020cc9f1a516e246c1d129c5c013ba569ba8dc6
Author: Lubomir Rintel <lkundrak at fedoraproject.org>
Date:   Wed Nov 11 15:33:32 2009 +0000

    - Rebased to new upstream release

 Pound.spec                                         |   11 ++++--
 ....4.4-openssl.patch => pound-2.4.5-openssl.patch |   32 ++++++++++----------
 2 files changed, 23 insertions(+), 20 deletions(-)
---
diff --git a/Pound.spec b/Pound.spec
index d66b2b5..5f43bc1 100644
--- a/Pound.spec
+++ b/Pound.spec
@@ -3,8 +3,8 @@
 %define pound_home   %{_localstatedir}/lib/pound
 
 Name:        Pound
-Version:     2.4.4
-Release:     4%{?dist}
+Version:     2.4.5
+Release:     1%{?dist}
 Summary:     Reverse proxy and load balancer
 
 Group:       System Environment/Daemons
@@ -17,7 +17,7 @@ BuildRequires: openssl-devel, pcre-devel
 
 # tcmalloc doesn't exist on ppc yet (#238390)
 # or sparc arches
-%ifnarch ppc ppc64 sparcv9 sparc64
+%ifnarch ppc ppc64 sparcv9 sparc64 %{?el5:x86_64}
 BuildRequires: google-perftools-devel
 %endif
 
@@ -31,7 +31,7 @@ Source0:  http://www.apsis.ch/pound/%{name}-%{version}.tgz
 Source1:  pound.init
 Source2:  pound.cfg
 Patch0:   pound-remove-owner.patch
-Patch1:   pound-2.4.4-openssl.patch
+Patch1:   pound-2.4.5-openssl.patch
 
 %description
 The Pound program is a reverse proxy, load balancer and
@@ -118,6 +118,9 @@ fi
 %attr(-,%{pound_user},%{pound_group}) %dir %{pound_home}
 
 %changelog
+* Wed Nov 11 2009 Lubomir Rintel (GoodData) <lubo.rintel at gooddata.com> - 2.4.5-1
+- Rebased to new upstream release
+
 * Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 2.4.4-4
 - rebuilt with new openssl
 
diff --git a/pound-2.4.4-openssl.patch b/pound-2.4.5-openssl.patch
similarity index 89%
rename from pound-2.4.4-openssl.patch
rename to pound-2.4.5-openssl.patch
index 3857b2a..73294b1 100644
--- a/pound-2.4.4-openssl.patch
+++ b/pound-2.4.5-openssl.patch
@@ -1,7 +1,7 @@
-diff -up Pound-2.4.4/config.c.openssl Pound-2.4.4/config.c
---- Pound-2.4.4/config.c.openssl	2009-01-14 17:39:54.000000000 +0100
-+++ Pound-2.4.4/config.c	2009-08-26 18:18:18.000000000 +0200
-@@ -375,14 +375,22 @@ t_hash(const TABNODE *e)
+diff -up Pound-2.4.5/config.c.openssl Pound-2.4.5/config.c
+--- Pound-2.4.5/config.c.openssl	2009-06-29 17:53:58.000000000 +0200
++++ Pound-2.4.5/config.c	2009-11-11 16:25:16.000000000 +0100
+@@ -379,14 +379,22 @@ t_hash(const TABNODE *e)
          res = (res ^ *k++) * 16777619;
      return res;
  }
@@ -24,7 +24,7 @@ diff -up Pound-2.4.4/config.c.openssl Pound-2.4.4/config.c
  
  /*
   * parse a service
-@@ -405,7 +413,11 @@ parse_service(FILE *const f_conf, const 
+@@ -409,7 +417,11 @@ parse_service(FILE *const f_conf, const 
      pthread_mutex_init(&res->mut, NULL);
      if(svc_name)
          strncpy(res->name, svc_name, KEY_SIZE);
@@ -36,10 +36,10 @@ diff -up Pound-2.4.4/config.c.openssl Pound-2.4.4/config.c
          logmsg(LOG_ERR, "line %d: lh_new failed - aborted", n_lin);
          exit(1);
      }
-diff -up Pound-2.4.4/pound.h.openssl Pound-2.4.4/pound.h
---- Pound-2.4.4/pound.h.openssl	2009-01-14 17:39:54.000000000 +0100
-+++ Pound-2.4.4/pound.h	2009-08-22 18:40:05.000000000 +0200
-@@ -312,6 +312,10 @@ typedef struct _tn {
+diff -up Pound-2.4.5/pound.h.openssl Pound-2.4.5/pound.h
+--- Pound-2.4.5/pound.h.openssl	2009-06-29 17:53:58.000000000 +0200
++++ Pound-2.4.5/pound.h	2009-11-11 16:25:16.000000000 +0100
+@@ -317,6 +317,10 @@ typedef struct _tn {
  /* maximal session key size */
  #define KEY_SIZE    127
  
@@ -50,7 +50,7 @@ diff -up Pound-2.4.4/pound.h.openssl Pound-2.4.4/pound.h
  /* service definition */
  typedef struct _service {
      char                name[KEY_SIZE + 1]; /* symbolic name */
-@@ -327,7 +331,11 @@ typedef struct _service {
+@@ -332,7 +336,11 @@ typedef struct _service {
      int                 sess_ttl;   /* session time-to-live */
      regex_t             sess_pat;   /* pattern to match the session data */
      char                *sess_parm; /* session cookie or parameter */
@@ -62,9 +62,9 @@ diff -up Pound-2.4.4/pound.h.openssl Pound-2.4.4/pound.h
      int                 dynscale;   /* true if the back-ends should be dynamically rescaled */
      int                 disabled;   /* true if the service is disabled */
      struct _service     *next;
-diff -up Pound-2.4.4/svc.c.openssl Pound-2.4.4/svc.c
---- Pound-2.4.4/svc.c.openssl	2009-01-14 17:39:54.000000000 +0100
-+++ Pound-2.4.4/svc.c	2009-08-26 20:18:33.000000000 +0200
+diff -up Pound-2.4.5/svc.c.openssl Pound-2.4.5/svc.c
+--- Pound-2.4.5/svc.c.openssl	2009-06-29 17:53:58.000000000 +0200
++++ Pound-2.4.5/svc.c	2009-11-11 16:27:03.000000000 +0100
 @@ -28,12 +28,17 @@
  
  #include    "pound.h"
@@ -242,7 +242,7 @@ diff -up Pound-2.4.4/svc.c.openssl Pound-2.4.4/svc.c
      return;
  }
  
-@@ -1378,13 +1415,11 @@ typedef struct  {
+@@ -1385,13 +1422,11 @@ typedef struct  {
  }   DUMP_ARG;
  
  static void
@@ -257,10 +257,10 @@ diff -up Pound-2.4.4/svc.c.openssl Pound-2.4.4/svc.c
      memcpy(&bep, t->content, sizeof(bep));
      for(n_be = 0, be = a->backends; be; be = be->next, n_be++)
          if(be == bep)
-@@ -1399,19 +1434,28 @@ t_dump(TABNODE *t, void *arg)
-     write(a->control_sock, t->key, sz);
+@@ -1407,19 +1442,28 @@ t_dump(TABNODE *t, void *arg)
      return;
  }
+ 
 -IMPLEMENT_LHASH_DOALL_ARG_FN(t_dump, TABNODE *, void *)
 +#if OPENSSL_VERSION_NUMBER >= 0x10000000L
 +IMPLEMENT_LHASH_DOALL_ARG_FN(t_dump, TABNODE, DUMP_ARG)