3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

34 commits

Author SHA1 Message Date
7c6f434c 8188f10752
Merge pull request #166430 from alyssais/openssl-static-retry
treewide: use lib.getLib for OpenSSL libraries
2022-04-02 12:59:55 +00:00
Alyssa Ross fd78240ac8
treewide: use lib.getLib for OpenSSL libraries
At some point, I'd like to make another attempt at
71f1f4884b ("openssl: stop static binaries referencing libs"), which
was reverted in 195c7da07d.  One problem with my previous attempt is
that I moved OpenSSL's libraries to a lib output, but many dependent
packages were hardcoding the out output as the location of the
libraries.  This patch fixes every such case I could find in the tree.
It won't have any effect immediately, but will mean these packages
will automatically use an OpenSSL lib output if it is reintroduced in
future.

This patch should cause very few rebuilds, because it shouldn't make
any change at all to most packages I'm touching.  The few rebuilds
that are introduced come from when I've changed a package builder not
to use variable names like openssl.out in scripts / substitution
patterns, which would be confusing since they don't hardcode the
output any more.

I started by making the following global replacements:

    ${pkgs.openssl.out}/lib -> ${lib.getLib pkgs.openssl}/lib
    ${openssl.out}/lib -> ${lib.getLib openssl}/lib

Then I removed the ".out" suffix when part of the argument to
lib.makeLibraryPath, since that function uses lib.getLib internally.

Then I fixed up cases where openssl was part of the -L flag to the
compiler/linker, since that unambigously is referring to libraries.

Then I manually investigated and fixed the following packages:

 - pycurl
 - citrix-workspace
 - ppp
 - wraith
 - unbound
 - gambit
 - acl2

I'm reasonably confindent in my fixes for all of them.

For acl2, since the openssl library paths are manually provided above
anyway, I don't think openssl is required separately as a build input
at all.  Removing it doesn't make a difference to the output size, the
file list, or the closure.

I've tested evaluation with the OfBorg meta checks, to protect against
introducing evaluation failures.
2022-03-30 15:10:00 +00:00
Sandro d3fb4568b3
monit: don't abuse meta.homepage 2022-03-27 17:15:21 +02:00
R. Ryantm 76a6908a09 monit: 5.31.0 -> 5.32.0 2022-03-27 09:19:53 +00:00
R. Ryantm fd61918dfd monit: 5.30.0 -> 5.31.0 2022-02-24 17:12:30 +00:00
R. Ryantm 4c62413a49 monit: 5.29.0 -> 5.30.0 2022-02-13 09:42:55 -08:00
Ryan Mulligan 27a37154de monit: 5.27.2 -> 5.29.0; format 2021-09-01 16:53:21 -07:00
Felix Buehler 051fcdbe8b tools/{security/system}: replace name with pname&version 2021-07-27 17:54:21 +02:00
Ryan Mulligan 3864dcea59 monit: add ryantm to maintainers 2021-02-26 11:37:18 -08:00
R. RyanTM e4bbdba929 monit: 5.27.1 -> 5.27.2 2021-01-20 05:52:16 +00:00
Ben Siraphob 8c5d37129f pkgs/tools: stdenv.lib -> lib 2021-01-15 17:12:36 +07:00
R. RyanTM 9035d97fd1 monit: 5.27.0 -> 5.27.1 2020-11-03 11:09:23 +00:00
R. RyanTM 976856c30c
monit: 5.26.0 -> 5.27.0 (#92361) 2020-07-07 21:43:26 +02:00
Michael Reilly 84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
R. RyanTM 13158dd4d1 monit: 5.25.3 -> 5.26.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/monit/versions
2019-07-15 14:58:38 -07:00
R. RyanTM 79ed374fde monit: 5.25.2 -> 5.25.3
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/monit/versions
2019-03-25 23:43:30 -07:00
John Ericson 34da7e2ce2 treewide: Remove stdenv.isCross
I *want* cross-specific overrides to be verbose, so I rather not have
this shorthand. This makes the syntactic overhead more proportional to
the maintainence cost. Hopefully this pushes people towards fewer
conditionals and more abstractions.
2018-08-02 15:01:58 -04:00
R. RyanTM cd1dd31772 monit: 5.25.1 -> 5.25.2
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/monit/versions.

These checks were done:

- built on NixOS
- /nix/store/mh4qnd2ljfha67cv20lvkiyxr1cj0ar7-monit-5.25.2/bin/monit passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 5.25.2 with grep in /nix/store/mh4qnd2ljfha67cv20lvkiyxr1cj0ar7-monit-5.25.2
- directory tree listing: https://gist.github.com/510e765f79571ddc4c2542c69dffc6f3
- du listing: https://gist.github.com/31af9a371bca965d4d606614e84025d4
2018-06-05 23:44:33 -07:00
Jörg Thalheim 9d7959de31
Merge pull request #35248 from telent/cross-monit
monit: cross-compile, and make openssl optional
2018-04-21 08:56:12 +01:00
Ryan Mulligan b7dcc45c49 monit: 5.23.0 -> 5.25.1
Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/qphnal7xszj71fmmy0l2kvz2d3bqpw1x-monit-5.25.1/bin/monit -h` got 0 exit code
- ran `/nix/store/qphnal7xszj71fmmy0l2kvz2d3bqpw1x-monit-5.25.1/bin/monit --help` got 0 exit code
- ran `/nix/store/qphnal7xszj71fmmy0l2kvz2d3bqpw1x-monit-5.25.1/bin/monit -V` and found version 5.25.1
- ran `/nix/store/qphnal7xszj71fmmy0l2kvz2d3bqpw1x-monit-5.25.1/bin/monit --version` and found version 5.25.1
- found 5.25.1 with grep in /nix/store/qphnal7xszj71fmmy0l2kvz2d3bqpw1x-monit-5.25.1
- found 5.25.1 in filename of file in /nix/store/qphnal7xszj71fmmy0l2kvz2d3bqpw1x-monit-5.25.1

cc "@raskin @wmertens"
2018-02-27 06:16:55 -08:00
Daniel Barlow 9cdb7fe722 monit: cross-compile, and make openssl optional
Upstream Monit optionally uses OpenSSL to provide TLS support in its
builtin admin web server.  Being able to turn off SSL in Nixpkgs'
monit derivation makes it much easier to build Monit on embedded
systems.

Security implication: if you choose not to build in openssl
then you should probably configure Monit to allow access only from
localhost.
2018-02-20 22:02:34 +00:00
Willi Butz 4872be756d monit: 5.20.0 -> 5.23.0 2017-08-09 21:50:21 +02:00
Graham Christensen 1376aeba42
monit: 5.19.0 -> 5.20.0 for CVE-2016-7067 2016-11-17 08:45:56 -05:00
Jörg Thalheim 6b34a62ef8
monit: 5.10 -> 5.19.0
monit disables SSLv23 now by default, see

- https://mmonit.com/monit/changes/
- https://lwn.net/Vulnerabilities/691497/
2016-09-24 09:46:25 +02:00
Tuomas Tynkkynen 21f17d69f6 treewide: Add lots of meta.platforms
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
Tuomas Tynkkynen 2a73de6e6c treewide: Make explicit that 'dev' output of openssl is used 2016-05-19 10:02:23 +02:00
Tuomas Tynkkynen d91c7347d1 treewide: Mass replace 'openssl}/lib' to refer the 'out' output 2016-01-24 10:03:38 +02:00
Michael Raskin 04635a87eb Update monit 2014-11-03 16:54:38 +03:00
Bjørn Forsman 3a060bbcc6 Add missing 's' in remaining meta.maintainer(s) attrs 2014-07-22 23:49:21 +02:00
wmertens 7fafc6ff85 monit: bump 5.8 -> 5.8.1 (bug fixes) 2014-05-25 19:27:10 +02:00
Wout Mertens 1e711ee42d Fix OpenSSL requirement 2014-05-09 22:47:45 +02:00
Wout Mertens 6ab576b702 Monit: Bump to 5.8
- Use callPackage etc
- Make PAM optional
2014-05-04 09:53:26 +02:00
Michael Raskin bb99b88e9b Update Monit 2012-12-04 10:21:36 +04:00
Michael Raskin f16657b14f Adding monit monitoring tool; in the course of action creating a script to auto-prepare basic autoupdate layout
svn path=/nixpkgs/trunk/; revision=16863
2009-08-26 16:22:20 +00:00