root
6 years ago
parent
918d542cd8
commit
c208462cb1
Binary file not shown.
Binary file not shown.
@ -0,0 +1,56 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python2_7 python3_{5,6} )
|
||||
|
||||
inherit distutils-r1 eutils versionator
|
||||
|
||||
DESCRIPTION="Model-driven deployment, config management, and command execution framework"
|
||||
HOMEPAGE="https://ansible.com/"
|
||||
SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86 ~x64-macos"
|
||||
IUSE="test"
|
||||
|
||||
RDEPEND="
|
||||
dev-python/paramiko[${PYTHON_USEDEP}]
|
||||
dev-python/jinja[${PYTHON_USEDEP}]
|
||||
dev-python/pyyaml[${PYTHON_USEDEP}]
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
dev-python/cryptography[${PYTHON_USEDEP}]
|
||||
dev-python/httplib2[${PYTHON_USEDEP}]
|
||||
dev-python/six[${PYTHON_USEDEP}]
|
||||
dev-python/netaddr[${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/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() {
|
||||
distutils-r1_python_install_all
|
||||
|
||||
doman docs/man/man1/*.1
|
||||
dodoc -r examples
|
||||
}
|
||||
@ -1 +1,2 @@
|
||||
DIST calamares-3.1.13.tar.gz 2279516 BLAKE2B ff2c81e81086d53c205c25dbdb7e8b1b60f5f10c979e9afd85c02426cd38037c6fbbf76e21fa5fb152ea9bf1c47658563ba5b2fb7e84b4e2734d6269584315df SHA512 451e04fe41448976e612b2a682cf38ed2683b490bb195ba82ad97d47dfd3eb808f8c25251be00104e3f3b4086ab37be462034bbd2866e64536e90f7ebcfb0d7a
|
||||
DIST calamares-3.2.0.tar.gz 2488863 BLAKE2B 6941cdd7eb381a6ee4f7bc2628605ee5a670de0d839b5797cec930737ec5fc09e214c484c2e8398ab2f12669bbc64768d5ee20b2aa1adae799fb96373a0b07df SHA512 0b502749ace48ce56f2bb364d265c5b9197cca2b27115663f928cb58d02ba43e93b80b5022053bca5899ce6ee35146992157408fc5af017da6d61abdcdbc4e1d
|
||||
|
||||
@ -0,0 +1,84 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python{3_5,3_6} )
|
||||
inherit kde5 python-r1
|
||||
|
||||
DESCRIPTION="Distribution-independent installer framework"
|
||||
HOMEPAGE="https://calamares.io"
|
||||
if [[ ${KDE_BUILD_TYPE} == live ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/${PN}/${PN}"
|
||||
else
|
||||
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
|
||||
KEYWORDS="~amd64"
|
||||
fi
|
||||
|
||||
LICENSE="GPL-3"
|
||||
IUSE="+networkmanager pythonqt +upower"
|
||||
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
||||
|
||||
DEPEND="${PYTHON_DEPS}
|
||||
$(add_frameworks_dep kconfig)
|
||||
$(add_frameworks_dep kcoreaddons)
|
||||
$(add_frameworks_dep kcrash)
|
||||
$(add_frameworks_dep kpackage)
|
||||
$(add_frameworks_dep kparts)
|
||||
$(add_frameworks_dep kservice)
|
||||
$(add_qt_dep qtdbus)
|
||||
$(add_qt_dep qtdeclarative)
|
||||
$(add_qt_dep qtgui)
|
||||
$(add_qt_dep qtnetwork)
|
||||
$(add_qt_dep qtsvg)
|
||||
$(add_qt_dep qtwebengine 'widgets')
|
||||
$(add_qt_dep qtwidgets)
|
||||
$(add_qt_dep qtxml)
|
||||
dev-cpp/yaml-cpp:=
|
||||
>=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
|
||||
dev-libs/libpwquality[${PYTHON_USEDEP}]
|
||||
sys-apps/dbus
|
||||
sys-apps/dmidecode
|
||||
sys-auth/polkit-qt[qt5(+)]
|
||||
>=sys-libs/kpmcore-3.0.3:5=
|
||||
pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
|
||||
"
|
||||
|
||||
RDEPEND="${DEPEND}
|
||||
app-admin/sudo
|
||||
dev-libs/libatasmart
|
||||
net-misc/rsync
|
||||
>=sys-block/parted-3.0
|
||||
|| ( sys-boot/grub:2 sys-boot/systemd-boot )
|
||||
sys-boot/os-prober
|
||||
sys-fs/squashfs-tools
|
||||
virtual/udev
|
||||
networkmanager? ( net-misc/networkmanager )
|
||||
upower? ( sys-power/upower )
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
cmake-utils_src_prepare
|
||||
python_setup
|
||||
export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
|
||||
PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
|
||||
PYTHON_CFLAGS="$(python_get_CFLAGS)"\
|
||||
PYTHON_LIBS="$(python_get_LIBS)"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DWEBVIEW_FORCE_WEBKIT=OFF
|
||||
-DWITH_PYTHONQT=$(usex pythonqt)
|
||||
)
|
||||
|
||||
kde5_src_configure
|
||||
sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' "${S}"/calamares.desktop
|
||||
sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' "${S}"/calamares.desktop
|
||||
}
|
||||
|
||||
src_install() {
|
||||
kde5_src_install
|
||||
dobin "${FILESDIR}"/calamares-pkexec
|
||||
}
|
||||
@ -0,0 +1,57 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit cmake-utils bash-completion-r1
|
||||
|
||||
DESCRIPTION="Interfaces with LastPass.com from the command line."
|
||||
HOMEPAGE="https://github.com/lastpass/lastpass-cli"
|
||||
SRC_URI="https://github.com/lastpass/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
SLOT="0"
|
||||
LICENSE="GPL-2+ GPL-2+-with-openssl-exception"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="libressl X +pinentry test"
|
||||
|
||||
RDEPEND="
|
||||
X? ( || ( x11-misc/xclip x11-misc/xsel ) )
|
||||
!libressl? ( dev-libs/openssl:0= )
|
||||
libressl? ( dev-libs/libressl:0= )
|
||||
net-misc/curl
|
||||
dev-libs/libxml2
|
||||
pinentry? ( app-crypt/pinentry )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
app-text/asciidoc
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DBASH_COMPLETION_COMPLETIONSDIR="$(get_bashcompdir)"
|
||||
)
|
||||
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
cmake-utils_src_compile all doc-man $(usex test lpass-test '')
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake-utils_src_install install install-doc
|
||||
}
|
||||
|
||||
src_test() {
|
||||
local myctestargs=(
|
||||
-j1 # Parallel tests fail
|
||||
)
|
||||
|
||||
# The path to lpass-test is hardcoded to "${S}"/build/lpass-test
|
||||
# which is incorrect for our out-of-source build
|
||||
sed -e "s|TEST_LPASS=.*|TEST_LPASS=\"${BUILD_DIR}/lpass-test\"|" \
|
||||
-i "${S}"/test/include.sh || die
|
||||
|
||||
cmake-utils_src_test
|
||||
}
|
||||
@ -1,53 +0,0 @@
|
||||
From a358d5ec01c6f87b39e5bfbab7a35582624fdbf7 Mon Sep 17 00:00:00 2001
|
||||
From: Josh Cooper <josh@puppet.com>
|
||||
Date: Fri, 12 Jan 2018 15:30:38 -0800
|
||||
Subject: [PATCH] (PUP-8297) Don't accept already connected socket
|
||||
|
||||
Webrick's start method yields an already connected socket, so it is not
|
||||
necessary to call accept on the socket. In ruby versions prior to 2.3.6 and
|
||||
2.4.3, the accept call was a noop.
|
||||
|
||||
In 2.3.6 and 2.4.3, it is an error, because ruby those versions use a
|
||||
non-blocking accept to handle clients that make an TCP connection, but
|
||||
are slow to negotiate the TLS handshake[1,2]. On these versions, puppet
|
||||
master would report:
|
||||
|
||||
SSL_accept returned=1 errno=0 state=unknown state: unexpected record
|
||||
|
||||
Remove the call to Socket#accept.
|
||||
|
||||
[1] https://bugs.ruby-lang.org/issues/14005
|
||||
[2] https://github.com/ruby/ruby/commit/2e728d51e70ed3756ad760c687a08b8487b0112f
|
||||
---
|
||||
lib/puppet/network/http/webrick.rb | 1 -
|
||||
spec/unit/network/http/webrick_spec.rb | 5 +++++
|
||||
2 files changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/puppet/network/http/webrick.rb b/lib/puppet/network/http/webrick.rb
|
||||
index 9ebf1763be5..3ac2ff40650 100644
|
||||
--- a/lib/puppet/network/http/webrick.rb
|
||||
+++ b/lib/puppet/network/http/webrick.rb
|
||||
@@ -29,7 +29,6 @@ def listen(address, port)
|
||||
if ! IO.select([sock],nil,nil,timeout)
|
||||
raise "Client did not send data within %.1f seconds of connecting" % timeout
|
||||
end
|
||||
- sock.accept
|
||||
@server.run(sock)
|
||||
end
|
||||
end
|
||||
diff --git a/spec/unit/network/http/webrick_spec.rb b/spec/unit/network/http/webrick_spec.rb
|
||||
index a90fc3f3378..843b0d54c8a 100644
|
||||
--- a/spec/unit/network/http/webrick_spec.rb
|
||||
+++ b/spec/unit/network/http/webrick_spec.rb
|
||||
@@ -92,6 +92,11 @@
|
||||
expect(server).to be_listening
|
||||
end
|
||||
|
||||
+ it "is passed an already connected socket" do
|
||||
+ socket.expects(:accept).never
|
||||
+ server.listen(address, port)
|
||||
+ end
|
||||
+
|
||||
describe "when the REST protocol is requested" do
|
||||
it "should register the REST handler at /" do
|
||||
# We don't care about the options here.
|
||||
Binary file not shown.
@ -1,39 +0,0 @@
|
||||
diff -r -u ../unchanged/Lib/Makefile ./Lib/Makefile
|
||||
--- ../unchanged/Lib/Makefile 2004-08-26 00:39:58.847605592 +1000
|
||||
+++ ./Lib/Makefile 2004-08-26 00:41:12.307438000 +1000
|
||||
@@ -41,7 +41,7 @@
|
||||
# to define LITT_ENDIAN on little endian machines (intel)
|
||||
# checks for sizeof(long)=4, sizeof(short)=2, sizeof(int)=4
|
||||
defendian.h: myconf
|
||||
- myconf
|
||||
+ ./myconf
|
||||
|
||||
adf_nativ.o: ${NATIV_DIR}/adf_nativ.c ${NATIV_DIR}/adf_nativ.h
|
||||
$(CC) ${CFLAGS} -c ${NATIV_DIR}/adf_nativ.c
|
||||
Only in ../unchanged/Lib: Makefile.orig
|
||||
Only in ../unchanged/Lib: Makefile.rej
|
||||
diff -r -u ../unchanged/Lib/myconf ./Lib/myconf
|
||||
--- ../unchanged/Lib/myconf 2000-08-19 11:08:08.000000000 +1000
|
||||
+++ ./Lib/myconf 2004-08-26 00:41:28.344000072 +1000
|
||||
@@ -31,17 +31,17 @@
|
||||
gcc myctest.c -o myctest
|
||||
rm myctest.c
|
||||
|
||||
-if [ `myctest |cut -d' ' -f 1` != 4 ]
|
||||
+if [ `./myctest |cut -d' ' -f 1` != 4 ]
|
||||
then echo "Error : sizeof(long)!=4"
|
||||
fi
|
||||
-if [ `myctest |cut -d' ' -f 2` != 2 ]
|
||||
+if [ `./myctest |cut -d' ' -f 2` != 2 ]
|
||||
then echo "Error : sizeof(short)!=2"
|
||||
fi
|
||||
-if [ `myctest |cut -d' ' -f 3` != 4 ]
|
||||
+if [ `./myctest |cut -d' ' -f 3` != 4 ]
|
||||
then echo "Error :sizeof(int)!=4"
|
||||
fi
|
||||
|
||||
-if [ `myctest |cut -d' ' -f 4` = LITTLE ]
|
||||
+if [ `./myctest |cut -d' ' -f 4` = LITTLE ]
|
||||
then
|
||||
echo "#ifndef LITT_ENDIAN" >defendian.h
|
||||
echo "#define LITT_ENDIAN 1" >>defendian.h
|
||||
@ -1,2 +1,3 @@
|
||||
DIST zopfli-1.0.0_p20140705.tar.gz 125759 BLAKE2B 5bc052de7f8189605ec4e155c35413e5000ab1fabe7edd2877b9bbc04a0041c5f02fa67fe6a818f68eb4af15251dabf7e599615656956e315b5ece497e2afa1a SHA512 ce5b3eb016b0d734a775dbb45842de4aa4a00bc1490edfdbbf81c4640da94994d08f336b313c45b785e17c61ecf58f370edb2cb6523c963798cad739af2282ca
|
||||
DIST zopfli-1.0.1.tar.gz 128178 BLAKE2B dfc410508c0566ba6ec948c2ed17b5ffa45338834c08991b5f2954b06b598f01a9c2cdba6526f324bd477e89e0ddb1ab86d4c2498ffe4cc573ba434b610fec14 SHA512 51d4b2d990e6785e86f0e0104325723c9a7c3b8bf6925ef694b6696f2238eaafff2ca625495a676874ecc1704df7d685e5234b0c601e5804c1c293242e113430
|
||||
DIST zopfli-1.0.2.tar.gz 136035 BLAKE2B 23b9af324f50f2fa7276cdb8ac042e251f4e295617638c6e3999b8ecaef5d61d1fe21dd7b8d84e19f7f682f3a592674fcd6c19f359efb86ac4ea57acaac3761e SHA512 290a9506a0c1f3d0510230ca21017e1d2bed830f3f96f9d38c9f27210d89123c3baebd05a1da988eccd5395a7b007f6690f08eb9087550a06eaa69d7531f074e
|
||||
|
||||
@ -0,0 +1,70 @@
|
||||
From 90221a4d79dcbf44239b9b07cb7c3ec7c090a4a3 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Pipping <sebastian@pipping.org>
|
||||
Date: Fri, 18 May 2018 20:43:23 +0200
|
||||
Subject: [PATCH] Respect env CC/CXX, split LDFLAGS, use libraries
|
||||
|
||||
This is a port of files/zopfli-1.0.1-makefile.patch to 1.0.2.
|
||||
---
|
||||
Makefile | 32 +++++++++++++++++++-------------
|
||||
1 file changed, 19 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 30b931e..bf063df 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -1,8 +1,10 @@
|
||||
-CC = gcc
|
||||
-CXX = g++
|
||||
+CC ?= gcc
|
||||
+CXX ?= g++
|
||||
|
||||
-CFLAGS = -W -Wall -Wextra -ansi -pedantic -lm -O2 -Wno-unused-function
|
||||
-CXXFLAGS = -W -Wall -Wextra -ansi -pedantic -O2
|
||||
+CFLAGS += -W -Wall -Wextra -ansi -pedantic
|
||||
+CXXFLAGS += -W -Wall -Wextra -ansi -pedantic
|
||||
+LDFLAGS += -L. -Wno-unused-function
|
||||
+LIBS = -lm
|
||||
|
||||
ZOPFLILIB_SRC = src/zopfli/blocksplitter.c src/zopfli/cache.c\
|
||||
src/zopfli/deflate.c src/zopfli/gzip_container.c\
|
||||
@@ -18,24 +20,28 @@ ZOPFLIPNGBIN_SRC := src/zopflipng/zopflipng_bin.cc
|
||||
|
||||
.PHONY: zopfli zopflipng
|
||||
|
||||
+all: zopfli zopflipng
|
||||
+
|
||||
# Zopfli binary
|
||||
-zopfli:
|
||||
- $(CC) $(ZOPFLILIB_SRC) $(ZOPFLIBIN_SRC) $(CFLAGS) -o zopfli
|
||||
+zopfli: libzopfli
|
||||
+ $(CC) $(ZOPFLIBIN_SRC) $(CFLAGS) $(LDFLAGS) $(LIBS) -lzopfli -o zopfli
|
||||
|
||||
# Zopfli shared library
|
||||
libzopfli:
|
||||
$(CC) $(ZOPFLILIB_SRC) $(CFLAGS) -fPIC -c
|
||||
- $(CC) $(ZOPFLILIB_OBJ) $(CFLAGS) -shared -Wl,-soname,libzopfli.so.1 -o libzopfli.so.1.0.2
|
||||
+ $(CC) $(ZOPFLILIB_OBJ) $(CFLAGS) $(LDFLAGS) $(LIBS) -shared -Wl,-soname,libzopfli.so.1 -o libzopfli.so.1.0.2
|
||||
+ @ln -s libzopfli.so.1.0.2 libzopfli.so.1
|
||||
+ @ln -s libzopfli.so.1.0.2 libzopfli.so
|
||||
|
||||
# ZopfliPNG binary
|
||||
-zopflipng:
|
||||
- $(CC) $(ZOPFLILIB_SRC) $(CFLAGS) -c
|
||||
- $(CXX) $(ZOPFLILIB_OBJ) $(LODEPNG_SRC) $(ZOPFLIPNGLIB_SRC) $(ZOPFLIPNGBIN_SRC) $(CFLAGS) -o zopflipng
|
||||
+zopflipng: libzopflipng
|
||||
+ $(CXX) $(ZOPFLILIB_OBJ) $(LODEPNG_SRC) $(ZOPFLIPNGBIN_SRC) $(CXXFLAGS) $(LDFLAGS) $(LIBS) -lzopflipng -o zopflipng
|
||||
|
||||
# ZopfliPNG shared library
|
||||
-libzopflipng:
|
||||
- $(CC) $(ZOPFLILIB_SRC) $(CFLAGS) -fPIC -c
|
||||
- $(CXX) $(ZOPFLILIB_OBJ) $(LODEPNG_SRC) $(ZOPFLIPNGLIB_SRC) $(CFLAGS) -fPIC --shared -Wl,-soname,libzopflipng.so.1 -o libzopflipng.so.1.0.2
|
||||
+libzopflipng: libzopfli
|
||||
+ $(CXX) $(ZOPFLILIB_OBJ) $(LODEPNG_SRC) $(ZOPFLIPNGLIB_SRC) $(CXXFLAGS) $(LDFLAGS) $(LIBS) -fPIC --shared -Wl,-soname,libzopflipng.so.1 -o libzopflipng.so.1.0.2
|
||||
+ @ln -s libzopflipng.so.1.0.2 libzopflipng.so.1
|
||||
+ @ln -s libzopflipng.so.1.0.2 libzopflipng.so
|
||||
|
||||
# Remove all libraries and binaries
|
||||
clean:
|
||||
--
|
||||
2.17.0
|
||||
|
||||
@ -0,0 +1,41 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit toolchain-funcs
|
||||
|
||||
DESCRIPTION="Very good, but slow, deflate or zlib compression"
|
||||
HOMEPAGE="https://github.com/google/zopfli/"
|
||||
SRC_URI="https://github.com/google/zopfli/archive/${P}.tar.gz"
|
||||
|
||||
S="${WORKDIR}/${PN}-${P}"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0/1"
|
||||
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
|
||||
|
||||
DOCS=( CONTRIBUTORS README README.zopflipng )
|
||||
|
||||
PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
|
||||
|
||||
# zopflipng statically links an exact version of LodePNG (https://github.com/lvandeve/lodepng)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
tc-export CC CXX
|
||||
}
|
||||
|
||||
# The Makefile has no install phase
|
||||
src_install() {
|
||||
dolib.so libzopfli.so*
|
||||
doheader src/zopfli/zopfli.h
|
||||
|
||||
dobin ${PN}
|
||||
|
||||
# This version was erroneously not bumped to match ${PV}
|
||||
dolib.so libzopflipng.so*
|
||||
doheader src/zopflipng/zopflipng_lib.h
|
||||
|
||||
dobin zopflipng
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
@ -1,3 +1,4 @@
|
||||
DIST siege-3.0.6.tar.gz 496002 BLAKE2B b21ed07a36b3e0ae5b4166f2d1351be790261d149bcac98f4d2795796e42a8697bf618822792f6f7c912be29d926cf5f8d3de443498deab8c553217db359d282 SHA512 621f3f60f2aac70fb051f48819f5673d60f31fc4fc69e4c65d4ae0a285d02112686f1e9b40241d48afc378446a2b296a7dc4bbc6d8ae38e390d380506f4d448b
|
||||
DIST siege-3.1.3.tar.gz 527862 BLAKE2B 9cc10b5afa15c5a7682452d8a4020de62c195192abcb222c36d148da871693c1fcf5be2e3d1a3ca1c4a7fd39fda505520f40ee053ca50fd15340441a498e368f SHA512 880b6d8bbe6b8210147ebb26fd724f4c242076740284977471165fbca514b56c49812ace42dcbe23c57be8fd10a2503b129deec10b79991451a9ae83f30a742b
|
||||
DIST siege-3.1.4.tar.gz 530149 BLAKE2B 3721387fa1ace745ce7748612849b84c07e84456bd903460930ab407cba1e24f493d4a251bacd3e509aafbc653e5d74e96509bf74f0a2a8066a0ec2b7ad2e9ee SHA512 8e8b4c1e9c20833f4c3538e8929e47d1c9113cd1faf395e5f07734fb7f4291061cb7554cf500a80d8b1b6be0d6f4c8194b054f632f35533837220702784ee068
|
||||
DIST siege-4.0.4.tar.gz 523102 BLAKE2B 2d69dd37fea7ff35e05b41d500d4efb5b4fe60d9389b7bd98ec360148af781a24b6ebaa213b59ffc36cfcc8421efea14d8ec9f5742a53e019b2221584b5af17e SHA512 a8361ac0e2514626d794e7e4a345b178462409a1f3b53a9318adf171b511c408508acdb07652ad38f34021ac4a614dc5e6d2ea3c6a4ffd261ceef36d3226e573
|
||||
|
||||
@ -0,0 +1,50 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit autotools bash-completion-r1
|
||||
|
||||
DESCRIPTION="A HTTP regression testing and benchmarking utility"
|
||||
HOMEPAGE="https://www.joedog.org/siege-home/"
|
||||
SRC_URI="http://download.joedog.org/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~x86 ~x64-macos"
|
||||
SLOT="0"
|
||||
IUSE="libressl ssl"
|
||||
|
||||
RDEPEND="ssl? (
|
||||
!libressl? ( dev-libs/openssl:0= )
|
||||
libressl? ( dev-libs/libressl:0= )
|
||||
)"
|
||||
DEPEND="${RDEPEND}
|
||||
sys-devel/libtool"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
# bundled macros break recent libtool
|
||||
sed -i -e '/AC_PROG_SHELL/d' configure.ac || die
|
||||
rm *.m4 || die "failed to remove bundled macros"
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf=(
|
||||
$(use_with ssl ssl "${EPREFIX}/usr")
|
||||
)
|
||||
econf "${myconf[@]}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install
|
||||
|
||||
dodoc AUTHORS ChangeLog INSTALL README* doc/siegerc doc/urls.txt
|
||||
|
||||
newbashcomp "${FILESDIR}"/${PN}.bash-completion ${PN}
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "An example ~/.siegerc file has been installed in"
|
||||
elog "${EPREFIX}/usr/share/doc/${PF}/"
|
||||
}
|
||||
Binary file not shown.
@ -1,45 +0,0 @@
|
||||
commit 53289f71c53f3aa8047b34d6db9b0ca2ac35f4cb
|
||||
Author: Cédric Krier <ced@b2ck.com>
|
||||
Date: Wed Jun 7 11:29:13 2017 +0200
|
||||
|
||||
Fix OpenSSL version check for LibreSSL
|
||||
|
||||
diff --git a/plugins_tools/eid-viewer/certhelpers.c b/plugins_tools/eid-viewer/certhelpers.c
|
||||
index de9f8bf4..1e3d1ee1 100644
|
||||
--- a/plugins_tools/eid-viewer/certhelpers.c
|
||||
+++ b/plugins_tools/eid-viewer/certhelpers.c
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
#include "backend.h"
|
||||
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||||
#define X509_get0_extensions(ce) ((ce)->cert_info->extensions)
|
||||
#define ASN1_STRING_get0_data ASN1_STRING_data
|
||||
#endif
|
||||
diff --git a/plugins_tools/eid-viewer/verify.c b/plugins_tools/eid-viewer/verify.c
|
||||
index 04016a44..f144d2cb 100644
|
||||
--- a/plugins_tools/eid-viewer/verify.c
|
||||
+++ b/plugins_tools/eid-viewer/verify.c
|
||||
@@ -22,7 +22,7 @@
|
||||
#endif
|
||||
// All valid OCSP URLs should have the following as their prefix:
|
||||
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||||
#define X509_get0_extensions(ce) ((ce)->cert_info->extensions)
|
||||
|
||||
#define X509_get0_tbs_sigalg(ci) ((ci)->sig_alg)
|
||||
diff --git a/tests/unit/sign.c b/tests/unit/sign.c
|
||||
index 31a1ab7a..0e0e3011 100644
|
||||
--- a/tests/unit/sign.c
|
||||
+++ b/tests/unit/sign.c
|
||||
@@ -37,7 +37,7 @@
|
||||
#include <openssl/rsa.h>
|
||||
#include <openssl/engine.h>
|
||||
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||||
static int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d) {
|
||||
if(!r || !n || !e) {
|
||||
return 0;
|
||||
@ -1,75 +0,0 @@
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 393ecb3..0e14661 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -1,7 +1,7 @@
|
||||
ACLOCAL_AMFLAGS = -I scripts/m4
|
||||
EXTRA_DIST = scripts/build-aux/config.rpath scripts/build-aux/genver.sh .version debian rpm doc
|
||||
|
||||
-SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util tests/unit plugins_tools/xpi plugins_tools/aboutmw/gtk plugins_tools/eid-viewer
|
||||
+SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util tests/unit plugins_tools/xpi
|
||||
|
||||
xpipackage:
|
||||
$(MAKE) -C plugins_tools/xpi xpipackage
|
||||
diff --git a/cardcomm/pkcs11/src/Makefile.am b/cardcomm/pkcs11/src/Makefile.am
|
||||
index 02e4e36..86d607b 100644
|
||||
--- a/cardcomm/pkcs11/src/Makefile.am
|
||||
+++ b/cardcomm/pkcs11/src/Makefile.am
|
||||
@@ -165,7 +165,6 @@ libbeidpkcs11_la_SOURCES += \
|
||||
dialogs/dialogsgtk/single_dialog.c
|
||||
endif
|
||||
|
||||
-libexec_PROGRAMS = beid-askpin beid-changepin beid-badpin beid-askaccess beid-spr-askpin beid-spr-changepin
|
||||
|
||||
if P11KIT
|
||||
dist_p11kitcf_DATA = beid.module
|
||||
@@ -176,30 +175,4 @@ install-exec-hook:
|
||||
$(LN_S) $(libdir)/libbeidpkcs11.so.0 beidpkcs11.so
|
||||
endif
|
||||
|
||||
-beid_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askpin.c
|
||||
-beid_askpin_CPPFLAGS = -I$(srcdir)/dialogsgtk -I$(srcdir)/../common/src -I$(srcdir)/src @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"'
|
||||
-beid_askpin_LDADD = @GTK_LIBS@
|
||||
-
|
||||
-beid_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-changepin.c
|
||||
-beid_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"'
|
||||
-beid_changepin_LDADD = @GTK_LIBS@
|
||||
-
|
||||
-beid_badpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-badpin.c
|
||||
-beid_badpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"'
|
||||
-beid_badpin_LDADD = @GTK_LIBS@
|
||||
-
|
||||
-beid_askaccess_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askaccess.c
|
||||
-beid_askaccess_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"'
|
||||
-beid_askaccess_LDADD = @GTK_LIBS@
|
||||
-
|
||||
-beid_spr_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-askpin.c
|
||||
-beid_spr_askpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"'
|
||||
-beid_spr_askpin_LDADD = @GTK_LIBS@
|
||||
-
|
||||
-beid_spr_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-changepin.c
|
||||
-beid_spr_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"'
|
||||
-beid_spr_changepin_LDADD = @GTK_LIBS@
|
||||
-
|
||||
pkgconfig_DATA=libbeidpkcs11.pc
|
||||
-
|
||||
-SUBDIRS = dialogs/dialogsgtk/po
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 9bf10f9..f0120b1 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -59,14 +59,6 @@ fi
|
||||
|
||||
AC_DEFINE_UNQUOTED([HAVE_GTK], [$have_gtk], [Set to major version of libgtk])
|
||||
|
||||
-if test "$have_gtk" = "no"
|
||||
-then
|
||||
- AC_MSG_ERROR([At least one version of GTK is required.])
|
||||
-fi
|
||||
-
|
||||
-PKG_CHECK_MODULES([XML2], [libxml-2.0])
|
||||
-PKG_CHECK_MODULES([libproxy], [libproxy-1.0])
|
||||
-
|
||||
###########################################################################
|
||||
####### read user-specific requests from --enable directives ######
|
||||
###########################################################################
|
||||
@ -0,0 +1,24 @@
|
||||
diff --git b/test/util.py a/test/util.py
|
||||
new file mode 100644
|
||||
index 0000000..0551d06
|
||||
--- /dev/null
|
||||
+++ a/test/util.py
|
||||
@@ -0,0 +1,18 @@
|
||||
+from click.testing import CliRunner
|
||||
+from ykman.cli.__main__ import cli
|
||||
+import os
|
||||
+
|
||||
+
|
||||
+PKG_DIR = os.path.dirname(os.path.abspath(__file__))
|
||||
+
|
||||
+
|
||||
+def open_file(*relative_path):
|
||||
+ return open(os.path.join(PKG_DIR, 'files', *relative_path), 'rb')
|
||||
+
|
||||
+
|
||||
+def ykman_cli(*argv, **kwargs):
|
||||
+ runner = CliRunner()
|
||||
+ result = runner.invoke(cli, list(argv), obj={}, **kwargs)
|
||||
+ if result.exit_code != 0:
|
||||
+ raise result.exception
|
||||
+ return result.output
|
||||
@ -0,0 +1,62 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
|
||||
inherit readme.gentoo-r1 distutils-r1
|
||||
|
||||
DESCRIPTION="Python library and command line tool for configuring a YubiKey"
|
||||
HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
|
||||
SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE="test"
|
||||
|
||||
RDEPEND="
|
||||
dev-python/fido2[${PYTHON_USEDEP}]
|
||||
dev-python/six[${PYTHON_USEDEP}]
|
||||
dev-python/pyscard[${PYTHON_USEDEP}]
|
||||
dev-python/pyusb[${PYTHON_USEDEP}]
|
||||
dev-python/click[${PYTHON_USEDEP}]
|
||||
dev-python/cryptography[${PYTHON_USEDEP}]
|
||||
dev-python/pyopenssl[${PYTHON_USEDEP}]
|
||||
$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
|
||||
sys-auth/ykpers
|
||||
"
|
||||
DEPEND="
|
||||
test? (
|
||||
${RDEPEND}
|
||||
$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2_7')
|
||||
)
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-0.7.0-fix-tests.patch
|
||||
)
|
||||
|
||||
python_test() {
|
||||
touch "${S}"/test/__init__.py || die
|
||||
esetup.py test
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
local DOC_CONTENTS
|
||||
|
||||
distutils-r1_python_install_all
|
||||
|
||||
DOC_CONTENTS="
|
||||
The 'openpgp' command may require the package 'app-crypt/ccid'
|
||||
to be installed on the system. Furthermore, make sure that pcscd
|
||||
daemon is running and has correct access permissions to USB
|
||||
devices.
|
||||
"
|
||||
|
||||
readme.gentoo_create_doc
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
readme.gentoo_print_elog
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
@ -1,28 +0,0 @@
|
||||
###########
|
||||
# WARNING #
|
||||
###########
|
||||
#
|
||||
# This file is provided for backwards compatibility only. The Apache
|
||||
# PHP configuration is now located in 70_mod_php.conf and requires you
|
||||
# to set -DPHP in your Apache conf.d file. Please examine
|
||||
# 70_mod_php.conf and update your Apache configuration to use -DPHP
|
||||
# instead of -DPHP5. Afterwards you may delete this file.
|
||||
#
|
||||
<IfDefine PHP5>
|
||||
# Load the module first
|
||||
<IfModule !mod_php5.c>
|
||||
LoadModule php5_module modules/libphp5.so
|
||||
</IfModule>
|
||||
|
||||
# Set it to handle the files
|
||||
# NOTE: Avoiding AddHandler/AddType for security (bug #538822)
|
||||
# NOTE: Please read the related news item!
|
||||
<FilesMatch "\.(php|php5|phtml)$">
|
||||
SetHandler application/x-httpd-php
|
||||
</FilesMatch>
|
||||
<FilesMatch "\.phps$">
|
||||
SetHandler application/x-httpd-php-source
|
||||
</FilesMatch>
|
||||
|
||||
DirectoryIndex index.php index.phtml
|
||||
</IfDefine>
|
||||
Binary file not shown.
@ -1,4 +1,4 @@
|
||||
DIST portage-utils-0.62.tar.xz 527216 BLAKE2B ac8331b74998ddb86db55a937992447bccf60611cc259ceb5fe79918c1a43b6dc4633e4ad64462e2df5c39e8d8aa193bd57ab24dcd714e088357eb3cb177e972 SHA512 71b2888cef1bf7549c3829cc7d4bbe2e99a711434bae4fb78c55b9c37815b61623518f19ab87db30f533d771398933c085640dc7c8ffcedf87a70ac702a52fa1
|
||||
DIST portage-utils-0.64.tar.xz 533124 BLAKE2B c3e0ecdc2d82af197dabb8434677d4c3bfbbee01c482c496d89d2f7be988ef894e0b3c7cb64337216144644a48ee3213fc1683ae6d75091e471189a4550b8c71 SHA512 e384b88454607aa9123ac3a71d55fb16de475ba59f4ba6efd236594f42140e75650696430138cdb6e1c4e1792db091bbc1db42b1c1102fd579af6514ecefffb7
|
||||
DIST portage-utils-0.65.tar.xz 542804 BLAKE2B bddc1a0ffa52a8d871547e5f4cbbca254e2ac56d84b7271dac127e6be64b13bc0168a7ed256b782b0e844720e536076fe7a7df3ec04a862c85b2501110de2d11 SHA512 a76be4d86b07ba39fa577efe477973f888062094d6f3a98b873e10998e10e3d0d08137444e11d14489ff8f465d984e8929b5ee91c26944bad7a245683ee4d056
|
||||
DIST portage-utils-0.70.tar.xz 551192 BLAKE2B ca15637ee6532eebd3a064559bb933aad3042c19994e5dcb8234249312dac139288e4ed38f9c2b46ce1921d97398485bb7276ccf285b2f97df3889a2c91f4d9f SHA512 de3d0813a2e71ca93722828b9b8ee8211e7d5383b81a8ae343624e98618522c0d56945422ae6fadbe0694c4b0f381aa0047eb28bfa7e63e0d95c468e3e2934ab
|
||||
DIST portage-utils-0.71.tar.xz 555156 BLAKE2B 504973b242f54824ae1f4b135dc1e1021ed0ca6a59d04ef39161255dbebdb7f8870455954ba02987c04c50f6963e7f6c460c4440b2c5ce456b9c489296979e48 SHA512 b9bf4156a1060fec56f9b6348d2d8e83b507a8bff2c507e07bc1c84075082b184d270ca0f89e0f4abf738ce9e8cb8b1f45a211d2dc52cadbdb0ee5d658bf678f
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@ -1,2 +1,3 @@
|
||||
DIST SchemaSync-0.9.2.tar.gz 12828 BLAKE2B 050a027376282816bef34d6a7e146e590c5ebc279649f03d65129d33b9941c08aeb7bb58a302b9a77a62c8b7820b8dcbd6bc783c2405a25a4baca863baa53d3e SHA512 4f2522c05e3cf0957fe0d51cc48f3a45fd8eaeb341801bfdeb32bb7e959e8a250a84a162b80853f2010a99a932ef7d1b556579f7c77971f0e9a3e0fa87531599
|
||||
DIST SchemaSync-0.9.4.tar.gz 13824 BLAKE2B d98cd5cc0d6275ac5e4bb0272f4ab2879f4639b0e2986c175297ab3cc60930f63c3288cc2c3194784078958749c8e95a9e9ecdf660e071a61caac37b9659f2e3 SHA512 0087f5f634d2374def5e1dd2dd8d6d57d3fca9322bba23aee461487053233dba30ce889a87747ce2c11bd9a7e08418d619e9fd8b910ea303987b57bac7609248
|
||||
DIST SchemaSync-0.9.5.tar.gz 13973 BLAKE2B e76dd4e2e69875dedafed44214b6e30db6e71f4ee62a4bcd1cf1592c6727ae9d6f70190aa288559594d278b3962f8cb91eeb3d4b4b9014737be8b6b37acc9e84 SHA512 8ee37c099de8e3627d3d708c5642e4e0b7304306002bfa82d24cd2a733539bd0d5144d6afd18dd06e229a87b05ee569fe2febc727785a085bb32169581805934
|
||||
|
||||
@ -0,0 +1,23 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="MySQL Schema Versioning and Migration Utility"
|
||||
HOMEPAGE="https://github.com/mmatuson/SchemaSync"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
dev-python/mysql-python[${PYTHON_USEDEP}]
|
||||
dev-python/SchemaObject[${PYTHON_USEDEP}]"
|
||||
DEPEND="${RDEPEND}"
|
||||
@ -1,43 +0,0 @@
|
||||
diff -aurN a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
|
||||
--- a/cmake/FindMySQL.cmake 2016-11-29 07:40:13.000000000 -0500
|
||||
+++ b/cmake/FindMySQL.cmake 2017-02-17 13:59:18.115389096 -0500
|
||||
@@ -747,7 +747,7 @@
|
||||
endif()
|
||||
|
||||
if(NOT MYSQL_CXXFLAGS)
|
||||
- if(MYSQL_CXX_LINKAGE OR MYSQL_VERSION_ID GREATER 50603)
|
||||
+ if(MYSQL_CXX_LINKAGE)
|
||||
_mysql_conf(MYSQL_CXXFLAGS "--cxxflags")
|
||||
set(MYSQL_CXX_LINKAGE 1)
|
||||
else()
|
||||
diff -aurN a/CMakeLists.txt b/CMakeLists.txt
|
||||
--- a/CMakeLists.txt 2017-02-17 13:50:43.556006202 -0500
|
||||
+++ b/CMakeLists.txt 2017-02-17 13:57:15.745676184 -0500
|
||||
@@ -242,10 +242,9 @@
|
||||
SET(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin")
|
||||
SET(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib")
|
||||
|
||||
-SET(LIB_SUBDIR "lib")
|
||||
-IF(RPM_BUILD AND CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64|ppc64|ppc64p7|s390x|sparc64)")
|
||||
- SET(LIB_SUBDIR "lib64")
|
||||
-ENDIF()
|
||||
+IF(NOT LIB_SUBDIR)
|
||||
+ MESSAGE(ERROR "LIB_SUBDIR is not set")
|
||||
+ENDIF(NOT LIB_SUBDIR)
|
||||
|
||||
MESSAGE(STATUS "Installation library subdir: ${LIB_SUBDIR}")
|
||||
|
||||
diff -aurN a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
|
||||
--- a/cmake/FindMySQL.cmake 2017-02-17 14:44:29.532733308 -0500
|
||||
+++ b/cmake/FindMySQL.cmake 2017-02-17 14:48:56.756740330 -0500
|
||||
@@ -270,8 +270,8 @@
|
||||
set(_static_lib_ext ".lib") # Careful, can be import library for DLL
|
||||
elseif(MYSQLCLIENT_NO_THREADS)
|
||||
# In 5.1 and below there is a single threaded library
|
||||
- set(_dynamic_libs "mysqlclient")
|
||||
- set(_static_libs "libmysqlclient.a")
|
||||
+ set(_dynamic_libs "${MYSQLCLIENT_LIB_NAME}")
|
||||
+ set(_static_libs "lib${MYSQLCLIENT_LIB_NAME}.a")
|
||||
set(_static_lib_ext ".a")
|
||||
else()
|
||||
# We try the multithreaded "libmysqlclient_r" first and if not
|
||||
@ -1,93 +0,0 @@
|
||||
diff -aurN a/driver/connect.c b/driver/connect.c
|
||||
--- a/driver/connect.c 2016-11-29 07:40:13.000000000 -0500
|
||||
+++ b/driver/connect.c 2017-02-17 16:14:48.116640371 -0500
|
||||
@@ -510,11 +510,11 @@
|
||||
}
|
||||
}
|
||||
|
||||
-#if MYSQL_VERSION_ID >= 50709
|
||||
- mysql_get_option(mysql, MYSQL_OPT_NET_BUFFER_LENGTH, &dbc->net_buffer_length);
|
||||
+#if MYSQL_VERSION_ID >= 50709 && !defined(MARIADB_BASE_VERSION)
|
||||
+ mysql_get_option(mysql, MYSQL_OPT_NET_BUFFER_LENGTH, &dbc->net_buffer_length_value);
|
||||
#else
|
||||
// for older versions just use net_buffer_length() macro
|
||||
- dbc->net_buffer_length = net_buffer_length;
|
||||
+ dbc->net_buffer_length_value = net_buffer_length;
|
||||
#endif
|
||||
return rc;
|
||||
|
||||
diff -aurN a/driver/cursor.c b/driver/cursor.c
|
||||
--- a/driver/cursor.c 2016-11-29 07:40:13.000000000 -0500
|
||||
+++ b/driver/cursor.c 2017-02-17 16:13:19.163299885 -0500
|
||||
@@ -1485,7 +1485,7 @@
|
||||
We have a limited capacity to shove data across the wire, but
|
||||
we handle this by sending in multiple calls to exec_stmt_query()
|
||||
*/
|
||||
- if (ext_query->length + length >= (SQLULEN) stmt->dbc->net_buffer_length)
|
||||
+ if (ext_query->length + length >= (SQLULEN) stmt->dbc->net_buffer_length_value)
|
||||
{
|
||||
break_insert= TRUE;
|
||||
break;
|
||||
diff -aurN a/driver/driver.h b/driver/driver.h
|
||||
--- a/driver/driver.h 2016-11-29 07:40:13.000000000 -0500
|
||||
+++ b/driver/driver.h 2017-02-17 16:10:57.072950723 -0500
|
||||
@@ -378,7 +378,7 @@
|
||||
int txn_isolation;
|
||||
uint port;
|
||||
uint cursor_count;
|
||||
- ulong net_buffer_length;
|
||||
+ ulong net_buffer_length_value;
|
||||
uint commit_flag;
|
||||
#ifdef THREAD
|
||||
myodbc_mutex_t lock;
|
||||
diff -aurN a/driver/info.c b/driver/info.c
|
||||
--- a/driver/info.c 2016-11-29 07:40:13.000000000 -0500
|
||||
+++ b/driver/info.c 2017-02-17 16:12:54.315763441 -0500
|
||||
@@ -587,7 +587,7 @@
|
||||
MYINFO_SET_USHORT(0);
|
||||
|
||||
case SQL_MAX_STATEMENT_LEN:
|
||||
- MYINFO_SET_ULONG(dbc->net_buffer_length);
|
||||
+ MYINFO_SET_ULONG(dbc->net_buffer_length_value);
|
||||
|
||||
case SQL_MAX_TABLE_NAME_LEN:
|
||||
MYINFO_SET_USHORT(NAME_LEN);
|
||||
diff -aurN a/driver/connect.c b/driver/connect.c
|
||||
--- a/driver/connect.c 2017-02-17 16:16:14.609026769 -0500
|
||||
+++ b/driver/connect.c 2017-02-17 16:34:29.637592664 -0500
|
||||
@@ -179,7 +179,7 @@
|
||||
/* Set other connection options */
|
||||
|
||||
if (ds->allow_big_results || ds->safe)
|
||||
-#if MYSQL_VERSION_ID >= 50709
|
||||
+#if MYSQL_VERSION_ID >= 50709 && !defined(MARIADB_BASE_VERSION)
|
||||
mysql_options(mysql, MYSQL_OPT_MAX_ALLOWED_PACKET, &max_long);
|
||||
#else
|
||||
/* max_allowed_packet is a magical mysql macro. */
|
||||
@@ -252,7 +252,7 @@
|
||||
ds_get_utf8attr(ds->rsakey, &ds->rsakey8));
|
||||
}
|
||||
|
||||
-#if MYSQL_VERSION_ID >= 50710
|
||||
+#if MYSQL_VERSION_ID >= 50710 && !defined(MARIADB_BASE_VERSION)
|
||||
{
|
||||
char tls_options[128] = { 0 };
|
||||
if (!ds->no_tls_1)
|
||||
@@ -323,7 +323,7 @@
|
||||
#endif
|
||||
|
||||
mysql->options.use_ssl = !ds->disable_ssl_default;
|
||||
-#if MYSQL_VERSION_ID >= 50703
|
||||
+#if MYSQL_VERSION_ID >= 50703 && !defined(MARIADB_BASE_VERSION)
|
||||
{
|
||||
if (ds->ssl_enforce)
|
||||
{
|
||||
@@ -332,7 +332,7 @@
|
||||
}
|
||||
#endif
|
||||
|
||||
-#if MYSQL_VERSION_ID >= 50711
|
||||
+#if MYSQL_VERSION_ID >= 50711 && !defined(MARIADB_BASE_VERSION)
|
||||
if (ds->sslmode)
|
||||
{
|
||||
unsigned int mode = 0;
|
||||
@ -1,96 +0,0 @@
|
||||
diff -aurN a/driver/catalog_no_i_s.c b/driver/catalog_no_i_s.c
|
||||
--- a/driver/catalog_no_i_s.c 2016-11-29 07:40:13.000000000 -0500
|
||||
+++ b/driver/catalog_no_i_s.c 2017-02-17 14:07:03.979683613 -0500
|
||||
@@ -1093,7 +1093,11 @@
|
||||
unsigned long *lengths;
|
||||
SQLRETURN rc= SQL_SUCCESS;
|
||||
|
||||
+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001
|
||||
+ myodbc_init_dynamic_array(&records, sizeof(MY_FOREIGN_KEY_FIELD), 0, 0, MYF(0));
|
||||
+#else
|
||||
myodbc_init_dynamic_array(&records, sizeof(MY_FOREIGN_KEY_FIELD), 0, 0);
|
||||
+#endif
|
||||
|
||||
/* Get the list of tables that match szCatalog and szTable */
|
||||
myodbc_mutex_lock(&stmt->dbc->lock);
|
||||
diff -aurN a/driver/desc.c b/driver/desc.c
|
||||
--- a/driver/desc.c 2016-11-29 07:40:13.000000000 -0500
|
||||
+++ b/driver/desc.c 2017-02-17 14:09:30.139954232 -0500
|
||||
@@ -63,13 +63,21 @@
|
||||
but in desc_get_rec we manually get a pointer to it. This avoids
|
||||
having to call set_dynamic after modifying the DESCREC.
|
||||
*/
|
||||
+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001
|
||||
+ if (myodbc_init_dynamic_array(&desc->records, sizeof(DESCREC), 0, 0, MYF(0)))
|
||||
+#else
|
||||
if (myodbc_init_dynamic_array(&desc->records, sizeof(DESCREC), 0, 0))
|
||||
+#endif
|
||||
{
|
||||
x_free((char *)desc);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001
|
||||
+ if (myodbc_init_dynamic_array(&desc->bookmark, sizeof(DESCREC), 0, 0, MYF(0)))
|
||||
+#else
|
||||
if (myodbc_init_dynamic_array(&desc->bookmark, sizeof(DESCREC), 0, 0))
|
||||
+#endif
|
||||
{
|
||||
delete_dynamic(&desc->records);
|
||||
x_free((char *)desc);
|
||||
@@ -997,7 +1005,11 @@
|
||||
delete_dynamic(&dest->records);
|
||||
if (myodbc_init_dynamic_array(&dest->records, sizeof(DESCREC),
|
||||
src->records.max_element,
|
||||
+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001
|
||||
+ src->records.alloc_increment, MYF(0)))
|
||||
+#else
|
||||
src->records.alloc_increment))
|
||||
+#endif
|
||||
{
|
||||
return set_desc_error(dest, "HY001",
|
||||
"Memory allocation error",
|
||||
diff -aurN a/driver/handle.c b/driver/handle.c
|
||||
--- a/driver/handle.c 2016-11-29 07:40:13.000000000 -0500
|
||||
+++ b/driver/handle.c 2017-02-17 14:10:32.078797593 -0500
|
||||
@@ -409,7 +409,11 @@
|
||||
}
|
||||
}
|
||||
|
||||
+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001
|
||||
+ myodbc_init_dynamic_array(*param_bind, sizeof(MYSQL_BIND), elements, 10, MYF(0));
|
||||
+#else
|
||||
myodbc_init_dynamic_array(*param_bind, sizeof(MYSQL_BIND), elements, 10);
|
||||
+#endif
|
||||
memset((*param_bind)->buffer, 0, sizeof(MYSQL_BIND) *
|
||||
(*param_bind)->max_element);
|
||||
|
||||
diff -aurN a/driver/parse.c b/driver/parse.c
|
||||
--- a/driver/parse.c 2016-11-29 07:40:13.000000000 -0500
|
||||
+++ b/driver/parse.c 2017-02-17 14:12:00.638143846 -0500
|
||||
@@ -139,8 +139,13 @@
|
||||
|
||||
/* TODO: Store offsets rather than ptrs. In this case we will be fine
|
||||
if work with copy of the originally parsed string */
|
||||
+#if defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID > 100001
|
||||
+ myodbc_init_dynamic_array(&pq->token, sizeof(uint), 20, 10, MYF(0));
|
||||
+ myodbc_init_dynamic_array(&pq->param_pos, sizeof(uint), 10, 10, MYF(0));
|
||||
+#else
|
||||
myodbc_init_dynamic_array(&pq->token, sizeof(uint), 20, 10);
|
||||
myodbc_init_dynamic_array(&pq->param_pos, sizeof(uint), 10, 10);
|
||||
+#endif
|
||||
}
|
||||
|
||||
return pq;
|
||||
diff -aurN a/MYODBC_MYSQL.h b/MYODBC_MYSQL.h
|
||||
--- a/MYODBC_MYSQL.h 2016-11-29 07:40:13.000000000 -0500
|
||||
+++ b/MYODBC_MYSQL.h 2017-02-17 15:04:47.153994839 -0500
|
||||
@@ -44,7 +44,7 @@
|
||||
#endif
|
||||
|
||||
#ifdef THREAD
|
||||
-#if MYSQL_VERSION_ID < 50703
|
||||
+#if MYSQL_VERSION_ID < 50703 || defined(MARIADB_BASE_VERSION)
|
||||
#include <my_pthread.h>
|
||||
#define myodbc_mutex_t pthread_mutex_t
|
||||
#define myodbc_key_t pthread_key_t
|
||||
@ -1,2 +1,3 @@
|
||||
DIST pgadmin4-2.0.tar.gz 24988176 BLAKE2B 96e942d5001b1d590fb1b642933c665a13bca5429d3a3e74eefe4a8090c76515cc08b656ebfea3a170b4fa6077d7086fbffdd5fddfcb517be08fd4ecc20052ab SHA512 463e95a341dec74ac0a08a647af1cbe83b514b0595b8469ab9c7b5335e24604e082b906d530aa735fef7b08c58d8a8a6df3edf5dc65402f6521165f1cbb72f67
|
||||
DIST pgadmin4-2.1.tar.gz 27842212 BLAKE2B 26c12dff8e2e5e37dd2911f6eb582a0f706d73490c8d93e83b07b7537fc201547d095d4f34181d2502bbc29b2741614adabf876b7e6ea3ef5f555eab94caa240 SHA512 02bc122ae53db595a1fd395e634fc4d0891f024a2e5e341c81b306a8c1d07bc18e5673cda440c7ba56754be4902ae4441010db0140132352e12b8986c8c0f47c
|
||||
DIST pgadmin4-3.0.tar.gz 28915010 BLAKE2B 7e6dccd91f082f7b5514f5d3abdf4653a9961b4efc706e10ce58d817785d514508233e25068762fe0e4bca4c1a3cf10a2515afa38e6f9ba3c99b4af3fa32f3d2 SHA512 5921340176e6748ef13112d906061f195d4bb2f73917d762371bbaeb44ef66cf8e0edcd1cd241eb78dae46ed0b3af014c749468a930fb0c0983b38b2c54dfc3a
|
||||
|
||||
@ -0,0 +1,123 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python3_{4,5} )
|
||||
PYTHON_REQ_USE="sqlite"
|
||||
|
||||
inherit python-single-r1 qmake-utils
|
||||
|
||||
DESCRIPTION="GUI administration and development platform for PostgreSQL"
|
||||
HOMEPAGE="http://www.pgadmin.org/"
|
||||
SRC_URI="mirror://postgresql/pgadmin/${PN}/v${PV}/source/${P}.tar.gz"
|
||||
|
||||
LICENSE="POSTGRESQL"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
SLOT="0"
|
||||
IUSE="doc"
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
||||
|
||||
COMMON_DEPEND="${PYTHON_DEPS}
|
||||
dev-qt/qtwidgets:5
|
||||
dev-qt/qtwebkit:5
|
||||
dev-qt/qtwebengine:5[widgets]
|
||||
"
|
||||
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
|
||||
"
|
||||
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
>=app-text/htmlmin-0.1.12[${PYTHON_USEDEP}]
|
||||
>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
|
||||
>=dev-python/beautifulsoup-4.4.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/blinker-1.4[${PYTHON_USEDEP}]
|
||||
>=dev-python/click-6.6[${PYTHON_USEDEP}]
|
||||
>=dev-python/extras-1.0.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/flask-0.12.2[${PYTHON_USEDEP}]
|
||||
>=dev-python/flask-babel-0.11.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/flask-babelex-0.9.3[${PYTHON_USEDEP}]
|
||||
>=dev-python/flask-gravatar-0.5.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/flask-htmlmin-1.3.2[${PYTHON_USEDEP}]
|
||||
>=dev-python/flask-login-0.3.2[${PYTHON_USEDEP}]
|
||||
>=dev-python/flask-mail-0.9.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/flask-migrate-2.1.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/flask-paranoid-0.2.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/flask-principal-0.4.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/flask-security-3.0.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/flask-sqlalchemy-2.3.2[${PYTHON_USEDEP}]
|
||||
>=dev-python/flask-wtf-0.14.2[${PYTHON_USEDEP}]
|
||||
>=dev-python/html5lib-1.0.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/itsdangerous-0.24[${PYTHON_USEDEP}]
|
||||
>=dev-python/jinja-2.7.3[${PYTHON_USEDEP}]
|
||||
>=dev-python/linecache2-1.0.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/markupsafe-0.23[${PYTHON_USEDEP}]
|
||||
>=dev-python/mimeparse-1.6.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/passlib-1.7.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/psycopg-2.7.4[${PYTHON_USEDEP}]
|
||||
>=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/pyrsistent-0.14.2[${PYTHON_USEDEP}]
|
||||
>=dev-python/python-dateutil-2.7.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/python-sqlparse-0.2.4[${PYTHON_USEDEP}]
|
||||
>=dev-python/pytz-2018.3[${PYTHON_USEDEP}]
|
||||
>=dev-python/simplejson-3.13.2[${PYTHON_USEDEP}]
|
||||
>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/speaklater-1.3[${PYTHON_USEDEP}]
|
||||
>=dev-python/sqlalchemy-1.2.5[${PYTHON_USEDEP}]
|
||||
>=dev-python/werkzeug-0.9.6[${PYTHON_USEDEP}]
|
||||
>=dev-python/wtforms-2.1[${PYTHON_USEDEP}]
|
||||
"
|
||||
|
||||
S="${WORKDIR}"/${P}/runtime
|
||||
|
||||
src_prepare() {
|
||||
cd "${WORKDIR}"/${P} || die
|
||||
default
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
eqmake5
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
default
|
||||
if use doc; then
|
||||
cd "${WORKDIR}"/${P} || die
|
||||
emake docs
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin pgAdmin4
|
||||
|
||||
cd "${WORKDIR}"/${P} || die
|
||||
|
||||
local APP_DIR=/usr/share/${PN}/web
|
||||
insinto "${APP_DIR}"
|
||||
doins -r web/*
|
||||
cat > "${D}${APP_DIR}"/config_local.py <<-EOF
|
||||
SERVER_MODE = False
|
||||
UPGRADE_CHECK_ENABLED = False
|
||||
EOF
|
||||
python_optimize "${D}${APP_DIR}"
|
||||
|
||||
local CONFIG_DIR="/etc/xdg/pgadmin"
|
||||
dodir "${CONFIG_DIR}"
|
||||
cat > "${D}${CONFIG_DIR}"/pgadmin4.conf <<-EOF
|
||||
[General]
|
||||
ApplicationPath=${APP_DIR}
|
||||
PythonPath=$(python_get_sitedir)
|
||||
EOF
|
||||
|
||||
if use doc; then
|
||||
rm -r docs/en_US/_build/html/_sources || die
|
||||
insinto /usr/share/${PN}/docs/en_US/_build
|
||||
doins -r docs/en_US/_build/html
|
||||
fi
|
||||
}
|
||||
@ -1,143 +0,0 @@
|
||||
diff -Naur a/contrib/Makefile b/contrib/Makefile
|
||||
--- a/contrib/Makefile 2012-05-10 18:35:09.000000000 -0400
|
||||
+++ b/contrib/Makefile 2012-05-20 09:33:47.892622992 -0400
|
||||
@@ -5,58 +5,10 @@
|
||||
include $(top_builddir)/src/Makefile.global
|
||||
|
||||
SUBDIRS = \
|
||||
- adminpack \
|
||||
- auth_delay \
|
||||
- auto_explain \
|
||||
- btree_gin \
|
||||
- btree_gist \
|
||||
- chkpass \
|
||||
- citext \
|
||||
- cube \
|
||||
- dblink \
|
||||
- dict_int \
|
||||
- dict_xsyn \
|
||||
- dummy_seclabel \
|
||||
- earthdistance \
|
||||
- file_fdw \
|
||||
- fuzzystrmatch \
|
||||
- hstore \
|
||||
- intagg \
|
||||
- intarray \
|
||||
- isn \
|
||||
- lo \
|
||||
- ltree \
|
||||
oid2name \
|
||||
- pageinspect \
|
||||
- passwordcheck \
|
||||
- pg_archivecleanup \
|
||||
- pg_buffercache \
|
||||
- pg_freespacemap \
|
||||
- pg_standby \
|
||||
- pg_stat_statements \
|
||||
- pg_test_fsync \
|
||||
- pg_test_timing \
|
||||
- pg_trgm \
|
||||
- pg_upgrade \
|
||||
- pg_upgrade_support \
|
||||
pgbench \
|
||||
- pgcrypto \
|
||||
- pgrowlocks \
|
||||
- pgstattuple \
|
||||
- seg \
|
||||
- spi \
|
||||
- tablefunc \
|
||||
- tcn \
|
||||
- test_parser \
|
||||
- tsearch2 \
|
||||
- unaccent \
|
||||
vacuumlo
|
||||
|
||||
-ifeq ($(with_openssl),yes)
|
||||
-SUBDIRS += sslinfo
|
||||
-else
|
||||
-ALWAYS_SUBDIRS += sslinfo
|
||||
-endif
|
||||
|
||||
ifeq ($(with_ossp_uuid),yes)
|
||||
SUBDIRS += uuid-ossp
|
||||
diff -Naur a/src/backend/Makefile b/src/backend/Makefile
|
||||
--- a/src/backend/Makefile 2012-05-10 18:35:09.000000000 -0400
|
||||
+++ b/src/backend/Makefile 2012-05-20 09:36:24.446654842 -0400
|
||||
@@ -45,7 +45,7 @@
|
||||
|
||||
##########################################################################
|
||||
|
||||
-all: submake-libpgport submake-schemapg postgres $(POSTGRES_IMP)
|
||||
+all: someheaders
|
||||
|
||||
ifneq ($(PORTNAME), cygwin)
|
||||
ifneq ($(PORTNAME), win32)
|
||||
@@ -114,7 +114,7 @@
|
||||
endif # aix
|
||||
|
||||
# Update the commonly used headers before building the subdirectories
|
||||
-$(SUBDIRS:%=%-recursive): $(top_builddir)/src/include/parser/gram.h $(top_builddir)/src/include/catalog/schemapg.h $(top_builddir)/src/include/utils/fmgroids.h $(top_builddir)/src/include/utils/errcodes.h $(top_builddir)/src/include/utils/probes.h
|
||||
+someheaders $(SUBDIRS:%=%-recursive): $(top_builddir)/src/include/parser/gram.h $(top_builddir)/src/include/catalog/schemapg.h $(top_builddir)/src/include/utils/fmgroids.h $(top_builddir)/src/include/utils/errcodes.h $(top_builddir)/src/include/utils/probes.h
|
||||
|
||||
# run this unconditionally to avoid needing to know its dependencies here:
|
||||
submake-schemapg:
|
||||
@@ -207,23 +207,7 @@
|
||||
|
||||
##########################################################################
|
||||
|
||||
-install: all installdirs install-bin
|
||||
-ifeq ($(PORTNAME), cygwin)
|
||||
-ifeq ($(MAKE_DLL), true)
|
||||
- $(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a'
|
||||
-endif
|
||||
-endif
|
||||
-ifeq ($(PORTNAME), win32)
|
||||
-ifeq ($(MAKE_DLL), true)
|
||||
- $(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a'
|
||||
-endif
|
||||
-endif
|
||||
- $(MAKE) -C catalog install-data
|
||||
- $(MAKE) -C tsearch install-data
|
||||
- $(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample '$(DESTDIR)$(datadir)/pg_hba.conf.sample'
|
||||
- $(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample '$(DESTDIR)$(datadir)/pg_ident.conf.sample'
|
||||
- $(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample '$(DESTDIR)$(datadir)/postgresql.conf.sample'
|
||||
- $(INSTALL_DATA) $(srcdir)/access/transam/recovery.conf.sample '$(DESTDIR)$(datadir)/recovery.conf.sample'
|
||||
+install:
|
||||
|
||||
install-bin: postgres $(POSTGRES_IMP) installdirs
|
||||
$(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postgres$(X)'
|
||||
diff -Naur a/src/bin/Makefile b/src/bin/Makefile
|
||||
--- a/src/bin/Makefile 2012-05-10 18:35:09.000000000 -0400
|
||||
+++ b/src/bin/Makefile 2012-05-20 09:41:18.489958216 -0400
|
||||
@@ -13,8 +13,7 @@
|
||||
top_builddir = ../..
|
||||
include $(top_builddir)/src/Makefile.global
|
||||
|
||||
-SUBDIRS = initdb pg_ctl pg_dump \
|
||||
- psql scripts pg_config pg_controldata pg_resetxlog pg_basebackup
|
||||
+SUBDIRS = pg_dump psql scripts pg_config
|
||||
|
||||
ifeq ($(PORTNAME), win32)
|
||||
SUBDIRS += pgevent
|
||||
diff -Naur a/src/Makefile b/src/Makefile
|
||||
--- a/src/Makefile 2012-05-10 18:35:09.000000000 -0400
|
||||
+++ b/src/Makefile 2012-05-20 09:40:13.532774840 -0400
|
||||
@@ -14,17 +14,11 @@
|
||||
|
||||
SUBDIRS = \
|
||||
port \
|
||||
- timezone \
|
||||
backend \
|
||||
- backend/utils/mb/conversion_procs \
|
||||
- backend/snowball \
|
||||
include \
|
||||
interfaces \
|
||||
- backend/replication/libpqwalreceiver \
|
||||
bin \
|
||||
- pl \
|
||||
- makefiles \
|
||||
- test/regress
|
||||
+ makefiles
|
||||
|
||||
# There are too many interdependencies between the subdirectories, so
|
||||
# don't attempt parallel make here.
|
||||
@ -1,65 +0,0 @@
|
||||
# Directory that contains the unix socket. Created and controlled by
|
||||
# the related initscript. The directory created will be owned
|
||||
# root:postgres with mode 1775.
|
||||
#
|
||||
# /run/postgresql is the default directory.
|
||||
PG_SOCKET_DIRECTORY="/run/postgresql"
|
||||
|
||||
# Which port and socket to bind PostgreSQL
|
||||
PGPORT="5432"
|
||||
|
||||
# How long to wait for server to start in seconds
|
||||
START_TIMEOUT=10
|
||||
|
||||
# NICE_QUIT ignores new connections and wait for clients to disconnect from
|
||||
# server before shutting down. NICE_TIMEOUT in seconds determines how long to
|
||||
# wait for this to succeed.
|
||||
NICE_TIMEOUT=60
|
||||
|
||||
# Forecfully disconnect clients from server and shut down. This is performed
|
||||
# after NICE_QUIT. Terminated client connections have their open transactions
|
||||
# rolled back.
|
||||
# Set RUDE_QUIT to "NO" to disable. RUDE_TIMEOUT in seconds.
|
||||
RUDE_QUIT="YES"
|
||||
RUDE_TIMEOUT=30
|
||||
|
||||
# If the server still fails to shutdown, you can force it to quit by setting
|
||||
# this to YES and a recover-run will execute on the next startup.
|
||||
# Set FORCE_QUIT to "YES" to enable. FORCE_TIMEOUT in seconds.
|
||||
FORCE_QUIT="NO"
|
||||
FORCE_TIMEOUT=2
|
||||
|
||||
# Extra options to run postmaster with, e.g.:
|
||||
# -N is the maximal number of client connections
|
||||
# -B is the number of shared buffers and has to be at least 2x the value for -N
|
||||
# Please read the man-page to postmaster for more options. Many of these
|
||||
# options can be set directly in the configuration file.
|
||||
#PGOPTS="-N 512 -B 1024"
|
||||
|
||||
# Pass extra environment variables. If you have to export environment variables
|
||||
# for the database process, this can be done here.
|
||||
# Don't forget to escape quotes.
|
||||
#PG_EXTRA_ENV="PGPASSFILE=\"/path/to/.pgpass\""
|
||||
|
||||
##############################################################################
|
||||
#
|
||||
# The following values should not be arbitrarily changed.
|
||||
#
|
||||
# `emerge --config dev-db/postgresql:@SLOT@' uses these values to
|
||||
# determine where to create the data directory, where to place the
|
||||
# configuration files, and any additional options to pass to initdb.
|
||||
#
|
||||
# The initscript also uses these variables to inform PostgreSQL where to find
|
||||
# its data directory and configuration files.
|
||||
#
|
||||
##############################################################################
|
||||
|
||||
# Location of configuration files
|
||||
PGDATA="/etc/postgresql-@SLOT@/"
|
||||
|
||||
# Where the data directory is located/to be created
|
||||
DATA_DIR="/var/lib/postgresql/@SLOT@/data"
|
||||
|
||||
# Additional options to pass to initdb.
|
||||
# See `man initdb' for available options.
|
||||
PG_INITDB_OPTS="--encoding=UTF8"
|
||||
@ -1,152 +0,0 @@
|
||||
#!/sbin/openrc-run
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
extra_started_commands="reload promote"
|
||||
|
||||
PG_CTL="/usr/@LIBDIR@/postgresql-@SLOT@/bin/pg_ctl"
|
||||
|
||||
description="PostgreSQL @SLOT@ -- the world's most advanced open source database --
|
||||
${RC_SERVICE} is a wrapper around pg_ctl with additional administrative checks
|
||||
and convenience"
|
||||
|
||||
get_config() {
|
||||
[ -f "${PGDATA%/}/postgresql.conf" ] || return 1
|
||||
|
||||
eval echo $(sed -e 's:#.*::' "${PGDATA%/}/postgresql.conf" \
|
||||
| awk '$1 == "'$1'" { print ($2 == "=" ? $3 : $2) }')
|
||||
}
|
||||
|
||||
depend() {
|
||||
use net
|
||||
provide postgresql
|
||||
|
||||
if [ "$(get_config log_destination)" = "syslog" ]; then
|
||||
use logger
|
||||
fi
|
||||
}
|
||||
|
||||
configured_port=$(get_config port)
|
||||
: ${configured_port:=${PGPORT}}
|
||||
|
||||
checkconfig() {
|
||||
# Check that DATA_DIR has been set
|
||||
if [ -z "${DATA_DIR}" ] ; then
|
||||
eerror "DATA_DIR not set"
|
||||
eerror "HINT: Perhaps you need to update /etc/conf.d/postgresql-@SLOT@"
|
||||
return 1
|
||||
fi
|
||||
|
||||
# Check that DATA_DIR exists
|
||||
if [ ! -d "${DATA_DIR}" ] ; then
|
||||
eerror "Directory not found: ${DATA_DIR}"
|
||||
eerror "HINT: Ensure that DATA_DIR points to the right path."
|
||||
eerror "HINT: Or perhaps you need to create the database cluster:"
|
||||
eerror " emerge --config dev-db/postgresql:@SLOT@"
|
||||
return 1
|
||||
fi
|
||||
|
||||
# Check for the existence of PostgreSQL's config files, and set the
|
||||
# proper mode and ownership.
|
||||
# Only three files should be checked as potentially other files
|
||||
# may be in PGDATA that should not be touched.
|
||||
local file
|
||||
for file in postgresql pg_hba pg_ident ; do
|
||||
file="${PGDATA%/}/${file}.conf"
|
||||
if [ -f "${file}" ] ; then
|
||||
checkpath -f -m 0600 -o postgres:postgres "${file}"
|
||||
else
|
||||
eerror "${file} not found"
|
||||
eerror "HINT: mv ${DATA_DIR%/}/*.conf ${PGDATA}"
|
||||
return 1
|
||||
fi
|
||||
done
|
||||
|
||||
# Set the proper permission for the socket path and create it if
|
||||
# it doesn't exist.
|
||||
checkpath -d -m 1775 -o root:postgres "${PG_SOCKET_DIRECTORY}"
|
||||
if [ -e "${PG_SOCKET_DIRECTORY%/}/.s.PGSQL.${configured_port}" ] ; then
|
||||
eerror "Socket conflict."
|
||||
eerror "A server is already listening on:"
|
||||
eerror " ${PG_SOCKET_DIRECTORY%/}/.s.PGSQL.${configured_port}"
|
||||
eerror "HINT: Change PGPORT to listen on a different socket."
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
start() {
|
||||
checkconfig || return 1
|
||||
|
||||
ebegin "Starting PostgreSQL @SLOT@"
|
||||
|
||||
rm -f "${DATA_DIR%/}/postmaster.pid"
|
||||
|
||||
su - postgres -c \
|
||||
"PGPORT=${configured_port} ${PG_EXTRA_ENV} ${PG_CTL} start \
|
||||
-s -w -t ${START_TIMEOUT} -l ${DATA_DIR%/}/postmaster.log \
|
||||
-D ${PGDATA} \
|
||||
-o '--data-directory=${DATA_DIR} \
|
||||
--unix-socket-directory=${PG_SOCKET_DIRECTORY} \
|
||||
${PGOPTS}'"
|
||||
|
||||
local retval=$?
|
||||
|
||||
if [ $retval -ne 0 ] ; then
|
||||
eerror "Check the log for a possible explanation of the above error."
|
||||
eerror "The log may be located at:"
|
||||
eerror " ${DATA_DIR%/}/postmaster.log"
|
||||
eerror "Or wherever you configured PostgreSQL @SLOT@ to log."
|
||||
fi
|
||||
|
||||
eend $retval
|
||||
}
|
||||
|
||||
stop() {
|
||||
local seconds=$(( ${NICE_TIMEOUT} + ${RUDE_TIMEOUT} + ${FORCE_TIMEOUT} ))
|
||||
ebegin "Stopping PostgreSQL @SLOT@ (this can take up to ${seconds} seconds)"
|
||||
|
||||
su - postgres -c \
|
||||
"${PG_CTL} stop -t ${NICE_TIMEOUT} -s -D ${DATA_DIR} -m smart"
|
||||
local retval=$?
|
||||
|
||||
if [ "${RUDE_QUIT}" != "NO" -a ${retval} -ne 0 ] ; then
|
||||
einfo "Previous attempt failed. Trying RUDE_QUIT."
|
||||
su - postgres -c \
|
||||
"${PG_CTL} stop -t ${RUDE_TIMEOUT} -s -D ${DATA_DIR} -m fast"
|
||||
retval=$?
|
||||
fi
|
||||
|
||||
if [ "${FORCE_QUIT}" = "YES" -a ${retval} -ne 0 ] ; then
|
||||
einfo "Previous step failed. Trying FORCE_QUIT."
|
||||
ewarn "A recover-run might be executed on next startup."
|
||||
su - postgres -c \
|
||||
"${PG_CTL} stop -t ${FORCE_TIMEOUT} -s -D ${DATA_DIR} -m immediate"
|
||||
retval=$?
|
||||
fi
|
||||
|
||||
eend ${retval}
|
||||
}
|
||||
|
||||
status() {
|
||||
ebegin "Checking PostgreSQL @SLOT@ status"
|
||||
su - postgres -c "${PG_CTL} status -D ${DATA_DIR}"
|
||||
eend $?
|
||||
}
|
||||
|
||||
description_reload="Simply sends the postgres process a SIGHUP signal, causing
|
||||
it to reread its configuration files (postgresql.conf, pg_hba.conf,
|
||||
etc.). This allows changing of configuration-file options that do not
|
||||
require a complete restart to take effect."
|
||||
reload() {
|
||||
ebegin "Reloading PostgreSQL @SLOT@ configuration"
|
||||
su - postgres -c "${PG_CTL} reload -s -D ${DATA_DIR}"
|
||||
eend $?
|
||||
}
|
||||
|
||||
description_promote="If the server is in standby, it is commanded to exit
|
||||
recovery and begin read-write operations."
|
||||
promote() {
|
||||
ebegin "Promoting PostgreSQL @SLOT@"
|
||||
su - postgres -c "${PG_CTL} promote -s -D ${DATA_DIR}"
|
||||
eend $?
|
||||
}
|
||||
Binary file not shown.
@ -0,0 +1,75 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit desktop
|
||||
|
||||
FPCVER="3.0.4"
|
||||
|
||||
DESCRIPTION="Lazarus IDE is a feature rich visual programming environment emulating Delphi"
|
||||
HOMEPAGE="https://www.lazarus-ide.org/"
|
||||
SRC_URI="https://sourceforge.net/projects/${PN}/files/Lazarus%20Zip%20_%20GZip/Lazarus%20${PV}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2 LGPL-2.1-with-linking-exception"
|
||||
SLOT="0" # Note: Slotting Lazarus needs slotting fpc, see DEPEND.
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="minimal"
|
||||
|
||||
DEPEND=">=dev-lang/fpc-${FPCVER}[source]
|
||||
net-misc/rsync
|
||||
x11-libs/gtk+:2
|
||||
>=sys-devel/binutils-2.19.1-r1:="
|
||||
RDEPEND="${DEPEND}
|
||||
!=gnome-base/librsvg-2.16.1"
|
||||
|
||||
RESTRICT="strip" #269221
|
||||
|
||||
S="${WORKDIR}/${PN}"
|
||||
|
||||
PATCHES=( "${FILESDIR}"/${PN}-0.9.26-fpcsrc.patch )
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
# Use default configuration (minus stripping) unless specifically requested otherwise
|
||||
if ! test ${PPC_CONFIG_PATH+set} ; then
|
||||
local FPCVER=$(fpc -iV)
|
||||
export PPC_CONFIG_PATH="${WORKDIR}"
|
||||
sed -e 's/^FPBIN=/#&/' /usr/lib/fpc/${FPCVER}/samplecfg |
|
||||
sh -s /usr/lib/fpc/${FPCVER} "${PPC_CONFIG_PATH}" || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
LCL_PLATFORM=gtk2 emake \
|
||||
$(usex minimal "" "bigide") \
|
||||
-j1
|
||||
}
|
||||
|
||||
src_install() {
|
||||
diropts -m0755
|
||||
dodir /usr/share
|
||||
# Using rsync to avoid unnecessary copies and cleaning...
|
||||
# Note: *.o and *.ppu are needed
|
||||
rsync -a \
|
||||
--exclude="CVS" --exclude=".cvsignore" \
|
||||
--exclude="*.ppw" --exclude="*.ppl" \
|
||||
--exclude="*.ow" --exclude="*.a"\
|
||||
--exclude="*.rst" --exclude=".#*" \
|
||||
--exclude="*.~*" --exclude="*.bak" \
|
||||
--exclude="*.orig" --exclude="*.rej" \
|
||||
--exclude=".xvpics" --exclude="*.compiled" \
|
||||
--exclude="killme*" --exclude=".gdb_hist*" \
|
||||
--exclude="debian" --exclude="COPYING*" \
|
||||
--exclude="*.app" \
|
||||
"${S}" "${ED%/}"/usr/share \
|
||||
|| die "Unable to copy files!"
|
||||
|
||||
dosym ../share/lazarus/startlazarus /usr/bin/startlazarus
|
||||
dosym ../share/lazarus/startlazarus /usr/bin/lazarus
|
||||
dosym ../share/lazarus/lazbuild /usr/bin/lazbuild
|
||||
use minimal || dosym ../share/lazarus/components/chmhelp/lhelp/lhelp /usr/bin/lhelp
|
||||
dosym ../lazarus/images/ide_icon48x48.png /usr/share/pixmaps/lazarus.png
|
||||
|
||||
make_desktop_entry startlazarus "Lazarus IDE" "lazarus" || die "Failed making desktop entry!"
|
||||
}
|
||||
@ -0,0 +1,148 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit eutils flag-o-matic java-pkg-opt-2 multilib
|
||||
|
||||
PATCHSET_VER="0"
|
||||
|
||||
DESCRIPTION="free, small, and standard compliant Prolog compiler"
|
||||
HOMEPAGE="http://www.swi-prolog.org/"
|
||||
SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"
|
||||
|
||||
LICENSE="BSD-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
|
||||
IUSE="archive berkdb debug doc +gmp hardened java +libedit libressl minimal odbc pcre readline ssl static-libs test uuid zlib X"
|
||||
|
||||
RDEPEND="sys-libs/ncurses:=
|
||||
archive? ( app-arch/libarchive )
|
||||
berkdb? ( >=sys-libs/db-4:= )
|
||||
zlib? ( sys-libs/zlib )
|
||||
odbc? ( dev-db/unixODBC )
|
||||
pcre? ( dev-libs/libpcre )
|
||||
readline? ( sys-libs/readline:= )
|
||||
libedit? ( dev-libs/libedit )
|
||||
gmp? ( dev-libs/gmp:0 )
|
||||
ssl? (
|
||||
!libressl? ( dev-libs/openssl:0 )
|
||||
libressl? ( dev-libs/libressl )
|
||||
)
|
||||
java? ( >=virtual/jdk-1.7:= )
|
||||
uuid? ( dev-libs/ossp-uuid )
|
||||
X? (
|
||||
virtual/jpeg:0
|
||||
x11-libs/libX11
|
||||
x11-libs/libXft
|
||||
x11-libs/libXpm
|
||||
x11-libs/libXt
|
||||
x11-libs/libICE
|
||||
x11-libs/libSM )"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
X? ( x11-base/xorg-proto )
|
||||
java? ( test? ( =dev-java/junit-3.8* ) )"
|
||||
|
||||
S="${WORKDIR}/swipl-${PV}"
|
||||
|
||||
src_prepare() {
|
||||
EPATCH_FORCE=yes
|
||||
EPATCH_SUFFIX=patch
|
||||
if [[ -d "${WORKDIR}"/${PV} ]] ; then
|
||||
epatch "${WORKDIR}"/${PV}
|
||||
fi
|
||||
|
||||
if ! use uuid; then
|
||||
mv packages/clib/uuid.pl packages/clib/uuid.pl.unused || die
|
||||
fi
|
||||
|
||||
# OSX/Intel ld doesn't like an archive without table of contents
|
||||
sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
|
||||
|
||||
eapply_user
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
append-flags -fno-strict-aliasing
|
||||
use ppc && append-flags -mno-altivec
|
||||
use hardened && append-flags -fno-unit-at-a-time
|
||||
use debug && append-flags -DO_DEBUG
|
||||
|
||||
# ARCH is used in the configure script to figure out host and target
|
||||
# specific stuff
|
||||
export ARCH=${CHOST}
|
||||
|
||||
export CC_FOR_BUILD=$(tc-getBUILD_CC)
|
||||
|
||||
cd "${S}"/src || die
|
||||
econf \
|
||||
--libdir="${EPREFIX}"/usr/$(get_libdir) \
|
||||
$(use_enable gmp) \
|
||||
$(use_enable static-libs static) \
|
||||
--enable-shared \
|
||||
--enable-custom-flags COFLAGS="${CFLAGS} -DOF=_Z_OF"
|
||||
|
||||
if ! use minimal ; then
|
||||
local jpltestconf
|
||||
if use java && use test ; then
|
||||
jpltestconf="--with-junit=$(java-config --classpath junit)"
|
||||
fi
|
||||
|
||||
cd "${S}/packages" || die
|
||||
econf \
|
||||
--libdir="${EPREFIX}"/usr/$(get_libdir) \
|
||||
$(use_with archive) \
|
||||
$(use_with berkdb bdb ) \
|
||||
$(use_with java jpl) \
|
||||
${jpltestconf} \
|
||||
$(use_with libedit) \
|
||||
$(use_with pcre) \
|
||||
$(use_with odbc) \
|
||||
$(use_with readline) \
|
||||
$(use_with ssl) \
|
||||
$(use_with X xpce) \
|
||||
$(use_with zlib) \
|
||||
COFLAGS='"${CFLAGS}"'
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
cd "${S}"/src || die
|
||||
emake
|
||||
|
||||
if ! use minimal ; then
|
||||
cd "${S}/packages" || die
|
||||
emake
|
||||
./report-failed || die "Cannot report failed packages"
|
||||
fi
|
||||
}
|
||||
|
||||
src_test() {
|
||||
cd "${S}/src" || die
|
||||
emake check
|
||||
|
||||
if ! use minimal ; then
|
||||
unset DISPLAY
|
||||
cd "${S}/packages" || die
|
||||
emake \
|
||||
USE_PUBLIC_NETWORK_TESTS=false \
|
||||
USE_ODBC_TESTS=false \
|
||||
check
|
||||
./report-failed || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake -C src DESTDIR="${D}" install
|
||||
|
||||
if ! use minimal ; then
|
||||
emake -C packages DESTDIR="${D}" install
|
||||
if use doc ; then
|
||||
emake -C packages DESTDIR="${D}" html-install
|
||||
fi
|
||||
./packages/report-failed || die "Cannot report failed packages"
|
||||
fi
|
||||
|
||||
dodoc ReleaseNotes/relnotes-5.10 INSTALL README.md VERSION
|
||||
}
|
||||
Binary file not shown.
@ -0,0 +1,14 @@
|
||||
Gentoo-bug: https://bugs.gentoo.org/640916
|
||||
Thanks-to: David Haller <gentoo@dhaller.de>
|
||||
|
||||
--- a/po/meson.build 2017-09-04 18:09:52.000000000 +0200
|
||||
+++ b/po/meson.build 2018-05-15 12:24:42.000000000 +0200
|
||||
@@ -21,7 +21,7 @@
|
||||
'find ' + meson.current_source_dir() +
|
||||
' -type f' +
|
||||
' -iname "*.po"' +
|
||||
- ' -printf \'%f\\n\'' +
|
||||
+ ' -printf \'%f\n\'' +
|
||||
' | grep -oP \'.*(?=[.])\' | sort' +
|
||||
' > ' + join_paths(meson.current_source_dir(), 'LINGUAS')
|
||||
]
|
||||
@ -1,40 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=3
|
||||
inherit autotools eutils toolchain-funcs
|
||||
|
||||
MY_P=${PN}-${PV/_/.}
|
||||
|
||||
DESCRIPTION="C API for memcached"
|
||||
HOMEPAGE="http://people.freebsd.org/~seanc/libmemcache/"
|
||||
SRC_URI="http://people.freebsd.org/~seanc/libmemcache/${MY_P}.tar.bz2"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
|
||||
IUSE=""
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${P}-inline.patch
|
||||
epatch "${FILESDIR}"/${P}-implicit_pointer.patch
|
||||
[[ $(tc-arch) == ppc* ]] && epatch "${FILESDIR}"/${P}-ppc_ftbfs.patch
|
||||
|
||||
rm -rf test/unit || die
|
||||
sed -i -e '/DIR/s,unit,,g' test/Makefile.am || die
|
||||
sed -i \
|
||||
-e 's,test/unit/Makefile,,g' \
|
||||
-e '/^CFLAGS=.*Wall.*pipe/s,-Wall,${CFLAGS} -Wall,g' \
|
||||
-e '/^OPTIMIZE=/d' \
|
||||
-e '/^PROFILE=/d' \
|
||||
configure.ac || die
|
||||
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die
|
||||
dodoc ChangeLog
|
||||
}
|
||||
Binary file not shown.
@ -1,93 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit eutils multilib toolchain-funcs
|
||||
|
||||
MY_PN=ccl
|
||||
MY_P=${MY_PN}-${PV}
|
||||
|
||||
DESCRIPTION="Common Lisp implementation, derived from Digitool's MCL product"
|
||||
HOMEPAGE="https://ccl.clozure.com/"
|
||||
SRC_URI="
|
||||
x86? ( ftp://ftp.clozure.com/pub/release/${PV}/${MY_P}-linuxx86.tar.gz )
|
||||
amd64? ( ftp://ftp.clozure.com/pub/release/${PV}/${MY_P}-linuxx86.tar.gz )
|
||||
doc? ( https://ccl.clozure.com/docs/ccl.html )"
|
||||
# ppc? ( ftp://ftp.clozure.com/pub/release/${PV}/${MY_P}-linuxppc.tar.gz )
|
||||
# ppc64? ( ftp://ftp.clozure.com/pub/release/${PV}/${MY_P}-linuxppc.tar.gz )"
|
||||
|
||||
LICENSE="LLGPL-2.1"
|
||||
SLOT="0"
|
||||
# KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="doc"
|
||||
|
||||
RDEPEND=">=dev-lisp/asdf-2.33-r3:="
|
||||
DEPEND="${RDEPEND}
|
||||
!dev-lisp/openmcl"
|
||||
|
||||
S="${WORKDIR}"/${MY_PN}
|
||||
ENVD="${T}"/50ccl
|
||||
|
||||
src_configure() {
|
||||
if use x86; then
|
||||
CCL_RUNTIME=lx86cl; CCL_HEADERS=x86-headers; CCL_KERNEL=linuxx8632
|
||||
elif use amd64; then
|
||||
CCL_RUNTIME=lx86cl64; CCL_HEADERS=x86-headers64; CCL_KERNEL=linuxx8664
|
||||
elif use ppc; then
|
||||
CCL_RUNTIME=ppccl; CCL_HEADERS=headers; CCL_KERNEL=linuxppc
|
||||
elif use ppc64; then
|
||||
CCL_RUNTIME=ppccl64; CCL_HEADERS=headers64; CCL_KERNEL=linuxppc64
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
epatch "${FILESDIR}"/ccl-format.patch
|
||||
cp /usr/share/common-lisp/source/asdf/build/asdf.lisp tools/ || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake -C lisp-kernel/${CCL_KERNEL} clean
|
||||
emake -C lisp-kernel/${CCL_KERNEL} all CC="$(tc-getCC)"
|
||||
|
||||
unset CCL_DEFAULT_DIRECTORY
|
||||
./${CCL_RUNTIME} -n -b -Q -e '(ccl:rebuild-ccl :full t)' -e '(ccl:quit)' || die "Compilation failed"
|
||||
|
||||
# remove non-owner write permissions on the full-image
|
||||
chmod go-w ${CCL_RUNTIME}{,.image} || die
|
||||
|
||||
esvn_clean
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local install_dir=/usr/$(get_libdir)/${PN}
|
||||
|
||||
exeinto ${install_dir}
|
||||
# install executable
|
||||
doexe ${CCL_RUNTIME}
|
||||
# install core image
|
||||
cp ${CCL_RUNTIME}.image "${D}"/${install_dir} || die
|
||||
# install optional libraries
|
||||
dodir ${install_dir}/tools
|
||||
cp tools/*fsl "${D}"/${install_dir}/tools || die
|
||||
|
||||
# until we figure out which source files are necessary for runtime
|
||||
# optional features and which aren't, we install all sources
|
||||
find . -type f -name '*fsl' -delete || die
|
||||
rm -f lisp-kernel/${CCL_KERNEL}/*.o || die
|
||||
cp -a compiler level-0 level-1 lib library \
|
||||
lisp-kernel scripts tools xdump contrib \
|
||||
"${D}"/${install_dir} || die
|
||||
cp -a ${CCL_HEADERS} "${D}"/${install_dir} || die
|
||||
|
||||
make_wrapper ccl "${install_dir}/${CCL_RUNTIME}"
|
||||
|
||||
echo "CCL_DEFAULT_DIRECTORY=${install_dir}" > "${ENVD}"
|
||||
doenvd "${ENVD}"
|
||||
|
||||
dodoc doc/release-notes.txt
|
||||
use doc && dodoc "${DISTDIR}"/ccl.html
|
||||
use doc && dodoc -r examples
|
||||
}
|
||||
@ -1,100 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit eutils flag-o-matic multilib toolchain-funcs
|
||||
|
||||
MY_PN=ccl
|
||||
MY_P=${MY_PN}-${PV}
|
||||
|
||||
DESCRIPTION="Common Lisp implementation, derived from Digitool's MCL product"
|
||||
HOMEPAGE="https://ccl.clozure.com"
|
||||
SRC_URI="
|
||||
x86? ( ${HOMEPAGE}/ftp/pub/release/${PV}/${MY_P}-linuxx86.tar.gz )
|
||||
amd64? ( ${HOMEPAGE}/ftp/pub/release/${PV}/${MY_P}-linuxx86.tar.gz )
|
||||
arm? ( ${HOMEPAGE}/ftp/pub/release/${PV}/${MY_P}-linuxarm.tar.gz )
|
||||
x86-macos? ( ${HOMEPAGE}/ftp/pub/release/${PV}/${MY_P}-darwinx86.tar.gz )
|
||||
x64-macos? ( ${HOMEPAGE}/ftp/pub/release/${PV}/${MY_P}-darwinx86.tar.gz )
|
||||
x86-solaris? ( ${HOMEPAGE}/ftp/pub/release/${PV}/${MY_P}-solarisx86.tar.gz )
|
||||
x64-solaris? ( ${HOMEPAGE}/ftp/pub/release/${PV}/${MY_P}-solarisx86.tar.gz )
|
||||
doc? ( ${HOMEPAGE}/docs/ccl.html )"
|
||||
|
||||
LICENSE="LLGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
|
||||
IUSE="doc"
|
||||
|
||||
RDEPEND=">=dev-lisp/asdf-2.33-r3:="
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
S="${WORKDIR}"/${MY_PN}
|
||||
ENVD="${T}/50ccl"
|
||||
|
||||
src_configure() {
|
||||
if use x86-macos; then
|
||||
CCL_RUNTIME=dx86cl; CCL_HEADERS=darwin-x86-headers; CCL_KERNEL=darwinx8632
|
||||
elif use x64-macos; then
|
||||
CCL_RUNTIME=dx86cl64; CCL_HEADERS=darwin-x86-headers64; CCL_KERNEL=darwinx8664
|
||||
elif use x86-solaris; then
|
||||
CCL_RUNTIME=sx86cl; CCL_HEADERS=solarisx86-headers; CCL_KERNEL=solarisx86
|
||||
elif use x64-solaris; then
|
||||
CCL_RUNTIME=sx86cl64; CCL_HEADERS=solarisx64-headers; CCL_KERNEL=solarisx64
|
||||
elif use x86; then
|
||||
CCL_RUNTIME=lx86cl; CCL_HEADERS=x86-headers; CCL_KERNEL=linuxx8632
|
||||
elif use amd64; then
|
||||
CCL_RUNTIME=lx86cl64; CCL_HEADERS=x86-headers64; CCL_KERNEL=linuxx8664
|
||||
elif use arm; then
|
||||
CCL_RUNTIME=armcl; CCL_HEADERS=arm-headers; CCL_KERNEL=linuxarm
|
||||
elif use ppc; then
|
||||
CCL_RUNTIME=ppccl; CCL_HEADERS=headers; CCL_KERNEL=linuxppc
|
||||
elif use ppc64; then
|
||||
CCL_RUNTIME=ppccl64; CCL_HEADERS=headers64; CCL_KERNEL=linuxppc64
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
eapply "${FILESDIR}/${MY_PN}-format.patch"
|
||||
# https://lists.clozure.com/pipermail/openmcl-devel/2016-September/011399.html
|
||||
sed -i "s/-dynamic/-no_pie/" "${S}/lisp-kernel/darwinx8664/Makefile" || die
|
||||
cp "${EPREFIX}/usr/share/common-lisp/source/asdf/build/asdf.lisp" tools/ || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake -C lisp-kernel/${CCL_KERNEL} clean
|
||||
emake -C lisp-kernel/${CCL_KERNEL} all CC="$(tc-getCC)"
|
||||
|
||||
unset CCL_DEFAULT_DIRECTORY
|
||||
./${CCL_RUNTIME} -n -b -Q -e '(ccl:rebuild-ccl :full t)' -e '(ccl:quit)' || die "Compilation failed"
|
||||
|
||||
# remove non-owner write permissions on the full-image
|
||||
chmod go-w ${CCL_RUNTIME}{,.image} || die
|
||||
|
||||
esvn_clean
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local target_dir="/usr/$(get_libdir)/${PN}"
|
||||
local prefix_dir="${EPREFIX}/${target_dir#/}"
|
||||
|
||||
mkdir -p "${D}/${prefix_dir#/}"
|
||||
|
||||
find . -type f -name '*fsl' -delete || die
|
||||
rm -f lisp-kernel/${CCL_KERNEL}/*.o || die
|
||||
cp -a compiler contrib level-0 level-1 lib library lisp-kernel scripts \
|
||||
tools xdump ${CCL_HEADERS} ${CCL_RUNTIME} ${CCL_RUNTIME}.image \
|
||||
"${D}/${prefix_dir#/}" || die
|
||||
|
||||
echo "CCL_DEFAULT_DIRECTORY=${prefix_dir}" > "${ENVD}"
|
||||
doenvd "${ENVD}"
|
||||
|
||||
dosym "${target_dir}/${CCL_RUNTIME}" /usr/bin/ccl
|
||||
dodoc doc/release-notes.txt
|
||||
|
||||
if use doc ; then
|
||||
dodoc "${DISTDIR}/ccl.html"
|
||||
dodoc -r doc/manual
|
||||
dodoc -r examples
|
||||
fi
|
||||
}
|
||||
@ -1,102 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit eutils flag-o-matic multilib toolchain-funcs
|
||||
|
||||
MY_PN=ccl
|
||||
MY_P=${MY_PN}-${PV}
|
||||
|
||||
DESCRIPTION="Common Lisp implementation, derived from Digitool's MCL product"
|
||||
HOMEPAGE="https://ccl.clozure.com"
|
||||
SRC_URI="
|
||||
x86? ( ${HOMEPAGE}/ftp/pub/release/${PV}/${MY_P}-linuxx86.tar.gz )
|
||||
amd64? ( ${HOMEPAGE}/ftp/pub/release/${PV}/${MY_P}-linuxx86.tar.gz )
|
||||
arm? ( ${HOMEPAGE}/ftp/pub/release/${PV}/${MY_P}-linuxarm.tar.gz )
|
||||
x86-macos? ( ${HOMEPAGE}/ftp/pub/release/${PV}/${MY_P}-darwinx86.tar.gz )
|
||||
x64-macos? ( ${HOMEPAGE}/ftp/pub/release/${PV}/${MY_P}-darwinx86.tar.gz )
|
||||
x86-solaris? ( ${HOMEPAGE}/ftp/pub/release/${PV}/${MY_P}-solarisx86.tar.gz )
|
||||
x64-solaris? ( ${HOMEPAGE}/ftp/pub/release/${PV}/${MY_P}-solarisx86.tar.gz )
|
||||
doc? ( ${HOMEPAGE}/docs/ccl.html )"
|
||||
|
||||
LICENSE="LLGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
|
||||
IUSE="doc"
|
||||
|
||||
RDEPEND=">=dev-lisp/asdf-2.33-r3:="
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
S="${WORKDIR}"/${MY_PN}
|
||||
ENVD="${T}/50ccl"
|
||||
|
||||
src_configure() {
|
||||
if use x86-macos; then
|
||||
CCL_RUNTIME=dx86cl; CCL_HEADERS=darwin-x86-headers; CCL_KERNEL=darwinx8632
|
||||
elif use x64-macos; then
|
||||
CCL_RUNTIME=dx86cl64; CCL_HEADERS=darwin-x86-headers64; CCL_KERNEL=darwinx8664
|
||||
elif use x86-solaris; then
|
||||
CCL_RUNTIME=sx86cl; CCL_HEADERS=solarisx86-headers; CCL_KERNEL=solarisx86
|
||||
elif use x64-solaris; then
|
||||
CCL_RUNTIME=sx86cl64; CCL_HEADERS=solarisx64-headers; CCL_KERNEL=solarisx64
|
||||
elif use x86; then
|
||||
CCL_RUNTIME=lx86cl; CCL_HEADERS=x86-headers; CCL_KERNEL=linuxx8632
|
||||
elif use amd64; then
|
||||
CCL_RUNTIME=lx86cl64; CCL_HEADERS=x86-headers64; CCL_KERNEL=linuxx8664
|
||||
elif use arm; then
|
||||
CCL_RUNTIME=armcl; CCL_HEADERS=arm-headers; CCL_KERNEL=linuxarm
|
||||
elif use ppc; then
|
||||
CCL_RUNTIME=ppccl; CCL_HEADERS=headers; CCL_KERNEL=linuxppc
|
||||
elif use ppc64; then
|
||||
CCL_RUNTIME=ppccl64; CCL_HEADERS=headers64; CCL_KERNEL=linuxppc64
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
eapply "${FILESDIR}/${MY_PN}-format.patch"
|
||||
# bug #638304 https://github.com/Clozure/ccl/commit/a87d61b88e1f48a563335062668970f7e6290ecf
|
||||
eapply "${FILESDIR}/${MY_P}-glibc-2.26.patch"
|
||||
# https://lists.clozure.com/pipermail/openmcl-devel/2016-September/011399.html
|
||||
sed -i "s/-dynamic/-no_pie/" "${S}/lisp-kernel/darwinx8664/Makefile" || die
|
||||
cp "${EPREFIX}/usr/share/common-lisp/source/asdf/build/asdf.lisp" tools/ || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake -C lisp-kernel/${CCL_KERNEL} clean
|
||||
emake -C lisp-kernel/${CCL_KERNEL} all CC="$(tc-getCC)"
|
||||
|
||||
unset CCL_DEFAULT_DIRECTORY
|
||||
./${CCL_RUNTIME} -n -b -Q -e '(ccl:rebuild-ccl :full t)' -e '(ccl:quit)' || die "Compilation failed"
|
||||
|
||||
# remove non-owner write permissions on the full-image
|
||||
chmod go-w ${CCL_RUNTIME}{,.image} || die
|
||||
|
||||
esvn_clean
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local target_dir="/usr/$(get_libdir)/${PN}"
|
||||
local prefix_dir="${EPREFIX}/${target_dir#/}"
|
||||
|
||||
mkdir -p "${D}/${prefix_dir#/}"
|
||||
|
||||
find . -type f -name '*fsl' -delete || die
|
||||
rm -f lisp-kernel/${CCL_KERNEL}/*.o || die
|
||||
cp -a compiler contrib level-0 level-1 lib library lisp-kernel scripts \
|
||||
tools xdump ${CCL_HEADERS} ${CCL_RUNTIME} ${CCL_RUNTIME}.image \
|
||||
"${D}/${prefix_dir#/}" || die
|
||||
|
||||
echo "CCL_DEFAULT_DIRECTORY=${prefix_dir}" > "${ENVD}"
|
||||
doenvd "${ENVD}"
|
||||
|
||||
dosym "${target_dir}/${CCL_RUNTIME}" /usr/bin/ccl
|
||||
dodoc doc/release-notes.txt
|
||||
|
||||
if use doc ; then
|
||||
dodoc "${DISTDIR}/ccl.html"
|
||||
dodoc -r doc/manual
|
||||
dodoc -r examples
|
||||
fi
|
||||
}
|
||||
@ -1,41 +0,0 @@
|
||||
diff -U2 -r ccl.orig/lisp-kernel/platform-linuxx8632.h ccl/lisp-kernel/platform-linuxx8632.h
|
||||
--- ccl.orig/lisp-kernel/platform-linuxx8632.h 2015-11-07 02:10:11.000000000 +0600
|
||||
+++ ccl/lisp-kernel/platform-linuxx8632.h 2017-11-21 23:50:31.630113003 +0700
|
||||
@@ -21,5 +21,7 @@
|
||||
#define PLATFORM_WORD_SIZE PLATFORM_WORD_SIZE_32
|
||||
|
||||
-typedef struct ucontext ExceptionInformation;
|
||||
+#include <ucontext.h>
|
||||
+
|
||||
+typedef ucontext_t ExceptionInformation;
|
||||
|
||||
#define MAXIMUM_MAPPABLE_MEMORY (9U<<28)
|
||||
diff -U2 -r ccl.orig/lisp-kernel/platform-linuxx8664.h ccl/lisp-kernel/platform-linuxx8664.h
|
||||
--- ccl.orig/lisp-kernel/platform-linuxx8664.h 2015-11-07 02:10:11.000000000 +0600
|
||||
+++ ccl/lisp-kernel/platform-linuxx8664.h 2017-11-21 23:51:44.693114350 +0700
|
||||
@@ -21,5 +21,7 @@
|
||||
#define PLATFORM_WORD_SIZE PLATFORM_WORD_SIZE_64
|
||||
|
||||
-typedef struct ucontext ExceptionInformation;
|
||||
+#include <ucontext.h>
|
||||
+
|
||||
+typedef ucontext_t ExceptionInformation;
|
||||
|
||||
#define MAXIMUM_MAPPABLE_MEMORY (512L<<30L)
|
||||
diff -U2 -r ccl.orig/lisp-kernel/x86-exceptions.c ccl/lisp-kernel/x86-exceptions.c
|
||||
--- ccl.orig/lisp-kernel/x86-exceptions.c 2015-11-07 02:10:11.000000000 +0600
|
||||
+++ ccl/lisp-kernel/x86-exceptions.c 2017-11-21 23:55:00.816117965 +0700
|
||||
@@ -1678,5 +1678,5 @@
|
||||
void *puc;
|
||||
siginfo_t info;
|
||||
- struct ucontext uc;
|
||||
+ ucontext_t uc;
|
||||
struct _fpstate fpstate;
|
||||
char retcode[8];
|
||||
@@ -2426,5 +2426,5 @@
|
||||
change copy_ucontext().
|
||||
*/
|
||||
- stack.ss_size -= sizeof(struct ucontext);
|
||||
+ stack.ss_size -= sizeof(ucontext_t);
|
||||
#endif
|
||||
if (sigaltstack(&stack, NULL) != 0) {
|
||||
@ -1,128 +0,0 @@
|
||||
diff -r -U1 ccl.orig/lib/format.lisp ccl/lib/format.lisp
|
||||
--- ccl.orig/lib/format.lisp 2015-11-07 02:10:10.000000000 +0600
|
||||
+++ ccl/lib/format.lisp 2015-11-20 22:51:51.736191995 +0600
|
||||
@@ -1296,5 +1296,2 @@
|
||||
|
||||
-
|
||||
-
|
||||
-
|
||||
;;; Given a non-negative floating point number, SCALE-EXPONENT returns a
|
||||
@@ -1305,41 +1302,74 @@
|
||||
|
||||
-
|
||||
-(defconstant long-log10-of-2 0.30103d0)
|
||||
-
|
||||
-#|
|
||||
-(defun scale-exponent (x)
|
||||
- (if (floatp x )
|
||||
- (scale-expt-aux (abs x) 0.0d0 1.0d0 1.0d1 1.0d-1 long-log10-of-2)
|
||||
- (report-bad-arg x 'float)))
|
||||
-
|
||||
-#|this is the slisp code that was in the place of the error call above.
|
||||
- before floatp was put in place of shortfloatp.
|
||||
- ;(scale-expt-aux x (%sp-l-float 0) (%sp-l-float 1) %long-float-ten
|
||||
- ; %long-float-one-tenth long-log10-of-2)))
|
||||
-|#
|
||||
-
|
||||
-; this dies with floating point overflow (?) if fed least-positive-double-float
|
||||
-
|
||||
-(defun scale-expt-aux (x zero one ten one-tenth log10-of-2)
|
||||
- (let ((exponent (nth-value 1 (decode-float x))))
|
||||
- (if (= x zero)
|
||||
- (values zero 1)
|
||||
- (let* ((e (round (* exponent log10-of-2)))
|
||||
- (x (if (minusp e) ;For the end ranges.
|
||||
- (* x ten (expt ten (- -1 e)))
|
||||
- (/ x ten (expt ten (1- e))))))
|
||||
- (do ((d ten (* d ten))
|
||||
- (y x (/ x d))
|
||||
- (e e (1+ e)))
|
||||
- ((< y one)
|
||||
- (do ((m ten (* m ten))
|
||||
- (z y (* z m))
|
||||
- (e e (1- e)))
|
||||
- ((>= z one-tenth) (values x e)))))))))
|
||||
-|#
|
||||
-
|
||||
-(defun scale-exponent (n)
|
||||
- (let ((exp (nth-value 1 (decode-float n))))
|
||||
- (values (round (* exp long-log10-of-2)))))
|
||||
-
|
||||
+(defconstant single-float-min-e
|
||||
+ (nth-value 1 (decode-float least-positive-single-float)))
|
||||
+(defconstant double-float-min-e
|
||||
+ (nth-value 1 (decode-float least-positive-double-float)))
|
||||
+
|
||||
+;;; Adapted from CMUCL.
|
||||
+
|
||||
+;; This is a modified version of the scale computation from Burger and
|
||||
+;; Dybvig's paper "Printing floating-point quickly and accurately."
|
||||
+;; We only want the exponent, so most things not needed for the
|
||||
+;; computation of the exponent have been removed. We also implemented
|
||||
+;; the floating-point log approximation given in Burger and Dybvig.
|
||||
+;; This is very noticeably faster for large and small numbers. It is
|
||||
+;; slower for intermediate sized numbers.
|
||||
+(defun accurate-scale-exponent (v)
|
||||
+ (declare (type float v))
|
||||
+ (if (zerop v)
|
||||
+ 1
|
||||
+ (let ((float-radix 2) ; b
|
||||
+ (float-digits (float-digits v)) ; p
|
||||
+ (min-e
|
||||
+ (etypecase v
|
||||
+ (single-float single-float-min-e)
|
||||
+ (double-float double-float-min-e))))
|
||||
+ (multiple-value-bind (f e)
|
||||
+ (integer-decode-float v)
|
||||
+ (let ( ;; FIXME: these even tests assume normal IEEE rounding
|
||||
+ ;; mode. I wonder if we should cater for non-normal?
|
||||
+ (high-ok (evenp f)))
|
||||
+ ;; We only want the exponent here.
|
||||
+ (labels ((flog (x)
|
||||
+ (declare (type (float (0.0)) x))
|
||||
+ (let ((xd (etypecase x
|
||||
+ (single-float
|
||||
+ (float x 1d0))
|
||||
+ (double-float
|
||||
+ x))))
|
||||
+ (ceiling (- (the (double-float -400d0 400d0)
|
||||
+ (log xd 10d0))
|
||||
+ 1d-10))))
|
||||
+ (fixup (r s m+ k)
|
||||
+ (if (if high-ok
|
||||
+ (>= (+ r m+) s)
|
||||
+ (> (+ r m+) s))
|
||||
+ (+ k 1)
|
||||
+ k))
|
||||
+ (scale (r s m+)
|
||||
+ (let* ((est (flog v))
|
||||
+ (scale (the integer (10-to-e (abs est)))))
|
||||
+ (if (>= est 0)
|
||||
+ (fixup r (* s scale) m+ est)
|
||||
+ (fixup (* r scale) s (* m+ scale) est)))))
|
||||
+ (let (r s m+)
|
||||
+ (if (>= e 0)
|
||||
+ (let* ((be (expt float-radix e))
|
||||
+ (be1 (* be float-radix)))
|
||||
+ (if (/= f (expt float-radix (1- float-digits)))
|
||||
+ (setf r (* f be 2)
|
||||
+ s 2
|
||||
+ m+ be)
|
||||
+ (setf r (* f be1 2)
|
||||
+ s (* float-radix 2)
|
||||
+ m+ be1)))
|
||||
+ (if (or (= e min-e)
|
||||
+ (/= f (expt float-radix (1- float-digits))))
|
||||
+ (setf r (* f 2)
|
||||
+ s (* (expt float-radix (- e)) 2)
|
||||
+ m+ 1)
|
||||
+ (setf r (* f float-radix 2)
|
||||
+ s (* (expt float-radix (- 1 e)) 2)
|
||||
+ m+ float-radix)))
|
||||
+ (scale r s m+))))))))
|
||||
|
||||
@@ -1922,3 +1952,3 @@
|
||||
(format-error "incompatible values for k and d")))
|
||||
- (when (not exp) (setq exp (scale-exponent number)))
|
||||
+ (when (not exp) (setq exp (accurate-scale-exponent (abs number))))
|
||||
AGAIN
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,2 +1,3 @@
|
||||
DIST SchemaObject-0.5.3.tar.gz 19921 BLAKE2B bed623dd8709e3c9c270d1e527d63260500bb39e00a3a4ae710dfa0c29de35a65ef4c6e41844a06a31b8744f827d3c4ea1c61783e95b20792a5f9f303b86596e SHA512 5f46672b6e069979db47aa96c4b1989f2575853803db84e27a4e15d40219829866e3aaf9e2a7f6f59a24cea7e6e166b8f310941a86f4f459cbe331ac6b3564d2
|
||||
DIST SchemaObject-0.5.7.tar.gz 13943 BLAKE2B 416b0b9a3a4883518cc2853abd7df5d8a1932915435443e9cf037609b5ca706dfc8f3ab7614473e23c3c84141d4ea6f19ebb626c9970a1ef1c084891022b0322 SHA512 b9ffd0a0927fd274440473d604ccc2fa58931c2c8c3594c53b6665d096ff9052c1dbcbe201548f3e38ea0a64807371cf7c606913df098cf2c7d5dcfd119be4ba
|
||||
DIST SchemaObject-0.5.8.tar.gz 13909 BLAKE2B bbb3d16b22cc5915803f64cd2b158ed73cf93492448bffc8301b9b25cc13774e51eb7d47b7d107f1b7495660c4f0267b00310596176ea0da66df8ae85e43fb9b SHA512 656a0f27fe9618be39d0be45275f83bc53f1c8437d249d97aec7cd18b5c873af1258ae6ffbcf53459705ec213e2d4a6bbe4971749fc245771de50fae0d2faf55
|
||||
|
||||
@ -0,0 +1,18 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="A simple Python object interface to a MySQL database schema"
|
||||
HOMEPAGE="https://github.com/mmatuson/SchemaObject"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
|
||||
@ -0,0 +1 @@
|
||||
DIST e4u-0.1rc4.tar.gz 50266 BLAKE2B 2cb878837ca34c7839e026b1f742ec23d9ee2c046406084ef10fca4c565b4661237ddf9f76620abc8db968dd5c521be4219752ff8ec4017326b57dc5de9b4ef0 SHA512 8ca0a0a160ddd1425be4f8a941d9767edac89edfaf5f5f14af840f3460ad91344186f8111711e0fb7af212d15af1f766d592e887511f820770b9f66818896a1d
|
||||
@ -0,0 +1,39 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
MY_PV="${PV/_/}"
|
||||
|
||||
DESCRIPTION="A library for handling unicode emoji and carrier's emoji"
|
||||
HOMEPAGE="https://github.com/lambdalisue/e4u"
|
||||
SRC_URI="https://github.com/lambdalisue/e4u/archive/${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz"
|
||||
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE="test"
|
||||
|
||||
RDEPEND="dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]"
|
||||
|
||||
DEPEND="${DEPEND}"
|
||||
|
||||
S="${WORKDIR}/${PN}-${MY_PV}"
|
||||
|
||||
PATCHES=( "${FILESDIR}/change-emoji4unicode-url.patch" "${FILESDIR}/initialize-e4u-tests.patch" )
|
||||
|
||||
python_test() {
|
||||
esetup.py test
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
insinto /usr/share/e4u
|
||||
doins e4u/data/emoji4unicode.xml
|
||||
|
||||
distutils-r1_python_install_all
|
||||
}
|
||||
@ -0,0 +1,33 @@
|
||||
--- a/e4u/__init__.py 2013-06-13 09:14:06.000000000 +0200
|
||||
+++ b/e4u/__init__.py 2018-05-18 15:35:49.000000000 +0200
|
||||
@@ -11,15 +11,15 @@
|
||||
|
||||
_loader = None
|
||||
|
||||
-def load(filename=None,
|
||||
- url=r"http://emoji4unicode.googlecode.com/svn/trunk/data/emoji4unicode.xml",
|
||||
+def load(filename=r"/usr/share/e4u/emoji4unicode.xml",
|
||||
+ url=None,
|
||||
loader_class=None):
|
||||
u"""load google's `emoji4unicode` project's xml file. must call this method first to use `e4u` library. this method never work twice if you want to reload, use `e4u.reload()` insted."""
|
||||
if not has_loaded():
|
||||
reload(filename, url, loader_class)
|
||||
|
||||
-def reload(filename=None,
|
||||
- url=r"http://emoji4unicode.googlecode.com/svn/trunk/data/emoji4unicode.xml",
|
||||
+def reload(filename=r"/usr/share/e4u/emoji4unicode.xml",
|
||||
+ url=None,
|
||||
loader_class=None):
|
||||
u"""reload google's `emoji4unicode` project's xml file. must call this method first to use `e4u` library."""
|
||||
if loader_class is None:
|
||||
--- a/e4u/loader.py 2013-06-13 09:14:06.000000000 +0200
|
||||
+++ b/e4u/loader.py 2018-05-18 15:36:01.000000000 +0200
|
||||
@@ -32,7 +32,7 @@
|
||||
self._translate_dictionaries = create_translate_dictionaries(self.symbols)
|
||||
|
||||
|
||||
- def load(self, filename=None, url=r"http://emoji4unicode.googlecode.com/svn/trunk/data/emoji4unicode.xml"):
|
||||
+ def load(self, filename=r"/usr/share/e4u/emoji4unicode.xml", url=None):
|
||||
if filename:
|
||||
xml = open(filename, 'r').read()
|
||||
else:
|
||||
@ -0,0 +1,11 @@
|
||||
--- a/test/test.py 2013-06-13 09:14:06.000000000 +0200
|
||||
+++ b/test/test.py 2018-05-16 13:40:22.000000000 +0200
|
||||
@@ -7,6 +7,8 @@
|
||||
import unittest
|
||||
import e4u
|
||||
|
||||
+e4u.load(filename=r"./e4u/data/emoji4unicode.xml")
|
||||
+
|
||||
DISPLAY_INFO = False
|
||||
|
||||
class TestCaseAbstract(object):
|
||||
@ -0,0 +1,21 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>ck+gentoo@bl4ckb0x.de</email>
|
||||
<name>Conrad Kostecki</name>
|
||||
</maintainer>
|
||||
<maintainer type="project">
|
||||
<email>proxy-maint@gentoo.org</email>
|
||||
<name>Proxy Maintainers</name>
|
||||
</maintainer>
|
||||
<upstream>
|
||||
<bugs-to>https://github.com/lambdalisue/e4u/issues</bugs-to>
|
||||
<remote-id type="github">lambdalisue/e4u</remote-id>
|
||||
</upstream>
|
||||
<longdescription>
|
||||
A library for handling unicode emoji and carrier's emoji.
|
||||
The main feature is conversion unicode emoji to carrier's emoji
|
||||
and conversion carrier's emoji to unicode emoji.
|
||||
</longdescription>
|
||||
</pkgmetadata>
|
||||
@ -0,0 +1 @@
|
||||
DIST fido2-0.3.0.tar.gz 125907 BLAKE2B 95054f258c775ac3b4f65608fd3b62ec4165a568c237064ebb66da1ca6ae899a3d88b5613e9dd4be87c05068ebd698be452dd3467800317e5894092216196e12 SHA512 c6ea83e104d77350413156eba4c1aa2635b77ae00d157dce61e5a8539c65aca4dd1dfc5303f9d408359582eeb98ae558aa1e2043a9b1dfcb23415eb8bc9c6a09
|
||||
@ -0,0 +1,35 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Python based FIDO 2.0 library"
|
||||
HOMEPAGE="https://github.com/Yubico/python-fido2"
|
||||
SRC_URI="https://github.com/Yubico/python-fido2/releases/download/${PV}/${P}.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0 BSD-2 MPL-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE="test"
|
||||
|
||||
RDEPEND="
|
||||
dev-python/six[${PYTHON_USEDEP}]
|
||||
dev-python/cryptography[${PYTHON_USEDEP}]
|
||||
$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
|
||||
"
|
||||
DEPEND="
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
test? (
|
||||
${RDEPEND}
|
||||
dev-python/mock[${PYTHON_USEDEP}]
|
||||
dev-python/pyfakefs[${PYTHON_USEDEP}]
|
||||
)
|
||||
"
|
||||
|
||||
python_test() {
|
||||
touch "${S}"/test/__init__.py || die
|
||||
esetup.py test
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue