Commit Graph

27 Commits

Author SHA1 Message Date
krant 2650de4686 socat: fix compile error when ccache is enabled
Signed-off-by: krant <aleksey.vasilenko@gmail.com>
2024-04-19 14:19:25 -07:00
krant 5a06e3471b socat: update to 1.8.0.0
Signed-off-by: krant <aleksey.vasilenko@gmail.com>
2024-04-13 14:03:09 -07:00
Rosen Penev 6c4205a58f socat: update to 1.7.4.4
Signed-off-by: Rosen Penev <rosenp@gmail.com>
2023-01-14 16:10:23 -08:00
Chukun Pan 373053a1e4 socat: update to 1.7.4.1
Remove upstreamed patch.

Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn>
2021-09-30 17:42:34 -07:00
Paul Fertser 8f0bd0b4fe net: socat: add option user
Allow UCI configuration to specify username to run this service as.
Defaults to root.

Signed-off-by: Paul Fertser <fercerpav@gmail.com>
2021-07-25 22:26:34 +03:00
Ilya Lipnitskiy 5d8d4fbbcb
treewide: Run refresh on all packages
The crude loop I wrote to come up with this changeset:

  find -L package/feeds/packages/ -name patches | \
  sed 's/patches$/refresh/' | sort | xargs make

Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
2021-02-20 16:02:15 -08:00
Dobroslaw Kijowski 218b7521aa socat: allow more complex command line options
Current implementation of socat's init service doesn't allow to run more
complex configurations. As an example there's no possibility to execute
following command:

  socat TCP-LISTEN:8080,fork,reuseaddr,bind=192.168.1.1 \
    EXEC:"/sbin/ip netns exec somenetns socat STDIO TCP:10.0.0.1:80"

In such command the first line is argv[1] and the second line is
argv[2]. SocatOptions config option is a string. As as a consequence of
this each word will be passed as a separate argv element. Socat won't be
able to parse arguments correctly.

In order to mitigate this issue, we can also accept SocatOptions as a
list of strings. Following config file will work correctly:

config socat 'tunnel_8080_into_somenetns'
	option enable '1'
	list SocatOptions 'TCP-LISTEN:8080,fork,reuseaddr,bind=192.168.1.1'
	list SocatOptions 'EXEC:"/sbin/ip netns exec somenetns socat STDIO TCP:10.0.0.1:80"'

While we're at it, pass stdout and stderr into logread.

Signed-off-by: Dobroslaw Kijowski <dobo90@gmail.com>
2021-01-27 21:24:38 +01:00
Rosen Penev aa87fde482
socat: update to 1.7.3.4
Signed-off-by: Rosen Penev <rosenp@gmail.com>
2020-02-13 15:53:36 -08:00
Jan Pavlinec 299e5b0a9b
treewide: add PKG_CPE_ID for better cvescanner coverage
Signed-off-by: Jan Pavlinec <jan.pavlinec@nic.cz>
2019-09-17 12:40:26 +02:00
Rosen Penev fadf2bfc14
socat: Fix compilation when usleep is missing
usleep is a legacy function that was removed in POSIX-2008. uClibc-ng can
be configured to compile without it. if out the code as it's not used.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2019-07-19 00:10:33 -07:00
Rosen Penev 1543809b61
socat: Remove outdated musl patch
No longer needed with modern musl.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2019-07-14 17:40:37 -07:00
Daniel Engberg 11270c979b net/socat: Update to 1.7.3.3
Update socat to 1.7.3.3

Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
2019-05-06 08:25:42 +00:00
Jeffery To 549bf0ec44 socat: Update init script
This replaces the use of uci_validate_section() with
uci_load_validate(), which removes the need to declare local variables
for every config option.

This also adds a service_triggers() function and removes some
unnecessary curly brackets.

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2019-02-03 19:59:43 +08:00
Rosen Penev 17cfc75b98 socat: Fix compile with deprecated APIs disabled
Signed-off-by: Rosen Penev <rosenp@gmail.com>
2018-11-10 17:26:56 -08:00
Ted Hess 8f56973564 socat: Fix CRDLY, TABDLY and CSIZE shifts for PowerPC
Signed-off-by: Ted Hess <thess@kitschensync.net>
2018-08-30 14:47:43 -04:00
Michal Hrusecky 6345dfc74d
socat: Do not use libbsd
Make sure that libbsd is not picked up during configuration even if it is
compiled before socat is.

Signed-off-by: Michal Hrusecky <michal.hrusecky@nic.cz>
2018-08-28 13:57:26 +02:00
Alexander Couzens 379afb45ef
socat: set BUILD_DATE to SOURCE_DATE_EPOCH
Build timestamp prevents reproducible builds [0].
SOURCE_DATE_EPOCH allows to use a timestamp which depends
on deterministic behaviour [1].
Fixes reproducible builds.

[0] https://reproducible-builds.org/docs/timestamps/
[1] https://reproducible-builds.org/specs/source-date-epoch/

Signed-off-by: Alexander Couzens <lynxis@fe80.eu>
2017-11-17 13:15:48 +01:00
Stephen Walker b63a809213 packages: cleanup Makefile variables
Standard assignment is immediate expansion without any extraneous spacing, RFC822 compliant email addresses and consistent section assignments

Signed-off-by: Stephen Walker <stephendwalker+github@gmail.com>
2017-06-03 16:38:06 -04:00
Daniel Engberg 076eba07f4 net/socat: Update to 1.7.3.2
Update socat to 1.7.3.2
Remove SSLv3 patch, workaround added upstream
Remove inclusion of stddef.h, fix added upstream
Replace obsolete tarball hash variable with PKG_HASH

Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
2017-06-02 13:43:06 +02:00
Ted Hess 646f85cce6 Merge pull request #3863 from jow-/socat-fix-build
socat: work around missing stddef.h include
2017-01-17 15:42:19 -05:00
Jo-Philipp Wich 5e0596b541 socat: work around missing stddef.h include
The buildbots fail to build socat due to the following error:

    nestlex.c:14:7: error: unknown type name 'ptrdiff_t'

It appears that certain source files do not include all required headers,
depending on the configure options passed to socat.

Work around the error by passing `-include stddef.h` via `TARGET_CFLAGS` to
forcibly inject this header file into all compilation units.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-01-17 21:24:12 +01:00
Daniel Engberg 8c0a4bf6c5 net/socat: Update to 1.7.3.1 and fix SSL
Update to 1.7.3.1
Fix SSL builds
Source: http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/net/socat/patches/#dirlist

Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
2017-01-16 22:05:41 +01:00
Jo-Philipp Wich a0968faedb socat: fix musl compatibility
Do not include netinet/if_ether.h for musl to prevent struct ethhdr
redeclarations.

Also define NETDB_INTERNAL if needed to fix compilation of the network
backends.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
2015-06-16 14:58:28 +02:00
John Szakmeister 2720fe57e5 Upgrade socat to 1.7.3.0.
The cross-compiling patch is no longer necessary.  Also added librt as a
dependency, since it is required.  This also fixes an issue where
support for linux/errqueue.h was not being detected correctly and
causing a build failure with 3.18.

Signed-off-by: John Szakmeister <john@szakmeister.net>
2015-03-03 06:39:43 -05:00
Ian Leonard ac7cd4c6e6 misc: correct typo in Makefiles for PKG_LICENSE_FILES
Signed-off-by: Ian Leonard <antonlacon@gmail.com>
2014-11-24 23:43:37 -08:00
Henning Schild 8b67d48c47 packages/socat: add init script
Init script to start instances of socat for port-forwarding etc.

Signed-off-by: Henning Schild <henning@hennsch.de>
2014-08-12 23:35:56 +02:00
Ted Hess 887411b8c3 socat: Import from oldpackages, upgrade to 1.7.2.4, update copyright, license info, pkg maintainer. Fix cross built error
Signed-off-by: Ted Hess <thess@kitschensync.net>
2014-08-12 12:21:56 -04:00