annotate src/postgresql-1-fixes.patch @ 2789:f20bbf45b91a

update package postgresql
author Mark Brand <mabrand@mabrand.nl>
date Wed, 26 Sep 2012 15:56:53 +0200
parents cc9a2cdaa9d5
children 166294cad9f0
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2333
f653602a0500 Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents: 2259
diff changeset
1 This file is part of MXE.
2353
99516e73b368 Move doc/index.html -> index.html
Volker Grabsch <vog@notjusthosting.com>
parents: 2333
diff changeset
2 See index.html for further information.
2047
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
3
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
4 Contains ad hoc patches for cross building.
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
5
2789
f20bbf45b91a update package postgresql
Mark Brand <mabrand@mabrand.nl>
parents: 2722
diff changeset
6 From 97675e8569c5eb6a13a044b52cb31a120ff61d26 Mon Sep 17 00:00:00 2001
2567
203c9a62062c update package postgresql
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
7 From: "a@a.org" <a@a.org>
2047
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
8 Date: Mon, 24 Oct 2011 14:02:33 +0200
2567
203c9a62062c update package postgresql
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
9 Subject: [PATCH 1/2] use unix style names for openssl on mingw-cross-env
2047
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
10
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
11
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
12 diff --git a/configure.in b/configure.in
2789
f20bbf45b91a update package postgresql
Mark Brand <mabrand@mabrand.nl>
parents: 2722
diff changeset
13 index 1024b0d..710ad0c 100644
2047
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
14 --- a/configure.in
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
15 +++ b/configure.in
2722
cc9a2cdaa9d5 update package postgresql
Mark Brand <mabrand@mabrand.nl>
parents: 2695
diff changeset
16 @@ -926,13 +926,8 @@ fi
2047
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
17
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
18 if test "$with_openssl" = yes ; then
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
19 dnl Order matters!
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
20 - if test "$PORTNAME" != "win32"; then
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
21 - AC_CHECK_LIB(crypto, CRYPTO_new_ex_data, [], [AC_MSG_ERROR([library 'crypto' is required for OpenSSL])])
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
22 - AC_CHECK_LIB(ssl, SSL_library_init, [], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])])
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
23 - else
2259
aa6e4ec5cf05 update package postgresql
Mark Brand <mabrand@mabrand.nl>
parents: 2047
diff changeset
24 - AC_SEARCH_LIBS(CRYPTO_new_ex_data, eay32 crypto, [], [AC_MSG_ERROR([library 'eay32' or 'crypto' is required for OpenSSL])])
aa6e4ec5cf05 update package postgresql
Mark Brand <mabrand@mabrand.nl>
parents: 2047
diff changeset
25 - AC_SEARCH_LIBS(SSL_library_init, ssleay32 ssl, [], [AC_MSG_ERROR([library 'ssleay32' or 'ssl' is required for OpenSSL])])
2047
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
26 - fi
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
27 + AC_CHECK_LIB(crypto, CRYPTO_new_ex_data, [], [AC_MSG_ERROR([library 'crypto' is required for OpenSSL])])
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
28 + AC_CHECK_LIB(ssl, SSL_library_init, [], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])])
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
29 fi
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
30
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
31 if test "$with_pam" = yes ; then
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
32 --
2722
cc9a2cdaa9d5 update package postgresql
Mark Brand <mabrand@mabrand.nl>
parents: 2695
diff changeset
33 1.7.10.4
2047
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
34
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
35
2789
f20bbf45b91a update package postgresql
Mark Brand <mabrand@mabrand.nl>
parents: 2722
diff changeset
36 From cf2e7bb8d924354cba299ac26b8128b6fb234505 Mon Sep 17 00:00:00 2001
2567
203c9a62062c update package postgresql
Mark Brand <mabrand@mabrand.nl>
parents: 2353
diff changeset
37 From: "a@a.org" <a@a.org>
2047
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
38 Date: Mon, 24 Oct 2011 14:09:38 +0200
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
39 Subject: [PATCH 2/2] do not check autoconf version
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
40
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
41
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
42 diff --git a/configure.in b/configure.in
2789
f20bbf45b91a update package postgresql
Mark Brand <mabrand@mabrand.nl>
parents: 2722
diff changeset
43 index 710ad0c..8acc307 100644
2047
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
44 --- a/configure.in
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
45 +++ b/configure.in
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
46 @@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
47
2789
f20bbf45b91a update package postgresql
Mark Brand <mabrand@mabrand.nl>
parents: 2722
diff changeset
48 AC_INIT([PostgreSQL], [9.2.1], [pgsql-bugs@postgresql.org])
2047
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
49
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
50 -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.63], [], [m4_fatal([Autoconf version 2.63 is required.
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
51 -Untested combinations of 'autoconf' and PostgreSQL versions are not
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
52 -recommended. You can remove the check from 'configure.in' but it is then
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
53 -your responsibility whether the result works or not.])])
2722
cc9a2cdaa9d5 update package postgresql
Mark Brand <mabrand@mabrand.nl>
parents: 2695
diff changeset
54 AC_COPYRIGHT([Copyright (c) 1996-2012, PostgreSQL Global Development Group])
2047
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
55 AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
56 AC_CONFIG_AUX_DIR(config)
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
57 --
2722
cc9a2cdaa9d5 update package postgresql
Mark Brand <mabrand@mabrand.nl>
parents: 2695
diff changeset
58 1.7.10.4
2047
5828a4a777a2 package postgresql: replace sed with patch
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
59