Ubuntu
cachefilesd package

Merge ~liushuyu-011/ubuntu/+source/cachefilesd:merge-lp2065208 into ubuntu/+source/cachefilesd:debian/sid

  1. Git
  2. lp:~liushuyu-011/ubuntu/+source/cachefilesd
  3. merge-lp2065208
  4. Merge into debian/sid
Proposed by Zixing Liu
Status: Needs review
Proposed branch: ~liushuyu-011/ubuntu/+source/cachefilesd:merge-lp2065208
Merge into: ubuntu/+source/cachefilesd:debian/sid
Diff against target: 77 lines (+19/-5)
3 files modified
cachefilesd.c (+4/-4)
debian/changelog (+13/-0)
debian/control (+2/-1)
Reviewer Review Type Date Requested Status
Simon Quigley (community) Approve
Review via email: mp+465799@code.launchpad.net

Description of the change

This MP merges cachefilesd changes from Debian unstable into Ubuntu Oracular.

PPA build: https://launchpad.net/~liushuyu-011/+archive/ubuntu/misc/+sourcepub/16127306/+listing-archive-extra

To post a comment you must log in.
Revision history for this message
Simon Quigley (tsimonq2) :
review: Approve
Reply

Unmerged commits

7517db7... by Zixing Liu

update-maintainer

64c2700... by Zixing Liu

reconstruct-changelog

610e3a2... by Zixing Liu

merge-changelogs

65cc84a... by Zixing Liu

    - Avoid counter underflow, leading to segfault (LP: #1854054)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/cachefilesd.c b/cachefilesd.c
2index d4d236f..145d933 100644
3--- a/cachefilesd.c
4+++ b/cachefilesd.c
5@@ -1389,13 +1389,13 @@ next:
6 if (cullready[loop] == child)
7 break;
8
9- if (loop == nr_in_ready_table - 1) {
10+ if (loop + 1 == nr_in_ready_table) {
11 /* child was oldest object */
12 cullready[--nr_in_ready_table] = (void *)(0x6b000000 | __LINE__);
13 put_object(child);
14 goto removed;
15 }
16- else if (loop < nr_in_ready_table - 1) {
17+ else if (loop + 1 < nr_in_ready_table) {
18 /* child was somewhere in between */
19 memmove(&cullready[loop],
20 &cullready[loop + 1],
21@@ -1409,12 +1409,12 @@ next:
22 if (cullbuild[loop] == child)
23 break;
24
25- if (loop == nr_in_build_table - 1) {
26+ if (loop + 1 == nr_in_build_table) {
27 /* child was oldest object */
28 cullbuild[--nr_in_build_table] = (void *)(0x6b000000 | __LINE__);
29 put_object(child);
30 }
31- else if (loop < nr_in_build_table - 1) {
32+ else if (loop + 1 < nr_in_build_table) {
33 /* child was somewhere in between */
34 memmove(&cullbuild[loop],
35 &cullbuild[loop + 1],
36diff --git a/debian/changelog b/debian/changelog
37index 10d0d49..cb8335c 100644
38--- a/debian/changelog
39+++ b/debian/changelog
40@@ -1,3 +1,10 @@
41+cachefilesd (0.10.10-0.4ubuntu1) oracular; urgency=medium
42+
43+ * Merge with Debian unstable (LP: #2065208). Remaining changes:
44+ - Avoid counter underflow, leading to segfault (LP #1854054)
45+
46+ -- Zixing Liu <zixing.liu@canonical.com> Wed, 08 May 2024 13:23:44 -0600
47+
48 cachefilesd (0.10.10-0.4) unstable; urgency=medium
49
50 * Non-maintainer upload.
51@@ -16,6 +23,12 @@ cachefilesd (0.10.10-0.3) unstable; urgency=medium
52
53 -- Bastian Germann <bage@debian.org> Wed, 23 Nov 2022 21:43:25 +0100
54
55+cachefilesd (0.10.10-0.2ubuntu1) focal; urgency=medium
56+
57+ * Avoid counter underflow, leading to segfault (LP: #1854054)
58+
59+ -- Dan Streetman <ddstreet@canonical.com> Tue, 26 Nov 2019 08:10:43 -0500
60+
61 cachefilesd (0.10.10-0.2) unstable; urgency=medium
62
63 * Non-maintainer upload.
64diff --git a/debian/control b/debian/control
65index c7766a9..4686902 100644
66--- a/debian/control
67+++ b/debian/control
68@@ -1,7 +1,8 @@
69 Source: cachefilesd
70 Section: misc
71 Priority: optional
72-Maintainer: Shane Wegner <shane@debian.org>
73+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
74+XSBC-Original-Maintainer: Shane Wegner <shane@debian.org>
75 Build-Depends: cdbs, debhelper (>= 10~)
76 Standards-Version: 3.9.3.1
77 Vcs-Browser: https://salsa.debian.org/debian/cachefilesd

Subscribers

People subscribed via source and target branches

to all changes: