Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package partclone for openSUSE:Factory checked in at 2021-09-30 23:43:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/partclone (Old) and /work/SRC/openSUSE:Factory/.partclone.new.2443 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "partclone" Thu Sep 30 23:43:37 2021 rev:17 rq:922300 version:0.3.18 Changes: -------- --- /work/SRC/openSUSE:Factory/partclone/partclone.changes 2021-03-24 16:12:08.463887941 +0100 +++ /work/SRC/openSUSE:Factory/.partclone.new.2443/partclone.changes 2021-09-30 23:44:52.484571010 +0200 @@ -1,0 +2,9 @@ +Wed Sep 29 12:48:23 UTC 2021 - Paolo Stivanin <i...@paolostivanin.com> + +- update to 0.3.18: + * Add block_size and blocks_total in torrent.info to provide + partition info + * change C99 for loop init to C89 for compatibility + * try to fix ignore_crc not working properly + +------------------------------------------------------------------- Old: ---- partclone-0.3.17.tar.gz New: ---- partclone-0.3.18.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ partclone.spec ++++++ --- /var/tmp/diff_new_pack.BNs6V1/_old 2021-09-30 23:44:52.896571481 +0200 +++ /var/tmp/diff_new_pack.BNs6V1/_new 2021-09-30 23:44:52.896571481 +0200 @@ -18,13 +18,13 @@ Name: partclone -Version: 0.3.17 +Version: 0.3.18 Release: 0 Summary: File System Clone Utilities License: GPL-2.0-or-later Group: System/Filesystems URL: https://partclone.org/ -Source: https://sourceforge.net/projects/partclone/files/unstable/partclone-%{version}.tar.gz +Source: https://github.com/Thomas-Tsai/partclone/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildRequires: autoconf BuildRequires: automake BuildRequires: e2fsprogs-devel ++++++ partclone-0.3.17.tar.gz -> partclone-0.3.18.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/partclone-0.3.17/ChangeLog new/partclone-0.3.18/ChangeLog --- old/partclone-0.3.17/ChangeLog 2020-10-29 05:21:08.000000000 +0100 +++ new/partclone-0.3.18/ChangeLog 2021-09-27 09:03:48.000000000 +0200 @@ -1,5 +1,55 @@ +2021-09-27 Thomas Tsai <tho...@nchc.org.tw> + + Merge branch 'master' of github.com:Thomas-Tsai/partclone + +2021-09-24 Thomas Tsai <tlinux.t...@gmail.com> + + Merge pull request #164 from tjjh89017/more_torrent_info + WIP: Add block_size and blocks_total in torrent.info to provide partition info + +2021-09-24 Date Huang <tjjh89...@hotmail.com> + + Add block_size and blocks_total in torrent.info to provide partition info + +2021-06-14 Thomas Tsai <tlinux.t...@gmail.com> + + Merge pull request #162 from mjoerg/master + doc: fix typo for logfile argument + +2021-06-12 Martin Joerg <martin.jo...@gmail.com> + + doc: fix typo for logfile argument + +2021-03-03 Thomas Tsai <tlinux.t...@gmail.com> + + Merge pull request #157 from pfrouleau/document_partclone_image_formats + doc: document the image formats + +2021-03-03 Patrick Rouleau <proulea...@gmail.com> + + doc: document the image formats + +2021-02-17 Thomas Tsai <tlinux.t...@gmail.com> + + Update README.md + +2021-01-06 Thomas Tsai <tlinux.t...@gmail.com> + + Merge pull request #152 from robert-scheck/c99-for-loop + Change C99 for loop init to C89 for compatibility + +2020-12-31 Robert Scheck <rob...@fedoraproject.org> + + Change C99 for loop init to C89 for compatibility + +2020-11-02 Thomas Tsai <tho...@nchc.org.tw> + + * try to fix ignore_crc not working properly in partclone 3.12. * issue is 2.8 image restored by 3.X with ignore_crc and get fail. reference https://github.com/Sebastian-Roth/partclone/commit/80ca94dccadbc4998b80f3eabe8c84bdc638c7b5 + 2020-10-29 Thomas Tsai <tho...@nchc.org.tw> + release 0.3.17 + release 0.3.16 Merge branch 'master' of github.com:Thomas-Tsai/partclone diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/partclone-0.3.17/IMAGE_FORMATS.md new/partclone-0.3.18/IMAGE_FORMATS.md --- old/partclone-0.3.17/IMAGE_FORMATS.md 1970-01-01 01:00:00.000000000 +0100 +++ new/partclone-0.3.18/IMAGE_FORMATS.md 2021-09-27 09:03:48.000000000 +0200 @@ -0,0 +1,115 @@ +# Image formats + +This file describes Partclone's image formats. 2 versions exist: 0001 and 0002. + +The generic structure of the images is like this: + +| section | +|-------------| +| Image header| +| Bitmap | +| Blocks | + +Only the blocks present in the bitmap are recorded in the blocks section. + + +# Format 0001 + +This is the original format. It is used by all partclone versions lower than 0.3.0. + +## Image header + +|Byte Offset | Size | Description +|------------|------|------------- +| 0 | 15 | Partclone image signature +| 15 | 15 | File system's type +| 30 | 4 | **_Image version, in text: "0001"_** +| 34 | 2 | Padding (no meaning) +| 36 | 4 | File system's block size +| 40 | 8 | File system's total size +| 48 | 8 | File system's total block count +| 56 | 8 | File system's used block count +| 64 | 4096 | Unused buffer +| 4160 | | Total size of image header + +## Bitmap + +|Byte Offset| Size | Description +|-----------|------|------------- +| 0 | File system's total block count | 1 byte per block: 0 = Not present; 1 = Present; other = ?? +| File system's total block count | 8 | Bitmap's signature: "BiTmAgIc" + +**Note:** It seems that some bitmaps contain values other than 0 or 1. The meaning of these values are not know and were probably caused by a bug manipulating the block's presence. + +## Blocks + +|Byte Offset | Size | Description +|------------|------|------------- +| N | File system's block size | 1 block of data +| N | 4 | CRC32 for the block (see https://sourceforge.net/p/partclone/bugs/6/) + + +# Format 0002 + +This new format is used since partclone 0.3.0. Partclone only write in this format, but it can read the previous format and restore the data. + +The main reason why this version has been created was to fix the issue with the checksum present after each block in 0001. + +The new format also support a few new features and has some flexibility for future extensions. + +## Image header + +|Byte Offset | Size | Description +|------------|------|------------- +| 0 | 16 | Partclone image signature +| 16 | 14 | Partclone version used to create the image, ex: 0.3.1 +| 30 | 4 | **_Image version, in text: "0002"_** +| 34 | 2 | Endianess marker: 0xC0DE = little-endian, 0xDEC0 = big-endian +| 36 | 16 | File system's type +| 52 | 8 | File system's total size +| 60 | 8 | File system's total block count +| 68 | 8 | File system's used block count +| 76 | 8 | Bitmap's size, in bytes +| 84 | 4 | File system's block size +| 88 | 4 | Size of feature section +| 92 | 2 | Image version, in binary: 0x0002 +| 94 | 2 | Number of bits for CPU data: 32, 64, other? +| 96 | 2 | Checksum mode for the block strip: 0 = None, 1 = CRC32 +| 98 | 2 | Checksum size, in bytes (4 for CRC32) +| 100 | 4 | Blocks per checksum, default is 256. +| 104 | 1 | Reseed checksum: 1 = yes, 0 = no +| 105 | 1 | Bitmap mode, see bitmap_mode_enum +| 106 | 4 | CRC32 of the previous bytes +| 110 | | Total size of image header + +## Bitmap + +|Byte Offset| Size | Description +|-----------|------|------------- +| 0 | ceil(File system's total block count / 8) | 1 **bit** per block: 0 = Not present; 1 = Present +| ceil(File system's total block count / 8) | 4 | Bitmap's CRC32 + +**Note:** If the bitmap's CRC does not match, the image data cannot be restored. + +## Blocks + +|Byte Offset | Size | Description +|------------|------|------------- +| N | File system's block size * Blocks per checksum | 1 strip of data +| N | Checksum size | Checksum for the strip, if checksum mode + +**Note:** If "Checksum mode" is None, "Blocks per checksum" is 0. In this case, the blocks are simply +written one after the other. + +## Special notes + + - Image 0002 stores a few details about the version used to create the image and the platform used to + help to handle issues with the image if some bugs are found later. By example, earlier versions of + partclone did not write the right data size when it was run on a 64 bits platform. Since image 0001 + does not has any detail about the tool used, the code has to detect the presence of that issue. + Another issue was related to the endianess of the plateform. + - Image 0002 allows to disable the checksum because the data is usually piped in an archiver. + If the archive gets corrupted, the archiver will abort before sending the data base into partclone. + Disabling the checksum allows partclone to run a little bit faster. + - By default, Image 0002 reset the checksum after writting it. This allows to verify a "checksum strip" + without reading all the blocks since the beginning of the image. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/partclone-0.3.17/README.Packages/debian/changelog new/partclone-0.3.18/README.Packages/debian/changelog --- old/partclone-0.3.17/README.Packages/debian/changelog 2020-10-29 05:21:08.000000000 +0100 +++ new/partclone-0.3.18/README.Packages/debian/changelog 2021-09-27 09:03:48.000000000 +0200 @@ -1,3 +1,10 @@ +partclone (0.3.18-1) unstable; urgency=medium + + * accept patch for ClonezillaBT image + * adding and update some documents + + -- Thomas Tsai <tho...@nchc.org.tw> Mon, 27 Sep 2021 15:03:46 +0800 + partclone (0.3.17-1) unstable; urgency=medium * fix progress diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/partclone-0.3.17/README.md new/partclone-0.3.18/README.md --- old/partclone-0.3.17/README.md 2020-10-29 05:21:08.000000000 +0100 +++ new/partclone-0.3.18/README.md 2021-09-27 09:03:48.000000000 +0200 @@ -26,8 +26,6 @@ * partclone.dd ... -master branch is NOT STABLE, Please check 'release' branch - Basic Usage: - clone partition to image diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/partclone-0.3.17/configure.ac new/partclone-0.3.18/configure.ac --- old/partclone-0.3.17/configure.ac 2020-10-29 05:21:08.000000000 +0100 +++ new/partclone-0.3.18/configure.ac 2021-09-27 09:03:48.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT([Partclone], [0.3.17], [tho...@nchc.org.tw]) +AC_INIT([Partclone], [0.3.18], [tho...@nchc.org.tw]) AM_INIT_AUTOMAKE([-Wall foreign]) AM_GNU_GETTEXT_VERSION([0.16.1]) AM_GNU_GETTEXT([external]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/partclone-0.3.17/docs/partclone.8 new/partclone-0.3.18/docs/partclone.8 --- old/partclone-0.3.17/docs/partclone.8 2020-10-29 05:21:08.000000000 +0100 +++ new/partclone-0.3.18/docs/partclone.8 2021-09-27 09:03:48.000000000 +0200 @@ -1,13 +1,13 @@ '\" t .\" Title: PARTCLONE .\" Author: Yu-Chin Tsai <tho...@nchc.org.tw> -.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/> -.\" Date: 10/25/2020 +.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> +.\" Date: 06/12/2021 .\" Manual: Partclone User Manual .\" Source: partclone .\" Language: English .\" -.TH "PARTCLONE" "8" "10/25/2020" "partclone" "Partclone User Manual" +.TH "PARTCLONE" "8" "06/12/2021" "partclone" "Partclone User Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -122,7 +122,7 @@ Creating special raw file for loop device\&. .RE .PP -\fB\-l \fR\fB\fIFILE\fR\fR, \fB\-\-logfile \fR\fB\fIFILE\fR\fR +\fB\-L \fR\fB\fIFILE\fR\fR, \fB\-\-logfile \fR\fB\fIFILE\fR\fR .RS 4 put special path to record partclone log information\&.(default /var/log/partclone\&.log) .RE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/partclone-0.3.17/docs/partclone.chkimg.8 new/partclone-0.3.18/docs/partclone.chkimg.8 --- old/partclone-0.3.17/docs/partclone.chkimg.8 2020-10-29 05:21:08.000000000 +0100 +++ new/partclone-0.3.18/docs/partclone.chkimg.8 2021-09-27 09:03:48.000000000 +0200 @@ -1,13 +1,13 @@ '\" t .\" Title: PARTCLONE.CHKIMG .\" Author: Yu-Chin Tsai <tho...@nchc.org.tw> -.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 09/19/2015 +.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> +.\" Date: 06/12/2021 .\" Manual: Partclone User Manual .\" Source: partclone.chkimg .\" Language: English .\" -.TH "PARTCLONE\&.CHKIMG" "8" "09/19/2015" "partclone.chkimg" "Partclone User Manual" +.TH "PARTCLONE\&.CHKIMG" "8" "06/12/2021" "partclone.chkimg" "Partclone User Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -52,7 +52,7 @@ Receving data from pipe line is supported ONLY for restoring, just ignore \-s option or use \*(Aq\-\*(Aq means receive data from stdin\&. .RE .PP -\fB\-l \fR\fB\fIFILE\fR\fR, \fB\-\-logfile \fR\fB\fIFILE\fR\fR +\fB\-L \fR\fB\fIFILE\fR\fR, \fB\-\-logfile \fR\fB\fIFILE\fR\fR .RS 4 put special path to record partclone log information\&.(default /var/log/partclone\&.log) .RE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/partclone-0.3.17/docs/partclone.chkimg.xml new/partclone-0.3.18/docs/partclone.chkimg.xml --- old/partclone-0.3.17/docs/partclone.chkimg.xml 2020-10-29 05:21:08.000000000 +0100 +++ new/partclone-0.3.18/docs/partclone.chkimg.xml 2021-09-27 09:03:48.000000000 +0200 @@ -173,7 +173,7 @@ </listitem> </varlistentry> <varlistentry> - <term><option>-l <replaceable>FILE</replaceable></option></term> + <term><option>-L <replaceable>FILE</replaceable></option></term> <term><option>--logfile <replaceable>FILE</replaceable></option></term> <listitem> <para>put special path to record partclone log information.(default /var/log/partclone.log)</para> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/partclone-0.3.17/docs/partclone.dd.8 new/partclone-0.3.18/docs/partclone.dd.8 --- old/partclone-0.3.17/docs/partclone.dd.8 2020-10-29 05:21:08.000000000 +0100 +++ new/partclone-0.3.18/docs/partclone.dd.8 2021-09-27 09:03:48.000000000 +0200 @@ -1,13 +1,13 @@ '\" t .\" Title: PARTCLONE.DD .\" Author: Yu-Chin Tsai <tho...@nchc.org.tw> -.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/> -.\" Date: 10/25/2020 +.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> +.\" Date: 06/12/2021 .\" Manual: Partclone User Manual .\" Source: partclone.dd .\" Language: English .\" -.TH "PARTCLONE\&.DD" "8" "10/25/2020" "partclone.dd" "Partclone User Manual" +.TH "PARTCLONE\&.DD" "8" "06/12/2021" "partclone.dd" "Partclone User Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -69,7 +69,7 @@ Creating special raw file for loop device\&. .RE .PP -\fB\-l \fR\fB\fIFILE\fR\fR, \fB\-\-logfile \fR\fB\fIFILE\fR\fR +\fB\-L \fR\fB\fIFILE\fR\fR, \fB\-\-logfile \fR\fB\fIFILE\fR\fR .RS 4 put special path to record partclone log information\&.(default /var/log/partclone\&.log) .RE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/partclone-0.3.17/docs/partclone.dd.xml new/partclone-0.3.18/docs/partclone.dd.xml --- old/partclone-0.3.17/docs/partclone.dd.xml 2020-10-29 05:21:08.000000000 +0100 +++ new/partclone-0.3.18/docs/partclone.dd.xml 2021-09-27 09:03:48.000000000 +0200 @@ -226,7 +226,7 @@ </listitem> </varlistentry> <varlistentry> - <term><option>-l <replaceable>FILE</replaceable></option></term> + <term><option>-L <replaceable>FILE</replaceable></option></term> <term><option>--logfile <replaceable>FILE</replaceable></option></term> <listitem> <para>put special path to record partclone log information.(default /var/log/partclone.log)</para> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/partclone-0.3.17/docs/partclone.imager.8 new/partclone-0.3.18/docs/partclone.imager.8 --- old/partclone-0.3.17/docs/partclone.imager.8 2020-10-29 05:21:08.000000000 +0100 +++ new/partclone-0.3.18/docs/partclone.imager.8 2021-09-27 09:03:48.000000000 +0200 @@ -1,13 +1,13 @@ '\" t .\" Title: PARTCLONE.IMAGER .\" Author: Yu-Chin Tsai <tho...@nchc.org.tw> -.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 01/10/2017 +.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> +.\" Date: 06/12/2021 .\" Manual: Partclone User Manual .\" Source: partclone.imager .\" Language: English .\" -.TH "PARTCLONE\&.IMAGER" "8" "01/10/2017" "partclone.imager" "Partclone User Manual" +.TH "PARTCLONE\&.IMAGER" "8" "06/12/2021" "partclone.imager" "Partclone User Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -84,7 +84,7 @@ Creating special raw file for loop device\&. .RE .PP -\fB\-l \fR\fB\fIFILE\fR\fR, \fB\-\-logfile \fR\fB\fIFILE\fR\fR +\fB\-L \fR\fB\fIFILE\fR\fR, \fB\-\-logfile \fR\fB\fIFILE\fR\fR .RS 4 put special path to record partclone log information\&.(default /var/log/partclone\&.log) .RE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/partclone-0.3.17/docs/partclone.imager.xml new/partclone-0.3.18/docs/partclone.imager.xml --- old/partclone-0.3.17/docs/partclone.imager.xml 2020-10-29 05:21:08.000000000 +0100 +++ new/partclone-0.3.18/docs/partclone.imager.xml 2021-09-27 09:03:48.000000000 +0200 @@ -280,7 +280,7 @@ </listitem> </varlistentry> <varlistentry> - <term><option>-l <replaceable>FILE</replaceable></option></term> + <term><option>-L <replaceable>FILE</replaceable></option></term> <term><option>--logfile <replaceable>FILE</replaceable></option></term> <listitem> <para>put special path to record partclone log information.(default /var/log/partclone.log)</para> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/partclone-0.3.17/docs/partclone.restore.8 new/partclone-0.3.18/docs/partclone.restore.8 --- old/partclone-0.3.17/docs/partclone.restore.8 2020-10-29 05:21:08.000000000 +0100 +++ new/partclone-0.3.18/docs/partclone.restore.8 2021-09-27 09:03:48.000000000 +0200 @@ -1,13 +1,13 @@ '\" t .\" Title: PARTCLONE.RESTORE .\" Author: Yu-Chin Tsai <tho...@nchc.org.tw> -.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 09/19/2015 +.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> +.\" Date: 06/12/2021 .\" Manual: Partclone User Manual .\" Source: partclone.restore .\" Language: English .\" -.TH "PARTCLONE\&.RESTORE" "8" "09/19/2015" "partclone.restore" "Partclone User Manual" +.TH "PARTCLONE\&.RESTORE" "8" "06/12/2021" "partclone.restore" "Partclone User Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -69,7 +69,7 @@ Creating special raw file for loop device\&. .RE .PP -\fB\-l \fR\fB\fIFILE\fR\fR, \fB\-\-logfile \fR\fB\fIFILE\fR\fR +\fB\-L \fR\fB\fIFILE\fR\fR, \fB\-\-logfile \fR\fB\fIFILE\fR\fR .RS 4 put special path to record partclone log information\&.(default /var/log/partclone\&.log) .RE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/partclone-0.3.17/docs/partclone.restore.xml new/partclone-0.3.18/docs/partclone.restore.xml --- old/partclone-0.3.17/docs/partclone.restore.xml 2020-10-29 05:21:08.000000000 +0100 +++ new/partclone-0.3.18/docs/partclone.restore.xml 2021-09-27 09:03:48.000000000 +0200 @@ -226,7 +226,7 @@ </listitem> </varlistentry> <varlistentry> - <term><option>-l <replaceable>FILE</replaceable></option></term> + <term><option>-L <replaceable>FILE</replaceable></option></term> <term><option>--logfile <replaceable>FILE</replaceable></option></term> <listitem> <para>put special path to record partclone log information.(default /var/log/partclone.log)</para> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/partclone-0.3.17/docs/partclone.xml new/partclone-0.3.18/docs/partclone.xml --- old/partclone-0.3.17/docs/partclone.xml 2020-10-29 05:21:08.000000000 +0100 +++ new/partclone-0.3.18/docs/partclone.xml 2021-09-27 09:03:48.000000000 +0200 @@ -309,7 +309,7 @@ </listitem> </varlistentry> <varlistentry> - <term><option>-l <replaceable>FILE</replaceable></option></term> + <term><option>-L <replaceable>FILE</replaceable></option></term> <term><option>--logfile <replaceable>FILE</replaceable></option></term> <listitem> <para>put special path to record partclone log information.(default /var/log/partclone.log)</para> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/partclone-0.3.17/src/main.c new/partclone-0.3.18/src/main.c --- old/partclone-0.3.17/src/main.c 2020-10-29 05:21:08.000000000 +0100 +++ new/partclone-0.3.18/src/main.c 2021-09-27 09:03:48.000000000 +0200 @@ -457,6 +457,8 @@ tinfo = open(torrent_name, O_RDWR | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR); torrent_init(&torrent, tinfo); + dprintf(tinfo, "block_size: %u\n", block_size); + dprintf(tinfo, "blocks_total: %llu\n", blocks_total); } block_id = 0; @@ -673,6 +675,8 @@ tinfo = open(torrent_name, O_RDWR | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR); torrent_init(&torrent, tinfo); + dprintf(tinfo, "block_size: %u\n", block_size); + dprintf(tinfo, "blocks_total: %llu\n", blocks_total); } block_id = 0; @@ -720,8 +724,10 @@ if (opt.ignore_crc) { read_offset += block_size; - if (++blocks_in_cs == blocks_per_cs) + if (++blocks_in_cs == blocks_per_cs){ read_offset += cs_size; + blocks_in_cs = 0; + } continue; } @@ -1003,6 +1009,8 @@ sprintf(torrent_name,"%s/torrent.info", target); tinfo = open(torrent_name, O_RDWR | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR); torrent_init(&torrent, tinfo); + dprintf(tinfo, "block_size: %u\n", block_size); + dprintf(tinfo, "blocks_total: %llu\n", blocks_total); } log_mesg(0, 0, 0, debug, "Total block %llu\n", blocks_total); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/partclone-0.3.17/src/torrent_helper.c new/partclone-0.3.18/src/torrent_helper.c --- old/partclone-0.3.17/src/torrent_helper.c 2020-10-29 05:21:08.000000000 +0100 +++ new/partclone-0.3.18/src/torrent_helper.c 2021-09-27 09:03:48.000000000 +0200 @@ -30,6 +30,7 @@ unsigned long long buffer_offset = 0; int tinfo = torrent->tinfo; + int x = 0; while (buffer_remain_length > 0) { sha_remain_length = BT_PIECE_SIZE - sha_length; @@ -37,7 +38,7 @@ // finish a piece SHA1_Final(torrent->hash, &torrent->ctx); dprintf(tinfo, "sha1: "); - for (int x = 0; x < SHA_DIGEST_LENGTH; x++) { + for (x = 0; x < SHA_DIGEST_LENGTH; x++) { dprintf(tinfo, "%02x", torrent->hash[x]); } dprintf(tinfo, "\n"); @@ -67,10 +68,12 @@ void torrent_final(torrent_generator *torrent) { + int x = 0; + if (torrent->length) { SHA1_Final(torrent->hash, &torrent->ctx); dprintf(torrent->tinfo, "sha1: "); - for (int x = 0; x < SHA_DIGEST_LENGTH; x++) { + for (x = 0; x < SHA_DIGEST_LENGTH; x++) { dprintf(torrent->tinfo, "%02x", torrent->hash[x]); } dprintf(torrent->tinfo, "\n"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/partclone-0.3.17/src/version.h new/partclone-0.3.18/src/version.h --- old/partclone-0.3.17/src/version.h 2020-10-29 05:21:08.000000000 +0100 +++ new/partclone-0.3.18/src/version.h 2021-09-27 09:03:48.000000000 +0200 @@ -3,5 +3,5 @@ * WHETHER THEY ARE BUILT BY OTHERS OR DURING DEVELOPMENT OR FOR THE * OFFICIAL PARTCLONE RELEASES. */ -#define git_version "066ee0aace5f1f7c7a940e853e259cfc3b2cec05" +#define git_version "66489fe40e6e6334c10a208516afbf3107817b8f"
