python-db/python-db.patch

Wed, 08 Feb 2012 20:07:00 +0200

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Wed, 08 Feb 2012 20:07:00 +0200
changeset 588
300d43423c2e
parent 313
fc0449ec63bb
permissions
-rw-r--r--

Update version, adapt patch, correct PID writing, correct build on newer
FreeBSD releases, and most importantly introduce new patch to try to
avoid segfault caused by multiple network interfaces with the same (or
no) address. This is common when configuring bridges and tunnels.

     1 Index: psycopg2-2.4/psycopg/config.h
     2 diff -Nau psycopg2-2.4psycopg/config.h.orig/ psycopg2-2.4/psycopg/config.h
     3 --- psycopg2-2.4/psycopg/config.h.orig	2011-02-27 12:44:55.000000000 +0100
     4 +++ psycopg2-2.4/psycopg/config.h	2011-03-22 19:19:11.648184363 +0100
     5 @@ -141,10 +141,11 @@
     7  #if (defined(__FreeBSD__) && __FreeBSD_version < 503000) || (defined(_WIN32) && !defined(__GNUC__)) || defined(__sun__) || defined(sun)
     8  /* what's this, we have no round function either? */
     9 -static double round(double num)
    10 +static double my_round(double num)
    11  {
    12    return (num >= 0) ? floor(num + 0.5) : ceil(num - 0.5);
    13  }
    14 +#define round(num) my_round(num)
    15  #endif
    17  /* postgresql < 7.4 does not have PQfreemem */
    18 Index: psycopg2-2.4/setup.py
    19 diff -Nau psycopg2-2.4/setup.py.orig/ psycopg2-2.4/setup.py
    20 --- psycopg2-2.4/setup.py.orig	2011-02-27 12:46:47.000000000 +0100
    21 +++ psycopg2-2.4/setup.py	2011-03-22 19:36:51.906859031 +0100
    22 @@ -269,6 +269,9 @@
    23                      os.path.join(self.get_pg_config("libdir"), "libpq.a"))
    24          else:
    25              self.libraries.append("pq")
    26 +            self.libraries.append("ssl")
    27 +            self.libraries.append("crypto")
    28 +            self.libraries.append("crypt")
    30          try:
    31              self.library_dirs.append(self.get_pg_config("libdir"))

mercurial