1 |
hollow 08/03/06 15:40:23 |
2 |
|
3 |
Modified: postinstall-en-2.8.0.txt |
4 |
Added: phpmyadmin-2.11.5-custom-cert.patch |
5 |
Log: |
6 |
add patch for custom connection certificates; fix postinstall instructions wrt #212117; remove vulnerable versions wrt #212000 |
7 |
(Portage version: 2.1.4.4) |
8 |
|
9 |
Revision Changes Path |
10 |
1.7 dev-db/phpmyadmin/files/postinstall-en-2.8.0.txt |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/phpmyadmin/files/postinstall-en-2.8.0.txt?rev=1.7&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/phpmyadmin/files/postinstall-en-2.8.0.txt?rev=1.7&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/phpmyadmin/files/postinstall-en-2.8.0.txt?r1=1.6&r2=1.7 |
15 |
|
16 |
Index: postinstall-en-2.8.0.txt |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/files/postinstall-en-2.8.0.txt,v |
19 |
retrieving revision 1.6 |
20 |
retrieving revision 1.7 |
21 |
diff -u -r1.6 -r1.7 |
22 |
--- postinstall-en-2.8.0.txt 26 May 2007 23:25:01 -0000 1.6 |
23 |
+++ postinstall-en-2.8.0.txt 6 Mar 2008 15:40:22 -0000 1.7 |
24 |
@@ -2,31 +2,34 @@ |
25 |
|
26 |
1. Configure ${PN}: |
27 |
|
28 |
- a) Create config.inc.php. You can use the web-based installer: |
29 |
+a) Create config.inc.php. You can use the web-based installer: |
30 |
|
31 |
- http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/scripts/setup.php |
32 |
+ mkdir ${MY_INSTALLDIR}/config |
33 |
+ chown ${VHOST_SERVER_UID}:${VHOST_SERVER_UID} ${MY_INSTALLDIR}/config |
34 |
|
35 |
- b) Alternatively, use an existing configuration: |
36 |
+ then go to http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/scripts/setup.php |
37 |
|
38 |
- mkdir ${MY_INSTALLDIR}/config |
39 |
- chmod o+rw ${MY_INSTALLDIR}/config |
40 |
- cp <path to existing config.inc.php file>/config.inc.php ${MY_INSTALLDIR}/config/ |
41 |
- chown -R ${VHOST_SERVER_UID}:${VHOST_SERVER_UID} ${MY_INSTALLDIR}/config |
42 |
+ once you've saved the configuration: |
43 |
|
44 |
- C) Alternatively, use the default config file in libraries/config.default.php |
45 |
+ cp ${MY_INSTALLDIR}/config/config.inc.php ${MY_INSTALLDIR}/config.inc.php |
46 |
+ rm -rf ${MY_INSTALLDIR}/config |
47 |
|
48 |
- mkdir ${MY_INSTALLDIR}/config |
49 |
- chmod o+rw ${MY_INSTALLDIR}/config |
50 |
- cp ${MY_INSTALLDIR}/libraries/config.default.php ${MY_INSTALLDIR}/config/ |
51 |
- chown -R ${VHOST_SERVER_UID}:${VHOST_SERVER_UID} ${MY_INSTALLDIR}/config |
52 |
+b) Alternatively, use an existing configuration: |
53 |
+ |
54 |
+ cp <path to existing config.inc.php file> ${MY_INSTALLDIR}/ |
55 |
+ |
56 |
+c) Alternatively, use the sample config file: |
57 |
+ |
58 |
+ cp ${MY_INSTALLDIR}/config.sample.inc.php ${MY_INSTALLDIR}/config.inc.php |
59 |
|
60 |
2. Be sure that the libraries/ directory is not visible. You can use the |
61 |
-provided .htaccess file. |
62 |
+ provided .htaccess file. |
63 |
|
64 |
-=============== |
65 |
+================================================================= |
66 |
|
67 |
If you are upgrading from an earlier version: |
68 |
|
69 |
-1. If you are using ${PN}'s features for master/foreign tables, be sure to read |
70 |
- http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/Documentation.html#col_com |
71 |
-You will need to perform the ALTER TABLE step yourself. |
72 |
+1. If you are using ${PN}'s features for master/foreign tables, be sure to read |
73 |
+ http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/Documentation.html#col_com |
74 |
+ |
75 |
+ You will need to perform the ALTER TABLE step yourself. |
76 |
|
77 |
|
78 |
|
79 |
1.1 dev-db/phpmyadmin/files/phpmyadmin-2.11.5-custom-cert.patch |
80 |
|
81 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/phpmyadmin/files/phpmyadmin-2.11.5-custom-cert.patch?rev=1.1&view=markup |
82 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/phpmyadmin/files/phpmyadmin-2.11.5-custom-cert.patch?rev=1.1&content-type=text/plain |
83 |
|
84 |
Index: phpmyadmin-2.11.5-custom-cert.patch |
85 |
=================================================================== |
86 |
Index: phpMyAdmin-2.11.5-all-languages-utf-8-only/libraries/dbi/mysqli.dbi.lib.php |
87 |
=================================================================== |
88 |
--- phpMyAdmin-2.11.5-all-languages-utf-8-only.orig/libraries/dbi/mysqli.dbi.lib.php |
89 |
+++ phpMyAdmin-2.11.5-all-languages-utf-8-only/libraries/dbi/mysqli.dbi.lib.php |
90 |
@@ -97,6 +97,9 @@ function PMA_DBI_connect($user, $passwor |
91 |
/* Optionally enable SSL */ |
92 |
if ($GLOBALS['cfg']['Server']['ssl'] && defined('MYSQLI_CLIENT_SSL')) { |
93 |
$client_flags |= MYSQLI_CLIENT_SSL; |
94 |
+ if ($GLOBALS['cfg']['Server']['ssl-key'] && $GLOBALS['cfg']['Server']['ssl-cert'] && $GLOBALS['cfg']['Server']['ssl-ca']) { |
95 |
+ mysqli_ssl_set($link, $GLOBALS['cfg']['Server']['ssl-key'], $GLOBALS['cfg']['Server']['ssl-cert'], $GLOBALS['cfg']['Server']['ssl-ca'], null, null); |
96 |
+ } |
97 |
} |
98 |
|
99 |
$return_value = @mysqli_real_connect($link, $GLOBALS['cfg']['Server']['host'], $user, $password, false, $server_port, $server_socket, $client_flags); |
100 |
|
101 |
|
102 |
|
103 |
-- |
104 |
gentoo-commits@l.g.o mailing list |