Ubuntu
kronosnet package

Merge ~zhsj/ubuntu/+source/kronosnet:fix-fortify-source into ubuntu/+source/kronosnet:ubuntu/devel

  1. Git
  2. lp:~zhsj/ubuntu/+source/kronosnet
  3. fix-fortify-source
  4. Merge into ubuntu/devel
Proposed by Shengjing Zhu
Status: Merged
Merged at revision: 185933d623f2f53b3c05a13f2c0cccb811520cd5
Proposed branch: ~zhsj/ubuntu/+source/kronosnet:fix-fortify-source
Merge into: ubuntu/+source/kronosnet:ubuntu/devel
Diff against target: 46 lines (+13/-4)
3 files modified
debian/changelog (+8/-0)
debian/control (+2/-1)
debian/rules (+3/-3)
Reviewer Review Type Date Requested Status
Nick Rosbrook (community) Approve
Ubuntu Sponsors Pending
Review via email: mp+462394@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Shengjing Zhu (zhsj) wrote :

PPA for testing https://launchpad.net/~zhsj/+archive/ubuntu/kronosnet/+packages

Revision history for this message
Nick Rosbrook (enr0n) wrote :

LGTM, but can you please add a bug for this noting the FTBFS and point to that in the changelog?

review: Needs Fixing
Revision history for this message
Shengjing Zhu (zhsj) wrote :

Done

Revision history for this message
Nick Rosbrook (enr0n) wrote :

Thanks! Sponsored.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index a4e90e0..09c0c63 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,11 @@
6+kronosnet (1.28-2ubuntu1) noble; urgency=medium
7+
8+ * d/rules: don't disable fortify feature. (LP: #2058222)
9+ It adds -D_FORTIFY_SOURCE=0 in Ubuntu and conflicts upstream -D_FORTIFY_SOURCE=3
10+ option.
11+
12+ -- Shengjing Zhu <shengjing.zhu@canonical.com> Thu, 14 Mar 2024 17:23:08 +0800
13+
14 kronosnet (1.28-2) unstable; urgency=medium
15
16 * [7ee73af] Annotate the versioned dpkg-dev build dependency with time64
17diff --git a/debian/control b/debian/control
18index 04ee544..73acf92 100644
19--- a/debian/control
20+++ b/debian/control
21@@ -1,7 +1,8 @@
22 Source: kronosnet
23 Section: admin
24 Priority: optional
25-Maintainer: Debian HA Maintainers <debian-ha-maintainers@alioth-lists.debian.net>
26+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
27+XSBC-Original-Maintainer: Debian HA Maintainers <debian-ha-maintainers@alioth-lists.debian.net>
28 Uploaders:
29 Ferenc Wágner <wferi@debian.org>,
30 Standards-Version: 4.6.2
31diff --git a/debian/rules b/debian/rules
32index a0d46f9..b04b346 100755
33--- a/debian/rules
34+++ b/debian/rules
35@@ -1,8 +1,8 @@
36 #!/usr/bin/make -f
37
38-# -D_FORTIFY_SOURCE=3 is used by the upstream build system,
39-# do not conflict it with -D_FORTIFY_SOURCE=2:
40-export DEB_BUILD_MAINT_OPTIONS = hardening=+all,-fortify
41+# Don't disable fortify feature. It adds -D_FORTIFY_SOURCE=0 in Ubuntu
42+# and conflicts upstream -D_FORTIFY_SOURCE=3 option.
43+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
44
45 # Ensure that we link against all needed libraries (cf. Policy 10.2)
46 export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs

Subscribers

People subscribed via source and target branches