Control: tags -1 patch Hi, On Tue, Oct 29, 2024 at 09:04:53PM +0100, Santiago Vila wrote:
../src/h264-encoder.c: In function ‘h264_encoder_create’:
../src/h264-encoder.c:550:58: error: ‘AVFilterLink’ has no member named ‘hw_frames_ctx’
550 | av_buffer_ref(self->filter_out->inputs[0]->hw_frames_ctx);
| ^~
../src/h264-encoder.c: In function ‘h264_encoder_feed’:
../src/h264-encoder.c:621:13: warning: variable ‘rc’ set but not used [-Wunused-but-set-variable]
621 | int rc = fb_queue_enqueue(&self->fb_queue, fb);
| ^~
ninja: build stopped: subcommand failed.
dh_auto_build: error: cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 ninja -j1 -v returned exit code 1
make: *** [debian/rules:8: binary] Error 25
dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2
I will do one QA upload which is to fix the issue also. Please review the debdiff attached. @syq, could you help me to sponsor this? Thanks. To access further information about this package, please visit the following URL: https://mentors.debian.net/package/neatvnc/ Alternatively, you can download the package with 'dget' using this command: dget -x https://mentors.debian.net/debian/pool/main/n/neatvnc/neatvnc_0.8.0+dfsg-3.dsc -- Regards, -- Bo YU
diff -Nru neatvnc-0.8.0+dfsg/debian/changelog neatvnc-0.8.0+dfsg/debian/changelog
--- neatvnc-0.8.0+dfsg/debian/changelog 2024-08-03 23:23:09.000000000 +0800
+++ neatvnc-0.8.0+dfsg/debian/changelog 2024-11-07 15:30:59.000000000 +0800
@@ -1,3 +1,15 @@
+neatvnc (0.8.0+dfsg-3) unstable; urgency=medium
+
+ * QA upload.
+ * Add Fix-ftbfs-on-ffmpeg-7.1.patch to fix ftbfs. (Closes: #1086304)
+ * Use pkgconf instread of pkg-config.
+ * Set std-ver to 4.7.0.
+ * Update year of d/copyright.
+ * Refresh headers of d/patches/*.
+ * Add d/libneatvnc0.symbols
+
+ -- Bo YU <tsu.yubo@gmail.com> Thu, 07 Nov 2024 15:30:59 +0800
+
neatvnc (0.8.0+dfsg-2) unstable; urgency=high
* QA upload.
diff -Nru neatvnc-0.8.0+dfsg/debian/control neatvnc-0.8.0+dfsg/debian/control
--- neatvnc-0.8.0+dfsg/debian/control 2024-08-03 23:23:09.000000000 +0800
+++ neatvnc-0.8.0+dfsg/debian/control 2024-11-07 14:43:08.000000000 +0800
@@ -2,7 +2,7 @@
Priority: optional
Section: libs
Maintainer: Debian QA Group <packages@qa.debian.org>
-Standards-Version: 4.6.2
+Standards-Version: 4.7.0
Build-Depends:
debhelper-compat (= 13),
gnutls-dev,
@@ -16,7 +16,7 @@
libturbojpeg0-dev,
libxxhash-dev,
meson,
- pkg-config,
+ pkgconf,
zlib1g-dev,
Rules-Requires-Root: no
Homepage: https://github.com/any1/neatvnc/
diff -Nru neatvnc-0.8.0+dfsg/debian/copyright neatvnc-0.8.0+dfsg/debian/copyright
--- neatvnc-0.8.0+dfsg/debian/copyright 2024-08-03 23:23:09.000000000 +0800
+++ neatvnc-0.8.0+dfsg/debian/copyright 2024-11-07 14:44:10.000000000 +0800
@@ -21,6 +21,7 @@
Files: debian/*
Copyright: 2021, Boyuan Yang <byang@debian.org>
+ 2024, Bo YU <tsu.yubo@gmail.com>
License: CC0-1.0
Files: debian/missing-sources/keymaps.csv
diff -Nru neatvnc-0.8.0+dfsg/debian/libneatvnc0.symbols neatvnc-0.8.0+dfsg/debian/libneatvnc0.symbols
--- neatvnc-0.8.0+dfsg/debian/libneatvnc0.symbols 1970-01-01 07:30:00.000000000 +0730
+++ neatvnc-0.8.0+dfsg/debian/libneatvnc0.symbols 2024-11-07 15:30:59.000000000 +0800
@@ -0,0 +1,76 @@
+libneatvnc.so.0 libneatvnc0 #MINVER#
+* Build-Depends-Package: libneatvnc-dev
+ nvnc__log@Base 0.8.0
+ nvnc_add_display@Base 0.8.0
+ nvnc_client_close@Base 0.8.0
+ nvnc_client_first@Base 0.8.0
+ nvnc_client_get_address@Base 0.8.0
+ nvnc_client_get_auth_username@Base 0.8.0
+ nvnc_client_get_server@Base 0.8.0
+ nvnc_client_next@Base 0.8.0
+ nvnc_client_supports_cursor@Base 0.8.0
+ nvnc_close@Base 0.8.0
+ nvnc_default_logger@Base 0.8.0
+ nvnc_desktop_layout_get_display@Base 0.8.0
+ nvnc_desktop_layout_get_display_count@Base 0.8.0
+ nvnc_desktop_layout_get_display_height@Base 0.8.0
+ nvnc_desktop_layout_get_display_width@Base 0.8.0
+ nvnc_desktop_layout_get_display_x_pos@Base 0.8.0
+ nvnc_desktop_layout_get_display_y_pos@Base 0.8.0
+ nvnc_desktop_layout_get_height@Base 0.8.0
+ nvnc_desktop_layout_get_width@Base 0.8.0
+ nvnc_display_feed_buffer@Base 0.8.0
+ nvnc_display_get_server@Base 0.8.0
+ nvnc_display_new@Base 0.8.0
+ nvnc_display_ref@Base 0.8.0
+ nvnc_display_unref@Base 0.8.0
+ nvnc_enable_auth@Base 0.8.0
+ nvnc_fb_from_buffer@Base 0.8.0
+ nvnc_fb_from_gbm_bo@Base 0.8.0
+ nvnc_fb_get_addr@Base 0.8.0
+ nvnc_fb_get_fourcc_format@Base 0.8.0
+ nvnc_fb_get_gbm_bo@Base 0.8.0
+ nvnc_fb_get_height@Base 0.8.0
+ nvnc_fb_get_pixel_size@Base 0.8.0
+ nvnc_fb_get_pts@Base 0.8.0
+ nvnc_fb_get_stride@Base 0.8.0
+ nvnc_fb_get_transform@Base 0.8.0
+ nvnc_fb_get_type@Base 0.8.0
+ nvnc_fb_get_width@Base 0.8.0
+ nvnc_fb_new@Base 0.8.0
+ nvnc_fb_pool_acquire@Base 0.8.0
+ nvnc_fb_pool_new@Base 0.8.0
+ nvnc_fb_pool_ref@Base 0.8.0
+ nvnc_fb_pool_release@Base 0.8.0
+ nvnc_fb_pool_resize@Base 0.8.0
+ nvnc_fb_pool_set_alloc_fn@Base 0.8.0
+ nvnc_fb_pool_unref@Base 0.8.0
+ nvnc_fb_ref@Base 0.8.0
+ nvnc_fb_set_pts@Base 0.8.0
+ nvnc_fb_set_release_fn@Base 0.8.0
+ nvnc_fb_set_transform@Base 0.8.0
+ nvnc_fb_unref@Base 0.8.0
+ nvnc_get_userdata@Base 0.8.0
+ nvnc_has_auth@Base 0.8.0
+ nvnc_open@Base 0.8.0
+ nvnc_open_unix@Base 0.8.0
+ nvnc_open_websocket@Base 0.8.0
+ nvnc_remove_display@Base 0.8.0
+ nvnc_send_cut_text@Base 0.8.0
+ nvnc_set_client_cleanup_fn@Base 0.8.0
+ nvnc_set_cursor@Base 0.8.0
+ nvnc_set_cut_text_fn@Base 0.8.0
+ nvnc_set_desktop_layout_fn@Base 0.8.0
+ nvnc_set_fb_req_fn@Base 0.8.0
+ nvnc_set_key_code_fn@Base 0.8.0
+ nvnc_set_key_fn@Base 0.8.0
+ nvnc_set_log_fn@Base 0.8.0
+ nvnc_set_log_fn_thread_local@Base 0.8.0
+ nvnc_set_log_level@Base 0.8.0
+ nvnc_set_name@Base 0.8.0
+ nvnc_set_new_client_fn@Base 0.8.0
+ nvnc_set_pointer_fn@Base 0.8.0
+ nvnc_set_rsa_creds@Base 0.8.0
+ nvnc_set_tls_creds@Base 0.8.0
+ nvnc_set_userdata@Base 0.8.0
+ nvnc_version@Base 0.8.0
diff -Nru neatvnc-0.8.0+dfsg/debian/patches/Add-sanity-check-for-chosen-security-type.patch neatvnc-0.8.0+dfsg/debian/patches/Add-sanity-check-for-chosen-security-type.patch
--- neatvnc-0.8.0+dfsg/debian/patches/Add-sanity-check-for-chosen-security-type.patch 2024-08-03 23:23:09.000000000 +0800
+++ neatvnc-0.8.0+dfsg/debian/patches/Add-sanity-check-for-chosen-security-type.patch 2024-11-07 15:25:20.000000000 +0800
@@ -1,7 +1,7 @@
From: Andri Yngvason <andri@yngvason.is>
Date: Thu, 1 Aug 2024 20:14:47 +0000
Subject: Add sanity check for chosen security type
-Origin: https://github.com/any1/neatvnc/commit/cc71650a69abc2573a0d96d082409d2468802d47
+Origin: upstream, https://github.com/any1/neatvnc/commit/cc71650a69abc2573a0d96d082409d2468802d47
Bug-Debian: https://bugs.debian.org/1077822
Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2024-42458
@@ -10,8 +10,6 @@
src/server.c | 81 +++++++++++++++++++++++++++++++++---------------
2 files changed, 60 insertions(+), 25 deletions(-)
-diff --git a/include/common.h b/include/common.h
-index 50ed1b09d2a7..4cd811eacf7b 100644
--- a/include/common.h
+++ b/include/common.h
@@ -38,6 +38,7 @@
@@ -22,7 +20,7 @@
enum nvnc_client_state {
VNC_CLIENT_STATE_ERROR = -1,
-@@ -167,6 +168,9 @@ struct nvnc {
+@@ -167,6 +168,9 @@
struct crypto_rsa_priv_key* rsa_priv;
#endif
@@ -32,8 +30,6 @@
uint32_t n_damage_clients;
};
-diff --git a/src/server.c b/src/server.c
-index 129ae37fa524..9f8bb234da85 100644
--- a/src/server.c
+++ b/src/server.c
@@ -67,7 +67,6 @@
@@ -44,7 +40,7 @@
#define APPLE_DH_SERVER_KEY_LENGTH 256
#define UDIV_UP(a, b) (((a) + (b) - 1) / (b))
-@@ -215,52 +214,79 @@ static int handle_unsupported_version(struct nvnc_client* client)
+@@ -215,52 +214,79 @@
return 0;
}
@@ -59,20 +55,20 @@
- char version_string[13];
- memcpy(version_string, client->msg_buffer + client->buffer_index, 12);
- version_string[12] = '\0';
--
-- if (strcmp(RFB_VERSION_MESSAGE, version_string) != 0)
-- return handle_unsupported_version(client);
+#define ADD_SECURITY_TYPE(type) \
+ assert(server->n_security_types < MAX_SECURITY_TYPES); \
+ server->security_types[server->n_security_types++] = (type);
+- if (strcmp(RFB_VERSION_MESSAGE, version_string) != 0)
+- return handle_unsupported_version(client);
++ if (server->n_security_types > 0)
++ return;
+
- uint8_t buf[sizeof(struct rfb_security_types_msg) +
- SECURITY_TYPES_MAX] = {};
- struct rfb_security_types_msg* security =
- (struct rfb_security_types_msg*)buf;
-+ if (server->n_security_types > 0)
-+ return;
-
+-
- security->n = 0;
if (server->auth_flags & NVNC_AUTH_REQUIRE_AUTH) {
assert(server->auth_fn);
@@ -148,7 +144,7 @@
stream_write(client->net_stream, security, sizeof(*security) +
security->n, NULL, NULL);
-@@ -798,6 +824,11 @@ static int on_security_message(struct nvnc_client* client)
+@@ -798,6 +824,11 @@
uint8_t type = client->msg_buffer[client->buffer_index];
nvnc_log(NVNC_LOG_DEBUG, "Client chose security type: %d", type);
@@ -160,6 +156,3 @@
switch (type) {
case RFB_SECURITY_TYPE_NONE:
security_handshake_ok(client, NULL);
---
-2.45.2
-
diff -Nru neatvnc-0.8.0+dfsg/debian/patches/Fix-ftbfs-on-ffmpeg-7.1.patch neatvnc-0.8.0+dfsg/debian/patches/Fix-ftbfs-on-ffmpeg-7.1.patch
--- neatvnc-0.8.0+dfsg/debian/patches/Fix-ftbfs-on-ffmpeg-7.1.patch 1970-01-01 07:30:00.000000000 +0730
+++ neatvnc-0.8.0+dfsg/debian/patches/Fix-ftbfs-on-ffmpeg-7.1.patch 2024-11-07 15:24:07.000000000 +0800
@@ -0,0 +1,18 @@
+Description: fix ftbfs again with ffmpeg7.1
+Origin: upstream, https://github.com/any1/neatvnc/commit/7e008743bf872598b4fcdb2a821041064ce5dd01
+Bug: https://bugs.debian.org/1086304
+Applied-Upstream: https://github.com/any1/neatvnc/commit/7e008743bf872598b4fcdb2a821041064ce5dd01
+Last-Update: 2024-11-07
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/h264-encoder.c
++++ b/src/h264-encoder.c
+@@ -547,7 +547,7 @@
+ goto codec_context_failure;
+
+ self->codec_ctx->hw_frames_ctx =
+- av_buffer_ref(self->filter_out->inputs[0]->hw_frames_ctx);
++ av_buffer_ref(av_buffersink_get_hw_frames_ctx(self->filter_out));
+
+ AVDictionary *opts = NULL;
+ av_dict_set_int(&opts, "async_depth", 1, 0);
diff -Nru neatvnc-0.8.0+dfsg/debian/patches/series neatvnc-0.8.0+dfsg/debian/patches/series
--- neatvnc-0.8.0+dfsg/debian/patches/series 2024-08-03 23:23:09.000000000 +0800
+++ neatvnc-0.8.0+dfsg/debian/patches/series 2024-11-07 14:29:38.000000000 +0800
@@ -1 +1,2 @@
Add-sanity-check-for-chosen-security-type.patch
+Fix-ftbfs-on-ffmpeg-7.1.patch
Attachment:
signature.asc
Description: PGP signature