mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2026-05-05 12:26:52 +02:00
testing/*: remove unused patches
This commit is contained in:
ptrcnull
parent
789d92a36b
commit
03f195377b
@ -1,61 +0,0 @@
|
||||
diff --git a/src/muuli_wdr.cpp b/src/muuli_wdr.cpp
|
||||
index 44f0eb6..64dbade 100644
|
||||
--- a/src/muuli_wdr.cpp
|
||||
+++ b/src/muuli_wdr.cpp
|
||||
@@ -181,10 +181,10 @@ wxSizer *searchDlg( wxWindow *parent, bool call_fit, bool set_sizer )
|
||||
wxBoxSizer *item3 = new wxBoxSizer( wxHORIZONTAL );
|
||||
|
||||
wxStaticText *item4 = new wxStaticText( parent, -1, _("Name:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
- item3->Add( item4, 0, wxALIGN_CENTER|wxALL, 5 );
|
||||
+ item3->Add( item4, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
|
||||
|
||||
CMuleTextCtrl *item5 = new CMuleTextCtrl( parent, IDC_SEARCHNAME, wxT(""), wxDefaultPosition, wxSize(80,-1), wxTE_PROCESS_ENTER );
|
||||
- item3->Add( item5, 1, wxALIGN_CENTER|wxALL, 5 );
|
||||
+ item3->Add( item5, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
|
||||
|
||||
wxFlexGridSizer *item6 = new wxFlexGridSizer( 1, 0, 0, 0 );
|
||||
|
||||
@@ -212,7 +212,7 @@ wxSizer *searchDlg( wxWindow *parent, bool call_fit, bool set_sizer )
|
||||
wxCheckBox *item12 = new wxCheckBox( parent, IDC_FILTERCHECK, _("Filtering"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
item6->Add( item12, 0, wxALIGN_CENTER|wxALL, 5 );
|
||||
|
||||
- item3->Add( item6, 0, wxALIGN_CENTER, 0 );
|
||||
+ item3->Add( item6, 0, wxALIGN_CENTER_VERTICAL, 0 );
|
||||
|
||||
item1->Add( item3, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
|
||||
|
||||
@@ -925,17 +925,17 @@ wxSizer *downloadDlg( wxWindow *parent, bool call_fit, bool set_sizer )
|
||||
item0->Add( item2, 0, wxALIGN_CENTER|wxLEFT|wxRIGHT, 5 );
|
||||
|
||||
wxGauge *item3 = new wxGauge( parent, ID_HTTPDOWNLOADPROGRESS, 100, wxDefaultPosition, wxSize(-1,10), wxGA_SMOOTH|wxGA_PROGRESSBAR );
|
||||
- item0->Add( item3, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
|
||||
+ item0->Add( item3, 0, wxGROW|wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
|
||||
|
||||
wxStaticText *item4 = new wxStaticText( parent, IDC_DOWNLOADSIZE, _("Unknown size"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
|
||||
- item0->Add( item4, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
|
||||
+ item0->Add( item4, 0, wxGROW|wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
|
||||
|
||||
wxStaticLine *item5 = new wxStaticLine( parent, -1, wxDefaultPosition, wxSize(20,-1), wxLI_HORIZONTAL );
|
||||
- item0->Add( item5, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
|
||||
+ item0->Add( item5, 0, wxGROW|wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
|
||||
|
||||
wxButton *item6 = new wxButton( parent, ID_HTTPCANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
item6->SetDefault();
|
||||
- item0->Add( item6, 0, wxALIGN_CENTER|wxALL, 5 );
|
||||
+ item0->Add( item6, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
|
||||
|
||||
if (set_sizer)
|
||||
{
|
||||
diff --git a/src/utils/wxCas/src/wxcasprefs.cpp b/src/utils/wxCas/src/wxcasprefs.cpp
|
||||
index d87aad3..c36ac64 100644
|
||||
--- a/src/utils/wxCas/src/wxcasprefs.cpp
|
||||
+++ b/src/utils/wxCas/src/wxcasprefs.cpp
|
||||
@@ -88,7 +88,7 @@ WxCasPrefs::WxCasPrefs ( wxWindow * parent ) : wxDialog ( parent, -1,
|
||||
WxCasCte::DEFAULT_REFRESH_RATE ) );
|
||||
m_refreshStaticText =
|
||||
new wxStaticText ( this, -1, _( "Refresh rate interval in seconds" ), wxDefaultPosition,
|
||||
- wxDefaultSize, wxALIGN_CENTRE );
|
||||
+ wxDefaultSize, wxALIGN_CENTER );
|
||||
m_refreshSBoxSizer->Add ( m_refreshSpinButton, 0, wxALL | wxALIGN_CENTER, 5 );
|
||||
m_refreshSBoxSizer->Add ( m_refreshStaticText, 1, wxALL | wxALIGN_CENTER, 5 );
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/c-utility/pal/linux/socket_async_os.h b/c-utility/pal/linux/socket_async_os.h
|
||||
index bd59e48..1797089 100644
|
||||
--- a/c-utility/pal/linux/socket_async_os.h
|
||||
+++ b/c-utility/pal/linux/socket_async_os.h
|
||||
@@ -10,7 +10,7 @@
|
||||
#include <sys/select.h>
|
||||
#include <netinet/in.h>
|
||||
#include <netinet/tcp.h>
|
||||
-#include <sys/errno.h>
|
||||
+#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
#include <unistd.h>
|
||||
#include <netdb.h>
|
||||
@ -1,36 +0,0 @@
|
||||
diff --git a/test/004_missing_option_argument.txt b/test/004_missing_option_argument.txt
|
||||
deleted file mode 100644
|
||||
index 8222bbb..0000000
|
||||
--- a/test/004_missing_option_argument.txt
|
||||
+++ /dev/null
|
||||
@@ -1,11 +0,0 @@
|
||||
-:ARGS
|
||||
--s
|
||||
-:INPUT
|
||||
-:OUTPUT-FILTER
|
||||
-1s/^.+?: /boxes: /
|
||||
-1s/-- s$/-- 's'/
|
||||
-:EXPECTED-ERROR 1
|
||||
-boxes: option requires an argument -- 's'
|
||||
-Usage: boxes [options] [infile [outfile]]
|
||||
-Try `boxes -h' for more information.
|
||||
-:EOF
|
||||
diff --git a/test/065_size_missing_argument.txt b/test/065_size_missing_argument.txt
|
||||
deleted file mode 100644
|
||||
index 6dad5ae..0000000
|
||||
--- a/test/065_size_missing_argument.txt
|
||||
+++ /dev/null
|
||||
@@ -1,12 +0,0 @@
|
||||
-:ARGS
|
||||
--s
|
||||
-:INPUT
|
||||
-foo
|
||||
-:OUTPUT-FILTER
|
||||
-1s/^.+?: /boxes: /
|
||||
-1s/-- s$/-- 's'/
|
||||
-:EXPECTED-ERROR 1
|
||||
-boxes: option requires an argument -- 's'
|
||||
-Usage: boxes [options] [infile [outfile]]
|
||||
-Try `boxes -h' for more information.
|
||||
-:EOF
|
||||
\ No newline at end of file
|
||||
@ -1,26 +0,0 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 7be3c15..b7f16c4 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -13,7 +13,7 @@ JPEG_LIB ?= $(JPEG_DIR)/lib`getconf LONG_BIT`
|
||||
CC = gcc
|
||||
CFLAGS = -Wall -O2
|
||||
GTK = `pkg-config --libs --cflags gtk+-3.0` `pkg-config --libs x11`
|
||||
-GTK += `pkg-config --cflags --libs appindicator3-0.1`
|
||||
+GTK += `pkg-config --cflags --libs ayatana-appindicator3-0.1`
|
||||
LIBAV = `pkg-config --libs --cflags libswscale libavutil`
|
||||
LIBS = -lspeex -lasound -lpthread -lm
|
||||
JPEG = -I$(JPEG_INCLUDE) $(JPEG_LIB)/libturbojpeg.a
|
||||
diff --git a/src/droidcam.c b/src/droidcam.c
|
||||
index cad1ee4..28f4000 100644
|
||||
--- a/src/droidcam.c
|
||||
+++ b/src/droidcam.c
|
||||
@@ -7,7 +7,7 @@
|
||||
*/
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
-#include <libappindicator/app-indicator.h>
|
||||
+#include <libayatana-appindicator/app-indicator.h>
|
||||
#include <X11/Xlib.h>
|
||||
#include <stdint.h>
|
||||
|
||||
@ -1,372 +0,0 @@
|
||||
From d0c1f5ee1f56c165bdf550c9e3be0d7313587b80 Mon Sep 17 00:00:00 2001
|
||||
From: Elly Fong-Jones <ellyjones@chromium.org>
|
||||
Date: Wed, 18 Jan 2023 22:33:11 +0000
|
||||
Subject: [PATCH] media: untangle MediaRouterUI lifetimes
|
||||
|
||||
Currently, MediaRouterUI is owned by MediaItemUIDeviceSelectorView.
|
||||
There is an observer method named "OnControllerInvalidated" which
|
||||
MediaItemUIDeviceSelectorView reacts to by deleting the MediaRouterUI it
|
||||
owns. However, OnControllerInvalidated can actually be called in two
|
||||
different situations:
|
||||
|
||||
* From MediaRouterUI::TakeMediaRouteStarter(), in which case the
|
||||
MediaRouterUI object is *not* being destroyed, but should be, because
|
||||
it can't be safely used after TakeMediaRouteStarter() ends;
|
||||
* From MediaRouterUI::~MediaRouterUI(), in which case the MediaRouterUI
|
||||
object *is* being destroyed already and should not be.
|
||||
|
||||
In the second case, only the fact that libc++ nulls out unique_ptr
|
||||
before destroying the pointed-to object saves us from a use-after-free;
|
||||
under libstdc++, we UaF immediately by re-entering the destructor. Even
|
||||
under libc++ though this is still very dangerous, because any observers
|
||||
that happened to be registered after MediaItemUIDeviceSelectorView will
|
||||
be invoked after the destruction of the object they're observing. Right
|
||||
now there are no such other observers, but the fact remains that this
|
||||
interface is basically a UaF timebomb.
|
||||
|
||||
This change separates "this object is about to be destroyed" (an
|
||||
observable state) from "please destroy this object, it is no longer
|
||||
useful" (a callback that is made to the object's owner) by:
|
||||
|
||||
1. Renaming OnControllerInvalidated to OnControllerDestroying, to make
|
||||
it very clear what is happening to the object, and
|
||||
2. Adding a RegisterDestructor method to CastDialogController, which
|
||||
allows MediaItemUIDeviceSelectorView to pass a callback into
|
||||
MediaRouterUI which MediaRouterUI can use to arrange for its own
|
||||
destruction.
|
||||
|
||||
This is still a bit tangled and ungainly, but it's safe. A fuller
|
||||
writeup is on the linked bug.
|
||||
|
||||
Fixed: 1407202
|
||||
Change-Id: Id9410de1fbf2cb42f13957dde316b7c9259f192f
|
||||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4165967
|
||||
Reviewed-by: Peter Kasting <pkasting@chromium.org>
|
||||
Reviewed-by: Takumi Fujimoto <takumif@chromium.org>
|
||||
Commit-Queue: Elly Fong-Jones <ellyjones@chromium.org>
|
||||
Cr-Commit-Position: refs/heads/main@{#1094110}
|
||||
---
|
||||
|
||||
diff --git a/chrome/browser/ui/media_router/cast_dialog_controller.h b/chrome/browser/ui/media_router/cast_dialog_controller.h
|
||||
index 2a8de976..c3c0553 100644
|
||||
--- a/chrome/browser/ui/media_router/cast_dialog_controller.h
|
||||
+++ b/chrome/browser/ui/media_router/cast_dialog_controller.h
|
||||
@@ -24,10 +24,12 @@
|
||||
public:
|
||||
virtual ~Observer() = default;
|
||||
|
||||
- virtual void OnModelUpdated(const CastDialogModel& model) = 0;
|
||||
+ virtual void OnModelUpdated(const CastDialogModel& model) {}
|
||||
|
||||
- // Observer should drop its reference to the controller when this is called.
|
||||
- virtual void OnControllerInvalidated() = 0;
|
||||
+ // Notifies observers that the observed object is being destroyed. Observers
|
||||
+ // MUST NOT try to destroy the observed object in response - to manage the
|
||||
+ // lifetime of a CastDialogController, use RegisterDestructor() below.
|
||||
+ virtual void OnControllerDestroying() {}
|
||||
};
|
||||
|
||||
virtual ~CastDialogController() = default;
|
||||
@@ -55,6 +57,16 @@
|
||||
// intended that this API should only be used to transfer ownership to some
|
||||
// new component that will want to start casting on this dialog box's behalf.
|
||||
virtual std::unique_ptr<MediaRouteStarter> TakeMediaRouteStarter() = 0;
|
||||
+
|
||||
+ // Registers a callback for when the CastDialogController has given up
|
||||
+ // ownership of its MediaRouteStarter and is no longer safe to use. The
|
||||
+ // provided closure must destroy |this| or otherwise ensure it is never used
|
||||
+ // again. This method can only be called once.
|
||||
+ //
|
||||
+ // TODO(https://crbug.com/1408494): It's awkward that CastDialogController has
|
||||
+ // a state where it exists but is unsafe to use, and doubly awkward that we
|
||||
+ // have to paper over that with this callback. Can that be fixed?
|
||||
+ virtual void RegisterDestructor(base::OnceClosure destructor) = 0;
|
||||
};
|
||||
|
||||
} // namespace media_router
|
||||
diff --git a/chrome/browser/ui/media_router/media_router_ui.cc b/chrome/browser/ui/media_router/media_router_ui.cc
|
||||
index 1865115f..644d131 100644
|
||||
--- a/chrome/browser/ui/media_router/media_router_ui.cc
|
||||
+++ b/chrome/browser/ui/media_router/media_router_ui.cc
|
||||
@@ -83,6 +83,9 @@
|
||||
MediaRouterUI::~MediaRouterUI() {
|
||||
if (media_route_starter_)
|
||||
DetachFromMediaRouteStarter();
|
||||
+ for (CastDialogController::Observer& observer : observers_) {
|
||||
+ observer.OnControllerDestroying();
|
||||
+ }
|
||||
}
|
||||
|
||||
// static
|
||||
@@ -145,9 +148,6 @@
|
||||
}
|
||||
|
||||
void MediaRouterUI::DetachFromMediaRouteStarter() {
|
||||
- for (CastDialogController::Observer& observer : observers_)
|
||||
- observer.OnControllerInvalidated();
|
||||
-
|
||||
media_route_starter()->RemovePresentationRequestSourceObserver(this);
|
||||
media_route_starter()->RemoveMediaSinkWithCastModesObserver(this);
|
||||
}
|
||||
@@ -181,8 +181,16 @@
|
||||
|
||||
std::unique_ptr<MediaRouteStarter> MediaRouterUI::TakeMediaRouteStarter() {
|
||||
DCHECK(media_route_starter_) << "MediaRouteStarter already taken!";
|
||||
- DetachFromMediaRouteStarter();
|
||||
- return std::move(media_route_starter_);
|
||||
+ auto starter = std::move(media_route_starter_);
|
||||
+ if (destructor_) {
|
||||
+ std::move(destructor_).Run(); // May destroy `this`.
|
||||
+ }
|
||||
+ return starter;
|
||||
+}
|
||||
+
|
||||
+void MediaRouterUI::RegisterDestructor(base::OnceClosure destructor) {
|
||||
+ DCHECK(!destructor_);
|
||||
+ destructor_ = std::move(destructor);
|
||||
}
|
||||
|
||||
bool MediaRouterUI::CreateRoute(const MediaSink::Id& sink_id,
|
||||
diff --git a/chrome/browser/ui/media_router/media_router_ui.h b/chrome/browser/ui/media_router/media_router_ui.h
|
||||
index 5c2f14e..7afe775 100644
|
||||
--- a/chrome/browser/ui/media_router/media_router_ui.h
|
||||
+++ b/chrome/browser/ui/media_router/media_router_ui.h
|
||||
@@ -100,8 +100,10 @@
|
||||
void StopCasting(const std::string& route_id) override;
|
||||
void ClearIssue(const Issue::Id& issue_id) override;
|
||||
// Note that |MediaRouterUI| should not be used after |TakeMediaRouteStarter|
|
||||
- // is called.
|
||||
+ // is called. To enforce that, |TakeMediaRouteStarter| calls the destructor
|
||||
+ // callback given to |RegisterDestructor| to destroy itself.
|
||||
std::unique_ptr<MediaRouteStarter> TakeMediaRouteStarter() override;
|
||||
+ void RegisterDestructor(base::OnceClosure destructor) override;
|
||||
|
||||
// Requests a route be created from the source mapped to
|
||||
// |cast_mode|, to the sink given by |sink_id|.
|
||||
@@ -337,6 +339,8 @@
|
||||
raw_ptr<MediaRouter> router_;
|
||||
raw_ptr<LoggerImpl> logger_;
|
||||
|
||||
+ base::OnceClosure destructor_;
|
||||
+
|
||||
// NOTE: Weak pointers must be invalidated before all other member variables.
|
||||
// Therefore |weak_factory_| must be placed at the end.
|
||||
base::WeakPtrFactory<MediaRouterUI> weak_factory_{this};
|
||||
diff --git a/chrome/browser/ui/media_router/media_router_ui_unittest.cc b/chrome/browser/ui/media_router/media_router_ui_unittest.cc
|
||||
index 2cc243d1..c33437b 100644
|
||||
--- a/chrome/browser/ui/media_router/media_router_ui_unittest.cc
|
||||
+++ b/chrome/browser/ui/media_router/media_router_ui_unittest.cc
|
||||
@@ -80,11 +80,11 @@
|
||||
}
|
||||
|
||||
MOCK_METHOD1(OnModelUpdated, void(const CastDialogModel& model));
|
||||
- void OnControllerInvalidated() override {
|
||||
+ void OnControllerDestroying() override {
|
||||
controller_ = nullptr;
|
||||
- OnControllerInvalidatedInternal();
|
||||
+ OnControllerDestroyingInternal();
|
||||
}
|
||||
- MOCK_METHOD0(OnControllerInvalidatedInternal, void());
|
||||
+ MOCK_METHOD0(OnControllerDestroyingInternal, void());
|
||||
|
||||
private:
|
||||
raw_ptr<CastDialogController> controller_ = nullptr;
|
||||
@@ -295,7 +295,7 @@
|
||||
})));
|
||||
NotifyUiOnRoutesUpdated({route});
|
||||
|
||||
- EXPECT_CALL(observer, OnControllerInvalidatedInternal());
|
||||
+ EXPECT_CALL(observer, OnControllerDestroyingInternal());
|
||||
ui_.reset();
|
||||
}
|
||||
|
||||
diff --git a/chrome/browser/ui/views/global_media_controls/media_item_ui_device_selector_view.cc b/chrome/browser/ui/views/global_media_controls/media_item_ui_device_selector_view.cc
|
||||
index 34dad46..d843bba 100644
|
||||
--- a/chrome/browser/ui/views/global_media_controls/media_item_ui_device_selector_view.cc
|
||||
+++ b/chrome/browser/ui/views/global_media_controls/media_item_ui_device_selector_view.cc
|
||||
@@ -222,6 +222,11 @@
|
||||
if (cast_controller) {
|
||||
cast_controller_ = std::move(cast_controller);
|
||||
cast_controller_->AddObserver(this);
|
||||
+ cast_controller_->RegisterDestructor(
|
||||
+ base::BindOnce(&MediaItemUIDeviceSelectorView::DestroyCastController,
|
||||
+ // Unretained is safe: this callback is held by
|
||||
+ // cast_controller_, which is owned by this object.
|
||||
+ base::Unretained(this)));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -499,10 +504,6 @@
|
||||
observer.OnMediaItemUIDeviceSelectorUpdated(device_entry_ui_map_);
|
||||
}
|
||||
|
||||
-void MediaItemUIDeviceSelectorView::OnControllerInvalidated() {
|
||||
- cast_controller_.reset();
|
||||
-}
|
||||
-
|
||||
void MediaItemUIDeviceSelectorView::OnDeviceSelected(int tag) {
|
||||
auto it = device_entry_ui_map_.find(tag);
|
||||
DCHECK(it != device_entry_ui_map_.end());
|
||||
@@ -658,5 +659,9 @@
|
||||
weak_ptr_factory_.GetWeakPtr()));
|
||||
}
|
||||
|
||||
+void MediaItemUIDeviceSelectorView::DestroyCastController() {
|
||||
+ cast_controller_.reset();
|
||||
+}
|
||||
+
|
||||
BEGIN_METADATA(MediaItemUIDeviceSelectorView, views::View)
|
||||
END_METADATA
|
||||
diff --git a/chrome/browser/ui/views/global_media_controls/media_item_ui_device_selector_view.h b/chrome/browser/ui/views/global_media_controls/media_item_ui_device_selector_view.h
|
||||
index e950565..222fc20 100644
|
||||
--- a/chrome/browser/ui/views/global_media_controls/media_item_ui_device_selector_view.h
|
||||
+++ b/chrome/browser/ui/views/global_media_controls/media_item_ui_device_selector_view.h
|
||||
@@ -81,7 +81,6 @@
|
||||
|
||||
// media_router::CastDialogController::Observer
|
||||
void OnModelUpdated(const media_router::CastDialogModel& model) override;
|
||||
- void OnControllerInvalidated() override;
|
||||
|
||||
// MediaItemUIFooterView::Delegate
|
||||
void OnDeviceSelected(int tag) override;
|
||||
@@ -121,6 +120,7 @@
|
||||
void RecordCastDeviceCount();
|
||||
DeviceEntryUI* GetDeviceEntryUI(views::View* view) const;
|
||||
void RegisterAudioDeviceCallbacks();
|
||||
+ void DestroyCastController();
|
||||
|
||||
bool has_expand_button_been_shown_ = false;
|
||||
bool have_devices_been_shown_ = false;
|
||||
diff --git a/chrome/browser/ui/views/global_media_controls/media_item_ui_device_selector_view_unittest.cc b/chrome/browser/ui/views/global_media_controls/media_item_ui_device_selector_view_unittest.cc
|
||||
index c3bcc6cc..6ae3dde8 100644
|
||||
--- a/chrome/browser/ui/views/global_media_controls/media_item_ui_device_selector_view_unittest.cc
|
||||
+++ b/chrome/browser/ui/views/global_media_controls/media_item_ui_device_selector_view_unittest.cc
|
||||
@@ -156,6 +156,7 @@
|
||||
MOCK_METHOD1(ClearIssue, void(const media_router::Issue::Id& issue_id));
|
||||
MOCK_METHOD0(TakeMediaRouteStarter,
|
||||
std::unique_ptr<media_router::MediaRouteStarter>());
|
||||
+ MOCK_METHOD1(RegisterDestructor, void(base::OnceClosure));
|
||||
};
|
||||
|
||||
} // anonymous namespace
|
||||
diff --git a/chrome/browser/ui/views/media_router/cast_dialog_coordinator_unittest.cc b/chrome/browser/ui/views/media_router/cast_dialog_coordinator_unittest.cc
|
||||
index f6c80d6a..2dedc7e 100644
|
||||
--- a/chrome/browser/ui/views/media_router/cast_dialog_coordinator_unittest.cc
|
||||
+++ b/chrome/browser/ui/views/media_router/cast_dialog_coordinator_unittest.cc
|
||||
@@ -40,6 +40,7 @@
|
||||
MOCK_METHOD(void, StopCasting, (const std::string& route_id));
|
||||
MOCK_METHOD(void, ClearIssue, (const Issue::Id& issue_id));
|
||||
MOCK_METHOD(std::unique_ptr<MediaRouteStarter>, TakeMediaRouteStarter, ());
|
||||
+ MOCK_METHOD(void, RegisterDestructor, (base::OnceClosure));
|
||||
};
|
||||
|
||||
class CastDialogCoordinatorTest : public TestWithBrowserView {
|
||||
diff --git a/chrome/browser/ui/views/media_router/cast_dialog_view.cc b/chrome/browser/ui/views/media_router/cast_dialog_view.cc
|
||||
index e3c7dadb..711d081 100644
|
||||
--- a/chrome/browser/ui/views/media_router/cast_dialog_view.cc
|
||||
+++ b/chrome/browser/ui/views/media_router/cast_dialog_view.cc
|
||||
@@ -125,9 +125,9 @@
|
||||
observer.OnDialogModelUpdated(this);
|
||||
}
|
||||
|
||||
-void CastDialogView::OnControllerInvalidated() {
|
||||
+void CastDialogView::OnControllerDestroying() {
|
||||
controller_ = nullptr;
|
||||
- // We don't destroy the dialog here because if the invalidation was caused by
|
||||
+ // We don't destroy the dialog here because if the destruction was caused by
|
||||
// activating the toolbar icon in order to close the dialog, then it would
|
||||
// cause the dialog to immediately open again.
|
||||
}
|
||||
diff --git a/chrome/browser/ui/views/media_router/cast_dialog_view.h b/chrome/browser/ui/views/media_router/cast_dialog_view.h
|
||||
index d87fdda..d44d4e0 100644
|
||||
--- a/chrome/browser/ui/views/media_router/cast_dialog_view.h
|
||||
+++ b/chrome/browser/ui/views/media_router/cast_dialog_view.h
|
||||
@@ -66,7 +66,7 @@
|
||||
|
||||
// CastDialogController::Observer:
|
||||
void OnModelUpdated(const CastDialogModel& model) override;
|
||||
- void OnControllerInvalidated() override;
|
||||
+ void OnControllerDestroying() override;
|
||||
|
||||
// views::BubbleDialogDelegateView:
|
||||
void OnPaint(gfx::Canvas* canvas) override;
|
||||
diff --git a/chrome/browser/ui/views/media_router/cast_dialog_view_browsertest.cc b/chrome/browser/ui/views/media_router/cast_dialog_view_browsertest.cc
|
||||
index 1c584120..a7af3c8 100644
|
||||
--- a/chrome/browser/ui/views/media_router/cast_dialog_view_browsertest.cc
|
||||
+++ b/chrome/browser/ui/views/media_router/cast_dialog_view_browsertest.cc
|
||||
@@ -70,6 +70,7 @@
|
||||
override {
|
||||
return nullptr;
|
||||
}
|
||||
+ void RegisterDestructor(base::OnceClosure destructor) override {}
|
||||
};
|
||||
|
||||
} // namespace
|
||||
diff --git a/chrome/browser/ui/views/media_router/cast_dialog_view_unittest.cc b/chrome/browser/ui/views/media_router/cast_dialog_view_unittest.cc
|
||||
index 5326467..988cb07a 100644
|
||||
--- a/chrome/browser/ui/views/media_router/cast_dialog_view_unittest.cc
|
||||
+++ b/chrome/browser/ui/views/media_router/cast_dialog_view_unittest.cc
|
||||
@@ -91,6 +91,7 @@
|
||||
MOCK_METHOD1(StopCasting, void(const std::string& route_id));
|
||||
MOCK_METHOD1(ClearIssue, void(const Issue::Id& issue_id));
|
||||
MOCK_METHOD0(TakeMediaRouteStarter, std::unique_ptr<MediaRouteStarter>());
|
||||
+ MOCK_METHOD1(RegisterDestructor, void(base::OnceClosure));
|
||||
};
|
||||
|
||||
class CastDialogViewTest : public ChromeViewsTestBase {
|
||||
diff --git a/chrome/browser/ui/views/media_router/media_router_dialog_controller_views.cc b/chrome/browser/ui/views/media_router/media_router_dialog_controller_views.cc
|
||||
index ad379b2..244d523 100644
|
||||
--- a/chrome/browser/ui/views/media_router/media_router_dialog_controller_views.cc
|
||||
+++ b/chrome/browser/ui/views/media_router/media_router_dialog_controller_views.cc
|
||||
@@ -51,7 +51,7 @@
|
||||
std::move(context));
|
||||
}
|
||||
|
||||
- ShowGlobalMeidaControlsDialog(std::move(context));
|
||||
+ ShowGlobalMediaControlsDialog(std::move(context));
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -155,9 +155,20 @@
|
||||
initiator(), std::move(start_presentation_context_))
|
||||
: MediaRouterUI::CreateWithDefaultMediaSourceAndMirroring(
|
||||
initiator());
|
||||
+ ui_->RegisterDestructor(
|
||||
+ base::BindOnce(&MediaRouterDialogControllerViews::DestroyMediaRouterUI,
|
||||
+ // Safe to use base::Unretained here: the callback being
|
||||
+ // bound is held by the MediaRouterUI we are creating and
|
||||
+ // owning, and ownership of |ui_| is never transferred
|
||||
+ // away from this object.
|
||||
+ base::Unretained(this)));
|
||||
}
|
||||
|
||||
-void MediaRouterDialogControllerViews::ShowGlobalMeidaControlsDialog(
|
||||
+void MediaRouterDialogControllerViews::DestroyMediaRouterUI() {
|
||||
+ ui_.reset();
|
||||
+}
|
||||
+
|
||||
+void MediaRouterDialogControllerViews::ShowGlobalMediaControlsDialog(
|
||||
std::unique_ptr<StartPresentationContext> context) {
|
||||
// Show the WebContents requesting a dialog.
|
||||
initiator()->GetDelegate()->ActivateContents(initiator());
|
||||
diff --git a/chrome/browser/ui/views/media_router/media_router_dialog_controller_views.h b/chrome/browser/ui/views/media_router/media_router_dialog_controller_views.h
|
||||
index 0a5fdb1..7c97211 100644
|
||||
--- a/chrome/browser/ui/views/media_router/media_router_dialog_controller_views.h
|
||||
+++ b/chrome/browser/ui/views/media_router/media_router_dialog_controller_views.h
|
||||
@@ -69,13 +69,14 @@
|
||||
// MediaRouterUIService::Observer:
|
||||
void OnServiceDisabled() override;
|
||||
|
||||
- // Initializes |ui_|.
|
||||
+ // Initializes and destroys |ui_| respectively.
|
||||
void InitializeMediaRouterUI();
|
||||
+ void DestroyMediaRouterUI();
|
||||
|
||||
// If there exists a media button, show the GMC dialog anchored to the media
|
||||
// button. Otherwise, show the dialog anchored to the top center of the web
|
||||
// contents.
|
||||
- void ShowGlobalMeidaControlsDialog(
|
||||
+ void ShowGlobalMediaControlsDialog(
|
||||
std::unique_ptr<StartPresentationContext> context);
|
||||
|
||||
// Returns the media button from the browser that initiates the request to
|
||||
@ -1,39 +0,0 @@
|
||||
Patch-Source: https://github.com/archlinux/svntogit-packages/blob/bf2401407df5bcc938382eb03748fbef41e41c89/trunk/unbundle-jsoncpp-avoid-CFI-faults-with-is_cfi-true.patch
|
||||
From ed8d931e35f81d8566835a579caf7d61368f85b7 Mon Sep 17 00:00:00 2001
|
||||
From: Evangelos Foutras <evangelos@foutrelis.com>
|
||||
Date: Tue, 27 Sep 2022 22:20:41 +0000
|
||||
Subject: [PATCH] unbundle/jsoncpp: avoid CFI faults with is_cfi=true
|
||||
|
||||
Ensure jsoncpp symbols have public visibility and are thus excluded from
|
||||
CFI checks and whole-program optimization. This is achieved by defining
|
||||
JSON_DLL_BUILD which in turn causes json/config.h to define JSON_API as
|
||||
__attribute__((visibility("default"))). The latter macro is used to tag
|
||||
jsoncpp classes and namespace functions throughout jsoncpp's headers.
|
||||
|
||||
BUG=1365218
|
||||
|
||||
Change-Id: I56277737b7d9ecaeb5e17c8d21a2e55f3d5d5bc9
|
||||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3919652
|
||||
Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
|
||||
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
|
||||
Cr-Commit-Position: refs/heads/main@{#1052077}
|
||||
---
|
||||
build/linux/unbundle/jsoncpp.gn | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/build/linux/unbundle/jsoncpp.gn b/build/linux/unbundle/jsoncpp.gn
|
||||
index 544f9d13c9..e84a0ef27a 100644
|
||||
--- a/build/linux/unbundle/jsoncpp.gn
|
||||
+++ b/build/linux/unbundle/jsoncpp.gn
|
||||
@@ -3,6 +3,11 @@ import("//build/shim_headers.gni")
|
||||
|
||||
pkg_config("jsoncpp_config") {
|
||||
packages = [ "jsoncpp" ]
|
||||
+
|
||||
+ # Defining JSON_DLL_BUILD applies public visibility to jsoncpp classes
|
||||
+ # thus deactivating CFI checks for them. This avoids CFI violations in
|
||||
+ # virtual calls to system jsoncpp library (https://crbug.com/1365218).
|
||||
+ defines = [ "JSON_DLL_BUILD" ]
|
||||
}
|
||||
|
||||
shim_headers("jsoncpp_shim") {
|
||||
@ -1,10 +0,0 @@
|
||||
--- a/third_party/node/update_npm_deps
|
||||
+++ b/third_party/node/update_npm_deps
|
||||
@@ -20,7 +20,6 @@
|
||||
|
||||
patch -d node_modules/@types/d3/ -p1 < chromium_d3_types_index.patch
|
||||
patch -d node_modules/html-minifier/ -p1 < html_minifier.patch
|
||||
-patch -p1 < typescript.patch
|
||||
|
||||
rsync -c --delete -r -q --include-from="npm_include.txt" --exclude-from="npm_exclude.txt" \
|
||||
--prune-empty-dirs "node_modules/" "node_modules_filtered/"
|
||||
@ -1,12 +0,0 @@
|
||||
diff --git a/es-core/src/utils/TimeUtil.h b/es-core/src/utils/TimeUtil.h
|
||||
index 9b44207..db69ad3 100644
|
||||
--- a/es-core/src/utils/TimeUtil.h
|
||||
+++ b/es-core/src/utils/TimeUtil.h
|
||||
@@ -2,6 +2,7 @@
|
||||
#ifndef ES_CORE_UTILS_TIME_UTIL_H
|
||||
#define ES_CORE_UTILS_TIME_UTIL_H
|
||||
|
||||
+#include <ctime>
|
||||
#include <string>
|
||||
|
||||
namespace Utils
|
||||
@ -1,26 +0,0 @@
|
||||
diff --git a/Documentation/k8s-old-manifests/kube-flannel-legacy.yml b/Documentation/k8s-old-manifests/kube-flannel-legacy.yml
|
||||
index d79d85e..01df638 100644
|
||||
--- a/Documentation/k8s-old-manifests/kube-flannel-legacy.yml
|
||||
+++ b/Documentation/k8s-old-manifests/kube-flannel-legacy.yml
|
||||
@@ -55,7 +55,7 @@ spec:
|
||||
- name: kube-flannel
|
||||
image: quay.io/coreos/flannel:v0.10.0-amd64
|
||||
command:
|
||||
- - /opt/bin/flanneld
|
||||
+ - /usr/bin/flanneld
|
||||
args:
|
||||
- --ip-masq
|
||||
- --kube-subnet-mgr
|
||||
diff --git a/Documentation/kube-flannel.yml b/Documentation/kube-flannel.yml
|
||||
index c7edaef..d41b884 100644
|
||||
--- a/Documentation/kube-flannel.yml
|
||||
+++ b/Documentation/kube-flannel.yml
|
||||
@@ -182,7 +182,7 @@ spec:
|
||||
- name: kube-flannel
|
||||
image: quay.io/coreos/flannel:v0.14.0
|
||||
command:
|
||||
- - /opt/bin/flanneld
|
||||
+ - /usr/bin/flanneld
|
||||
args:
|
||||
- --ip-masq
|
||||
- --kube-subnet-mgr
|
||||
@ -1,14 +0,0 @@
|
||||
this is useless and only wastes space
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 6439a10..8bb85fd 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -92,7 +92,7 @@ install-guake:
|
||||
@sed -i -e 's|{{ LOGIN_DESTOP_PATH }}|"$(LOGIN_DESTOP_PATH)"|g' guake/paths.py
|
||||
@sed -i -e 's|{{ AUTOSTART_FOLDER }}|"$(AUTOSTART_FOLDER)"|g' guake/paths.py
|
||||
|
||||
- @$(PYTHON_INTERPRETER) setup.py install --root "$(DESTDIR)" --prefix="$(PREFIX)" --optimize=1
|
||||
+ @$(PYTHON_INTERPRETER) setup.py install --root "$(DESTDIR)" --prefix="$(PREFIX)"
|
||||
|
||||
@rm -f guake/paths.py
|
||||
@if [ -f guake/paths.py.dev ]; then mv guake/paths.py.dev guake/paths.py; fi
|
||||
@ -1,15 +0,0 @@
|
||||
diff -urN kubesplit-0.3.1.orig/setup.py kubesplit-0.3.1/setup.py
|
||||
--- kubesplit-0.3.1.orig/setup.py 2021-07-26 23:14:23.440970320 -0600
|
||||
+++ kubesplit-0.3.1/setup.py 2021-07-26 23:15:01.301173153 -0600
|
||||
@@ -13,9 +13,9 @@
|
||||
|
||||
requirements = ["ruamel.yaml>=0.16.10", "yamkix>=0.9.0"]
|
||||
|
||||
-setup_requirements = ["pytest-runner"]
|
||||
+setup_requirements = []
|
||||
|
||||
-test_requirements = ["pytest"]
|
||||
+test_requirements = []
|
||||
|
||||
setup(
|
||||
author="Christophe Furmaniak",
|
||||
@ -1,11 +0,0 @@
|
||||
--- a/cmake/pcl_utils.cmake
|
||||
+++ b/cmake/pcl_utils.cmake
|
||||
@@ -107,7 +107,7 @@
|
||||
if(WIN32 AND NOT MINGW)
|
||||
set(PCLCONFIG_INSTALL_DIR "cmake")
|
||||
else()
|
||||
- set(PCLCONFIG_INSTALL_DIR "share/${PROJECT_NAME_LOWER}-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}")
|
||||
+ set(PCLCONFIG_INSTALL_DIR "lib/cmake/${PROJECT_NAME_LOWER}-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}")
|
||||
endif()
|
||||
endmacro()
|
||||
|
||||
@ -1,36 +0,0 @@
|
||||
From a0b3ce9ca5c69a945695c1c83dab7937a3d99b83 Mon Sep 17 00:00:00 2001
|
||||
From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
|
||||
Date: Sat, 5 May 2018 23:58:13 +0200
|
||||
Subject: [PATCH] Dereference shared_ptr, fix for GCC8
|
||||
|
||||
---
|
||||
segmentation/include/pcl/segmentation/ground_plane_comparator.h | 2 +-
|
||||
.../include/pcl/segmentation/plane_coefficient_comparator.h | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/segmentation/include/pcl/segmentation/ground_plane_comparator.h b/segmentation/include/pcl/segmentation/ground_plane_comparator.h
|
||||
index e39354d7fd..f96f38bfb5 100644
|
||||
--- a/segmentation/include/pcl/segmentation/ground_plane_comparator.h
|
||||
+++ b/segmentation/include/pcl/segmentation/ground_plane_comparator.h
|
||||
@@ -147,7 +147,7 @@ namespace pcl
|
||||
const std::vector<float>&
|
||||
getPlaneCoeffD () const
|
||||
{
|
||||
- return (plane_coeff_d_);
|
||||
+ return (*plane_coeff_d_);
|
||||
}
|
||||
|
||||
/** \brief Set the tolerance in radians for difference in normal direction between neighboring points, to be considered part of the same plane.
|
||||
diff --git a/segmentation/include/pcl/segmentation/plane_coefficient_comparator.h b/segmentation/include/pcl/segmentation/plane_coefficient_comparator.h
|
||||
index 9c94813727..a21725a40c 100644
|
||||
--- a/segmentation/include/pcl/segmentation/plane_coefficient_comparator.h
|
||||
+++ b/segmentation/include/pcl/segmentation/plane_coefficient_comparator.h
|
||||
@@ -141,7 +141,7 @@ namespace pcl
|
||||
const std::vector<float>&
|
||||
getPlaneCoeffD () const
|
||||
{
|
||||
- return (plane_coeff_d_);
|
||||
+ return (*plane_coeff_d_);
|
||||
}
|
||||
|
||||
/** \brief Set the tolerance in radians for difference in normal direction between neighboring points, to be considered part of the same plane.
|
||||
@ -1,33 +0,0 @@
|
||||
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
|
||||
index ee4a6b2..56aea69 100644
|
||||
--- a/python/CMakeLists.txt
|
||||
+++ b/python/CMakeLists.txt
|
||||
@@ -64,6 +64,10 @@ if (NOT DEFINED ${Boost_PYTHON310-MT_LIBRARY})
|
||||
set(Boost_PYTHON310-MT_LIBRARY ${Boost_PYTHON310_LIBRARY})
|
||||
endif()
|
||||
|
||||
+if (NOT DEFINED ${Boost_PYTHON311-MT_LIBRARY})
|
||||
+ set(Boost_PYTHON311-MT_LIBRARY ${Boost_PYTHON311_LIBRARY})
|
||||
+endif()
|
||||
+
|
||||
# Try all possible boost-python variable namings
|
||||
set(PYTHON_WRAPPER_LIBS ${Boost_PYTHON_LIBRARY}
|
||||
${Boost_PYTHON3_LIBRARY}
|
||||
@@ -75,6 +79,7 @@ set(PYTHON_WRAPPER_LIBS ${Boost_PYTHON_LIBRARY}
|
||||
${Boost_PYTHON38_LIBRARY}
|
||||
${Boost_PYTHON39_LIBRARY}
|
||||
${Boost_PYTHON310_LIBRARY}
|
||||
+ ${Boost_PYTHON311_LIBRARY}
|
||||
)
|
||||
|
||||
if (APPLE)
|
||||
@@ -93,6 +98,9 @@ if (APPLE)
|
||||
if (Boost_PYTHON310-MT_LIBRARY_RELEASE)
|
||||
set(PYTHON_WRAPPER_LIBS ${PYTHON_WRAPPER_LIBS} ${Boost_PYTHON310-MT_LIBRARY_RELEASE})
|
||||
endif ()
|
||||
+ if (Boost_PYTHON311-MT_LIBRARY_RELEASE)
|
||||
+ set(PYTHON_WRAPPER_LIBS ${PYTHON_WRAPPER_LIBS} ${Boost_PYTHON311-MT_LIBRARY_RELEASE})
|
||||
+ endif ()
|
||||
endif()
|
||||
|
||||
message(STATUS "Using Boost Python libs: ${PYTHON_WRAPPER_LIBS}")
|
||||
@ -1,21 +0,0 @@
|
||||
From b1d63d980e8b1a666e312e1c05c9037e2920685b Mon Sep 17 00:00:00 2001
|
||||
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
|
||||
Date: Fri, 29 Jan 2021 18:10:32 -0500
|
||||
Subject: [PATCH] Drop encoding parameter from json.load
|
||||
|
||||
Apparently this is no longer an accepted keyword for json.load(), as
|
||||
of python 3.9.
|
||||
|
||||
This was uncovered in https://bugs.debian.org/973175 where the
|
||||
google-i18n-address tests failed. But i haven't been able to find a
|
||||
reference for the change in python upstream. Perhaps the encoding
|
||||
parameter never did anything, but 3.9 became more strict about
|
||||
unhandled keywords.
|
||||
|
||||
It looks like python's json module does bytestream encoding
|
||||
autodetection anyway so this should be safe to do:
|
||||
https://bugs.python.org/issue17909
|
||||
---
|
||||
tests/test_downloader.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
@ -1,10 +0,0 @@
|
||||
We can't ship such strict versions of dependencies as other packages will need newer versions
|
||||
|
||||
diff --git a/requirements.txt b/requirements.txt
|
||||
index d431540..1f1bb30 100644
|
||||
--- a/requirements.txt
|
||||
+++ b/requirements.txt
|
||||
@@ -1 +1 @@
|
||||
-python-dateutil==2.6.0
|
||||
\ No newline at end of file
|
||||
+python-dateutil
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,5 +0,0 @@
|
||||
Fix tests failing because of a change in Python 3.10 argparse
|
||||
|
||||
Modified from https://github.com/ashb/sphinx-argparse/commit/a7b186aa60cf256dd91268ca3c18e78ef6644223
|
||||
Removed the changes to CI matrix since it doesn't exist in the PyPI tarball
|
||||
|
||||
@ -1,41 +0,0 @@
|
||||
--- a/src/rtop/rtop.sh
|
||||
+++ b/src/rtop/rtop.sh
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env bash
|
||||
+#!/bin/sh
|
||||
# Copyright (c) 2015-present, Facebook, Inc. All rights reserved.
|
||||
|
||||
|
||||
@@ -13,15 +13,26 @@
|
||||
# require's reason, so that reason is required after .ocamlinit is
|
||||
# parsed in standard syntax.
|
||||
|
||||
-touch $HOME/.utoprc
|
||||
-touch $HOME/.utop-history
|
||||
-DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
|
||||
+# Enable pipefail if supported.
|
||||
+if ( set -o pipefail 2>/dev/null ); then
|
||||
+ set -o pipefail
|
||||
+fi
|
||||
|
||||
+touch "$HOME"/.utoprc
|
||||
+touch "$HOME"/.utop-history
|
||||
+
|
||||
# intercept the -stdin flag of utop, and preprocess the code into reason code
|
||||
# before forwarding it. Afaik currently there's no better way of intercepting
|
||||
# the code after urtop receives code from stdin and before it processes it
|
||||
-if [[ $@ =~ "stdin" ]]; then
|
||||
- refmt --parse re --print ml --interface false | utop-full $@
|
||||
+stdin=no
|
||||
+for arg in "$@"; do
|
||||
+ case "$arg" in
|
||||
+ -stdin) stdin=yes; break;;
|
||||
+ esac
|
||||
+done
|
||||
+
|
||||
+if [ "$stdin" = yes ]; then
|
||||
+ refmt --parse re --print ml --interface false | utop-full "$@"
|
||||
else
|
||||
- utop-full -init $DIR/rtop_init.ml $@ -I $HOME -safe-string
|
||||
+ utop-full -init /usr/share/reason-rtop/rtop_init.ml "$@" -I "$HOME" -safe-string
|
||||
fi
|
||||
@ -1,11 +0,0 @@
|
||||
--- old/CMakeLists.txt
|
||||
+++ new/CMakeLists.txt
|
||||
@@ -161,7 +161,7 @@
|
||||
ENDIF(SPEEX_FOUND)
|
||||
|
||||
IF(SEMS_USE_OPENSSL)
|
||||
- FIND_PACKAGE(OpenSSL REQUIRED QUIETLY)
|
||||
+ FIND_PACKAGE(OpenSSL REQUIRED)
|
||||
MESSAGE(STATUS "Found OpenSSL includes: ${OPENSSL_INCLUDE_DIR}/openssl/ssl.h")
|
||||
MESSAGE(STATUS "Found OpenSSL library: ${OPENSSL_LIBRARIES}")
|
||||
MESSAGE(STATUS "Using OpenSSL: YES")
|
||||
@ -1,25 +0,0 @@
|
||||
From 929872513cf14c4c11df1b144b97595301f69475 Mon Sep 17 00:00:00 2001
|
||||
From: Guillem Jover <gjover@sipwise.com>
|
||||
Date: Fri, 25 Aug 2017 14:12:15 +0200
|
||||
Subject: [PATCH] apps/diameter_client: Do not access the OpenSSL BIO struct
|
||||
directly
|
||||
|
||||
Use a proper accessor instead of messing with the struc directly
|
||||
which has become opaque in latest OpenSSL versions.
|
||||
---
|
||||
apps/diameter_client/lib_dbase/tcp_comm.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/apps/diameter_client/lib_dbase/tcp_comm.c b/apps/diameter_client/lib_dbase/tcp_comm.c
|
||||
index d9fea4591..1290fc3a3 100644
|
||||
--- a/apps/diameter_client/lib_dbase/tcp_comm.c
|
||||
+++ b/apps/diameter_client/lib_dbase/tcp_comm.c
|
||||
@@ -74,7 +74,7 @@ long tcp_ssl_dbg_cb(BIO *bio, int oper, const char *argp,
|
||||
switch (oper) {
|
||||
case BIO_CB_WRITE: {
|
||||
char buf[256];
|
||||
- snprintf(buf, 256, "%s: %s", argp, bio->method->name);
|
||||
+ snprintf(buf, 256, "%s: %s", argp, BIO_method_name(bio));
|
||||
INFO("%s", buf);
|
||||
} break;
|
||||
|
||||
@ -1,23 +0,0 @@
|
||||
Requires python2
|
||||
|
||||
diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
|
||||
index e2668eb..c8cc2d2 100644
|
||||
--- a/apps/CMakeLists.txt
|
||||
+++ b/apps/CMakeLists.txt
|
||||
@@ -6,6 +6,7 @@ ADD_SUBDIRECTORY(callback)
|
||||
ADD_SUBDIRECTORY(click2dial)
|
||||
IF(PYTHONLIBS_FOUND)
|
||||
ADD_SUBDIRECTORY(conf_auth)
|
||||
+ ADD_SUBDIRECTORY(dsm)
|
||||
ENDIF(PYTHONLIBS_FOUND)
|
||||
ADD_SUBDIRECTORY(conference)
|
||||
IF(MYSQLPP_FOUND)
|
||||
@@ -14,7 +15,6 @@ ENDIF(MYSQLPP_FOUND)
|
||||
IF(OPENSSL_FOUND)
|
||||
ADD_SUBDIRECTORY(diameter_client)
|
||||
ENDIF(OPENSSL_FOUND)
|
||||
-ADD_SUBDIRECTORY(dsm)
|
||||
ADD_SUBDIRECTORY(early_announce)
|
||||
#ADD_SUBDIRECTORY(examples)
|
||||
IF(MISDN_FOUND)
|
||||
|
||||
@ -1,281 +0,0 @@
|
||||
diff --git a/apps/gateway/mISDNChannel.cpp b/apps/gateway/mISDNChannel.cpp
|
||||
index 8abd77a..36e8778 100644
|
||||
--- a/apps/gateway/mISDNChannel.cpp
|
||||
+++ b/apps/gateway/mISDNChannel.cpp
|
||||
@@ -118,8 +118,8 @@ int mISDN_get_free_ext_ie(mISDN::Q931_info_t *qi) {
|
||||
return (-1);
|
||||
}
|
||||
|
||||
-int mISDN_AddIE(mISDN::Q931_info_t *qi, u_char *p, u_char ie, u_char *iep) {
|
||||
- u_char *ps;
|
||||
+int mISDN_AddIE(mISDN::Q931_info_t *qi, unsigned char *p, unsigned char ie, unsigned char *iep) {
|
||||
+ unsigned char *ps;
|
||||
mISDN::ie_info_t *ies;
|
||||
int l;
|
||||
|
||||
@@ -158,7 +158,7 @@ int mISDN_AddIE(mISDN::Q931_info_t *qi, u_char *p, u_char ie, u_char *iep) {
|
||||
}
|
||||
l = iep[0] + 1;
|
||||
}
|
||||
- ps = (u_char *) qi;
|
||||
+ ps = (unsigned char *) qi;
|
||||
ps += L3_EXTRA_SIZE;
|
||||
ies->off = (u16)(p - ps);
|
||||
*p++ = ie;
|
||||
diff --git a/core/sip/parse_dns.cpp b/core/sip/parse_dns.cpp
|
||||
index 2b62f3e..d24f537 100644
|
||||
--- a/core/sip/parse_dns.cpp
|
||||
+++ b/core/sip/parse_dns.cpp
|
||||
@@ -6,10 +6,10 @@
|
||||
#define SECTION_COUNTS_OFF 4
|
||||
#define HEADER_OFFSET 12
|
||||
|
||||
-unsigned short dns_msg_count(u_char* begin, dns_section_type sect);
|
||||
-int dns_skip_name(u_char** p, u_char* end);
|
||||
-int dns_expand_name(u_char** ptr, u_char* begin, u_char* end,
|
||||
- u_char* buf, unsigned int len);
|
||||
+unsigned short dns_msg_count(unsigned char* begin, dns_section_type sect);
|
||||
+int dns_skip_name(unsigned char** p, unsigned char* end);
|
||||
+int dns_expand_name(unsigned char** ptr, unsigned char* begin, unsigned char* end,
|
||||
+ unsigned char* buf, unsigned int len);
|
||||
|
||||
|
||||
const char* dns_rr_type_str(dns_rr_type t)
|
||||
@@ -27,11 +27,11 @@ const char* dns_rr_type_str(dns_rr_type t)
|
||||
|
||||
|
||||
|
||||
-int dns_msg_parse(u_char* msg, int len, dns_parse_fct fct, void* data)
|
||||
+int dns_msg_parse(unsigned char* msg, int len, dns_parse_fct fct, void* data)
|
||||
{
|
||||
- u_char* begin = msg;
|
||||
- u_char* p = begin + HEADER_OFFSET;
|
||||
- u_char* end = msg + len;
|
||||
+ unsigned char* begin = msg;
|
||||
+ unsigned char* p = begin + HEADER_OFFSET;
|
||||
+ unsigned char* end = msg + len;
|
||||
|
||||
if(p >= end) return -1;
|
||||
|
||||
@@ -48,7 +48,7 @@ int dns_msg_parse(u_char* msg, int len, dns_parse_fct fct, void* data)
|
||||
for(int i=0; i<dns_msg_count(begin,(dns_section_type)s); i++){
|
||||
|
||||
// expand name
|
||||
- if(dns_expand_name(&p,begin,end,(u_char*)rr.name,NS_MAXDNAME) < 0) return -1;
|
||||
+ if(dns_expand_name(&p,begin,end,(unsigned char*)rr.name,NS_MAXDNAME) < 0) return -1;
|
||||
|
||||
// at least 8 bytes for type+class+ttl left?
|
||||
if((p + 8) > end) return -1;
|
||||
@@ -79,14 +79,14 @@ int dns_msg_parse(u_char* msg, int len, dns_parse_fct fct, void* data)
|
||||
return 0;
|
||||
}
|
||||
|
||||
-unsigned short dns_msg_count(u_char* begin, dns_section_type sect)
|
||||
+unsigned short dns_msg_count(unsigned char* begin, dns_section_type sect)
|
||||
{
|
||||
- u_char* p = begin + SECTION_COUNTS_OFF + 2*sect;
|
||||
+ unsigned char* p = begin + SECTION_COUNTS_OFF + 2*sect;
|
||||
|
||||
return ((u_short)*p)<<8 | ((u_short)*(p+1));
|
||||
}
|
||||
|
||||
-int dns_skip_name(u_char** p, u_char* end)
|
||||
+int dns_skip_name(unsigned char** p, unsigned char* end)
|
||||
{
|
||||
while(*p < end) {
|
||||
|
||||
@@ -106,11 +106,11 @@ int dns_skip_name(u_char** p, u_char* end)
|
||||
return -1;
|
||||
}
|
||||
|
||||
-int dns_expand_name(u_char** ptr, u_char* begin, u_char* end,
|
||||
- u_char* start_buf, unsigned int len)
|
||||
+int dns_expand_name(unsigned char** ptr, unsigned char* begin, unsigned char* end,
|
||||
+ unsigned char* start_buf, unsigned int len)
|
||||
{
|
||||
- u_char* buf = start_buf;
|
||||
- u_char* p = *ptr;
|
||||
+ unsigned char* buf = start_buf;
|
||||
+ unsigned char* p = *ptr;
|
||||
bool is_ptr=false;
|
||||
|
||||
while(p < end) {
|
||||
diff --git a/core/sip/parse_dns.h b/core/sip/parse_dns.h
|
||||
index c5de8b6..34406b0 100644
|
||||
--- a/core/sip/parse_dns.h
|
||||
+++ b/core/sip/parse_dns.h
|
||||
@@ -39,18 +39,18 @@ struct dns_record
|
||||
|
||||
class dns_entry;
|
||||
|
||||
-typedef int (*dns_parse_fct)(dns_record* rr, dns_section_type t, u_char* begin, u_char* end, void* data);
|
||||
+typedef int (*dns_parse_fct)(dns_record* rr, dns_section_type t, unsigned char* begin, unsigned char* end, void* data);
|
||||
|
||||
-int dns_msg_parse(u_char* msg, int len, dns_parse_fct fct, void* data);
|
||||
-int dns_expand_name(u_char** ptr, u_char* begin, u_char* end,
|
||||
- u_char* buf, unsigned int len);
|
||||
+int dns_msg_parse(unsigned char* msg, int len, dns_parse_fct fct, void* data);
|
||||
+int dns_expand_name(unsigned char** ptr, unsigned char* begin, unsigned char* end,
|
||||
+ unsigned char* buf, unsigned int len);
|
||||
|
||||
-inline uint16_t dns_get_16(const u_char* p)
|
||||
+inline uint16_t dns_get_16(const unsigned char* p)
|
||||
{
|
||||
return ntohs(*(uint16_t*)p);
|
||||
}
|
||||
|
||||
-inline uint32_t dns_get_32(const u_char* p)
|
||||
+inline uint32_t dns_get_32(const unsigned char* p)
|
||||
{
|
||||
return ntohl(*(uint32_t*)p);
|
||||
}
|
||||
diff --git a/core/sip/resolver.cpp b/core/sip/resolver.cpp
|
||||
index 9793069..80c547c 100644
|
||||
--- a/core/sip/resolver.cpp
|
||||
+++ b/core/sip/resolver.cpp
|
||||
@@ -169,7 +169,7 @@ public:
|
||||
stable_sort(ip_vec.begin(),ip_vec.end(),srv_less);
|
||||
}
|
||||
|
||||
- dns_base_entry* get_rr(dns_record* rr, u_char* begin, u_char* end);
|
||||
+ dns_base_entry* get_rr(dns_record* rr, unsigned char* begin, unsigned char* end);
|
||||
|
||||
int next_ip(dns_handle* h, sockaddr_storage* sa)
|
||||
{
|
||||
@@ -316,7 +316,7 @@ dns_entry* dns_entry::make_entry(dns_rr_type t)
|
||||
}
|
||||
}
|
||||
|
||||
-void dns_entry::add_rr(dns_record* rr, u_char* begin, u_char* end, long now)
|
||||
+void dns_entry::add_rr(dns_record* rr, unsigned char* begin, unsigned char* end, long now)
|
||||
{
|
||||
dns_base_entry* e = get_rr(rr,begin,end);
|
||||
if(!e) return;
|
||||
@@ -451,7 +451,7 @@ void ip_entry::to_sa(sockaddr_storage* sa)
|
||||
string ip_entry::to_str()
|
||||
{
|
||||
if(type == IPv4) {
|
||||
- u_char* cp = (u_char*)&addr;
|
||||
+ unsigned char* cp = (unsigned char*)&addr;
|
||||
return int2str(cp[0]) +
|
||||
"." + int2str(cp[1]) +
|
||||
"." + int2str(cp[2]) +
|
||||
@@ -496,7 +496,7 @@ string ip_port_entry::to_str()
|
||||
return ip_entry::to_str() + ":" + int2str(port);
|
||||
}
|
||||
|
||||
-dns_base_entry* dns_ip_entry::get_rr(dns_record* rr, u_char* begin, u_char* end)
|
||||
+dns_base_entry* dns_ip_entry::get_rr(dns_record* rr, unsigned char* begin, unsigned char* end)
|
||||
{
|
||||
if(rr->type != dns_r_a)
|
||||
return NULL;
|
||||
@@ -516,16 +516,16 @@ dns_base_entry* dns_ip_entry::get_rr(dns_record* rr, u_char* begin, u_char* end)
|
||||
return new_ip;
|
||||
}
|
||||
|
||||
-dns_base_entry* dns_srv_entry::get_rr(dns_record* rr, u_char* begin, u_char* end)
|
||||
+dns_base_entry* dns_srv_entry::get_rr(dns_record* rr, unsigned char* begin, unsigned char* end)
|
||||
{
|
||||
if(rr->type != dns_r_srv)
|
||||
return NULL;
|
||||
|
||||
- u_char name_buf[NS_MAXDNAME];
|
||||
- const u_char * rdata = ns_rr_rdata(*rr);
|
||||
+ unsigned char name_buf[NS_MAXDNAME];
|
||||
+ const unsigned char * rdata = ns_rr_rdata(*rr);
|
||||
|
||||
/* Expand the target's name */
|
||||
- u_char* p = (u_char*)rdata+6;
|
||||
+ unsigned char* p = (unsigned char*)rdata+6;
|
||||
if (dns_expand_name(&p,begin,end,
|
||||
name_buf, /* Result */
|
||||
NS_MAXDNAME) /* Size of result buffer */
|
||||
@@ -570,7 +570,7 @@ struct dns_search_h
|
||||
};
|
||||
|
||||
int rr_to_dns_entry(dns_record* rr, dns_section_type t,
|
||||
- u_char* begin, u_char* end, void* data)
|
||||
+ unsigned char* begin, unsigned char* end, void* data)
|
||||
{
|
||||
// only answer and additional sections
|
||||
if(t != dns_s_an && t != dns_s_ar)
|
||||
@@ -668,7 +668,7 @@ void dns_naptr_entry::init()
|
||||
stable_sort(ip_vec.begin(),ip_vec.end(),naptr_less);
|
||||
}
|
||||
|
||||
-dns_base_entry* dns_naptr_entry::get_rr(dns_record* rr, u_char* begin, u_char* end)
|
||||
+dns_base_entry* dns_naptr_entry::get_rr(dns_record* rr, unsigned char* begin, unsigned char* end)
|
||||
{
|
||||
enum NAPTR_FieldIndex {
|
||||
NAPTR_Flags = 0,
|
||||
@@ -681,7 +681,7 @@ dns_base_entry* dns_naptr_entry::get_rr(dns_record* rr, u_char* begin, u_char* e
|
||||
if(rr->type != dns_r_naptr)
|
||||
return NULL;
|
||||
|
||||
- const u_char * rdata = ns_rr_rdata(*rr);
|
||||
+ const unsigned char * rdata = ns_rr_rdata(*rr);
|
||||
|
||||
unsigned short order = dns_get_16(rdata);
|
||||
rdata += 2;
|
||||
@@ -856,7 +856,7 @@ _resolver::~_resolver()
|
||||
|
||||
int _resolver::query_dns(const char* name, dns_entry_map& entry_map, dns_rr_type t)
|
||||
{
|
||||
- u_char dns_res[NS_PACKETSZ];
|
||||
+ unsigned char dns_res[NS_PACKETSZ];
|
||||
|
||||
if(!name) return -1;
|
||||
|
||||
diff --git a/core/sip/resolver.h b/core/sip/resolver.h
|
||||
index 7565898..caa81e8 100644
|
||||
--- a/core/sip/resolver.h
|
||||
+++ b/core/sip/resolver.h
|
||||
@@ -77,7 +77,7 @@ class dns_entry
|
||||
: public atomic_ref_cnt,
|
||||
public dns_base_entry
|
||||
{
|
||||
- virtual dns_base_entry* get_rr(dns_record* rr, u_char* begin, u_char* end)=0;
|
||||
+ virtual dns_base_entry* get_rr(dns_record* rr, unsigned char* begin, unsigned char* end)=0;
|
||||
|
||||
public:
|
||||
vector<dns_base_entry*> ip_vec;
|
||||
@@ -87,7 +87,7 @@ public:
|
||||
dns_entry();
|
||||
virtual ~dns_entry();
|
||||
virtual void init()=0;
|
||||
- virtual void add_rr(dns_record* rr, u_char* begin, u_char* end, long now);
|
||||
+ virtual void add_rr(dns_record* rr, unsigned char* begin, unsigned char* end, long now);
|
||||
virtual int next_ip(dns_handle* h, sockaddr_storage* sa)=0;
|
||||
|
||||
virtual string to_str();
|
||||
@@ -140,7 +140,7 @@ public:
|
||||
{}
|
||||
|
||||
void init(){};
|
||||
- dns_base_entry* get_rr(dns_record* rr, u_char* begin, u_char* end);
|
||||
+ dns_base_entry* get_rr(dns_record* rr, unsigned char* begin, unsigned char* end);
|
||||
int next_ip(dns_handle* h, sockaddr_storage* sa);
|
||||
|
||||
int fill_ip_list(const list<sip_destination>& ip_list);
|
||||
@@ -199,7 +199,7 @@ public:
|
||||
{}
|
||||
|
||||
void init();
|
||||
- dns_base_entry* get_rr(dns_record* rr, u_char* begin, u_char* end);
|
||||
+ dns_base_entry* get_rr(dns_record* rr, unsigned char* begin, unsigned char* end);
|
||||
|
||||
// not needed
|
||||
int next_ip(dns_handle* h, sockaddr_storage* sa) { return -1; }
|
||||
diff --git a/core/sip/udp_trsp.cpp b/core/sip/udp_trsp.cpp
|
||||
index eb3a1ce..e33a156 100644
|
||||
--- a/core/sip/udp_trsp.cpp
|
||||
+++ b/core/sip/udp_trsp.cpp
|
||||
@@ -300,7 +300,7 @@ void udp_trsp::run()
|
||||
msg.msg_namelen = sizeof(sockaddr_storage);
|
||||
msg.msg_iov = iov;
|
||||
msg.msg_iovlen = 1;
|
||||
- msg.msg_control = new u_char[DSTADDR_DATASIZE];
|
||||
+ msg.msg_control = new unsigned char[DSTADDR_DATASIZE];
|
||||
msg.msg_controllen = DSTADDR_DATASIZE;
|
||||
|
||||
if(sock->get_sd()<=0){
|
||||
@ -1,22 +0,0 @@
|
||||
this breaks the clang include path
|
||||
--
|
||||
--- a/build/config/compiler/BUILD.gn
|
||||
+++ a/build/config/compiler/BUILD.gn
|
||||
@@ -1310,7 +1310,7 @@
|
||||
# paths to the tools it invokes. We don't want this because we don't
|
||||
# really need it and it can mess up the goma cache entries.
|
||||
if (is_clang && (!is_nacl || is_nacl_saigo)) {
|
||||
- cflags += [ "-no-canonical-prefixes" ]
|
||||
+ #cflags += [ "-no-canonical-prefixes" ]
|
||||
|
||||
# Same for links: Let the compiler driver invoke the linker
|
||||
# with a relative path and pass relative paths to built-in
|
||||
@@ -1319,7 +1319,7 @@
|
||||
# We don't link on goma, so this change is just for cleaner
|
||||
# internal linker invocations, for people who work on the build.
|
||||
if (!is_win) {
|
||||
- ldflags += [ "-no-canonical-prefixes" ]
|
||||
+ #ldflags += [ "-no-canonical-prefixes" ]
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,17 +0,0 @@
|
||||
--- TheForceEngine-1.09.410.bak/TheForceEngine/TFE_A11y/accessibility.cpp
|
||||
+++ TheForceEngine-1.09.410/TheForceEngine/TFE_A11y/accessibility.cpp
|
||||
@@ -303,12 +303,12 @@
|
||||
//TFE_System::logWrite(LOG_ERROR, "a11y", (std::to_string(i) + " " + std::to_string(textSize.y) + ", " + std::to_string(lineHeight) + " " + std::to_string(lines) + " " + std::to_string(totalLines) + " " + std::to_string(windowSize.y)).c_str());
|
||||
if (wrapText)
|
||||
{
|
||||
- ImGui::TextWrapped(title->text.c_str());
|
||||
+ ImGui::TextWrapped("%s", title->text.c_str());
|
||||
}
|
||||
else
|
||||
{
|
||||
ImGui::SetCursorPosX((windowSize.x - textSize.x) * 0.5f);
|
||||
- ImGui::Text(title->text.c_str());
|
||||
+ ImGui::Text("%s", title->text.c_str());
|
||||
}
|
||||
|
||||
// Reduce the caption's time remaining, removing it from the list if it's out of time
|
||||
@ -1,18 +0,0 @@
|
||||
These tests are just checking the syntax of the version name, which
|
||||
Alpine has its own format for.
|
||||
--- thelounge-4.3.0/test/src/helperTest.js
|
||||
+++ thelounge-4.3.0/test/src/helperTest.js
|
||||
@@ -45,11 +45,11 @@
|
||||
describe("#getVersion()", function () {
|
||||
const version = Helper.getVersion();
|
||||
|
||||
- it("should mention it is served from source code", function () {
|
||||
+ xit("should mention it is served from source code", function () {
|
||||
expect(version).to.include("source");
|
||||
});
|
||||
|
||||
- it("should include a short Git SHA", function () {
|
||||
+ xit("should include a short Git SHA", function () {
|
||||
expect(version).to.match(/\([0-9a-f]{7,11} /);
|
||||
});
|
||||
|
||||
@ -1,18 +0,0 @@
|
||||
Author: Rasmus Thomsen <oss@cogitri.dev>
|
||||
Reason: The logic in the configure.ac is wrong: Pandoc is a hard requirement
|
||||
for the man pages and $srcdir/man/man1 always exists, so we need to use
|
||||
AND here and not OR.
|
||||
Upstream: No
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 7b5c219..4331fd4 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -30,7 +30,7 @@ AS_IF(
|
||||
AM_CONDITIONAL([HAVE_PANDOC],[test "x${PANDOC}" = "xyes"])
|
||||
AM_CONDITIONAL(
|
||||
[HAVE_MAN_PAGES],
|
||||
- [test -d "${srcdir}/man/man1" -o "x${PANDOC}" = "xyes"])
|
||||
+ [test -d "${srcdir}/man/man1" -a "x${PANDOC}" = "xyes"])
|
||||
|
||||
AC_ARG_ENABLE([fapi],
|
||||
[AS_HELP_STRING([--disable-fapi], [disable FAPI tools (default: auto)])],,
|
||||
Loading…
x
Reference in New Issue
Block a user