Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: mail-client/squirrelmail/, profiles/, mail-client/squirrelmail/files/
Date: Sat, 01 Jul 2017 09:20:20
Message-Id: 1498900788.d229371435c05ea46d79bd2172c69887888e9634.mgorny@gentoo
1 commit: d229371435c05ea46d79bd2172c69887888e9634
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jul 1 09:09:49 2017 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Jul 1 09:19:48 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2293714
7
8 mail-client/squirrelmail: Remove last-rited pkg, #611422
9
10 mail-client/squirrelmail/Manifest | 10 -
11 .../files/ldapuserdata-0.4-gentoo.patch | 20 --
12 mail-client/squirrelmail/files/postinstall-en.txt | 18 --
13 mail-client/squirrelmail/metadata.xml | 15 --
14 .../squirrelmail-1.4.23_pre20140426.ebuild | 208 ---------------------
15 profiles/package.mask | 5 -
16 6 files changed, 276 deletions(-)
17
18 diff --git a/mail-client/squirrelmail/Manifest b/mail-client/squirrelmail/Manifest
19 deleted file mode 100644
20 index e71165148a8..00000000000
21 --- a/mail-client/squirrelmail/Manifest
22 +++ /dev/null
23 @@ -1,10 +0,0 @@
24 -DIST admin_add.0.1-1.4.0.tar.gz 2388 SHA256 25ec999eea098a509f7d49cfe368b0557b64c698f86b2a2c951617f67735dabc SHA512 c8abb5a29b815ad2a4591ed965d60d1f75deea17d64c5eaa85ba4fec11d7d1ac1aa5beb8d39228e02b1377782d507b0fb55c47bb8ad10b9b958af8c207c6b627 WHIRLPOOL 94d26bd55e1e859f583db0cd39e4ae9b1ef778139302a24af1a10a671b44989354180c837e9eb74b0d58cef0adb345e65a2421c7777ddf77bcb48795133ce534
25 -DIST all_locales-1.4.18-20090526.tar.bz2 3898341 SHA256 b9198127084407950ad6158e030c76fdf9be5fd0d0abd69c606fb7757ae246c6 SHA512 082317a7b443db11236a5fa5771fa68535200b212cf0471ea37013f54c4b3979a3ee3d289aa3e6eed0988febd2188ab7a6054508068d972dd19c49fa700c9492 WHIRLPOOL 66b2eb3f4353f03280b45d1a14d00d924af38b6558997ca667b1672144dfcbfb5731e4df7b910f80a3aec11bc6fbcc2b28ff5a56fff6a3b8d1bfee86cd51ba1b
26 -DIST amavisnewsql-0.8.0-1.4.tar.gz 101008 SHA256 f9ef453f80e0a44a22c695712b44af935f6d1a505239bd0cb6470fc27608041c SHA512 93981e9ef917069982d57a92305dd4096642f04e815daab30d37d0a41956eacfdc2c0fddd68aa5e8c98823becf9ef15f64377600ef42d3d8dfffb4313bded598 WHIRLPOOL ee2f0e0c6887b852eb8494b1fa1c73e7960555a77e9fc0beadfa1fe745fdf531fae1bceba270e34dc90b40e719507a76a4f4151f298fed3ba2cb057227ddefcd
27 -DIST compatibility-2.0.16-1.0.tar.gz 41497 SHA256 bf179d29223fc76ff6609fdf5146d8f488c603314a343ef70e41f77267de0261 SHA512 478b921da90679022da8790183a651c91bcc879e2ec42db9982e3fef7d3f7e92cd23703ac81a7e8e465889348b28597feba8aaa60943cdbe518a076c4723cf3c WHIRLPOOL 6248e48123484d29c299f88485342b612ecfd72f1ea21a67e988b8d379fcc54bc1262095ed75a3ee238bc60e527d5177e1252a370d0e32f0640b227a4e5e69c2
28 -DIST ldapuserdata-0.4.tar.gz 67439 SHA256 ee10b97e99c35b0656e7e87f60785408f3d26a53ee2a0107d8aa04f7947c3ff7 SHA512 89cb6740865a6b48dbdae8b6ded49bfdac1946f0a76538dd874db104d01ddbbd022f1819a7f94d9ade599d9583dc4b4a1e3f4981bdd6d3dbd86c673bb1d388ac WHIRLPOOL 0c69741b1abbdd51dad33e284fafe148e29c66e6fe20351763bee1d400f980a52ec95eb59d6d9a10afa1a4baf1e7d27843c3b51ccd296c1eae47723cee4ff5ab
29 -DIST retrieveuserdata.0.9-1.4.0.tar.gz 10448 SHA256 086796d858e781c518b538b37e9ec011d51a2aebd6d14aeba1aa330b58626b8d SHA512 77588d0dafc603837cff7c33f8e487ee9b322d9ba875077fce1c5ef85b6e57fe9239680f1b9cf805e0940ae4f1a34c0dcd03e3d26706ac44732ea679ccaf8896 WHIRLPOOL b0121dac6146659fce80b9653084b92efb44fb4cc5ee986ebde91c46e581a721c775c8791e5f38bad10fba5b2369ab0f9e72c8749eeec102d1006a93e5f9d13a
30 -DIST secure_login-1.4-1.2.8.tar.gz 16993 SHA256 b6ede807a79c9b5300b43565c920570c583a1cc4d339bcea715c32196518837e SHA512 3246bf3e3f058d73e33a3f2e33166aa57061be0210fcc939f3a881bdb569d049fb95d8ad5c141de9ff7f2014feff40bcc5c72f4ca9acf9c30937c484977e15db WHIRLPOOL 86e5361ec0e0df994c2bd80346fc54126f77d463f642bb23e1fa39daf31488d2abab71cf81c8b290059e9acba1032b160b87a2d92f1295fb6b8b0ee22a477707
31 -DIST show_ssl_link-2.2-1.2.8.tar.gz 13193 SHA256 70ecefc01003fd5dddc13e6dd7bf4e6ab4663426a9990c894e353fb96ebb4a1a SHA512 5e2579a6d55924e5b92ee558379e88f7a5ffd4702009fa00c9a99a2a5bec750cf7b1de7b78ac05c0cdb5f59248c73bde15404e8b27a408766c96fc24ecc4b9c8 WHIRLPOOL d99dc6a04ef026b3faf8029b695ad5bb374009c1e19866661f3b32f5d2b46f27e231cd82f59130cbd15ca3caac3496b132b8c79b5229f5ed558b05e8743e7b8e
32 -DIST squirrelmail-20140426_0200-SVN.stable.tar.bz2 552464 SHA256 1ace525d0e19ed2df9bc294027b4f1c189fb6b454c434abd0ea700e5abefe9ec SHA512 bf0853a878c4a6fe01083090e0fb9cda2c5620248ffcd2e77f728c66480ae9161c6aba9798002b0c4f63d595dc5efa07ec1d5ec2b281d9cfe74096ed51db4850 WHIRLPOOL 29313fa14ec648f93728f2e37727aaa519bcb502b4ecc6fd4100df863b1276233f8a2c28d96d3b83af2a2fe85114b2e567b0ba0f818536a2a40b9f60ae338d86
33 -DIST squirrelmail-decode-1.2.tar.bz2 333942 SHA256 72750301b83ee23fffe32ae40a3dec33ad4f39abf81c5abdd38f235aab3fcb26 SHA512 f804d7e4bf8814fc00ea076b388a106820df6cb22e0d6c76305fef414f159238578a31e13787a932f9e832dc4b31eb4a7ef5da481f2abbcb164b81673e68698b WHIRLPOOL 735695b9f78068542b1db65cb1d35c06eb5c7d94b699fb176d6c5c82cb2b2f38725a83c6bff355ec7035916a55493666e5f839356369b923d2a6b8f9bd5688da
34
35 diff --git a/mail-client/squirrelmail/files/ldapuserdata-0.4-gentoo.patch b/mail-client/squirrelmail/files/ldapuserdata-0.4-gentoo.patch
36 deleted file mode 100644
37 index 46ebc04cff5..00000000000
38 --- a/mail-client/squirrelmail/files/ldapuserdata-0.4-gentoo.patch
39 +++ /dev/null
40 @@ -1,20 +0,0 @@
41 ---- plugins/ldapuserdata/setup.php.orig 2004-01-15 23:40:41.000000000 -0800
42 -+++ plugins/ldapuserdata/setup.php 2004-01-15 23:40:52.000000000 -0800
43 -@@ -92,7 +92,7 @@
44 - global $ldap_bind_dn, $ldap_host;
45 -
46 - /* fill $ldap_prefs_cache with data from LDAP. */
47 -- $ldap_prefs_cache = retrieve_data($login_username);
48 -+ $ldap_prefs_cache = ldap_retrieve_data($login_username);
49 -
50 - /*
51 - print "<pre>";
52 -@@ -121,7 +121,7 @@
53 - }
54 -
55 -
56 --function retrieve_data ($uid) {
57 -+function ldap_retrieve_data ($uid) {
58 - global $ldap_host, $username, $ldap_base_dn, $ldap_bind_dn, $ldap_bind_pw;
59 - global $ldap_manager_dn, $ldap_manager_pw;
60 - global $ldap_objectclass, $prefs_default, $ldap_attributes, $boolean_attrs, $multivalue_attrs;
61
62 diff --git a/mail-client/squirrelmail/files/postinstall-en.txt b/mail-client/squirrelmail/files/postinstall-en.txt
63 deleted file mode 100644
64 index dc9c64a8611..00000000000
65 --- a/mail-client/squirrelmail/files/postinstall-en.txt
66 +++ /dev/null
67 @@ -1,18 +0,0 @@
68 - * You must edit the following configuration files to setup your server.
69 - * Note that not all of them may be present depending on USE flags.
70 - *
71 - * config/config.php
72 - * plugins/retrieveuserdata/config.php
73 - * plugins/virus_scan/config.php
74 - * plugins/gpg/gpg_local_prefs.txt
75 - * plugins/ldapuserdata/config.php
76 - * plugins/show_ssl_link/config.php
77 - * plugins/secure_login/config.php
78 - *
79 - * You should also create the file 'config/admins'
80 - * containing the users who should have access to administrative options.
81 - * Put each login on its own line, and be sure to leave a newline at the
82 - * end of the file.
83 - *
84 - * You can use the console based configuration tool by executing:
85 - * cd config; perl conf.pl
86
87 diff --git a/mail-client/squirrelmail/metadata.xml b/mail-client/squirrelmail/metadata.xml
88 deleted file mode 100644
89 index 7c17718122c..00000000000
90 --- a/mail-client/squirrelmail/metadata.xml
91 +++ /dev/null
92 @@ -1,15 +0,0 @@
93 -<?xml version="1.0" encoding="UTF-8"?>
94 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
95 -<pkgmetadata>
96 - <maintainer type="project">
97 - <email>net-mail@g.o</email>
98 - <name>Net-Mail</name>
99 - </maintainer>
100 - <use>
101 - <flag name="filter">Enable <pkg>mail-filter/amavisd-new</pkg>
102 - filtering</flag>
103 - </use>
104 - <upstream>
105 - <remote-id type="sourceforge">squirrelmail</remote-id>
106 - </upstream>
107 -</pkgmetadata>
108
109 diff --git a/mail-client/squirrelmail/squirrelmail-1.4.23_pre20140426.ebuild b/mail-client/squirrelmail/squirrelmail-1.4.23_pre20140426.ebuild
110 deleted file mode 100644
111 index 75764521fa2..00000000000
112 --- a/mail-client/squirrelmail/squirrelmail-1.4.23_pre20140426.ebuild
113 +++ /dev/null
114 @@ -1,208 +0,0 @@
115 -# Copyright 1999-2015 Gentoo Foundation
116 -# Distributed under the terms of the GNU General Public License v2
117 -
118 -EAPI=5
119 -inherit webapp eutils
120 -
121 -IUSE="ldap spell ssl filter mysql postgres nls"
122 -DESCRIPTION="Webmail for nuts!"
123 -
124 -# Plugin Versions
125 -COMPATIBILITY_VER=2.0.16-1.0
126 -USERDATA_VER=0.9-1.4.0
127 -ADMINADD_VER=0.1-1.4.0
128 -AMAVIS_VER=0.8.0-1.4
129 -LDAP_USERDATA_VER=0.4
130 -SECURELOGIN_VER=1.4-1.2.8
131 -SHOWSSL_VER=2.2-1.2.8
132 -LOCALES_VER=1.4.18-20090526
133 -DECODING_VER=1.2
134 -
135 -#MY_P=${PN}-webmail-${PV}
136 -MY_P=${PN}-${PVR##*_pre}_0200-SVN.stable
137 -#S="${WORKDIR}/${MY_P}"
138 -S="${WORKDIR}/${PN}.stable/${PN}"
139 -
140 -PLUGINS_LOC="http://www.squirrelmail.org/plugins"
141 -SRC_URI="http://snapshots.squirrelmail.org/${MY_P}.tar.bz2
142 - mirror://sourceforge/${PN}/squirrelmail-decode-${DECODING_VER}.tar.bz2
143 - mirror://sourceforge/retruserdata/retrieveuserdata.${USERDATA_VER}.tar.gz
144 - ${PLUGINS_LOC}/compatibility-${COMPATIBILITY_VER}.tar.gz
145 - ssl? ( ${PLUGINS_LOC}/secure_login-${SECURELOGIN_VER}.tar.gz )
146 - ssl? ( ${PLUGINS_LOC}/show_ssl_link-${SHOWSSL_VER}.tar.gz )
147 - ${PLUGINS_LOC}/admin_add.${ADMINADD_VER}.tar.gz
148 - filter? ( ${PLUGINS_LOC}/amavisnewsql-0.8.0-1.4.tar.gz )
149 - ldap? ( ${PLUGINS_LOC}/ldapuserdata-${LDAP_USERDATA_VER}.tar.gz )
150 - nls? ( mirror://sourceforge/${PN}/all_locales-${LOCALES_VER}.tar.bz2 )"
151 -
152 -HOMEPAGE="http://www.squirrelmail.org/"
153 -
154 -LICENSE="GPL-2"
155 -KEYWORDS="amd64 ~ppc ~ppc64 sparc x86"
156 -
157 -DEPEND=""
158 -
159 -RDEPEND="dev-lang/php[session]
160 - virtual/perl-DB_File
161 - ldap? ( net-nds/openldap )
162 - spell? ( app-text/aspell )
163 - filter? ( mail-filter/amavisd-new dev-php/PEAR-Log dev-php/PEAR-DB dev-php/PEAR-Net_SMTP )
164 - postgres? ( dev-php/PEAR-DB )
165 - mysql? ( dev-php/PEAR-DB )"
166 -
167 -src_unpack() {
168 - unpack ${MY_P}.tar.bz2
169 - unpack squirrelmail-decode-${DECODING_VER}.tar.bz2
170 -
171 - cd "${S}" || die
172 -
173 - mv config/config_default.php config/config.php || die
174 -
175 - # Now do the plugins
176 - cd "${S}/plugins" || die
177 -
178 - unpack compatibility-${COMPATIBILITY_VER}.tar.gz
179 -
180 - unpack admin_add.${ADMINADD_VER}.tar.gz
181 -
182 - unpack retrieveuserdata.${USERDATA_VER}.tar.gz
183 -
184 - use filter &&
185 - unpack amavisnewsql-${AMAVIS_VER}.tar.gz &&
186 - mv amavisnewsql/config.php.dist amavisnewsql/config.php
187 -
188 - use ldap &&
189 - unpack ldapuserdata-${LDAP_USERDATA_VER}.tar.gz
190 -
191 - use ssl &&
192 - unpack secure_login-${SECURELOGIN_VER}.tar.gz &&
193 - mv secure_login/config.sample.php secure_login/config.php &&
194 - unpack show_ssl_link-${SHOWSSL_VER}.tar.gz &&
195 - mv show_ssl_link/config.php.sample show_ssl_link/config.php
196 -
197 - use nls &&
198 - cd "${S}" &&
199 - unpack all_locales-${LOCALES_VER}.tar.bz2
200 -}
201 -
202 -src_prepare() {
203 - sed -i "s:'/var/local/squirrelmail/data/':SM_PATH . 'data/':" \
204 - config/config.php || die
205 -
206 - cd "${S}/plugins" || die
207 - if use ldap; then
208 - epatch "${FILESDIR}"/ldapuserdata-${LDAP_USERDATA_VER}-gentoo.patch
209 - mv ldapuserdata/config_sample.php ldapuserdata/config.php || die
210 - fi
211 -}
212 -
213 -src_configure() {
214 - #we need to have this empty function ...
215 - echo "Nothing to configure"
216 -}
217 -
218 -src_compile() {
219 - #we need to have this empty function ... default compile hangs
220 - echo "Nothing to compile"
221 -}
222 -
223 -src_install() {
224 - webapp_src_preinst
225 -
226 - # handle documentation files
227 - #
228 - # NOTE that doc files go into /usr/share/doc as normal; they do NOT
229 - # get installed per vhost!
230 -
231 - dodoc README
232 -
233 - docinto compatibility
234 - for doc in plugins/compatibility/docs/INSTALL plugins/compatibility/docs/README; do
235 - dodoc ${doc}
236 - rm -f ${doc}
237 - done
238 -
239 - docinto admin_add
240 - for doc in plugins/admin_add/README; do
241 - dodoc ${doc}
242 - rm -f ${doc}
243 - done
244 -
245 - docinto retrieveuserdata
246 - for doc in plugins/retrieveuserdata/INSTALL plugins/retrieveuserdata/changelog plugins/retrieveuserdata/users_example.txt; do
247 - dodoc ${doc}
248 - rm -f ${doc}
249 - done
250 -
251 - if use filter; then
252 - docinto amavisnewsql
253 - for doc in plugins/amavisnewsql/{CHANGELOG,README,UPGRADE}; do
254 - dodoc ${doc}
255 - rm -f ${doc}
256 - done
257 - fi
258 -
259 - if use ldap; then
260 - rm plugins/ldapuserdata/README
261 - docinto ldapuserdata
262 - for doc in plugins/ldapuserdata/doc/README; do
263 - dodoc ${doc}
264 - rm -f ${doc}
265 - done
266 - fi
267 -
268 - if use ssl; then
269 - docinto secure_login
270 - for doc in plugins/secure_login/INSTALL plugins/secure_login/README; do
271 - dodoc ${doc}
272 - rm -f ${doc}
273 - done
274 -
275 - docinto show_ssl_link
276 - for doc in plugins/show_ssl_link/INSTALL plugins/show_ssl_link/README; do
277 - dodoc ${doc}
278 - rm -f ${doc}
279 - done
280 - fi
281 -
282 - # Copy the app's main files
283 - einfo "Installing squirrelmail files."
284 - cp -r . "${D}${MY_HTDOCSDIR}" || die
285 -
286 - cp "${WORKDIR}"/squirrelmail-decode-${DECODING_VER}/*/*.php \
287 - "${D}${MY_HTDOCSDIR}/functions/decode" || die
288 -
289 - # Identify the configuration files that this app uses
290 - local configs="config/config.php config/config_local.php plugins/retrieveuserdata/config.php"
291 - use filter && configs="${configs} plugins/amavisnewsql/config.php"
292 - use ldap && configs="${configs} plugins/ldapuserdata/config.php"
293 - use ssl && configs="${configs} plugins/show_ssl_link/config.php plugins/secure_login/config.php"
294 -
295 - for file in ${configs}; do
296 - webapp_configfile ${MY_HTDOCSDIR}/${file}
297 - done
298 -
299 - # Identify any script files that need #! headers adding to run under
300 - # a CGI script (such as PHP/CGI)
301 - #
302 - # for phpmyadmin, we *assume* that all .php files that don't end in
303 - # .inc.php need to have CGI/BIN support added
304 -
305 - #for x in `find . -name '*.php' -print | grep -v 'inc.php'` ; do
306 - # webapp_runbycgibin php ${MY_HTDOCSDIR}/$x
307 - #done
308 -
309 - local server_owned="data index.php"
310 - for file in ${server_owned}; do
311 - webapp_serverowned ${MY_HTDOCSDIR}/${file}
312 - done
313 -
314 - # add the post-installation instructions
315 - webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
316 -
317 - # all done
318 - #
319 - # now we let the eclass strut its stuff ;-)
320 -
321 - webapp_src_install
322 -}
323
324 diff --git a/profiles/package.mask b/profiles/package.mask
325 index e3f9ce11876..b3312566eaf 100644
326 --- a/profiles/package.mask
327 +++ b/profiles/package.mask
328 @@ -618,11 +618,6 @@ net-wireless/cpyrit-cuda
329 >=dev-games/openscenegraph-3.5.5
330 >=dev-games/openscenegraph-qt-3.5.5
331
332 -# Thomas Deutschmann <whissi@g.o> (17 May 2017)
333 -# Unpatched security vulnerability per bug #616700
334 -# Removal in 30 days.
335 -mail-client/squirrelmail
336 -
337 # Eray Aslan <eras@g.o> (17 May 2017)
338 # Functionality merged to cyrus-imapd-2.5.x series.
339 # cyrus-imapd-2.5.10 was stabilized in Jan 2017. Upgrade