python-db/python-db.patch@914043724d20 (annotated)
python-db/python-db.patch
Sat, 06 Oct 2012 16:24:01 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Sat, 06 Oct 2012 16:24:01 +0200
- changeset 727
- 914043724d20
- parent 313
- fc0449ec63bb
- permissions
- -rw-r--r--
Update to new vendor software version and adjust patch code accordingly.
Unfortunately the vendor has apparently failed to properly test this
release which depends on missing object symbols in libsasl2.a(common.o):
undefined reference to `sasl_randcreate'
undefined reference to `sasl_mkchal'
undefined reference to `sasl_utf8verify'
undefined reference to `sasl_rand'
undefined reference to `sasl_churn'
undefined reference to `sasl_encode64'
undefined reference to `sasl_decode64'
undefined reference to `sasl_erasebuffer'
undefined reference to `sasl_randfree'
undefined reference to `sasl_strlower'
undefined reference to `get_fqhostname'
...yet to be patched.
| michael@314 | 1 | Index: psycopg2-2.4/psycopg/config.h |
| michael@314 | 2 | diff -Nau psycopg2-2.4psycopg/config.h.orig/ psycopg2-2.4/psycopg/config.h |
| michael@314 | 3 | --- psycopg2-2.4/psycopg/config.h.orig 2011-02-27 12:44:55.000000000 +0100 |
| michael@314 | 4 | +++ psycopg2-2.4/psycopg/config.h 2011-03-22 19:19:11.648184363 +0100 |
| michael@314 | 5 | @@ -141,10 +141,11 @@ |
| michael@313 | 6 | |
| michael@313 | 7 | #if (defined(__FreeBSD__) && __FreeBSD_version < 503000) || (defined(_WIN32) && !defined(__GNUC__)) || defined(__sun__) || defined(sun) |
| michael@313 | 8 | /* what's this, we have no round function either? */ |
| michael@313 | 9 | -static double round(double num) |
| michael@313 | 10 | +static double my_round(double num) |
| michael@313 | 11 | { |
| michael@313 | 12 | return (num >= 0) ? floor(num + 0.5) : ceil(num - 0.5); |
| michael@313 | 13 | } |
| michael@313 | 14 | +#define round(num) my_round(num) |
| michael@313 | 15 | #endif |
| michael@313 | 16 | |
| michael@313 | 17 | /* postgresql < 7.4 does not have PQfreemem */ |
| michael@314 | 18 | Index: psycopg2-2.4/setup.py |
| michael@314 | 19 | diff -Nau psycopg2-2.4/setup.py.orig/ psycopg2-2.4/setup.py |
| michael@314 | 20 | --- psycopg2-2.4/setup.py.orig 2011-02-27 12:46:47.000000000 +0100 |
| michael@314 | 21 | +++ psycopg2-2.4/setup.py 2011-03-22 19:36:51.906859031 +0100 |
| michael@314 | 22 | @@ -269,6 +269,9 @@ |
| michael@313 | 23 | os.path.join(self.get_pg_config("libdir"), "libpq.a")) |
| michael@313 | 24 | else: |
| michael@313 | 25 | self.libraries.append("pq") |
| michael@313 | 26 | + self.libraries.append("ssl") |
| michael@313 | 27 | + self.libraries.append("crypto") |
| michael@313 | 28 | + self.libraries.append("crypt") |
| michael@313 | 29 | |
| michael@313 | 30 | try: |
| michael@313 | 31 | self.library_dirs.append(self.get_pg_config("libdir")) |
