Commit Graph

55 Commits

Author SHA1 Message Date
Alyssa Ross
292bc3f53c
socat: enable parallel building
Tested at -j64.
2024-01-06 00:59:51 +01:00
Sergei Trofimovich
38f8b29c92 socat: 1.7.4.4 -> 1.8.0.0
Changes: http://www.dest-unreach.org/socat/
2023-11-15 18:25:16 +01:00
n3oney
02d604cd68
treewide: add meta.mainProgram 2023-08-05 00:11:04 +02:00
Alyssa Ross
3539dd6988 socat: add musl test
A couple of recent upgrades have broken socat on Musl, so it would be
nice to catch these in advance.
2023-01-29 13:24:54 +00:00
Alyssa Ross
0f25d9fc43 Revert "pkgsMusl.socat: fix build"
This reverts commit 7ecf7a3493.

This is no longer necessary as of socat 1.7.4.4, and in fact breaks
the build.

Fixes: 497c7f26aa ("socat: 1.7.4.3 -> 1.7.4.4")
2023-01-22 16:34:30 +00:00
Guillaume Girol
33afbf39f6 treewide: switch to nativeCheckInputs
checkInputs used to be added to nativeBuildInputs. Now we have
nativeCheckInputs to do that instead. Doing this treewide change allows
to keep hashes identical to before the introduction of
nativeCheckInputs.
2023-01-21 12:00:00 +00:00
R. Ryantm
497c7f26aa socat: 1.7.4.3 -> 1.7.4.4 2023-01-16 19:15:00 +00:00
Artturin
33cce15e42 treewide: remove meta.repositories
there's no documentation for meta.repositories and its not widely used
2022-03-24 23:56:14 +02:00
Alyssa Ross
7ecf7a3493 pkgsMusl.socat: fix build
Fix via Alpine.
2022-03-03 13:57:21 +00:00
R. RyanTM
3cbb02087b
socat: 1.7.4.2 -> 1.7.4.3
* socat: 1.7.4.2 -> 1.7.4.3 (#154548)

* socat: remove unnecessary patch with 1.7.4.3

Co-authored-by: Renaud <c0bw3b@users.noreply.github.com>
2022-01-20 09:48:16 +01:00
midchildan
f720cf68d0
socat: fix darwin build by adding missing feature check 2021-12-11 03:39:27 +09:00
R. Ryantm
8e6d531394 socat: 1.7.4.1 -> 1.7.4.2 2021-12-06 15:37:29 +00:00
Jörg Thalheim
26f0cea471 socat2pre: remove
marked as broken
2021-08-22 17:01:47 +02:00
Ben Siraphob
8c5d37129f pkgs/tools: stdenv.lib -> lib 2021-01-15 17:12:36 +07:00
Sandro
cc0d004530
Merge pull request #109124 from fabaff/bump-socat
socat: 1.7.3.4 -> 1.7.4.1
2021-01-13 08:43:49 +01:00
Fabian Affolter
bde9c12b59 socat: 1.7.3.4 -> 1.7.4.1 2021-01-12 17:32:58 +01:00
Profpatsch
4a7f99d55d treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
2021-01-11 10:38:22 +01:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Andrew Childs
0780537546 socat: remove patch that is now in upstream 2020-02-10 12:23:19 +09:00
R. RyanTM
75a9868dbe socat: 1.7.3.3 -> 1.7.3.4 2020-02-02 22:00:23 +01:00
Robin Gloster
6095f88e7e
socat2pre: mark as broken 2019-08-21 20:31:57 +02:00
Andrew Childs
14e505c6fa socat: fix darwin build 2019-04-26 23:56:33 +09:00
R. RyanTM
6c3e0907a5 socat: 1.7.3.2 -> 1.7.3.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/socat/versions
2019-04-16 18:31:39 +02:00
Jan Malakhovski
131e6d664b socat: make tests run, but disable 2018-08-11 09:35:33 +00:00
Robin Gloster
108c6d1a03
socat: 1.7.3.1 -> 1.7.3.2
fixes compatibility with openssl 1.1.0 (and libressl)
2017-02-17 00:11:03 +01:00
Robin Gloster
459d46dc5a
socat2pre: enable ip6 on darwin 2016-08-31 15:41:51 +02:00
Robin Gloster
5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
obadz
ca17bd0c8a socat: add readline support 2016-06-13 12:09:32 +01:00
Franz Pletz
aff1f4ab94 Use general hardening flag toggle lists
The following parameters are now available:

  * hardeningDisable
    To disable specific hardening flags
  * hardeningEnable
    To enable specific hardening flags

Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.

cc-wrapper supports the following flags:

  * fortify
  * stackprotector
  * pie (disabled by default)
  * pic
  * strictoverflow
  * format
  * relro
  * bindnow
2016-03-05 18:55:26 +01:00
Robin Gloster
3b4765c9e5 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-28 16:32:57 +00:00
Franz Pletz
0a9076b5f8 socat: 2.0.0-b8 -> 2.0.0-b9 (CVE-2016-2217)
https://lwn.net/Vulnerabilities/674840/

http://www.dest-unreach.org/socat/contrib/socat-secadv7.html
http://www.dest-unreach.org/socat/contrib/socat-secadv8.html
2016-02-27 19:10:38 +01:00
Franz Pletz
88d1564985 socat: 1.7.3.0 -> 1.7.3.1 (CVE-2016-2217)
https://lwn.net/Vulnerabilities/674840/

http://www.dest-unreach.org/socat/contrib/socat-secadv7.html
http://www.dest-unreach.org/socat/contrib/socat-secadv8.html
2016-02-27 19:10:38 +01:00
Robin Gloster
a73762200d socat: enable pie hardening 2016-02-26 16:45:49 +00:00
Robin Gloster
8613060425 socat: add patch to fix build with libressl
This fixes the build for libressl >= 2.3 as some legacy openssl code has
been removed.
2015-12-23 22:08:33 +00:00
Robert Helgesson
12ec56030e socat2pre: 2.0.0-b7 -> 2.0.0-b8 2015-07-16 23:27:04 +02:00
Andrey Arapov
7a7e59d2a9 socat: Update from 1.7.2.4 to 1.7.3.0, fixes a possible denial of service attack
socat: Update from 1.7.2.4 to 1.7.3.0, fixes a possible denial of service attack
(CVE Id pending), improves SSL client security, and provides a couple of bug and
porting fixes.

Among new features, socat now enables OpenSSL server side use of ECDHE ciphers,
providing PFS (Perfect Forward Secrecy)

http://www.dest-unreach.org/socat/doc/CHANGES
2015-01-25 13:48:11 +01:00
Pascal Wittmann
8d67b9a240 transformed meta.maintainers of some packages into lists 2014-09-13 13:52:02 +02:00
John Wiegley
78a42931e5 socat: allow 2.x to build on darwin 2014-07-24 15:48:07 -05:00
John Wiegley
010132e302 Change several package constraints from linux to unix
They all build on Darwin.
2014-04-12 16:01:16 -05:00
Evgeny Egorochkin
e585d65b49 socat: update from 1.7.2.3 to 1.7.2.4 2014-03-13 09:11:54 +02:00
Vladimír Čunát
2dd13fcb0b socat-2.*: fix CVE-2014-0019 2014-02-06 19:21:26 +01:00
Evgeny Egorochkin
0c439c3a1a socat: update from 1.7.2.2 to 1.7.2.3, potentially fixes CVE-2014-0019 2014-02-06 09:50:00 +02:00
Eelco Dolstra
59cad4dc07 socate: Update to 1.7.2.2, 2.0.0-b6
CVE-2013-3571
2013-11-04 21:10:59 +01:00
Eelco Dolstra
8fc1fe9f6b socat: Update to 1.7.2.1
CVE-2012-0219
2013-04-12 15:01:01 +02:00
Lluís Batlle i Rossell
5521faad65 Updating socat. I thought it could have improvements in performance for nixos
build-vm in my computer, but does not.


svn path=/nixpkgs/trunk/; revision=33239
2012-03-18 18:33:10 +00:00
Eelco Dolstra
b88adf69c3 * socat updated to 1.7.1.2.
svn path=/nixpkgs/trunk/; revision=22252
2010-06-14 08:01:38 +00:00
Eelco Dolstra
5b098479f5 * socat updated to 1.7.1.1.
svn path=/nixpkgs/trunk/; revision=19269
2010-01-06 17:36:33 +00:00
Michael Raskin
bbd6e56d69 Fix the cleanup-induced problems
svn path=/nixpkgs/trunk/; revision=18554
2009-11-23 12:21:34 +00:00
Eelco Dolstra
7f5b839524 * Removed selectVersion. There's no good reason to write
`selectVersion ./foo "bar"' instead of `import ./foo/bar.nix'.
* Replaced `with args' with formal function arguments in several
  packages.
* Renamed several files to `default.nix'.  As a general rule, version
  numbers should only be included in the filename when there is a
  reason to keep multiple versions of a package in Nixpkgs.
  Otherwise, it just makes it harder to update the package.

svn path=/nixpkgs/trunk/; revision=18403
2009-11-18 09:39:59 +00:00
Michael Raskin
9eff5ac580 Updating socat
svn path=/nixpkgs/trunk/; revision=15538
2009-05-10 20:10:12 +00:00