[med-svn] [Git][med-team/sprai][master] 9 commits: d/clean: new: fix double source build failure.

Étienne Mollier (@emollier) gitlab at salsa.debian.org
Wed Aug 28 20:35:04 BST 2024



Étienne Mollier pushed to branch master at Debian Med / sprai


Commits:
a6c28662 by Étienne Mollier at 2024-08-28T21:06:28+02:00
d/clean: new: fix double source build failure.

Closes: #1047125

- - - - -
c3ca9d2d by Étienne Mollier at 2024-08-28T21:20:48+02:00
d/rules: activate hardwning flags.

- - - - -
3bc79385 by Étienne Mollier at 2024-08-28T21:22:30+02:00
flags.patch: propagate hardening flags to package targets.

The patch is renamed from cflags.patch for naming consistency.

- - - - -
4e0756b5 by Étienne Mollier at 2024-08-28T21:27:30+02:00
d/s/lintian-overrides: hide more unactionable hints.

- - - - -
9bf74023 by Étienne Mollier at 2024-08-28T21:29:25+02:00
d/control: bump to debhelper-compat 13.

- - - - -
8353f1ce by Étienne Mollier at 2024-08-28T21:30:58+02:00
d/control: declare compliance to standards version 4.7.0.

- - - - -
6a634dd4 by Étienne Mollier at 2024-08-28T21:31:25+02:00
d/control: add myself to uploaders.

- - - - -
3ab57f45 by Étienne Mollier at 2024-08-28T21:32:22+02:00
Ready for upload to unstable.

- - - - -
f1fbea69 by Étienne Mollier at 2024-08-28T21:33:01+02:00
Trim leftover whitespaces in the changelog.

Gbp-Dch: ignore

- - - - -


7 changed files:

- debian/changelog
- + debian/clean
- debian/control
- debian/patches/cflags.patch → debian/patches/flags.patch
- debian/patches/series
- debian/rules
- debian/source/lintian-overrides


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,16 @@
+sprai (0.9.9.23+dfsg1-3) unstable; urgency=medium
+
+  * d/clean: new: fix double source build failure. (Closes: #1047125)
+  * d/rules: activate hardwning flags.
+  * flags.patch: propagate hardening flags to package targets.
+    The patch is renamed from cflags.patch for naming consistency.
+  * d/s/lintian-overrides: hide more unactionable hints.
+  * d/control: bump to debhelper-compat 13.
+  * d/control: declare compliance to standards version 4.7.0.
+  * d/control: add myself to uploaders.
+
+ -- Étienne Mollier <emollier at debian.org>  Wed, 28 Aug 2024 21:31:44 +0200
+
 sprai (0.9.9.23+dfsg1-2) unstable; urgency=medium
 
   * Team upload.
@@ -7,7 +20,7 @@ sprai (0.9.9.23+dfsg1-2) unstable; urgency=medium
 
 sprai (0.9.9.23+dfsg1-1) unstable; urgency=medium
 
-  [ Adrian Bunk ]  
+  [ Adrian Bunk ]
   * Use CURDIR instead of PWD
     Closes: #956814
 


=====================================
debian/clean
=====================================
@@ -0,0 +1,4 @@
+bfmt72s
+m52bfmt7
+myrealigner
+nss2v_v3


=====================================
debian/control
=====================================
@@ -1,10 +1,11 @@
 Source: sprai
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
-Uploaders: Andreas Tille <tille at debian.org>
+Uploaders: Andreas Tille <tille at debian.org>,
+           Étienne Mollier <emollier at debian.org>
 Section: science
 Priority: optional
-Build-Depends: debhelper-compat (= 12)
-Standards-Version: 4.5.0
+Build-Depends: debhelper-compat (= 13)
+Standards-Version: 4.7.0
 Vcs-Browser: https://salsa.debian.org/med-team/sprai
 Vcs-Git: https://salsa.debian.org/med-team/sprai.git
 Homepage: https://web.archive.org/web/20180316202959/http://zombie.cb.k.u-tokyo.ac.jp/sprai/


=====================================
debian/patches/cflags.patch → debian/patches/flags.patch
=====================================
@@ -1,28 +1,31 @@
 Description: Make the build reproducible
+ Take that opportunity to also propagate hardening flags.
+
 Author: Chris Lamb <lamby at debian.org>
+Reviewed-By: Étienne Mollier <emollier at debian.org>
 Bug-Debian: https://bugs.debian.org/956473
-Last-Update: 2020-04-11
+Last-Update: 2024-08-28
 
---- a/makefile
-+++ b/makefile
-@@ -38,16 +38,16 @@ check_circularity.pl \
+--- sprai.orig/makefile
++++ sprai/makefile
+@@ -38,16 +38,16 @@
  all: $(COMPILED)
  
  bfmt72s: bfmt72s.c
 -	$(CC) -Wall -O3 -g -o $@ $<
-+	$(CC) -Wall -O3 -g $(CFLAGS) -o $@ $<
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $<
  
  nss2v_v3: nss2v_v3.c
 -	$(CC) -Wall -O3 -g -o $@ $<
-+	$(CC) -Wall -O3 -g $(CFLAGS) -o $@ $<
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $<
  
  myrealigner: myrealigner.c
 -	$(CC) -Wall -O3 -g -o $@ $^
-+	$(CC) -Wall -O3 -g $(CFLAGS) -o $@ $^
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $^
  
  m52bfmt7: m52bfmt7.c
 -	$(CC) -Wall -O3 -g -o $@ $<
-+	$(CC) -Wall -O3 -g $(CFLAGS) -o $@ $<
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $<
  
  
  install: $(COMPILED) $(SCRIPTS)


=====================================
debian/patches/series
=====================================
@@ -2,4 +2,4 @@ libexec.patch
 example-specs.patch
 makefile.patch
 no-pwd.patch
-cflags.patch
+flags.patch


=====================================
debian/rules
=====================================
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 DPKG_EXPORT_BUILDFLAGS = 1
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 include /usr/share/dpkg/buildflags.mk
 
 %:


=====================================
debian/source/lintian-overrides
=====================================
@@ -1,3 +1,10 @@
 # There is not even an upstream site any more - so suppress this noise
 sprai source: upstream-metadata-missing-bug-tracking
 sprai source: upstream-metadata-missing-repository
+
+# This won't be actionable anymore as there are no more upstream
+# versions to be expected, nor to contact to forward patches and
+# manuals.
+sprai source: anticipated-repack-count 0.9.9.23+dfsg1-2
+sprai source: patch-not-forwarded-upstream [debian/patches/*.patch]
+sprai source: maintainer-manual-page [debian/man/*.*]



View it on GitLab: https://salsa.debian.org/med-team/sprai/-/compare/04deae873c645987533a3c4879bd57b636b910d5...f1fbea69d30728515e5510b7bf28c182223313e7

-- 
View it on GitLab: https://salsa.debian.org/med-team/sprai/-/compare/04deae873c645987533a3c4879bd57b636b910d5...f1fbea69d30728515e5510b7bf28c182223313e7
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20240828/45c4e2c8/attachment-0001.htm>


More information about the debian-med-commit mailing list