root
3 years ago
parent
fde6c8f891
commit
0dd89ba238
Binary file not shown.
Binary file not shown.
@ -1,2 +1,3 @@
|
||||
DIST ansible-base-2.10.10.tar.gz 5986488 BLAKE2B 5c793d25ac5a216d05e15f49cd447cbdfb2ef97c2881bca60be5c23e3245262e15304a63431704d8b69fff56594e25517c0e5e1f2641b3eca5ad6a1e76e4d7b3 SHA512 b599b498a20b77cd3346f5b865b5a0436cdd835af250e8cc4ed20d61ac6a4929bf4ceef9a95c6e7b8e825c5f513d33ea32b24661c58e2f1d285db0569d71fc1b
|
||||
DIST ansible-base-2.10.9.tar.gz 6039597 BLAKE2B de455cc402ae4c5c4acd6b1c3d3f2e16572d4a4e79c5f3e4151ec8b913a3be0cfbcb42e5743fe627b7aba9b0e6b004189960cd5a17ff46166cd033a952d3c560 SHA512 093514230a3f6680ddeda07c24e77c2e793475895f44da6e5dd68335341d6fefe10091a124cf84e18475257a099b39fd2c16e6fc0dae0bbaf2d26e70b09c277a
|
||||
DIST ansible-core-2.11.1.tar.gz 6148111 BLAKE2B 46b1553542adbebfb0b0756be99a81d20cce2978a59766c65632b40413a851ad3c9de12df67959c0557584c5209ecd4f3c94381ae0a1e6987bd3cfb237de5a85 SHA512 1362754dde0a88ca8f6323d87cc6f4bf5f93b189b8d45fcb435d3fb289c359da128e7688a92107ade2c54828d4c4deb3ded9e01e18d19c503306924aa189a381
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
DIST ansible-2.10.7.tar.gz 29862966 BLAKE2B fa86deaac034adc8e02f91cbf4b63ca718d50376cab19e156c85f8372c1787275e2ce24840fc3cbad2b9191146c785feafcf024a0c14052ee39a839390cc1319 SHA512 7a6522bcc57c178c9c6e87e313f6f175d5c74ac0d1b9dd0cad5506c7fa0efb16d4a627dc2d9c73f988177544bd9ccfdbec162d0feacc757edeb20280d7414191
|
||||
DIST ansible-core-2.11.1.tar.gz 6148111 BLAKE2B 46b1553542adbebfb0b0756be99a81d20cce2978a59766c65632b40413a851ad3c9de12df67959c0557584c5209ecd4f3c94381ae0a1e6987bd3cfb237de5a85 SHA512 1362754dde0a88ca8f6323d87cc6f4bf5f93b189b8d45fcb435d3fb289c359da128e7688a92107ade2c54828d4c4deb3ded9e01e18d19c503306924aa189a381
|
||||
DIST ansible-4.1.0.tar.gz 33999079 BLAKE2B b7c512ed01f220dbfdd5c90cd67c88cc3b50dce5a83a783b798afafe88d75d96ae7abd9a512a1d4fc4e1ad0305c72e6d2b4ebe3811addf78faf2d14dab7dd188 SHA512 603a5aa6b63d447efcb6e2f04f40c1bf5d7cc888f344bdc00ca3f9bca92c406554328a0e77cf3d5f2633addc9d6459d7b9d9176d14ecc506c67013fc8180b0c0
|
||||
|
||||
@ -0,0 +1,25 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python3_{8..9} )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Model-driven deployment, config management, and command execution framework"
|
||||
HOMEPAGE="https://www.ansible.com/"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-3+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
|
||||
RESTRICT="test"
|
||||
|
||||
RDEPEND=">=app-admin/ansible-base-2.11.1
|
||||
<app-admin/ansible-base-2.12"
|
||||
|
||||
python_compile() {
|
||||
local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
|
||||
distutils-r1_python_compile
|
||||
}
|
||||
@ -1,2 +1,3 @@
|
||||
DIST syslog-ng-3.30.1.tar.gz 5707042 BLAKE2B 3e6ee58b3732ae4863de43c7d22799a74074e94dbbf735368c09c11382b641a5554a4a25ad836b4ac25c8a4f64781dbfb1d9ddd6961ba3aa70c4213cfec81bfd SHA512 ac7ed4978c6db9464add30aa7aeb71a646f841593b02884c8d4ad34c0508c8d3243bcbe6ee98e81c04698895305334eadd9e624ba71e510c14d79155723efb52
|
||||
DIST syslog-ng-3.31.2.tar.gz 5727835 BLAKE2B a71190fe1580702a4d904c8a4d31a123d2aa0d01bb5a6e21f32f8502ec99f6109b45537c1a5022b0baeae89456b4b919bb8c88077d00aa9724398b7588254d89 SHA512 22a647c37f87fb1a45c8c69c2b0a022d1886cde5b0d585c3384b606d967c3f320a18e34810655174e82c797c0dc23c481732ecefd5be16da8fba4983b2ed0385
|
||||
DIST syslog-ng-3.32.1.tar.gz 5782744 BLAKE2B 43600ac7bf3bcd090353aa5a3d3b3c7701b8794328a111a0ef306dffbf5462880ef3e86f4f8b63580402848b7a4e333112ae1c5514c5e8d41103db4a0d4de159 SHA512 c5a72e4815c2791cb609cbb93993cbb2c52f3ac869e062984b6a359f11232f523c5db3555857f0fef0071764a677f1efdb2aa1f24b4abe7cea13590973d09280
|
||||
|
||||
@ -0,0 +1,173 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python3_{7..10} )
|
||||
inherit autotools python-single-r1 systemd
|
||||
|
||||
MY_PV_MM=$(ver_cut 1-2)
|
||||
DESCRIPTION="syslog replacement with advanced filtering features"
|
||||
HOMEPAGE="https://syslog-ng.com/open-source-log-management"
|
||||
SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2+ LGPL-2.1+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
|
||||
IUSE="amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd"
|
||||
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
|
||||
test? ( python )"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-libs/glib-2.10.1:2
|
||||
>=dev-libs/ivykis-0.42.4
|
||||
>=dev-libs/libpcre-6.1:=
|
||||
!dev-libs/eventlog
|
||||
amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] )
|
||||
caps? ( sys-libs/libcap )
|
||||
dbi? ( >=dev-db/libdbi-0.9.0 )
|
||||
geoip2? ( dev-libs/libmaxminddb:= )
|
||||
http? ( net-misc/curl )
|
||||
json? ( >=dev-libs/json-c-0.9:= )
|
||||
kafka? ( >=dev-libs/librdkafka-1.0.0:= )
|
||||
mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 )
|
||||
python? ( ${PYTHON_DEPS} )
|
||||
redis? ( >=dev-libs/hiredis-0.11.0:= )
|
||||
smtp? ( >=net-libs/libesmtp-1.0.6_p20200824:= )
|
||||
snmp? ( net-analyzer/net-snmp:0= )
|
||||
spoof-source? ( net-libs/libnet:1.1= )
|
||||
systemd? ( sys-apps/systemd:= )
|
||||
tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
|
||||
dev-libs/openssl:0="
|
||||
DEPEND="${RDEPEND}
|
||||
test? ( dev-libs/criterion )"
|
||||
BDEPEND="
|
||||
sys-devel/flex
|
||||
virtual/pkgconfig"
|
||||
|
||||
DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc}
|
||||
contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened"
|
||||
"${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" )
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-3.28.1-net-snmp.patch
|
||||
"${FILESDIR}"/${PN}-3.30.1-esmtp-pkgconfig.patch
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
use python && python-single-r1_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
local f
|
||||
|
||||
use python && python_fix_shebang .
|
||||
|
||||
# remove bundled libs
|
||||
rm -r lib/ivykis || die
|
||||
|
||||
# drop scl modules requiring json
|
||||
if use !json; then
|
||||
sed -i -r '/cim|elasticsearch|ewmm|graylog2|loggly|logmatic|netskope|nodejs|osquery|slack/d' scl/Makefile.am || die
|
||||
fi
|
||||
|
||||
# drop scl modules requiring http
|
||||
if use !http; then
|
||||
sed -i -r '/slack|telegram/d' scl/Makefile.am || die
|
||||
fi
|
||||
|
||||
# use gentoo default path
|
||||
if use systemd; then
|
||||
sed -e 's@/etc/syslog-ng.conf@/etc/syslog-ng/syslog-ng.conf@g;s@/var/run@/run@g' \
|
||||
-i contrib/systemd/syslog-ng@default || die
|
||||
fi
|
||||
|
||||
for f in syslog-ng.logrotate.hardened.in syslog-ng.logrotate.in; do
|
||||
sed \
|
||||
-e "s#@GENTOO_RESTART@#$(usex systemd "systemctl kill -s HUP syslog-ng@default" \
|
||||
"/etc/init.d/syslog-ng reload")#g" \
|
||||
"${FILESDIR}/${f}" > "${T}/${f/.in/}" || die
|
||||
done
|
||||
|
||||
for f in syslog-ng.conf.gentoo.hardened.in \
|
||||
syslog-ng.conf.gentoo.in; do
|
||||
sed -e "s/@SYSLOGNG_VERSION@/${MY_PV_MM}/g" "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die
|
||||
done
|
||||
|
||||
default
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf=(
|
||||
--disable-docs
|
||||
--disable-java
|
||||
--disable-java-modules
|
||||
--disable-riemann
|
||||
--enable-manpages
|
||||
--localstatedir=/var/lib/syslog-ng
|
||||
--sysconfdir=/etc/syslog-ng
|
||||
--with-embedded-crypto
|
||||
--with-ivykis=system
|
||||
--with-module-dir=/usr/$(get_libdir)/syslog-ng
|
||||
--with-pidfile-dir=/var/run
|
||||
--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
|
||||
$(use_enable amqp)
|
||||
$(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client)
|
||||
$(use_enable caps linux-caps)
|
||||
$(use_enable dbi sql)
|
||||
$(use_enable geoip2)
|
||||
$(use_enable http)
|
||||
$(use_enable ipv6)
|
||||
$(use_enable json)
|
||||
$(use_enable kafka)
|
||||
$(use_enable mongodb)
|
||||
$(usex mongodb --with-mongoc=system "--without-mongoc --disable-legacy-mongodb-options")
|
||||
$(use_enable pacct)
|
||||
$(use_enable python)
|
||||
$(use_enable redis)
|
||||
$(use_enable smtp)
|
||||
$(use_enable snmp afsnmp)
|
||||
$(use_enable spoof-source)
|
||||
$(use_enable systemd)
|
||||
$(use_enable tcpd tcp-wrapper)
|
||||
)
|
||||
|
||||
econf "${myconf[@]}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
# Install default configuration
|
||||
insinto /etc/default
|
||||
doins contrib/systemd/syslog-ng@default
|
||||
|
||||
insinto /etc/syslog-ng
|
||||
newins "${T}/syslog-ng.conf.gentoo" syslog-ng.conf
|
||||
|
||||
insinto /etc/logrotate.d
|
||||
newins "${T}/syslog-ng.logrotate" syslog-ng
|
||||
|
||||
newinitd "${FILESDIR}/syslog-ng.rc" syslog-ng
|
||||
newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng
|
||||
keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
|
||||
find "${D}" -name '*.la' -delete || die
|
||||
|
||||
use python && python_optimize
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# bug #355257
|
||||
if ! has_version app-admin/logrotate ; then
|
||||
elog "It is highly recommended that app-admin/logrotate be emerged to"
|
||||
elog "manage the log files. ${PN} installs a file in /etc/logrotate.d"
|
||||
elog "for logrotate to use."
|
||||
fi
|
||||
|
||||
if use systemd; then
|
||||
ewarn "The service file for systemd has changed to support multiple instances."
|
||||
ewarn "To start the default instance issue:"
|
||||
ewarn "# systemctl start syslog-ng@default"
|
||||
fi
|
||||
}
|
||||
Binary file not shown.
@ -0,0 +1,32 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
DESCRIPTION="V.E.R.A. -- Virtual Entity of Relevant Acronyms for dict"
|
||||
HOMEPAGE="http://home.snafu.de/ohei/vera/vueber-e.html"
|
||||
SRC_URI="mirror://gnu/vera/vera-${PV}.tar.gz"
|
||||
S="${WORKDIR}/vera-${PV}"
|
||||
SLOT="0"
|
||||
LICENSE="FDL-1.3"
|
||||
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
|
||||
|
||||
DEPEND=">=app-text/dictd-1.5.5"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
PATCHES=( "${FILESDIR}/${P}-U+D7.patch" )
|
||||
|
||||
src_compile() {
|
||||
cat vera.[0-9a-z] | dictfmt -f -u http://home.snafu.de/ohei \
|
||||
-s "V.E.R.A. -- Virtual Entity of Relevant Acronyms" \
|
||||
vera || die
|
||||
dictzip -v vera.dict || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
insinto /usr/share/dict
|
||||
doins vera.dict.dz
|
||||
doins vera.index
|
||||
|
||||
dodoc changelog README
|
||||
}
|
||||
Binary file not shown.
@ -1 +1,2 @@
|
||||
DIST gummi-0.8.1.tar.gz 580887 BLAKE2B ce06df4e85e2dfd510e39aeab785d1289335802fd24fa0b25eb9a0b920849d7ab2b89d62509e91ddb41c8f4c601544f3da8819f69ff3e38fc59dbde0aa3e789d SHA512 dccef28f6ceb2743a5a44c5224cce7326e9bb9e6f1baccb51c23d801ce595914d1b960fe11d230dcad5f041d80fe57b46c0e5aa9c6abd881dd2e32db373d329a
|
||||
DIST gummi-0.8.2.tar.gz 595733 BLAKE2B 9c7366df2b8fe40f7876f065a1156eb4992048b3eaec5dde332c50ccb98ef2a5d8d2cbe73ebb56eb3736bbce49f3168f165db82f562ee7265ce0859952801a2c SHA512 3882f1e2779b94348cc0cc243c3968a78165c16de41029f9fcb8ba2fa942d329c43f5ecc8ba8327590e14343556ca472a51d1e824ce0985a415ab92aa2cbbc42
|
||||
|
||||
@ -0,0 +1,45 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit xdg-utils
|
||||
|
||||
DESCRIPTION="Simple LaTeX editor for GTK+ users"
|
||||
HOMEPAGE="https://github.com/alexandervdm/gummi"
|
||||
SRC_URI="https://github.com/alexandervdm/${PN}/releases/download/${PV}/${P}.tar.gz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm64 ~x86"
|
||||
|
||||
RDEPEND="
|
||||
app-text/gtkspell:3
|
||||
app-text/poppler[cairo]
|
||||
dev-libs/glib:2
|
||||
dev-texlive/texlive-latex
|
||||
dev-texlive/texlive-latexextra
|
||||
x11-libs/gtk+:3
|
||||
x11-libs/gtksourceview:3.0
|
||||
x11-libs/pango
|
||||
"
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
"
|
||||
BDEPEND="
|
||||
dev-util/intltool
|
||||
sys-devel/gettext
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
pkg_postinst() {
|
||||
xdg_desktop_database_update
|
||||
|
||||
elog "Gummi supports spell-checking through gtkspell. Support for"
|
||||
elog "additional languages can be added by installing myspell-**-"
|
||||
elog "packages for your language of choice."
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
xdg_desktop_database_update
|
||||
}
|
||||
@ -1,3 +1,3 @@
|
||||
DIST nano-5.3.tar.gz 2874796 BLAKE2B d266018f2508153369e10c6f9cf4c53eaeafdf0efe88da6de19efd76ef13fedebe4b9339ae594b751a12cf18a8c4dcd57466ceedfabf61406f63b69c75fceff1 SHA512 019b58779f5a7d9a9472b415715876d0daac313a02b794900339469ee0b5a27ce202e397c00ad6396b7e26a7c303e52c28d981fff85cf774c79a5a8a9835836d
|
||||
DIST nano-5.6.1.tar.gz 2957693 BLAKE2B dbd1a63b6e0997a30a2ef40ad3248a7f53e2613d4662d5b9fc585bd0e2dfe78f8e8c71354e1a5bbf043ca99e0a69742df7846656d1f0706af79bcbfc53b6d1a6 SHA512 e27ca4411472409bd6ff8d812405e4d8aa869c1348c0a6adbb1c538fb5bdd112b322ef6d8a13df0b43c472d925b94111ac676d03f360d79181dee335a4fd09cf
|
||||
DIST nano-5.7.tar.gz 2989413 BLAKE2B 604f3140bd963661bb7d13933b5bac867bcfd90635287dc8f160e4bda094641c20f2fe2157fe1b5eda28842f78c4e651a354ed6edcafe67b4f2bf6c9eda0051c SHA512 f6d580918c488b15a5f8f77b4b52ea3e86535c251fe32dd978bae014bcadd543a5696f7741018ffd05b6271c1defe6a67687577f3cfe059ed2b4d3e422b2a694
|
||||
DIST nano-5.8.tar.gz 3038948 BLAKE2B 126976539e8ab3a7be986edc7422bc58d31e0c81dffbf34c9b701d09d268233ed0de4f07ac8d2dd0963b768cce4e2afe89a4f8ed9fd216a71ebac98c7f403deb SHA512 dd3a7e328f256052707c4d28f2ca32f9e44de123e3dee3c0747fbab222d215b2a895c403b9274fd286e19477b8be3314fc83167eec32194370105b1e70c05a3f
|
||||
|
||||
@ -1,3 +1,6 @@
|
||||
DIST vscode-1.56.2-amd64.tar.gz 104824843 BLAKE2B 608cc74daad0534a91d3c6200827b82efa0c2a9634c3cd9f031d4744a35f25c5201a7310011d6dfe57f761845e79574d068678a4500650c47d8404d2bd810f4d SHA512 35ef320b92a66d05a8c2b61a81978d659245f37ef0b2f05002083386a265a232ed163dcc06ddee9bc2bc8f1205fa80e7841268bf66fdddcabe4a8ed35fb50a35
|
||||
DIST vscode-1.56.2-arm.tar.gz 95395040 BLAKE2B e948f09a97a39f898276fe4bbc9f7f35fa96b833732a48058e402aaa0246790d79c5422f5e209c842b94c6c46d19b657cdeefa9caa1e255331f81e91e0760c69 SHA512 4486d030d2d611aa0d29a156ba5c2beb2bd0ab1950684c7bdea44460fb05f3a18b62419c346d99a84cd71bb595f7802dab10730b40600879e442ee3181129e6f
|
||||
DIST vscode-1.56.2-arm64.tar.gz 110174990 BLAKE2B 3b512136911b3ca431fbf71951655490c85f1c7cc707c6ddea3fd4d41b956fbf33dd8264e279d1d6e69564506aefcd9588397665133a3a34997d916605c9aa73 SHA512 bc3fb6b78e33286486411aa78b538693c371b309e86a84ee7361a2fd78d2d8e0dd4e9dd761f9278ced4e3a31a532e2534cdde001635935dfda92dfab85eb9e51
|
||||
DIST vscode-1.57.0-amd64.tar.gz 104867323 BLAKE2B 4c96f1c67c2414f84e51f2589cd511d060fbb19f662b0d4230fc8d6decbc6fd1d7cfffcb6a3d005e53a71af35ee16db4222dd2b8a2f9e6aba92c365baaf1b271 SHA512 35c5590b526c7df5ede6184481568d349ad239c1442a88c78cb5c11c1e7d50ebd34f1cf8faaa87eee3da32e15a56e733734e850d25ab91b8c24168002a2c58d2
|
||||
DIST vscode-1.57.0-arm.tar.gz 95405275 BLAKE2B 97e53cf478257a000a25fd7adcd79a43ef69034bc4fc82a74c4d327a9c0015a4d1247afa3440f7ad1b9316f307022c68056675a614ab5b77c98f26063cd56d29 SHA512 64122bff910139904791e0ce4287da6c46dc0c439313f5f25c2b03afa87a7e0c2031c65497ceabe9f4592c3060ddb18dc6a473b3a78812505163a2d52a82e408
|
||||
DIST vscode-1.57.0-arm64.tar.gz 110191475 BLAKE2B 667385cb94029a5c4eee383f8f7ebcb01f9090f1178fc8b57a74595ee6766b8d3121cacf5f03e044b972d20c0a51064d5f4b740146399454c0048909e645a74c SHA512 0d46c3bebe4363e5681d7cd8b73844654b7d993df3d89a537041acc9a3f3a00d77f537088c275d38f395d8aa4d4bd216df75388829e9340598465ee290ff06df
|
||||
|
||||
@ -0,0 +1,103 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit desktop pax-utils xdg
|
||||
|
||||
DESCRIPTION="Multiplatform Visual Studio Code from Microsoft"
|
||||
HOMEPAGE="https://code.visualstudio.com"
|
||||
SRC_URI="
|
||||
amd64? ( https://update.code.visualstudio.com/${PV}/linux-x64/stable -> ${P}-amd64.tar.gz )
|
||||
arm? ( https://update.code.visualstudio.com/${PV}/linux-armhf/stable -> ${P}-arm.tar.gz )
|
||||
arm64? ( https://update.code.visualstudio.com/${PV}/linux-arm64/stable -> ${P}-arm64.tar.gz )
|
||||
"
|
||||
S="${WORKDIR}"
|
||||
|
||||
RESTRICT="mirror strip bindist"
|
||||
|
||||
LICENSE="
|
||||
Apache-2.0
|
||||
BSD
|
||||
BSD-1
|
||||
BSD-2
|
||||
BSD-4
|
||||
CC-BY-4.0
|
||||
ISC
|
||||
LGPL-2.1+
|
||||
Microsoft-vscode
|
||||
MIT
|
||||
MPL-2.0
|
||||
openssl
|
||||
PYTHON
|
||||
TextMate-bundle
|
||||
Unlicense
|
||||
UoI-NCSA
|
||||
W3C
|
||||
"
|
||||
SLOT="0"
|
||||
KEYWORDS="-* ~amd64 ~arm ~arm64"
|
||||
|
||||
RDEPEND="
|
||||
app-accessibility/at-spi2-atk
|
||||
app-crypt/libsecret[crypt]
|
||||
dev-libs/nss
|
||||
media-libs/alsa-lib
|
||||
media-libs/libpng:0/16
|
||||
x11-libs/cairo
|
||||
x11-libs/gtk+:3
|
||||
x11-libs/libnotify
|
||||
x11-libs/libxkbcommon
|
||||
x11-libs/libxkbfile
|
||||
x11-libs/libXScrnSaver
|
||||
x11-libs/libXtst
|
||||
x11-libs/pango
|
||||
"
|
||||
|
||||
QA_PREBUILT="
|
||||
/opt/vscode/code
|
||||
/opt/vscode/libEGL.so
|
||||
/opt/vscode/libffmpeg.so
|
||||
/opt/vscode/libGLESv2.so
|
||||
/opt/vscode/libvulkan.so*
|
||||
/opt/vscode/chrome-sandbox
|
||||
/opt/vscode/libvk_swiftshader.so
|
||||
/opt/vscode/swiftshader/libEGL.so
|
||||
/opt/vscode/swiftshader/libGLESv2.so
|
||||
/opt/vscode/resources/app/extensions/*
|
||||
/opt/vscode/resources/app/node_modules.asar.unpacked/*
|
||||
"
|
||||
|
||||
src_install() {
|
||||
if use amd64; then
|
||||
cd "${WORKDIR}/VSCode-linux-x64" || die
|
||||
elif use arm; then
|
||||
cd "${WORKDIR}/VSCode-linux-armhf" || die
|
||||
elif use arm64; then
|
||||
cd "${WORKDIR}/VSCode-linux-arm64" || die
|
||||
else
|
||||
die "Visual Studio Code only supports amd64, arm and arm64"
|
||||
fi
|
||||
|
||||
# Cleanup
|
||||
rm -r ./resources/app/LICENSES.chromium.html ./resources/app/LICENSE.rtf ./resources/app/licenses || die
|
||||
|
||||
# Install
|
||||
pax-mark m code
|
||||
insinto "/opt/${PN}"
|
||||
doins -r *
|
||||
fperms +x /opt/${PN}/{,bin/}code
|
||||
fperms +x /opt/${PN}/chrome-sandbox
|
||||
fperms -R +x /opt/${PN}/resources/app/out/vs/base/node
|
||||
fperms +x /opt/${PN}/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg
|
||||
dosym "../../opt/${PN}/bin/code" "usr/bin/vscode"
|
||||
domenu "${FILESDIR}/vscode.desktop"
|
||||
domenu "${FILESDIR}/vscode-url-handler.desktop"
|
||||
newicon "resources/app/resources/linux/code.png" "vscode.png"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
xdg_pkg_postinst
|
||||
elog "You may want to install some additional utils, check in:"
|
||||
elog "https://code.visualstudio.com/Docs/setup#_additional-tools"
|
||||
}
|
||||
@ -1,3 +1,6 @@
|
||||
DIST vscodium-1.56.2-amd64.tar.gz 108032091 BLAKE2B e6d66885f79a8f29e9316cf759d6b562029a3da9c3fc6d14742adda0ae20e4be05b6c08f8c1698f3340cd0ca97836c49d3ef82bca9a27318d5f6d5e36555455d SHA512 831444221a3055fde829920ad6c0b8c007aa539b614918b20af0e676ecd31f341497f9c7fb8d8fe95f757bc360446cac93e00ee1a828183e0feb1eefad1e0c11
|
||||
DIST vscodium-1.56.2-arm.tar.gz 96683293 BLAKE2B bdc6b89ebfa9e1be765aef63f8a2bcdbf2074b64d70833447b3a3caf148c7887c672077827b7467a681219eef0101bdf82581f589586a263397d2cc9951a8c0c SHA512 023c59d4ae6590437c9425fa02f70cd957c125ea69cfa1c4fe8812f2b7521b747421efe89fd3e4bd95b54f0bdea177941f72467af5d8036d51426b8139a48fc2
|
||||
DIST vscodium-1.56.2-arm64.tar.gz 113358341 BLAKE2B f7f8c8589985edd11ba80b4fff9ab1174d436a2516eabc02cd6b3f5d03559295f3fe6772a16e6825d6a23953107b5b7537ab28cedc040a8b35a4b25182ee8d29 SHA512 f0aec2074e93bc26cfc615029bbc9ab360993f00a70272002982c058c7746824f6d97fffb34a5d6c16597b4ad8453730f28b04c11e4d0fd8ccea873490b260d5
|
||||
DIST vscodium-1.57.0-amd64.tar.gz 107752144 BLAKE2B c7f6f07a526e25b52f5a93eecdcf285f32bf5af38ff4e0b4882303078c110555134e37d85fad01d92970758e867e17e199586878a0a3abebd6fc18866d1c557a SHA512 e58d6161cff2ab0ef206ae629c65d03a947cc9112826a880f86c296d19462edf03e66c2d17399268b32aed597ea688f93b20cade8aac79d97871306c4d967073
|
||||
DIST vscodium-1.57.0-arm.tar.gz 96394761 BLAKE2B 3fc3ab8d4be7343cc8597cf9c09a13e1e28a1bfce12b19a11f5bdf46c1d6931c12718306f19c78fd7c567b622bf40434165009b0b0b6b9de3b86005833188511 SHA512 d7eb1776ceedd0072b039a04ec194779d6c27decc92d311cc9bd8c630b776ec1c85e46b8c3afe93c3cae904f27a2e05d69c6ca4155cae6a90c44570f59afedb2
|
||||
DIST vscodium-1.57.0-arm64.tar.gz 113075134 BLAKE2B eeead9b70a8e7b353ac744b65b3854ce5954f242a777e974ba4c8a586aa8c99d6dc5ee793e01568275a3edc48f8287ee3c3c8d1ae6b3c54b9df8913d4f32f96d SHA512 0c8a282b36ec3067246b590c241b3301a623cc9b0bd15bdbc3a2ad6303399c24bb721264ea69f4342717d8ad29046e6ed25ff6b3449923a315e2df2ccc85e0db
|
||||
|
||||
@ -0,0 +1,95 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit desktop pax-utils xdg
|
||||
|
||||
DESCRIPTION="A community-driven, freely-licensed binary distribution of Microsoft's VSCode"
|
||||
HOMEPAGE="https://vscodium.com/"
|
||||
SRC_URI="
|
||||
amd64? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-x64-${PV}.tar.gz -> ${P}-amd64.tar.gz )
|
||||
arm? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-armhf-${PV}.tar.gz -> ${P}-arm.tar.gz )
|
||||
arm64? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-arm64-${PV}.tar.gz -> ${P}-arm64.tar.gz )
|
||||
"
|
||||
|
||||
RESTRICT="mirror strip bindist"
|
||||
|
||||
LICENSE="
|
||||
Apache-2.0
|
||||
BSD
|
||||
BSD-1
|
||||
BSD-2
|
||||
BSD-4
|
||||
CC-BY-4.0
|
||||
ISC
|
||||
LGPL-2.1+
|
||||
MIT
|
||||
MPL-2.0
|
||||
openssl
|
||||
PYTHON
|
||||
TextMate-bundle
|
||||
Unlicense
|
||||
UoI-NCSA
|
||||
W3C
|
||||
"
|
||||
SLOT="0"
|
||||
KEYWORDS="-* ~amd64 ~arm ~arm64"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
app-accessibility/at-spi2-atk
|
||||
app-crypt/libsecret[crypt]
|
||||
dev-libs/nss
|
||||
media-libs/alsa-lib
|
||||
media-libs/libpng:0/16
|
||||
net-print/cups
|
||||
x11-libs/cairo
|
||||
x11-libs/gtk+:3
|
||||
x11-libs/libnotify
|
||||
x11-libs/libxkbcommon
|
||||
x11-libs/libxkbfile
|
||||
x11-libs/libXScrnSaver
|
||||
x11-libs/libXtst
|
||||
x11-libs/pango
|
||||
"
|
||||
|
||||
QA_PREBUILT="
|
||||
/opt/vscodium/codium
|
||||
/opt/vscodium/libEGL.so
|
||||
/opt/vscodium/libffmpeg.so
|
||||
/opt/vscodium/libGLESv2.so
|
||||
/opt/vscodium/libvulkan.so*
|
||||
/opt/vscodium/chrome-sandbox
|
||||
/opt/vscodium/libvk_swiftshader.so
|
||||
/opt/vscodium/swiftshader/libEGL.so
|
||||
/opt/vscodium/swiftshader/libGLESv2.so
|
||||
/opt/vscodium/resources/app/extensions/*
|
||||
/opt/vscodium/resources/app/node_modules.asar.unpacked/*
|
||||
"
|
||||
|
||||
S="${WORKDIR}"
|
||||
|
||||
src_install() {
|
||||
# Cleanup
|
||||
rm "${S}/resources/app/LICENSE.txt" || die
|
||||
|
||||
# Install
|
||||
pax-mark m codium
|
||||
insinto "/opt/${PN}"
|
||||
doins -r *
|
||||
fperms +x /opt/${PN}/{,bin/}codium
|
||||
fperms +x /opt/${PN}/chrome-sandbox
|
||||
fperms -R +x /opt/${PN}/resources/app/out/vs/base/node
|
||||
fperms +x /opt/${PN}/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg
|
||||
dosym "../../opt/${PN}/bin/codium" "usr/bin/vscodium"
|
||||
domenu "${FILESDIR}/vscodium.desktop"
|
||||
domenu "${FILESDIR}/vscodium-url-handler.desktop"
|
||||
newicon "resources/app/resources/linux/code.png" "vscodium.png"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
xdg_pkg_postinst
|
||||
elog "When compared to the regular VSCode, VSCodium has a few quirks"
|
||||
elog "More information at: https://github.com/VSCodium/vscodium/blob/master/DOCS.md"
|
||||
}
|
||||
Binary file not shown.
@ -1 +1 @@
|
||||
DIST jpipe-0.0.1.tar.gz 4567 BLAKE2B 0c33e36ed03373ef2a030aa2ac0ecc6e05c0683f04bf4c96eeec0cc07b75a16e3c805bc9c59b6cf7fd6aa9e65dc639dbc1e496d4084bb4b74835ea0c3043c8be SHA512 8cd7f9ff5138f55c13497a0059d32fdde6d6e698020e9ea231ed0431e76e97b2769f781e8a58ec636cadfe110f84f940161cbfa212cfa2f805e18e92a7e0d310
|
||||
DIST jpipe-0.1.3.1.tar.gz 5957 BLAKE2B ce7570006aa40ca61939c59a93608569898b0327d10a3ebce85e44ca33175a1fcf8412740008a648865ce5098594318154ad415505ed3167664c8726827402c7 SHA512 4dd90c4d59f1a3ca8a2417a20b95db9bb949c380104030a35053edb5e1c3a1bc73d28725cc18c0a3384181899198837f4d4abedaf9c7e374ec905e42ce1af4f6
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
DIST tmuxp-1.5.4.tar.gz 843048 BLAKE2B 863b428198e8bb2895802ba7365ac2ec43fc75c708b41929934b6803c79b8f6436b5233ad567f1ab010e6ae372d89261a7ee19953fa01ab9defd1e290b6da621 SHA512 f6fdecff23de883076461fcef3fb1555242d8a96f1c05c88fd0fb3216bbb99fb321680f484972b10f54ff87eb032d8627397f76960262612954eaab6bbf7c7a9
|
||||
DIST tmuxp-1.6.5.tar.gz 1017117 BLAKE2B 4cc8955f9dcfffd237ffde3e7487496aaf85dd886fd124ad76d61e10fa64f90bac79cc4df9aac63122446b7a4727b01ceaea502d7bbe5f5ba7f68e89bbb86feb SHA512 9095c196f20b537662ffa9d819c675e325fda7f49fb3fd9811f00fc1e1c763b7ea29cdd500bb7d775d1673ab2fc1386f662a2ff6744ffcd2b7aaab13a014cce3
|
||||
DIST tmuxp-1.7.2.tar.gz 1027293 BLAKE2B 2564d196c9c327584d24f57ce72165a7cdff2209fe6869a4d3519eb0246329cd8159ecaa20c2a39e153bde224201b1f846f4244c4df72ac540cf0d71f9fba75a SHA512 2ccf63c9f5b7049438ca6079894aac92a0f7496a56c68d88e5a9d5c2a42188a4e40d559792857881f492b28392a329697d4d43781f38ee7c49ed592aac8a69f8
|
||||
DIST tmuxp-1.8.1.tar.gz 1019728 BLAKE2B 2bf5a1964cf2d29e41c387e69019a5fae533eed70a578a3a6259a46a541ce22462d4b43326f3df7ded9afc0b5a685bd02a83e3633ed795687ba7bf0903bff866 SHA512 a414721fd9f976a9059cbb6e289aee67154df09f9437f78f97ae82b07af7fbbe67d72ed10272401fa5373643ff2a8946abcafd1c6d2098d7f1fde8364281dff3
|
||||
|
||||
@ -0,0 +1,43 @@
|
||||
# Copyright 2019-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python3_{7..10} pypy3 )
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="tmux session manager. built on libtmux"
|
||||
HOMEPAGE="https://tmuxp.git-pull.com"
|
||||
SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
|
||||
|
||||
RDEPEND="
|
||||
>=app-misc/tmux-3.0a
|
||||
>=dev-python/kaptan-0.5.10[${PYTHON_USEDEP}]
|
||||
>=dev-python/libtmux-0.9[${PYTHON_USEDEP}]
|
||||
<dev-python/libtmux-0.10[${PYTHON_USEDEP}]
|
||||
>=dev-python/click-7.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/colorama-0.3.9[${PYTHON_USEDEP}]
|
||||
"
|
||||
BDEPEND="
|
||||
test? (
|
||||
dev-python/mock[${PYTHON_USEDEP}]
|
||||
>=dev-python/pytest-rerunfailures-4.2[${PYTHON_USEDEP}]
|
||||
!dev-python/flaky
|
||||
)
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/tmuxp-1.6.4-tests.patch"
|
||||
"${FILESDIR}/tmuxp-1.7.2-tests.patch"
|
||||
"${FILESDIR}/tmuxp-1.7.2-relax-click-dep.patch"
|
||||
)
|
||||
|
||||
distutils_enable_tests pytest
|
||||
|
||||
python_test() {
|
||||
SHELL="/bin/bash" epytest
|
||||
}
|
||||
Binary file not shown.
@ -1 +1,2 @@
|
||||
DIST commoncpp2-1.8.1-patches-r1.txz 7144 BLAKE2B 0d464810afc9aab2b198495789ecfe4c84fab9edf33f85523dc711602a2f1c08c24a5c2cd7fd92ef799e049624159eb373a2accff193ddec1413fc9aa4450a4e SHA512 d8df95b0963a47c7049fe80b21dadd004f0d4a4498139d629dcc65034211e58e2dffa5e2e6ab61eba10b265f2737eb6a78c0c92b6ec13ae50ab5826bf6e4d68b
|
||||
DIST commoncpp2-1.8.1.tar.gz 908678 BLAKE2B 93868286230b4b0507127627f0a1c24b4f340e4af50d7592774b57bfc7a8f1e31bacc0cee5d17b4237aac85be0265cf3aabd65708e988159daaac85b4145c398 SHA512 949823461d20429c2b0acfa22554a5a9dacc977e3ee097f34416f65d322df84fbdb27c644435c6c6caaed800347dfbe789cee7f19b39b306165c97b4f4012bfe
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
http://bugs.gentoo.org/334135
|
||||
|
||||
--- a/src/applog.cpp
|
||||
+++ b/src/applog.cpp
|
||||
@@ -44,6 +44,7 @@
|
||||
#include <cstdio>
|
||||
#include <stdarg.h>
|
||||
#include <errno.h>
|
||||
+#include <sys/stat.h>
|
||||
|
||||
// TODO sc: test if has to move up now that it is into commoncpp
|
||||
// NOTE: the order of inclusion is important do not move following include line
|
||||
@ -1,61 +0,0 @@
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -9,7 +9,8 @@
|
||||
# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
|
||||
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
|
||||
-AC_INIT(src/thread.cpp)
|
||||
+AC_INIT
|
||||
+AC_CONFIG_SRCDIR([src/thread.cpp])
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
m4_pattern_allow(LT_VERSION)
|
||||
|
||||
@@ -81,17 +82,17 @@
|
||||
AC_SUBST(ccincludedir)
|
||||
|
||||
AC_CONFIG_AUX_DIR(autoconf)
|
||||
-AC_CANONICAL_SYSTEM
|
||||
+AC_CANONICAL_TARGET
|
||||
AC_PROG_CPP
|
||||
AC_PROG_CC
|
||||
AC_PROG_CXXCPP
|
||||
AC_PROG_CXX
|
||||
OST_PROG_CC_POSIX
|
||||
NP_PROG_MSC
|
||||
-AC_LIBTOOL_WIN32_DLL
|
||||
-AM_PROG_LIBTOOL
|
||||
+
|
||||
+LT_INIT([win32-dll,disable-static])
|
||||
AM_INIT_AUTOMAKE(commoncpp2, [$VERSION])
|
||||
-AM_CONFIG_HEADER(config.h)
|
||||
+AC_CONFIG_HEADERS([config.h])
|
||||
|
||||
AC_C_RESTRICT
|
||||
AC_C_VOLATILE
|
||||
@@ -395,10 +396,11 @@
|
||||
#endif
|
||||
|
||||
])
|
||||
-
|
||||
+AC_ARG_WITH([doxygen],
|
||||
+ AS_HELP_STRING([--without-doxygen], [Do not build documentation]))
|
||||
AC_PATH_PROG(DOXYGEN, doxygen, no)
|
||||
AC_SUBST(DOXYGEN)
|
||||
-AM_CONDITIONAL(DOXY, test "$DOXYGEN" != "no")
|
||||
+AM_CONDITIONAL([DOXY], [test "x$with_doxygen" != "xno"])
|
||||
|
||||
AM_CONDITIONAL(GETOPT_LONG, [test ! -z "$LIBGETOPTOBJS"])
|
||||
|
||||
@@ -408,10 +410,11 @@
|
||||
AC_SUBST(LIB_VERSION)
|
||||
AC_SUBST(LIB_MAJOR)
|
||||
|
||||
-AC_OUTPUT([src/ccgnu2-config src/libccext2.pc src/libccgnu2.pc
|
||||
+AC_CONFIG_FILES([src/ccgnu2-config src/libccext2.pc src/libccgnu2.pc
|
||||
src/Makefile w32/Makefile w32/vs2008/Makefile w32/vs2008/ccext2.vcproj w32/vs2008/ccgnu2.vcproj w32/vs2008/common.sln m4/Makefile doc/Doxyfile
|
||||
doc/Makefile demo/Makefile inc/Makefile inc/cc++/Makefile Makefile
|
||||
commoncpp2.spec tests/Makefile commoncpp2.list w32/ccgnu2.dsp w32/ccext2.dsp w32/ccgnu2.vcproj w32/ccext2.vcproj])
|
||||
+AC_OUTPUT
|
||||
|
||||
# if test ! -f inc/cc++/thread.h ; then
|
||||
# cp ${srcdir}/inc/cc++/*.h inc/cc++ ; fi
|
||||
@ -1,14 +0,0 @@
|
||||
diff --git a/m4/ost_socket.m4 b/m4/ost_socket.m4
|
||||
index bd9db7c..122c938 100644
|
||||
--- a/m4/ost_socket.m4
|
||||
+++ b/m4/ost_socket.m4
|
||||
@@ -93,6 +93,9 @@ AC_DEFUN([OST_SYS_SOCKET],[
|
||||
AC_CHECK_HEADERS([linux/netfilter_ipv4.h linux/netfilter_ipv6.h],,,
|
||||
[#ifdef HAVE_LIMITS_H
|
||||
#include <limits.h>
|
||||
+ #endif
|
||||
+ #ifdef HAVE_NETINET_IN_H
|
||||
+ #include <netinet/in.h>
|
||||
#endif])
|
||||
if test "$ac_cv_header_linux_netfilter_ipv4_h" = "yes" &&
|
||||
[ test "$ac_cv_header_linux_netfilter_ipv6_h" = "yes" &&
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/src/inaddr.cpp b/src/inaddr.cpp
|
||||
index 5a4b9c4..50127f3 100644
|
||||
--- a/src/inaddr.cpp
|
||||
+++ b/src/inaddr.cpp
|
||||
@@ -333,7 +333,7 @@ void IPV4Address::setAddress(const char *host)
|
||||
if(ipaddr)
|
||||
delete[] ipaddr;
|
||||
ipaddr = new struct in_addr[1];
|
||||
- memset((void *)&ipaddr[0], 0, sizeof(ipaddr));
|
||||
+ memset((void *)&ipaddr[0], 0, sizeof(*ipaddr));
|
||||
return;
|
||||
}
|
||||
|
||||
@ -1,52 +0,0 @@
|
||||
Fix building with C++14, which errors out due changed noexcept()
|
||||
semantics for dtors caught by -Werror=terminate.
|
||||
|
||||
See also: https://bugs.gentoo.org/show_bug.cgi?id=595422
|
||||
|
||||
--- a/src/nat.cpp
|
||||
+++ b/src/nat.cpp
|
||||
@@ -145,11 +145,11 @@
|
||||
"nat lookup successful",
|
||||
"nat address not in table",
|
||||
"nat not supported/implemented",
|
||||
- "unable to open device "NAT_DEVICE,
|
||||
+ "unable to open device " NAT_DEVICE,
|
||||
"unable to get socket name",
|
||||
"unable to get peer name",
|
||||
"unable to get socket type",
|
||||
- "unable to lookup, nat "NAT_SYSCALL" failed",
|
||||
+ "unable to lookup, nat " NAT_SYSCALL " failed",
|
||||
"unkown nat error code"
|
||||
};
|
||||
|
||||
--- a/src/socket.cpp
|
||||
+++ b/src/socket.cpp
|
||||
@@ -2971,12 +2971,7 @@
|
||||
|
||||
TCPStream::~TCPStream()
|
||||
{
|
||||
-#ifdef CCXX_EXCEPTIONS
|
||||
- try { endStream(); }
|
||||
- catch( ... ) { if ( ! std::uncaught_exception()) throw;};
|
||||
-#else
|
||||
- endStream();
|
||||
-#endif
|
||||
+ endStream();
|
||||
}
|
||||
|
||||
#ifdef HAVE_GETADDRINFO
|
||||
--- a/src/ssl.cpp
|
||||
+++ b/src/ssl.cpp
|
||||
@@ -441,12 +441,7 @@
|
||||
|
||||
SSLStream::~SSLStream()
|
||||
{
|
||||
-#ifdef CCXX_EXCEPTIONS
|
||||
- try { endStream(); }
|
||||
- catch( ...) { if ( ! std::uncaught_exception()) throw;};
|
||||
-#else
|
||||
endStream();
|
||||
-#endif
|
||||
}
|
||||
|
||||
#ifdef CCXX_NAMESPACES
|
||||
@ -1,36 +0,0 @@
|
||||
From ba702b6034444c2e30b0990d06e28bb2dea8ecb7 Mon Sep 17 00:00:00 2001
|
||||
From: Alon Bar-Lev <alon.barlev@gmail.com>
|
||||
Date: Sat, 4 Mar 2017 01:36:23 +0200
|
||||
Subject: [PATCH] ssl: support gnutls-3.4
|
||||
|
||||
Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
|
||||
---
|
||||
src/ssl.cpp | 5 +----
|
||||
1 file changed, 1 insertion(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/ssl.cpp b/src/ssl.cpp
|
||||
index 5bf526d..38ef0a7 100644
|
||||
--- a/src/ssl.cpp
|
||||
+++ b/src/ssl.cpp
|
||||
@@ -344,9 +344,6 @@ ssize_t SSLStream::readData(void *target, size_t size, char separator, timeout_t
|
||||
#ifdef CCXX_GNUTLS
|
||||
bool SSLStream::getSession(void)
|
||||
{
|
||||
- const int cert_priority[3] =
|
||||
- {GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0};
|
||||
-
|
||||
if(ssl)
|
||||
return true;
|
||||
|
||||
@@ -362,7 +359,7 @@ bool SSLStream::getSession(void)
|
||||
|
||||
gnutls_set_default_priority(ssl->session);
|
||||
gnutls_certificate_allocate_credentials(&ssl->xcred);
|
||||
- gnutls_certificate_type_set_priority(ssl->session, cert_priority);
|
||||
+ gnutls_priority_set_direct(ssl->session, "NORMAL:+CTYPE-OPENPGP", NULL);
|
||||
gnutls_credentials_set(ssl->session, GNUTLS_CRD_CERTIFICATE, ssl->xcred);
|
||||
gnutls_transport_set_ptr(ssl->session, (gnutls_transport_ptr)so);
|
||||
if(gnutls_handshake(ssl->session)) {
|
||||
--
|
||||
2.10.2
|
||||
|
||||
@ -1,48 +0,0 @@
|
||||
--- a/src/ssl.cpp
|
||||
+++ b/src/ssl.cpp
|
||||
@@ -99,35 +99,7 @@
|
||||
return 0;
|
||||
}
|
||||
|
||||
-extern "C" {
|
||||
- static int _wrap_mutex_init(void **priv)
|
||||
- {
|
||||
- return _gcry_mutex_init((Mutex **)(priv));
|
||||
- }
|
||||
-
|
||||
- static int _wrap_mutex_destroy(void **priv)
|
||||
- {
|
||||
- return _gcry_mutex_destroy((Mutex **)(priv));
|
||||
- }
|
||||
-
|
||||
- static int _wrap_mutex_lock(void **priv)
|
||||
- {
|
||||
- return _gcry_mutex_lock((Mutex **)(priv));
|
||||
- }
|
||||
-
|
||||
- static int _wrap_mutex_unlock(void **priv)
|
||||
- {
|
||||
- return _gcry_mutex_unlock((Mutex **)(priv));
|
||||
- }
|
||||
-
|
||||
- static struct gcry_thread_cbs _gcry_threads =
|
||||
- {
|
||||
- GCRY_THREAD_OPTION_PTHREAD, NULL,
|
||||
- _wrap_mutex_init, _wrap_mutex_destroy,
|
||||
- _wrap_mutex_lock, _wrap_mutex_unlock
|
||||
- };
|
||||
-
|
||||
-};
|
||||
+GCRY_THREAD_OPTION_PTHREAD_IMPL;
|
||||
|
||||
#endif
|
||||
|
||||
@@ -135,7 +107,7 @@
|
||||
public:
|
||||
_ssl_global() {
|
||||
#ifndef WIN32
|
||||
- gcry_control(GCRYCTL_SET_THREAD_CBS, &_gcry_threads);
|
||||
+ gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
|
||||
#endif
|
||||
gnutls_global_init();
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -47,6 +47,7 @@
|
||||
|
||||
if EXTRAS
|
||||
libccext2_la_LIBADD = @THREAD_LIBS@ @BASE_LIB@ @SSL_LIBS@ @ZSTREAM_LIBS@
|
||||
+libccext2_la_DEPENDENCIES = libccgnu2.la
|
||||
libccext2_la_LDFLAGS = $(RELEASE) $(SHARED_FLAGS)
|
||||
|
||||
if GETOPT_LONG
|
||||
|
||||
Binary file not shown.
@ -0,0 +1,44 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python3_{7..10} )
|
||||
|
||||
inherit meson python-any-r1
|
||||
|
||||
BOXFORT_COMMIT="ac0507b3f45fe58100b528baeb8ca04270b4a8ff"
|
||||
|
||||
DESCRIPTION="Convenient & cross-platform sandboxing C library"
|
||||
HOMEPAGE="https://github.com/Snaipe/BoxFort"
|
||||
SRC_URI="https://github.com/Snaipe/BoxFort/archive/${BOXFORT_COMMIT}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
|
||||
IUSE="test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
DEPEND="test? (
|
||||
$(python_gen_any_dep 'dev-util/cram[${PYTHON_USEDEP}]')
|
||||
)"
|
||||
BDEPEND="virtual/pkgconfig"
|
||||
|
||||
S="${WORKDIR}/BoxFort-${BOXFORT_COMMIT}"
|
||||
|
||||
python_check_deps() {
|
||||
use test && has_version "dev-util/cram[${PYTHON_USEDEP}]"
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
use test && python-any-r1_pkg_setup
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local emesonargs=(
|
||||
-Dsamples=$(usex test true false)
|
||||
-Dtests=$(usex test true false)
|
||||
)
|
||||
|
||||
meson_src_configure
|
||||
}
|
||||
@ -0,0 +1,37 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit cmake
|
||||
|
||||
DESCRIPTION="Header-only C++11 serialization library"
|
||||
HOMEPAGE="https://uscilab.github.io/cereal/"
|
||||
SRC_URI="https://github.com/USCiLab/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="doc test"
|
||||
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
DEPEND="test? ( dev-libs/boost )"
|
||||
|
||||
src_prepare() {
|
||||
sed -i -e '/set(CMAKE_CXX_FLAGS "-Wall -g -Wextra -Wshadow -pedantic -Wold-style-cast ${CMAKE_CXX_FLAGS}")/d' CMakeLists.txt || die
|
||||
|
||||
if ! use doc ; then
|
||||
sed -i -e '/add_subdirectory(doc/d' CMakeLists.txt || die
|
||||
fi
|
||||
|
||||
cmake_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DJUST_INSTALL_CEREAL=$(usex !test)
|
||||
-DWITH_WERROR=OFF
|
||||
)
|
||||
cmake_src_configure
|
||||
}
|
||||
@ -1,8 +1,12 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<!-- maintainer-needed -->
|
||||
<maintainer type="project">
|
||||
<email>3dprint@gentoo.org</email>
|
||||
<name>Gentoo 3D Printer Project</name>
|
||||
</maintainer>
|
||||
<upstream>
|
||||
<remote-id type="cpe">cpe:/a:usc:cereal</remote-id>
|
||||
<remote-id type="github">USCiLab/cereal</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
DIST criterion-4b5174ebda04ab76fe65eec25b5b6ea0809055e7.tar.gz 862951 BLAKE2B c01f95cd573a5f8cb92fb7e6a38b2b27a8066d8a690d51374f38adab92d41d4d408316c0195767445d8bd417191f4c5914c5855d7f0012ec0d91e32398373f8f SHA512 58560ec81eb6017afa0491db5f1f3e16961b4c4f3eddae3d2d04c5bcd4e9cf13df515745531e512a6463ec5ab98bcd8936a8c23e5382535cb6f8b8bfb8cb2c9a
|
||||
DIST criterion-4cf886a2d96ada425e8c88d3c4d935e510c7c712.tar.gz 863335 BLAKE2B 5e86709f4b7d500f3a2d4e61dbffd17f50d5ab593bfe48c8b8d5d6019436e203cd0b7a818933733377fa2dd98b9a94a46f3980b0bc52a8b3ca54c9d60406bace SHA512 34a6acc6fc0c74dcab572c9f6a56c4490935df442b1ea95169143a50193e752fc361c66d007f875c319285eb81b533139f25c5b421903e7cc1ec89c546b94a21
|
||||
DIST debugbreak-6b79ec8d8f8d4603111f580a0537f8f31c484c32.tar.gz 5613 BLAKE2B 78711c3c46d567fb7110a70dfddc2fb5e413eb5c6b9f67d5d8b5f8a663af854cb50f3b9d9947a2c14909dcd2b34f762192a4fbe8b32dcde7c9894f0560ccf769 SHA512 f4bb95b3f931545800abbb86aa787939cc1c30f464e465689aff3fff3d753766bafe4de9065b762d9db882608b2df250514ab38fc9c476cbd6d7d95d516c75cb
|
||||
DIST klib-cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502.tar.gz 99303 BLAKE2B 7804c030106ffab44afcbc1ac77d644e7dfef7c107d4f9679a3a4b7506e41ada65e87113831f94fc5c6f70073356c38a317153e01f1985522029990e9af40544 SHA512 fe4f0cd9b5ff2d5605d388f8a67d6c7211320d0fea6fb9b2df0c9b1e67a1f683b80b86cac007b0cfbd264b75bc0e4849e772506c2ee66b86967e5ee24cc89e1d
|
||||
DIST nanopb-6a6903be6084bb3f5a98a3341acef2aa05c61df9.tar.gz 248884 BLAKE2B 5ab65dbee87686ac8fb4985c3a8c71cdc946580248318a4f566550e5f7dab492c00cf3be471e04313a15c4ad3659f71744bbb30686506d2950588aa3c26a37fb SHA512 14ddc420e8a38116d0f7fbf01623728f14048ddb41b3ac6024d7610532071ecb8ce88b25e3440f9f4bfe9ee7d376071e2eb9e0c166f3e2982f35cc155dcf0362
|
||||
DIST nanopb-70f0de9877b1ce12abc0229d5df84db6349fcbfc.tar.gz 301605 BLAKE2B 24ddb83b3bd220be57c82761159f2b138ec646bec53d02632e96f6cf9dd6fa39e24039a908ac9687c183612703e6973095f94aba55fab5dd5559f243c5d412b2 SHA512 ab535c57a000c5df267352fcab8dcf0560a3a0d9b92634699508c8504840510e4f9f4a21005d57baf0af2e31718eda2ebe41763c7f82ac37ef9b6342c27e2e2a
|
||||
|
||||
@ -0,0 +1,68 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python3_{7..10} )
|
||||
|
||||
inherit meson python-any-r1
|
||||
|
||||
CRITERION_COMMIT="4cf886a2d96ada425e8c88d3c4d935e510c7c712"
|
||||
DEBUGBREAK_COMMIT="6b79ec8d8f8d4603111f580a0537f8f31c484c32"
|
||||
KLIB_COMMIT="cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502"
|
||||
NANOPB_COMMIT="70f0de9877b1ce12abc0229d5df84db6349fcbfc"
|
||||
|
||||
DESCRIPTION="Cross platform unit testing framework for C and C++"
|
||||
HOMEPAGE="https://github.com/Snaipe/Criterion"
|
||||
SRC_URI="https://github.com/Snaipe/Criterion/archive/${CRITERION_COMMIT}.tar.gz -> criterion-${CRITERION_COMMIT}.tar.gz
|
||||
https://github.com/scottt/debugbreak/archive/${DEBUGBREAK_COMMIT}.tar.gz -> debugbreak-${DEBUGBREAK_COMMIT}.tar.gz
|
||||
https://github.com/attractivechaos/klib/archive/${KLIB_COMMIT}.tar.gz -> klib-${KLIB_COMMIT}.tar.gz
|
||||
https://github.com/nanopb/nanopb/archive/${NANOPB_COMMIT}.tar.gz -> nanopb-${NANOPB_COMMIT}.tar.gz"
|
||||
|
||||
LICENSE="BSD-2 MIT ZLIB"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
|
||||
IUSE="test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND="dev-libs/nanomsg:=
|
||||
dev-libs/libgit2:=
|
||||
dev-libs/libffi:="
|
||||
DEPEND="${RDEPEND}
|
||||
dev-libs/boxfort
|
||||
test? (
|
||||
$(python_gen_any_dep 'dev-util/cram[${PYTHON_USEDEP}]')
|
||||
)"
|
||||
BDEPEND="virtual/pkgconfig"
|
||||
|
||||
S="${WORKDIR}/Criterion-${CRITERION_COMMIT}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-2.4_pre20200110-gcc11.patch
|
||||
)
|
||||
|
||||
python_check_deps() {
|
||||
has_version "dev-util/cram[${PYTHON_USEDEP}]"
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
use test && python-any-r1_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
rm -r dependencies/{debugbreak,klib} || die
|
||||
mv "${WORKDIR}/debugbreak-${DEBUGBREAK_COMMIT}" dependencies/debugbreak || die
|
||||
mv "${WORKDIR}/klib-${KLIB_COMMIT}" dependencies/klib || die
|
||||
mv "${WORKDIR}/nanopb-${NANOPB_COMMIT}" subprojects/nanopb || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local emesonargs=(
|
||||
-Dsamples=$(usex test true false)
|
||||
-Dtests=$(usex test true false)
|
||||
)
|
||||
|
||||
meson_src_configure
|
||||
}
|
||||
@ -1,128 +0,0 @@
|
||||
From e14d5b53ad588e45b2bcffb778563daf2fead5df Mon Sep 17 00:00:00 2001
|
||||
From: Ian Kumlien <ian.kumlien@gmail.com>
|
||||
Date: Fri, 7 Aug 2020 15:57:17 +0200
|
||||
Subject: [PATCH] replace deprecated CK?_NETSCAPE_? constants
|
||||
|
||||
... with the corresponding CK?_NSS_? constants
|
||||
|
||||
Fixes: https://github.com/kdudka/nss-pem/issues/6
|
||||
Closes: https://github.com/kdudka/nss-pem/pull/7
|
||||
---
|
||||
pfind.c | 16 ++++++++--------
|
||||
pinst.c | 8 ++++----
|
||||
pobject.c | 10 +++++-----
|
||||
3 files changed, 17 insertions(+), 17 deletions(-)
|
||||
|
||||
diff --git a/pfind.c b/pfind.c
|
||||
index 83d5b89..fa5dd4d 100644
|
||||
--- a/pfind.c
|
||||
+++ b/pfind.c
|
||||
@@ -276,18 +276,18 @@ collect_objects(CK_ATTRIBUTE_PTR pTemplate,
|
||||
type = pemBareKey;
|
||||
plog("CKO_PRIVATE_KEY\n");
|
||||
break;
|
||||
- case CKO_NETSCAPE_TRUST:
|
||||
+ case CKO_NSS_TRUST:
|
||||
type = pemTrust;
|
||||
- plog("CKO_NETSCAPE_TRUST\n");
|
||||
+ plog("CKO_NSS_TRUST\n");
|
||||
break;
|
||||
- case CKO_NETSCAPE_CRL:
|
||||
- plog("CKO_NETSCAPE_CRL\n");
|
||||
+ case CKO_NSS_CRL:
|
||||
+ plog("CKO_NSS_CRL\n");
|
||||
goto done;
|
||||
- case CKO_NETSCAPE_SMIME:
|
||||
- plog("CKO_NETSCAPE_SMIME\n");
|
||||
+ case CKO_NSS_SMIME:
|
||||
+ plog("CKO_NSS_SMIME\n");
|
||||
goto done;
|
||||
- case CKO_NETSCAPE_BUILTIN_ROOT_LIST:
|
||||
- plog("CKO_NETSCAPE_BUILTIN_ROOT_LIST\n");
|
||||
+ case CKO_NSS_BUILTIN_ROOT_LIST:
|
||||
+ plog("CKO_NSS_BUILTIN_ROOT_LIST\n");
|
||||
goto done;
|
||||
case CK_INVALID_HANDLE:
|
||||
type = pemAll; /* look through all objectclasses - ignore the type field */
|
||||
diff --git a/pinst.c b/pinst.c
|
||||
index ef2d955..564458e 100644
|
||||
--- a/pinst.c
|
||||
+++ b/pinst.c
|
||||
@@ -236,7 +236,7 @@ CreateObject(CK_OBJECT_CLASS objClass,
|
||||
/* more unique nicknames - https://bugzilla.redhat.com/689031#c66 */
|
||||
nickname = filename;
|
||||
break;
|
||||
- case CKO_NETSCAPE_TRUST:
|
||||
+ case CKO_NSS_TRUST:
|
||||
plog("Creating trust nick %s id %ld in slot %ld\n", nickname, objid, slotID);
|
||||
memset(&o->u.trust, 0, sizeof(o->u.trust));
|
||||
break;
|
||||
@@ -265,7 +265,7 @@ CreateObject(CK_OBJECT_CLASS objClass,
|
||||
|
||||
switch (objClass) {
|
||||
case CKO_CERTIFICATE:
|
||||
- case CKO_NETSCAPE_TRUST:
|
||||
+ case CKO_NSS_TRUST:
|
||||
if (SECSuccess != GetCertFields(o->derCert->data, o->derCert->len,
|
||||
&issuer, &serial, &derSN, &subject,
|
||||
&valid, &subjkey))
|
||||
@@ -344,7 +344,7 @@ derEncodingsMatch(CK_OBJECT_CLASS objClass, pemInternalObject * obj,
|
||||
|
||||
switch (objClass) {
|
||||
case CKO_CERTIFICATE:
|
||||
- case CKO_NETSCAPE_TRUST:
|
||||
+ case CKO_NSS_TRUST:
|
||||
result = SECITEM_CompareItem(obj->derCert, certDER);
|
||||
break;
|
||||
|
||||
@@ -497,7 +497,7 @@ AddCertificate(char *certfile, char *keyfile, PRBool cacert,
|
||||
nickname, 0, slotID, NULL);
|
||||
if (o != NULL) {
|
||||
/* Add the CA trust object */
|
||||
- o = AddObjectIfNeeded(CKO_NETSCAPE_TRUST, pemTrust, objs[i], NULL,
|
||||
+ o = AddObjectIfNeeded(CKO_NSS_TRUST, pemTrust, objs[i], NULL,
|
||||
nickname, 0, slotID, NULL);
|
||||
}
|
||||
if (o == NULL) {
|
||||
diff --git a/pobject.c b/pobject.c
|
||||
index f613678..a97f3e2 100644
|
||||
--- a/pobject.c
|
||||
+++ b/pobject.c
|
||||
@@ -149,8 +149,8 @@ static const CK_KEY_TYPE ckk_rsa = CKK_RSA;
|
||||
static const CK_OBJECT_CLASS cko_certificate = CKO_CERTIFICATE;
|
||||
static const CK_OBJECT_CLASS cko_private_key = CKO_PRIVATE_KEY;
|
||||
static const CK_OBJECT_CLASS cko_public_key = CKO_PUBLIC_KEY;
|
||||
-static const CK_OBJECT_CLASS cko_trust = CKO_NETSCAPE_TRUST;
|
||||
-static const CK_TRUST ckt_netscape_trusted = CKT_NETSCAPE_TRUSTED_DELEGATOR;
|
||||
+static const CK_OBJECT_CLASS cko_trust = CKO_NSS_TRUST;
|
||||
+static const CK_TRUST ckt_netscape_trusted = CKT_NSS_TRUSTED_DELEGATOR;
|
||||
static const NSSItem pem_trueItem = {
|
||||
(void *) &ck_true, (PRUint32) sizeof(CK_BBOOL)
|
||||
};
|
||||
@@ -578,7 +578,7 @@ pem_FetchAttribute
|
||||
return pem_FetchCertAttribute(io, type);
|
||||
case CKO_PRIVATE_KEY:
|
||||
return pem_FetchPrivKeyAttribute(io, type, pError);
|
||||
- case CKO_NETSCAPE_TRUST:
|
||||
+ case CKO_NSS_TRUST:
|
||||
return pem_FetchTrustAttribute(io, type);
|
||||
case CKO_PUBLIC_KEY:
|
||||
return pem_FetchPubKeyAttribute(io, type);
|
||||
@@ -775,7 +775,7 @@ pem_mdObject_GetAttributeCount
|
||||
return pubKeyAttrsCount;
|
||||
case CKO_PRIVATE_KEY:
|
||||
return privKeyAttrsCount;
|
||||
- case CKO_NETSCAPE_TRUST:
|
||||
+ case CKO_NSS_TRUST:
|
||||
return trustAttrsCount;
|
||||
default:
|
||||
break;
|
||||
@@ -1168,7 +1168,7 @@ pem_CreateObject
|
||||
if (listItem->io != NULL) {
|
||||
/* Add the trust object */
|
||||
APPEND_LIST_ITEM(listItem);
|
||||
- listItem->io = AddObjectIfNeeded(CKO_NETSCAPE_TRUST, pemTrust,
|
||||
+ listItem->io = AddObjectIfNeeded(CKO_NSS_TRUST, pemTrust,
|
||||
derlist[c], NULL, nickname, 0,
|
||||
slotID, NULL);
|
||||
}
|
||||
@ -1,2 +1,2 @@
|
||||
DIST rhtvision_2.1.0-2.tar.gz 1590449 BLAKE2B f5c31f997396f7b41b40089d3ebad8cdb5f24fce22f19defe3530d8a6cfcd728bf9cd3bcbb4e5d1d76c1fa3bc13c3b84f1147bd3c5aa07810077f5f159684eb0 SHA512 0593cd2eee9490d5cd6e79a6b8f4c0b384f78e5bb24b0728876fb9df482a43ee97c141d89127254210b4e012970327adfc5c8815d7c3c580a6d54a09291d42a1
|
||||
DIST rhtvision_2.2.1-4.tar.gz 1777675 BLAKE2B 04fee72d25c01825c8e21115bf16348e1f204371055490520d86a7eb6ad07d73c3d46f6046e11e01f7725b4fe8bd9eaf039ed72233f9141aaa19193635d6fe98 SHA512 bbbaab611fc7831eb339ddb612ef208a16e74f8e0961268e7e63f69c38cdfe45013d440861f3396aceabddf1a44e4cd65023b5b4238a39d55bbf133bde37dd8f
|
||||
DIST tvision-2.2.3.tar.gz 1150257 BLAKE2B a642f2b6b7c30b14fdebd97911230f9b108144f346aff327c7db9d29d230c476d556b5891e7c31e1a126b95c94a938d9ad414a0a19bf720d552f44dbe4f0ada3 SHA512 96785b7539c23cd205f7180024ed0b451fc4c33599d83e625c43a84b42e7fa4655ed2ccb4d0b885e1917e23bad7cb68b7d7ceda7dfdea95f8c1db3f0c59f4030
|
||||
|
||||
@ -1,45 +0,0 @@
|
||||
--- tvision/config.pl
|
||||
+++ tvision/config.pl
|
||||
@@ -206,6 +206,7 @@
|
||||
}
|
||||
# Flags to link as a dynamic lib
|
||||
$MakeDefsRHIDE[6]='RHIDE_LDFLAGS=';
|
||||
+$MakeDefsRHIDE[7]='RHIDE_LIBS=';
|
||||
if ($OS eq 'UNIX')
|
||||
{
|
||||
if ($OSf ne 'Darwin')
|
||||
@@ -229,15 +230,15 @@
|
||||
}
|
||||
$libs=$conf{'X11Lib'};
|
||||
$libs=~s/(\S+)/-l$1/g;
|
||||
- $MakeDefsRHIDE[6].=" -L".$conf{'X11LibPath'}." $libs" if @conf{'HAVE_X11'} eq 'yes';
|
||||
+ $MakeDefsRHIDE[7].=" -L".$conf{'X11LibPath'}." $libs" if @conf{'HAVE_X11'} eq 'yes';
|
||||
- $MakeDefsRHIDE[6].=' -lgpm' if @conf{'HAVE_GPM'} eq 'yes';
|
||||
+ $MakeDefsRHIDE[7].=' -lgpm' if @conf{'HAVE_GPM'} eq 'yes';
|
||||
- $MakeDefsRHIDE[6].=(($OSf eq 'QNXRtP') ? ' -lncursesS' : ' -lncurses') unless $conf{'ncurses'} eq 'no';
|
||||
+ $MakeDefsRHIDE[7].=(($OSf eq 'QNXRtP') ? ' -lncursesS' : ' -lncurses') unless $conf{'ncurses'} eq 'no';
|
||||
- $MakeDefsRHIDE[6].=" $stdcxx -lm -lc";
|
||||
+ $MakeDefsRHIDE[7].=" $stdcxx -lm -lc";
|
||||
- $MakeDefsRHIDE[6].=' -lpthread' if $conf{'HAVE_LINUX_PTHREAD'} eq 'yes';
|
||||
+ $MakeDefsRHIDE[7].=' -lpthread' if $conf{'HAVE_LINUX_PTHREAD'} eq 'yes';
|
||||
- $MakeDefsRHIDE[6].=' libtvfintl.a' if ($OSf eq 'Darwin') && $UseDummyIntl;
|
||||
+ $MakeDefsRHIDE[7].=' libtvfintl.a' if ($OSf eq 'Darwin') && $UseDummyIntl;
|
||||
}
|
||||
-$MakeDefsRHIDE[7]="LIB_VER=$Version";
|
||||
+$MakeDefsRHIDE[8]="LIB_VER=$Version";
|
||||
-$MakeDefsRHIDE[8]="LIB_VER_MAJOR=$VersionMajor";
|
||||
+$MakeDefsRHIDE[9]="LIB_VER_MAJOR=$VersionMajor";
|
||||
|
||||
ModifyMakefiles('intl/dummy/Makefile');
|
||||
CreateRHIDEenvs('examples/rhide.env','makes/rhide.env','compat/rhide.env');
|
||||
--- tvision/makes/common.imk
|
||||
+++ tvision/makes/common.imk
|
||||
@@ -54,7 +54,7 @@
|
||||
C_EXTRA_FLAGS=$(SHARED_CODE_OPTION)
|
||||
RHIDE_COMPILE_ARCHIVE=$(RHIDE_LD) $(RHIDE_LIBDIRS) $(LDFLAGS) \
|
||||
$(RHIDE_LDFLAGS) $(C_EXTRA_FLAGS) -o $(OUTFILE) \
|
||||
- $(OBJFILES)
|
||||
+ $(OBJFILES) $(addprefix -l,$(RHIDE_OS_LIBS))
|
||||
else
|
||||
RHIDE_COMPILE_ARCHIVE=$(RHIDE_AR) $(RHIDE_ARFLAGS) $(OUTFILE)\
|
||||
$(ALL_PREREQ)
|
||||
@ -1,30 +0,0 @@
|
||||
index 8b78ba3..92aa570 100644
|
||||
--- a/config.pl
|
||||
+++ b/config.pl
|
||||
@@ -1111,7 +1111,7 @@ sub GenerateMakefile
|
||||
$rep.="\t\$(MAKE) prefix=\$(prefix) -C intl\n";
|
||||
}
|
||||
$text=~s/\@target_rules\@/$rep/g;
|
||||
- $rep="intl-dummy:\n\t\$(MAKE) -C intl/dummy\n";
|
||||
+ $rep="intl-dummy:\n\t\$(MAKE) prefix=\$(prefix) -C intl/dummy\n";
|
||||
$rep.="\tcp intl/dummy/libtvfintl.a $makeDir\n";
|
||||
$rep.="\tranlib $makeDir/libtvfintl.a\n" if $conf{'UseRanLib'};
|
||||
$text=~s/\@intl_dummy_rule\@/$rep/g;
|
||||
@@ -1196,7 +1196,7 @@ sub GenerateMakefile
|
||||
}
|
||||
if ($internac)
|
||||
{
|
||||
- $rep.="\ninstall-internac:\n\t\$(MAKE) -C intl install\n";
|
||||
+ $rep.="\ninstall-internac:\n\t\$(MAKE) prefix=\$(prefix) -C intl install\n";
|
||||
}
|
||||
$text=~s/\@install_rules\@/$rep/g;
|
||||
|
||||
@@ -1216,7 +1216,7 @@ sub GenerateMakefile
|
||||
$rep.="\trm -f intl/dummy/*.lo\n";
|
||||
$rep.="\trm -f intl/dummy/*.a\n";
|
||||
$rep.="\t-\$(MAKE) -C examples clean\n";
|
||||
- $rep.="\t-\$(MAKE) -C intl clean\n";
|
||||
+ $rep.="\t-\$(MAKE) prefix=\$(prefix) -C intl clean\n";
|
||||
$rep.="\trm -f configure.cache\n";
|
||||
$rep.="\trm -f rhtv-config\$(EXE_EXT)\n";
|
||||
$text=~s/\@clean\@/$rep/g;
|
||||
@ -1,11 +0,0 @@
|
||||
--- tvision/Makefile.in
|
||||
+++ tvision/Makefile.in
|
||||
@@ -31,7 +31,7 @@ examples:
|
||||
$(MAKE) -C examples
|
||||
|
||||
rhtv-config$(EXE_EXT): rhtv-config.c include/tv/configtv.h
|
||||
- @GCC@ -o rhtv-config$(EXE_EXT) -Iinclude rhtv-config.c
|
||||
+ @GCC@ -o rhtv-config$(EXE_EXT) $(CFLAGS) $(LDFLAGS) -Iinclude rhtv-config.c
|
||||
|
||||
install-headers:
|
||||
@install_headers@
|
||||
@ -1,11 +0,0 @@
|
||||
--- tvision/include/tv/inputln.h
|
||||
+++ tvision/include/tv/inputln.h
|
||||
@@ -201,7 +201,7 @@
|
||||
{ return name; }
|
||||
|
||||
protected:
|
||||
- TInputLine::TInputLine(StreamableInit) :
|
||||
+ TInputLine(StreamableInit) :
|
||||
TInputLineBaseT<char,TDrawBuffer>(streamableInit) {}
|
||||
|
||||
public:
|
||||
@ -1,21 +0,0 @@
|
||||
--- tvision/classes/ipstream.cc
|
||||
+++ tvision/classes/ipstream.cc
|
||||
@@ -19,6 +19,7 @@
|
||||
*
|
||||
*/
|
||||
#include <assert.h>
|
||||
+#include <stdio.h>
|
||||
#define Uses_string
|
||||
#define Uses_TStreamable
|
||||
#define Uses_TStreamableClass
|
||||
--- tvision/include/tv/textdev.h
|
||||
+++ tvision/include/tv/textdev.h
|
||||
@@ -16,6 +16,8 @@
|
||||
#if defined( Uses_TTextDevice ) && !defined( __TTextDevice )
|
||||
#define __TTextDevice
|
||||
|
||||
+#include <stdio.h>
|
||||
+
|
||||
class TRect;
|
||||
class TScrollBar;
|
||||
|
||||
@ -1,147 +0,0 @@
|
||||
Fix gcc-6 compilation errors; bug 594176
|
||||
|
||||
--- a/classes/tdesktop.cc
|
||||
+++ b/classes/tdesktop.cc
|
||||
@@ -26,6 +26,10 @@ Modified cursor behavior while desktop locked by Salvador E. Tropea (SET)
|
||||
#define Uses_TVCodePage
|
||||
#include <tv.h>
|
||||
|
||||
+#include <cmath>
|
||||
+
|
||||
+using std::abs;
|
||||
+
|
||||
TDeskInit::TDeskInit( TBackground *(*cBackground)( TRect ) ) :
|
||||
createBackground( cBackground )
|
||||
{
|
||||
--- a/classes/tdisplay.cc
|
||||
+++ b/classes/tdisplay.cc
|
||||
@@ -22,6 +22,10 @@ same used in original Turbo Vision for compatibility purposes.
|
||||
#define Uses_TVCodePage
|
||||
#include <tv.h>
|
||||
|
||||
+#include <cmath>
|
||||
+
|
||||
+using std::abs;
|
||||
+
|
||||
// Remove me please!
|
||||
int TDisplay::dual_display=0;
|
||||
|
||||
--- a/classes/tvtext1.cc
|
||||
+++ b/classes/tvtext1.cc
|
||||
@@ -110,8 +110,8 @@
|
||||
char TCheckBoxes::button[] = " [ ] ";
|
||||
char TCheckBoxes::obutton[] = " [ ] ";
|
||||
|
||||
-TScrollChars TScrollBar::vChars = {30, 31, 177, 254, 178};
|
||||
-TScrollChars TScrollBar::ovChars = {30, 31, 177, 254, 178};
|
||||
-TScrollChars TScrollBar::hChars = {17, 16, 177, 254, 178};
|
||||
-TScrollChars TScrollBar::ohChars = {17, 16, 177, 254, 178};
|
||||
+TScrollChars TScrollBar::vChars = {30, 31, (char) 177, (char) 254, (char) 178};
|
||||
+TScrollChars TScrollBar::ovChars = {30, 31, (char) 177, (char) 254, (char) 178};
|
||||
+TScrollChars TScrollBar::hChars = {17, 16, (char) 177, (char) 254, (char) 178};
|
||||
+TScrollChars TScrollBar::ohChars = {17, 16, (char) 177, (char) 254, (char) 178};
|
||||
|
||||
--- a/classes/x11/x11src.cc
|
||||
+++ b/classes/x11/x11src.cc
|
||||
@@ -94,6 +94,10 @@
|
||||
#define TIMER_ALARM SIGALRM
|
||||
#endif
|
||||
|
||||
+#include <cmath>
|
||||
+
|
||||
+using std::abs;
|
||||
+
|
||||
const unsigned foWmin=5, foHmin=7, foWmax=20, foHmax=32;
|
||||
const int cursorDelay=300000;
|
||||
|
||||
@@ -2555,49 +2559,49 @@ Cursor TScreenX11::busyCursor,
|
||||
TScreenX11::leftPtr;
|
||||
char TScreenX11::busyCursorMap[]=
|
||||
{
|
||||
- 0xff, 0xff, 0xff, 0x1f,
|
||||
- 0xfd, 0xff, 0xff, 0x1f,
|
||||
- 0xf9, 0xff, 0xff, 0x1f,
|
||||
- 0xf1, 0xff, 0xff, 0x1f,
|
||||
- 0xe1, 0x7f, 0xc0, 0x1f,
|
||||
- 0xc1, 0x7f, 0xc0, 0x1f,
|
||||
- 0x81, 0x3f, 0x80, 0x1f,
|
||||
- 0x01, 0x9f, 0x3b, 0x1f,
|
||||
- 0x01, 0xce, 0x7b, 0x1e,
|
||||
- 0xc1, 0xef, 0xfb, 0x1e,
|
||||
- 0xc9, 0xef, 0xf1, 0x18,
|
||||
- 0x9d, 0xef, 0xf1, 0x18,
|
||||
- 0x9f, 0xef, 0xfe, 0x18,
|
||||
- 0x3f, 0x6f, 0xff, 0x1e,
|
||||
- 0x3f, 0xcf, 0x7f, 0x1e,
|
||||
- 0xff, 0x9f, 0x3f, 0x1f,
|
||||
- 0xff, 0x3f, 0x80, 0x1f,
|
||||
- 0xff, 0x7f, 0xc0, 0x1f,
|
||||
- 0xff, 0x7f, 0xc0, 0x1f,
|
||||
- 0xff, 0xff, 0xff, 0x1f
|
||||
+ (char)0xff, (char)0xff, (char)0xff, (char)0x1f,
|
||||
+ (char)0xfd, (char)0xff, (char)0xff, (char)0x1f,
|
||||
+ (char)0xf9, (char)0xff, (char)0xff, (char)0x1f,
|
||||
+ (char)0xf1, (char)0xff, (char)0xff, (char)0x1f,
|
||||
+ (char)0xe1, (char)0x7f, (char)0xc0, (char)0x1f,
|
||||
+ (char)0xc1, (char)0x7f, (char)0xc0, (char)0x1f,
|
||||
+ (char)0x81, (char)0x3f, (char)0x80, (char)0x1f,
|
||||
+ (char)0x01, (char)0x9f, (char)0x3b, (char)0x1f,
|
||||
+ (char)0x01, (char)0xce, (char)0x7b, (char)0x1e,
|
||||
+ (char)0xc1, (char)0xef, (char)0xfb, (char)0x1e,
|
||||
+ (char)0xc9, (char)0xef, (char)0xf1, (char)0x18,
|
||||
+ (char)0x9d, (char)0xef, (char)0xf1, (char)0x18,
|
||||
+ (char)0x9f, (char)0xef, (char)0xfe, (char)0x18,
|
||||
+ (char)0x3f, (char)0x6f, (char)0xff, (char)0x1e,
|
||||
+ (char)0x3f, (char)0xcf, (char)0x7f, (char)0x1e,
|
||||
+ (char)0xff, (char)0x9f, (char)0x3f, (char)0x1f,
|
||||
+ (char)0xff, (char)0x3f, (char)0x80, (char)0x1f,
|
||||
+ (char)0xff, (char)0x7f, (char)0xc0, (char)0x1f,
|
||||
+ (char)0xff, (char)0x7f, (char)0xc0, (char)0x1f,
|
||||
+ (char)0xff, (char)0xff, (char)0xff, (char)0x1f
|
||||
};
|
||||
char TScreenX11::busyCursorMask[]=
|
||||
{
|
||||
- 0xfc, 0xff, 0xff, 0x1f,
|
||||
- 0xf8, 0xff, 0xff, 0x1f,
|
||||
- 0xf0, 0xff, 0xff, 0x1f,
|
||||
- 0xe0, 0x3f, 0x80, 0x1f,
|
||||
- 0xc0, 0x3f, 0x80, 0x1f,
|
||||
- 0x80, 0x3f, 0x80, 0x1f,
|
||||
- 0x00, 0x1f, 0x00, 0x1f,
|
||||
- 0x00, 0x0e, 0x00, 0x1e,
|
||||
- 0x00, 0x04, 0x00, 0x1c,
|
||||
- 0x00, 0x04, 0x00, 0x10,
|
||||
- 0x80, 0x07, 0x00, 0x10,
|
||||
- 0x08, 0x07, 0x00, 0x10,
|
||||
- 0x0c, 0x07, 0x00, 0x10,
|
||||
- 0x1f, 0x06, 0x00, 0x10,
|
||||
- 0x1f, 0x06, 0x00, 0x1c,
|
||||
- 0x3f, 0x0f, 0x00, 0x1e,
|
||||
- 0xff, 0x1f, 0x00, 0x1f,
|
||||
- 0xff, 0x3f, 0x80, 0x1f,
|
||||
- 0xff, 0x3f, 0x80, 0x1f,
|
||||
- 0xff, 0x3f, 0x80, 0x1f
|
||||
+ (char)0xfc, (char)0xff, (char)0xff, (char)0x1f,
|
||||
+ (char)0xf8, (char)0xff, (char)0xff, (char)0x1f,
|
||||
+ (char)0xf0, (char)0xff, (char)0xff, (char)0x1f,
|
||||
+ (char)0xe0, (char)0x3f, (char)0x80, (char)0x1f,
|
||||
+ (char)0xc0, (char)0x3f, (char)0x80, (char)0x1f,
|
||||
+ (char)0x80, (char)0x3f, (char)0x80, (char)0x1f,
|
||||
+ (char)0x00, (char)0x1f, (char)0x00, (char)0x1f,
|
||||
+ (char)0x00, (char)0x0e, (char)0x00, (char)0x1e,
|
||||
+ (char)0x00, (char)0x04, (char)0x00, (char)0x1c,
|
||||
+ (char)0x00, (char)0x04, (char)0x00, (char)0x10,
|
||||
+ (char)0x80, (char)0x07, (char)0x00, (char)0x10,
|
||||
+ (char)0x08, (char)0x07, (char)0x00, (char)0x10,
|
||||
+ (char)0x0c, (char)0x07, (char)0x00, (char)0x10,
|
||||
+ (char)0x1f, (char)0x06, (char)0x00, (char)0x10,
|
||||
+ (char)0x1f, (char)0x06, (char)0x00, (char)0x1c,
|
||||
+ (char)0x3f, (char)0x0f, (char)0x00, (char)0x1e,
|
||||
+ (char)0xff, (char)0x1f, (char)0x00, (char)0x1f,
|
||||
+ (char)0xff, (char)0x3f, (char)0x80, (char)0x1f,
|
||||
+ (char)0xff, (char)0x3f, (char)0x80, (char)0x1f,
|
||||
+ (char)0xff, (char)0x3f, (char)0x80, (char)0x1f
|
||||
};
|
||||
|
||||
/* This is the function which creates cursors. On success it return
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
--- tvision/config.pl
|
||||
+++ tvision/config.pl
|
||||
@@ -1193,12 +1193,6 @@
|
||||
$rep.="\t".GenInstallFiles('0644',"$makeDir/$ver",'$(libdir)');
|
||||
$stripDebug=($OSf eq 'Darwin') ? '-S' : '--strip-debug';
|
||||
$rep.="\tstrip $stripDebug \$(libdir)/$ver\n" unless $conf{'debugInfo'} eq 'yes';
|
||||
- # FreeBSD: merge data from libdir.
|
||||
- # Darwin: doesn't have ldconfig.
|
||||
- if ($OSf ne 'Darwin')
|
||||
- {
|
||||
- $rep.=($OSf eq 'FreeBSD') ? "\t-ldconfig -m \$(libdir)\n" : "\t-ldconfig\n";
|
||||
- }
|
||||
}
|
||||
if ($internac)
|
||||
{
|
||||
@ -1,41 +0,0 @@
|
||||
Recent kernel headers no longer provide asm/io.h.
|
||||
|
||||
--- tvision/classes/linux/linuxdis.cc
|
||||
+++ tvision/classes/linux/linuxdis.cc
|
||||
@@ -300,7 +300,11 @@
|
||||
*****************************************************************************/
|
||||
|
||||
#ifdef h386LowLevel
|
||||
+#if HAVE_OUTB_IN_SYS
|
||||
+#include <sys/io.h>
|
||||
+#else
|
||||
#include <asm/io.h>
|
||||
+#endif
|
||||
|
||||
static inline
|
||||
unsigned char I(unsigned char i)
|
||||
--- tvision/classes/linux/linuxscr.cc
|
||||
+++ tvision/classes/linux/linuxscr.cc
|
||||
@@ -123,7 +123,11 @@
|
||||
#include <tv/linux/log.h>
|
||||
|
||||
#ifdef h386LowLevel
|
||||
+ #if HAVE_OUTB_IN_SYS
|
||||
+ #include <sys/io.h>
|
||||
+ #else
|
||||
#include <asm/io.h>
|
||||
+ #endif
|
||||
#endif
|
||||
|
||||
// What a hell is that?!
|
||||
--- tvision/config.pl
|
||||
+++ tvision/config.pl
|
||||
@@ -77,7 +77,7 @@
|
||||
# glibc I use but the fact is that the needed tricks make it very Linux
|
||||
# dependent.
|
||||
LookForPThread() if $OSf eq 'Linux';
|
||||
- #LookForOutB();
|
||||
+ LookForOutB();
|
||||
}
|
||||
if ($Compf eq 'Cygwin')
|
||||
{# Cygwin incorporates a XFree86 port
|
||||
@ -1,30 +0,0 @@
|
||||
diff --git a/config.pl b/config.pl
|
||||
index 53a7b50..784676b 100644
|
||||
--- a/config.pl
|
||||
+++ b/config.pl
|
||||
@@ -5,8 +5,8 @@
|
||||
# To specify the compilation flags define the CFLAGS environment variable.
|
||||
#
|
||||
|
||||
-require "miscperl.pl";
|
||||
-require "conflib.pl";
|
||||
+require "./miscperl.pl";
|
||||
+require "./conflib.pl";
|
||||
|
||||
# If the script is newer discard the cache.
|
||||
#GetCache() unless (-M 'config.pl' < -M 'configure.cache');
|
||||
diff --git a/confignt.pl b/confignt.pl
|
||||
index e185f49..9ff7ae6 100644
|
||||
--- a/confignt.pl
|
||||
+++ b/confignt.pl
|
||||
@@ -3,8 +3,8 @@
|
||||
# see copyrigh file for details
|
||||
#
|
||||
|
||||
-require "miscperl.pl";
|
||||
-require "conflib.pl";
|
||||
+require "./miscperl.pl";
|
||||
+require "./conflib.pl";
|
||||
|
||||
SeeCommandLine();
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
Bug #160591; fixes a buffer underflow.
|
||||
Reported by B Douglas Hilton <b.d.hilton@verizon.net>
|
||||
|
||||
--- tvision/classes/ttermina.cc
|
||||
+++ tvision/classes/ttermina.cc
|
||||
@@ -233,7 +233,7 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
- while (pos-->=queBack);
|
||||
+ while (pos-->queBack);
|
||||
|
||||
return queBack;
|
||||
}
|
||||
@ -0,0 +1,23 @@
|
||||
From 017a1059067ab58a9286b3049505cb3e77696de5 Mon Sep 17 00:00:00 2001
|
||||
From: Bernd Waibel <waebbl-gentoo@posteo.net>
|
||||
Date: Mon, 14 Jun 2021 17:48:45 +0200
|
||||
Subject: [PATCH 2/2] use proper AR
|
||||
|
||||
Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
|
||||
---
|
||||
intl/dummy/Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/intl/dummy/Makefile b/intl/dummy/Makefile
|
||||
index c32b0a8..d47e185 100644
|
||||
--- a/intl/dummy/Makefile
|
||||
+++ b/intl/dummy/Makefile
|
||||
@@ -2,4 +2,4 @@ RHIDE_GCC=gcc
|
||||
CC=$(RHIDE_GCC)
|
||||
|
||||
libtvfintl.a: intldummy.o
|
||||
- ar -rv libtvfintl.a intldummy.o
|
||||
+ $(AR) -rv libtvfintl.a intldummy.o
|
||||
--
|
||||
2.32.0
|
||||
|
||||
@ -1,53 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
DESCRIPTION="Text User Interface that implements the well known CUA widgets"
|
||||
HOMEPAGE="http://tvision.sourceforge.net/"
|
||||
SRC_URI="mirror://sourceforge/tvision/rhtvision_${PV/_pre/-}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ppc x86"
|
||||
IUSE=""
|
||||
|
||||
DOCS=( readme.txt THANKS TODO )
|
||||
|
||||
HTML_DOCS=( www-site/. )
|
||||
|
||||
S=${WORKDIR}/${PN}
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${P}-gcc41.patch"
|
||||
"${FILESDIR}/${P}-outb.patch"
|
||||
"${FILESDIR}/${P}-underflow.patch"
|
||||
"${FILESDIR}/${P}-asneeded.patch"
|
||||
"${FILESDIR}/${P}-gcc44.patch"
|
||||
"${FILESDIR}/${P}-ldconfig.patch"
|
||||
"${FILESDIR}/${P}-flags.patch"
|
||||
"${FILESDIR}/${P}-gcc6.patch" # bug #594176
|
||||
"${FILESDIR}/${P}-build-system.patch" # for EAPI=6
|
||||
"${FILESDIR}/${P}-perl-INC.patch" # dot-in-INC
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
# Strip hunk from invalid characters for gcc6.patch
|
||||
sed -e ":TScrollChars: s:; // \x1E\x1F\xB1\xFE\xB2:;:" \
|
||||
-e ":TScrollChars: s:; // \x11\x10\xB1\xFE\xB2:;:" \
|
||||
-i classes/tvtext1.cc || die
|
||||
default
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
./configure --fhs || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install \
|
||||
prefix="\${DESTDIR}/usr" \
|
||||
libdir="\$(prefix)/$(get_libdir)"
|
||||
|
||||
einstalldocs
|
||||
dosym rhtvision /usr/include/tvision
|
||||
}
|
||||
@ -0,0 +1,81 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit toolchain-funcs
|
||||
|
||||
MY_PN="rh${PN}"
|
||||
MY_P="${MY_PN}-${PV}"
|
||||
|
||||
DESCRIPTION="Text User Interface that implements the well known CUA widgets"
|
||||
HOMEPAGE="http://tvision.sourceforge.net/"
|
||||
SRC_URI="https://github.com/set-soft/${PN}/releases/download/v${PV}/${MY_P}.src.tar.gz -> ${P}.tar.gz"
|
||||
S="${WORKDIR}/${PN}"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~x86"
|
||||
IUSE="examples nls"
|
||||
|
||||
DOCS=( readme.txt THANKS TODO )
|
||||
HTML_DOCS=( www-site/. )
|
||||
|
||||
RDEPEND="
|
||||
dev-libs/libbsd
|
||||
media-libs/allegro:0[X]
|
||||
sys-apps/util-linux
|
||||
sys-libs/gpm
|
||||
sys-libs/ncurses:0=
|
||||
x11-libs/libICE
|
||||
x11-libs/libSM
|
||||
x11-libs/libX11
|
||||
x11-libs/libXau
|
||||
x11-libs/libXdmcp
|
||||
x11-libs/libXext
|
||||
x11-libs/libXmu
|
||||
x11-libs/libXt
|
||||
x11-libs/libxcb:=
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="sys-devel/gettext"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-2.2.1.4-flags.patch
|
||||
"${FILESDIR}"/${PN}-2.2.1.4-ldconfig.patch
|
||||
"${FILESDIR}"/${P}-0001-use-proper-AR.patch
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
tc-export CC CXX AR
|
||||
|
||||
local myconf=()
|
||||
myconf+=(
|
||||
--fhs
|
||||
--prefix="${EPREFIX}/usr"
|
||||
--with-pthread
|
||||
--without-static
|
||||
--x-include="${EPREFIX}/usr/include/X11"
|
||||
)
|
||||
|
||||
use nls || myconf+=( --no-intl )
|
||||
|
||||
# Note: Do not use econf here, this isn't an autoconf configure script,
|
||||
# but a perl based script which simply calls config.pl
|
||||
einfo "Running ./configure ${myconf[@]}"
|
||||
./configure ${myconf[@]} || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install \
|
||||
prefix="\${DESTDIR}${EPREFIX}/usr" \
|
||||
libdir="\$(prefix)/$(get_libdir)"
|
||||
|
||||
einstalldocs
|
||||
|
||||
if use examples; then
|
||||
docompress -x /usr/share/doc/${PF}/examples
|
||||
docinto examples
|
||||
dodoc -r examples/*
|
||||
fi
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
@ -1 +1,2 @@
|
||||
DIST python-dbusmock-0.23.0.tar.gz 79928 BLAKE2B a004bbc93cd4dd3ab5919e28bde18e7b015546e43b789826010ccfd2000075babf933bc53b72bc4369458ac6c37845b534b0e36e594afc4bfd298d9ac37495c7 SHA512 b464c376b1489bc2a9967d08fd1e4e8943e372f46eef46d1cebf316f4afd1f2bf55d02abc3b82b7052c685fe1ff9ba22734a58aa75945706a26ae9d71e5d807e
|
||||
DIST python-dbusmock-0.23.1.tar.gz 79964 BLAKE2B 60140997f7a9c196d4c38100a975550d6a4745344fde9084ca5a56881035c09cfd56387897a7e409e35aecbc759f01b8f4953b8a5cdda4bfbe70d80cd01b8332 SHA512 933205c770f82aef623e571d9d806b6d639467c977ca326718ff475f41e309ef25e9a8f1cd8439e181edbafeb6513af7b73dfb938b3abfc7d5f63b6b5ffa9fc9
|
||||
|
||||
@ -0,0 +1,36 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python3_{8..10} )
|
||||
PYTHON_REQ_USE="xml(+)"
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
MY_PN="python-${PN}"
|
||||
MY_P="${MY_PN}-${PV}"
|
||||
|
||||
DESCRIPTION="Easily create mock objects on D-Bus for software testing"
|
||||
HOMEPAGE="https://github.com/martinpitt/python-dbusmock"
|
||||
SRC_URI="https://github.com/martinpitt/${MY_PN}/releases/download/${PV}/${MY_P}.tar.gz"
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
LICENSE="LGPL-3+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
|
||||
|
||||
RDEPEND="
|
||||
dev-python/dbus-python[${PYTHON_USEDEP}]
|
||||
dev-python/pygobject:3[${PYTHON_USEDEP}]"
|
||||
|
||||
distutils_enable_tests unittest
|
||||
|
||||
src_prepare() {
|
||||
# needed for unittest discovery
|
||||
> tests/__init__.py || die
|
||||
# linter tests, fragile to newer linter versions
|
||||
rm tests/test_code.py || die
|
||||
|
||||
distutils-r1_src_prepare
|
||||
}
|
||||
@ -1,2 +1 @@
|
||||
DIST filesystem_spec-2021.04.0.tar.gz 288179 BLAKE2B 896982345533fef9593f393209202e0a90473e9826ced9d69854dca20c66c64b85e1b1c44413dda718cdd1af7f41ac821b4d67b600536b32a873a4f73ab32801 SHA512 6806d6fbae89b514955a309346f19b2d199db10aecece728d117798368c311e3fbb38161fd5a54ea4a60ee7e656d2e50fdf8c4444ec3d6bdd761229b4a6341f2
|
||||
DIST filesystem_spec-2021.05.0.tar.gz 292796 BLAKE2B 5d56d860ced1a72c27d2031b7d257a4bcbd52f6b2fed5275fbcbf7088375fde26652f0a003e919ebd3948d5e9833d802304234282ca858a7a2a19bfa11f66aa8 SHA512 7c27a1ad4e21efdcc0f31f91a9929e4c09db7b9421e7bf8d2f485e961f6887a4a5c083f38f8d7b09005a4cf11f55c93cce4617e3dc6c2b241ed20f7847ad711e
|
||||
|
||||
@ -1,47 +0,0 @@
|
||||
# Copyright 2020-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python3_{7..9} )
|
||||
inherit distutils-r1
|
||||
|
||||
MY_P=filesystem_spec-${PV}
|
||||
|
||||
DESCRIPTION="A specification that python filesystems should adhere to"
|
||||
HOMEPAGE="https://github.com/intake/filesystem_spec/
|
||||
https://pypi.org/project/fsspec/"
|
||||
SRC_URI="
|
||||
https://github.com/intake/filesystem_spec/archive/${PV}.tar.gz
|
||||
-> ${MY_P}.tar.gz"
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ~arm ~arm64 x86"
|
||||
|
||||
BDEPEND="
|
||||
dev-python/versioneer[${PYTHON_USEDEP}]
|
||||
test? (
|
||||
dev-python/aiohttp[${PYTHON_USEDEP}]
|
||||
dev-python/numpy[${PYTHON_USEDEP}]
|
||||
dev-python/requests[${PYTHON_USEDEP}]
|
||||
dev-vcs/git
|
||||
)"
|
||||
|
||||
distutils_enable_tests pytest
|
||||
|
||||
src_test() {
|
||||
git config --global user.email "you@example.com" || die
|
||||
git config --global user.name "Your Name" || die
|
||||
distutils-r1_src_test
|
||||
}
|
||||
|
||||
python_test() {
|
||||
# sftp and smb require server started via docker
|
||||
epytest \
|
||||
--deselect fsspec/tests/test_spec.py::test_find \
|
||||
--ignore fsspec/implementations/tests/test_dbfs.py \
|
||||
--ignore fsspec/implementations/tests/test_sftp.py \
|
||||
--ignore fsspec/implementations/tests/test_smb.py
|
||||
}
|
||||
@ -1 +1,2 @@
|
||||
DIST libtmux-v0.8.5.tar.gz 222445 BLAKE2B 5af148555eb89c66bdc66f3f214967f7e901d9b86ea85e02a9fba64f2eb3559828519ba8120eaee5eb86ec75bee2e599a08384dd096de8dc0969129c58172c1e SHA512 d456725c3ca41a672ee5239bfb5f42a262674638d308fa141627995be8b8fe348bb8713b735eb05c5a3cc73f35fe3f6fac12024f6254c950a3048b2e07606363
|
||||
DIST libtmux-v0.9.0.tar.gz 215649 BLAKE2B fdf6f424ce8eead5f0f19cb53bfd438e9cd7b5326e57e676281f74cedac6e1bcd7cded27e4ef226d2fc3bc09bbb57ff0e63aaa7d901ab910b6a890275c7fe63d SHA512 d47078300614b2a286eab6063c9492baa115787b917d2fb2e4188032ce580f495f0e7f4a14383407c61063a77d640092d117ba43974524f18da024dfc687c8a5
|
||||
|
||||
@ -0,0 +1,36 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python3_{7..10} pypy3 )
|
||||
DISTUTILS_USE_SETUPTOOLS=bdepend
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="python api for tmux"
|
||||
HOMEPAGE="https://libtmux.git-pull.com/"
|
||||
SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> ${PN}-v${PV}.tar.gz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
|
||||
|
||||
RDEPEND=">=app-misc/tmux-3.0a"
|
||||
BDEPEND="
|
||||
test? (
|
||||
$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python3_{7..9})
|
||||
dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
|
||||
dev-python/pytest-mock[${PYTHON_USEDEP}]
|
||||
dev-python/twine[${PYTHON_USEDEP}]
|
||||
)
|
||||
"
|
||||
|
||||
distutils_enable_tests pytest
|
||||
|
||||
python_prepare_all() {
|
||||
local issues="https://github.com/tmux-python/libtmux/issues/"
|
||||
sed -r -i "s|:issue:\`([[:digit:]]+)\`|\`issue \1 ${issues}\1\`|" CHANGES || die
|
||||
rm requirements/doc.txt || die
|
||||
|
||||
distutils-r1_python_prepare_all
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue