1 |
commit: 64ca050d5c3447f07d0e146a6f52f45c0c532b11 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Apr 15 06:48:10 2019 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Apr 15 06:48:10 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64ca050d |
7 |
|
8 |
dev-vcs/subversion: Security cleanup |
9 |
|
10 |
Bug: https://bugs.gentoo.org/676094 |
11 |
Closes: https://bugs.gentoo.org/674984 |
12 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
13 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
14 |
|
15 |
dev-vcs/subversion/Manifest | 2 - |
16 |
.../subversion/files/subversion-1.9.7-kf5.patch | 211 -------- |
17 |
dev-vcs/subversion/subversion-1.9.7-r1.ebuild | 531 --------------------- |
18 |
3 files changed, 744 deletions(-) |
19 |
|
20 |
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest |
21 |
index 27b062f7068..d55f59df88a 100644 |
22 |
--- a/dev-vcs/subversion/Manifest |
23 |
+++ b/dev-vcs/subversion/Manifest |
24 |
@@ -2,5 +2,3 @@ DIST subversion-1.10.0_rc1-patches-1.tar.xz 2984 BLAKE2B 7c9619b95ca6b433a58dc5b |
25 |
DIST subversion-1.10.4.tar.bz2 8392477 BLAKE2B 93364178d2252332b070ebddd5791cb43e0000802d820848a6ca2e13ae3036a9119901dcde1b73ea09bd34af3fd72b923bdd2765e302359e7f1ecf49a6840685 SHA512 c44a4a4a9533cd4f4cb6ddbc3ce98585a96da6c8e75497d087034b52f899797bb0972dfc0e79db99e81149e59e7fa765398c6ad35eba64f11f4ae9c3b3537434 |
26 |
DIST subversion-1.11.1.tar.bz2 8499709 BLAKE2B f14bbe9b28dec32894a8c262d32f36e01c9866352f1c54b5468804e81c1eadb895cbe9e33783a9e7d4a7f54dfa3b25b762015b9ca4886a14628c434254995c77 SHA512 2d082f715bf592ffc6a19311a9320dbae2ff0ee126b0472ce1c3f10e9aee670f43d894889430e6d093620f7b69c611e9a26773bc7a2f8b599ec37540ecd84a8d |
27 |
DIST subversion-1.12.0-rc1.tar.bz2 8503704 BLAKE2B e9f2779155aa45ee0f60359d292c085c1a4bbb2237964d6c045278d7dff71e665662c3af8bfcd81139eb7c501f8f0923377c80348202d1dfb1c9087fafe5a1ed SHA512 b82205d6530ba36d29194382897dbf0b79bd81326eebdaf71f21d061d3759c4f77fecfc2f9f5e761bef9e2534eb4567d62b96618813be644059d5c20219ff546 |
28 |
-DIST subversion-1.8.18-patchset.tar.bz2 7407 BLAKE2B dc3b6d80dfdf4c6cc30f1663c8cee3eebc4f42d433c3965d8b309f9cc79c31b566a74cf43b3b04037c2498b6a2bffe2c60953c5cfb25aec61a8e4a7e928efcae SHA512 b5c207ed7b6923f1259290563409b2e946a512cc052e4e5d8a061abf3f0909dbbb15c0525a1fca618f1ec5e4abbbc8b49f3f0f714c9dd100f1d6c7e6d88442b2 |
29 |
-DIST subversion-1.9.7.tar.bz2 7881909 BLAKE2B 004a180780e00f5af80e14586dee799bae07dccde7f240a51594590b1a084f3054b5b4d917d5e47e0b6ffb11097ecfb97fff490f6d31c0532f2aae8cd9d10031 SHA512 a55efd3edaddbc099450d849fcc6fe5a8d20b85ece966d8ac2fd73ee9cb4255a0349bbcfceb4e9fca6daf054ce7c648eff8d273c6873f5dade6e62dcea7eeb2b |
30 |
|
31 |
diff --git a/dev-vcs/subversion/files/subversion-1.9.7-kf5.patch b/dev-vcs/subversion/files/subversion-1.9.7-kf5.patch |
32 |
deleted file mode 100644 |
33 |
index 5b692fa3066..00000000000 |
34 |
--- a/dev-vcs/subversion/files/subversion-1.9.7-kf5.patch |
35 |
+++ /dev/null |
36 |
@@ -1,211 +0,0 @@ |
37 |
-diff -u b/subversion/libsvn_auth_kwallet/kwallet.cpp b/subversion/libsvn_auth_kwallet/kwallet.cpp |
38 |
---- b/subversion/libsvn_auth_kwallet/kwallet.cpp (revision 1798731) |
39 |
-+++ b/subversion/libsvn_auth_kwallet/kwallet.cpp 2018-01-18 16:48:52.026801597 +0100 |
40 |
-@@ -39,8 +39,6 @@ |
41 |
- #include <QtCore/QString> |
42 |
- |
43 |
- #include <kaboutdata.h> |
44 |
--#include <kcmdlineargs.h> |
45 |
--#include <kcomponentdata.h> |
46 |
- #include <klocalizedstring.h> |
47 |
- #include <kwallet.h> |
48 |
- |
49 |
-@@ -221,14 +219,15 @@ |
50 |
- app = new QCoreApplication(argc, q_argv); |
51 |
- } |
52 |
- |
53 |
-- KCmdLineArgs::init(q_argc, q_argv, |
54 |
-- get_application_name(parameters, pool), |
55 |
-- "subversion", |
56 |
-- ki18n(get_application_name(parameters, pool)), |
57 |
-- SVN_VER_NUMBER, |
58 |
-- ki18n("Version control system"), |
59 |
-- KCmdLineArgs::CmdLineArgKDE); |
60 |
-- KComponentData component_data(KCmdLineArgs::aboutData()); |
61 |
-+ KLocalizedString::setApplicationDomain("subversion"); /* translation domain */ |
62 |
-+ |
63 |
-+ /* componentName appears in KDE GUI prompts */ |
64 |
-+ KAboutData aboutData(QStringLiteral("subversion"), /* componentName */ |
65 |
-+ i18n(get_application_name(parameters, |
66 |
-+ pool)), /* displayName */ |
67 |
-+ QStringLiteral(SVN_VER_NUMBER)); |
68 |
-+ KAboutData::setApplicationData(aboutData); |
69 |
-+ |
70 |
- QString folder = QString::fromUtf8("Subversion"); |
71 |
- QString key = |
72 |
- QString::fromUtf8(username) + "@" + QString::fromUtf8(realmstring); |
73 |
-@@ -291,14 +290,15 @@ |
74 |
- app = new QCoreApplication(argc, q_argv); |
75 |
- } |
76 |
- |
77 |
-- KCmdLineArgs::init(q_argc, q_argv, |
78 |
-- get_application_name(parameters, pool), |
79 |
-- "subversion", |
80 |
-- ki18n(get_application_name(parameters, pool)), |
81 |
-- SVN_VER_NUMBER, |
82 |
-- ki18n("Version control system"), |
83 |
-- KCmdLineArgs::CmdLineArgKDE); |
84 |
-- KComponentData component_data(KCmdLineArgs::aboutData()); |
85 |
-+ KLocalizedString::setApplicationDomain("subversion"); /* translation domain */ |
86 |
-+ |
87 |
-+ /* componentName appears in KDE GUI prompts */ |
88 |
-+ KAboutData aboutData(QStringLiteral("subversion"), /* componentName */ |
89 |
-+ i18n(get_application_name(parameters, |
90 |
-+ pool)), /* displayName */ |
91 |
-+ QStringLiteral(SVN_VER_NUMBER)); |
92 |
-+ KAboutData::setApplicationData(aboutData); |
93 |
-+ |
94 |
- QString q_password = QString::fromUtf8(password); |
95 |
- QString folder = QString::fromUtf8("Subversion"); |
96 |
- KWallet::Wallet *wallet = get_wallet(wallet_name, parameters); |
97 |
-unchanged: |
98 |
---- a/build/ac-macros/compiler.m4 (revision 1798730) |
99 |
-+++ b/build/ac-macros/compiler.m4 (revision 1798731) |
100 |
-@@ -126,3 +126,18 @@ |
101 |
- SVN_CXXFLAGS_ADD_IFELSE([-Werror=unknown-warning-option]) |
102 |
- fi |
103 |
- ]) |
104 |
-+ |
105 |
-+dnl The KWallet provider needs to use C++11 mode when using KDE 5 |
106 |
-+AC_DEFUN([SVN_CXX_MODE_SETUP11], |
107 |
-+[ |
108 |
-+ CXXFLAGS_KEEP="$CXXFLAGS" |
109 |
-+ CXXFLAGS="" |
110 |
-+ |
111 |
-+ if test "$GXX" = "yes"; then |
112 |
-+ SVN_CXXFLAGS_ADD_IFELSE([-std=c++11]) |
113 |
-+ fi |
114 |
-+ |
115 |
-+ CXXMODEFLAGS="$CXXFLAGS" |
116 |
-+ CXXFLAGS="$CXXFLAGS_KEEP" |
117 |
-+ AC_SUBST(CXXMODEFLAGS) |
118 |
-+]) |
119 |
-unchanged: |
120 |
---- a/build/ac-macros/kwallet.m4 (revision 1798730) |
121 |
-+++ b/build/ac-macros/kwallet.m4 (revision 1802646) |
122 |
-@@ -25,8 +25,10 @@ |
123 |
- AC_DEFUN(SVN_LIB_KWALLET, |
124 |
- [ |
125 |
- AC_ARG_WITH(kwallet, |
126 |
-- [AS_HELP_STRING([[--with-kwallet[=PATH]]], |
127 |
-- [Enable use of KWallet (KDE 4) for auth credentials])], |
128 |
-+ [AS_HELP_STRING([[--with-kwallet[=PATH|INCDIR:LIBDIR]]], |
129 |
-+ [Enable use of KWallet (KDE 5 or 4) for auth credentials. |
130 |
-+ PATH is the KDE install path, alternatively INCDIR:LIBDIR |
131 |
-+ are the header and library install paths. ])], |
132 |
- [svn_lib_kwallet="$withval"], |
133 |
- [svn_lib_kwallet=no]) |
134 |
- |
135 |
-@@ -42,40 +44,70 @@ |
136 |
- if test "$APR_HAS_DSO" = "yes"; then |
137 |
- if test -n "$PKG_CONFIG"; then |
138 |
- if test "$HAVE_DBUS" = "yes"; then |
139 |
-- AC_MSG_CHECKING([for QtCore, QtDBus, QtGui]) |
140 |
-- if $PKG_CONFIG --exists QtCore QtDBus QtGui; then |
141 |
-- AC_MSG_RESULT([yes]) |
142 |
-+ AC_MSG_CHECKING([for Qt]) |
143 |
-+ if $PKG_CONFIG --exists Qt5Core Qt5DBus Qt5Gui; then |
144 |
-+ AC_MSG_RESULT([yes, Qt5]) |
145 |
-+ qt_pkg_config_names="Qt5Core Qt5DBus Qt5Gui" |
146 |
-+ kde_config_name="kf5-config" |
147 |
-+ kde_inc_names="KF5/KWallet KF5/KCoreAddons KF5/KI18n" |
148 |
-+ kde_lib_names="-lKF5Wallet -lKF5I18n -lKF5CoreAddons -lQt5Gui -lQt5DBus -lQt5Core" |
149 |
-+ elif $PKG_CONFIG --exists QtCore QtDBus QtGui; then |
150 |
-+ AC_MSG_RESULT([yes, Qt4]) |
151 |
-+ qt_pkg_config_names="QtCore QtDBus QtGui" |
152 |
-+ kde_config_name="kde4-config" |
153 |
-+ kde_inc_names="/" |
154 |
-+ kde_lib_names="-lkdeui -lkdecore -lQtGui -lQtDBus -lQtCore" |
155 |
-+ fi |
156 |
-+ if test -n "$qt_pkg_config_names"; then |
157 |
- if test "$svn_lib_kwallet" != "yes"; then |
158 |
-- AC_MSG_CHECKING([for kde4-config]) |
159 |
-- KDE4_CONFIG="$svn_lib_kwallet/bin/kde4-config" |
160 |
-- if test -f "$KDE4_CONFIG" && test -x "$KDE4_CONFIG"; then |
161 |
-+ AC_MSG_CHECKING([for $kde_config_name]) |
162 |
-+ KDE_CONFIG="$svn_lib_kwallet/bin/$kde_config_name" |
163 |
-+ if test -f "$KDE_CONFIG" && test -x "$KDE_CONFIG"; then |
164 |
- AC_MSG_RESULT([yes]) |
165 |
- else |
166 |
-- KDE4_CONFIG="" |
167 |
-- AC_MSG_RESULT([no]) |
168 |
-+ if echo "$svn_lib_kwallet" | $EGREP ":" > /dev/null; then |
169 |
-+ AC_MSG_RESULT([unneeded]) |
170 |
-+ KDE_CONFIG="unneeded" |
171 |
-+ kde_incdir=["`echo "$svn_lib_kwallet" | $SED -e "s/:.*//"`"] |
172 |
-+ kde_libdir=["`echo "$svn_lib_kwallet" | $SED -e "s/.*://"`"] |
173 |
-+ else |
174 |
-+ AC_MSG_RESULT([no]) |
175 |
-+ KDE_CONFIG="" |
176 |
-+ fi |
177 |
- fi |
178 |
- else |
179 |
-- AC_PATH_PROG(KDE4_CONFIG, kde4-config) |
180 |
-+ AC_PATH_PROG(KDE_CONFIG, $kde_config_name) |
181 |
-+ if test -n "$KDE_CONFIG"; then |
182 |
-+ kde_incdir="`$KDE_CONFIG --install include`" |
183 |
-+ kde_libdir="`$KDE_CONFIG --install lib`" |
184 |
-+ fi |
185 |
- fi |
186 |
-- if test -n "$KDE4_CONFIG"; then |
187 |
-- AC_MSG_CHECKING([for KWallet]) |
188 |
-+ if test -n "$KDE_CONFIG"; then |
189 |
-+ if test $kde_config_name = "kf5-config"; then |
190 |
-+ dnl KF5 does not compile with -std=c++98 |
191 |
-+ SVN_CXX_MODE_SETUP11 |
192 |
-+ fi |
193 |
- old_CXXFLAGS="$CXXFLAGS" |
194 |
- old_LDFLAGS="$LDFLAGS" |
195 |
- old_LIBS="$LIBS" |
196 |
-- for d in [`$PKG_CONFIG --cflags QtCore QtDBus QtGui`]; do |
197 |
-+ dnl --std=c++11 may be required |
198 |
-+ CXXFLAGS="$CXXFLAGS $CXXMODEFLAGS" |
199 |
-+ AC_MSG_CHECKING([for KWallet]) |
200 |
-+ for d in [`$PKG_CONFIG --cflags $qt_pkg_config_names`]; do |
201 |
- if test -n ["`echo "$d" | $EGREP -- '^-D[^[:space:]]*'`"]; then |
202 |
- CPPFLAGS="$CPPFLAGS $d" |
203 |
- fi |
204 |
- done |
205 |
-- qt_include_dirs="`$PKG_CONFIG --cflags-only-I QtCore QtDBus QtGui`" |
206 |
-- kde_incdir="`$KDE4_CONFIG --install include`" |
207 |
-- SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs -I$kde_incdir" |
208 |
-- qt_libs_other_options="`$PKG_CONFIG --libs-only-other QtCore QtDBus QtGui`" |
209 |
-- SVN_KWALLET_LIBS="$DBUS_LIBS -lQtCore -lQtDBus -lQtGui -lkdecore -lkdeui $qt_libs_other_options" |
210 |
-- CXXFLAGS="$CXXFLAGS $SVN_KWALLET_INCLUDES" |
211 |
-+ qt_include_dirs="`$PKG_CONFIG --cflags-only-I $qt_pkg_config_names`" |
212 |
-+ for kde_inc_name in $kde_inc_names; do |
213 |
-+ kde_kwallet_includes="$kde_kwallet_includes -I$kde_incdir/$kde_inc_name" |
214 |
-+ done |
215 |
-+ SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs $kde_kwallet_includes" |
216 |
-+ qt_libs_other_options="`$PKG_CONFIG --libs-only-other $qt_pkg_config_names`" |
217 |
-+ SVN_KWALLET_LIBS="$DBUS_LIBS $kde_lib_names $qt_libs_other_options" |
218 |
-+ CXXFLAGS="$CXXFLAGS $SVN_KWALLET_INCLUDES -fPIC" |
219 |
- LIBS="$LIBS $SVN_KWALLET_LIBS" |
220 |
-- qt_lib_dirs="`$PKG_CONFIG --libs-only-L QtCore QtDBus QtGui`" |
221 |
-- kde_libdir="`$KDE4_CONFIG --install lib`" |
222 |
-+ qt_lib_dirs="`$PKG_CONFIG --libs-only-L $qt_pkg_config_names`" |
223 |
- LDFLAGS="$old_LDFLAGS `SVN_REMOVE_STANDARD_LIB_DIRS($qt_lib_dirs -L$kde_libdir)`" |
224 |
- AC_LANG(C++) |
225 |
- AC_LINK_IFELSE([AC_LANG_SOURCE([[ |
226 |
-@@ -87,16 +119,19 @@ |
227 |
- AC_MSG_RESULT([yes]) |
228 |
- CXXFLAGS="$old_CXXFLAGS" |
229 |
- LIBS="$old_LIBS" |
230 |
-+ if test "$kde_config_name" = "kf5-config"; then |
231 |
-+ AC_DEFINE([SVN_HAVE_KF5], [1], [Defined if KF5 available]) |
232 |
-+ fi |
233 |
- else |
234 |
- AC_MSG_RESULT([no]) |
235 |
- AC_MSG_ERROR([cannot find KWallet]) |
236 |
- fi |
237 |
- else |
238 |
-- AC_MSG_ERROR([cannot find kde4-config]) |
239 |
-+ AC_MSG_ERROR([cannot find $kde_config_name]) |
240 |
- fi |
241 |
- else |
242 |
- AC_MSG_RESULT([no]) |
243 |
-- AC_MSG_ERROR([cannot find QtCore, QtDBus, QtGui]) |
244 |
-+ AC_MSG_ERROR([cannot find Qt]) |
245 |
- fi |
246 |
- else |
247 |
- AC_MSG_ERROR([cannot find D-Bus]) |
248 |
|
249 |
diff --git a/dev-vcs/subversion/subversion-1.9.7-r1.ebuild b/dev-vcs/subversion/subversion-1.9.7-r1.ebuild |
250 |
deleted file mode 100644 |
251 |
index 6be305333dd..00000000000 |
252 |
--- a/dev-vcs/subversion/subversion-1.9.7-r1.ebuild |
253 |
+++ /dev/null |
254 |
@@ -1,531 +0,0 @@ |
255 |
-# Copyright 1999-2019 Gentoo Authors |
256 |
-# Distributed under the terms of the GNU General Public License v2 |
257 |
- |
258 |
-EAPI=6 |
259 |
- |
260 |
-PYTHON_COMPAT=( python2_7 ) |
261 |
-USE_RUBY="ruby23 ruby22 ruby21" |
262 |
-DISTUTILS_OPTIONAL=1 |
263 |
-WANT_AUTOMAKE="none" |
264 |
-GENTOO_DEPEND_ON_PERL="no" |
265 |
- |
266 |
-inherit autotools bash-completion-r1 db-use depend.apache distutils-r1 elisp-common eutils flag-o-matic java-pkg-opt-2 libtool multilib perl-module ruby-single xdg-utils |
267 |
- |
268 |
-MY_P="${P/_/-}" |
269 |
-DESCRIPTION="Advanced version control system" |
270 |
-HOMEPAGE="https://subversion.apache.org/" |
271 |
-SRC_URI="mirror://apache/${PN}/${MY_P}.tar.bz2 |
272 |
- https://dev.gentoo.org/~mgorny/dist/${PN}-1.8.18-patchset.tar.bz2" |
273 |
-S="${WORKDIR}/${MY_P}" |
274 |
- |
275 |
-LICENSE="Subversion GPL-2" |
276 |
-SLOT="0" |
277 |
-KEYWORDS="~arm64 ~mips s390 ~sh ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
278 |
-IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kwallet nls perl python ruby sasl test vim-syntax" |
279 |
- |
280 |
-COMMON_DEPEND=" |
281 |
- app-arch/bzip2 |
282 |
- >=dev-db/sqlite-3.7.12 |
283 |
- >=dev-libs/apr-1.3:1 |
284 |
- >=dev-libs/apr-util-1.3:1 |
285 |
- dev-libs/expat |
286 |
- sys-apps/file |
287 |
- sys-libs/zlib |
288 |
- berkdb? ( >=sys-libs/db-4.0.14:= ) |
289 |
- ctypes-python? ( ${PYTHON_DEPS} ) |
290 |
- gnome-keyring? ( |
291 |
- dev-libs/glib:2 |
292 |
- gnome-base/libgnome-keyring |
293 |
- sys-apps/dbus |
294 |
- ) |
295 |
- http? ( >=net-libs/serf-1.3.4 ) |
296 |
- kwallet? ( |
297 |
- dev-qt/qtcore:5 |
298 |
- dev-qt/qtdbus:5 |
299 |
- dev-qt/qtgui:5 |
300 |
- kde-frameworks/kcoreaddons:5 |
301 |
- kde-frameworks/ki18n:5 |
302 |
- kde-frameworks/kwallet:5 |
303 |
- sys-apps/dbus |
304 |
- ) |
305 |
- perl? ( dev-lang/perl:= ) |
306 |
- python? ( ${PYTHON_DEPS} ) |
307 |
- ruby? ( ${RUBY_DEPS} ) |
308 |
- sasl? ( dev-libs/cyrus-sasl )" |
309 |
-RDEPEND="${COMMON_DEPEND} |
310 |
- apache2? ( www-servers/apache[apache2_modules_dav] ) |
311 |
- java? ( >=virtual/jre-1.5 ) |
312 |
- nls? ( virtual/libintl ) |
313 |
- perl? ( dev-perl/URI )" |
314 |
-# Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once |
315 |
-DEPEND="${COMMON_DEPEND} |
316 |
- !!<sys-apps/sandbox-1.6 |
317 |
- ctypes-python? ( dev-python/ctypesgen ) |
318 |
- doc? ( app-doc/doxygen ) |
319 |
- gnome-keyring? ( virtual/pkgconfig ) |
320 |
- http? ( virtual/pkgconfig ) |
321 |
- java? ( >=virtual/jdk-1.5 ) |
322 |
- kwallet? ( |
323 |
- kde-frameworks/kdelibs4support:5 |
324 |
- virtual/pkgconfig |
325 |
- ) |
326 |
- nls? ( sys-devel/gettext ) |
327 |
- test? ( ${PYTHON_DEPS} )" |
328 |
- |
329 |
-REQUIRED_USE=" |
330 |
- ctypes-python? ( ${PYTHON_REQUIRED_USE} ) |
331 |
- python? ( ${PYTHON_REQUIRED_USE} ) |
332 |
- test? ( |
333 |
- ${PYTHON_REQUIRED_USE} |
334 |
- !dso |
335 |
- )" |
336 |
- |
337 |
-PATCHES=( |
338 |
- "${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.5.4-interix.patch |
339 |
- "${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.5.6-aix-dso.patch |
340 |
- "${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.8.0-hpux-dso.patch |
341 |
- "${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-fix-parallel-build-support-for-perl-bindings.patch |
342 |
- "${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.8.1-revert_bdb6check.patch |
343 |
- "${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.8.16-javadoc-nolint.patch |
344 |
- "${FILESDIR}"/${P}-kf5.patch |
345 |
- "${FILESDIR}"/${PN}-1.9.7-fix-wc-queries-test-test.patch |
346 |
- "${FILESDIR}"/${PN}-1.11.1-allow-apr-1.7.0+.patch |
347 |
-) |
348 |
- |
349 |
-want_apache |
350 |
- |
351 |
-pkg_setup() { |
352 |
- if use berkdb ; then |
353 |
- local apu_bdb_version="$(${EPREFIX}/usr/bin/apu-1-config --includes \ |
354 |
- | grep -Eoe '-I${EPREFIX}/usr/include/db[[:digit:]]\.[[:digit:]]' \ |
355 |
- | sed 's:.*b::')" |
356 |
- einfo |
357 |
- if [[ -z "${SVN_BDB_VERSION}" ]] ; then |
358 |
- if [[ -n "${apu_bdb_version}" ]] ; then |
359 |
- SVN_BDB_VERSION="${apu_bdb_version}" |
360 |
- einfo "Matching db version to apr-util" |
361 |
- else |
362 |
- SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/null)")" |
363 |
- einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB." |
364 |
- fi |
365 |
- fi |
366 |
- einfo "Using: Berkeley DB ${SVN_BDB_VERSION}" |
367 |
- einfo |
368 |
- |
369 |
- if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != "${apu_bdb_version}" ]]; then |
370 |
- eerror "APR-Util is linked against Berkeley DB ${apu_bdb_version}, but you are trying" |
371 |
- eerror "to build Subversion with support for Berkeley DB ${SVN_BDB_VERSION}." |
372 |
- eerror "Rebuild dev-libs/apr-util or set SVN_BDB_VERSION=\"${apu_bdb_version}\"." |
373 |
- eerror "Aborting to avoid possible run-time crashes." |
374 |
- die "Berkeley DB version mismatch" |
375 |
- fi |
376 |
- fi |
377 |
- |
378 |
- depend.apache_pkg_setup |
379 |
- |
380 |
- java-pkg-opt-2_pkg_setup |
381 |
- |
382 |
- if ! use http ; then |
383 |
- ewarn "WebDAV support is disabled. You need WebDAV to" |
384 |
- ewarn "access repositories through the HTTP protocol." |
385 |
- ewarn "Consider enabling \"http\" USE flag" |
386 |
- echo -ne "\a" |
387 |
- fi |
388 |
- |
389 |
- # https://issues.apache.org/jira/browse/SVN-4813#comment-16813739 |
390 |
- append-cppflags -P |
391 |
- |
392 |
- if use debug ; then |
393 |
- append-cppflags -DSVN_DEBUG -DAP_DEBUG |
394 |
- fi |
395 |
- |
396 |
- # http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3C51C42014.3060700@××××××××.com%3E |
397 |
- [[ ${CHOST} == *-solaris2* ]] && append-cppflags -D__EXTENSIONS__ |
398 |
- |
399 |
- # Allow for custom repository locations. |
400 |
- SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}" |
401 |
- |
402 |
- if use ruby ; then |
403 |
- local rbslot |
404 |
- RB_VER="" |
405 |
- for rbslot in $(sed 's@\([[:digit:]]\+\)\([[:digit:]]\)@\1.\2@g' <<< ${USE_RUBY//ruby}) ; do |
406 |
- if has_version dev-lang/ruby:${rbslot} ; then |
407 |
- RB_VER="${rbslot/.}" |
408 |
- break |
409 |
- fi |
410 |
- done |
411 |
- [[ -z "${RB_VER}" ]] && die "No useable ruby version found" |
412 |
- fi |
413 |
-} |
414 |
- |
415 |
-src_prepare() { |
416 |
- default |
417 |
- |
418 |
- fperms +x build/transform_libtool_scripts.sh |
419 |
- |
420 |
- sed -i \ |
421 |
- -e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \ |
422 |
- -e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac |
423 |
- |
424 |
- # this bites us in particular on Solaris |
425 |
- sed -i -e '1c\#!/usr/bin/env sh' build/transform_libtool_scripts.sh || \ |
426 |
- die "/bin/sh is not POSIX shell!" |
427 |
- |
428 |
- eautoconf |
429 |
- elibtoolize |
430 |
- |
431 |
- sed -e 's/\(libsvn_swig_py\)-\(1\.la\)/\1-$(EPYTHON)-\2/g' \ |
432 |
- -i build-outputs.mk || die "sed failed" |
433 |
- |
434 |
- if use python ; then |
435 |
- # XXX: make python_copy_sources accept path |
436 |
- S=${S}/subversion/bindings/swig/python python_copy_sources |
437 |
- rm -r "${S}"/subversion/bindings/swig/python || die |
438 |
- fi |
439 |
- |
440 |
- xdg_environment_reset |
441 |
-} |
442 |
- |
443 |
-src_configure() { |
444 |
- local myconf=( |
445 |
- --libdir="${EPREFIX%/}/usr/$(get_libdir)" |
446 |
- $(use_with apache2 apache-libexecdir) |
447 |
- $(use_with apache2 apxs "${APXS}") |
448 |
- $(use_with berkdb berkeley-db "db.h:${EPREFIX%/}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}") |
449 |
- $(use_with ctypes-python ctypesgen "${EPREFIX%/}/usr") |
450 |
- $(use_enable dso runtime-module-search) |
451 |
- $(use_with gnome-keyring) |
452 |
- $(use_enable java javahl) |
453 |
- $(use_with java jdk "${JAVA_HOME}") |
454 |
- $(use_with kwallet) |
455 |
- $(use_enable nls) |
456 |
- $(use_with sasl) |
457 |
- $(use_with http serf) |
458 |
- --with-apr="${EPREFIX%/}/usr/bin/apr-1-config" |
459 |
- --with-apr-util="${EPREFIX%/}/usr/bin/apu-1-config" |
460 |
- --disable-experimental-libtool |
461 |
- --without-jikes |
462 |
- --disable-mod-activation |
463 |
- --disable-static |
464 |
- ) |
465 |
- |
466 |
- if use python || use perl || use ruby; then |
467 |
- myconf+=( --with-swig ) |
468 |
- else |
469 |
- myconf+=( --without-swig ) |
470 |
- fi |
471 |
- |
472 |
- if use java ; then |
473 |
- myconf+=( --without-junit ) |
474 |
- fi |
475 |
- |
476 |
- case ${CHOST} in |
477 |
- *-aix*) |
478 |
- # avoid recording immediate path to sharedlibs into executables |
479 |
- append-ldflags -Wl,-bnoipath |
480 |
- ;; |
481 |
- *-cygwin*) |
482 |
- # no LD_PRELOAD support, no undefined symbols |
483 |
- myconf+=( --disable-local-library-preloading LT_LDFLAGS=-no-undefined ) |
484 |
- ;; |
485 |
- *-interix*) |
486 |
- # loader crashes on the LD_PRELOADs... |
487 |
- myconf+=( --disable-local-library-preloading ) |
488 |
- ;; |
489 |
- *-solaris*) |
490 |
- # need -lintl to link |
491 |
- use nls && append-libs intl |
492 |
- # this breaks installation, on x64 echo replacement is 32-bits |
493 |
- myconf+=( --disable-local-library-preloading ) |
494 |
- ;; |
495 |
- *-mint*) |
496 |
- myconf+=( --enable-all-static --disable-local-library-preloading ) |
497 |
- ;; |
498 |
- *) |
499 |
- # inject LD_PRELOAD entries for easy in-tree development |
500 |
- myconf+=( --enable-local-library-preloading ) |
501 |
- ;; |
502 |
- esac |
503 |
- |
504 |
- #version 1.7.7 again tries to link against the older installed version and fails, when trying to |
505 |
- #compile for x86 on amd64, so workaround this issue again |
506 |
- #check newer versions, if this is still/again needed |
507 |
- myconf+=( --disable-disallowing-of-undefined-references ) |
508 |
- |
509 |
- # for build-time scripts |
510 |
- if use ctypes-python || use python || use test; then |
511 |
- python_setup |
512 |
- fi |
513 |
- |
514 |
- if use python && [[ ${CHOST} == *-darwin* ]] ; then |
515 |
- export ac_cv_python_link="$(tc-getCC) "'$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)' |
516 |
- export ac_cv_python_libs='$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)' |
517 |
- export ac_cv_python_compile="$(tc-getCC)" |
518 |
- fi |
519 |
- |
520 |
- # allow overriding Python include directory |
521 |
- ac_cv_path_RUBY=$(usex ruby "${EPREFIX%/}/usr/bin/ruby${RB_VER}" "none") \ |
522 |
- ac_cv_path_RDOC=$(usex ruby "${EPREFIX%/}/usr/bin/rdoc${RB_VER}" "none") \ |
523 |
- ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \ |
524 |
- econf "${myconf[@]}" |
525 |
-} |
526 |
- |
527 |
-src_compile() { |
528 |
- emake local-all |
529 |
- |
530 |
- if use ctypes-python ; then |
531 |
- # pre-generate .py files |
532 |
- use ctypes-python && emake ctypes-python |
533 |
- |
534 |
- pushd subversion/bindings/ctypes-python >/dev/null || die |
535 |
- distutils-r1_src_compile |
536 |
- popd >/dev/null || die |
537 |
- fi |
538 |
- |
539 |
- if use python ; then |
540 |
- swig_py_compile() { |
541 |
- local p=subversion/bindings/swig/python |
542 |
- rm -f ${p} || die |
543 |
- ln -s "${BUILD_DIR}" ${p} || die |
544 |
- |
545 |
- python_export PYTHON_INCLUDEDIR |
546 |
- emake swig-py \ |
547 |
- swig_pydir="$(python_get_sitedir)/libsvn" \ |
548 |
- swig_pydir_extra="$(python_get_sitedir)/svn" |
549 |
- } |
550 |
- |
551 |
- # this will give us proper BUILD_DIR for symlinking |
552 |
- BUILD_DIR=python \ |
553 |
- python_foreach_impl swig_py_compile |
554 |
- fi |
555 |
- |
556 |
- if use perl ; then |
557 |
- emake swig-pl |
558 |
- fi |
559 |
- |
560 |
- if use ruby ; then |
561 |
- emake swig-rb |
562 |
- fi |
563 |
- |
564 |
- if use java ; then |
565 |
- emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl |
566 |
- fi |
567 |
- |
568 |
- if use extras ; then |
569 |
- emake tools |
570 |
- fi |
571 |
- |
572 |
- if use doc ; then |
573 |
- doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed" |
574 |
- |
575 |
- if use java; then |
576 |
- emake doc-javahl |
577 |
- fi |
578 |
- fi |
579 |
-} |
580 |
- |
581 |
-src_test() { |
582 |
- if has_version ~${CATEGORY}/${P} ; then |
583 |
- default |
584 |
- |
585 |
- if use ctypes-python ; then |
586 |
- python_test() { |
587 |
- "${PYTHON}" subversion/bindings/ctypes-python/test/run_all.py \ |
588 |
- || die "ctypes-python tests fail with ${EPYTHON}" |
589 |
- } |
590 |
- |
591 |
- distutils-r1_src_test |
592 |
- fi |
593 |
- |
594 |
- if use python ; then |
595 |
- swig_py_test() { |
596 |
- pushd "${BUILD_DIR}" >/dev/null || die |
597 |
- "${PYTHON}" tests/run_all.py || die "swig-py tests fail with ${EPYTHON}" |
598 |
- popd >/dev/null || die |
599 |
- } |
600 |
- |
601 |
- BUILD_DIR=subversion/bindings/swig/python \ |
602 |
- python_foreach_impl swig_py_test |
603 |
- fi |
604 |
- else |
605 |
- ewarn "The test suite shows errors when there is an older version of" |
606 |
- ewarn "${CATEGORY}/${PN} installed. Please install =${CATEGORY}/${P}*" |
607 |
- ewarn "before running the test suite." |
608 |
- ewarn "Test suite skipped." |
609 |
- fi |
610 |
-} |
611 |
- |
612 |
-src_install() { |
613 |
- emake -j1 DESTDIR="${D}" local-install |
614 |
- |
615 |
- if use ctypes-python ; then |
616 |
- pushd subversion/bindings/ctypes-python >/dev/null || die |
617 |
- distutils-r1_src_install |
618 |
- popd >/dev/null || die |
619 |
- fi |
620 |
- |
621 |
- if use python ; then |
622 |
- swig_py_install() { |
623 |
- local p=subversion/bindings/swig/python |
624 |
- rm -f ${p} || die |
625 |
- ln -s "${BUILD_DIR}" ${p} || die |
626 |
- |
627 |
- emake \ |
628 |
- DESTDIR="${D}" \ |
629 |
- swig_pydir="$(python_get_sitedir)/libsvn" \ |
630 |
- swig_pydir_extra="$(python_get_sitedir)/svn" \ |
631 |
- install-swig-py |
632 |
- } |
633 |
- |
634 |
- BUILD_DIR=python \ |
635 |
- python_foreach_impl swig_py_install |
636 |
- fi |
637 |
- |
638 |
- if use perl ; then |
639 |
- emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl |
640 |
- perl_delete_localpod |
641 |
- find "${ED}" "(" -name .packlist -o -name "*.bs" ")" -delete |
642 |
- fi |
643 |
- |
644 |
- if use ruby ; then |
645 |
- emake DESTDIR="${D}" install-swig-rb |
646 |
- fi |
647 |
- |
648 |
- if use java ; then |
649 |
- emake DESTDIR="${D}" install-javahl |
650 |
- java-pkg_regso "${ED%/}"/usr/$(get_libdir)/libsvnjavahl*$(get_libname) |
651 |
- java-pkg_dojar "${ED%/}"/usr/$(get_libdir)/svn-javahl/svn-javahl.jar |
652 |
- rm -fr "${ED%/}"/usr/$(get_libdir)/svn-javahl/*.jar |
653 |
- fi |
654 |
- |
655 |
- # Install Apache module configuration. |
656 |
- if use apache2 ; then |
657 |
- keepdir "${APACHE_MODULES_CONFDIR}" |
658 |
- insinto "${APACHE_MODULES_CONFDIR}" |
659 |
- doins "${FILESDIR}/47_mod_dav_svn.conf" |
660 |
- fi |
661 |
- |
662 |
- # Install Bash Completion, bug 43179. |
663 |
- newbashcomp tools/client-side/bash_completion svn |
664 |
- bashcomp_alias svn svn{admin,dumpfilter,look,sync,version} |
665 |
- rm -f tools/client-side/bash_completion |
666 |
- |
667 |
- # Install hot backup script, bug 54304. |
668 |
- newbin tools/backup/hot-backup.py svn-hot-backup |
669 |
- rm -fr tools/backup |
670 |
- |
671 |
- # Install svnserve init-script and xinet.d snippet, bug 43245. |
672 |
- newinitd "${FILESDIR}"/svnserve.initd3 svnserve |
673 |
- newconfd "${FILESDIR}"/svnserve.confd svnserve |
674 |
- insinto /etc/xinetd.d |
675 |
- newins "${FILESDIR}"/svnserve.xinetd svnserve |
676 |
- |
677 |
- #adjust default user and group with disabled apache2 USE flag, bug 381385 |
678 |
- use apache2 || sed -e "s\USER:-apache\USER:-svn\g" \ |
679 |
- -e "s\GROUP:-apache\GROUP:-svnusers\g" \ |
680 |
- -i "${ED%/}"/etc/init.d/svnserve || die |
681 |
- use apache2 || sed -e "0,/apache/s//svn/" \ |
682 |
- -e "s:apache:svnusers:" \ |
683 |
- -i "${ED%/}"/etc/xinetd.d/svnserve || die |
684 |
- |
685 |
- # Install documentation. |
686 |
- dodoc CHANGES COMMITTERS README |
687 |
- dodoc tools/xslt/svnindex.{css,xsl} |
688 |
- rm -fr tools/xslt |
689 |
- |
690 |
- # Install extra files. |
691 |
- if use extras ; then |
692 |
- cat <<- EOF > 80subversion-extras |
693 |
- PATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin" |
694 |
- ROOTPATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin" |
695 |
- EOF |
696 |
- doenvd 80subversion-extras |
697 |
- |
698 |
- emake DESTDIR="${D}" toolsdir="/usr/$(get_libdir)/subversion/bin" install-tools |
699 |
- |
700 |
- find tools "(" -name "*.bat" -o -name "*.in" -o -name ".libs" ")" -print0 | xargs -0 rm -fr |
701 |
- rm -fr tools/client-side/svnmucc |
702 |
- rm -fr tools/server-side/{svn-populate-node-origins-index,svnauthz-validate}* |
703 |
- rm -fr tools/{buildbot,dev,diff,po} |
704 |
- |
705 |
- insinto /usr/share/${PN} |
706 |
- find tools -name '*.py' -exec sed -i -e '1s:python:&2:' {} + || die |
707 |
- doins -r tools |
708 |
- fi |
709 |
- |
710 |
- if use doc ; then |
711 |
- docinto html |
712 |
- dodoc -r doc/doxygen/html/* |
713 |
- |
714 |
- if use java ; then |
715 |
- java-pkg_dojavadoc doc/javadoc |
716 |
- fi |
717 |
- fi |
718 |
- |
719 |
- prune_libtool_files --all |
720 |
- |
721 |
- cd "${ED%/}"/usr/share/locale |
722 |
- for i in * ; do |
723 |
- [[ ${i} == *$LINGUAS* ]] || { rm -r ${i} || die ; } |
724 |
- done |
725 |
-} |
726 |
- |
727 |
-pkg_preinst() { |
728 |
- # Compare versions of Berkeley DB, bug 122877. |
729 |
- if use berkdb && [[ -f "${EROOT%/}/usr/bin/svn" ]] ; then |
730 |
- OLD_BDB_VERSION="$(scanelf -nq "${EROOT%/}/usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")" |
731 |
- NEW_BDB_VERSION="$(scanelf -nq "${ED%/}/usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")" |
732 |
- if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]] ; then |
733 |
- CHANGED_BDB_VERSION="1" |
734 |
- fi |
735 |
- fi |
736 |
-} |
737 |
- |
738 |
-pkg_postinst() { |
739 |
- if [[ -n "${CHANGED_BDB_VERSION}" ]] ; then |
740 |
- ewarn "You upgraded from an older version of Berkeley DB and may experience" |
741 |
- ewarn "problems with your repository. Run the following commands as root to fix it:" |
742 |
- ewarn " db4_recover -h ${SVN_REPOS_LOC}/repos" |
743 |
- ewarn " chown -Rf apache:apache ${SVN_REPOS_LOC}/repos" |
744 |
- fi |
745 |
- |
746 |
- ewarn "If you run subversion as a daemon, you will need to restart it to avoid module mismatches." |
747 |
-} |
748 |
- |
749 |
-pkg_postrm() { |
750 |
- : |
751 |
-} |
752 |
- |
753 |
-pkg_config() { |
754 |
- # Remember: Don't use ${EROOT}${SVN_REPOS_LOC} since ${SVN_REPOS_LOC} |
755 |
- # already has EPREFIX in it |
756 |
- einfo "Initializing the database in ${SVN_REPOS_LOC}..." |
757 |
- if [[ -e "${SVN_REPOS_LOC}/repos" ]] ; then |
758 |
- echo "A Subversion repository already exists and I will not overwrite it." |
759 |
- echo "Delete \"${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version." |
760 |
- else |
761 |
- mkdir -p "${SVN_REPOS_LOC}/conf" |
762 |
- |
763 |
- einfo "Populating repository directory..." |
764 |
- # Create initial repository. |
765 |
- "${EROOT}usr/bin/svnadmin" create "${SVN_REPOS_LOC}/repos" |
766 |
- |
767 |
- einfo "Setting repository permissions..." |
768 |
- SVNSERVE_USER="$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_USER}")" |
769 |
- SVNSERVE_GROUP="$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_GROUP}")" |
770 |
- if use apache2 ; then |
771 |
- [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache" |
772 |
- [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache" |
773 |
- else |
774 |
- [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="svn" |
775 |
- [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="svnusers" |
776 |
- fi |
777 |
- chmod -Rf go-rwx "${SVN_REPOS_LOC}/conf" |
778 |
- chmod -Rf o-rwx "${SVN_REPOS_LOC}/repos" |
779 |
- echo "Please create \"${SVNSERVE_GROUP}\" group if it does not exist yet." |
780 |
- echo "Afterwards please create \"${SVNSERVE_USER}\" user with homedir \"${SVN_REPOS_LOC}\"" |
781 |
- echo "and as part of the \"${SVNSERVE_GROUP}\" group if it does not exist yet." |
782 |
- echo "Finally, execute \"chown -Rf ${SVNSERVE_USER}:${SVNSERVE_GROUP} ${SVN_REPOS_LOC}/repos\"" |
783 |
- echo "to finish the configuration." |
784 |
- fi |
785 |
-} |