From 5b68b3c83eeba9cd1f69f8bce1194794975b84d3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 21 Nov 2023 11:12:11 +0000 Subject: gentoo auto-resync : 21:11:2023 - 11:12:11 --- sys-apps/Manifest.gz | Bin 49515 -> 49515 bytes sys-apps/gptfdisk/Manifest | 1 - sys-apps/gptfdisk/gptfdisk-1.0.9-r2.ebuild | 62 ------------- sys-apps/syd/Manifest | 4 +- sys-apps/syd/syd-3.3.1.ebuild | 142 ----------------------------- sys-apps/syd/syd-3.3.3.ebuild | 142 +++++++++++++++++++++++++++++ 6 files changed, 144 insertions(+), 207 deletions(-) delete mode 100644 sys-apps/gptfdisk/gptfdisk-1.0.9-r2.ebuild delete mode 100644 sys-apps/syd/syd-3.3.1.ebuild create mode 100644 sys-apps/syd/syd-3.3.3.ebuild (limited to 'sys-apps') diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz index 0960bd83feba..b22fef1d4986 100644 Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ diff --git a/sys-apps/gptfdisk/Manifest b/sys-apps/gptfdisk/Manifest index 44d120521ca0..624b1d7439c0 100644 --- a/sys-apps/gptfdisk/Manifest +++ b/sys-apps/gptfdisk/Manifest @@ -3,6 +3,5 @@ AUX gptfdisk-1.0.9-libuuid.patch 899 BLAKE2B 534038452a7184945486b8435099adf7f19 AUX gptfdisk-1.0.9-musl-1.2.4.patch 819 BLAKE2B 79fde3617e158c1a43ac257e412e2c69cde0f6f7b4352a40fd82573d0f8585bbe1dadd323d6d5c717c0ea9e57abb67a71844648f34dd5586fbfc56c1179b30c9 SHA512 940f7f2647b9165404816d1c9e2d2c4d528a45645b5322b46ee3bba843b36acd088b47caad6348c46360107987cc8a3ab087cc6718e02aa46053abfb246b537e AUX gptfdisk-1.0.9-popt_segv.patch 671 BLAKE2B 1d46905caca1b7a403d1d200f5f0afa89953b86997f834df16002780d4371027bc34988c58b9a67e6b10a8978d4c99e93b2e711cbe00f5c49f3a868f708efc29 SHA512 b559c479dd2d62208b41a4ba3c6e68cf3e3b099d999bb8c2bbe251d77f217ccde28a44de0ca26c86004a6cecc17cf8360a120f3f1dd884ab4616c061110fde60 DIST gptfdisk-1.0.9.tar.gz 215065 BLAKE2B 1939ffd75972a4d7f92af2bfab90c7b0223825b5478b6b808dd35af943c687d38ba81663cd7ba5e0f9400656db4dac019c13a9f75d90b7bd716568c676c24dd2 SHA512 c2489ac7e196cb53b9fdb18d0e421571eca43c366de8922c5c7f550aadf192558e7af69b181c30747d6cf607c1670126223465eaa5e231cc589402d94a4e97a2 -EBUILD gptfdisk-1.0.9-r2.ebuild 1401 BLAKE2B db7cc80c28170a2d7f8afee76a4feb7c459575b12a8c89dd68461c0eec4c3f194325ca361e18b98b644829100f200b96806dc7f16ef741051fdce9c2e8b5f7c7 SHA512 56a541820121d690eae0ff43d5c2cfa80037ac2b42e3f81570dcb62b66c6df4f22b3ad47148e6381a574e1962fb9cf0205f6dc8dfd1add0203329a23e3a52ab5 EBUILD gptfdisk-1.0.9-r3.ebuild 1446 BLAKE2B cc25c869453450c8ad4e446c43dfa8619fcd14e349fae2470c87cbfa03fda1cfbfa5a6ebb83291902068ce5fc8179d4bffc736013576a31ad51dfdd383478f0b SHA512 645a82351ed321544a8dfa2ad1a456fcfe9b9f3f194d1dd67963042fd840733426d90c898878fa094a6f89416f32d1a31771f2fc8d4e2d2e684d956509e153af MISC metadata.xml 324 BLAKE2B 71325b739cb7e216be64dfff099ebf3a3f24d8a714ce59838780b6944a65f7d9abdb9b0afb43c617364071778768a7d90da9ef8c7eb4c3bc0cd6b5dc9e04c773 SHA512 ad7457ef87228bef7db385c72bee2c9cf1f913cf261641582a57e4b72c05e7106ad39092c55e2aae1e4d92f86a0bf6f4537dd7de9fdd6e1dc64677b36df4a273 diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.9-r2.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.9-r2.ebuild deleted file mode 100644 index 94027ea21f26..000000000000 --- a/sys-apps/gptfdisk/gptfdisk-1.0.9-r2.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="GPT partition table manipulator for Linux" -HOMEPAGE="https://www.rodsbooks.com/gdisk/" -SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" -IUSE="ncurses static" - -# libuuid from util-linux is required. -RDEPEND="!static? ( - dev-libs/popt - ncurses? ( sys-libs/ncurses:=[unicode(+)] ) - kernel_linux? ( sys-apps/util-linux ) - )" -DEPEND=" - ${RDEPEND} - static? ( - dev-libs/popt[static-libs(+)] - ncurses? ( sys-libs/ncurses:=[unicode(+),static-libs(+)] ) - kernel_linux? ( sys-apps/util-linux[static-libs(+)] ) - ) - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}/${PN}-1.0.9-libuuid.patch" #844073 - "${FILESDIR}/${PN}-1.0.9-popt_segv.patch" #872131 - "${FILESDIR}"/${PN}-1.0.9-musl-1.2.4.patch -) - -src_prepare() { - default - - tc-export CXX PKG_CONFIG - - if ! use ncurses ; then - sed -i \ - -e '/^all:/s: cgdisk::' \ - Makefile || die - fi - - sed \ - -e '/g++/s:=:?=:g' \ - -e 's:-lncursesw:$(shell $(PKG_CONFIG) --libs ncursesw):g' \ - -i Makefile || die - - use static && append-ldflags -static -} - -src_install() { - dosbin gdisk sgdisk $(usex ncurses cgdisk '') fixparts - doman *.8 - dodoc NEWS README -} diff --git a/sys-apps/syd/Manifest b/sys-apps/syd/Manifest index 385faffeb878..486541610624 100644 --- a/sys-apps/syd/Manifest +++ b/sys-apps/syd/Manifest @@ -68,8 +68,8 @@ DIST serde_json-1.0.108.crate 146476 BLAKE2B 9c0ceae5566a4e0ce7a6264939862f9dd92 DIST smallvec-1.11.2.crate 34801 BLAKE2B 58645e99db8f02db64d02c75860c7ea41836c427c03ee3b0b23365e73a406e4fd6ac312bf13fc5faef8bb6111c10fcfd5f839d5b3686e9b34d1626f8469fc327 SHA512 5cfb427c3b99b0dbd71f6154ed899abcde9d7d2992977ac7b2ef3a4c3ff51e4efafd133071a69609b4ed6cb269bdc26b79eb72e1988f10dfcaef8185d950cd1d DIST strum-0.25.0.crate 5539 BLAKE2B 9c031e5ce19e2ecaa63e63118197c740ae9295b8881f6280ad92847b99fca6fb08b0d395ab1b2a66e25c8374cd18866d8436540538e3c0f1f047fd2235971b40 SHA512 a3522df79547e94518f25a0e29248f67f1d7e2586a7a424d7d996cb6bfe5d98fcc4fc44da7ddcd4e35a1127b2816bee55107f30cb2a559f5b9bbb1346139544a DIST strum_macros-0.25.3.crate 22570 BLAKE2B 511af0d1f0f76df7ad1528c79987b6e09390bfb33e1c34078fb5450171aca7f169afb83fa2f2338a861ded6842c8535ea6e4cdb0d31f341edab0a06d7eeac16c SHA512 e6ebc00943d9f88104815a5bd6a302a391a06fb0ed5ff836e01d341150628684e00e5e2e5b3f6466ece92d376985246f818243a0d1d775cfa55d1c50c0ec0c62 -DIST syd-3.3.1.tar.gz 293158 BLAKE2B 4f5c665eb3967d05377bf8e3512d92bba604fc8f1ba9daf0044db1bdc4d38f344a06adeec745b6994aec48c7cbf0cecfdc477dfa22988dc3148bcfc33cac5c61 SHA512 f2770f0c4652dd3ed5fe1b6a94709365b2c312939075bacf45b2017c858200b52e6e38950cbb2a3e3ed0b395e2be59456601041fe7c6ba5df7ab0b8f8613fd74 DIST syd-3.3.2.tar.gz 294930 BLAKE2B c3d3adc218046c5a5114c4f72153ae598fddda796ebf55406c9e0b1ed7a9b959f7cf0fa52b2dc02e774437cd9c264ba85206dff5f8bdd6cdb9017ba7de9c6dbf SHA512 fb3b2ec69bcca25e2a53220cea4c5534ffe2aa83ab29e3001dce18868b74f44ada2b50b687a0d7f1c805f99e795b74bcbf33d5eaec1f20ada607d733792609df +DIST syd-3.3.3.tar.gz 295755 BLAKE2B 9176a7fa5a65acb54c659076d7c88df03905bfbec1f3d75952f7c4660679cd1edf63c5c68251fb6c699738c9ac671d766e8caa8765189e09e7f8555dec938c98 SHA512 2a166f53cfed61643baf3b2fe7e7b0ab42c9f60ac0f4fc10792d89b4b1d1157b35811c65d974869f85666ffaadeac61159cc41b4ffb5919ff0ab949ebaa7135b DIST syn-2.0.39.crate 244129 BLAKE2B 2cff6626624d03f70f1662af45a8644c28a9f92e2dfe38999bef3ba4a4c1ce825ae598277e9cb7abd5585eebfb17b239effc8d0bbf1c6ac196499f0d288e5e01 SHA512 96cc347cfdb0f9ca0b6c7289279a1cad8fc401625783742292564f7ceca8237ced8d9a3f62069696f6132ed06092dff2baaf4be09ef53b21260d93785b0e27c3 DIST tempfile-3.8.1.crate 32164 BLAKE2B abccff7939df8cd223a5a8ee61e5af7c35335f1cd61b3e72fed9a8565465c293e99938d57b50743141aace3cd20422ad5d3090507ed66561cb0155771fe0a5ec SHA512 b257bfb70793575d59ec4cf4b7492aff83dafb68b367a48594211f476a3b1d4800b69bddc405d8749d8b320c30cbe71be1261a60b4bbc862663b37a6c7d97a3a DIST threadpool-1.8.1.crate 14408 BLAKE2B 8bd64ede19184e18460f6b2ad5bc888d6facd5fcaa5b43c35269e35909c9c68a884203f5c4b92619c097ad48c19ec29f73085755ee348cc637233ff3b5b50ccc SHA512 adaa5aecdeec25848af15b160e5b39833978454d834974211bd586d81837f2ce89e5590f08b7e0d4868346cf57056913a5d41bc8bf92b89109ed769cce4a8be0 @@ -89,6 +89,6 @@ DIST windows_i686_msvc-0.48.5.crate 864300 BLAKE2B 3d3ea8be55e2d6ced0eeda18abe1d DIST windows_x86_64_gnu-0.48.5.crate 801619 BLAKE2B aa7e7e6a6ff9f9553ada3a0a39a9aa798e9d995a8eef36e0b6fdb2a0db93ddecee5548970575271fe43aec74797a420d0ee231d503b5bad1bd999059261e0e33 SHA512 1d6056fae430b3d042bdff3c6217c76be4b8b9f5dada9bad06beaac2db7d7ab9b0a82e44f498ec88e61afa73e99f56d84d445dc3847732b9ce5d947e08485f74 DIST windows_x86_64_gnullvm-0.48.5.crate 418486 BLAKE2B 12a2199d434617c1df1a839e9f435620ad64b40c579f6d0c3677553ad7a48e5765d12c266b04946402e15c92cff2e4ac4979ce2130750ef426e2672119680284 SHA512 c016d5b5e73832b61ff67929d92fa8c16e154656294357266ad29ce1f44db4ca2d2935dba31a6b571187dc838b1d22f1e3b41fefffd1d719a338439adf1646aa DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0 -EBUILD syd-3.3.1.ebuild 2705 BLAKE2B e427bad4f10162adc7f7bec1e337731c55c1b8b6cacf9e06f591c1e527d56296cf43d326fdfcd00f654a376f37e492064bf80b5de4f3bb3d0de655e2a271a955 SHA512 cfda19082d2ee556ae2b028589581003f77795ddb3632c43c69f2e35ce50b8d7ca8873d6b04c2684b071d8498df78b0bafee394b57e9c59ccdfe0447a9684059 EBUILD syd-3.3.2.ebuild 2705 BLAKE2B e427bad4f10162adc7f7bec1e337731c55c1b8b6cacf9e06f591c1e527d56296cf43d326fdfcd00f654a376f37e492064bf80b5de4f3bb3d0de655e2a271a955 SHA512 cfda19082d2ee556ae2b028589581003f77795ddb3632c43c69f2e35ce50b8d7ca8873d6b04c2684b071d8498df78b0bafee394b57e9c59ccdfe0447a9684059 +EBUILD syd-3.3.3.ebuild 2705 BLAKE2B e427bad4f10162adc7f7bec1e337731c55c1b8b6cacf9e06f591c1e527d56296cf43d326fdfcd00f654a376f37e492064bf80b5de4f3bb3d0de655e2a271a955 SHA512 cfda19082d2ee556ae2b028589581003f77795ddb3632c43c69f2e35ce50b8d7ca8873d6b04c2684b071d8498df78b0bafee394b57e9c59ccdfe0447a9684059 MISC metadata.xml 254 BLAKE2B 0e6d918ec0aa523a1d7ff2da1c9081d8257c2a83396bc5c7033412341b400364ee2d9b155d9d1df05da92b11f6a940dcda2adae7c158e479d082ce4a0583971b SHA512 24b045489397ba3bcd9dc48dbbc8a26189c1220053c04f09035dd735d2a3fb2ad6a55791f943f4502fee20c633c4a30983b76093f31ce752994f424fbb3cd21b diff --git a/sys-apps/syd/syd-3.3.1.ebuild b/sys-apps/syd/syd-3.3.1.ebuild deleted file mode 100644 index adeca5bb20df..000000000000 --- a/sys-apps/syd/syd-3.3.1.ebuild +++ /dev/null @@ -1,142 +0,0 @@ -# Copyright 2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -RESTRICT="test" # fails with sandbox - -CRATES=" - aho-corasick@1.1.2 - anes@0.1.6 - anstyle@1.0.4 - anyhow@1.0.75 - argv@0.1.9 - autocfg@1.1.0 - bitflags@1.3.2 - bitflags@2.4.1 - bstr@1.8.0 - cast@0.3.0 - cfg-if@1.0.0 - ciborium-io@0.2.1 - ciborium-ll@0.2.1 - ciborium@0.2.1 - clap@4.4.8 - clap_builder@4.4.8 - clap_lex@0.6.0 - criterion-plot@0.5.0 - criterion@0.5.1 - either@1.9.0 - env_logger@0.10.1 - errno@0.3.6 - fastrand@2.0.1 - fnv@1.0.7 - getargs@0.5.0 - globset@0.4.13 - half@1.8.2 - heck@0.4.1 - hermit-abi@0.3.3 - io-uring@0.6.2 - ipnetwork@0.20.0 - is-terminal@0.4.9 - itertools@0.10.5 - itoa@1.0.9 - lazy_static@1.4.0 - libc@0.2.150 - libseccomp-sys@0.2.1 - libseccomp@0.3.0 - linux-raw-sys@0.4.11 - lock_api@0.4.11 - log@0.4.20 - memchr@2.6.4 - memoffset@0.7.1 - nix@0.26.4 - nonempty@0.8.1 - num-traits@0.2.17 - num_cpus@1.16.0 - once_cell@1.18.0 - oorandom@11.1.3 - openat2@0.1.2 - parking_lot@0.12.1 - parking_lot_core@0.9.9 - pkg-config@0.3.27 - proc-macro2@1.0.69 - quote@1.0.33 - redox_syscall@0.4.1 - regex-automata@0.4.3 - regex-syntax@0.8.2 - regex@1.10.2 - rustix@0.38.21 - rustversion@1.0.14 - ryu@1.0.15 - same-file@1.0.6 - scopeguard@1.2.0 - serde@1.0.192 - serde_derive@1.0.192 - serde_json@1.0.108 - smallvec@1.11.2 - strum@0.25.0 - strum_macros@0.25.3 - syn@2.0.39 - tempfile@3.8.1 - threadpool@1.8.1 - tinytemplate@1.2.1 - unicode-ident@1.0.12 - walkdir@2.4.0 - winapi-i686-pc-windows-gnu@0.4.0 - winapi-util@0.1.6 - winapi-x86_64-pc-windows-gnu@0.4.0 - winapi@0.3.9 - windows-sys@0.48.0 - windows-targets@0.48.5 - windows_aarch64_gnullvm@0.48.5 - windows_aarch64_msvc@0.48.5 - windows_i686_gnu@0.48.5 - windows_i686_msvc@0.48.5 - windows_x86_64_gnu@0.48.5 - windows_x86_64_gnullvm@0.48.5 - windows_x86_64_msvc@0.48.5 -" - -inherit cargo - -DESCRIPTION="practical userspace application sandbox" -HOMEPAGE="https://gitlab.exherbo.org/sydbox" - -SRC_URI="https://git.sr.ht/~alip/syd/archive/v${PV}.tar.gz -> ${P}.tar.gz - ${CARGO_CRATE_URIS} -" - -IUSE="+static" - -LICENSE="GPL-3+" -# Dependent crate licenses -LICENSE+=" Apache-2.0 MIT Unicode-DFS-2016" - -SLOT="0" -KEYWORDS="~amd64" - -DEPEND="static? ( sys-libs/libseccomp[static-libs] ) - sys-libs/libseccomp" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/syd-v${PV}" - -src_compile() { - if use static; then - export LIBSECCOMP_LINK_TYPE="static" - export LIBSECCOMP_LIB_PATH=$(pkgconf --variable=libdir libseccomp) - export RUSTFLAGS+="-Clink-args=-static -Clink-args=-no-pie -Clink-args=-Wl,-Bstatic -Ctarget-feature=+crt-static" - myfeatures=( "static" ) - fi - cargo_src_compile -} - -src_install () { - cargo_src_install - dodoc README.md - insinto /usr/libexec - doins src/esyd.sh - - insinto /etc - newins data/user.syd-3 user.syd-3.sample -} diff --git a/sys-apps/syd/syd-3.3.3.ebuild b/sys-apps/syd/syd-3.3.3.ebuild new file mode 100644 index 000000000000..adeca5bb20df --- /dev/null +++ b/sys-apps/syd/syd-3.3.3.ebuild @@ -0,0 +1,142 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +RESTRICT="test" # fails with sandbox + +CRATES=" + aho-corasick@1.1.2 + anes@0.1.6 + anstyle@1.0.4 + anyhow@1.0.75 + argv@0.1.9 + autocfg@1.1.0 + bitflags@1.3.2 + bitflags@2.4.1 + bstr@1.8.0 + cast@0.3.0 + cfg-if@1.0.0 + ciborium-io@0.2.1 + ciborium-ll@0.2.1 + ciborium@0.2.1 + clap@4.4.8 + clap_builder@4.4.8 + clap_lex@0.6.0 + criterion-plot@0.5.0 + criterion@0.5.1 + either@1.9.0 + env_logger@0.10.1 + errno@0.3.6 + fastrand@2.0.1 + fnv@1.0.7 + getargs@0.5.0 + globset@0.4.13 + half@1.8.2 + heck@0.4.1 + hermit-abi@0.3.3 + io-uring@0.6.2 + ipnetwork@0.20.0 + is-terminal@0.4.9 + itertools@0.10.5 + itoa@1.0.9 + lazy_static@1.4.0 + libc@0.2.150 + libseccomp-sys@0.2.1 + libseccomp@0.3.0 + linux-raw-sys@0.4.11 + lock_api@0.4.11 + log@0.4.20 + memchr@2.6.4 + memoffset@0.7.1 + nix@0.26.4 + nonempty@0.8.1 + num-traits@0.2.17 + num_cpus@1.16.0 + once_cell@1.18.0 + oorandom@11.1.3 + openat2@0.1.2 + parking_lot@0.12.1 + parking_lot_core@0.9.9 + pkg-config@0.3.27 + proc-macro2@1.0.69 + quote@1.0.33 + redox_syscall@0.4.1 + regex-automata@0.4.3 + regex-syntax@0.8.2 + regex@1.10.2 + rustix@0.38.21 + rustversion@1.0.14 + ryu@1.0.15 + same-file@1.0.6 + scopeguard@1.2.0 + serde@1.0.192 + serde_derive@1.0.192 + serde_json@1.0.108 + smallvec@1.11.2 + strum@0.25.0 + strum_macros@0.25.3 + syn@2.0.39 + tempfile@3.8.1 + threadpool@1.8.1 + tinytemplate@1.2.1 + unicode-ident@1.0.12 + walkdir@2.4.0 + winapi-i686-pc-windows-gnu@0.4.0 + winapi-util@0.1.6 + winapi-x86_64-pc-windows-gnu@0.4.0 + winapi@0.3.9 + windows-sys@0.48.0 + windows-targets@0.48.5 + windows_aarch64_gnullvm@0.48.5 + windows_aarch64_msvc@0.48.5 + windows_i686_gnu@0.48.5 + windows_i686_msvc@0.48.5 + windows_x86_64_gnu@0.48.5 + windows_x86_64_gnullvm@0.48.5 + windows_x86_64_msvc@0.48.5 +" + +inherit cargo + +DESCRIPTION="practical userspace application sandbox" +HOMEPAGE="https://gitlab.exherbo.org/sydbox" + +SRC_URI="https://git.sr.ht/~alip/syd/archive/v${PV}.tar.gz -> ${P}.tar.gz + ${CARGO_CRATE_URIS} +" + +IUSE="+static" + +LICENSE="GPL-3+" +# Dependent crate licenses +LICENSE+=" Apache-2.0 MIT Unicode-DFS-2016" + +SLOT="0" +KEYWORDS="~amd64" + +DEPEND="static? ( sys-libs/libseccomp[static-libs] ) + sys-libs/libseccomp" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/syd-v${PV}" + +src_compile() { + if use static; then + export LIBSECCOMP_LINK_TYPE="static" + export LIBSECCOMP_LIB_PATH=$(pkgconf --variable=libdir libseccomp) + export RUSTFLAGS+="-Clink-args=-static -Clink-args=-no-pie -Clink-args=-Wl,-Bstatic -Ctarget-feature=+crt-static" + myfeatures=( "static" ) + fi + cargo_src_compile +} + +src_install () { + cargo_src_install + dodoc README.md + insinto /usr/libexec + doins src/esyd.sh + + insinto /etc + newins data/user.syd-3 user.syd-3.sample +} -- cgit v1.2.3