move adding symbols for 1.10 to d/libknet1.symbols directly

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/debian/libknet1.symbols b/debian/libknet1.symbols
index 0fa1fd5060e383674bcfb113a9cdf6e31846c8e3..eb0baa304a32d79de8467795b78500fcc39d032b 100644 (file)
--- a/debian/libknet1.symbols
+++ b/debian/libknet1.symbols
@@ -11,6 +11,7 @@ libknet.so.1 libknet1 #MINVER#
  knet_handle_clear_stats@LIBKNET 0.9
  knet_handle_compress@LIBKNET 0.9
  knet_handle_crypto@LIBKNET 0.9
+ knet_handle_enable_access_lists@LIBKNET 1.10
  knet_handle_enable_filter@LIBKNET 0.9
  knet_handle_enable_pmtud_notify@LIBKNET 0.9
  knet_handle_enable_sock_notify@LIBKNET 0.9
@@ -37,6 +38,8 @@ libknet.so.1 libknet1 #MINVER#
  knet_host_remove@LIBKNET 0.9
  knet_host_set_name@LIBKNET 0.9
  knet_host_set_policy@LIBKNET 0.9
+ knet_link_add_acl@LIBKNET 1.10
+ knet_link_clear_acl@LIBKNET 1.10
  knet_link_clear_config@LIBKNET 0.9
  knet_link_get_config@LIBKNET 0.9
  knet_link_get_enable@LIBKNET 0.9
@@ -45,6 +48,8 @@ libknet.so.1 libknet1 #MINVER#
  knet_link_get_pong_count@LIBKNET 0.9
  knet_link_get_priority@LIBKNET 0.9
  knet_link_get_status@LIBKNET 0.9
+ knet_link_insert_acl@LIBKNET 1.10
+ knet_link_rm_acl@LIBKNET 1.10
  knet_link_set_config@LIBKNET 0.9
  knet_link_set_enable@LIBKNET 0.9
  knet_link_set_ping_timers@LIBKNET 0.9

diff --git a/patches/0005-add-new-symbols-for-libknet-1.10.patch b/patches/0005-add-new-symbols-for-libknet-1.10.patch
deleted file mode 100644 (file)
index 46ef699..0000000
--- a/patches/0005-add-new-symbols-for-libknet-1.10.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
-Date: Wed, 19 Jun 2019 10:41:22 +0200
-Subject: [PATCH kronosnet] add new symbols for libknet 1.10
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
----
- debian/libknet1.symbols | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/debian/libknet1.symbols b/debian/libknet1.symbols
-index 0fa1fd5..eb0baa3 100644
---- a/debian/libknet1.symbols
-+++ b/debian/libknet1.symbols
-@@ -11,6 +11,7 @@ libknet.so.1 libknet1 #MINVER#
-  knet_handle_clear_stats@LIBKNET 0.9
-  knet_handle_compress@LIBKNET 0.9
-  knet_handle_crypto@LIBKNET 0.9
-+ knet_handle_enable_access_lists@LIBKNET 1.10
-  knet_handle_enable_filter@LIBKNET 0.9
-  knet_handle_enable_pmtud_notify@LIBKNET 0.9
-  knet_handle_enable_sock_notify@LIBKNET 0.9
-@@ -37,6 +38,8 @@ libknet.so.1 libknet1 #MINVER#
-  knet_host_remove@LIBKNET 0.9
-  knet_host_set_name@LIBKNET 0.9
-  knet_host_set_policy@LIBKNET 0.9
-+ knet_link_add_acl@LIBKNET 1.10
-+ knet_link_clear_acl@LIBKNET 1.10
-  knet_link_clear_config@LIBKNET 0.9
-  knet_link_get_config@LIBKNET 0.9
-  knet_link_get_enable@LIBKNET 0.9
-@@ -45,6 +48,8 @@ libknet.so.1 libknet1 #MINVER#
-  knet_link_get_pong_count@LIBKNET 0.9
-  knet_link_get_priority@LIBKNET 0.9
-  knet_link_get_status@LIBKNET 0.9
-+ knet_link_insert_acl@LIBKNET 1.10
-+ knet_link_rm_acl@LIBKNET 1.10
-  knet_link_set_config@LIBKNET 0.9
-  knet_link_set_enable@LIBKNET 0.9
-  knet_link_set_ping_timers@LIBKNET 0.9

diff --git a/patches/series b/patches/series
index 4280e183334db5637c72c4b507e9f7a66d73f8b7..ede59da641f6c07b715ad9880806c92cbd0a1500 100644 (file)
--- a/patches/series
+++ b/patches/series
@@ -1,4 +1,3 @@
 0002-cherry-pick-1.9-as-patches.patch
 0003-cherry-pick-1.10-as-patches.patch
-0005-add-new-symbols-for-libknet-1.10.patch
 0006-cherry-pick-pmtud-fixes.patch