3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/pkgs/tools/networking
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
..
6tunnel
aardvark-dns aardvark-dns: 1.0.1 -> 1.0.2 2022-03-24 17:32:44 +10:00
acme-client
ahcpd
aircrack-ng
airfield
altermime
amass amass: 3.17.1 -> 3.18.2 2022-03-22 00:53:21 +00:00
anevicon
argus
argus-clients
aria2
arping arping: clarify license 2022-03-08 10:55:15 +01:00
arpoison
assh
atftp
atinout
autossh
axel
babeld
bacnet-stack
badvpn
bandwhich
bgpdump
bgpq3 bgpq3: 0.1.36 -> 0.1.36.1 2022-02-12 16:18:32 +01:00
bgpq4
biosdevname
bitmask-vpn
bore
boringtun boringtun: 0.3.0 -> 0.4.0 2022-03-12 15:02:03 +08:00
boundary boundary: 0.7.5 -> 0.7.6 2022-03-16 20:15:37 -04:00
brook brook: 20220404 -> 20220406 2022-03-21 23:49:07 +08:00
bsd-finger fingerd_bsd: "merge" with finger_bsd 2022-03-14 12:56:17 -03:00
bud bud: switch to fetchFromGitHub 2022-03-14 19:32:48 +01:00
bukubrow
bully
burpsuite
bwm-ng
cadaver
calendar-cli
cantoolz
carddav-util
cassowary
cbftp
cdpr
changetower
chaos chaos: 0.1.9 -> 0.2.0 2022-02-12 21:31:09 -08:00
checkip checkip: 0.18.1 -> 0.19.0 2022-03-12 03:59:32 +00:00
chisel
chrony treewide: remove meta.repositories 2022-03-24 23:56:14 +02:00
circus
cjdns
cksfv
clash clash: 1.6.0 -> 1.10.0 2022-03-21 07:23:35 +00:00
cloud-custodian
cloudflare-warp cloudflare-warp: init at 2022.02.24 2022-03-18 11:03:47 -06:00
cmst cmst: 2022.01.05 -> 2022.03.13 2022-03-14 04:35:33 +00:00
cnping
cntlm
cocom
connect
connman
corerad corerad: 1.1.0 -> 1.1.1 2022-03-20 13:06:17 -04:00
corkscrew
crackle
croc croc: 9.5.1 -> 9.5.2 2022-02-24 18:57:07 +10:00
curl
curl-unix-socket
curlie
darkstat
davix davix-copy: remove appendToName to have a consistent package name for repology 2022-02-28 12:45:43 +01:00
dcap
dd-agent datadog-agent: 7.33.0 -> 7.33.1 2022-02-16 23:37:29 +01:00
ddclient
dhcp
dhcpcd
dhcpdump
dhcping
dibbler
dirb
djbdns
dnschef
dnscrypt-proxy2
dnscrypt-wrapper
dnsmasq dnsmasq: honor dbusSupport 2022-03-06 21:24:28 +02:00
dnsperf
dnsproxy dnsproxy: 0.41.4 -> 0.42.0 2022-03-22 04:03:20 +00:00
dnstake
dnstop
dnstracer
dnstwist
dnsviz
dogdns
driftnet
drill treewide: use lib.getLib for OpenSSL libraries 2022-03-30 15:10:00 +00:00
dropbear
dsniff
easyrsa
eggdrop
email
eternal-terminal eternal-terminal: remove broken linker flag for c++fs () 2022-02-22 19:07:01 -05:00
evillimiter
fakeroute
fast-ssh
fastd
fdm
ferm
filegive
findomain findomain: 7.0.0 -> 7.0.1 2022-02-26 05:17:38 +00:00
flannel flannel: 0.16.3 -> 0.17.0 2022-03-14 21:58:53 +10:00
flvstreamer
fping fping: 5.0 -> 5.1 2022-02-12 10:32:29 +01:00
freebind
frp frp: 0.39.1 -> 0.40.0 2022-03-12 08:47:34 +00:00
gandi-cli
gemget
getmail6
ghostunnel
globalprotect-openconnect
gmrender-resurrect
gnirehtet
go-shadowsocks2
gobgp gobgp: 2.34.0 -> 3.0.0 2022-03-02 06:06:18 +00:00
godns godns: 2.6 -> 2.7 2022-02-28 13:55:34 +08:00
godspeed
goflow goflow: init at 3.4.3 2022-03-08 18:59:06 +01:00
goimapnotify
goklp
goreplay
gost
gping gping: 1.2.7 -> 1.3.0 2022-02-25 08:00:10 +00:00
grpcui grpcui: 1.2.0 -> 1.3.0 2022-02-16 09:50:51 +00:00
grpcurl
guardian-agent
gupnp-tools
gvpe
gvproxy
hans
haproxy haproxy: 2.5.3 -> 2.5.4 2022-03-07 13:39:08 +01:00
hey hey: enable tests 2022-03-16 11:02:32 -03:00
horst
hp2p
hping
hss
htpdate
http-prompt
http2tcp
httperf
httpie httpie: 3.0.2 -> 3.1.0 2022-03-16 10:12:26 +01:00
httping
httplab
httplz httplz: 1.12.3 -> 1.12.4 2022-02-26 07:27:35 +00:00
httpstat
httptunnel
hue-cli
hurl
hyenae
i2p
i2pd i2pd: 2.40.0 -> 2.41.0 2022-02-21 09:53:17 +00:00
ifstat-legacy
iftop
igmpproxy
imapsync
inadyn
inetutils
innernet innernet: 1.5.3 -> 1.5.4 2022-03-17 12:00:25 +00:00
iodine
iouyap
ip2location
ip2unix
ipcalc
iperf iperf: 3.10.1 -> 3.11 2022-03-13 12:31:33 +03:00
ipgrep
ipinfo
ipv6calc
isync
iwgtk
jnettop
junkie
jwhois
kail
kapp kapp: 0.45.0 -> 0.46.0 2022-02-19 16:52:37 +00:00
kea kea: 2.0.1 -> 2.0.2 2022-03-04 16:30:24 +01:00
keepalived
lftp
libnids
libreswan
ligolo-ng ligolo-ng: 0.2 -> 0.3.2 2022-02-12 13:47:27 +00:00
linkchecker
linux-router
lldpd
logmein-hamachi
lsh
lxi-tools
lychee lychee: 0.8.2 -> 0.9.0 2022-03-23 19:24:48 +00:00
magic-wormhole-rs magic-wormhole-rs: init at 0.3.0 2022-03-17 22:27:19 +01:00
maildrop
mailsend
mailutils mailutils: add debug info 2022-03-03 13:57:16 +00:00
maphosts
maxscale
mcrcon
mdk4
megatools
memtier-benchmark
minidlna minidlna: add passthrough test 2022-03-06 12:53:45 +01:00
minio-client minio-client: 2022-03-13T22-34-00Z -> 2022-03-17T20-25-06Z 2022-03-18 23:59:21 +00:00
minissdpd
miniupnpc
miniupnpd
miredo
mmsd
modemmanager
mole
moodle-dl
mosh
mozwire
mpack
mqttui mqttui: 0.16.0 -> 0.16.1 2022-03-23 20:56:49 +01:00
mtr
mtr-exporter
mu
mubeng mubeng: 0.9.2 -> 0.9.3 2022-03-03 11:28:38 +00:00
n2n
nat-traverse
nbd nbd: add programs.nbd, services.nbd, and test 2022-03-09 12:00:47 +00:00
ncftp
ndisc6
ndjbdns
ndn-tools
nebula
netavark netavark: 1.0.1 -> 1.0.2 2022-03-24 17:32:44 +10:00
netboot
netcat
netdiscover netdiscover: 0.8.1 -> 0.9 2022-02-21 14:09:27 +00:00
nethogs
netifd
netkit/tftp
netmask
netproc netproc: init at unstable-2022-02-11 2022-03-16 13:21:19 +08:00
netrw
netselect
netsniff-ng
nettee
networkmanager networkmanager: 1.34.0 -> 1.36.2 2022-03-09 17:04:39 +00:00
nfdump
nfstrace
ngrep
ngrok-1
ngrok-2
nikto
noip
notemap notemap: fix darwin build 2022-02-18 16:07:35 -05:00
nss-mdns
nss-pam-ldapd nss_pam_ldapd: 0.9.11 -> 0.9.12 2022-02-24 00:14:10 +01:00
ntopng ntopng: 2.0 -> 5.2.1 2022-02-16 20:48:59 +03:00
ntp treewide: use lib.getLib for OpenSSL libraries 2022-03-30 15:10:00 +00:00
nttcp
ntttcp
nuttcp
nxdomain
nylon
nyx
nzbget
oapi-codegen oapi-codegen: 1.9.0 -> 1.9.1 2022-02-17 18:19:50 +01:00
obfs4 treewide: remove meta.repositories 2022-03-24 23:56:14 +02:00
ocproxy
ocserv ocserv: 1.1.5 -> 1.1.6 2022-02-25 10:56:57 -08:00
offlineimap
ofono ofono: 1.33 -> 1.34 2022-02-15 13:21:46 +01:00
oha
olsrd
oneshot
ookla-speedtest
oonf-olsrd2
openapi-generator-cli openapi-generator-cli-unstable: 6.0.0-2021-01-18 -> 6.0.0-2022-03-18 2022-03-18 19:15:36 +01:00
openconnect
opendrop opendrop: init at 0.13.0 2022-02-25 13:54:28 -06:00
openfortivpn openfortivpn: fix on darwin () 2022-02-18 20:15:46 +01:00
openntpd
openresolv
opensm
opensnitch nixos/opensnitch: Add options to configure daemon 2022-03-02 18:38:56 -05:00
openssh openssh_hpn: 8.8p1 -> 8.9p1 2022-03-04 02:50:34 +05:30
openvpn openvpn: 2.4.11 -> 2.4.12 (security, CVE-2022-0547) 2022-03-17 22:47:40 +01:00
owl owl: init at unstable-2022-01-30 2022-02-25 13:52:53 -06:00
p2p gtkgnutella: 1.2.1 -> 1.2.2 2022-03-01 11:50:56 +00:00
packetdrill
pacparser
par2cmdline
passh
pcapc
pcapfix
pdnsd
pdsh
persepolis maintainers: remove linarcx 2022-02-20 04:20:00 +00:00
philter
phodav
photon
pingtcp
pirate-get pirate-get: 0.4.1 -> 0.4.2 2022-03-16 05:58:48 +00:00
pixiecore
pixiewps
pmacct
polygraph
ppp treewide: use lib.getLib for OpenSSL libraries 2022-03-30 15:10:00 +00:00
pptp
pptpd
prettyping
pritunl-ssh
privoxy
proxify proxify: 0.0.5 -> 0.0.6 2022-02-14 04:26:14 +00:00
proxychains
proxychains-ng
pssh
pwnat
py-wmi-client
pykms
qodem
qrcp qrcp: 0.9.0 -> 0.9.1 2022-03-14 19:10:42 +01:00
quickserve
quicktun
radsecproxy
radvd
ratman
ratools
rcon
rdap rdap: init at 2019-10-17 2022-03-04 09:24:06 -06:00
rdrview
reaver-wps reaverwps: enable parallel build () 2022-02-12 09:23:43 -05:00
reaver-wps-t6x
redfang
redir
redsocks
ripmime
rp-pppoe
rshijack
rtptools
rustcat
s3cmd
s3gof3r s3gof3r: switch to fetchFromGitHub 2022-03-14 19:32:47 +01:00
s3rs
s4cmd
s5cmd
s6-dns
s6-networking
saldl
samplicator
shadowfox
shadowsocks-libev
shadowsocks-rust shadowsocks-rust: fix build () 2022-03-11 17:06:31 +01:00
shadowsocks-v2ray-plugin
shncpd
shorewall
siege siege: 4.1.1 -> 4.1.2 2022-03-21 20:29:59 +01:00
simpleproxy
sipcalc
sipsak
sish sish: 2.0.1 -> 2.1.0 2022-02-21 18:48:28 +00:00
slack-cli
slirp4netns
slowlorust
smartdns
smokeping
snabb
snet snet: Init at unstable-2021-11-26 2022-03-07 23:40:07 +08:00
sniffglue sniffglue: 0.14.0 -> 0.15.0 2022-03-05 17:42:17 +00:00
snmpcheck
snowflake
socat treewide: remove meta.repositories 2022-03-24 23:56:14 +02:00
sockperf sockperf: 3.7 -> 3.8 2022-03-12 22:38:45 +00:00
spiped
spoof-mac
spoofer
srelay
ssh-agents
ssh-askpass-fullscreen
ssh-ident
ssh-key-confirmer
sshoogr
sshpass
sshping
ssldump
sslsplit
ssmtp
sstp
stevenblack-blocklist
strongswan
stun
stunnel stunnel: 5.62 -> 5.63 2022-03-22 17:27:01 +00:00
stuntman
subfinder subfinder: 2.4.9 -> 2.5.0 2022-03-07 17:31:56 +00:00
suckit
surfraw
swagger-codegen
swagger-codegen3
swaks
tayga
tcp-cutter
tcpdump Revert "tcpdump: Filter Darwin from supported platforms ()" 2022-03-16 08:58:49 +10:00
tcpflow
tcpreplay tcpreplay: 4.4.0 -> 4.4.1 2022-02-13 17:10:40 +00:00
tcptraceroute
tdns-cli
telepresence
telepresence2
tendermint tendermint: 0.35.1 -> 0.35.2 2022-03-04 19:06:06 +00:00
termscp
termshark
tftp-hpa
tgt
tinc
tinyfecvpn
tinyproxy
tinyssh tinyssh: 20220305 -> 20220311 2022-03-13 00:34:47 +00:00
tlspool
tnat64
toss
tox-node
toxvpn
tracebox
traceroute
trickle
tridactyl-native
tunnelto
tuntox libtoxcore: 0.2.13 -> 0.2.17 2022-03-23 11:33:46 +01:00
twa
ua ua: switch to fetchFromGitHub 2022-03-14 19:32:08 +01:00
ubridge
ucspi-tcp
udptunnel
uget
uget-integrator
unbound treewide: use lib.getLib for OpenSSL libraries 2022-03-30 15:10:00 +00:00
updog
uqmi
urlwatch
userhosts
uwimap treewide: use lib.getLib for OpenSSL libraries 2022-03-30 15:10:00 +00:00
v2ray
vde2
vegeta
vlan
vopono
vpn-slice
vpnc vpnc: don't produce non-free binaries by default 2022-02-19 22:32:51 +00:00
vpnc-scripts
waitron waitron: switch to fetchFromGitHub 2022-03-14 19:32:08 +01:00
wakelan wakelan: ibiblioPubLinux mirror 2022-03-13 21:20:49 -03:00
wakeonlan
wavemon
wbox
webalizer
webwormhole
weighttp
wg-friendly-peer-names
wg-netmanager wg-netmanager: 0.5.0 -> 0.5.1 2022-02-23 09:08:58 +01:00
wget wget: 1.21.2 -> 1.21.3 2022-03-07 12:33:04 +00:00
wget2
whois whois: 5.5.11 -> 5.5.12 2022-03-05 16:19:26 +01:00
wifish
wifite2
wireguard-go
wireguard-tools
wol
wolfebin
wormhole-william
wrk
wrk2
wuzz wuzz: 0.2.0 -> 0.5.0 2022-02-18 23:03:17 +01:00
x11-ssh-askpass
xh
xl2tpd
xnbd
xrootd xrootd: 5.4.0 -> 5.4.1 2022-02-25 00:12:12 +00:00
xxh python3Packages.xxh: limit the supported Python releases 2022-02-14 13:38:36 +01:00
yggdrasil
yrd
ytcc ytcc: 2.5.4 -> 2.5.5 2022-03-12 22:22:20 +00:00
zap
zerotierone
zs-apc-spdu-ctl
zs-wait4host
zssh