aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Postnikov <apostnikov@gmail.com>2021-01-12 00:10:43 +0200
committerLeo <thinkabit.ukim@gmail.com>2021-01-14 05:30:29 +0000
commit368c6047bc2890190f47922b56d626279f24f5f1 (patch)
tree179ed8808b3c464d48a137096e2cbf840b8314fe
parentcdd8e43e84732f5ed2eb8eed091dd1e8b35e60fd (diff)
downloadaports-368c6047bc2890190f47922b56d626279f24f5f1.tar.gz
aports-368c6047bc2890190f47922b56d626279f24f5f1.tar.bz2
aports-368c6047bc2890190f47922b56d626279f24f5f1.tar.xz
main/socat: upgrade to 1.7.4.1
-rw-r--r--main/socat/APKBUILD8
-rw-r--r--main/socat/fix-32-bit.patch43
2 files changed, 3 insertions, 48 deletions
diff --git a/main/socat/APKBUILD b/main/socat/APKBUILD
index 6d92257b89..8c5faf0c8c 100644
--- a/main/socat/APKBUILD
+++ b/main/socat/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=socat
-pkgver=1.7.4.0
+pkgver=1.7.4.1
pkgrel=0
pkgdesc="Multipurpose relay for binary protocols"
# test 58 CHILDDEFAULT: child process default properties... FAILED:
@@ -16,7 +16,6 @@ subpackages="$pkgname-doc"
source="http://www.dest-unreach.org/socat/download/socat-$pkgver.tar.bz2
use-linux-headers.patch
netdb-internal.patch
- fix-32-bit.patch
"
build() {
@@ -41,7 +40,6 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="c4d166c2259271a70f81d6c4972549549c3fc60a9e47cc03eff1dd4d71c298ac39c177ae3c053dc0c97c2770fe8d157fd0bc6f2c14aef91625f868894d5d7c61 socat-1.7.4.0.tar.bz2
+sha512sums="7fa069bff294a01baebfd790faed027391ab1f47f09f0990e6dcb1c7cce5f3cdc20638fecb10e82c10b6342d903de9481f6d85a0debcc0368c882417dafbc756 socat-1.7.4.1.tar.bz2
2032b6528cb27b69d8fb6a6f64af32fcc1f6e4934bb0d7c8931b38ab7ad5e27f6f4344a6cf49751fa3178cd725f954e195373362f7d5929e587d7f0309346059 use-linux-headers.patch
-22a6e0c2317a9317997c98114daac258ebbcc3d8e58e49a6ebf24781b98967afed47c63807282582fa0909076fe349281f05e4462faacb90e7aabc853903d6e6 netdb-internal.patch
-9cab2172644b1beb14d964c177a5a54f74cf758e668a015dc415c6f7aeae904b005cf7554d6d2d750bfc9f7011c20eb15a7742997893b391a198c9d2584a7032 fix-32-bit.patch"
+22a6e0c2317a9317997c98114daac258ebbcc3d8e58e49a6ebf24781b98967afed47c63807282582fa0909076fe349281f05e4462faacb90e7aabc853903d6e6 netdb-internal.patch"
diff --git a/main/socat/fix-32-bit.patch b/main/socat/fix-32-bit.patch
deleted file mode 100644
index d1537ce85a..0000000000
--- a/main/socat/fix-32-bit.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Upstream: yes, cherrry-picked from master, will be in 1.7.4.1
-Reason: Fixes 32 bit
-
---- a/compat.h
-+++ b/compat.h
-@@ -134,6 +134,8 @@ typedef int sig_atomic_t;
- # define F_uint64_t "%u"
- # elif HAVE_BASIC_UINT64_T==6
- # define F_uint64_t "%lu"
-+# elif HAVE_BASIC_UINT64_T==8
-+# define F_uint64_t "%llu"
- # else
- # error "HAVE_BASIC_UINT64_T is out of range:" HAVE_BASIC_UINT64_T
- # endif
-@@ -147,7 +149,7 @@ typedef int sig_atomic_t;
- # elif HAVE_BASIC_INT16_T==3
- # define F_int16_t "%d"
- # elif HAVE_BASIC_INT16_T==5
--# define F_int16_t "%l"
-+# define F_int16_t "%ld"
- # else
- # error "HAVE_BASIC_INT16_T is out of range:" HAVE_BASIC_INT16_T
- # endif
-@@ -161,7 +163,7 @@ typedef int sig_atomic_t;
- # elif HAVE_BASIC_INT32_T==3
- # define F_int32_t "%d"
- # elif HAVE_BASIC_INT32_T==5
--# define F_int32_t "%l"
-+# define F_int32_t "%ld"
- # else
- # error "HAVE_BASIC_INT32_T is out of range:" HAVE_BASIC_INT32_T
- # endif
-@@ -175,7 +177,9 @@ typedef int sig_atomic_t;
- # elif HAVE_BASIC_INT64_T==3
- # define F_int64_t "%d"
- # elif HAVE_BASIC_INT64_T==5
--# define F_int64_t "%l"
-+# define F_int64_t "%ld"
-+# elif HAVE_BASIC_INT64_T==7
-+# define F_int64_t "%lld"
- # else
- # error "HAVE_BASIC_INT64_T is out of range:" HAVE_BASIC_INT64_T
- # endif