Skip to content

Commit 84c5263

Browse files
fd00fd00
committed
cnats-3.10.1 (WIP)
1 parent 2fc58f7 commit 84c5263

File tree

3 files changed

+61
-36
lines changed

3 files changed

+61
-36
lines changed

‎cnats/README

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,45 +3,46 @@ cnats
33
A C client for the NATS messaging system.
44

55
Runtime requirements:
6-
cygwin-3.5.4-1
7-
libnats-devel-3.9.2-1bl1
8-
libnats3.9-3.9.2-1bl1
9-
libprotobuf-c1-1.5.0-1bl1
6+
cygwin-3.6.0-1
7+
libnats-devel-3.10.1-1bl1
8+
libnats3.10-3.10.1-1bl1
9+
libprotobuf-c1-1.5.1-1bl1
1010
libsodium23-1.0.18-1
11-
libssl3-3.0.15-1
12-
pkg-config-2.3.0-1
11+
libssl3-3.0.16-1
12+
pkg-config-2.4.3-1
1313

1414
Build requirements:
1515
(besides corresponding -devel packages)
16-
binutils-2.43.1-1
16+
binutils-2.44-1
1717
cmake-3.28.3-1
1818
cygport-0.36.9-1
1919
gcc-core-12.4.0-3
20-
libprotobuf-c-devel-1.5.0-1bl1
20+
gcc-g++-12.4.0-3
21+
libprotobuf-c-devel-1.5.1-1bl1
2122
libsodium-devel-1.0.18-1
22-
libssl-devel-3.0.15-1
23-
ninja-1.12.0-1
23+
libssl-devel-3.0.16-1
24+
ninja-1.12.1-1
2425

2526
Canonical website:
2627
https://github.com/nats-io/nats.c
2728

2829
Canonical download:
29-
https://github.com/nats-io/nats.c/archive/refs/tags/v3.9.2.tar.gz
30+
https://github.com/nats-io/nats.c/archive/refs/tags/v3.10.1.tar.gz
3031

3132
-------------------------------------------
3233

3334
Build instructions:
34-
1. unpack cnats-3.9.2-X-src.tar.xz
35+
1. unpack cnats-3.10.1-X-src.tar.xz
3536
2. if you use setup to install this src package,
3637
it will be unpacked under /usr/src automatically
3738
% cd /usr/src
38-
% cygport ./cnats-3.9.2-X.cygport all
39+
% cygport ./cnats-3.10.1-X.cygport all
3940

4041
This will create:
41-
/usr/src/cnats-3.9.2-X-src.tar.xz
42-
/usr/src/cnats-3.9.2-X.tar.xz
43-
/usr/src/libnats3.9-3.9.2-X.tar.xz
44-
/usr/src/libnats-devel-3.9.2-X.tar.xz
42+
/usr/src/cnats-3.10.1-X-src.tar.xz
43+
/usr/src/cnats-3.10.1-X.tar.xz
44+
/usr/src/libnats3.10-3.10.1-X.tar.xz
45+
/usr/src/libnats-devel-3.10.1-X.tar.xz
4546

4647
-------------------------------------------
4748

@@ -56,8 +57,8 @@ Files included in the binary package:
5657
/usr/share/doc/cnats/README.md
5758
/usr/share/doc/cnats/dependencies.md
5859

59-
(libnats3.9)
60-
/usr/bin/cygnats-3.9.dll
60+
(libnats3.10)
61+
/usr/bin/cygnats-3.10.dll
6162

6263
(libnats-devel)
6364
/usr/include/nats.h
@@ -76,6 +77,9 @@ Files included in the binary package:
7677

7778
Port Notes:
7879

80+
----- version 3.10.1-1bl1 -----
81+
Version bump.
82+
7983
----- version 3.9.2-1bl1 -----
8084
Version bump.
8185

‎cnats/cnats-3.9.2-1bl1.cygport renamed to ‎cnats/cnats-3.10.1-1bl1.cygport

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@ PKG_NAMES="
4646
cnats_CONTENTS="
4747
usr/share
4848
"
49-
libnats3_9_CONTENTS="
49+
libnats3_10_CONTENTS="
5050
usr/bin/cyg*-${PV[1]}.${PV[2]}.dll
5151
"
5252
libnats_devel_CONTENTS="
5353
usr/include
5454
usr/lib
5555
"
5656
cnats_SUMMARY="${SUMMARY} (licensing & readmes)"
57-
libnats3_9_SUMMARY="${SUMMARY} (runtime)"
57+
libnats3_10_SUMMARY="${SUMMARY} (runtime)"
5858
libnats_devel_SUMMARY="${SUMMARY} (development)"

‎cnats/cnats-3.9.2-1bl1.src.patch renamed to ‎cnats/cnats-3.10.1-1bl1.src.patch

Lines changed: 36 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
--- origsrc/nats.c-3.9.2/CMakeLists.txt 2024-12-10 01:50:23.000000000 +0900
2-
+++ src/nats.c-3.9.2/CMakeLists.txt 2025-01-16 11:34:33.030478800 +0900
3-
@@ -120,7 +120,7 @@ if(NATS_BUILD_USE_SODIUM)
1+
--- origsrc/nats.c-3.10.1/CMakeLists.txt 2025-03-15 01:45:20.000000000 +0900
2+
+++ src/nats.c-3.10.1/CMakeLists.txt 2025-04-09 18:47:25.597709000 +0900
3+
@@ -121,7 +121,7 @@ if(NATS_BUILD_USE_SODIUM)
44
${NATS_SODIUM_DIR}
55
)
66
FIND_LIBRARY(NATS_SODIUM_LIBRARY
@@ -9,8 +9,8 @@
99
HINTS ${NATS_SODIUM_DIR}
1010
)
1111
FIND_PACKAGE_HANDLE_STANDARD_ARGS(libsodium DEFAULT_MSG
12-
--- origsrc/nats.c-3.9.2/src/CMakeLists.txt 2024-12-10 01:50:23.000000000 +0900
13-
+++ src/nats.c-3.9.2/src/CMakeLists.txt 2025-01-16 11:25:28.898201600 +0900
12+
--- origsrc/nats.c-3.10.1/src/CMakeLists.txt 2025-03-15 01:45:20.000000000 +0900
13+
+++ src/nats.c-3.10.1/src/CMakeLists.txt 2025-04-09 18:47:25.597709000 +0900
1414
@@ -62,7 +62,7 @@ if(NATS_BUILD_LIB_SHARED)
1515
target_include_directories(nats PUBLIC
1616
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
@@ -20,8 +20,8 @@
2020
install(EXPORT cnats-targets
2121
NAMESPACE cnats::
2222
FILE cnats-config.cmake
23-
--- origsrc/nats.c-3.9.2/src/libnats.pc.in 2024-12-10 01:50:23.000000000 +0900
24-
+++ src/nats.c-3.9.2/src/libnats.pc.in 2025-01-16 11:26:05.659247400 +0900
23+
--- origsrc/nats.c-3.10.1/src/libnats.pc.in 2025-03-15 01:45:20.000000000 +0900
24+
+++ src/nats.c-3.10.1/src/libnats.pc.in 2025-04-09 18:47:25.597709000 +0900
2525
@@ -1,12 +1,12 @@
2626
-prefix="@CMAKE_INSTALL_PREFIX@"
2727
-exec_prefix="${prefix}"
@@ -42,8 +42,8 @@
4242
+Cflags: -I${includedir}
4343
+Libs: -L${libdir} -lnats
4444
+Libs.private: -L${libdir} -lnats @PKGCONF_LIBS_PRIV@
45-
--- origsrc/nats.c-3.9.2/test/CMakeLists.txt 2024-12-10 01:50:23.000000000 +0900
46-
+++ src/nats.c-3.9.2/test/CMakeLists.txt 2025-01-16 11:27:03.053147200 +0900
45+
--- origsrc/nats.c-3.10.1/test/CMakeLists.txt 2025-03-15 01:45:20.000000000 +0900
46+
+++ src/nats.c-3.10.1/test/CMakeLists.txt 2025-04-09 18:47:25.613329000 +0900
4747
@@ -6,7 +6,7 @@ if(NOT BUILD_TESTING)
4848
return()
4949
endif()
@@ -71,8 +71,29 @@
7171

7272
set(BENCH_LIST ${PROJECT_SOURCE_DIR}/test/list_bench.txt)
7373
set(STAN_LIST ${PROJECT_SOURCE_DIR}/test/list_stan.txt)
74-
--- origsrc/nats.c-3.9.2/test/test.c 2024-12-10 01:50:23.000000000 +0900
75-
+++ src/nats.c-3.9.2/test/test.c 2025-01-16 11:44:32.658884500 +0900
74+
--- origsrc/nats.c-3.10.1/test/check_cpp/CMakeLists.txt 2025-03-15 01:45:20.000000000 +0900
75+
+++ src/nats.c-3.10.1/test/check_cpp/CMakeLists.txt 2025-04-09 18:51:12.444502800 +0900
76+
@@ -2,12 +2,6 @@ if(NOT BUILD_TESTING)
77+
return()
78+
endif()
79+
80+
-if(NOT NATS_BUILD_LIB_STATIC)
81+
- MESSAGE(FATAL_ERROR
82+
- "Building tests require static library, or run CMake with -DBUILD_TESTING=OFF")
83+
- return()
84+
-endif()
85+
-
86+
if(MSVC)
87+
set_source_files_properties(test.c PROPERTIES COMPILE_FLAGS "/w")
88+
endif()
89+
@@ -22,4 +16,4 @@ endif(NATS_BUILD_WITH_TLS)
90+
# Build the test program
91+
add_executable(check_cpp check_cpp.cpp)
92+
93+
-target_link_libraries(check_cpp nats_static ${NATS_EXTRA_LIB})
94+
+target_link_libraries(check_cpp nats ${NATS_EXTRA_LIB})
95+
--- origsrc/nats.c-3.10.1/test/test.c 2025-03-15 01:45:20.000000000 +0900
96+
+++ src/nats.c-3.10.1/test/test.c 2025-04-09 18:47:25.613329000 +0900
7697
@@ -20,8 +20,10 @@
7798
#else
7899
#include <dirent.h>
@@ -84,16 +105,16 @@
84105

85106
#include "buf.h"
86107
#include "timer.h"
87-
@@ -37012,7 +37014,7 @@ void test_StanSubTimeout(void)
108+
@@ -37298,7 +37300,7 @@ void test_StanSubTimeout(void)
88109

89110
#endif
90111

91112
-#ifndef _WIN32
92113
+#if !defined(_WIN32) && !defined(__CYGWIN__)
93114
static void _sigsegv_handler(int sig) {
94-
void *array[20];
95-
int size = backtrace(array, 20);
96-
@@ -37037,7 +37039,7 @@ int main(int argc, char **argv)
115+
116+
// Android doesn't support backtrace before API Level 33.
117+
@@ -37333,7 +37335,7 @@ int main(int argc, char **argv)
97118
}
98119
testName = argv[1];
99120

0 commit comments

Comments
 (0)