Bug#1073085: hfsutils: upgrade the source package to use compat level 13
Hi Liu, On Fri, 2024-07-26 at 17:09 +0800, Zixing Liu wrote: > > Now you're putting me under pressure. Are you in a hurry? > > No, I am not in a hurry. I just realized I might have made a mistake > by not opening a merge request on Debian Salsa since that may be a > more straightforward solution. > So, I wanted to let you know that I was fixing this mistake. OK, no worries. > Please take as much time as you need to test and upload the fix. I'm > sorry if my wording sounds like I am putting you under pressure, as > English isn't my native language, so miscommunication might have > happened there. > No, it's perfectly fine. I really appreciate your help. I currently have some motivation issues working on Debian but it's getting better now and I want to do it myself to be able to help overcome my mental barrier by forcing myself to do it. Apologies if I sounded harsh. Adrian -- .''`. John Paul Adrian Glaubitz : :' : Debian Developer `. `' Physicist `-GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
Bug#1073085: hfsutils: upgrade the source package to use compat level 13
Hi John, On Fri, Jul 26, 2024 at 4:33 PM John Paul Adrian Glaubitz wrote: > > Hello, > > On Fri, 2024-07-26 at 12:14 +0800, Zixing Liu wrote: > > I have also prepared > > https://salsa.debian.org/debian/hfsutils/-/merge_requests/2 if you are > > having issues with your local Git tree. > > You can verify the merge with the version I uploaded to > > https://mentors.debian.net/debian/pool/main/h/hfsutils/hfsutils_3.2.6-17.dsc. > > Now you're putting me under pressure. Are you in a hurry? No, I am not in a hurry. I just realized I might have made a mistake by not opening a merge request on Debian Salsa since that may be a more straightforward solution. So, I wanted to let you know that I was fixing this mistake. Please take as much time as you need to test and upload the fix. I'm sorry if my wording sounds like I am putting you under pressure, as English isn't my native language, so miscommunication might have happened there. > > Adrian > > -- > .''`. John Paul Adrian Glaubitz > : :' : Debian Developer > `. `' Physicist > `-GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913 Thanks, Zixing
Bug#1073085: hfsutils: upgrade the source package to use compat level 13
Hello, On Fri, 2024-07-26 at 12:14 +0800, Zixing Liu wrote: > I have also prepared > https://salsa.debian.org/debian/hfsutils/-/merge_requests/2 if you are > having issues with your local Git tree. > You can verify the merge with the version I uploaded to > https://mentors.debian.net/debian/pool/main/h/hfsutils/hfsutils_3.2.6-17.dsc. Now you're putting me under pressure. Are you in a hurry? Adrian -- .''`. John Paul Adrian Glaubitz : :' : Debian Developer `. `' Physicist `-GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
Bug#1073085: hfsutils: upgrade the source package to use compat level 13
Hi John, On Wed, Jul 17, 2024 at 7:07 PM John Paul Adrian Glaubitz wrote: > > Hello Liu, > > On Mon, 2024-07-01 at 20:05 +0200, John Paul Adrian Glaubitz wrote: > > > After digging through the Debian BTS, I can see the patch may fix > > > #421457 in BTS. > > > Maybe you can edit my changelog entry to indicate that. > > > > Thanks for the suggestion. I will have a look. Sorry for not getting this > > fixed, > > there was a lot of work to be done in June. > > I have started working on this now and I just realized I messed a bit up in > my packaging source git tree. So, it might take me a little longer to get > this properly fixed up. I have also prepared https://salsa.debian.org/debian/hfsutils/-/merge_requests/2 if you are having issues with your local Git tree. You can verify the merge with the version I uploaded to https://mentors.debian.net/debian/pool/main/h/hfsutils/hfsutils_3.2.6-17.dsc. > > I will import for patch crediting you, so thanks a lot for fixing this issue! > > Adrian > > -- > .''`. John Paul Adrian Glaubitz > : :' : Debian Developer > `. `' Physicist > `-GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913 Thanks, Zixing
Bug#1073085: hfsutils: upgrade the source package to use compat level 13
Hello Liu, On Mon, 2024-07-01 at 20:05 +0200, John Paul Adrian Glaubitz wrote: > > After digging through the Debian BTS, I can see the patch may fix > > #421457 in BTS. > > Maybe you can edit my changelog entry to indicate that. > > Thanks for the suggestion. I will have a look. Sorry for not getting this > fixed, > there was a lot of work to be done in June. I have started working on this now and I just realized I messed a bit up in my packaging source git tree. So, it might take me a little longer to get this properly fixed up. I will import for patch crediting you, so thanks a lot for fixing this issue! Adrian -- .''`. John Paul Adrian Glaubitz : :' : Debian Developer `. `' Physicist `-GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
Bug#1073085: hfsutils: upgrade the source package to use compat level 13
Hi, > > Hi, > > On Mon, 2024-07-01 at 12:03 -0600, Zixing Liu wrote: > > On Wed, Jun 12, 2024 at 3:27 PM John Paul Adrian Glaubitz > > wrote: > > > > > > Hello Liu, > > > > > > On Wed, 2024-06-12 at 15:10 -0600, Zixing Liu wrote: > > > > This patch does the following: > > > > > > > > * d/rules: switch to use the debhelper autoreconf template. > > > > - d/rules: disable parallel testing. > > > > - d/hfsutils-tcltk.links: remove, this is auto-handled by debhelper > > > > now. > > > > * d/p/0006-Fix-memory-corruption.patch: add a patch to fix memory > > > > corruption > > > > issues (LP: #493273). > > > > > > > > > > > > Thanks for considering the patch. > > > > > > Thanks for your patch. I'll implement your changes in the weekend. > > > > > > > After digging through the Debian BTS, I can see the patch may fix > > #421457 in BTS. > > Maybe you can edit my changelog entry to indicate that. > > Thanks for the suggestion. I will have a look. Sorry for not getting this > fixed, > there was a lot of work to be done in June. > That's totally understandable! Thanks for your quick response! > Adrian > > -- > .''`. John Paul Adrian Glaubitz > : :' : Debian Developer > `. `' Physicist > `-GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913 Thanks, Zixing
Bug#1073085: hfsutils: upgrade the source package to use compat level 13
Hi, On Mon, 2024-07-01 at 12:03 -0600, Zixing Liu wrote: > On Wed, Jun 12, 2024 at 3:27 PM John Paul Adrian Glaubitz > wrote: > > > > Hello Liu, > > > > On Wed, 2024-06-12 at 15:10 -0600, Zixing Liu wrote: > > > This patch does the following: > > > > > > * d/rules: switch to use the debhelper autoreconf template. > > > - d/rules: disable parallel testing. > > > - d/hfsutils-tcltk.links: remove, this is auto-handled by debhelper > > > now. > > > * d/p/0006-Fix-memory-corruption.patch: add a patch to fix memory > > > corruption > > > issues (LP: #493273). > > > > > > > > > Thanks for considering the patch. > > > > Thanks for your patch. I'll implement your changes in the weekend. > > > > After digging through the Debian BTS, I can see the patch may fix > #421457 in BTS. > Maybe you can edit my changelog entry to indicate that. Thanks for the suggestion. I will have a look. Sorry for not getting this fixed, there was a lot of work to be done in June. Adrian -- .''`. John Paul Adrian Glaubitz : :' : Debian Developer `. `' Physicist `-GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
Bug#1073085: hfsutils: upgrade the source package to use compat level 13
Hi Adrian, On Wed, Jun 12, 2024 at 3:27 PM John Paul Adrian Glaubitz wrote: > > Hello Liu, > > On Wed, 2024-06-12 at 15:10 -0600, Zixing Liu wrote: > > This patch does the following: > > > > * d/rules: switch to use the debhelper autoreconf template. > > - d/rules: disable parallel testing. > > - d/hfsutils-tcltk.links: remove, this is auto-handled by debhelper now. > > * d/p/0006-Fix-memory-corruption.patch: add a patch to fix memory > > corruption > > issues (LP: #493273). > > > > > > Thanks for considering the patch. > > Thanks for your patch. I'll implement your changes in the weekend. > After digging through the Debian BTS, I can see the patch may fix #421457 in BTS. Maybe you can edit my changelog entry to indicate that. > Adrian > > -- > .''`. John Paul Adrian Glaubitz > : :' : Debian Developer > `. `' Physicist > `-GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913 Thanks, Zixing
Bug#1073085: hfsutils: upgrade the source package to use compat level 13
Hello Liu, On Wed, 2024-06-12 at 15:10 -0600, Zixing Liu wrote: > This patch does the following: > > * d/rules: switch to use the debhelper autoreconf template. > - d/rules: disable parallel testing. > - d/hfsutils-tcltk.links: remove, this is auto-handled by debhelper now. > * d/p/0006-Fix-memory-corruption.patch: add a patch to fix memory corruption > issues (LP: #493273). > > > Thanks for considering the patch. Thanks for your patch. I'll implement your changes in the weekend. Adrian -- .''`. John Paul Adrian Glaubitz : :' : Debian Developer `. `' Physicist `-GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
Bug#1073085: hfsutils: upgrade the source package to use compat level 13
Package: hfsutils
Version: 3.2.6-16
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu oracular ubuntu-patch
Dear Maintainer,
This patch does the following:
* d/rules: switch to use the debhelper autoreconf template.
- d/rules: disable parallel testing.
- d/hfsutils-tcltk.links: remove, this is auto-handled by debhelper now.
* d/p/0006-Fix-memory-corruption.patch: add a patch to fix memory corruption
issues (LP: #493273).
Thanks for considering the patch.
-- System Information:
Debian Release: trixie/sid
APT prefers noble-updates
APT policy: (500, 'noble-updates'), (500, 'noble-security'), (500, 'noble'),
(100, 'noble-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 6.8.0-35-generic (SMP w/10 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8),
LANGUAGE=en_CA:en
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru hfsutils-3.2.6/debian/compat hfsutils-3.2.6/debian/compat
--- hfsutils-3.2.6/debian/compat2021-01-23 07:13:30.0 -0700
+++ hfsutils-3.2.6/debian/compat1969-12-31 17:00:00.0 -0700
@@ -1 +0,0 @@
-10
diff -Nru hfsutils-3.2.6/debian/control hfsutils-3.2.6/debian/control
--- hfsutils-3.2.6/debian/control 2021-10-17 09:09:15.0 -0600
+++ hfsutils-3.2.6/debian/control 2024-06-11 15:24:07.0 -0600
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: John Paul Adrian Glaubitz
Standards-Version: 4.1.3
-Build-Depends: debhelper (>= 10), tcl-dev, tk-dev
+Build-Depends: debhelper-compat (= 13), tcl-dev, tk-dev
Homepage: http://www.mars.org/home/rob/proj/hfs/
Vcs-Browser: https://salsa.debian.org/debian/hfsutils
Vcs-Git: https://salsa.debian.org/debian/hfsutils.git
diff -Nru hfsutils-3.2.6/debian/hfsutils-tcltk.links
hfsutils-3.2.6/debian/hfsutils-tcltk.links
--- hfsutils-3.2.6/debian/hfsutils-tcltk.links 2021-01-23 07:13:30.0
-0700
+++ hfsutils-3.2.6/debian/hfsutils-tcltk.links 1969-12-31 17:00:00.0
-0700
@@ -1 +0,0 @@
-usr/share/doc/hfsutils usr/share/doc/hfsutils-tcltk
diff -Nru hfsutils-3.2.6/debian/patches/0006-Fix-memory-corruption.patch
hfsutils-3.2.6/debian/patches/0006-Fix-memory-corruption.patch
--- hfsutils-3.2.6/debian/patches/0006-Fix-memory-corruption.patch
1969-12-31 17:00:00.0 -0700
+++ hfsutils-3.2.6/debian/patches/0006-Fix-memory-corruption.patch
2024-06-11 15:24:07.0 -0600
@@ -0,0 +1,57 @@
+Description: Fix memory corruption in hfssh
+ This was caused by mismatched alloc/free functions.
+ Memory allocated by Tcl must be freed by TclFree and memory transferred to
+ Tcl must be allocated using TclAlloc.
+Author: Zixing Liu
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=421457
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/hfsutils/+bug/493273
+Forwarded: no
+Last-Update: 2024-06-11
+---
+Index: hfsutils/tclhfs.c
+===
+--- hfsutils.orig/tclhfs.c
hfsutils/tclhfs.c
+@@ -378,7 +378,7 @@ int file_cmd(ClientData clientData, Tcl_
+ return TCL_ERROR;
+ }
+
+-mem = ALLOC(char, bytes + 1);
++mem = Tcl_Alloc(bytes + 1);
+ if (mem == 0)
+ {
+ interp->result = "out of memory";
+@@ -1038,7 +1038,7 @@ int vol_cmd(ClientData clientData, Tcl_I
+ return TCL_ERROR;
+
+ fargv = hfs_glob(vol, listc, listv, );
+-free(listv);
++Tcl_Free(listv);
+
+ if (fargv == 0)
+ {
+@@ -1313,7 +1313,7 @@ int cmd_hfs(ClientData clientData, Tcl_I
+ badblocks = ALLOCX(unsigned long, listc);
+ if (listc && badblocks == 0)
+ {
+-free(listv);
++Tcl_Free(listv);
+
+ interp->result = "out of memory";
+ return TCL_ERROR;
+@@ -1324,13 +1324,13 @@ int cmd_hfs(ClientData clientData, Tcl_I
+ if (Tcl_ExprLong(interp, listv[i],
+ (long *) [i]) != TCL_OK)
+ {
+-free(listv);
++Tcl_Free(listv);
+ FREE(badblocks);
+ return TCL_ERROR;
+ }
+ }
+
+-free(listv);
++Tcl_Free(listv);
+
+ if (do_format(argv[2], partno, 0, argv[4], listc, badblocks) == -1)
+ {
diff -Nru hfsutils-3.2.6/debian/patches/series
hfsutils-3.2.6/debian/patches/series
--- hfsutils-3.2.6/debian/patches/series2024-04-14 05:45:36.0
-0600
+++ hfsutils-3.2.6/debian/patches/series2024-06-11 15:24:07.0
-0600
@@ -3,3 +3,4 @@
0003-Add-support-for-files-larger-than-2GB.patch
0004-Add-DUSE_INTERP_RESULT-to-DEFINES-in-Makefile.in.patch
0005-Fix-missing-inclusion-of-string.h-in-hpwd.c.patch
+0006-Fix-memory-corruption.patch
diff -Nru
