From cca357a5c1dbe69841bdbf0ea7c4a40103cf5899 Mon Sep 17 00:00:00 2001 From: "Ronny (tastytea) Gutbrod" Date: Wed, 3 Jun 2020 11:02:30 +0200 Subject: [PATCH 1/3] net-misc/gemserv: Version bump 0.4.1_pre20200529. Signed-off-by: Ronny (tastytea) Gutbrod --- .../gemserv/gemserv-0.4.1_pre20200529.ebuild | 141 ++++++++++++++++++ 1 file changed, 141 insertions(+) create mode 100644 net-misc/gemserv/gemserv-0.4.1_pre20200529.ebuild diff --git a/net-misc/gemserv/gemserv-0.4.1_pre20200529.ebuild b/net-misc/gemserv/gemserv-0.4.1_pre20200529.ebuild new file mode 100644 index 0000000000..2a544c896c --- /dev/null +++ b/net-misc/gemserv/gemserv-0.4.1_pre20200529.ebuild @@ -0,0 +1,141 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CRATES=" + arc-swap-0.4.6 + atty-0.2.14 + autocfg-1.0.0 + bitflags-1.2.1 + bytes-0.5.4 + cc-1.0.54 + cfg-if-0.1.10 + chrono-0.4.11 + colored-1.9.3 + foreign-types-0.3.2 + foreign-types-shared-0.1.1 + fuchsia-zircon-0.3.3 + fuchsia-zircon-sys-0.3.3 + futures-core-0.3.5 + futures-macro-0.3.5 + futures-task-0.3.5 + futures-util-0.3.5 + hermit-abi-0.1.13 + idna-0.2.0 + iovec-0.1.4 + kernel32-sys-0.2.2 + lazy_static-1.4.0 + libc-0.2.71 + log-0.4.8 + matches-0.1.8 + memchr-2.3.3 + mime-0.3.16 + mime_guess-2.0.3 + mio-0.6.22 + mio-named-pipes-0.1.6 + mio-uds-0.6.8 + miow-0.2.1 + miow-0.3.4 + net2-0.2.34 + num-integer-0.1.42 + num-traits-0.2.11 + num_cpus-1.13.0 + once_cell-1.4.0 + openssl-0.10.29 + openssl-sys-0.9.57 + percent-encoding-2.1.0 + pin-project-0.4.17 + pin-project-internal-0.4.17 + pin-project-lite-0.1.5 + pin-utils-0.1.0 + pkg-config-0.3.17 + proc-macro-hack-0.5.16 + proc-macro-nested-0.1.4 + proc-macro2-1.0.17 + quote-1.0.6 + redox_syscall-0.1.56 + serde-1.0.110 + serde_derive-1.0.110 + signal-hook-registry-1.2.0 + simple_logger-1.6.0 + slab-0.4.2 + smallvec-1.4.0 + socket2-0.3.12 + syn-1.0.27 + time-0.1.43 + tokio-0.2.21 + tokio-openssl-0.4.0 + toml-0.5.6 + unicase-2.6.0 + unicode-bidi-0.3.4 + unicode-normalization-0.1.12 + unicode-xid-0.2.0 + url-2.1.1 + vcpkg-0.2.8 + version_check-0.9.2 + winapi-0.2.8 + winapi-0.3.8 + winapi-build-0.1.1 + winapi-i686-pc-windows-gnu-0.4.0 + winapi-x86_64-pc-windows-gnu-0.4.0 + ws2_32-sys-0.2.1 +" + +inherit cargo git-r3 systemd + +EGIT_REPO_URI="https://git.sr.ht/~int80h/gemserv" +EGIT_COMMIT="cfcaf3f7c7ec6db48782932fd6ec025d12b79a40" + +DESCRIPTION="A gemini Server written in rust" +HOMEPAGE=" + gemini://80h.dev/projects/gemserv/ + https://git.sr.ht/~int80h/gemserv +" +SRC_URI="$(cargo_crate_uris ${CRATES})" + +LICENSE="Apache-2.0 BSD MIT MPL-2.0" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND=" + >=dev-libs/openssl-1.1.0g + acct-user/gemini +" +DEPEND="${RDEPEND}" + +src_prepare() { + # Fix paths in systemd unit. + sed -i "s@/path/to/bin /path/to/config@${EPREFIX}/usr/bin/gemserv ${EPREFIX}/etc/gemserv/config.toml@" \ + init-scripts/gemserv.service || die + + # Fix paths in config. + sed -Ei 's@/path/to/(key|cert)@/etc/gemserv/\1.pem@' config.toml || die + sed -Ei 's@/path/to/serv@/var/gemini@' config.toml || die + + default +} + +src_unpack() { + git-r3_src_unpack + cargo_src_unpack +} + +src_install() { + cargo_src_install + + einstalldocs + + diropts --group=gemini + insinto etc/gemserv + newins config.toml config.toml.example + + systemd_dounit init-scripts/gemserv.service + newinitd "init-scripts/${PN}.openrc" "${PN}" +} + +pkg_postinst() { + einfo "You can generate yourself a TLS certificate and key with:" + einfo "openssl req -x509 -newkey rsa:4096 -sha256 -days 3660 -nodes \\" + einfo " -keyout /etc/gemserv/key.pem -out /etc/gemserv/cert.pem" +} From 979f4e3c2463b5cb3031a0d336df52abff08e6d7 Mon Sep 17 00:00:00 2001 From: "Ronny (tastytea) Gutbrod" Date: Thu, 4 Jun 2020 12:55:22 +0200 Subject: [PATCH 2/3] net-misc/castor: Version bump 0.8.13. Signed-off-by: Ronny (tastytea) Gutbrod --- net-misc/castor/Manifest | 1 + net-misc/castor/castor-0.8.13.ebuild | 151 +++++++++++++++++++++++++++ 2 files changed, 152 insertions(+) create mode 100644 net-misc/castor/castor-0.8.13.ebuild diff --git a/net-misc/castor/Manifest b/net-misc/castor/Manifest index a1200ba793..4b01f809e7 100644 --- a/net-misc/castor/Manifest +++ b/net-misc/castor/Manifest @@ -12,6 +12,7 @@ DIST cairo-rs-0.8.1.crate 46018 BLAKE2B f3879b08d404495a401df205a4e51c67caa36722 DIST cairo-sys-rs-0.9.2.crate 11650 BLAKE2B ac664b7976de57907ae543c1afc2fd8fe166b2a147e1be31d6f60aec0b08949bb53b9f59c16e02f33a299a225f8e8202c5d7ad744c6aa8c5f03ec421a773ff33 SHA512 cab877b76951212710c7e668093fda218ac9c7e1e26fcffc448d759a3f968a7faeeea347025189a1aee7579b15916c141d0d727f986bb7061183a695b52bf39b DIST castor-0.8.11.tar.gz 91340 BLAKE2B d7ea232ca841a75039f6f38c82e7268388d35dfe622864cad19b6056d1ed568e9d9ed3cbbe9c471eb82187d1a2d22f7cb836a245fe33a2366aeeddfb0493de60 SHA512 ae150f83a4f2a4959cbd3575cc252e0d68e8a3311b84c3f446e1a9efd31add5c1190707038353f169f90ac8246f5e8e8005eb62eebb9a7ead33417652d72ecce DIST castor-0.8.12.tar.gz 91403 BLAKE2B 486f235efe1a03a16a784903cccc1c832a9cffbc9409653c3002685f1cad005229939233999254e4488654552bf54a346054aab1e572e026adc6290b66fb8f27 SHA512 95449344540eda24639d49c4a4eb02c408a065c4b6700d5267dc01fd5495c3757fb95b3635f29ea5e57c2abcd97565f6a0b93498b76f47bea8030cd110ff8468 +DIST castor-0.8.13.tar.gz 91390 BLAKE2B 30fb1bec4c85babdd4370290f5eb5d839a7c214faaf5484847c8f65752f16d8fcf3a0a74acc3424a70144a6bc493d7773fb6f0302dc0ef8552c8c62bb0c888ef SHA512 9913b3ca2aa3b930c8aa7341cb341c0ac203051cff443d0553407d6fce35f2e7a13a48203ca937ead76d5ed3a69626d60324c54594d5bf8bcac2a8c55c49f560 DIST cc-1.0.52.crate 51006 BLAKE2B a19083042845bc1fcead482b1e644ce09701fc97aad60afc0750d7ee191e26257e5c926fb5a70bef8cc5a37a694581e6098a29c56e63868d67302bb270a8f8f8 SHA512 50558f9b76748298568a1e010ab85b0a0e1cf47d6f8589de718aac0afc130158b092e1be11b73bb1ff51d3a281c5e6ad72ecad5bce9dbff90b4c330c8d95dd90 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339 DIST constant_time_eq-0.1.5.crate 4936 BLAKE2B 882dbf33f20954205fcc5b6e39863db8969d184b697fd51ef462f6890c1a754e3fae67bcc7db685d8cc26abe6e3871d3b80aa542489ba9551a0c95a49f7a6dc2 SHA512 a4e0155a7ad72babcfd418d832d362b3fca7333aaaf36c246b00e948983837c3c93378b86e37c5fa7626fe137e3b6d77276ccc61624a7f4ab914605905a88a01 diff --git a/net-misc/castor/castor-0.8.13.ebuild b/net-misc/castor/castor-0.8.13.ebuild new file mode 100644 index 0000000000..5122affc26 --- /dev/null +++ b/net-misc/castor/castor-0.8.13.ebuild @@ -0,0 +1,151 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# NOTE: Generate new list with `cargo-ebuild ebuild` on every bump. +CRATES=" + aho-corasick-0.7.10 + ansi-parser-0.6.5 + arrayref-0.3.6 + arrayvec-0.5.1 + atk-0.8.0 + atk-sys-0.9.1 + autocfg-1.0.0 + base64-0.11.0 + bitflags-1.2.1 + blake2b_simd-0.5.10 + cairo-rs-0.8.1 + cairo-sys-rs-0.9.2 + cc-1.0.52 + cfg-if-0.1.10 + constant_time_eq-0.1.5 + core-foundation-0.7.0 + core-foundation-sys-0.7.0 + crossbeam-utils-0.7.2 + dirs-2.0.2 + dirs-sys-0.3.4 + foreign-types-0.3.2 + foreign-types-shared-0.1.1 + futures-channel-0.3.5 + futures-core-0.3.5 + futures-executor-0.3.5 + futures-io-0.3.5 + futures-macro-0.3.5 + futures-task-0.3.5 + futures-util-0.3.5 + gdk-0.12.1 + gdk-pixbuf-0.8.0 + gdk-pixbuf-sys-0.9.1 + gdk-sys-0.9.1 + getrandom-0.1.14 + gio-0.8.1 + gio-sys-0.9.1 + glib-0.9.3 + glib-sys-0.9.1 + gobject-sys-0.9.1 + gtk-0.8.1 + gtk-sys-0.9.2 + idna-0.2.0 + lazy_static-1.4.0 + libc-0.2.70 + log-0.4.8 + matches-0.1.8 + memchr-2.3.3 + native-tls-0.2.4 + nom-4.2.3 + once_cell-1.4.0 + open-1.4.0 + openssl-0.10.29 + openssl-probe-0.1.2 + openssl-sys-0.9.56 + pango-0.8.0 + pango-sys-0.9.1 + percent-encoding-2.1.0 + pin-project-0.4.16 + pin-project-internal-0.4.16 + pin-utils-0.1.0 + pkg-config-0.3.17 + ppv-lite86-0.2.6 + proc-macro-hack-0.5.15 + proc-macro-nested-0.1.4 + proc-macro2-1.0.12 + quote-1.0.5 + rand-0.7.3 + rand_chacha-0.2.2 + rand_core-0.5.1 + rand_hc-0.2.0 + redox_syscall-0.1.56 + redox_users-0.3.4 + regex-1.3.7 + regex-syntax-0.6.17 + remove_dir_all-0.5.2 + rust-argon2-0.7.0 + schannel-0.1.19 + security-framework-0.4.4 + security-framework-sys-0.4.3 + serde-1.0.110 + serde_derive-1.0.110 + slab-0.4.2 + smallvec-1.4.0 + syn-1.0.21 + tempfile-3.1.0 + thread_local-1.0.1 + toml-0.5.6 + unicode-bidi-0.3.4 + unicode-normalization-0.1.12 + unicode-xid-0.2.0 + url-2.1.1 + vcpkg-0.2.8 + version_check-0.1.5 + wasi-0.9.0+wasi-snapshot-preview1 + winapi-0.3.8 + winapi-i686-pc-windows-gnu-0.4.0 + winapi-x86_64-pc-windows-gnu-0.4.0 +" + +inherit cargo desktop xdg + +DESCRIPTION="A graphical browser for plain-text protocols" +HOMEPAGE="https://git.sr.ht/~julienxx/castor" +SRC_URI=" + https://git.sr.ht/~julienxx/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz + $(cargo_crate_uris ${CRATES}) +" + +LICENSE="Apache-2.0 BSD-2 CC0-1.0 MIT MPL-2.0" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND=" + dev-libs/openssl + x11-libs/gtk+:3 +" +DEPEND="${RDEPEND}" + +src_prepare() { + xdg_src_prepare + + # Upstream uses forks to support LibreSSL. We revert to official sources. + sed -Ei 's/(native-tls|openssl(-sys)?) = \{.+/\1 = "*"/' Cargo.toml || die +} + +src_test() { + # FIXME: test absolute_url::test_make_absolute_just_path fails without this, + # but I couldn't reproduce it. + RUST_BACKTRACE=1 cargo_src_test +} + +src_install() { + cargo_src_install + + einstalldocs + newdoc data/castor_settings.toml.example settings.toml.example + + doicon data/org.typed-hole.castor.svg + for icon in data/org.typed-hole.castor-*.png; do + local size=$(grep -Eo '[0-9]{2,3}' <<<${icon}) + newicon --size ${size} ${icon} $(basename ${icon/-${size}/}) + done + domenu data/Castor.desktop +} From 4a318d2e369b602d22ff96f9ad08f7d24eded2e6 Mon Sep 17 00:00:00 2001 From: "Ronny (tastytea) Gutbrod" Date: Thu, 4 Jun 2020 13:07:01 +0200 Subject: [PATCH 3/3] net-misc/castor: Delete old ebuilds. Signed-off-by: Ronny (tastytea) Gutbrod --- net-misc/castor/Manifest | 1 - net-misc/castor/castor-0.8.11.ebuild | 154 --------------------------- 2 files changed, 155 deletions(-) delete mode 100644 net-misc/castor/castor-0.8.11.ebuild diff --git a/net-misc/castor/Manifest b/net-misc/castor/Manifest index 4b01f809e7..8f98535649 100644 --- a/net-misc/castor/Manifest +++ b/net-misc/castor/Manifest @@ -10,7 +10,6 @@ DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022 DIST blake2b_simd-0.5.10.crate 34093 BLAKE2B 6e725c9399714d1e199277e3f9882d636c1737af5b0b290f853573575005d053d2ab3a34843461747914a0c25d370f0d5a5cbb46765fe99308c1fd7666d471c7 SHA512 7471e0347267a4b88e9eea932b3001c420da0a472b2ea0f20dff974789955d6d95e19d51e3a8a312516c7fc4c83b6af17cc59ea2b8fcd4ef879ebac22534307a DIST cairo-rs-0.8.1.crate 46018 BLAKE2B f3879b08d404495a401df205a4e51c67caa36722e0661b6eb3bc6c1dc830d52b01149d4cb27ad2c40b4870771f9f5f356ed1cd02c879dcce3bba5e18fd81b7a8 SHA512 33ec3b7b1069934aae88b76c11a6be76974fdc6d2eedee3e6d20328a4a2df7d248960a3fa4de7deb696f6c0dd332f77f9d8004cdf0bc36be1187cbb5ccf9b682 DIST cairo-sys-rs-0.9.2.crate 11650 BLAKE2B ac664b7976de57907ae543c1afc2fd8fe166b2a147e1be31d6f60aec0b08949bb53b9f59c16e02f33a299a225f8e8202c5d7ad744c6aa8c5f03ec421a773ff33 SHA512 cab877b76951212710c7e668093fda218ac9c7e1e26fcffc448d759a3f968a7faeeea347025189a1aee7579b15916c141d0d727f986bb7061183a695b52bf39b -DIST castor-0.8.11.tar.gz 91340 BLAKE2B d7ea232ca841a75039f6f38c82e7268388d35dfe622864cad19b6056d1ed568e9d9ed3cbbe9c471eb82187d1a2d22f7cb836a245fe33a2366aeeddfb0493de60 SHA512 ae150f83a4f2a4959cbd3575cc252e0d68e8a3311b84c3f446e1a9efd31add5c1190707038353f169f90ac8246f5e8e8005eb62eebb9a7ead33417652d72ecce DIST castor-0.8.12.tar.gz 91403 BLAKE2B 486f235efe1a03a16a784903cccc1c832a9cffbc9409653c3002685f1cad005229939233999254e4488654552bf54a346054aab1e572e026adc6290b66fb8f27 SHA512 95449344540eda24639d49c4a4eb02c408a065c4b6700d5267dc01fd5495c3757fb95b3635f29ea5e57c2abcd97565f6a0b93498b76f47bea8030cd110ff8468 DIST castor-0.8.13.tar.gz 91390 BLAKE2B 30fb1bec4c85babdd4370290f5eb5d839a7c214faaf5484847c8f65752f16d8fcf3a0a74acc3424a70144a6bc493d7773fb6f0302dc0ef8552c8c62bb0c888ef SHA512 9913b3ca2aa3b930c8aa7341cb341c0ac203051cff443d0553407d6fce35f2e7a13a48203ca937ead76d5ed3a69626d60324c54594d5bf8bcac2a8c55c49f560 DIST cc-1.0.52.crate 51006 BLAKE2B a19083042845bc1fcead482b1e644ce09701fc97aad60afc0750d7ee191e26257e5c926fb5a70bef8cc5a37a694581e6098a29c56e63868d67302bb270a8f8f8 SHA512 50558f9b76748298568a1e010ab85b0a0e1cf47d6f8589de718aac0afc130158b092e1be11b73bb1ff51d3a281c5e6ad72ecad5bce9dbff90b4c330c8d95dd90 diff --git a/net-misc/castor/castor-0.8.11.ebuild b/net-misc/castor/castor-0.8.11.ebuild deleted file mode 100644 index 7a72b545a8..0000000000 --- a/net-misc/castor/castor-0.8.11.ebuild +++ /dev/null @@ -1,154 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# NOTE: Generate new list with `cargo-ebuild ebuild` on every bump. -CRATES=" - aho-corasick-0.7.10 - ansi-parser-0.6.5 - arrayref-0.3.6 - arrayvec-0.5.1 - atk-0.8.0 - atk-sys-0.9.1 - autocfg-1.0.0 - base64-0.11.0 - bitflags-1.2.1 - blake2b_simd-0.5.10 - cairo-rs-0.8.1 - cairo-sys-rs-0.9.2 - cc-1.0.52 - cfg-if-0.1.10 - constant_time_eq-0.1.5 - core-foundation-0.7.0 - core-foundation-sys-0.7.0 - crossbeam-utils-0.7.2 - dirs-2.0.2 - dirs-sys-0.3.4 - foreign-types-0.3.2 - foreign-types-shared-0.1.1 - futures-channel-0.3.5 - futures-core-0.3.5 - futures-executor-0.3.5 - futures-io-0.3.5 - futures-macro-0.3.5 - futures-task-0.3.5 - futures-util-0.3.5 - gdk-0.12.1 - gdk-pixbuf-0.8.0 - gdk-pixbuf-sys-0.9.1 - gdk-sys-0.9.1 - getrandom-0.1.14 - gio-0.8.1 - gio-sys-0.9.1 - glib-0.9.3 - glib-sys-0.9.1 - gobject-sys-0.9.1 - gtk-0.8.1 - gtk-sys-0.9.2 - idna-0.2.0 - lazy_static-1.4.0 - libc-0.2.70 - log-0.4.8 - matches-0.1.8 - memchr-2.3.3 - native-tls-0.2.4 - nom-4.2.3 - once_cell-1.4.0 - open-1.4.0 - openssl-0.10.29 - openssl-probe-0.1.2 - openssl-sys-0.9.56 - pango-0.8.0 - pango-sys-0.9.1 - percent-encoding-2.1.0 - pin-project-0.4.16 - pin-project-internal-0.4.16 - pin-utils-0.1.0 - pkg-config-0.3.17 - ppv-lite86-0.2.6 - proc-macro-hack-0.5.15 - proc-macro-nested-0.1.4 - proc-macro2-1.0.12 - quote-1.0.5 - rand-0.7.3 - rand_chacha-0.2.2 - rand_core-0.5.1 - rand_hc-0.2.0 - redox_syscall-0.1.56 - redox_users-0.3.4 - regex-1.3.7 - regex-syntax-0.6.17 - remove_dir_all-0.5.2 - rust-argon2-0.7.0 - schannel-0.1.19 - security-framework-0.4.4 - security-framework-sys-0.4.3 - serde-1.0.110 - serde_derive-1.0.110 - slab-0.4.2 - smallvec-1.4.0 - syn-1.0.21 - tempfile-3.1.0 - thread_local-1.0.1 - toml-0.5.6 - unicode-bidi-0.3.4 - unicode-normalization-0.1.12 - unicode-xid-0.2.0 - url-2.1.1 - vcpkg-0.2.8 - version_check-0.1.5 - wasi-0.9.0+wasi-snapshot-preview1 - winapi-0.3.8 - winapi-i686-pc-windows-gnu-0.4.0 - winapi-x86_64-pc-windows-gnu-0.4.0 -" - -inherit cargo desktop xdg - -DESCRIPTION="A graphical browser for plain-text protocols" -HOMEPAGE="https://git.sr.ht/~julienxx/castor" -SRC_URI=" - https://git.sr.ht/~julienxx/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz - $(cargo_crate_uris ${CRATES}) -" - -LICENSE="Apache-2.0 BSD-2 CC0-1.0 MIT MPL-2.0" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND=" - dev-libs/openssl - x11-libs/gtk+:3 -" -DEPEND="${RDEPEND}" - -src_prepare() { - xdg_src_prepare - - # Upstream uses forks to support LibreSSL. We revert to official sources. - sed -Ei 's/(native-tls|openssl(-sys)?) = \{.+/\1 = "*"/' Cargo.toml || die - - # Fix Desktop entry. - sed -Ei 's/Icon=(.+)\.png/Icon=\1/' data/Castor.desktop || die - sed -i 's/Categories=Browser/Categories=Network/' data/Castor.desktop || die -} - -src_test() { - # FIXME: test absolute_url::test_make_absolute_just_path fails without this. - RUST_BACKTRACE=1 cargo_src_test -} - -src_install() { - cargo_src_install - - einstalldocs - newdoc data/castor_settings.toml.example settings.toml.example - - doicon data/org.typed-hole.castor.svg - for icon in data/org.typed-hole.castor-*.png; do - local size=$(grep -Eo '[0-9]{2,3}' <<<${icon}) - newicon --size ${size} ${icon} $(basename ${icon/-${size}/}) - done - domenu data/Castor.desktop -}