root
8 years ago
parent
ea013cf3c3
commit
cb5240602e
@ -1,2 +1,2 @@
|
||||
DIST caribou-0.4.19.tar.xz 412328 SHA256 2f0bd0c14c5f94cf5ac3a7627018919addf7a054ac84aaa8e62356957c175a44 SHA512 ae8fd278612778eae35810eee199dc9c64b45340de1459cc71eb5806ebc14ddd05e7e0e5464e2976d0160a50c6d76656a7ed0362bfd79eecdc09de1fc78b6de1 WHIRLPOOL db26dbc91e231558712bd33f57f857de660cc17f5c7c6c8c8fd2687807b75d5784df8654e0328c35a4e06902ec5a628609b8c9dd2d568a2afcb59c2f12c081a8
|
||||
DIST caribou-0.4.20.tar.xz 415148 SHA256 3a6664d5698c2b62a6c1c115743630d339ac237a7324bb354f2e5d55b4bb50d9 SHA512 e72a18462268278e0c07f178085eeff0e65ece6a9bf2f667c4ca66a66d173b39c68843c537ba6e8bd056c21575be592cece5f4f752f324c7f0db44fe28c45504 WHIRLPOOL e718ab799dcb8474c813e22fae1445d5a299d6c14dfa880cbe3da55793db867a8e5b5ef442a99e184a75a5b6fbf4d5719821a901d75ba69dba74db1d3473c437
|
||||
DIST caribou-0.4.21.tar.xz 426516 SHA256 9c43d9f4bd30f4fea7f780d4e8b14f7589107c52e9cb6bd202bd0d1c2064de55 SHA512 5fc0cf54a1cad50d41e659adbbb932b51d69d18951562f87497e99aaae17ac72b453b759dd7289ff8f68a79574dfce510b9de6bedc61408c14cb48b83eaf08da WHIRLPOOL 530a1b061cdadb12c31ad2e7b5686ca21db3da8066579fc6ba25a2b26418febeb58224eda61f27977507ed46db1cdbfd6afe4b555a970acdf9a580b30ac2174e
|
||||
|
||||
@ -1,2 +1,3 @@
|
||||
DIST orca-3.18.2.tar.xz 2213548 SHA256 986244af7a0891b758eb8e772bc61d72483808e7e9c790360f9f389045d7262a SHA512 ec1210cea7a540bd931f7ede45c173829e780a4da4e61245920d15bb11b62d803771e32b791b2d0c307e15a8ef61b619b5e79e9909bf438a94252842a0dd8613 WHIRLPOOL 31475d1eacbf322cdd49d286c3585d97c93de08f92b0533fa58905d4ea089272bc16e8bb748041cc6f27dd54c19996b3d72993c5b148b3c8e6c873f9e452fe98
|
||||
DIST orca-3.20.2.tar.xz 2313164 SHA256 8c90403c4ae8bb0a4b240d1e784b61ee56de42df781520c912b298c10ae05785 SHA512 27594b9b0fa9343057a854e8cfff7ab074e084c3f210c1bf1f4310363b4738ce6af5b4f62ef15ed58093af27e7eaad2e030c08e990cf462624e5fb2c8329fd0c WHIRLPOOL 473f7fd8b5dedb8034774604a38b97dcdc3b2e3c346e89f0b36343b18e69bffac7f98927bc069b3ac20c969c2dae09087f2612dacb09b98952fc299e3d340c76
|
||||
DIST orca-3.20.3.tar.xz 2312864 SHA256 86a03b504f626e39247694d8d76c272a298874887a40bd044f8a535b8d689fd7 SHA512 5dc04cec821f7a47be0cb6e820a531e9753dd24685771e6b70488d30502bc111a4b107f8d63440139bfa9579015f224f6fda6cd8f0ecc0fc7fbfa3ce684d75f9 WHIRLPOOL c96795a9d6f9486cce7150041c5608d5beb39b8fdd33c7312beee40100aba67f3846f4c449ea8ae8b393c334be27197dbb5b2415d8a8a38cba9d775144b1bbfd
|
||||
|
||||
@ -0,0 +1,74 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
GNOME2_LA_PUNT="yes"
|
||||
PYTHON_COMPAT=( python3_{3,4,5} )
|
||||
PYTHON_REQ_USE="threads"
|
||||
|
||||
inherit gnome2 python-r1
|
||||
|
||||
DESCRIPTION="Extensible screen reader that provides access to the desktop"
|
||||
HOMEPAGE="https://wiki.gnome.org/Projects/Orca"
|
||||
|
||||
LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
|
||||
|
||||
IUSE="+braille"
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
||||
|
||||
# liblouis is not in portage yet
|
||||
# it is used to provide contracted braille support
|
||||
COMMON_DEPEND="${PYTHON_DEPS}
|
||||
>=app-accessibility/at-spi2-atk-2.12:2
|
||||
>=app-accessibility/at-spi2-core-2.12:2[introspection]
|
||||
>=dev-libs/atk-2.10
|
||||
>=dev-libs/glib-2.28:2
|
||||
>=dev-python/pygobject-3.10:3[${PYTHON_USEDEP}]
|
||||
media-libs/gstreamer:1.0
|
||||
>=x11-libs/gtk+-3.6.2:3[introspection]
|
||||
braille? (
|
||||
>=app-accessibility/brltty-5.0-r3[python,${PYTHON_USEDEP}]
|
||||
dev-libs/liblouis[python,${PYTHON_USEDEP}] )
|
||||
"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
>=app-accessibility/speech-dispatcher-0.8[python,${PYTHON_USEDEP}]
|
||||
dev-libs/atk[introspection]
|
||||
dev-python/pyatspi[${PYTHON_USEDEP}]
|
||||
dev-python/setproctitle[${PYTHON_USEDEP}]
|
||||
x11-libs/libwnck:3[introspection]
|
||||
x11-libs/pango[introspection]
|
||||
"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
>=dev-util/intltool-0.50
|
||||
dev-util/itstool
|
||||
virtual/pkgconfig
|
||||
"
|
||||
# app-text/yelp-tools
|
||||
|
||||
src_prepare() {
|
||||
gnome2_src_prepare
|
||||
python_copy_sources
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
python_foreach_impl run_in_build_dir gnome2_src_configure \
|
||||
$(use_with braille liblouis)
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
python_foreach_impl run_in_build_dir gnome2_src_compile
|
||||
}
|
||||
|
||||
src_install() {
|
||||
installing() {
|
||||
gnome2_src_install
|
||||
# Massage shebang to make python_doscript happy
|
||||
sed -e 's:#!'"${PYTHON}:#!/usr/bin/python:" \
|
||||
-i src/orca/orca || die
|
||||
python_doscript src/orca/orca
|
||||
}
|
||||
python_foreach_impl run_in_build_dir installing
|
||||
}
|
||||
@ -1,3 +1,4 @@
|
||||
DIST ansible-1.9.6.tar.gz 941457 SHA256 50773781b1e76f2885bbeb2351a97cf1c6a29239d3e073da939a104e7e81ee5d SHA512 97ea17f032bf253c53d5e1f79071603f0b3b7caffe4e267534cf181ab88b7186d953c41203c762e0650ab70302bde7e84bb5ee8bcd03153a3e4a76e41d1a3bec WHIRLPOOL b26390090aeabd2a6e8e27916a7cc0e89e0041715bd036118f034292da52df55107d27c577fe38e838b3455d3167cf3e876533fa47fe184d02ebfaa98cf46f5e
|
||||
DIST ansible-2.0.2.0.tar.gz 1516681 SHA256 373a2e50319d90da50948e3faf1c033464b7302200e0199da8981d24646d4387 SHA512 0f78f15fcfcfe0e0fe60b1ee5f60b101d93f1fa81de942955a036763da4d492f86f2854cc8561e36427c23beb9b70bc577f5d0f42d9a3c7c966bb0979dee8011 WHIRLPOOL a704fea45396ab635662d6df07888ea17321e9f42127957c658ed88f02968a96b6f7fa1f8efa9c266c13f40ff3ab8f00377ac631fcafe0c402a258d71953cf3a
|
||||
DIST ansible-2.1.0.0.tar.gz 1877209 SHA256 403443b55f6522cf86f9b41544a9b6b81f7d27f088446e85334d5d7a6317ccad SHA512 8601325098b70469cf908ce09c075334952774519a4331f109b6aa0568fc718bb347ea4d06389277e41ce54270b19dca01815f46071d8e638e0cd751957f20c7 WHIRLPOOL 03cb5713eecd8bb8c050366c0c23d040fb3a27fa5da91a3fa3ffc14871052e24e2f207eb6c6f35f4f8e4893dd566de5b9d33a72da321dc2833b86b20356de3fa
|
||||
DIST ansible-2.1.1.0.tar.gz 1875511 SHA256 8d2d4f39341b30257b83830a682b559c22904d81fd60b4a3e8b96f055f031197 SHA512 b8019a56140c19bc3994fea87f59d08a59ce128ea0a68d975dfd0cf6c6c52b29a7652c1f7a7d911f713af4993d490722869e98d82d3553eafd7754ff36e1ddf0 WHIRLPOOL a0b0109f9eb86b0ac3cb3cb83cf6c7d56d48f54551d99d13b0ced536629ca4d455bdbd382ce97144b306daea81d38e30210e9cc7aa12e28b20ee048d9adba9ab
|
||||
|
||||
@ -0,0 +1,59 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
|
||||
inherit distutils-r1 eutils versionator
|
||||
|
||||
DESCRIPTION="Model-driven deployment, config management, and command execution framework"
|
||||
HOMEPAGE="http://ansible.com/"
|
||||
BLAKE2B_HASH="26/7c/4c717d39afac30bc324744a35fda077c969d3881daf71d396969958e01b7"
|
||||
SRC_URI="https://pypi.python.org/packages/${BLAKE2B_HASH}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86 ~x64-macos"
|
||||
IUSE="keyczar test"
|
||||
|
||||
RDEPEND="
|
||||
keyczar? ( dev-python/keyczar[${PYTHON_USEDEP}] )
|
||||
dev-python/paramiko[${PYTHON_USEDEP}]
|
||||
dev-python/jinja[${PYTHON_USEDEP}]
|
||||
dev-python/pyyaml[${PYTHON_USEDEP}]
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
|
||||
dev-python/httplib2[${PYTHON_USEDEP}]
|
||||
dev-python/six[${PYTHON_USEDEP}]
|
||||
net-misc/sshpass
|
||||
virtual/ssh
|
||||
"
|
||||
DEPEND="
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
|
||||
test? (
|
||||
${RDEPEND}
|
||||
dev-python/nose[${PYTHON_USEDEP}]
|
||||
>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
|
||||
<dev-python/mock-1.1[${PYTHON_USEDEP}]
|
||||
dev-python/passlib[${PYTHON_USEDEP}]
|
||||
dev-python/coverage[${PYTHON_USEDEP}]
|
||||
dev-python/unittest2[${PYTHON_USEDEP}]
|
||||
dev-vcs/git
|
||||
)"
|
||||
|
||||
# not included in release tarball
|
||||
RESTRICT="test"
|
||||
|
||||
python_test() {
|
||||
nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
EXAMPLES=( examples )
|
||||
distutils-r1_python_install_all
|
||||
|
||||
doman docs/man/man1/*.1
|
||||
}
|
||||
@ -1,2 +1,2 @@
|
||||
DIST 3.9.2.tar.gz 80711 SHA256 2de00c65e23fa9d7909cae6594e550b9abe9a7eb1553669ddeaca92d30f97009 SHA512 62c84a98ec3373562a5c0ab0abd68e33620787cbbafbcf442cb5c7bdc1a41a7f673ee5dabc5f905ad4dd3fffebcbee0dab2ea8698f20de04cc13950212aaab33 WHIRLPOOL b77338f2cc88e6bd03310cea40c26cd4d890238455b4d9507f64a3f8de1006bf98e0d3b783f6536da963f3d695ab604ab3f9bb0e6aa1ae9575005a665b497ec1
|
||||
DIST logrotate-3.9.1.tar.gz 79061 SHA256 022769e3288c80981559a8421703c88e8438b447235e36dd3c8e97cd94c52545 SHA512 e6da7c7f067befaf2441e9c6ce77e53cf5ddb4f56cc3304c3e50873b6f20c68520f4a0e50ec466cbebcbed20bfd77bf6dfc489975a8131e9573fb19856c0fe28 WHIRLPOOL 9b3558bb03c6c95f8f386ea75ca09bfda802ae4c45b9ef8408692e3aa7a2ee57447cf15ce04d0289946b9cae2266acb5509d8151d15ac6ea0ad9113aeb32dc17
|
||||
DIST logrotate-3.9.2.tar.gz 80711 SHA256 2de00c65e23fa9d7909cae6594e550b9abe9a7eb1553669ddeaca92d30f97009 SHA512 62c84a98ec3373562a5c0ab0abd68e33620787cbbafbcf442cb5c7bdc1a41a7f673ee5dabc5f905ad4dd3fffebcbee0dab2ea8698f20de04cc13950212aaab33 WHIRLPOOL b77338f2cc88e6bd03310cea40c26cd4d890238455b4d9507f64a3f8de1006bf98e0d3b783f6536da963f3d695ab604ab3f9bb0e6aa1ae9575005a665b497ec1
|
||||
|
||||
@ -0,0 +1,109 @@
|
||||
diff --git a/tests/unit/modules/linux_sysctl_test.py b/tests/unit/modules/linux_sysctl_test.py
|
||||
index 89bea83..49851cb 100644
|
||||
--- a/tests/unit/modules/linux_sysctl_test.py
|
||||
+++ b/tests/unit/modules/linux_sysctl_test.py
|
||||
@@ -85,18 +85,6 @@ class LinuxSysctlTestCase(TestCase):
|
||||
'net.ipv4.ip_forward', 1), ret)
|
||||
|
||||
@patch('os.path.isfile', MagicMock(return_value=False))
|
||||
- def test_persist_no_conf_failure(self):
|
||||
- '''
|
||||
- Tests adding of config file failure
|
||||
- '''
|
||||
- with patch('salt.utils.fopen', mock_open()) as m_open:
|
||||
- helper_open = m_open()
|
||||
- helper_open.write.assertRaises(CommandExecutionError,
|
||||
- linux_sysctl.persist,
|
||||
- 'net.ipv4.ip_forward',
|
||||
- 1, config=None)
|
||||
-
|
||||
- @patch('os.path.isfile', MagicMock(return_value=False))
|
||||
@patch('os.path.exists', MagicMock(return_value=True))
|
||||
def test_persist_no_conf_success(self):
|
||||
'''
|
||||
diff --git a/tests/unit/modules/mac_sysctl_test.py b/tests/unit/modules/mac_sysctl_test.py
|
||||
index e90ec64..b2ea691 100644
|
||||
--- a/tests/unit/modules/mac_sysctl_test.py
|
||||
+++ b/tests/unit/modules/mac_sysctl_test.py
|
||||
@@ -67,18 +67,6 @@ class DarwinSysctlTestCase(TestCase):
|
||||
'net.inet.icmp.icmplim', 50), ret)
|
||||
|
||||
@patch('os.path.isfile', MagicMock(return_value=False))
|
||||
- def test_persist_no_conf_failure(self):
|
||||
- '''
|
||||
- Tests adding of config file failure
|
||||
- '''
|
||||
- with patch('salt.utils.fopen', mock_open()) as m_open:
|
||||
- helper_open = m_open()
|
||||
- helper_open.write.assertRaises(CommandExecutionError,
|
||||
- mac_sysctl.persist,
|
||||
- 'net.inet.icmp.icmplim',
|
||||
- 50, config=None)
|
||||
-
|
||||
- @patch('os.path.isfile', MagicMock(return_value=False))
|
||||
def test_persist_no_conf_success(self):
|
||||
'''
|
||||
Tests successful add of config file when previously not one
|
||||
diff --git a/tests/unit/modules/mount_test.py b/tests/unit/modules/mount_test.py
|
||||
index 290c368..16918d8 100644
|
||||
--- a/tests/unit/modules/mount_test.py
|
||||
+++ b/tests/unit/modules/mount_test.py
|
||||
@@ -137,15 +137,6 @@ class MountTestCase(TestCase):
|
||||
with patch('salt.utils.fopen', mock_open()):
|
||||
self.assertTrue(mount.rm_fstab('name', 'device'))
|
||||
|
||||
- mock_fstab = MagicMock(return_value={'name': 'name'})
|
||||
- with patch.dict(mount.__grains__, {'kernel': ''}):
|
||||
- with patch.object(mount, 'fstab', mock_fstab):
|
||||
- with patch('salt.utils.fopen', mock_open()) as m_open:
|
||||
- helper_open = m_open()
|
||||
- helper_open.write.assertRaises(CommandExecutionError,
|
||||
- mount.rm_fstab,
|
||||
- config=None)
|
||||
-
|
||||
def test_set_fstab(self):
|
||||
'''
|
||||
Tests to verify that this mount is represented in the fstab,
|
||||
@@ -178,14 +169,6 @@ class MountTestCase(TestCase):
|
||||
with patch.object(mount, 'automaster', mock):
|
||||
self.assertTrue(mount.rm_automaster('name', 'device'))
|
||||
|
||||
- mock = MagicMock(return_value={'name': 'name'})
|
||||
- with patch.object(mount, 'fstab', mock):
|
||||
- with patch('salt.utils.fopen', mock_open()) as m_open:
|
||||
- helper_open = m_open()
|
||||
- helper_open.write.assertRaises(CommandExecutionError,
|
||||
- mount.rm_automaster,
|
||||
- 'name', 'device')
|
||||
-
|
||||
def test_set_automaster(self):
|
||||
'''
|
||||
Verify that this mount is represented in the auto_salt, change the mount
|
||||
diff --git a/tests/unit/modules/puppet_test.py b/tests/unit/modules/puppet_test.py
|
||||
index 02bc2e1..1fd915b 100644
|
||||
--- a/tests/unit/modules/puppet_test.py
|
||||
+++ b/tests/unit/modules/puppet_test.py
|
||||
@@ -85,11 +85,6 @@ class PuppetTestCase(TestCase):
|
||||
with patch('salt.utils.fopen', mock_open()):
|
||||
self.assertTrue(puppet.disable())
|
||||
|
||||
- with patch('salt.utils.fopen', mock_open()) as m_open:
|
||||
- helper_open = m_open()
|
||||
- helper_open.write.assertRaises(CommandExecutionError,
|
||||
- puppet.disable)
|
||||
-
|
||||
def test_status(self):
|
||||
'''
|
||||
Test to display puppet agent status
|
||||
@@ -144,11 +139,6 @@ class PuppetTestCase(TestCase):
|
||||
mock_open(read_data="resources: 1")):
|
||||
self.assertDictEqual(puppet.summary(), {'resources': 1})
|
||||
|
||||
- with patch('salt.utils.fopen', mock_open()) as m_open:
|
||||
- helper_open = m_open()
|
||||
- helper_open.write.assertRaises(CommandExecutionError,
|
||||
- puppet.summary)
|
||||
-
|
||||
def test_plugin_sync(self):
|
||||
'''
|
||||
Test to runs a plugin synch between the puppet master and agent
|
||||
@ -0,0 +1,142 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
PYTHON_COMPAT=(python2_7)
|
||||
|
||||
inherit eutils systemd distutils-r1
|
||||
|
||||
DESCRIPTION="Salt is a remote execution and configuration manager"
|
||||
HOMEPAGE="http://saltstack.org/"
|
||||
|
||||
if [[ ${PV} == 9999* ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
|
||||
EGIT_BRANCH="develop"
|
||||
SRC_URI=""
|
||||
KEYWORDS=""
|
||||
else
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
KEYWORDS="~x86 ~amd64"
|
||||
fi
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova"
|
||||
IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax"
|
||||
|
||||
RDEPEND="sys-apps/pciutils
|
||||
dev-python/jinja[${PYTHON_USEDEP}]
|
||||
>=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
|
||||
dev-python/pyyaml[${PYTHON_USEDEP}]
|
||||
dev-python/markupsafe[${PYTHON_USEDEP}]
|
||||
>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
>=www-servers/tornado-4.2.1[${PYTHON_USEDEP}]
|
||||
virtual/python-futures[${PYTHON_USEDEP}]
|
||||
libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
|
||||
mako? ( dev-python/mako[${PYTHON_USEDEP}] )
|
||||
ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
|
||||
libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
|
||||
openssl? (
|
||||
dev-libs/openssl:*[-bindist]
|
||||
dev-python/pyopenssl[${PYTHON_USEDEP}]
|
||||
)
|
||||
raet? (
|
||||
>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
|
||||
>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
|
||||
)
|
||||
zeromq? (
|
||||
>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
|
||||
)
|
||||
cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
|
||||
mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
|
||||
portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
|
||||
keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
|
||||
mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
|
||||
redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
|
||||
selinux? ( sec-policy/selinux-salt )
|
||||
timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )
|
||||
nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
|
||||
neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
|
||||
gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
|
||||
profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
|
||||
vim-syntax? ( app-vim/salt-vim )"
|
||||
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
test? (
|
||||
dev-python/psutil[${PYTHON_USEDEP}]
|
||||
dev-python/pip[${PYTHON_USEDEP}]
|
||||
dev-python/virtualenv[${PYTHON_USEDEP}]
|
||||
dev-python/mock[${PYTHON_USEDEP}]
|
||||
dev-python/timelib[${PYTHON_USEDEP}]
|
||||
>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
|
||||
!x86? ( dev-python/boto3[${PYTHON_USEDEP}] )
|
||||
>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
|
||||
>=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}]
|
||||
>=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
|
||||
${RDEPEND}
|
||||
)"
|
||||
|
||||
DOCS=(README.rst AUTHORS)
|
||||
|
||||
REQUIRED_USE="|| ( raet zeromq )"
|
||||
RESTRICT="x86? ( test )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-2015.8.2-tmpdir.patch"
|
||||
"${FILESDIR}/${PN}-2016.3.1-dont-realpath-tmpdir.patch"
|
||||
"${FILESDIR}/${PN}-2016.3.2-broken-tests.patch"
|
||||
)
|
||||
|
||||
python_prepare() {
|
||||
# this test fails because it trys to "pip install distribute"
|
||||
rm tests/unit/{modules,states}/zcbuildout_test.py \
|
||||
tests/unit/modules/{rh_ip,win_network,random_org}_test.py
|
||||
|
||||
# apparently libcloud does not know about this?
|
||||
rm tests/unit/cloud/clouds/dimensiondata_test.py
|
||||
|
||||
# seriously? "ValueError: Missing (or not readable) key file: '/home/dany/PRIVKEY.pem'"
|
||||
rm tests/unit/cloud/clouds/gce_test.py
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
local svc
|
||||
USE_SETUPTOOLS=1 distutils-r1_python_install_all
|
||||
|
||||
for svc in minion master syndic api; do
|
||||
newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
|
||||
newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
|
||||
systemd_dounit "${FILESDIR}"/salt-${svc}.service
|
||||
done
|
||||
|
||||
insinto /etc/${PN}
|
||||
doins -r conf/*
|
||||
}
|
||||
|
||||
python_test() {
|
||||
local tempdir
|
||||
# testsuite likes lots of files
|
||||
ulimit -n 3072
|
||||
|
||||
# ${T} is too long a path for the tests to work
|
||||
tempdir="$(mktemp -dup /tmp salt-XXX)"
|
||||
mkdir "${T}/$(basename "${tempdir}")"
|
||||
|
||||
(
|
||||
cleanup() { rm -f "${tempdir}"; }
|
||||
trap cleanup EXIT
|
||||
|
||||
addwrite "${tempdir}"
|
||||
ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}"
|
||||
|
||||
USE_SETUPTOOLS=1 SHELL="/bin/bash" \
|
||||
TMPDIR="${tempdir}" \
|
||||
${EPYTHON} tests/runtests.py \
|
||||
--unit-tests --no-report --verbose
|
||||
|
||||
) || die "testing failed"
|
||||
}
|
||||
@ -1,3 +1,3 @@
|
||||
DIST unrarsrc-5.3.11.tar.gz 223663 SHA256 77b87af4b2976ef7c6b0c79e071284c2c1b035a9543273ec925f9d92f73b8763 SHA512 14ea833fe4c2d81718df25794d2e795a255f92c68a5533d6a7d2cbfc072db3ce07bba7ba1fd5555aad1a17fbaf4980eb217a7d9f6158461fa917e1a17590569b WHIRLPOOL 60c909d9005cb0e2cfbef606b2dc66d9f7b3fd019fbf8ad83ce8b07f9e11c1890db175836ee3e63a21aa2f309ac0ebfebcf2ed5f60ca321a9b8a1b89409b1331
|
||||
DIST unrarsrc-5.4.2.tar.gz 225915 SHA256 d91d5fa8abdbac60b3e2b7317cc1451a2b38c550adee977b847f22594c53f1bd SHA512 a6c6b4fde8d0d1bff1d8eabaf348c2397bc7f1433cb8781b7bf4d4d48a62cc23e410ab1b6badf2f16a87664e7ecd0a8e33c4f30fa8af23d65bc4efa7a6c964e3 WHIRLPOOL 5880187982f5497e6195e80e47427fdd6a6cfafc956316d5fc1206c2b8762b02663a9f48826c9cebe5ac664df8bb6f43b24a135b321abf9364e183dc4a80cf7c
|
||||
DIST unrarsrc-5.4.3.tar.gz 226066 SHA256 e4f05190d9e379449a04c22baffc24cc2f03164a4738befe601b1325440db0c6 SHA512 47bf658146037df203babb34f7c3572b685c016ba6f5e148d8af08605554f561dea4a54b7f0402d5715772f1aea43e60b0769d0e48ef544bc51afb6f4b608e30 WHIRLPOOL 57f0a99d78ca350d72982417dc4c3c156920af6cf27b77fa8a7c13ab41a60a25ff67acd40e7afac466f14a6113c797203f5ad4d25343dda4a411867317404af0
|
||||
DIST unrarsrc-5.4.4.tar.gz 226097 SHA256 556b65d61164b018c4a3ce10e6290b16f4d042a603f6a4e17f74b19ac25d2d83 SHA512 496646b851bae4ac2c5b4f62a41265ba0d63e8ec58fa66b1801d971186b58e305a8d44a212e8fe035a82bf0b599eeb35e881dc62e8d75a1a5c7c54ce26aad1d6 WHIRLPOOL 35a84ff2247d2f886237721a978ac784426c9968b57d8928aab10d895504bac53040f121bf54c445eaedba6d237c1dda7544ffa4195bc0da7162c1c5f6d485e4
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
DIST latexila-3.16.2.tar.xz 1058776 SHA256 5ad20a2acdb8c93dea5aa175a219e62efe5f4a7ffb67bc52ff6faf0c6f42bad3 SHA512 d9d5c90374d5aa9b2599f90565dde9da1c4dc7713b7be8ffbfac71b5797124142ef46811660f14edfd278ec9d3f3b6b0c56ef325201fb85caf3b7322577e40fc WHIRLPOOL 3fde6abc4979dd9a40cc019e30c8b0e0c55c97fa3a4670d073d1ca6f662342b54923ea263246a169e8944fa3aaba358d6881629e20c6e949b1287e9328c1cdc6
|
||||
DIST latexila-3.18.1.tar.xz 1092768 SHA256 edfd95f321dfff31fb094c243c358cb78d19904164b9ef4fb37c021113044d0a SHA512 4123cbe4b6df7b493767abbe75ed43e025b640a869a61abec29715f40a3619433bc8300be6a06c8ec5c252215a6b05623d4b7a7f55d7eabbafa6f0ca19a26f92 WHIRLPOOL e1612ba477bef16aaee9f2173f29963c7dab3c0496082fe308ee2bed22b1a6cf9b480f1df1d259a774b593f3c58976de6bc0c3d6757941254abb1a5de067ddb6
|
||||
DIST latexila-3.18.2.tar.xz 1094728 SHA256 4bb584ec2c8d2ff8ee91e533ad7cf298f68b4a17c18b5663ea38482095c8773a SHA512 98d927e65c26c883e9f46097c204d612ad7815f1f2ebf73194f56f90ff63ce6e51780e6b7b8f7d5d7c303b52f4dfca3e891f61242fd81ce5898dfef90e15c1b6 WHIRLPOOL fae82e1be3cdee1b67a8ef1cf16d892639bd55b0a485136b4d40ef174bd08921a207c0360a17a85a924d362cd25b437d69dc91c3dac6c973bf6f4d940d7ca775
|
||||
DIST latexila-3.20.0.tar.xz 1104688 SHA256 fa0a7023b522339a1d5af57121bbed410651f4772b76a7139a3ab1c2ab49f85c SHA512 cc27512299b9388f87edcd03376b177c305249718a6e73e9a536e10f6b408a164cbc14642bd212d34c96204b1accd252ed183c0cc4560c3261f235e191be2c63 WHIRLPOOL a58787458b9a9c43838c2461f2f87f0c3c8c66bbf216eac0758d8053dd14aa7b0cac0535b8be867e822bda39b35d7b9bbc1a9e20f21477ccd5c2ef8f3e6b40e8
|
||||
DIST latexila-3.20.1.tar.xz 1113788 SHA256 58edbe3a1d7734d590ed4b85387fb8ce2e0df351bde9cd25ed3ee29239c81089 SHA512 22fd8eb6f6ae839404a6c1ca25b7bda796bcd740e2a66fde7d4fd92f8d412972b023e1769fda04247a0c0c4d97640b64ca3426d3285b4c94f33429a576d0b2ff WHIRLPOOL 25aadbf3de455277b981d6c33a1cf307423d3c3355b3518acbfb2ea776eb2c463accae2ef24ae90dc5583c3d4069d981d26772f5440085b269f9bc6fe04a0451
|
||||
|
||||
@ -1,55 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="5"
|
||||
GCONF_DEBUG="no"
|
||||
VALA_MIN_API_VERSION="0.26"
|
||||
VALA_USE_DEPEND="vapigen"
|
||||
|
||||
inherit gnome2 vala
|
||||
|
||||
DESCRIPTION="Integrated LaTeX environment for GNOME"
|
||||
HOMEPAGE="https://wiki.gnome.org/Apps/LaTeXila"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="+introspection +latexmk rubber"
|
||||
|
||||
COMMON_DEPEND="$(vala_depend)
|
||||
app-text/enchant
|
||||
>=app-text/gtkspell-3.0.4:3
|
||||
>=dev-libs/glib-2.40:2[dbus]
|
||||
>=dev-libs/libgee-0.10:0.8=
|
||||
gnome-base/gsettings-desktop-schemas
|
||||
>=x11-libs/gtk+-3.14:3
|
||||
>=x11-libs/gtksourceview-3.16:3.0
|
||||
x11-libs/gdk-pixbuf:2
|
||||
x11-libs/libX11
|
||||
x11-libs/pango
|
||||
introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
|
||||
"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
virtual/latex-base
|
||||
x11-themes/hicolor-icon-theme
|
||||
latexmk? ( dev-tex/latexmk )
|
||||
rubber? ( dev-tex/rubber )
|
||||
"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
>=dev-util/gtk-doc-am-1.14
|
||||
>=dev-util/intltool-0.50.1
|
||||
dev-util/itstool
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
DOCS="AUTHORS HACKING NEWS README"
|
||||
gnome2_src_prepare
|
||||
vala_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
gnome2_src_configure \
|
||||
$(use_enable introspection)
|
||||
}
|
||||
@ -1,2 +1,2 @@
|
||||
DIST docker-1.11.0.tar.gz 10637394 SHA256 088869b9a19ae17656e068aa6d3d473866e8133365427c601c671da1b2189057 SHA512 ecb7f531a5632fd6274e3eec59a5194c61d0788ab9f3864845cbc248232c2f14671a26c34abab8c5ca85ce6106ae72ea3ae4e5d133ad1efb126069ae82a2dba0 WHIRLPOOL 20b0ef1642d2fea2ae186a17786d95f138fb7df92daa104f00c481488f82eadd5e8f27a0a8e926d68f495fd62bc132d83817a0831f84b3786474a9408d87878f
|
||||
DIST docker-1.12.0_rc5.tar.gz 12543474 SHA256 f94f52463c07256691c89eb07902999d7c79aa7c7b888ef5ee1efa2bbf1c260e SHA512 16b89b9bbd420d4fd1fe46fe674eeccb3f93281a54577efd11e8d29e215410729855b630516bef97301aab7198d45cce7426769c5f4ee06c3f95cfdd65e42457 WHIRLPOOL 39cde949419ff253cd904303d637c55abecc177058364103d4ca475c9af758797539747c782dbb171778651f59fe7d9f35ce4cba2f465bd22848286741001099
|
||||
DIST docker-1.12.0.tar.gz 13018773 SHA256 f8139acba98248eb1fdb0b6d94efee89b876f9a50d00e263dc144fd2b0c372d4 SHA512 113707c0447bc096dc59204a1666b9f3a4e92d0ad89f016a0259734d6eee47861d5a6b1febab61f357212f0b4ffceea7ed3a53f883a748604aeb65bb5701413b WHIRLPOOL aa817e74c00b3f4ec9f494336a8a2f46d41ff978a4d04f4400a3f6ba21b4271a8f80b3708c4e18f9517f974f8e4f59194edbd57e3a662910cb01483fa6332b48
|
||||
|
||||
@ -1,12 +1,8 @@
|
||||
DIST kvmtool-3c8aec9e2b5066412390559629dabeb7816ee8f2.tar.gz 241486 SHA256 a3e65e5331e8bb20b112ac2dcc252fbcc9b9a83ef20292874ed4682bc2d87dcc SHA512 21a9ec313a9f46d6ebc4b7badfcc731350f5e58781892f33d11b907e085b84e6eebcaf2f22d101ed46a570e87d6530468be0bf6c258f195a38d594407cb2471b WHIRLPOOL f998afe674ef1bb8050d944646d35854fb75c3ef00eb0379ba3a52ea80bc9590e793fd333cb45803f683a4d0ed21c61d6d1cc7b74d01eb9503a6d960eef9e143
|
||||
DIST kvmtool-d62653e177597251c24494a6dda60acd6d846671.tar.gz 243930 SHA256 89f4cc94364298aa5b9c39c660ebd82a4beb5351cc838d418e7e21afefb5c1f0 SHA512 70aea2324273603b77aa64c95efd36df35c74514fa820013bfee386332289119cc148aed2983a8c6fd9ddfa5bc3db39c5aa0ee32bfc2077787338a47f2954f2f WHIRLPOOL ee47d7e38509eddf90ef0cf7d0cd3761c623e55a1003e8810e645759dc9615e33fbae22ab5576627f9f86eee8b4ca96c4bdf692b7ab073f1f222734bc378477a
|
||||
DIST linux-4.3.1.tar.xz 86900452 SHA256 11faaff6e7546038b868f524cdf42a5a1b67be9fdfd37d931723a8deb1811b72 SHA512 640db1a15db2e18f912e8ea93b01c784740d1a9957dc1d5580809448adb0713edfb02b7172f61362f0f362800c88f09dcc8165005250a757fbd942b59e36ba16 WHIRLPOOL f5de4ea768ad7a5cad21705c24b79773522207ffbc85209676b1a4ce067e031330ded68e2201953c477c3dae743f95521da230194be90be900afa30f39f943c5
|
||||
DIST rkt-1.10.1.tar.gz 2754338 SHA256 4a3c5db16be05292d6174d9d2c1d1f4c5c967e37686390927b8ca0d2bf570eb5 SHA512 6f6291251b31a3b4e1a4652554ded3f5c43b975aac861bbad483360347ea23f3f517b5fdd97fca2b26ab9543530df6318207e67c3d0776eff04cd4808489d2ec WHIRLPOOL 8f2946a2e5478bc2d1a0d5274fd22a7a16fbc81ed462d0cc49e7aa47e43c6c4324c317c3913199b55000d09b955aa56df0090427f99825f4cf376240cdd285c7
|
||||
DIST rkt-1.6.0.tar.gz 2641952 SHA256 767f2ed21d6dbf00a7a264d0dbd84a2733d56dbe97bab90b3d99af47d33c9b5c SHA512 54a0c564173047adbb5b81abb73600fee4fbdb5bf27521d4de269156e6ae9d3df23796cf57fdff551fc0846332c88fb96cca0b757beca512e1b760c5653a462b WHIRLPOOL 84fac58e268651f76ee1509ef99b3554bdc14e5cb66a75613f60fca5fe3d177305dc252a7b868e3d183222f40882e618aa964760c9025829f42b8bce7e1391b1
|
||||
DIST rkt-1.7.0.tar.gz 2835144 SHA256 80806ea63fe741cc569c991f98721289cd439c2239c3a8b1966ced2e467ed182 SHA512 677fe65921610070a8d3dfd96adda361390511e1f30f5fbd0335ddf0f743056f9dcddf089f3d42db0060f1d85830647b8b5633439ed5d8e589c64daf0490e6f6 WHIRLPOOL aeea6323a4e962c4f64f6c03b0685b85021916840d61d441da554f3091b1c68efd6bf3e4b06fb7536ae421bd9f2bc13747856e3139da5361cc1e8f35809a6231
|
||||
DIST rkt-pxe-1032.0.0.img 233166273 SHA256 2e34b18dc6d8a7f89ab6dd64ed405299171067f4d9f0bb2cf18b15be9985bed2 SHA512 e6dd5b2329894c54d1d5c6b0d700a6e5aab5001c754a043de461bf0335c946690933d7b93897f681c82c99778fdbddd75efe777535dfc7dda1f11834d0a6e8d2 WHIRLPOOL df5af345546339bb245884900cda7f246de58d6d0fc21c8f8f9dfb16bf7375263f455526d9c3d2330b4693b7c015029987edc9c5843201ca6b51482a2b3fdef7
|
||||
DIST rkt-1.11.0.tar.gz 2767797 SHA256 cd75f1648ae6736da731c14a2102646ee90467efd6d2a32b518fd36b8c9806c5 SHA512 dfc604b50037a5a272e0fe0f438c35e1a010489ee19a426cbad7184a3910a214f4bf659b533f323a2ab742deffe7bba10daee52691ff32e5a35f453b2b0c4bb0 WHIRLPOOL 4caa6be6f5f8c5aeb67c762a2643ffc8579d45f49b5c5e4cb5c16ce5e38cc4db35e9dee7d5df20ef80bf75d64e3cccbcc1521c4ddab18441652d2d383a17368b
|
||||
DIST rkt-pxe-1068.0.0.img 261402717 SHA256 f7ae0b0c676a2aaaaf2872fd5d0d692744d6af9185a334354c3c673865e54a1a SHA512 7b4c4ac28eb59f9fa8616b205fb440e5535814b80d89a365fd695252e7f9ed5f0d5288d1e571bc71b261f4f68ca052d327eee7eabe9b562e7003c767c96e052a WHIRLPOOL 1afa35b65a4beb2d5c12a8da4db7aff6b3b3123aa83366b0a51caac911938957f992082f7af35c1592c2da44503cc5131547a7961771c2c4064e79b3074f8a6b
|
||||
DIST rkt-pxe-794.1.0.img 185121072 SHA256 d513e27d2412d8fdaa2456786703346f10c24a62480d2036ca5c31b3d5a0df16 SHA512 f36324e9736bb0c533706c45d4146bed2efcb3ee2cb842c3624a62399835808c0df2aef56495a12b30f67c47fd84e93e34b10c57e4aa6d0450402d5e21c6f88c WHIRLPOOL 099851022b11aa29d004bbcef316a7cceeb5efa43f8069cdf1858888e7550f938fd9f9ec53eb63c313b5c1b93b0569f578a50fc5bae28b4d30c451a2ffd2adba
|
||||
DIST rkt-pxe-1097.0.0.img 240454650 SHA256 aa205919c4c733cf4cb7220f038f272f4b3ce6a185e5195945fdc625f506f737 SHA512 7a3cc62b5ae13ed8813effdea6125472982c81fa1fb35df0ac13a233ee352e67167a38cd82a802c0e8da50b2cf4455771441ad5ada186b3e3f2cdade4b1903c7 WHIRLPOOL 067eba2c1ebc546df506a249c0c49ab2ce556869f9455b6b1706e2285111293a4beed0172036df372e7b2e02449d815fb76c361219badcebe3240686be7bcc4c
|
||||
DIST rkt-sdjournal-64e931a183d12a30e3e25deefbeab0753dca99bf.patch 11264 SHA256 789ac19d4edb2b8b06c0dd3f1ad9092c583fcc039b7d0c3e491d03cdcf83b4d2 SHA512 2f4e918b1be3812b781813ebbfffb258c1b3441298825cfaba768453dd55ffe39f91fc2b230b6c3ec2c8003543e61d72cf161a56dfff85ba51f2e3fcd2c8f1e3 WHIRLPOOL dde9c83be96278eb5b7fb5bab2c0db4e3a741eede3164fe9bcd27905834ea31554e3739614a34a55a8cb1d9e89804a4db9a004d1758d618211bc5b50865286de
|
||||
DIST systemd-222.tar.gz 4015599 SHA256 b49f51f9855127987adc98aad3b6d608e4e53eaa029b629f2ea2089ce0234f34 SHA512 83f0acf0ca90c89c902c268af6eef4b61380a30380013cbe89c929357959f51682cd3961a6a4f772abc09d5ca09404ae290edf2c3253fab1b20dc2b5b3ecde47 WHIRLPOOL dd0151034de374b072e70448e7a9ff47693df0190e8a2a11488593400d3d7e53e0a91d86037d027c750584089e6c68e58c437647d608a72f8826f091e3253879
|
||||
DIST systemd-229.tar.gz 4319173 SHA256 b51b0a48d1beb388d95bd6a98d62be05490335d4bb388aefecdcb576e91e0741 SHA512 d692c0c9fc82f2fce64a5ec1caa4a0f8cf9edaeb1bdaaa1c462669db8f78b3dd6b33c87ef926ff21823582d0460f7b63aa3755792f9ae2cd6fb813ba08a35c39 WHIRLPOOL aa44f7161d80cc680226f19755579ba72c52cfe7bd671aefb09c414981f3a5a5c852f07d3449ac6f96d4ca91120cfb1464225d995b1637f1e2c108baf3c4a392
|
||||
|
||||
@ -1,194 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
AUTOTOOLS_AUTORECONF=yes
|
||||
AUTOTOOLS_IN_SOURCE_BUILD=yes
|
||||
|
||||
inherit autotools-utils flag-o-matic systemd toolchain-funcs
|
||||
|
||||
KEYWORDS="~amd64"
|
||||
|
||||
PXE_VERSION="1032.0.0"
|
||||
PXE_SYSTEMD_VERSION="v229"
|
||||
KVM_LINUX_VERSION="4.3.1"
|
||||
KVMTOOL_VERSION="d62653e177597251c24494a6dda60acd6d846671"
|
||||
PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
|
||||
PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
|
||||
|
||||
SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
|
||||
rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
|
||||
rkt_stage1_kvm? (
|
||||
https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
|
||||
mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
|
||||
${PXE_URI} -> ${PXE_FILE}
|
||||
)
|
||||
rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
|
||||
|
||||
DESCRIPTION="A CLI for running app containers, and an implementation of the App
|
||||
Container Spec."
|
||||
HOMEPAGE="https://github.com/coreos/rkt"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src +actool systemd"
|
||||
REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src ) rkt_stage1_host? ( systemd )"
|
||||
|
||||
DEPEND=">=dev-lang/go-1.5
|
||||
app-arch/cpio
|
||||
app-crypt/trousers
|
||||
sys-fs/squashfs-tools
|
||||
dev-perl/Capture-Tiny
|
||||
rkt_stage1_src? ( >=sys-apps/util-linux-2.27 )"
|
||||
|
||||
RDEPEND="!app-emulation/rocket
|
||||
rkt_stage1_host? ( systemd? (
|
||||
>=sys-apps/systemd-222
|
||||
app-shells/bash:0
|
||||
) )"
|
||||
|
||||
BUILDDIR="build-${P}"
|
||||
STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
|
||||
|
||||
src_unpack() {
|
||||
local x
|
||||
for x in ${A}; do
|
||||
case ${x} in
|
||||
*.img|linux-*) continue ;;
|
||||
kvmtool-*)
|
||||
mkdir kvmtool || die
|
||||
pushd kvmtool >/dev/null || die
|
||||
unpack ${x}
|
||||
popd >/dev/null || die
|
||||
;;
|
||||
*)
|
||||
unpack ${x}
|
||||
esac
|
||||
done
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# disable git fetch of systemd
|
||||
sed -e 's~^include makelib/git.mk$~'\
|
||||
'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
|
||||
'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
|
||||
'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
|
||||
'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
|
||||
'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
|
||||
'else\n'\
|
||||
'\t\0\n'\
|
||||
'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
|
||||
|
||||
# disable git fetch of kvmtool
|
||||
sed -e 's~^include makelib/git.mk$~'\
|
||||
'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
|
||||
'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
|
||||
'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
|
||||
'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
|
||||
'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
|
||||
'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
|
||||
'else\n'\
|
||||
'\t\0\n'\
|
||||
'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
|
||||
|
||||
# disable fetch of kernel sources
|
||||
sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
|
||||
-i stage1/usr_from_kvm/kernel.mk || die
|
||||
|
||||
if use rkt_stage1_host; then
|
||||
# Make systemdUnitsPath consistent with host
|
||||
sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
|
||||
-i stage1/init/init.go || die
|
||||
fi
|
||||
|
||||
# https://github.com/coreos/rkt/pull/2633
|
||||
sed -e 's:^\(func \)\(TestCalculateDataDir\):\1_\2:' \
|
||||
-i rkt/rkt_test.go || die
|
||||
|
||||
autotools-utils_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local flavors myeconfargs=(
|
||||
--with-stage1-default-images-directory="/usr/share/rkt"
|
||||
--with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
|
||||
)
|
||||
|
||||
# enable flavors (first is default)
|
||||
use rkt_stage1_host && flavors+=",host"
|
||||
use rkt_stage1_src && flavors+=",src"
|
||||
use rkt_stage1_coreos && flavors+=",coreos"
|
||||
use rkt_stage1_fly && flavors+=",fly"
|
||||
use rkt_stage1_kvm && flavors+=",kvm"
|
||||
myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
|
||||
|
||||
if use rkt_stage1_src; then
|
||||
myeconfargs+=(
|
||||
--with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
|
||||
--with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
|
||||
)
|
||||
fi
|
||||
|
||||
if use rkt_stage1_coreos || use rkt_stage1_kvm; then
|
||||
myeconfargs+=(
|
||||
--with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
|
||||
--with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
|
||||
)
|
||||
fi
|
||||
|
||||
# Go's 6l linker does not support PIE, disable so cgo binaries
|
||||
# which use 6l+gcc for linking can be built correctly.
|
||||
if gcc-specs-pie; then
|
||||
append-ldflags -nopie
|
||||
fi
|
||||
|
||||
export CC=$(tc-getCC)
|
||||
export CGO_ENABLED=1
|
||||
export CGO_CFLAGS="${CFLAGS}"
|
||||
export CGO_CPPFLAGS="${CPPFLAGS}"
|
||||
export CGO_CXXFLAGS="${CXXFLAGS}"
|
||||
export CGO_LDFLAGS="${LDFLAGS}"
|
||||
export BUILDDIR
|
||||
|
||||
autotools-utils_src_configure
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
local arch=${ARCH}
|
||||
case ${arch} in
|
||||
amd64) arch=x86_64;;
|
||||
esac
|
||||
ARCH=${arch} autotools-utils_src_compile
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dodoc README.md
|
||||
use doc && dodoc -r Documentation
|
||||
use examples && dodoc -r examples
|
||||
use actool && dobin "${S}/${BUILDDIR}/bin/actool"
|
||||
|
||||
dobin "${S}/${BUILDDIR}/bin/rkt"
|
||||
|
||||
insinto /usr/share/rkt
|
||||
doins "${S}/${BUILDDIR}/bin/"*.aci
|
||||
|
||||
# create symlink for default stage1 image path
|
||||
if use rkt_stage1_host; then
|
||||
dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
|
||||
elif use rkt_stage1_src; then
|
||||
dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
|
||||
elif use rkt_stage1_coreos; then
|
||||
dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
|
||||
elif use rkt_stage1_fly; then
|
||||
dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
|
||||
elif use rkt_stage1_kvm; then
|
||||
dosym stage1-kvm.aci "${STAGE1_DEFAULT_LOCATION}"
|
||||
fi
|
||||
|
||||
systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.service
|
||||
systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.timer
|
||||
systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.service
|
||||
systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.socket
|
||||
}
|
||||
@ -1,192 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
AUTOTOOLS_AUTORECONF=yes
|
||||
AUTOTOOLS_IN_SOURCE_BUILD=yes
|
||||
|
||||
inherit git-r3 autotools-utils flag-o-matic systemd toolchain-funcs
|
||||
|
||||
KEYWORDS=""
|
||||
|
||||
EGIT_REPO_URI="https://github.com/coreos/rkt.git"
|
||||
PXE_VERSION="794.1.0"
|
||||
PXE_SYSTEMD_VERSION="v222"
|
||||
KVM_LINUX_VERSION="4.3.1"
|
||||
KVMTOOL_VERSION="3c8aec9e2b5066412390559629dabeb7816ee8f2"
|
||||
PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
|
||||
PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
|
||||
|
||||
[[ ${PV} == *9999* ]] || SRC_URI+=" https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
SRC_URI+="
|
||||
rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
|
||||
rkt_stage1_kvm? (
|
||||
https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
|
||||
mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
|
||||
${PXE_URI} -> ${PXE_FILE}
|
||||
)
|
||||
rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
|
||||
|
||||
DESCRIPTION="A CLI for running app containers, and an implementation of the App
|
||||
Container Spec."
|
||||
HOMEPAGE="https://github.com/coreos/rkt"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src +actool systemd"
|
||||
REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src ) rkt_stage1_host? ( systemd )"
|
||||
|
||||
DEPEND=">=dev-lang/go-1.4.1
|
||||
app-arch/cpio
|
||||
app-crypt/trousers
|
||||
sys-fs/squashfs-tools
|
||||
dev-perl/Capture-Tiny"
|
||||
|
||||
RDEPEND="!app-emulation/rocket
|
||||
rkt_stage1_host? ( systemd? (
|
||||
>=sys-apps/systemd-222
|
||||
app-shells/bash:0
|
||||
) )"
|
||||
|
||||
BUILDDIR="build-${P}"
|
||||
STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
|
||||
|
||||
src_unpack() {
|
||||
[[ ${PV} == *9999* ]] && git-r3_src_unpack
|
||||
local x
|
||||
for x in ${A}; do
|
||||
case ${x} in
|
||||
*.img|linux-*) continue ;;
|
||||
kvmtool-*)
|
||||
mkdir kvmtool || die
|
||||
pushd kvmtool >/dev/null || die
|
||||
unpack ${x}
|
||||
popd >/dev/null || die
|
||||
;;
|
||||
*)
|
||||
unpack ${x}
|
||||
esac
|
||||
done
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# disable git fetch of systemd
|
||||
sed -e 's~^include makelib/git.mk$~'\
|
||||
'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
|
||||
'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
|
||||
'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
|
||||
'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
|
||||
'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
|
||||
'else\n'\
|
||||
'\t\0\n'\
|
||||
'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
|
||||
|
||||
# disable git fetch of kvmtool
|
||||
sed -e 's~^include makelib/git.mk$~'\
|
||||
'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
|
||||
'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
|
||||
'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
|
||||
'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
|
||||
'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
|
||||
'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
|
||||
'else\n'\
|
||||
'\t\0\n'\
|
||||
'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
|
||||
|
||||
# disable fetch of kernel sources
|
||||
sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
|
||||
-i stage1/usr_from_kvm/kernel.mk || die
|
||||
|
||||
if use rkt_stage1_host; then
|
||||
# Make systemdUnitsPath consistent with host
|
||||
sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
|
||||
-i stage1/init/init.go || die
|
||||
fi
|
||||
|
||||
autotools-utils_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local flavors myeconfargs=(
|
||||
--with-stage1-default-images-directory="/usr/share/rkt"
|
||||
--with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
|
||||
)
|
||||
|
||||
# enable flavors (first is default)
|
||||
use rkt_stage1_host && flavors+=",host"
|
||||
use rkt_stage1_src && flavors+=",src"
|
||||
use rkt_stage1_coreos && flavors+=",coreos"
|
||||
use rkt_stage1_fly && flavors+=",fly"
|
||||
use rkt_stage1_kvm && flavors+=",kvm"
|
||||
myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
|
||||
|
||||
if use rkt_stage1_src; then
|
||||
myeconfargs+=(
|
||||
--with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
|
||||
--with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
|
||||
)
|
||||
fi
|
||||
|
||||
if use rkt_stage1_coreos || use rkt_stage1_kvm; then
|
||||
myeconfargs+=(
|
||||
--with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
|
||||
--with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
|
||||
)
|
||||
fi
|
||||
|
||||
# Go's 6l linker does not support PIE, disable so cgo binaries
|
||||
# which use 6l+gcc for linking can be built correctly.
|
||||
if gcc-specs-pie; then
|
||||
append-ldflags -nopie
|
||||
fi
|
||||
|
||||
export CC=$(tc-getCC)
|
||||
export CGO_ENABLED=1
|
||||
export CGO_CFLAGS="${CFLAGS}"
|
||||
export CGO_CPPFLAGS="${CPPFLAGS}"
|
||||
export CGO_CXXFLAGS="${CXXFLAGS}"
|
||||
export CGO_LDFLAGS="${LDFLAGS}"
|
||||
export BUILDDIR
|
||||
|
||||
autotools-utils_src_configure
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
local arch=${ARCH}
|
||||
case ${arch} in
|
||||
amd64) arch=x86_64;;
|
||||
esac
|
||||
ARCH=${arch} autotools-utils_src_compile
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dodoc README.md
|
||||
use doc && dodoc -r Documentation
|
||||
use examples && dodoc -r examples
|
||||
use actool && dobin "${S}/${BUILDDIR}/bin/actool"
|
||||
|
||||
dobin "${S}/${BUILDDIR}/bin/rkt"
|
||||
|
||||
insinto /usr/share/rkt
|
||||
doins "${S}/${BUILDDIR}/bin/"*.aci
|
||||
|
||||
# create symlink for default stage1 image path
|
||||
if use rkt_stage1_host; then
|
||||
dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
|
||||
elif use rkt_stage1_src; then
|
||||
dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
|
||||
elif use rkt_stage1_coreos; then
|
||||
dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
|
||||
elif use rkt_stage1_fly; then
|
||||
dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
|
||||
elif use rkt_stage1_kvm; then
|
||||
dosym stage1-kvm.aci "${STAGE1_DEFAULT_LOCATION}"
|
||||
fi
|
||||
|
||||
systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.service
|
||||
systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.timer
|
||||
systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.service
|
||||
systemd_dounit "${S}"/dist/init/systemd/${PN}-metadata.socket
|
||||
}
|
||||
@ -1,2 +1,3 @@
|
||||
DIST evemu-2.1.0.tar.xz 502240 SHA256 0c87360882751356e9f977ebf7438c00fe97deb232ac725dd86e5ba78203ee97 SHA512 16ed613aa465d85f617a5dd6b958b0480c55477836effc86c293facdb500152d5b387a79f14802f2db6a3c721cc754cac2e8fc605f5e689962742b8fc361c81b WHIRLPOOL bc4e9631eebe6329d726adf853e8ef716246d70cf4f3ee50497bec6d654c8483c9291a40f532d488813d0c2568cd106e03a131cfa6aab86f037ad3ee1f0a8d18
|
||||
DIST evemu-2.2.0.tar.xz 492184 SHA256 e0f79808959d1b1f307a3d5add8ee9e5786d926e9aeb0045dadb85c7350d0a3c SHA512 638fa4962dae2aa88d70d1c30a244eab67ccc102af47a6de4b93f32b9f2b9d767d7f358efb71964c62f461e93c431bb679ad7019e2509f0cd4c02bd0e94a29d9 WHIRLPOOL 0f7cd045a8ad217a562fe640c5fc0f0bff890a725e1786741a5a412f24a866c997f18bf0dd404a804ed2e0718b85464797d21e1f8a3fdbee63216504d12ac09e
|
||||
DIST evemu-2.4.0.tar.xz 505848 SHA256 0706ea5a830203f9cdb30c0e10c8c41d2427128ba9041543a5ae157fa3b4a30e SHA512 e629a0eedb6ce58d3f088b279f45b87117b30b01af07e53dd5515ced7ea15293476fafe9aa9832e6758a6953ad7a462b0fae0a0996181eec327377176cf00c7a WHIRLPOOL ad909f5e074dfdd0d6c9f3660844024f94da587f97cf9181e5ab1232fe077c8df47cca045b598a472bbf6ec776c2cbf313908a800d95a539173770080fb388ce
|
||||
|
||||
@ -0,0 +1,44 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
|
||||
inherit eutils python-single-r1
|
||||
|
||||
DESCRIPTION="tools and bindings for kernel evdev device emulation, data capture, and replay"
|
||||
HOMEPAGE="https://www.freedesktop.org/wiki/Evemu/"
|
||||
SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
|
||||
|
||||
LICENSE="LGPL-3 GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="python static-libs"
|
||||
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
|
||||
|
||||
RDEPEND="python? ( ${PYTHON_DEPS} )
|
||||
>=dev-libs/libevdev-1.2.99.902"
|
||||
DEPEND="app-arch/xz-utils
|
||||
${RDEPEND}"
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
$(use_enable static-libs static) \
|
||||
$(use_enable python python-bindings)
|
||||
}
|
||||
|
||||
src_test() {
|
||||
if use python ; then
|
||||
if [[ ! ${EUID} -eq 0 ]] || has sandbox $FEATURES || has usersandbox $FEATURES ; then
|
||||
ewarn "Tests require userpriv, sandbox, and usersandbox to be disabled in FEATURES."
|
||||
else
|
||||
emake check
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
prune_libtool_files
|
||||
}
|
||||
@ -0,0 +1,28 @@
|
||||
#!/sbin/openrc-run
|
||||
# Copyright 2003 Martin Hierling <mad@cc.fh-lippe.de>
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
: ${IREXEC_USER:=root}
|
||||
|
||||
depend() {
|
||||
need lircd
|
||||
}
|
||||
|
||||
start() {
|
||||
if [ "x${IREXEC_USER}" = "xroot" -a "x${IREXEC_DISABLE_ROOT_WARNING}" != "xyes" ]; then
|
||||
ewarn "Warning: Running irexec as root can open security holes"
|
||||
fi
|
||||
|
||||
ebegin "Starting irexec"
|
||||
start-stop-daemon --start --chuid ${IREXEC_USER} --user ${IREXEC_USER} --chdir / \
|
||||
--exec /usr/bin/irexec -- --daemon ${IREXEC_OPTS}
|
||||
eend $? "Failed to start irexec."
|
||||
}
|
||||
|
||||
stop() {
|
||||
ebegin "Stopping irexec"
|
||||
start-stop-daemon --stop --exec /usr/bin/irexec --user ${IREXEC_USER}
|
||||
eend $? "Failed to stop irexec."
|
||||
}
|
||||
|
||||
@ -0,0 +1,27 @@
|
||||
https://sourceforge.net/p/lirc/tickets/214/
|
||||
|
||||
diff --git a/doc/Makefile.am b/doc/Makefile.am
|
||||
index 53d0f21..f833b4b 100644
|
||||
--- a/doc/Makefile.am
|
||||
+++ b/doc/Makefile.am
|
||||
@@ -33,7 +33,6 @@ nodist_man_MANS += man/xmode2.1 man/irxevent.1
|
||||
manpage_html += man-html/irxevent.html man-html/xmode2.html
|
||||
endif
|
||||
|
||||
-docdir = @datadir@/doc/@PACKAGE@
|
||||
dist_doc_DATA = irxevent.keys
|
||||
|
||||
if HAVE_DOXYGEN
|
||||
@@ -58,10 +57,10 @@ if HAVE_PYMOD_YAML
|
||||
nodist_website_html_DATA += table.html
|
||||
endif
|
||||
|
||||
-vardocsdir = $(localstatedir)/lib/lirc/plugins
|
||||
+vardocsdir = $(docdir)/plugins
|
||||
vardocs_DATA = index.html html-source/lirc.css
|
||||
|
||||
-varimagedir = $(localstatedir)/lib/lirc/images
|
||||
+varimagedir = $(docdir)/images
|
||||
varimage_DATA = $(dist_image_DATA)
|
||||
|
||||
website_imagedir = $(docdir)/lirc.org/images
|
||||
@ -0,0 +1,131 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit eutils flag-o-matic systemd
|
||||
|
||||
DESCRIPTION="decode and send infra-red signals of many commonly used remote controls"
|
||||
HOMEPAGE="http://www.lirc.org/"
|
||||
|
||||
LIRC_DRIVER_DEVICE="/dev/lirc0"
|
||||
|
||||
MY_P=${PN}-${PV/_/}
|
||||
|
||||
if [[ "${PV/_pre/}" = "${PV}" ]]; then
|
||||
SRC_URI="mirror://sourceforge/lirc/${MY_P}.tar.bz2"
|
||||
else
|
||||
SRC_URI="http://www.lirc.org/software/snapshots/${MY_P}.tar.bz2"
|
||||
fi
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
|
||||
IUSE="doc static-libs X audio irman ftdi inputlirc iguanair systemd usb"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
REQUIRED_USE="
|
||||
iguanair? ( irman )
|
||||
"
|
||||
DEPEND="
|
||||
doc? ( app-doc/doxygen )
|
||||
"
|
||||
|
||||
RDEPEND="
|
||||
X? (
|
||||
x11-libs/libX11
|
||||
x11-libs/libSM
|
||||
x11-libs/libICE
|
||||
)
|
||||
systemd? ( sys-apps/systemd )
|
||||
audio? (
|
||||
>media-libs/portaudio-18
|
||||
media-libs/alsa-lib
|
||||
)
|
||||
irman? ( media-libs/libirman )
|
||||
iguanair? ( app-misc/iguanaIR )
|
||||
ftdi? ( dev-embedded/libftdi:0 )
|
||||
inputlirc? ( app-misc/inputlircd )
|
||||
usb? ( virtual/libusb:0 )
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/lirc-0.9.4-doc-path-fix.patch # https://bugs.gentoo.org/show_bug.cgi?id=589246 https://sourceforge.net/p/lirc/tickets/214/
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
filter-flags -Wl,-O1
|
||||
econf \
|
||||
--docdir=/usr/share/doc/${PF} \
|
||||
--localstatedir=/var \
|
||||
$(use_enable static-libs static) \
|
||||
$(use_with X x)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
newinitd "${FILESDIR}"/lircd-0.8.6-r2 lircd
|
||||
newinitd "${FILESDIR}"/lircmd lircmd
|
||||
newconfd "${FILESDIR}"/lircd.conf.4 lircd
|
||||
|
||||
insinto /etc/modprobe.d/
|
||||
newins "${FILESDIR}"/modprobed.lirc lirc.conf
|
||||
|
||||
newinitd "${FILESDIR}"/irexec-initd-0.9.4a-r1 irexec
|
||||
newconfd "${FILESDIR}"/irexec-confd irexec
|
||||
|
||||
keepdir /etc/lirc
|
||||
if [[ -e "${D}"/etc/lirc/lircd.conf ]]; then
|
||||
newdoc "${D}"/etc/lirc/lircd.conf lircd.conf.example
|
||||
fi
|
||||
|
||||
if ! use static-libs; then
|
||||
rm "${D}/usr/$(get_libdir)/liblirc_client.la" || die
|
||||
fi
|
||||
|
||||
# Avoid QA notice
|
||||
rm -d "${D}"/var/run/lirc || die
|
||||
rm -d "${D}"/var/run || die
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
local dir="${EROOT}/etc/modprobe.d"
|
||||
if [[ -a "${dir}"/lirc && ! -a "${dir}"/lirc.conf ]]; then
|
||||
elog "Renaming ${dir}/lirc to lirc.conf"
|
||||
mv -f "${dir}/lirc" "${dir}/lirc.conf" || die
|
||||
fi
|
||||
|
||||
# copy the first file that can be found
|
||||
if [[ -f "${EROOT}"/etc/lirc/lircd.conf ]]; then
|
||||
cp "${EROOT}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die
|
||||
elif [[ -f "${EROOT}"/etc/lircd.conf ]]; then
|
||||
cp "${EROOT}"/etc/lircd.conf "${T}"/lircd.conf || die
|
||||
MOVE_OLD_LIRCD_CONF=1
|
||||
elif [[ -f "${D}"/etc/lirc/lircd.conf ]]; then
|
||||
cp "${D}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die
|
||||
fi
|
||||
|
||||
# stop portage from touching the config file
|
||||
if [[ -e "${D}"/etc/lirc/lircd.conf ]]; then
|
||||
rm -f "${D}"/etc/lirc/lircd.conf || die
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# copy config file to new location
|
||||
# without portage knowing about it
|
||||
# so it will not delete it on unmerge or ever touch it again
|
||||
if [[ -e "${T}"/lircd.conf ]]; then
|
||||
cp "${T}"/lircd.conf "${EROOT}"/etc/lirc/lircd.conf || die
|
||||
if [[ "$MOVE_OLD_LIRCD_CONF" = "1" ]]; then
|
||||
elog "Moved /etc/lircd.conf to /etc/lirc/lircd.conf"
|
||||
rm -f "${EROOT}"/etc/lircd.conf || die
|
||||
fi
|
||||
fi
|
||||
|
||||
einfo "The new default location for lircd.conf is inside of"
|
||||
einfo "/etc/lirc/ directory"
|
||||
}
|
||||
@ -1 +1 @@
|
||||
DIST 0.8-b3.tar.gz 1555942 SHA256 9f049ace09469f6ca6e00439ddcccdbe398f99cd36313ec4f5cb88577154b687 SHA512 61a3f22fcff2f605d61044a84d8d6df4fae40a6f637df9df5e0af2d61aaa474cf085b206900f9e0b9596aa03549ce2df4ca72c1409dc980ac08e8dc1704d4271 WHIRLPOOL a8ba202a9823caecf504e2aaa222c09c667dfe8b092f53922de325ac44fbfe6bf37e0447b9c0af614284432fc1a71633970619624992de789927b3621a080cb7
|
||||
DIST freesmee-0.8-b3.tar.gz 1555942 SHA256 9f049ace09469f6ca6e00439ddcccdbe398f99cd36313ec4f5cb88577154b687 SHA512 61a3f22fcff2f605d61044a84d8d6df4fae40a6f637df9df5e0af2d61aaa474cf085b206900f9e0b9596aa03549ce2df4ca72c1409dc980ac08e8dc1704d4271 WHIRLPOOL a8ba202a9823caecf504e2aaa222c09c667dfe8b092f53922de325ac44fbfe6bf37e0447b9c0af614284432fc1a71633970619624992de789927b3621a080cb7
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
DIST gspell-0.1.2.tar.xz 355128 SHA256 e8625c57296b6c178bc37659f023342f8edefaaa2c5eccf40de8bd479dbfa8f0 SHA512 8d9bd61f378929217b9461debb58df5070952539f30f6ee211cf13f856dfe5d5216468679a8d7d7b08df47ee6b7b45f25b2b6400212a83de9563e2bf175905bb WHIRLPOOL 44334ac608e9a66c5a6bf011ad21d7d368e29d7923079e947ed5484ae0c7847df1f29dc255979d0da844e1ecba16fa19dfae5b84aefd85287bc63de1465d3ffa
|
||||
DIST gspell-0.2.2.tar.xz 358600 SHA256 cecded0f0a8dfe4b28cbb47a6024f82f50b7ffb7476e36032d5f8d741e3f627e SHA512 6f3fe9eecb6d464db549747294e5d39aec1175c104a8210fecee596f255db7b76121fbe4681f27723281078dc7f0cb87effa1e12b9f6be37f04e9004ee9b2b24 WHIRLPOOL ed8df8cf984b5398fcf8b026289de23c793d0426feb76380a7550898557d76af8d5d4abecd3e70d422b4f516549dd0383ab27fb56822c13080341a78dc85ee06
|
||||
DIST gspell-0.2.3.tar.xz 363424 SHA256 e3bfa90a04f660efb1e5bcb182ee8d07d13f78817cccd006992534261b633510 SHA512 1ddb8b7e39317520292a2bd1de372ec428729ed43f49cb60d982fb9a045b6218890f481fed9a0454f0116cac18bdebd9c6f9cecfec3e687e1233491013ffd576 WHIRLPOOL 8765432e1f5eaf67916afbf224674ba132fd142d9e76ae7a8ed718c64b43ce9e809c939b4d34259e242c663acc686717b18cb79186823f709884eb719929c459
|
||||
DIST gspell-1.0.2.tar.xz 383844 SHA256 80d859a2ee7cf5184bd2b3dc696a0ec1b899ff67b606177e1ef87ef945ff92bb SHA512 67ed34b70ca1d8e626f366b62847c04efe204fa21d9e6b3f55ec4d08dca8613f2a03e42de28d38ebe53923889d848ea9064f01a89ede9a7f22772712f5b11aa7 WHIRLPOOL 5ff3ea3925d0b44c2b6302c679fcd307823454d1f6e76484ddbcde76354bcc1d4a03bc833319a22974c535bdecc75444eb4ea09a0190865bfe4fa5739a6105bd
|
||||
DIST gspell-1.0.3.tar.xz 385772 SHA256 d95905e6c631e34911e8e3feeb364815bf3fd7ccd1dac118a34bcbae70261bd5 SHA512 c38159a988996c69ffd4ed7a348ab5eeef214632e57cf599541806b4317937f0f9ccb8d677182886fd281eb1a955cae595e6382924b1bd5f5edbe447b3e95e5b WHIRLPOOL c4dad122007264fe4a61039eb7aa38b04e4325fb3bf0916ddbcd1073988fe3acc13a9fe445023c113b87ea2ff59f93719d2efaa905d522aff5b070129098569b
|
||||
|
||||
@ -1,44 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="5"
|
||||
GCONF_DEBUG="no"
|
||||
VALA_USE_DEPEND="vapigen"
|
||||
|
||||
inherit gnome2 vala
|
||||
|
||||
DESCRIPTION="Spell check library for GTK+ applications"
|
||||
HOMEPAGE="https://wiki.gnome.org/Projects/gspell"
|
||||
|
||||
LICENSE="LGPL-2.1+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="+introspection vala"
|
||||
REQUIRED_IUSE="vala? ( introspection )"
|
||||
|
||||
RDEPEND="
|
||||
>=app-text/enchant-1.6.0
|
||||
>=app-text/iso-codes-0.35
|
||||
>=dev-libs/glib-2.44:2
|
||||
>=x11-libs/gtk+-3.16:3[introspection?]
|
||||
introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
|
||||
vala? ( $(vala_depend) )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
>=dev-util/gtk-doc-am-1.24
|
||||
>=dev-util/intltool-0.35.0
|
||||
>=sys-devel/gettext-0.19.4
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
use vala && vala_src_prepare
|
||||
gnome2_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
gnome2_src_configure \
|
||||
$(use_enable introspection) \
|
||||
$(use_enable vala)
|
||||
}
|
||||
@ -1,37 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit autotools eutils
|
||||
|
||||
DESCRIPTION="Unicode-aware text to PostScript converter"
|
||||
HOMEPAGE="http://paps.sourceforge.net/"
|
||||
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="x11-libs/pango"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig"
|
||||
|
||||
src_prepare() {
|
||||
epatch \
|
||||
"${FILESDIR}"/${P}-fix-as-needed-build.patch \
|
||||
"${FILESDIR}"/${P}-fix-doxygen-acinclude.patch \
|
||||
"${FILESDIR}"/${P}-fix-freetype-include.patch
|
||||
|
||||
mv configure.in configure.ac || die
|
||||
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin src/paps
|
||||
doman src/paps.1
|
||||
dodoc AUTHORS ChangeLog NEWS README TODO
|
||||
}
|
||||
@ -1,15 +0,0 @@
|
||||
--- lib/replace/autoconf-2.60.m4.orig 2008-04-19 00:26:33.000000000 -0400
|
||||
+++ lib/replace/autoconf-2.60.m4 2008-04-19 00:22:25.000000000 -0400
|
||||
@@ -179,6 +179,7 @@
|
||||
# ------------------------
|
||||
# Enable extensions on systems that normally disable them,
|
||||
# typically due to standards-conformance issues.
|
||||
+m4_ifndef([AC_USE_SYSTEM_EXTENSIONS],[
|
||||
AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS],
|
||||
[
|
||||
AC_BEFORE([$0], [AC_COMPILE_IFELSE])
|
||||
@@ -208,3 +209,4 @@
|
||||
AC_DEFINE([__EXTENSIONS__])
|
||||
AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
|
||||
])
|
||||
+])
|
||||
@ -1,77 +0,0 @@
|
||||
diff -Naur ctdb-1.0.114.orig/config/functions ctdb-1.0.114/config/functions
|
||||
--- ctdb-1.0.114.orig/config/functions 2010-04-04 18:01:18.278707515 +0200
|
||||
+++ ctdb-1.0.114/config/functions 2010-04-04 18:08:05.792447032 +0200
|
||||
@@ -22,6 +22,8 @@
|
||||
. /etc/default/$1
|
||||
elif [ -f $CTDB_BASE/sysconfig/$1 ]; then
|
||||
. $CTDB_BASE/sysconfig/$1
|
||||
+ elif [ -f /etc/config.d/$1 ]; then
|
||||
+ . /etc/config.d/$name
|
||||
fi
|
||||
}
|
||||
|
||||
@@ -33,6 +35,8 @@
|
||||
|
||||
if [ -x /sbin/startproc ]; then
|
||||
CTDB_INIT_STYLE="suse"
|
||||
+ elif [ -x /bin/rc-status ] ; then
|
||||
+ CTDB_INIT_STYLE="gentoo"
|
||||
elif [ -x /sbin/start-stop-daemon ]; then
|
||||
CTDB_INIT_STYLE="debian"
|
||||
else
|
||||
@@ -356,6 +360,9 @@
|
||||
[ -x /etc/init.d/nfslock ] && {
|
||||
PLATFORM="rhel"
|
||||
}
|
||||
+ [ -x etc/init.d/nfs ] && {
|
||||
+ PLATFORM="gentoo"
|
||||
+ }
|
||||
|
||||
case $PLATFORM in
|
||||
sles)
|
||||
@@ -380,6 +387,16 @@
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
+ gentoo)
|
||||
+ case $1 in
|
||||
+ start)
|
||||
+ service nfs start
|
||||
+ ;;
|
||||
+ stop)
|
||||
+ service nfs stop > /dev/null 2>&1
|
||||
+ ;;
|
||||
+ esac
|
||||
+ ;;
|
||||
*)
|
||||
echo "Unknown platform. NFS is not supported with ctdb"
|
||||
exit 1
|
||||
@@ -398,6 +415,9 @@
|
||||
[ -x /etc/init.d/nfslock ] && {
|
||||
PLATFORM="rhel"
|
||||
}
|
||||
+ [ -x etc/init.d/nfs ] && {
|
||||
+ PLATFORM="gentoo"
|
||||
+ }
|
||||
|
||||
case $PLATFORM in
|
||||
sles)
|
||||
@@ -422,6 +442,18 @@
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
+ gentoo)
|
||||
+ # for gentoo there is no service for lockmanager
|
||||
+ # so we instead just shutdown/restart nfs
|
||||
+ case $1 in
|
||||
+ start)
|
||||
+ service nfs start
|
||||
+ ;;
|
||||
+ stop)
|
||||
+ service nfs stop > /dev/null 2>&1
|
||||
+ ;;
|
||||
+ esac
|
||||
+ ;;
|
||||
*)
|
||||
echo "Unknown platform. NFS locking is not supported with ctdb"
|
||||
exit 1
|
||||
@ -1,13 +0,0 @@
|
||||
--- ./config/events.d/41.httpd 2009-05-29 14:19:30.741662868 +0100
|
||||
+++ ./config/events.d/41.httpd 2009-07-28 18:31:48.016042964 +0100
|
||||
@@ -19,6 +19,10 @@
|
||||
CTDB_SERVICE_HTTP="apache2"
|
||||
CTDB_CONFIG_HTTP="apache2"
|
||||
;;
|
||||
+ gentoo)
|
||||
+ CTDB_SERVICE_HTTP="apache2"
|
||||
+ CTDB_CONFIG_HTTP="apache2"
|
||||
+ ;;
|
||||
*)
|
||||
# should not happen.
|
||||
# for now use red hat style as default
|
||||
@ -1,14 +0,0 @@
|
||||
--- ./config/events.d/50.samba 2009-05-29 14:19:30.741662868 +0100
|
||||
+++ ./config/events.d/50.samba 2009-07-28 18:27:21.896042994 +0100
|
||||
@@ -25,6 +25,11 @@
|
||||
CTDB_SERVICE_NMB=${CTDB_SERVICE_NMB:-""}
|
||||
CTDB_SERVICE_WINBIND=${CTDB_SERVICE_WINBIND:-winbind}
|
||||
;;
|
||||
+ gentoo)
|
||||
+ CTDB_SERVICE_SMB=${CTDB_SERVICE_SMB:-samba}
|
||||
+ CTDB_SERVICE_NMB=${CTDB_SERVICE_NMB:-""}
|
||||
+ CTDB_SERVICE_WINBIND=${CTDB_SERVICE_WINBIND:-""}
|
||||
+ ;;
|
||||
*)
|
||||
# should not happen, but for now use redhat style as default:
|
||||
CTDB_SERVICE_SMB=${CTDB_SERVICE_SMB:-smb}
|
||||
@ -1,76 +0,0 @@
|
||||
--- ./config/functions 2009-05-29 14:19:30.741662868 +0100
|
||||
+++ ./config/functions 2009-07-29 14:15:19.436043164 +0100
|
||||
@@ -10,6 +10,8 @@
|
||||
. /etc/default/$name
|
||||
elif [ -f $CTDB_BASE/sysconfig/$name ]; then
|
||||
. $CTDB_BASE/sysconfig/$name
|
||||
+ elif [ -f /etc/config.d/$name ]; then
|
||||
+ . /etc/config.d/$name
|
||||
fi
|
||||
}
|
||||
|
||||
@@ -21,6 +23,8 @@
|
||||
|
||||
if [ -x /sbin/startproc ]; then
|
||||
CTDB_INIT_STYLE="suse"
|
||||
+ elif [ -x /bin/rc-status ]; then
|
||||
+ CTDB_INIT_STYLE="gentoo"
|
||||
elif [ -x /sbin/start-stop-daemon ]; then
|
||||
CTDB_INIT_STYLE="ubuntu"
|
||||
else
|
||||
@@ -400,6 +404,9 @@
|
||||
[ -x /etc/init.d/nfslock ] && {
|
||||
PLATFORM="rhel"
|
||||
}
|
||||
+ [ -x etc/init.d/nfs ] && {
|
||||
+ PLATFORM="gentoo"
|
||||
+ }
|
||||
|
||||
case $PLATFORM in
|
||||
sles)
|
||||
@@ -424,6 +431,16 @@
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
+ gentoo)
|
||||
+ case $1 in
|
||||
+ start)
|
||||
+ service nfs start
|
||||
+ ;;
|
||||
+ stop)
|
||||
+ service nfs stop > /dev/null 2>&1
|
||||
+ ;;
|
||||
+ esac
|
||||
+ ;;
|
||||
*)
|
||||
echo "Unknown platform. NFS is not supported with ctdb"
|
||||
exit 1
|
||||
@@ -442,6 +459,9 @@
|
||||
[ -x /etc/init.d/nfslock ] && {
|
||||
PLATFORM="rhel"
|
||||
}
|
||||
+ [ -x etc/init.d/nfs ] && {
|
||||
+ PLATFORM="gentoo"
|
||||
+ }
|
||||
|
||||
case $PLATFORM in
|
||||
sles)
|
||||
@@ -466,6 +486,18 @@
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
+ gentoo)
|
||||
+ # for gentoo there is no service for lockmanager
|
||||
+ # so we instead just shutdown/restart nfs
|
||||
+ case $1 in
|
||||
+ start)
|
||||
+ service nfs start
|
||||
+ ;;
|
||||
+ stop)
|
||||
+ service nfs stop > /dev/null 2>&1
|
||||
+ ;;
|
||||
+ esac
|
||||
+ ;;
|
||||
*)
|
||||
echo "Unknown platform. NFS locking is not supported with ctdb"
|
||||
exit 1
|
||||
@ -1,81 +0,0 @@
|
||||
#!/sbin/openrc-run
|
||||
|
||||
depend() {
|
||||
need localmount
|
||||
need net
|
||||
before samba
|
||||
after bootmisc
|
||||
}
|
||||
|
||||
start() {
|
||||
ebegin "Starting ctdb"
|
||||
|
||||
[ -z "$CTDB_RECOVERY_LOCK" ] && {
|
||||
eerror "You must configure the location of the CTDB_RECOVERY_LOCK in /etc/conf.d/ctdb"
|
||||
return 1
|
||||
}
|
||||
|
||||
[ -z "$CTDB_PUBLIC_ADDRESSES" ] && {
|
||||
eerror "You must configure the location of the CTDB_PUBLIC_ADDRESSES in /etc/conf.d/ctdb"
|
||||
return 1
|
||||
}
|
||||
|
||||
[ -z "$CTDB_PUBLIC_INTERFACE" ] && {
|
||||
eerror "You must configure the location of the CTDB_PUBLIC_INTERFACE in /etc/conf.d/ctdb"
|
||||
return 1
|
||||
}
|
||||
|
||||
CTDB_OPTIONS="$CTDB_OPTIONS --reclock=$CTDB_RECOVERY_LOCK"
|
||||
|
||||
# build up CTDB_OPTIONS variable from optional parameters
|
||||
[ -z "$CTDB_LOGFILE" ] || CTDB_OPTIONS="$CTDB_OPTIONS --logfile=$CTDB_LOGFILE"
|
||||
[ -z "$CTDB_NODES" ] || CTDB_OPTIONS="$CTDB_OPTIONS --nlist=$CTDB_NODES"
|
||||
[ -z "$CTDB_SOCKET" ] || CTDB_OPTIONS="$CTDB_OPTIONS --socket=$CTDB_SOCKET"
|
||||
[ -z "$CTDB_PUBLIC_ADDRESSES" ] || CTDB_OPTIONS="$CTDB_OPTIONS --public-addresses=$CTDB_PUBLIC_ADDRESSES"
|
||||
[ -z "$CTDB_PUBLIC_INTERFACE" ] || CTDB_OPTIONS="$CTDB_OPTIONS --public-interface=$CTDB_PUBLIC_INTERFACE"
|
||||
[ -z "$CTDB_SINGLE_PUBLIC_IP" ] || CTDB_OPTIONS="$CTDB_OPTIONS --single-public-ip=$CTDB_SINGLE_PUBLIC_IP"
|
||||
[ -z "$CTDB_DBDIR" ] || CTDB_OPTIONS="$CTDB_OPTIONS --dbdir=$CTDB_DBDIR"
|
||||
[ -z "$CTDB_DBDIR_PERSISTENT" ] || CTDB_OPTIONS="$CTDB_OPTIONS --dbdir-persistent=$CTDB_DBDIR_PERSISTENT"
|
||||
[ -z "$CTDB_EVENT_SCRIPT_DIR" ] || CTDB_OPTIONS="$CTDB_OPTIONS --event-script-dir $CTDB_EVENT_SCRIPT_DIR"
|
||||
[ -z "$CTDB_TRANSPORT" ] || CTDB_OPTIONS="$CTDB_OPTIONS --transport $CTDB_TRANSPORT"
|
||||
[ -z "$CTDB_DEBUGLEVEL" ] || CTDB_OPTIONS="$CTDB_OPTIONS -d $CTDB_DEBUGLEVEL"
|
||||
[ -z "$CTDB_START_AS_DISABLED" ] || [ "$CTDB_START_AS_DISABLED" != "yes" ] || {
|
||||
CTDB_OPTIONS="$CTDB_OPTIONS --start-as-disabled"
|
||||
}
|
||||
[ -z "$CTDB_CAPABILITY_RECMASTER" ] || [ "$CTDB_CAPABILITY_RECMASTER" != "no" ] || {
|
||||
CTDB_OPTIONS="$CTDB_OPTIONS --no-recmaster"
|
||||
}
|
||||
[ -z "$CTDB_CAPABILITY_LMASTER" ] || [ "$CTDB_CAPABILITY_LMASTER" != "no" ] || {
|
||||
CTDB_OPTIONS="$CTDB_OPTIONS --no-lmaster"
|
||||
}
|
||||
[ -z "$CTDB_LVS_PUBLIC_IP" ] || {
|
||||
CTDB_OPTIONS="$CTDB_OPTIONS --lvs"
|
||||
}
|
||||
[ -z "$CTDB_SCRIPT_LOG_LEVEL" ] || {
|
||||
CTDB_OPTIONS="$CTDB_OPTIONS --script-log-level=$CTDB_SCRIPT_LOG_LEVEL"
|
||||
}
|
||||
|
||||
# check all persistent databases that they look ok
|
||||
PERSISTENT_DB_DIR="/var/ctdb/persistent"
|
||||
[ -z "$CTDB_DBDIR" ] || {
|
||||
PERSISTENT_DB_DIR="$CTDB_DBDIR/persistent"
|
||||
}
|
||||
mkdir -p $PERSISTENT_DB_DIR 2>/dev/null
|
||||
for PDBASE in `ls $PERSISTENT_DB_DIR/*.tdb.[0-9] 2>/dev/null`; do
|
||||
/usr/bin/tdbdump $PDBASE >/dev/null 2>/dev/null || {
|
||||
eerror "Persistent database $PDBASE is corrupted! CTDB will not start."
|
||||
return 1
|
||||
}
|
||||
done
|
||||
|
||||
start-stop-daemon --start --background --exec /usr/sbin/ctdbd \
|
||||
--pidfile /var/run/ctdbd.pid -- $CTDB_OPTIONS
|
||||
eend $?
|
||||
|
||||
}
|
||||
|
||||
stop() {
|
||||
start-stop-daemon --stop --exec /usr/sbin/ctdbd \
|
||||
--pidfile /var/run/ctdbd.pid
|
||||
}
|
||||
|
||||
@ -1,59 +0,0 @@
|
||||
diff -Naur Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.firebird Firebird-2.5.0.26074-0_deps-flags/builds/posix/Makefile.in.firebird
|
||||
--- Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.firebird 2010-11-09 12:42:45.000000000 -0500
|
||||
+++ Firebird-2.5.0.26074-0_deps-flags/builds/posix/Makefile.in.firebird 2011-03-28 15:10:09.814370706 -0400
|
||||
@@ -158,7 +158,7 @@
|
||||
# some complications particularly for super in needing to start the server
|
||||
# that you are currently building. MOD 28-July-2002
|
||||
|
||||
-firebird_basic: btyacc_binary external_libraries firebird_boot basic_targets
|
||||
+firebird_basic: firebird_boot basic_targets
|
||||
|
||||
firebird_boot: updateBuildNum boot_phase1 boot_phase2
|
||||
|
||||
diff -Naur Firebird-2.5.0.26074-0_orig/builds/posix/make.defaults Firebird-2.5.0.26074-0_deps-flags/builds/posix/make.defaults
|
||||
--- Firebird-2.5.0.26074-0_orig/builds/posix/make.defaults 2010-11-09 12:42:45.000000000 -0500
|
||||
+++ Firebird-2.5.0.26074-0_deps-flags/builds/posix/make.defaults 2011-03-28 15:21:26.904370708 -0400
|
||||
@@ -138,7 +138,7 @@
|
||||
AR= ar @AR_OPTIONS@ crsu
|
||||
LN= @LN_S@
|
||||
RANLIB= @RANLIB@
|
||||
-BTYACC=$(ROOT)/extern/btyacc/btyacc
|
||||
+BTYACC=/usr/bin/btyacc
|
||||
|
||||
CC = @CC@
|
||||
CXX = @CXX@
|
||||
diff -Naur Firebird-2.5.0.26074-0_orig/builds/posix/prefix.linux Firebird-2.5.0.26074-0_deps-flags/builds/posix/prefix.linux
|
||||
--- Firebird-2.5.0.26074-0_orig/builds/posix/prefix.linux 2010-11-09 12:42:45.000000000 -0500
|
||||
+++ Firebird-2.5.0.26074-0_deps-flags/builds/posix/prefix.linux 2011-03-25 21:38:29.031037374 -0400
|
||||
@@ -18,11 +18,10 @@
|
||||
#
|
||||
# 2 Oct 2002, Nickolay Samofatov - Major cleanup
|
||||
|
||||
-COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0
|
||||
-OPTIMIZE_FLAGS=-O3 -march=i586 -mtune=i686 -fno-omit-frame-pointer
|
||||
+COMMON_FLAGS=-DLINUX -MMD -fPIC -fmessage-length=0
|
||||
WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable
|
||||
|
||||
-PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
|
||||
+PROD_FLAGS=$(COMMON_FLAGS)
|
||||
#DEV_FLAGS=-DUSE_VALGRIND -p $(COMMON_FLAGS) $(WARN_FLAGS)
|
||||
DEV_FLAGS=-p $(COMMON_FLAGS) $(WARN_FLAGS)
|
||||
|
||||
diff -Naur Firebird-2.5.0.26074-0_orig/builds/posix/prefix.linux_amd64 Firebird-2.5.0.26074-0_deps-flags/builds/posix/prefix.linux_amd64
|
||||
--- Firebird-2.5.0.26074-0_orig/builds/posix/prefix.linux_amd64 2010-11-09 12:42:45.000000000 -0500
|
||||
+++ Firebird-2.5.0.26074-0_deps-flags/builds/posix/prefix.linux_amd64 2011-03-25 21:39:15.134370707 -0400
|
||||
@@ -18,12 +18,11 @@
|
||||
#
|
||||
# 2 Oct 2002, Nickolay Samofatov - Major cleanup
|
||||
|
||||
-COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DAMD64 -pipe -MMD -fPIC -fmessage-length=0
|
||||
-OPTIMIZE_FLAGS=-O3 -fno-omit-frame-pointer
|
||||
+COMMON_FLAGS=-DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DAMD64 -MMD -fPIC -fmessage-length=0
|
||||
WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable
|
||||
CXXFLAGS:= $(CXXFLAGS) -fno-rtti
|
||||
|
||||
-PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
|
||||
+PROD_FLAGS=$(COMMON_FLAGS)
|
||||
#DEV_FLAGS=-DUSE_VALGRIND $(COMMON_FLAGS) $(WARN_FLAGS)
|
||||
DEV_FLAGS=$(COMMON_FLAGS) $(WARN_FLAGS)
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
--- build.xml.orig 2006-10-17 22:25:57.000000000 +0200
|
||||
+++ build.xml 2006-10-17 22:27:34.000000000 +0200
|
||||
@@ -21,26 +21,26 @@
|
||||
<property name="libreadline-java" value="libreadline-java-0.8.0.jar"/>
|
||||
|
||||
<path id="compile.classpath">
|
||||
- <fileset dir="${lib}">
|
||||
- <include name="${libreadline-java}"/>
|
||||
- <include name="${commons-cli}"/>
|
||||
- </fileset>
|
||||
+ <fileset dir="${lib}" includes="**/*.jar"/>
|
||||
</path>
|
||||
|
||||
<path id="run.classpath">
|
||||
<path refid="compile.classpath" />
|
||||
<pathelement path="${classes}" />
|
||||
</path>
|
||||
-
|
||||
+
|
||||
+ <!--
|
||||
<taskdef name="ant-server" classname="net.sweetohm.ant.server.ServerTask">
|
||||
<classpath>
|
||||
<pathelement location="${lib}/build/sat-0.7.jar" />
|
||||
</classpath>
|
||||
</taskdef>
|
||||
+
|
||||
|
||||
<target name="server">
|
||||
<ant-server/>
|
||||
</target>
|
||||
+ -->
|
||||
|
||||
<target name="prepare">
|
||||
<tstamp>
|
||||
@ -1,42 +0,0 @@
|
||||
--- a/bin/henplus 2004-02-02 14:53:28.000000000 +0100
|
||||
+++ b/bin/henplus 2004-07-23 11:21:11.518166136 +0200
|
||||
@@ -2,6 +2,7 @@
|
||||
# $Id$
|
||||
##
|
||||
|
||||
+echo $(dirname $0)
|
||||
# additional flags you might want to pass to the java interpreter
|
||||
# like -Dfile.encoding=ISO-8859-1
|
||||
JAVA_FLAGS=
|
||||
@@ -13,20 +14,8 @@
|
||||
JAVA=$JAVA_HOME/bin/java
|
||||
fi
|
||||
|
||||
-##------------------
|
||||
-THISDIR=`dirname $0`
|
||||
-HENPLUSDIR=$THISDIR/../share/henplus
|
||||
-
|
||||
-# not yet installed ? Then look in the build directory
|
||||
-if [ ! -d "$HENPLUSDIR" ] ; then
|
||||
- HENPLUSDIR=$THISDIR/../build
|
||||
-fi
|
||||
-
|
||||
-# location of the readline lib.
|
||||
-# Modify this, if you installation stores this at a different
|
||||
-# position.
|
||||
-LD_LIBRARY_PATH=$THISDIR/../lib:/usr/lib/jni:$LD_LIBRARY_PATH
|
||||
-CLASSPATH=$CLASSPATH:$THISDIR/../share/java/libreadline-java.jar
|
||||
+HENPLUSDIR=$(dirname $(java-config -p henplus))
|
||||
+CLASSPATH=$CLASSPATH:$(java-config -p libreadline-java)
|
||||
|
||||
# you may just throw your own jar files in this dir.
|
||||
# (like additional JDBC-drivers, that are not in default
|
||||
@@ -65,7 +54,4 @@
|
||||
CLASSPATH=$CLASSPATH:$f
|
||||
fi
|
||||
done
|
||||
-
|
||||
-export CLASSPATH LD_LIBRARY_PATH
|
||||
-
|
||||
-exec $JAVA $JAVA_FLAGS henplus.HenPlus "$@"
|
||||
+LD_LIBRARY_PATH="$(java-config -i libreadline-java):$LD_LIBRARY_PATH" exec $JAVA -cp $CLASSPATH $JAVA_FLAGS henplus.HenPlus "$@"
|
||||
@ -1,18 +0,0 @@
|
||||
--- configure.ac_orig 2012-07-14 07:14:19.000000000 +1000
|
||||
+++ configure.ac 2012-07-23 14:17:38.702411605 +1000
|
||||
@@ -298,12 +298,11 @@
|
||||
CPPFLAGS="-I$with_sqlite/include $CPPFLAGS"
|
||||
AC_CHECK_HEADERS([sqlite3.h], [
|
||||
sqlite="yes"
|
||||
- if test -r "$with_sqlite/lib/libsqlite3.a"; then
|
||||
+ AC_CHECK_LIB(sqlite3, main,[
|
||||
+
|
||||
DBCPPFLAGS="$DBCPPFLAGS -I$with_sqlite/include"
|
||||
DBLDFLAGS="$DBLDFLAGS -L$with_sqlite/lib/ -lsqlite3"
|
||||
- else
|
||||
- sqlite="no"
|
||||
- fi
|
||||
+ ],[sqlite="no"])
|
||||
], [sqlite="no"])
|
||||
LDFLAGS=$svd_LDFLAGS
|
||||
CPPFLAGS=$svd_CPPFLAGS
|
||||
@ -1,9 +0,0 @@
|
||||
# Your API key - See: http://mms.10gen.com/settings
|
||||
API_KEY=""
|
||||
SECRET_KEY=""
|
||||
|
||||
# Seconds between Mongo status checks
|
||||
#COLLECTION_INTERVAL=56
|
||||
|
||||
# Seconds between cloud configuration checks
|
||||
#CONF_INTERVAL=120
|
||||
@ -1,41 +0,0 @@
|
||||
#!/sbin/openrc-run
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
ROOTDIR=/opt/mms-agent
|
||||
PIDFILE=/var/run/mm-agent.pid
|
||||
EXEC="/usr/bin/env python agent.py"
|
||||
LOGFILE=/var/log/mongodb/mms-agent.log
|
||||
|
||||
depend() {
|
||||
need net
|
||||
use syslog
|
||||
}
|
||||
|
||||
start() {
|
||||
ebegin "Starting ${SVCNAME}"
|
||||
|
||||
checkpath -d -m 0755 -o root:root /var/run/
|
||||
|
||||
# Setup API/SECRETY KEYS
|
||||
sed -i -e "s/^mms_key.*/mms_key = '${API_KEY}'/g" \
|
||||
-e "s/^secret_key.*/secret_key = '${SECRET_KEY}'/g" ${ROOTDIR}/settings.py &>/dev/null
|
||||
|
||||
# Tune the agent
|
||||
[ -z "${COLLECTION_INTERVAL}" ] || sed -i \
|
||||
-e "s/^collection_interval.*/collection_interval = ${COLLECTION_INTERVAL}/g" ${ROOTDIR}/settings.py &>/dev/null
|
||||
[ -z "${CONF_INTERVAL}" ] || sed -i \
|
||||
-e "s/^conf_interval.*/conf_interval = ${CONF_INTERVAL}/g" ${ROOTDIR}/settings.py &>/dev/null
|
||||
|
||||
start-stop-daemon --start --chdir ${ROOTDIR} --exec ${EXEC} \
|
||||
--pidfile "${PIDFILE}" --make-pidfile --background \
|
||||
--user mongodb:mongodb --stdout ${LOGFILE} --stderr ${LOGFILE}
|
||||
eend $?
|
||||
}
|
||||
|
||||
stop() {
|
||||
ebegin "Requesting ${SVCNAME} to stop"
|
||||
start-stop-daemon --stop --pidfile "${PIDFILE}"
|
||||
eend $?
|
||||
}
|
||||
@ -1,31 +0,0 @@
|
||||
#!/sbin/openrc-run
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
ROOTDIR=/opt/mms-agent
|
||||
PIDFILE=/var/run/mm-agent.pid
|
||||
EXEC="/usr/bin/env python agent.py"
|
||||
LOGFILE=/var/log/mongodb/mms-agent.log
|
||||
|
||||
depend() {
|
||||
need net
|
||||
use syslog
|
||||
}
|
||||
|
||||
start() {
|
||||
ebegin "Starting ${SVCNAME}"
|
||||
|
||||
checkpath -d -m 0755 -o root:root /var/run/
|
||||
|
||||
start-stop-daemon --start --chdir ${ROOTDIR} --exec ${EXEC} \
|
||||
--pidfile "${PIDFILE}" --make-pidfile --background \
|
||||
--user mongodb:mongodb --stdout ${LOGFILE} --stderr ${LOGFILE}
|
||||
eend $?
|
||||
}
|
||||
|
||||
stop() {
|
||||
ebegin "Requesting ${SVCNAME} to stop"
|
||||
start-stop-daemon --stop --pidfile "${PIDFILE}"
|
||||
eend $?
|
||||
}
|
||||
@ -1,25 +0,0 @@
|
||||
#!/sbin/openrc-run
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
logfile=/var/log/mongodb/mms-agent.log
|
||||
run_dir=${run_dir:-/run/mongodb}
|
||||
|
||||
command="/usr/bin/python2 agent.py &>${logfile}"
|
||||
command_background="true"
|
||||
|
||||
pidfile=${run_dir}/${SVCNAME}.pid
|
||||
user=${user:-mongodb}
|
||||
group=${group:-mongodb}
|
||||
start_stop_daemon_args="--user ${user} --group ${group}"
|
||||
|
||||
depend() {
|
||||
need net
|
||||
use syslog
|
||||
}
|
||||
|
||||
start_pre() {
|
||||
checkpath -d -m 0750 -o "${user}":"${group}" "${run_dir}"
|
||||
cd /opt/mms-agent
|
||||
}
|
||||
@ -1,36 +0,0 @@
|
||||
--- a/SConstruct 2011-11-16 22:11:39.000000000 +0100
|
||||
+++ b/SConstruct 2011-11-17 16:30:16.144117550 +0100
|
||||
@@ -688,7 +688,7 @@
|
||||
env["CXX"] = "distcc " + env["CXX"]
|
||||
|
||||
# -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
|
||||
- env.Append( CPPFLAGS="-fPIC -fno-strict-aliasing -ggdb -pthread -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch" )
|
||||
+ env.Append( CPPFLAGS="-fPIC -fno-strict-aliasing -pthread -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch" )
|
||||
# env.Append( " -Wconversion" ) TODO: this doesn't really work yet
|
||||
if linux:
|
||||
env.Append( CPPFLAGS=" -Werror " )
|
||||
@@ -696,7 +696,9 @@
|
||||
env.Append( CPPFLAGS=" -fno-builtin-memcmp " ) # glibc's memcmp is faster than gcc's
|
||||
|
||||
env.Append( CPPDEFINES="_FILE_OFFSET_BITS=64" )
|
||||
+ env.Append( CXXFLAGS=os.environ['CXXFLAGS'])
|
||||
env.Append( CXXFLAGS=" -Wnon-virtual-dtor " )
|
||||
+ env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
|
||||
env.Append( LINKFLAGS=" -fPIC -pthread -rdynamic" )
|
||||
env.Append( LIBS=[] )
|
||||
|
||||
@@ -706,12 +708,13 @@
|
||||
|
||||
if linux and has_option( "sharedclient" ):
|
||||
env.Append( LINKFLAGS=" -Wl,--as-needed -Wl,-zdefs " )
|
||||
+ env.Append( SHLINKFLAGS=" -Wl,-soname=libmongoclient.so " )
|
||||
|
||||
if debugBuild:
|
||||
env.Append( CPPFLAGS=" -O0 -fstack-protector " );
|
||||
env['ENV']['GLIBCXX_FORCE_NEW'] = 1; # play nice with valgrind
|
||||
else:
|
||||
- env.Append( CPPFLAGS=" -O3 " )
|
||||
+ env.Append( CXXFLAGS=" -O3 " )
|
||||
#env.Append( CPPFLAGS=" -fprofile-generate" )
|
||||
#env.Append( LINKFLAGS=" -fprofile-generate" )
|
||||
# then:
|
||||
@ -1,245 +0,0 @@
|
||||
diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/db.cpp mongodb-src-r2.0.6-patched/db/db.cpp
|
||||
--- mongodb-src-r2.0.6/db/db.cpp 2012-06-04 15:42:54.000000000 +0200
|
||||
+++ mongodb-src-r2.0.6-patched/db/db.cpp 2012-07-10 22:27:16.496886220 +0200
|
||||
@@ -326,7 +326,7 @@
|
||||
boost::filesystem::path path( dbpath );
|
||||
for ( boost::filesystem::directory_iterator i( path );
|
||||
i != boost::filesystem::directory_iterator(); ++i ) {
|
||||
- string fileName = boost::filesystem::path(*i).leaf();
|
||||
+ string fileName = boost::filesystem::path(*i).leaf().string();
|
||||
if ( boost::filesystem::is_directory( *i ) &&
|
||||
fileName.length() && fileName[ 0 ] == '$' )
|
||||
boost::filesystem::remove_all( *i );
|
||||
@@ -655,11 +655,6 @@
|
||||
dbExecCommand = argv[0];
|
||||
|
||||
srand(curTimeMicros());
|
||||
-#if( BOOST_VERSION >= 104500 )
|
||||
- boost::filesystem::path::default_name_check( boost::filesystem2::no_check );
|
||||
-#else
|
||||
- boost::filesystem::path::default_name_check( boost::filesystem::no_check );
|
||||
-#endif
|
||||
|
||||
{
|
||||
unsigned x = 0x12345678;
|
||||
@@ -976,7 +971,7 @@
|
||||
if (params.count("shutdown")){
|
||||
bool failed = false;
|
||||
|
||||
- string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).native_file_string();
|
||||
+ string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).string();
|
||||
if ( !boost::filesystem::exists( name ) || boost::filesystem::file_size( name ) == 0 )
|
||||
failed = true;
|
||||
|
||||
diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/dur.cpp mongodb-src-r2.0.6-patched/db/dur.cpp
|
||||
--- mongodb-src-r2.0.6/db/dur.cpp 2012-06-04 15:42:54.000000000 +0200
|
||||
+++ mongodb-src-r2.0.6-patched/db/dur.cpp 2012-07-10 21:56:28.866778732 +0200
|
||||
@@ -692,7 +692,7 @@
|
||||
|
||||
bool samePartition = true;
|
||||
try {
|
||||
- const string dbpathDir = boost::filesystem::path(dbpath).native_directory_string();
|
||||
+ const string dbpathDir = boost::filesystem::path(dbpath).string();
|
||||
samePartition = onSamePartition(getJournalDir().string(), dbpathDir);
|
||||
}
|
||||
catch(...) {
|
||||
diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/dur_journal.cpp mongodb-src-r2.0.6-patched/db/dur_journal.cpp
|
||||
--- mongodb-src-r2.0.6/db/dur_journal.cpp 2012-06-04 15:42:54.000000000 +0200
|
||||
+++ mongodb-src-r2.0.6-patched/db/dur_journal.cpp 2012-07-10 22:04:18.583472723 +0200
|
||||
@@ -169,7 +169,7 @@
|
||||
for ( boost::filesystem::directory_iterator i( getJournalDir() );
|
||||
i != boost::filesystem::directory_iterator();
|
||||
++i ) {
|
||||
- string fileName = boost::filesystem::path(*i).leaf();
|
||||
+ string fileName = boost::filesystem::path(*i).leaf().string();
|
||||
if( str::startsWith(fileName, "j._") )
|
||||
return true;
|
||||
}
|
||||
@@ -185,7 +185,7 @@
|
||||
for ( boost::filesystem::directory_iterator i( getJournalDir() );
|
||||
i != boost::filesystem::directory_iterator();
|
||||
++i ) {
|
||||
- string fileName = boost::filesystem::path(*i).leaf();
|
||||
+ string fileName = boost::filesystem::path(*i).leaf().string();
|
||||
if( str::startsWith(fileName, "j._") ) {
|
||||
try {
|
||||
removeOldJournalFile(*i);
|
||||
diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/dur_recover.cpp mongodb-src-r2.0.6-patched/db/dur_recover.cpp
|
||||
--- mongodb-src-r2.0.6/db/dur_recover.cpp 2012-06-04 15:42:54.000000000 +0200
|
||||
+++ mongodb-src-r2.0.6-patched/db/dur_recover.cpp 2012-07-10 22:02:18.226799055 +0200
|
||||
@@ -71,7 +71,7 @@
|
||||
i != filesystem::directory_iterator();
|
||||
++i ) {
|
||||
filesystem::path filepath = *i;
|
||||
- string fileName = filesystem::path(*i).leaf();
|
||||
+ string fileName = filesystem::path(*i).leaf().string();
|
||||
if( str::startsWith(fileName, "j._") ) {
|
||||
unsigned u = str::toUnsigned( str::after(fileName, '_') );
|
||||
if( m.count(u) ) {
|
||||
@@ -84,7 +84,7 @@
|
||||
if( i != m.begin() && m.count(i->first - 1) == 0 ) {
|
||||
uasserted(13532,
|
||||
str::stream() << "unexpected file in journal directory " << dir.string()
|
||||
- << " : " << filesystem::path(i->second).leaf() << " : can't find its preceeding file");
|
||||
+ << " : " << filesystem::path(i->second).leaf().string() << " : can't find its preceeding file");
|
||||
}
|
||||
files.push_back(i->second);
|
||||
}
|
||||
diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/instance.cpp mongodb-src-r2.0.6-patched/db/instance.cpp
|
||||
--- mongodb-src-r2.0.6/db/instance.cpp 2012-06-04 15:42:54.000000000 +0200
|
||||
+++ mongodb-src-r2.0.6-patched/db/instance.cpp 2012-07-10 22:08:55.213488817 +0200
|
||||
@@ -645,13 +645,13 @@
|
||||
i != boost::filesystem::directory_iterator(); ++i ) {
|
||||
if ( directoryperdb ) {
|
||||
boost::filesystem::path p = *i;
|
||||
- string dbName = p.leaf();
|
||||
+ string dbName = p.leaf().string();
|
||||
p /= ( dbName + ".ns" );
|
||||
if ( MMF::exists( p ) )
|
||||
names.push_back( dbName );
|
||||
}
|
||||
else {
|
||||
- string fileName = boost::filesystem::path(*i).leaf();
|
||||
+ string fileName = boost::filesystem::path(*i).leaf().string();
|
||||
if ( fileName.length() > 3 && fileName.substr( fileName.length() - 3, 3 ) == ".ns" )
|
||||
names.push_back( fileName.substr( 0, fileName.length() - 3 ) );
|
||||
}
|
||||
@@ -893,7 +893,7 @@
|
||||
}
|
||||
|
||||
void acquirePathLock(bool doingRepair) {
|
||||
- string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).native_file_string();
|
||||
+ string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).string();
|
||||
|
||||
bool oldFile = false;
|
||||
|
||||
diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/pdfile.cpp mongodb-src-r2.0.6-patched/db/pdfile.cpp
|
||||
--- mongodb-src-r2.0.6/db/pdfile.cpp 2012-06-04 15:42:54.000000000 +0200
|
||||
+++ mongodb-src-r2.0.6-patched/db/pdfile.cpp 2012-07-10 22:11:44.103498643 +0200
|
||||
@@ -1987,7 +1987,7 @@
|
||||
virtual bool apply( const Path &p ) {
|
||||
if ( !boost::filesystem::exists( p ) )
|
||||
return false;
|
||||
- boostRenameWrapper( p, newPath_ / ( p.leaf() + ".bak" ) );
|
||||
+ boostRenameWrapper( p, newPath_ / ( p.leaf().string() + ".bak" ) );
|
||||
return true;
|
||||
}
|
||||
virtual const char * op() const {
|
||||
@@ -2093,7 +2093,7 @@
|
||||
uniqueReservedPath( ( preserveClonedFilesOnFailure || backupOriginalFiles ) ?
|
||||
"backup" : "$tmp" );
|
||||
BOOST_CHECK_EXCEPTION( boost::filesystem::create_directory( reservedPath ) );
|
||||
- string reservedPathString = reservedPath.native_directory_string();
|
||||
+ string reservedPathString = reservedPath.string();
|
||||
|
||||
bool res;
|
||||
{
|
||||
diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/dbtests/framework.cpp mongodb-src-r2.0.6-patched/dbtests/framework.cpp
|
||||
--- mongodb-src-r2.0.6/dbtests/framework.cpp 2012-06-04 15:42:54.000000000 +0200
|
||||
+++ mongodb-src-r2.0.6-patched/dbtests/framework.cpp 2012-07-10 22:29:20.610226773 +0200
|
||||
@@ -281,7 +281,7 @@
|
||||
boost::filesystem::create_directory(p);
|
||||
}
|
||||
|
||||
- string dbpathString = p.native_directory_string();
|
||||
+ string dbpathString = p.string();
|
||||
dbpath = dbpathString.c_str();
|
||||
|
||||
cmdLine.prealloc = false;
|
||||
diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/pch.h mongodb-src-r2.0.6-patched/pch.h
|
||||
--- mongodb-src-r2.0.6/pch.h 2012-06-04 15:42:54.000000000 +0200
|
||||
+++ mongodb-src-r2.0.6-patched/pch.h 2012-07-10 21:35:57.133373738 +0200
|
||||
@@ -79,7 +79,7 @@
|
||||
//#include <boost/any.hpp>
|
||||
#include "boost/thread/once.hpp"
|
||||
//#include <boost/archive/iterators/transform_width.hpp>
|
||||
-#define BOOST_FILESYSTEM_VERSION 2
|
||||
+#define BOOST_FILESYSTEM_VERSION 3
|
||||
#include <boost/filesystem/convenience.hpp>
|
||||
#include <boost/filesystem/exception.hpp>
|
||||
#include <boost/filesystem/operations.hpp>
|
||||
diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/shell/shell_utils.cpp mongodb-src-r2.0.6-patched/shell/shell_utils.cpp
|
||||
--- mongodb-src-r2.0.6/shell/shell_utils.cpp 2012-06-04 15:42:54.000000000 +0200
|
||||
+++ mongodb-src-r2.0.6-patched/shell/shell_utils.cpp 2012-07-10 22:38:58.443593723 +0200
|
||||
@@ -388,7 +388,7 @@
|
||||
#endif
|
||||
}
|
||||
|
||||
- argv_.push_back( programPath.native_file_string() );
|
||||
+ argv_.push_back( programPath.string() );
|
||||
|
||||
port_ = -1;
|
||||
|
||||
diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/tools/restore.cpp mongodb-src-r2.0.6-patched/tools/restore.cpp
|
||||
--- mongodb-src-r2.0.6/tools/restore.cpp 2012-06-04 15:42:54.000000000 +0200
|
||||
+++ mongodb-src-r2.0.6-patched/tools/restore.cpp 2012-07-10 22:45:00.046948094 +0200
|
||||
@@ -131,7 +131,7 @@
|
||||
log(2) << "drillDown: " << root.string() << endl;
|
||||
|
||||
// skip hidden files and directories
|
||||
- if (root.leaf()[0] == '.' && root.leaf() != ".")
|
||||
+ if (root.leaf().string()[0] == '.' && root.leaf().string() != ".")
|
||||
return;
|
||||
|
||||
if ( is_directory( root ) ) {
|
||||
@@ -210,7 +210,7 @@
|
||||
ns += "." + _coll;
|
||||
}
|
||||
else {
|
||||
- string l = root.leaf();
|
||||
+ string l = root.leaf().string();
|
||||
l = l.substr( 0 , l.find_last_of( "." ) );
|
||||
ns += "." + l;
|
||||
}
|
||||
diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/tools/tool.cpp mongodb-src-r2.0.6-patched/tools/tool.cpp
|
||||
--- mongodb-src-r2.0.6/tools/tool.cpp 2012-06-04 15:42:54.000000000 +0200
|
||||
+++ mongodb-src-r2.0.6-patched/tools/tool.cpp 2012-07-10 22:23:53.356874403 +0200
|
||||
@@ -113,12 +113,6 @@
|
||||
// we want durability to be disabled.
|
||||
cmdLine.dur = false;
|
||||
|
||||
-#if( BOOST_VERSION >= 104500 )
|
||||
- boost::filesystem::path::default_name_check( boost::filesystem2::no_check );
|
||||
-#else
|
||||
- boost::filesystem::path::default_name_check( boost::filesystem::no_check );
|
||||
-#endif
|
||||
-
|
||||
_name = argv[0];
|
||||
|
||||
/* using the same style as db.cpp */
|
||||
diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/util/background.cpp mongodb-src-r2.0.6-patched/util/background.cpp
|
||||
--- mongodb-src-r2.0.6/util/background.cpp 2012-06-04 15:42:54.000000000 +0200
|
||||
+++ mongodb-src-r2.0.6-patched/util/background.cpp 2012-07-10 21:47:40.420081320 +0200
|
||||
@@ -89,7 +89,7 @@
|
||||
if ( msTimeOut ) {
|
||||
// add msTimeOut millisecond to current time
|
||||
boost::xtime xt;
|
||||
- boost::xtime_get( &xt, boost::TIME_UTC );
|
||||
+ boost::xtime_get( &xt, boost::TIME_UTC_ );
|
||||
|
||||
unsigned long long ns = msTimeOut * 1000000ULL; // milli to nano
|
||||
if ( xt.nsec + ns < 1000000000 ) {
|
||||
diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/util/concurrency/mutex.h mongodb-src-r2.0.6-patched/util/concurrency/mutex.h
|
||||
--- mongodb-src-r2.0.6/util/concurrency/mutex.h 2012-06-04 15:42:54.000000000 +0200
|
||||
+++ mongodb-src-r2.0.6-patched/util/concurrency/mutex.h 2012-07-10 21:45:51.333408307 +0200
|
||||
@@ -29,7 +29,7 @@
|
||||
|
||||
inline boost::xtime incxtimemillis( long long s ) {
|
||||
boost::xtime xt;
|
||||
- boost::xtime_get(&xt, boost::TIME_UTC);
|
||||
+ boost::xtime_get(&xt, boost::TIME_UTC_);
|
||||
xt.sec += (int)( s / 1000 );
|
||||
xt.nsec += (int)(( s % 1000 ) * 1000000);
|
||||
if ( xt.nsec >= 1000000000 ) {
|
||||
diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/util/queue.h mongodb-src-r2.0.6-patched/util/queue.h
|
||||
--- mongodb-src-r2.0.6/util/queue.h 2012-06-04 15:42:54.000000000 +0200
|
||||
+++ mongodb-src-r2.0.6-patched/util/queue.h 2012-07-10 22:14:00.243506560 +0200
|
||||
@@ -82,7 +82,7 @@
|
||||
Timer timer;
|
||||
|
||||
boost::xtime xt;
|
||||
- boost::xtime_get(&xt, boost::TIME_UTC);
|
||||
+ boost::xtime_get(&xt, boost::TIME_UTC_);
|
||||
xt.sec += maxSecondsToWait;
|
||||
|
||||
scoped_lock l( _lock );
|
||||
@ -1,28 +0,0 @@
|
||||
--- a/SConstruct 2013-06-26 10:31:56.209089504 +0200
|
||||
+++ b/SConstruct 2013-06-26 10:33:59.177045991 +0200
|
||||
@@ -702,7 +702,6 @@
|
||||
# -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
|
||||
env.Append( CCFLAGS=["-fPIC",
|
||||
"-fno-strict-aliasing",
|
||||
- "-ggdb",
|
||||
"-pthread",
|
||||
"-Wall",
|
||||
"-Wsign-compare",
|
||||
@@ -710,14 +709,14 @@
|
||||
"-Winvalid-pch"] )
|
||||
# env.Append( " -Wconversion" ) TODO: this doesn't really work yet
|
||||
if linux:
|
||||
- env.Append( CCFLAGS=["-Werror", "-pipe"] )
|
||||
if not has_option('clang'):
|
||||
env.Append( CCFLAGS=["-fno-builtin-memcmp"] ) # glibc's memcmp is faster than gcc's
|
||||
|
||||
env.Append( CPPDEFINES=["_FILE_OFFSET_BITS=64"] )
|
||||
- env.Append( CXXFLAGS=["-Wnon-virtual-dtor", "-Woverloaded-virtual"] )
|
||||
+ env.Append( CXXFLAGS=os.environ['CXXFLAGS'])
|
||||
+ env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
|
||||
env.Append( LINKFLAGS=["-fPIC", "-pthread", "-rdynamic"] )
|
||||
- env.Append( LIBS=[] )
|
||||
+ env.Append( LIBS=['pcre', 'pcrecpp', 'snappy'] )
|
||||
|
||||
#make scons colorgcc friendly
|
||||
for key in ('HOME', 'TERM'):
|
||||
@ -1,35 +0,0 @@
|
||||
diff --git SConstruct SConstruct
|
||||
index 3886d1b..81c59a9 100644
|
||||
--- SConstruct
|
||||
+++ SConstruct
|
||||
@@ -811,19 +811,17 @@ if nix:
|
||||
# -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
|
||||
env.Append( CCFLAGS=["-fPIC",
|
||||
"-fno-strict-aliasing",
|
||||
- "-ggdb",
|
||||
"-pthread",
|
||||
"-Wall",
|
||||
"-Wsign-compare",
|
||||
"-Wno-unknown-pragmas",
|
||||
"-Winvalid-pch"] )
|
||||
# env.Append( " -Wconversion" ) TODO: this doesn't really work yet
|
||||
- if linux or darwin:
|
||||
- env.Append( CCFLAGS=["-Werror", "-pipe"] )
|
||||
|
||||
env.Append( CPPDEFINES=["_FILE_OFFSET_BITS=64"] )
|
||||
- env.Append( CXXFLAGS=["-Wnon-virtual-dtor", "-Woverloaded-virtual"] )
|
||||
env.Append( LINKFLAGS=["-fPIC", "-pthread"] )
|
||||
+ env.Append( CXXFLAGS=os.environ['CXXFLAGS'])
|
||||
+ env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
|
||||
|
||||
# SERVER-9761: Ensure early detection of missing symbols in dependent libraries at program
|
||||
# startup.
|
||||
@@ -840,7 +838,7 @@ if nix:
|
||||
if not darwin:
|
||||
env.Append( LINKFLAGS=["-rdynamic"] )
|
||||
|
||||
- env.Append( LIBS=[] )
|
||||
+ env.Append( LIBS=['pcre', 'pcrecpp', 'snappy', 'yaml-cpp'] )
|
||||
|
||||
#make scons colorgcc friendly
|
||||
for key in ('HOME', 'TERM'):
|
||||
@ -1,16 +0,0 @@
|
||||
# Mongos essentials
|
||||
MONGOS_EXEC="/usr/bin/mongos"
|
||||
MONGOS_RUN="/var/run/mongodb"
|
||||
MONGOS_USER="mongodb"
|
||||
|
||||
# Listen to specified IP, comment this to listen to all
|
||||
MONGOS_IP="127.0.0.1"
|
||||
|
||||
# Listen to specified port
|
||||
MONGOS_PORT="27018"
|
||||
|
||||
# 1 to 3 comma separated config servers (mandatory)
|
||||
MONGOS_CONFIGDB=""
|
||||
|
||||
# Set extra options here
|
||||
MONGOS_OPTIONS=""
|
||||
@ -1,50 +0,0 @@
|
||||
#!/sbin/openrc-run
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
depend() {
|
||||
use net
|
||||
}
|
||||
|
||||
checkconfig() {
|
||||
if [ -z "${MONGOS_CONFIGDB}" ]; then
|
||||
eerror "MONGOS_CONFIGDB is not defined, check your configuration file !"
|
||||
return 1
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
start() {
|
||||
checkconfig || return 1
|
||||
|
||||
checkpath -d -m 0750 -o "${MONGOS_USER}":mongodb "${MONGOS_RUN}"
|
||||
|
||||
# Listen to MONGOS_IP if configured
|
||||
[ -z "${MONGOS_IP}" ] || MONGOS_OPTIONS="--bind_ip ${MONGOS_IP} ${MONGOS_OPTIONS}"
|
||||
|
||||
# Baselayout-1 user should use --chuid instead of --user
|
||||
local USEROPT="--user"
|
||||
if [ ! -f /etc/init.d/sysfs ]; then
|
||||
USEROPT="--chuid"
|
||||
fi
|
||||
|
||||
ebegin "Starting ${SVCNAME}"
|
||||
start-stop-daemon --background --start --make-pidfile \
|
||||
--pidfile ${MONGOS_RUN:-/var/run/mongodb}/${SVCNAME}.pid \
|
||||
${USEROPT} ${MONGOS_USER:-mongodb} \
|
||||
--exec ${MONGOS_EXEC:-/usr/bin/mongos} \
|
||||
-- \
|
||||
--port ${MONGOS_PORT:-27018} \
|
||||
--unixSocketPrefix ${MONGOS_RUN:-/var/run/mongodb} \
|
||||
--logappend --logpath /var/log/mongodb/${SVCNAME}.log \
|
||||
--configdb ${MONGOS_CONFIGDB} \
|
||||
${MONGOS_OPTIONS}
|
||||
eend $?
|
||||
}
|
||||
|
||||
stop() {
|
||||
ebegin "Stopping ${SVCNAME}"
|
||||
start-stop-daemon --stop --pidfile ${MONGOS_RUN:-/var/run/mongodb}/${SVCNAME}.pid
|
||||
eend $?
|
||||
}
|
||||
@ -1,14 +0,0 @@
|
||||
diff -urNad mysql-connector-c++-1.0.6~r754~/CMakeLists.txt mysql-connector-c++-1.0.6~r754/CMakeLists.txt
|
||||
--- mysql-connector-c++-1.0.6~r754~/CMakeLists.txt 2009-08-20 22:25:35.000000000 +0200
|
||||
+++ mysql-connector-c++-1.0.6~r754/CMakeLists.txt 2009-08-20 22:25:57.000000000 +0200
|
||||
@@ -241,10 +241,6 @@
|
||||
ADD_SUBDIRECTORY(cppconn)
|
||||
ADD_SUBDIRECTORY(driver)
|
||||
ADD_SUBDIRECTORY(examples)
|
||||
-ADD_SUBDIRECTORY(test)
|
||||
-ADD_SUBDIRECTORY(test/framework)
|
||||
-ADD_SUBDIRECTORY(test/CJUnitTestsPort)
|
||||
-ADD_SUBDIRECTORY(test/unit)
|
||||
|
||||
IF(DEFINED CMAKE_SYSTEM_NAME AND ${CMAKE_SYSTEM_NAME} STREQUAL "SunOS")
|
||||
# see also README
|
||||
@ -1,85 +0,0 @@
|
||||
diff -urN mysql-connector-c++-1.1.0.old/CMakeLists.txt mysql-connector-c++-1.1.0/CMakeLists.txt
|
||||
--- mysql-connector-c++-1.1.0.old/CMakeLists.txt 2011-07-30 13:15:44.000000000 +0200
|
||||
+++ mysql-connector-c++-1.1.0/CMakeLists.txt 2011-07-30 13:16:18.000000000 +0200
|
||||
@@ -232,7 +232,7 @@
|
||||
"install_manifest.txt")
|
||||
SET(PRJ_COMMON_IGNORE_FILES ${COMMON_IGNORE_FILES} "ANNOUNCEMENT_102_ALPHA" "ANNOUNCEMENT_103_ALPHA" "ANNOUNCEMENT_104_BETA" "ANNOUNCEMENT_105_GA" "ANNOUNCEMENT_110_GA" "ANNOUNCEMENT_DRAFT" )
|
||||
|
||||
-SET(CPACK_SOURCE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES} "./cppconn/config.h$" "./driver/nativeapi/binding_config.h$")
|
||||
+SET(CPACK_SOURCE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES} "${CMAKE_CURRENT_SOURCE_DIR}/cppconn/config.h$" "${CMAKE_CURRENT_SOURCE_DIR}/driver/nativeapi/binding_config.h$")
|
||||
SET(CPACK_PACKAGE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES} "something_there" )
|
||||
SET(CPACK_SOURCE_GENERATOR "TGZ")
|
||||
|
||||
diff -urN mysql-connector-c++-1.1.0.old/cppconn/CMakeLists.txt mysql-connector-c++-1.1.0/cppconn/CMakeLists.txt
|
||||
--- mysql-connector-c++-1.1.0.old/cppconn/CMakeLists.txt 2011-07-30 13:15:44.000000000 +0200
|
||||
+++ mysql-connector-c++-1.1.0/cppconn/CMakeLists.txt 2011-07-30 14:10:34.000000000 +0200
|
||||
@@ -55,7 +55,7 @@
|
||||
|
||||
SET(MYSQLCPPCONN_INSTALL_HEADERS
|
||||
build_config.h
|
||||
- config.h
|
||||
+ ${CMAKE_CURRENT_BINARY_DIR}/config.h
|
||||
connection.h
|
||||
datatype.h
|
||||
driver.h
|
||||
diff -urN mysql-connector-c++-1.1.0.old/driver/CMakeLists.txt mysql-connector-c++-1.1.0/driver/CMakeLists.txt
|
||||
--- mysql-connector-c++-1.1.0.old/driver/CMakeLists.txt 2011-07-30 13:15:44.000000000 +0200
|
||||
+++ mysql-connector-c++-1.1.0/driver/CMakeLists.txt 2011-07-30 13:20:36.000000000 +0200
|
||||
@@ -26,6 +26,9 @@
|
||||
|
||||
INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR})
|
||||
INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR}/cppconn)
|
||||
+INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR})
|
||||
+INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR}/cppconn)
|
||||
+INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR}/driver/nativeapi)
|
||||
INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BOOST_INCLUDE_DIRS})
|
||||
MESSAGE(STATUS "BOOST_INCLUDE_DIRS=${MYSQLCPPCONN_BOOST_INCLUDE_DIRS}")
|
||||
|
||||
@@ -149,20 +152,22 @@
|
||||
nativeapi/native_statement_wrapper.h
|
||||
nativeapi/mysql_native_resultset_wrapper.h
|
||||
nativeapi/native_resultset_wrapper.h
|
||||
- ../cppconn/warning.h
|
||||
- ../cppconn/statement.h
|
||||
- ../cppconn/sqlstring.h
|
||||
- ../cppconn/resultset_metadata.h
|
||||
- ../cppconn/resultset.h
|
||||
- ../cppconn/prepared_statement.h
|
||||
- ../cppconn/parameter_metadata.h
|
||||
- ../cppconn/metadata.h
|
||||
- ../cppconn/exception.h
|
||||
- ../cppconn/driver.h
|
||||
- ../cppconn/datatype.h
|
||||
- ../cppconn/connection.h
|
||||
- ../cppconn/config.h
|
||||
- ../cppconn/build_config.h
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/warning.h
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/statement.h
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/sqlstring.h
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/resultset_metadata.h
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/resultset.h
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/prepared_statement.h
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/parameter_metadata.h
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/metadata.h
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/exception.h
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/driver.h
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/datatype.h
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/connection.h
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/config.h
|
||||
+ ${CMAKE_CURRENT_BINARY_DIR}/cppconn/config.h
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/build_config.h
|
||||
+ ${CMAKE_CURRENT_BINARY_DIR}/cppconn/build_config.h
|
||||
|
||||
)
|
||||
|
||||
@@ -271,8 +276,8 @@
|
||||
)
|
||||
ELSE(WIN32)
|
||||
INSTALL(TARGETS mysqlcppconn mysqlcppconn-static
|
||||
- LIBRARY DESTINATION lib
|
||||
- ARCHIVE DESTINATION lib
|
||||
+ LIBRARY DESTINATION lib${LIB_SUFFIX}
|
||||
+ ARCHIVE DESTINATION lib${LIB_SUFFIX}
|
||||
)
|
||||
ENDIF(WIN32)
|
||||
|
||||
@ -1,106 +0,0 @@
|
||||
--- a/CMakeLists.txt 2014-05-04 21:27:59.000000000 -0400
|
||||
+++ b/CMakeLists.txt 2014-05-04 21:47:31.460572470 -0400
|
||||
@@ -269,14 +269,14 @@
|
||||
${CPACK_RESOURCE_FILE_LICENSE}
|
||||
"${CMAKE_SOURCE_DIR}/Licenses_for_Third-Party_Components.txt"
|
||||
"${CMAKE_SOURCE_DIR}/ANNOUNCEMENT"
|
||||
- DESTINATION "." OPTIONAL)
|
||||
+ DESTINATION "${INSTALL_DOCS}" OPTIONAL)
|
||||
|
||||
SET(COMMON_IGNORE_FILES "/CMakeFiles/" "/Testing/" "/.bzr/" "_CPack_Packages/"
|
||||
"~" ".swp" ".log" ".gz" ".directory$" "CMakeCache.txt" "Makefile"
|
||||
"install_manifest.txt")
|
||||
SET(PRJ_COMMON_IGNORE_FILES ${COMMON_IGNORE_FILES} "ANNOUNCEMENT_102_ALPHA" "ANNOUNCEMENT_103_ALPHA" "ANNOUNCEMENT_104_BETA" "ANNOUNCEMENT_105_GA" "ANNOUNCEMENT_110_GA" "ANNOUNCEMENT_111_GA" "ANNOUNCEMENT_DRAFT" )
|
||||
|
||||
-SET(CPACK_SOURCE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES} "./cppconn/config.h$" "./driver/nativeapi/binding_config.h$" "./driver/version_info.h$")
|
||||
+SET(CPACK_SOURCE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES} "${CMAKE_CURRENT_SOURCE_DIR}/cppconn/config.h$" "${CMAKE_CURRENT_SOURCE_DIR}/driver/nativeapi/binding_config.h$" "${CMAKE_CURRENT_SOURCE_DIR}/driver/version_info.h$")
|
||||
SET(CPACK_PACKAGE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES} "something_there" )
|
||||
SET(CPACK_SOURCE_GENERATOR "TGZ")
|
||||
|
||||
@@ -303,10 +303,6 @@
|
||||
ADD_SUBDIRECTORY(cppconn)
|
||||
ADD_SUBDIRECTORY(driver)
|
||||
ADD_SUBDIRECTORY(examples)
|
||||
-ADD_SUBDIRECTORY(test)
|
||||
-ADD_SUBDIRECTORY(test/framework)
|
||||
-ADD_SUBDIRECTORY(test/CJUnitTestsPort)
|
||||
-ADD_SUBDIRECTORY(test/unit)
|
||||
|
||||
IF(DEFINED CMAKE_SYSTEM_NAME AND ${CMAKE_SYSTEM_NAME} STREQUAL "SunOS")
|
||||
# see also README
|
||||
diff -urN a/cppconn/CMakeLists.txt b/cppconn/CMakeLists.txt
|
||||
--- a/cppconn/CMakeLists.txt 2011-07-30 13:15:44.000000000 +0200
|
||||
+++ b/cppconn/CMakeLists.txt 2011-07-30 14:10:34.000000000 +0200
|
||||
@@ -55,7 +55,7 @@
|
||||
|
||||
SET(MYSQLCPPCONN_INSTALL_HEADERS
|
||||
build_config.h
|
||||
- config.h
|
||||
+ ${CMAKE_CURRENT_BINARY_DIR}/config.h
|
||||
connection.h
|
||||
datatype.h
|
||||
driver.h
|
||||
diff -urN mysql-connector-c++-1.1.0.old/driver/CMakeLists.txt mysql-connector-c++-1.1.0/driver/CMakeLists.txt
|
||||
--- a/driver/CMakeLists.txt 2011-07-30 13:15:44.000000000 +0200
|
||||
+++ b/driver/CMakeLists.txt 2011-07-30 13:20:36.000000000 +0200
|
||||
@@ -26,6 +26,9 @@
|
||||
|
||||
INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR})
|
||||
INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR}/cppconn)
|
||||
+INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR})
|
||||
+INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR}/cppconn)
|
||||
+INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR}/driver/nativeapi)
|
||||
INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BOOST_INCLUDE_DIRS})
|
||||
MESSAGE(STATUS "BOOST_INCLUDE_DIRS=${MYSQLCPPCONN_BOOST_INCLUDE_DIRS}")
|
||||
|
||||
@@ -149,21 +152,23 @@
|
||||
nativeapi/native_statement_wrapper.h
|
||||
nativeapi/mysql_native_resultset_wrapper.h
|
||||
nativeapi/native_resultset_wrapper.h
|
||||
- ../cppconn/warning.h
|
||||
- ../cppconn/statement.h
|
||||
- ../cppconn/sqlstring.h
|
||||
- ../cppconn/resultset_metadata.h
|
||||
- ../cppconn/resultset.h
|
||||
- ../cppconn/prepared_statement.h
|
||||
- ../cppconn/parameter_metadata.h
|
||||
- ../cppconn/metadata.h
|
||||
- ../cppconn/exception.h
|
||||
- ../cppconn/driver.h
|
||||
- ../cppconn/datatype.h
|
||||
- ../cppconn/variant.h
|
||||
- ../cppconn/connection.h
|
||||
- ../cppconn/config.h
|
||||
- ../cppconn/build_config.h
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/warning.h
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/statement.h
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/sqlstring.h
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/resultset_metadata.h
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/resultset.h
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/prepared_statement.h
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/parameter_metadata.h
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/metadata.h
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/exception.h
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/driver.h
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/datatype.h
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/variant.h
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/connection.h
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/config.h
|
||||
+ ${CMAKE_CURRENT_BINARY_DIR}/cppconn/config.h
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/cppconn/build_config.h
|
||||
+ ${CMAKE_CURRENT_BINARY_DIR}/cppconn/build_config.h
|
||||
|
||||
)
|
||||
|
||||
diff -aruN a/FindMySQL.cmake b/FindMySQL.cmake
|
||||
--- a/FindMySQL.cmake 2014-11-19 08:37:11.000000000 -0500
|
||||
+++ b/FindMySQL.cmake 2015-02-21 21:58:20.264446822 -0500
|
||||
@@ -462,7 +462,7 @@
|
||||
endif()
|
||||
|
||||
if(NOT MYSQL_CXXFLAGS)
|
||||
- if(MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION GREATER 50603)
|
||||
+ if(MYSQL_CXX_LINKAGE)
|
||||
_mysql_conf(MYSQL_CXXFLAGS "--cxxflags")
|
||||
set(MYSQL_CXX_LINKAGE 1)
|
||||
else()
|
||||
@ -1,29 +0,0 @@
|
||||
Patch taken from opensuse:
|
||||
https://www.mail-archive.com/opensuse-commit@opensuse.org/msg60296.html
|
||||
|
||||
Modified to be conditional on MARIADB_BASE_VERSION
|
||||
|
||||
++++++ mysql-workbench-mysql_options4.patch ++++++
|
||||
diff --git a/plugins/migration/copytable/copytable.cpp
|
||||
b/plugins/migration/copytable/copytable.cpp
|
||||
index b273287..77c227b 100644
|
||||
--- a/plugins/migration/copytable/copytable.cpp
|
||||
+++ b/plugins/migration/copytable/copytable.cpp
|
||||
@@ -1633,12 +1633,17 @@ MySQLCopyDataTarget::MySQLCopyDataTarget(const
|
||||
std::string &hostname, int port,
|
||||
_truncate = false;
|
||||
|
||||
mysql_init(&_mysql);
|
||||
+ /* This is optional has compiled in for MySQL >= 5.6.6
|
||||
+ * Looks like MariaDB does not support this as supposed,
|
||||
+ * so disable completly. */
|
||||
+#ifndef MARIADB_BASE_VERSION
|
||||
#if defined(MYSQL_VERSION_MAJOR) && defined(MYSQL_VERSION_MINOR) && defined(MYSQL_VERSION_PATCH)
|
||||
#if MYSQL_CHECK_VERSION(5,6,6)
|
||||
mysql_options4(&_mysql, MYSQL_OPT_CONNECT_ATTR_ADD, "program_name", app_name.c_str());
|
||||
#endif
|
||||
#endif
|
||||
+#endif
|
||||
|
||||
// _bulk_insert_record is used to prepare a single record string, the connection
|
||||
// is needed to escape binary data properly
|
||||
@ -1,10 +0,0 @@
|
||||
--- plugins/migration/CMakeLists.txt.~1~ 2014-07-12 08:45:56.808929549 +0200
|
||||
+++ plugins/migration/CMakeLists.txt 2014-07-12 08:49:26.659049880 +0200
|
||||
@@ -7,6 +7,7 @@
|
||||
|
||||
add_definitions(${ODBC_DEFINITIONS})
|
||||
|
||||
+SET(CMAKE_INSTALL_RPATH "${WB_INSTALL_LIB_DIR}")
|
||||
add_executable(wbcopytables
|
||||
copytable/copytable.cpp
|
||||
copytable/python_copy_data_source.cpp
|
||||
@ -1,35 +0,0 @@
|
||||
Fix compilation with ctemplate 2.3 by avoiding long-deprecated method.
|
||||
|
||||
Patch by Marcel Pennewiß in https://bugs.gentoo.org/show_bug.cgi?id=533086
|
||||
|
||||
Unresolved upstream bug http://bugs.mysql.com/bug.php?id=72585
|
||||
|
||||
--- mysql-workbench-community-6.0.9-src/backend/wbpublic/sqlide/recordset_text_storage.cpp
|
||||
+++ mysql-workbench-community-6.0.9-src/backend/wbpublic/sqlide/recordset_text_storage.cpp
|
||||
@@ -204,7 +204,7 @@
|
||||
if (!pre_tpl)
|
||||
g_warning("Failed to open template file: `%s`", pre_tpl_path.c_str());
|
||||
else
|
||||
- pre_tpl->ReloadIfChanged();
|
||||
+ pre_tpl->ReloadAllIfChanged();
|
||||
}
|
||||
if (g_file_test((name+".post.tpl").c_str(), G_FILE_TEST_EXISTS))
|
||||
{
|
||||
@@ -213,7 +213,7 @@
|
||||
if (!post_tpl)
|
||||
g_warning("Failed to open template file: `%s`", post_tpl_path.c_str());
|
||||
else
|
||||
- post_tpl->ReloadIfChanged();
|
||||
+ post_tpl->ReloadAllIfChanged();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -222,7 +222,7 @@
|
||||
throw std::runtime_error(strfmt("Failed to open output file: `%s`", _file_path.c_str()));
|
||||
}
|
||||
|
||||
- tpl->ReloadIfChanged();
|
||||
+ tpl->ReloadAllIfChanged();
|
||||
|
||||
std::auto_ptr<TemplateDictionary> dict(new TemplateDictionary("/"));
|
||||
BOOST_FOREACH (const Parameters::value_type ¶m, _parameters)
|
||||
@ -1,42 +0,0 @@
|
||||
Patch to make the query results window work with glib 2.42.
|
||||
https://bugs.gentoo.org/show_bug.cgi?id=536024
|
||||
http://bugs.mysql.com/bug.php?id=74147
|
||||
|
||||
|
||||
=== modified file frontend/linux/linux_utilities/listmodel_wrapper.cpp
|
||||
--- frontend/linux/linux_utilities/listmodel_wrapper.cpp 2014-03-17 16:42:25 +0000
|
||||
+++ frontend/linux/linux_utilities/listmodel_wrapper.cpp 2014-10-16 10:33:12 +0000
|
||||
@@ -528,7 +528,6 @@
|
||||
ListModelWrapper::ListModelWrapper(bec::ListModel* tm, Gtk::TreeView *treeview, const std::string& name)
|
||||
: Glib::ObjectBase(typeid(ListModelWrapper))
|
||||
, Glib::Object()
|
||||
- , Gtk::TreeModel()
|
||||
, _treeview(treeview)
|
||||
, _iconview(0)
|
||||
, _context_menu(0)
|
||||
|
||||
=== modified file frontend/linux/linux_utilities/listmodel_wrapper.h
|
||||
--- frontend/linux/linux_utilities/listmodel_wrapper.h 2013-12-05 13:10:03 +0000
|
||||
+++ frontend/linux/linux_utilities/listmodel_wrapper.h 2014-10-16 10:33:12 +0000
|
||||
@@ -232,9 +232,16 @@
|
||||
|
||||
//==============================================================================
|
||||
|
||||
-class ListModelWrapper : public Glib::Object, public Gtk::TreeModel,
|
||||
- public Gtk::TreeDragDest, public Gtk::TreeDragSource,
|
||||
- public base::trackable
|
||||
+#if GLIB_CHECK_VERSION(2, 42, 0)
|
||||
+class ListModelWrapper : public Gtk::TreeModel, public Glib::Object,
|
||||
+ public Gtk::TreeDragDest, public Gtk::TreeDragSource,
|
||||
+ public base::trackable
|
||||
+#else
|
||||
+class ListModelWrapper : public Glib::Object, public Gtk::TreeModel,
|
||||
+ public Gtk::TreeDragDest, public Gtk::TreeDragSource,
|
||||
+ public base::trackable
|
||||
+
|
||||
+#endif
|
||||
{
|
||||
friend class ColumnsModel;
|
||||
protected:
|
||||
|
||||
|
||||
@ -1,51 +0,0 @@
|
||||
Last-Update: 2014-10-07
|
||||
Forwarded: not-needed
|
||||
From: Alfredo Kojima
|
||||
Bug-Upstream: http://bugs.mysql.com/bug.php?id=74223
|
||||
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=763971
|
||||
Description: fix connectivity through SSH tunnel.
|
||||
|
||||
=== modified file 'plugins/wb.admin/backend/wb_admin_ssh.py'
|
||||
--- a/plugins/wb.admin/backend/wb_admin_ssh.py
|
||||
+++ b/plugins/wb.admin/backend/wb_admin_ssh.py
|
||||
@@ -84,10 +84,14 @@
|
||||
m = Message()
|
||||
m.add_byte(chr(MSG_CHANNEL_OPEN))
|
||||
m.add_string(kind)
|
||||
m.add_int(chanid)
|
||||
- m.add_int(self.window_size)
|
||||
- m.add_int(self.max_packet_size)
|
||||
+ if server_version_str2tuple(paramiko.__version__) < (1, 15, 0):
|
||||
+ m.add_int(self.window_size)
|
||||
+ m.add_int(self.max_packet_size)
|
||||
+ else:
|
||||
+ m.add_int(self.default_window_size)
|
||||
+ m.add_int(self.default_max_packet_size)
|
||||
if (kind == 'forwarded-tcpip') or (kind == 'direct-tcpip'):
|
||||
m.add_string(dest_addr[0])
|
||||
m.add_int(dest_addr[1])
|
||||
m.add_string(src_addr[0])
|
||||
@@ -99,9 +103,12 @@
|
||||
self._channels.put(chanid, chan)
|
||||
self.channel_events[chanid] = event = threading.Event()
|
||||
self.channels_seen[chanid] = True
|
||||
chan._set_transport(self)
|
||||
- chan._set_window(self.window_size, self.max_packet_size)
|
||||
+ if server_version_str2tuple(paramiko.__version__) < (1, 15, 0):
|
||||
+ chan._set_window(self.window_size, self.max_packet_size)
|
||||
+ else:
|
||||
+ chan._set_window(self.default_window_size, self.default_max_packet_size)
|
||||
finally:
|
||||
self.lock.release()
|
||||
self._send_user_message(m)
|
||||
ts = time.time() + OPEN_CHANNEL_TIMEOUT if (timeout is None) else timeout
|
||||
@@ -669,8 +676,9 @@
|
||||
|
||||
read_timeout = 10
|
||||
|
||||
if self.client is not None:
|
||||
+ chan = None
|
||||
transport = self.client.get_transport()
|
||||
try:
|
||||
spawn_process = False
|
||||
if 'nohup' in cmd:
|
||||
@ -1,26 +0,0 @@
|
||||
diff -Naurw postgis-2.0.2.orig/loader/Makefile.in postgis-2.0.2/loader/Makefile.in
|
||||
--- postgis-2.0.2.orig/loader/Makefile.in 2012-03-21 21:36:59.000000000 +0000
|
||||
+++ postgis-2.0.2/loader/Makefile.in 2013-01-29 21:44:12.566318760 +0000
|
||||
@@ -97,11 +97,11 @@
|
||||
|
||||
$(PGSQL2SHP-CLI): $(SHPLIB_OBJS) pgsql2shp-core.o pgsql2shp-cli.o $(LIBLWGEOM)
|
||||
$(LIBTOOL) --mode=link \
|
||||
- $(CC) $(CFLAGS) $^ $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) $(GETTEXT_LDFLAGS) -o $@
|
||||
+ $(CC) $(CFLAGS) $^ $(LDFLAGS) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) $(GETTEXT_LDFLAGS) -o $@
|
||||
|
||||
$(SHP2PGSQL-CLI): $(SHPLIB_OBJS) shp2pgsql-core.o shp2pgsql-cli.o $(LIBLWGEOM)
|
||||
$(LIBTOOL) --mode=link \
|
||||
- $(CC) $(CFLAGS) $^ -o $@ $(GETTEXT_LDFLAGS) $(ICONV_LDFLAGS)
|
||||
+ $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(GETTEXT_LDFLAGS) $(ICONV_LDFLAGS)
|
||||
|
||||
shp2pgsql-gui.o: shp2pgsql-gui.c shp2pgsql-core.h shpcommon.h
|
||||
$(CC) $(CFLAGS) $(GTK_CFLAGS) $(PGSQL_FE_CPPFLAGS) -o $@ -c shp2pgsql-gui.c
|
||||
@@ -109,7 +109,7 @@
|
||||
$(SHP2PGSQL-GUI): $(SHPLIB_OBJS) shp2pgsql-core.o shp2pgsql-gui.o pgsql2shp-core.o $(LIBLWGEOM) $(GTK_WIN32_RES)
|
||||
$(LIBTOOL) --mode=link \
|
||||
$(CC) $(CFLAGS) $(GTK_WIN32_FLAGS) $^ -o $@ \
|
||||
- $(GTK_LIBS) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) $(GETTEXT_LDFLAGS)
|
||||
+ $(LDFLAGS) $(GTK_LIBS) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) $(GETTEXT_LDFLAGS)
|
||||
|
||||
installdir:
|
||||
@mkdir -p $(DESTDIR)$(bindir)
|
||||
@ -1,99 +0,0 @@
|
||||
diff -Naruw postgis-2.0.2.orig/configure.ac postgis-2.0.2/configure.ac
|
||||
--- postgis-2.0.2.orig/configure.ac 2012-05-17 12:10:04.000000000 +0000
|
||||
+++ postgis-2.0.2/configure.ac 2013-02-11 11:57:06.733323130 +0000
|
||||
@@ -701,57 +701,14 @@
|
||||
dnl Detect if json-c installed
|
||||
dnl ===========================================================================
|
||||
|
||||
-HAVE_JSON=no
|
||||
-AC_SUBST([HAVE_JSON])
|
||||
-
|
||||
-AC_ARG_WITH([jsondir],
|
||||
- [AS_HELP_STRING([--with-jsondir=PATH], [specify the json-c installation directory])],
|
||||
- [JSONDIR="$withval"], [JSONDIR=])
|
||||
-
|
||||
-if test ! "x$JSONDIR" = "x"; then
|
||||
- dnl Make sure that the directory exists
|
||||
- if test "x$JSONDIR" = "xyes"; then
|
||||
- AC_MSG_ERROR([you must specify a parameter to --with-jsondir, e.g. --with-jsondir=/path/to])
|
||||
- else
|
||||
- dnl We need (libjson.so OR libjson.a OR libjson.dll) AND json/json.h
|
||||
- if test ! -e "${JSONDIR}/include/json/json.h" -o \
|
||||
- ! \( -e "${JSONDIR}/lib/libjson.so" -o \
|
||||
- -e "${JSONDIR}/lib/libjson.dll" -o \
|
||||
- -e "${JSONDIR}/lib/libjson.dylib" -o \
|
||||
- -e "${JSONDIR}/bin/libjson.dll" -o \
|
||||
- -e "${JSONDIR}/lib/libjson.a" \)
|
||||
- then
|
||||
- AC_MSG_ERROR([Cannot find json dev files in "$JSONDIR"])
|
||||
- fi
|
||||
- AC_MSG_RESULT([Using user-specified json-c directory: $JSONDIR])
|
||||
-
|
||||
- dnl Add the include directory to JSON_CPPFLAGS
|
||||
- JSON_CPPFLAGS="-I$JSONDIR/include"
|
||||
- JSON_LDFLAGS="-L$JSONDIR/lib -ljson"
|
||||
- fi
|
||||
-fi
|
||||
-
|
||||
-dnl Check that we can find the json/json.h header file
|
||||
-CPPFLAGS_SAVE="$CPPFLAGS"
|
||||
-CPPFLAGS="$JSON_CPPFLAGS"
|
||||
-AC_CHECK_HEADER([json/json.h], [HAVE_JSON=yes], [])
|
||||
-CPPFLAGS="$CPPFLAGS_SAVE"
|
||||
-
|
||||
-dnl Ensure we can link against libjson
|
||||
-LIBS_SAVE="$LIBS"
|
||||
-LIBS="$JSON_LDFLAGS"
|
||||
-AC_CHECK_LIB([json], [json_object_get], [HAVE_JSON=yes], [], [])
|
||||
-LIBS="$LIBS_SAVE"
|
||||
-
|
||||
-if test "$HAVE_JSON" = "yes"; then
|
||||
+PKG_CHECK_MODULES([JSON], [json],
|
||||
+ [
|
||||
+ HAVE_JSON=yes
|
||||
AC_DEFINE([HAVE_LIBJSON], 1, [Define to 1 if libjson is present])
|
||||
- if test "x$JSON_LDFLAGS" = "x"; then
|
||||
- JSON_LDFLAGS="-ljson"
|
||||
- fi
|
||||
-fi
|
||||
+ ],
|
||||
+ [HAVE_JSON=no])
|
||||
|
||||
-AC_SUBST([JSON_CPPFLAGS])
|
||||
-AC_SUBST([JSON_LDFLAGS])
|
||||
+AC_SUBST([HAVE_JSON])
|
||||
|
||||
dnl ===========================================================================
|
||||
dnl Detect GTK+2.0 for GUI
|
||||
@@ -842,10 +799,10 @@
|
||||
AC_DEFINE_UNQUOTED([POSTGIS_USE_STATS], [1], [Enable use of ANALYZE statistics])
|
||||
|
||||
|
||||
-CPPFLAGS="$PGSQL_CPPFLAGS $GEOS_CPPFLAGS $PROJ_CPPFLAGS $JSON_CPPFLAGS $XML2_CPPFLAGS"
|
||||
+CPPFLAGS="$PGSQL_CPPFLAGS $GEOS_CPPFLAGS $PROJ_CPPFLAGS $JSON_CFLAGS $XML2_CPPFLAGS"
|
||||
dnl AC_MSG_RESULT([CPPFLAGS: $CPPFLAGS])
|
||||
|
||||
-SHLIB_LINK="$PGSQL_LDFLAGS $GEOS_LDFLAGS $PROJ_LDFLAGS -lgeos_c -lproj $JSON_LDFLAGS $XML2_LDFLAGS"
|
||||
+SHLIB_LINK="$PGSQL_LDFLAGS $GEOS_LDFLAGS $PROJ_LDFLAGS -lgeos_c -lproj $JSON_LIBS $XML2_LDFLAGS"
|
||||
AC_SUBST([SHLIB_LINK])
|
||||
dnl AC_MSG_RESULT([SHLIB_LINK: $SHLIB_LINK])
|
||||
|
||||
diff -Naruw postgis-2.0.2.orig/postgis/lwgeom_in_geojson.c postgis-2.0.2/postgis/lwgeom_in_geojson.c
|
||||
--- postgis-2.0.2.orig/postgis/lwgeom_in_geojson.c 2012-12-03 16:18:33.000000000 +0000
|
||||
+++ postgis-2.0.2/postgis/lwgeom_in_geojson.c 2013-02-11 12:09:29.017167709 +0000
|
||||
@@ -28,8 +28,8 @@
|
||||
#ifdef HAVE_LIBJSON
|
||||
|
||||
#include "lwgeom_export.h"
|
||||
-#include <json/json.h>
|
||||
-#include <json/json_object_private.h>
|
||||
+#include <json.h>
|
||||
+#include <json_object_private.h>
|
||||
|
||||
/* Prototype */
|
||||
LWGEOM* parse_geojson(json_object *geojson, bool *hasz, int *root_srid);
|
||||
@@ -556,4 +556,3 @@
|
||||
PG_RETURN_POINTER(geom);
|
||||
#endif
|
||||
}
|
||||
-
|
||||
@ -1,13 +0,0 @@
|
||||
Index: postgresql-9.4-9.4~beta2/src/include/storage/barrier.h
|
||||
===================================================================
|
||||
--- postgresql-9.4-9.4~beta2.orig/src/include/storage/barrier.h
|
||||
+++ postgresql-9.4-9.4~beta2/src/include/storage/barrier.h
|
||||
@@ -117,7 +117,7 @@ extern slock_t dummy_spinlock;
|
||||
* read barrier to cover that case. We might need to add that later.
|
||||
*/
|
||||
#define pg_memory_barrier() __asm__ __volatile__ ("mb" : : : "memory")
|
||||
-#define pg_read_barrier() __asm__ __volatile__ ("rmb" : : : "memory")
|
||||
+#define pg_read_barrier() __asm__ __volatile__ ("mb" : : : "memory")
|
||||
#define pg_write_barrier() __asm__ __volatile__ ("wmb" : : : "memory")
|
||||
#elif defined(__hppa) || defined(__hppa__) /* HP PA-RISC */
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
See https://github.com/antirez/redis/pull/137
|
||||
|
||||
--- src/Makefile 2011-10-17 10:46:00.000000000 +0200
|
||||
+++ src/Makefile.2 2011-10-17 13:47:53.000000000 +0200
|
||||
@@ -49,7 +49,16 @@
|
||||
ifeq ($(USE_JEMALLOC),yes)
|
||||
ALLOC_DEP=../deps/jemalloc/lib/libjemalloc.a
|
||||
ALLOC_LINK=$(ALLOC_DEP) -ldl
|
||||
- ALLOC_FLAGS=-DUSE_JEMALLOC -I../deps/jemalloc/include
|
||||
+ ALLOC_FLAGS=-DUSE_JEMALLOC
|
||||
+ ifdef JEMALLOC_SHARED
|
||||
+ ALLOC_DEP=
|
||||
+ ALLOC_LINK=-ljemalloc
|
||||
+ ALLOC_FLAGS=-DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE -I/usr/include
|
||||
+ else
|
||||
+ ALLOC_DEP=../deps/jemalloc/lib/libjemalloc.a
|
||||
+ ALLOC_LINK=$(ALLOC_DEP) -ldl
|
||||
+ ALLOC_FLAGS=-DUSE_JEMALLOC -I../deps/jemalloc/include
|
||||
+ endif
|
||||
endif
|
||||
|
||||
CCOPT= $(CFLAGS) $(ARCH) $(PROF)
|
||||
@ -1,22 +0,0 @@
|
||||
See https://github.com/antirez/redis/pull/137
|
||||
|
||||
--- src/Makefile 2011-10-17 10:46:00.000000000 +0200
|
||||
+++ src/Makefile.2 2011-10-17 13:47:53.000000000 +0200
|
||||
@@ -49,7 +49,16 @@
|
||||
ifeq ($(USE_JEMALLOC),yes)
|
||||
ALLOC_DEP=../deps/jemalloc/lib/libjemalloc.a
|
||||
ALLOC_LINK=$(ALLOC_DEP) -ldl
|
||||
- ALLOC_FLAGS=-DUSE_JEMALLOC -I../deps/jemalloc/include
|
||||
+ ALLOC_FLAGS=-DUSE_JEMALLOC
|
||||
+ ifdef JEMALLOC_SHARED
|
||||
+ ALLOC_DEP=
|
||||
+ ALLOC_LINK=-ljemalloc
|
||||
+ ALLOC_FLAGS=-DUSE_JEMALLOC -I/usr/include
|
||||
+ else
|
||||
+ ALLOC_DEP=../deps/jemalloc/lib/libjemalloc.a
|
||||
+ ALLOC_LINK=$(ALLOC_DEP) -ldl
|
||||
+ ALLOC_FLAGS=-DUSE_JEMALLOC -I../deps/jemalloc/include
|
||||
+ endif
|
||||
endif
|
||||
|
||||
CCOPT= $(CFLAGS) $(ARCH) $(PROF)
|
||||
@ -1,21 +0,0 @@
|
||||
https://github.com/antirez/redis/pull/218
|
||||
|
||||
diff --git a/src/Makefile b/src/Makefile
|
||||
index 72edcad..3e43990 100644
|
||||
--- a/src/Makefile
|
||||
+++ b/src/Makefile
|
||||
@@ -35,12 +35,14 @@ else
|
||||
endif
|
||||
|
||||
ifeq ($(USE_TCMALLOC),yes)
|
||||
+ USE_JEMALLOC=no
|
||||
ALLOC_DEP=
|
||||
ALLOC_LINK=-ltcmalloc
|
||||
ALLOC_FLAGS=-DUSE_TCMALLOC
|
||||
endif
|
||||
|
||||
ifeq ($(USE_TCMALLOC_MINIMAL),yes)
|
||||
+ USE_JEMALLOC=no
|
||||
ALLOC_DEP=
|
||||
ALLOC_LINK=-ltcmalloc_minimal
|
||||
ALLOC_FLAGS=-DUSE_TCMALLOC
|
||||
@ -1,69 +0,0 @@
|
||||
commit 7f05e59a052941fd070be1825d0623a054c66e2d
|
||||
Author: jbergstroem <bugs@bergstroem.nu>
|
||||
Date: Tue Oct 30 13:11:23 2012 +1100
|
||||
|
||||
Adapt config based on Gentoo defaults
|
||||
|
||||
diff --git a/redis.conf b/redis.conf
|
||||
index 751a3eb..1a36b12 100644
|
||||
--- a/redis.conf
|
||||
+++ b/redis.conf
|
||||
@@ -14,11 +14,11 @@
|
||||
|
||||
# By default Redis does not run as a daemon. Use 'yes' if you need it.
|
||||
# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
|
||||
-daemonize no
|
||||
+daemonize yes
|
||||
|
||||
# When running daemonized, Redis writes a pid file in /var/run/redis.pid by
|
||||
# default. You can specify a custom pid file location here.
|
||||
-pidfile /var/run/redis.pid
|
||||
+pidfile /var/run/redis/redis.pid
|
||||
|
||||
# Accept connections on the specified port, default is 6379.
|
||||
# If port 0 is specified Redis will not listen on a TCP socket.
|
||||
@@ -27,7 +27,7 @@ port 6379
|
||||
# If you want you can bind a single interface, if the bind option is not
|
||||
# specified all the interfaces will listen for incoming connections.
|
||||
#
|
||||
-# bind 127.0.0.1
|
||||
+bind 127.0.0.1
|
||||
|
||||
# Specify the path for the unix socket that will be used to listen for
|
||||
# incoming connections. There is no default, so Redis will not listen
|
||||
@@ -50,7 +50,7 @@ loglevel notice
|
||||
# Specify the log file name. Also 'stdout' can be used to force
|
||||
# Redis to log on the standard output. Note that if you use standard
|
||||
# output for logging but daemonize, logs will be sent to /dev/null
|
||||
-logfile stdout
|
||||
+logfile /var/log/redis/redis.log
|
||||
|
||||
# To enable logging to the system logger, just set 'syslog-enabled' to yes,
|
||||
# and optionally update the other syslog parameters to suit your needs.
|
||||
@@ -124,7 +124,7 @@ rdbcompression yes
|
||||
rdbchecksum yes
|
||||
|
||||
# The filename where to dump the DB
|
||||
-dbfilename dump.rdb
|
||||
+dbfilename /var/lib/redis/dump.rdb
|
||||
|
||||
# The working directory.
|
||||
#
|
||||
@@ -134,7 +134,7 @@ dbfilename dump.rdb
|
||||
# Also the Append Only File will be created inside this directory.
|
||||
#
|
||||
# Note that you must specify a directory here, not a file name.
|
||||
-dir ./
|
||||
+dir /var/lib/redis/
|
||||
|
||||
################################# REPLICATION #################################
|
||||
|
||||
@@ -278,7 +278,7 @@ slave-priority 100
|
||||
# limit for maxmemory so that there is some free RAM on the system for slave
|
||||
# output buffers (but this is not needed if the policy is 'noeviction').
|
||||
#
|
||||
-# maxmemory <bytes>
|
||||
+maxmemory 67108864
|
||||
|
||||
# MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
|
||||
# is reached? You can select among five behavior:
|
||||
@ -1,36 +0,0 @@
|
||||
commit 6931bf1d81de597b3abc2a36adf081a24c114567
|
||||
Author: jbergstroem <bugs@bergstroem.nu>
|
||||
Date: Tue Oct 23 12:26:04 2012 +1100
|
||||
|
||||
Build against shared jemalloc
|
||||
|
||||
diff --git a/src/Makefile b/src/Makefile
|
||||
index 358b4cb..41390f4 100644
|
||||
--- a/src/Makefile
|
||||
+++ b/src/Makefile
|
||||
@@ -22,12 +22,7 @@ STD= -std=c99 -pedantic
|
||||
WARN= -Wall
|
||||
OPT= $(OPTIMIZATION)
|
||||
|
||||
-# Default allocator
|
||||
-ifeq ($(uname_S),Linux)
|
||||
- MALLOC=jemalloc
|
||||
-else
|
||||
- MALLOC=libc
|
||||
-endif
|
||||
+MALLOC?=jemalloc
|
||||
|
||||
# Backwards compatibility for selecting an allocator
|
||||
ifeq ($(USE_TCMALLOC),yes)
|
||||
@@ -71,9 +66,8 @@ ifeq ($(MALLOC),tcmalloc_minimal)
|
||||
endif
|
||||
|
||||
ifeq ($(MALLOC),jemalloc)
|
||||
- DEPENDENCY_TARGETS+= jemalloc
|
||||
- FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include
|
||||
- FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a -ldl
|
||||
+ FINAL_CFLAGS+= -DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE
|
||||
+ FINAL_LIBS+= -ljemalloc -ldl
|
||||
endif
|
||||
|
||||
REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
|
||||
@ -1,57 +0,0 @@
|
||||
diff --git a/runtest b/runtest
|
||||
index 0eb384c..fadc283 100755
|
||||
--- a/runtest
|
||||
+++ b/runtest
|
||||
@@ -1,5 +1,5 @@
|
||||
#!/bin/sh
|
||||
-TCL=tclsh8.5
|
||||
+TCL=tclsh
|
||||
which $TCL
|
||||
if [ "$?" != "0" ]
|
||||
then
|
||||
diff --git a/tests/integration/replication-4.tcl b/tests/integration/replication-4.tcl
|
||||
index 69fcab3..58a70fa 100644
|
||||
--- a/tests/integration/replication-4.tcl
|
||||
+++ b/tests/integration/replication-4.tcl
|
||||
@@ -1,5 +1,5 @@
|
||||
proc start_bg_complex_data {host port db ops} {
|
||||
- exec tclsh8.5 tests/helpers/bg_complex_data.tcl $host $port $db $ops &
|
||||
+ exec tclsh tests/helpers/bg_complex_data.tcl $host $port $db $ops &
|
||||
}
|
||||
|
||||
proc stop_bg_complex_data {handle} {
|
||||
diff --git a/tests/integration/replication.tcl b/tests/integration/replication.tcl
|
||||
index da94b08..30baf6a 100644
|
||||
--- a/tests/integration/replication.tcl
|
||||
+++ b/tests/integration/replication.tcl
|
||||
@@ -78,7 +78,7 @@ start_server {tags {"repl"}} {
|
||||
}
|
||||
|
||||
proc start_write_load {host port seconds} {
|
||||
- exec tclsh8.5 tests/helpers/gen_write_load.tcl $host $port $seconds &
|
||||
+ exec tclsh tests/helpers/gen_write_load.tcl $host $port $seconds &
|
||||
}
|
||||
|
||||
proc stop_write_load {handle} {
|
||||
diff --git a/tests/test_helper.tcl b/tests/test_helper.tcl
|
||||
index b2e58b4..253e955 100644
|
||||
--- a/tests/test_helper.tcl
|
||||
+++ b/tests/test_helper.tcl
|
||||
@@ -2,6 +2,8 @@
|
||||
# This softare is released under the BSD License. See the COPYING file for
|
||||
# more information.
|
||||
|
||||
+package require Tcl 8.5
|
||||
+
|
||||
set tcl_precision 17
|
||||
source tests/support/redis.tcl
|
||||
source tests/support/server.tcl
|
||||
@@ -189,7 +191,7 @@ proc test_server_main {} {
|
||||
set start_port [expr {$::port+100}]
|
||||
for {set j 0} {$j < $::numclients} {incr j} {
|
||||
set start_port [find_available_port $start_port]
|
||||
- set p [exec tclsh8.5 [info script] {*}$::argv \
|
||||
+ set p [exec tclsh [info script] {*}$::argv \
|
||||
--client $port --port $start_port &]
|
||||
lappend ::clients_pids $p
|
||||
incr start_port 10
|
||||
@ -1,59 +0,0 @@
|
||||
commit 66f26c12faaeb8ed85a715d2dfd6a41c978a4bd1
|
||||
Author: Johan Bergström <bugs@bergstroem.nu>
|
||||
Date: Mon Nov 25 09:23:10 2013 +1100
|
||||
|
||||
Modify config to gentoo defaults
|
||||
|
||||
diff --git redis.conf redis.conf
|
||||
index 2e3239c..6c7ef4a 100644
|
||||
--- redis.conf
|
||||
+++ redis.conf
|
||||
@@ -14,11 +14,11 @@
|
||||
|
||||
# By default Redis does not run as a daemon. Use 'yes' if you need it.
|
||||
# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
|
||||
-daemonize no
|
||||
+daemonize yes
|
||||
|
||||
# When running daemonized, Redis writes a pid file in /var/run/redis.pid by
|
||||
# default. You can specify a custom pid file location here.
|
||||
-pidfile /var/run/redis.pid
|
||||
+pidfile /run/redis/redis.pid
|
||||
|
||||
# Accept connections on the specified port, default is 6379.
|
||||
# If port 0 is specified Redis will not listen on a TCP socket.
|
||||
@@ -32,7 +32,7 @@ port 6379
|
||||
# Examples:
|
||||
#
|
||||
# bind 192.168.1.100 10.0.0.1
|
||||
-# bind 127.0.0.1
|
||||
+bind 127.0.0.1
|
||||
|
||||
# Specify the path for the unix socket that will be used to listen for
|
||||
# incoming connections. There is no default, so Redis will not listen
|
||||
@@ -71,7 +71,7 @@ loglevel notice
|
||||
# Specify the log file name. Also the emptry string can be used to force
|
||||
# Redis to log on the standard output. Note that if you use standard
|
||||
# output for logging but daemonize, logs will be sent to /dev/null
|
||||
-logfile ""
|
||||
+logfile /var/log/redis/redis.log
|
||||
|
||||
# To enable logging to the system logger, just set 'syslog-enabled' to yes,
|
||||
# and optionally update the other syslog parameters to suit your needs.
|
||||
@@ -155,7 +155,7 @@ dbfilename dump.rdb
|
||||
# The Append Only File will also be created inside this directory.
|
||||
#
|
||||
# Note that you must specify a directory here, not a file name.
|
||||
-dir ./
|
||||
+dir /var/lib/redis/
|
||||
|
||||
################################# REPLICATION #################################
|
||||
|
||||
@@ -365,6 +365,7 @@ slave-priority 100
|
||||
# output buffers (but this is not needed if the policy is 'noeviction').
|
||||
#
|
||||
# maxmemory <bytes>
|
||||
+maxmemory 67108864
|
||||
|
||||
# MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
|
||||
# is reached. You can select among five behaviors:
|
||||
@ -1,23 +0,0 @@
|
||||
#!/sbin/openrc-run
|
||||
# $Id$
|
||||
|
||||
REDIS_DIR=${REDIS_DIR:-/var/lib/redis}
|
||||
REDIS_CONF=${REDIS_CONF:-/etc/redis.conf}
|
||||
REDIS_OPTS=${REDIS_OPTS:-"${REDIS_CONF}"}
|
||||
REDIS_USER=${REDIS_USER:-redis}
|
||||
REDIS_GROUP=${REDIS_GROUP:-redis}
|
||||
|
||||
command=/usr/sbin/redis-server
|
||||
start_stop_daemon_args="--chdir \"${REDIS_DIR}\"
|
||||
--user ${REDIS_USER} --group ${REDIS_GROUP}"
|
||||
command_args="${REDIS_OPTS}"
|
||||
pidfile=${REDIS_PID:-/var/run/redis/redis.pid}
|
||||
|
||||
depend() {
|
||||
use net localmount logger
|
||||
after keepalived
|
||||
}
|
||||
|
||||
start_pre() {
|
||||
checkpath -d -m 0775 -o ${REDIS_USER}:${REDIS_GROUP} $(dirname ${REDIS_PID})
|
||||
}
|
||||
@ -1,32 +0,0 @@
|
||||
#!/sbin/openrc-run
|
||||
# $Id$
|
||||
|
||||
REDIS_DIR=${REDIS_DIR:-/var/lib/redis}
|
||||
REDIS_CONF=${REDIS_CONF:-/etc/redis.conf}
|
||||
REDIS_OPTS=${REDIS_OPTS:-"${REDIS_CONF}"}
|
||||
REDIS_USER=${REDIS_USER:-redis}
|
||||
REDIS_GROUP=${REDIS_GROUP:-redis}
|
||||
|
||||
command=/usr/sbin/redis-server
|
||||
start_stop_daemon_args="--chdir \"${REDIS_DIR}\"
|
||||
--user ${REDIS_USER} --group ${REDIS_GROUP}"
|
||||
command_args="${REDIS_OPTS}"
|
||||
pidfile=${REDIS_PID:-/run/redis/redis.pid}
|
||||
|
||||
depend() {
|
||||
use net localmount logger
|
||||
after keepalived
|
||||
}
|
||||
|
||||
start_pre() {
|
||||
checkpath -d -m 0775 -o ${REDIS_USER}:${REDIS_GROUP} $(dirname ${REDIS_PID})
|
||||
}
|
||||
|
||||
stop() {
|
||||
ebegin "Stopping ${SVCNAME}"
|
||||
start-stop-daemon --stop \
|
||||
--exec ${retries} \
|
||||
--retry 30 \
|
||||
--pidfile ${pidfile}
|
||||
eend
|
||||
}
|
||||
@ -1,29 +0,0 @@
|
||||
diff -Naur a/Makefile.global.in b/Makefile.global.in
|
||||
--- a/Makefile.global.in 2012-01-25 14:13:40.000000000 -0500
|
||||
+++ b/Makefile.global.in 2012-02-22 06:14:05.240047000 -0500
|
||||
@@ -80,7 +80,7 @@
|
||||
subdir=$(slony_subdir)
|
||||
|
||||
override CPPFLAGS := -I${pgincludeserverdir} -I${pgincludedir} $(CPPFLAGS)
|
||||
-LDFLAGS = -L${pglibdir} -L${pgpkglibdir} -lpq @NLSLIB@
|
||||
+override LDFLAGS += -L${pglibdir} -L${pgpkglibdir} -lpq @NLSLIB@
|
||||
|
||||
ifeq ($(GCC), yes)
|
||||
CFLAGS += -Wall -Wmissing-prototypes -Wmissing-declarations
|
||||
diff -Naur a/makefiles/Makefile.linux b/makefiles/Makefile.linux
|
||||
--- a/makefiles/Makefile.linux 2012-01-25 14:13:40.000000000 -0500
|
||||
+++ b/makefiles/Makefile.linux 2012-02-22 06:15:45.652523000 -0500
|
||||
@@ -12,9 +12,9 @@
|
||||
endif
|
||||
|
||||
%.so: %.o
|
||||
- $(CC) -shared -o $@ $<
|
||||
+ $(CC) $(LDFLAGS) -shared -o $@ $<
|
||||
|
||||
%.o: %.c
|
||||
- $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
|
||||
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -c -o $@ $<
|
||||
|
||||
-sqlmansect = 7
|
||||
\ No newline at end of file
|
||||
+sqlmansect = 7
|
||||
@ -1,70 +0,0 @@
|
||||
CMakeLists.txt | 12 ++----------
|
||||
tests/CMakeLists.txt | 5 +----
|
||||
2 files changed, 3 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 4a76947..a58510b 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -7,13 +7,9 @@ if(NOT CMAKE_BUILD_TYPE)
|
||||
set(CMAKE_BUILD_TYPE "Release")
|
||||
endif()
|
||||
|
||||
-set(ANTLR_DIR libs/antlr-2.7.7)
|
||||
set(QHEXEDIT_DIR libs/qhexedit)
|
||||
-set(QCUSTOMPLOT_DIR libs/qcustomplot-source)
|
||||
|
||||
-add_subdirectory(${ANTLR_DIR})
|
||||
add_subdirectory(${QHEXEDIT_DIR})
|
||||
-add_subdirectory(${QCUSTOMPLOT_DIR})
|
||||
|
||||
if(USE_QT5)
|
||||
find_package(Qt5Widgets REQUIRED)
|
||||
@@ -191,9 +187,7 @@ endif(EXTRAPATH)
|
||||
|
||||
include_directories(
|
||||
"${CMAKE_CURRENT_BINARY_DIR}"
|
||||
- ${ANTLR_DIR}
|
||||
${QHEXEDIT_DIR}
|
||||
- ${QCUSTOMPLOT_DIR}
|
||||
${ADDITIONAL_INCLUDE_PATHS}
|
||||
src)
|
||||
|
||||
@@ -210,12 +204,10 @@ if(USE_QT5)
|
||||
qt5_use_modules(${PROJECT_NAME} Gui Widgets Network Test PrintSupport)
|
||||
set(QT_LIBRARIES "")
|
||||
endif()
|
||||
-add_dependencies(${PROJECT_NAME} antlr qhexedit qcustomplot)
|
||||
+add_dependencies(${PROJECT_NAME} qhexedit)
|
||||
|
||||
link_directories(
|
||||
- "${CMAKE_CURRENT_BINARY_DIR}/${ANTLR_DIR}"
|
||||
- "${CMAKE_CURRENT_BINARY_DIR}/${QHEXEDIT_DIR}"
|
||||
- "${CMAKE_CURRENT_BINARY_DIR}/${QCUSTOMPLOT_DIR}")
|
||||
+ "${CMAKE_CURRENT_BINARY_DIR}/${QHEXEDIT_DIR}")
|
||||
|
||||
target_link_libraries(${PROJECT_NAME}
|
||||
antlr
|
||||
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
|
||||
index 75009dc..6fd7f48 100644
|
||||
--- a/tests/CMakeLists.txt
|
||||
+++ b/tests/CMakeLists.txt
|
||||
@@ -7,9 +7,6 @@ if(NOT CMAKE_BUILD_TYPE)
|
||||
set(CMAKE_BUILD_TYPE "Release")
|
||||
endif()
|
||||
|
||||
-set(ANTLR_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../libs/antlr-2.7.7")
|
||||
-add_subdirectory("${ANTLR_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/antlr")
|
||||
-
|
||||
if(USE_QT5)
|
||||
find_package(Qt5Widgets REQUIRED)
|
||||
set(CMAKE_AUTOMOC ON)
|
||||
@@ -56,7 +53,7 @@ if(NOT USE_QT5)
|
||||
QT4_WRAP_CPP(SQLB_MOC ${SQLB_MOC_HDR})
|
||||
endif()
|
||||
|
||||
-include_directories("${ANTLR_DIR}" ../src)
|
||||
+include_directories(../src)
|
||||
|
||||
add_executable(${PROJECT_NAME} ${SQLB_MOC} ${SQLB_HDR} ${SQLB_SRC})
|
||||
|
||||
@ -1,62 +0,0 @@
|
||||
--- sqlitebrowser-3.6.0/CMakeLists.txt
|
||||
+++ sqlitebrowser-3.6.0/CMakeLists.txt
|
||||
@@ -21,14 +21,10 @@
|
||||
set(CMAKE_PREFIX_PATH "${QT5_PATH};${SQLITE3_PATH}")
|
||||
endif()
|
||||
|
||||
-set(ANTLR_DIR libs/antlr-2.7.7)
|
||||
set(QHEXEDIT_DIR libs/qhexedit)
|
||||
-set(QCUSTOMPLOT_DIR libs/qcustomplot-source)
|
||||
set(QSCINTILLA_DIR libs/qscintilla/Qt4Qt5)
|
||||
|
||||
-add_subdirectory(${ANTLR_DIR})
|
||||
add_subdirectory(${QHEXEDIT_DIR})
|
||||
-add_subdirectory(${QCUSTOMPLOT_DIR})
|
||||
add_subdirectory(${QSCINTILLA_DIR})
|
||||
|
||||
if(USE_QT5)
|
||||
@@ -207,9 +201,7 @@
|
||||
|
||||
include_directories(
|
||||
"${CMAKE_CURRENT_BINARY_DIR}"
|
||||
- ${ANTLR_DIR}
|
||||
${QHEXEDIT_DIR}
|
||||
- ${QCUSTOMPLOT_DIR}
|
||||
${QSCINTILLA_DIR}
|
||||
${ADDITIONAL_INCLUDE_PATHS}
|
||||
src)
|
||||
@@ -227,12 +218,9 @@
|
||||
qt5_use_modules(${PROJECT_NAME} Gui Widgets Network Test PrintSupport)
|
||||
set(QT_LIBRARIES "")
|
||||
endif()
|
||||
-add_dependencies(${PROJECT_NAME} antlr qhexedit qcustomplot qscintilla2)
|
||||
+add_dependencies(${PROJECT_NAME} qhexedit qscintilla2)
|
||||
|
||||
link_directories(
|
||||
- "${CMAKE_CURRENT_BINARY_DIR}/${ANTLR_DIR}"
|
||||
- "${CMAKE_CURRENT_BINARY_DIR}/${QHEXEDIT_DIR}"
|
||||
- "${CMAKE_CURRENT_BINARY_DIR}/${QCUSTOMPLOT_DIR}"
|
||||
"${CMAKE_CURRENT_BINARY_DIR}/${QSCINTILLA_DIR}")
|
||||
|
||||
target_link_libraries(${PROJECT_NAME}
|
||||
--- sqlitebrowser-3.6.0/tests/CMakeLists.txt
|
||||
+++ sqlitebrowser-3.6.0/tests/CMakeLists.txt
|
||||
@@ -7,9 +7,6 @@
|
||||
set(CMAKE_BUILD_TYPE "Release")
|
||||
endif()
|
||||
|
||||
-set(ANTLR_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../libs/antlr-2.7.7")
|
||||
-add_subdirectory("${ANTLR_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/antlr")
|
||||
-
|
||||
if(USE_QT5)
|
||||
find_package(Qt5Widgets REQUIRED)
|
||||
set(CMAKE_AUTOMOC ON)
|
||||
@@ -65,7 +62,7 @@
|
||||
QT4_WRAP_UI(SQLB_FORM_HDR ${SQLB_FORMS})
|
||||
endif()
|
||||
|
||||
-include_directories("${CMAKE_CURRENT_BINARY_DIR}" "${ANTLR_DIR}" ../src)
|
||||
+include_directories("${CMAKE_CURRENT_BINARY_DIR}" ../src)
|
||||
|
||||
add_executable(${PROJECT_NAME} ${SQLB_MOC} ${SQLB_HDR} ${SQLB_SRC} ${SQLB_FORM_HDR})
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index 973bf81..e44f0a8 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -125,7 +125,6 @@ install :
|
||||
cd man && cp -Rf $(MAN3FILES) $(DESTDIR)$(MAN3DIR)
|
||||
mkdir -p $(DESTDIR)$(PCDIR)
|
||||
cp -Rf $(PCFILES) $(DESTDIR)$(PCDIR)
|
||||
- [ "$$UID" = 0 ] && ldconfig || true
|
||||
@printf '\n'
|
||||
@printf '#================================================================\n'
|
||||
@printf '# Thanks for using Tokyo Cabinet.\n'
|
||||
@ -1,12 +0,0 @@
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index 8846c38..01caa50 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -125,7 +125,6 @@ install :
|
||||
cd man && cp -Rf $(MAN3FILES) $(DESTDIR)$(MAN3DIR)
|
||||
mkdir -p $(DESTDIR)$(PCDIR)
|
||||
cp -Rf $(PCFILES) $(DESTDIR)$(PCDIR)
|
||||
- -[ "$$UID" = 0 ] && PATH=/sbin:/usr/sbin:$(PATH) ldconfig 2>/dev/null || true
|
||||
@printf '\n'
|
||||
@printf '#================================================================\n'
|
||||
@printf '# Thanks for using Tokyo Cabinet.\n'
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index 8846c38..29ac11e 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -117,8 +117,6 @@ install :
|
||||
cp -Rf $(COMMANDFILES) $(DESTDIR)$(BINDIR)
|
||||
mkdir -p $(DESTDIR)$(LIBEXECDIR)
|
||||
cp -Rf $(CGIFILES) $(DESTDIR)$(LIBEXECDIR)
|
||||
- mkdir -p $(DESTDIR)$(DATADIR)
|
||||
- cp -Rf $(DOCUMENTFILES) $(DESTDIR)$(DATADIR)
|
||||
mkdir -p $(DESTDIR)$(MAN1DIR)
|
||||
cd man && cp -Rf $(MAN1FILES) $(DESTDIR)$(MAN1DIR)
|
||||
mkdir -p $(DESTDIR)$(MAN3DIR)
|
||||
@ -1,27 +0,0 @@
|
||||
http://bugs.gentoo.org/show_bug.cgi?id=358611
|
||||
--- unixODBC-2.3.0.orig/DriverManager/SQLDriverConnect.c 2011-04-02 21:56:19.889301819 +0400
|
||||
+++ unixODBC-2.3.0/DriverManager/SQLDriverConnect.c 2011-04-02 21:58:37.129102095 +0400
|
||||
@@ -639,7 +639,7 @@
|
||||
{
|
||||
DMHDBC connection = (DMHDBC)hdbc;
|
||||
struct con_struct con_struct;
|
||||
- char *driver, *dsn = NULL, *filedsn, *tsavefile, savefile[ 128 ];
|
||||
+ char *driver, *dsn = NULL, *filedsn, *tsavefile, savefile[ INI_MAX_PROPERTY_VALUE + 1 ];
|
||||
char lib_name[ INI_MAX_PROPERTY_VALUE + 1 ];
|
||||
char driver_name[ INI_MAX_PROPERTY_VALUE + 1 ];
|
||||
SQLRETURN ret_from_connect;
|
||||
@@ -944,7 +944,13 @@
|
||||
tsavefile = __get_attribute_value( &con_struct, "SAVEFILE" );
|
||||
if ( tsavefile )
|
||||
{
|
||||
- strcpy( savefile, tsavefile );
|
||||
+ if ( strlen( tsavefile ) > INI_MAX_PROPERTY_VALUE ) {
|
||||
+ memcpy( savefile, tsavefile, INI_MAX_PROPERTY_VALUE );
|
||||
+ savefile[ INI_MAX_PROPERTY_VALUE ] = '\0';
|
||||
+ }
|
||||
+ else {
|
||||
+ strcpy( savefile, tsavefile );
|
||||
+ }
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -1,14 +0,0 @@
|
||||
# Package Information for pkg-config
|
||||
|
||||
prefix=/usr
|
||||
wxver=@WXVERSION@
|
||||
includedir=${prefix}/include/wx-${wxver}/
|
||||
libdir=${prefix}/@LIBDIR@
|
||||
|
||||
Name: wxsqlite3-@WXVERSION@
|
||||
Description: SQLite3 C++ wrapper for use in programs based on the wxWidgets
|
||||
Version: @VERSION@
|
||||
#Requires: sqlite3
|
||||
Libs: -L${libdir} -lwxcode_gtk2u@WXDEBUG@_wxsqlite3-@WXVERSION@
|
||||
Libs.private: -lpthread
|
||||
Cflags: -I${includedir}
|
||||
@ -1,15 +1,6 @@
|
||||
DIST crystal-0.11.1-1-linux-i686.tar.gz 12283213 SHA256 2db84f6a287925d02832192cb7c5b99d0f543afd5323286a3a8c1799d5952abe SHA512 c4cfcd51efa76492c0174d8a5273303d17e672273de1b35eafcce920710afadd031e7cfec775880ccedd7d6e87d0f2c27958b1499c8ce494fcc849c6e78ec2a5 WHIRLPOOL 849abefe1ebbf9b8aae484567662973b5712e1d55a45a123cd41f7f0cfd4ecd5f7bfe5d27e6ce227922b4985772f4b70acfb8e94ff8042c48a48f08c9cab5887
|
||||
DIST crystal-0.11.1-1-linux-x86_64.tar.gz 11854829 SHA256 742ee62b23d2ada2a9baa39d0f30973ca0b5b003504b04f2aad8483ef9b6f07b SHA512 ff0a8f25a5732936797f9d9359be9725d4d93f80d1d33ddf43e1833d4fd9dc9dcfc99e6d3a54e51c380cbdaacf0c8bf7b0077b939739434e604ad33f38dc56e0 WHIRLPOOL d26aa43fe08d05f29e38885b005ccd43a3f35a51e909d2ff4c343f1d617041d7b3c7f80414781abee482f43115b9d4a9963fa5001391a5d9a487f89580605811
|
||||
DIST crystal-0.11.1.tar.gz 830437 SHA256 bdff81fcb4f2dfdd50d79abba8a1ed0260bad4c1f055002cd16b9b6f443b8a15 SHA512 ba2dc5a74925c8cc84e0654773e4befb604b3c485294d54e8ed738d7f1eef42173bb94aa12a08b65845e29494073b83b1da7bbe9438df0ba0ed30dd8491ce4ba WHIRLPOOL 9cf36214ef6df4d1e9249e8f725343eb3235cb12323416b9247c478dbca97b42c3be317c58d478576dd1cb81dc3d57b8c5e8118a4fd11d6c103a40b277de7cbe
|
||||
DIST crystal-0.12.0-1-linux-i686.tar.gz 12301739 SHA256 0595aab4336e48d0d04f0a0f172f641ebb1c17ebdb6e2eebbbfa36a650323242 SHA512 b893f1c36f658356b19257c7eb60219d2dd0a20f00d8d27ce4f3136a05153d4e3ded090979623f2895eb7b0070a902b59cdc891aba88515ee6ba9e6cf065351c WHIRLPOOL dc81e6e0ea6619e697ae81a247849bf2bf10b5134f45fd2979a7bbfa7e1be53a5f79890ecebeab9f35c86b58bfca486c0e071c5baee06600c0d76cf1f6db3224
|
||||
DIST crystal-0.12.0-1-linux-x86_64.tar.gz 11874469 SHA256 ecd444dab34803fd97dcb9f82da47c60fad9de3c2f43d20195108d678e874f16 SHA512 ffea0d3a9864249a91d9a8243ffdb39c8bd54e931479b35414065fe30d5d2d79f5f4b743eaf3f7e8936a183673e2ff3ccb83fa5f2a9e2521443eb0632f5f6723 WHIRLPOOL 3938a93c5647f784e1782e747a432668726bf901f2aa1ac0992ff19ac69a008313d3922e492343deda7ae1786847c4fb2781ac26c34870d3e2aa0f378c38b5bc
|
||||
DIST crystal-0.12.0.tar.gz 851051 SHA256 918bad9b906fe252f3f66685487892ad7c13a31135aa5874ac1e52ea399328e3 SHA512 86ba58e3f69ecada49a8e6596f49cc4e4becb109c2725b9436eb5aa587c247aa4c309242e3fdc5d6a655726595005db4e33fcf868d7c888448c58af74d1b947f WHIRLPOOL 4523f8a1904feade28584ce828fbb96d302f6976f6a0a7836c4b8cc40ac4cc2c28c9b41eb2da6dead314dbaa3422f46727cce2443e10776cd271627fb4c3d2d6
|
||||
DIST crystal-0.13.0-1-linux-i686.tar.gz 12337456 SHA256 c99d3513d46a0195625b637d0b3d3ab2b93794575b4cace973ad2f35d9f33105 SHA512 95e0443c1fc363ed065a1f33d62ae2a9ad3be98f46234f2d817e3a295ed1839867942572faa1b5c4b62223feaed2077d800b36225dd3ae01ef7cfb4d3cf1f8b5 WHIRLPOOL 02c153e7911629bf4ddd4e7e81e1a5f31af8dc5e603dc644672baf88cb89867dcab035c746c998f35406fe68fe4875976111f4d3739b31f8f1dcdadeae1ae892
|
||||
DIST crystal-0.13.0-1-linux-x86_64.tar.gz 11892025 SHA256 43946bad44378f92dd92edaf0fcb04312755c635dd1670eca8387160dd2cefa0 SHA512 ea2ac7a8b68863f62c377f9be2709299ecb80c128a99b92325fa86560319771531911f97e4e5220964507711d730767d25161eb9aa1f33e346e6c450a380716c WHIRLPOOL 5f5c8f420eb2090c7e9a5c3bb27131b9e36f92a8372da6d188bc100f853d0678e9015da4c6a439738eb366c55a08300fe74c227eec1104edbecb81955f662921
|
||||
DIST crystal-0.13.0.tar.gz 857842 SHA256 abada1d7bd411dca52ac0df2124a188d61301bdcd1fc75e8419a24496ee8ff42 SHA512 4834172808f7035c9478aa342b7bc8fe6349844a6a64d4d2d3dd63ed44658edb0a4d115afee586370c00fc169dd42c2ac4c2027e7e96197c8b5594f103bbf1c7 WHIRLPOOL 5861c20372764258275512f901d66fdfe6f92e01ed56ebea09c9225ecc84248083f23ff1b24cdeccc57f3aa02ce15e0922070469207aebc26a54c2067245b649
|
||||
DIST crystal-0.14.2-1-linux-i686.tar.gz 12794759 SHA256 12a8b8b85182a98cc162ae56452ea1226d339964076aef1fd3aa85b424608bf7 SHA512 1e930408b5e09660d73f4dfaf1b1873235167f96844cda7a93724b3a003339e780ad41e5fb29984ac4f1336bb3fd7cf361f6df7628dc86a4f23309044981ab5d WHIRLPOOL 60a01b739f72dab1aaec17461c7cfd510b8f529889212547346da3908302d5af5784e1c754f0eb77058b95ba89d22bdc88510dfa4bb180bd1499b4bad7313b90
|
||||
DIST crystal-0.14.2-1-linux-x86_64.tar.gz 12381685 SHA256 d4b96e576473a76e17175439c2e380b07feeffbbc5cb07490a96ea4dc533b922 SHA512 1ff1411698a4e5c69889c0014e3362a471d6f773dfb15bdf8fd098f784d7412171f0e1f15d54773c3ad785f4440ab47b0c099f5a57ec866c31d0d0b3f2ccaee3 WHIRLPOOL e45d5392183154568d224f21a7679fc66801adf4c17b9c0397f4d8a8ac29489222149fa01b56ee375014093a4ccfb9dfa47b8a728803a01e5c434975a9158cff
|
||||
DIST crystal-0.14.2.tar.gz 1181264 SHA256 0fdbb8c0ebbc1da0024b19fac193763654b474e3e2db957a4543bfc5ad5dba67 SHA512 ecb5d283b3b6edeff20c266b45dbef9863f1a91761279d549d7eb734a2ac233a3ca8da65f77114e80477d44c36e3825a875b08078eca550fbc902378b2db998d WHIRLPOOL e137212138cbfc06cc60f240862121677be57c51bbdb6115618bb0ae7bc59056888fb95936198761b17690f4b81941f904c19b785ea09262b854fb6970b7544d
|
||||
DIST crystal-0.15.0-1-linux-i686.tar.gz 12829634 SHA256 438c2b6ae818d6eb9e685ba352bf1310d3baf64c01e80dd9676ce43b63c393c9 SHA512 889ab12dcbd6e317d5d13a46280741a887f6c85c9888450f4a36cbd7f747f1a0475829022aff9faa5805175e967e8e10b4211028d1950bf73c8db18561e87184 WHIRLPOOL bb53e1e39d7148e6b7f238aba5045143c806f02c4b09ecb891909a3d10cd382fd1e7100d88febdf26cfdd7098442a14d8bc6feb72e3401d061dee216f1b90ec1
|
||||
DIST crystal-0.15.0-1-linux-x86_64.tar.gz 12414258 SHA256 538d3e327a5237ac521c1053ca1d98565545c3e243dc6bf7298508ae1ff474ab SHA512 f6f3cff8305c63931997279c408b27473118f1a2571885d7d8932a8c9003e5a6796f6ed71cdadbb6e9abc97904862fd224c0d4faa82f8f90051b333502067da5 WHIRLPOOL 25072726b174409296004a15ff32fbbf89800408a848bdb910c33127663d24642c612694bb30748b014f29ae149bb07d76ccf9efe1209ddd98aa8f8c7370b240
|
||||
DIST crystal-0.15.0.tar.gz 1188583 SHA256 d79445ec92faa2a045af150fca4886d90ecd9fba27451003b68118c8714b26bd SHA512 48da951e9502d882505d6c0e6dc9e9bc14cf24c3e666b33fe0d76e62fc075d8b80414686a202bbff8fcf77e61ac23438975c58bc011755d63db5a26641977ba7 WHIRLPOOL 796c7d5c70cef833419be07d62f7b389949cede1a01c5c56b9684449b158f813fedd66fc5b5b3ee72647302a6a46105cf89126bed3ab1c49281964d294fa1687
|
||||
DIST crystal-0.18.7-1-linux-i686.tar.gz 14273325 SHA256 b84e9d4050b4667012bd7f59f4802f690a2933188370703558a57c51b7661eb2 SHA512 0733f7dc45c677465f24c5615a6a97739d0f9a7276a31f44d6bd297fa49914058451eb04d2805f1c9835a08006c22caef8a44c4eff273a57b438a48f6e6d8c54 WHIRLPOOL 99668a5fc398422447543aaab34a16ba5bc28035df06cfec6225ea622354e1cdfb765243a0f7c855dfbe907ff1a8130e8526c17b391e4532146cc8edc3832efd
|
||||
DIST crystal-0.18.7-1-linux-x86_64.tar.gz 13977303 SHA256 8be06d53e91d14ad05417c5504931b0ac8485a101a98711181b6a40f008f3fa8 SHA512 69366aa66f921534cb8c3f2e03555736d6e451658e0eec1038f26e74bd8ba31c61513d61d52259291431834e8bbd941d6364f329846e81bcdfb05c5d8382343c WHIRLPOOL 7cb68ab111dc5050bb92fffe7a9b243d1bd39d097c4af39d3bb43dd5ec72e1b8e393988550255605a04084afc6e0b19270003b49ff27dd948264cd8afce49291
|
||||
DIST crystal-0.18.7.tar.gz 1359375 SHA256 72b33fd4bd903a9f0957c74c2f95429e8c0f94c04df86396711b5560f540805d SHA512 4d176036d0f003cc17be73e6a0a9c5c2c9df2764123051007156d86a7dc967c93821c3e087d8c1e27fe7f7b79efa43ea0503bc902813c5b322ca12cd2212da90 WHIRLPOOL 3f7b266be386459918c2e546faf1c3989e7c285400e1f68d0af15b3a639cf72c6a08e0f821703e0413661d8080da499da22035806e0c0a6169f0dbd43792f93f
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue