summaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
authorJason Helfman <jgh@FreeBSD.org>2012-05-30 22:26:15 +0000
committerJason Helfman <jgh@FreeBSD.org>2012-05-30 22:26:15 +0000
commit8efd38a2acd90422d224e1fa1d4f626f7860bf65 (patch)
tree49ddd7bd48b77fbe1cf65ae4b8980a1a8da8399f /databases
parent- Mark BROKEN on 7.X: fails to extract (diff)
- Address postgresql*-servers for crypt vulnerability (CVE-2012-2143)
http://www.postgresql.org/about/news/1397/ With hat: pgsql
Notes
Notes: svn path=/head/; revision=297840
Diffstat (limited to 'databases')
-rw-r--r--databases/postgresql83-server/Makefile2
-rw-r--r--databases/postgresql83-server/files/patch-crypt-des.c12
-rw-r--r--databases/postgresql84-server/Makefile1
-rw-r--r--databases/postgresql84-server/files/patch-crypt-des.c12
-rw-r--r--databases/postgresql90-server/Makefile2
-rw-r--r--databases/postgresql90-server/files/patch-crypt-des.c12
-rw-r--r--databases/postgresql91-server/Makefile1
-rw-r--r--databases/postgresql91-server/files/patch-crypt-des.c12
-rw-r--r--databases/postgresql92-server/Makefile1
-rw-r--r--databases/postgresql92-server/files/patch-crypt-des.c12
10 files changed, 65 insertions, 2 deletions
diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile
index f93de7faac03..6a3dca1ccb8a 100644
--- a/databases/postgresql83-server/Makefile
+++ b/databases/postgresql83-server/Makefile
@@ -6,7 +6,7 @@
#
DISTVERSION?= 8.3.18
-PORTREVISION?= 0
+PORTREVISION?= 1
PKGNAMESUFFIX?= -server
MAINTAINER?= pgsql@FreeBSD.org
diff --git a/databases/postgresql83-server/files/patch-crypt-des.c b/databases/postgresql83-server/files/patch-crypt-des.c
new file mode 100644
index 000000000000..ce61aaa5b2b7
--- /dev/null
+++ b/databases/postgresql83-server/files/patch-crypt-des.c
@@ -0,0 +1,12 @@
+--- ./contrib/pgcrypto/crypt-des.c
++++ ./contrib/pgcrypto/crypt-des.c
+@@ -670,7 +670,8 @@ px_crypt_des(const char *key, const char *setting)
+ q = (uint8 *) keybuf;
+ while (q - (uint8 *) keybuf - 8)
+ {
+- if ((*q++ = *key << 1))
++ *q++ = *key << 1;
++ if (*key != '\0')
+ key++;
+ }
+ if (des_setkey((char *) keybuf))
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index 6804988d6d41..5ac8cd1de70c 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -7,6 +7,7 @@
PORTNAME?= postgresql
DISTVERSION?= 8.4.11
+PORTREVISION?= 1
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
MASTER_SITE_SUBDIR= source/v${DISTVERSION}
diff --git a/databases/postgresql84-server/files/patch-crypt-des.c b/databases/postgresql84-server/files/patch-crypt-des.c
new file mode 100644
index 000000000000..ce61aaa5b2b7
--- /dev/null
+++ b/databases/postgresql84-server/files/patch-crypt-des.c
@@ -0,0 +1,12 @@
+--- ./contrib/pgcrypto/crypt-des.c
++++ ./contrib/pgcrypto/crypt-des.c
+@@ -670,7 +670,8 @@ px_crypt_des(const char *key, const char *setting)
+ q = (uint8 *) keybuf;
+ while (q - (uint8 *) keybuf - 8)
+ {
+- if ((*q++ = *key << 1))
++ *q++ = *key << 1;
++ if (*key != '\0')
+ key++;
+ }
+ if (des_setkey((char *) keybuf))
diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile
index 814b8a329554..1987b2981c66 100644
--- a/databases/postgresql90-server/Makefile
+++ b/databases/postgresql90-server/Makefile
@@ -6,7 +6,7 @@
#
DISTVERSION?= 9.0.7
-PORTREVISION= 1
+PORTREVISION= 2
PKGNAMESUFFIX?= -server
MAINTAINER?= pgsql@FreeBSD.org
diff --git a/databases/postgresql90-server/files/patch-crypt-des.c b/databases/postgresql90-server/files/patch-crypt-des.c
new file mode 100644
index 000000000000..ce61aaa5b2b7
--- /dev/null
+++ b/databases/postgresql90-server/files/patch-crypt-des.c
@@ -0,0 +1,12 @@
+--- ./contrib/pgcrypto/crypt-des.c
++++ ./contrib/pgcrypto/crypt-des.c
+@@ -670,7 +670,8 @@ px_crypt_des(const char *key, const char *setting)
+ q = (uint8 *) keybuf;
+ while (q - (uint8 *) keybuf - 8)
+ {
+- if ((*q++ = *key << 1))
++ *q++ = *key << 1;
++ if (*key != '\0')
+ key++;
+ }
+ if (des_setkey((char *) keybuf))
diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile
index 1926a6033ab0..a68ad29b9926 100644
--- a/databases/postgresql91-server/Makefile
+++ b/databases/postgresql91-server/Makefile
@@ -7,6 +7,7 @@
PORTNAME?= postgresql
DISTVERSION?= 9.1.3
+PORTREVISION?= 1
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
MASTER_SITE_SUBDIR= source/v${DISTVERSION}
diff --git a/databases/postgresql91-server/files/patch-crypt-des.c b/databases/postgresql91-server/files/patch-crypt-des.c
new file mode 100644
index 000000000000..ce61aaa5b2b7
--- /dev/null
+++ b/databases/postgresql91-server/files/patch-crypt-des.c
@@ -0,0 +1,12 @@
+--- ./contrib/pgcrypto/crypt-des.c
++++ ./contrib/pgcrypto/crypt-des.c
+@@ -670,7 +670,8 @@ px_crypt_des(const char *key, const char *setting)
+ q = (uint8 *) keybuf;
+ while (q - (uint8 *) keybuf - 8)
+ {
+- if ((*q++ = *key << 1))
++ *q++ = *key << 1;
++ if (*key != '\0')
+ key++;
+ }
+ if (des_setkey((char *) keybuf))
diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index ff6f70c71820..1ded113142f3 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -7,6 +7,7 @@
PORTNAME?= postgresql
DISTVERSION?= 9.2beta1
+PORTREVISION?= 1
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
MASTER_SITE_SUBDIR= source/v9.2.0beta1
diff --git a/databases/postgresql92-server/files/patch-crypt-des.c b/databases/postgresql92-server/files/patch-crypt-des.c
new file mode 100644
index 000000000000..ce61aaa5b2b7
--- /dev/null
+++ b/databases/postgresql92-server/files/patch-crypt-des.c
@@ -0,0 +1,12 @@
+--- ./contrib/pgcrypto/crypt-des.c
++++ ./contrib/pgcrypto/crypt-des.c
+@@ -670,7 +670,8 @@ px_crypt_des(const char *key, const char *setting)
+ q = (uint8 *) keybuf;
+ while (q - (uint8 *) keybuf - 8)
+ {
+- if ((*q++ = *key << 1))
++ *q++ = *key << 1;
++ if (*key != '\0')
+ key++;
+ }
+ if (des_setkey((char *) keybuf))
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-13 19:19:03 +0000