Skip to content

Commit 3adaccf

Browse files
authored
Merge branch 'trunk' into noports-desktop-cram-auth
2 parents 0396443 + bcbcfeb commit 3adaccf

39 files changed

+178
-78
lines changed

apps/admin/admin_api/pubspec.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -617,7 +617,7 @@ packages:
617617
path: "../../../packages/dart/noports_core"
618618
relative: true
619619
source: path
620-
version: "6.6.0"
620+
version: "6.6.1"
621621
openssh_ed25519:
622622
dependency: transitive
623623
description:

packages/c/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ set(ATSDK_USE_SHARED_LIBS ${NOPORTS_USE_SHARED_LIBS})
1414
cmake_minimum_required(VERSION 3.19)
1515
set(CMAKE_C_STANDARD 99)
1616
cmake_policy(SET CMP0135 NEW)
17-
project(noports VERSION 1.0.12 LANGUAGES C)
17+
project(noports VERSION 1.0.13 LANGUAGES C)
1818

1919
include("${CMAKE_CURRENT_LIST_DIR}/cmake/CPackSetup.cmake")
2020

packages/c/cmake/CPackSetup.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# package info
22
set(CPACK_PACKAGE_NAME noports)
33
set(CPACK_PACKAGE_DESCRIPTION "noports source tarballs")
4-
set(CPACK_PACKAGE_VERSION 1.0.12)
4+
set(CPACK_PACKAGE_VERSION 1.0.13)
55
set(CPACK_PACKAGE_VENDOR_NAME atsign-foundation)
66

77
# cmake configuration

packages/c/graceful-shutdown-tool/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cmake_minimum_required(VERSION 3.19)
22
set(CMAKE_C_STANDARD 99)
33
cmake_policy(SET CMP0135 NEW)
4-
project(graceful-shutdown-tool VERSION 1.0.12 LANGUAGES C)
4+
project(graceful-shutdown-tool VERSION 1.0.13 LANGUAGES C)
55

66
include(FetchContent)
77
include(GNUInstallDirs)

packages/c/srv/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.19)
22
set(CMAKE_C_STANDARD 99)
33
cmake_policy(SET CMP0135 NEW)
44

5-
project(srv VERSION 1.0.12 LANGUAGES C)
5+
project(srv VERSION 1.0.13 LANGUAGES C)
66

77
# 1. Variables - you are free to edit anything in this step
88

packages/c/sshnpd/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 1.0.13
2+
3+
- feat: csshnpd root-domain implementation
4+
15
## 1.0.12
26

37
- fix: convert device name to lower case to comply with Dart

packages/c/sshnpd/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cmake_minimum_required(VERSION 3.19)
22
set(CMAKE_C_STANDARD 99)
33
cmake_policy(SET CMP0135 NEW)
4-
project(sshnpd VERSION 1.0.12 LANGUAGES C)
4+
project(sshnpd VERSION 1.0.13 LANGUAGES C)
55

66
# 1. Variables - you are free to edit anything in this step
77

packages/c/sshnpd/include/sshnpd/daemon.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ extern struct _notification_key_map {
1616
enum notification_key key;
1717
} notification_key_map[];
1818

19+
extern atclient_authenticate_options worker_options;
1920
extern atclient worker;
21+
extern atclient_authenticate_options monitor_options;
2022
extern atclient monitor_ctx;
2123
extern char *ping_response;
2224
extern char *atserver_host;

packages/c/sshnpd/include/sshnpd/sshnpd.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
#define USERVAR "USER"
1515
#endif
1616

17-
#define ROOT_HOST "root.atsign.org"
18-
#define ROOT_PORT 64
17+
#define DEFAULT_ROOT_HOST "root.atsign.org"
18+
#define DEFAULT_ROOT_PORT 64
1919

2020
#define PUBLICKEY_PREFIX "public:publickey@"
2121
#define PUBLICKEY_PREFIX_LEN 17
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#ifndef SSHNPD_VERSION_H
22
#define SSHNPD_VERSION_H
3-
#define SSHNPD_VERSION "1.0.12"
3+
#define SSHNPD_VERSION "1.0.13"
44
#endif

0 commit comments

Comments
 (0)