Sync with portage [Tue Mar 26 12:17:33 MSK 2019].

mhiretskiy 1382
root 5 years ago
parent 676d609641
commit 4859f60b5c

Binary file not shown.

Binary file not shown.

@ -0,0 +1 @@
DIST rails-5.2.2.1.tgz 8795399 BLAKE2B cb07c555b4124b67c12d7b913209112730a2aa4d957b3711c6b1f41918bfbce792426d75bd2e4443043a701f74bb2a286d59b140248f6a74f1c4547f00dc0b7d SHA512 c976e3b4f0f2350cd611309c89a9c3ad16871f115577788694519482afa10420a272f2cc560bd823f05d6d616e3cde1e121d6f530e3d29df12a55bd2aa76ed0e

@ -0,0 +1,58 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
USE_RUBY="ruby23 ruby24 ruby25"
RUBY_FAKEGEM_TASK_DOC=""
RUBY_FAKEGEM_DOCDIR=""
RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
RUBY_FAKEGEM_GEMSPEC="activestorage.gemspec"
RUBY_FAKEGEM_EXTRAINSTALL="app config db"
RUBY_FAKEGEM_BINWRAP=""
inherit ruby-fakegem eapi7-ver
DESCRIPTION="Attach cloud and local files in Rails applications"
HOMEPAGE="https://github.com/rails/rails"
SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
LICENSE="MIT"
SLOT="$(ver_cut 1-2)"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE=""
RUBY_S="rails-${PV}/${PN}"
DEPEND+=" test? ( app-text/mupdf ) "
ruby_add_rdepend "
~dev-ruby/actionpack-${PV}:*
~dev-ruby/activerecord-${PV}:*
>=dev-ruby/marcel-0.3.1 =dev-ruby/marcel-0.3*
"
ruby_add_bdepend "
test? (
~dev-ruby/railties-${PV}
dev-ruby/test-unit:2
dev-ruby/mini_magick
dev-ruby/mocha
dev-ruby/rake
dev-ruby/sqlite3
)"
all_ruby_prepare() {
# Remove items from the common Gemfile that we don't need for this
# test run. This also requires handling some gemspecs.
sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|rubocop\|capybara\|rack-cache\|json\|dalli\|listen\|connection_pool\|puma\|mysql2\)/ s:^:#:" \
-e '/dalli/ s/2.7.7/2.7.9/' \
-e '/:job/,/end/ s:^:#:' \
-e '/:test/,/^end/ s:^:#:' \
-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
rm ../Gemfile.lock || die
}

@ -2,4 +2,5 @@ DIST ruby_parser-3.10.1.gem 414208 BLAKE2B 22b0df7f5b7c137e6c331b13639ccd399323b
DIST ruby_parser-3.11.0.gem 463360 BLAKE2B 6001914a0835c5f21e16eff279100335855fd833b60c7508fe66378a899af44e928afe31efb78ad1189301b1e85facba2d025c6e544a95d730f579642169eb1d SHA512 62b01b3ecbed0fbcd75a7d3515d4804dd1d8544667ad667dc36cf19cc2e380d87bb58ca56342ee4428cdf7044356cdfa2585125636a9c18ec4a460eb901baa22
DIST ruby_parser-3.12.0.gem 463872 BLAKE2B 1dc6772a801e777a91c6019923db5d428275863a50daa96ffa3a3ab3c6d8d1617d339523917ff0b11f635cc4d41ba4e8d68ea7fac5ad3d980f4071e8c077ce0a SHA512 338bb68decb844ad08c68080a34d1d1cc4c72c8021afa93f2dcdac1d108666680e5cffa23e55ccf91ca154527e751bb80204eda1ebcc178ba797a5ad8563d4de
DIST ruby_parser-3.13.0.gem 442880 BLAKE2B b4ebbce3aa82465d8d377825908acb5601aa2109b0cacfb861e6abbdcdd4ce5e089c1f48a174f4cda67515a935450803c70abfe0e80a3818c04c5d657c896c06 SHA512 879893ec6f82a8c9fd7bcdf670fdfc864dbe30cfe799dc3841bdab3430dd7c126f086496cda1861b2a3cc1b5585746721f81ecf053728926e000c5041c744314
DIST ruby_parser-3.13.1.gem 445952 BLAKE2B 7df7bbfe3f7f700747d32bd5c66d94fdd7c57974e622969958dda39f4dc8656a4211378ba51c4b8e8eefafebf82e550ab73a775530eab06ff6419a3dee7f8f7b SHA512 90c8b68245168c7df4ec8d0e6c62d9723d759945823768645614fe085f375c6811a15c35334c485cb59f32f6adb1aa0a06e7df043b09a48ef4e6102d93562b1b
DIST ruby_parser-3.9.0.gem 411648 BLAKE2B ba5247a408c24c2ac36561ed9c26b4124a61565327247ee5dc3315a9f3e1f995fd6419c19ee8013efcc2b30fd752b3c8f6dd24011d35168f7e8cbcd224ddb909 SHA512 f609084d82caf4c33a40b64ee9df473375f00c59a34ec5b419f155a54a7fb9436ffb77ace406a01974c6c0d7b11b97447da0b3053c1fd87c66eb0406a0150312

@ -0,0 +1,38 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
USE_RUBY="ruby23 ruby24 ruby25 ruby26"
RUBY_FAKEGEM_RECIPE_DOC="rdoc"
RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
inherit ruby-fakegem
DESCRIPTION="A ruby parser written in pure ruby"
HOMEPAGE="https://github.com/seattlerb/ruby_parser"
LICENSE="MIT"
SLOT="3"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_rdepend ">=dev-ruby/sexp_processor-4.9.0:4
!<dev-ruby/ruby_parser-2.3.1-r1"
ruby_add_bdepend "test? ( dev-ruby/racc >=dev-ruby/minitest-4.3 >=dev-ruby/sexp_processor-4.12.0:4 )"
DEPEND+=" test? ( dev-util/unifdef )"
all_ruby_prepare() {
# Remove reference to perforce method that is not in a released
# version of hoe-seattlerb.
#sed -i -e '/perforce/d' Rakefile || die
sed -i -e '/license/d' Rakefile || die
sed -i -e '/Hoe.plugin :isolate/ s:^:#:' Rakefile || die
}
each_ruby_test() {
${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
}

Binary file not shown.

@ -20,6 +20,7 @@ RDEPEND="
"
DEPEND="${DEPEND}
>=sys-devel/gettext-0.19.4
dev-util/glib-utils
>=dev-util/gtk-doc-am-1.25
virtual/pkgconfig
"

Binary file not shown.

@ -1 +1 @@
Tue, 26 Mar 2019 04:38:40 +0000
Tue, 26 Mar 2019 08:38:39 +0000

@ -1 +1 @@
Tue, 26 Mar 2019 04:38:40 +0000
Tue, 26 Mar 2019 08:38:39 +0000

Binary file not shown.

@ -0,0 +1,14 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
DEPEND=test? ( app-text/mupdf ) test? ( ruby_targets_ruby23? ( ~dev-ruby/actionpack-5.2.2.1:*[ruby_targets_ruby23] ~dev-ruby/activerecord-5.2.2.1:*[ruby_targets_ruby23] >=dev-ruby/marcel-0.3.1[ruby_targets_ruby23] =dev-ruby/marcel-0.3*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/actionpack-5.2.2.1:*[ruby_targets_ruby24] ~dev-ruby/activerecord-5.2.2.1:*[ruby_targets_ruby24] >=dev-ruby/marcel-0.3.1[ruby_targets_ruby24] =dev-ruby/marcel-0.3*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( ~dev-ruby/actionpack-5.2.2.1:*[ruby_targets_ruby25] ~dev-ruby/activerecord-5.2.2.1:*[ruby_targets_ruby25] >=dev-ruby/marcel-0.3.1[ruby_targets_ruby25] =dev-ruby/marcel-0.3*[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( ~dev-ruby/railties-5.2.2.1[ruby_targets_ruby23] dev-ruby/test-unit:2[ruby_targets_ruby23] dev-ruby/mini_magick[ruby_targets_ruby23] dev-ruby/mocha[ruby_targets_ruby23] dev-ruby/rake[ruby_targets_ruby23] dev-ruby/sqlite3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( ~dev-ruby/railties-5.2.2.1[ruby_targets_ruby24] dev-ruby/test-unit:2[ruby_targets_ruby24] dev-ruby/mini_magick[ruby_targets_ruby24] dev-ruby/mocha[ruby_targets_ruby24] dev-ruby/rake[ruby_targets_ruby24] dev-ruby/sqlite3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( ~dev-ruby/railties-5.2.2.1[ruby_targets_ruby25] dev-ruby/test-unit:2[ruby_targets_ruby25] dev-ruby/mini_magick[ruby_targets_ruby25] dev-ruby/mocha[ruby_targets_ruby25] dev-ruby/rake[ruby_targets_ruby25] dev-ruby/sqlite3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
DESCRIPTION=Attach cloud and local files in Rails applications
EAPI=6
HOMEPAGE=https://github.com/rails/rails
IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
LICENSE=MIT
RDEPEND=ruby_targets_ruby23? ( ~dev-ruby/actionpack-5.2.2.1:*[ruby_targets_ruby23] ~dev-ruby/activerecord-5.2.2.1:*[ruby_targets_ruby23] >=dev-ruby/marcel-0.3.1[ruby_targets_ruby23] =dev-ruby/marcel-0.3*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/actionpack-5.2.2.1:*[ruby_targets_ruby24] ~dev-ruby/activerecord-5.2.2.1:*[ruby_targets_ruby24] >=dev-ruby/marcel-0.3.1[ruby_targets_ruby24] =dev-ruby/marcel-0.3*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( ~dev-ruby/actionpack-5.2.2.1:*[ruby_targets_ruby25] ~dev-ruby/activerecord-5.2.2.1:*[ruby_targets_ruby25] >=dev-ruby/marcel-0.3.1[ruby_targets_ruby25] =dev-ruby/marcel-0.3*[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
SLOT=5.2
SRC_URI=https://github.com/rails/rails/archive/v5.2.2.1.tar.gz -> rails-5.2.2.1.tgz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem 4044516b167f460104703fee4a3c7f5f ruby-ng 9ffc1c055a3294fcc48de781c94825f6 ruby-utils 10cec86289e60f4b0d731b2e4b545e5d toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
_md5_=186b6808a4492c5be2cfb5e76311da61

@ -0,0 +1,14 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby23] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby24] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby25] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby26] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/racc[ruby_targets_ruby23] >=dev-ruby/minitest-4.3[ruby_targets_ruby23] >=dev-ruby/sexp_processor-4.12.0:4[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/racc[ruby_targets_ruby24] >=dev-ruby/minitest-4.3[ruby_targets_ruby24] >=dev-ruby/sexp_processor-4.12.0:4[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/racc[ruby_targets_ruby25] >=dev-ruby/minitest-4.3[ruby_targets_ruby25] >=dev-ruby/sexp_processor-4.12.0:4[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/racc[ruby_targets_ruby26] >=dev-ruby/minitest-4.3[ruby_targets_ruby26] >=dev-ruby/sexp_processor-4.12.0:4[ruby_targets_ruby26] ) ) test? ( dev-util/unifdef ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
DESCRIPTION=A ruby parser written in pure ruby
EAPI=6
HOMEPAGE=https://github.com/seattlerb/ruby_parser
IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby23] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby24] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby25] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby26] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby26] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
SLOT=3
SRC_URI=mirror://rubygems/ruby_parser-3.13.1.gem
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem 4044516b167f460104703fee4a3c7f5f ruby-ng 9ffc1c055a3294fcc48de781c94825f6 ruby-utils 10cec86289e60f4b0d731b2e4b545e5d toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
_md5_=03ee8e84d56e0e384761c5a5c961a4e5

@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare
DEPEND=>=sys-devel/gettext-0.19.4 >=dev-util/gtk-doc-am-1.25 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
DEPEND=>=sys-devel/gettext-0.19.4 dev-util/glib-utils >=dev-util/gtk-doc-am-1.25 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=Actions, Menus and Toolbars Kit for GTK+ applications
EAPI=6
HOMEPAGE=https://wiki.gnome.org/Projects/Amtk
@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.52:2 >=x11-libs/gtk+-3.22:3 introspection? ( >=dev-lib
SLOT=5
SRC_URI=mirror://gnome/sources/amtk/5.0/amtk-5.0.0.tar.xz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
_md5_=90756db8c028a556238d65f54d9ccaf7
_md5_=297107e314836772bc7cf83aa17960e2

@ -4,11 +4,11 @@ DESCRIPTION=Point-to-Point Protocol (PPP)
EAPI=6
HOMEPAGE=https://ppp.samba.org/
IUSE=activefilter atm dhcp eap-tls gtk ipv6 libressl pam radius kernel_linux
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
LICENSE=BSD GPL-2
PDEPEND=net-dialup/ppp-scripts
RDEPEND=activefilter? ( net-libs/libpcap ) atm? ( net-dialup/linux-atm ) pam? ( virtual/pam ) gtk? ( x11-libs/gtk+:2 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= )
SLOT=0/2.4.7
SRC_URI=https://download.samba.org/pub/ppp/ppp-2.4.7.tar.gz https://dev.gentoo.org/~polynomial-c/ppp-2.4.7-patches-7.tar.xz http://www.netservers.net.uk/gpl/ppp-dhcpc.tgz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 pam 3e788d86170dfcd5b06824d898315e18 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
_md5_=7ca8b0918ca056254812131a58309cde
_md5_=c3960a4da3ac0546eca81422ee555d21

@ -10,6 +10,6 @@ RDEPEND=!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-
REQUIRED_USE=?? ( gcrypt libressl mbedtls )
RESTRICT=test
SLOT=0
SRC_URI=https://www.libssh2.org/download/libssh2-1.8.1.tar.gz
SRC_URI=https://www.libssh2.org/download/libssh2-1.8.2.tar.gz
_eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils ab10bd85e5d38e2a32077bcd91faa1b6 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 14d00d009167652b1fa363e55effe213
_md5_=5b88a838ae8e91a8bc8e2d60592b1cce

@ -1 +1 @@
Tue, 26 Mar 2019 04:38:40 +0000
Tue, 26 Mar 2019 08:38:39 +0000

@ -1 +1 @@
Tue Mar 26 04:38:40 UTC 2019
Tue Mar 26 08:38:39 UTC 2019

@ -1 +1 @@
Tue, 26 Mar 2019 05:00:01 +0000
Tue, 26 Mar 2019 09:00:01 +0000

@ -1 +1 @@
0252795a66c95ae30819f0cdc26b89821794c07e 1553573582 2019-03-26T04:13:02+00:00
1315f1d0a046f97945c0f29dabf8009e47dc8718 1553588773 2019-03-26T08:26:13+00:00

@ -1 +1 @@
1553574901 Tue 26 Mar 2019 04:35:01 AM UTC
1553589301 Tue 26 Mar 2019 08:35:01 AM UTC

@ -1 +1 @@
Tue, 26 Mar 2019 04:38:40 +0000
Tue, 26 Mar 2019 08:38:39 +0000

Binary file not shown.

@ -1,4 +1,4 @@
# Copyright 1999-2018 Gentoo Authors
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@ -14,7 +14,7 @@ SRC_URI="https://download.samba.org/pub/ppp/${P}.tar.gz
LICENSE="BSD GPL-2"
SLOT="0/${PV}"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
IUSE="activefilter atm dhcp eap-tls gtk ipv6 libressl pam radius"
DEPEND="

Binary file not shown.

@ -1,2 +1,2 @@
DIST libssh2-1.8.0.tar.gz 854916 BLAKE2B 618c4a19789f2e5eda85852760dffff5672d420d2fa50393b05b7398a1913f74e5f6695f078628050ac9851965d6e45cf410b7c4590a8f18d67c718c829ab352 SHA512 289aa45c4f99653bebf5f99565fe9c519abc204feb2084b47b7cc3badc8bf4ecdedd49ea6acdce8eb902b3c00995d5f92a3ca77b2508b92f04ae0e7de7287558
DIST libssh2-1.8.1.tar.gz 858088 BLAKE2B 4e7358c55355265ec3c7d7ce749b01d74bc1c37ba73467401c24f0abb2b22da12ba938393f3cf7278ef30900c0cfa700ab71c4fd32a1d41eaeb6fb47669c1ee1 SHA512 f09ad9ed04d25305b966e7f8c210082fe06c2b236dcd5018b009bd0bd6aaff123d16559d280892a5060760ed055ffe295bc02dc6e8dd1e7b8383c6c703f09290
DIST libssh2-1.8.2.tar.gz 859587 BLAKE2B 58e0854e83001c424a767ceb4ddfb535373320d8319aa632244dc14434276db7c8b7a77d4a5f22fe8e397f1050b33516d2fca1162658a9f414166f560bc1f358 SHA512 390ab4ad93bb738415ec11a6eb92806c9b9e9e5d8ee7c442d841a58b4292c1c447a9bc99e153ba464e2e11f9c0d1913469303598c3046722d1ae821991e8cb93

Binary file not shown.

@ -1,6 +1,27 @@
From 7ad08649a223a4cd61e67d8334a147f55c79399d Mon Sep 17 00:00:00 2001
From: Jacob Nevins <jacobn@chiark.greenend.org.uk>
Date: Mon, 25 Mar 2019 23:46:59 +0000
Subject: [PATCH] Fix compilation with NO_GSSAPI.
This is a fairly shallow patch, which removes the UI and interactions
with external libraries. Some other machinery (which is dead code in
this configuration) is left in place.
Adapted by me from a patch by Jeroen Roovers.
---
config.c | 4 ++++
settings.c | 12 ++++++++++--
ssh.c | 16 +++++++++++++++-
ssh2transport.c | 3 +--
ssh2userauth.c | 8 ++++++--
sshserver.c | 13 ++++++++++++-
6 files changed, 48 insertions(+), 8 deletions(-)
diff --git a/config.c b/config.c
index 9c299fee..6528a969 100644
--- a/config.c
+++ b/config.c
@@ -2442,10 +2442,12 @@
@@ -2442,10 +2442,12 @@ void setup_config_box(struct controlbox *b, bool midsession,
HELPCTX(ssh_kexlist),
kexlist_handler, P(NULL));
c->listbox.height = KEX_MAX;
@ -13,7 +34,7 @@
s = ctrl_getset(b, "Connection/SSH/Kex", "repeat",
"Options controlling key re-exchange");
@@ -2455,11 +2457,13 @@
@@ -2455,11 +2457,13 @@ void setup_config_box(struct controlbox *b, bool midsession,
conf_editbox_handler,
I(CONF_ssh_rekey_time),
I(-1));
@ -27,9 +48,11 @@
ctrl_editbox(s, "Max data before rekey (0 for no limit)", 'x', 20,
HELPCTX(ssh_kex_repeat),
conf_editbox_handler,
diff --git a/settings.c b/settings.c
index 8d563026..54f5ab7b 100644
--- a/settings.c
+++ b/settings.c
@@ -592,21 +592,25 @@
@@ -592,21 +592,25 @@ void save_open_settings(settings_w *sesskey, Conf *conf)
write_setting_b(sesskey, "Compression", conf_get_bool(conf, CONF_compression));
write_setting_b(sesskey, "TryAgent", conf_get_bool(conf, CONF_tryagent));
write_setting_b(sesskey, "AgentFwd", conf_get_bool(conf, CONF_agentfwd));
@ -56,7 +79,7 @@
wprefs(sesskey, "GSSLibs", gsslibkeywords, ngsslibs, conf, CONF_ssh_gsslist);
write_setting_filename(sesskey, "GSSCustom", conf_get_filename(conf, CONF_ssh_gss_custom));
#endif
@@ -937,7 +941,9 @@
@@ -937,7 +941,9 @@ void load_open_settings(settings_r *sesskey, Conf *conf)
gppb(sesskey, "TryAgent", true, conf, CONF_tryagent);
gppb(sesskey, "AgentFwd", false, conf, CONF_agentfwd);
gppb(sesskey, "ChangeUsername", false, conf, CONF_change_username);
@ -66,7 +89,7 @@
gprefs(sesskey, "Cipher", "\0",
ciphernames, CIPHER_MAX, conf, CONF_ssh_cipherlist);
{
@@ -990,7 +996,9 @@
@@ -990,7 +996,9 @@ void load_open_settings(settings_r *sesskey, Conf *conf)
gprefs(sesskey, "HostKey", "ed25519,ecdsa,rsa,dsa,WARN",
hknames, HK_MAX, conf, CONF_ssh_hklist);
gppi(sesskey, "RekeyTime", 60, conf, CONF_ssh_rekey_time);
@ -76,7 +99,7 @@
gpps(sesskey, "RekeyBytes", "1G", conf, CONF_ssh_rekey_data);
{
/* SSH-2 only by default */
@@ -1007,9 +1015,9 @@
@@ -1007,9 +1015,9 @@ void load_open_settings(settings_r *sesskey, Conf *conf)
gppb(sesskey, "SshBanner", true, conf, CONF_ssh_show_banner);
gppb(sesskey, "AuthTIS", false, conf, CONF_try_tis_auth);
gppb(sesskey, "AuthKI", true, conf, CONF_try_ki_auth);
@ -87,9 +110,11 @@
gprefs(sesskey, "GSSLibs", "\0",
gsslibkeywords, ngsslibs, conf, CONF_ssh_gsslist);
gppfile(sesskey, "GSSCustom", conf, CONF_ssh_gss_custom);
diff --git a/ssh.c b/ssh.c
index e35ebc64..e8ad61b8 100644
--- a/ssh.c
+++ b/ssh.c
@@ -50,7 +50,9 @@
@@ -50,7 +50,9 @@ struct Ssh {
ssh_sharing_state *connshare;
bool attempting_connshare;
@ -99,7 +124,7 @@
char *savedhost;
int savedport;
@@ -252,10 +254,17 @@
@@ -252,10 +254,18 @@ static void ssh_got_ssh_version(struct ssh_version_receiver *rcv,
conf_get_bool(ssh->conf, CONF_tryagent), username,
conf_get_bool(ssh->conf, CONF_change_username),
conf_get_bool(ssh->conf, CONF_try_ki_auth),
@ -107,31 +132,86 @@
conf_get_bool(ssh->conf, CONF_try_gssapi_auth),
conf_get_bool(ssh->conf, CONF_try_gssapi_kex),
conf_get_bool(ssh->conf, CONF_gssapifwd),
&ssh->gss_state);
- &ssh->gss_state);
+ &ssh->gss_state
+#else
+ NULL,
+ NULL,
+ NULL,
+ NULL);
+ false,
+ false,
+ false,
+ NULL
+#endif
+ );
ssh_connect_ppl(ssh, userauth_layer);
transport_child_layer = userauth_layer;
@@ -267,7 +276,11 @@
@@ -267,7 +277,11 @@ static void ssh_got_ssh_version(struct ssh_version_receiver *rcv,
ssh->fullhostname,
ssh_verstring_get_local(old_bpp),
ssh_verstring_get_remote(old_bpp),
+#ifndef NO_GSSAPI
&ssh->gss_state,
+#else
+ NULL,
+ NULL,
+#endif
&ssh->stats, transport_child_layer, false);
ssh_connect_ppl(ssh, ssh->base_layer);
diff --git a/ssh2transport.c b/ssh2transport.c
index 8640d89d..5e8955a0 100644
--- a/ssh2transport.c
+++ b/ssh2transport.c
@@ -1781,6 +1781,7 @@ static void ssh2_transport_gss_update(struct ssh2_transport_state *s,
if (mins > 0 && s->gss_ctxt_lifetime <= mins * 60)
s->gss_status |= GSS_CTXT_EXPIRES;
}
+#endif /* NO_GSSAPI */
ptrlen ssh2_transport_get_session_id(PacketProtocolLayer *ppl)
{
@@ -1805,8 +1806,6 @@ void ssh2_transport_notify_auth_done(PacketProtocolLayer *ppl)
queue_idempotent_callback(&s->ppl.ic_process_queue);
}
-#endif /* NO_GSSAPI */
-
static bool ssh2_transport_get_specials(
PacketProtocolLayer *ppl, add_special_fn_t add_special, void *ctx)
{
diff --git a/ssh2userauth.c b/ssh2userauth.c
index fc413923..7f5a1292 100644
--- a/ssh2userauth.c
+++ b/ssh2userauth.c
@@ -613,8 +613,10 @@ static void ssh2_userauth_process_queue(PacketProtocolLayer *ppl)
* Scan it for method identifiers we know about.
*/
bool srv_pubkey = false, srv_passwd = false;
- bool srv_keyb_inter = false, srv_gssapi = false;
- bool srv_gssapi_keyex_auth = false;
+ bool srv_keyb_inter = false;
+#ifndef NO_GSSAPI
+ bool srv_gssapi = false, srv_gssapi_keyex_auth = false;
+#endif
for (ptrlen method; get_commasep_word(&methods, &method) ;) {
if (ptrlen_eq_string(method, "publickey"))
@@ -623,10 +625,12 @@ static void ssh2_userauth_process_queue(PacketProtocolLayer *ppl)
srv_passwd = true;
else if (ptrlen_eq_string(method, "keyboard-interactive"))
srv_keyb_inter = true;
+#ifndef NO_GSSAPI
else if (ptrlen_eq_string(method, "gssapi-with-mic"))
srv_gssapi = true;
else if (ptrlen_eq_string(method, "gssapi-keyex"))
srv_gssapi_keyex_auth = true;
+#endif
}
/*
diff --git a/sshserver.c b/sshserver.c
index 5f6e7dde..5c34bb35 100644
--- a/sshserver.c
+++ b/sshserver.c
@@ -50,7 +50,9 @@
@@ -50,7 +50,9 @@ struct server {
PacketProtocolLayer *base_layer;
ConnectionLayer *cl;
@ -141,18 +221,19 @@
};
static void ssh_server_free_callback(void *vsrv);
@@ -246,8 +248,10 @@
@@ -245,9 +247,11 @@ Plug *ssh_server_plug(
bufchain_init(&srv->out_raw);
bufchain_init(&srv->dummy_user_input);
/* FIXME: replace with sensible */
+#ifndef NO_GSSAPI
/* FIXME: replace with sensible */
srv->gss_state.libs = snew(struct ssh_gss_liblist);
srv->gss_state.libs->nlibraries = 0;
+#endif
return &srv->plug;
}
@@ -297,7 +301,9 @@
@@ -297,7 +301,9 @@ static void ssh_server_free_callback(void *vsrv)
conf_free(srv->conf);
log_free(srv->logctx);
@ -162,75 +243,20 @@
sfree(srv);
@@ -442,7 +448,11 @@
@@ -442,7 +448,12 @@ static void server_got_ssh_version(struct ssh_version_receiver *rcv,
srv->conf, NULL, 0, NULL,
ssh_verstring_get_remote(old_bpp),
ssh_verstring_get_local(old_bpp),
- &srv->gss_state, &srv->stats, transport_child_layer, true);
+#ifndef NO_GSSAPI
&srv->gss_state, &srv->stats, transport_child_layer, true);
+ &srv->gss_state,
+#else
+ NULL, &srv->stats, transport_child_layer, true);
+ NULL,
+#endif
+ &srv->stats, transport_child_layer, true);
ssh2_transport_provide_hostkeys(
srv->base_layer, srv->hostkeys, srv->nhostkeys);
if (userauth_layer)
--- a/ssh2userauth.c
+++ b/ssh2userauth.c
@@ -241,7 +241,9 @@
* Misc one-time setup for authentication.
*/
s->publickey_blob = NULL;
+#ifndef NO_GSSAPI
s->session_id = ssh2_transport_get_session_id(s->transport_layer);
+#endif
/*
* Load the public half of any configured public key file for
@@ -613,8 +615,12 @@
* Scan it for method identifiers we know about.
*/
bool srv_pubkey = false, srv_passwd = false;
+#ifndef NO_GSSAPI
bool srv_keyb_inter = false, srv_gssapi = false;
bool srv_gssapi_keyex_auth = false;
+#else
+ bool srv_keyb_inter = false;
+#endif
for (ptrlen method; get_commasep_word(&methods, &method) ;) {
if (ptrlen_eq_string(method, "publickey"))
@@ -623,10 +629,12 @@
srv_passwd = true;
else if (ptrlen_eq_string(method, "keyboard-interactive"))
srv_keyb_inter = true;
+#ifndef NO_GSSAPI
else if (ptrlen_eq_string(method, "gssapi-with-mic"))
srv_gssapi = true;
else if (ptrlen_eq_string(method, "gssapi-keyex"))
srv_gssapi_keyex_auth = true;
+#endif
}
/*
@@ -1640,7 +1648,9 @@
* any packets since. Signal the transport layer to consider
* doing an immediate rekey, if it has any reason to want to.
*/
+#ifndef NO_GSSAPI
ssh2_transport_notify_auth_done(s->transport_layer);
+#endif
/*
* Finally, hand over to our successor layer, and return
--- a/ssh2userauth-server.c
+++ b/ssh2userauth-server.c
@@ -122,7 +122,9 @@
crBegin(s->crState);
+#ifndef NO_GSSAPI
s->session_id = ssh2_transport_get_session_id(s->transport_layer);
+#endif
while (1) {
crMaybeWaitUntilV((pktin = ssh2_userauth_server_pop(s)) != NULL);
--
2.11.0

Loading…
Cancel
Save