Sync with portage [Sun Aug 20 20:31:18 MSK 2017].

mhiretskiy
root 7 years ago
parent 4ec223f241
commit a6ec6b76ce

@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
IUSE="libressl ssl"
RESTRICT="test"

@ -3,7 +3,7 @@
EAPI="6"
USE_RUBY="ruby21 ruby22"
USE_RUBY="ruby22 ruby23"
inherit ruby-single versionator

@ -1,5 +1,4 @@
DIST logrotate-3.11.0.tar.gz 176488 SHA256 7dcb440ed2f1937459e1e06f841c6af1e564b77b2df8009147b56c8649197910 SHA512 67ceb2e18c175a5935c81e7699af7a5e6625cef50a3f52e993d49d6c10d9c433f6c7354a8dd05cb35ab28e4393d1db198f2e46e5f6eafd3e6f040b6518438cc1 WHIRLPOOL 0a581aa5922386b84a7c40a9490364287f4e162f7180fd0e15bf191694294168b663947c7081e92755406fe4f0b3b8792b6f0c5f0e646afa5505a17995a86858
DIST logrotate-3.12.1.tar.gz 202420 SHA256 2f439241355cab306ed6b2e6c9450347a35806ee0377d86ef0eb1048ab3969a2 SHA512 3d84c835be9b3a394f5c0e6abd2519d572e4e2c49f807a31f94894adc0908457cdb3e33cb832f34febc25ce8e34be1e7091b489c14e84c59d58ad42787f91b16 WHIRLPOOL 282c98e66d5a723dcdbbf1ec20b0196e56523a7f3a05a9071ac56c841e88f1745fa35af78f43171e3e1de4c76566537a844e05f305373b5da28f83099ff4e27b
DIST logrotate-3.12.2.tar.gz 202700 SHA256 754777ada2ef2f34378e8f6025cdb0c0725e212f12195d59971c42df0ae0597f SHA512 ba8c3d7c7134b9ab5968c0dc8a1c5d24d7287a3204e1c6eed080b537d6a0ed7765a47c69b3067493304994e3f4238dc0173b593e4628316bfadf3decd002da16 WHIRLPOOL a299bc2bd50ab36acdd4ab747a479c5b94e84ac92bf55b71a8a8a7d4e1b55eb909dce94c22a5fdadda946dc783376923de5f46729084e21b54811489ce97c482
DIST logrotate-3.12.3.tar.gz 202991 SHA256 435a3f9a534a37e11657532a090f6bf521d8696bdf9cb799a360c1750ba3aea9 SHA512 ab700a50736c7ce8a6e5b9dc2504919c6d3e6ae48a7f112f6980253df5c6bab7fc507c82a0cd961d73ed1312c930da46d96d9f27046996644e0759c84c6a1ae9 WHIRLPOOL ceadd2a748850f0035702156b9a566bf3a38749edf823062f1c867e60cac1c7b40d770d6c923eed79972ce58394b3220e16e40e97e192a6a7046cf09c5fcbf77
DIST logrotate-3.9.1.tar.gz 79061 SHA256 022769e3288c80981559a8421703c88e8438b447235e36dd3c8e97cd94c52545 SHA512 e6da7c7f067befaf2441e9c6ce77e53cf5ddb4f56cc3304c3e50873b6f20c68520f4a0e50ec466cbebcbed20bfd77bf6dfc489975a8131e9573fb19856c0fe28 WHIRLPOOL 9b3558bb03c6c95f8f386ea75ca09bfda802ae4c45b9ef8408692e3aa7a2ee57447cf15ce04d0289946b9cae2266acb5509d8151d15ac6ea0ad9113aeb32dc17

@ -1,12 +0,0 @@
diff -Nuar a/Makefile.am b/Makefile.am
--- a/Makefile.am 2017-04-21 12:58:48.000000000 +0200
+++ b/Makefile.am 2017-04-23 00:02:39.312011684 +0200
@@ -9,7 +9,7 @@
# GNU General Public License for more details.
#
AM_CPPFLAGS = -include config.h
-AM_CFLAGS = -Wall -Werror
+AM_CFLAGS = -Wall
sbin_PROGRAMS = logrotate
logrotate_SOURCES = config.c log.c logrotate.c \
log.h logrotate.h queue.h

@ -1,36 +0,0 @@
diff -Nuar a/config.c b/config.c
--- a/config.c 2017-04-22 23:46:08.201991730 +0200
+++ b/config.c 2017-04-22 23:49:43.021996055 +0200
@@ -25,6 +25,10 @@
#include <sys/mman.h>
#include <libgen.h>
+#if !defined(PATH_MAX) && defined(__FreeBSD__)
+#include <sys/param.h>
+#endif
+
#include "log.h"
#include "logrotate.h"
diff -Nuar a/logrotate.c b/logrotate.c
--- a/logrotate.c 2017-04-21 10:52:10.000000000 +0200
+++ b/logrotate.c 2017-04-22 23:50:20.691996814 +0200
@@ -1,6 +1,6 @@
#include "queue.h"
/* alloca() is defined in stdlib.h in NetBSD */
-#ifndef __NetBSD__
+#if !defined(__NetBSD__) && !defined(__FreeBSD__)
#include <alloca.h>
#endif
#include <limits.h>
@@ -27,6 +27,10 @@
#include <limits.h>
#endif
+#if !defined(PATH_MAX) && defined(__FreeBSD__)
+#include <sys/param.h>
+#endif
+
#include "log.h"
#include "logrotate.h"

@ -1,14 +0,0 @@
diff -Nuar a/config.c b/config.c
--- a/config.c 2017-04-18 14:57:02.000000000 +0200
+++ b/config.c 2017-04-22 23:46:08.201991730 +0200
@@ -389,7 +389,9 @@
int i;
/* Check if fname is '.' or '..'; if so, return false */
- if (fname[0] == '.' && (!fname[1] || (fname[1] == '.' && !fname[2])))
+ /* Don't include 'hidden' files either; this breaks Gentoo
+ portage config file management http://bugs.gentoo.org/87683 */
+ if (fname[0] == '.')
return 0;
/* Check if fname is ending in a taboo-extension; if so, return false */

@ -1,84 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit autotools eutils toolchain-funcs flag-o-matic
DESCRIPTION="Rotates, compresses, and mails system logs"
HOMEPAGE="https://github.com/logrotate/logrotate"
SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
IUSE="acl +cron selinux"
CDEPEND="
>=dev-libs/popt-1.5
selinux? ( sys-libs/libselinux )
acl? ( virtual/acl )"
DEPEND="${CDEPEND}
>=sys-apps/sed-4"
RDEPEND="${CDEPEND}
selinux? ( sec-policy/selinux-logrotate )
cron? ( virtual/cron )"
install_cron_file() {
sed -i 's#/usr/sbin/logrotate#/usr/bin/logrotate#' "${S}"/examples/logrotate.cron || die
exeinto /etc/cron.daily
newexe "${S}"/examples/logrotate.cron "${PN}"
}
PATCHES=(
"${FILESDIR}/${P}-ignore-hidden.patch"
"${FILESDIR}/${P}-fbsd.patch"
"${FILESDIR}/${P}-Werror.patch"
)
src_prepare() {
default
eautoreconf
}
src_configure() {
econf $(use_with acl) $(use_with selinux)
}
src_compile() {
emake ${myconf} RPM_OPT_FLAGS="${CFLAGS}"
}
src_test() {
emake test
}
src_install() {
insinto /usr
dobin logrotate
doman logrotate.8
dodoc ChangeLog.md examples/logrotate*
insinto /etc
doins "${FILESDIR}"/logrotate.conf
use cron && install_cron_file
keepdir /etc/logrotate.d
}
pkg_postinst() {
elog "The ${PN} binary is now installed under /usr/bin. Please"
elog "update your links"
elog
if [[ -z ${REPLACING_VERSIONS} ]] ; then
elog "If you wish to have logrotate e-mail you updates, please"
elog "emerge virtual/mailx and configure logrotate in"
elog "/etc/logrotate.conf appropriately"
elog
elog "Additionally, /etc/logrotate.conf may need to be modified"
elog "for your particular needs. See man logrotate for details."
fi
}

@ -2,13 +2,9 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>candrews@integralblue.com</email>
<email>candrews@gentoo.org</email>
<name>Craig Andrews</name>
</maintainer>
<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
<longdescription lang="en">
Restart daemons after library updates
</longdescription>

@ -4,3 +4,5 @@ DIST puppet-agent_1.10.6-1xenial_amd64.deb 16459994 SHA256 ebd680c4c35823298ffb6
DIST puppet-agent_1.10.6-1xenial_i386.deb 16131024 SHA256 7e28145e6ca8847a1eb33bb443f1b55aa0700d4e4ddc65c74c605c075c312d55 SHA512 488fbfee2c9f75cd97e88511ef36521f26c5e617792bdc5b145040c8f7ff58b14308d24542afe4fc7c8689cc0e0d7b03514309123dc0653484eacd3de938dc59 WHIRLPOOL bb7b7a1efbddd88d4ddf382a543358af7f98ac4690fad3339f47b8ff71b8bf050acf9e0dea4ed376bac5e8b1929f4368504a1ae5ab2461e4f091abed66fb149d
DIST puppet-agent_5.0.1-1xenial_amd64.deb 15171814 SHA256 44b67741a276256cbee8dfad72053d6be9a9b1e4aeea43cb80413d569129a2c0 SHA512 0dc388b2f561b2ddd7d9064188298de212648c31bbf0e70e15f20de9c851a2efba1f648e38b593c6f0e8f027f7161d50051e1039dda1a1abbaed1b90c8e9a72c WHIRLPOOL b40844b6b873e4dfa63d90ee0f17a08b7f2d4862c9353d2fbb6590fa6387071f3b414a5063407ab75ee04c1f2f8e14186197cbc7be3bd617ee640f2283b596ab
DIST puppet-agent_5.0.1-1xenial_i386.deb 15591958 SHA256 d302ae9543812ef64252f04ef031ae2c46929c6950c8356e5e1d23526e47d24f SHA512 e7da74e534993c896ce79a27667717adecd8cbcb6002335210c0a29ca5002f58e03528d9da820908a0ed76c9a02f70b3bad7f82cdfa63eebc28aae01f7aaeee5 WHIRLPOOL c8061395adfd91b49e36975a971b36679bc0600e8df56e04902828c41b5389792161df83d00bbec4c4440f97fb1815bd4740635c457c66bc1326c37ea458dbcb
DIST puppet-agent_5.1.0-1xenial_amd64.deb 15141786 SHA256 1a3ad0ef1a5e4026927f3ae010e9a48b9c1e31dfb8e0691d01383d29f3b14644 SHA512 a210d225591328e2c041aad1dd7cfdac614531e1ceb524c3e35d3330962111bdc66408268550072e53190d6a10a7c8244b0bfa8a12b81f023883831c1fcbd070 WHIRLPOOL 34dc5cfcf6bb3500b89451078734d5d7a03a53a0be9e5501d6ded574cf2b6dbafe207db87aa919fd9cdadb6c2a0a05191854be3245d477e035fe7d52778cf527
DIST puppet-agent_5.1.0-1xenial_i386.deb 15596316 SHA256 41a4d70b3ff87352d9aa5594d2b65176f9854b38b21c738321e6d7dd516ccf25 SHA512 9e364fc50baa081cc808c0e0277d6625f6064dad7d56fba352d552e9398e7197405a8c3e15fac4f569dfa11c7c4657261f06b8c90f04bef6fcc6a9794d94e927 WHIRLPOOL e54f2a75b753f94b5dff8d230776afad6193f446d8156d2d2e10d9248732a607a83fa79fe01c4fae36ad8f3cf4ddb453906cf2f4fda87e3e414ede4fa893c58e

@ -0,0 +1,105 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
inherit eutils systemd unpacker user
DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
HOMEPAGE="https://puppetlabs.com/"
SRC_BASE="http://apt.puppetlabs.com/pool/xenial/puppet5/${PN:0:1}/${PN}/${PN}_${PV}-1xenial"
SRC_URI="
amd64? ( ${SRC_BASE}_amd64.deb )
x86? ( ${SRC_BASE}_i386.deb )
"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="puppetdb selinux"
RESTRICT="strip"
CDEPEND="!app-admin/augeas
!app-admin/mcollective
!app-admin/puppet
!dev-ruby/hiera
!dev-ruby/facter
!app-emulation/virt-what"
DEPEND="
${CDEPEND}"
RDEPEND="${CDEPEND}
app-portage/eix
sys-apps/dmidecode
sys-libs/glibc
>=sys-libs/readline-6.0
<sys-libs/readline-7.0
selinux? (
sys-libs/libselinux[ruby]
sec-policy/selinux-puppet
)
puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
S=${WORKDIR}
QA_PREBUILT="
/opt/puppetlabs/puppet
/opt/puppetlabs/puppet/lib/ruby/vendor_ruby/2.1.0/x86_64-linux/*
/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/mathn/*
/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/io/*
/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/dl/*
/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/racc/*
/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/enc/*
/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/json/ext/*
/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/rbconfig/*
/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/digest/*
/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/*
/opt/puppetlabs/puppet/lib/engines/*
/opt/puppetlabs/puppet/lib/virt-what/*
/opt/puppetlabs/puppet/lib/*
/opt/puppetlabs/puppet/bin/*"
pkg_setup() {
enewgroup puppet
enewuser puppet -1 -1 /var/run/puppet puppet
}
src_install() {
# conf.d
doconfd etc/default/puppet
doconfd etc/default/mcollective
doconfd etc/default/pxp-agent
# logrotate.d
insinto /etc/logrotate.d
doins etc/logrotate.d/mcollective
doins etc/logrotate.d/pxp-agent
# puppet itself
insinto /etc/puppetlabs
doins -r etc/puppetlabs/*
# logdir for systemd
dodir var/log/puppetlabs/puppet/
fperms 0750 var/log/puppetlabs/puppet/
# the rest
insinto /opt
dodir opt/puppetlabs/puppet/cache
doins -r opt/*
fperms 0750 /opt/puppetlabs/puppet/cache
# init
newinitd "${FILESDIR}/puppet.initd" puppet
newinitd "${FILESDIR}/mcollective.initd" mcollective
systemd_dounit lib/systemd/system/puppet.service
systemd_dounit lib/systemd/system/mcollective.service
systemd_dounit lib/systemd/system/pxp-agent.service
systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
# symlinks
chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
dosym /opt/puppetlabs/bin/facter /usr/bin/facter
dosym /opt/puppetlabs/bin/hiera /usr/bin/hiera
dosym /opt/puppetlabs/bin/mco /usr/bin/mco
dosym /opt/puppetlabs/bin/puppet /usr/bin/puppet
dosym /opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
dosym /opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
dosym /opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
dosym /opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
dosym /opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera
}

@ -1,9 +1,6 @@
DIST puppet-3.8.7.tar.gz 2650247 SHA256 50460a3dd8d25118e25eb01178d09743dabc01cd185f6b2cc723bae21ff023c2 SHA512 f86568d4f33c8c18da270e089e1274ce2e3c705c116b078531bb66656f0bbb9a2fc95effbb8bf5355a082d4f32ce5b44e7f6e316937164aa0d71dd47e654c618 WHIRLPOOL 6e3b754f9e6f40c6037652dc7d746e616871a653640e2a91ab7dd3e70b4240c0b377d0f79c543ca95c5d661046c6431e30f263e0f18998cac0ca3089a4634273
DIST puppet-4.10.1.tar.gz 2954351 SHA256 271738d2b5aaec8faafd543076ac0d9012fcd6051bccd2f70a66cd479362c605 SHA512 d232f062b93485f7eea8abb9c5420462e313e6050e7335159f051f7c7af86338c006ae4edc09e0e1370784ee7b076911ca563a4cfc6a1f2afc7179bed08d2032 WHIRLPOOL 1a5b8c3fc87fdb4e23196cc13ad46c963cdb6314cfc0e4d3a6d44adad4545289cf41886c6150ee14fcd0d30d9b29f32987c6e31a7c39077a2c53aac7147c69dd
DIST puppet-4.10.4.tar.gz 2968202 SHA256 59b8510ddf2f49342a39ccbe26bc7b2ea5e16d79de9dd572d929de58967aab90 SHA512 e7a47c95a30ccfe31ff6a245ce5df0e2aa1d6b1f07fd70623e40e1822c3df9322a87bcd6e624b4483c7b90756ef3ed34242aa9c6a880df57ff65918c4d31267f WHIRLPOOL f808cb84cebae7294f887fdb3ac0005b4129fca368cc58dcc0e558fa2dbd185b1f416ace96b7428ad7577fc3df45edf1fab0c150880d1205e0e3d1a9afcc7072
DIST puppet-4.10.5.tar.gz 2976455 SHA256 656a64e158c1453087099096d035adae53263dae752d3bac3c8fe0250b3894d1 SHA512 655a89dc5605f722389fbccc3fdfe5304220a45678f6d087170ba77d70a4d8574f9d7d9aadfe331107dbf663dee8ef920775fafebe63d22e91c739402abd419a WHIRLPOOL 87d63967afd7ab7bcd3e4e5ae082fc989b52606c0432d20e9060836d3eecc8966745201c5b88092d1d2003809be2ed736d6e98a893593a30db81ebb88df21ec1
DIST puppet-4.10.6.tar.gz 2977099 SHA256 19250a3659339961953d48d71aa5951d52bcee3bac0a1e2f45042aa82fcf358a SHA512 f983005d161bbd5fb81dfd15a32cb0ae2417557bd4faa1a62d2fb10fffa55c91ea29c1577785af9642a2878c78405ab99c7e6ee4268fcedcc107c07a0a5bfdd1 WHIRLPOOL 4619f7e89a02560f2c6bd1194b1f50699348fcddf5889628884c807deb0afd9b530883d280db20086a787052d2456ef61b2eef84854e95724562f1a0225b2640
DIST puppet-4.8.1.tar.gz 2873371 SHA256 8b3ee6b60639e2a2839ad7403fab8f8ecc390a93e6e47b03f1b053aa262bcf17 SHA512 9ecde04c68874652b501e779764bb3227d226564e80f06c2c15bd982620529ec55f8e11911bcf68db994ee98287746761752538aa5aeee474ddf37f21976e2d1 WHIRLPOOL d3a4b0b4b15dceb75cb3f161b73843af53f5d21121ba1fb06fdae422ec458f62f5fa47d0f5c7bfb96e3e9b04eb62c4c1e1a97f7131101e4f6f4ff952127c0685
DIST puppet-4.9.1.tar.gz 2912770 SHA256 db02cffb8339b349bd1ab2b15899511d3f5d449f0f591038256f0fb862f4c7db SHA512 db2bd324e4f58c583debe417ca233c613c296aa8824520c5373c8da45056ae9d09e54ceecba5c6b7d0250ea7228d6e1b83e5b690b1203de43dca8942c8f24ce2 WHIRLPOOL fd5554d5de319f8534fbada7ae6f4100d6de5a98f6646985e21c250a52a3d415ac31fc46c15c987bd7bcbc688bc8bb4d7dc9d37ebd93ecd183b3bd01d3426687
DIST puppet-5.0.0.tar.gz 2706319 SHA256 09ae5b56ff799ccfd78e3a1999aa27d6f2bf69a7a5ed19bd758cf88c17a004ab SHA512 4423001340623d00a72de16e7b585ce3874019b020b91abd4edb9b9a524bd0d709107bee4dfcdf20b2eaf99e67b3401e2883ea297659ad1debfea8fb33a665bd WHIRLPOOL 66bbb279fb9d646ada78ce28af3d2377abf63ce059b9e61ee15fc0b3b48796ea0f708f5f2c380e5dd986d4469f6a8b73606c61dfc3280aca5913d9c7fffa4f2f
DIST puppet-5.0.1.tar.gz 2715867 SHA256 ff80092c7bfde7198ec2cf776b8d0b8ba1c2c95be927a5cb5edae9f670038c4a SHA512 6038ce27f5144112bed080f0a33d0d866d4aac41b0e49436fb8a5a428ffd4c952b1e8582c4840803f9ebd6619ac0837b7b1413451f5665a9a4e02bb3f24464b3 WHIRLPOOL 6537888f122d4cfa76ec3d8a18086f7c53cbdb96f7e88f84f1910d00a6d90973b44610919863e1f569c75df9e0451f5fd134f83c3aeb1b3a563223658bd28e4f
DIST puppet-5.1.0.tar.gz 2734018 SHA256 ceb8059704d2e79c1f9147716b596261e1c6c38da3313a2283def777ecf9193c SHA512 07019f40c5b7f18243f13abb899c2ff2ea4b135895ab98c13da3df50f8e720e2759f8eb39e349ff04286da7de504cffea3df8acf9711e8591b25001a2a3f9c15 WHIRLPOOL a5e4e44c68a503307b01729546121a03a0271bc68f8db139e7d52981f9ce9f6db4e24b18a252633794e7de1c7aceb6d833c817a291099081b31190060bb59d50

@ -1,192 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
USE_RUBY="ruby21 ruby22 ruby23"
#RUBY_FAKEGEM_RECIPE_TEST="rspec3"
inherit xemacs-elisp-common eutils user ruby-fakegem versionator
DESCRIPTION="A system automation and configuration management software."
HOMEPAGE="http://puppetlabs.com/"
SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
LICENSE="Apache-2.0 GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~hppa ~ppc ~x86"
IUSE="augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs"
RESTRICT="test"
ruby_add_rdepend "
dev-ruby/hiera
>=dev-ruby/rgen-0.6.5
dev-ruby/json:=
>=dev-ruby/facter-3.0.0
augeas? ( dev-ruby/ruby-augeas )
diff? ( dev-ruby/diff-lcs )
doc? ( dev-ruby/rdoc )
ldap? ( dev-ruby/ruby-ldap )
shadow? ( dev-ruby/ruby-shadow )
sqlite? ( dev-ruby/sqlite3 )
virtual/ruby-ssl"
# ruby_add_bdepend "
# test? (
# dev-ruby/mocha:0.14
# =dev-ruby/rack-1*
# dev-ruby/rspec-its
# dev-ruby/rspec-collection_matchers
# >=dev-ruby/vcr-2.9:2
# >=dev-ruby/webmock-1.24:0
# )"
DEPEND+=" ${DEPEND}
xemacs? ( app-editors/xemacs )"
RDEPEND+=" ${RDEPEND}
rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
selinux? (
sys-libs/libselinux[ruby]
sec-policy/selinux-puppet
)
vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
>=app-portage/eix-0.18.0"
PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
SITEFILE="50${PN}-mode-gentoo.el"
pkg_setup() {
enewgroup puppet
enewuser puppet -1 -1 /var/lib/puppet puppet
}
all_ruby_prepare() {
# Avoid spec that require unpackaged json-schema.
rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
# can't be run within portage.
epatch "${FILESDIR}/puppet-fix-tests-4.7.0.patch"
# fix systemd path
epatch "${FILESDIR}/puppet-systemd.patch"
if use experimental; then
epatch "${FILESDIR}/43e2c935252b995134ce353e5e6312cf77aea480.patch"
fi
# Use working version of mocha
sed -i -e '1igem "mocha", "~>0.14.0"; gem "rack", "~>1.0"' spec/spec_helper.rb || die
# Avoid specs that can only run in the puppet.git repository. This
# should be narrowed down to the specific specs.
rm spec/integration/parser/compiler_spec.rb || die
# Avoid failing specs that need further investigation.
sed -i -e '/should resolve external facts/,/^ end/ s:^:#:' \
spec/integration/indirector/facts/facter_spec.rb || die
sed -i -e "/describe 'cfacter'/,/^ end/ s:^:#:" spec/unit/defaults_spec.rb || die
rm -f spec/unit/indirector/ldap_spec.rb \
spec/unit/parser/functions/create_resources_spec.rb || die
# Avoid specs that rely on tools from other OSs
rm -f spec/unit/provider/package/{dnf,tdnf,yum}_spec.rb \
spec/unit/provider/user/directoryservice_spec.rb || die
# Avoid specs that depend on hiera-eyaml to avoid circular
# dependencies
rm -f spec/unit/functions/lookup_spec.rb || die
# Avoid specs that fail due to an unpackaged file
sed -i -e '/when loading pp resource types using auto loading/,/^ end/ s:^:#:' spec/unit/pops/loaders/loaders_spec.rb || die
}
all_ruby_compile() {
if use xemacs ; then
# Create a separate version for xemacs to be able to install
# emacs and xemacs in parallel.
mkdir ext/xemacs
cp ext/emacs/* ext/xemacs/
xemacs-elisp-compile ext/xemacs/puppet-mode.el
fi
}
each_ruby_install() {
each_fakegem_install
# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
}
all_ruby_install() {
all_fakegem_install
# systemd stuffs
insinto /usr/lib/systemd/system
doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
# tmpfiles stuff
insinto /usr/lib/tmpfiles.d
newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
# openrc init stuff
newinitd "${FILESDIR}"/puppet.init-4.x puppet
newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
keepdir /etc/puppetlabs/puppet/ssl
keepdir /var/lib/puppet/facts
keepdir /var/lib/puppet/files
fowners -R puppet:puppet /var/lib/puppet
fperms 0750 /var/lib/puppet
fperms 0750 /etc/puppetlabs
fperms 0750 /etc/puppetlabs/puppet
fperms 0750 /etc/puppetlabs/puppet/ssl
fowners -R :puppet /etc/puppetlabs
fowners -R :puppet /var/lib/puppet
if use xemacs ; then
xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
fi
if use ldap ; then
insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
fi
# ext and examples files
for f in $(find ext examples -type f) ; do
docinto "$(dirname ${f})"; dodoc "${f}"
done
}
pkg_postinst() {
elog
elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
elog "cause puppet to hang while installing packages."
elog
elog "Portage Puppet module with Gentoo-specific resources:"
elog "http://forge.puppetlabs.com/gentoo/portage"
elog
local v
for v in ${REPLACING_VERSIONS}; do
if [ "$(get_major_version $v)" = "3" ]; then
elog
elog "If you're upgrading from 3.x then please move everything in /etc/puppet to"
elog "/etc/puppetlabs/puppet"
elog "Also, puppet now uses config directories for modules and manifests."
elog "See https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html"
elog "and https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html"
elog "for more information."
elog
fi
done
use xemacs && xemacs-elisp-site-regen
}
pkg_postrm() {
use xemacs && xemacs-elisp-site-regen
}

@ -1,192 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
USE_RUBY="ruby21 ruby22 ruby23"
#RUBY_FAKEGEM_RECIPE_TEST="rspec3"
inherit xemacs-elisp-common eutils user ruby-fakegem versionator
DESCRIPTION="A system automation and configuration management software."
HOMEPAGE="http://puppetlabs.com/"
SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
LICENSE="Apache-2.0 GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~hppa ~ppc ~x86"
IUSE="augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs"
RESTRICT="test"
ruby_add_rdepend "
dev-ruby/hiera
>=dev-ruby/rgen-0.6.5
dev-ruby/json:=
>=dev-ruby/facter-3.0.0
augeas? ( dev-ruby/ruby-augeas )
diff? ( dev-ruby/diff-lcs )
doc? ( dev-ruby/rdoc )
ldap? ( dev-ruby/ruby-ldap )
shadow? ( dev-ruby/ruby-shadow )
sqlite? ( dev-ruby/sqlite3 )
virtual/ruby-ssl"
# ruby_add_bdepend "
# test? (
# dev-ruby/mocha:0.14
# =dev-ruby/rack-1*
# dev-ruby/rspec-its
# dev-ruby/rspec-collection_matchers
# >=dev-ruby/vcr-2.9:2
# >=dev-ruby/webmock-1.24:0
# )"
DEPEND+=" ${DEPEND}
xemacs? ( app-editors/xemacs )"
RDEPEND+=" ${RDEPEND}
rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
selinux? (
sys-libs/libselinux[ruby]
sec-policy/selinux-puppet
)
vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
>=app-portage/eix-0.18.0"
PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
SITEFILE="50${PN}-mode-gentoo.el"
pkg_setup() {
enewgroup puppet
enewuser puppet -1 -1 /var/lib/puppet puppet
}
all_ruby_prepare() {
# Avoid spec that require unpackaged json-schema.
rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
# can't be run within portage.
epatch "${FILESDIR}/puppet-fix-tests-4.7.0.patch"
# fix systemd path
epatch "${FILESDIR}/puppet-systemd.patch"
if use experimental; then
epatch "${FILESDIR}/43e2c935252b995134ce353e5e6312cf77aea480.patch"
fi
# Use working version of mocha
sed -i -e '1igem "mocha", "~>0.14.0"; gem "rack", "~>1.0"' spec/spec_helper.rb || die
# Avoid specs that can only run in the puppet.git repository. This
# should be narrowed down to the specific specs.
rm spec/integration/parser/compiler_spec.rb || die
# Avoid failing specs that need further investigation.
sed -i -e '/should resolve external facts/,/^ end/ s:^:#:' \
spec/integration/indirector/facts/facter_spec.rb || die
sed -i -e "/describe 'cfacter'/,/^ end/ s:^:#:" spec/unit/defaults_spec.rb || die
rm -f spec/unit/indirector/ldap_spec.rb \
spec/unit/parser/functions/create_resources_spec.rb || die
# Avoid specs that rely on tools from other OSs
rm -f spec/unit/provider/package/{dnf,tdnf,yum}_spec.rb \
spec/unit/provider/user/directoryservice_spec.rb || die
# Avoid specs that depend on hiera-eyaml to avoid circular
# dependencies
rm -f spec/unit/functions/lookup_spec.rb || die
# Avoid specs that fail due to an unpackaged file
sed -i -e '/when loading pp resource types using auto loading/,/^ end/ s:^:#:' spec/unit/pops/loaders/loaders_spec.rb || die
}
all_ruby_compile() {
if use xemacs ; then
# Create a separate version for xemacs to be able to install
# emacs and xemacs in parallel.
mkdir ext/xemacs
cp ext/emacs/* ext/xemacs/
xemacs-elisp-compile ext/xemacs/puppet-mode.el
fi
}
each_ruby_install() {
each_fakegem_install
# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
}
all_ruby_install() {
all_fakegem_install
# systemd stuffs
insinto /usr/lib/systemd/system
doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
# tmpfiles stuff
insinto /usr/lib/tmpfiles.d
newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
# openrc init stuff
newinitd "${FILESDIR}"/puppet.init-4.x puppet
newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
keepdir /etc/puppetlabs/puppet/ssl
keepdir /var/lib/puppet/facts
keepdir /var/lib/puppet/files
fowners -R puppet:puppet /var/lib/puppet
fperms 0750 /var/lib/puppet
fperms 0750 /etc/puppetlabs
fperms 0750 /etc/puppetlabs/puppet
fperms 0750 /etc/puppetlabs/puppet/ssl
fowners -R :puppet /etc/puppetlabs
fowners -R :puppet /var/lib/puppet
if use xemacs ; then
xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
fi
if use ldap ; then
insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
fi
# ext and examples files
for f in $(find ext examples -type f) ; do
docinto "$(dirname ${f})"; dodoc "${f}"
done
}
pkg_postinst() {
elog
elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
elog "cause puppet to hang while installing packages."
elog
elog "Portage Puppet module with Gentoo-specific resources:"
elog "http://forge.puppetlabs.com/gentoo/portage"
elog
local v
for v in ${REPLACING_VERSIONS}; do
if [ "$(get_major_version $v)" = "3" ]; then
elog
elog "If you're upgrading from 3.x then please move everything in /etc/puppet to"
elog "/etc/puppetlabs/puppet"
elog "Also, puppet now uses config directories for modules and manifests."
elog "See https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html"
elog "and https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html"
elog "for more information."
elog
fi
done
use xemacs && xemacs-elisp-site-regen
}
pkg_postrm() {
use xemacs && xemacs-elisp-site-regen
}

@ -1,184 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
USE_RUBY="ruby21 ruby22"
RUBY_FAKEGEM_RECIPE_TEST="rspec3"
inherit elisp-common xemacs-elisp-common eutils user ruby-fakegem versionator
DESCRIPTION="A system automation and configuration management software."
HOMEPAGE="http://puppetlabs.com/"
SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
LICENSE="Apache-2.0 GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~hppa ~ppc ~x86"
IUSE="augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs"
RESTRICT="test"
ruby_add_rdepend "
dev-ruby/hiera
>=dev-ruby/rgen-0.6.5
dev-ruby/json:=
>=dev-ruby/facter-3.0.0
augeas? ( dev-ruby/ruby-augeas )
diff? ( dev-ruby/diff-lcs )
doc? ( dev-ruby/rdoc )
ldap? ( dev-ruby/ruby-ldap )
shadow? ( dev-ruby/ruby-shadow )
sqlite? ( dev-ruby/sqlite3 )
virtual/ruby-ssl"
ruby_add_bdepend "
test? (
dev-ruby/mocha
dev-ruby/rack
dev-ruby/rspec-its
)"
# this should go in the above lists, but isn't because of test deps not being keyworded
# dev-ruby/rspec-collection_matchers
DEPEND+=" ${DEPEND}
emacs? ( virtual/emacs )
xemacs? ( app-editors/xemacs )"
RDEPEND+=" ${RDEPEND}
rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
selinux? (
sys-libs/libselinux[ruby]
sec-policy/selinux-puppet
)
vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
>=app-portage/eix-0.18.0"
SITEFILE="50${PN}-mode-gentoo.el"
pkg_setup() {
enewgroup puppet
enewuser puppet -1 -1 /var/lib/puppet puppet
}
all_ruby_prepare() {
# Avoid spec that require unpackaged json-schema.
rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
# can't be run within portage.
epatch "${FILESDIR}/puppet-fix-tests-4.7.0.patch"
# fix systemd path
epatch "${FILESDIR}/puppet-systemd.patch"
if use experimental; then
epatch "${FILESDIR}/43e2c935252b995134ce353e5e6312cf77aea480.patch"
fi
# Avoid specs that can only run in the puppet.git repository. This
# should be narrowed down to the specific specs.
rm spec/integration/parser/compiler_spec.rb || die
# Avoid failing spec that need further investigation.
rm spec/unit/module_tool/metadata_spec.rb || die
}
all_ruby_compile() {
if use emacs ; then
elisp-compile ext/emacs/puppet-mode.el
fi
if use xemacs ; then
# Create a separate version for xemacs to be able to install
# emacs and xemacs in parallel.
mkdir ext/xemacs
cp ext/emacs/* ext/xemacs/
xemacs-elisp-compile ext/xemacs/puppet-mode.el
fi
}
each_ruby_install() {
each_fakegem_install
# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
}
all_ruby_install() {
all_fakegem_install
# systemd stuffs
insinto /usr/lib/systemd/system
doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
# tmpfiles stuff
insinto /usr/lib/tmpfiles.d
newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
# openrc init stuff
newinitd "${FILESDIR}"/puppet.init-4.x puppet
newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
keepdir /etc/puppetlabs/puppet/ssl
keepdir /var/lib/puppet/facts
keepdir /var/lib/puppet/files
fowners -R puppet:puppet /var/lib/puppet
fperms 0750 /var/lib/puppet
fperms 0750 /etc/puppetlabs
fperms 0750 /etc/puppetlabs/puppet
fperms 0750 /etc/puppetlabs/puppet/ssl
fowners -R :puppet /etc/puppetlabs
fowners -R :puppet /var/lib/puppet
if use emacs ; then
elisp-install ${PN} ext/emacs/puppet-mode.el*
elisp-site-file-install "${FILESDIR}/${SITEFILE}"
fi
if use xemacs ; then
xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
fi
if use ldap ; then
insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
fi
# ext and examples files
for f in $(find ext examples -type f) ; do
docinto "$(dirname ${f})"; dodoc "${f}"
done
}
pkg_postinst() {
elog
elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
elog "cause puppet to hang while installing packages."
elog
elog "Portage Puppet module with Gentoo-specific resources:"
elog "http://forge.puppetlabs.com/gentoo/portage"
elog
local v
for v in ${REPLACING_VERSIONS}; do
if [ "$(get_major_version $v)" = "3" ]; then
elog
elog "If you're upgrading from 3.x then please move everything in /etc/puppet to"
elog "/etc/puppetlabs/puppet"
elog "Also, puppet now uses config directories for modules and manifests."
elog "See https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html"
elog "and https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html"
elog "for more information."
elog
fi
done
use emacs && elisp-site-regen
use xemacs && xemacs-elisp-site-regen
}
pkg_postrm() {
use emacs && elisp-site-regen
use xemacs && xemacs-elisp-site-regen
}

@ -1,7 +1,7 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
EAPI="6"
USE_RUBY="ruby21 ruby22 ruby23"
# need to get deps up to date for this

@ -1,5 +1,4 @@
DIST sysstat-11.4.0.tar.xz 343968 SHA256 b8518ca88acfcbc474a406022ee9c0c3210ccef4f0ec80e5b3e8c41dda8c16f2 SHA512 4a5c81d75fdbc8dcaf80685f302688c39bd7143554e5a06cb324532ddb5180caac19b261182d5320f40b317bdb1e81664887acc7cedfeb5a95dc6ad37a898604 WHIRLPOOL 39f48929040405f83a0d3c49dcf2aac471deeadd10d31181ee03809a30573868a7da43df160688ad553d305221bd21c2e253f56913f8f8a53020fb66f62c05ba
DIST sysstat-11.4.4.tar.xz 344756 SHA256 6585f08e24347d2d6462aee6ef97e80fe4cc869605193184500df0f80fa61cc8 SHA512 918b8c54ab6bdde568106254d1550644f6e962896b1923f4145bfbfb6c65542b08182141d2164be51667fc0dc5df57d94cbeb34cf5f8dfacb224559caef0740c WHIRLPOOL 09f873d65015037a780a5c8425bb2fc80c3124aa2560b8a8e1b3173676121b3e41d9606c2015439f00738be0da67c73ac92521bf882007c948e064d4c2ab5fed
DIST sysstat-11.4.5.tar.xz 344796 SHA256 785d754d64c746b21190773a846539ef2ee789bf908f05cd8245c234d15784ff SHA512 e195e0fa4afa45e894fc1089ecdc7e77dd0532f0db0d10b717b32e642710baa96de31be01c70c8a1173359c8f65f34dc72ac2722ecd2c8e63bf286a6eed202fd WHIRLPOOL a35f673129b873a0fac657447905d7662eaa22f3bd80a095d5c440586d116a595dab68136a147f3f50b0019eb1e244a29c8cdff0fb4b8e6698f31920a901f623
DIST sysstat-11.5.6.tar.xz 465576 SHA256 83a81e0a6c1d39a0985310dc2944ac6214c963adb4dc8af24ae03a9ae8d0f3ac SHA512 7541284a1a7bbd3eeccca1110176e5f261bba54ab27b1ea587d584e651e818c3c029aa07b98200e783257ebdffa48048f40dfbbaacb4cbbd1d51d40d7d48a64a WHIRLPOOL 16eb9c5919506df7c6685436874bab0ea5b51c711a6932681925cfd2f37f7da953613aa3397f931cf94d0e35b2de66712dd7ff511e11cc513b6f5cc5288a2c60
DIST sysstat-11.5.7.tar.xz 467420 SHA256 4a38efaa0ca85ee5484d046bd427012979264fef17f07fd7855860e592819482 SHA512 ddbf4eba9215b90c5b97ec05afc8f04205ac2d641478886324bcd462bd3978ea1ea4cc9adc7afe3690d58d36be66d949029d08da1e9bc028f9c52b6a9ad77bcb WHIRLPOOL 4dd63cfbf8710d881dd9a999d942b8e659793f7edb74852cc087a8f5d0c4a34ac4386122bbf564e9239122d81ab1475205ca1068f6c52235baf2d1ccf5726c50
DIST sysstat-11.4.6.tar.xz 344832 SHA256 2bc1d98572169a901868afdf0c56f98580191353ba3bc5c7ce6efd12e7a7fa2e SHA512 50fa1426fde528758dcc3b067f3f52987bf6e09788f81feda9fa5db5286960f7cff9bf832ab8320448904429ee473c444eca25c40c545b875b83b90b9b132439 WHIRLPOOL 16b7e5d69f1bd4f3d2198b9a32f3cb88ff1063df331c9a336947e240789aa7945b34a009a27c69752e4002992718c6e461b52ee36e02b6b7aae361e8a7c79965
DIST sysstat-11.6.0.tar.xz 468528 SHA256 122172f5730162efd80e74fbbc0eeee8facfe10b30f38fe4b8f0693588474ee4 SHA512 b54af1724777e20df54e9dac97b558abd4f669724234d4a62debbfa2dd5788020683ca8e47f95ea018feefd024abe2f930a91363b35ef490ddf69b7cf2d5df68 WHIRLPOOL bffada8ed40938fb1f67ec894403f2339a7736a2a11a8b14a370b7ab1c8bd0e0e3fbcb4d2e2a3d91916cc348e34848c215b72caa3cad5202eeb723df1c09c7ba

@ -1,89 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit flag-o-matic multilib systemd toolchain-funcs
DESCRIPTION="System performance tools for Linux"
HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
SRC_URI="${HOMEPAGE}${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
IUSE="debug nls lm_sensors selinux static"
CDEPEND="
nls? ( virtual/libintl )
lm_sensors? ( sys-apps/lm_sensors )
"
DEPEND="
${CDEPEND}
nls? ( sys-devel/gettext )
"
RDEPEND="
${CDEPEND}
selinux? ( sec-policy/selinux-sysstat )
"
PATCHES=(
"${FILESDIR}"/${PN}-10.0.4-flags.patch
"${FILESDIR}"/${PN}-11.0.4-cron.patch
)
SYSSTAT_FAKE_RC_DIR=Gentoo-does-not-use-rc.d
src_prepare() {
if use nls; then
strip-linguas -i nls/
local lingua pofile
for pofile in nls/*.po; do
lingua=${pofile/nls\/}
lingua=${lingua/.po}
if ! has ${lingua} ${LINGUAS}; then
rm "nls/${lingua}.po" || die
fi
done
fi
default
}
src_configure() {
tc-export AR
use static && append-ldflags -static
sa_lib_dir=/usr/$(get_libdir)/sa \
conf_dir=/etc \
rcdir=${SYSSTAT_FAKE_RC_DIR} \
econf \
$(use_enable debug debuginfo) \
$(use_enable lm_sensors sensors) \
$(use_enable nls) \
--enable-copy-only \
--enable-documentation \
--enable-install-cron \
--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
}
src_compile() {
emake LFLAGS="${LDFLAGS}"
}
src_install() {
keepdir /var/log/sa
emake \
CHOWN=true \
DESTDIR="${D}" \
DOC_DIR=/usr/share/doc/${PF} \
MANGRPARG='' \
install
dodoc -r contrib/
rm -r "${D}/${SYSSTAT_FAKE_RC_DIR}" || die
newinitd "${FILESDIR}"/${PN}.init.d ${PN}
systemd_dounit ${PN}.service
rm -f "${D}"usr/share/doc/${PF}/COPYING
}

@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
IUSE="debug nls lm_sensors selinux static"
CDEPEND="

@ -0,0 +1,33 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit toolchain-funcs
DESCRIPTION="cpio-format archives"
HOMEPAGE="http://members.chello.nl/k.holtman/afio.html"
SRC_URI="http://members.chello.nl/k.holtman/${P}.tgz"
LICENSE="Artistic LGPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
PATCHES=( "${FILESDIR}"/Makefile-r1.patch )
src_prepare() {
default
tc-export CC
}
src_install() {
dobin "${PN}"
doman "${PN}.1"
dodoc ANNOUNCE-* HISTORY README SCRIPTS
local i
for i in {1..4}; do
docinto "script$i"
dodoc "script$i"/*
done
}

@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
IUSE="+bzip2 +lzma nls selinux test unicode +update-alternatives +zlib"
RDEPEND="

@ -18,7 +18,7 @@ SRC_URI="x86? ( ${URI_x86} )
LICENSE="RAR BSD BSD-2"
SLOT="0"
KEYWORDS="-* ~amd64 ~x86"
KEYWORDS="-* amd64 x86"
IUSE="all_sfx"
RESTRICT="mirror bindist"

@ -14,7 +14,7 @@ SRC_URI="http://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="unRAR"
# subslot = soname version
SLOT="0/5"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"

@ -3,3 +3,4 @@ DIST bacula-7.0.5.tar.gz 3216406 SHA256 1457849eb33011b43371801b62ffa13d29bebe51
DIST bacula-7.4.4.tar.gz 3312271 SHA256 01a53d4501b17aeea0c25f0b63e49b4586ac221107834a6c471c43bc602c4c47 SHA512 37f1fd0d91f027fc12cd43b5e575abf0f8d9ccad805775bd308a06cff843b77cfc599e0d45eaf83536c1be669a5189c35744b5774adaefa606fed31d63888029 WHIRLPOOL 53a45d30b2188cacfa092dae4f791c4bb9c3cd4fc0f30fa2fc1e212dfdaccb1fc50a3b709f2d69e71458916916e887362f09a1aabe0219c34867bb6c4d93d0e9
DIST bacula-7.4.6.tar.gz 3312673 SHA256 4e8ea321b64cd49e29aecbdd3cb0dc10615302b18e2f26ffa7e7c82362c1cfed SHA512 2d8c47d184dd5d611bf3d209f0d39b0d2e60763bbb757a393c1ddb2fb361de855a4d53d4cbd76f4fda555cc7c069e79eefcb57fc01389a98dec6dc7815d0cde7 WHIRLPOOL d8831459a8f70a8a6b3b03b6b366ac62181ab2241f9bbf9fad46df95df1923873ec32795dd382c2c3fe66170b573d2ed54802e3784a47beed33aefd17ab84417
DIST bacula-7.4.7.tar.gz 3312991 SHA256 6f6075c2ca90a63cdeeca39b0b82a3ea07ce9999dedc68951d88bed7fbc0be40 SHA512 2dcffe3f02de8e7dedc11f58aeca58fb95486757579065564753376d3fab7699d7577c189d0d34f8490706d773cd6a95d42ef1f35facb95e6fff10dad085c0d0 WHIRLPOOL bc897086f8589d952c6b9dad7751278d21be5e51d9bbcfd2c697f95191ca1295127bb0f06b98c1f05a13e9f7cd0ef61ce7aba87f3cd8d0503168114c9ad96c93
DIST bacula-9.0.3.tar.gz 3951688 SHA256 ae8501960d43399bea13113274993637b6395d73d7d2c47f9b7a07cb4aa72251 SHA512 025cdcc3d92f2674cda7ed2f7d050a8826daf71d0f435d2b34b2514d3f03ab09a299a1882d9d9d51134445f8ba71bb38dc3fabf12d28877604a1b88d92623f7f WHIRLPOOL d82043a7de7e859e0e7059de71e29b046059e80a8c48ddba72ba783237a28fc339c34c51283f5c6a2de8d92e01ceb4a68729a023209677825596d7bed82acda4

@ -0,0 +1,418 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
inherit eutils multilib qt4-r2 systemd user libtool
MY_PV=${PV/_beta/-b}
MY_P=${PN}-${MY_PV}
DESCRIPTION="Featureful client/server network backup suite"
HOMEPAGE="http://www.bacula.org/"
SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
LICENSE="AGPL-3"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~sparc ~x86"
IUSE="bacula-clientonly bacula-nodir bacula-nosd examples ipv6 libressl logwatch mysql postgres qt4 readline +sqlite ssl static tcpd vim-syntax X"
DEPEND="
dev-libs/gmp:0
!bacula-clientonly? (
postgres? ( dev-db/postgresql:=[threads] )
mysql? ( virtual/mysql )
sqlite? ( dev-db/sqlite:3 )
!bacula-nodir? ( virtual/mta )
)
qt4? (
dev-qt/qtsvg:4
x11-libs/qwt:5
)
logwatch? ( sys-apps/logwatch )
tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
readline? ( sys-libs/readline:0 )
static? (
virtual/acl[static-libs]
sys-libs/zlib[static-libs]
dev-libs/lzo[static-libs]
sys-libs/ncurses:=[static-libs]
ssl? (
!libressl? ( dev-libs/openssl:0=[static-libs] )
libressl? ( dev-libs/libressl:0=[static-libs] )
)
)
!static? (
virtual/acl
sys-libs/zlib
dev-libs/lzo
sys-libs/ncurses:=
ssl? (
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
)
)"
RDEPEND="${DEPEND}
!bacula-clientonly? (
!bacula-nosd? (
sys-block/mtx
app-arch/mt-st
)
)
vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
REQUIRED_USE="!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
static? ( bacula-clientonly )"
S=${WORKDIR}/${MY_P}
pkg_setup() {
#XOR and !bacula-clientonly controlled by REQUIRED_USE
use mysql && export mydbtype="mysql"
use postgres && export mydbtype="postgresql"
use sqlite && export mydbtype="sqlite3"
# create the daemon group and user
if [ -z "$(egetent group bacula 2>/dev/null)" ]; then
enewgroup bacula
einfo
einfo "The group 'bacula' has been created. Any users you add to this"
einfo "group have access to files created by the daemons."
einfo
fi
if use bacula-clientonly && use static && use qt4; then
ewarn
ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt4' useflag."
ewarn
fi
if ! use bacula-clientonly; then
if [ -z "$(egetent passwd bacula 2>/dev/null)" ]; then
enewuser bacula -1 -1 /var/lib/bacula bacula,disk,tape,cdrom,cdrw
einfo
einfo "The user 'bacula' has been created. Please see the bacula manual"
einfo "for information about running bacula as a non-root user."
einfo
fi
fi
}
src_prepare() {
# adjusts default configuration files for several binaries
# to /etc/bacula/<config> instead of ./<config>
pushd src >&/dev/null || die
for f in console/console.c dird/dird.c filed/filed.c \
stored/bcopy.c stored/bextract.c stored/bls.c \
stored/bscan.c stored/btape.c stored/stored.c \
qt-console/main.cpp; do
sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \
|| die "sed on ${f} failed"
done
popd >&/dev/null || die
# bug 466688 drop deprecated categories from Desktop file
sed -i -e 's/Application;//' scripts/bat.desktop.in || die
# bug 466690 Use CXXFLAGS instead of CFLAGS
sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
# drop automatic install of unneeded documentation (for bug 356499)
epatch "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch
# bug #310087
epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
# bug #311161
epatch "${FILESDIR}"/9.0.2/${PN}-9.0.2-lib-search-path.patch
# bat needs to respect LDFLAGS
epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-ldflags.patch
# bug #328701
epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
epatch "${FILESDIR}"/9.0.2/${PN}-9.0.2-fix-static.patch
# fix soname in libbaccat.so bug #602952
epatch "${FILESDIR}/bacula-fix-sonames.patch"
# do not strip binaries
sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
# fix file not found error during make depend
epatch "${FILESDIR}"/7.0.2/${PN}-7.0.2-depend.patch
# Fix systemd unit files:
# bug 497748
sed -i -e '/Requires/d' platforms/systemd/*.service.in || die
sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die
# bug 504370
sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die
# bug 584442 and 504368
sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in || die
# fix bundled libtool (bug 466696)
# But first move directory with M4 macros out of the way.
# It is only needed by autoconf and gives errors during elibtoolize.
mv autoconf/libtool autoconf/libtool1 || die
elibtoolize
}
src_configure() {
local myconf=''
if use bacula-clientonly; then
myconf="${myconf} \
$(use_enable bacula-clientonly client-only) \
$(use_enable !static libtool) \
$(use_enable static static-cons) \
$(use_enable static static-fd)"
else
myconf="${myconf} \
$(use_enable !bacula-nodir build-dird) \
$(use_enable !bacula-nosd build-stored)"
# bug #311099
# database support needed by dir-only *and* sd-only
# build as well (for building bscan, btape, etc.)
myconf="${myconf}
--with-${mydbtype}"
if use mysql; then
myconf="${myconf} \
--disable-batch-insert"
else
myconf="${myconf} \
--enable-batch-insert"
fi
fi
# do not build bat if 'static' clientonly
if ! use bacula-clientonly || ! use static; then
myconf="${myconf} \
$(use_enable qt4 bat)"
fi
myconf="${myconf} \
$(use_with X x) \
$(use_enable !readline conio) \
$(use_enable readline) \
$(use_with readline readline /usr) \
$(use_with ssl openssl) \
$(use_enable ipv6) \
$(use_with tcpd tcp-wrappers)"
econf \
--enable-acl \
--libdir=/usr/$(get_libdir) \
--docdir=/usr/share/doc/${PF} \
--htmldir=/usr/share/doc/${PF}/html \
--with-pid-dir=/var/run \
--sysconfdir=/etc/bacula \
--with-subsys-dir=/var/lock/subsys \
--with-working-dir=/var/lib/bacula \
--with-logdir=/var/lib/bacula \
--with-scriptdir=/usr/libexec/bacula \
--with-systemd=$(systemd_get_unitdir) \
--with-dir-user=bacula \
--with-dir-group=bacula \
--with-sd-user=root \
--with-sd-group=bacula \
--with-fd-user=root \
--with-fd-group=bacula \
--enable-smartalloc \
--disable-afs \
--host=${CHOST} \
${myconf}
# correct configuration for QT based bat
if use qt4 ; then
pushd src/qt-console
eqmake4
popd
fi
}
src_compile() {
# Make build log verbose (bug #447806)
emake NO_ECHO=""
}
src_install() {
emake DESTDIR="${D}" install
doicon scripts/bacula.png
# install bat icon and desktop file when enabled
# (for some reason ./configure doesn't pick this up)
if use qt4 && ! use static ; then
doicon src/qt-console/images/bat_icon.png
domenu scripts/bat.desktop
fi
# remove some scripts we don't need at all
rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
# rename statically linked apps
if use bacula-clientonly && use static ; then
pushd "${D}"/usr/sbin || die
mv static-bacula-fd bacula-fd || die
mv static-bconsole bconsole || die
popd || die
fi
# extra files which 'make install' doesn't cover
if ! use bacula-clientonly; then
# the database update scripts
diropts -m0750
insinto /usr/libexec/bacula/updatedb
insopts -m0754
doins "${S}"/updatedb/*
fperms 0640 /usr/libexec/bacula/updatedb/README
# the logrotate configuration
# (now unconditional wrt bug #258187)
diropts -m0755
insinto /etc/logrotate.d
insopts -m0644
newins "${S}"/scripts/logrotate bacula
# the logwatch scripts
if use logwatch; then
diropts -m0750
dodir /usr/share/logwatch/scripts/services
dodir /usr/share/logwatch/scripts/shared
dodir /etc/logwatch/conf/logfiles
dodir /etc/logwatch/conf/services
pushd "${S}"/scripts/logwatch >&/dev/null || die
emake DESTDIR="${D}" install
popd >&/dev/null || die
fi
fi
if ! use qt4; then
rm -vf "${D}"/usr/share/man/man1/bat.1*
fi
rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
if use bacula-clientonly || use bacula-nodir; then
rm -vf "${D}"/usr/share/man/man8/bacula-dir.8*
rm -vf "${D}"/usr/share/man/man8/dbcheck.8*
rm -vf "${D}"/usr/share/man/man1/bsmtp.1*
rm -vf "${D}"/usr/libexec/bacula/create_*_database
rm -vf "${D}"/usr/libexec/bacula/drop_*_database
rm -vf "${D}"/usr/libexec/bacula/make_*_tables
rm -vf "${D}"/usr/libexec/bacula/update_*_tables
rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
fi
if use bacula-clientonly || use bacula-nosd; then
rm -vf "${D}"/usr/share/man/man8/bacula-sd.8*
rm -vf "${D}"/usr/share/man/man8/bcopy.8*
rm -vf "${D}"/usr/share/man/man8/bextract.8*
rm -vf "${D}"/usr/share/man/man8/bls.8*
rm -vf "${D}"/usr/share/man/man8/bscan.8*
rm -vf "${D}"/usr/share/man/man8/btape.8*
rm -vf "${D}"/usr/libexec/bacula/disk-changer
rm -vf "${D}"/usr/libexec/bacula/mtx-changer
rm -vf "${D}"/usr/libexec/bacula/dvd-handler
fi
# documentation
dodoc ChangeLog ReleaseNotes SUPPORT
# install examples (bug #457504)
if use examples; then
docinto examples/
dodoc -r examples/*
fi
# vim-files
if use vim-syntax; then
insinto /usr/share/vim/vimfiles/syntax
doins scripts/bacula.vim
insinto /usr/share/vim/vimfiles/ftdetect
newins scripts/filetype.vim bacula_ft.vim
fi
# setup init scripts
myscripts="bacula-fd"
if ! use bacula-clientonly; then
if ! use bacula-nodir; then
myscripts="${myscripts} bacula-dir"
fi
if ! use bacula-nosd; then
myscripts="${myscripts} bacula-sd"
fi
fi
for script in ${myscripts}; do
# copy over init script and config to a temporary location
# so we can modify them as needed
cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
cp "${FILESDIR}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
# now set the database dependancy for the director init script
case "${script}" in
bacula-dir)
case "${mydbtype}" in
sqlite3)
# sqlite databases don't have a daemon
sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
;;
*)
# all other databases have daemons
sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
;;
esac
;;
*)
;;
esac
# install init script and config
newinitd "${T}/${script}".initd "${script}"
newconfd "${T}/${script}".confd "${script}"
done
systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
# make sure the working directory exists
diropts -m0750
keepdir /var/lib/bacula
# make sure bacula group can execute bacula libexec scripts
fowners -R root:bacula /usr/libexec/bacula
}
pkg_postinst() {
if use bacula-clientonly; then
fowners root:bacula /var/lib/bacula
else
fowners bacula:bacula /var/lib/bacula
fi
if ! use bacula-clientonly && ! use bacula-nodir; then
einfo
einfo "If this is a new install, you must create the ${mydbtype} databases with:"
einfo " /usr/libexec/bacula/create_${mydbtype}_database"
einfo " /usr/libexec/bacula/make_${mydbtype}_tables"
einfo " /usr/libexec/bacula/grant_${mydbtype}_privileges"
einfo
ewarn "ATTENTION!"
ewarn "The format of the database may have changed."
ewarn "If you just upgraded from a version below 9.0.0 you must run"
ewarn "'update_bacula_tables' now."
ewarn "Make sure to have a backup of your catalog before."
ewarn
fi
if use sqlite; then
einfo
einfo "Be aware that Bacula does not officially support SQLite database anymore."
einfo "Best use it only for a client-only installation. See Bug #445540."
einfo
fi
einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
einfo "you have to enable 'USE=qt4'."
einfo
}

@ -0,0 +1,63 @@
--- src/console/Makefile.in.orig 2017-07-25 19:03:05.664760298 +0200
+++ src/console/Makefile.in 2017-07-25 19:05:43.576706091 +0200
@@ -24,6 +24,7 @@
CONSSRCS = console.c console_conf.c authenticate.c @CONS_SRC@
CONSOBJS = console.o console_conf.o authenticate.o @CONS_OBJ@
JSONOBJS = bbconsjson.o console_conf.o
+ZLIBS=@ZLIBS@
# these are the objects that are changed by the .configure process
EXTRAOBJS = @OBJLIST@
@@ -50,18 +51,18 @@
bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
$(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
- $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
- $(OPENSSL_LIBS)
+ $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
+ $(OPENSSL_LIBS) $(LIBS)
bbconsjson: Makefile $(JSONOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
$(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(JSONOBJS) \
- $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
- $(OPENSSL_LIBS)
+ $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
+ $(OPENSSL_LIBS) $(LIBS)
static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
$(LIBTOOL_LINK) $(CXX) -static -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
- $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
- $(OPENSSL_LIBS)
+ $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
+ $(OPENSSL_LIBS) $(LIBS)
strip $@
--- src/filed/Makefile.in.orig 2017-07-25 19:09:19.655852979 +0200
+++ src/filed/Makefile.in 2017-07-25 19:11:39.519558592 +0200
@@ -69,19 +69,19 @@
bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
@echo "Linking $@ ..."
$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \
- $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
+ $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
+ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
bfdjson: Makefile $(JSONOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@
@echo "Linking $@ ..."
$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(JSONOBJS) \
- $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
+ $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
+ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \
- $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
+ $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
+ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
strip $@
Makefile: $(srcdir)/Makefile.in $(topdir)/config.status

@ -0,0 +1,25 @@
# If upgrading the old libraries gets linked first. So fix order of
# lib search path.
--- src/console/Makefile.in.orig 2017-07-26 15:03:07.000000000 +0200
+++ src/console/Makefile.in 2017-07-23 18:31:57.000000000 +0200
@@ -49,17 +49,17 @@
bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
+ $(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
$(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
$(OPENSSL_LIBS)
bbconsjson: Makefile $(JSONOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(JSONOBJS) \
+ $(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(JSONOBJS) \
$(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
$(OPENSSL_LIBS)
static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
- $(LIBTOOL_LINK) $(CXX) -static $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
+ $(LIBTOOL_LINK) $(CXX) -static -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
$(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
$(OPENSSL_LIBS)
strip $@

@ -2,17 +2,13 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>candrews@integralblue.com</email>
<email>candrews@gentoo.org</email>
<name>Craig Andrews</name>
</maintainer>
<maintainer type="person">
<email>axel@tty0.ch</email>
<name>Axel Burri</name>
</maintainer>
<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
<longdescription lang="en">
Tool for creating snapshots and remote backups of btrfs subvolumes
</longdescription>

@ -1,50 +0,0 @@
# udev rules to set the access rights of CCID smart card readers
# so they can be used by pcscd
# $Id: 92_pcscd_ccid.rules 6587 2013-04-05 16:31:55Z rousseau $
# Gemplus PCMCIA Card
#SUBSYSTEMS=="pcmcia", DRIVERS=="serial_cs", ACTION=="add", ATTRS{prod_id1}=="Gemplus", ATTRS{prod_id2}=="SerialPort", ATTRS{prod_id3}=="GemPC Card", RUN+="/usr/sbin/pcscd --hotplug"
# If not adding the device, go away
ACTION!="add", GOTO="pcscd_ccid_rules_end"
SUBSYSTEM!="usb", GOTO="pcscd_ccid_rules_end"
ENV{DEVTYPE}!="usb_device", GOTO="pcscd_ccid_rules_end"
# Kobil mIDentity
ATTRS{idVendor}=="0d46", ATTRS{idProduct}=="4081", RUN+="/usr/sbin/Kobil_mIDentity_switch"
# generic CCID device (bInterfaceClass = 0x0b)
# change group from default "root" to "pcscd"
ENV{ID_USB_INTERFACES}=="*:0b0000:*", ENV{PCSCD}="1"
# set USB power management to auto. "power/level" has been deprecated in
# Linux 2.6.35 and replaced by "power/control"
ENV{ID_USB_INTERFACES}==":0b0000:", RUN+="/bin/sh -c 'echo auto > /sys/$devpath/power/level ; echo auto > /sys/$devpath/power/control'"
# non CCID generic (InterfaceClass: 0xFF)
# CherrySmartTerminalST2XXX.txt
ATTRS{idVendor}=="046a", ATTRS{idProduct}=="003e", ENV{PCSCD}="1"
# DellSK-3106.txt
ATTRS{idVendor}=="413c", ATTRS{idProduct}=="2100", ENV{PCSCD}="1"
# MySmartPad.txt
ATTRS{idVendor}=="09be", ATTRS{idProduct}=="0002", ENV{PCSCD}="1"
# SCR3310-NTTCom USB SmartCard Reader
ATTRS{idVendor}=="04e6", ATTRS{idProduct}=="511a", ENV{PCSCD}="1"
# SCR331-DI USB Smart Card Reader
ATTRS{idVendor}=="04e6", ATTRS{idProduct}=="5120", ENV{PCSCD}="1"
# SCR331-DI.txt
ATTRS{idVendor}=="04e6", ATTRS{idProduct}=="5111", ENV{PCSCD}="1"
# SDI010.txt
ATTRS{idVendor}=="04e6", ATTRS{idProduct}=="5121", ENV{PCSCD}="1"
# SPR532.txt
ATTRS{idVendor}=="04e6", ATTRS{idProduct}=="e003", ENV{PCSCD}="1"
# Verisign_secure_storage_token.txt
ATTRS{idVendor}=="08e6", ATTRS{idProduct}=="1359", ENV{PCSCD}="1"
# Verisign_secure_token.txt
ATTRS{idVendor}=="08e6", ATTRS{idProduct}=="ace0", ENV{PCSCD}="1"
# SchlumbergerSema Cyberflex Access e-gate
ATTRS{idVendor}=="0973", ATTRS{idProduct}=="0003", ENV{PCSCD}="1"
# All done
LABEL="pcscd_ccid_rules_end"

@ -1,33 +0,0 @@
From cf3778631f87ad03274ac94dcae7c7fbbd036913 Mon Sep 17 00:00:00 2001
From: Kristian Fiskerstrand <kf@sumptuouscapital.com>
Date: Tue, 22 Nov 2016 10:07:33 +0100
Subject: [PATCH] gpgscm: Use shorter socket path lengts to improve test
reliability
--
As socket lengths are normally restricted to 108 characters
(UNIX_PATH_MAX variable in /usr/include/linux/un.h), using 42 characters
by default easily results in errors.
---
tests/gpgscm/tests.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/gpgscm/tests.scm b/tests/gpgscm/tests.scm
index 72afa99..039ea86 100644
--- a/tests/gpgscm/tests.scm
+++ b/tests/gpgscm/tests.scm
@@ -268,9 +268,9 @@
(define (mkdtemp . components)
(_mkdtemp (if (null? components)
(path-join (getenv "TMP")
- (string-append "gpgscm-" (get-isotime) "-"
+ (string-append "gscm"
(basename-suffix *scriptname* ".scm")
- "-XXXXXX"))
+ "XXXXXX"))
(apply path-join components))))
(macro (with-temporary-working-directory form)
--
2.7.3

@ -1,56 +0,0 @@
https://lists.gnupg.org/pipermail/gnupg-devel/2017-March/032668.html
From c22a2a89d3bd3d08b3abb8e4e33df32b480338ec Mon Sep 17 00:00:00 2001
From: Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com>
Date: Tue, 7 Mar 2017 13:54:49 +0100
Subject: [PATCH] gpgscm: Use system strlwr if available.
* tests/gpgscm/scheme.c: Define local strlwr only when HAVE_STRLWR is
not defined in config.h.
* tests/gpgscm/scheme-config.h: Remove hack.
Signed-off-by: Justus Winter <justus@g10code.com>
---
tests/gpgscm/scheme-config.h | 4 ----
tests/gpgscm/scheme.c | 6 +++++-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/tests/gpgscm/scheme-config.h b/tests/gpgscm/scheme-config.h
index 2003498..15ca969 100644
--- a/tests/gpgscm/scheme-config.h
+++ b/tests/gpgscm/scheme-config.h
@@ -30,7 +30,3 @@
#define USE_PLIST 0
#define USE_INTERFACE 1
#define SHOW_ERROR_LINE 1
-
-#if __MINGW32__
-# define USE_STRLWR 0
-#endif /* __MINGW32__ */
diff --git a/tests/gpgscm/scheme.c b/tests/gpgscm/scheme.c
index b2ff721..af97c27 100644
--- a/tests/gpgscm/scheme.c
+++ b/tests/gpgscm/scheme.c
@@ -12,6 +12,10 @@
*
*/
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#define _SCHEME_SOURCE
#include "scheme-private.h"
#ifndef WIN32
@@ -88,7 +92,7 @@ static int stricmp(const char *s1, const char *s2)
}
#endif /* __APPLE__ */
-#if USE_STRLWR
+#if USE_STRLWR && !defined(HAVE_STRLWR)
static const char *strlwr(char *s) {
const char *p=s;
while(*s) {
--
2.10.2

@ -1,19 +0,0 @@
command-ssh: include ucred.h
In order to use ucred() when HAVE_SO_PEERCRED is defined, ucred.h needs
to be included on Solaris.
https://bugs.gnupg.org/gnupg/issue2981
--- a/agent/command-ssh.c
+++ b/agent/command-ssh.c
@@ -40,6 +40,9 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <assert.h>
+#ifdef HAVE_UCRED_H
+#include <ucred.h>
+#endif
#include "agent.h"

@ -1,85 +0,0 @@
From 4ce4f2f683a17be3ddb93729f3f25014a97934ad Mon Sep 17 00:00:00 2001
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Mon, 6 Mar 2017 10:26:11 +0900
Subject: [PATCH 1/1] agent: For SSH, robustly handling scdaemon's errors.
* agent/command-ssh.c (card_key_list): Return 0 when
agent_card_serialno returns an error.
(ssh_handler_request_identities): Handle errors for card listing
and proceed to other cases.
--
GnuPG-bug-id: 2980
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
---
agent/command-ssh.c | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/agent/command-ssh.c b/agent/command-ssh.c
index 79b8f85..3ab41cf 100644
--- a/agent/command-ssh.c
+++ b/agent/command-ssh.c
@@ -2393,13 +2393,12 @@ card_key_list (ctrl_t ctrl, char **r_serialno, strlist_t *result)
err = agent_card_serialno (ctrl, r_serialno, NULL);
if (err)
{
- if (gpg_err_code (err) == GPG_ERR_ENODEV)
- return 0; /* Nothing available. */
-
- if (opt.verbose)
+ if (gpg_err_code (err) != GPG_ERR_ENODEV && opt.verbose)
log_info (_("error getting serial number of card: %s\n"),
gpg_strerror (err));
- return err;
+
+ /* Nothing available. */
+ return 0;
}
err = agent_card_cardlist (ctrl, result);
@@ -2568,7 +2567,6 @@ ssh_handler_request_identities (ctrl_t ctrl,
gpg_error_t err;
int ret;
ssh_control_file_t cf = NULL;
- char *cardsn;
gpg_error_t ret_err;
(void)request;
@@ -2601,21 +2599,21 @@ ssh_handler_request_identities (ctrl_t ctrl,
if (opt.verbose)
log_info (_("error getting list of cards: %s\n"),
gpg_strerror (err));
- goto out;
+ goto scd_out;
}
for (sl = card_list; sl; sl = sl->next)
{
char *serialno0;
+ char *cardsn;
+
err = agent_card_serialno (ctrl, &serialno0, sl->d);
if (err)
{
if (opt.verbose)
log_info (_("error getting serial number of card: %s\n"),
gpg_strerror (err));
- xfree (serialno);
- free_strlist (card_list);
- goto out;
+ continue;
}
xfree (serialno0);
@@ -2640,6 +2638,7 @@ ssh_handler_request_identities (ctrl_t ctrl,
free_strlist (card_list);
}
+ scd_out:
/* Then look at all the registered and non-disabled keys. */
err = open_control_file (&cf, 0);
if (err)
--
2.8.0.rc3

@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd"
IUSE="afs +berkdb caps hdb-ldap ipv6 otp +pkinit selinux ssl static-libs test X"
CDEPEND="ssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )

@ -1,118 +0,0 @@
diff -ur mhash-0.9.9.orig/lib/stdfns.c mhash-0.9.9/lib/stdfns.c
--- mhash-0.9.9.orig/lib/stdfns.c Wed Apr 4 21:18:42 2007
+++ mhash-0.9.9/lib/stdfns.c Mon May 28 16:08:38 2007
@@ -152,12 +152,23 @@
}
}
+static void
+mutils_memset8(void *s, __const mutils_word8 c, __const mutils_word32 n)
+{
+ mutils_word8 *stmp = s;
+ mutils_word32 i;
+
+ for (i = 0; i < n; i++, stmp++)
+ {
+ *stmp = c;
+ }
+}
+
WIN32DLL_DEFINE
void
mutils_memset(void *s, __const mutils_word8 c, __const mutils_word32 n)
{
- mutils_word8 *stmp;
- mutils_word32 *ltmp = (mutils_word32 *) s;
+ mutils_word32 *ltmp;
mutils_word32 lump;
mutils_word32 i;
mutils_word32 words;
@@ -168,10 +179,22 @@
return;
}
+ if (n < 16)
+ {
+ return mutils_memset8(s, c, n);
+ }
+
+ /* unaligned portion at beginning */
+ remainder = (-(mutils_word32)s) & 0x3;
+ mutils_memset8(s, c, remainder);
+
+ /* aligned words in the middle */
+ ltmp = (mutils_word32 *) (s + remainder);
+
lump = (c << 24) + (c << 16) + (c << 8) + c;
- words = n >> 2;
- remainder = n - (words << 2);
+ words = (n - remainder) >> 2;
+ remainder = n - remainder - (words << 2);
for (i = 0; i < words; i++, ltmp++)
{
@@ -178,12 +201,8 @@
*ltmp = lump;
}
- stmp = (mutils_word8 *) ltmp;
-
- for (i = 0; i < remainder; i++, stmp++)
- {
- *stmp = c;
- }
+ /* unaligned portion at end */
+ return mutils_memset8(ltmp, c, remainder);
}
static void
@@ -275,6 +294,9 @@
mutils_word32 *buffer;
mutils_word32 *ptrIn;
mutils_word32 *ptrOut;
+ mutils_word8 *ptr8In;
+ mutils_word8 *ptr8Out;
+ mutils_word8 tmp8;
mutils_word32 count = n * 4;
if (destructive == MUTILS_FALSE)
@@ -295,10 +317,36 @@
* data on a little-endian machine.
*/
- for (loop = 0, ptrIn = x, ptrOut = buffer; loop < n; loop++, ptrOut++, ptrIn++)
+ if ((mutils_word32)x & 0x3)
{
- *ptrOut = mutils_lend32(*ptrIn);
+ ptr8In = (mutils_word8 *) x;
+ ptr8Out = (mutils_word8 *) buffer;
+ for (loop = 0; loop < n; loop++)
+ {
+#ifdef WORDS_BIGENDIAN
+ tmp8 = ptr8In[0];
+ ptr8Out[0] = ptr8In[3];
+ ptr8Out[3] = tmp8;
+ tmp8 = ptr8In[1];
+ ptr8Out[1] = ptr8In[2];
+ ptr8Out[2] = tmp8;
+#else
+ ptr8Out[0] = ptr8In[0];
+ ptr8Out[1] = ptr8In[1];
+ ptr8Out[2] = ptr8In[2];
+ ptr8Out[3] = ptr8In[3];
+#endif
+ ptr8Out += 4;
+ ptr8In += 4;
+ }
}
+ else
+ {
+ for (loop = 0, ptrIn = x, ptrOut = buffer; loop < n; loop++, ptrOut++, ptrIn++)
+ {
+ *ptrOut = mutils_lend32(*ptrIn);
+ }
+ }
return(buffer);
}

@ -1,18 +0,0 @@
--- gpgwrap/src/Makefile 2010-02-11 13:26:29.000000000 -0500
+++ gpgwrap/src/Makefile.new 2010-10-15 18:16:49.000000000 -0400
@@ -1,5 +1,4 @@
CC=${DIET} gcc -s -Wall -O2 -fomit-frame-pointer
-STRIP=strip -R .note -R .comment
RM=rm -f
TARGET=../bin/gpgwrap
@@ -8,8 +7,7 @@
all: ${TARGET}
${TARGET}: gpgwrap.c
- ${CC} -o ${TARGET} gpgwrap.c
- ${STRIP} ${TARGET} 2>/dev/null || true
+ ${CC} -o ${TARGET} ${CFLAGS} ${LDFLAGS} gpgwrap.c
clean:
${RM} ${TARGET}

@ -1,124 +0,0 @@
From ca758f29c89d87581b244c652f7a14c8306cc994 Mon Sep 17 00:00:00 2001
From: Alon Bar-Lev <alon.barlev@gmail.com>
Date: Wed, 7 Jan 2015 14:43:37 +0200
Subject: [PATCH] Add more EC conditionals
Upstream bug:
https://sourceforge.net/p/xca/patches/16/
---
lib/pki_scard.cpp | 12 ++++++++++++
widgets/MW_help.cpp | 2 +-
widgets/NewKey.cpp | 2 +-
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/lib/pki_scard.cpp b/lib/pki_scard.cpp
index 444c81d..547c932 100644
--- a/lib/pki_scard.cpp
+++ b/lib/pki_scard.cpp
@@ -237,7 +237,9 @@ pk11_attlist pki_scard::objectAttributesNoId(EVP_PKEY *pk, bool priv) const
QByteArray ba;
RSA *rsa = pk->pkey.rsa;
DSA *dsa = pk->pkey.dsa;
+#ifndef OPENSSL_NO_EC
EC_KEY *ec = pk->pkey.ec;
+#endif
pk11_attlist attrs(pk11_attr_ulong(CKA_CLASS,
priv ? CKO_PRIVATE_KEY : CKO_PUBLIC_KEY));
@@ -254,6 +256,7 @@ pk11_attlist pki_scard::objectAttributesNoId(EVP_PKEY *pk, bool priv) const
pk11_attr_data(CKA_SUBPRIME, dsa->q, false) <<
pk11_attr_data(CKA_BASE, dsa->g, false);
break;
+#ifndef OPENSSL_NO_EC
case EVP_PKEY_EC:
ba = i2d_bytearray(I2D_VOID(i2d_ECPKParameters),
EC_KEY_get0_group(ec));
@@ -261,6 +264,7 @@ pk11_attlist pki_scard::objectAttributesNoId(EVP_PKEY *pk, bool priv) const
attrs << pk11_attr_ulong(CKA_KEY_TYPE, CKK_EC) <<
pk11_attr_data(CKA_EC_PARAMS, ba);
break;
+#endif
default:
throw errorEx(QString("Unkown Keytype %d").arg(pk->type));
@@ -330,7 +334,9 @@ void pki_scard::store_token(slotid slot, EVP_PKEY *pkey)
QByteArray ba;
RSA *rsa = pkey->pkey.rsa;
DSA *dsa = pkey->pkey.dsa;
+#ifndef OPENSSL_NO_EC
EC_KEY *ec = pkey->pkey.ec;
+#endif
pk11_attlist pub_atts;
pk11_attlist priv_atts;
QList<CK_OBJECT_HANDLE> objects;
@@ -381,6 +387,7 @@ void pki_scard::store_token(slotid slot, EVP_PKEY *pkey)
priv_atts << pk11_attr_data(CKA_VALUE, dsa->priv_key, false);
pub_atts << pk11_attr_data(CKA_VALUE, dsa->pub_key, false);
break;
+#ifndef OPENSSL_NO_EC
case EVP_PKEY_EC: {
/* Public Key */
BIGNUM *point;
@@ -410,6 +417,7 @@ void pki_scard::store_token(slotid slot, EVP_PKEY *pkey)
EC_KEY_get0_private_key(ec));
break;
}
+#endif
default:
throw errorEx(QString("Unkown Keytype %d").arg(pkey->type));
@@ -459,11 +467,13 @@ QList<int> pki_scard::possibleHashNids()
case CKM_DSA_SHA1: nids << NID_sha1; break;
}
break;
+#ifndef OPENSSL_NO_EC
case EVP_PKEY_EC:
switch (mechanism) {
case CKM_ECDSA_SHA1: nids << NID_sha1; break;
}
break;
+#endif
}
}
if (nids.count() == 0) {
@@ -473,7 +483,9 @@ QList<int> pki_scard::possibleHashNids()
NID_sha384 << NID_sha512 << NID_ripemd160;
break;
case EVP_PKEY_DSA:
+#ifndef OPENSSL_NO_EC
case EVP_PKEY_EC:
+#endif
nids << NID_sha1;
break;
}
diff --git a/widgets/MW_help.cpp b/widgets/MW_help.cpp
index 67faa2a..c13c309 100644
--- a/widgets/MW_help.cpp
+++ b/widgets/MW_help.cpp
@@ -65,7 +65,7 @@ void MainWindow::about()
}
#endif
#else
- brainpool = "(Elliptic Curve Cryptography support disabled)"
+ brainpool = "(Elliptic Curve Cryptography support disabled)";
#endif
openssl = SSLeay_version(SSLEAY_VERSION);
qt = qVersion();
diff --git a/widgets/NewKey.cpp b/widgets/NewKey.cpp
index 824456d..0dba2c2 100644
--- a/widgets/NewKey.cpp
+++ b/widgets/NewKey.cpp
@@ -79,8 +79,8 @@ class keyListItem
*/
ec_flags = CKF_EC_F_P | CKF_EC_F_2M;
}
- }
#endif
+ }
printname = QString("%1 #%2 (%3 Key of %4 - %5 bits)").
arg(ti.label()).arg(ti.serial()).
arg(tl->name).
--
2.0.5

@ -1,25 +1,46 @@
DIST github.com-dustinkirkland-golang-petname-1f4996aa8aa05ee066aaf9e3179d340b48c6da74.tar.gz 15087 SHA256 727e3b7d4ed0df94b96c99ca69c3505303d4f93173c31b5afce20e6813d6a270 SHA512 7f2d849104993e089aac6abc01844a559239110fbe257469ee918de26ef6d77cc29027324204b38613346c6f0579afc66bd721f56c2c2062354ac31f4e7fd7e3 WHIRLPOOL 857821556293492db1bd1cfbaf6c376846a94e6a13d0c021051827e4be0defdafe4b0c81f4823620b619d04a9fdea077341376d9f4665964475ecd092aa9b343
DIST github.com-flosch-pongo2-5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9.tar.gz 59915 SHA256 f80d8b1dd92d7f2ea4b48d2e4b20d726156d0920e90ae0d6e8ac540a0d156ba3 SHA512 c40fc45b7a781067cc80a616b5a843977ff29071f7b36400631a7445d6fd8530144e73ecc1f406b2315be0725a214c62bfafb44f904b76d83384d8df488380ee WHIRLPOOL e2a011888949ecdf0ecbce662ea30de731ce7393142d06b9a0116ebdbf46771dde7be89067785663ed93cc45bdc861122112cf8c3b8f6fa27018c0a100066b0a
DIST github.com-go-check-check-20d25e2804050c1cd24a7eea1e7a6447dd0e74ec.tar.gz 30367 SHA256 297ad610c697f409ae1fa434f09da1ba6acdf3bbfcdbe8079dc4b6a6668c12f0 SHA512 94342de3aad4db1c4442062f4cf4e57c723a43bbcb0069a8bed3b719e3864eef7500a24c9c99c755114708d6822e9b23f296b6d0b2b46f32cc6ffc65944d1729 WHIRLPOOL d3341fccb03237d8352c305ca1067449c0e00cc59297f9b14c98f38f2f6d463820469e6f13641dd5341ccc3d07a731b7436ed1a8eb3666e37a79e6447d336c1c
DIST github.com-go-stack-stack-817915b46b97fd7bb80e8ab6b69f01a53ac3eebf.tar.gz 6476 SHA256 2c03218436fdcebe9e9fd970055155a543ae06eb5a2c631911e2bc358fe52c58 SHA512 cbbdd7066249a571cc4d052e7907150f575e18c078078199b18f7557e3b12fc7c6969e6fe55773c951f3f954d296707d9e4c74ce26e3b6f408263774b0315a52 WHIRLPOOL 9829d90b0be2ab4b522ac6b95295627877229ba6db1055b9c33ddf404a2d02922837056096ac3a287353edbcddb14966ddb89f160e95c2aff46bc0e758419329
DIST github.com-go-tomb-tomb-d5d1b5820637886def9eef33e03a27a9f166942c.tar.gz 5515 SHA256 2379edcc225238167aa0d45cb28d3561c5193979b136a6cf3443a1fe3b85c78a SHA512 03ac20f7608db7c4ce54cc1ad9dfa62d770c32e1806a131909cb5c1ca4a9708b482e58d0e1bda0dbaff56ed36558a96ce2d4453566813967a32eef5245012a8d WHIRLPOOL fc39214f5e5d7063069f7173bfea57483d3a8f46c586c704d93a9af1ebb534493de343a9f2dbbd51eb22de118db2f0e3e9838ee4df2c414d2921545f2ed3ed7f
DIST github.com-go-yaml-yaml-cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b.tar.gz 60805 SHA256 11a6ce686bb70ab92020f2dffadc2e024e267a6564a62b0091e2974474c7f88d SHA512 268498022f34c4b59b5b75443ee10fd4273203f4b77bfa11b08a792c004cf13e3010c34b4c15cee2b4e7f3c910648d9897700f60ab00b327d78c49e97497fe2b WHIRLPOOL b2d18dc7354fa6e4819c2b1437e3dce55212fbf6e907361b82bfefc0b2306f12cbf70560c3819e2a81426e538949f05be01c6b8b3f3e53a3aa6daf828e95d537
DIST github.com-go-yaml-yaml-eb3733d160e74a9c7e442f435eb3bea458e1d19f.tar.gz 64789 SHA256 2f35fb36301bdee6afa5d7ec41c8870bca370ee8300b4da157ee3336812b5c36 SHA512 9e34c34c907d1177e072eb5f3b421b8a3af0e68b490508691d745cdcf1145d9bcfd2592d909a4b05e7f12bfb62355d49861f6d2e1bd29b69cf026ef631965289 WHIRLPOOL 27c9123a8be869dbe6a15d1e69e39d511f44624fffd89aac37bf0e59c5d30f2b7932c6015fa055f3ffed9357873a2fb92c1f6522793a64b752722cd539bc2089
DIST github.com-golang-crypto-b176d7def5d71bdd214203491f89843ed217f420.tar.gz 1431191 SHA256 9a7d565a11c3bb0aa78156c3ab6c6d55c2c8ff9e0d7733574b7f2e67fef03ebf SHA512 6cae1da26b6d46c4f080f74b574f5b7d7e1e86eeb83532e19f42e6e098e9f6d0b113cd07e66f43806ace738583262e37cbb7dc229f8d61ad16a5f86372eb539a WHIRLPOOL b2a1b6d19ee5d72e4b38b403bc3142385d543c713fb4729333e1614b114fb81789a4c94974811f67e3c61c0f03aa8f3fc91e61558d85eb507a7812d43052b7e8
DIST github.com-golang-crypto-e1a4589e7d3ea14a3352255d04b6f1a418845e5e.tar.gz 1336856 SHA256 28950420102f0dc290b84a52f06bc5b12a0a2b411b1b4fe216ba4ffe3ec3754e SHA512 c22fc86fbc22d6ec8157f89c075f07db8b72bf63ff97e06c907f555bf865cb77414c4fa2b9974407e43fa4f74b77710d3be9d2646f929fcfd5269b0ffc379914 WHIRLPOOL c85d338f87f5c418009497308ba28bd805769cb5350835dca35f77cce7ce456afe9cbcd66d9db3aea77e3eab0ed228260f7ec2e6825632624d9c80556ed15fbf
DIST github.com-golang-net-1c05540f6879653db88113bc4a2b70aec4bd491f.tar.gz 916090 SHA256 37d0bf101e8fc7e1dd8f1aa83ef106befe02fef11dc6a12ea1f7cebdf1a160e1 SHA512 40c070ab27ba31bbf0f0555e2b90b12100246caef36d7bf48d543e432272b0eca6e0deaf49e1e31ff6974b06d6476924818862a9243a8646d0f38b344a09633c WHIRLPOOL d344671f614f0d43a313d1409ba20cad711bf8d3be7b0c52e6d2a7db0a3efbd17369cea70136a095522122a3cbaada7de4d79e2f7ad784b9e7fd8e46d54ec443
DIST github.com-golang-net-e4fa1c5465ad6111f206fc92186b8c83d64adbe1.tar.gz 899910 SHA256 a92f1314f40ff6e542ac6e6ea1346cefcfc74e5e5de4939a1baa67c4f86a482b SHA512 0a582e9aa0ecee1c881771715970129d8af5975cccbb797f1e2eeeea7989b17448b26c000ef49fc7a1ae02eddebdfbc52dd2cd9a82b0b3b667b4ee7f62346052 WHIRLPOOL bdd305498d35c9ef3f1eb34878976e165117ec1c9d1eca8a28cb06a4616d54733e4e2504143990d0e74c6901bd5d6f717e2a0132fd0c4f74fdc305c7d983256d
DIST github.com-golang-protobuf-5a0f697c9ed9d68fef0116532c6e05cfeae00e55.tar.gz 252930 SHA256 0f5d73fa192983fd67d0aa6b9f6e0c5fa64a966bfda42f7f4ffbd83163adf02b SHA512 ac284034ee27b275df8adb83ecf4eb85977cc9cf5266384a080df2beb2fdcb84af7e166cabaf76881b95eab4812997ab435adf0abd6068ed967f609b1747b6a7 WHIRLPOOL 87685c46c8813b8d4882aadb0b37437782f509efd8e59068f524cd100e11693bce0939087b923acd5214a14edcf76cf0ad71636ff634989d6c9dd5b02667ecfa
DIST github.com-golang-protobuf-ab9f9a6dab164b7d1246e0e688b0ab7b94d8553e.tar.gz 265243 SHA256 25454663aa8e0cf17f0bf273ce0e07703b75aadff9268707228fc76581b7d91e SHA512 25618656838aa0b20f5a4da59fa126d339fe8825a8cdea46ecbd05831751c3fbb86e496fc0930a38faf18760ebece510b505a2aae9b29ab659a081a02005099b WHIRLPOOL e61468e817d5ee34326ce795dd841922a00edc1ba5eb502a59fe095e100eee6273531823474f87b744a36007871a720d4312df921a1ccb9f30fedf986768c4cf
DIST github.com-golang-sync-f52d1811a62927559de87708c8913c1650ce4f26.tar.gz 15326 SHA256 25b869d922114e49906f2d9559c86b23b54f753986e58546d4ad816f426a9ad2 SHA512 912a5afe25c6854e14d72d9d0a897808ab9b67ba4f8428cd04fe7bb3ca815f1bd1b78667587fcd74967f88f44ea591b77616955dd130cc2f98eea922fdbacf61 WHIRLPOOL 91c3b07b66c56b0bce5f430f5e0573d30f57ebf83204cfcbadea5a88607f843c8176eadc2ebdae6020b4bc1144b9ae45ba03fb00c12070faa7505e4726f6b2e1
DIST github.com-golang-sys-9f7170bcd8e9f4d3691c06401119c46a769a1e03.tar.gz 756878 SHA256 71c6138054b6ab517392e4f943183a12acf51c1abd9d4d1927563ffbdbf60812 SHA512 b1caae99c1575e588801e63775da86133f3f4f8380eddb148b9d38b34b21a20e1ad2e050c7a19bc7e1c77f5b450cafe67c06682d4cd4e7f7905f050f9f3cbabd WHIRLPOOL eadb6c57c7f82a684499d691874ae2e3bee7cbbef1a58f3cffdcee3f63fe5a7b0038ec12546283bfda575cdf99dc615be18bf4bdf4641800ed1dccfec8d3a044
DIST github.com-golang-text-ccbd3f7822129ff389f8ca4858a9b9d4d910531c.tar.gz 4549711 SHA256 5bdfdcc6c259710ca398c1b6da7967d18dcdb8c6aaa56501da3f0333767d38ce SHA512 78941350134b98f0dd72b0397796106b309cc50e34d0741bb1b4e8795a653f6364e35061b1f36def969ab81a2b07ef80fa135baca3054116d58358d53dea282b WHIRLPOOL 870f029b29ed47881a1fbc71f4e903c43c215a56b0ce635956be6ef13fa4f379a793cfbd2dd9b70b031425245d5b3afbc84bb789fee7a2502575c472c0f3e0ba
DIST github.com-golang-text-e56139fd9c5bc7244c76116c68e500765bb6db6b.tar.gz 4604834 SHA256 17b5549b3463ad5f4adb10036294a521601de2c9d5e7bca946fef909b859c2a6 SHA512 26dd6fcf2c9e589f1fcdeef0197c0db12ddb2b3f526c1992b76954fde826aa01f86bf485ffefc312d9cfedd793d185475bb5d84c951e02e8df7586f0c6269749 WHIRLPOOL 9412e8790334e7558c3083f487aa257a38295ed325c183bfaca0b4d09c081353e368732d336808c32cdae9c0f183e4bfc8d90bdaa71aaeeb6c1c66b029c4ce10
DIST github.com-golang-tools-2a5864fcfb595b4ee9a7607f1beb25778cf64c6e.tar.gz 2224136 SHA256 33d0524e2173a3d1292ad2a280230c39bd3b4def2eccad5d4a058b5cb29a4c12 SHA512 dc36f88d348ae5c299c4909120caecab35964dbb85529e6e735bd507155173ab86b134cd39a1fdfc50b7f1f55345175604f29027b0b3e1acd7f3b312303aef70 WHIRLPOOL 7ef8bd2853654c99a9b38d3ea14418ea28834824392a67cc93513682ce260b15d970343773982e31e2b65029c19ffb6f562cf46f4b69b4a3e41acfdd525fc79d
DIST github.com-golang-tools-84a35ef54dff3c5596983e180ec10919fc432242.tar.gz 2244664 SHA256 26436026e569cc2f9ef07c11eab48ecfba2a11966fc5ddf2e534be29235031b1 SHA512 df4621cda50f01542eb4cb106bff05680137f21b91b5524348a72aec0682e547724183e698621e573e34622c45031f54a071181941be168aabe96dc52d6931a5 WHIRLPOOL f407a1280e81e88a12869fe22a1e31c61e4076cfe872b8a864d810251653bba6d46dae60a993168bb5d2f9eb8abbbcda86edeb71ce4d082ee58b4c5c40446457
DIST github.com-gorilla-mux-18fca31550181693b3a834a15b74b564b3605876.tar.gz 29433 SHA256 f3fced6606c5e662aaef9d4cd71017438040af3ea419b3ac44dacf7c17dff91a SHA512 5bf7e9a6e8b01b235f5a9e697b5749d5655e62816d74b2173b123814f70aa92c5e0bc84cf40f643905354374efdcf1ffe8838d3a55d7e3abec29fd12a2e0239e WHIRLPOOL e4bca82d6c672290c5aa0683de5d81c787fcdfaf09bc2dd2ffd67f5e17c6cbbe829bb58b8e01861b692518550d4e8de359b7fcea175719e020e5ed31774806a4
DIST github.com-gorilla-mux-ac112f7d75a0714af1bd86ab17749b31f7809640.tar.gz 29594 SHA256 8e3af8f0a839ae14d9267660758128cccd5b6ab16595de786961b297d5ee1ac7 SHA512 442e6249d273440eb5f31ca14b1ce4f702ca363ce385f34ed58189f96aac6a8f5314318cbbb61ff5376f1c6b660a81cd3f53948d79c081eb0c0d9e47657fb447 WHIRLPOOL 6af297833cece2d375da506b7b67b13761c12901da28c5ee63021fae50c4c55b72bd0d0ba70d265fbe2b8b747c7bff044a7bc57b7ec1ab990e5d373bd291465e
DIST github.com-gorilla-websocket-a69d9f6de432e2c6b296a947d8a5ee88f68522cf.tar.gz 42996 SHA256 b90c0b4117f2267a737b8573abbe139b706a6aa92257b346f6dd185d3135bde4 SHA512 95a107e3e8626bc17407b8ae14d8cf14b22be616a35e3a287aa9992bd952d0fd3e09668d8bd8e4af66bc7213dc2d1f0063c0c7edf7222a0e11423aba3a201d62 WHIRLPOOL 6a36def6799bcb77dab98c7a16818ab8db8c0c605c5fe9802c4026fa23cd7a761be55894c933e7683648af7177f9318b295d1b95c4510b0155a852c8356d9986
DIST github.com-gorilla-websocket-a91eba7f97777409bc2c443f5534d41dd20c5720.tar.gz 42927 SHA256 56858a67bb8b462f496e9b9795436824036ae17cc3a540284a4183a4c9ca3dcb SHA512 651d017498aca3fed375996a4cd77a5128396a14aaca4485e5480937f85d1ea8a734ec607d1658601ec6eb9b0b1e9a4756a0264c4dd86ac6bf2de556daa6693c WHIRLPOOL 5f1181de9500b03fde03f6ff8406a65987e60eb7018bd76defa3065c85e6b1d79f674024aeb000d0cb5a0bada96b6d757a82edce203bb8ff0d1c79a176868783
DIST github.com-gosexy-gettext-74466a0a0c4a62fea38f44aa161d4bbfbe79dd6b.tar.gz 9682 SHA256 23e121b4ea15818e26d840cba571fb1c165b785271b07f44d3b575e17070fc1a SHA512 99a00ecfeb4226bba01dbef615f02b22f54959252c9fb99ed55f8c040026305fa54256f78eceb5c02ac6a77842c72fda43d1790590adfdcf3202095ad836a198 WHIRLPOOL 0e3c101756336766d38a5a8d80349b55378456f6241ee53a873edf5a23e44f557dc1125c12892aef6a5fa70797da47f1ab72b0f5acb4502c10aa2be8d6c1aaf4
DIST github.com-inconshreveable-log15-b105bd37f74e5d9dc7b6ad7806715c7a2b83fd3f.tar.gz 24466 SHA256 3eb782a5ca1fe5da13d89a371cf9d41b870c1e03c4625064ae88aa6e489bfe65 SHA512 f5add63516e3d4a0797cda4fde3568aefd392a2986186cdca8c060ca51a8d5d09d3ba990578942c6ebf0441f94b9f042f7379c5c3897b4210ab861998a597088 WHIRLPOOL dadfadd3d5ae01c154dc1e09617b8ca0badd00d0015b6304619d6fa79b2040a65bf0f39f6aa6fb8503052ce9680188761d21f033e5d4ccabcb00299cdf393c57
DIST github.com-jessevdk-go-flags-5695738f733662da3e9afc2283bba6f3c879002d.tar.gz 54989 SHA256 6a46bc8a692a1153b12a889b357683aa2aa2254d162ddb1c38253d7988cf1030 SHA512 9f117c43a41ee7b8753ba8bcb9ad49ad5106ce01b3be617921ed9d1208bd5bc1c4c155d797f2b1f7134955b16f3d82e46de2b0a45e5e8808199e0173687719b1 WHIRLPOOL c6f230afc0467fb6d76a2da9867e8437833471a7c36073d74834a5af399e8e6cfef0bd40bc5ae9cce4fad15c8b1d03b03110ee20c86ca4c281b5204f9e28e0fd
DIST github.com-jessevdk-go-flags-6cf8f02b4ae8ba723ddc64dcfd403e530c06d927.tar.gz 55513 SHA256 c67846e5532a92d3ee629bc67eed7a12bfefe0b837182daef51ebb9774697d25 SHA512 cf4c45b2a0f314874dc4bd2cbedddfd6f46ed71d6b51198365db17d4a4fc6b2ecce000968b62d6c883f596bd8847f0429f3fbbfddb0ab7369a3a6b78d83c48c8 WHIRLPOOL 59be6ddb176a25cdbd0a48ed829259c49911e76c63f9f1f3a4027a0f4e0ed7c7ae39b7b3a99cc49fec99fcec6b4941ab066da9795eeee41a168c63f7e8425786
DIST github.com-juju-errors-c7d06af17c68cd34c835053720b21f6549d9b0ee.tar.gz 16210 SHA256 eafa160a17919edabe61aed53ea7c129499ad9ee169134da8532b89c920d01d0 SHA512 04dfe2f155724d98c31fa2d274a13e77efc34364ffae172fffbc8e14b72f68a6301e6f582c1ff9f37cb105d11a7b3197e2ffa635f410ffb64d54e7c6fd1b9d1a WHIRLPOOL 76989d50938b01ecad8f0fee239a3e5bd4a829e8fa78a4f9b6d9e0711ebef5fef7d8786e28cfc03477017a4b5b2b5e4659c05f98d7239a4d5251878004d010ff
DIST github.com-lxc-go-lxc-1a2cf29ce27f74298fe70acbf817ca2f46cf7457.tar.gz 36338 SHA256 818389b46709ad9c248157d421219d2d04cc009ce43df6f173019e3d7dcf89df SHA512 92b69f1d6fe6dcbf67c4ec73be84dd066d6396c6f4be200ab3ec41654505870a94fe92c0d06d09c18c9ae634ee67377f79d6465b3640099409f25a6254fdae58 WHIRLPOOL 1e2b0b960a8f21e60455378dcc39f025e3dddee50a26c084cc2fc9eea506fe07a277c7a7810a273ade52378bed34acadc3f38563eebe4a4a81d7110c52ee660c
DIST github.com-lxc-go-lxc-de2c8bfd65a78752d6a70b4ad99114c6969363b0.tar.gz 36156 SHA256 7e794163a24488854f2ff48468e699577dcff82871717913cd7a079dc83d292c SHA512 57e84c66b8c8260e3d2631b37e5dabcaf5136e47ed4233489f8fd3b2cc8796c495dbc78390e4372b0cc54ee5920d1f469579f77de1c0291c3ae31dfd6b628dbb WHIRLPOOL 61e8d12211a0ea1eebaba824f4adc2784f26ed0c8496e74d51f02a7647f526954001ced5d3559bd2e2de8fa4c6ab76dd6d15cb8cbf678ec36db5613fcce9accb
DIST github.com-mattn-go-colorable-ad5389df28cdac544c99bd7b9161a0b5b6ca9d1b.tar.gz 8089 SHA256 ad1e8de71cee50acb8492bcaa9b1a7d0ebe175f76266a8f3dd4d7fb48d8e53be SHA512 0f458e6acfec266b58cd458bd05bc04617df0ef223ffa6a6c374decd29555a78441f3a17df7b5f782d96a25f56bcece061407e9778e25ceafeedafa014a45bb4 WHIRLPOOL e18e5c426b611f5ba102c2bfa935c26bf5be3b42e48c2b337d3827936361daa28ba1185337b1e25d5732063e0cd539661cb740028f811577cd0250ea24b4e0fe
DIST github.com-mattn-go-colorable-ded68f7a9561c023e790de24279db7ebf473ea80.tar.gz 7522 SHA256 454e4134a81b0913cd22fd6efc50164cc352218f81e1a73ee209a95a7d017f09 SHA512 ae09fd28e2aae98d0b73bf71ee7496d8d53e20232428d09e021ee8571ca7e990e85c0d9613c89851e2025624d317a26e1768f4e7af12294eb1a189a241bd8daf WHIRLPOOL 567d3a684eeca18e8703714197b23ad9d7157fa50664ea09a0ab130635cb75fdc543aacb23a347324d9dd15b44081f0393e7db1a1d8e9159b9fd3e703cb7d008
DIST github.com-mattn-go-isatty-fc9e8d8ef48496124e79ae0df75490096eccf6fe.tar.gz 3262 SHA256 c013b75f090745e80bc5e3060a26d7053ebc63bd3d077177aa7a3e349bf151ca SHA512 8627d22f5ee5a087744bbf4dd391f8f87ebabe8940564206935dec9e406e40a98976479ea973e61afeb1774df211992cd61c67ee198d546e22fbf60826b64ac9 WHIRLPOOL be9969d0cca83428e9f6eadfffd970d95ae8c0562c00005303eb8122b2cd737410372458e2cd8e6328ff65536d5b7d6b60e34f94fac8cb4d582202dae4e0b94a
DIST github.com-mattn-go-runewidth-97311d9f7767e3d6f422ea06661bc2c7a19e8a5d.tar.gz 22406 SHA256 60afaf4d86f11a5d256d240cbccba766c5ef6ba2e695661df6bc4608021ca186 SHA512 0452fbc64250169ea99fe4eb4e2ef4f81c7bce5b77572789186f749c9c502c29c7146f7ef57971b6b78db0abe33e9926931719dd610f59925e31e6dd6c0b8d70 WHIRLPOOL 5606a1879961eed55f00e3d7cfb21663db1d9f7059a586ea5a423f58655713a333d89ceb8dab328af0cea9d13e9dd02bde49bff6a086d80d571a03c79fc72ba8
DIST github.com-mattn-go-sqlite3-6654e412c3c7eabb310d920cf73a2102dbf8c632.tar.gz 2028435 SHA256 650ece3ec45fe26df3879e3e67fc4e21f65547d441b4085f4910817dae54509e SHA512 743b713ff506517c05ea89fe744eebd5b67751305fc720459840ec6c2d0f2d1fff8437f668a38291b9686ecf940a5177c356c34e022fc020540e0f8c60a21ba8 WHIRLPOOL 840e78119db23b74a231d8f01c6f6a20ce5d5933aafa2dda9c2c1179c5f69f2c7e17fb59a5e5771252cc89b859bcc7ed32f777a5bf139f80e0fb6e026d9e2c6e
DIST github.com-mattn-go-sqlite3-83772a7051f5e30d8e59746a9e43dfa706b72f3b.tar.gz 2027317 SHA256 f108517a1ef06a51044a869f4da473b5e3f5f664afeaf4eeb9956c4bc2ad059c SHA512 687b1c9f7b2f27be4ef0d924f691f17251fb84522647436d3e6d1ba5946208618156663d817d146f954ea07d31619c446a3023f9a811f113a3761cda0daebdec WHIRLPOOL 26747056149e68ed1c9b59cfe5e1a6b0b38cdcd06a2d28ea68fef09085969dc1d706be70438552854c35096d3ce6405b6450da6fa5beae911da0e4b8730df8d0
DIST github.com-olekukonko-tablewriter-be5337e7b39e64e5f91445ce7e721888dbab7387.tar.gz 12269 SHA256 a3f2a6f367b97d8406402a674eaf96c5ee9baab05de32b2031085b8d92e7eea1 SHA512 444bf361e0b602fba43a4b0d991614f10ed79a105bbba30bf3054d0dec687de6e9f4583793d52d5e25c99d55f3d39c5121f60110f3a879cf0bbd37594834a929 WHIRLPOOL f43f7093b37580845a7e87fe487684d5ef5e51646413d9188e6e3895403a6e028f873c1fc52ae60cf9d677cc9c3d5373c6cb39cb05e3632172ff3827ae4f7064
DIST github.com-olekukonko-tablewriter-febf2d34b54a69ce7530036c7503b1c9fbfdf0bb.tar.gz 11822 SHA256 080a2090ffb58f682a3b15aeccc866b8ff3acfa2020eaaf138b3d0b27f29d0db SHA512 bfccf8eacd32840ec195c0e69d141fc24ca55d9f0832b38ad87e0c2292c61f5ff0731e83a19045ddebde4db8b9cd77b0b84214c5442f4cd4f8a892e77efce758 WHIRLPOOL ca608bae83163bfb2640d2956021f849cbfe6e827f40120b9151ba663fcf248b3157d3a0eb294747ae0f8b9510c79443d9e3193294b874578b2dd3e68cf9a3c2
DIST github.com-pborman-uuid-1b00554d822231195d1babd97ff4a781231955c9.tar.gz 12808 SHA256 54da54d54a914e569fb2b31132e0c458ece12d7cd70c14a33adf95731e07afe7 SHA512 c332bd39781e7a3bd7125bbf26e62da2aca24bb89975491a4165a17580f3ffb99587e4620a9c9c17afff5d34865ae0b86065e1516ca325d0edc4dd84be269283 WHIRLPOOL fb245c1056abe69f7e3fa5a4ded80111777af2fdc107dee3fc36faa25bea8394eb30fda6000075cbdf124cb01c4165ed08fb154d70c30c8a1812988e2bd86619
DIST github.com-pborman-uuid-e790cca94e6cc75c7064b1332e63811d4aae1a53.tar.gz 12805 SHA256 5093e139937f8da5577e9f33e21ffc3a59ebff6a3264b80e8c5524c113bdaf44 SHA512 ab27b50c06384f20637e628d7e7289ff4b9f00f2fdb5e650aa7f4bf19bcd54cdd1b83fd9e3c45eede2ba8f35af9b177972597205ea29570b129f9a97e6c63c0e WHIRLPOOL 5baf15dc682df9daac2bed1ee083e49a4823a09599a85f38ef2bc3b17fe5d7fa5f0d02f841148a6e247fd664812e0a4ee4ce238aa93ceecc98e9c5a75921751d
DIST github.com-stretchr-testify-890a5c3458b43e6104ff5da8dfa139d013d77544.tar.gz 94296 SHA256 39889d7ef7b263edc99dd0ec8a72d86fd44915a59dad41a958d522c2b23d8e64 SHA512 7cdc1bdd6711496280aae5ad5efb51bf9d6f9a271e89ab7c2af4a94d6bccf67958ef00d1805b9278903309dab20aa0d5b15105a7284a940b1e0ebfd78901ecb0 WHIRLPOOL 9565e5f455c1843732fa394dfb6f6a296cbb5f10afb6f82646b437273bd3c1c587b9991cde6a650ab760947a8547d82d5eb80f6965d16e2b2ced3857b9a1bb3a
DIST github.com-stretchr-testify-f6abca593680b2315d2075e0f5e2a9751e3f431a.tar.gz 94237 SHA256 91f64ae4d5093511464b5ddce34b88b0134219a0a17d638fe148b6cb9f9e261a SHA512 3aaa245f70dcee49b08e5f677dfa2137b00cc0cbc18cd52d773722b951ec579e3f4e146f951de51973630488a9d9efc7c54462842c6fe5987cc099a44f04a03f WHIRLPOOL 3e55426a5f3086c3e46652da4f5bebf214ae620950556b6659b48cad01e51781d836a3c1ea9c692dc59b4a3d4862e16cec1acffd31a0b4853f97c4f67c22c2c8
DIST github.com-syndtr-gocapability-db04d3cc01c8b54962a58ec7e491717d06cfcc16.tar.gz 9899 SHA256 e63800ecdd704541bafcf8788d651a73599cdead61cd5bccedd31418c4fe58bc SHA512 fdd8a3cc1add7570269df6ad8867fd9d2da7bbf751416a5376ff123dcf959be13912b766f5214123e20fabd242a629e02f3bdaf0680782805afb81f6f08a78ae WHIRLPOOL ec73f593f37d28565f9efe9b21d17175353b922e144842666b81163538b5d464dcdb4857897f5c1a4362fb44637490c3994f958498672fc31054539f2b5c64e3
DIST github.com-syndtr-gocapability-e7cb7fa329f456b3855136a2642b197bad7366ba.tar.gz 9894 SHA256 1c90570f690a5b753633bce84097942021893f180c9d27c0b83f7a1bddaf59d9 SHA512 ee2de5568b76b87723e80e081e16094093f09a6be68dd0920793e007d4b705808ec1eac7a15b4c0ce7ed20aff04978f4ade264ab5bf5bdc5e2fdc46db2f4116c WHIRLPOOL ce1a13e5374248ffccaa613d399447d619ad94156f6ebf198d9e63019bd698496d67770ef520b802c59451ff9ad95d9fd789e8c9f758d1df553e2432c3b29289
DIST lxd-2.14.tar.gz 629982 SHA256 0ccf98257482458ff417c8af141a1f726fe7e696b7ab8b089ed1ee741280b2b8 SHA512 a1b6d7eb055a29ba3c28f9184e6dbac5f279332a6445347bbf8f946ab23b0afb353ac146b379f22922fe678ce034c18dc9d5d2f2dd7704b8cce1730c29dfa9c3 WHIRLPOOL 3483b15f7e09e8212fa5b646e5fc6be305b48e6cfcad5538ff9a4967820928b3f87931ca38fc4787ecab67216d2c876476880551ce56e3ed0c080a7b769e2823
DIST lxd-2.16.tar.gz 707146 SHA256 16d4b09f132f628dbacaa192c02ae27baf91a20a57e26cfea2a24b5af6077680 SHA512 63a870f3613f3e7e917bd06bc748d143586af543901cd4e2159015cb2f20fdf40ba7f04971d6dee2e8a5afd60fc1476cef29783ab5ec5e531c35360fdf83e70f WHIRLPOOL 74b8cdd09801840d87e81317e03d153afab833fff4b58efaf58c7c49703d447fd42d08892b83ef3f18635bdb61ebac0df1651ca99eb3d98710b032283b941b5f

@ -0,0 +1,16 @@
--- /src/github.com/lxc/lxd/Makefile.orig 2016-07-11 23:34:40.299664675 +0000
+++ /src/github.com/lxc/lxd/Makefile 2016-07-11 23:37:00.816018727 +0000
@@ -13,13 +13,11 @@
.PHONY: default
default:
- go get -t -v -d ./...
go install -v $(TAGS) $(DEBUG) ./...
@echo "LXD built successfully"
.PHONY: client
client:
- go get -t -v -d ./...
go install -v $(TAGS) $(DEBUG) ./lxc
@echo "LXD client built successfully"

@ -0,0 +1,27 @@
# Group which owns the shared socket
LXD_OPTIONS+=" --group lxd"
# Enable cpu profiling into the specified file
#LXD_OPTIONS+=" --cpuprofile /tmp/lxc_cpu_profile"
# Enable memory profiling into the specified file
#LXD_OPTIONS+=" --memprofile /tmp/lxc_mem_profile"
# Enables debug mode
#LXD_OPTIONS+=" --debug"
# For debugging, print a complete stack trace every n seconds
#LXD_OPTIONS+=" --print-goroutines-every 5"
# Enables verbose mode
#LXD_OPTIONS+=" -v"
# Logfile to log to
#LXD_OPTIONS+=" --logfile /var/log/lxd/lxd.log"
# Enables syslog logging
#LXD_OPTIONS+=" --syslog"

@ -0,0 +1,46 @@
#!/sbin/openrc-run
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
DAEMON=/usr/sbin/lxd
PIDFILE=/run/lxd.pid
extra_commands="stopall"
depend() {
need net
use lxcfs
}
start() {
ebegin "Starting lxd server"
start-stop-daemon --start \
--pidfile ${PIDFILE} \
--exec ${DAEMON} \
--background \
--make-pidfile \
-- \
${LXD_OPTIONS}
eend $?
}
stop() {
if [ "$RC_GOINGDOWN" = "YES" ] || [ "$RC_REBOOT" = "YES" ]; then
stopall
else
ebegin "Stopping lxd service (but not containers)"
start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
eend $?
fi
}
stopall() {
ebegin "Stopping lxd service and containers"
if "${DAEMON}" shutdown; then
/etc/init.d/lxd zap
rm -f ${PIDFILE}
fi
eend $?
}

@ -0,0 +1,10 @@
[Unit]
Description=Container hypervisor based on LXC
[Service]
ExecStart=/usr/sbin/lxd --group lxd
KillMode=process
Restart=on-failure
[Install]
WantedBy=multi-user.target

@ -0,0 +1,222 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
DESCRIPTION="Fast, dense and secure container management"
HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
EGO_PN_PARENT="github.com/lxc"
EGO_PN="${EGO_PN_PARENT}/lxd"
# Maintained with https://github.com/hsoft/gentoo-ego-vendor-update
EGO_VENDOR=(
"github.com/dustinkirkland/golang-petname 1f4996aa8aa05ee066aaf9e3179d340b48c6da74"
"github.com/golang/protobuf ab9f9a6dab164b7d1246e0e688b0ab7b94d8553e"
"github.com/gorilla/mux ac112f7d75a0714af1bd86ab17749b31f7809640"
"github.com/gorilla/websocket a69d9f6de432e2c6b296a947d8a5ee88f68522cf"
"github.com/gosexy/gettext 74466a0a0c4a62fea38f44aa161d4bbfbe79dd6b"
"github.com/jessevdk/go-flags 6cf8f02b4ae8ba723ddc64dcfd403e530c06d927"
"github.com/mattn/go-colorable ad5389df28cdac544c99bd7b9161a0b5b6ca9d1b"
"github.com/mattn/go-runewidth 97311d9f7767e3d6f422ea06661bc2c7a19e8a5d"
"github.com/mattn/go-sqlite3 6654e412c3c7eabb310d920cf73a2102dbf8c632"
"github.com/olekukonko/tablewriter be5337e7b39e64e5f91445ce7e721888dbab7387"
"github.com/pborman/uuid e790cca94e6cc75c7064b1332e63811d4aae1a53"
"github.com/stretchr/testify 890a5c3458b43e6104ff5da8dfa139d013d77544"
"github.com/syndtr/gocapability db04d3cc01c8b54962a58ec7e491717d06cfcc16"
"github.com/go-stack/stack 817915b46b97fd7bb80e8ab6b69f01a53ac3eebf"
"github.com/mattn/go-isatty fc9e8d8ef48496124e79ae0df75490096eccf6fe"
"github.com/juju/errors c7d06af17c68cd34c835053720b21f6549d9b0ee"
"golang.org/x/crypto b176d7def5d71bdd214203491f89843ed217f420 github.com/golang/crypto"
"golang.org/x/net 1c05540f6879653db88113bc4a2b70aec4bd491f github.com/golang/net"
"golang.org/x/sync f52d1811a62927559de87708c8913c1650ce4f26 github.com/golang/sync"
"golang.org/x/text e56139fd9c5bc7244c76116c68e500765bb6db6b github.com/golang/text"
"golang.org/x/tools 84a35ef54dff3c5596983e180ec10919fc432242 github.com/golang/tools"
"golang.org/x/sys 9f7170bcd8e9f4d3691c06401119c46a769a1e03 github.com/golang/sys"
"gopkg.in/check.v1 20d25e2804050c1cd24a7eea1e7a6447dd0e74ec github.com/go-check/check"
"gopkg.in/flosch/pongo2.v3 5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9 github.com/flosch/pongo2"
"gopkg.in/inconshreveable/log15.v2 b105bd37f74e5d9dc7b6ad7806715c7a2b83fd3f github.com/inconshreveable/log15"
"gopkg.in/lxc/go-lxc.v2 1a2cf29ce27f74298fe70acbf817ca2f46cf7457 github.com/lxc/go-lxc"
"gopkg.in/tomb.v2 d5d1b5820637886def9eef33e03a27a9f166942c github.com/go-tomb/tomb"
"gopkg.in/yaml.v2 eb3733d160e74a9c7e442f435eb3bea458e1d19f github.com/go-yaml/yaml"
)
ARCHIVE_URI="https://${EGO_PN}/archive/${P}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64"
# Portage complains about zh_Hans missing, but repoman doesn't like it when it's there.
PLOCALES="de el fr it ja nl ru sr sv tr zh"
IUSE="+daemon nls test"
# IUSE and PLOCALES must be defined before l10n inherited
inherit bash-completion-r1 golang-build l10n linux-info systemd user golang-vcs-snapshot
SRC_URI="${ARCHIVE_URI}
${EGO_VENDOR_URI}"
DEPEND="
>=dev-lang/go-1.7.1
dev-libs/protobuf
nls? ( sys-devel/gettext )
test? (
app-misc/jq
dev-db/sqlite
net-misc/curl
sys-devel/gettext
)
"
RDEPEND="
daemon? (
app-arch/xz-utils
>=app-emulation/lxc-2.0.7[seccomp]
net-dns/dnsmasq[dhcp,ipv6]
net-misc/rsync[xattr]
sys-apps/iproute2[ipv6]
sys-fs/squashfs-tools
virtual/acl
)
"
CONFIG_CHECK="
~BRIDGE
~DUMMY
~IP6_NF_NAT
~IP6_NF_TARGET_MASQUERADE
~IPV6
~IP_NF_NAT
~IP_NF_TARGET_MASQUERADE
~MACVLAN
~NETFILTER_XT_MATCH_COMMENT
~NET_IPGRE
~NET_IPGRE_DEMUX
~NET_IPIP
~NF_NAT_MASQUERADE_IPV4
~NF_NAT_MASQUERADE_IPV6
~VXLAN
"
ERROR_BRIDGE="BRIDGE: needed for network commands"
ERROR_DUMMY="DUMMY: needed for network commands"
ERROR_IP6_NF_NAT="IP6_NF_NAT: needed for network commands"
ERROR_IP6_NF_TARGET_MASQUERADE="IP6_NF_TARGET_MASQUERADE: needed for network commands"
ERROR_IPV6="IPV6: needed for network commands"
ERROR_IP_NF_NAT="IP_NF_NAT: needed for network commands"
ERROR_IP_NF_TARGET_MASQUERADE="IP_NF_TARGET_MASQUERADE: needed for network commands"
ERROR_MACVLAN="MACVLAN: needed for network commands"
ERROR_NETFILTER_XT_MATCH_COMMENT="NETFILTER_XT_MATCH_COMMENT: needed for network commands"
ERROR_NET_IPGRE="NET_IPGRE: needed for network commands"
ERROR_NET_IPGRE_DEMUX="NET_IPGRE_DEMUX: needed for network commands"
ERROR_NET_IPIP="NET_IPIP: needed for network commands"
ERROR_NF_NAT_MASQUERADE_IPV4="NF_NAT_MASQUERADE_IPV4: needed for network commands"
ERROR_NF_NAT_MASQUERADE_IPV6="NF_NAT_MASQUERADE_IPV6: needed for network commands"
ERROR_VXLAN="VXLAN: needed for network commands"
PATCHES=(
"${FILESDIR}/${P}-dont-go-get.patch"
)
# KNOWN ISSUES:
# - Translations may not work. I've been unsuccessful in forcing
# localized output. Anyway, upstream (Canonical) doesn't install the
# message files.
src_prepare() {
default_src_prepare
# Warn on unhandled locale changes
l10n_find_plocales_changes "${S}/src/${EGO_PN}/po" "" .po
# Examples in go-lxc make our build fail.
rm -rf "${S}/src/${EGO_PN}/vendor/gopkg.in/lxc/go-lxc.v2/examples" || die
}
src_compile() {
export GOPATH="${S}"
cd "${S}/src/${EGO_PN}" || die "Failed to change to deep src dir"
tmpgoroot="${T}/goroot"
if use daemon; then
# Build binaries
emake
else
# build client tool
emake client
fi
use nls && emake build-mo
}
src_test() {
if use daemon; then
# Go native tests should succeed
golang-build_src_test
fi
}
src_install() {
# Installs all src,pkg to /usr/lib/go-gentoo
golang-build_src_install
cd "${S}" || die "can't cd into ${S}"
dobin bin/lxc
if use daemon; then
dosbin bin/lxd
dobin bin/fuidshift
fi
cd "src/${EGO_PN}" || die "can't cd into ${S}/src/${EGO_PN}"
if use nls; then
local lingua
for lingua in ${PLOCALES}; do
if use linguas_${lingua}; then
domo po/${lingua}.mo
fi
done
fi
if use daemon; then
newinitd "${FILESDIR}"/${P}.initd lxd
newconfd "${FILESDIR}"/${P}.confd lxd
systemd_newunit "${FILESDIR}"/${P}.service ${PN}.service
fi
newbashcomp config/bash/lxd-client lxc
dodoc AUTHORS CONTRIBUTING.md README.md doc/*
}
pkg_postinst() {
einfo
einfo "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
einfo "including a Quick Start."
# The messaging below only applies to daemon installs
use daemon || return 0
# The control socket will be owned by (and writeable by) this group.
enewgroup lxd
# Ubuntu also defines an lxd user but it appears unused (the daemon
# must run as root)
einfo
einfo "Though not strictly required, some features are enabled at run-time"
einfo "when the relevant helper programs are detected:"
einfo "- sys-apps/apparmor"
einfo "- sys-fs/btrfs-progs"
einfo "- sys-fs/lvm2"
einfo "- sys-fs/lxcfs"
einfo "- sys-fs/zfs"
einfo "- sys-process/criu"
einfo
einfo "Since these features can't be disabled at build-time they are"
einfo "not USE-conditional."
einfo
einfo "Networks with bridge.mode=fan are unsupported due to requiring"
einfo "a patched kernel and iproute2."
}

@ -12,7 +12,7 @@ SRC_URI="https://www.spice-space.org/download/releases/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="amd64 ~arm64 ~x86"
KEYWORDS="amd64 ~arm64 x86"
IUSE="libressl lz4 sasl smartcard static-libs gstreamer"
# the libspice-server only uses the headers of libcacard

@ -1,2 +1,3 @@
DIST virt-what-1.12.tar.gz 147144 SHA256 2592082f5b2caa93d3967b7c275a3afabfe49de9f051fdf0da6ded59e2c11b1c SHA512 629e452419a01b86cd5442c4294b5aea6fc475522d7a350ac8e727b59e63948915c755fe6cae16f7824749059662bb0fbd4557a2aa56c098b407037a35881735 WHIRLPOOL a3f9a519c183950a766fe407f8e814a131e2586d738fa0fdbf341d0755bbf726e58da9cde594a8b7c32b9c27094c442ff95b6d3e5adaf92b57d96710383453d3
DIST virt-what-1.15.tar.gz 163117 SHA256 7ab9220d4682eadf9139c6afe62d33ebd273fff69e49054279caba5514937c41 SHA512 b85d02eb632328031be93dd33be1e42603e55182c4458fca9b9d98465ff7487fc399d01ebd117a8311960091c1b166547380b9a54c0054ebf2c0aa454d9a41e5 WHIRLPOOL 6d5d439f5617ef80f4cdda752717cce7025669e518f6fb327a5e7595935153ba58ea8271e4ed84c203d3888b877f60ae136f54aca97bd4f79a1cc18bf2365480
DIST virt-what-1.18.tar.gz 173703 SHA256 bc42dd8214a6f30a1e6f2478faf12c41ecf0a0c8b9e493241f02416ae28162f4 SHA512 8085a38111d5664f411f5bb9d2ee221bc22e5b0f2d993e8d518718b3f63b16ba73e052b1623c090493cf8fef52fd237ba823377503a32b4b7d03cc5380d5c613 WHIRLPOOL e5b496a0cabc65ec9553a6fd55d4a30e8f7501683af384107a40999c4c393ebc21dae37a67a1f377bb224f5e369af281a44adc468ba68072f2b137cb9d66c6f1

@ -0,0 +1,24 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
DESCRIPTION="Detects if the current machine is running in a virtual machine"
HOMEPAGE="https://people.redhat.com/~rjones/virt-what/"
SRC_URI="https://people.redhat.com/~rjones/virt-what/files/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE="dmi"
DEPEND="dev-lang/perl"
RDEPEND="app-shells/bash
dmi? ( sys-apps/dmidecode )"
src_prepare() {
default
# Pretends to be POSIX sh while it is not
sed -e 's:/bin/sh:/bin/bash:' -i virt-what.in || die
}

@ -8,7 +8,7 @@ HOMEPAGE="http://www.gentoo.org/"
SRC_URI="http://dev.gentoo.org/~titanofold/${P}.tbz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
IUSE=""
RDEPEND="app-admin/eselect"

@ -0,0 +1,21 @@
diff --git a/src/DeriveShow.hs b/src/DeriveShow.hs
index c11dd03..40cc205 100644
--- a/src/DeriveShow.hs
+++ b/src/DeriveShow.hs
@@ -1,5 +1,5 @@
{-# LANGUAGE TemplateHaskell #-}
+{-# LANGUAGE StandaloneDeriving #-}
module DeriveShow where
-import Data.Derive.Show
import Data.DeriveTH
@@ -12,3 +12,2 @@ isArbInsName = isinsName ''Show
devShow :: Name -> Q [Dec]
-devShow = megaderive (derive makeShow) isArbInsName
-
+devShow = megaderive (\n -> [d| deriving instance Show $(return (ConT n)) |]) isArbInsName
--- a/QuickFuzz.cabal
+++ b/QuickFuzz.cabal
@@ -75,0 +75,1 @@ executable QuickFuzz
+ default-extensions: StandaloneDeriving

@ -98,6 +98,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${P}-ghc-8.0.2_rc1.patch
"${FILESDIR}"/${P}-directory-1.3.patch
"${FILESDIR}"/${P}-derive-2.6.patch
)
# $1 - target tarball name (not including extension)

@ -1 +1,2 @@
DIST dateutils-0.4.1.tar.xz 611460 SHA256 6ccce48975fc4d3af2e27c7893e181c46ab5df1cb37e4a428b4b521a77d55278 SHA512 c13461de6dad483b0014692a2319a7bf9ed1677415b8ee168131b397086f75725eb8b4e833d8b4a22f4aa726d6aca74be2597c2e07ef75a036cfea9bf67ccf1b WHIRLPOOL 2b6770306363f2653b0ddbdb12badc19927179dab707f5460c48f3219b96a475b5a0b6d451de5bba0f6567c7d348c40a6a2fdcf2afecc1e42034c832f7bc0177
DIST dateutils-0.4.2.tar.xz 620196 SHA256 ecdae892584098ee9d8f5b14bd555fd63e09d1199cb75aac6b02f09c7e2eb46b SHA512 0b6e98bd9402dc3629122c3d68ab54df547ce779806661cc01df3625ab7cedb429d943ef46e151653283c1ac6c557f4bf14b3b5adaafbcac1d0a86c6d12895fd WHIRLPOOL 2de8ca88d0ce36f2b2f4af4af8e57a02adc5230cf937345c9e58704c7887b2d03427ad3aa076a54e6bce2ece8dc7320c9219c7e391c7227dc04d8d77825b80ef

@ -0,0 +1,31 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
DESCRIPTION="command line date and time utilities"
HOMEPAGE="https://hroptatyr.github.com/dateutils/"
SRC_URI="https://bitbucket.org/hroptatyr/${PN}/downloads/${P}.tar.xz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
DEPEND="app-arch/xz-utils
sys-libs/timezone-data"
# bug 429810
RDEPEND="!sys-fabric/dapl"
src_configure() {
econf --docdir=/usr/share/doc/${PF}
}
src_compile() {
emake CFLAGS="${CFLAGS}"
}
src_test() {
# parallel tests failure
emake CFLAGS="${CFLAGS}" -j1 check
}

@ -1,15 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<maintainer type="person">
<email>candrews@integralblue.com</email>
<email>candrews@gentoo.org</email>
<name>Craig Andrews</name>
<description>Proxied maintainer; set to assignee in all bugs</description>
</maintainer>
<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
<use>
<flag name="uinput">Enable support for uinput</flag>

@ -0,0 +1,72 @@
From e95103c40d0541fbcdb4b84b000832d9b1b83b8d Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyfox@gentoo.org>
Date: Sat, 19 Aug 2017 10:34:41 +0100
Subject: [PATCH] scanelf: fix out-of-bounds access in ia64
commit 2eb852129394f97dae89c0ff1f9f48637edcb0e9
slightly changed decoder and added unchecked
read from elf header:
```
switch (EGET(dpltrel->d_un.d_val)) { \
case DT_REL: \
rel = REL##B(elf->vdata + EGET(drel->d_un.d_val)); \
```
On ia64 'EGET(drel->d_un.d_val)' returns absolute address:
```
$ dumpelf bug/luatex
...
/* Dynamic tag #31 'DT_RELA' 0x97E310 */
{
.d_tag = 0x7 ,
.d_un = {
.d_val = 0x4000000000031C30 ,
.d_ptr = 0x4000000000031C30 ,
},
},
```
That causes 'scanelf' crash on binaries like 'luatex'.
This change restores check and loudly skips such sections:
scanelf: bug/luatex: DT_RELA is out of file range
Bug: https://bugs.gentoo.org/624356
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
---
scanelf.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/scanelf.c b/scanelf.c
index 1ead891..a054408 100644
--- a/scanelf.c
+++ b/scanelf.c
@@ -607,11 +607,23 @@ static char *scanelf_file_textrels(elfobj *elf, char *found_textrels, char *foun
} \
switch (EGET(dpltrel->d_un.d_val)) { \
case DT_REL: \
+ if (EGET(drel->d_un.d_val) >= (uint64_t)elf->len - sizeof (drel->d_un.d_val)) { \
+ rel = NULL; \
+ rela = NULL; \
+ warn("%s: DT_REL is out of file range", elf->filename); \
+ break; \
+ } \
rel = REL##B(elf->vdata + EGET(drel->d_un.d_val)); \
rela = NULL; \
pltrel = DT_REL; \
break; \
case DT_RELA: \
+ if (EGET(drel->d_un.d_val) >= (uint64_t)elf->len - sizeof (drel->d_un.d_val)) { \
+ rel = NULL; \
+ rela = NULL; \
+ warn("%s: DT_RELA is out of file range", elf->filename); \
+ break; \
+ } \
rel = NULL; \
rela = RELA##B(elf->vdata + EGET(drel->d_un.d_val)); \
pltrel = DT_RELA; \
--
2.14.1

@ -0,0 +1,58 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit eutils toolchain-funcs unpacker
DESCRIPTION="ELF utils that can check files for security relevant properties"
HOMEPAGE="https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities"
SRC_URI="mirror://gentoo/${P}.tar.xz
https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="caps debug python seccomp"
RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
python? ( dev-python/pyelftools )
seccomp? ( sys-libs/libseccomp )"
DEPEND="${RDEPEND}
caps? ( virtual/pkgconfig )
seccomp? ( virtual/pkgconfig )
app-arch/xz-utils"
PATCHES=("${FILESDIR}"/${P}-scanelf-fix-out-of-bounds-access-in-ia64.patch)
_emake() {
emake \
USE_CAP=$(usex caps) \
USE_DEBUG=$(usex debug) \
USE_PYTHON=$(usex python) \
USE_SECCOMP=$(usex seccomp) \
"$@"
}
src_configure() {
# Avoid slow configure+gnulib+make if on an up-to-date Linux system
if use prefix || ! use kernel_linux || \
has_version '<sys-libs/glibc-2.10'
then
econf $(use_with caps) $(use_with debug) $(use_with python) $(use_with seccomp)
else
tc-export CC PKG_CONFIG
fi
}
src_compile() {
_emake
}
src_test() {
_emake check
}
src_install() {
_emake DESTDIR="${D}" PKGDOCDIR='$(DOCDIR)'/${PF} install
}

@ -1,78 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="4"
inherit eutils linux-info toolchain-funcs
MY_PN='spacenav'
DESCRIPTION="The spacenavd daemon provides free alternative to the 3dxserv daemon"
HOMEPAGE="http://spacenav.sourceforge.net/"
SRC_URI="mirror://sourceforge/project/${MY_PN}/${MY_PN}%20daemon/${PN}%20${PV}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="amd64 ppc64 x86"
IUSE="X"
RDEPEND="X? ( x11-apps/xdpyinfo )"
DEPEND="${RDEPEND}"
pkg_setup() {
CONFIG_CHECK="~INPUT_EVDEV"
ERROR_CFG="Your kernel needs INPUT_EVDEV for the spacenavd to work properly"
check_extra_config
}
src_prepare() {
epatch "${FILESDIR}"/${P}-destdir.patch
epatch "${FILESDIR}"/${P}-custom-flags.patch
epatch "${FILESDIR}"/${P}-no-x11.patch
}
src_configure() {
econf \
--enable-opt --enable-ldopt \
$(use_enable X x11)
}
src_compile() {
emake CC=$(tc-getCC)
}
src_install() {
# Config file
insinto /etc
newins "${S}/doc/example-spnavrc" spnavrc.sample || die
# Init script
newinitd "${FILESDIR}/spnavd" spacenavd || die
# Install udev rule but leave activiation to the user
# since Xorg may be configured to grab the device already
insinto /etc/udev/rules.d
newins "${FILESDIR}"/99-space-navigator.rules 99-space-navigator.rules.ignored || die
# Daemon
dobin "${S}/spacenavd"
use X && dobin "${S}/spnavd_ctl"
}
pkg_postinst() {
elog "To start the Spacenav daemon system-wide by default"
elog "you should add it to the default runlevel :"
elog "\`rc-update add spacenavd default\`"
elog
if use X; then
elog "To start generating Spacenav X events by default"
elog "you should add this command in your user startup"
elog "scripts such as .gnomerc or .xinitrc :"
elog "\`spnavd_ctl x11 start\`"
elog
fi
elog "If you want to auto-start the daemon when you plug in"
elog "a SpaceNavigator device, activate the related udev rule :"
elog "\`sudo ln -s 99-space-navigator.rules.ignored /etc/udev/rules.d/99-space-navigator.rules\`"
elog
ewarn "You must restart spnavd \`/etc/init.d/spacenavd restart\` to run"
ewarn "the new version of the daemon."
}

@ -1,78 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="4"
inherit eutils linux-info toolchain-funcs udev
MY_PN='spacenav'
DESCRIPTION="The spacenavd daemon provides free alternative to the 3dxserv daemon"
HOMEPAGE="http://spacenav.sourceforge.net/"
SRC_URI="mirror://sourceforge/project/${MY_PN}/${MY_PN}%20daemon/${PN}%20${PV}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="amd64 ppc64 x86"
IUSE="X"
RDEPEND="X? ( x11-apps/xdpyinfo )"
DEPEND="${RDEPEND}"
pkg_setup() {
CONFIG_CHECK="~INPUT_EVDEV"
ERROR_CFG="Your kernel needs INPUT_EVDEV for the spacenavd to work properly"
check_extra_config
}
src_prepare() {
epatch "${FILESDIR}"/${P}-destdir.patch
epatch "${FILESDIR}"/${P}-custom-flags.patch
epatch "${FILESDIR}"/${P}-no-x11.patch
}
src_configure() {
econf \
--enable-opt --enable-ldopt \
$(use_enable X x11)
}
src_compile() {
emake CC="$(tc-getCC)"
}
src_install() {
# Config file
insinto /etc
newins "${S}/doc/example-spnavrc" spnavrc.sample
# Init script
newinitd "${FILESDIR}/spnavd" spacenavd
# Install udev rule but leave activiation to the user
# since Xorg may be configured to grab the device already
insinto "$(get_udevdir)"
newins "${FILESDIR}"/99-space-navigator.rules 99-space-navigator.rules.ignored
# Daemon
dobin "${S}/spacenavd"
use X && dobin "${S}/spnavd_ctl"
}
pkg_postinst() {
elog "To start the Spacenav daemon system-wide by default"
elog "you should add it to the default runlevel :"
elog "\`rc-update add spacenavd default\`"
elog
if use X; then
elog "To start generating Spacenav X events by default"
elog "you should add this command in your user startup"
elog "scripts such as .gnomerc or .xinitrc :"
elog "\`spnavd_ctl x11 start\`"
elog
fi
elog
elog "If you want to auto-start the daemon when you plug in"
elog "a SpaceNavigator device, activate the related udev rule :"
elog "\`sudo ln -s $(get_udevdir)/rules.d/99-space-navigator.rules.ignored /etc/udev/rules.d\`"
ewarn "You must restart spnavd \`/etc/init.d/spacenavd restart\` to run"
ewarn "the new version of the daemon."
}

@ -1 +1,2 @@
DIST dia2code-0.8.8.tar.gz 480548 SHA256 b7431a3f8a9f703397e4b849f304897a2c7150a378fe6069ae17cd2bfc1e6294 SHA512 15dfbad66fc7855f0ccc31cfd32488de13380653dcd72a7a47cfcec60727aea265373da3b829f2bb62c4aade5cb06b0cb884fa29b197545a5268b03c75e717a2 WHIRLPOOL 2cbdfaab1e733c4752ca7457a2763b539a1ed48eb351e6bd62264757fa862a11dc1f012a8d957cd05d3e199e88649b2b9c68cf8058e1da52ddc070053e35d6ba
DIST dia2code-1.0.0.tar.gz 946967 SHA256 c7746379cd15267fc3f600af16f77490e28f3becd260b7440f53776239ad491d SHA512 6669352e624fddc94aaaa36a30263ad591494d473ca09e662a9de90902e4b4a7a7eb6d3de9b28cf162c63ebeea36f86b33822d510ac87ce97c5f196c761bac85 WHIRLPOOL 4ae059ee2e4fce0e08a45dcfce24b368a3945c87cbab587886567c1ed916689b3e6ee3c626825e1a4d27925cd8de3a29f0d1c68c9f4b0032729ea9b248cbf396

@ -0,0 +1,32 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit gnome2
DESCRIPTION="Convert UML diagrams produced with Dia to various source code flavours"
HOMEPAGE="http://dia2code.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
IUSE="test"
RDEPEND="${DEPEND}"
DEPEND="
dev-libs/libxml2
test? ( app-shells/bash )
"
src_prepare() {
# Script makes use of arrays
sed -e 's:/bin/sh:/bin/bash:' \
-i tests/tests.sh || die
gnome2_src_prepare
}
src_install() {
gnome2_src_install
doman docs/dia2code.1
}

@ -1,86 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
KDE_LINGUAS="bs ca ca@valencia cs da de el en_GB es et eu fi fr gl
hu it kk nds nl pl pt pt_BR ro ru sk sv tr uk zh_CN zh_TW"
KDE_HANDBOOK="optional"
VIRTUALX_REQUIRED="test"
VIRTUALDBUS_TEST="true"
inherit kde4-base
DESCRIPTION="Personal finance manager by KDE"
HOMEPAGE="https://kmymoney.org/"
if [[ ${KDE_BUILD_TYPE} = release ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
fi
LICENSE="GPL-2"
SLOT="4"
KEYWORDS="amd64 x86"
IUSE="debug calendar doc hbci ofx pim quotes weboob"
COMMON_DEPEND="
>=app-crypt/gpgme-1.7.0[cxx]
<app-office/libalkimia-6.0.0
dev-libs/gmp:0=
dev-libs/libgpg-error
x11-misc/shared-mime-info
calendar? ( dev-libs/libical:= )
hbci? (
>=net-libs/aqbanking-5.5.1
>=sys-libs/gwenhywfar-4.15.3[qt4]
)
ofx? ( >=dev-libs/libofx-0.9.4 )
pim? ( $(add_kdeapps_dep kdepimlibs) )
weboob? ( www-client/weboob )
"
RDEPEND="${COMMON_DEPEND}
quotes? ( dev-perl/Finance-Quote )
"
DEPEND="${COMMON_DEPEND}
dev-libs/boost
virtual/pkgconfig
doc? ( app-doc/doxygen )
"
PATCHES=(
"${FILESDIR}/${P}-tests.patch"
"${FILESDIR}/${P}-alkimia-detect.patch"
"${FILESDIR}/${P}-fix-csvdialog.patch"
"${FILESDIR}/${P}-soversion.patch"
"${FILESDIR}/${P}-gpgmepp.patch"
"${FILESDIR}/${P}-kdepimlibs-optional.patch"
)
src_prepare() {
kde4-base_src_prepare
# don't install as executable
sed -i kmymoney/CMakeLists.txt \
-e "/install.*kmymoney.appdata/ s/PROGRAMS/FILES/" || die
}
src_configure() {
local mycmakeargs=(
-DUSE_QT_DESIGNER=OFF
-DENABLE_LIBICAL=$(usex calendar)
-DUSE_DEVELOPER_DOC=$(usex doc)
-DENABLE_KBANKING=$(usex hbci)
-DENABLE_LIBOFX=$(usex ofx)
$(cmake-utils_use_find_package pim KdepimLibs)
-DENABLE_WEBOOB=$(usex weboob)
)
kde4-base_src_configure
}
src_compile() {
kde4-base_src_compile
use doc && kde4-base_src_compile apidoc
}
src_install() {
use doc && HTML_DOCS=("${BUILD_DIR}/apidocs/html/")
kde4-base_src_install
}

@ -19,7 +19,7 @@ fi
LICENSE="GPL-2"
SLOT="4"
KEYWORDS="~amd64 ~x86"
KEYWORDS="amd64 x86"
IUSE="calendar debug doc hbci ofx pim quotes weboob"
COMMON_DEPEND="

@ -564,9 +564,6 @@ src_install() {
insinto /usr/$(get_libdir)/libreoffice/help
doins xmlhelp/util/*.xsl
# Remove desktop files to support old installs that can't parse mime
rm -r "${ED}"usr/share/mimelnk/ || die
pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
}

@ -29,7 +29,7 @@ CDEPEND="!app-office/openerp-web
dev-python/pyparsing[${PYTHON_USEDEP}]
dev-python/reportlab[${PYTHON_USEDEP}]
dev-python/simplejson[${PYTHON_USEDEP}]
media-gfx/pydot
dev-python/pydot[${PYTHON_USEDEP}]
dev-python/vobject[${PYTHON_USEDEP}]
dev-python/mako[${PYTHON_USEDEP}]
dev-python/mock[${PYTHON_USEDEP}]

@ -29,7 +29,7 @@ CDEPEND="!app-office/openerp-web
dev-python/pyparsing[${PYTHON_USEDEP}]
dev-python/reportlab[${PYTHON_USEDEP}]
dev-python/simplejson[${PYTHON_USEDEP}]
media-gfx/pydot
dev-python/pydot[${PYTHON_USEDEP}]
dev-python/vobject[${PYTHON_USEDEP}]
dev-python/mako[${PYTHON_USEDEP}]
dev-python/mock[${PYTHON_USEDEP}]

@ -1 +1,2 @@
DIST skrooge-2.8.1.tar.xz 19299556 SHA256 8f166db74a27db0ce0ea197f89dfd021224afc3e4875e36438a4496f10746460 SHA512 864de0c9e8876b87ab4100b0d48ea8e573655ebad5175333230ff715faa46077b96e25b91e767da864196960de14df9b9fee5b561e4d51b03a80fb58a070755f WHIRLPOOL 12d1455493fd32dd61cb0543a2365444f0fd1fa5b08214760f7c3b58836c3ac55a480f322cbea61eb13675b9698531fa860f8a2b4c9a915a789fc95bedc8b269
DIST skrooge-2.9.0.tar.xz 19310412 SHA256 ad02403026b649203f0381cc599a7754d36f41cc75cc03d14e63bfdb666e7bb5 SHA512 cbcd1e9c00509d6aa387f83f3a245b20c856e936095d8bb16ec7ab6898131a24edda8a4e9ee20323c7d04ab56194b8d4720a77b8d10699e64e8dbacbe9bb868c WHIRLPOOL 2ecc558add9160c724e2ff9623baa205e54ce45b385f63cc1d2151ce75dc79c65e7608abf419721761c19f3cffbe80a16db9876bdc4cc756d531a85a42bbec28

@ -0,0 +1,96 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
KDE_HANDBOOK="optional"
KDE_TEST="forceoptional"
QT_MINIMAL="5.7.1"
VIRTUALX_REQUIRED="test"
inherit kde5
DESCRIPTION="Personal finances manager, aiming at being simple and intuitive"
HOMEPAGE="http://www.skrooge.org/"
[[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
LICENSE="GPL-2"
KEYWORDS="~amd64 ~x86"
IUSE="activities designer kde ofx"
COMMON_DEPEND="
$(add_frameworks_dep karchive)
$(add_frameworks_dep kcompletion)
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
$(add_frameworks_dep kdbusaddons)
$(add_frameworks_dep ki18n)
$(add_frameworks_dep kiconthemes)
$(add_frameworks_dep kio)
$(add_frameworks_dep kitemviews)
$(add_frameworks_dep knewstuff)
$(add_frameworks_dep knotifications)
$(add_frameworks_dep knotifyconfig)
$(add_frameworks_dep kparts)
$(add_frameworks_dep kservice)
$(add_frameworks_dep ktextwidgets)
$(add_frameworks_dep kwallet)
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kxmlgui)
$(add_qt_dep qtconcurrent)
$(add_qt_dep qtdbus)
$(add_qt_dep qtdeclarative 'widgets')
$(add_qt_dep qtgui)
$(add_qt_dep qtprintsupport)
$(add_qt_dep qtscript)
$(add_qt_dep qtsql)
$(add_qt_dep qtsvg)
$(add_qt_dep qtwebkit)
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
app-crypt/qca:2[qt5]
dev-db/sqlcipher
dev-libs/grantlee:5
activities? ( $(add_frameworks_dep kactivities) )
kde? ( $(add_frameworks_dep krunner) )
ofx? ( dev-libs/libofx )
"
DEPEND="${COMMON_DEPEND}
$(add_frameworks_dep kguiaddons)
$(add_frameworks_dep kjobwidgets)
$(add_frameworks_dep kwindowsystem)
dev-libs/libxslt
virtual/pkgconfig
x11-misc/shared-mime-info
designer? (
$(add_frameworks_dep kdesignerplugin)
$(add_qt_dep designer)
)
"
RDEPEND="${COMMON_DEPEND}
!app-office/skrooge:4
"
REQUIRED_USE="test? ( designer )"
# hangs + installs files
RESTRICT+=" test"
src_configure() {
local mycmakeargs=(
-DSKG_BUILD_TEST=$(usex test)
-DSKG_DESIGNER=$(usex designer)
$(cmake-utils_use_find_package activities KF5Activities)
$(cmake-utils_use_find_package kde KF5Runner)
$(cmake-utils_use_find_package ofx LibOfx)
)
kde5_src_configure
}
src_test() {
local mycmakeargs=(
-DSKG_BUILD_TEST=ON
)
kde5_src_test
}

@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND="sys-apps/gentoo-functions"

@ -13,7 +13,7 @@ LICENSE="GPL-2+ CC-BY-SA-3.0"
# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
SLOT="0/evd3.4-evv3.3"
IUSE="djvu dvi gstreamer gnome gnome-keyring +introspection nautilus nsplugin +postscript t1lib tiff xps"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
# atk used in libview
# gdk-pixbuf used all over the place

@ -1,2 +1,3 @@
DIST gspell-1.2.3.tar.xz 395360 SHA256 a64e158e47a6e2b8ec9a3a1fea98a416f78a13e275c909b2ed488494ff835f82 SHA512 b45f17e8707187a070d4c5d4f91e4bcbd4108e596519c2900d7ca1f35050b6b397ed8c012fa25e179dddaf8b9c3a356b26c6070698f8333dff00c57a72e47198 WHIRLPOOL 1b6f22740d2b5597c20aa6d84e3e9e0b0b50c2fccfd811f49c99dff5e3762bc91a7582f223711f0f37a95c37d302b40697bd3517c170e8991cad4d556398875f
DIST gspell-1.4.1.tar.xz 408996 SHA256 442f88fecd7f9e00a6a9d0af2d762744dd3c119217ff11d6739500f75b0f10be SHA512 ded60e876598d8b6002ea28aa9a0d8f84c56c3a46d245df051949f5400f605a666279e42949bf2bfb365cf31f4618f1ce657dd3b81ed748af1036eddc1e67f6d WHIRLPOOL 5d76db642cad3dcfdc58d7a2a5b81768b16f7c29829646c8d6517e6fbc835389affc06372b9e339bfade388debd57d3d389920b2bd1e605b1e3cbbcfdbb61f64
DIST gspell-1.4.2.tar.xz 407356 SHA256 a59ba7e747bfbe93f6e511d7df3169d1530b518b46ca620cbc000fecbcdf0399 SHA512 00f53d3ca47a4ba1af1e8b4983a41dc6df8a9788898b45ffdd161a3fc8de28024cc985f49fbb872912c0a94addbca3b28ce2edda70eeb206a794e2bcf65e4a5e WHIRLPOOL a657ad0b6d3c41fccee2ddf09cf220acd8e59dbe687b78d61e1c25a6bf03e5033efa988587fbe511428562be85593bffefa47ee3188d48e929cca32c8aeddccf

@ -0,0 +1,46 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
VALA_USE_DEPEND="vapigen"
inherit gnome2 vala virtualx
DESCRIPTION="Spell check library for GTK+ applications"
HOMEPAGE="https://wiki.gnome.org/Projects/gspell"
LICENSE="LGPL-2.1+"
SLOT="0/1" # subslot = libgspell-1 soname version
KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86"
IUSE="+introspection vala"
REQUIRED_USE="vala? ( introspection )"
RDEPEND="
app-text/iso-codes
>=app-text/enchant-1.6.0
>=dev-libs/glib-2.44:2
>=x11-libs/gtk+-3.20:3[introspection?]
introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
vala? ( $(vala_depend) )
"
DEPEND="${RDEPEND}
>=dev-util/gtk-doc-am-1.25
>=sys-devel/gettext-0.19.4
virtual/pkgconfig
"
src_prepare() {
use vala && vala_src_prepare
gnome2_src_prepare
}
src_configure() {
gnome2_src_configure \
$(use_enable introspection) \
$(use_enable vala)
}
src_test() {
virtx emake check
}

@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/kchmviewer/${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="

@ -1,64 +0,0 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit fdo-mime qmake-utils
DESCRIPTION="Feature rich chm file viewer, based on Qt"
HOMEPAGE="http://www.kchmviewer.net/"
SRC_URI="mirror://sourceforge/kchmviewer/${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="
dev-libs/chmlib
dev-libs/libzip:=
dev-qt/qtcore:5
dev-qt/qtdbus:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5
dev-qt/qtprintsupport:5
dev-qt/qtwebkit:5
dev-qt/qtwidgets:5
dev-qt/qtxml:5
"
DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}/${P}-force-qtwebkit.patch"
"${FILESDIR}/${P}-underlinking.patch"
)
src_prepare() {
# bug #579430
sed -i \
-e "s:zip:zip;:g" \
packages/kchmviewer.desktop || die "Failed to fix desktop file"
default
}
src_configure() {
eqmake5
}
src_install() {
dodoc ChangeLog DBUS-bindings FAQ README
doicon packages/kchmviewer.png
dobin bin/kchmviewer
domenu packages/kchmviewer.desktop
}
pkg_postinst() {
fdo-mime_desktop_database_update
}
pkg_postrm() {
fdo-mime_desktop_database_update
}

@ -60,6 +60,5 @@ multilib_src_configure() {
multilib_src_install_all() {
einstalldocs
find "${ED}" -name '*.la' -exec rm -f {} + || die
rm -f "${ED}"/usr/lib/charset.alias || die
find "${ED}" -name '*.la' -exec rm -v {} + || die
}

@ -37,6 +37,5 @@ src_configure() {
src_install() {
default
find "${ED}" -name '*.la' -exec rm -f {} + || die
rm -f "${ED}"/usr/lib/charset.alias || die
find "${ED}" -name '*.la' -exec rm -v {} + || die
}

@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64"
KEYWORDS="~amd64 ~x86"
IUSE="test"
RDEPEND="

@ -5,12 +5,6 @@
<email>vim@gentoo.org</email>
<name>Gentoo Vim Project</name>
</maintainer>
<maintainer type="person">
<email>degrenier@easyconnect.fr</email>
<description>Please Cc: Thomas de Grenier de Latour (not a Gentoo
developer) on any bugs, as he knows lots about the package and I'd
like his opinion before I make any big changes.</description>
</maintainer>
<upstream>
<remote-id type="sourceforge">cream</remote-id>
</upstream>

@ -0,0 +1,24 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit vim-plugin python-single-r1
DESCRIPTION="vim plugin: integrates python documentation view and search tool"
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=910 https://github.com/fs111/pydoc.vim"
SRC_URI="https://github.com/fs111/${PN}.vim/tarball/${PV} -> ${P}.tar.gz"
LICENSE="GPL-2"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
DEPEND="app-arch/unzip"
RDEPEND="${PYTHON_DEPS}"
src_unpack() {
default
mv * "${P}" || die
}

@ -1 +1,2 @@
DIST tcomment-3.08.1.tar.gz 49918 SHA256 4f42ca89bb66110fcd770862a129b225c6b54b3f8e9419dba168002de238ad6d SHA512 609d5eb1e7785fb1af829000ab27ab63ac2bb7550bcd0f91c7c35f0a8c4b879e5348745f57b11d1e24d37920056ca55da8863e15e40d6fe289617d5d898a4177 WHIRLPOOL eb4383350708e78fb6b816aca97e178897f9710a3ff4cba8dfe5c7861b65ed4b86a7532375ebdc9ff0a2635a6493788d3caeac85a079c2674c2980b8cdda3404
DIST tcomment-3.08.tar.gz 38317 SHA256 4e88509c10dbbb6fdbdf93955c004fa3d44c10536a63e1c3e4348e65454e7256 SHA512 9cb582e4c82334a5752f2a0b5b3e753fc7a4bfd3db76dd8f1ca49938f3f9890b8723476a0c3400f60ff8b358d52bf32fa8497c7b1c6118afd21bb860b2ce6061 WHIRLPOOL 855a4516e0864989bde077fe476778a1f33d60423a6fda1da442c4d0e76e727931d868fdb6fad140535a0398fac15ba555fe71fd418cfefea214b275d0e87404

@ -0,0 +1,28 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit vim-plugin
MY_PN="tcomment_vim"
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://github.com/tomtom/nerdtree.git"
inherit git-r3
else
SRC_URI="https://github.com/tomtom/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
S="${WORKDIR}/${MY_PN}-${PV}"
fi
DESCRIPTION="vim plugin: an extensible and universal comment toggler"
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1173 https://github.com/tomtom/tcomment_vim"
LICENSE="GPL-3"
VIM_PLUGIN_HELPFILES="${PN}.txt"
src_prepare() {
default
rm -r README LICENSE.TXT etc spec addon* || die
}

@ -0,0 +1,28 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit vim-plugin
MY_PN="tcomment_vim"
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://github.com/tomtom/nerdtree.git"
inherit git-r3
else
SRC_URI="https://github.com/tomtom/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
S="${WORKDIR}/${MY_PN}-${PV}"
fi
DESCRIPTION="vim plugin: an extensible and universal comment toggler"
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1173 https://github.com/tomtom/tcomment_vim"
LICENSE="GPL-3"
VIM_PLUGIN_HELPFILES="${PN}.txt"
src_prepare() {
default
rm -r README LICENSE.TXT etc spec addon* || die
}

@ -0,0 +1 @@
DIST vimcdoc-1.9.0.tar.gz 1969682 SHA256 eee60f8b50aa4858f6668061ef0b35b81f67cd5f2114a871b14d422622eb435b SHA512 f12e6e12d481d6cf718c97aecc1619c11d5c19ef647155ed66c8c6b79f7a82ca36249e7f60aeb246404dbb31c68eced135c53247f0d99acaf05bc8e7a5679fc9 WHIRLPOOL ba65b334735a16720c6eedeaf5a075d2a6aa020e2e46adfda1a2595b2c3f7eca43266a797169678fb46a00df35c0f7dd665e3a899458edaf12cfd46caa8c73a2

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>vim@gentoo.org</email>
<name>Gentoo Vim Project</name>
</maintainer>
</pkgmetadata>

@ -0,0 +1,11 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit vim-plugin
DESCRIPTION="online vim documentation translated into Chinese"
HOMEPAGE="http://vimcdoc.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="vim.org"
KEYWORDS="~amd64 ~x86"

@ -1,3 +1,4 @@
DIST Catch-1.9.4.tar.gz 363097 SHA256 d67d2ee26ec9f72618dd9b28a9d1b7ba3c6368bc846ecfeda05a1e5d1b8b9b20 SHA512 78d43719e87f5d27132178c5f139b72e6093dd1029eb742bfb48e32b618079e156837fb25d4cbe0fd5044535a5a65ad90510cff8ae93f2695c7bb3fc5cb2a5ec WHIRLPOOL 80b4c36172e62ea12fc4acee096a84cd00b1a290dc2a7a9e9a8e2ff2485e39a619e33f2aee853daa7773d3c877f55788b2d0f86e44542c6f8c0b6027edaf0585
DIST Catch-1.9.6.tar.gz 367108 SHA256 d1fc9f0018fe55a1b74168d5c37a2cf6580a902dab9b646050373e70090b2c61 SHA512 6d4989518935d60d2274361ad64649be9241e4de435d34cb04ac8ee2f7b25deb33c8919acaa3cd1c0d68c7822f15d74d0f19115ab72bb93d2cf8b3a0205e44c6 WHIRLPOOL 7c1d3a779a144a9d51a3b512bc5295d68e98c1d0d6fea600a586d2bcafc2141c57beacbb4ab5d58376e096d27681fd7a5f416c5f78cfc6635634ba00707cff06
DIST Catch-1.9.7.tar.gz 371816 SHA256 751090d755072777c5bb98de6ead1f7919ea239d4b77bb028fb7b06624ec0d7a SHA512 573d324b3e0ffe1026bdd10410a9299eff6d3e0a316b2b84c687dc993fb33570620e26107667ce8b59ab66844cfbc39526ed6ba4e9dd1ba529c6b21ebd274b63 WHIRLPOOL 1d3bcf6b2a3d8af6fba7ded0e92d7381857360a4bbf2dd689474408c52612f874da35579ad0adaf13679e1d8aaddee101274cd29070a5a51d58e7d52b76473f2
DIST Catch-2.0.0-develop.2.tar.gz 376246 SHA256 b7f4210353be2c78d65801d0cc3885110aeae3824f6b67d59dff71deccad1694 SHA512 89fd36d310ac6322d7d8683360482a564e5c90bf0880b8cc9a6e379044dfc1bcea99669d8dada67293d8b70d274c6129018bc97598eb72b48fd85d4ebe0b21ef WHIRLPOOL 94a2f270b2a884e17a6d35936409911d544b7447c98f217b4b14e58387d8c8ac045dde5569bbf3560547b195a91f93101d3e293ebc1b981ddc447264d9742906

@ -0,0 +1,37 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit cmake-utils
MY_PV=${PV/_pre/-develop.}
MY_P=${PN^}-${MY_PV}
DESCRIPTION="Modern C++ header-only framework for unit-tests"
HOMEPAGE="https://github.com/philsquared/Catch"
SRC_URI="https://github.com/philsquared/Catch/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
LICENSE="Boost-1.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
S=${WORKDIR}/${MY_P}
# CMake is only used to build & run tests, so override phases
src_configure() { :; }
src_compile() { :; }
src_test() {
cmake-utils_src_configure
cmake-utils_src_compile
cmake-utils_src_test
}
src_install() {
# same location as used in fedora
insinto /usr/include/catch
doins -r include/.
dodoc -r docs/.
}

@ -0,0 +1,21 @@
Fix build with GCC 6 due to lifetime issues.
--- a/googletest/src/gtest.cc
+++ b/googletest/src/gtest.cc
@@ -2654,10 +2654,12 @@
test->Run();
}
- // Deletes the test object.
- impl->os_stack_trace_getter()->UponLeavingGTest();
- internal::HandleExceptionsInMethodIfSupported(
- test, &Test::DeleteSelf_, "the test fixture's destructor");
+ if (test != NULL) {
+ // Deletes the test object.
+ impl->os_stack_trace_getter()->UponLeavingGTest();
+ internal::HandleExceptionsInMethodIfSupported(
+ test, &Test::DeleteSelf_, "the test fixture's destructor");
+ }
result_.set_elapsed_time(internal::GetTimeInMillis() - start);

@ -0,0 +1,19 @@
Fix python tests that use broken generator expressions
--- a/googletest/cmake/internal_utils.cmake
+++ b/googletest/cmake/internal_utils.cmake
@@ -247,12 +247,12 @@
add_test(
NAME ${name}
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/${name}.py
- --build_dir=${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>)
+ --build_dir=${CMAKE_CURRENT_BINARY_DIR})
else (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 3.1)
add_test(
${name}
${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/${name}.py
- --build_dir=${CMAKE_CURRENT_BINARY_DIR}/\${CTEST_CONFIGURATION_TYPE})
+ --build_dir=${CMAKE_CURRENT_BINARY_DIR})
endif (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 3.1)
endif()
endfunction()

@ -0,0 +1,64 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
# Python is required for tests and some build tasks.
PYTHON_COMPAT=( python2_7 )
inherit git-r3 python-any-r1 cmake-multilib
DESCRIPTION="Google C++ Testing Framework"
HOMEPAGE="https://github.com/google/googletest"
EGIT_REPO_URI="https://github.com/google/googletest.git"
LICENSE="BSD"
SLOT="0"
IUSE="examples test"
# Test require a ton of privileges, namely
# FEATURES="-sandbox -userpriv -usersandbox"
# which is generally not acceptable for Gentoo
RESTRICT="test"
DEPEND="test? ( ${PYTHON_DEPS} )"
RDEPEND="!dev-cpp/gmock"
PATCHES=(
"${FILESDIR}"/${P}-fix-py-tests.patch
"${FILESDIR}"/${P}-fix-gcc6-undefined-behavior.patch
)
pkg_setup() {
use test && python-any-r1_pkg_setup
}
multilib_src_configure() {
local mycmakeargs=(
-DBUILD_GMOCK=ON
-DBUILD_GTEST=ON
-DINSTALL_GMOCK=ON
-DINSTALL_GTEST=ON
-Dgtest_build_samples=OFF
-Dgtest_disable_pthreads=OFF
# currently only static libs work
# due to numerous ODR violations
# https://github.com/google/googletest/issues/930
-DBUILD_SHARED_LIBS=OFF
# tests
-Dgmock_build_tests=$(usex test)
-Dgtest_build_tests=$(usex test)
-DPYTHON_EXECUTABLE="${PYTHON}"
)
cmake-utils_src_configure
}
multilib_src_install_all() {
einstalldocs
if use examples; then
docinto examples
dodoc googletest/samples/*.{cc,h}
fi
}

@ -11,7 +11,7 @@ SRC_URI="mirror://apache/couchdb/source/${PV}/apache-${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 ~ppc ~x86"
KEYWORDS="amd64 ~ppc x86"
IUSE="libressl selinux test"
RDEPEND=">=dev-libs/icu-4.3.1:=

@ -1,4 +1,4 @@
# Copyright 1999-2016 Gentoo Foundation
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@ -11,7 +11,7 @@ SRC_URI="http://www.tildeslash.com/${PN}/dist/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="amd64 ~x86"
KEYWORDS="amd64 x86"
IUSE="debug doc mysql postgres +sqlite ssl static-libs"
REQUIRED_USE=" || ( postgres mysql sqlite )"

@ -16,7 +16,7 @@ inherit mysql-multilib-r1
IUSE="$IUSE"
# REMEMBER: also update eclass/mysql*.eclass before committing!
KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
RDEPEND="${RDEPEND}"

@ -0,0 +1,535 @@
From 2eef6cc4928c611cecdca3c1daecb60568deca4e Mon Sep 17 00:00:00 2001
From: Sanket Mehta <sanket.mehta@enterprisedb.com>
Date: Fri, 17 Jul 2015 09:07:09 +0100
Subject: [PATCH] Add log timestamps and a --version option per Josh Berkus.
Update copyright notices while passing.
---
CMakeLists.txt | 8 ++++----
LICENSE | 2 +-
cmake/MakeExt.cmake | 2 +-
connection.cpp | 2 +-
include/connection.h | 2 +-
include/job.h | 2 +-
include/misc.h | 3 ++-
include/pgAgent.h | 2 +-
job.cpp | 2 +-
misc.cpp | 14 +++++++++++++-
pgAgent.cpp | 2 +-
pgAgent.rc | 14 +++++++-------
pgaevent/CMakeLists.txt | 2 +-
pgaevent/pgaevent.c | 2 +-
pgaevent/pgaevent.def | 2 +-
pgaevent/pgamsgevent.h | 2 +-
pgaevent/pgamsgevent.rc | 14 +++++++-------
precomp.cpp | 2 +-
sql/pgagent--unpackaged--3.4.sql | 2 +-
sql/pgagent.sql | 2 +-
sql/pgagent_upgrade.sql | 2 +-
unix.cpp | 16 +++++++++++-----
win32.cpp | 5 ++++-
23 files changed, 64 insertions(+), 42 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ab02fea..c8bfa4a 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
#######################################################################
#
# pgAgent - PostgreSQL tools
-# Copyright (C) 2002 - 2014, The pgAdmin Development Team
+# Copyright (C) 2002 - 2015, The pgAdmin Development Team
# This software is released under the PostgreSQL Licence
#
# CMakeLists.txt - CMake build configuration
@@ -27,7 +27,6 @@ SET(CMAKE_FIND_LIBRARY_PREFIXES "")
SET(CMAKE_FIND_LIBRARY_SUFFIXES ".lib")
SET(STATIC_BUILD YES CACHE BOOL "Statically link the executable?")
-
################################################################################
# Apple stuff
################################################################################
@@ -61,12 +60,12 @@ PROJECT(pgagent)
# in pgagent.sql and upgrade_pgagent.sql if the major version number is
# changed. The full version number also needs to be included in pgAgent.rc and
# pgaevent/pgamsgevent.rc at present.
-SET(VERSION 3.4.0)
+SET(VERSION "3.4.1")
# CPack stuff
SET(CPACK_PACKAGE_VERSION_MAJOR 3)
SET(CPACK_PACKAGE_VERSION_MINOR 4)
-SET(CPACK_PACKAGE_VERSION_PATCH 0)
+SET(CPACK_PACKAGE_VERSION_PATCH 1)
SET(CPACK_PACKAGE_NAME "pgAgent")
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "pgAgent is a job scheduling engine for PostgreSQL")
SET(CPACK_PACKAGE_VENDOR "the pgAdmin Development Team")
@@ -79,6 +78,7 @@ SET(CPACK_SOURCE_GENERATOR TGZ)
SET(CPACK_SOURCE_IGNORE_FILES "\\\\.DS_Store;/CVS/;/\\\\.svn/;\\\\.swp$;\\\\.#;/#;.*~;cscope.*")
ADD_DEFINITIONS(-DPGAGENT_VERSION_MAJOR=${CPACK_PACKAGE_VERSION_MAJOR})
+ADD_DEFINITIONS(-DPGAGENT_VERSION="${VERSION}")
# This must come after we set the CPACK variables!!
INCLUDE(CPack)
diff --git a/LICENSE b/LICENSE
index 3b2638a..c460d6f 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
pgAgent
-Copyright (c) 2002 - 2014, The pgAdmin Development Team
+Copyright (c) 2002 - 2015, The pgAdmin Development Team
Permission to use, copy, modify, and distribute this software and its
documentation for any purpose, without fee, and without a written agreement is
diff --git a/cmake/MakeExt.cmake b/cmake/MakeExt.cmake
index 5777c97..ae30e30 100644
--- a/cmake/MakeExt.cmake
+++ b/cmake/MakeExt.cmake
@@ -1,7 +1,7 @@
#######################################################################
#
# pgAgent - PostgreSQL tools
-# Copyright (C) 2002 - 2014, The pgAdmin Development Team
+# Copyright (C) 2002 - 2015, The pgAdmin Development Team
# This software is released under the PostgreSQL Licence
#
# MakeExt,cmake - Create the PG Extension
diff --git a/connection.cpp b/connection.cpp
index f2213bd..25432bb 100644
--- a/connection.cpp
+++ b/connection.cpp
@@ -2,7 +2,7 @@
//
// pgAgent - PostgreSQL Tools
//
-// Copyright (C) 2002 - 2014, The pgAdmin Development Team
+// Copyright (C) 2002 - 2015, The pgAdmin Development Team
// This software is released under the PostgreSQL Licence
//
// connection.cpp - database connection
diff --git a/include/connection.h b/include/connection.h
index a201450..064067c 100644
--- a/include/connection.h
+++ b/include/connection.h
@@ -2,7 +2,7 @@
//
// pgAgent - PostgreSQL Tools
//
-// Copyright (C) 2002 - 2014, The pgAdmin Development Team
+// Copyright (C) 2002 - 2015, The pgAdmin Development Team
// This software is released under the PostgreSQL Licence
//
// connection.h - database connection
diff --git a/include/job.h b/include/job.h
index e511852..abc33d4 100644
--- a/include/job.h
+++ b/include/job.h
@@ -2,7 +2,7 @@
//
// pgAgent - PostgreSQL Tools
//
-// Copyright (C) 2002 - 2014, The pgAdmin Development Team
+// Copyright (C) 2002 - 2015, The pgAdmin Development Team
// This software is released under the PostgreSQL Licence
//
// job.h - agent job
diff --git a/include/misc.h b/include/misc.h
index 14b4edc..59847d1 100644
--- a/include/misc.h
+++ b/include/misc.h
@@ -2,7 +2,7 @@
//
// pgAgent - PostgreSQL Tools
//
-// Copyright (C) 2002 - 2014, The pgAdmin Development Team
+// Copyright (C) 2002 - 2015, The pgAdmin Development Team
// This software is released under the PostgreSQL Licence
//
// misc.h - misc functions
@@ -18,6 +18,7 @@ void WaitAWhile(const bool waitLong = false);
void setOptions(int argc, char **argv, const wxString &executable);
wxString getArg(int &argc, char **&argv);
wxString NumToStr(const long l);
+void printVersion();
#endif // MISC_H
diff --git a/include/pgAgent.h b/include/pgAgent.h
index 6ef4944..059e0ca 100644
--- a/include/pgAgent.h
+++ b/include/pgAgent.h
@@ -2,7 +2,7 @@
//
// pgAgent - PostgreSQL Tools
//
-// Copyright (C) 2002 - 2014, The pgAdmin Development Team
+// Copyright (C) 2002 - 2015, The pgAdmin Development Team
// This software is released under the PostgreSQL Licence
//
// pgAgent.h - main include
diff --git a/job.cpp b/job.cpp
index c4b39ce..f3eaa03 100644
--- a/job.cpp
+++ b/job.cpp
@@ -2,7 +2,7 @@
//
// pgAgent - PostgreSQL Tools
//
-// Copyright (C) 2002 - 2014 The pgAdmin Development Team
+// Copyright (C) 2002 - 2015 The pgAdmin Development Team
// This software is released under the PostgreSQL Licence
//
// job.cpp - pgAgent job
diff --git a/misc.cpp b/misc.cpp
index dfd56a0..2252d83 100644
--- a/misc.cpp
+++ b/misc.cpp
@@ -2,7 +2,7 @@
//
// pgAgent - PostgreSQL Tools
//
-// Copyright (C) 2002 - 2014 The pgAdmin Development Team
+// Copyright (C) 2002 - 2015 The pgAdmin Development Team
// This software is released under the PostgreSQL Licence
//
// misc.cpp - misc functions
@@ -16,6 +16,8 @@
#include <unistd.h>
#endif
+#define APPVERSION_STR wxT(PGAGENT_VERSION)
+
// In unix.c or win32.c
void usage(const wxString &executable);
@@ -42,6 +44,11 @@ wxString getArg(int &argc, char **&argv)
return s;
}
+void printVersion()
+{
+ wxPrintf(_("PostgreSQL Scheduling Agent\n"));
+ wxPrintf(_("Version: %s\n"), APPVERSION_STR);
+}
void setOptions(int argc, char **argv, const wxString &executable)
{
@@ -72,6 +79,11 @@ void setOptions(int argc, char **argv, const wxString &executable)
minLogLevel = val;
break;
}
+ case 'v':
+ {
+ printVersion();
+ exit (0);
+ }
#ifndef __WXMSW__
case 'f':
{
diff --git a/pgAgent.cpp b/pgAgent.cpp
index 5ed43fb..9238fa1 100644
--- a/pgAgent.cpp
+++ b/pgAgent.cpp
@@ -2,7 +2,7 @@
//
// pgAgent - PostgreSQL Tools
//
-// Copyright (C) 2002 - 2014, The pgAdmin Development Team
+// Copyright (C) 2002 - 2015, The pgAdmin Development Team
// This software is released under the PostgreSQL Licence
//
// pgAgent.cpp - pgAgent main entry
diff --git a/pgAgent.rc b/pgAgent.rc
index 3c51bfa..c4169e1 100644
--- a/pgAgent.rc
+++ b/pgAgent.rc
@@ -2,7 +2,7 @@
//
// pgAgent - PostgreSQL Tools
//
-// Copyright (C) 2002 - 2014, The pgAdmin Development Team
+// Copyright (C) 2002 - 2015, The pgAdmin Development Team
// This software is released under the PostgreSQL Licence
//
// pgAgent.rc - win32 Resources
@@ -16,8 +16,8 @@ aaaPGAGENT ICON DISCARDABLE "include/pgAgent.ico"
VS_VERSION_INFO VERSIONINFO
-FILEVERSION 3,4,0,0
-PRODUCTVERSION 3,4,0,0
+FILEVERSION 3,4,1,0
+PRODUCTVERSION 3,4,1,0
FILEOS VOS__WINDOWS32
FILETYPE VFT_APP
BEGIN
@@ -25,15 +25,15 @@ BEGIN
BEGIN
BLOCK "040904E4"
BEGIN
- VALUE "FileVersion", "3.4.0", "\0"
- VALUE "File Version", "3.4.0", "\0"
+ VALUE "FileVersion", "3.4.1", "\0"
+ VALUE "File Version", "3.4.1", "\0"
VALUE "FileDescription", "pgAgent - PostgreSQL Scheduling Agent", "\0"
- VALUE "LegalCopyright", "\251 2002 - 2012, The pgAdmin Development Team", "\0"
+ VALUE "LegalCopyright", "\251 2002 - 2015, The pgAdmin Development Team", "\0"
VALUE "LegalTrademarks", "This software is released under the PostgreSQL Licence.", "\0"
VALUE "InternalName", "pgAgent", "\0"
VALUE "OriginalFilename","pgagent.exe", "\0"
VALUE "ProductName", "pgAgent", "\0"
- VALUE "ProductVersion", "3.4.0", "\0"
+ VALUE "ProductVersion", "3.4.1", "\0"
END
END
BLOCK "VarFileInfo"
diff --git a/pgaevent/CMakeLists.txt b/pgaevent/CMakeLists.txt
index 10478c3..2fd6192 100644
--- a/pgaevent/CMakeLists.txt
+++ b/pgaevent/CMakeLists.txt
@@ -1,7 +1,7 @@
#######################################################################
#
# pgAgent - PostgreSQL tools
-# Copyright (C) 2002 - 2014, The pgAdmin Development Team
+# Copyright (C) 2002 - 2015, The pgAdmin Development Team
# This software is released under the PostgreSQL Licence
#
# pgaevent/CMakeLists.txt - CMake build configuration
diff --git a/pgaevent/pgaevent.c b/pgaevent/pgaevent.c
index a66ed42..c9fac75 100644
--- a/pgaevent/pgaevent.c
+++ b/pgaevent/pgaevent.c
@@ -2,7 +2,7 @@
//
// pgAgent - PostgreSQL Tools
//
-// Copyright (C) 2002 - 2014, The pgAdmin Development Team
+// Copyright (C) 2002 - 2015, The pgAdmin Development Team
// This software is released under the PostgreSQL Licence
//
// pgaevent.c - win32 message format dll
diff --git a/pgaevent/pgaevent.def b/pgaevent/pgaevent.def
index c9e222d..34e03c1 100644
--- a/pgaevent/pgaevent.def
+++ b/pgaevent/pgaevent.def
@@ -2,7 +2,7 @@
; //
; // pgAgent - PostgreSQL Tools
; //
-; // Copyright (C) 2002 - 2014 The pgAdmin Development Team
+; // Copyright (C) 2002 - 2015 The pgAdmin Development Team
; // This software is released under the PostgreSQL Licence
; //
; // pgaeventdef - pgaevent.dll exports
diff --git a/pgaevent/pgamsgevent.h b/pgaevent/pgamsgevent.h
index b8e11a5..f589d60 100644
--- a/pgaevent/pgamsgevent.h
+++ b/pgaevent/pgamsgevent.h
@@ -2,7 +2,7 @@
//
// pgAgent - PostgreSQL Tools
//
-// Copyright (C) 2002 - 2014, The pgAdmin Development Team
+// Copyright (C) 2002 - 2015, The pgAdmin Development Team
// This software is released under the PostgreSQL Licence
//
// pgamsgevent.h - Message id declarations
diff --git a/pgaevent/pgamsgevent.rc b/pgaevent/pgamsgevent.rc
index 79e77aa..510ab65 100644
--- a/pgaevent/pgamsgevent.rc
+++ b/pgaevent/pgamsgevent.rc
@@ -2,7 +2,7 @@
//
// pgAgent - PostgreSQL Tools
//
-// Copyright (C) 2002 - 2014, The pgAdmin Development Team
+// Copyright (C) 2002 - 2015, The pgAdmin Development Team
// This software is released under the PostgreSQL Licence
//
// pgaevent.rc - win32 Resources
@@ -19,8 +19,8 @@ aaaPGAEVENT ICON DISCARDABLE "../include/pgagent.ico"
VS_VERSION_INFO VERSIONINFO
-FILEVERSION 3,4,0,0
-PRODUCTVERSION 3,4,0,0
+FILEVERSION 3,4,1,0
+PRODUCTVERSION 3,4,1,0
FILEOS VOS__WINDOWS32
FILETYPE VFT_APP
BEGIN
@@ -28,15 +28,15 @@ BEGIN
BEGIN
BLOCK "040904E4"
BEGIN
- VALUE "FileVersion", "3.4.0", "\0"
- VALUE "File Version", "3.4.0", "\0"
+ VALUE "FileVersion", "3.4.1", "\0"
+ VALUE "File Version", "3.4.1", "\0"
VALUE "FileDescription", "pgaevent - pgAgent Event Log Message DLL", "\0"
- VALUE "LegalCopyright", "\251 2002 - 2014, The pgAdmin Development Team", "\0"
+ VALUE "LegalCopyright", "\251 2002 - 2015, The pgAdmin Development Team", "\0"
VALUE "LegalTrademarks", "This software is released under the PostgreSQL Licence.", "\0"
VALUE "InternalName", "pgaevent", "\0"
VALUE "OriginalFilename","pgaevent.dll", "\0"
VALUE "ProductName", "pgAgent", "\0"
- VALUE "ProductVersion", "3.4.0", "\0"
+ VALUE "ProductVersion", "3.4.1", "\0"
END
END
BLOCK "VarFileInfo"
diff --git a/precomp.cpp b/precomp.cpp
index 02c969f..56766bb 100644
--- a/precomp.cpp
+++ b/precomp.cpp
@@ -2,7 +2,7 @@
//
// pgAgent - PostgreSQL Tools
//
-// Copyright (C) 2002 - 2014, The pgAdmin Development Team
+// Copyright (C) 2002 - 2015, The pgAdmin Development Team
// This software is released under the PostgreSQL Licence
//
// precomp.cpp - pgAgent precompiled headers
diff --git a/sql/pgagent--unpackaged--3.4.sql b/sql/pgagent--unpackaged--3.4.sql
index 536640e..f5ffc63 100644
--- a/sql/pgagent--unpackaged--3.4.sql
+++ b/sql/pgagent--unpackaged--3.4.sql
@@ -1,7 +1,7 @@
/*
// pgAgent - PostgreSQL Tools
//
-// Copyright (C) 2002 - 2014 The pgAdmin Development Team
+// Copyright (C) 2002 - 2015 The pgAdmin Development Team
// This software is released under the PostgreSQL Licence
//
// pgagent--unpackaged--3.4.sql - Convert pgAgent existing tables and functions to an extension
diff --git a/sql/pgagent.sql b/sql/pgagent.sql
index 3708adf..1118833 100644
--- a/sql/pgagent.sql
+++ b/sql/pgagent.sql
@@ -1,7 +1,7 @@
/*
// pgAgent - PostgreSQL Tools
//
-// Copyright (C) 2002 - 2014 The pgAdmin Development Team
+// Copyright (C) 2002 - 2015 The pgAdmin Development Team
// This software is released under the PostgreSQL Licence
//
// pgagent.sql - pgAgent tables and functions
diff --git a/sql/pgagent_upgrade.sql b/sql/pgagent_upgrade.sql
index ae0d995..c256c93 100644
--- a/sql/pgagent_upgrade.sql
+++ b/sql/pgagent_upgrade.sql
@@ -1,7 +1,7 @@
/*
// pgAgent - PostgreSQL Tools
//
-// Copyright (C) 2002 - 2014 The pgAdmin Development Team
+// Copyright (C) 2002 - 2015 The pgAdmin Development Team
// This software is released under the PostgreSQL Licence
//
// pgagent_upgrade.sql - Upgrade pgAgent tables and functions
diff --git a/unix.cpp b/unix.cpp
index 34ad0f6..e206408 100644
--- a/unix.cpp
+++ b/unix.cpp
@@ -2,7 +2,7 @@
//
// pgAgent - PostgreSQL Tools
//
-// Copyright (C) 2002 - 2014, The pgAdmin Development Team
+// Copyright (C) 2002 - 2015, The pgAdmin Development Team
// This software is released under the PostgreSQL Licence
//
// unix.cpp - pgAgent unix specific functions
@@ -17,14 +17,17 @@
#include <wx/filename.h>
#include <wx/ffile.h>
#include <fcntl.h>
+void printVersion();
void usage(const wxString &executable)
{
wxFileName *fn = new wxFileName(executable);
+ printVersion();
wxPrintf(_("Usage:\n"));
wxPrintf(fn->GetName() + _(" [options] <connect-string>\n"));
wxPrintf(_("options:\n"));
+ wxPrintf(_("-v (display version info and then exit)\n"));
wxPrintf(_("-f run in the foreground (do not detach from the terminal)\n"));
wxPrintf(_("-t <poll time interval in seconds (default 10)>\n"));
wxPrintf(_("-r <retry period after connection abort in seconds (>=10, default 30)>\n"));
@@ -50,22 +53,25 @@ void LogMessage(wxString msg, int level)
return;
}
+ wxDateTime logTime = wxDateTime::Now();
+ wxString logTimeString = logTime.Format() + wxT(" : ");
+
switch (level)
{
case LOG_DEBUG:
if (minLogLevel >= LOG_DEBUG)
- file.Write(_("DEBUG: ") + msg + wxT("\n"));
+ file.Write(logTimeString + _("DEBUG: ") + msg + wxT("\n"));
break;
case LOG_WARNING:
if (minLogLevel >= LOG_WARNING)
- file.Write(_("WARNING: ") + msg + wxT("\n"));
+ file.Write(logTimeString + _("WARNING: ") + msg + wxT("\n"));
break;
case LOG_ERROR:
- file.Write(_("ERROR: ") + msg + wxT("\n"));
+ file.Write(logTimeString + _("ERROR: ") + msg + wxT("\n"));
exit(1);
break;
case LOG_STARTUP:
- file.Write(_("WARNING: ") + msg + wxT("\n"));
+ file.Write(logTimeString + _("WARNING: ") + msg + wxT("\n"));
break;
}
diff --git a/win32.cpp b/win32.cpp
index aa5d5d7..624ae77 100644
--- a/win32.cpp
+++ b/win32.cpp
@@ -2,7 +2,7 @@
//
// pgAgent - PostgreSQL Tools
//
-// Copyright (C) 2002 - 2014 The pgAdmin Development Team
+// Copyright (C) 2002 - 2015 The pgAdmin Development Team
// This software is released under the PostgreSQL Licence
//
// win32.cpp - pgAgent win32 specific functions
@@ -36,6 +36,7 @@ static HANDLE serviceSync;
static HANDLE eventHandle;
bool stopService();
+void printVersion();
// This will be called from MainLoop, if pgagent is initialized properly
void Initialized()
@@ -435,12 +436,14 @@ bool removeService(const wxString &serviceName)
void usage(const wxString &executable)
{
wxFileName *fn = new wxFileName(executable);
+ printVersion();
wxPrintf(_("Usage:\n"));
wxPrintf(fn->GetName() + _(" REMOVE <serviceName>\n"));
wxPrintf(fn->GetName() + _(" INSTALL <serviceName> [options] <connect-string>\n"));
wxPrintf(fn->GetName() + _(" DEBUG [options] <connect-string>\n"));
wxPrintf(_("options:\n"));
+ wxPrintf(_("-v (display version info and then exit)\n"));
wxPrintf(_("-u <user or DOMAIN\\user>\n"));
wxPrintf(_("-p <password>\n"));
wxPrintf(_("-d <displayname>\n"));

@ -0,0 +1,32 @@
From f9bf1ccb27ebcfce00e7a6d467bc0e1b5ee9555e Mon Sep 17 00:00:00 2001
From: Ashesh Vashi <ashesh.vashi@enterprisedb.com>
Date: Wed, 1 Apr 2015 15:24:11 +0530
Subject: [PATCH] Fixed a bug in DBconn::GetLastError() function.
pgAgent was crashing, while removing the trailing new-lines from the
empty error message string (Reported by: Thomas Krennwallner)
---
connection.cpp | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/connection.cpp b/connection.cpp
index b7623e6..f2213bd 100644
--- a/connection.cpp
+++ b/connection.cpp
@@ -313,15 +313,7 @@ int DBconn::ExecuteVoid(const wxString &query)
wxString DBconn::GetLastError()
{
- // Return the last error message, minus any trailing line ends
- if (lastError.substr(lastError.length() - 2, 2) == wxT("\r\n")) // DOS
- return lastError.substr(0, lastError.length() - 2);
- else if (lastError.substr(lastError.length() - 1, 1) == wxT("\n")) // Unix
- return lastError.substr(0, lastError.length() - 1);
- else if (lastError.substr(lastError.length() - 1, 1) == wxT("\r")) // Mac
- return lastError.substr(0, lastError.length() - 1);
- else
- return lastError;
+ return lastError.Trim(true);
}
///////////////////////////////////////////////////////7

@ -0,0 +1,30 @@
From 01b72d867cc2bdbaff1765499a6395f7bc94e2be Mon Sep 17 00:00:00 2001
From: Sanket Mehta <sanket.mehta@enterprisedb.com>
Date: Tue, 1 Dec 2015 11:34:32 +0530
Subject: [PATCH] Set 'succeeded' flag to true/false by checking for the step
failure everytime (it gets executed).
These was an issue with the current implementation.
Once the 'succeeded' flag is set to true, the following batch step
execution does not stop executiong of following steps on failure, even
we have set 'onerror' to 'f' for that step.
---
job.cpp | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/job.cpp b/job.cpp
index f3eaa03..9864f57 100644
--- a/job.cpp
+++ b/job.cpp
@@ -307,9 +307,7 @@ int Job::Execute()
// set success status for batch runs, be pessimistic by default
LogMessage(wxString::Format(_("Script return code: %d"), rc), LOG_DEBUG);
- if (rc == 0)
- succeeded = true;
-
+ succeeded = ((rc == 0) ? true : false);
// If output is empty then either script did not return any output
// or script threw some error into stderr.
// Check script threw some error into stderr

@ -0,0 +1,79 @@
From 5d2e0d3500a8e144215cdfe10b52cf7415b58046 Mon Sep 17 00:00:00 2001
From: Ashesh Vashi <ashesh.vashi@enterprisedb.com>
Date: Mon, 25 May 2015 12:37:42 +0530
Subject: [PATCH] Save the standarad error too along with the standard output
in the jobstep output for the batch jobs.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
[Worked on by: Mehmet Emin KARAKAŞ, Akshay Joshi]
[Reviewed and improvised by: Sanket Joshi, Ashesh Vashi]
---
job.cpp | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
diff --git a/job.cpp b/job.cpp
index 00334ab..c4b39ce 100644
--- a/job.cpp
+++ b/job.cpp
@@ -186,8 +186,10 @@ int Job::Execute()
#ifdef __WIN32__
wxString filename = dirname + wxT("\\") + jobid + wxT("_") + stepid + wxT(".bat");
+ wxString errorFile = dirname + wxT("\\") + jobid + wxT("_") + stepid + wxT("_error.txt");
#else
wxString filename = dirname + wxT("/") + jobid + wxT("_") + stepid + wxT(".scr");
+ wxString errorFile = dirname + wxT("/") + jobid + wxT("_") + stepid + wxT("_error.txt");
#endif
// Write the script
@@ -233,6 +235,10 @@ int Job::Execute()
file->Close();
LogMessage(wxString::Format(_("Executing script file: %s"), filename.c_str()), LOG_DEBUG);
+ // freopen function is used to redirect output of stream (stderr in our case)
+ // into the specified file.
+ FILE *fpError = freopen(errorFile.mb_str(), "w", stderr);
+
// Execute the file and capture the output
#ifdef __WIN32__
// The Windows way
@@ -304,6 +310,37 @@ int Job::Execute()
if (rc == 0)
succeeded = true;
+ // If output is empty then either script did not return any output
+ // or script threw some error into stderr.
+ // Check script threw some error into stderr
+ if (fpError)
+ {
+ //fclose(fpError);
+ FILE* fpErr = fopen(errorFile.mb_str(), "r");
+ if (fpErr)
+ {
+ char buffer[4098];
+ wxString errorMsg = wxEmptyString;
+ while (!feof(fpErr))
+ {
+ if (fgets(buffer, 4096, fpErr) != NULL)
+ errorMsg += wxString(buffer, wxConvLibc);
+ }
+
+ if (errorMsg != wxEmptyString) {
+ wxString errmsg =
+ wxString::Format(
+ _("Script Error: \n%s\n"),
+ errorMsg.c_str());
+ LogMessage(errmsg, LOG_WARNING);
+ output += wxT("\n") + errmsg;
+ }
+
+ fclose(fpErr);
+ }
+ wxRemoveFile(errorFile);
+ }
+
// Delete the file/directory. If we fail, don't overwrite the script output in the log, just throw warnings.
if (!wxRemoveFile(filename))
{

@ -24,7 +24,13 @@ DEPEND="${RDEPEND}"
S="${WORKDIR}/${MY_PN}-${PV}-Source"
PATCHES=( "${FILESDIR}/postgres-10-build-fix.patch" )
PATCHES=(
"${FILESDIR}/fix-dbconn-getlasterror-crash.patch"
"${FILESDIR}/save-stderr-jobstep-output.patch"
"${FILESDIR}/add-log-timestamps.patch"
"${FILESDIR}/fix-job-success-test.patch"
"${FILESDIR}/postgres-10-build-fix.patch"
)
src_prepare() {
default

@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
systemd user versionator
KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
SLOT="$(get_version_component_range 1-2)"

@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
systemd user versionator
KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
SLOT="$(get_version_component_range 1-2)"

@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
systemd user versionator
KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
SLOT="$(get_version_component_range 1-2)"

@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
systemd user versionator
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
SLOT="$(get_version_component_range 1-2)"

@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
systemd user versionator
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
SLOT="$(get_version_component_range 1-2)"

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save