parent
dececce387
commit
1e5bec651d
@ -1,23 +1,23 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA512
|
||||
|
||||
MANIFEST Manifest.files.gz 29315 BLAKE2B b409c17c33e69e031adb7a5b0a52674880cf31b7e23dfaf8bd5b364118e81b43d36f83a31c7c81b838621ec7e3c2eb9f105b20f181a9cafb2fa15664c3a0e48a SHA512 c20c4f8c30888dd9db1d8791344960c3f9ff3a41c9ab3ee59b87d9c90c19fed7ba3e81d95a2e546011a289f6c62b3fa05f5709b5f8af484e2d5c97b275637211
|
||||
TIMESTAMP 2021-09-11T14:39:23Z
|
||||
MANIFEST Manifest.files.gz 29316 BLAKE2B 866fdfb35c9aea4289a90bba29765c2b8e83a4a6c83abfec895cba268dc90406781d5fa1c3ad892d7fa5eae9a10a9f6347fc91e1560f517bf2bd228317a09396 SHA512 0937003b45c18b8bf1369e01718b5f0887186af692d5b9d19d02698ad58538a1c262d20816b18cfe3bc485ca303575f25536fcc250dec889138e2227c00ab808
|
||||
TIMESTAMP 2021-09-13T05:08:55Z
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmE8v5tfFIAAAAAALgAo
|
||||
iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmE+3OdfFIAAAAAALgAo
|
||||
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
|
||||
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
|
||||
klDoYQ/+Pbm113kE+G6eihb8hbK0JzbSbJTvzBH/UgRxekwd40sV5AZ7Tc3q0xRz
|
||||
8lOPBHbB53pQMnSeZ3XkRKgCLygY6WJdkg+vZStKUer4sYwroSM9JZ5zcSt1GbE4
|
||||
sFI/Yarp12t+CvasRP6Y/Zu/Ca8Jj4CgCap06xTRCbec5KHk2v5ra5wn6KxkSpC8
|
||||
1lCOkFYWnEF/Xn9uujoP33YTrpyrhiV5h879pQhz/ylEfD82smkPZdyaOAIqnTjZ
|
||||
SVdl6zBWWpVhiBaqK4+EKcBKKV9Pe/6gAHuQfvcuE34Pa5jTkBM37TQdt4mi2U+o
|
||||
tLFzMbZirinkgSaKHtON9FvbPNO5kR6kD04VEKSJqgWXmEvIFdCGttalb0t9MfP7
|
||||
RGamDYUESH1hhnhnH/DuGnI4LS+F3eW118k+C8bMfYi2T4QqKDT285/gGMheGncq
|
||||
jCMK3lNjeIOcxFSeAuxn2w9/oGmWiN6VeCiUDLTuRXBANdAzucOj9xfXXmPUNHs/
|
||||
HHuaMEOZlv01+Dw7/PQmzrE0xk1/h72il+0vpPwaMPM3+l2t3X7aGA5QPc03mOS9
|
||||
V4yYLeTZwHg//8o8r7zdfaQbYVSCdMSlH1b/UzGB/UzRlNHvEXu4fUee7rWVXo6F
|
||||
GxAk6AGXLJxMfjlxCBhXgR+IDckcnz1mwkpSJ60FqvIKarWHxnM=
|
||||
=9+Sl
|
||||
klClHw/+JpEzyYhUV6o1YHW6Ywjer9x+xBecbyMYFzV8eSzO8dtXUgdT9hPJkYOZ
|
||||
NyJZIgY/XuqVmzaaC36jMCMpes5Fghl5S7uE/5bZA67LJf3aXDzp0phjIvrJ1Xh0
|
||||
Z/DOTAtKz1UjyDoEUZkUw4dTRpKn6bL4TZv2vsk83pvw/+fXMZ9KpOV2cQfD9EBU
|
||||
Ce9zgYFk55kuWhGgaqaVjh1Ls5xaz70oanSAvNAD/AYJF2DUrN96WU77mx9KaQtE
|
||||
ederkTuzxahrQeedrXzYHutA+4EdHhnGKhuu4J5wxdhT24Eohia7mdgjrTwJyxRV
|
||||
ala7LgcWfyEp+E2t0ADe1r7RboMHHYfq7nKPfMewhg6HdN8RQwZ8yWrf3PS8aZRN
|
||||
bzC9yvuSXw/BCmi59Dt3EGTg9hjKIT1PgxA18by9ACOLmw3mPXV97zuDVc5J0cxb
|
||||
hZhDu/u/kaFlQc6QkkzkIhHvF9rQqQ1MIEkF0GUdKTpfqYCsQpgSUrBhOWwPsZwI
|
||||
67CW4kMvZuhenB2aBfPLiZklW6tAXguoFnHgpWODqt7pAuhCj65AQX5z7m4qHHCQ
|
||||
dhbvW9NEE7ZGBqrYKcl5YlCrOhYCqZcknccahZg8LL6lbreKgKymjGW2AdZy1FNp
|
||||
RbruxSWLx9wMipILSQBzQXiDsVs3W6Dlp8/nQUBUDIB4u1lZmMo=
|
||||
=oD6o
|
||||
-----END PGP SIGNATURE-----
|
||||
|
Binary file not shown.
Binary file not shown.
@ -1,6 +1,4 @@
|
||||
AUX mcollectived.initd 497 BLAKE2B 1fe966f49117f9ea1b8c8ca4f5c92d5ddd7f8fb28658e4c3b016c193b69d1c42d35da85ace176279d09778c12fcc664748ea743c9b88219cb0fec2292ca867d4 SHA512 dc77a522e3ab6af3e23c559bfcb385033f2200b58b50db59000e7f56b2a789e8fbd83340f8ee494a1a9fdbdd1bd737a2b17ae4743823794264723fdc931ea6b0
|
||||
DIST mcollective-2.12.4.tar.gz 1517723 BLAKE2B e49a43ae7b99a5f22fe33549b26f938941f4e007c164c3c8de77daf2b3410c7db21e5023a400c87a2e4927a5a986e3b66bc3363a0c697ea06f0dd112825ae368 SHA512 f357297253f1cb5815738c8899a543642ce721c60ba023b13a7b14a99049d909622f8500ed82fc68c142cc1ffc106aed5a9bf8b1604a47c19a04a5ef4006b9e5
|
||||
DIST mcollective-2.12.5.tar.gz 1517727 BLAKE2B b5d91c748bb1bfc63c7c040fb067d7ba39badede094d975f0b87587fe3a6c5bb6757a5be73f887be5d83f99dfefb0272bd48da6c9e79b4aee34c8d5f51e2e6c5 SHA512 639458d83b3f25d9aa433c205b9d16ded5ec689c1efb4827457fc3075c000d7abc2b70c9c8cf741c8bea03c1e47284015e69bf834e7a5670c68a40097e45891b
|
||||
EBUILD mcollective-2.12.4.ebuild 1646 BLAKE2B 36932cbac263d9e0c2d6c0ff41a78d902eb9608d2bbf7a819f97a439feab2e7dfce45d3fd7b5a726a8ff61e87a4c1659efb25ca4a713eb1c4d2fd9313c0bf0aa SHA512 1382a7674f73b359669965fa7c591d4e1c60276b918bb028c36edfead8f9cf7efdb1fa0907d757df5210561602bb4a2345e3d15dca86482335289a71eec1d705
|
||||
EBUILD mcollective-2.12.5.ebuild 1646 BLAKE2B f259fc2825f41f82822004b1713dfb2decd05bdec62af33e41b8436a073f166d99f9f1c1473e739e0c74c347b5201c2f098f69a459ae6dd4dc5946ab8ea40f87 SHA512 6ac57249025751d9d3c41f06167851e9fc9b30d187c0b81e7aa0fff8960ba668e122a8d7da946171f11728b4822d42609f8bb1124a94aca45905d60719d1df11
|
||||
MISC metadata.xml 392 BLAKE2B d01236da42e7dc7ab1829bf4353a446b3c195cc6f4dbf40ad6d7f846fae0f4e0392a97767497ae14cd0c9950a12e7c6a0ac2a136b74e43d1f6c28d375a1a0564 SHA512 616a68590b38d2f842fbc8758e611db9610df52a5e7ed00757ddaed87703464eb1919c277bb2afa97db04610824c58715c08fb8c05a7a8bbb65d42410f74f412
|
||||
|
@ -1,60 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="6"
|
||||
|
||||
USE_RUBY="ruby23 ruby24 ruby25"
|
||||
|
||||
inherit ruby-ng
|
||||
|
||||
DESCRIPTION="Framework to build server orchestration or parallel job execution
|
||||
systems"
|
||||
HOMEPAGE="https://docs.puppet.com/mcollective/"
|
||||
SRC_URI="https://github.com/puppetlabs/marionette-collective/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
S="${WORKDIR}/all/marionette-collective-${PV}"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="doc +client"
|
||||
|
||||
DEPEND=""
|
||||
RDEPEND=">=dev-ruby/stomp-1.4.4"
|
||||
|
||||
src_compile() {
|
||||
einfo "nothing to compile"
|
||||
}
|
||||
|
||||
each_ruby_install() {
|
||||
cd "marionette-collective-${PV}"
|
||||
doruby -r lib/*
|
||||
insinto /usr/share/mcollective
|
||||
use client && dosbin bin/mco
|
||||
dosbin bin/mcollectived
|
||||
if use doc ; then
|
||||
dohtml -r doc/*
|
||||
insinto /usr/share/doc/${P}/ext
|
||||
doins -r ext/*
|
||||
fi
|
||||
newinitd "${FILESDIR}"/mcollectived.initd mcollectived
|
||||
insinto /etc/mcollective
|
||||
cd etc
|
||||
for cfg in *.dist ; do
|
||||
newins "${cfg}" "${cfg%%.dist}"
|
||||
sed -i -e "s:^libdir.*:libdir = /usr/share/mcollective/plugins:" \
|
||||
"${D}"/etc/mcollective/${cfg%%.dist} || die "sed failed"
|
||||
done
|
||||
insinto /etc/mcollective/plugin.d
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo "Mcollective requires a stomp server installed and functioning before"
|
||||
einfo "you can use it. The recommended server to use is ActiveMQ [1] but"
|
||||
einfo "any other stomp compatible server should work."
|
||||
einfo
|
||||
einfo "It is recommended you read the \'getting started\' guide [2] if this"
|
||||
einfo "is a new installation"
|
||||
einfo
|
||||
einfo "[1] https://activemq.apache.org/"
|
||||
einfo "[2] https://code.google.com/p/mcollective/wiki/GettingStarted"
|
||||
}
|
Binary file not shown.
@ -1,7 +0,0 @@
|
||||
AUX acovea-gtk-1.0.1-gcc4.3.patch 455 BLAKE2B 4cd6eaea8285e185f01a577e350f1921d3037dd206ab5ac04cb6d369530d2ac3f24e642b4a451e4ce73263f4260a7813d54599450f1ec16d24e809ae92b5fe51 SHA512 a1312e06ff5bebb8f66a27b34cbdf9cb05879e6dc51951bb683746e2ad20a9cbaddc6d43165face16d1c130262bfd38a29ff645809f884ac88fc66f3d7f19462
|
||||
AUX acovea-gtk-1.0.1-libbrahe.patch 351 BLAKE2B 9926469cb0812db675c89be708246207c3c2d86f198e95f771fb4324a4fba561de030b0c4c2398aa7edadd8e4dbc1cfa49c51a096fe1fb3680b4448ac862db35 SHA512 a12b61a07f1d68c56fe13840e9bfd54ebfce1f6205bd0f7d3a98c7a505b7c6dfba33eb159f51c73d64ffabd0f1053c54213ddd01c9a438de35a9a4e00b71282c
|
||||
AUX acovea-gtk-1.0.1-libsigc.patch 6753 BLAKE2B b7a32cdc82f00e8add5ccff74e666667f170cce1113aa549ac3cdfdc241fcc55328804fa8e8ef14a888ddf0362440ada3f3cc34cbc9d611047e373684026396c SHA512 0f8463b8cec994a8fe1fe2a3971c9cc3f3d1427b7f3925cfdeb3a23ebcecfe324512830a80532ca904896c3314a72e75180dae9b10c2d0711d503c8bfc081ec0
|
||||
AUX acovea-gtk-1.0.1-unicode.patch 385 BLAKE2B ab96d0827004a7cd1dc1fb27af0db920d5ca3a0fa9770afebe3fb0a7cb52c9eb09c20651bb9dff26638d179c64dbbac721938a9c417a716444c3bfdaa2f8f3af SHA512 ea792ec464cc5d844eba769bb4246a7396b393d214834c6eaf8890ebf2d0de2d36e0e89dc89efdf753d046d1d3f032dc3806a20bf4360810bb8e1af56fc4d66e
|
||||
DIST acovea-gtk-1.0.1.tar.gz 407230 BLAKE2B ba8e27bc42e1cf7577c61a819a25b373c45738fb6788da9e4e40368ee3a64e363fcc66b43b80a357ba7ecf8e2b22937188c61457212e6051950fe5285e8e7629 SHA512 c26eb0059b0f6a8a77ebff2f9cad9a9d543a2932f035e520c40bc3b917d1570533be934571528b7e2e53932e56afa77eff108a1ac51678a514960563a775c2ed
|
||||
EBUILD acovea-gtk-1.0.1.ebuild 794 BLAKE2B e3cd08ce57ce3e28dd61a7ddf59c8771cf0a5848d38c2bb51adb224234ccc2e6ec28d183bf31c47235a8df19ec4b39bf4ebf83381b83a8f4eb2a982ce8ec417e SHA512 c1a46dc2540fc4046bb37c81d813db31209c4dd1a1e7db0dadd374179bb753efbce1608d4e6a85d1af10216d20bb923cd8d382b0edebeaa20134f3cb2d1cf6f1
|
||||
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
|
@ -1,34 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit autotools desktop flag-o-matic
|
||||
|
||||
DESCRIPTION="Analysis of Compiler Options via Evolutionary Algorithm GUI"
|
||||
HOMEPAGE="http://www.coyotegulch.com/products/acovea/"
|
||||
SRC_URI="http://www.coyotegulch.com/distfiles/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="unicode"
|
||||
|
||||
RDEPEND=">=app-benchmarks/acovea-5
|
||||
dev-cpp/gtkmm:2.4"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
use unicode && eapply "${FILESDIR}"/${P}-unicode.patch
|
||||
eapply "${FILESDIR}"/${P}-{libbrahe,libsigc,gcc4.3}.patch
|
||||
append-cxxflags -std=c++11
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
make_desktop_entry "${PN}" Acovea-gtk \
|
||||
/usr/share/acovea-gtk/pixmaps/acovea_icon_064.png System
|
||||
}
|
@ -1,23 +0,0 @@
|
||||
--- a/src/settings_window.cc
|
||||
+++ b/src/settings_window.cc
|
||||
@@ -6,6 +6,7 @@
|
||||
// This file is for your program, I won't touch it again!
|
||||
|
||||
#include <gtkmm.h>
|
||||
+#include <cstring>
|
||||
#include "config.h"
|
||||
#include "settings_window.hh"
|
||||
|
||||
|
||||
--- a/src/main_window.cc
|
||||
+++ b/src/main_window.cc
|
||||
@@ -9,6 +9,8 @@
|
||||
#include <gtkmm.h>
|
||||
#include <gtkmm/main.h>
|
||||
#include <iomanip>
|
||||
+#include <cstring>
|
||||
+#include <sys/stat.h>
|
||||
#include "config.h"
|
||||
#include "main_window.hh"
|
||||
|
||||
|
@ -1,8 +0,0 @@
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -22,4 +22,4 @@
|
||||
AM_CXXFLAGS = @GTKMM_CFLAGS@
|
||||
|
||||
acovea_gtk_LDFLAGS = -pthread -L//usr/lib
|
||||
-acovea_gtk_LDADD = @LIBS@ @GTKMM_LIBS@ -lgthread-2.0 -lglib-2.0 -lcoyotl -levocosm -lacovea -lexpat
|
||||
+acovea_gtk_LDADD = @LIBS@ @GTKMM_LIBS@ -lgthread-2.0 -lglib-2.0 -lcoyotl -levocosm -lbrahe -lacovea -lexpat
|
@ -1,101 +0,0 @@
|
||||
--- a/src/about_box_glade.cc
|
||||
+++ b/src/about_box_glade.cc
|
||||
@@ -1530,8 +1530,8 @@
|
||||
hbuttonbox1->show();
|
||||
vbox3->show();
|
||||
about_box->show();
|
||||
- about_close_button->signal_clicked().connect(SigC::slot(*this, &about_box_glade::on_about_close_button_clicked), false);
|
||||
- about_box->signal_realize().connect(SigC::slot(*this, &about_box_glade::on_about_box_realize), false);
|
||||
+ about_close_button->signal_clicked().connect(sigc::mem_fun(*this, &about_box_glade::on_about_close_button_clicked), false);
|
||||
+ about_box->signal_realize().connect(sigc::mem_fun(*this, &about_box_glade::on_about_box_realize), false);
|
||||
}
|
||||
|
||||
about_box_glade::~about_box_glade()
|
||||
--- a/src/main_window_glade.cc
|
||||
+++ b/src/main_window_glade.cc
|
||||
@@ -998,19 +998,19 @@
|
||||
main_status->show();
|
||||
vbox1->show();
|
||||
main_window->show();
|
||||
- menu_set_run_options->signal_activate().connect(SigC::slot(*this, &main_window_glade::on_menu_set_run_options_activate), false);
|
||||
- menu_save_options_default->signal_activate().connect(SigC::slot(*this, &main_window_glade::on_menu_save_options_default_activate), false);
|
||||
- menu_load_default_options->signal_activate().connect(SigC::slot(*this, &main_window_glade::on_menu_load_default_options_activate), false);
|
||||
- menu_save_options->signal_activate().connect(SigC::slot(*this, &main_window_glade::on_menu_save_options_activate), false);
|
||||
- save_load_options->signal_activate().connect(SigC::slot(*this, &main_window_glade::on_load_options_activate), false);
|
||||
- menu_quit->signal_activate().connect(SigC::slot(*this, &main_window_glade::on_menu_quit_activate), false);
|
||||
- menu_run->signal_activate().connect(SigC::slot(*this, &main_window_glade::on_menu_run_activate), false);
|
||||
- menu_stop->signal_activate().connect(SigC::slot(*this, &main_window_glade::on_menu_stop_activate), false);
|
||||
- menu_save_output->signal_activate().connect(SigC::slot(*this, &main_window_glade::on_menu_save_output_activate), false);
|
||||
- menu_about->signal_activate().connect(SigC::slot(*this, &main_window_glade::on_about1_activate), false);
|
||||
- toolbar_settings_button->signal_clicked().connect(SigC::slot(*this, &main_window_glade::on_toolbar_settings_button_clicked), false);
|
||||
- toolbar_run_button->signal_clicked().connect(SigC::slot(*this, &main_window_glade::on_toolbar_run_button_clicked), false);
|
||||
- toolbar_stop_button->signal_clicked().connect(SigC::slot(*this, &main_window_glade::on_toolbar_stop_button_clicked), false);
|
||||
+ menu_set_run_options->signal_activate().connect(sigc::mem_fun(*this, &main_window_glade::on_menu_set_run_options_activate), false);
|
||||
+ menu_save_options_default->signal_activate().connect(sigc::mem_fun(*this, &main_window_glade::on_menu_save_options_default_activate), false);
|
||||
+ menu_load_default_options->signal_activate().connect(sigc::mem_fun(*this, &main_window_glade::on_menu_load_default_options_activate), false);
|
||||
+ menu_save_options->signal_activate().connect(sigc::mem_fun(*this, &main_window_glade::on_menu_save_options_activate), false);
|
||||
+ save_load_options->signal_activate().connect(sigc::mem_fun(*this, &main_window_glade::on_load_options_activate), false);
|
||||
+ menu_quit->signal_activate().connect(sigc::mem_fun(*this, &main_window_glade::on_menu_quit_activate), false);
|
||||
+ menu_run->signal_activate().connect(sigc::mem_fun(*this, &main_window_glade::on_menu_run_activate), false);
|
||||
+ menu_stop->signal_activate().connect(sigc::mem_fun(*this, &main_window_glade::on_menu_stop_activate), false);
|
||||
+ menu_save_output->signal_activate().connect(sigc::mem_fun(*this, &main_window_glade::on_menu_save_output_activate), false);
|
||||
+ menu_about->signal_activate().connect(sigc::mem_fun(*this, &main_window_glade::on_about1_activate), false);
|
||||
+ toolbar_settings_button->signal_clicked().connect(sigc::mem_fun(*this, &main_window_glade::on_toolbar_settings_button_clicked), false);
|
||||
+ toolbar_run_button->signal_clicked().connect(sigc::mem_fun(*this, &main_window_glade::on_toolbar_run_button_clicked), false);
|
||||
+ toolbar_stop_button->signal_clicked().connect(sigc::mem_fun(*this, &main_window_glade::on_toolbar_stop_button_clicked), false);
|
||||
}
|
||||
|
||||
main_window_glade::~main_window_glade()
|
||||
--- a/src/settings_window_glade.cc
|
||||
+++ b/src/settings_window_glade.cc
|
||||
@@ -391,11 +391,11 @@
|
||||
hbuttonbox3->show();
|
||||
vbox6->show();
|
||||
settings_window->show();
|
||||
- settings_benchmark_browse_button->signal_clicked().connect(SigC::slot(*this, &settings_window_glade::on_settings_benchmark_browse_button_clicked), false);
|
||||
- settings_config_browse_button->signal_clicked().connect(SigC::slot(*this, &settings_window_glade::on_settings_config_browse_button_clicked), false);
|
||||
- settings_seed_check->signal_toggled().connect(SigC::slot(*this, &settings_window_glade::on_settings_seed_check_toggled), false);
|
||||
- settings_cancel_button->signal_clicked().connect(SigC::slot(*this, &settings_window_glade::on_settings_cancel_button_clicked), false);
|
||||
- settings_okay_button->signal_clicked().connect(SigC::slot(*this, &settings_window_glade::on_settings_okay_button_clicked), false);
|
||||
+ settings_benchmark_browse_button->signal_clicked().connect(sigc::mem_fun(*this, &settings_window_glade::on_settings_benchmark_browse_button_clicked), false);
|
||||
+ settings_config_browse_button->signal_clicked().connect(sigc::mem_fun(*this, &settings_window_glade::on_settings_config_browse_button_clicked), false);
|
||||
+ settings_seed_check->signal_toggled().connect(sigc::mem_fun(*this, &settings_window_glade::on_settings_seed_check_toggled), false);
|
||||
+ settings_cancel_button->signal_clicked().connect(sigc::mem_fun(*this, &settings_window_glade::on_settings_cancel_button_clicked), false);
|
||||
+ settings_okay_button->signal_clicked().connect(sigc::mem_fun(*this, &settings_window_glade::on_settings_okay_button_clicked), false);
|
||||
}
|
||||
|
||||
settings_window_glade::~settings_window_glade()
|
||||
--- a/src/about_box_glade.cc
|
||||
+++ b/src/about_box_glade.cc
|
||||
@@ -14,8 +14,7 @@
|
||||
#endif //
|
||||
#include "config.h"
|
||||
#include <gtkmmconfig.h>
|
||||
#if GTKMM_MAJOR_VERSION==2 && GTKMM_MINOR_VERSION>2
|
||||
-#include <sigc++/compatibility.h>
|
||||
#define GMM_GTKMM_22_24(a,b) b
|
||||
#else //gtkmm 2.2
|
||||
#define GMM_GTKMM_22_24(a,b) a
|
||||
--- a/src/main_window_glade.cc
|
||||
+++ b/src/main_window_glade.cc
|
||||
@@ -14,8 +14,7 @@
|
||||
#endif //
|
||||
#include "config.h"
|
||||
#include <gtkmmconfig.h>
|
||||
#if GTKMM_MAJOR_VERSION==2 && GTKMM_MINOR_VERSION>2
|
||||
-#include <sigc++/compatibility.h>
|
||||
#define GMM_GTKMM_22_24(a,b) b
|
||||
#else //gtkmm 2.2
|
||||
#define GMM_GTKMM_22_24(a,b) a
|
||||
--- a/src/settings_window_glade.cc
|
||||
+++ b/src/settings_window_glade.cc
|
||||
@@ -14,8 +14,7 @@
|
||||
#endif //
|
||||
#include "config.h"
|
||||
#include <gtkmmconfig.h>
|
||||
#if GTKMM_MAJOR_VERSION==2 && GTKMM_MINOR_VERSION>2
|
||||
-#include <sigc++/compatibility.h>
|
||||
#define GMM_GTKMM_22_24(a,b) b
|
||||
#else //gtkmm 2.2
|
||||
#define GMM_GTKMM_22_24(a,b) a
|
||||
|
@ -1,12 +0,0 @@
|
||||
--- a/src/main_window.cc
|
||||
+++ b/src/main_window.cc
|
||||
@@ -488,7 +488,7 @@
|
||||
{
|
||||
Glib::RefPtr<Gtk::TextBuffer> buffer = main_window_output->get_buffer();
|
||||
Gtk::TextIter end = buffer->end();
|
||||
- buffer->insert(buffer->end(),text->c_str());
|
||||
+ buffer->insert(buffer->end(),Glib::convert (text->c_str(), "UTF-8", "ISO-8859-1"));
|
||||
}
|
||||
|
||||
void main_window::set_ui_running(bool running)
|
||||
|
@ -1,9 +0,0 @@
|
||||
AUX acovea-5.1.1-asneeded.patch 373 BLAKE2B 6322fdbf97e59a601e4d7dc246cfcc14be5434b2ef03f3d0fea4e71c7c7bdaee4735eda0ed8f9b7b5895c0618718f5a400711c033bfa12a40105bfe2409e6de5 SHA512 888da467b00314edbc17abd589aecd9aa70951c6137b8c9da6d133f0f838ee40fc396585fd9c50bc18ee3300d386eccf99d7976dfba37ac8267e4479d26a755e
|
||||
AUX acovea-5.1.1-free-fix.patch 271 BLAKE2B fcf114d5420795ca08d3ca8605ab7968a18b05f2a52403fda0233360b3f8efb7c0d924708756488f7a77ebca0517cffe3ab6f732fdd27d1d7f0526534f5e8a29 SHA512 0f7ab86bb81ce9a6f54cfd1f9c35fa9b62bbf12500b6b5a91b0c387b3ba3d6f17683009e6656ce1c37ed95893814a884494823ccb9896bd0111275f444c6801a
|
||||
AUX acovea-5.1.1-gcc44.patch 285 BLAKE2B 37d3d8bbc0243cb3ce1df5eb4e6592bb9c6175bb367c317a802d438842504f186a1872f534a971176adefc7546df291d0b60823f001e7626ee191df317f516ec SHA512 2cc3307131a3038e002dd025a2c8888416004845da2c8fcdf96ab0732644e6effd75dbf3b41e7e5a30c38da14dd04015d9c5626320b333994963ba4a602d2450
|
||||
AUX acovea-5.1.1-glibc-212.patch 235 BLAKE2B 13be0d214c3f0c287a560bb240efc47874bb9f743f7197ea6809d0912e56baef02ea4861467e0b8c01e3bbb2bbd1e788150f45532d63f4b263067a7efeab0cee SHA512 29da09439e6caddbd5a934d147f2638cea117707be38f623f53f68134178bb29b25690c802dc5522985deb0a3eade245fa7e9b1067c1a84637564ef0ffdb7298
|
||||
AUX acovea-5.1.1-libevocosm.patch 3531 BLAKE2B 1a221c1abd7499384f5ef087c4e3efa8df510bdce15c32a5b1a70420b5acb7987780dcc4db6cba9cf6609a8f91397845071ba45797c81f4911f33b79acc4d403 SHA512 41704c855fdbdef96dc7eae1f196fde895412a95a248627cbf4e99ccf28519f3725edde17d443fa92ae0f5a301b95c4d8e2255d4a48deb14d4e5a59e902cbe1f
|
||||
AUX acovea-5.1.1-underlinking.patch 327 BLAKE2B 3b611c70d306cce314baf45622e4a395fa48f0a29d663198098f8446a575176e852b878615fd5abd3460e660c25f8549492cfb0c2e6c60ed20fb6915082a18f3 SHA512 cc185181899cef9a6e1b830663a179b61170a47cbc1568ee6fd71756cee3ccc605a4568528384b9b24a7b7b4758e70f5bcf523d4ea044b31667bb024293eb883
|
||||
DIST libacovea-5.1.1.tar.gz 363048 BLAKE2B 61f894e99f3678f3b676e0926ff6d7a6bd376a654ad109d5b7f676d7053e4b975d90e0ac01d820b8498a6992db1cbd2fb5443fbe3871ef3f86bee280fd808352 SHA512 47ac88d713004ccdbf31c29bd5ead3e9d869eee262f2c12e12bf9aa7ec177d2c1e175908704cd5463b314752692edcd98d69408dbeb5873caff1745535a3a365
|
||||
EBUILD acovea-5.1.1-r2.ebuild 888 BLAKE2B adea00e0c4f5496605d3ebeac66fcdce7a8d597c45aee3a2f7fc890c5bdf2a8c77d2e26c4fa2772a2617d37b51675f2cd27162ba97812bda080e1cbe77af05ce SHA512 5c231085144a4e9c7cc903f81e257aac54934a498dbdf33feb1b50a87645993e2e75b4f597af6978ae45781240099a8d5ca485faf2b183504c7f33dee2554aec
|
||||
MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
|
@ -1,45 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit autotools
|
||||
|
||||
DESCRIPTION="Analysis of Compiler Options via Evolutionary Algorithm"
|
||||
HOMEPAGE="http://www.coyotegulch.com/products/acovea/"
|
||||
SRC_URI="http://www.coyotegulch.com/distfiles/lib${P}.tar.gz"
|
||||
S="${WORKDIR}/lib${P}"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ppc x86"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-libs/libcoyotl-3.1.0:=
|
||||
>=dev-libs/libevocosm-3.3.0:=
|
||||
dev-libs/expat:="
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${P}-asneeded.patch
|
||||
"${FILESDIR}"/${P}-free-fix.patch
|
||||
"${FILESDIR}"/${P}-gcc44.patch
|
||||
"${FILESDIR}"/${P}-glibc-212.patch
|
||||
"${FILESDIR}"/${P}-underlinking.patch
|
||||
"${FILESDIR}"/${P}-libevocosm.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf --disable-static
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
find "${ED}" -name '*.la' -delete || die
|
||||
}
|
@ -1,16 +0,0 @@
|
||||
--- a/cmdline/Makefile.am
|
||||
+++ b/cmdline/Makefile.am
|
||||
@@ -7,4 +7,4 @@
|
||||
|
||||
runacovea_SOURCES = runacovea.cpp
|
||||
|
||||
-LIBS = -L../libacovea -lacovea -lcoyotl -levocosm -lexpat
|
||||
+LIBS = -L../libacovea -lacovea -lcoyotl -levocosm
|
||||
--- a/libacovea/Makefile.am
|
||||
+++ b/libacovea/Makefile.am
|
||||
@@ -16,3 +16,5 @@
|
||||
library_include_HEADERS = $(h_sources)
|
||||
|
||||
DEFS=-I. -I$(srcdir)
|
||||
+
|
||||
+LIBS = -lexpat
|
@ -1,12 +0,0 @@
|
||||
--- a/benchmarks/treebench.c
|
||||
+++ b/benchmarks/treebench.c
|
||||
@@ -201,8 +201,8 @@
|
||||
if (page->m_links[n] != NULL)
|
||||
recursive_destroy_page(page->m_links[n]);
|
||||
|
||||
- free(page);
|
||||
}
|
||||
+ free(page);
|
||||
}
|
||||
|
||||
static void free_btree(btree * btree)
|
@ -1,14 +0,0 @@
|
||||
--- a/libacovea/acovea.cpp
|
||||
+++ b/libacovea/acovea.cpp
|
||||
@@ -44,10 +44,11 @@
|
||||
#include <unistd.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/wait.h>
|
||||
|
||||
#include <vector>
|
||||
+#include <cstdio>
|
||||
#include <cstring>
|
||||
#include <sstream>
|
||||
#include <iostream>
|
||||
#include <iomanip>
|
||||
#include <stdexcept>
|
@ -1,12 +0,0 @@
|
||||
http://bugs.gentoo.org/336260
|
||||
|
||||
--- a/libacovea/acovea.cpp
|
||||
+++ b/libacovea/acovea.cpp
|
||||
@@ -44,6 +44,7 @@
|
||||
#include <unistd.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/wait.h>
|
||||
+#include <sys/stat.h>
|
||||
|
||||
#include <vector>
|
||||
#include <cstring>
|
@ -1,119 +0,0 @@
|
||||
--- a/libacovea/acovea.cpp
|
||||
+++ b/libacovea/acovea.cpp
|
||||
@@ -86,7 +86,7 @@
|
||||
// randomize settings of this option
|
||||
void option::randomize()
|
||||
{
|
||||
- m_enabled = (g_random.get_rand_real2() < 0.5);
|
||||
+ m_enabled = (g_random.get_real() < 0.5);
|
||||
}
|
||||
|
||||
// mutate this option
|
||||
@@ -246,7 +246,7 @@
|
||||
m_step = 1;
|
||||
|
||||
// possibly adjust value to randomize populations
|
||||
- size_t choice = g_random.get_rand_index(3);
|
||||
+ size_t choice = g_random.get_index(3);
|
||||
|
||||
switch (choice)
|
||||
{
|
||||
@@ -304,12 +304,12 @@
|
||||
void tuning_option::mutate()
|
||||
{
|
||||
// select our mutation
|
||||
- if (g_random.get_rand_real2() < 0.5)
|
||||
+ if (g_random.get_real() < 0.5)
|
||||
option::mutate();
|
||||
else
|
||||
{
|
||||
// mutate value of this option, up or down randomly
|
||||
- if (g_random.get_rand_real2() < 0.5)
|
||||
+ if (g_random.get_real() < 0.5)
|
||||
m_value -= m_step;
|
||||
else
|
||||
m_value += m_step;
|
||||
@@ -335,7 +335,7 @@
|
||||
enum_option::enum_option(const vector<string> & a_choices, bool a_enabled)
|
||||
: option(a_enabled),
|
||||
m_choices(a_choices),
|
||||
- m_setting(g_random.get_rand_index(a_choices.size()))
|
||||
+ m_setting(g_random.get_index(a_choices.size()))
|
||||
{
|
||||
// nada
|
||||
}
|
||||
@@ -344,7 +344,7 @@
|
||||
enum_option::enum_option(const char ** a_choices, size_t a_num_choices, bool a_enabled)
|
||||
: option(a_enabled),
|
||||
m_choices(),
|
||||
- m_setting(g_random.get_rand_index(a_num_choices))
|
||||
+ m_setting(g_random.get_index(a_num_choices))
|
||||
{
|
||||
for (int n = 0; n < a_num_choices; ++n)
|
||||
m_choices.push_back(string(a_choices[n]));
|
||||
@@ -369,7 +369,7 @@
|
||||
token = strtok(NULL,"|");
|
||||
}
|
||||
|
||||
- m_setting = g_random.get_rand_index(m_choices.size());
|
||||
+ m_setting = g_random.get_index(m_choices.size());
|
||||
|
||||
free(choices);
|
||||
}
|
||||
@@ -407,17 +407,17 @@
|
||||
void enum_option::randomize()
|
||||
{
|
||||
// randomize enabled
|
||||
- m_enabled = (g_random.get_rand_real2() < 0.5);
|
||||
+ m_enabled = (g_random.get_real() < 0.5);
|
||||
|
||||
// randomize setting
|
||||
- m_setting = g_random.get_rand_index(m_choices.size());
|
||||
+ m_setting = g_random.get_index(m_choices.size());
|
||||
}
|
||||
|
||||
// mutate this option
|
||||
void enum_option::mutate()
|
||||
{
|
||||
// select our mutation
|
||||
- if (g_random.get_rand() & 1)
|
||||
+ if (g_random.get_real() < 0.5)
|
||||
option::mutate();
|
||||
else
|
||||
{
|
||||
@@ -435,7 +435,7 @@
|
||||
|
||||
// find a different setting
|
||||
while (new_setting == m_setting)
|
||||
- new_setting = g_random.get_rand_index(m_choices.size());
|
||||
+ new_setting = g_random.get_index(m_choices.size());
|
||||
|
||||
m_setting = new_setting;
|
||||
}
|
||||
@@ -915,7 +915,7 @@
|
||||
// randomly pick an option from one of the parents
|
||||
for (int n = 0; n < a_parent1.size(); ++n)
|
||||
{
|
||||
- if (g_random.get_rand() & 1)
|
||||
+ if (g_random.get_real() < 0.5)
|
||||
child.push_back(a_parent1[n]->clone());
|
||||
else
|
||||
child.push_back(a_parent2[n]->clone());
|
||||
@@ -931,7 +931,7 @@
|
||||
{
|
||||
for (int n = 0; n < a_options.size(); ++n)
|
||||
{
|
||||
- if (g_random.get_rand_real2() < a_mutation_chance)
|
||||
+ if (g_random.get_real() < a_mutation_chance)
|
||||
a_options[n]->mutate();
|
||||
}
|
||||
}
|
||||
@@ -1096,7 +1096,7 @@
|
||||
acovea_organism * child;
|
||||
|
||||
// do we crossover?
|
||||
- if (g_random.get_rand_real2() <= m_crossover_rate)
|
||||
+ if (g_random.get_real() <= m_crossover_rate)
|
||||
{
|
||||
// select a second parent
|
||||
size_t second_index = first_index;
|
@ -1,10 +0,0 @@
|
||||
diff --git a/cmdline/Makefile.am b/cmdline/Makefile.am
|
||||
index f3c763e..8e18d9c 100644
|
||||
--- a/cmdline/Makefile.am
|
||||
+++ b/cmdline/Makefile.am
|
||||
@@ -7,4 +7,4 @@ bin_PROGRAMS = runacovea
|
||||
|
||||
runacovea_SOURCES = runacovea.cpp
|
||||
|
||||
-LIBS = -L../libacovea -lacovea -lcoyotl -levocosm
|
||||
+LIBS = -L../libacovea -lacovea -lcoyotl -levocosm -lbrahe
|
@ -1,5 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<!-- maintainer-needed -->
|
||||
</pkgmetadata>
|
Binary file not shown.
@ -1,3 +0,0 @@
|
||||
DIST WiRouterKeyRec-1.1.2.zip 117262 BLAKE2B fe140bf19d7a1af1c8c6e04725f3d3e67c30b3f108d64f1fe706b1e28e8767d08219e30b78e67b33553a00dea03ca344acf43c8b75f3c5f7633980e08d095f2b SHA512 a3c449497e3f3fed88dfbb35a90a2cfa5937efa02393e825ec51ab390b7094ce619d3238a916afd2b48e35e0e261b454f7d7005af46d6a45d77b2e1d4faaac51
|
||||
EBUILD WiRouterKeyRec-1.1.2.ebuild 745 BLAKE2B 64cf51647976b6408f391338358fe85bd18398c77c292860df0a01fd9e37c6aa8dd9083a642962c2851be16d5e2ac56e58bf56ad8c4d9f44077212c6ddcbeadc SHA512 872e888d368409e0b71cf061387c4489241e94cbfd2a04537175560fddf6ca9d57f85db038b0e4c994122f9e29357546f488d84861a1a900dcdddcdf4fbe7ab3
|
||||
MISC metadata.xml 247 BLAKE2B 0d70eb11e28ba1c4c3b215dc0198d4e6ede221ac943c2f3d88692e0b031b65f01febaf00b4ab7c272f8eb12ca493435235a17b76a63011b1ee1b0dafb4a1d8aa SHA512 195e87b6fd5004fcccbbcceaaae73c92f16aca00febbd0850aa261146b134cc8491fc9f01944b1724b3ee795b652c062abbc46258969f48cc237107095be6947
|
@ -1,39 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit toolchain-funcs
|
||||
|
||||
MY_PN="WiRouter_KeyRec"
|
||||
MY_P="${MY_PN}_${PV}"
|
||||
|
||||
DESCRIPTION="Recovery tool for wpa passphrase"
|
||||
HOMEPAGE="https://www.salvatorefresta.net"
|
||||
SRC_URI="https://tools.salvatorefresta.net/${MY_P}.zip -> ${P}.zip"
|
||||
S="${WORKDIR}"/${MY_P}
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ppc x86"
|
||||
|
||||
BDEPEND="app-arch/unzip"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
sed -i "s:wirouterkeyrec:${PN}:" src/*.h || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake \
|
||||
CC="$(tc-getCC)" \
|
||||
CFLAGS="${CFLAGS}" \
|
||||
LDFLAGS="${LDFLAGS}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
newbin build/wirouterkeyrec ${PN}
|
||||
insinto /etc/${PN}
|
||||
doins config/agpf_config.lst config/teletu_config.lst
|
||||
}
|
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>ago@gentoo.org</email>
|
||||
<name>Agostino Sarubbo</name>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
Binary file not shown.
@ -1,8 +1,8 @@
|
||||
DIST iwdevtools-0.4.0.tar.gz 31939 BLAKE2B bdab037a2b27bf0c67bb453427ad7f8d7485db3f45f3c465e3b2790e8e259b1328b75eff7d86012df06a44f4101e8bc0e83c9e7a8886adc25d589ecca1a25892 SHA512 a8be15568f24d2f54178f9a92cbc4107f7fdb06da8b2a769ad19ca5b55e90896c4b2253569d7d39158765081d9f9267ff568a066edef8401ec52c29451655ee1
|
||||
DIST iwdevtools-0.5.3.tar.gz 42845 BLAKE2B 9e6b634e8409cffc57fde36157be0186943d4df07c47f0b07eeb0dd5071bc3e4c7b84e543a46cd2ff4e49d9b9b34b9121b3583bd227479f1485ec5957dee4780 SHA512 8458abba687135caaefd1cb0adb8af079a2cf94ca484a4bb95ef2b32e00eea46a2c8df7d305d4b0bf7121f46a92ac3a25cd9067e22ad9a314f289f77379a1684
|
||||
DIST iwdevtools-0.6.0.tar.gz 51788 BLAKE2B 1b37e3097cd77201398959272c09d6391746036530c6341b7b2ccfccc4361067dc46c6e3b2c729717855e346a7ebf7279f8d0fc0a760203527a1431e2366dad0 SHA512 0c192c9a6b52eca99574eda8da8d41b051a502cbbf891188e323f376f43472aaa72c2f8ac78f4790c4f41d610aa0927180a3fbe290ac2964ccb9f257b7f508fc
|
||||
EBUILD iwdevtools-0.4.0.ebuild 1206 BLAKE2B b8cdbf8d592d7c40cf224f95f6536a4467bdf5528a33de7bba94e1e2a685eabe9c55920fb2cdd4df00c479b0b50db058c82384abf8db87bac04a4d50532f8615 SHA512 33f66f90f0417e4915b04e3a90f65a4ab4e432c38ca8446ffc10c0d07e7648ddbc703dd711040e66a835060aad3edf83b8175c6b63fcc8dd19d7b3bd0628f2ea
|
||||
DIST iwdevtools-0.7.0.tar.gz 56208 BLAKE2B 205bb9bc1e894b9cc6a9c3abb4f902c9c3f8337fff8618df162f4dc5d78416fe8e2852cb513d4153d8acf2a0d918e43352714502e1f40faffc777e19ad81ab55 SHA512 ec528901229066d333fcd8f53060601628b682a93c3e07a89826ff0fd2e406a4dffe76397883d4c50b459588cc6364873c43e5129bd172049c30aea039ae36d5
|
||||
EBUILD iwdevtools-0.5.3.ebuild 1309 BLAKE2B 6df9178a5a77696e9a72db562288fe3ab90827971d70337edd598403e5acdabc4e70af3e47a87acaef486b32273c20db7061bee58a108a7b86bbbcc137bc01c5 SHA512 0a528e9ec0a5164a638ad119c79f514d40804d1fde8e58a0c6cfba3449df3158fb62c3dcabca0602958735c72e3c0a1f9146e2ee0a4eb6d21bed82c7012d9546
|
||||
EBUILD iwdevtools-0.6.0.ebuild 1309 BLAKE2B 6df9178a5a77696e9a72db562288fe3ab90827971d70337edd598403e5acdabc4e70af3e47a87acaef486b32273c20db7061bee58a108a7b86bbbcc137bc01c5 SHA512 0a528e9ec0a5164a638ad119c79f514d40804d1fde8e58a0c6cfba3449df3158fb62c3dcabca0602958735c72e3c0a1f9146e2ee0a4eb6d21bed82c7012d9546
|
||||
EBUILD iwdevtools-0.7.0.ebuild 1309 BLAKE2B 6df9178a5a77696e9a72db562288fe3ab90827971d70337edd598403e5acdabc4e70af3e47a87acaef486b32273c20db7061bee58a108a7b86bbbcc137bc01c5 SHA512 0a528e9ec0a5164a638ad119c79f514d40804d1fde8e58a0c6cfba3449df3158fb62c3dcabca0602958735c72e3c0a1f9146e2ee0a4eb6d21bed82c7012d9546
|
||||
EBUILD iwdevtools-9999.ebuild 1256 BLAKE2B bc43f1eeb5a06d5e0d912e5ae01d2d8f2d4016769e69bee1ccc58e1911e3b384f72e3848cf601d5697c255d4b5c1bfb7e7073e8474670dcc7132ce3fda899072 SHA512 45ac4e64a7fb16ced13528d81706231217f82f0e6b05c371b0f518f21a69a76945c4c10b02953748d33ba3305b046a273c9abb98e2163e921c36600d196f50b0
|
||||
MISC metadata.xml 354 BLAKE2B 752c8fbf18967fb380f0f5d460396222f5fea3f0c7b9ed960ff0dbe62a9a505a2d07c45750aaa55285d11169e01f5e83b82eb278b12fbc5e9c43353c0a5fc9ed SHA512 d8e5866d89b7f05a5a8cd8cc464083d3d096b4c03f8a83e9314dcf45e57c25369bf8a3bc725aed3b8db9f3f86e76bad358bfa58f1eca70f7ec0bf3d31286c2c3
|
||||
|
Binary file not shown.
@ -0,0 +1,213 @@
|
||||
https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=a9bd3dec9fde03327a4a2c69dad1036bf9632e20
|
||||
https://bugs.gentoo.org/812509
|
||||
|
||||
From: Chris Liddell <chris.liddell@artifex.com>
|
||||
Date: Tue, 7 Sep 2021 20:36:12 +0100
|
||||
Subject: [PATCH 1/1] Bug 704342: Include device specifier strings in access
|
||||
validation
|
||||
|
||||
for the "%pipe%", %handle%" and %printer% io devices.
|
||||
|
||||
We previously validated only the part after the "%pipe%" Postscript device
|
||||
specifier, but this proved insufficient.
|
||||
|
||||
This rebuilds the original file name string, and validates it complete. The
|
||||
slight complication for "%pipe%" is it can be reached implicitly using
|
||||
"|" so we have to check both prefixes.
|
||||
|
||||
Addresses CVE-2021-3781
|
||||
--- a/base/gdevpipe.c
|
||||
+++ b/base/gdevpipe.c
|
||||
@@ -72,8 +72,28 @@ pipe_fopen(gx_io_device * iodev, const char *fname, const char *access,
|
||||
#else
|
||||
gs_lib_ctx_t *ctx = mem->gs_lib_ctx;
|
||||
gs_fs_list_t *fs = ctx->core->fs;
|
||||
+ /* The pipe device can be reached in two ways, explicltly with %pipe%
|
||||
+ or implicitly with "|", so we have to check for both
|
||||
+ */
|
||||
+ char f[gp_file_name_sizeof];
|
||||
+ const char *pipestr = "|";
|
||||
+ const size_t pipestrlen = strlen(pipestr);
|
||||
+ const size_t preflen = strlen(iodev->dname);
|
||||
+ const size_t nlen = strlen(fname);
|
||||
+ int code1;
|
||||
+
|
||||
+ if (preflen + nlen >= gp_file_name_sizeof)
|
||||
+ return_error(gs_error_invalidaccess);
|
||||
+
|
||||
+ memcpy(f, iodev->dname, preflen);
|
||||
+ memcpy(f + preflen, fname, nlen + 1);
|
||||
+
|
||||
+ code1 = gp_validate_path(mem, f, access);
|
||||
+
|
||||
+ memcpy(f, pipestr, pipestrlen);
|
||||
+ memcpy(f + pipestrlen, fname, nlen + 1);
|
||||
|
||||
- if (gp_validate_path(mem, fname, access) != 0)
|
||||
+ if (code1 != 0 && gp_validate_path(mem, f, access) != 0 )
|
||||
return gs_error_invalidfileaccess;
|
||||
|
||||
/*
|
||||
--- a/base/gp_mshdl.c
|
||||
+++ b/base/gp_mshdl.c
|
||||
@@ -95,8 +95,17 @@ mswin_handle_fopen(gx_io_device * iodev, const char *fname, const char *access,
|
||||
long hfile; /* Correct for Win32, may be wrong for Win64 */
|
||||
gs_lib_ctx_t *ctx = mem->gs_lib_ctx;
|
||||
gs_fs_list_t *fs = ctx->core->fs;
|
||||
+ char f[gp_file_name_sizeof];
|
||||
+ const size_t preflen = strlen(iodev->dname);
|
||||
+ const size_t nlen = strlen(fname);
|
||||
|
||||
- if (gp_validate_path(mem, fname, access) != 0)
|
||||
+ if (preflen + nlen >= gp_file_name_sizeof)
|
||||
+ return_error(gs_error_invalidaccess);
|
||||
+
|
||||
+ memcpy(f, iodev->dname, preflen);
|
||||
+ memcpy(f + preflen, fname, nlen + 1);
|
||||
+
|
||||
+ if (gp_validate_path(mem, f, access) != 0)
|
||||
return gs_error_invalidfileaccess;
|
||||
|
||||
/* First we try the open_handle method. */
|
||||
--- a/base/gp_msprn.c
|
||||
+++ b/base/gp_msprn.c
|
||||
@@ -168,8 +168,16 @@ mswin_printer_fopen(gx_io_device * iodev, const char *fname, const char *access,
|
||||
uintptr_t *ptid = &((tid_t *)(iodev->state))->tid;
|
||||
gs_lib_ctx_t *ctx = mem->gs_lib_ctx;
|
||||
gs_fs_list_t *fs = ctx->core->fs;
|
||||
+ const size_t preflen = strlen(iodev->dname);
|
||||
+ const size_t nlen = strlen(fname);
|
||||
|
||||
- if (gp_validate_path(mem, fname, access) != 0)
|
||||
+ if (preflen + nlen >= gp_file_name_sizeof)
|
||||
+ return_error(gs_error_invalidaccess);
|
||||
+
|
||||
+ memcpy(pname, iodev->dname, preflen);
|
||||
+ memcpy(pname + preflen, fname, nlen + 1);
|
||||
+
|
||||
+ if (gp_validate_path(mem, pname, access) != 0)
|
||||
return gs_error_invalidfileaccess;
|
||||
|
||||
/* First we try the open_printer method. */
|
||||
--- a/base/gp_os2pr.c
|
||||
+++ b/base/gp_os2pr.c
|
||||
@@ -107,9 +107,20 @@ os2_printer_fopen(gx_io_device * iodev, const char *fname, const char *access,
|
||||
FILE ** pfile, char *rfname, uint rnamelen)
|
||||
{
|
||||
os2_printer_t *pr = (os2_printer_t *)iodev->state;
|
||||
- char driver_name[256];
|
||||
+ char driver_name[gp_file_name_sizeof];
|
||||
gs_lib_ctx_t *ctx = mem->gs_lib_ctx;
|
||||
gs_fs_list_t *fs = ctx->core->fs;
|
||||
+ const size_t preflen = strlen(iodev->dname);
|
||||
+ const int size_t = strlen(fname);
|
||||
+
|
||||
+ if (preflen + nlen >= gp_file_name_sizeof)
|
||||
+ return_error(gs_error_invalidaccess);
|
||||
+
|
||||
+ memcpy(driver_name, iodev->dname, preflen);
|
||||
+ memcpy(driver_name + preflen, fname, nlen + 1);
|
||||
+
|
||||
+ if (gp_validate_path(mem, driver_name, access) != 0)
|
||||
+ return gs_error_invalidfileaccess;
|
||||
|
||||
/* First we try the open_printer method. */
|
||||
/* Note that the loop condition here ensures we don't
|
||||
--- a/base/gslibctx.c
|
||||
+++ b/base/gslibctx.c
|
||||
@@ -655,82 +655,39 @@ rewrite_percent_specifiers(char *s)
|
||||
int
|
||||
gs_add_outputfile_control_path(gs_memory_t *mem, const char *fname)
|
||||
{
|
||||
- char *fp, f[gp_file_name_sizeof];
|
||||
- const int pipe = 124; /* ASCII code for '|' */
|
||||
- const int len = strlen(fname);
|
||||
- int i, code;
|
||||
+ char f[gp_file_name_sizeof];
|
||||
+ int code;
|
||||
|
||||
/* Be sure the string copy will fit */
|
||||
- if (len >= gp_file_name_sizeof)
|
||||
+ if (strlen(fname) >= gp_file_name_sizeof)
|
||||
return gs_error_rangecheck;
|
||||
strcpy(f, fname);
|
||||
- fp = f;
|
||||
/* Try to rewrite any %d (or similar) in the string */
|
||||
rewrite_percent_specifiers(f);
|
||||
- for (i = 0; i < len; i++) {
|
||||
- if (f[i] == pipe) {
|
||||
- fp = &f[i + 1];
|
||||
- /* Because we potentially have to check file permissions at two levels
|
||||
- for the output file (gx_device_open_output_file and the low level
|
||||
- fopen API, if we're using a pipe, we have to add both the full string,
|
||||
- (including the '|', and just the command to which we pipe - since at
|
||||
- the pipe_fopen(), the leading '|' has been stripped.
|
||||
- */
|
||||
- code = gs_add_control_path(mem, gs_permit_file_writing, f);
|
||||
- if (code < 0)
|
||||
- return code;
|
||||
- code = gs_add_control_path(mem, gs_permit_file_control, f);
|
||||
- if (code < 0)
|
||||
- return code;
|
||||
- break;
|
||||
- }
|
||||
- if (!IS_WHITESPACE(f[i]))
|
||||
- break;
|
||||
- }
|
||||
- code = gs_add_control_path(mem, gs_permit_file_control, fp);
|
||||
+
|
||||
+ code = gs_add_control_path(mem, gs_permit_file_control, f);
|
||||
if (code < 0)
|
||||
return code;
|
||||
- return gs_add_control_path(mem, gs_permit_file_writing, fp);
|
||||
+ return gs_add_control_path(mem, gs_permit_file_writing, f);
|
||||
}
|
||||
|
||||
int
|
||||
gs_remove_outputfile_control_path(gs_memory_t *mem, const char *fname)
|
||||
{
|
||||
- char *fp, f[gp_file_name_sizeof];
|
||||
- const int pipe = 124; /* ASCII code for '|' */
|
||||
- const int len = strlen(fname);
|
||||
- int i, code;
|
||||
+ char f[gp_file_name_sizeof];
|
||||
+ int code;
|
||||
|
||||
/* Be sure the string copy will fit */
|
||||
- if (len >= gp_file_name_sizeof)
|
||||
+ if (strlen(fname) >= gp_file_name_sizeof)
|
||||
return gs_error_rangecheck;
|
||||
strcpy(f, fname);
|
||||
- fp = f;
|
||||
/* Try to rewrite any %d (or similar) in the string */
|
||||
- for (i = 0; i < len; i++) {
|
||||
- if (f[i] == pipe) {
|
||||
- fp = &f[i + 1];
|
||||
- /* Because we potentially have to check file permissions at two levels
|
||||
- for the output file (gx_device_open_output_file and the low level
|
||||
- fopen API, if we're using a pipe, we have to add both the full string,
|
||||
- (including the '|', and just the command to which we pipe - since at
|
||||
- the pipe_fopen(), the leading '|' has been stripped.
|
||||
- */
|
||||
- code = gs_remove_control_path(mem, gs_permit_file_writing, f);
|
||||
- if (code < 0)
|
||||
- return code;
|
||||
- code = gs_remove_control_path(mem, gs_permit_file_control, f);
|
||||
- if (code < 0)
|
||||
- return code;
|
||||
- break;
|
||||
- }
|
||||
- if (!IS_WHITESPACE(f[i]))
|
||||
- break;
|
||||
- }
|
||||
- code = gs_remove_control_path(mem, gs_permit_file_control, fp);
|
||||
+ rewrite_percent_specifiers(f);
|
||||
+
|
||||
+ code = gs_remove_control_path(mem, gs_permit_file_control, f);
|
||||
if (code < 0)
|
||||
return code;
|
||||
- return gs_remove_control_path(mem, gs_permit_file_writing, fp);
|
||||
+ return gs_remove_control_path(mem, gs_permit_file_writing, f);
|
||||
}
|
||||
|
||||
int
|
@ -0,0 +1,191 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit autotools toolchain-funcs
|
||||
|
||||
DESCRIPTION="Interpreter for the PostScript language and PDF"
|
||||
HOMEPAGE="https://ghostscript.com/"
|
||||
|
||||
MY_PN=${PN/-gpl}
|
||||
MY_P="${MY_PN}-${PV/_}"
|
||||
PVM=$(ver_cut 1-2)
|
||||
PVM_S=$(ver_rs 1-2 "")
|
||||
|
||||
MY_PATCHSET="ghostscript-gpl-9.54-patchset-01.tar.xz"
|
||||
|
||||
SRC_URI="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PVM_S}/${MY_P}.tar.xz"
|
||||
|
||||
if [[ -n "${MY_PATCHSET}" ]] ; then
|
||||
SRC_URI+=" https://dev.gentoo.org/~whissi/dist/ghostscript-gpl/${MY_PATCHSET}"
|
||||
fi
|
||||
|
||||
LICENSE="AGPL-3 CPL-1.0"
|
||||
SLOT="0/$(ver_cut 1-2)"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="cups dbus gtk +jpeg2k l10n_de static-libs unicode X"
|
||||
|
||||
LANGS="ja ko zh-CN zh-TW"
|
||||
for X in ${LANGS} ; do
|
||||
IUSE="${IUSE} l10n_${X}"
|
||||
done
|
||||
|
||||
DEPEND="
|
||||
app-text/libpaper
|
||||
media-libs/fontconfig
|
||||
>=media-libs/freetype-2.4.9:2=
|
||||
>=media-libs/jbig2dec-0.19:=
|
||||
>=media-libs/lcms-2.6:2
|
||||
>=media-libs/libpng-1.6.2:0=
|
||||
>=media-libs/tiff-4.0.1:0=
|
||||
>=sys-libs/zlib-1.2.7
|
||||
virtual/jpeg:0
|
||||
cups? ( >=net-print/cups-1.3.8 )
|
||||
dbus? ( sys-apps/dbus )
|
||||
gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) )
|
||||
jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
|
||||
unicode? ( net-dns/libidn:0= )
|
||||
X? ( x11-libs/libXt x11-libs/libXext )
|
||||
"
|
||||
BDEPEND="virtual/pkgconfig"
|
||||
RDEPEND="${DEPEND}
|
||||
app-text/poppler-data
|
||||
>=media-fonts/urw-fonts-2.4.9
|
||||
l10n_ja? ( media-fonts/kochi-substitute )
|
||||
l10n_ko? ( media-fonts/baekmuk-fonts )
|
||||
l10n_zh-CN? ( media-fonts/arphicfonts )
|
||||
l10n_zh-TW? ( media-fonts/arphicfonts )
|
||||
"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
src_prepare() {
|
||||
if [[ -n "${MY_PATCHSET}" ]] ; then
|
||||
# apply various patches, many borrowed from Fedora
|
||||
# https://src.fedoraproject.org/rpms/ghostscript
|
||||
# and Debian
|
||||
# https://salsa.debian.org/printing-team/ghostscript/-/tree/debian/latest/debian/patches
|
||||
eapply "${WORKDIR}/patches/"*.patch
|
||||
fi
|
||||
|
||||
eapply "${FILESDIR}"/${P}-CVE-2021-3781.patch
|
||||
|
||||
default
|
||||
|
||||
# remove internal copies of various libraries
|
||||
rm -r cups/libs || die
|
||||
rm -r freetype || die
|
||||
rm -r jbig2dec || die
|
||||
rm -r jpeg || die
|
||||
rm -r lcms2mt || die
|
||||
rm -r libpng || die
|
||||
rm -r tiff || die
|
||||
rm -r zlib || die
|
||||
rm -r openjpeg || die
|
||||
# remove internal CMaps (CMaps from poppler-data are used instead)
|
||||
rm -r Resource/CMap || die
|
||||
|
||||
if ! use gtk ; then
|
||||
sed -e "s:\$(GSSOX)::" \
|
||||
-e "s:.*\$(GSSOX_XENAME)$::" \
|
||||
-i base/unix-dll.mak || die "sed failed"
|
||||
fi
|
||||
|
||||
# Force the include dirs to a neutral location.
|
||||
sed -e "/^ZLIBDIR=/s:=.*:=${T}:" \
|
||||
-i configure.ac || die
|
||||
# Some files depend on zlib.h directly. Redirect them. #573248
|
||||
# Also make sure to not define OPJ_STATIC to avoid linker errors due to
|
||||
# hidden symbols (https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=203327#c1)
|
||||
sed -e '/^zlib_h/s:=.*:=:' \
|
||||
-e 's|-DOPJ_STATIC ||' \
|
||||
-i base/lib.mak || die
|
||||
|
||||
# search path fix
|
||||
# put LDFLAGS after BINDIR, bug #383447
|
||||
sed -e "s:\$\(gsdatadir\)/lib:@datarootdir@/ghostscript/${PV}/$(get_libdir):" \
|
||||
-e "s:exdir=.*:exdir=@datarootdir@/doc/${PF}/examples:" \
|
||||
-e "s:docdir=.*:docdir=@datarootdir@/doc/${PF}/html:" \
|
||||
-e "s:GS_DOCDIR=.*:GS_DOCDIR=@datarootdir@/doc/${PF}/html:" \
|
||||
-e 's:-L$(BINDIR):& $(LDFLAGS):g' \
|
||||
-i Makefile.in base/*.mak || die "sed failed"
|
||||
|
||||
# remove incorrect symlink, bug 590384
|
||||
rm ijs/ltmain.sh || die
|
||||
eautoreconf
|
||||
|
||||
cd ijs || die
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local FONTPATH
|
||||
for path in \
|
||||
"${EPREFIX}"/usr/share/fonts/urw-fonts \
|
||||
"${EPREFIX}"/usr/share/fonts/Type1 \
|
||||
"${EPREFIX}"/usr/share/fonts \
|
||||
"${EPREFIX}"/usr/share/poppler/cMap/Adobe-CNS1 \
|
||||
"${EPREFIX}"/usr/share/poppler/cMap/Adobe-GB1 \
|
||||
"${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan1 \
|
||||
"${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan2 \
|
||||
"${EPREFIX}"/usr/share/poppler/cMap/Adobe-Korea1
|
||||
do
|
||||
FONTPATH="$FONTPATH${FONTPATH:+:}${EPREFIX}$path"
|
||||
done
|
||||
|
||||
PKGCONFIG=$(type -P $(tc-getPKG_CONFIG)) \
|
||||
econf \
|
||||
--enable-dynamic \
|
||||
--enable-freetype \
|
||||
--enable-fontconfig \
|
||||
$(use_enable jpeg2k openjpeg) \
|
||||
--disable-compile-inits \
|
||||
--with-drivers=ALL \
|
||||
--with-fontpath="$FONTPATH" \
|
||||
--with-ijs \
|
||||
--with-jbig2dec \
|
||||
--with-libpaper \
|
||||
--with-system-libtiff \
|
||||
$(use_enable cups) \
|
||||
$(use_enable dbus) \
|
||||
$(use_enable gtk) \
|
||||
$(use_with cups pdftoraster) \
|
||||
$(use_with unicode libidn) \
|
||||
$(use_with X x) \
|
||||
DARWIN_LDFLAGS_SO_PREFIX="${EPREFIX}/usr/lib/"
|
||||
|
||||
cd "${S}/ijs" || die
|
||||
econf \
|
||||
--enable-shared \
|
||||
$(use_enable static-libs static)
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake so all
|
||||
|
||||
cd ijs || die
|
||||
emake
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install-so install
|
||||
|
||||
# move gsc to gs, bug #343447
|
||||
# gsc collides with gambit, bug #253064
|
||||
mv -f "${ED}"/usr/bin/{gsc,gs} || die
|
||||
|
||||
cd "${S}/ijs" || die
|
||||
emake DESTDIR="${D}" install
|
||||
|
||||
# install the CMaps from poppler-data properly, bug #409361
|
||||
dosym ../../../poppler/cMaps "/usr/share/ghostscript/${PV}/Resource/CMap"
|
||||
|
||||
if ! use static-libs; then
|
||||
find "${ED}" -name '*.la' -delete || die
|
||||
fi
|
||||
|
||||
if ! use l10n_de; then
|
||||
rm -r "${ED}"/usr/share/man/de || die
|
||||
fi
|
||||
}
|
@ -1,6 +1,6 @@
|
||||
DIST libmwaw-0.3.19.tar.xz 1401720 BLAKE2B 93e63993dd73d52d1b071c44a5efa4ba2495a370a767cd80fbeb437a56224d333781cfdf32c3ca1c0a3794544da6cdf8c967badf98b6858796fbc8f2ea7878c1 SHA512 a5b74f417366f7e8a8303948e678d54caf9c45e0b51694d39593926b2f2fbbaa5dfea5dee8a6b4a656e5ca5bd880f41a76e7b869f55230690740b7ab75a28f1f
|
||||
DIST libmwaw-0.3.20.tar.xz 1425812 BLAKE2B a708ce4a28a0d5a5a5ee9d178c67119189add0180e61d67af6821c509d95b9f8bfb60eeb1afcdf8e2da5bed26053108b12db57db98912d97dc7e0ef0f7121f18 SHA512 d6cd28629b6482dd61e070036e94568ecc44d9064dddd9c699c7362caa8ef36652ce84cf0f199813854636f2e39ab19d47f4e148990822791b88cd3f17f68b3b
|
||||
EBUILD libmwaw-0.3.19.ebuild 1004 BLAKE2B e6db19e89201be0df73cb6dd3deb81eaf2e08d442c6d958826e95120d14ce2740248158b3a1f5084ae4b9f588d22d62c4794f090f0c58aebcde48204ea256560 SHA512 2ba0bc30818fc9b4032698081bcdea307185e24dd08885168d05ca6ab43bbb6dd2747cfa2268a5416e31c4050fcada5bfcb32bf605d4eadba26cf766b407a2f4
|
||||
EBUILD libmwaw-0.3.20.ebuild 993 BLAKE2B 67267f5263a9c98540db6033727d6276f9c033265d1afe2dcde1a9918ff3181ca2b8ae34ec96ffdd9ef0027cb8523ed54f9550dcdf86eaffa5af6c036793ec12 SHA512 dcdcefdb014c8a08ba5415fe53674371f0255fc49c8a070ffd2047b164b7083c280dd039287ba48c3b3be5e68f7cda543ea33e7ec53d1784041c7346c76519ba
|
||||
EBUILD libmwaw-0.3.20.ebuild 992 BLAKE2B 4a20b55c2a0fc09cf47782dc2e69e5c13ed91ffa8bc87939fbecb361e3faa4676fd70d3c70dc01a6d1228456d8fa904ad2992cbf4e1e587105dba2048bf5b0ff SHA512 3995087709ad115c143efcd9625320028cfb8c7a58aeea08a2ba2b98aa75f6eb46f41857f380873ce745272fa69f371839fff0e474a672efe390f8ea606794ed
|
||||
EBUILD libmwaw-9999.ebuild 993 BLAKE2B 67267f5263a9c98540db6033727d6276f9c033265d1afe2dcde1a9918ff3181ca2b8ae34ec96ffdd9ef0027cb8523ed54f9550dcdf86eaffa5af6c036793ec12 SHA512 dcdcefdb014c8a08ba5415fe53674371f0255fc49c8a070ffd2047b164b7083c280dd039287ba48c3b3be5e68f7cda543ea33e7ec53d1784041c7346c76519ba
|
||||
MISC metadata.xml 404 BLAKE2B 95ac1c73023ff52b4a0d1754f9d37b6c2ffd82f49f16122058f853e40ce15dd9b2fbe6ecc24bdf86e82addc27b4a6f9cd7478560fde845b696f62a1645abdca7 SHA512 858235729f5091f06699f4b32ff14890c139c5e0adff30172da79e3fec4b4452e8529c401a0273b1799706e0ade449451f10b84555ade12022bf62e37098ac07
|
||||
|
@ -1,5 +1,5 @@
|
||||
DIST rpl-1.6.7.tar.gz 21867 BLAKE2B ac523aa836312d6ed6db9eabaf9b6499ce00047ce1a4d35bf398f769036d65aa5b52c410b2110cf5bb14c31d782bc1c424bcd1b2a26692de28ca70fd452b18f1 SHA512 f853eae0ce0a82d864e72ecf3fd3f20fba10553357b23d0012ed22ee0efd57bbefea71095775f7215323d829057f6579aadfc006b6a893972e05039784dc5add
|
||||
DIST rpl-1.9.1.gh.tar.gz 22858 BLAKE2B 583a29fd34d7a0d2b3a35b0966a6bd42ac2851750806a97846785dc0331bd5d2199ffba3309184e64a4aa7194f9ae4b9ecb2acc500830b841bd34e2184ec1798 SHA512 be480c6788fa1eb672b892d798deb7d263eae227dac5d93a55f28ebf3b4a43f896eb10edd00e52aad1cd57f4a80faf4a4552b4762b26da273cd05f0c5bce754a
|
||||
EBUILD rpl-1.6.7.ebuild 699 BLAKE2B 96252444486478f421942989476311710b3fa8925bfd734791984675d01b091aeac2a5216b390edfede919cfcbc6ec24854016a3355b674bca880bb1da8cd56f SHA512 0ed10c86134712b76464a8ef40faccde42dfecbb2e2098795ee7d6520b40509db300c00cfd196e8c84d1222110b3de5719fa8f06808d5bb94785833c9df9dfce
|
||||
EBUILD rpl-1.9.1.ebuild 639 BLAKE2B 8d88f8f1c50215ace0a732a742d7a2569eb572782a7458190c37d02759d54769b7aee818afe56b76a9297015a4a3f0654c8c727219fcb3de874cb2ca6ee6aa04 SHA512 cc90855316ab3fe93a0dec1973084fcfffeb01bf58d54d299445406b01bee1a16fdf23bdf1d7ca6893fcd22881059ca36b6668126a397bc2721700a010049249
|
||||
EBUILD rpl-1.9.1.ebuild 644 BLAKE2B 45789710edf7863701dff8cedaa9986df979e74207b80c4ad9f29afff16d3d7cd04fa0111e5f61dcdfbb4c3cbe6d6f0edfb0e356ddb3d78dd843f3798487f83b SHA512 b71624c4967bc781f653b103a41a735ea3e118e4cc53b8f2e9d7f63aa52b482b16343e0b69dfb7f8bef6e5aa235ec8512f9742aa7da8114fa14abfb64304db4c
|
||||
MISC metadata.xml 415 BLAKE2B 7d6fcfc502df7caae990705cac7ad186ea3cb7ea5eafc85cd1a04fde93e09dbaa7001abc531a74092750f925c60a1c47de13687f4105585090b30654e79e7ef6 SHA512 61f24dace96be9d82a7f539195ec7d2b76cad2cc04dd1f51eef648277307975502d29ea7e6f479dc6a293dbc121d71d8097b40227103275d35d40e2026e68da6
|
||||
|
@ -1,4 +1,4 @@
|
||||
DIST zathura-djvu-0.2.9.tar.xz 8976 BLAKE2B f0a798e9473ad2d09bdf171f4689231d73fa1e1bbaa0faa750feb82db2e2b029a86bf759e642f92c0ba438ee88b9178969e5d2aec4f30d9cb049bd3bcd69639e SHA512 3c2815e7f1cdfb9fc594dc6ad65359245f322e5fa27f018fb9431747e4d474734f5efd134aaeb9dabde09b01de603b1d1dc7aede883b1ef81266e067b0490726
|
||||
EBUILD zathura-djvu-0.2.9.ebuild 778 BLAKE2B 8c64bda4aedcfbb1b6168a8097faa49e11a55ec9288c2ca8532e2362f09cad1aa21a961dc64ae973d781d125e4b4eee7cbb42a659b071d4e558ba884fa3ca060 SHA512 01ca8e5506dbb4d7198d643b108187294493068c4f312781222345fe3f4d6f0b20d5d6592dd6400124020171e135c544363fa17920db4d0a518ad03349bf7918
|
||||
EBUILD zathura-djvu-9999.ebuild 800 BLAKE2B cbd99a6266bc4c3ab4dd12c6e5701a00ed166b12f22dea6fe5427bf24236990cf5bc34b4af47c61910ce936188d79d48147f5cde70e24b3923b30dc7c64326da SHA512 2c4aa4192b4dddb5dbe1ecc291760579cc2b5f5871a8365e8403f96ae99e590980755904a820cd7078ac880819c55191c22760620460fb944ef623fcaa1fbd7e
|
||||
EBUILD zathura-djvu-0.2.9.ebuild 630 BLAKE2B f6f9e996a739a30893f0bc3e00592a29d2a01d1307c4e8db8156746e12e0e8fc9a99ca1d31a373c7f66944e5ef2ff69a54c20e4941fc633af4c08dcbb3d05574 SHA512 11665cc089c5766d685a7b0f409df1e46c551a107b31b0744019d8790c5791f588f1501a60292d7efb571ea809a613d53ecf93f144a8093e551d45e185dd089b
|
||||
EBUILD zathura-djvu-9999.ebuild 633 BLAKE2B afb7ad74271cf203eb6da9844ccbdf157a872ba67d77c5f7bd2f2b638d12a67c2a9e0df5c03b0de99acc0ab8ed8a7dad63b62c97ad1a4d23cc47ec63b9021b9e SHA512 56e32f466e781d2340a5763749aea63defad52d9261e416ca31b5d3613837dc7ab13ce5b1ebcde969b6afa058c62ac27640b1416d0c1231fdca6a8438f7c020b
|
||||
MISC metadata.xml 593 BLAKE2B 8f65f361d05b40abc086c22e92410471cc128901fa8168c1e20154e6078f6b8cb54dd2a6c310bac3bdfc5150f59136fc1d3b998eb560d1e060f5958c05e4113a SHA512 34a075ad7219315a07090bc6451a202a5c9f7a9c7bd3022b5de7530f7f1322aa7f510b50f1fcc809e83c95c9fd91cc1b59b40b41adf2f14877d450273dcc82af
|
||||
|
Binary file not shown.
@ -1,5 +1,5 @@
|
||||
AUX libmcpp-2.7.2-fix-build-system.patch 1008 BLAKE2B d9a87af2faada430c9bd09bb6d4e70f51385725b45dd380b6eecd67e82ed6f2e001f3768b03e08864055fe4119187cf26efd3f09463c64072a9647f63ad251d1 SHA512 25e2e9cd8d18080947a84c0d76f0b34d74b289ccc7c6172278908c026dd6f7379ebb268aae79c3e8ab458f3883aa212e54a137cbaab336c1277acdad07a13a01
|
||||
DIST mcpp-2.7.2.tar.gz 1533457 BLAKE2B 4368fd1c667923ab3b60ce79f8421c549a9d9105957ca87b9ba49be513cb1be7f220a3ddbaf306e860014d5211af480d07170d912d3d4a80345d8eab45fd6c00 SHA512 1ca885cb13fdb684de9d0595a9215b52f48a93a69077d82cdcacafe40d9a61fb77b00a3ff2b8890e7bc0a0fcc0c8d70d4093c00c280351cd4459aba67c573235
|
||||
DIST mcpp_2.7.2-5.debian.tar.xz 7528 BLAKE2B 92f455809cfb49d97ca4e62c7087ebe2ebe0ce835e8f12d6e93b1df2ec1e15472f242637f320be2b6bada85b193545fcf3608e8c9a935805a5f052909d3c6f0b SHA512 08509945048ccc4525ecd61d3f901a4d81fe73c1db84c26b76664d5127970af45662a168b99836b58467afc7202a1a20e0dfe8954a87e4cd1368f2136d7955be
|
||||
EBUILD libmcpp-2.7.2_p5.ebuild 891 BLAKE2B 9ee84971fc7f77a78d0cb144a809217d597f5448c609225ccd87fc48c8920b36539b8a8d92bbbd9e9896d268e69ab12be8061293a7ff98dcf0a72d2abf158d6d SHA512 fe30f0c6442ad13262589c5e4aa0dd9fabb5ed180b977db59662131b3230118dfd6135f0a8f7a622b33075120c83905fefc507af3b3fd8db6fbe72d55c54157e
|
||||
EBUILD libmcpp-2.7.2_p5.ebuild 884 BLAKE2B d78aeefe050fb404785c2b6e65f0cd0bc829a76159e972342b097124d2e5d5c06d4ba2e256873d4ca9999b031d45b57a1a3e11d770a48a83c44919e830fcd762 SHA512 4ad337dcc479d56e69fb3a46f586b1fbff2b1d26caf53eaa6c01a9bb26bb159453866c1382b810d27007f55314d5cfaa7baf9173f748f30326e68c2800188170
|
||||
MISC metadata.xml 242 BLAKE2B c3104b4c49aa49dc9855ea0b1469084d84e3c66395bd368859edefe22ff374525cc05752f56acc5e6976cda7564f54fc736d91019a143d74d5598bfad7595c41 SHA512 122762f21cf0e354a83c94569028bc356ab1af71727787d8bd1402a67690bf0a3a32ebd6304a249febfe942f5f0a1b1e2c07d81b31a05a8abae530e00c21e3e9
|
||||
|
Binary file not shown.
@ -1,64 +0,0 @@
|
||||
Bug: https://bugs.gentoo.org/show_bug.cgi?id=618878
|
||||
|
||||
A few patches to make crossdev for mingw-w64 play nice with ruby's ebuilds.
|
||||
Basic gist is that without the following patch to configure.in ruby-2.4.1
|
||||
hardcodes 240 into the shared, static, and import library names, which when
|
||||
built with the current ruby ebuilds results in names like libx64-msvcrt-ruby24240.dll and so on. The patch is in ruby-trunk[1], but may take a while
|
||||
to hit the tarballs that gentoo uses.
|
||||
|
||||
Index: configure.in
|
||||
===================================================================
|
||||
--- a/configure.in (revision 57824)
|
||||
+++ b/configure.in (revision 57825)
|
||||
@@ -3825,7 +3825,23 @@
|
||||
|
||||
AC_ARG_WITH(soname,
|
||||
AS_HELP_STRING([--with-soname=SONAME], [base name of shared library]),
|
||||
- [RUBY_SO_NAME=$withval], [RUBY_SO_NAME='$(RUBY_BASE_NAME)'])
|
||||
+ [RUBY_SO_NAME=$withval],
|
||||
+ [
|
||||
+ AS_CASE(["$target_os"],
|
||||
+ [darwin*], [
|
||||
+ RUBY_SO_NAME='$(RUBY_BASE_NAME).$(RUBY_PROGRAM_VERSION)'
|
||||
+ ],
|
||||
+ [cygwin*], [
|
||||
+ RUBY_SO_NAME='$(RUBY_BASE_NAME)$(MAJOR)$(MINOR)0'
|
||||
+ ],
|
||||
+ [mingw*], [
|
||||
+ RUBY_SO_NAME="${rb_cv_msvcrt}"'-$(RUBY_BASE_NAME)$(MAJOR)$(MINOR)0'
|
||||
+ AS_IF([test x"${target_cpu}" != xi386], [
|
||||
+ RUBY_SO_NAME="${target_cpu}-${RUBY_SO_NAME}"
|
||||
+ ])
|
||||
+ ],
|
||||
+ [RUBY_SO_NAME='$(RUBY_BASE_NAME)'])
|
||||
+ ])
|
||||
|
||||
LIBRUBY_LDSHARED=$LDSHARED
|
||||
LIBRUBY_DLDFLAGS=$DLDFLAGS
|
||||
@@ -3925,7 +3941,6 @@
|
||||
SOLIBS='-lm -lc'
|
||||
],
|
||||
[darwin*], [
|
||||
- RUBY_SO_NAME="$RUBY_SO_NAME"'.$(RUBY_PROGRAM_VERSION)'
|
||||
LIBRUBY_LDSHARED='$(CC) -dynamiclib'
|
||||
if test "$load_relative" = yes; then
|
||||
libprefix="@executable_path/../${libdir_basename}"
|
||||
@@ -4157,7 +4172,6 @@
|
||||
fi
|
||||
],
|
||||
[cygwin*|mingw*], [
|
||||
- RUBY_SO_NAME="${RUBY_SO_NAME}"'$(MAJOR)$(MINOR)0'
|
||||
LIBRUBY_DLDFLAGS="${DLDFLAGS}"' -Wl,--out-implib=$(LIBRUBY)'
|
||||
AS_CASE(["$target_os"],
|
||||
[cygwin*], [
|
||||
@@ -4167,10 +4181,6 @@
|
||||
fi
|
||||
],
|
||||
[mingw*], [
|
||||
- RUBY_SO_NAME="${rb_cv_msvcrt}-${RUBY_SO_NAME}"
|
||||
- if test x"${target_cpu}" != xi386; then
|
||||
- RUBY_SO_NAME="${target_cpu}-${RUBY_SO_NAME}"
|
||||
- fi
|
||||
if test x"$enable_shared" = xyes; then
|
||||
LIBRUBY_SO='$(RUBY_SO_NAME)'.dll
|
||||
LIBRUBY_DLDFLAGS="${LIBRUBY_DLDFLAGS}"' $(RUBYDEF)'
|
@ -1,11 +0,0 @@
|
||||
--- ruby-1.9.3-preview1.orig/configure.in
|
||||
+++ ruby-1.9.3-preview1/configure.in
|
||||
@@ -2038,7 +2038,7 @@ if test "$with_dln_a_out" != yes; then
|
||||
[linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi* | kopensolaris*-gnu], [
|
||||
: ${LDSHARED='$(CC) -shared'}
|
||||
if test "$rb_cv_binary_elf" = yes; then
|
||||
- LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
|
||||
+ LDFLAGS="$LDFLAGS -Wl,-export-dynamic -Wl,--no-undefined"
|
||||
fi
|
||||
rb_cv_dlopen=yes],
|
||||
[interix*], [ : ${LDSHARED='$(CC) -shared'}
|
@ -1,112 +0,0 @@
|
||||
--- a/tool/rbinstall.rb.~1~ 2016-10-17 09:17:07.000000000 +0200
|
||||
+++ b/tool/rbinstall.rb 2016-12-25 08:20:07.873491045 +0100
|
||||
@@ -695,107 +695,11 @@
|
||||
# :startdoc:
|
||||
|
||||
install?(:ext, :comm, :gem) do
|
||||
- gem_dir = Gem.default_dir
|
||||
- directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode)
|
||||
- prepare "default gems", gem_dir, directories
|
||||
-
|
||||
- spec_dir = File.join(gem_dir, directories.grep(/^spec/)[0])
|
||||
- default_spec_dir = "#{spec_dir}/default"
|
||||
- makedirs(default_spec_dir)
|
||||
-
|
||||
- gems = Dir.glob(srcdir+"/{lib,ext}/**/*.gemspec").map {|src|
|
||||
- spec = Gem::Specification.load(src) || raise("invalid spec in #{src}")
|
||||
- file_collector = RbInstall::Specs::FileCollector.new(File.dirname(src))
|
||||
- files = file_collector.collect
|
||||
- next if files.empty?
|
||||
- spec.files = files
|
||||
- spec
|
||||
- }
|
||||
- gems.compact.sort_by(&:name).each do |gemspec|
|
||||
- full_name = "#{gemspec.name}-#{gemspec.version}"
|
||||
-
|
||||
- puts "#{" "*30}#{gemspec.name} #{gemspec.version}"
|
||||
- gemspec_path = File.join(default_spec_dir, "#{full_name}.gemspec")
|
||||
- open_for_install(gemspec_path, $data_mode) do
|
||||
- gemspec.to_ruby
|
||||
- end
|
||||
-
|
||||
- unless gemspec.executables.empty? then
|
||||
- bin_dir = File.join(gem_dir, 'gems', full_name, gemspec.bindir)
|
||||
- makedirs(bin_dir)
|
||||
-
|
||||
- execs = gemspec.executables.map {|exec| File.join(srcdir, 'bin', exec)}
|
||||
- install(execs, bin_dir, :mode => $script_mode)
|
||||
- end
|
||||
- end
|
||||
+ # gems are unbundled in Gentoo
|
||||
end
|
||||
|
||||
install?(:ext, :comm, :gem) do
|
||||
- gem_dir = Gem.default_dir
|
||||
- directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode)
|
||||
- prepare "bundle gems", gem_dir, directories
|
||||
- install_dir = with_destdir(gem_dir)
|
||||
- installed_gems = {}
|
||||
- options = {
|
||||
- :install_dir => install_dir,
|
||||
- :bin_dir => with_destdir(bindir),
|
||||
- :domain => :local,
|
||||
- :ignore_dependencies => true,
|
||||
- :dir_mode => $dir_mode,
|
||||
- :data_mode => $data_mode,
|
||||
- :prog_mode => $prog_mode,
|
||||
- :wrappers => true,
|
||||
- :format_executable => true,
|
||||
- }
|
||||
- gem_ext_dir = "#$extout/gems/#{CONFIG['arch']}"
|
||||
- extensions_dir = Gem::StubSpecification.gemspec_stub("", gem_dir, gem_dir).extensions_dir
|
||||
- Gem::Specification.each_gemspec([srcdir+'/gems/*']) do |path|
|
||||
- dir = File.dirname(path)
|
||||
- spec = Dir.chdir(dir) {
|
||||
- Gem::Specification.load(File.basename(path))
|
||||
- }
|
||||
- next unless spec.platform == Gem::Platform::RUBY
|
||||
- next unless spec.full_name == path[srcdir.size..-1][/\A\/gems\/([^\/]+)/, 1]
|
||||
- spec.extension_dir = "#{extensions_dir}/#{spec.full_name}"
|
||||
- if File.directory?(ext = "#{gem_ext_dir}/#{spec.full_name}")
|
||||
- spec.extensions[0] ||= "-"
|
||||
- end
|
||||
- ins = RbInstall::UnpackedInstaller.new(spec, options)
|
||||
- puts "#{" "*30}#{spec.name} #{spec.version}"
|
||||
- ins.install
|
||||
- File.chmod($data_mode, File.join(install_dir, "specifications", "#{spec.full_name}.gemspec"))
|
||||
- unless spec.extensions.empty?
|
||||
- install_recursive(ext, spec.extension_dir)
|
||||
- end
|
||||
- installed_gems[spec.full_name] = true
|
||||
- end
|
||||
- installed_gems, gems = Dir.glob(srcdir+'/gems/*.gem').partition {|gem| installed_gems.key?(File.basename(gem, '.gem'))}
|
||||
- unless installed_gems.empty?
|
||||
- install installed_gems, gem_dir+"/cache"
|
||||
- end
|
||||
- next if gems.empty?
|
||||
- if defined?(Zlib)
|
||||
- Gem.instance_variable_set(:@ruby, with_destdir(File.join(bindir, ruby_install_name)))
|
||||
- silent = Gem::SilentUI.new
|
||||
- gems.each do |gem|
|
||||
- inst = Gem::Installer.new(gem, options)
|
||||
- inst.spec.extension_dir = with_destdir(inst.spec.extension_dir)
|
||||
- begin
|
||||
- Gem::DefaultUserInteraction.use_ui(silent) {inst.install}
|
||||
- rescue Gem::InstallError => e
|
||||
- next
|
||||
- end
|
||||
- gemname = File.basename(gem)
|
||||
- puts "#{" "*30}#{gemname}"
|
||||
- end
|
||||
- # fix directory permissions
|
||||
- # TODO: Gem.install should accept :dir_mode option or something
|
||||
- File.chmod($dir_mode, *Dir.glob(install_dir+"/**/"))
|
||||
- # fix .gemspec permissions
|
||||
- File.chmod($data_mode, *Dir.glob(install_dir+"/specifications/*.gemspec"))
|
||||
- else
|
||||
- puts "skip installing bundle gems because of lacking zlib"
|
||||
- end
|
||||
+ # gems are unbundled in Gentoo
|
||||
end
|
||||
|
||||
parse_args()
|
@ -1,64 +0,0 @@
|
||||
From 027b576b31cd12bad575b3a39476726273f58c41 Mon Sep 17 00:00:00 2001
|
||||
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
|
||||
Date: Mon, 18 Dec 2017 09:03:59 +0000
|
||||
Subject: [PATCH] suppress warning: 'const' attribute on function returning
|
||||
'void'
|
||||
|
||||
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61323 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
|
||||
---
|
||||
include/ruby/intern.h | 4 ++--
|
||||
include/ruby/ruby.h | 2 +-
|
||||
internal.h | 4 ++--
|
||||
3 files changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/include/ruby/intern.h b/include/ruby/intern.h
|
||||
index 5684b3230a67..a711b861159f 100644
|
||||
--- a/include/ruby/intern.h
|
||||
+++ b/include/ruby/intern.h
|
||||
@@ -249,9 +249,9 @@ PRINTF_ARGS(NORETURN(void rb_name_error_str(VALUE, const char*, ...)), 2, 3);
|
||||
NORETURN(void rb_invalid_str(const char*, const char*));
|
||||
NORETURN(void rb_error_frozen(const char*));
|
||||
NORETURN(void rb_error_frozen_object(VALUE));
|
||||
-CONSTFUNC(void rb_error_untrusted(VALUE));
|
||||
+void rb_error_untrusted(VALUE);
|
||||
void rb_check_frozen(VALUE);
|
||||
-CONSTFUNC(void rb_check_trusted(VALUE));
|
||||
+void rb_check_trusted(VALUE);
|
||||
#define rb_check_frozen_internal(obj) do { \
|
||||
VALUE frozen_obj = (obj); \
|
||||
if (OBJ_FROZEN(frozen_obj)) { \
|
||||
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h
|
||||
index 9c7d2fb68439..3210103c648a 100644
|
||||
--- a/include/ruby/ruby.h
|
||||
+++ b/include/ruby/ruby.h
|
||||
@@ -628,7 +628,7 @@ int ruby_safe_level_2_warning(void) __attribute__((const,warning("$SAFE=2 to 4 a
|
||||
# define rb_set_safe_level(level) rb_set_safe_level(RUBY_SAFE_LEVEL_CHECK(level, error))
|
||||
#endif
|
||||
void rb_set_safe_level_force(int);
|
||||
-CONSTFUNC(void rb_secure_update(VALUE));
|
||||
+void rb_secure_update(VALUE);
|
||||
NORETURN(void rb_insecure_operation(void));
|
||||
|
||||
VALUE rb_errinfo(void);
|
||||
diff --git a/internal.h b/internal.h
|
||||
index d0257a8d8ba0..4ccf3218c6ca 100644
|
||||
--- a/internal.h
|
||||
+++ b/internal.h
|
||||
@@ -1110,7 +1110,7 @@ VALUE rb_invcmp(VALUE, VALUE);
|
||||
struct rb_block;
|
||||
int rb_dvar_defined(ID, const struct rb_block *);
|
||||
int rb_local_defined(ID, const struct rb_block *);
|
||||
-CONSTFUNC(const char * rb_insns_name(int i));
|
||||
+const char * rb_insns_name(int i);
|
||||
VALUE rb_insns_name_array(void);
|
||||
|
||||
/* complex.c */
|
||||
@@ -1136,7 +1136,7 @@ void Init_ext(void);
|
||||
|
||||
/* encoding.c */
|
||||
ID rb_id_encoding(void);
|
||||
-CONSTFUNC(void rb_gc_mark_encodings(void));
|
||||
+void rb_gc_mark_encodings(void);
|
||||
rb_encoding *rb_enc_get_from_index(int index);
|
||||
rb_encoding *rb_enc_check_str(VALUE str1, VALUE str2);
|
||||
int rb_encdb_replicate(const char *alias, const char *orig);
|
@ -1,339 +0,0 @@
|
||||
From 7af808153dd34a980e027a04d4490ae38019b3ed Mon Sep 17 00:00:00 2001
|
||||
From: Mark Wright <gienah@gentoo.org>
|
||||
Date: Sun, 15 Oct 2017 01:24:12 +1100
|
||||
Subject: [PATCH] Fix build failure against OpenSSL 1.1 built with
|
||||
no-deprecated Thanks rhenium for the code review and fixes.
|
||||
|
||||
---
|
||||
ext/openssl/openssl_missing.h | 4 +++
|
||||
ext/openssl/ossl.c | 23 ++++++---------
|
||||
ext/openssl/ossl.h | 5 ++++
|
||||
ext/openssl/ossl_cipher.c | 14 ++++-----
|
||||
ext/openssl/ossl_engine.c | 54 ++++++++++++++++++++++-------------
|
||||
ext/openssl/ossl_ssl.c | 2 +-
|
||||
ext/openssl/ossl_x509cert.c | 4 +--
|
||||
ext/openssl/ossl_x509crl.c | 4 +--
|
||||
8 files changed, 63 insertions(+), 47 deletions(-)
|
||||
|
||||
diff --git a/ext/openssl/openssl_missing.h b/ext/openssl/openssl_missing.h
|
||||
index cc31f6ac..debd25ad 100644
|
||||
--- a/ext/openssl/openssl_missing.h
|
||||
+++ b/ext/openssl/openssl_missing.h
|
||||
@@ -209,6 +209,10 @@ IMPL_PKEY_GETTER(EC_KEY, ec)
|
||||
# define X509_get0_notAfter(x) X509_get_notAfter(x)
|
||||
# define X509_CRL_get0_lastUpdate(x) X509_CRL_get_lastUpdate(x)
|
||||
# define X509_CRL_get0_nextUpdate(x) X509_CRL_get_nextUpdate(x)
|
||||
+# define X509_set1_notBefore(x, t) X509_set_notBefore(x, t)
|
||||
+# define X509_set1_notAfter(x, t) X509_set_notAfter(x, t)
|
||||
+# define X509_CRL_set1_lastUpdate(x, t) X509_CRL_set_lastUpdate(x, t)
|
||||
+# define X509_CRL_set1_nextUpdate(x, t) X509_CRL_set_nextUpdate(x, t)
|
||||
#endif
|
||||
|
||||
#if !defined(HAVE_SSL_SESSION_GET_PROTOCOL_VERSION)
|
||||
diff --git a/ext/openssl/ossl.c b/ext/openssl/ossl.c
|
||||
index 93ecc7d4..245385e7 100644
|
||||
--- a/ext/openssl/ossl.c
|
||||
+++ b/ext/openssl/ossl.c
|
||||
@@ -1109,25 +1109,14 @@ Init_openssl(void)
|
||||
/*
|
||||
* Init all digests, ciphers
|
||||
*/
|
||||
- /* CRYPTO_malloc_init(); */
|
||||
- /* ENGINE_load_builtin_engines(); */
|
||||
+#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000
|
||||
+ if (!OPENSSL_init_ssl(0, NULL))
|
||||
+ rb_raise(rb_eRuntimeError, "OPENSSL_init_ssl");
|
||||
+#else
|
||||
OpenSSL_add_ssl_algorithms();
|
||||
OpenSSL_add_all_algorithms();
|
||||
ERR_load_crypto_strings();
|
||||
SSL_load_error_strings();
|
||||
-
|
||||
- /*
|
||||
- * FIXME:
|
||||
- * On unload do:
|
||||
- */
|
||||
-#if 0
|
||||
- CONF_modules_unload(1);
|
||||
- destroy_ui_method();
|
||||
- EVP_cleanup();
|
||||
- ENGINE_cleanup();
|
||||
- CRYPTO_cleanup_all_ex_data();
|
||||
- ERR_remove_state(0);
|
||||
- ERR_free_strings();
|
||||
#endif
|
||||
|
||||
/*
|
||||
@@ -1149,7 +1138,11 @@ Init_openssl(void)
|
||||
/*
|
||||
* Version of OpenSSL the ruby OpenSSL extension is running with
|
||||
*/
|
||||
+#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000
|
||||
+ rb_define_const(mOSSL, "OPENSSL_LIBRARY_VERSION", rb_str_new2(OpenSSL_version(OPENSSL_VERSION)));
|
||||
+#else
|
||||
rb_define_const(mOSSL, "OPENSSL_LIBRARY_VERSION", rb_str_new2(SSLeay_version(SSLEAY_VERSION)));
|
||||
+#endif
|
||||
|
||||
/*
|
||||
* Version number of OpenSSL the ruby OpenSSL extension was built with
|
||||
diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h
|
||||
index f08889b2..5a15839c 100644
|
||||
--- a/ext/openssl/ossl.h
|
||||
+++ b/ext/openssl/ossl.h
|
||||
@@ -35,6 +35,11 @@
|
||||
#if !defined(OPENSSL_NO_OCSP)
|
||||
# include <openssl/ocsp.h>
|
||||
#endif
|
||||
+#include <openssl/bn.h>
|
||||
+#include <openssl/rsa.h>
|
||||
+#include <openssl/dsa.h>
|
||||
+#include <openssl/evp.h>
|
||||
+#include <openssl/dh.h>
|
||||
|
||||
/*
|
||||
* Common Module
|
||||
diff --git a/ext/openssl/ossl_cipher.c b/ext/openssl/ossl_cipher.c
|
||||
index bfa76c1a..e6179733 100644
|
||||
--- a/ext/openssl/ossl_cipher.c
|
||||
+++ b/ext/openssl/ossl_cipher.c
|
||||
@@ -508,9 +508,9 @@ ossl_cipher_set_iv(VALUE self, VALUE iv)
|
||||
StringValue(iv);
|
||||
GetCipher(self, ctx);
|
||||
|
||||
#if defined(HAVE_AUTHENTICATED_ENCRYPTION)
|
||||
- if (EVP_CIPHER_CTX_flags(ctx) & EVP_CIPH_FLAG_AEAD_CIPHER)
|
||||
+ if (EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(ctx)) & EVP_CIPH_FLAG_AEAD_CIPHER)
|
||||
iv_len = (int)(VALUE)EVP_CIPHER_CTX_get_app_data(ctx);
|
||||
#endif
|
||||
if (!iv_len)
|
||||
iv_len = EVP_CIPHER_CTX_iv_length(ctx);
|
||||
@@ -535,7 +535,7 @@ ossl_cipher_is_authenticated(VALUE self)
|
||||
|
||||
GetCipher(self, ctx);
|
||||
|
||||
#if defined(HAVE_AUTHENTICATED_ENCRYPTION)
|
||||
- return (EVP_CIPHER_CTX_flags(ctx) & EVP_CIPH_FLAG_AEAD_CIPHER) ? Qtrue : Qfalse;
|
||||
+ return (EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(ctx)) & EVP_CIPH_FLAG_AEAD_CIPHER) ? Qtrue : Qfalse;
|
||||
#else
|
||||
return Qfalse;
|
||||
#endif
|
||||
@@ -606,7 +606,7 @@ ossl_cipher_get_auth_tag(int argc, VALUE *argv, VALUE self)
|
||||
|
||||
GetCipher(self, ctx);
|
||||
|
||||
- if (!(EVP_CIPHER_CTX_flags(ctx) & EVP_CIPH_FLAG_AEAD_CIPHER))
|
||||
+ if (!(EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(ctx)) & EVP_CIPH_FLAG_AEAD_CIPHER))
|
||||
ossl_raise(eCipherError, "authentication tag not supported by this cipher");
|
||||
|
||||
ret = rb_str_new(NULL, tag_len);
|
||||
@@ -641,7 +641,7 @@ ossl_cipher_set_auth_tag(VALUE self, VALUE vtag)
|
||||
tag_len = RSTRING_LENINT(vtag);
|
||||
|
||||
GetCipher(self, ctx);
|
||||
- if (!(EVP_CIPHER_CTX_flags(ctx) & EVP_CIPH_FLAG_AEAD_CIPHER))
|
||||
+ if (!(EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(ctx)) & EVP_CIPH_FLAG_AEAD_CIPHER))
|
||||
ossl_raise(eCipherError, "authentication tag not supported by this cipher");
|
||||
|
||||
if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG, tag_len, tag))
|
||||
@@ -668,7 +668,7 @@ ossl_cipher_set_auth_tag_len(VALUE self, VALUE vlen)
|
||||
EVP_CIPHER_CTX *ctx;
|
||||
|
||||
GetCipher(self, ctx);
|
||||
- if (!(EVP_CIPHER_CTX_flags(ctx) & EVP_CIPH_FLAG_AEAD_CIPHER))
|
||||
+ if (!(EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(ctx)) & EVP_CIPH_FLAG_AEAD_CIPHER))
|
||||
ossl_raise(eCipherError, "AEAD not supported by this cipher");
|
||||
|
||||
if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG, tag_len, NULL))
|
||||
@@ -695,7 +695,7 @@ ossl_cipher_set_iv_length(VALUE self, VALUE iv_length)
|
||||
EVP_CIPHER_CTX *ctx;
|
||||
|
||||
GetCipher(self, ctx);
|
||||
- if (!(EVP_CIPHER_CTX_flags(ctx) & EVP_CIPH_FLAG_AEAD_CIPHER))
|
||||
+ if (!(EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(ctx)) & EVP_CIPH_FLAG_AEAD_CIPHER))
|
||||
ossl_raise(eCipherError, "cipher does not support AEAD");
|
||||
|
||||
if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_IVLEN, len, NULL))
|
||||
@@ -786,9 +786,9 @@ ossl_cipher_iv_length(VALUE self)
|
||||
int len = 0;
|
||||
|
||||
GetCipher(self, ctx);
|
||||
#if defined(HAVE_AUTHENTICATED_ENCRYPTION)
|
||||
- if (EVP_CIPHER_CTX_flags(ctx) & EVP_CIPH_FLAG_AEAD_CIPHER)
|
||||
+ if (EVP_CIPHER_flags(EVP_CIPHER_CTX_cipher(ctx)) & EVP_CIPH_FLAG_AEAD_CIPHER)
|
||||
len = (int)(VALUE)EVP_CIPHER_CTX_get_app_data(ctx);
|
||||
#endif
|
||||
if (!len)
|
||||
len = EVP_CIPHER_CTX_iv_length(ctx);
|
||||
diff --git a/ext/openssl/ossl_engine.c b/ext/openssl/ossl_engine.c
|
||||
index d69b5dca..5ca0d4ca 100644
|
||||
--- a/ext/openssl/ossl_engine.c
|
||||
+++ b/ext/openssl/ossl_engine.c
|
||||
@@ -46,13 +46,25 @@ VALUE eEngineError;
|
||||
/*
|
||||
* Private
|
||||
*/
|
||||
-#define OSSL_ENGINE_LOAD_IF_MATCH(x) \
|
||||
+#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000
|
||||
+#define OSSL_ENGINE_LOAD_IF_MATCH(engine_name, x) \
|
||||
do{\
|
||||
- if(!strcmp(#x, RSTRING_PTR(name))){\
|
||||
- ENGINE_load_##x();\
|
||||
+ if(!strcmp(#engine_name, RSTRING_PTR(name))){\
|
||||
+ if (OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_##x, NULL))\
|
||||
+ return Qtrue;\
|
||||
+ else\
|
||||
+ ossl_raise(eEngineError, "OPENSSL_init_crypto"); \
|
||||
+ }\
|
||||
+}while(0)
|
||||
+#else
|
||||
+#define OSSL_ENGINE_LOAD_IF_MATCH(engine_name, x) \
|
||||
+do{\
|
||||
+ if(!strcmp(#engine_name, RSTRING_PTR(name))){\
|
||||
+ ENGINE_load_##engine_name();\
|
||||
return Qtrue;\
|
||||
}\
|
||||
}while(0)
|
||||
+#endif
|
||||
|
||||
static void
|
||||
ossl_engine_free(void *engine)
|
||||
@@ -94,55 +106,55 @@ ossl_engine_s_load(int argc, VALUE *argv, VALUE klass)
|
||||
StringValueCStr(name);
|
||||
#ifndef OPENSSL_NO_STATIC_ENGINE
|
||||
#if HAVE_ENGINE_LOAD_DYNAMIC
|
||||
- OSSL_ENGINE_LOAD_IF_MATCH(dynamic);
|
||||
+ OSSL_ENGINE_LOAD_IF_MATCH(dynamic, DYNAMIC);
|
||||
#endif
|
||||
#if HAVE_ENGINE_LOAD_4758CCA
|
||||
- OSSL_ENGINE_LOAD_IF_MATCH(4758cca);
|
||||
+ OSSL_ENGINE_LOAD_IF_MATCH(4758cca, 4758CCA);
|
||||
#endif
|
||||
#if HAVE_ENGINE_LOAD_AEP
|
||||
- OSSL_ENGINE_LOAD_IF_MATCH(aep);
|
||||
+ OSSL_ENGINE_LOAD_IF_MATCH(aep, AEP);
|
||||
#endif
|
||||
#if HAVE_ENGINE_LOAD_ATALLA
|
||||
- OSSL_ENGINE_LOAD_IF_MATCH(atalla);
|
||||
+ OSSL_ENGINE_LOAD_IF_MATCH(atalla, ATALLA);
|
||||
#endif
|
||||
#if HAVE_ENGINE_LOAD_CHIL
|
||||
- OSSL_ENGINE_LOAD_IF_MATCH(chil);
|
||||
+ OSSL_ENGINE_LOAD_IF_MATCH(chil, CHIL);
|
||||
#endif
|
||||
#if HAVE_ENGINE_LOAD_CSWIFT
|
||||
- OSSL_ENGINE_LOAD_IF_MATCH(cswift);
|
||||
+ OSSL_ENGINE_LOAD_IF_MATCH(cswift, CSWIFT);
|
||||
#endif
|
||||
#if HAVE_ENGINE_LOAD_NURON
|
||||
- OSSL_ENGINE_LOAD_IF_MATCH(nuron);
|
||||
+ OSSL_ENGINE_LOAD_IF_MATCH(nuron, NURON);
|
||||
#endif
|
||||
#if HAVE_ENGINE_LOAD_SUREWARE
|
||||
- OSSL_ENGINE_LOAD_IF_MATCH(sureware);
|
||||
+ OSSL_ENGINE_LOAD_IF_MATCH(sureware, SUREWARE);
|
||||
#endif
|
||||
#if HAVE_ENGINE_LOAD_UBSEC
|
||||
- OSSL_ENGINE_LOAD_IF_MATCH(ubsec);
|
||||
+ OSSL_ENGINE_LOAD_IF_MATCH(ubsec, UBSEC);
|
||||
#endif
|
||||
#if HAVE_ENGINE_LOAD_PADLOCK
|
||||
- OSSL_ENGINE_LOAD_IF_MATCH(padlock);
|
||||
+ OSSL_ENGINE_LOAD_IF_MATCH(padlock, PADLOCK);
|
||||
#endif
|
||||
#if HAVE_ENGINE_LOAD_CAPI
|
||||
- OSSL_ENGINE_LOAD_IF_MATCH(capi);
|
||||
+ OSSL_ENGINE_LOAD_IF_MATCH(capi, CAPI);
|
||||
#endif
|
||||
#if HAVE_ENGINE_LOAD_GMP
|
||||
- OSSL_ENGINE_LOAD_IF_MATCH(gmp);
|
||||
+ OSSL_ENGINE_LOAD_IF_MATCH(gmp, GMP);
|
||||
#endif
|
||||
#if HAVE_ENGINE_LOAD_GOST
|
||||
- OSSL_ENGINE_LOAD_IF_MATCH(gost);
|
||||
+ OSSL_ENGINE_LOAD_IF_MATCH(gost, GOST);
|
||||
#endif
|
||||
#if HAVE_ENGINE_LOAD_CRYPTODEV
|
||||
- OSSL_ENGINE_LOAD_IF_MATCH(cryptodev);
|
||||
+ OSSL_ENGINE_LOAD_IF_MATCH(cryptodev, CRYPTODEV);
|
||||
#endif
|
||||
#if HAVE_ENGINE_LOAD_AESNI
|
||||
- OSSL_ENGINE_LOAD_IF_MATCH(aesni);
|
||||
+ OSSL_ENGINE_LOAD_IF_MATCH(aesni, AESNI);
|
||||
#endif
|
||||
#endif
|
||||
#ifdef HAVE_ENGINE_LOAD_OPENBSD_DEV_CRYPTO
|
||||
- OSSL_ENGINE_LOAD_IF_MATCH(openbsd_dev_crypto);
|
||||
+ OSSL_ENGINE_LOAD_IF_MATCH(openbsd_dev_crypto, OPENBSD_DEV_CRYPTO);
|
||||
#endif
|
||||
- OSSL_ENGINE_LOAD_IF_MATCH(openssl);
|
||||
+ OSSL_ENGINE_LOAD_IF_MATCH(openssl, OPENSSL);
|
||||
rb_warning("no such builtin loader for `%"PRIsVALUE"'", name);
|
||||
return Qnil;
|
||||
#endif /* HAVE_ENGINE_LOAD_BUILTIN_ENGINES */
|
||||
@@ -160,7 +172,9 @@ ossl_engine_s_load(int argc, VALUE *argv, VALUE klass)
|
||||
static VALUE
|
||||
ossl_engine_s_cleanup(VALUE self)
|
||||
{
|
||||
+#if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000
|
||||
ENGINE_cleanup();
|
||||
+#endif
|
||||
return Qnil;
|
||||
}
|
||||
|
||||
diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c
|
||||
index 8e3c0c42..d32a299c 100644
|
||||
--- a/ext/openssl/ossl_ssl.c
|
||||
+++ b/ext/openssl/ossl_ssl.c
|
||||
@@ -379,7 +379,7 @@ ossl_call_session_get_cb(VALUE ary)
|
||||
|
||||
/* this method is currently only called for servers (in OpenSSL <= 0.9.8e) */
|
||||
static SSL_SESSION *
|
||||
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
|
||||
+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
|
||||
ossl_sslctx_session_get_cb(SSL *ssl, const unsigned char *buf, int len, int *copy)
|
||||
#else
|
||||
ossl_sslctx_session_get_cb(SSL *ssl, unsigned char *buf, int len, int *copy)
|
||||
diff --git a/ext/openssl/ossl_x509cert.c b/ext/openssl/ossl_x509cert.c
|
||||
index cf82a53d..8d16b9b7 100644
|
||||
--- a/ext/openssl/ossl_x509cert.c
|
||||
+++ b/ext/openssl/ossl_x509cert.c
|
||||
@@ -440,7 +440,7 @@ ossl_x509_set_not_before(VALUE self, VALUE time)
|
||||
|
||||
GetX509(self, x509);
|
||||
asn1time = ossl_x509_time_adjust(NULL, time);
|
||||
- if (!X509_set_notBefore(x509, asn1time)) {
|
||||
+ if (!X509_set1_notBefore(x509, asn1time)) {
|
||||
ASN1_TIME_free(asn1time);
|
||||
ossl_raise(eX509CertError, "X509_set_notBefore");
|
||||
}
|
||||
@@ -479,7 +479,7 @@ ossl_x509_set_not_after(VALUE self, VALUE time)
|
||||
|
||||
GetX509(self, x509);
|
||||
asn1time = ossl_x509_time_adjust(NULL, time);
|
||||
- if (!X509_set_notAfter(x509, asn1time)) {
|
||||
+ if (!X509_set1_notAfter(x509, asn1time)) {
|
||||
ASN1_TIME_free(asn1time);
|
||||
ossl_raise(eX509CertError, "X509_set_notAfter");
|
||||
}
|
||||
diff --git a/ext/openssl/ossl_x509crl.c b/ext/openssl/ossl_x509crl.c
|
||||
index 5ecd7ea0..45cf7fb4 100644
|
||||
--- a/ext/openssl/ossl_x509crl.c
|
||||
+++ b/ext/openssl/ossl_x509crl.c
|
||||
@@ -226,7 +226,7 @@ ossl_x509crl_set_last_update(VALUE self, VALUE time)
|
||||
|
||||
GetX509CRL(self, crl);
|
||||
asn1time = ossl_x509_time_adjust(NULL, time);
|
||||
- if (!X509_CRL_set_lastUpdate(crl, asn1time)) {
|
||||
+ if (!X509_CRL_set1_lastUpdate(crl, asn1time)) {
|
||||
ASN1_TIME_free(asn1time);
|
||||
ossl_raise(eX509CRLError, "X509_CRL_set_lastUpdate");
|
||||
}
|
||||
@@ -257,7 +257,7 @@ ossl_x509crl_set_next_update(VALUE self, VALUE time)
|
||||
|
||||
GetX509CRL(self, crl);
|
||||
asn1time = ossl_x509_time_adjust(NULL, time);
|
||||
- if (!X509_CRL_set_nextUpdate(crl, asn1time)) {
|
||||
+ if (!X509_CRL_set1_nextUpdate(crl, asn1time)) {
|
||||
ASN1_TIME_free(asn1time);
|
||||
ossl_raise(eX509CRLError, "X509_CRL_set_nextUpdate");
|
||||
}
|
@ -1,67 +0,0 @@
|
||||
From 5af43b1ec2674e9f86090790bc61abdb96be14ff Mon Sep 17 00:00:00 2001
|
||||
From: hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
|
||||
Date: Tue, 30 Jan 2018 05:43:42 +0000
|
||||
Subject: [PATCH] ia64: update ia64-specific code to use execution context
|
||||
|
||||
This change follows commit 837fd5e494731d7d44786f29e7d6e8c27029806f
|
||||
in '#ifdef __ia64' branches.
|
||||
|
||||
Noticed as a build failure by John Paul Adrian Glaubitz:
|
||||
|
||||
```
|
||||
cont.c:502:50: error: 'rb_thread_t {aka struct rb_thread_struct}'
|
||||
has no member named 'machine'
|
||||
size = cont->machine.register_stack_size =
|
||||
th->machine.register_stack_end - th->machine.register_stack_start;
|
||||
^~
|
||||
```
|
||||
|
||||
The change is trivial: update 'th->machine' usage to 'th->ec->machine'.
|
||||
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
|
||||
|
||||
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62106 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
|
||||
---
|
||||
cont.c | 6 +++---
|
||||
thread.c | 2 +-
|
||||
2 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/cont.c b/cont.c
|
||||
index f48fd2e52b..93a64f8fe6 100644
|
||||
--- a/cont.c
|
||||
+++ b/cont.c
|
||||
@@ -475,7 +475,7 @@ cont_save_machine_stack(rb_thread_t *th, rb_context_t *cont)
|
||||
|
||||
SET_MACHINE_STACK_END(&th->ec->machine.stack_end);
|
||||
#ifdef __ia64
|
||||
- th->machine.register_stack_end = rb_ia64_bsp();
|
||||
+ th->ec->machine.register_stack_end = rb_ia64_bsp();
|
||||
#endif
|
||||
|
||||
if (th->ec->machine.stack_start > th->ec->machine.stack_end) {
|
||||
@@ -499,8 +499,8 @@ cont_save_machine_stack(rb_thread_t *th, rb_context_t *cont)
|
||||
|
||||
#ifdef __ia64
|
||||
rb_ia64_flushrs();
|
||||
- size = cont->machine.register_stack_size = th->machine.register_stack_end - th->machine.register_stack_start;
|
||||
- cont->machine.register_stack_src = th->machine.register_stack_start;
|
||||
+ size = cont->machine.register_stack_size = th->ec->machine.register_stack_end - th->ec->machine.register_stack_start;
|
||||
+ cont->machine.register_stack_src = th->ec->machine.register_stack_start;
|
||||
if (cont->machine.register_stack) {
|
||||
REALLOC_N(cont->machine.register_stack, VALUE, size);
|
||||
}
|
||||
diff --git a/thread.c b/thread.c
|
||||
index acb53354fd..23957eba09 100644
|
||||
--- a/thread.c
|
||||
+++ b/thread.c
|
||||
@@ -133,7 +133,7 @@ static inline void blocking_region_end(rb_thread_t *th, struct rb_blocking_regio
|
||||
|
||||
#ifdef __ia64
|
||||
#define RB_GC_SAVE_MACHINE_REGISTER_STACK(th) \
|
||||
- do{(th)->machine.register_stack_end = rb_ia64_bsp();}while(0)
|
||||
+ do{(th)->ec->machine.register_stack_end = rb_ia64_bsp();}while(0)
|
||||
#else
|
||||
#define RB_GC_SAVE_MACHINE_REGISTER_STACK(th)
|
||||
#endif
|
||||
--
|
||||
2.16.1
|
||||
|
@ -1,65 +0,0 @@
|
||||
From 6160ea5e22ee7353a0814159c94bd3cf890a52ce Mon Sep 17 00:00:00 2001
|
||||
From: Sergei Trofimovich <slyfox@gentoo.org>
|
||||
Date: Mon, 16 Nov 2020 08:42:15 +0000
|
||||
Subject: [PATCH] configure.ac: fix for upcoming autoconf-2.70
|
||||
|
||||
The failure initially noticed on `autoconf-2.69d` (soon to become 2.70):
|
||||
|
||||
```
|
||||
$ ./configure
|
||||
./configure: line 8720: syntax error near unexpected token `fi'
|
||||
./configure: line 8720: `fi'
|
||||
```
|
||||
|
||||
Before the change generated `./configure ` snippet looked like:
|
||||
|
||||
```
|
||||
if ! $CC -E -xc - <<SRC >/dev/null
|
||||
then :
|
||||
|
||||
#if defined __APPLE_CC__ && defined __clang_major__ && __clang_major__ < 3
|
||||
#error premature clang
|
||||
#endif
|
||||
SRC
|
||||
as_fn_error $? "clang version 3.0 or later is required" "$LINENO" 5
|
||||
fi
|
||||
```
|
||||
|
||||
Note the newline that breaks here-document syntax.
|
||||
|
||||
After the change the snippet does not use here-document.
|
||||
|
||||
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
|
||||
---
|
||||
configure.ac | 15 ++++++++-------
|
||||
1 file changed, 8 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index a5e3dc76f6..4e4a52f066 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -271,13 +271,14 @@ AS_CASE(["$host_os:$build_os"],
|
||||
# clang version 1.0 (http://llvm.org/svn/llvm-project/cfe/tags/Apple/clang-23 exported)
|
||||
# Apple clang version 2.0 (tags/Apple/clang-137) (based on LLVM 2.9svn)
|
||||
# Apple clang version 2.1 (tags/Apple/clang-163.7.1) (based on LLVM 3.0svn)
|
||||
- AS_IF([! $CC -E -xc - <<SRC >/dev/null], [
|
||||
- @%:@if defined __APPLE_CC__ && defined __clang_major__ && __clang_major__ < 3
|
||||
- @%:@error premature clang
|
||||
- @%:@endif
|
||||
-SRC
|
||||
- AC_MSG_ERROR([clang version 3.0 or later is required])
|
||||
- ])
|
||||
+ AC_PREPROC_IFELSE(
|
||||
+ [AC_LANG_PROGRAM([
|
||||
+ @%:@if defined __APPLE_CC__ && defined __clang_major__ && __clang_major__ < 3
|
||||
+ @%:@error premature clang
|
||||
+ @%:@endif
|
||||
+ ])],
|
||||
+ [],
|
||||
+ [AC_MSG_ERROR([clang version 3.0 or later is required])])
|
||||
])
|
||||
|
||||
AS_CASE(["$target_os"],
|
||||
--
|
||||
2.29.2
|
||||
|
@ -1,11 +0,0 @@
|
||||
--- a/configure.ac.~1~ 2017-12-15 10:43:40.000000000 +0100
|
||||
+++ b/configure.ac 2017-12-25 11:02:19.099076831 +0100
|
||||
@@ -3233,7 +3233,7 @@
|
||||
[linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi* | kopensolaris*-gnu | haiku*], [
|
||||
: ${LDSHARED='$(CC) -shared'}
|
||||
AS_IF([test "$rb_cv_binary_elf" = yes], [
|
||||
- LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
|
||||
+ LDFLAGS="$LDFLAGS -Wl,-export-dynamic -Wl,--no-undefined"
|
||||
])
|
||||
rb_cv_dlopen=yes],
|
||||
[interix*], [ : ${LDSHARED='$(CC) -shared'}
|
@ -1,95 +0,0 @@
|
||||
--- a/tool/rbinstall.rb.~1~ 2017-10-30 06:45:20.000000000 +0100
|
||||
+++ b/tool/rbinstall.rb 2017-12-25 11:06:53.340432435 +0100
|
||||
@@ -700,20 +700,10 @@
|
||||
# :startdoc:
|
||||
|
||||
install?(:ext, :comm, :gem, :'default-gems', :'default-gems-comm') do
|
||||
- install_default_gem('lib', srcdir)
|
||||
+ # Gems are unbundled in Gentoo
|
||||
end
|
||||
install?(:ext, :arch, :gem, :'default-gems', :'default-gems-arch') do
|
||||
- install_default_gem('ext', srcdir) do |path|
|
||||
- # assume that gemspec and extconf.rb are placed in the same directory
|
||||
- success = false
|
||||
- begin
|
||||
- IO.foreach(File.dirname(path[(srcdir.size+1)..-1]) + "/Makefile") do |l|
|
||||
- break success = true if /^TARGET\s*=/ =~ l
|
||||
- end
|
||||
- rescue Errno::ENOENT
|
||||
- end
|
||||
- success
|
||||
- end
|
||||
+ # Gems are unbundled in Gentoo
|
||||
end
|
||||
|
||||
def load_gemspec(file)
|
||||
@@ -765,68 +755,7 @@
|
||||
end
|
||||
|
||||
install?(:ext, :comm, :gem, :'bundled-gems') do
|
||||
- gem_dir = Gem.default_dir
|
||||
- directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode)
|
||||
- prepare "bundled gems", gem_dir, directories
|
||||
- install_dir = with_destdir(gem_dir)
|
||||
- installed_gems = {}
|
||||
- options = {
|
||||
- :install_dir => install_dir,
|
||||
- :bin_dir => with_destdir(bindir),
|
||||
- :domain => :local,
|
||||
- :ignore_dependencies => true,
|
||||
- :dir_mode => $dir_mode,
|
||||
- :data_mode => $data_mode,
|
||||
- :prog_mode => $prog_mode,
|
||||
- :wrappers => true,
|
||||
- :format_executable => true,
|
||||
- }
|
||||
- gem_ext_dir = "#$extout/gems/#{CONFIG['arch']}"
|
||||
- extensions_dir = Gem::StubSpecification.gemspec_stub("", gem_dir, gem_dir).extensions_dir
|
||||
- Gem::Specification.each_gemspec([srcdir+'/gems/*']) do |path|
|
||||
- spec = load_gemspec(path)
|
||||
- next unless spec.platform == Gem::Platform::RUBY
|
||||
- next unless spec.full_name == path[srcdir.size..-1][/\A\/gems\/([^\/]+)/, 1]
|
||||
- spec.extension_dir = "#{extensions_dir}/#{spec.full_name}"
|
||||
- if File.directory?(ext = "#{gem_ext_dir}/#{spec.full_name}")
|
||||
- spec.extensions[0] ||= "-"
|
||||
- end
|
||||
- ins = RbInstall::UnpackedInstaller.new(spec, options)
|
||||
- puts "#{INDENT}#{spec.name} #{spec.version}"
|
||||
- ins.install
|
||||
- File.chmod($data_mode, File.join(install_dir, "specifications", "#{spec.full_name}.gemspec"))
|
||||
- unless spec.extensions.empty?
|
||||
- install_recursive(ext, spec.extension_dir)
|
||||
- end
|
||||
- installed_gems[spec.full_name] = true
|
||||
- end
|
||||
- installed_gems, gems = Dir.glob(srcdir+'/gems/*.gem').partition {|gem| installed_gems.key?(File.basename(gem, '.gem'))}
|
||||
- unless installed_gems.empty?
|
||||
- install installed_gems, gem_dir+"/cache"
|
||||
- end
|
||||
- next if gems.empty?
|
||||
- if defined?(Zlib)
|
||||
- Gem.instance_variable_set(:@ruby, with_destdir(File.join(bindir, ruby_install_name)))
|
||||
- silent = Gem::SilentUI.new
|
||||
- gems.each do |gem|
|
||||
- inst = Gem::Installer.new(gem, options)
|
||||
- inst.spec.extension_dir = with_destdir(inst.spec.extension_dir)
|
||||
- begin
|
||||
- Gem::DefaultUserInteraction.use_ui(silent) {inst.install}
|
||||
- rescue Gem::InstallError => e
|
||||
- next
|
||||
- end
|
||||
- gemname = File.basename(gem)
|
||||
- puts "#{INDENT}#{gemname}"
|
||||
- end
|
||||
- # fix directory permissions
|
||||
- # TODO: Gem.install should accept :dir_mode option or something
|
||||
- File.chmod($dir_mode, *Dir.glob(install_dir+"/**/"))
|
||||
- # fix .gemspec permissions
|
||||
- File.chmod($data_mode, *Dir.glob(install_dir+"/specifications/*.gemspec"))
|
||||
- else
|
||||
- puts "skip installing bundled gems because of lacking zlib"
|
||||
- end
|
||||
+ # Gems are unbundled in Gentoo
|
||||
end
|
||||
|
||||
parse_args()
|
@ -1,85 +0,0 @@
|
||||
--- a/tool/rbinstall.rb.~1~ 2017-10-30 06:45:20.000000000 +0100
|
||||
+++ b/tool/rbinstall.rb 2017-12-25 11:06:53.340432435 +0100
|
||||
@@ -700,10 +700,10 @@
|
||||
# :startdoc:
|
||||
|
||||
install?(:ext, :comm, :gem, :'default-gems', :'default-gems-comm') do
|
||||
- install_default_gem('lib', srcdir)
|
||||
+ # Gems are unbundled in Gentoo
|
||||
end
|
||||
install?(:ext, :arch, :gem, :'default-gems', :'default-gems-arch') do
|
||||
- install_default_gem('ext', srcdir)
|
||||
+ # Gems are unbundled in Gentoo
|
||||
end
|
||||
|
||||
def load_gemspec(file)
|
||||
@@ -765,68 +755,7 @@
|
||||
end
|
||||
|
||||
install?(:ext, :comm, :gem, :'bundled-gems') do
|
||||
- gem_dir = Gem.default_dir
|
||||
- directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode)
|
||||
- prepare "bundled gems", gem_dir, directories
|
||||
- install_dir = with_destdir(gem_dir)
|
||||
- installed_gems = {}
|
||||
- options = {
|
||||
- :install_dir => install_dir,
|
||||
- :bin_dir => with_destdir(bindir),
|
||||
- :domain => :local,
|
||||
- :ignore_dependencies => true,
|
||||
- :dir_mode => $dir_mode,
|
||||
- :data_mode => $data_mode,
|
||||
- :prog_mode => $prog_mode,
|
||||
- :wrappers => true,
|
||||
- :format_executable => true,
|
||||
- }
|
||||
- gem_ext_dir = "#$extout/gems/#{CONFIG['arch']}"
|
||||
- extensions_dir = Gem::StubSpecification.gemspec_stub("", gem_dir, gem_dir).extensions_dir
|
||||
- Gem::Specification.each_gemspec([srcdir+'/gems/*']) do |path|
|
||||
- spec = load_gemspec(path)
|
||||
- next unless spec.platform == Gem::Platform::RUBY
|
||||
- next unless spec.full_name == path[srcdir.size..-1][/\A\/gems\/([^\/]+)/, 1]
|
||||
- spec.extension_dir = "#{extensions_dir}/#{spec.full_name}"
|
||||
- if File.directory?(ext = "#{gem_ext_dir}/#{spec.full_name}")
|
||||
- spec.extensions[0] ||= "-"
|
||||
- end
|
||||
- ins = RbInstall::UnpackedInstaller.new(spec, options)
|
||||
- puts "#{INDENT}#{spec.name} #{spec.version}"
|
||||
- ins.install
|
||||
- File.chmod($data_mode, File.join(install_dir, "specifications", "#{spec.full_name}.gemspec"))
|
||||
- unless spec.extensions.empty?
|
||||
- install_recursive(ext, spec.extension_dir)
|
||||
- end
|
||||
- installed_gems[spec.full_name] = true
|
||||
- end
|
||||
- installed_gems, gems = Dir.glob(srcdir+'/gems/*.gem').partition {|gem| installed_gems.key?(File.basename(gem, '.gem'))}
|
||||
- unless installed_gems.empty?
|
||||
- install installed_gems, gem_dir+"/cache"
|
||||
- end
|
||||
- next if gems.empty?
|
||||
- if defined?(Zlib)
|
||||
- Gem.instance_variable_set(:@ruby, with_destdir(File.join(bindir, ruby_install_name)))
|
||||
- silent = Gem::SilentUI.new
|
||||
- gems.each do |gem|
|
||||
- inst = Gem::Installer.new(gem, options)
|
||||
- inst.spec.extension_dir = with_destdir(inst.spec.extension_dir)
|
||||
- begin
|
||||
- Gem::DefaultUserInteraction.use_ui(silent) {inst.install}
|
||||
- rescue Gem::InstallError => e
|
||||
- next
|
||||
- end
|
||||
- gemname = File.basename(gem)
|
||||
- puts "#{INDENT}#{gemname}"
|
||||
- end
|
||||
- # fix directory permissions
|
||||
- # TODO: Gem.install should accept :dir_mode option or something
|
||||
- File.chmod($dir_mode, *Dir.glob(install_dir+"/**/"))
|
||||
- # fix .gemspec permissions
|
||||
- File.chmod($data_mode, *Dir.glob(install_dir+"/specifications/*.gemspec"))
|
||||
- else
|
||||
- puts "skip installing bundled gems because of lacking zlib"
|
||||
- end
|
||||
+ # Gems are unbundled in Gentoo
|
||||
end
|
||||
|
||||
parse_args()
|
@ -1,220 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit autotools flag-o-matic multilib
|
||||
|
||||
MY_P="${PN}-$(ver_cut 1-3)"
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
SLOT=$(ver_cut 1-2)
|
||||
MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
|
||||
RUBYVERSION=${SLOT}.0
|
||||
|
||||
DESCRIPTION="An object-oriented scripting language"
|
||||
HOMEPAGE="https://www.ruby-lang.org/"
|
||||
SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz"
|
||||
|
||||
LICENSE="|| ( Ruby-BSD BSD-2 )"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86"
|
||||
IUSE="berkdb debug doc examples gdbm ipv6 jemalloc +rdoc rubytests socks5 +ssl static-libs tk xemacs"
|
||||
|
||||
RDEPEND="
|
||||
berkdb? ( sys-libs/db:= )
|
||||
gdbm? ( sys-libs/gdbm:= )
|
||||
jemalloc? ( dev-libs/jemalloc:= )
|
||||
ssl? (
|
||||
dev-libs/openssl:0=
|
||||
)
|
||||
socks5? ( >=net-proxy/dante-1.1.13 )
|
||||
tk? (
|
||||
dev-lang/tcl:0=[threads]
|
||||
dev-lang/tk:0=[threads]
|
||||
)
|
||||
dev-libs/libyaml
|
||||
dev-libs/libffi:=
|
||||
sys-libs/readline:0=
|
||||
sys-libs/zlib
|
||||
virtual/libcrypt:=
|
||||
>=app-eselect/eselect-ruby-20171225
|
||||
"
|
||||
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
BUNDLED_GEMS="
|
||||
>=dev-ruby/did_you_mean-1.2.0:2.5[ruby_targets_ruby25]
|
||||
>=dev-ruby/minitest-5.10.3[ruby_targets_ruby25]
|
||||
>=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby25]
|
||||
>=dev-ruby/power_assert-1.1.1[ruby_targets_ruby25]
|
||||
>=dev-ruby/rake-12.3.0[ruby_targets_ruby25]
|
||||
>=dev-ruby/test-unit-3.2.7[ruby_targets_ruby25]
|
||||
>=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby25]
|
||||
"
|
||||
|
||||
PDEPEND="
|
||||
${BUNDLED_GEMS}
|
||||
virtual/rubygems[ruby_targets_ruby25]
|
||||
>=dev-ruby/json-2.0.2[ruby_targets_ruby25]
|
||||
rdoc? ( >=dev-ruby/rdoc-6.1.2[ruby_targets_ruby25] )
|
||||
xemacs? ( app-xemacs/ruby-modes )"
|
||||
|
||||
src_prepare() {
|
||||
eapply "${FILESDIR}"/${SLOT}/{001,005,011}*.patch
|
||||
|
||||
einfo "Unbundling gems..."
|
||||
cd "$S"
|
||||
# Remove bundled gems that we will install via PDEPEND, bug
|
||||
# 539700. Use explicit version numbers to ensure rm fails when they
|
||||
# change so we can update dependencies accordingly.
|
||||
rm -f gems/{did_you_mean-1.2.0,minitest-5.10.3,net-telnet-0.1.1,power_assert-1.1.1,rake-12.3.0,test-unit-3.2.7,xmlrpc-0.3.0}.gem || die
|
||||
|
||||
einfo "Removing bundled libraries..."
|
||||
rm -fr ext/fiddle/libffi-3.2.1 || die
|
||||
|
||||
eapply_user
|
||||
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local modules= myconf=
|
||||
|
||||
# -fomit-frame-pointer makes ruby segfault, see bug #150413.
|
||||
filter-flags -fomit-frame-pointer
|
||||
# In many places aliasing rules are broken; play it safe
|
||||
# as it's risky with newer compilers to leave it as it is.
|
||||
append-flags -fno-strict-aliasing
|
||||
|
||||
# Socks support via dante
|
||||
if use socks5 ; then
|
||||
# Socks support can't be disabled as long as SOCKS_SERVER is
|
||||
# set and socks library is present, so need to unset
|
||||
# SOCKS_SERVER in that case.
|
||||
unset SOCKS_SERVER
|
||||
fi
|
||||
|
||||
# Increase GC_MALLOC_LIMIT if set (default is 8000000)
|
||||
if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
|
||||
append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
|
||||
fi
|
||||
|
||||
# ipv6 hack, bug 168939. Needs --enable-ipv6.
|
||||
use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
|
||||
|
||||
# Determine which modules *not* to build depending in the USE flags.
|
||||
if ! use berkdb ; then
|
||||
modules="${modules},dbm"
|
||||
fi
|
||||
if ! use gdbm ; then
|
||||
modules="${modules},gdbm"
|
||||
fi
|
||||
if ! use ssl ; then
|
||||
modules="${modules},openssl"
|
||||
fi
|
||||
if ! use tk ; then
|
||||
modules="${modules},tk"
|
||||
fi
|
||||
|
||||
# Provide an empty LIBPATHENV because we disable rpath but we do not
|
||||
# need LD_LIBRARY_PATH by default since that breaks USE=multitarget
|
||||
# #564272
|
||||
INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
|
||||
--program-suffix=${MY_SUFFIX} \
|
||||
--with-soname=ruby${MY_SUFFIX} \
|
||||
--enable-shared \
|
||||
--enable-pthread \
|
||||
--disable-rpath \
|
||||
--with-out-ext="${modules}" \
|
||||
$(use_with jemalloc jemalloc) \
|
||||
$(use_enable socks5 socks) \
|
||||
$(use_enable doc install-doc) \
|
||||
--enable-ipv6 \
|
||||
$(use_enable static-libs static) \
|
||||
$(use_enable static-libs install-static-library) \
|
||||
$(use_with static-libs static-linked-ext) \
|
||||
$(use_enable debug) \
|
||||
${myconf} \
|
||||
--enable-option-checking=no
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake V=1 EXTLDFLAGS="${LDFLAGS}"
|
||||
}
|
||||
|
||||
src_test() {
|
||||
emake -j1 V=1 test
|
||||
|
||||
elog "Ruby's make test has been run. Ruby also ships with a make check"
|
||||
elog "that cannot be run until after ruby has been installed."
|
||||
elog
|
||||
if use rubytests; then
|
||||
elog "You have enabled rubytests, so they will be installed to"
|
||||
elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
|
||||
elog "than root, and you must place them into a writeable directory."
|
||||
elog "Then call: "
|
||||
elog
|
||||
elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
|
||||
else
|
||||
elog "Enable the rubytests USE flag to install the make check tests"
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# Remove the remaining bundled gems. We do this late in the process
|
||||
# since they are used during the build to e.g. create the
|
||||
# documentation.
|
||||
rm -rf ext/json || die
|
||||
|
||||
# Ruby is involved in the install process, we don't want interference here.
|
||||
unset RUBYOPT
|
||||
|
||||
local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
|
||||
|
||||
LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
|
||||
RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
|
||||
for d in $(find "${S}/ext" -type d) ; do
|
||||
RUBYLIB="${RUBYLIB}:$d"
|
||||
done
|
||||
export LD_LIBRARY_PATH RUBYLIB
|
||||
|
||||
emake V=1 DESTDIR="${D}" install
|
||||
|
||||
# Remove installed rubygems and rdoc copy
|
||||
rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
|
||||
rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
|
||||
rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
|
||||
rm -rf "${ED}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
|
||||
|
||||
if use doc; then
|
||||
make DESTDIR="${D}" install-doc || die "make install-doc failed"
|
||||
fi
|
||||
|
||||
if use examples; then
|
||||
dodoc -r sample
|
||||
fi
|
||||
|
||||
dodoc ChangeLog NEWS doc/NEWS* README*
|
||||
|
||||
if use rubytests; then
|
||||
pushd test
|
||||
insinto /usr/share/${PN}-${SLOT}/test
|
||||
doins -r .
|
||||
popd
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if [[ ! -n $(readlink "${EROOT}"/usr/bin/ruby) ]] ; then
|
||||
eselect ruby set ruby${MY_SUFFIX}
|
||||
fi
|
||||
|
||||
elog
|
||||
elog "To switch between available Ruby profiles, execute as root:"
|
||||
elog "\teselect ruby set ruby(23|24|...)"
|
||||
elog
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
eselect ruby cleanup
|
||||
}
|
@ -1,246 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit autotools flag-o-matic multilib
|
||||
|
||||
MY_P="${PN}-$(ver_cut 1-3)"
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
SLOT=$(ver_cut 1-2)
|
||||
MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
|
||||
RUBYVERSION=${SLOT}.0
|
||||
|
||||
DESCRIPTION="An object-oriented scripting language"
|
||||
HOMEPAGE="https://www.ruby-lang.org/"
|
||||
SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz"
|
||||
|
||||
LICENSE="|| ( Ruby-BSD BSD-2 )"
|
||||
KEYWORDS="~alpha amd64 ~arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="berkdb debug doc examples gdbm ipv6 jemalloc +rdoc rubytests socks5 +ssl static-libs systemtap tk xemacs"
|
||||
|
||||
RDEPEND="
|
||||
berkdb? ( sys-libs/db:= )
|
||||
gdbm? ( sys-libs/gdbm:= )
|
||||
jemalloc? ( dev-libs/jemalloc:= )
|
||||
ssl? (
|
||||
dev-libs/openssl:0=
|
||||
)
|
||||
socks5? ( >=net-proxy/dante-1.1.13 )
|
||||
systemtap? ( dev-util/systemtap )
|
||||
tk? (
|
||||
dev-lang/tcl:0=[threads]
|
||||
dev-lang/tk:0=[threads]
|
||||
)
|
||||
dev-libs/libyaml
|
||||
dev-libs/libffi:=
|
||||
sys-libs/readline:0=
|
||||
sys-libs/zlib
|
||||
virtual/libcrypt:=
|
||||
>=app-eselect/eselect-ruby-20171225
|
||||
"
|
||||
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
BUNDLED_GEMS="
|
||||
>=dev-ruby/did_you_mean-1.2.0:2.5[ruby_targets_ruby25]
|
||||
>=dev-ruby/minitest-5.10.3[ruby_targets_ruby25]
|
||||
>=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby25]
|
||||
>=dev-ruby/power_assert-1.1.1[ruby_targets_ruby25]
|
||||
>=dev-ruby/rake-12.3.0[ruby_targets_ruby25]
|
||||
>=dev-ruby/test-unit-3.2.7[ruby_targets_ruby25]
|
||||
>=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby25]
|
||||
"
|
||||
|
||||
PDEPEND="
|
||||
${BUNDLED_GEMS}
|
||||
virtual/rubygems[ruby_targets_ruby25]
|
||||
>=dev-ruby/json-2.0.2[ruby_targets_ruby25]
|
||||
rdoc? ( >=dev-ruby/rdoc-6.1.2[ruby_targets_ruby25] )
|
||||
xemacs? ( app-xemacs/ruby-modes )"
|
||||
|
||||
src_prepare() {
|
||||
eapply "${FILESDIR}"/${SLOT}/{001,002,005,011}*.patch
|
||||
|
||||
einfo "Unbundling gems..."
|
||||
cd "$S"
|
||||
# Remove bundled gems that we will install via PDEPEND, bug
|
||||
# 539700. Use explicit version numbers to ensure rm fails when they
|
||||
# change so we can update dependencies accordingly.
|
||||
rm -f gems/{did_you_mean-1.2.0,minitest-5.10.3,net-telnet-0.1.1,power_assert-1.1.1,rake-12.3.0,test-unit-3.2.7,xmlrpc-0.3.0}.gem || die
|
||||
|
||||
einfo "Removing bundled libraries..."
|
||||
rm -fr ext/fiddle/libffi-3.2.1 || die
|
||||
|
||||
if use prefix ; then
|
||||
# Fix hardcoded SHELL var in mkmf library
|
||||
sed -i -e "s#\(SHELL = \).*#\1${EPREFIX}/bin/sh#" lib/mkmf.rb || die
|
||||
|
||||
if [[ ${CHOST} == *darwin* ]] ; then
|
||||
# avoid symlink loop on Darwin (?!)
|
||||
sed -i \
|
||||
-e '/LIBRUBY_ALIASES=/s/lib$(RUBY_INSTALL_NAME).$(SOEXT)//' \
|
||||
configure.ac || die
|
||||
|
||||
# make ar/libtool hack for Darwin work
|
||||
sed -i \
|
||||
-e "s/ac_cv_prog_ac_ct_AR='libtool/ac_cv_prog_AR='${CHOST}-libtool/" \
|
||||
configure.ac || die
|
||||
fi
|
||||
fi
|
||||
|
||||
eapply_user
|
||||
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local modules= myconf=
|
||||
|
||||
# -fomit-frame-pointer makes ruby segfault, see bug #150413.
|
||||
filter-flags -fomit-frame-pointer
|
||||
# In many places aliasing rules are broken; play it safe
|
||||
# as it's risky with newer compilers to leave it as it is.
|
||||
append-flags -fno-strict-aliasing
|
||||
|
||||
# Socks support via dante
|
||||
if use socks5 ; then
|
||||
# Socks support can't be disabled as long as SOCKS_SERVER is
|
||||
# set and socks library is present, so need to unset
|
||||
# SOCKS_SERVER in that case.
|
||||
unset SOCKS_SERVER
|
||||
fi
|
||||
|
||||
# Increase GC_MALLOC_LIMIT if set (default is 8000000)
|
||||
if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
|
||||
append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
|
||||
fi
|
||||
|
||||
# ipv6 hack, bug 168939. Needs --enable-ipv6.
|
||||
use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
|
||||
|
||||
# Determine which modules *not* to build depending in the USE flags.
|
||||
if ! use berkdb ; then
|
||||
modules="${modules},dbm"
|
||||
fi
|
||||
if ! use gdbm ; then
|
||||
modules="${modules},gdbm"
|
||||
fi
|
||||
if ! use ssl ; then
|
||||
modules="${modules},openssl"
|
||||
fi
|
||||
if ! use tk ; then
|
||||
modules="${modules},tk"
|
||||
fi
|
||||
|
||||
# Provide an empty LIBPATHENV because we disable rpath but we do not
|
||||
# need LD_LIBRARY_PATH by default since that breaks USE=multitarget
|
||||
# #564272
|
||||
INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
|
||||
--program-suffix=${MY_SUFFIX} \
|
||||
--with-soname=ruby${MY_SUFFIX} \
|
||||
--with-readline-dir="${EPREFIX}"/usr \
|
||||
--enable-shared \
|
||||
--enable-pthread \
|
||||
--disable-rpath \
|
||||
--with-out-ext="${modules}" \
|
||||
$(use_with jemalloc jemalloc) \
|
||||
$(use_enable socks5 socks) \
|
||||
$(use_enable systemtap dtrace) \
|
||||
$(use_enable doc install-doc) \
|
||||
--enable-ipv6 \
|
||||
$(use_enable static-libs static) \
|
||||
$(use_enable static-libs install-static-library) \
|
||||
$(use_with static-libs static-linked-ext) \
|
||||
$(use_enable debug) \
|
||||
${myconf} \
|
||||
--enable-option-checking=no
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake V=1 EXTLDFLAGS="${LDFLAGS}"
|
||||
}
|
||||
|
||||
src_test() {
|
||||
emake -j1 V=1 test
|
||||
|
||||
elog "Ruby's make test has been run. Ruby also ships with a make check"
|
||||
elog "that cannot be run until after ruby has been installed."
|
||||
elog
|
||||
if use rubytests; then
|
||||
elog "You have enabled rubytests, so they will be installed to"
|
||||
elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
|
||||
elog "than root, and you must place them into a writeable directory."
|
||||
elog "Then call: "
|
||||
elog
|
||||
elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
|
||||
else
|
||||
elog "Enable the rubytests USE flag to install the make check tests"
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# Remove the remaining bundled gems. We do this late in the process
|
||||
# since they are used during the build to e.g. create the
|
||||
# documentation.
|
||||
rm -rf ext/json || die
|
||||
|
||||
# Ruby is involved in the install process, we don't want interference here.
|
||||
unset RUBYOPT
|
||||
|
||||
local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
|
||||
|
||||
LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
|
||||
|
||||
if [[ ${CHOST} == *darwin* ]] ; then
|
||||
DYLD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${DYLD_LIBRARY_PATH+:}${DYLD_LIBRARY_PATH}"
|
||||
export DYLD_LIBRARY_PATH
|
||||
fi
|
||||
|
||||
RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
|
||||
for d in $(find "${S}/ext" -type d) ; do
|
||||
RUBYLIB="${RUBYLIB}:$d"
|
||||
done
|
||||
export LD_LIBRARY_PATH RUBYLIB
|
||||
|
||||
emake V=1 DESTDIR="${D}" install
|
||||
|
||||
# Remove installed rubygems and rdoc copy
|
||||
rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
|
||||
rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
|
||||
rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
|
||||
rm -rf "${ED}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
|
||||
|
||||
if use doc; then
|
||||
make DESTDIR="${D}" install-doc || die "make install-doc failed"
|
||||
fi
|
||||
|
||||
if use examples; then
|
||||
dodoc -r sample
|
||||
fi
|
||||
|
||||
dodoc ChangeLog NEWS doc/NEWS* README*
|
||||
|
||||
if use rubytests; then
|
||||
pushd test
|
||||
insinto /usr/share/${PN}-${SLOT}/test
|
||||
doins -r .
|
||||
popd
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if [[ ! -n $(readlink "${EROOT}"/usr/bin/ruby) ]] ; then
|
||||
eselect ruby set ruby${MY_SUFFIX}
|
||||
fi
|
||||
|
||||
elog
|
||||
elog "To switch between available Ruby profiles, execute as root:"
|
||||
elog "\teselect ruby set ruby(23|24|...)"
|
||||
elog
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
eselect ruby cleanup
|
||||
}
|
Binary file not shown.
@ -1,5 +1,5 @@
|
||||
DIST angelscript_2.34.0.zip 2020026 BLAKE2B f002c67d812cc6453d1e93ffba4aaa4c300926996b74f8d596642625e251ccd14b97473f8f0ff595e3233a3ebc7654c94420ae761eaa0b67439e18472f8df977 SHA512 c26dba452ab52c300da9c95fde8398acf4840cbc0e653ededf978d4a3e942cfe5b77292c74c49dc0279250a27cfd324c696c49d139a97c844b2a1eead9aae2f4
|
||||
DIST angelscript_2.35.0.zip 1971850 BLAKE2B 2253583f46181b420514e3f5a4609a33a019e47ac4ef183d1ddbca52610ce421da28a0e67f16f04b873bd18d9c56673bfac5aba152e6fadff84f8fe4718308a4 SHA512 e54b58e78b21c2ff6aa34d5f55b18fcf8737d057c86aef8901ac0c11f14739fe7f1494f9bcfdbca6a8e54b6d0b36a04dd098780bcd02dea5764fd6d22984b6b0
|
||||
EBUILD angelscript-2.34.0.ebuild 986 BLAKE2B a3d46781774031df2820e0c5f3755cbf835157866ac2d1ab65a0138e507f1f54cf58573f14c302db07266baa0e977c5047bbde6fc33f5f20625cd045a7b607d7 SHA512 0b22fa066cb4eebd20e1fe093d8365f8fb839c6f138b3841c14b7badb11ba77c3823b407518c8c5e9720ca5e2b943a9cee4f2bee3e261cb4260a94dc7735cbbe
|
||||
EBUILD angelscript-2.35.0.ebuild 986 BLAKE2B 9ffc6c7aa6ba6a58591c6c5872694063e38ae32a9633aa54c7c77eaa44666e8884029a024404b2d22b64351541dbc97f7fe935d8c6661435935d4baf4ed2660e SHA512 3a5afaabe60889b2eee7032447ba06a92b297522a099c6dcb2f868e8f0604d9139b5eddb5043844d0e7d449a1ec4f740988c5530c9f6639780e5bdb59116aa66
|
||||
EBUILD angelscript-2.35.0.ebuild 993 BLAKE2B d3a12ba2531ce84532b7dcb61a4921fd3caa17820c032c0a79803d4c7bcfad4202c1a3b0c95f1453ebbc0b239c8e7935703d23e181c7dc1cad9420eb2e87e3fe SHA512 148a185791b7d9cf4e51781da3911a9080cf70495b4e1198700791149c4885ce5752775394fc807230b892fb153aced0a8e31bfba90d7cc6cefa76dea70d342f
|
||||
MISC metadata.xml 407 BLAKE2B 5d10a87729e294d0df6a7afd624cd4012116e773736aae89ee56763eee0002feca2206d62b22feaa835383c1b0d197966a5e19f48851281b06df0c7cf9c0a4a8 SHA512 883e575349da504d73f1aad6b8e03fe12a1a0c05a33c63cf592bc1919fe926a4f5fcc80fc68deeb026adc143ebee0b96bbff2f32d0d5fa49554a0af28ee69b19
|
||||
|
@ -1,4 +0,0 @@
|
||||
AUX 1.1.0-missing_libs.patch 152 BLAKE2B c82e98a978de8f9446e14a87f0a6aa7eee20074720beb530903f8b30254e981d29197e405c6ace3a17873426a531d0d730c872a96dda27f5f0a7ee4fd24b5dd4 SHA512 a408e593193fac9601b781b85f585959b9aef9d0fa4c872291d5a141214be9a87b5f54b28521d99c3dee31054324389554776922770ac8477bbe35cc65cd6114
|
||||
DIST libbrahe-1.1.0.tar.gz 344264 BLAKE2B 84d32344ce9a8f8447b2963d88352a48ec286d1f9c7f39f9ac0da019198cb06f5cc9909eef891ae1e324bfc4a29eea9df4c9a6685f388098ece0888fbeeb4c70 SHA512 54f2d0c9c1c04429fab59d365d6a4144eed29a400edccd7ed9e5d19876565071ac76686da73e7f84c857057c8c52e1b85d2e257203724cbd9f1877d76024927f
|
||||
EBUILD libbrahe-1.1.0-r1.ebuild 577 BLAKE2B 3c91faaf48b8866a8102b03bfe5d744a4547458e2340e71a1c0823ab82434f4e186213671110f023133d2092c901c22bf573227a2d1dc0d787c2ca1d4e33be26 SHA512 19b36950c80a25326c15be4e1e92f261f534eb880c7453be5c73f2abf7d0ef40db7628bd74390df1e7ccb3a74d3ff3e9a7e86d64b1803bf89056644d5107dc69
|
||||
MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
|
@ -1,7 +0,0 @@
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -14,3 +14,4 @@
|
||||
|
||||
AM_CFLAGS = -std=gnu99 -pedantic -Wall -Wno-format
|
||||
DEFS = -I. -I$(srcdir)
|
||||
+LIBS = -lm
|
@ -1,31 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit autotools
|
||||
|
||||
DESCRIPTION="A Heterogenous C Library of Numeric Functions"
|
||||
HOMEPAGE="http://www.coyotegulch.com/products/brahe/"
|
||||
SRC_URI="http://www.coyotegulch.com/distfiles/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
|
||||
|
||||
DOCS=( AUTHORS ChangeLog NEWS )
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PV}-missing_libs.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
find "${ED}" -name '*.a' -delete || die
|
||||
}
|
@ -1,5 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<!-- maintainer-needed -->
|
||||
</pkgmetadata>
|
@ -1,5 +0,0 @@
|
||||
AUX 3.1.0-gcc-4.3.patch 704 BLAKE2B ca080c51b1892e264fc7221255e5583b94e3a5dcb0ae978d34480991e6bcca71250759078381aef46a450f527ac46f7bea5484a6cb553568876ff35d361645e3 SHA512 f7b971314024466f699572385803bcc6845d538d2a20286fdebac96019491b7e6d17c05e49af45f5e55de9ce92abf967e83bb5c2af0b4369ebe4e3d11d396d60
|
||||
AUX 3.1.0-gcc-4.7.patch 213 BLAKE2B f2b8d6138693e80632cc96ad1f832cec646d39489b30a3217ce2d00e406b3f5317a39b1289c15510dc09b04dfb595a494dbac74a972fd1410263a15a1246e6c9 SHA512 13f9b79181ddc795ba0b392e7d1aceb6b0d804cc2dd01d28fdb240dbbbb6cde08a88e641c13b8c033fd6d3a13a3fb2c602ff99e12d57613721b3d22217a4ef76
|
||||
DIST libcoyotl-3.1.0.tar.gz 346384 BLAKE2B 7b3b63e5cd629bc5a53e95d6fb35f9f8d64df593eca95bafce71934560e38d37b89efa3fa8a0b12a50e570d761609cda4bbdfbd0a1577d062a8c4fa5e12a07a1 SHA512 18d0a71204dc57d44f73fe03fd88c2a040e83615557cf1f018c22ad7c9a11d793c7f71df8e10a156b9fd4fae910882ed6cec37f9e57efd3546ffc15fa82a51b5
|
||||
EBUILD libcoyotl-3.1.0-r2.ebuild 972 BLAKE2B 91e15bcb3aff35df8b79223d939783b3360d2640972cc4abcf780176bfb1a9ac260e06ddef60eca098744f8c008cd6d2415ceac1beb1638096d787f8786427b6 SHA512 c735f97e2ac385eb503e1d69d5cbb1b33df8e41a482298e6335cee8ab3cf99a366a312c0eefc1251624f87f6859de3725c27e4703dcf3db71978eb809d4d41d0
|
||||
MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
|
@ -1,30 +0,0 @@
|
||||
--- a/libcoyotl/command_line.cpp
|
||||
+++ b/libcoyotl/command_line.cpp
|
||||
@@ -30,10 +30,13 @@
|
||||
// http://www.coyotegulch.com
|
||||
//
|
||||
//-----------------------------------------------------------------------
|
||||
|
||||
#include "command_line.h"
|
||||
+
|
||||
+#include <cstring>
|
||||
+
|
||||
using namespace libcoyotl;
|
||||
|
||||
command_line::command_line(int argc, char * argv[], const set<string> & bool_opts)
|
||||
: m_options(),
|
||||
m_inputs(),
|
||||
--- a/libcoyotl/sortutil.h
|
||||
+++ b/libcoyotl/sortutil.h
|
||||
@@ -34,10 +34,11 @@
|
||||
//-----------------------------------------------------------------------
|
||||
|
||||
#if !defined(LIBCOYOTL_SORTUTIL_H)
|
||||
#define LIBCOYOTL_SORTUTIL_H
|
||||
|
||||
+#include <climits>
|
||||
#include <stdexcept>
|
||||
|
||||
namespace libcoyotl
|
||||
{
|
||||
|
@ -1,11 +0,0 @@
|
||||
--- a/libcoyotl/maze_renderer.cpp
|
||||
+++ b/libcoyotl/maze_renderer.cpp
|
||||
@@ -36,6 +36,8 @@
|
||||
#include "maze_renderer.h"
|
||||
using namespace libcoyotl;
|
||||
|
||||
+#include <string.h>
|
||||
+
|
||||
#include <stdexcept>
|
||||
using namespace std;
|
||||
|
@ -1,56 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit autotools
|
||||
|
||||
DESCRIPTION="A collection of portable C++ classes"
|
||||
HOMEPAGE="http://www.coyotegulch.com/products/libcoyotl/"
|
||||
SRC_URI="http://www.coyotegulch.com/distfiles/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
|
||||
IUSE="doc"
|
||||
|
||||
RDEPEND="media-libs/libpng:0="
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="doc? ( app-doc/doxygen )"
|
||||
|
||||
DOCS=( AUTHORS ChangeLog NEWS README )
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PV}-gcc-4.3.patch
|
||||
"${FILESDIR}"/${PV}-gcc-4.7.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
ac_cv_prog_HAVE_DOXYGEN="false" econf --disable-static
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake
|
||||
|
||||
if use doc ; then
|
||||
cd docs || die
|
||||
doxygen libcoyotl.doxygen || die "generating docs failed"
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
find "${ED}" -name '*.la' -delete || die
|
||||
|
||||
if use doc ; then
|
||||
docinto html
|
||||
dodoc docs/html/*
|
||||
fi
|
||||
}
|
@ -1,5 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<!-- maintainer-needed -->
|
||||
</pkgmetadata>
|
@ -1,4 +0,0 @@
|
||||
AUX libevocosm-3.3.1-gcc47.patch 402 BLAKE2B bf6e11eabc9229ff8fe0badb61b01089a46a34abda5d42912caff7e6d494e01a55ab4de06e646a5af73d118314f9b023feeeff00cfd644c4070f2fe4eb7313f5 SHA512 2d4b2f615e17fdbcd8dd481384172755bfc26d98f6b3807d866e33a96f676292c70487b1c3c35b67d7425eec8e86733baad62da51be696c457ee2100fc180bf8
|
||||
DIST libevocosm-3.3.1.tar.gz 414392 BLAKE2B 7952cb83a1d5affa4e9b267670cfc889373fbf5c461fdb7022fe1c4af01e2116266f298b4a6ccbfc8102e0bf38fb8411eb6b741e5d72ffefe97b15281a7e44e8 SHA512 ebb4200ac533bdb86051a8a33e5da08d677ae0aa8c2e65a9855e9465b76827c0a72f31e260ee34be62600cd22794a4e47c4471623de8d9fcb4749dcf0a37d946
|
||||
EBUILD libevocosm-3.3.1-r1.ebuild 906 BLAKE2B cbc6254083f228be1b0ce0a5f3595dafeca8d8435f4f7307fdb5cdf53f67baa4f05e6c1d168352cda6dba4aee8fc27d665f13491916d2a820f01a14239fed50c SHA512 1930d62e11052eacb9493563d98e388f7827fe5a725c684bbf38f6e73e71f56a8616ef345c7ae5a351685687dc76cf8d5c3ded1596773c468f2650fbbde79551
|
||||
MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
|
@ -1,20 +0,0 @@
|
||||
https://bugs.gentoo.org/421607
|
||||
|
||||
evocommon.h:468:29: error: 'usleep' was not declared in this scope
|
||||
|
||||
libevocosm/evocommon.h | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
--- a/libevocosm/evocommon.h
|
||||
+++ b/libevocosm/evocommon.h
|
||||
@@ -54,6 +54,10 @@
|
||||
#undef min
|
||||
#endif
|
||||
|
||||
+#if !defined(_MSC_VER)
|
||||
+#include "unistd.h"
|
||||
+#endif
|
||||
+
|
||||
namespace libevocosm
|
||||
{
|
||||
//! The random number generator used by Evocosm
|
@ -1,49 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
DESCRIPTION="A C++ framework for evolutionary computing"
|
||||
HOMEPAGE="http://www.coyotegulch.com/products/libevocosm/"
|
||||
SRC_URI="http://www.coyotegulch.com/distfiles/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
|
||||
IUSE="doc"
|
||||
|
||||
RDEPEND="dev-libs/libcoyotl
|
||||
dev-libs/libbrahe"
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="doc? ( app-doc/doxygen )"
|
||||
|
||||
DOCS=( AUTHORS ChangeLog NEWS README )
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${P}-gcc47.patch
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
export ac_cv_prog_HAVE_DOXYGEN="false"
|
||||
econf --disable-static
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake
|
||||
|
||||
if use doc ; then
|
||||
cd docs || die
|
||||
doxygen libevocosm.doxygen || die "generating docs failed"
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
if use doc ; then
|
||||
docinto html
|
||||
dodoc docs/html/*
|
||||
fi
|
||||
|
||||
find "${ED}" -name '*.la' -delete || die
|
||||
}
|
@ -1,5 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<!-- maintainer-needed -->
|
||||
</pkgmetadata>
|
Binary file not shown.
@ -1,4 +1,4 @@
|
||||
AUX facile-1.1-make.patch 1613 BLAKE2B e469aa4820358b9d197251c6b3c6150c0aeaca8362d104441fc35e975e401776e1d23804a160cd6b37c545c769c0c856ff871d0428bbde47828fc9cc79125d20 SHA512 024132dfacce666c1f52f331fe5ec9f927dbabc1742b44aa11be7ae8851c25943afea5f2f99b3e544127b5c49af7d7337d4b59c60165a777990402855100ebc0
|
||||
DIST facile-1.1.3.tar.gz 99656 BLAKE2B 19d81c48c39b96083628cc40eb9aca7e8ad7dea4ae81c884bfb22daa56135ac411698d57b68f3112829a1fc53d29612627809901c6e30eb4672776508eee57b2 SHA512 78d315188e661245eb7306b645e9baaca94db0b9511112b57dbc8597bf2f75cab5604c8f4cf850209464e802c636f592552c8b492730cb28896d2acd7f413346
|
||||
EBUILD facile-1.1.3.ebuild 1373 BLAKE2B 8cdbe01b4b27c07845e09bbeca4c54c10a5a68114ad4374794660493f27ed4d720860057e39e9552c4f868c2826ab80e1f6d1fddaf9d709d7167e1dadbb2c0ab SHA512 8b237e727640c263d61682428aefca1b65199ea5b9fc1257dae263948a8d38fc67d71fac2c04bc81fe04855ae87c50dabccc8b63813c643db6fda813dea2e18f
|
||||
EBUILD facile-1.1.3.ebuild 1362 BLAKE2B fd06cb8691023ce463c28996d2400ca6420117396514ac46f53f083814e6dff9f890a11a8932ec2655cc8f83e0f48c55017dbc01572e04e6f8690f678732ac2d SHA512 b452f3c88402c010fe47f924bb306f13f3fa4f8f798ba17cb83c981af3b3a55f195f49af0e960655fcf92ba3d7222c196f6d19b20232ea711e9b36c3fee7ba84
|
||||
MISC metadata.xml 427 BLAKE2B 5d2175a32c7c2005d4f7ce47d7c775053f4b0c2d4e707138669db582d5239356ae8a53c5b48b3751580a72db52d256250fc4aec98cfc17b40ed7567571f954df SHA512 a5add2382c31da550a44168738d8d0b10711f5d225320dac43f67e07ab443ce345b79ba027822d3e29845325a8cc0b70c20894deea260e7fad4081bbe86b6724
|
||||
|
@ -1,5 +1,3 @@
|
||||
DIST zarith-1.11.tar.gz 98909 BLAKE2B 01deed333dc79dfdb5748c835ef80403c7892e36e461a1c65e5bb97f147b32df2e6cbe8f4e9b916aabc3bd2479bd97439a68d9cdb123d15b7c9ed0e3e7f784f3 SHA512 7c0645d63511d42b763cd0a33b3fb139c26d23ae0cf59cd651388644cb8e7c43a83265d55d69ff3320d8c4586c4f8dbd9c3412197bab2e110c38e6e7dac88b83
|
||||
DIST zarith-1.12.tar.gz 93695 BLAKE2B b9622e2f397887d08fb8a8520419cf459e99906c05a897af91258b17d92d3fbbd2314a0a4be8a56a07074dcb0a0d04c896b3b5e69526a6c81a8a07b657d1bfec SHA512 8075573ae65579a2606b37dd1b213032a07d220d28c733f9288ae80d36f8a2cc4d91632806df2503c130ea9658dc207ee3a64347c21aa53969050a208f5b2bb4
|
||||
EBUILD zarith-1.11.ebuild 1349 BLAKE2B 94ba51ff6528da6c29e75920680d596852c403c957755633999f17cbb218ce8af091ff18efec885e6378a1dbcb170001deb82ad1bc955eb738865e3b9bbfd9f0 SHA512 72384da49f4aed3f07e4c86560cef28b40a308a76b3ff7acea064b432f0f2d1f50dc9bfe9bae04215e21359e5569d75b156a62ae4cffc6bfe863dc2d6d9c05ff
|
||||
EBUILD zarith-1.12.ebuild 1328 BLAKE2B 227b968a6afda8d5b57e559074b27bb1d5123b4b90d1165c9f10d7ec235da491ad2442c7bbe783915a443399f0f596c39edc208e4c7ff17e406d2bf35a305b97 SHA512 138168f2783fbed6f1f9cc635d76ccb87b5417a8e71203d0f59b51e8642dfb4f50585f47156838e6a125b466645b39e1fe8b6f5560ff9e2970c97dfc786cb5bf
|
||||
EBUILD zarith-1.12.ebuild 1382 BLAKE2B be6bbb3c6a6780953f84184513632019dbebfda50acc21078769f2f2fe172c95bf4217ab9b64effed4b58f2c4cac27264dc1a9705b04980527bb8bb606ad8aa9 SHA512 59db0bfbd106c7da0133b742882a6657726fd0f0bf4362304cb9c797d3fbdc7d27172b953cdc9935276457d1b4de18ec91e00896e53c82b31d73dcb7218f0583
|
||||
MISC metadata.xml 385 BLAKE2B b88400ffa45f84bd5bcfab6a7299ae7f961453f12a55f14dd329831a2273ded4ef2b21dcb25b2611d8590dac2850f84a0221a561d40fa65ce9d62a6ef9a75e57 SHA512 cab52bdbd8b49498a14001cef333073aab9e9496c4caef217cc37738e607a35b23d8e25c41394e976be98f822aca806a8da30773f142a70c69d2de7c8d87531c
|
||||
|
@ -1,58 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit findlib toolchain-funcs
|
||||
|
||||
DESCRIPTION="Arithmetic and logic operations over arbitrary-precision integers"
|
||||
HOMEPAGE="https://github.com/ocaml/Zarith"
|
||||
SRC_URI="https://github.com/ocaml/Zarith/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-2.1-with-linking-exception"
|
||||
SLOT="0/${PV}"
|
||||
KEYWORDS="amd64 ~arm ~arm64 ppc x86"
|
||||
IUSE="doc mpir +ocamlopt"
|
||||
RESTRICT="!ocamlopt? ( test )"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-lang/ocaml-4.05:=[ocamlopt=]
|
||||
!mpir? ( dev-libs/gmp:0= )
|
||||
mpir? ( sci-libs/mpir:= )"
|
||||
|
||||
DEPEND="${RDEPEND} dev-lang/perl"
|
||||
DOCS=( README.md Changes )
|
||||
|
||||
S="${WORKDIR}/Zarith-release-${PV}"
|
||||
|
||||
src_configure() {
|
||||
tc-export CC AR
|
||||
./configure \
|
||||
-host "${CHOST}" \
|
||||
-ocamllibdir /usr/$(get_libdir)/ocaml \
|
||||
-installdir "${ED}"/usr/$(get_libdir)/ocaml \
|
||||
$(usex mpir "-mpir" "-gmp") || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake -j 1 HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) all
|
||||
use doc && emake doc
|
||||
}
|
||||
|
||||
src_test() {
|
||||
emake HASOCAMLOPT=yes HASDYNLINK=yes tests
|
||||
}
|
||||
|
||||
src_install() {
|
||||
findlib_src_preinst
|
||||
|
||||
emake \
|
||||
HASOCAMLOPT=$(usex ocamlopt yes no) \
|
||||
HASDYNLINK=$(usex ocamlopt yes no) \
|
||||
install
|
||||
|
||||
dosym zarith/libzarith.a /usr/$(get_libdir)/ocaml/libzarith.a
|
||||
|
||||
use doc && HTML_DOCS=( html/* )
|
||||
einstalldocs
|
||||
}
|
@ -1,3 +1,3 @@
|
||||
DIST AppConfig-1.71.tar.gz 56739 BLAKE2B 6244f2e3f6b3d5c4a401fa711db894f401c3707f9d826688d7d6f5fdb6bf330bdc29b7084a69b58e505fbc8194b991f08d0f367e35776c798dc3b405f2145d95 SHA512 cbd58601ce0ea6c237e86b8b013cf75e552914263f56b1ab26b8079bff75b28ca2bb35585bfaa187b611afa969767c25494d3ec2a6b3ff5d1aecd2f9ffa8df72
|
||||
EBUILD AppConfig-1.710.0-r1.ebuild 800 BLAKE2B 786acce3b680fefaaf227b0b22ba5e85b52f03271616f163dbbc1195e0bccab5f0e0b6539a5ee9cea1eae5fdb409a594d43bb2ecbef3518ad12665903d6de9a7 SHA512 471079c08942bba5d109a60fc54242f923689327913b5c4cda585fd0c2f3f77b3e877611f27f21e59e483015012ef7c3d94f3dcfdd7d4bf0f7a5caf8e694ce42
|
||||
EBUILD AppConfig-1.710.0-r1.ebuild 807 BLAKE2B e2b8036dfa320ff0800895c9f415acadf5dba6128b9b139e6d36bbd0cb805b470033565a6f7bf12aae323a0c22ed2a3a5d5ef48120aea064098bd17bba1dae75 SHA512 804477797abc142fb9e80ea923215647959196a79294ebd927ff22d05348e38c81931f69b8416295742c432a215e08aa49dc923f7a0d6a90100a87f99873a6fc
|
||||
MISC metadata.xml 763 BLAKE2B 705760440ec5fe979e9dd3bc081be1ffe2c37b8f662bd90fea0343c100e38442d22fb92f11d8bca88cd02087c24ca7a220e99892bfea985aa47d0f7636049789 SHA512 025a089877eb0bdea1b2d7ef65a09794e8935783cacbbede5e51e25cf80b8ae6feb66375ab4c2e6062f7c08b665a4b0e1e304b7c73f9914cfa3f4d09a2218f75
|
||||
|
@ -1,3 +1,3 @@
|
||||
DIST Class-Accessor-0.51.tar.gz 13013 BLAKE2B 6797c0635aac3f0a9b8e1241b95d0286246da8169f2e41f478a69b5d154ce9ff3b1e21bcf94b75f987b14401fd7645428d4d303f4f78bb2c03554159f7de5a4e SHA512 be11acea4747c59e3e524c75d818e0391756cbc08eebff71dca280e737ce228209e76310649298e536e07db1c856d5a71dd64aefc55b49e33cfcb2b3439eab0b
|
||||
EBUILD Class-Accessor-0.510.0.ebuild 585 BLAKE2B cfb6055138ddd4b56028de8f052ffc13d9d4ea8d0fb2d985c54aa88d5b406ad6c9a66cb8b68330130d6308cc8ae1aab4ae564fdc1285f117ec2008fc3b4bd10c SHA512 f2e63deb5817af4d178b4328873d30b7127ab2632d63b61d7097ed8d12d3a098d21acca40acf726cf109102df869018c1ff2ec77fafb18d75f39f4668ef93cea
|
||||
EBUILD Class-Accessor-0.510.0.ebuild 592 BLAKE2B 0b19d698c37c13b21b3351b480517dcb0975d1ba4f6306e5c6c5d056e2ced0645dff2f6af24c026ff8317d2cd376b79db01452db1880fb3327884d64705aaf88 SHA512 8b31d2ac73022a87132d9f0724468ecb16d295f7041fe4f044d0a6de513a40cacf9badd7540477a9cd148d84102423343c81c49bda86ee657f7c16fa567db000
|
||||
MISC metadata.xml 539 BLAKE2B a2a96ca34c81b26d9717327db58b8028ea59cc721f50b1c2f6cfafcfb2d49f78b6cac62006dbaba54fe154ad4fdabf145c13673475c5620fd0375f85e24422a8 SHA512 1b9c68c837e6a6bb468df3ed9027d2c4594b17265c8321e5ec97b81c306c91456bc78f7170d82cfb4d8500a1f8cf81f4e4ea7eb446543b7134bed8c670011df4
|
||||
|
@ -1,3 +1,3 @@
|
||||
DIST Class-Load-XS-0.10.tar.gz 77930 BLAKE2B 8d7540797a11fadf5f1d3622df0f39a1a8e97ec35aff807c04e55bfaf3ae3438c0cf777bfae8a39b44b4948b42fd05f8dbf476617b3321a1dee2149bd013a4b9 SHA512 16ab845dc393567f0b0e9597eda7d7678b8a41d218823a166bacdfd4dc93e704a6aff98662340b8d7f4d045a60530071bb84ea8da8be5a6930af47722207d126
|
||||
EBUILD Class-Load-XS-0.100.0-r1.ebuild 830 BLAKE2B 8cdd4bf875596bb1877552b147dc5cc751e44205570524a50454bed855dbefe173360a2f68c25b4560ce79f78569b2db5bfdd02b55016f526afde6ce1e1a05f2 SHA512 dc1156f69d556596026d4e300403f028fbff6693027eb51625eaf60be45c076812789183542bb699155c3a44b289f98be481d6d35a8c824e1ffc61b80457217b
|
||||
EBUILD Class-Load-XS-0.100.0-r1.ebuild 837 BLAKE2B 7db2d46d11cfead913fe019eeaf27c80c7c425061346d04aef64e9c9e2bc1990901e7e3376834a6e15bee039ce1758e732841021a461f0c57ba3242fe57bd3ef SHA512 5b170657e66a506c0da629bde84519def18dde7bd352d29692609c922ea84947bee49e985836eb14ddb76c8435dee6d5f5d955cee7f08a976dcc681fb7cf66d1
|
||||
MISC metadata.xml 400 BLAKE2B 723a3be528a6c7a1c95950c70e3281d4a394fa021cb4368c9c001b15eb58c17a3d1842b6f52badde6e6ebebf1e6f7ae12cc807e4fc3f90f780219ccf66d083b4 SHA512 62e0140d1f004c2af26995da7c19513176d81bfc73b971724bbd1510390e6a4868878c66bd66ed31e4db939d2e6f2a4ce1f3980235a2aa4956885f93404f3516
|
||||
|
@ -1,3 +1,3 @@
|
||||
DIST Class-Load-0.25.tar.gz 36644 BLAKE2B b28f559a0d582f1f48cf8e158065d86b764b6271df0f9f4df7b7ec97317ad1d6a3154d476c5a8387219d56fdcceea3c853706c2cccbcf6d247b47381fa5de3d2 SHA512 feacb4ae99358d3dc45b23b2d7cc814603e59a72424e7e0620d4939fa6d6206a1bb123c010b49013ce4764df11dc7c04fc1d7bd5783c61a391310bcb653e7ca4
|
||||
EBUILD Class-Load-0.250.0.ebuild 877 BLAKE2B 015916cd2f97e5872f5c54a28aac5d5408342fce970f70d0b0f9de3515c11b24639c8038cf57a5603b6486dee413742dfaf8657b44a5ed6fc72303b036153e78 SHA512 92bb93d2dbf45184840d8f74818a49c77709938ede0ffd1ca76fe60f0d96817a6324180d1c415250ae9030150508b112aa94e88fc5f7431a3cd4b09e1a35ac29
|
||||
EBUILD Class-Load-0.250.0.ebuild 884 BLAKE2B 374dfde53d5a4165112caad15ab690f1b3d1e547bed472fff202f53bb4863cd079f7cafb002f683dc1b16d384b12bf7451e4e99b777a544ea2af4aa4a73cadb1 SHA512 ec716e81d4b37f39af44b726c1e5b347f8f7c7e6e2a4adaa1b25970074354eaffcced9804ff7a2ceb788c6ee42c0f94ca331efe24c76cdc0a646118f45d5f372
|
||||
MISC metadata.xml 455 BLAKE2B 46c5622be6f25610d40ed1f3eed170ef8f7976c405bf3277550cc9d256e2fd1b30d929784f2016de5dc23f17a3f7ddaffca310e757bfabfa6aed9e3b79410d3b SHA512 1f1233b787d335e0d9504fb493dde3effe499a81f5cae94b6817071ea134b682727c582d0ff2a33eb789b329cf925ef82533aa45cd202976d8ee19162b878f6a
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue