- up to 8.1.23 (but not all patches)

Changed files:
    postgresql-pg_ctl-fix.patch -> 1.1.2.1
    postgresql.spec -> 1.362.2.3

diff --git a/postgresql-pg_ctl-fix.patch b/postgresql-pg_ctl-fix.patch
index 912e9c634619b2ffb31bca081d77f132eede3d1f..1c8e6bae89ab3589db0f0eb2103044ea629eaac9 100644 (file)
--- a/postgresql-pg_ctl-fix.patch
+++ b/postgresql-pg_ctl-fix.patch
@@ -1,11 +1,11 @@
 --- src/bin/pg_ctl/pg_ctl.c.orig       2006-04-04 15:52:48.000000000 +0000
 +++ src/bin/pg_ctl/pg_ctl.c    2006-04-04 16:43:27.000000000 +0000
 @@ -373,9 +373,11 @@
 --- src/bin/pg_ctl/pg_ctl.c.orig       2006-04-04 15:52:48.000000000 +0000
 +++ src/bin/pg_ctl/pg_ctl.c    2006-04-04 16:43:27.000000000 +0000
 @@ -373,9 +373,11 @@

-       bool            success = false;

        int                     i;
        char            portstr[32];
 +      char            sockstr[256];
        char       *p;
        int                     i;
        char            portstr[32];
 +      char            sockstr[256];
        char       *p;

+       char       *q;

  
        *portstr = '\0';
 +      *sockstr = '\0';
  
        *portstr = '\0';
 +      *sockstr = '\0';


@@ -13,9 +13,9 @@
        /* post_opts */
        for (p = post_opts; *p;)
 @@ -400,7 +402,7 @@
        /* post_opts */
        for (p = post_opts; *p;)
 @@ -400,7 +402,7 @@

-       }
- 
-       /* config file */
+        * This parsing code isn't amazingly bright either, but it should be
+        * okay for valid port settings.
+        */

 -      if (!*portstr)
 +      if (!*portstr || !*sockstr)
        {
 -      if (!*portstr)
 +      if (!*portstr || !*sockstr)
        {


@@ -25,9 +25,9 @@
  
                                while (isspace((unsigned char) *p))
                                        p++;
  
                                while (isspace((unsigned char) *p))
                                        p++;

--                              if (strncmp(p, "port", strlen("port")) != 0)
+-                              if (strncmp(p, "port", 4) != 0)

 -                                      continue;
 -                                      continue;

--                              p += strlen("port");
+-                              p += 4;

 -                              while (isspace((unsigned char) *p))
 -                                      p++;
 -                              if (*p != '=')
 -                              while (isspace((unsigned char) *p))
 -                                      p++;
 -                              if (*p != '=')

diff --git a/postgresql.spec b/postgresql.spec
index 4f4c09cf5a4668d92afd4f5968d5df1950f49ef5..a8228521b4208a54275bfdda87c02897e2a6ff4b 100644 (file)
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -25,12 +25,12 @@ Summary(tr):        Veri Taban
 Summary(uk):   PostgreSQL - ÓÉÓÔÅÍÁ ËÅÒÕ×ÁÎÎÑ ÂÁÚÁÍÉ ÄÁÎÉÈ
 Summary(zh_CN):        PostgreSQL ¿Í»§¶Ë³ÌÐòºÍ¿âÎļþ
 Name:          postgresql
 Summary(uk):   PostgreSQL - ÓÉÓÔÅÍÁ ËÅÒÕ×ÁÎÎÑ ÂÁÚÁÍÉ ÄÁÎÉÈ
 Summary(zh_CN):        PostgreSQL ¿Í»§¶Ë³ÌÐòºÍ¿âÎļþ
 Name:          postgresql

-Version:       8.1.11
+Version:       8.1.23

 Release:       1
 License:       BSD
 Group:         Applications/Databases
 Source0:       ftp://ftp6.pl.postgresql.org/pub/postgresql/source/v%{version}/%{name}-%{version}.tar.bz2
 Release:       1
 License:       BSD
 Group:         Applications/Databases
 Source0:       ftp://ftp6.pl.postgresql.org/pub/postgresql/source/v%{version}/%{name}-%{version}.tar.bz2

-# Source0-md5: 48922512bcf683d5ea22a99df5eaaecd
+# Source0-md5: b511c1c6d5de2417096dba48912e6f18

 ##Source0:     ftp://ftp.postgresql.org/pub/source/v%{version}beta/%{name}-%{version}%{beta}.tar.bz2
 Source1:       %{name}.init
 Source2:       pgsql-Database-HOWTO-html.tar.gz
 ##Source0:     ftp://ftp.postgresql.org/pub/source/v%{version}beta/%{name}-%{version}%{beta}.tar.bz2
 Source1:       %{name}.init
 Source2:       pgsql-Database-HOWTO-html.tar.gz