mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 05:31:22 +00:00
Code Issues Wiki Activity
67496 commits 319 branches 124 tags 6.6 GiB
Commit graph

1719 commits

Author SHA1 Message Date
Tobias Geerinckx-Rice 98b2d7b727 Separate nativeBuildInputs where maintainers |= nckx 2015-06-17 22:21:32 +02:00
William A. Kennington III bc4e1f3c1a inetutils: 1.9.3 -> 1.9.4 2015-06-16 15:20:28 -07:00
Pascal Wittmann 4e0fb6578a strongswan: update from 5.2.1 to 5.3.2, fixes CVE-2015-4171 2015-06-14 21:44:18 +02:00
Michael Raskin 9c726f502d Update getmail 2015-06-14 11:22:40 +03:00
Joachim Fasting 114cb31b65 dnscrypt-proxy: enable systemd support on linux 
This permits using socket activation in the NixOS service
module.
 2015-06-12 15:12:33 +02:00
Arseniy Seroka 2e5f4a0152 Merge pull request #8255 from adevress/master 
New expression for the davix toolkit
 2015-06-12 00:52:37 +02:00
Adrien Devresse f12a466730 New expression for the davix toolkit 2015-06-11 22:57:13 +02:00
John Chee 85da7792b8 openconnect: update to version 7.06 and support openssl or gnutls 2015-06-11 11:56:18 -07:00
Pascal Wittmann d362ef845e Merge pull request #8250 from pesterhazy/fix/httpie 
httpie: bump version to fix ImportError
 2015-06-09 19:19:08 +02:00
Paulus Esterhazy fdc8e6beff httpie: bump version to fix ImportError 
Fixes https://github.com/jakubroztocil/httpie/issues/314
 2015-06-09 17:45:00 +02:00
lethalman 253d30b986 Merge pull request #8231 from DamienCassou/add-carddav-util 
Add carddav-util
 2015-06-09 10:39:46 +02:00
William A. Kennington III ddafa487fc dnstop: Update to 20140915 2015-06-08 17:59:09 -07:00
Damien Cassou 5647c894c6 Add carddav-util 2015-06-08 18:03:41 +02:00
Tobias Geerinckx-Rice dd6ceb61fa netsniff-ng -> 0.5.9-10-gb7ece46 2015-06-08 16:56:54 +02:00
Arseniy Seroka 24a8c23617 Merge pull request #8212 from ktosiek/sstp-1.0.10 
Bump sstp to 1.0.10
 2015-06-08 14:28:27 +03:00
Tomasz Kontusz 380c7d1f72 Bump sstp to 1.0.10 2015-06-08 00:23:46 +02:00
Arseniy Seroka 70b5e51456 Merge pull request #8178 from jagajaga/fix/versions 
fix: add missing versions
 2015-06-06 00:22:10 +03:00
William A. Kennington III ffd0539eba cacert: store ca-bundle.crt in $out/etc/ssl/certs instead of $out 2015-06-05 13:00:52 -07:00
lethalman 9683743e68 Merge pull request #8191 from ragnard/wrk-update 
wrk: Update from 3.1.2 to 4.0.0 (master)
 2015-06-05 18:31:18 +02:00
Ragnar Dahlén 45cad45e4d wrk: Update from 3.1.2 to 4.0.0 (master) 2015-06-05 15:15:21 +01:00
Arseniy Seroka daf4ec39a5 fix: add missing versions 2015-06-04 23:34:14 +03:00
Eelco Dolstra cde5053d9a Revert "curl: Modernize build" 
This reverts commit 5e3fe3916a.
 2015-06-04 14:54:52 +02:00
Eelco Dolstra 68493cd8dc Revert "curl: propagate inputs instead of patching pkgconfig" 
This reverts commit 206d63edac.
 2015-06-04 14:54:51 +02:00
Eelco Dolstra 98a4eabd99 Revert "qemu: 2.2.2 -> 2.3.0" 
This reverts commit 19c259161b.
 2015-06-04 14:54:48 +02:00
Eelco Dolstra 3096d03435 Revert "Refactor mkFlag / shouldUsePkg into the nixpkgs libraries" 
This reverts commit 25a148fa19.
 2015-06-04 14:54:48 +02:00
Domen Kožar 23c845f526 Merge pull request #8119 from mbbx6spp/fix-dd-agent-package 
Fix dd-agent buildInputs to include pythonPackages.psutil
 2015-06-03 09:11:10 +02:00
Patrick Mahoney 74964c255e Update skarnet.org software 
execline           2.1.2.0
s6-dns             2.0.0.3
s6-networking      2.1.0.1
s6-portable-utils  2.0.5.0
skalibs            2.3.4.0
 2015-06-01 15:20:56 -05:00
Patrick Mahoney 9835f18fbd Add myself as maintainer for skarnet software 2015-06-01 15:20:56 -05:00
Susan Potter 727565279f Fix dd-agent buildInputs to include pythonPackages.psutil 
When deploying current master version journalctl showed ImportErrors in the logs with message:
'No module named psutil' and systemctl dd-agent service failed to start. To fix I added
pythonPackages.psutil as a buildInputs entry and this fixed the issue.

See this Gist for journalctl errors for reference:
https://gist.github.com/mbbx6spp/59eefabbe708c335a31f
 2015-06-01 13:54:13 -05:00
Tobias Geerinckx-Rice 13cc88f273 netsniff-ng -> 0.5.9-5-g107456c 
Provides more detailed rtnl dumps.
 2015-06-01 04:09:30 +02:00
codyopel 75f64a8bc4 tcpdump: 4.7.3 -> 4.7.4 2015-05-31 20:28:31 -04:00
Vladimír Čunát 6bc372af69 inadyn: fix build and typo in name 
/cc maintainer @viric.
 2015-05-30 19:34:55 +02:00
William A. Kennington III 14c1e0fa1f Fix ca-bundle paths 2015-05-29 14:03:34 -07:00
Pascal Wittmann 86e6e490ff nzbget: update from 14.2 to 15.0 2015-05-29 19:07:52 +02:00
Tobias Geerinckx-Rice 158e1cfdd0 Don't use "with licenses;" for single licences 
And don't use square brackets on such lines.
 2015-05-28 19:20:29 +02:00
Tobias Geerinckx-Rice b2d7f4b1ba Use common licence attributes from lib/licenses.nix 
Many (less easily automatically converted) old-style strings
remain.

Where there was any possible ambiguity about the exact version or
variant intended, nothing was changed. IANAL, nor a search robot.

Use `with stdenv.lib` wherever it makes sense.
 2015-05-27 22:00:06 +02:00
Rob Vermaas 49b5acc3d9 Upgrade dhcpcd to 6.9.0. Version 6.8.1 caused issues on GCE, making the instances unavailable. 2015-05-27 11:43:14 +00:00
Mateusz Kowalczyk 164a5ef32a Merge pull request #8006 from DamienCassou/update-offlineimap-6.5.7 
Update offlineimap 6.5.6 -> 6.5.7
 2015-05-26 14:16:06 +01:00
Damien Cassou 5f92dcce36 Update offlineimap 6.5.6 -> 6.5.7 2015-05-26 15:12:40 +02:00
William A. Kennington III c2a32a689d nbd: 3.10 -> 3.11 2015-05-26 01:36:35 -07:00
William A. Kennington III 96178127c5 aria2: 1.18.10 -> 1.19.0 2015-05-26 01:36:35 -07:00
Tobias Geerinckx-Rice c4a2f4f4b1 darkstat 3.0.718 -> 3.0.719 
- Implement tracking of remote ports: shows which ports the host
  is making outgoing connections to. Long time feature request.
- Bugfix: when the capture interface goes down, exit instead of
  busy-looping forever.
- Fix "clock error" due to machine reboot.
- SIGUSR1 now resets the time and bytes reported on the graphs
  page.
- Account for all IP protocols.
- Change the default ports_max to only twice the default
  ports_keep.
 2015-05-25 13:35:54 +02:00
William A. Kennington III 580032914f dhcp: Add proper bind dependency 2015-05-24 15:05:25 -07:00
William A. Kennington III 25a148fa19 Refactor mkFlag / shouldUsePkg into the nixpkgs libraries 2015-05-22 13:26:55 -07:00
Tobias Geerinckx-Rice 5d5044b2ec Use mirror:// URIs for ftp.debian.org 
Provide a more robust experience for users with horrible network
hardware (me).
 2015-05-22 10:39:27 +02:00
Damien Cassou 188a067d8e Merge pull request #7929 from DamienCassou/update-networkmanager-1.0.2 
networkmanager 1.0.0 -> 1.0.2
 2015-05-22 10:19:48 +02:00
Damien Cassou 3a50708958 network-manager 1.0.0 -> 1.0.2 2015-05-22 10:17:01 +02:00
William A. Kennington III 19c259161b qemu: 2.2.2 -> 2.3.0 2015-05-20 18:30:22 -07:00
Luca Bruno 404608478d networkmanagerapplet: fix VPN plugins path. Closes #7908 2015-05-20 11:57:42 +00:00
William A. Kennington III ef7c804a6f openresolv: 3.5.7 -> 3.7.0 2015-05-20 00:03:48 -07:00
Luca Bruno 9adde87fea More usage of gnome3.defaultIconTheme 2015-05-19 14:44:27 +02:00
Nikolay Amiantov ab7d2f7f39 network-manager-l2tp: add homepage 2015-05-18 17:21:08 +03:00
Domen Kožar ea2c17571d miniupnp{c,d}: bump 2015-05-16 20:34:40 +02:00
William A. Kennington III da719f19a6 inetutils: 1.9.2 -> 1.9.3 2015-05-15 18:38:13 -07:00
William A. Kennington III 52587b9f81 tinc-pre: 2015-03-14 -> 2015-05-15 2015-05-15 18:38:12 -07:00
Spencer Whitt 4c76dda4dd curl 7.15: Disable on Darwin 
Build is failing and this version of curl is not used for anything
useful on Darwin, so it's not worth fixing.
 2015-05-15 11:58:21 -04:00
Spencer Whitt 3f6b56812c bwm_ng: clang fix 2015-05-15 11:58:20 -04:00
Pascal Wittmann 9ac11fb2ef inadyn: fix & update from 1.99.10 to 1.99.13 2015-05-14 19:36:09 +02:00
Pascal Wittmann bb9e9cc3f8 Turned some meta.maintainers into lists 2015-05-14 19:09:43 +02:00
Eric Seidel 67fe5d46d4 Merge pull request #7817 from gridaphobe/cc-wrapper-isgnu-isclang 
Add isGNU and isClang attributes to cc-wrapper
 2015-05-14 10:09:07 -07:00
Pascal Wittmann 9c9c586534 Fixed several "package has no version" warnings 2015-05-14 17:19:41 +02:00
Charles Strahan 7021988dd1 Merge pull request #7818 from cstrahan/nmtui2 
networkmanager: enable nmtui, the curses interface
 2015-05-13 00:46:04 -04:00
Shea Levy 206d63edac curl: propagate inputs instead of patching pkgconfig 2015-05-12 13:07:58 -04:00
Shea Levy f168973bfd Revert "curl: Improve .pc and .la patching" 
This breaks on darwin with:

> sed: -e: No such file or directory

This reverts commit 26c37ded73.
 2015-05-12 12:49:36 -04:00
Charles Strahan 1677b33162 networkmanager: enable nmtui, the curses interface 2015-05-11 20:54:17 -04:00
William A. Kennington III 26c37ded73 curl: Improve .pc and .la patching 2015-05-11 15:12:38 -07:00
Eric Seidel 662a6b1ca6 remove all references to stdenv.cc.cc.is{GNU,Clang} 
use the new `stdenv.cc.is{GNU,Clang}` instead, which will always be
defined.
 2015-05-11 14:44:50 -07:00
Tobias Geerinckx-Rice c7c10f28ad netsniff-ng -> 0.5.9 2015-05-11 23:12:09 +02:00
Michael Raskin b51dbb22dd Update badvpn 2015-05-10 13:46:31 +02:00
Lluís Batlle i Rossell 282354a6cf Updating cjdns to latest master. 
It has important stability fixes.
 2015-05-09 20:22:58 +00:00
William A. Kennington III c9395e1e92 Merge branch 'master' into staging 2015-05-08 05:59:50 -07:00
Luca Bruno eb98989cf0 Add libcrafter and tracebox 2015-05-08 13:20:27 +02:00
Tobias Geerinckx-Rice 0db1bb5bda wget: verify cookie domains with libpsl 
Reduces vulnerability to "supercookie" attacks:
<http://comments.gmane.org/gmane.comp.web.wget.general/12820>
 2015-05-07 17:30:20 +02:00
William A. Kennington III 074c4a7f78 Merge remote-tracking branch 'upstream/master' into staging 2015-05-07 01:44:49 -07:00
William A. Kennington III faf57b2d05 radvd: 2.10 -> 2.11 2015-05-04 23:20:34 -07:00
Tobias Geerinckx-Rice aaef57d4c2 netsniff-ng -> v0.5.9-rc5-22-gdafb89c 
- Show the packet number as part of the dissector output
- Reorder packet number output
- Print 'IE:' prefix before each mgmt IE parameter
- Print probe request IEs info
- Alias lb to rr as well
 2015-05-03 22:29:13 +02:00
William A. Kennington III 5e3fe3916a curl: Modernize build 2015-05-01 15:57:14 -07:00
William A. Kennington III 00df204c82 Merge remote-tracking branch 'upstream/master' into staging 2015-05-01 15:57:09 -07:00
William A. Kennington III 9d5a3e62cf curl: 7.42.0 -> 7.42.1 2015-05-01 15:06:39 -07:00
Joachim Fasting bf7ad2d84f meta.description fixups 
Mostly scripted substitutions with a couple of subjective enhancements.
 2015-04-30 18:17:42 +02:00
Thomas Tuegel 66b66e8302 openconnect: depend on zlib 2015-04-30 11:14:24 -05:00
Thomas Tuegel 1fe28a1132 Merge remote-tracking branch 'upstream/master' into staging 2015-04-29 11:33:28 -05:00
Herwig Hochleitner 9754783b06 i2p: fix compilation 
- use system jdk instead of hardcoded openjdk
- remove backgrounding of service launcher
 2015-04-28 15:17:58 +02:00
Herwig Hochleitner c6562348b8 i2p: update 0.9.18 -> 0.9.19 2015-04-28 14:35:36 +02:00
Pascal Wittmann f99d5cf2fc Fixed some descriptions 2015-04-28 10:55:20 +02:00
Tobias Geerinckx-Rice f401b3cf0b httping 2.3.4 -> 2.4 
Also add support for the fancy ncurses interface.
 2015-04-28 02:22:25 +02:00
lethalman 458ea6d506 Merge pull request #7480 from dezgeg/pr-ddclient-line-buffering 
ddclient: Force line buffering on stdout
 2015-04-27 12:16:50 +02:00
William A. Kennington III 6a366d535a eggdrop: Refactor 2015-04-26 21:30:28 -07:00
Vladimír Čunát 30f31c9afc Merge 'master' into staging 
(relatively simple conflicts)
 2015-04-26 22:52:08 +02:00
William A. Kennington III bcbda5d95b ntp: Refactor and add signing support 2015-04-25 21:27:53 -07:00
John Chee 5717d5e09e curl: ldap and libidn support as curlFull 2015-04-25 14:01:36 -07:00
Luca Bruno db3b86560f GNOME 3.16.1, closes #7357 2015-04-25 12:02:33 +02:00
Luca Bruno 38d6aec3f6 network-manager: update to 1.0 2015-04-25 11:51:57 +02:00
William A. Kennington III e074268230 stunnel: 5.14 -> 5.16 2015-04-22 14:47:09 -07:00
William A. Kennington III dc3f962f64 curl: 7.41.0 -> 7.42.0 2015-04-22 14:37:53 -07:00
Lluís Batlle i Rossell 5a21c015c7 Updating cjdns to 20150422. 2015-04-22 17:11:10 +02:00
Tobias Geerinckx-Rice e4f0c4a494 netsniff-ng -> v0.5.9-rc5 2015-04-22 12:32:59 +02:00
Joachim Fasting 8488d133f3 meta.licenses -> license 2015-04-21 23:10:07 +02:00
William A. Kennington III 6b9d2efcb1 unbound: 1.5.1 -> 1.5.3 2015-04-20 21:34:48 -07:00
Tobias Geerinckx-Rice 604ac701f3 netsniff-ng v0.5.9-rc4-62-g47a7037 -> v0.5.9-rc4-63-gf43bbe9 
Bug fix: mac80211: Check existence of generated monX device

Fix the case when netsniff-ng fails if there is already an existing
monX device while generating one.
 2015-04-20 17:17:40 +02:00
Peter Simons a510ba0334 Drop broken packages sproxy and sproxy-web. 2015-04-19 18:48:29 +02:00
Tuomas Tynkkynen 7532c5379d ddclient: Force line buffering on stdout 
Status messages of ddclient go to stdout, which is block buffered by
default, so most of its output won't appear in the journal until it is
exiting:

-- Reboot --
Apr 19 11:31:04 xen systemd[1]: Starting Dynamic DNS Client...
Apr 19 11:31:04 xen systemd[1]: Started Dynamic DNS Client.
Apr 19 11:31:53 xen systemd[1]: Stopping Dynamic DNS Client...
Apr 19 11:31:53 xen ddclient[530]: === opt ====
Apr 19 11:31:53 xen ddclient[530]: opt{cache}                           : <undefined>
Apr 19 11:31:53 xen ddclient[530]: opt{cmd}                             : <undefined>
...

Fix this by adding a patch to set line buffering on stdout.
 2015-04-19 12:32:04 +03:00
Tobias Geerinckx-Rice 32bd963427 dropbear 2014.66 -> 2015.67 2015-04-17 00:57:25 +02:00
Joachim Fasting 0bca050210 mu: 0.9.11 -> 0.9.12 2015-04-16 11:53:12 +02:00
Tobias Geerinckx-Rice 2bc813dc5c Add hans: tunnel IPv4 over ICMP 2015-04-16 06:11:16 +02:00
Joel Moberg e82a94f816 i2p: fix wrapper 2015-04-15 17:09:46 +02:00
Joel Moberg 2c6fbdefad i2p: fix platform 2015-04-15 12:38:17 +02:00
Tobias Geerinckx-Rice 4213e9f30f netsniff-ng: v0.5.9-rc4-53-gdd5d906 -> v0.5.9-rc4-62-g47a7037 2015-04-14 15:51:36 +02:00
koral 49e250564a wget: 1.16 -> 1.16.3 2015-04-13 17:25:28 +00:00
Bjørn Forsman c1556f70d7 hping: set platforms = all 
From http://www.hping.org/:

  "Hping works on the following unix-like systems: Linux, FreeBSD,
   NetBSD, OpenBSD, Solaris, MacOs X, Windows."
 2015-04-11 15:25:11 +02:00
Bjørn Forsman 965129cdac lftp: update 4.6.0 -> 4.6.1 
2014-12-29: lftp-4.6.1 released. Some bugs fixed, minor feature added.
 2015-04-11 15:06:13 +02:00
Thomas Tuegel 88918e10e9 Merge branch 'master' into staging 2015-04-10 07:45:38 -05:00
William A. Kennington III 58d6ab8d4b openntpd: Remove output dir hack 2015-04-08 15:11:45 -07:00
William A. Kennington III 458c8381e0 ntp: 4.2.8 -> 4.2.8p2 2015-04-08 14:07:26 -07:00
_1126 a3785360a9 isync: adds cyrus_sasl to (re)enable authentication 2015-04-07 11:49:24 +02:00
Eric Seidel 6ec373d776 Merge branch master into staging 2015-04-06 18:58:08 -07:00
William A. Kennington III 5c2dbf9827 isync: 1.1.2 -> 1.2.0 2015-04-05 16:17:38 -07:00
Александр Цамутали 50855c7e37 Add ability to use pppd to xl2tpd 2015-04-05 23:16:25 +03:00
Stewart Mackenzie bdc7c6366e New package: ZeroTierOne 2015-04-05 21:41:15 +08:00
William A. Kennington III 45b37ca1d8 ndisc6: 1.0.2 -> 1.0.3 2015-04-04 20:45:20 -07:00
William A. Kennington III bb18faf767 tinc_pre: 2015-02-24 -> 2015-03-14 2015-04-04 20:14:35 -07:00
Michael Raskin 9882ca5bc2 Merge pull request #6436 from k0ral/aria 
aria2: added c-ares dependency + link ssl certificates.
 2015-04-04 23:23:54 +03:00
Tobias Geerinckx-Rice 55b218160d ntopng: use new geolite-legacy package 2015-04-04 16:23:45 +02:00
Austin Seipp 52b71fc13b Merge pull request #7138 from spwhitt/s3cmd 
s3cmd: 1.0.1 -> 1.5.2 and remove git version
 2015-04-03 04:07:25 -05:00
Austin Seipp 2c55798f1a nixpkgs: spiped 1.4.1 -> 1.5.0 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-04-02 16:27:52 -05:00
Austin Seipp 4a3b755cc8 nixpkgs: stunnel 5.11 -> 5.14 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-04-02 16:27:52 -05:00
Austin Seipp c07cce40a4 nixpkgs: dd-agent 5.1.1 -> 5.2.3 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2015-04-02 16:27:51 -05:00
Spencer Whitt 6b47ddf999 s3cmd: 1.0.1 -> 1.5.2 and remove git version 2015-04-02 12:56:06 -04:00
William A. Kennington III a604b42480 mysql: Use libs in place of the binary mysql 2015-04-01 16:46:53 -07:00
William A. Kennington III ff21171921 Fix references to current-system/sw/sbin 2015-04-01 13:57:36 -07:00
Edward Tjörnhammar cce00353d0 Merge pull request #7122 from joelmo/i2p-official 
i2p: added package
 2015-04-01 18:24:22 +02:00
Joel Moberg 243ec61c4f i2p: initial 2015-04-01 18:15:54 +02:00
Edward Tjörnhammar b3e1021b41 i2pd: 0.8.0 -> 0.9.0 2015-04-01 16:35:47 +02:00
Vladimír Čunát edee502f81 ngrep: fix build by using make-3 
/cc maintainer @bjornfor.
 2015-04-01 08:41:45 +02:00
Tobias Geerinckx-Rice 0d9ebe7535 ipv6calc: use new geolite-legacy package 
GeoIP look-ups now actually work.
 2015-03-31 16:36:15 +02:00
Tobias Geerinckx-Rice b011d10cee netsniff-ng: use new geolite-legacy package 2015-03-31 16:36:15 +02:00
Tobias Geerinckx-Rice c7362b6b03 netsniff-ng: 0.5.9-rc4-{49-g6f54288 -> 53-gdd5d906} 
Fixes a bug that prevented mz from working at all.
 2015-03-31 00:51:47 +02:00
Nikolay Amiantov 7c03829024 Merge pull request #7060 from abbradar/nm-l2tp 
Support L2TP in NetworkManager
 2015-03-30 23:05:42 +03:00
Nikolay Amiantov dcaee528c2 networkmanagerapplet: support l2tp 2015-03-29 13:09:02 +03:00
Nikolay Amiantov 0e8b27ea6d networkmanager-l2tp: add package 2015-03-29 13:09:02 +03:00
Nikolay Amiantov fe263f4c7e xl2tpd: add package 2015-03-29 13:09:02 +03:00
Patrick Mahoney 00b57f47c7 Update versions of skarnet.org packages 
skalibs            2.3.2.0
execline           2.1.1.0
s6                 2.1.3.0
st-portable-utils  2.0.4.0
s6-linux-utils     2.0.2.0
s6-networking      2.1.0.0

Also change path to s6 static library in s6-networking build.
 2015-03-28 23:13:45 -05:00
Patrick Mahoney 6a2ec766fc s6-dns: update checksum 
Upstream unfortunately changed the tag v2.0.0.2 from revision
b533774a704c271a6feeaef76939b0aefbf039d7 to one commit forward:
539bee3f515b13a9a55ce65c0c0593babc7c5048.
 2015-03-28 18:52:56 -05:00
William A. Kennington III 7ccccc15ba Merge branch 'master' into staging 2015-03-27 16:03:03 -07:00
William A. Kennington III c612a25666 dhcpcd: 6.8.0 -> 6.8.1 2015-03-27 16:01:42 -07:00
William A. Kennington III c7a0045b80 openntpd: 5.7p3 -> 5.7p4 2015-03-26 16:07:02 -07:00
William A. Kennington III 2c9823713a Merge branch 'master' into staging 2015-03-26 14:49:34 -07:00
William A. Kennington III 767c179a94 Merge branch 'master' into staging 2015-03-26 14:44:05 -07:00
William A. Kennington III e78b94199f Merge pull request #7011 from taktoa/master 
Add SSL support to HAProxy
 2015-03-26 14:31:29 -07:00
William A. Kennington III ce9f2d5720 tcpdump: 4.6.2 -> 4.7.3 2015-03-26 14:03:52 -07:00