Package: mlucas
Version: 20.1.1-1.1
Severity: normal

Hello Alex, this is the patch for the NMU.

Cheers,
-- 
Bill. <ballo...@debian.org>

Imagine a large red swirl here. 
diff -Nru mlucas-20.1.1/debian/changelog mlucas-20.1.1/debian/changelog
--- mlucas-20.1.1/debian/changelog      2021-12-21 00:07:38.000000000 +0100
+++ mlucas-20.1.1/debian/changelog      2024-09-27 22:27:58.000000000 +0200
@@ -1,3 +1,18 @@
+mlucas (20.1.1-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload. (Closes: #1080048)
+    Mlucas author, Mr Ernst Mayer, sadly passed away in 2023,
+    see <https://www.mersenneforum.org/node/22279?t=28890>
+    He will be missed. Consider this package as a tribute to him.
+  * New patch fopen-on-arm.patch from Steve Langasek (Closes: #1014547)
+  * debian/control:
+    - Fix maintainer address. (Closes: #1013910)
+  * debian/rules:
+    - Apply patch from Steve Langasek (Closes: #1027776)
+    - build with -Wno-incompatible-pointer-types (Closes: #1081082)
+
+ -- Bill Allombert <ballo...@debian.org>  Fri, 27 Sep 2024 22:27:58 +0200
+
 mlucas (20.1.1-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru mlucas-20.1.1/debian/control mlucas-20.1.1/debian/control
--- mlucas-20.1.1/debian/control        2021-12-21 00:07:38.000000000 +0100
+++ mlucas-20.1.1/debian/control        2024-09-27 22:02:29.000000000 +0200
@@ -1,7 +1,7 @@
 Source: mlucas
 Section: math
 Priority: optional
-Maintainer: Alex Vong <alexvong1995-AT-protonmail-DOT-com@NOSPAM.invalid>
+Maintainer: Alex Vong <alexvong.k8...@simplelogin.com>
 Build-Depends: debhelper-compat (= 13), libgmp-dev
 Rules-Requires-Root: no
 Standards-Version: 4.6.0.1
diff -Nru mlucas-20.1.1/debian/patches/fopen-on-arm.patch 
mlucas-20.1.1/debian/patches/fopen-on-arm.patch
--- mlucas-20.1.1/debian/patches/fopen-on-arm.patch     1970-01-01 
01:00:00.000000000 +0100
+++ mlucas-20.1.1/debian/patches/fopen-on-arm.patch     2024-09-26 
22:40:39.000000000 +0200
@@ -0,0 +1,22 @@
+Description: don't use mlucas_fopen() for system files
+ mlucas_fopen() is a wrapper around fopen() that rewrites the path in
+ various cases.  It is not an appropriate interface for opening system
+ files like /proc/cpuinfo, and causes the mlucas binary to be completely
+ broken on ARM architectures.
+Author: Steve Langasek <steve.langa...@ubuntu.com>
+Forwarded: no
+Last-Update: 2022-07-07
+
+Index: mlucas-20.1.1/upstream/src/util.c
+===================================================================
+--- mlucas-20.1.1.orig/upstream/src/util.c
++++ mlucas-20.1.1/upstream/src/util.c
+@@ -1909,7 +1909,7 @@
+       int has_asimd(void)
+       {
+               char in_line[STR_MAX_LEN];
+-              FILE*fp = mlucas_fopen("/proc/cpuinfo", "r");
++              FILE*fp = fopen("/proc/cpuinfo", "r");
+               ASSERT(HERE, fp != 0x0, "/proc/cpuinfo file not found!");
+               while(fgets(in_line, STR_MAX_LEN, fp) != 0x0) {
+                       if(strstr(in_line, "asimd") != 0)
diff -Nru mlucas-20.1.1/debian/patches/series 
mlucas-20.1.1/debian/patches/series
--- mlucas-20.1.1/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ mlucas-20.1.1/debian/patches/series 2024-09-26 22:40:39.000000000 +0200
@@ -0,0 +1 @@
+fopen-on-arm.patch
diff -Nru mlucas-20.1.1/debian/rules mlucas-20.1.1/debian/rules
--- mlucas-20.1.1/debian/rules  2021-12-21 00:07:38.000000000 +0100
+++ mlucas-20.1.1/debian/rules  2024-09-26 15:08:32.000000000 +0200
@@ -13,6 +13,9 @@
 # configure script detects optimization and debbuging flags automatically
 export DEB_CFLAGS_MAINT_STRIP = -O2 -g
 
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+
+CFLAGS += -Wno-incompatible-pointer-types
 
 # main packaging script based on dh7 syntax
 %:
@@ -24,3 +27,10 @@
 
 override_dh_auto_configure:
        dh_auto_configure -- --enable-mlucas-default-path
+
+override_dh_auto_test:
+ifeq ($(DEB_HOST_ARCH), arm64)
+       dh_auto_test || true
+else
+       dh_auto_test
+endif

Reply via email to