diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-20 17:35:36 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-20 17:35:36 +0100 |
commit | b620fb1b0929ff9657a2588aaa42b85e3021c102 (patch) | |
tree | 5c4e9e39b5d3ea7fc569c26b0d4ba6db582249e6 /sys-apps | |
parent | d473a706836012853193afc7000922601e4ada61 (diff) |
gentoo resync : 20.10.2017
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/gawk/Manifest | 4 | ||||
-rw-r--r-- | sys-apps/gawk/gawk-4.1.4.ebuild | 2 | ||||
-rw-r--r-- | sys-apps/gawk/gawk-4.2.0.ebuild | 86 | ||||
-rw-r--r-- | sys-apps/hdparm/Manifest | 1 | ||||
-rw-r--r-- | sys-apps/hdparm/files/hdparm-9.50-build.patch | 32 | ||||
-rw-r--r-- | sys-apps/kexec-tools/Manifest | 2 | ||||
-rw-r--r-- | sys-apps/kexec-tools/files/kexec.init-2.0.12 | 174 | ||||
-rw-r--r-- | sys-apps/kexec-tools/files/kexec.init-2.0.4-r3 | 164 | ||||
-rw-r--r-- | sys-apps/less/Manifest | 1 | ||||
-rw-r--r-- | sys-apps/less/files/code2color-0.2.patch | 26 | ||||
-rw-r--r-- | sys-apps/portage/Manifest | 4 | ||||
-rw-r--r-- | sys-apps/portage/portage-2.3.12.ebuild (renamed from sys-apps/portage/portage-2.3.10.ebuild) | 0 | ||||
-rw-r--r-- | sys-apps/util-linux/Manifest | 1 | ||||
-rw-r--r-- | sys-apps/util-linux/files/util-linux-2.30-pylibmount_segfault.patch | 25 |
14 files changed, 92 insertions, 430 deletions
diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest index ae40c24c790a..4c7749efc308 100644 --- a/sys-apps/gawk/Manifest +++ b/sys-apps/gawk/Manifest @@ -5,10 +5,12 @@ DIST gawk-3.1.8.tar.bz2 1984129 SHA256 5dbc7b2c4c328711337c2aacd09a122c731312226 DIST gawk-4.0.2.tar.xz 1626808 SHA256 21e1f28c51b5160f0a4bf1a735c6109b46a3bd6a43de808eabc21c17bb026d13 SHA512 069f68b6792521d94d4003764006ad8fbe9a17c60a88212629204d9a5eb3f662903fff6d91dd3c1834597b76c18f9d3231c93a033f456c59c0571ac13eb77b27 WHIRLPOOL 8b2916d964c5fa67a46c0a5fc39d424b03e6b39a3335ad796a224feb760528631199c1ec6ee2b6719bdc014ab190ddf38092211685020c92851d617e6ca08690 DIST gawk-4.1.3.tar.xz 2311268 SHA256 e3cf55e91e31ea2845f8338bedd91e40671fc30e4d82ea147d220e687abda625 SHA512 8b9470a1bba397353f10e4e652e8589a637a49e8235fb39ca7681ae662fd27cd140c193d0634179c800f99e19b0e49aef55dfa6612f9695ba80760a36936a1c3 WHIRLPOOL ddcd0f218a08c7d54beaaa28db3a965c57b1d394dd294f142970cbf3b4777a407bbb491b7442f9e4de0b7435167919e76b16f4c5ab28eb62758a3d44d11a49e1 DIST gawk-4.1.4.tar.xz 2367832 SHA256 53e184e2d0f90def9207860531802456322be091c7b48f23fdc79cda65adc266 SHA512 6a0e9cf086544212f54b54261dcd517b611aaf495ef99c4b7740d07e363bb00c5632f3d7fd5e12a954d5aa9793764162a57453e0e18884b29c6c54b5f444c097 WHIRLPOOL 5103388e7260cd9d4e777a5b53e93ae2eb1270c5baec462d0d4c244fde12bb29d41864ebb22de5c9b797fb9678c548cf3059a39488d35660b508b90c802346ff +DIST gawk-4.2.0.tar.xz 2948108 SHA256 d4f3cd31c001fd0ed52832d4fbfbdfeaa38ad541c182f80ff8fdf87324a6a9f2 SHA512 3076b2f42e43fff0ce63dcaa3fb749ce421473d0abc3e1e2d9dd375207d3e35c98d5bf91c3179f49156e8a4977424c16bb2d3d662846ad487153729dd4cfeb4c WHIRLPOOL 5fe8f46d78effeef2563446b6c73c7e5bcc4e1f8b565ca2bed3bbf30017683e784daa9655cfb7722ea090a8c9a3ce6f5740f278c0ff3a70d85ec67d7a8b5808a EBUILD gawk-3.1.8.ebuild 1794 SHA256 b794beff4f8ce3bb31d416ea4e7cffa083ee432991e4f6b86a1a071b63444845 SHA512 ca82d7bba5d88aadb4616817d0d55f001446a90da3def7fd49fb817c5b2674cd389f5a92efe82736e562ea0f46c9a214286f96137f324ee2be2149d09f298f61 WHIRLPOOL 9b2abe1d8028961d76032e39a359ae76d82ab647008e48d79c887e6ad3b2bd017ab33d7e877582fb34868ee604ed78d8169134c75d1dbfc6b466507847eb2a78 EBUILD gawk-4.0.2.ebuild 2088 SHA256 aeb7bc3dda2def791ba830ff3052247292249a6fcb270c81412651a5fd013761 SHA512 b15b3c32c04c724e7b0c5c6f8d7cae86e3118c1560ca2fae0f5ded39fc098afa29987e425733e96daedbf1db5757e15fb21059a023c5158498f5b6168809f063 WHIRLPOOL 0197d1effc02f2668e3834108eab717407fb02bb880fdd1a964fdbc0a5bfb44a0f5cd1ab6893af0da3aadd0e22c1e9444af46a98b2fdd74b341877d7d9fd00fd EBUILD gawk-4.1.3.ebuild 2201 SHA256 e973870920b273d6f516ccb6a47265d0b793916d60a3a72aa8c7153cd90ff8c3 SHA512 fd78556fbd0d2ba92c2816d4a82330a365ca99985b042a3431e075e7a1390954bec0139d7dc63370c564eb90ab3f0a97c6966230a7309d46462d5e934b090d0b WHIRLPOOL 8c4ab7736911b57077dda94446831b6bb1b7fe1c839f6d06b22f42b6d7cc0b763a94e2b5aca899ae0b6641bc5b9a0dc79aafc07f325a885a9ea9f2aa336c7d1a -EBUILD gawk-4.1.4.ebuild 2301 SHA256 26d24d086963e0347732c0c450a18eb3827779a4259f8173683c05f41c780235 SHA512 7264a7180f127dbe7147db5eaee201f37bd4ec25f1478029086720ee59fa96ac3d3516ae1eafeccdfffd8ccb5107152310311953e40c1d0ec9053a6e1a53c27c WHIRLPOOL 93816fee2ee67f75f898f28e2966c90d3f5ef1878213ab0110a63782a4cf3baae7509dfc13ce982058f21b90b9ac253bb552c8674b6e8b8adcedd8089ef19f6a +EBUILD gawk-4.1.4.ebuild 2300 SHA256 d8f662346008bbd6b0ffce8bda3b720a81a22382689e58b41aa18e5a1f23c27d SHA512 3b8a5f9fa6b07b50eac243ccf6857a709dbed88d18fc9711d114c9ea8e89d72c9aae5fd776cffb383961d8082c55fc01f718fa0954f93c91c08cfc93c072b741 WHIRLPOOL 3958171ffacbac65767b9616331fcb3ca2dbc74a86e53e4d79da31cad490be6d5c91fa623293c5dae270b926af0fa28d0441cb24a960e36333441a137980d3cf +EBUILD gawk-4.2.0.ebuild 2370 SHA256 f8860f720eba40291cfcd692fbdd34a6c4147d940caf3765fb0ce63d865caa45 SHA512 c5bf4b2ca22f4d630105f091a80c5c41dbb63189c794ef7c2b42c960b714b87bf927e9c345dcc86bba40931597f72f66d5177a59a9080a336e81e04ac0ece31d WHIRLPOOL 80f680fe852472fc45e974e6ac32a26eda5f0951b738dc8c758818b6417e95b5a85954bb11a210c3fbd6eddcfa48979b024a445ef9a398900f5f2edc33636571 MISC ChangeLog 5037 SHA256 d91b8f1506cf9102f4f46dbdd03d6c757ed521c54e08b1f03c70ea61d950ee1a SHA512 22fec5534ecd42063f666080c6e9690197120700d23277ca718181306715c41e2253f684efb4c9cdb4456c1a0609d6b45c8a644c4f2e3b86f5e9f5f84a5ec3d6 WHIRLPOOL 69b1294e44f270910dcf450bf3a83167d1665d195b8767f950f45443ab5c5e187afa22c8d49246a3a5c1721650698983407c9e80fa9e964290fc7ca35b0e2f7d MISC ChangeLog-2015 25235 SHA256 bde68cfbf1ddb7ec621042d675bab7b5aeffed7f3f092dc278b0c0ac2cd602de SHA512 243495808dbef55124b5a8d02e27b87550ad40104b427ed9bb63d3c8785a84d0acd3675a8d15c8579553c22f06809a47d19530eea0300a0b616ed2e3fb527dee WHIRLPOOL 70afaf3d02a4f5a3e4b4b13bb3c9f912d55c4b4c6f06beb10412f52b59fd82e5b6bfb9548fbe1a625e933750e903cb179cf31267b4abba103b3539d95622e8d8 MISC metadata.xml 347 SHA256 cfaa5b9985d20997a4800b7a60f7804bf8660d217ef2421732c2e296532d6862 SHA512 1150e37d64393f26ef81056ff25e9720a4bc82dd28c9cffd164d144bb6d2f660f802a31d5ebf4fd121a01b36a4a5073893ebec6b735d3eb570da36705d5f446e WHIRLPOOL f4cc92f281dfb2f436c979257347ac8694056a8d9a4a3c794056027a12c64f6cf04023641b0462d57a376335d93c55f3b6722504e7f7e32baf702c4c7578e5f9 diff --git a/sys-apps/gawk/gawk-4.1.4.ebuild b/sys-apps/gawk/gawk-4.1.4.ebuild index 303da0e8c823..6de13808dc55 100644 --- a/sys-apps/gawk/gawk-4.1.4.ebuild +++ b/sys-apps/gawk/gawk-4.1.4.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gawk/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="mpfr nls readline" RDEPEND="mpfr? ( dev-libs/mpfr:0= ) diff --git a/sys-apps/gawk/gawk-4.2.0.ebuild b/sys-apps/gawk/gawk-4.2.0.ebuild new file mode 100644 index 000000000000..da57da475731 --- /dev/null +++ b/sys-apps/gawk/gawk-4.2.0.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit toolchain-funcs multilib + +DESCRIPTION="GNU awk pattern-matching language" +HOMEPAGE="https://www.gnu.org/software/gawk/gawk.html" +SRC_URI="mirror://gnu/gawk/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="mpfr nls readline" + +RDEPEND=" + dev-libs/gmp:0= + mpfr? ( dev-libs/mpfr:0= ) + readline? ( sys-libs/readline:0= ) +" +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext )" + +src_prepare() { + default + + # use symlinks rather than hardlinks, and disable version links + sed -i \ + -e '/^LN =/s:=.*:= $(LN_S):' \ + -e '/install-exec-hook:/s|$|\nfoo:|' \ + Makefile.in doc/Makefile.in || die + sed -i '/^pty1:$/s|$|\n_pty1:|' test/Makefile.in #413327 + # disable pointless build time hack that breaks cross-compiling #493362 + sed -i \ + -e '/check-recursive all-recursive: check-for-shared-lib-support/d' \ + extension/Makefile.in || die + # fix standards conflict on Solaris + if [[ ${CHOST} == *-solaris* ]] ; then + sed -i \ + -e '/\<_XOPEN_SOURCE\>/s/$/600/' \ + extension/inplace.c || die + fi +} + +src_configure() { + export ac_cv_libsigsegv=no + local myeconfargs=( + --libexec='$(libdir)/misc' + $(use_with mpfr) + $(use_enable nls) + $(use_with readline) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + rm -rf README_d # automatic dodocs barfs + default + + # Install headers + insinto /usr/include/awk + doins *.h || die + rm "${ED}"/usr/include/awk/config.h || die +} + +pkg_postinst() { + # symlink creation here as the links do not belong to gawk, but to any awk + if has_version app-admin/eselect \ + && has_version app-eselect/eselect-awk ; then + eselect awk update ifunset + else + local l + for l in "${EROOT%/}"/usr/share/man/man1/gawk.1* "${EROOT%/}"/usr/bin/gawk; do + [[ -e ${l} && ! -e ${l/gawk/awk} ]] && ln -s "${l##*/}" "${l/gawk/awk}" + done + [[ ! -e ${EROOT%/}/bin/awk ]] && ln -s "../usr/bin/gawk" "${EROOT%/}/bin/awk" + fi +} + +pkg_postrm() { + if has_version app-admin/eselect \ + && has_version app-eselect/eselect-awk ; then + eselect awk update ifunset + fi +} diff --git a/sys-apps/hdparm/Manifest b/sys-apps/hdparm/Manifest index bd1f7bc6550c..325832d3eb25 100644 --- a/sys-apps/hdparm/Manifest +++ b/sys-apps/hdparm/Manifest @@ -1,5 +1,4 @@ AUX hdparm-9.48-sysmacros.patch 474 SHA256 6e75ceceac0065586af5982822d3c54fbd189dbd929102d40ac3fbf372fc1698 SHA512 cd12a544f6149076c48657f572d71dbc400fa80fa26e6604325d3812159f2a3cd3ab79d8f248b64aac3db7c9913c6f406e427cab62103c927274ff6439a4151a WHIRLPOOL 453542b64f9c64dce17824a46d4d81468b79f7252eb8dc502578264cc3735d15c08ee69a61e98be5e451f4477e05c4fdf70248ec2267d4d177295e9f515ce65c -AUX hdparm-9.50-build.patch 1216 SHA256 389c96c9769b470b7a6e50d3a02ace02cc15d4f4058229e24f808e1f47c8ec99 SHA512 5b914d446a1a8ee5e99253abc450dec706e57a55d87d82b14e4fcabf1cd76d0575f3adc1a3a226925662ac30cd674403d5b652af17e8776bdc43453b2cda9951 WHIRLPOOL 837f6e449cdbd20ae2991b57f01d6542d4ac5f00ef8d63e1b6449fe026e3c6e50ae96c27c3c769cea27e71b04cc4fd24c0b082243f65f1262b18145908a7f598 AUX hdparm-9.51-build.patch 1210 SHA256 cb69bd4c70ee1e5c0e854ff4f9c86b512e1dee1b9843eb64b74643d477155e39 SHA512 d8efe50cc8ab963be2ace3e52e077e3be8d266b2c5c293febe344fc53760d53c1b52f7bbd1c7813f7a7979a6e4ebc52cb808dc3797f6e1ac7949ac5f9696239a WHIRLPOOL 77f0351420208af26c3e48ae022396cf9535093914341ab2510e33ac94872863f75e91f7b95062e1a495d50ff2f87c2efad553f52485d7c17f00f62ecff7e11b AUX hdparm-conf.d.3 872 SHA256 37c95ff723fa578e9039613d09dbf790d99113a318c065422986c744519214e9 SHA512 968c6b9d26a71bf724728c259d35a499a644496875eac255dcac3cb4a7e5cadb677a4f6e5e0f8bbd7e1826b6fb77cb39af15b11d1e59b3e9daf9ba442b9e6f02 WHIRLPOOL 110d330860c4f5e3b1626b85ab369a02e5c092acf656edc845a2f311b5349644317ec2021063a0fb977d3b9851e0bb9c54fd66e814a080d6af3aa0f05fbd658b AUX hdparm-init-8 1360 SHA256 05b264cadc84984f773cd555af322b41fdb13da7cb2ca60d8a7d590ddf4d5e5f SHA512 0417168cf540d2385c5edc4e199c9c2318f97c397d4bbb8b0ac6d4dcadf153564a51a9a5da172442c75a670f79fdec84da5db777a1400cf3c8d8cf6a7066fcc8 WHIRLPOOL 5b0a1ac41153ba724540cdc8285dda32916ce1251ef94cca3b2bfd10ceff2d317f838827efb5f8646993617436f030768b00cf24ccd8dfa786f592128d90f69c diff --git a/sys-apps/hdparm/files/hdparm-9.50-build.patch b/sys-apps/hdparm/files/hdparm-9.50-build.patch deleted file mode 100644 index ff1948acb01e..000000000000 --- a/sys-apps/hdparm/files/hdparm-9.50-build.patch +++ /dev/null @@ -1,32 +0,0 @@ -* drop hardcoded -O2 flag from CFLAGS -* drop hardcoded -s (strip) flag from LDFLAGS, and respect user LDFLAGS -* fix hardcoded `make` and hardcoded -j2 flags -* respect CFLAGS when linking - ---- a/Makefile -+++ b/Makefile -@@ -13,9 +13,8 @@ - CC ?= gcc - STRIP ?= strip - --CFLAGS := -O2 -W -Wall -Wbad-function-cast -Wcast-align -Wpointer-arith -Wcast-qual -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -fkeep-inline-functions -Wwrite-strings -Waggregate-return -Wnested-externs -Wtrigraphs $(CFLAGS) -+CFLAGS += -W -Wall -Wbad-function-cast -Wcast-align -Wpointer-arith -Wcast-qual -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -fkeep-inline-functions -Wwrite-strings -Waggregate-return -Wnested-externs -Wtrigraphs - --LDFLAGS = -s - #LDFLAGS = -s -static - INSTALL = install - INSTALL_DATA = $(INSTALL) -m 644 -@@ -24,11 +23,10 @@ INSTALL_PROGRAM = $(INSTALL) - - OBJS = hdparm.o identify.o sgio.o sysfs.o geom.o fallocate.o fibmap.o fwdownload.o dvdspeed.o wdidle3.o - --all: -- make -j2 hdparm -+all: hdparm - - hdparm: hdparm.h sgio.h $(OBJS) -- $(CC) $(LDFLAGS) -o hdparm $(OBJS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o hdparm $(OBJS) - $(STRIP) hdparm - - hdparm.o: hdparm.h sgio.h diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest index 025b661df644..fabe2c55100e 100644 --- a/sys-apps/kexec-tools/Manifest +++ b/sys-apps/kexec-tools/Manifest @@ -5,10 +5,8 @@ AUX kexec-tools-2.0.4-disable-kexec-test.patch 473 SHA256 95d7d6756aa438af926358 AUX kexec-tools-2.0.4-out-of-source.patch 816 SHA256 f86f053efcd210f7919f458a52721ae3704a905488935a66f67a039bd915d6bf SHA512 4839800f99e2bdb7dfbf3aa1f3ad795feb63b4e493812a50d4baa839a27b5e96319c4e848969cbcedf627a32ed5fbfb312461c2ac89b73daaa7f8f680f35f504 WHIRLPOOL ec72be471f55d26f18152d6c92c85974c9e2c89021566d2311e517b880846c94d19057f69d055de74954efdef9301fd356b87ff1647467d425bb755c54f338bb AUX kexec.conf 340 SHA256 19d6a02cf0bf3cebf03dc81c3b9fd5f517815ab1060f67cb9019b7e9653a7fc0 SHA512 66beb57ee13dba70f75f12326643270a0c888e178fdfca8ba7a566a874707aebe2afebb6ceae976dfb0aaf3135048daad6277e70580e4c7911b9ddbf74e4f00a WHIRLPOOL b77bb59ab16ea67690fa3e551995510b0fb0d82f7e2f10f9ed7d7815eb1e498cdda9ea667d2648b62cd1ae86a3ab67ae2ca1abd1fd2b9fce376b64ac41fb8725 AUX kexec.conf-2.0.4 1013 SHA256 4c1b7e4651cd4be342db48389bc560589c896004f0274f8aba35a92fcd790531 SHA512 96db2834454aa4d038061e9b1f918932da3d3054021487425d0f70c6ad32096b9433ae2f3921e83196b23af901c32e591df3d6a84a6d14e064608d8ad895a599 WHIRLPOOL 3041644bf1688ac6c89e6078adcee987913bce124ea3ae4a2ce342c0956f319cccae93aabf39ee4aed9f23812e575f7f06cbf110bf39d9d961a1a19294108f27 -AUX kexec.init-2.0.12 3361 SHA256 f462ad4908cd12f19d8255a1efb96cf98bef74d9965f9f47a914096d7b129fc5 SHA512 b4152adced5f2fb6b31b9a42d898efc83d5b6a612b315bc7960fcd16361ed85a465032ce46e54c49c11b0817b84dfa59f1ee00d43442c17ab23bece65e032060 WHIRLPOOL c5eaf77bc2f559d190c9ff7708d79e620071565005febf64e202df79769f0e46b9d4c1bcb5048408222d6312c0eb6b072b41a2805be912ad738668e0dd433e12 AUX kexec.init-2.0.13-r1 3655 SHA256 c93221d21b73e58efab8d045e164a9be7caf8bed427380a6a75dc996085faf96 SHA512 1d04e14e6fe1debc55fa23029a68f78f2d2a408c12bee6d55252109da178c3dbc998db4ccc7f05f7f8c65b333b50d6a1da7bf0d325ee6cae2f00840078d8a457 WHIRLPOOL 3ea9d42e4bf63845e5310c9108690ee24867628cf89d688c7b0c70b5fc35c97a17ed1c073dc3871826b628986b2a5da7087f625e259625ab88558fd9d163828e AUX kexec.init-2.0.4-r2 3507 SHA256 643a90ea83b3940e44e6631337d8a56cb21c7b70408603a44611a52a0cce86c1 SHA512 a1b1d907a349b66b97bdbd04fcb0baf03add50816538591a6273e2c3e991b36dd9e15cbe694d915e369ad425c313673b2f9dfd756000fae22102c73ed07deff2 WHIRLPOOL e2b06e98a3c309055e05a88b5291a831c4d8f59e621ec6b52a7a62892f5e7fba75278af16fe9e0534fc274b96cbe04b7b5eb1cd56a938bcd4d79e4493571be0f -AUX kexec.init-2.0.4-r3 3515 SHA256 3e179b6fd9515f8ce97a1ba15a3bb705bbb401e583a674932c664ac7955099a6 SHA512 b9de8b745bc343a6da559064ba1410fffd62e1c8a158012b7dc4c801dc5e5ab6be2aca81be0db7f235c5d1aace308f2d6ff3a3cbf09b7246dd9e1fe4f18655c1 WHIRLPOOL e7786abe4845f7e675b6963a709627b6870e2615bde5fd56b8895c327a31ac74bc1bd81e1e6213e262e46340b0af71ecce25a65371fae15f3d205d8d0316ddce AUX kexec.service 407 SHA256 d95610609301d46e0f67efd78653beabd7dd253d2bf00f5736de5cdfbf2ea94e SHA512 9f0fa6d39c67048fe774fee0f2e8ed10e9e12a2468e7dda193cd8c5bd8b4cf49819d14703efad35c91265cd4e03c6f5460934b5fe92efd06eab8dc619920b1e3 WHIRLPOOL 9a412481d729e7ec7cec3a4142f2159337d61baf22431e4129f1e7798bf2683f1802e51edc92800e6b42b8b9b01cd83ef51f67cbc1cb7a4b209f923f3180948f DIST kexec-tools-2.0.14.tar.xz 283640 SHA256 ffb2e7e99d9d08754c6bc1922aed3c000094f318665d82a72ecc76c4ff1c0dc6 SHA512 8c1f9d1f4bb69a621961d45091f9c8349535ae69b80168423663685b44d89e1b9324d5cd11c83e86d805a3371f4f1600b0def551c52efb3c6cf020e9c11c273f WHIRLPOOL 1f9cc414724bf2d710876b2fbf721543cbd973b272a66b86bf134774b946ec540579b698fa3bcb56a2041d226da2c4298f750180c671ece17633067370a9df8e DIST kexec-tools-2.0.15.tar.xz 286944 SHA256 899b7b861431eb51886d0c12866e91b036228244d35a5fb04762dd1a3c0194e7 SHA512 0bddf31b9bb0e203b813d820e1e248974c2d62cb388dfaf4f2f4971f764cc71e54edbaeaeb663c15d6fa06574beceb87d9ffd7d822ac6699d86c54645096e7e9 WHIRLPOOL 8d40f03cc9cbaf90a9ab9bcb009dfd3c5b1130eec6ac515c3d3a2f7d7205d856fb43ff748a4ef51a1d3169f7ba068d998baafc155c7400a8e96245e326d62558 diff --git a/sys-apps/kexec-tools/files/kexec.init-2.0.12 b/sys-apps/kexec-tools/files/kexec.init-2.0.12 deleted file mode 100644 index a7bd859f0826..000000000000 --- a/sys-apps/kexec-tools/files/kexec.init-2.0.12 +++ /dev/null @@ -1,174 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# Set up some defaults. -: "${LOAD_DURING_SHUTDOWN:=yes}" -: "${BOOTPART:=/boot}" -: "${DONT_MOUNT_BOOT:=no}" - -depend() { - need localmount -} - -auto_prefix_bootpath() { - # Only auto-add prefix to relative paths. - case $1 in - */*) echo "$1";; - *) echo "${BOOTPART}/$1" ;; - esac -} - -image_path() { - # Do no sanity checking if the user has set a value. - if [ -n "${KNAME}" ]; then - auto_prefix_bootpath "${KNAME}" - return - fi - - local x kver="$(uname -r)" karch="$(uname -m)" - for x in \ - "bzImage" \ - "vmlinuz" \ - "bzImage-${kver}" \ - "vmlinuz-${kver}" \ - "kernel-genkernel-${karch}-${kver}" \ - "kernel-${kver}" \ - "kernel-${karch}"; do - if [ -e "${BOOTPART}/${x}" ]; then - echo "${BOOTPART}/${x}" - return - fi - done - - return 1 -} - -initrd_path() { - # Do no sanity checking if the user has set a value. - if [ -n "${INITRD}" ]; then - auto_prefix_bootpath "${INITRD}" - return 0 - fi - - local x kver="$(uname -r)" karch="$(uname -m)" - for x in \ - "initrd" \ - "initrd.img-${kver}" \ - "initrd-${kver}.img" \ - "initrd-${kver}" \ - "initramfs-${kver}.img" \ - "initramfs-genkernel-${karch}-${kver}"; do - if [ -e "${BOOTPART}/${x}" ]; then - echo "${BOOTPART}/${x}" - return 0 - fi - done - - return 1 -} - -mount_boot() { - [ "${DONT_MOUNT_BOOT}" != "no" ] && return 1 - mountinfo -q "${BOOTPART}" && return 1 - - ebegin "Mounting ${BOOTPART}" - mount "${BOOTPART}" - eend $? -} - -load_image() { - if [ "${KNAME}" = "-" ]; then - ebegin "Disabling kexec" - kexec -u - eend $? - return # eend preserved $? for us. - fi - - local img initrd="$(initrd_path)" mounted=false kparamopt initrdopt - - if ! img="$(image_path)"; then - if mount_boot; then - if img="$(image_path)"; then - mounted=true - initrd="$(initrd_path)" - else - eerror "No kernel image found in ${BOOTPART}!" - umount "${BOOTPART}" - return 1 - fi - else - eerror "No kernel image found in ${BOOTPART}!" - return 1 - fi - fi - - if [ -z "${ROOTPART}" ]; then - ROOTPART="$(readlink -f "$(sed -n '/^\/[^ ]* \/ / s,^\([^ ]*\).*,\1,p' /proc/mounts)")" - fi - - if [ -z "${KPARAM}" ]; then - kparamopt="--reuse-cmdline" - fi - - if [ -n "${initrd}" ]; then - initrdopt="--initrd=${initrd}" - fi - - local msg - [ -n "${initrd}" ] && \ - msg=" (with ${initrd})" - ebegin "Using kernel image ${img}${msg} for kexec" - - kexec ${KEXEC_OPT_ARGS} ${kparamopt} \ - -l "${img}" --append="root=${ROOTPART} ${KPARAM}" ${initrdopt} - local ret=$? - - ${mounted} && umount "${BOOTPART}" - eend ${ret} - return ${ret} -} - -start() { - if [ "${LOAD_DURING_SHUTDOWN}" = "yes" ]; then - local mounted - if mount_boot; then - mounted=true - fi - if ! image_path >/dev/null; then - ewarn "Cannot find kernel image!" - ewarn "Please make sure a valid kernel image is present before reboot." - return 0 - fi - if [ -n "${mounted}" ]; then - ebegin "Unmounting ${BOOTPART}" - umount "${BOOTPART}" - eend $? - fi - # $? is already set to the previous calls. - return - else - load_image - fi -} - -stop() { - if ! yesno ${RC_REBOOT}; then - ebegin "Not rebooting; disabling kexec" - kexec -u - eend $? - return - fi - - if [ -f /nokexec ]; then - ebegin "Rebooting; disabling kexec due to /nokexec" - rm -f /nokexec - kexec -u - eend $? - return - fi - - if [ "${LOAD_DURING_SHUTDOWN}" = "yes" ]; then - load_image - fi -} diff --git a/sys-apps/kexec-tools/files/kexec.init-2.0.4-r3 b/sys-apps/kexec-tools/files/kexec.init-2.0.4-r3 deleted file mode 100644 index 6eb2a748c9e9..000000000000 --- a/sys-apps/kexec-tools/files/kexec.init-2.0.4-r3 +++ /dev/null @@ -1,164 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need localmount -} - -image_path() { - local x= kver=$(uname -r) karch=$(uname -m) - BOOTPART="${BOOTPART:-/boot}" - KNAME="${KNAME:-bzImage}" - if [ -e "${KNAME}" ]; then - echo "${KNAME}" - return 0 - fi - for x in "${KNAME#${BOOTPART}}" vmlinuz \ - bzImage-${kver} vmlinuz-${kver} \ - kernel-genkernel-${karch}-${kver} \ - kernel-${kver} kernel-${karch}; do - if [ -e "${BOOTPART}/${x}" ]; then - echo "${BOOTPART}/${x}" - return 0 - fi - done - - return 1 -} - -initrd_path() { - local x= kver=$(uname -r) karch=$(uname -m) - BOOTPART="${BOOTPART:-/boot}" - INITRD="${INITRD:-initrd}" - if [ -e "${INITRD}" ]; then - echo "${INITRD}" - return 0 - fi - for x in "${INITRD#${BOOTPART}}" \ - initrd.img-${kver} initrd-${kver}.img \ - initrd-${kver} initramfs-${kver}.img \ - initramfs-genkernel-${karch}-${kver} ; do - if [ -e "${BOOTPART}/${x}" ]; then - echo "${BOOTPART}/${x}" - return 0 - fi - done - - return 1 -} - -mount_boot(){ - local ret - - [ "${DONT_MOUNT_BOOT:-no}" = "no" ] || return 1 - grep -q " ${BOOTPART:-/boot} " /proc/mounts && return 1 - - BOOTPART="${BOOTPART:-/boot}" - ebegin "Mounting ${BOOTPART}" - mount "${BOOTPART}"; ret=$? - eend ${ret} - return ${ret} -} - -load_image() { - local ret - if [ "${KNAME}" = "-" ]; then - ebegin "Disabling kexec" - kexec -u; ret=$? - eend ${ret} - return ${ret} - fi - - BOOTPART="${BOOTPART:-/boot}" - local img= initrd="$(initrd_path)" mounted=false initrdopt= - - if ! img="$(image_path)"; then - if mount_boot; then - if img="$(image_path)"; then - mounted=true - initrd="$(initrd_path)" - else - eerror "No kernel image found in ${BOOTPART}!" - umount "${BOOTPART}" - return 1 - fi - else - eerror "No kernel image found in ${BOOTPART}!" - return 1 - fi - fi - - if [ -n "${INITRD}" ] && \ - ! [ "${BOOTPART}/${INITRD#${BOOTPART}}" = "${initrd}" ]; then - eerror "Requested initrd: ${INITRD#${BOOTPART}}" - eerror "could not be found" - return 1 - fi - - [ -n "${ROOTPART}" ] || \ - ROOTPART="$(readlink -f "$(sed -n '/^\/[^ ]* \/ / s,^\([^ ]*\).*,\1,p' /proc/mounts)")" - - [ -n "${KPARAM}" ] || KEXEC_OPT_ARGS="${KEXEC_OPT_ARGS} --reuse-cmdline" - - [ -n "${initrd}" ] && [ -e "${initrd}" ] && initrdopt="--initrd=${initrd}" - - local msg= - [ -n "${initrd}" ] && \ - msg="with ${initrd}" - einfo "Using kernel image ${img} ${msg} for kexec" - - ebegin "Setting kexec with ${KEXEC_OPT_ARGS} -l ${img} root=${ROOTPART} ${KPARAM} ${initrdopt}" - kexec ${KEXEC_OPT_ARGS} -l "${img}" --append="root=${ROOTPART} ${KPARAM}" ${initrdopt} - local res=$? - - ${mounted} && umount "${BOOTPART}" - eend ${res} - return ${res} -} - -start() { - if [ "${LOAD_DURING_SHUTDOWN:-yes}" = "yes" ]; then - local ret=0 - BOOTPART="${BOOTPART:-/boot}" - if mount_boot; then - mounted=true - fi - if ! image_path > /dev/null; then - ewarn "Cannot find kernel image!" - ewarn "Please make sure a valid kernel image is present before reboot." - return 0 - fi - if [ -n "${mounted}" ]; then - ebegin "Unmounting ${BOOTPART}" - umount "${BOOTPART}"; ret=$? - eend ${ret} - fi - return ${ret} - else - ebegin "Configuring kexec" - load_image - eend $? - fi -} - -stop() { - if ! yesno $RC_REBOOT; then - einfo "Not rebooting, so disabling" - kexec -u - return 0 - fi - - if [ -f /nokexec ]; then - einfo "Not using kexec during reboot" - rm -f /nokexec - kexec -u - return 0 - fi - - [ "${LOAD_DURING_SHUTDOWN:-yes}" != "yes" ] && return 0 - - ebegin "Configuring kexec" - load_image - eend $? -} diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest index 3c252406829b..d4673e9c5597 100644 --- a/sys-apps/less/Manifest +++ b/sys-apps/less/Manifest @@ -1,5 +1,4 @@ AUX README.Gentoo 823 SHA256 3985fd1810f660ea1c1f2732f719b069b6934d62d8d9e8a09287e63f049ba27d SHA512 fe18f4f5bac70f31ca833cb25d4f1aecde03c3993495ab964cc67f0e52737e3d04aa2263eff26ded279121cc346ef77738743943b5b092c9586c5622ee3a6c92 WHIRLPOOL 7b4de4d109da49392cf9ded961fc9aa0a7cda1ff82dc837b0303f02d00f76f73563397c14440ab0c8638a5a2a92e3b6c62f20a904ae7cd1dd0f5eb8efa68ec39 -AUX code2color-0.2.patch 919 SHA256 1792992964eb024150025b6e357649e07dab6209254512cc9be1a7d5bcc31b77 SHA512 6569c652dc5bcff9eb0eb3d85699b319f1439bb69268157d2d63a96ebe5a48577ed2f5e6af4510a8c742b38848e5f76a79397fd3b05e7acaf487955d60f6b5ce WHIRLPOOL d661d0226a753e4aaf1d60dc1fc756e05a78490d5781df54db1c2da73fee0a44edf4e70f28aeb9ca6e888a2d5c8cb94f3ed9e864c034d9e9b7219e2f6e191600 AUX less.envd 47 SHA256 961d6e87eeb2b41d163def66718ee78d4b7c778dbe91b24c6764635b0ae1cdd7 SHA512 261b25887b08b3255e412b36130d014fc37ffc7de75dce3b5ba2521d94a1b0be4c584808b9698c30a8dafea70c62fae2cd0642d0983f96cdb418c3c501433674 WHIRLPOOL dbb1fbec8c6370a5feec2eecdb3e109e035f2f40c2a1d00672d7660d2058aaf0a104487e1ae8c06ecfb32161d4aa2aceed6194e60cacde3590974bbcb00511ba AUX lesspipe.sh 7797 SHA256 576331d742e19a8cec0adeba185bacb7b4b67f7fb93be9c52fa4701d3c5a0a94 SHA512 d7bbae07e8ddcae2981549f958daffc3750f3a343da37cd5e43df86b4dcab35c3121d7fa7b76d61dd457c972a888bcce1c85d01fa1e685aadf169d5541bb0d8b WHIRLPOOL 63a57b5dacf480680377ff67a285a893b3a3eeb7071159c2139c75af02aeb2a4c419ecf515d4ab16a2c0ac18612039c4dfb2225ac3540663eec7367e302ae6a0 DIST less-487.tar.gz 318488 SHA256 f3dc8455cb0b2b66e0c6b816c00197a71bf6d1787078adeee0bcf2aea4b12706 SHA512 d31274fdada570fbc6706d7c52637d1accbd18ce947ec062e10b1624c251a8533c6638bc3a1d89d3c70a0c7b9c6d45740598bec9003f281d64c587b1f829125a WHIRLPOOL e1a6c5dc2ea17e57226083f022d3c39b8a9d17428b7aa15385138680e78fa1ee22800e216a40fe5aa0ca38ca4c0025792a2839031faabdf8f9384dec3c750f74 diff --git a/sys-apps/less/files/code2color-0.2.patch b/sys-apps/less/files/code2color-0.2.patch deleted file mode 100644 index f8a782504e60..000000000000 --- a/sys-apps/less/files/code2color-0.2.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- code2color -+++ code2color -@@ -163,11 +163,11 @@ - # building up the database - # newer entries overwrite old ones - my @CONFIG_FILES; -- push @CONFIG_FILES, "/etc/code2html.config"; -+ push @CONFIG_FILES, "/etc/code2color"; - push @CONFIG_FILES, -- $ENV{'HOME'}."/.code2html.config" if $ENV{'HOME'}; -+ $ENV{'HOME'}."/.code2color" if $ENV{'HOME'}; - push @CONFIG_FILES, -- split(/:/,$ENV{'CODE2HTML_CONFIG'}) if $ENV{'CODE2HTML_CONFIG'}; -+ split(/:/,$ENV{'CODE2COLOR_CONFIG'}) if $ENV{'CODE2COLOR_CONFIG'}; - push @CONFIG_FILES, - split(/:/,$params{'langfile'}) if $params{'langfile'}; - -@@ -3192,7 +3192,7 @@ - # - - $LANGUAGE{'shellscript'} = { -- 'filename' => '\\.(sh|shell)$', -+ 'filename' => '\\.(ebuild|eclass|sh|shell)$', - 'regex' => '^\\s*#\\s*![^\\s]*(sh|bash|ash|zsh|ksh)', - 'patterns' => [ { - 'name' => 'comment', diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 91f0ec3e746c..b69ab41ab8f2 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -1,10 +1,10 @@ AUX README.RESCUE 137 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0 WHIRLPOOL 713fcc790442999d56e13efaf536fec9954dadeda680b3642d0358311332096ddedf8b55697bd1ca620d84f0dc7d025ff7931e086c74c1f5032be72dca2ff8f5 -DIST portage-2.3.10.tar.bz2 939871 SHA256 f7cf1f74e62b7288fd4392c254940a3b70608f45c33ccfa9dbf60457d53cc28a SHA512 2db5d1f77f8f6dc7a88a22a7d213c6af441fdcced2ab3c8e60f6cd1b9f97aa25261f7a4de750303d3b1ea77d9e8c01b77b37f5d285b0704e884a57d800dbfd60 WHIRLPOOL 96178cc869e0b580ea813ab5fa38eb3226d094e6bdceb559cc88fcba9b1e71f0e2baebcd50ccebfc716ae037090534324ac6554318c5fd40b8aecb49041d7545 DIST portage-2.3.11.tar.bz2 940732 SHA256 f2596fc8e5eaaaab19be88c5c0a92d9f304eddb14ebe1230ab6f8d841ae90720 SHA512 16047fae060eb400e0fd01ca4966d69c0413e90659b33e4511b34464a24e9beb510c4c785af713921240e893c3031d3c3c3f2332eb175a21bb34b414962058fd WHIRLPOOL b0d357e626710c3574dde9228c68d604eb70843d083917d761a0c55680702da96d2157566e04d7f7c6c900d8120909d1faa00e6ff2a8fe970d53da05288ae0ad +DIST portage-2.3.12.tar.bz2 944929 SHA256 4a6b6c1d038131d141b932b1ad93768a7823acd0704093c6c1e5adb9f913ba1d SHA512 39f6d938e167a96b338dc85191bfc25d6db2328014f13386dd2552b9a3c36308b9b4d444dcd3342e7f6761e26d97fc0b3e2c8a9092ef7aa863d55c26bdccfd3a WHIRLPOOL 34cc7567dfe4913129a451a8e8597c48382c6c423ec1a008db1fc489f5da99d5cf371ffa48b8449d799aa98e3f0dba98f7c8b55a4b8744fdb857f914448b6f5c DIST portage-2.3.6.tar.bz2 943085 SHA256 2f57545fcb142a4b23c2052c523d3d858754b232be21455ee6c6cd3ff0903cc2 SHA512 5bcfb678c1ea0cd97a983ee7520c9ecabd07d5bb0fd01c70b74fd7b6ce478f4a109aac84d40b82426719ca7c9ee6aed3affb3b9754045e62b4c664ae113cf055 WHIRLPOOL d0258c579597690e8bf2cc2a3ecc36d543e67a728c302a9b16ae361086023a7e059ac1a9e2e64f026b7d975d6b619d3b981062227042098ed3afc1b86658b636 DIST portage-2.3.8.tar.bz2 938062 SHA256 19b73658dca848d215c5527d1d020c8106352007a84d7675e5efd0a7b9b48a8a SHA512 4b4b2de20323799b9b0f7a8812f939aa9a96d2744a0f65ad5287ba49744c491b55169cdb21f2885317a6a7c960d2070775ffd798f247b44eebc677c33c271eb8 WHIRLPOOL 0c576bbd8aaf8b27fa1746c863ac02b2a5f361d9011d17250ffbe4b830a8a6bf10a0aee48b5181a8aa6c55d8ad81ad411195da2a6253e9b324d3c7397053fe29 -EBUILD portage-2.3.10.ebuild 8216 SHA256 4396a5edc8391d04c412e20694e71311dc34a288ab1dd67b1455aa29524f8fde SHA512 8f5e923a644abc5cb704ba3cc0ab54c8dc254cb77e3f9fab207d40b6aa80dcffb2e6aedeaab649108a744ebd1d88c827cde81fa131e3e94360db921fcaf853f9 WHIRLPOOL a39d650d8fdba9181c1e1220bf9868467e31360e474ceca40f0548eebb1bd3eba088203fb86f62c5a674ca8f532e9180d916ed707cf0833623f74770d81faaa7 EBUILD portage-2.3.11.ebuild 8216 SHA256 4396a5edc8391d04c412e20694e71311dc34a288ab1dd67b1455aa29524f8fde SHA512 8f5e923a644abc5cb704ba3cc0ab54c8dc254cb77e3f9fab207d40b6aa80dcffb2e6aedeaab649108a744ebd1d88c827cde81fa131e3e94360db921fcaf853f9 WHIRLPOOL a39d650d8fdba9181c1e1220bf9868467e31360e474ceca40f0548eebb1bd3eba088203fb86f62c5a674ca8f532e9180d916ed707cf0833623f74770d81faaa7 +EBUILD portage-2.3.12.ebuild 8216 SHA256 4396a5edc8391d04c412e20694e71311dc34a288ab1dd67b1455aa29524f8fde SHA512 8f5e923a644abc5cb704ba3cc0ab54c8dc254cb77e3f9fab207d40b6aa80dcffb2e6aedeaab649108a744ebd1d88c827cde81fa131e3e94360db921fcaf853f9 WHIRLPOOL a39d650d8fdba9181c1e1220bf9868467e31360e474ceca40f0548eebb1bd3eba088203fb86f62c5a674ca8f532e9180d916ed707cf0833623f74770d81faaa7 EBUILD portage-2.3.6.ebuild 8661 SHA256 9590a689915eea31ffc5dd347154719d70cfb4b000a60e0f6e6294fe0c3e1df7 SHA512 53301757289cc37690020ac7b5379d026ff1e87f9d558c913eae213d0f33b75261045616c9259fe28684aa1031c27d4f58a52438e67eb91a97d186a80ad298a4 WHIRLPOOL c70770b2e9ac8b9af931d9f9918af82ac20eda198a33d9cc19c5d457701fe09c3cd5d45fb756457b05209cc0594c2b0b4efe3d544e1966d759c6a27fcf5b0743 EBUILD portage-2.3.8.ebuild 8207 SHA256 dd61d45fccf60247d105993e2c73fb16a3ab59322add5701b636361b035ce6ec SHA512 24985286ffe9d4adc99aa65b26b4a15784b7edc84187a3a85b22751854f4845ea00573493a949f5aa6c3f270e4b52138a246006b71c9e6cc04ea402b820aee48 WHIRLPOOL e4ae75b7b4ee0ecf71328dcaebcfc4bb440e3c700156c2a17db3455b54066241285e8c625a5e2a2167c0d8ef31ec855d09219ab7cae1f5285057e95a1bb77165 EBUILD portage-9999.ebuild 7697 SHA256 c7d91c34e7fb25283f6ac634a00686273fd3f286ecfb9fc1ab3bc685ae8fd9c4 SHA512 6b8342034752512df0345d386f67c025b0ba15439ae5758783b16973d16b3b3b4d866abfb65bac2e26424e270294bebe26e43f12539ef141891b567dc0f000ce WHIRLPOOL 0b2b3f122d57a5c9d3dd63ea09c7a7bd05e1eaf298cd5018d400543cd825469e108fdd981c06518d24a37f7a339195fb01b04480143c0d9f93cce18093119c42 diff --git a/sys-apps/portage/portage-2.3.10.ebuild b/sys-apps/portage/portage-2.3.12.ebuild index af287ccb8752..af287ccb8752 100644 --- a/sys-apps/portage/portage-2.3.10.ebuild +++ b/sys-apps/portage/portage-2.3.12.ebuild diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest index a0580e93b527..a2a389418096 100644 --- a/sys-apps/util-linux/Manifest +++ b/sys-apps/util-linux/Manifest @@ -1,6 +1,5 @@ AUX runuser-l.pamd 188 SHA256 3d825e3e6fe56f0e90fab528867cb476e24857c6cb0fc0a85a28ddaea0aa549b SHA512 86538adbd3d01c4b9e46fee00c38d298d2857fb1224461206425532404c212f03331308b74347c9af2e00583a3b50802085bdc6cb2bd393cf5e9d032e7290301 WHIRLPOOL e7ba3299d6ccecfdf81ada063786822b2590c42c3ea42043659ce933a6734192d8b45452c6f2679f9e06faa2b39deec6ae4713f638c46d5886aebb9fc69df080 AUX runuser.pamd 278 SHA256 1b6b168edd9b4ec4d787bd0ef627881c035f7d8080a126a367105d0935e3e123 SHA512 a4c4d41078acdc7c7f1d1f1894d20d052d3d5a3c66d5680d7f76665e251c614fd76ca9678a27ea376147f49250c716a1b3b0c0afa9595bd74d26d2190d1680fd WHIRLPOOL 4c2ca705a0faf01eb627e8fe30fa104923be938fb2a56d463edf94a2ebf7d7fbd3a0558ab247515d360bac1b9b6b3967509c0ffeccf5f168aa7964bcae0ab1b2 -AUX util-linux-2.30-pylibmount_segfault.patch 823 SHA256 92aaa379c86dd721d77316f02e6411f40670c036415d29e9a4f4ad1a4f302509 SHA512 999474f53e8986af1c57ae73e21dd2264e70dedb9c91c2d83b584fdc68c6850489082df68353d666cc415dbb301e7238b6ad87ed3e3e7e738994d874ee44c809 WHIRLPOOL 88b41138873dbe2b2817d47991eda4deb57d99750d16d775ded1b55569feebb71f377a9371613ec6f45a23ec1ac479a1bec3901aa31ec730ebb38849a6f7348d DIST util-linux-2.28.2.tar.xz 4149700 SHA256 b89d37146f20bede93a42c847bce881a17e6dbd8066ff2db2bee733fa409f0cd SHA512 ac1c2d4c92bbc4eabed464cb0334c1d9b21e58df0f07f0b26e7adcfa188879de8632d195b65a4358c5e11e14ac6e09a1c6206265bbf1fab4ce122414bee7e940 WHIRLPOOL 1735e33620dba30cc1f42e60b707adb72234006b7fea242ac98c389295617bd0225563bcffa76b9d0753dfa100775dd9a2b73614843645ce667db5536842e308 DIST util-linux-2.29.2.tar.xz 4277668 SHA256 accea4d678209f97f634f40a93b7e9fcad5915d1f4749f6c47bee6bf110fe8e3 SHA512 0a87e6758531f74276f3de7607ef545f324b9b36b444aa5d163140c5fb0f4f7602655d7ec9939f92550dcb320d922cd69521a2183199d463795e67d3c27fce79 WHIRLPOOL 1f45711e593c76c6e208a28892ed2bf2622adb5fa1334867e13c6bf775a8903c2f1ebf18c3238d96fe139c5b60d61abf496251cf594a339209ce044f2bb8c17a DIST util-linux-2.30.1.tar.xz 4459284 SHA256 1be4363a91ac428c9e43fc04dc6d2c66a19ec1e36f1105bd4b481540be13b841 SHA512 bcf1807198660c133c380e13d6ba5dcdb7470c47bcaeea03ccc5a78a0d834e3df3d13ae5ffc35fd7f8fff7ba062629d4b1f5cde78452b846c9315c51c9e108f5 WHIRLPOOL 19e78768cf2fd2d73bb7b45cb826101b4653bf49c9838bda10f05e508f06b117bb846ce517726465384bfe94ba24981f261d7b5091458242fb0c14d593d4b29e diff --git a/sys-apps/util-linux/files/util-linux-2.30-pylibmount_segfault.patch b/sys-apps/util-linux/files/util-linux-2.30-pylibmount_segfault.patch deleted file mode 100644 index 73fbc9949232..000000000000 --- a/sys-apps/util-linux/files/util-linux-2.30-pylibmount_segfault.patch +++ /dev/null @@ -1,25 +0,0 @@ -https://bugs.gentoo.org/621176 - -From 29b721bc9d20ed44858017689ce1745c220bd0d4 Mon Sep 17 00:00:00 2001 -From: Zac Medico <zmedico@gentoo.org> -Date: Wed, 7 Jun 2017 17:21:33 -0700 -Subject: [PATCH] pylibmount: NULL terminate kwlist in Context_init - -Fixes a segfault observed with python3.6. ---- - libmount/python/context.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libmount/python/context.c b/libmount/python/context.c -index 6d82e1432..982414d01 100644 ---- a/libmount/python/context.c -+++ b/libmount/python/context.c -@@ -90,7 +90,7 @@ static int Context_init(ContextObjext *self, PyObject *args, PyObject *kwds) - "source", "target", "fstype", - "options", "mflags", "fstype_pattern", - "options_pattern", "fs", "fstab", -- "optsmode" -+ "optsmode", NULL - }; - - if (!PyArg_ParseTupleAndKeywords( |