misc: 2nd general review of helpers.
This commit is contained in:
Luis Guzmán
parent
df6774d1fe
commit
372a379e8a
36 changed files with 16 additions and 5662 deletions
|
|
@ -1,53 +0,0 @@
|
|||
diff --git a/bin/casper-snapshot b/bin/casper-snapshot
|
||||
index ab075292..33243f63 100755
|
||||
--- a/bin/casper-snapshot
|
||||
+++ b/bin/casper-snapshot
|
||||
@@ -33,7 +33,7 @@ VERSION=0.0.1
|
||||
if [ -e /etc/casper.conf ]; then
|
||||
. /etc/casper.conf
|
||||
else
|
||||
- USERNAME=$(cat /etc/passwd | grep "999" | cut -f1 -d ':')
|
||||
+ USERNAME=$(cat /etc/passwd | grep "1000" | cut -f1 -d ':')
|
||||
HOSTNAME=$(hostname)
|
||||
BUILD_SYSTEM="Debian"
|
||||
fi
|
||||
diff --git a/scripts/casper-bottom/15autologin b/scripts/casper-bottom/15autologin
|
||||
index d6c75e66..c80e2058 100755
|
||||
--- a/scripts/casper-bottom/15autologin
|
||||
+++ b/scripts/casper-bottom/15autologin
|
||||
@@ -90,9 +90,6 @@ if [ -f /root/usr/bin/sddm ]; then
|
||||
sddm_session=QLubuntu.desktop
|
||||
fi
|
||||
cat >>/root/etc/sddm.conf <<EOF
|
||||
-[Users]
|
||||
-MinimumUid=999
|
||||
-
|
||||
[Autologin]
|
||||
User=$USERNAME
|
||||
Session=$sddm_session
|
||||
diff --git a/scripts/casper-bottom/25adduser b/scripts/casper-bottom/25adduser
|
||||
index 8320e710..efbf5677 100755
|
||||
--- a/scripts/casper-bottom/25adduser
|
||||
+++ b/scripts/casper-bottom/25adduser
|
||||
@@ -57,7 +57,8 @@ db_set passwd/root-password-crypted '*'
|
||||
db_set passwd/user-password-crypted U6aMy0wojraho
|
||||
db_set passwd/user-fullname "$USERFULLNAME"
|
||||
db_set passwd/username "$USERNAME"
|
||||
-db_set passwd/user-uid 999
|
||||
+# Per LP: #2004092, systemd uses 995-999
|
||||
+db_set passwd/user-uid 1000
|
||||
|
||||
chroot /root /usr/lib/user-setup/user-setup-apply > /dev/null
|
||||
if [ ! -f /root/usr/bin/sddm ]; then
|
||||
@@ -93,11 +94,6 @@ for file in /usr/share/applications/ubiquity.desktop /usr/share/applications/kde
|
||||
fi
|
||||
done
|
||||
|
||||
-# GDM
|
||||
-if [ -d /root/etc/gdm3 ]; then
|
||||
- sed -i '/^[UG]ID_MIN/s/\<1000$/ 999/' /root/etc/login.defs
|
||||
-fi
|
||||
-
|
||||
# Kubuntu
|
||||
if [ -f "/root/usr/bin/plasma-desktop" ]; then
|
||||
if [ -f "/root/usr/share/kde4/apps/khelpcenter/plugins/kubuntu/a_welcome.desktop" ]; then
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
# Fixes https://gitlab.trisquel.org/trisquel/package-helpers/-/issues/148
|
||||
|
||||
diff --git a/debian/control b/debian/control
|
||||
index 3297b1c..37ff49a 100644
|
||||
--- a/debian/control
|
||||
+++ b/debian/control
|
||||
@@ -28,6 +28,7 @@ Depends: ${shlibs:Depends},
|
||||
accountsservice,
|
||||
group-service,
|
||||
mate-desktop-common,
|
||||
+ cracklib-runtime,
|
||||
Description: MATE User Manager
|
||||
User and group management utility suitable for lightweight desktop
|
||||
environments such as MATE or Xfce.
|
||||
|
|
@ -1,77 +0,0 @@
|
|||
Remove _xmppconnect support
|
||||
|
||||
It has always been vulnerable to MITM attacks when it is not used with DNSSEC,
|
||||
and has been removed from XEP-0156 because of that. We have been issued
|
||||
CVE-2022-26491 for this issue.
|
||||
|
||||
More discussion can be found at
|
||||
https://mail.jabber.org/pipermail/standards/2022-February/038759.html.
|
||||
|
||||
Testing Done:
|
||||
Compiled
|
||||
|
||||
Reviewed at https://reviews.imfreedom.org/r/1357/
|
||||
|
||||
--- a/libpurple/protocols/jabber/jabber.c Sat Apr 23 05:05:54 2022 -0500
|
||||
+++ b/libpurple/protocols/jabber/jabber.c Wed Apr 27 23:41:06 2022 -0500
|
||||
@@ -798,48 +798,6 @@
|
||||
}
|
||||
|
||||
static void
|
||||
-txt_resolved_cb(GList *responses, gpointer data)
|
||||
-{
|
||||
- JabberStream *js = data;
|
||||
- gboolean found = FALSE;
|
||||
-
|
||||
- js->srv_query_data = NULL;
|
||||
-
|
||||
- while (responses) {
|
||||
- PurpleTxtResponse *resp = responses->data;
|
||||
- gchar **token;
|
||||
- token = g_strsplit(purple_txt_response_get_content(resp), "=", 2);
|
||||
- if (purple_strequal(token[0], "_xmpp-client-xbosh")) {
|
||||
- purple_debug_info("jabber","Found alternative connection method using %s at %s.\n", token[0], token[1]);
|
||||
- js->bosh = jabber_bosh_connection_init(js, token[1]);
|
||||
- g_strfreev(token);
|
||||
- break;
|
||||
- }
|
||||
- g_strfreev(token);
|
||||
- purple_txt_response_destroy(resp);
|
||||
- responses = g_list_delete_link(responses, responses);
|
||||
- }
|
||||
-
|
||||
- if (js->bosh) {
|
||||
- found = TRUE;
|
||||
- jabber_bosh_connection_connect(js->bosh);
|
||||
- }
|
||||
-
|
||||
- if (!found) {
|
||||
- purple_debug_warning("jabber", "Unable to find alternative XMPP connection "
|
||||
- "methods after failing to connect directly.\n");
|
||||
- purple_connection_error_reason(js->gc,
|
||||
- PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
|
||||
- _("Unable to connect"));
|
||||
- return;
|
||||
- }
|
||||
-
|
||||
- if (responses) {
|
||||
- g_list_free_full(responses, (GDestroyNotify)purple_txt_response_destroy);
|
||||
- }
|
||||
-}
|
||||
-
|
||||
-static void
|
||||
jabber_login_callback(gpointer data, gint source, const gchar *error)
|
||||
{
|
||||
PurpleConnection *gc = data;
|
||||
@@ -849,11 +807,6 @@
|
||||
if (js->srv_rec != NULL) {
|
||||
purple_debug_error("jabber", "Unable to connect to server: %s. Trying next SRV record or connecting directly.\n", error);
|
||||
try_srv_connect(js);
|
||||
- } else {
|
||||
- purple_debug_info("jabber","Couldn't connect directly to %s. Trying to find alternative connection methods, like BOSH.\n", js->user->domain);
|
||||
- js->srv_query_data = purple_txt_resolve_account(
|
||||
- purple_connection_get_account(gc), "_xmppconnect",
|
||||
- js->user->domain, txt_resolved_cb, js);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
diff -Nru psensor-1.1.5/debian/patches/fix-ftbfs.patch psensor-1.1.5/debian/patches/fix-ftbfs.patch
|
||||
--- psensor-1.1.5/debian/patches/fix-ftbfs.patch 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ psensor-1.1.5/debian/patches/fix-ftbfs.patch 2022-09-02 23:32:48.000000000 +0100
|
||||
@@ -0,0 +1,20 @@
|
||||
+Description: Fix FTBFS with gcc-11
|
||||
+ Fix the indentation while keeping the logic same as before.
|
||||
+
|
||||
+Author: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
|
||||
+---
|
||||
+
|
||||
+Bug-Debian: https://bugs.debian.org/984298
|
||||
+Forwarded: no
|
||||
+
|
||||
+--- psensor-1.1.5.orig/src/lib/pudisks2.c
|
||||
++++ psensor-1.1.5/src/lib/pudisks2.c
|
||||
+@@ -83,7 +83,7 @@ static void smart_update(struct psensor
|
||||
+ PROVIDER_NAME,
|
||||
+ data->path);
|
||||
+
|
||||
+- data->last_smart_update = t;
|
||||
++ data->last_smart_update = t;
|
||||
+ }
|
||||
+
|
||||
+ void udisks2_psensor_list_update(struct psensor **sensors)
|
||||
diff -Nru psensor-1.1.5/debian/patches/series psensor-1.1.5/debian/patches/series
|
||||
--- psensor-1.1.5/debian/patches/series 2021-02-06 19:50:55.000000000 +0000
|
||||
+++ psensor-1.1.5/debian/patches/series 2022-09-02 23:33:02.000000000 +0100
|
||||
@@ -1,3 +1,4 @@
|
||||
0001-Update-rsensor.c-drop-is_error-macro-definition.patch
|
||||
14.patch
|
||||
ayatana-appindicator.patch
|
||||
+fix-ftbfs.patch
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
From b7dd425660c420466d951f09e3c67e9d5f9eec90 Mon Sep 17 00:00:00 2001
|
||||
From: Aline Gondim Santos <aline.gondimsantos@savoirfairelinux.com>
|
||||
Date: Wed, 5 Oct 2022 10:19:27 -0300
|
||||
Subject: [PATCH] misc: set frame time_base when decoding
|
||||
|
||||
To properly get the time_base and framerate in the plugins,
|
||||
we need to set the frame properties when decoding.
|
||||
|
||||
GitLab: https://git.jami.net/savoirfairelinux/jami-plugins/-/issues/23
|
||||
|
||||
Change-Id: I69a2235c46b13a15414c4d01821cc1eba5b73987
|
||||
---
|
||||
src/media/media_decoder.cpp | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/daemon/src/media/media_decoder.cpp b/daemon/src/media/media_decoder.cpp
|
||||
index 7cba58abe63..cd1698a5048 100644
|
||||
--- a/daemon/src/media/media_decoder.cpp
|
||||
+++ b/daemon/src/media/media_decoder.cpp
|
||||
@@ -644,6 +644,7 @@ MediaDecoder::decode(AVPacket& packet)
|
||||
#endif
|
||||
auto frame = f->pointer();
|
||||
ret = avcodec_receive_frame(decoderCtx_, frame);
|
||||
+ frame->time_base = decoderCtx_->time_base;
|
||||
if (resolutionChangedCallback_) {
|
||||
if (decoderCtx_->width != width_ or decoderCtx_->height != height_) {
|
||||
JAMI_DBG("Resolution changed from %dx%d to %dx%d",
|
||||
File diff suppressed because it is too large
Load diff
Loading…
Add table
Add a link
Reference in a new issue