Gentoo Archives: gentoo-commits

From: Justin Lecher <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pysvn/files/, dev-python/pysvn/
Date: Sat, 26 Dec 2015 17:58:57
Message-Id: 1451152731.258b64db9acfdbc04832a6b3a316daa5824394b9.jlec@gentoo
1 commit: 258b64db9acfdbc04832a6b3a316daa5824394b9
2 Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 26 17:58:42 2015 +0000
4 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 26 17:58:51 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=258b64db
7
8 dev-python/pysvn: Drop vulnerable version for CVE-2015-0853
9
10 Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=560530
11
12 obsoletes:
13 Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=420191
14
15 Package-Manager: portage-2.2.26
16 Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
17
18 dev-python/pysvn/Manifest | 2 -
19 .../pysvn/files/pysvn-1.7.10-respect_flags.patch | 95 ---------------------
20 .../pysvn/files/pysvn-1.7.9-respect_flags.patch | 96 ----------------------
21 dev-python/pysvn/pysvn-1.7.10.ebuild | 61 --------------
22 dev-python/pysvn/pysvn-1.7.9.ebuild | 59 -------------
23 5 files changed, 313 deletions(-)
24
25 diff --git a/dev-python/pysvn/Manifest b/dev-python/pysvn/Manifest
26 index 5db2a53..00a0e26 100644
27 --- a/dev-python/pysvn/Manifest
28 +++ b/dev-python/pysvn/Manifest
29 @@ -1,3 +1 @@
30 -DIST pysvn-1.7.10.tar.gz 352631 SHA256 cb8a7eca9fd5d077f4b086c79cc1115a2f38a37979eee836ff258b4da0aee517 SHA512 3404ce53f974ff91a7eecea29176f6b71f1dbb37a716880dfd3d2961d4c6e0c81f87aa46308994d4f7ed6a6cbca7f7451753e1de43ce95fef4443fc5f70ff3aa WHIRLPOOL 99ac425ad2e19355521c73947cf33b2c5bff0023af686d699fdfcd7abc8c5f965974c9762b0dbd3ae3cddfc833e35ac549af1de54ca2472d1354a8fa126e8c36
31 -DIST pysvn-1.7.9.tar.gz 352320 SHA256 8a58ea6405e5f5ffd0850fc5ed6bc29a93b3573da099293f49ef3241e5be1692 SHA512 966f9b57f63abc68d82a0f0f0d710d3109c2bd515eb0b0dacdca140b0db32154c802d27b4f79062da19f0d18ff6332b729c6f9c06e0a74742161a00b74bef7aa WHIRLPOOL 53f27a30ce97b723fe0d1a8540221e25e593fc00789eab7b6e2814f3ffe3ff8f485523ad7fe3bff7c1b5d101fb87d694a1c18111d2523895835ea72ea1ee6aab
32 DIST pysvn-1.8.0.tar.gz 366583 SHA256 39596f4884ed689cdb5a4e210e421724302a566c7ba756cc4d46bbfeb0c8326b SHA512 14a70b910be986eba638a903edde5046c93314fedb08a7c15d464dc51da1c7efeb87147cc68c00ff9ac1b4ca506d099d3aedf7e4d86f92642c7304ef9540653b WHIRLPOOL 90a795f4d6a1c353321a116f5676741ce2121122de0426d045893e2688cc10bcd248ffef98da6d920daba70e2406ce136fed972e8172b7e648c6dd02f04e608d
33
34 diff --git a/dev-python/pysvn/files/pysvn-1.7.10-respect_flags.patch b/dev-python/pysvn/files/pysvn-1.7.10-respect_flags.patch
35 deleted file mode 100644
36 index 18c7ea6..0000000
37 --- a/dev-python/pysvn/files/pysvn-1.7.10-respect_flags.patch
38 +++ /dev/null
39 @@ -1,95 +0,0 @@
40 -diff -ur pysvn-1.7.9.orig/Source/setup_configure.py pysvn-1.7.9/Source/setup_configure.py
41 ---- Source/setup_configure.py 2014-02-02 22:19:59.000000000 +0800
42 -+++ Source/setup_configure.py 2014-08-15 08:15:44.676746371 +0800
43 -@@ -848,8 +848,8 @@
44 - def __init__( self, setup ):
45 - Compiler.__init__( self, setup )
46 -
47 -- self._addVar( 'CCC', 'g++' )
48 -- self._addVar( 'CC', 'gcc' )
49 -+ self._addVar( 'CCC', '$(CXX)' )
50 -+ self._addVar( 'CC', '$(CC)' )
51 -
52 - def getPythonExtensionFileExt( self ):
53 - return '.so'
54 -@@ -975,8 +975,8 @@
55 - else:
56 - arch_options = ''
57 -
58 -- self._addVar( 'CCC', 'g++ %s' % (arch_options,) )
59 -- self._addVar( 'CC', 'gcc %s' % (arch_options,) )
60 -+ self._addVar( 'CCC', '$(CXX) %s' % (arch_options,) )
61 -+ self._addVar( 'CC', '$(CC) %s' % (arch_options,) )
62 -
63 - self._find_paths_pycxx_dir = [
64 - '../Import/pycxx-%d.%d.%d' % pycxx_version,
65 -@@ -1031,11 +1031,11 @@
66 -
67 - def setupUtilities( self ):
68 - self._addVar( 'CCCFLAGS',
69 -- '-g '
70 -+ '$(CXXFLAGS) '
71 - '-Wall -fPIC -fexceptions -frtti '
72 - '-I. -I%(APR_INC)s -I%(APU_INC)s -I%(SVN_INC)s '
73 - '-D%(DEBUG)s' )
74 -- self._addVar( 'LDEXE', '%(CCC)s -g' )
75 -+ self._addVar( 'LDEXE', '$(CXX) $(LDFLAGS)' )
76 -
77 - def setupPySvn( self ):
78 - self._pysvnModuleSetup()
79 -@@ -1047,7 +1047,7 @@
80 - self._addVar( 'PYTHON_INC', distutils.sysconfig.get_python_inc() )
81 -
82 - py_cflags_list = [
83 -- '-g',
84 -+ '$(CXXFLAGS) ',
85 - '-Wall -fPIC -fexceptions -frtti',
86 - '-I. -I%(APR_INC)s -I%(APU_INC)s -I%(SVN_INC)s',
87 - '-DPYCXX_PYTHON_2TO3 -I%(PYCXX)s -I%(PYCXX_SRC)s -I%(PYTHON_INC)s',
88 -@@ -1073,13 +1073,12 @@
89 -
90 - self._addVar( 'CCCFLAGS', ' '.join( py_cflags_list ) )
91 - self._addVar( 'LDLIBS', ' '.join( py_ld_libs ) )
92 -- self._addVar( 'LDSHARED', '%(CCC)s -bundle -g '
93 -+ self._addVar( 'LDSHARED', '$(CXX) $(LDFLAGS) -bundle '
94 - '-framework System '
95 - '%(PYTHON_FRAMEWORK)s '
96 - '-framework CoreFoundation '
97 - '-framework Kerberos '
98 -- '-framework Security '
99 -- '%(LDLIBS)s' )
100 -+ '-framework Security' )
101 -
102 - class UnixCompilerGCC(CompilerGCC):
103 - def __init__( self, setup ):
104 -@@ -1139,11 +1138,11 @@
105 -
106 - def setupUtilities( self ):
107 - self._addVar( 'CCCFLAGS',
108 -- '-g '
109 -+ '$(CXXFLAGS) '
110 - '-Wall -fPIC -fexceptions -frtti '
111 - '-I. -I%(APR_INC)s -I%(APU_INC)s -I%(SVN_INC)s '
112 - '-D%(DEBUG)s' )
113 -- self._addVar( 'LDEXE', '%(CCC)s -g' )
114 -+ self._addVar( 'LDEXE', '$(CXX) $(LDFLAGS)' )
115 -
116 - def setupPySvn( self ):
117 - self._pysvnModuleSetup()
118 -@@ -1154,6 +1153,7 @@
119 - self._addVar( 'PYTHON_ARCH_SPECIFIC_INC', distutils.sysconfig.get_python_inc( True ) )
120 -
121 - py_cflags_list = [
122 -+ '$(CXXFLAGS)',
123 - '-Wall -fPIC -fexceptions -frtti',
124 - '-I. -I%(APR_INC)s -I%(APU_INC)s -I%(SVN_INC)s',
125 - '-DPYCXX_PYTHON_2TO3 -I%(PYCXX)s -I%(PYCXX_SRC)s -I%(PYTHON_INC)s',
126 -@@ -1171,7 +1171,7 @@
127 -
128 - self._addVar( 'CCCFLAGS', ' '.join( py_cflags_list ) )
129 - self._addVar( 'LDLIBS', ' '.join( self._getLdLibs() ) )
130 -- self._addVar( 'LDSHARED', '%(CCC)s -shared -g' )
131 -+ self._addVar( 'LDSHARED', '$(CXX) $(LDFLAGS) -shared' )
132 -
133 - #--------------------------------------------------------------------------------
134 - class LinuxCompilerGCC(UnixCompilerGCC):
135
136 diff --git a/dev-python/pysvn/files/pysvn-1.7.9-respect_flags.patch b/dev-python/pysvn/files/pysvn-1.7.9-respect_flags.patch
137 deleted file mode 100644
138 index 7f1c35e..0000000
139 --- a/dev-python/pysvn/files/pysvn-1.7.9-respect_flags.patch
140 +++ /dev/null
141 @@ -1,96 +0,0 @@
142 -diff -ur pysvn-1.7.9.orig/Source/setup_configure.py pysvn-1.7.9/Source/setup_configure.py
143 ---- Source/setup_configure.py 2014-02-02 22:19:59.000000000 +0800
144 -+++ Source/setup_configure.py 2014-08-15 08:15:44.676746371 +0800
145 -@@ -848,8 +848,8 @@
146 - def __init__( self, setup ):
147 - Compiler.__init__( self, setup )
148 -
149 -- self._addVar( 'CCC', 'g++' )
150 -- self._addVar( 'CC', 'gcc' )
151 -+ self._addVar( 'CCC', '$(CXX)' )
152 -+ self._addVar( 'CC', '$(CC)' )
153 -
154 - def getPythonExtensionFileExt( self ):
155 - return '.so'
156 -@@ -975,8 +975,8 @@
157 - else:
158 - arch_options = ''
159 -
160 -- self._addVar( 'CCC', 'g++ %s' % (arch_options,) )
161 -- self._addVar( 'CC', 'gcc %s' % (arch_options,) )
162 -+ self._addVar( 'CCC', '$(CXX) %s' % (arch_options,) )
163 -+ self._addVar( 'CC', '$(CC) %s' % (arch_options,) )
164 -
165 - self._find_paths_pycxx_dir = [
166 - '../Import/pycxx-%d.%d.%d' % pycxx_version,
167 -@@ -1031,12 +1031,12 @@
168 -
169 - def setupUtilities( self ):
170 - self._addVar( 'CCCFLAGS',
171 -- '-g '
172 -+ '$(CXXFLAGS) '
173 - '-no-long-double '
174 - '-Wall -fPIC -fexceptions -frtti '
175 - '-I. -I%(APR_INC)s -I%(APU_INC)s -I%(SVN_INC)s '
176 - '-D%(DEBUG)s' )
177 -- self._addVar( 'LDEXE', '%(CCC)s -g' )
178 -+ self._addVar( 'LDEXE', '$(CXX) $(LDFLAGS)' )
179 -
180 - def setupPySvn( self ):
181 - self._pysvnModuleSetup()
182 -@@ -1048,7 +1048,7 @@
183 - self._addVar( 'PYTHON_INC', distutils.sysconfig.get_python_inc() )
184 -
185 - py_cflags_list = [
186 -- '-g',
187 -+ '$(CXXFLAGS) ',
188 - '-no-long-double',
189 - '-Wall -fPIC -fexceptions -frtti',
190 - '-I. -I%(APR_INC)s -I%(APU_INC)s -I%(SVN_INC)s',
191 -@@ -1075,13 +1075,12 @@
192 -
193 - self._addVar( 'CCCFLAGS', ' '.join( py_cflags_list ) )
194 - self._addVar( 'LDLIBS', ' '.join( py_ld_libs ) )
195 -- self._addVar( 'LDSHARED', '%(CCC)s -bundle -g '
196 -+ self._addVar( 'LDSHARED', '$(CXX) $(LDFLAGS) -bundle '
197 - '-framework System '
198 - '%(PYTHON_FRAMEWORK)s '
199 - '-framework CoreFoundation '
200 - '-framework Kerberos '
201 -- '-framework Security '
202 -- '%(LDLIBS)s' )
203 -+ '-framework Security' )
204 -
205 - class UnixCompilerGCC(CompilerGCC):
206 - def __init__( self, setup ):
207 -@@ -1141,11 +1140,11 @@
208 -
209 - def setupUtilities( self ):
210 - self._addVar( 'CCCFLAGS',
211 -- '-g '
212 -+ '$(CXXFLAGS) '
213 - '-Wall -fPIC -fexceptions -frtti '
214 - '-I. -I%(APR_INC)s -I%(APU_INC)s -I%(SVN_INC)s '
215 - '-D%(DEBUG)s' )
216 -- self._addVar( 'LDEXE', '%(CCC)s -g' )
217 -+ self._addVar( 'LDEXE', '$(CXX) $(LDFLAGS)' )
218 -
219 - def setupPySvn( self ):
220 - self._pysvnModuleSetup()
221 -@@ -1156,6 +1155,7 @@
222 - self._addVar( 'PYTHON_ARCH_SPECIFIC_INC', distutils.sysconfig.get_python_inc( True ) )
223 -
224 - py_cflags_list = [
225 -+ '$(CXXFLAGS)',
226 - '-Wall -fPIC -fexceptions -frtti',
227 - '-I. -I%(APR_INC)s -I%(APU_INC)s -I%(SVN_INC)s',
228 - '-DPYCXX_PYTHON_2TO3 -I%(PYCXX)s -I%(PYCXX_SRC)s -I%(PYTHON_INC)s',
229 -@@ -1173,7 +1173,7 @@
230 -
231 - self._addVar( 'CCCFLAGS', ' '.join( py_cflags_list ) )
232 - self._addVar( 'LDLIBS', ' '.join( self._getLdLibs() ) )
233 -- self._addVar( 'LDSHARED', '%(CCC)s -shared -g' )
234 -+ self._addVar( 'LDSHARED', '$(CXX) $(LDFLAGS) -shared' )
235 -
236 - #--------------------------------------------------------------------------------
237 - class LinuxCompilerGCC(UnixCompilerGCC):
238
239 diff --git a/dev-python/pysvn/pysvn-1.7.10.ebuild b/dev-python/pysvn/pysvn-1.7.10.ebuild
240 deleted file mode 100644
241 index 5ea2536..0000000
242 --- a/dev-python/pysvn/pysvn-1.7.10.ebuild
243 +++ /dev/null
244 @@ -1,61 +0,0 @@
245 -# Copyright 1999-2015 Gentoo Foundation
246 -# Distributed under the terms of the GNU General Public License v2
247 -# $Id$
248 -
249 -EAPI=5
250 -PYTHON_COMPAT=( python{2_7,3_3,3_4} )
251 -
252 -inherit distutils-r1 toolchain-funcs
253 -
254 -DESCRIPTION="Object-oriented python bindings for subversion"
255 -HOMEPAGE="http://pysvn.tigris.org/"
256 -SRC_URI="http://pysvn.barrys-emacs.org/source_kits/${P}.tar.gz"
257 -
258 -LICENSE="Apache-1.1"
259 -SLOT="0"
260 -KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
261 -IUSE="doc examples"
262 -
263 -DEPEND="
264 - >=dev-python/pycxx-6.2.0[${PYTHON_USEDEP}]
265 - <dev-vcs/subversion-1.9"
266 -RDEPEND="${DEPEND}"
267 -
268 -PATCHES=( "${FILESDIR}"/${P}-respect_flags.patch )
269 -
270 -python_prepare() {
271 - # Don't use internal copy of dev-python/pycxx.
272 - rm -r Import || die
273 -
274 - # http://pysvn.tigris.org/source/browse/pysvn?view=rev&revision=1469
275 - sed \
276 - -e "s/PYSVN_HAS_SVN_CLIENT_CTX_T__CONFLICT_FUNC_16/PYSVN_HAS_SVN_CLIENT_CTX_T__CONFLICT_FUNC_1_6/" \
277 - -i Source/pysvn_svnenv.hpp || die
278 -}
279 -
280 -python_configure() {
281 - cd Source || die
282 - # all config options from 1.7.6 are all already set
283 - esetup.py configure
284 -}
285 -
286 -python_compile() {
287 - cd Source || die
288 - emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
289 -}
290 -
291 -python_test() {
292 - cd Tests || die
293 - emake
294 -}
295 -
296 -python_install() {
297 - cd Source || die
298 - python_domodule pysvn
299 -}
300 -
301 -python_install_all() {
302 - use doc && local HTML_DOCS=( Docs/ )
303 - use examples && local EXAMPLES=( Examples/Client/. )
304 - distutils-r1_python_install_all
305 -}
306
307 diff --git a/dev-python/pysvn/pysvn-1.7.9.ebuild b/dev-python/pysvn/pysvn-1.7.9.ebuild
308 deleted file mode 100644
309 index 6cc2869..0000000
310 --- a/dev-python/pysvn/pysvn-1.7.9.ebuild
311 +++ /dev/null
312 @@ -1,59 +0,0 @@
313 -# Copyright 1999-2014 Gentoo Foundation
314 -# Distributed under the terms of the GNU General Public License v2
315 -# $Id$
316 -
317 -EAPI=5
318 -PYTHON_COMPAT=( python{2_7,3_3,3_4} )
319 -
320 -inherit eutils distutils-r1 toolchain-funcs
321 -
322 -DESCRIPTION="Object-oriented python bindings for subversion"
323 -HOMEPAGE="http://pysvn.tigris.org/"
324 -SRC_URI="http://pysvn.barrys-emacs.org/source_kits/${P}.tar.gz"
325 -
326 -LICENSE="Apache-1.1"
327 -SLOT="0"
328 -KEYWORDS="amd64 ~arm ppc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
329 -IUSE="doc examples"
330 -
331 -DEPEND="
332 - >=dev-python/pycxx-6.2.0[${PYTHON_USEDEP}]
333 - <dev-vcs/subversion-1.9"
334 -RDEPEND="${DEPEND}"
335 -
336 -PATCHES=( "${FILESDIR}"/${P}-respect_flags.patch )
337 -
338 -python_prepare() {
339 - # Don't use internal copy of dev-python/pycxx.
340 - rm -r Import || die
341 -
342 - # http://pysvn.tigris.org/source/browse/pysvn?view=rev&revision=1469
343 - sed -e "s/PYSVN_HAS_SVN_CLIENT_CTX_T__CONFLICT_FUNC_16/PYSVN_HAS_SVN_CLIENT_CTX_T__CONFLICT_FUNC_1_6/" -i Source/pysvn_svnenv.hpp
344 -}
345 -
346 -python_configure() {
347 - cd Source || die
348 - # all config options from 1.7.6 are all already set
349 - esetup.py configure
350 -}
351 -
352 -python_compile() {
353 - cd Source || die
354 - emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
355 -}
356 -
357 -python_test() {
358 - cd Tests || die
359 - emake
360 -}
361 -
362 -python_install() {
363 - cd Source || die
364 - python_domodule pysvn
365 -}
366 -
367 -python_install_all() {
368 - use doc && local HTML_DOCS=( Docs/ )
369 - use examples && local EXAMPLES=( Examples/Client/. )
370 - distutils-r1_python_install_all
371 -}