diff options
Diffstat (limited to 'dev-lang/erlang')
-rw-r--r-- | dev-lang/erlang/Manifest | 11 | ||||
-rw-r--r-- | dev-lang/erlang/erlang-20.3.2.ebuild | 1 | ||||
-rw-r--r-- | dev-lang/erlang/erlang-20.3.8.ebuild | 3 | ||||
-rw-r--r-- | dev-lang/erlang/erlang-20.3.ebuild | 3 | ||||
-rw-r--r-- | dev-lang/erlang/erlang-21.0.2.ebuild | 1 | ||||
-rw-r--r-- | dev-lang/erlang/files/epmd.init | 13 | ||||
-rw-r--r-- | dev-lang/erlang/files/erlang-add-epmd-pid-file-creation-for-openrc.patch | 90 |
7 files changed, 112 insertions, 10 deletions
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest index a7e0c5161c43..cfc75342dc4c 100644 --- a/dev-lang/erlang/Manifest +++ b/dev-lang/erlang/Manifest @@ -1,9 +1,10 @@ AUX 18.2.1-wx3.0.patch 3849 BLAKE2B 02912cf61094d8217eab7181a4cc35aead224df7872c412db0b40b072778cfb900bf18219baf52e29f609b72305d3a11ea1079b2e873cf56a0a3bd42e3303d2f SHA512 33d8b67542266ae224ffb2bc86fbf36fff6737252810cfb445662ecc418fb30b0b00cbddd2f706ca836f1a8809c505e61edfe221d29dbe91c78c371bff6cec15 AUX 50erlang-gentoo.el 134 BLAKE2B df2da5c0c4be3e6855b51b820e3304f5c212a92d13ec48aa5d73ea3a0e801a8dddd371fd8894d49aa9d5573def56b3a864e463734d72fcf5356d39753dbda1ba SHA512 7a862e0ef1e96e88a484e80aeb92eb4465c7e8661efb0291c28abc13225eb3aa69442fe29417f5ad0d264e54399d645d9cd4713bc9869b48e87a91e50b9b2473 -AUX epmd.init 407 BLAKE2B 958698de3eb49ed66d59b3bd3435f64feec22ca8a9d7260ff9141b8d46e0afa40024fd11c6b84ff3cb5ae46f42a795355e594632300a096ca6a862b254994829 SHA512 9a9d1c0d512e31254170a601edb3a023c1f0abfa9c02656ea86cc04f38bfd4b3bffa131cef2c20ee81d3f62073036b0dcaa399736be7d413fcfa48e4001a5304 +AUX epmd.init 537 BLAKE2B 8b7c45ec9820d37b01cbbe824e0fd13f4651ac280383f8830dc42037f76f918569ce68c00d6c880ab34a95f5c2831dfb3edaf62e13112e5a1c0e77534fd9239c SHA512 231eb48c02eb183eac7aa2f6ec811b0934098e04faf49b130d5f6e184d351f3c1d6484ff5330e5c8d707473be79f220247a9b7076cf3bf27fdd659b1ccdcc111 AUX epmd.service 138 BLAKE2B f56c907ec51bb85c437235334cf01c6a43ccf2316be3b226ab557e3f71cab48baf59b5a9533a4dccb2cb61a4434e3a51d44eae06010718dbf9a732d605c40f73 SHA512 405740f8f9cd55d4ecd7420748399ab3f374b7cb09e53605f44ba49d0af86b70e4a1baf1fde05a703fb90c8a83dbcdd5cfbbf09185e9d7b58ff9612aefc2dd28 AUX erlang-20.2-libressl-2.6.1.patch 4228 BLAKE2B 8c671d3aa8329562b274e6b9f233a3f93565f5a0f4491b83e7e57fb6881d0fbaaf955d7aa5537bdcfc85dbf4c979a3625aed2c203679eccaf9fcc4bd93133836 SHA512 66ff54153264d37d21822a19c07dc7d07fb4ed5c32234be7270821c060fcbd2673069dfd23a38512c7b0373fc97e6e44799f4b4280a1391b300f60f422ef6d69 AUX erlang-20.3.2-dont-ignore-LDFLAGS.patch 1337 BLAKE2B 7272c96b1ee947a98f0a5b1f3bd1fce11e8d02f121348208196ae60af965dfde7fac15263ca0a58df96dff21785a1a63f4fc10f7e7e10c0f68a618e760e5ffd7 SHA512 59d39b1680ac3406e4c37f81a0207588208a873279920258235af54700f80bd67584c3e55c9278f893cd7813573bbec8b13195e47ba00101fc578d5a2b40fa34 +AUX erlang-add-epmd-pid-file-creation-for-openrc.patch 2359 BLAKE2B 54a3148144bcbb9a4dd68e89fd609a09a9e9a0a9c7a71a4e9eaafc12632e23da44411d72c1590e482fda73d5464b1071386aa564b8d9a73b032b62c474d20570 SHA512 301aed1980a8638a8cd069ecb6e968e5c15d3e82b38580861a0ed6a2fc7a9505d99525a53a6ac19c2d9b786703aac6bf51751275a6a7fafd8f530c07ea0c7e8c DIST erlang-20.3.2.tar.gz 53492641 BLAKE2B 2cdf78b6003801400d99949865a5b3e17d2209bf411bbe07dc12f749c84725710d12f85cb2559bc39ac04a7d6f7a9ae07b5f131a5524cf4ce3eb8559ca0259bc SHA512 060874cd4f72c1ecea178dd102f4b37a644485a810127092ad04fee76b52729ce199ee476335a2a40370bc718b7e03eb76869c3a48d457773856fd9f6d30a20b DIST erlang-20.3.8.tar.gz 53499006 BLAKE2B 0c38fb739a9c4f4b79533faea8c533f85c30d680081b5de96e70722a243d53b9317a26c7138a24a78cadd938777bd48a515484fffef2fdfd720819ab12bb8c0c SHA512 2ada142b47fdd0d1807a179e7cd3067e001f94682011436d33e503219a8a93495a187f8192fa2ebcdac48409e489b7b310d538779447981e6ba033a6dde12e1c DIST erlang-21.0.2.tar.gz 52835517 BLAKE2B bf7e2e166236a7c0a3e3411889f163dce0d938c1a854a6c264c137b601587c4cd4d62d58d9a87cf925406272d6e3d6547e4403927adc8e901716289ee2164162 SHA512 ff736a6df92ac7feec7b9ebb1b6523d511a533d48e536f36aee20fa21b5a1dc33791065d45f6900bbbaa48b4ba80b57a306b416801456a5ac33468786dfb00b7 @@ -26,8 +27,8 @@ DIST otp_src_20.3.tar.gz 88170904 BLAKE2B 3f92641e4eb4079572c0cc1cbc6ba1f56977ef EBUILD erlang-19.1.ebuild 4482 BLAKE2B 36a4249649473f50cce66f542c98dbefee41a56d57bd6327f911e6137d5d9bd5fc0656e3f5770f804ae425d428739530be8395a078cc6d930e6c4df2e44edc90 SHA512 26067ee69b78c63a40800b87fcd41f74f1b5a04fdc9e1103b2953f1c721195ec6dfb992474d442193c0673c548ed76a3e88938cc3f93bdbee9e26403164e5e60 EBUILD erlang-19.3.ebuild 4535 BLAKE2B 248bcab46bc6830e6ffcc626d8170b99f5705c7955fd7184e2f8b8799e0ab4fc97c9741bf4ad9413da479c703b585589e2eae63c9fb298d7e36750fadcb1b56b SHA512 c1b60ca3420d5a3cb1561376c6622d346dbd483e8ff5965f2823a6b1e1e3b0146b32a805307d0a7563ae5171d005cfc27a6662ae2ba8fff0511c5db221851b14 EBUILD erlang-20.2.ebuild 4586 BLAKE2B e3eed51b916285c87e212446047d07d47492410580464a2c800642be36426848f859573387204afd7ab67d72bbfaefec4189b973525f23829bed9f7a365d436b SHA512 80d5567d6233c7d9fcd53ca64814dd8cf188094decc6f8708563c22bef77b0b85bd23623df825f085f738547bf64b68fdde160b2ca9389b743a2c56259bf37b6 -EBUILD erlang-20.3.2.ebuild 6607 BLAKE2B d25ae5f93fc21e7304beeeecc99cd39516d52685d13003b5c9458272e1e6a9301a028009f746be53c20d20d1d896ec4177d9f06ed1d608ad4c466f1497226046 SHA512 dc6f1228f0f0b9a852f0d8cae149476b44f6069ec647340d259e8cb016a54c80265234e97e49686b33a3948cff485a2a30d276e03c1186749ecdc724e9cbefe2 -EBUILD erlang-20.3.8.ebuild 6650 BLAKE2B a6d808b56317da3fb65ccad9ef422bf602db0546729e8a61f70c233d4d4aa908b09acbb9c435ddcee6990d1372fb7f1dad5ab8a2ab4c8f21cb9ff0600996df9a SHA512 eca902776825efaf825183adbfdf158452bac38476ea6abea88ccdc8e15bf08f34921835acd9a81664b28216e909712dbae75e9b087587778aedae8c15fdf1dc -EBUILD erlang-20.3.ebuild 4694 BLAKE2B 5d66f16b192c72d5890dc656530a743fd4ffd1f5e7a4770e8a2dbd0f69b631ade821163bdda3dfdf579fbddaa723d10564a4990f0c2c272fcc0455c45277154d SHA512 f059ffc739cbe0026c50d1a9019aef3bd63b8da887d755b3cbf6673ee208f294125ff38d261ce27e6b7f884a9a8156ca3bfe57da3bf3794f149b592ea905ed2a -EBUILD erlang-21.0.2.ebuild 6648 BLAKE2B 3da97597dae434a2e35c0f2fb0682258b96f6d41e63760ec9f9acb458ae6db03e9189e346e3d644416f2082d5b13f15d6c0fc3a4d97d673dfedbe22b5c029dca SHA512 fbf641ce18a3c3ae2c3223f629bbd01c3ac0d63e5767c9576d31f9b009f45658adf8c5cbc32447882ebdbbaaf58952160eda1b8ebe4a1cf7c543e2287c8d6a86 +EBUILD erlang-20.3.2.ebuild 6673 BLAKE2B 47afb094d4d6b0866075a7db996d59bf6836a559b8cc17396622f6fee8248b7c116601f95d8ade51ecf218546dad9c105ea16d0ec0fc24072f0aebb5ebc88d92 SHA512 3150ebee49b8739ec42c4562743b51a3b4c0501297a2b1fdb6eedd642ed45c5b1b3e5aa30f8f8fa99898f255cc8418fc2911b0005a0d8fc2ffdcad8a155af3c0 +EBUILD erlang-20.3.8.ebuild 6715 BLAKE2B 17490339c9a438c11464a62918b7b16ae9a6f9e15fa554b52c943fe51075d04c3e22e3f6cce1996bc241c6fd98d84196f7abd13545a84488432eb5bff0ea0c6d SHA512 b5a225da6d0029cac2cf64ba2966fc09fd48357c8f018c7851bd62bc15186bc0732e70a9b4973f7893d3768f1292b45b3797bdfee5818b87102fdcd911cdac5b +EBUILD erlang-20.3.ebuild 4762 BLAKE2B 441de4c69a235e22d6105ce65569d77254684edaf7bf03812e591e2da7015eb0bac1e70193682ed49c7cbd27870ebbb1d2d667b62c212439e37a73a441a4eaf1 SHA512 f9358e7e3f4207b89f02f719c30a529b9cbe56bba679b31ed94cfc3a7736005f91b7248b14e644109406c32cb0ba00403a076aa8a4ca42b4e20533206043b0c1 +EBUILD erlang-21.0.2.ebuild 6714 BLAKE2B e8a082a1b0c7b57182e6bae6d878ff226b2ebd3f49fa92d755f79c825c5b9b185da64b8f826c31c4f9f66f5fa6e37492074c6415ecaf8ac2010eb9568c810bb1 SHA512 3c495fe4c31c6e84f2666bd208a5d2c7871d28adb59dcb981af2f9d2119d50820f0eb50d18789903960c9c1251f3b1c00c3df07afee56dc01153ac5e56f12f50 MISC metadata.xml 700 BLAKE2B f71879bdfc301ed27bd8212f074e5dbb176b29bcdab9edeb5ce0ba3dab3d8cb888977a140e91b0a50fbe35960799ab487afa3cd26a7b3b52d01909c678c1f30c SHA512 cada8e7cf719a6f0249c9f8538452d599e9ea938b2d57a9083e728c8f9d1c259871cc0f32c4f01c725692dd5e8270f0f67d84335593bdfe5ae31a54f117b1b84 diff --git a/dev-lang/erlang/erlang-20.3.2.ebuild b/dev-lang/erlang/erlang-20.3.2.ebuild index d9828cad710b..fa93bdca5607 100644 --- a/dev-lang/erlang/erlang-20.3.2.ebuild +++ b/dev-lang/erlang/erlang-20.3.2.ebuild @@ -48,6 +48,7 @@ S="${WORKDIR}/otp-OTP-${PV}" PATCHES=( "${FILESDIR}/18.2.1-wx3.0.patch" "${FILESDIR}/${PN}-20.3.2-dont-ignore-LDFLAGS.patch" + "${FILESDIR}/${PN}-add-epmd-pid-file-creation-for-openrc.patch" ) SITEFILE=50"${PN}"-gentoo.el diff --git a/dev-lang/erlang/erlang-20.3.8.ebuild b/dev-lang/erlang/erlang-20.3.8.ebuild index ed20da173d49..e9f4f68c03bd 100644 --- a/dev-lang/erlang/erlang-20.3.8.ebuild +++ b/dev-lang/erlang/erlang-20.3.8.ebuild @@ -48,6 +48,7 @@ S="${WORKDIR}/otp-OTP-${PV}" PATCHES=( "${FILESDIR}/18.2.1-wx3.0.patch" "${FILESDIR}/${PN}-20.3.2-dont-ignore-LDFLAGS.patch" + "${FILESDIR}/${PN}-add-epmd-pid-file-creation-for-openrc.patch" ) SITEFILE=50"${PN}"-gentoo.el @@ -170,7 +171,7 @@ src_install() { [[ -z "${ERL_ERTS_VER}" ]] && die "Couldn't determine erts version" [[ -z "${ERL_INTERFACE_VER}" ]] && die "Couldn't determine interface version" - emake INSTALL_PREFIX="${ED}" install + emake INSTALL_PREFIX="${D}" install if use doc ; then local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" "${WORKDIR}"/doc/. "${WORKDIR}"/lib/. "${WORKDIR}"/erts-* ) diff --git a/dev-lang/erlang/erlang-20.3.ebuild b/dev-lang/erlang/erlang-20.3.ebuild index 80c077ee54b3..80b1e5b08a41 100644 --- a/dev-lang/erlang/erlang-20.3.ebuild +++ b/dev-lang/erlang/erlang-20.3.ebuild @@ -48,7 +48,8 @@ SITEFILE=50${PN}-gentoo.el src_prepare() { default - eapply "${FILESDIR}"/18.2.1-wx3.0.patch + eapply "${FILESDIR}"/18.2.1-wx3.0.patch \ + "${FILESDIR}"/${PN}-add-epmd-pid-file-creation-for-openrc.patch if ! use odbc; then sed -i 's: odbc : :' lib/Makefile || die diff --git a/dev-lang/erlang/erlang-21.0.2.ebuild b/dev-lang/erlang/erlang-21.0.2.ebuild index 4d85955c4706..874512907a2a 100644 --- a/dev-lang/erlang/erlang-21.0.2.ebuild +++ b/dev-lang/erlang/erlang-21.0.2.ebuild @@ -47,6 +47,7 @@ S="${WORKDIR}/otp-OTP-${PV}" PATCHES=( "${FILESDIR}/18.2.1-wx3.0.patch" "${FILESDIR}/${PN}-20.3.2-dont-ignore-LDFLAGS.patch" + "${FILESDIR}/${PN}-add-epmd-pid-file-creation-for-openrc.patch" ) SITEFILE=50"${PN}"-gentoo.el diff --git a/dev-lang/erlang/files/epmd.init b/dev-lang/erlang/files/epmd.init index 9b3b9e2ad72c..f0ef7c224165 100644 --- a/dev-lang/erlang/files/epmd.init +++ b/dev-lang/erlang/files/epmd.init @@ -1,14 +1,21 @@ #!/sbin/openrc-run -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the Erlang Public License 1.1 +ZT_ADDRESS="" +pidfile="/var/run/epmd.pid" +command_args="-daemon -relaxed_command_check -address 127.0.0.1" + depend() { - need net + need loopback + before sshd } start() { ebegin "Starting Erlang Port Mapper Daemon" - start-stop-daemon --start --quiet --user nobody --group nobody --exec /usr/bin/epmd -- -daemon + start-stop-daemon --start --quiet \ + --pidfile $pidfile \ + --exec /usr/bin/epmd -- $command_args eend $? } diff --git a/dev-lang/erlang/files/erlang-add-epmd-pid-file-creation-for-openrc.patch b/dev-lang/erlang/files/erlang-add-epmd-pid-file-creation-for-openrc.patch new file mode 100644 index 000000000000..56e3946c93fa --- /dev/null +++ b/dev-lang/erlang/files/erlang-add-epmd-pid-file-creation-for-openrc.patch @@ -0,0 +1,90 @@ +From 04ace92c33a699f75445dc99c30d521311aba826 Mon Sep 17 00:00:00 2001 +From: Steve Arnold <nerdboy@gentoo.org> +Date: Mon, 6 Aug 2018 16:38:30 -0700 +Subject: [PATCH] Add daemon-mode pid file creation when not configured for + systemd + +Signed-off-by: Steve Arnold <nerdboy@gentoo.org> +--- + erts/epmd/src/epmd.c | 39 ++++++++++++++++++++++++++++++++++++++- + erts/epmd/src/epmd.h | 3 +++ + 2 files changed, 41 insertions(+), 1 deletion(-) + +diff --git a/erts/epmd/src/epmd.c b/erts/epmd/src/epmd.c +index 44e997e609..c74888a1ee 100644 +--- a/erts/epmd/src/epmd.c ++++ b/erts/epmd/src/epmd.c +@@ -40,6 +40,37 @@ static int check_relaxed(void); + #ifdef __WIN32__ + static int has_console(void); + #endif ++#ifndef HAVE_SYSTEMD_DAEMON ++static int create_pidfile(void); ++static const char *pidfile = EPMD_PIDFILE; ++#endif ++ ++#ifndef HAVE_SYSTEMD_DAEMON ++static int create_pidfile(void) ++{ ++ int fd; ++ ++ unlink(pidfile); ++ ++ /* open the pidfile */ ++ fd = open(pidfile, O_WRONLY|O_CREAT|O_EXCL, 0644); ++ if (fd >= 0) { ++ FILE *f; ++ ++ /* write our pid to it */ ++ f = fdopen(fd, "w"); ++ if (f != NULL) { ++ fprintf(f, "%d\n", getpid()); ++ fclose(f); ++ /* leave the fd open */ ++ return 0; ++ } ++ close(fd); ++ } ++ ++ return -1; ++} ++#endif /* (no) HAVE_SYSTEMD_DAEMON */ + + #ifdef DONT_USE_MAIN + +@@ -340,6 +371,13 @@ static void run_daemon(EpmdVars *g) + + umask(0); + ++#ifndef HAVE_SYSTEMD_DAEMON ++ if (create_pidfile() < 0) { ++ dbg_perror(g,"could not create pidfile %s", pidfile); ++ epmd_cleanup_exit(g,1); ++ } ++#endif /* HAVE_SYSTEMD_DAEMON */ ++ + for (fd = 0; fd < g->max_conn ; fd++) /* close all files ... */ + close(fd); + /* Syslog on linux will try to write to whatever if we dont +@@ -614,4 +652,3 @@ static int check_relaxed(void) + char* port_str = getenv("ERL_EPMD_RELAXED_COMMAND_CHECK"); + return (port_str != NULL) ? 1 : 0; + } +- +diff --git a/erts/epmd/src/epmd.h b/erts/epmd/src/epmd.h +index cffcd4ae7a..e53322acf5 100644 +--- a/erts/epmd/src/epmd.h ++++ b/erts/epmd/src/epmd.h +@@ -20,6 +20,9 @@ + + /* The port number is defined in a makefile */ + ++/* The name and path to the pid file */ ++#define EPMD_PIDFILE "/var/run/epmd.pid" ++ + /* Definitions of message codes */ + + /* Registration and queries */ +-- +2.17.0 + |