dev-db/postgresql-base: Added patch to relax strict permission check on ssl key files (bug #210938).

svn path=/experimental/; revision=358

7 files changed, 34 insertions, 9 deletions

diff --git a/dev-db/postgresql-base/ChangeLog b/dev-db/postgresql-base/ChangeLog
index 041dd77..e6034cd 100644
--- a/dev-db/postgresql-base/ChangeLog
+++ b/dev-db/postgresql-base/ChangeLog
@@ -3,6 +3,12 @@
 # $Header: $
 
   07 Apr 2008; Tiziano Müller <dev-zero@gentoo.org>
+  postgresql-base-8.0.15.ebuild, postgresql-base-8.1.11.ebuild,
+  postgresql-base-8.2.7.ebuild, postgresql-base-8.3.1.ebuild,
+  +files/postgresql-8.x-relax_ssl_perms.patch:
+  Added patch to relax strict permission check on ssl key files (bug #210938).
+
+  07 Apr 2008; Tiziano Müller <dev-zero@gentoo.org>
   files/postgresql-7.3-base.patch, files/postgresql-7.4-base.patch,
   files/postgresql-8.0-base.patch, files/postgresql-8.1-base.patch,
   files/postgresql-8.2-base.patch, files/postgresql-8.3-base.patch:
diff --git a/dev-db/postgresql-base/Manifest b/dev-db/postgresql-base/Manifest
index d8c34d5..8234f2f 100644
--- a/dev-db/postgresql-base/Manifest
+++ b/dev-db/postgresql-base/Manifest
@@ -12,6 +12,7 @@ AUX postgresql-8.2-base.patch 4045 RMD160 3cad669ba0db500cd97b17dba376a554617670
 AUX postgresql-8.2-common.patch 2640 RMD160 b25ba915d5d6ad9c12c1d51426363c196b830923 SHA1 7b946d57bfed34e2e7e1338c3ab3004341d7ab12 SHA256 36ca9cb4f26424c302fdd704b7c1a268e87612afa3006bf008d4594dabe080f8
 AUX postgresql-8.3-base.patch 4130 RMD160 53cf20e4161ac9a9abd14c1a834f2e4508c5b44a SHA1 f58dbfde59f1543c8bd87527a1dfc3356c06db90 SHA256 a3bb8eca2d472a22d744a23d47d829b9931cd5bae2206e90d7e0fac4399927a5
 AUX postgresql-8.3-common.patch 2641 RMD160 0822bf1512457e91d5f32f9d192de6f197db9c55 SHA1 e4bdbd5eee1023e8f0b42ef408b34b57495d1e2b SHA256 e416c26d9c3d266b306ddbc0a2b648054739b7ace35e2b4e449fbdaf094bc197
+AUX postgresql-8.x-relax_ssl_perms.patch 764 RMD160 d1ce5164779c0b0c9229dc13d2eebe6b8c960616 SHA1 f28af41e549bbe3a0b4b8669a2762f71bf3e8a9e SHA256 98bc99954521db083320bd9a6b3a0a5d6eb960af3699527c16e53c567e22394a
 DIST postgresql-7.3.21.tar.bz2 9284558 RMD160 f9de4676b4fbe3d96e6d1462b8bc3c05600d6525 SHA1 bdfa3bddc483c6642cc2ee271d076bfaa4c20c92 SHA256 bf44e0ac259e9f6e14ac102f2977496b6996ecea2fd227fbdcea5fa70e342888
 DIST postgresql-7.4.19.tar.bz2 10307396 RMD160 c9a1c7dc8e7bf9ce93c3b4f061af0563b1cc2627 SHA1 19c563d47b0d5deeef03b5ca7707c9f1917853ce SHA256 447ac7070aa0a547f17a307e842734fc27e2716cb4a251fa9a810b178d44c389
 DIST postgresql-8.0.15.tar.bz2 11253897 RMD160 6aff5c63dce73eea609f0b6e013cd043ae8b7a37 SHA1 66a6fef7749afb91471200005511c04fc1ac2706 SHA256 59408a00db1c73e638a11af10438a827507b7a72b53916d58f2d44c477718714
@@ -20,9 +21,9 @@ DIST postgresql-8.2.7.tar.bz2 12576126 RMD160 96700e91c3b9e733c686b0fe377c7ba661
 DIST postgresql-8.3.1.tar.bz2 13995572 RMD160 075efb67126f2b308d2a5fe4f9097fdbfbe94c89 SHA1 7397e0d8fd3c420ee845d9ae4995ae347bfaea1d SHA256 7ccf1e5c987920e4d6eb98b8589939e29d3a361d285055d5af35ddd8e1a2d992
 EBUILD postgresql-base-7.3.21.ebuild 4278 RMD160 019d9aeb258b289bbf3cf9a0169700477d1e53ed SHA1 2c58832e82835a251214b4315551e242901a92c7 SHA256 5fffc806d591139bdc782fdf933b5c3e23fffa79deb2d2101130f23cf2a475f7
 EBUILD postgresql-base-7.4.19.ebuild 4467 RMD160 44df11946e3cdd2e394cd68d5920ace2a3516388 SHA1 2fa2bc4efe209771e66bbec4224e86151e86144e SHA256 f354d671610ac79a929e27cc9c84b6fe1f59fc44641c1c073288a796155e482d
-EBUILD postgresql-base-8.0.15.ebuild 4496 RMD160 894ba173454171c423592a30c904adde50bf375b SHA1 aa10c7bc8463294c2f2793d648b2a08f473a9ffb SHA256 f51edf2599322a0045696452543a2ae5a2fd58803e4f50765638297fa35617d7
-EBUILD postgresql-base-8.1.11.ebuild 4496 RMD160 f4bdab3155dc3b9dff35d405e26fcfcff9fd7fc9 SHA1 e7fd8f21159f27a5fbe9b488f09d8266f29a55d3 SHA256 b1b1d7996098d35d6135705c339aec72b3dbec20833684f13eee3e9f78ba2817
-EBUILD postgresql-base-8.2.7.ebuild 4965 RMD160 445d71b33936783f121b994fe3a225a57a17a9a3 SHA1 647ea288fc870f2a2dcfc965db1d3daaa0e6cba9 SHA256 0a2f01ff2055950198f8dcf94636066e08be2cc3e813d400062348e3b6fc085b
-EBUILD postgresql-base-8.3.1.ebuild 4997 RMD160 6e15935b1a0f332943a0e8191fd2fb522303959e SHA1 8a2aa2dc1d0684a9a442edbe5fd55d6ef7c32c01 SHA256 c0d7093a5b041829524e75ed3b02d3682a88fa5c525d446ecf80f0058d5cbd01
-MISC ChangeLog 4471 RMD160 3f259782976508fc61675974a44f505d7139d0e3 SHA1 1c7b91fb941d14c9adc856f3c9db860a16a42c5e SHA256 6728cd10e7e99b0a75291675fa14ab5352cdcc6f84a5ac0e70f690b47e7bf6e8
+EBUILD postgresql-base-8.0.15.ebuild 4551 RMD160 202fbcc74aa489b483feb845e50b0615e4c24a02 SHA1 17fd1ef7630deea4040d3fbc85edcd80a6f57eb1 SHA256 091d2f4e078404dcb883f4fe4fb46e4b2db21787ada56251be2e0d19442d81b2
+EBUILD postgresql-base-8.1.11.ebuild 4551 RMD160 3628ced248c003e4d6e175bba90b628c83f9e419 SHA1 7f42d97412f17176d588352ec6144aa1fae631df SHA256 898bfeee009b5e17b9273e4442ce13fc26601761d4d8c8bb0a736dd3e19ff2c8
+EBUILD postgresql-base-8.2.7.ebuild 5020 RMD160 e6350486e5cab56d6045719b5c4cf568838db20e SHA1 4ae4f6d53f86329708202fcdddd1ca57a9dc2f23 SHA256 9561f99f94419fa86be749659fd50684090773130e6cf9424c1c3965f56f4df2
+EBUILD postgresql-base-8.3.1.ebuild 5052 RMD160 a02f705d0965a370e760002a04c25ff22b41726d SHA1 1be069f7a46ea37cf6b98efa85ae82334dca47a3 SHA256 5ba9bc040fd02e28032571b64eb11eacb0899862a63c26afcf937bbfac76af57
+MISC ChangeLog 4777 RMD160 5444214f3762d78e359ea180cfc350b146a09f95 SHA1 97febf99379974afd458495c27969c878bc8d044 SHA256 9e89ee09316fa6362c3c816adec19ef39469e5352b8b72d77c34965a93bd78ee
 MISC metadata.xml 164 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc SHA1 f67b7ac1c5e6e65ef5a19a589d4759c84918f86c SHA256 7e8e8126bc8701c4a42c7dfed8bb755ac6040fe3d0e3f994d888f8b2b4fa7d8b
diff --git a/dev-db/postgresql-base/files/postgresql-8.x-relax_ssl_perms.patch b/dev-db/postgresql-base/files/postgresql-8.x-relax_ssl_perms.patch
new file mode 100644
index 0000000..242aa33
--- /dev/null
+++ b/dev-db/postgresql-base/files/postgresql-8.x-relax_ssl_perms.patch
@@ -0,0 +1,14 @@
+diff -ur postgresql-8.0.15.orig/src/backend/libpq/be-secure.c postgresql-8.0.15/src/backend/libpq/be-secure.c
+--- postgresql-8.0.15.orig/src/backend/libpq/be-secure.c	2008-02-21 04:06:04.334289203 +0100
++++ postgresql-8.0.15/src/backend/libpq/be-secure.c	2008-02-21 04:08:47.309426324 +0100
+@@ -737,8 +737,8 @@
+ 		 * data directory permission check in postmaster.c)
+ 		 */
+ #if !defined(WIN32) && !defined(__CYGWIN__)
+-		if (!S_ISREG(buf.st_mode) || (buf.st_mode & (S_IRWXG | S_IRWXO)) ||
+-			buf.st_uid != geteuid())
++		if (!S_ISREG(buf.st_mode) || (buf.st_mode & (S_IWGRP | S_IRWXO)) ||
++			(buf.st_uid != geteuid()) && buf.st_uid != 0)
+ 			ereport(FATAL,
+ 					(errcode(ERRCODE_CONFIG_FILE_ERROR),
+ 				  errmsg("unsafe permissions on private key file \"%s\"",
diff --git a/dev-db/postgresql-base/postgresql-base-8.0.15.ebuild b/dev-db/postgresql-base/postgresql-base-8.0.15.ebuild
index 1d38657..a523ca0 100644
--- a/dev-db/postgresql-base/postgresql-base-8.0.15.ebuild
+++ b/dev-db/postgresql-base/postgresql-base-8.0.15.ebuild
@@ -53,7 +53,8 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}/postgresql-${SLOT}-common.patch" \
-		"${FILESDIR}/postgresql-${SLOT}-base.patch"
+		"${FILESDIR}/postgresql-${SLOT}-base.patch" \
+		"${FILESDIR}/postgresql-8.x-relax_ssl_perms.patch"
 
 	# to avoid collision - it only should be installed by server
 	rm "${S}/src/backend/nls.mk"
diff --git a/dev-db/postgresql-base/postgresql-base-8.1.11.ebuild b/dev-db/postgresql-base/postgresql-base-8.1.11.ebuild
index 70bd5b7..4347d12 100644
--- a/dev-db/postgresql-base/postgresql-base-8.1.11.ebuild
+++ b/dev-db/postgresql-base/postgresql-base-8.1.11.ebuild
@@ -53,7 +53,8 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}/postgresql-${SLOT}-common.patch" \
-		"${FILESDIR}/postgresql-${SLOT}-base.patch"
+		"${FILESDIR}/postgresql-${SLOT}-base.patch" \
+		"${FILESDIR}/postgresql-8.x-relax_ssl_perms.patch"
 
 	# to avoid collision - it only should be installed by server
 	rm "${S}/src/backend/nls.mk"
diff --git a/dev-db/postgresql-base/postgresql-base-8.2.7.ebuild b/dev-db/postgresql-base/postgresql-base-8.2.7.ebuild
index f180f94..32db1a6 100644
--- a/dev-db/postgresql-base/postgresql-base-8.2.7.ebuild
+++ b/dev-db/postgresql-base/postgresql-base-8.2.7.ebuild
@@ -62,7 +62,8 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}/postgresql-${SLOT}-common.patch" \
-		"${FILESDIR}/postgresql-${SLOT}-base.patch"
+		"${FILESDIR}/postgresql-${SLOT}-base.patch" \
+		"${FILESDIR}/postgresql-8.x-relax_ssl_perms.patch"
 
 	# to avoid collision - it only should be installed by server
 	rm "${S}/src/backend/nls.mk"
diff --git a/dev-db/postgresql-base/postgresql-base-8.3.1.ebuild b/dev-db/postgresql-base/postgresql-base-8.3.1.ebuild
index cd07f20..9f740a8 100644
--- a/dev-db/postgresql-base/postgresql-base-8.3.1.ebuild
+++ b/dev-db/postgresql-base/postgresql-base-8.3.1.ebuild
@@ -62,7 +62,8 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}/postgresql-${SLOT}-common.patch" \
-		"${FILESDIR}/postgresql-${SLOT}-base.patch"
+		"${FILESDIR}/postgresql-${SLOT}-base.patch" \
+		"${FILESDIR}/postgresql-8.x-relax_ssl_perms.patch"
 
 	# to avoid collision - it only should be installed by server
 	rm "${S}/src/backend/nls.mk"