diff options
Diffstat (limited to 'sys-fs')
-rw-r--r-- | sys-fs/Manifest.gz | bin | 22080 -> 22079 bytes | |||
-rw-r--r-- | sys-fs/e2fsprogs/Manifest | 2 | ||||
-rw-r--r-- | sys-fs/e2fsprogs/e2fsprogs-1.44.5.ebuild | 2 | ||||
-rw-r--r-- | sys-fs/fuse-common/Manifest | 2 | ||||
-rw-r--r-- | sys-fs/fuse-common/fuse-common-3.2.6.ebuild | 2 | ||||
-rw-r--r-- | sys-fs/fuse/Manifest | 2 | ||||
-rw-r--r-- | sys-fs/fuse/fuse-2.9.8.ebuild | 2 | ||||
-rw-r--r-- | sys-fs/lessfs/Manifest | 3 | ||||
-rw-r--r-- | sys-fs/lessfs/files/lessfs-1.7.0-openssl11.patch | 72 | ||||
-rw-r--r-- | sys-fs/lessfs/lessfs-1.7.0-r1.ebuild | 5 | ||||
-rw-r--r-- | sys-fs/udev/Manifest | 16 | ||||
-rw-r--r-- | sys-fs/udev/udev-236-r1.ebuild | 2 | ||||
-rw-r--r-- | sys-fs/udev/udev-238.ebuild | 2 | ||||
-rw-r--r-- | sys-fs/udev/udev-239.ebuild | 4 | ||||
-rw-r--r-- | sys-fs/udev/udev-240-r2.ebuild | 2 | ||||
-rw-r--r-- | sys-fs/udev/udev-240-r3.ebuild | 2 | ||||
-rw-r--r-- | sys-fs/udev/udev-241_rc1.ebuild | 326 | ||||
-rw-r--r-- | sys-fs/udev/udev-241_rc2.ebuild | 326 | ||||
-rw-r--r-- | sys-fs/udev/udev-9999.ebuild | 14 |
19 files changed, 762 insertions, 24 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz Binary files differindex 49e49c743371..96c798a3697e 100644 --- a/sys-fs/Manifest.gz +++ b/sys-fs/Manifest.gz diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest index 29b4855af2b4..0fa35f6b4a40 100644 --- a/sys-fs/e2fsprogs/Manifest +++ b/sys-fs/e2fsprogs/Manifest @@ -13,5 +13,5 @@ DIST e2fsprogs-1.44.5.tar.xz 5375996 BLAKE2B a6069e7c4889cdd3a30d94994d179c024ed EBUILD e2fsprogs-1.43.6.ebuild 3781 BLAKE2B b68206959b716f2f7018da95f2e7872bdab4dd1ba554d83fc089ad5dead7e2e51b5c7a3d67669083bbe7f8d67c5b45919439a2560d95a4de3dcc217dd4bdbe1a SHA512 71ce74750ec162caac3d07602cc011ac0ed429723f8aca43d4f4918184cb3ea9a4ae770e834ab46ba2dacf351cf5288463b05b36c66f90d127cbe50452c7a727 EBUILD e2fsprogs-1.43.9.ebuild 3804 BLAKE2B a110adfe131292172510d7133d8c4266742c54cc3a3aad3959375d966672d462d2761561b79a2f952c6f4ed2b3004bc7abbc0ef90a6d44e8b89203a0df96cd09 SHA512 143bdfe5f8dd353782e84e3c0b9955127eab10aa7fa07e6c024656282225ec5ba30880d1fab61e249010d5192b2d546278694f0b951138500fb1a6ac3ee70a6d EBUILD e2fsprogs-1.44.4.ebuild 3857 BLAKE2B 3e9e55635efdb8a463a760bb0eac8c602b3d474e936d8b8aee6c56a950d33a14d30bb3f47b1ef1ef9762ff1db019a9495e7d970f72ccde2dda89c9429ad9f3af SHA512 a7f0441b1cd0fbb2f3c0a06b9b4ea831c97eaa36516bf5b205d65e7212d6e1b0312c64b89d2f72076bc580a5cfe9775bb0b237e6b76bc6de5d54de03ecae8fe1 -EBUILD e2fsprogs-1.44.5.ebuild 3922 BLAKE2B 56d48b6701051f2402969776c05bf175c78071ea7e2af326ea78a46ae95684c4186675faad09bcec0d402b64d5c8d1e937cdac81de75efbafbc99ab92d0cc4e8 SHA512 7b8824f200cf3f53dc5754492e25e3bb2eb9bc16bad95a1794612642c38d5629aa72041d9897b43c50cf840d72811accf71df212cee100bfdff92f95e748bf13 +EBUILD e2fsprogs-1.44.5.ebuild 3918 BLAKE2B d94d9e1f0546b8430b4b45e98db9e4987a9e7ef7776de5595b1e504a6cf4771b558078225e916b1c92abe2cf79aa38b639728d51c2a67cccc5cc457d7649e122 SHA512 6508248dd3f3fe3dd65ce752ce56926a8c659c96184a4fecd05a070d9af875b82ff9f2af1fb24f70293ca414cadd823e9a283fc9333cc2e73793ba13ba2a4738 MISC metadata.xml 520 BLAKE2B 3e908938de1132b5cde97c6b51b40f72c03e91301b54c14339379d2e2380414dd33096a87d64ff2fc7d886cd65fb16b9c16a376b7338c826f44917860f380be2 SHA512 a5ff91610ed175147f1a9c2c725a30380908c02fc04c6b7df2792cb4fd805f9137374d2a910e456128a7bf2fec9e83af3063bcb5f2ad51394bed8bed648e3905 diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.44.5.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.44.5.ebuild index 37368200c8bf..79632229b52c 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-1.44.5.ebuild +++ b/sys-fs/e2fsprogs/e2fsprogs-1.44.5.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.xz LICENSE="GPL-2 BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 -x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint" +KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 -x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint" IUSE="fuse nls static-libs elibc_FreeBSD" RDEPEND="~sys-libs/${PN}-libs-${PV} diff --git a/sys-fs/fuse-common/Manifest b/sys-fs/fuse-common/Manifest index abc0a8aaee41..c45981f745da 100644 --- a/sys-fs/fuse-common/Manifest +++ b/sys-fs/fuse-common/Manifest @@ -3,7 +3,7 @@ AUX fuse.init 757 BLAKE2B 802821596154d3dabae5c56367656d46a714c22a284cadf8ca78b2 DIST fuse-3.2.6.tar.xz 1456220 BLAKE2B 9b09504ed04abd0134188c28f3908e69e3416c345a96aefbca0f64447f3c3a8907550874f5fec9cd8f65fbaa892be6cc0213a7f61d7ad51c955ce3acf955ee17 SHA512 3a1ef77ab4c79a24aad0b259e17f568a30a5faf53ac17eb25d05f30dc7423f0081583f5b3c284ca9196a01885843e97c323a84231272b7e2b55c8e73848a61b8 DIST fuse-3.3.0.tar.xz 1010840 BLAKE2B 56422879c7a87351deb731b3e5f950c1d7f584f730e5d595f5b3f1b5dea960cd26c875d8921ae6495c7fd99b3525b76a65b9c866c5f19e653c04f9ae4bd98b13 SHA512 fa6ee83c4ccdea797e37c9413d504ebe3cbc2bfef9526d485519144714f7b7163bbae9be26ec8a471aa76e98958779bd9d702083be272abaa3b6f1694816e913 DIST fuse-3.4.1.tar.xz 1016436 BLAKE2B 50a35039d7302741239736f2e62f4603c147d49947580fb92f7ac6b46aa8dbcd1cbb16ba35719e198dc3b693b11c215ee8123d02a0c96154d6c905541eb35936 SHA512 45e56346b6d4c90055168254cd8508339d5b428ec58f1d9e287439e3d48fce344498826f099de89051e6529e45a45e0990a0e07fc8a9acbae1f76f4d6c72dd0d -EBUILD fuse-common-3.2.6.ebuild 1256 BLAKE2B 905d611a8458ae6a5d736ef3cc6c59bb8d9e16ded898312d97d2156a6b76422e34cd14d8be1e92c6f2c762553c04975d7f162f3ec23f643a9eabc911aaf9c971 SHA512 28ecd4e83e34ea724011f558bc29975ff89a54abff811997d24e13f5d80f861f2aff85c534402079deed1569aac39725167e934434ccb04cf626699720bddeac +EBUILD fuse-common-3.2.6.ebuild 1255 BLAKE2B fc0e83b952ef21e22ae91fdde4e51cb06558b904660af2b6a8ae95904faf7dd46093ce8fd73086c5c9a44ee51ab489519c5a65cea5086909fca5b09d6de07ec2 SHA512 296f5904a0835f6645841809c12d22d7fa8a9921ae6231c211ff5a07e2532c1f87f5728e64721b50452f46d687420a092a5caa08482315a1abe237e8100a17b9 EBUILD fuse-common-3.3.0-r1.ebuild 882 BLAKE2B 1c160f4ee9fe4855263ec009d1a14fc8a27d47de6951515bcaf71493a51231afd03bcc0afbe9c426fc912d056fc7fac88e6ffe6545d84601b0822a13926e42b0 SHA512 886597787d42d27b204e5786c0aa70c46b70bdbcd1cfaaa75fab9be0ff57179948235976f552ac3b443974e62f4df0922970a078d0ae6a5bdfc4cd655f8031ef EBUILD fuse-common-3.4.1.ebuild 882 BLAKE2B c160fa9e872d8a705b52a935324cc80f1147f8b23221fb819ead793a742bd3d01c4b71a57bffd6aa7096714a43e433343efff327a295b264b19e9af8223d8283 SHA512 ceec795c2ac2800132fa875997534e29eece406acb30c50733a5baba33dcc35d31761caf489536c6b19d199b6b3af7760aca0114d2cb7f273ee2619879850180 MISC metadata.xml 326 BLAKE2B e3a863aeff43218beaba67d6ca4692dad0b3854a706213db47880058af990e02655a30a55eb16dc3cbe546382f6e55989d0d8321eb115b8270a016d2c1c62ab8 SHA512 fcb872557acd0b8478fd8afe48c408a6dc08fda8eeba46f6db89470b6b3aa5d1287d4be9c5ec2aee80137901d4a1d943b61b22117849d283eafd3bd587c05eae diff --git a/sys-fs/fuse-common/fuse-common-3.2.6.ebuild b/sys-fs/fuse-common/fuse-common-3.2.6.ebuild index 043612ef49a7..bc727b2982ad 100644 --- a/sys-fs/fuse-common/fuse-common-3.2.6.ebuild +++ b/sys-fs/fuse-common/fuse-common-3.2.6.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/libfuse/libfuse/releases/download/fuse-${PV}/fuse-${ LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86" DEPEND="virtual/pkgconfig" RDEPEND="!<sys-fs/fuse-2.9.7-r1:0" diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest index 02eaa661a9e6..dab86e067cee 100644 --- a/sys-fs/fuse/Manifest +++ b/sys-fs/fuse/Manifest @@ -6,7 +6,7 @@ DIST fuse-2.9.8.tar.gz 4610904 BLAKE2B 803eebea510834676379df8c9514050efcf47d83c DIST fuse-2.9.9.tar.gz 1813177 BLAKE2B 9e9141380bda46eb0bcce325c6fd293fe3844fe884a4952bb38d4b89dc48b728ffcc891038b3a7a861f05acfacce9dd7bb0e11d600609f3ad0ab278ccbe98847 SHA512 3d82fafd04f2924299bb09d2bb144935fa004a43fb9a6568e2e1cc5a60fded2efa1711029a0d7f12b3e6e4501f7217f2ee3545646d89da8dece083cb390f23e2 DIST fuse-3.4.1.tar.xz 1016436 BLAKE2B 50a35039d7302741239736f2e62f4603c147d49947580fb92f7ac6b46aa8dbcd1cbb16ba35719e198dc3b693b11c215ee8123d02a0c96154d6c905541eb35936 SHA512 45e56346b6d4c90055168254cd8508339d5b428ec58f1d9e287439e3d48fce344498826f099de89051e6529e45a45e0990a0e07fc8a9acbae1f76f4d6c72dd0d EBUILD fuse-2.9.7.ebuild 2206 BLAKE2B eb1f3ee67657e03d572bea6895655ab43f39cf41e6eef422baf6643184080a224f72e773afe496784d0e60d12ce63d9e678b3f1c43a867042f93fea2fc350cfa SHA512 5b44ada149cf1cc4028307ee6e11657e7e1de98f9893a5061aada592037ca54b16644354f970d222687b3f07d3673c1352c02e8ddf5fe60d031244a617d13d23 -EBUILD fuse-2.9.8.ebuild 1943 BLAKE2B 71465d376dd2aa6018e52d0405de9ad206acedd8d170732fbebfe57e640357a328f22a09f7a382697cdf1ea2f6d3d15d0f34a1dcd80456d3d8d9fb03fa955776 SHA512 c1eb8a7b9bdd5a2661e310617e01b7d42db4b9a37d5bdea90e2561c1d8f769c11725319a22431948393141413094d34abf50bd77c2d61c84147c1aca3a8e5533 +EBUILD fuse-2.9.8.ebuild 1942 BLAKE2B 160c38daa8321d980347079e0ab8677526c639e0d6f20b8fffaa481b7072146f1aced7f61cfc5ae05b483d7178beed551e6df44d5e319c9274a3c1c5cb530e58 SHA512 35efa56282f0a9a4aca7e284af1da587d6a5545439c50258ecc31c47159fa777c70400f28b4fd9c8392a39d1b43ba8c3c1935e0860d7689dc7ad40f5134e7da8 EBUILD fuse-2.9.9.ebuild 1883 BLAKE2B 7cbd50df85e6eaea2e89b3e36bf819bba20cc1589dc2607bff8e2fe97155a7f1f6ae34b9589c3965e29dffd311682a259cbbd06bd9cce215121837b2c29022c0 SHA512 876c5d8760383847d59db3ceed3dcb074fe48e87ef4192cbb8bd586eac9e5e2becfd7a0a49a76cb213426e961ac2e353d9421865fb5801507e59a584a89da5e0 EBUILD fuse-3.4.1.ebuild 1659 BLAKE2B fb830f40d7c535864111a02277aef8d51da505be9d497e09bf1d7e60c44831d13421261f24e4be82785aa275f78e3b7ba20f21d27fbe9edaed2fc33c5512c2b2 SHA512 d92104cda402f7497d2417012298558fcd532fdac41cdf8897c70a061c093a26aab04ac774f652c25e6d10e00ebd913bd8140502c8517c1a9df7d5b424407609 MISC metadata.xml 391 BLAKE2B 69aa72b5ba983496e0b682bcde7d61b33d982031e1c5ca1f4b0181384daeff3a47482fc23e68ae9097321dfa5a0203abc60de4fae5aa99c7e32542e9b8e59f0a SHA512 181d574140e8459c76d7392cf63eec85e1b40142b31b9ac1a19bf657c8482b581c1ea23fdae6a523bbad4943e3245409dfc14eea38243b78ef541e3cad49a180 diff --git a/sys-fs/fuse/fuse-2.9.8.ebuild b/sys-fs/fuse/fuse-2.9.8.ebuild index 0f9c05247d54..a5951498b33e 100644 --- a/sys-fs/fuse/fuse-2.9.8.ebuild +++ b/sys-fs/fuse/fuse-2.9.8.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux" IUSE="examples kernel_linux kernel_FreeBSD static-libs" PDEPEND="kernel_FreeBSD? ( sys-fs/fuse4bsd )" diff --git a/sys-fs/lessfs/Manifest b/sys-fs/lessfs/Manifest index 757ff1482e3a..8ef6d85f82b2 100644 --- a/sys-fs/lessfs/Manifest +++ b/sys-fs/lessfs/Manifest @@ -1,6 +1,7 @@ +AUX lessfs-1.7.0-openssl11.patch 2725 BLAKE2B 47c6bc1d6a841f2a2c295e593576d18733befedc7176e7e418f0872d5ffbf4cc36cd64394cf818293f31271e7816cb007ccabfa0f72813cbf84544b5c1512298 SHA512 f296654e621b03495ab9a8a1bcebb169cb03da42763a2803f0adabf2d6951db871c00790464aa527e93373cb876a6d62ecf0595d32a6c9e248865b205c828f1b DIST lessfs-1.5.13.tar.gz 506221 BLAKE2B 30d960b97120c7e819af2357358050720d01c226f6855334ec7511d854f82a683112682389353b20d80b5bda82d0ab89464830036da3e1aadc3ea64285ed93b0 SHA512 7143b7e1df8e059184d003be6519cac323fa035a6d9005b4e007504328d58624232ff9a494ecf11d445977f9138e7c41492d7fd30721065e5293927f85585604 DIST lessfs-1.7.0.tar.gz 514667 BLAKE2B 249e240dbeb95ed9412495d00fe7fdc708a931c65d724f2f16019213f62a9c6333ad6be849337399243a99e3d31d692cdec9a8e0347957087a6f7a36daf11586 SHA512 a868b28159fbcd2e7672607d46e3007c7b959bd8c8880b6c98cdab6c61fd104ac222e156f543c2b3e9f9d9fe2f1879c2988ee80605946f03b646481e7c6f15d1 EBUILD lessfs-1.5.13.ebuild 1218 BLAKE2B 518b144a352a20fb2501f69f21e591514876c37628fc6aac3615e205a190e5bdbaa00c5d2f758bba9c5ded2be75547ff1536d330f455f2a3ae3b0b02347f36f3 SHA512 ef9ff6d16f0397fded5f6eeb21039e760485f73f61579f7a1345228ae6a94ebdad1c4a98a92d008585ceb16cab54999bfd8b40eb06476c9049542dfc4e1e7d52 -EBUILD lessfs-1.7.0-r1.ebuild 1307 BLAKE2B 83e477101187681d4d1c597c663bd0d6dc1f1dceac5391700e34f4ead1806b658c4024e3f41bc6accbe855e6283a4241ed0935a521c66b395f5d9758787d1619 SHA512 2bcb82fbddb2c4585b364bcb61694ac8ad4aee5555d08ce0e7fbdb352d3bf0a9f2bf11c6bc1afcd3c21e3993619b9cb6ed5e524cb6012a282877268f839dba6d +EBUILD lessfs-1.7.0-r1.ebuild 1387 BLAKE2B 733f97efe58d69c7d50690117b940450b88b5f59622197905af1d09042a8f37b2881f00378397ab94af7111a0cfe206a64a556cf22ad7ac707c7ebc349ff9f92 SHA512 97964094fd16717104791d9c0d79c0792bda71f22e4c412ead74629495cb85fa62172ef4f6faa987dbc8c16fe3f478302f9d853788f2155595142e742fd1f9dc EBUILD lessfs-1.7.0.ebuild 1281 BLAKE2B 6080ac5f1c1a57321306a292728bd297b4687754274c7d10adf25298405937d3cf7bcbdf2ccb4d595e4141d0b7483de5b9982e814d716d4cfc0dd417ca5c55b7 SHA512 e930c0ebb872b82702a495dd62fb3782dc64b10afce925f34311d80e00ebecfde203da2f171102ad39035849da1043ac69c0480c2c43461b7803c18e340c1100 MISC metadata.xml 1422 BLAKE2B faa04d5dc2bb7b18102a3bd2a4386590050599cbfd1124b632d78cae75692f0395f9675b9226c2c7a45de81359737b43f488ddffc67ec04aec829f256cd0fd92 SHA512 d841f92f53749f39637801b2f4f5129083f07df540cc13c5c2e2bdd1c7e16aefa66e120ca9b0b78e38d85a9186a7c208dfb44a3600f1ba7d76e70d6e7bfb95d9 diff --git a/sys-fs/lessfs/files/lessfs-1.7.0-openssl11.patch b/sys-fs/lessfs/files/lessfs-1.7.0-openssl11.patch new file mode 100644 index 000000000000..45f24eba3b15 --- /dev/null +++ b/sys-fs/lessfs/files/lessfs-1.7.0-openssl11.patch @@ -0,0 +1,72 @@ +--- lessfs-1.7.0/lib_crypto.c.org 2011-09-30 20:13:08.000000000 +0200 ++++ lessfs-1.7.0/lib_crypto.c 2018-09-26 13:16:08.995599693 +0200 +@@ -78,7 +78,7 @@ unsigned char *safepassword() + DAT *lfsencrypt(unsigned char *unenc, unsigned long size) + { + unsigned char *safepasswd; +- EVP_CIPHER_CTX ctx; ++ EVP_CIPHER_CTX *ctx; + DAT *encoded; + int olen, tlen; + +@@ -86,19 +86,24 @@ DAT *lfsencrypt(unsigned char *unenc, un + + pthread_mutex_lock(&crypto_mutex); + safepasswd = safepassword(); +- EVP_CIPHER_CTX_init(&ctx); +- EVP_EncryptInit(&ctx, EVP_bf_cbc(), safepasswd, config->iv); ++ ctx = EVP_CIPHER_CTX_new(); ++ if (ctx == NULL) { ++ die_cryptoerr("can't allocate memory for new ctx"); ++ } ++ EVP_EncryptInit(ctx, EVP_bf_cbc(), safepasswd, config->iv); + encoded = s_malloc(sizeof(DAT)); + encoded->data = s_malloc(8 + size); //Blowfish can grow 64 bits + +- if (EVP_EncryptUpdate(&ctx, encoded->data, &olen, unenc, size) != 1) { ++ if (EVP_EncryptUpdate(ctx, encoded->data, &olen, unenc, size) != 1) { ++ EVP_CIPHER_CTX_free(ctx); + die_cryptoerr("error in encrypt update\n"); + } + +- if (EVP_EncryptFinal(&ctx, encoded->data + olen, &tlen) != 1) { ++ if (EVP_EncryptFinal(ctx, encoded->data + olen, &tlen) != 1) { ++ EVP_CIPHER_CTX_free(ctx); + die_cryptoerr("error in encrypt final\n"); + } +- EVP_CIPHER_CTX_cleanup(&ctx); ++ EVP_CIPHER_CTX_free(ctx); + encoded->size = olen + tlen; + if (encoded->size > 8 + size) { + die_cryptoerr +@@ -123,20 +128,24 @@ DAT *lfsdecrypt(DAT * data) + decrypted->data = s_malloc(data->size); + safepasswd = safepassword(); + +- EVP_CIPHER_CTX ctx; +- EVP_CIPHER_CTX_init(&ctx); +- EVP_DecryptInit(&ctx, EVP_bf_cbc(), safepasswd, config->iv); ++ EVP_CIPHER_CTX *ctx; ++ ctx = EVP_CIPHER_CTX_new(); ++ if (ctx == NULL) ++ die_cryptoerr("can't allocate memory for new ctx"); ++ EVP_DecryptInit(ctx, EVP_bf_cbc(), safepasswd, config->iv); + + if (EVP_DecryptUpdate +- (&ctx, decrypted->data, &olen, data->data, data->size) != 1) { ++ (ctx, decrypted->data, &olen, data->data, data->size) != 1) { ++ EVP_CIPHER_CTX_free(ctx); + die_cryptoerr("Unexpected fatal error while decrypting.\n"); + } + +- if (EVP_DecryptFinal(&ctx, decrypted->data + olen, &tlen) != 1) { ++ if (EVP_DecryptFinal(ctx, decrypted->data + olen, &tlen) != 1) { ++ EVP_CIPHER_CTX_free(ctx); + die_cryptoerr("Unexpected fatal error in decrypt final.\n"); + } + olen += tlen; +- EVP_CIPHER_CTX_cleanup(&ctx); ++ EVP_CIPHER_CTX_free(ctx); + decrypted->size = olen; + s_free(safepasswd); + pthread_mutex_unlock(&crypto_mutex); diff --git a/sys-fs/lessfs/lessfs-1.7.0-r1.ebuild b/sys-fs/lessfs/lessfs-1.7.0-r1.ebuild index f0b3e0a95f0a..aa7091174a65 100644 --- a/sys-fs/lessfs/lessfs-1.7.0-r1.ebuild +++ b/sys-fs/lessfs/lessfs-1.7.0-r1.ebuild @@ -33,6 +33,11 @@ DOC_CONTENTS="Default configuration file: /etc/${PN}.cfg. If your host is a client consult the following configuration file: /usr/share/doc/${PF}/${PN}.cfg-slave.*" +PATCHES=( + # From PLD-Linux, bug #674422 + "${FILESDIR}/${P}-openssl11.patch" +) + src_configure() { econf \ $(use_enable debug) $(use_enable debug lckdebug) \ diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index 3f897666427f..bcfe5cc6b426 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -9,10 +9,14 @@ DIST systemd-239.tar.gz 7157293 BLAKE2B 975f6215c8bb6662d6e161f637e1fece22930c01 DIST systemd-240-patches-1.tar.gz 15364 BLAKE2B e5cf4c2b8666a5c03e658f46674422d2566a748d3dc088f3cda0f5c5e7b51aec00a531ef7e9d047fd59504299d2e8a44faa353da1183260ae72156bb486d51f7 SHA512 1541810dbcfcc75c4323015c056c963ef69d633761293dea7f27aa6106e3ccc59a84263c703fc5542cf2fb3410c846e97ffb11ecc7d56a98ca658b43b73b6313 DIST systemd-240-patches-3.tar.gz 31952 BLAKE2B 0677d24c4f4e1575dbd4953eb75734f0773671e4ffc2a8d848353a379f5ea2caf4f96620ed6303d98ec00a15367d5e2124b493aaef80b1a0fe118866a1c04ada SHA512 e604e1de17bcd4c941036f12d2e3ae96dd6e86647db2b07576e8468405900b6e8af6a0e55a50c7e9b19704601930b8152c8ac506b2624e261ee0cd35dfc91a21 DIST systemd-240.tar.gz 7582001 BLAKE2B cf53595a83424984dd9f533f7cd0c9905366c5a52ab946fc45ff7fd1bcc85978ff654720113641534e40c0f9a1ad1c9628255778616770762950426789f659c3 SHA512 da7467781b16f65d868931ae88fd07554db61542aec7f11dbec9f7279b529f900301edfea2d3813ddb64eeb3fdcfb7be86e540c65212dd7cfdcdebbc80de2ff5 -EBUILD udev-236-r1.ebuild 10048 BLAKE2B cd7b1f1b4edaf2dec245c9b00e1f19af56e3f4b21f6de1535f062d9deaa16107efc9f873dc50928604562da3c8877cdfff70c5489bec15cbcfa952b9bf4ff8ca SHA512 e6dca2f55c992a025cefc67b06df09d402fdd8438cfd819419a70de6ea2b26e58e380781aa66f0d63bf682b4500ab94f6b552117969851ddd892bb8a6415f4ee -EBUILD udev-238.ebuild 9594 BLAKE2B cc2f3ede4a7e22c0f035d9b67882b72a51daea6d0ce4a234cfa5e44e7b1a30f30c0b8ba5090eec07fa0755bc600bc26398b20e39b3b64042b17150dcfb260723 SHA512 432f5768573c64546347eaa1885a6cbaecc486ef6cbbb697e8e8fa8dad2a186289834db127073f35e79ac63c2157e4942e27caf22c5989367c44aae6ff662f93 -EBUILD udev-239.ebuild 9766 BLAKE2B 6d3dedc0a0a8726c654b4c5aacbdd5970949e322a843bbe7b7394db4494c815b02854962eff06edbf75aa46d8405c26f76947a8c94c28a3f481825b6c306f446 SHA512 496cc3456b0b94b29d81e3f092cf693b6b822c9dd057f5da4403fb1c2b465442724ffc73f477b9b5af8e69e579d7f487278863a6b9ad607aa6b46b81bd62d1a0 -EBUILD udev-240-r2.ebuild 9664 BLAKE2B 2816f914917b91221545e7bb77ba18a5158873d581c973e812e943472884ac4794a71a3a21ab4ce95d7bbd16d525cf3c9472ed41500fc88322f3418685b99be2 SHA512 618b7b0cd646409b9ea73576c60685e94f0769330745dc2db0a1edc9281d45405adaef645c00187570a0c5d8ef283c7585689f782d80817b6296fe84dae7f51c -EBUILD udev-240-r3.ebuild 9664 BLAKE2B 96799a2cb4f347e45aafbe2a2b0dfbb12b574be9b62fd21f4599dba948ec5ca683b1899a1aaf3edcba37882e9516949f31cb6f2b675bd280a0fc8f3f3214b20b SHA512 847f2cfd167c225819bc2264368407f0d896a9782622f60475b89d9a2f3ec1085d144e4065d8b728e642f57f231b951628bab142d70805a6432a7f414cbc8655 -EBUILD udev-9999.ebuild 9564 BLAKE2B e372c292973ac0b83f1fef60199d7ab31ef80cb0208f3ef34c52b3357fc684d9afd3fdf5e1cc69a3296ef65781a90e55f4e9fbba579d55cef7be2db8058288a0 SHA512 9e02e243bdd6bf01349bc21619cd4033be65c9c2bb22449cee83cfb0966c930df1a6f5dcc74a610e27006f81eb0483a976cd6d1e9cdb21174cc02e3beb3f2436 +DIST systemd-241-rc1.tar.gz 7617965 BLAKE2B 6c491297b71ad3c473d644de04bb334f902ee4110d647b654c5452f34401cfc11c7564b290022072555f3fbd46674ce009f587622f412f8a66330a7089db34c5 SHA512 168ba80d6e8abadbf1ed84270f2b02e257f1490b61021bb6fb704d9b5fad2670b63e0fc0cb26071e8d56c993faa30274e80d53cf49154cce2b609f47c73b30e0 +DIST systemd-241-rc2.tar.gz 7619504 BLAKE2B 610940b3141d36a0534cf477d303eb681f418f8c04d7e9ff1d28832d02c05d68195aec108b15392662b134020c28df5b35f6c1c85f8eea8e7090cdc210ce5e26 SHA512 69932b1e5d48fbf6fd650a91354763b1e7e8d490def98a011d6377ee8623abc21244f2c8ddd97a500c4d3e6ab11bae2a6148ddc84e325d75a0273b3d456d8f41 +EBUILD udev-236-r1.ebuild 10048 BLAKE2B 8813b56cbd71890b974be9597f75d864eeaccfed35e474d3278069e7c1c362100e7790409768e1d5dfe786313cff8cc9f5ba996798c1a1119a11f7de468ea201 SHA512 f740b9d26efe64e42a7e8b64f0d4222aca3606e8f98471d934674213874ceab76afe2a8ed9c0a677aac9a3246fb0eb6cc97f5c662e9d33dc0591e1ad4ba230a2 +EBUILD udev-238.ebuild 9594 BLAKE2B 8f708567f1629fda0e96f72c53ced2618f9201f6ca996f74d972795597adca12f89fff6852b6624fe461aa810d13d821dad15be68c24973d2a8d09f67ae5e0bc SHA512 145d3adb943a29c75e8b97b01a154fc5d0b21973696bc86c034d997bfda060ade5d72e255d3752539cdfa160c4d2cce7b8ab0ab928b34cd7c510d65e53decd0d +EBUILD udev-239.ebuild 9764 BLAKE2B 00d1cf0c670919c7ae76ef0c522f9dcd972d2c5a9dcb28b27b0740e7b087b77e1080297732101412b146bf31c05887a81ec191649e70b86f8662e23b8fbb054e SHA512 1aa80b0d44d1107f17e8907141b51340ec02366ffd49e4c3c444359484391448c8404b6823fc670c6a7ca8b6b256b928ba8ad7e64c1c4fadee8213a71de3c7ab +EBUILD udev-240-r2.ebuild 9664 BLAKE2B adf21d3fba8960bb90328ff19db2186c8a89aae584ac9745affe637eda0263c6db0dc2b920a1ccae12661cddc5ff010b10c3e30d6310fd03ef499b9116cf3f53 SHA512 f44c4240c85f9bd0e070ae9bd529fe06c79f5bc229703477107ea9937037b130e48e576a092b217ff73bd25e1b72ab592edc7f09553a69f8488eceeeac368ba1 +EBUILD udev-240-r3.ebuild 9664 BLAKE2B 2daaa3124df1ce0ea5b3247200a55020d75b92383c81d4c687ee8cd33bc4fc00f8792a8d862fe1d966880b59d89560748ceba562c8b8bfa04ea02ba4c5c7332a SHA512 07c752f8f4a12777b909748a729d88b521ad4c720703244265af5120cb3846d9289d125f02e9aa6b8bd2275111e8fa329561f20df388d89b0560de4367b00a32 +EBUILD udev-241_rc1.ebuild 9637 BLAKE2B 0c5f05d169bf4e7318e46d7b5a2eff8f31cae9c4b5b14ac6fa0ec5029b120cb97d71341ddad3d89a197653b4b3fda330d03d15fd2f45507c808dba375437d6cf SHA512 03ae6bd7929e67d557e347e0c4a034deb3f802c34b9ecd9faeeb4970230f2bac12a77544fdb36986744f87711fd326c3d928587bcfbd1d6042bb9e44c740cc20 +EBUILD udev-241_rc2.ebuild 9637 BLAKE2B 0c5f05d169bf4e7318e46d7b5a2eff8f31cae9c4b5b14ac6fa0ec5029b120cb97d71341ddad3d89a197653b4b3fda330d03d15fd2f45507c808dba375437d6cf SHA512 03ae6bd7929e67d557e347e0c4a034deb3f802c34b9ecd9faeeb4970230f2bac12a77544fdb36986744f87711fd326c3d928587bcfbd1d6042bb9e44c740cc20 +EBUILD udev-9999.ebuild 9637 BLAKE2B 0c5f05d169bf4e7318e46d7b5a2eff8f31cae9c4b5b14ac6fa0ec5029b120cb97d71341ddad3d89a197653b4b3fda330d03d15fd2f45507c808dba375437d6cf SHA512 03ae6bd7929e67d557e347e0c4a034deb3f802c34b9ecd9faeeb4970230f2bac12a77544fdb36986744f87711fd326c3d928587bcfbd1d6042bb9e44c740cc20 MISC metadata.xml 476 BLAKE2B 5d293590663fda69b35a5f434b64827de86ac14831536e873c38d1e3baa8575cc02cc45525726046103b73212c02852dce6c407fe7c02705370e4b6402771686 SHA512 552311593b07f4f3d41e406fe99606d79973d9c69e5e448ffcdf3f6d1e04ea6b59c97b022ad2fe7fedbf0c627e2b45efc293dc1065e7cec035c2e48c85c3495d diff --git a/sys-fs/udev/udev-236-r1.ebuild b/sys-fs/udev/udev-236-r1.ebuild index fbd64daf5c41..ace4ae355624 100644 --- a/sys-fs/udev/udev-236-r1.ebuild +++ b/sys-fs/udev/udev-236-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 2003-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 diff --git a/sys-fs/udev/udev-238.ebuild b/sys-fs/udev/udev-238.ebuild index 936975acbedf..0aa97d85fa66 100644 --- a/sys-fs/udev/udev-238.ebuild +++ b/sys-fs/udev/udev-238.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 2003-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 diff --git a/sys-fs/udev/udev-239.ebuild b/sys-fs/udev/udev-239.ebuild index 9c0ba4257fa5..02cfd467af47 100644 --- a/sys-fs/udev/udev-239.ebuild +++ b/sys-fs/udev/udev-239.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 2003-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then inherit git-r3 else SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86" fi DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" diff --git a/sys-fs/udev/udev-240-r2.ebuild b/sys-fs/udev/udev-240-r2.ebuild index 05b9ea36bd9b..9772ccf7dcb3 100644 --- a/sys-fs/udev/udev-240-r2.ebuild +++ b/sys-fs/udev/udev-240-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 2003-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 diff --git a/sys-fs/udev/udev-240-r3.ebuild b/sys-fs/udev/udev-240-r3.ebuild index c4dc4ee986fe..e7251ee0143e 100644 --- a/sys-fs/udev/udev-240-r3.ebuild +++ b/sys-fs/udev/udev-240-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 2003-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 diff --git a/sys-fs/udev/udev-241_rc1.ebuild b/sys-fs/udev/udev-241_rc1.ebuild new file mode 100644 index 000000000000..ba1551d202d3 --- /dev/null +++ b/sys-fs/udev/udev-241_rc1.ebuild @@ -0,0 +1,326 @@ +# Copyright 2003-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal toolchain-funcs udev user + +if [[ ${PV} = 9999* ]]; then + EGIT_REPO_URI="https://github.com/systemd/systemd.git" + inherit git-r3 +else + MY_PV=${PV/_/-} + MY_P=systemd-${MY_PV} + S=${WORKDIR}/${MY_P} + SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +fi + +DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" + +LICENSE="LGPL-2.1 MIT GPL-2" +SLOT="0" +IUSE="acl +kmod selinux" + +RESTRICT="test" + +COMMON_DEPEND=">=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}] + sys-libs/libcap[${MULTILIB_USEDEP}] + acl? ( sys-apps/acl ) + kmod? ( >=sys-apps/kmod-16 ) + selinux? ( >=sys-libs/libselinux-2.1.9 ) + !<sys-libs/glibc-2.11 + !sys-apps/gentoo-systemd-integration + !sys-apps/systemd" +DEPEND="${COMMON_DEPEND} + dev-util/gperf + >=dev-util/intltool-0.50 + >=dev-util/meson-0.40.0 + dev-util/ninja + >=sys-apps/coreutils-8.16 + virtual/os-headers + virtual/pkgconfig + >=sys-kernel/linux-headers-3.9 + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xml-dtd:4.5 + app-text/docbook-xsl-stylesheets + dev-libs/libxslt" +RDEPEND="${COMMON_DEPEND} + !<sys-fs/lvm2-2.02.103 + !<sec-policy/selinux-base-2.20120725-r10" +PDEPEND=">=sys-apps/hwids-20140304[udev] + >=sys-fs/udev-init-scripts-26" + +pkg_setup() { + if [[ ${MERGE_TYPE} != buildonly ]]; then + CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~!FW_LOADER_USER_HELPER ~UNIX" + linux-info_pkg_setup + + # CONFIG_FHANDLE was introduced by 2.6.39 + local MINKV=2.6.39 + + if kernel_is -lt ${MINKV//./ }; then + eerror "Your running kernel is too old to run this version of ${P}" + eerror "You need to upgrade kernel at least to ${MINKV}" + fi + + if kernel_is -lt 3 7; then + ewarn "Your running kernel is too old to have firmware loader and" + ewarn "this version of ${P} doesn't have userspace firmware loader" + ewarn "If you need firmware support, you need to upgrade kernel at least to 3.7" + fi + fi +} + +src_prepare() { + cat <<-EOF > "${T}"/40-gentoo.rules + # Gentoo specific floppy and usb groups + ACTION=="add", SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy" + ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb" + EOF + + if [[ -d "${WORKDIR}/patches" ]]; then + eapply "${WORKDIR}/patches" + fi + + local PATCHES=( + "${FILESDIR}/236-uucp-group.patch" + ) + + default +} + +meson_multilib_native_use() { + if multilib_is_native_abi && use "$1"; then + echo true + else + echo false + fi +} + +multilib_src_configure() { + local emesonargs=( + -Dacl=$(meson_multilib_native_use acl) + -Defi=false + -Dkmod=$(meson_multilib_native_use kmod) + -Dselinux=$(meson_multilib_native_use selinux) + -Dlink-udev-shared=false + -Dsplit-usr=true + + # Prevent automagic deps + -Dgcrypt=false + -Dlibcryptsetup=false + -Dlibidn=false + -Dlibidn2=false + -Dlibiptc=false + -Dseccomp=false + -Dlz4=false + -Dxz=false + ) + meson_src_configure +} + +src_configure() { + # Prevent conflicts with i686 cross toolchain, bug 559726 + tc-export AR CC NM OBJCOPY RANLIB + multilib-minimal_src_configure +} + +multilib_src_compile() { + # meson creates this link + local libudev=$(readlink src/udev/libudev.so.1) + + local targets=( + src/udev/${libudev} + ) + if multilib_is_native_abi; then + targets+=( + systemd-udevd + udevadm + src/udev/ata_id + src/udev/cdrom_id + src/udev/mtd_probe + src/udev/scsi_id + src/udev/v4l_id + man/udev.conf.5 + man/systemd.link.5 + man/hwdb.7 + man/udev.7 + man/systemd-udevd.service.8 + man/udevadm.8 + ) + fi + eninja "${targets[@]}" +} + +multilib_src_install() { + local libudev=$(readlink src/udev/libudev.so.1) + + into / + dolib.so src/udev/{${libudev},libudev.so.1,libudev.so} + + insinto "/usr/$(get_libdir)/pkgconfig" + doins src/libudev/libudev.pc + + if multilib_is_native_abi; then + into / + dobin udevadm + + exeinto /lib/systemd + doexe systemd-udevd + + exeinto /lib/udev + doexe src/udev/{ata_id,cdrom_id,mtd_probe,scsi_id,v4l_id} + + rm rules/99-systemd.rules || die + insinto /lib/udev/rules.d + doins rules/*.rules + + insinto /usr/share/pkgconfig + doins src/udev/udev.pc + + mv man/systemd-udevd.service.8 man/systemd-udevd.8 || die + rm man/systemd-udevd-{control,kernel}.socket.8 || die + doman man/*.[0-9] + fi +} + +multilib_src_install_all() { + doheader src/libudev/libudev.h + + insinto /etc/udev + doins src/udev/udev.conf + keepdir /etc/udev/{hwdb.d,rules.d} + + insinto /lib/systemd/network + doins network/99-default.link + + # see src_prepare() for content of 40-gentoo.rules + insinto /lib/udev/rules.d + doins "${T}"/40-gentoo.rules + doins "${S}"/rules/*.rules + + dobashcomp shell-completion/bash/udevadm + + insinto /usr/share/zsh/site-functions + doins shell-completion/zsh/_udevadm + + einstalldocs +} + +pkg_postinst() { + mkdir -p "${ROOT%/}"/run + + # "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766 + # So try to remove it here (will only work if empty). + rmdir "${ROOT%/}"/dev/loop 2>/dev/null + if [[ -d ${ROOT%/}/dev/loop ]]; then + ewarn "Please make sure your remove /dev/loop," + ewarn "else losetup may be confused when looking for unused devices." + fi + + local fstab="${ROOT%/}"/etc/fstab dev path fstype rest + while read -r dev path fstype rest; do + if [[ ${path} == /dev && ${fstype} != devtmpfs ]]; then + ewarn "You need to edit your /dev line in ${fstab} to have devtmpfs" + ewarn "filesystem. Otherwise udev won't be able to boot." + ewarn "See, https://bugs.gentoo.org/453186" + fi + done < "${fstab}" + + if [[ -d ${ROOT%/}/usr/lib/udev ]]; then + ewarn + ewarn "Please re-emerge all packages on your system which install" + ewarn "rules and helpers in /usr/lib/udev. They should now be in" + ewarn "/lib/udev." + ewarn + ewarn "One way to do this is to run the following command:" + ewarn "emerge -av1 \$(qfile -q -S -C /usr/lib/udev)" + ewarn "Note that qfile can be found in app-portage/portage-utils" + fi + + local old_cd_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-cd.rules + local old_net_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-net.rules + for old_rules in "${old_cd_rules}" "${old_net_rules}"; do + if [[ -f ${old_rules} ]]; then + ewarn + ewarn "File ${old_rules} is from old udev installation but if you still use it," + ewarn "rename it to something else starting with 70- to silence this deprecation" + ewarn "warning." + fi + done + + elog + elog "Starting from version >= 197 the new predictable network interface names are" + elog "used by default, see:" + elog "https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames" + elog "https://cgit.freedesktop.org/systemd/systemd/tree/src/udev/udev-builtin-net_id.c" + elog + elog "Example command to get the information for the new interface name before booting" + elog "(replace <ifname> with, for example, eth0):" + elog "# udevadm test-builtin net_id /sys/class/net/<ifname> 2> /dev/null" + elog + elog "You can use either kernel parameter \"net.ifnames=0\", create empty" + elog "file /etc/systemd/network/99-default.link, or symlink it to /dev/null" + elog "to disable the feature." + + if has_version 'sys-apps/biosdevname'; then + ewarn + ewarn "You can replace the functionality of sys-apps/biosdevname which has been" + ewarn "detected to be installed with the new predictable network interface names." + fi + + ewarn + ewarn "You need to restart udev as soon as possible to make the upgrade go" + ewarn "into effect." + ewarn "The method you use to do this depends on your init system." + if has_version 'sys-apps/openrc'; then + ewarn "For sys-apps/openrc users it is:" + ewarn "# /etc/init.d/udev --nodeps restart" + fi + + elog + elog "For more information on udev on Gentoo, upgrading, writing udev rules, and" + elog "fixing known issues visit:" + elog "https://wiki.gentoo.org/wiki/Udev" + elog "https://wiki.gentoo.org/wiki/Udev/upgrade" + + # If user has disabled 80-net-name-slot.rules using a empty file or a symlink to /dev/null, + # do the same for 80-net-setup-link.rules to keep the old behavior + local net_move=no + local net_name_slot_sym=no + local net_rules_path="${ROOT%/}"/etc/udev/rules.d + local net_name_slot="${net_rules_path}"/80-net-name-slot.rules + local net_setup_link="${net_rules_path}"/80-net-setup-link.rules + if [[ ! -e ${net_setup_link} ]]; then + [[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]] && net_move=yes + if [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then + net_move=yes + net_name_slot_sym=yes + fi + fi + if [[ ${net_move} == yes ]]; then + ebegin "Copying ${net_name_slot} to ${net_setup_link}" + + if [[ ${net_name_slot_sym} == yes ]]; then + ln -nfs /dev/null "${net_setup_link}" + else + cp "${net_name_slot}" "${net_setup_link}" + fi + eend $? + fi + + # https://cgit.freedesktop.org/systemd/systemd/commit/rules/50-udev-default.rules?id=3dff3e00e044e2d53c76fa842b9a4759d4a50e69 + # https://bugs.gentoo.org/246847 + # https://bugs.gentoo.org/514174 + enewgroup input + + # Update hwdb database in case the format is changed by udev version. + if has_version 'sys-apps/hwids[udev]'; then + udevadm hwdb --update --root="${ROOT%/}" + # Only reload when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd + # https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda + [[ -z ${REPLACING_VERSIONS} ]] && udev_reload + fi +} diff --git a/sys-fs/udev/udev-241_rc2.ebuild b/sys-fs/udev/udev-241_rc2.ebuild new file mode 100644 index 000000000000..ba1551d202d3 --- /dev/null +++ b/sys-fs/udev/udev-241_rc2.ebuild @@ -0,0 +1,326 @@ +# Copyright 2003-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal toolchain-funcs udev user + +if [[ ${PV} = 9999* ]]; then + EGIT_REPO_URI="https://github.com/systemd/systemd.git" + inherit git-r3 +else + MY_PV=${PV/_/-} + MY_P=systemd-${MY_PV} + S=${WORKDIR}/${MY_P} + SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +fi + +DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" + +LICENSE="LGPL-2.1 MIT GPL-2" +SLOT="0" +IUSE="acl +kmod selinux" + +RESTRICT="test" + +COMMON_DEPEND=">=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}] + sys-libs/libcap[${MULTILIB_USEDEP}] + acl? ( sys-apps/acl ) + kmod? ( >=sys-apps/kmod-16 ) + selinux? ( >=sys-libs/libselinux-2.1.9 ) + !<sys-libs/glibc-2.11 + !sys-apps/gentoo-systemd-integration + !sys-apps/systemd" +DEPEND="${COMMON_DEPEND} + dev-util/gperf + >=dev-util/intltool-0.50 + >=dev-util/meson-0.40.0 + dev-util/ninja + >=sys-apps/coreutils-8.16 + virtual/os-headers + virtual/pkgconfig + >=sys-kernel/linux-headers-3.9 + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xml-dtd:4.5 + app-text/docbook-xsl-stylesheets + dev-libs/libxslt" +RDEPEND="${COMMON_DEPEND} + !<sys-fs/lvm2-2.02.103 + !<sec-policy/selinux-base-2.20120725-r10" +PDEPEND=">=sys-apps/hwids-20140304[udev] + >=sys-fs/udev-init-scripts-26" + +pkg_setup() { + if [[ ${MERGE_TYPE} != buildonly ]]; then + CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~!FW_LOADER_USER_HELPER ~UNIX" + linux-info_pkg_setup + + # CONFIG_FHANDLE was introduced by 2.6.39 + local MINKV=2.6.39 + + if kernel_is -lt ${MINKV//./ }; then + eerror "Your running kernel is too old to run this version of ${P}" + eerror "You need to upgrade kernel at least to ${MINKV}" + fi + + if kernel_is -lt 3 7; then + ewarn "Your running kernel is too old to have firmware loader and" + ewarn "this version of ${P} doesn't have userspace firmware loader" + ewarn "If you need firmware support, you need to upgrade kernel at least to 3.7" + fi + fi +} + +src_prepare() { + cat <<-EOF > "${T}"/40-gentoo.rules + # Gentoo specific floppy and usb groups + ACTION=="add", SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy" + ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb" + EOF + + if [[ -d "${WORKDIR}/patches" ]]; then + eapply "${WORKDIR}/patches" + fi + + local PATCHES=( + "${FILESDIR}/236-uucp-group.patch" + ) + + default +} + +meson_multilib_native_use() { + if multilib_is_native_abi && use "$1"; then + echo true + else + echo false + fi +} + +multilib_src_configure() { + local emesonargs=( + -Dacl=$(meson_multilib_native_use acl) + -Defi=false + -Dkmod=$(meson_multilib_native_use kmod) + -Dselinux=$(meson_multilib_native_use selinux) + -Dlink-udev-shared=false + -Dsplit-usr=true + + # Prevent automagic deps + -Dgcrypt=false + -Dlibcryptsetup=false + -Dlibidn=false + -Dlibidn2=false + -Dlibiptc=false + -Dseccomp=false + -Dlz4=false + -Dxz=false + ) + meson_src_configure +} + +src_configure() { + # Prevent conflicts with i686 cross toolchain, bug 559726 + tc-export AR CC NM OBJCOPY RANLIB + multilib-minimal_src_configure +} + +multilib_src_compile() { + # meson creates this link + local libudev=$(readlink src/udev/libudev.so.1) + + local targets=( + src/udev/${libudev} + ) + if multilib_is_native_abi; then + targets+=( + systemd-udevd + udevadm + src/udev/ata_id + src/udev/cdrom_id + src/udev/mtd_probe + src/udev/scsi_id + src/udev/v4l_id + man/udev.conf.5 + man/systemd.link.5 + man/hwdb.7 + man/udev.7 + man/systemd-udevd.service.8 + man/udevadm.8 + ) + fi + eninja "${targets[@]}" +} + +multilib_src_install() { + local libudev=$(readlink src/udev/libudev.so.1) + + into / + dolib.so src/udev/{${libudev},libudev.so.1,libudev.so} + + insinto "/usr/$(get_libdir)/pkgconfig" + doins src/libudev/libudev.pc + + if multilib_is_native_abi; then + into / + dobin udevadm + + exeinto /lib/systemd + doexe systemd-udevd + + exeinto /lib/udev + doexe src/udev/{ata_id,cdrom_id,mtd_probe,scsi_id,v4l_id} + + rm rules/99-systemd.rules || die + insinto /lib/udev/rules.d + doins rules/*.rules + + insinto /usr/share/pkgconfig + doins src/udev/udev.pc + + mv man/systemd-udevd.service.8 man/systemd-udevd.8 || die + rm man/systemd-udevd-{control,kernel}.socket.8 || die + doman man/*.[0-9] + fi +} + +multilib_src_install_all() { + doheader src/libudev/libudev.h + + insinto /etc/udev + doins src/udev/udev.conf + keepdir /etc/udev/{hwdb.d,rules.d} + + insinto /lib/systemd/network + doins network/99-default.link + + # see src_prepare() for content of 40-gentoo.rules + insinto /lib/udev/rules.d + doins "${T}"/40-gentoo.rules + doins "${S}"/rules/*.rules + + dobashcomp shell-completion/bash/udevadm + + insinto /usr/share/zsh/site-functions + doins shell-completion/zsh/_udevadm + + einstalldocs +} + +pkg_postinst() { + mkdir -p "${ROOT%/}"/run + + # "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766 + # So try to remove it here (will only work if empty). + rmdir "${ROOT%/}"/dev/loop 2>/dev/null + if [[ -d ${ROOT%/}/dev/loop ]]; then + ewarn "Please make sure your remove /dev/loop," + ewarn "else losetup may be confused when looking for unused devices." + fi + + local fstab="${ROOT%/}"/etc/fstab dev path fstype rest + while read -r dev path fstype rest; do + if [[ ${path} == /dev && ${fstype} != devtmpfs ]]; then + ewarn "You need to edit your /dev line in ${fstab} to have devtmpfs" + ewarn "filesystem. Otherwise udev won't be able to boot." + ewarn "See, https://bugs.gentoo.org/453186" + fi + done < "${fstab}" + + if [[ -d ${ROOT%/}/usr/lib/udev ]]; then + ewarn + ewarn "Please re-emerge all packages on your system which install" + ewarn "rules and helpers in /usr/lib/udev. They should now be in" + ewarn "/lib/udev." + ewarn + ewarn "One way to do this is to run the following command:" + ewarn "emerge -av1 \$(qfile -q -S -C /usr/lib/udev)" + ewarn "Note that qfile can be found in app-portage/portage-utils" + fi + + local old_cd_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-cd.rules + local old_net_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-net.rules + for old_rules in "${old_cd_rules}" "${old_net_rules}"; do + if [[ -f ${old_rules} ]]; then + ewarn + ewarn "File ${old_rules} is from old udev installation but if you still use it," + ewarn "rename it to something else starting with 70- to silence this deprecation" + ewarn "warning." + fi + done + + elog + elog "Starting from version >= 197 the new predictable network interface names are" + elog "used by default, see:" + elog "https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames" + elog "https://cgit.freedesktop.org/systemd/systemd/tree/src/udev/udev-builtin-net_id.c" + elog + elog "Example command to get the information for the new interface name before booting" + elog "(replace <ifname> with, for example, eth0):" + elog "# udevadm test-builtin net_id /sys/class/net/<ifname> 2> /dev/null" + elog + elog "You can use either kernel parameter \"net.ifnames=0\", create empty" + elog "file /etc/systemd/network/99-default.link, or symlink it to /dev/null" + elog "to disable the feature." + + if has_version 'sys-apps/biosdevname'; then + ewarn + ewarn "You can replace the functionality of sys-apps/biosdevname which has been" + ewarn "detected to be installed with the new predictable network interface names." + fi + + ewarn + ewarn "You need to restart udev as soon as possible to make the upgrade go" + ewarn "into effect." + ewarn "The method you use to do this depends on your init system." + if has_version 'sys-apps/openrc'; then + ewarn "For sys-apps/openrc users it is:" + ewarn "# /etc/init.d/udev --nodeps restart" + fi + + elog + elog "For more information on udev on Gentoo, upgrading, writing udev rules, and" + elog "fixing known issues visit:" + elog "https://wiki.gentoo.org/wiki/Udev" + elog "https://wiki.gentoo.org/wiki/Udev/upgrade" + + # If user has disabled 80-net-name-slot.rules using a empty file or a symlink to /dev/null, + # do the same for 80-net-setup-link.rules to keep the old behavior + local net_move=no + local net_name_slot_sym=no + local net_rules_path="${ROOT%/}"/etc/udev/rules.d + local net_name_slot="${net_rules_path}"/80-net-name-slot.rules + local net_setup_link="${net_rules_path}"/80-net-setup-link.rules + if [[ ! -e ${net_setup_link} ]]; then + [[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]] && net_move=yes + if [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then + net_move=yes + net_name_slot_sym=yes + fi + fi + if [[ ${net_move} == yes ]]; then + ebegin "Copying ${net_name_slot} to ${net_setup_link}" + + if [[ ${net_name_slot_sym} == yes ]]; then + ln -nfs /dev/null "${net_setup_link}" + else + cp "${net_name_slot}" "${net_setup_link}" + fi + eend $? + fi + + # https://cgit.freedesktop.org/systemd/systemd/commit/rules/50-udev-default.rules?id=3dff3e00e044e2d53c76fa842b9a4759d4a50e69 + # https://bugs.gentoo.org/246847 + # https://bugs.gentoo.org/514174 + enewgroup input + + # Update hwdb database in case the format is changed by udev version. + if has_version 'sys-apps/hwids[udev]'; then + udevadm hwdb --update --root="${ROOT%/}" + # Only reload when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd + # https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda + [[ -z ${REPLACING_VERSIONS} ]] && udev_reload + fi +} diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild index 7934423439b0..ba1551d202d3 100644 --- a/sys-fs/udev/udev-9999.ebuild +++ b/sys-fs/udev/udev-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 2003-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -9,7 +9,10 @@ if [[ ${PV} = 9999* ]]; then EGIT_REPO_URI="https://github.com/systemd/systemd.git" inherit git-r3 else - SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz" + MY_PV=${PV/_/-} + MY_P=systemd-${MY_PV} + S=${WORKDIR}/${MY_P} + SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.tar.gz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" fi @@ -49,9 +52,6 @@ RDEPEND="${COMMON_DEPEND} PDEPEND=">=sys-apps/hwids-20140304[udev] >=sys-fs/udev-init-scripts-26" -S=${WORKDIR}/systemd-${PV} -EGIT_CHECKOUT_DIR=${S} - pkg_setup() { if [[ ${MERGE_TYPE} != buildonly ]]; then CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~!FW_LOADER_USER_HELPER ~UNIX" @@ -80,6 +80,10 @@ src_prepare() { ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb" EOF + if [[ -d "${WORKDIR}/patches" ]]; then + eapply "${WORKDIR}/patches" + fi + local PATCHES=( "${FILESDIR}/236-uucp-group.patch" ) |