diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-01-29 18:03:51 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-01-29 18:03:51 +0000 |
| commit | d7ed2b01311f15ba54fe8ea872aab7d59ab2b193 (patch) | |
| tree | 1814dd2b5bbf2e7639fdafbeef48d228cfaf5e9b /net-fs/cifs-utils | |
| parent | abaa75b10f899ada8dd05b23cc03205064394bc6 (diff) | |
gentoo resync : 29.01.2021
Diffstat (limited to 'net-fs/cifs-utils')
| -rw-r--r-- | net-fs/cifs-utils/Manifest | 3 | ||||
| -rw-r--r-- | net-fs/cifs-utils/cifs-utils-6.12.ebuild | 8 | ||||
| -rw-r--r-- | net-fs/cifs-utils/files/cifs-utils-6.12-ln_in_destdir.patch | 22 |
3 files changed, 31 insertions, 2 deletions
diff --git a/net-fs/cifs-utils/Manifest b/net-fs/cifs-utils/Manifest index 0d3ac8392dd0..5ba966920c80 100644 --- a/net-fs/cifs-utils/Manifest +++ b/net-fs/cifs-utils/Manifest @@ -1,7 +1,8 @@ AUX cifs-utils-6.10-ln_in_destdir.patch 813 BLAKE2B 71ac0215407a2350c19a15545d96f77115357c04bbcae2d1e09b7fbe54fd344d40638d3778195865eff3f9686b1fa9a0a13e188fdd4cc3d25c7a100fc5c376a1 SHA512 f9ccbd0d4d14cde1d07cc165533c51cc2876ed65e651a797a8b7c69958f6ee827090731888cbc425aecbb879b41e87a0e9ed1fce6817e1907cc7b114c53b8fc9 +AUX cifs-utils-6.12-ln_in_destdir.patch 629 BLAKE2B aa901b00c41a58ae21d948b3eece79914dc78782fcd49afc27ba8d7fa061f8aec43d187ce1302d67b5e5fc2cce113906545b9ae9920704f29ad3758a71079994 SHA512 354e33c91b0678e08ba9dabd989a5afdb2e558fa71dc427b283f9b987f94908d9b696c95a7e608e13f26497a52e7e8bf973290a84b2024ac9bc817ba512adf26 AUX cifs-utils-6.7-heimdal.patch 904 BLAKE2B de816117010e71ced5ad094e8ed3537b672b37a0e8ac0b999aa7aaf180ac051f6745ee68373948b266ad359e1ba3b58552eda6314b5a4339673bd04656ab6090 SHA512 e3364e05fba6aff57ea2f09b530692f4f5ec95213e91794388fff9382d210db9bacb28dae1440d3b35a570c0b3bc21084a067e0ce8333febd5246c52aa9260ae DIST cifs-utils-6.11.tar.bz2 408903 BLAKE2B 5ee7cd87b54a266750bf938396ee90b3f20c2a3446aca295ccb58cb667fbfb68be9aa0e2bbc20aa5e18ffd7f1fcd5fbb0aef3bc25fd13bb96abc5a57a0b45b4b SHA512 064c0ac75572fb44908390508462e4fdfe0686751149fd8b656a209dd961a5a24a7d9774c38c0e72fa5f9875b43aea7bf2de038c4e4a63a11664e71d9003100e DIST cifs-utils-6.12.tar.bz2 413393 BLAKE2B 54d9f8cc5c7aac8157baac4bd0f742fea27f7141adc183a99ba276888b6aa8ec87150983cfa677ebd96bcfe8a019038199fef8dfe464c82bbdbaf07c0a7b35dd SHA512 2f2e1cba8d56c9039fc28236fa63812a09f07f14931c3bd7bd5ae3e6aeb372130c5a059569d8714fb973bea87eba394fd30228fbaeabe700961bba400dd01ca6 EBUILD cifs-utils-6.11.ebuild 3212 BLAKE2B a87a72d144e834998197802c23e3ad2c8f94f10fb54adc5654b1cde63d0a13104e3993ff250df710c710e5b0873a55fa823b7baa75f3f0fc04871ee32a56b50c SHA512 a4a06f59ae9f0c37c0084df205345647d1e9803e5973b54922803c5c8016607940669ed5a23ca11ae52fcef01a08d6da9c53bd809c2bc29807a357e4962941b3 -EBUILD cifs-utils-6.12.ebuild 3288 BLAKE2B 9c9f48ab61545db5621b85b258470a984af9a09026032f4fb574dd5a5ed9f6b1a9b730ae718c4d329ae6de5a1e2d336e464fd1a17ab16b99ba39596511c8e10c SHA512 f862cbe67782e187b2a2db57a1554cde4aad2ec288ac5fb49f682f891f50285e958a8598e90f6b77f01345f4a72f517cdf6d407faeda4010a28880e637600305 +EBUILD cifs-utils-6.12.ebuild 3379 BLAKE2B fe2701f7693ef70d7694d442ed21066a6ef1380c15a52d38d8494a30f2b0956ab979b779f9dff531a1359c3443ec46f625039b898a0b6817ac0624fd31b4c58b SHA512 51794304681992aba4c5c0958d887c3b6880dedff72b6bcc6b5dfc00f2740ef6117ff310ec30d86a8f73010e38509a2ce9b3dab711e40fe0a9579b8024ba6ee5 MISC metadata.xml 886 BLAKE2B 2ddb0ff3b0da3392b23743f3804c1d63651904c05a17e69f105c7b062d33befca62a13a1a93f631b314143a60bca8e2b20ec9b331646f0e6804a2f8cfce3bb81 SHA512 36019a5885034309e16198a154fc0fc16de2ff507eec81f4d63840bf56e9f67cf67dbf4ba7662a6f64daeb17541604d5f588ec67cca134b7ff07e0612817072b diff --git a/net-fs/cifs-utils/cifs-utils-6.12.ebuild b/net-fs/cifs-utils/cifs-utils-6.12.ebuild index f7fa30ad0e46..c93c18699178 100644 --- a/net-fs/cifs-utils/cifs-utils-6.12.ebuild +++ b/net-fs/cifs-utils/cifs-utils-6.12.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{6..9} ) -inherit bash-completion-r1 linux-info multilib pam python-single-r1 +inherit autotools bash-completion-r1 linux-info multilib pam python-single-r1 DESCRIPTION="Tools for Managing Linux CIFS Client Filesystems" HOMEPAGE="https://wiki.samba.org/index.php/LinuxCIFS_utils" @@ -40,6 +40,10 @@ REQUIRED_USE=" DOCS="doc/linux-cifs-client-guide.odt" +PATCHES=( + "${FILESDIR}/${PN}-6.12-ln_in_destdir.patch" #766594 +) + pkg_setup() { linux-info_pkg_setup @@ -64,6 +68,8 @@ src_prepare() { # https://bugs.gentoo.org/612584 eapply "${FILESDIR}/${PN}-6.7-heimdal.patch" fi + + eautoreconf } src_configure() { diff --git a/net-fs/cifs-utils/files/cifs-utils-6.12-ln_in_destdir.patch b/net-fs/cifs-utils/files/cifs-utils-6.12-ln_in_destdir.patch new file mode 100644 index 000000000000..a5f7be668ac3 --- /dev/null +++ b/net-fs/cifs-utils/files/cifs-utils-6.12-ln_in_destdir.patch @@ -0,0 +1,22 @@ +Fixed an inverted race condition when installing with MAKEOPTS="-j1" + +jer found this: + install-root_sbinPROGRAMS is called from install-data-am but + install-exec-hook is called from install-exec-am + +So moving the failing ln call into install-data-hook for now... + +--- cifs-utils-6.12/Makefile.am ++++ cifs-utils-6.12/Makefile.am +@@ -117,10 +117,8 @@ + + SUBDIRS = contrib + +-install-exec-hook: install-sbinPROGRAMS ++install-data-hook: install-sbinPROGRAMS + (cd $(DESTDIR)$(ROOTSBINDIR) && ln -sf mount.cifs mount.smb3) +- +-install-data-hook: + if CONFIG_MAN + ( cd $(DESTDIR)$(man8dir) && ln -sf mount.cifs.8 mount.smb3.8) + endif |