Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xfsdump for openSUSE:Factory checked in at 2022-12-18 17:22:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfsdump (Old) and /work/SRC/openSUSE:Factory/.xfsdump.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfsdump" Sun Dec 18 17:22:23 2022 rev:36 rq:1043475 version:3.1.12 Changes: -------- --- /work/SRC/openSUSE:Factory/xfsdump/xfsdump.changes 2022-08-30 14:48:31.799974978 +0200 +++ /work/SRC/openSUSE:Factory/.xfsdump.new.1835/xfsdump.changes 2022-12-18 17:22:25.937278803 +0100 @@ -1,0 +2,9 @@ +Sat Dec 17 18:23:54 UTC 2022 - Dirk Müller <[email protected]> + +- update to 3.1.12: + * xfsrestore: fix on-media inventory media unpacking + * xfsrestore: fix on-media inventory stream unpacking + * xfsdump: fix on-media inventory stream packing + * xfsrestore: untangle inventory unpacking logic + +------------------------------------------------------------------- Old: ---- xfsdump-3.1.11.tar.sign xfsdump-3.1.11.tar.xz New: ---- xfsdump-3.1.12.tar.sign xfsdump-3.1.12.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfsdump.spec ++++++ --- /var/tmp/diff_new_pack.6cuFWK/_old 2022-12-18 17:22:26.825283935 +0100 +++ /var/tmp/diff_new_pack.6cuFWK/_new 2022-12-18 17:22:26.829283959 +0100 @@ -17,7 +17,7 @@ Name: xfsdump -Version: 3.1.11 +Version: 3.1.12 Release: 0 Summary: Administrative Utilities for the XFS File System License: GPL-2.0-or-later @@ -36,7 +36,6 @@ BuildRequires: ncurses-devel BuildRequires: xfsprogs-devel BuildRequires: xz -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description The xfsdump package contains xfsdump, xfsrestore, and a number of other ++++++ xfsdump-3.1.11.tar.xz -> xfsdump-3.1.12.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfsdump-3.1.11/VERSION new/xfsdump-3.1.12/VERSION --- old/xfsdump-3.1.11/VERSION 2022-08-26 18:09:51.000000000 +0200 +++ new/xfsdump-3.1.12/VERSION 2022-12-15 06:42:07.000000000 +0100 @@ -3,5 +3,5 @@ # PKG_MAJOR=3 PKG_MINOR=1 -PKG_REVISION=11 +PKG_REVISION=12 PKG_BUILD=1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfsdump-3.1.11/configure new/xfsdump-3.1.12/configure --- old/xfsdump-3.1.11/configure 2022-08-26 18:15:01.000000000 +0200 +++ new/xfsdump-3.1.12/configure 2022-12-16 11:54:35.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for xfsdump 3.1.11. +# Generated by GNU Autoconf 2.69 for xfsdump 3.1.12. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ # Identity of this package. PACKAGE_NAME='xfsdump' PACKAGE_TARNAME='xfsdump' -PACKAGE_VERSION='3.1.11' -PACKAGE_STRING='xfsdump 3.1.11' +PACKAGE_VERSION='3.1.12' +PACKAGE_STRING='xfsdump 3.1.12' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1336,7 +1336,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xfsdump 3.1.11 to adapt to many kinds of systems. +\`configure' configures xfsdump 3.1.12 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1402,7 +1402,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xfsdump 3.1.11:";; + short | recursive ) echo "Configuration of xfsdump 3.1.12:";; esac cat <<\_ACEOF @@ -1510,7 +1510,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xfsdump configure 3.1.11 +xfsdump configure 3.1.12 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1875,7 +1875,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xfsdump $as_me 3.1.11, which was +It was created by xfsdump $as_me 3.1.12, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -14299,7 +14299,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xfsdump $as_me 3.1.11, which was +This file was extended by xfsdump $as_me 3.1.12, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14365,7 +14365,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -xfsdump config.status 3.1.11 +xfsdump config.status 3.1.12 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfsdump-3.1.11/configure.ac new/xfsdump-3.1.12/configure.ac --- old/xfsdump-3.1.11/configure.ac 2022-08-26 18:09:51.000000000 +0200 +++ new/xfsdump-3.1.12/configure.ac 2022-12-15 06:42:23.000000000 +0100 @@ -1,4 +1,4 @@ -AC_INIT([xfsdump], [3.1.11]) +AC_INIT([xfsdump], [3.1.12]) AC_PREREQ(2.50) AC_CONFIG_AUX_DIR([.]) AC_CONFIG_MACRO_DIR([m4]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfsdump-3.1.11/debian/changelog new/xfsdump-3.1.12/debian/changelog --- old/xfsdump-3.1.11/debian/changelog 2022-08-26 18:09:51.000000000 +0200 +++ new/xfsdump-3.1.12/debian/changelog 2022-12-15 06:43:53.000000000 +0100 @@ -1,3 +1,9 @@ +xfsdump (3.1.12) unstable; urgency=low + + * New upstream release + + -- Nathan Scott <[email protected]> Thu, 15 Dec 2022 06:43:00 +0200 + xfsdump (3.1.11) unstable; urgency=low * New upstream release diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfsdump-3.1.11/doc/CHANGES new/xfsdump-3.1.12/doc/CHANGES --- old/xfsdump-3.1.11/doc/CHANGES 2022-08-26 18:09:51.000000000 +0200 +++ new/xfsdump-3.1.12/doc/CHANGES 2022-12-15 06:49:11.000000000 +0100 @@ -1,3 +1,6 @@ +xfsdump-3-1.12 (15 Dec 2022) + - Fix inventory unpacking (Donald Douwsma) + xfsdump-3-1.11 (25 Aug 2022) - Remove remaining slave words from documentation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfsdump-3.1.11/inventory/inv_stobj.c new/xfsdump-3.1.12/inventory/inv_stobj.c --- old/xfsdump-3.1.11/inventory/inv_stobj.c 2022-08-08 15:48:54.000000000 +0200 +++ new/xfsdump-3.1.12/inventory/inv_stobj.c 2022-12-15 06:38:56.000000000 +0100 @@ -798,7 +798,7 @@ sesbuf += sizeof(invt_session_t); for (i = 0; i < ses->s_cur_nstreams; i++) { - xlate_invt_stream(strms, (invt_stream_t *)sesbuf, 1); + xlate_invt_stream(&strms[i], (invt_stream_t *)sesbuf, 1); sesbuf += sizeof(invt_stream_t); } @@ -1008,7 +1008,7 @@ size_t bufsz, invt_sessinfo_t *s) { - uint i; + uint i, j; char *tmpbuf; char *p = (char *)bufp; @@ -1065,48 +1065,36 @@ return BOOL_FALSE; } + /* get the seshdr and then, the remainder of the session */ xlate_invt_seshdr((invt_seshdr_t *)p, (invt_seshdr_t *)tmpbuf, 1); bcopy(tmpbuf, p, sizeof(invt_seshdr_t)); - - /* get the seshdr and then, the remainder of the session */ s->seshdr = (invt_seshdr_t *)p; s->seshdr->sh_sess_off = -1; p += sizeof(invt_seshdr_t); - xlate_invt_session((invt_session_t *)p, (invt_session_t *)tmpbuf, 1); bcopy (tmpbuf, p, sizeof(invt_session_t)); s->ses = (invt_session_t *)p; p += sizeof(invt_session_t); /* the array of all the streams belonging to this session */ - xlate_invt_stream((invt_stream_t *)p, (invt_stream_t *)tmpbuf, 1); - bcopy(tmpbuf, p, sizeof(invt_stream_t)); s->strms = (invt_stream_t *)p; - p += s->ses->s_cur_nstreams * sizeof(invt_stream_t); + for (i = 0; i < s->ses->s_cur_nstreams; i++) { + xlate_invt_stream((invt_stream_t *)p, + (invt_stream_t *)tmpbuf, 1); + bcopy(tmpbuf, p, sizeof(invt_stream_t)); + p += sizeof(invt_stream_t); + } /* all the media files */ s->mfiles = (invt_mediafile_t *)p; - -#ifdef INVT_DELETION - { - int tmpfd = open("moids", O_RDWR | O_CREAT, S_IRUSR|S_IWUSR); - uint j; - invt_mediafile_t *mmf = s->mfiles; - for (i=0; i< s->ses->s_cur_nstreams; i++) { - for (j=0; j< s->strms[i].st_nmediafiles; - j++, mmf++) - xlate_invt_mediafile((invt_mediafile_t *)mmf, (invt_mediafile_t *)tmpbuf, 1); - bcopy(tmpbuf, mmf, sizeof(invt_mediafile_t)); - put_invtrecord(tmpfd, &mmf->mf_moid, - sizeof(uuid_t), 0, SEEK_END, 0); - } - close(tmpfd); - } -#endif for (i = 0; i < s->ses->s_cur_nstreams; i++) { - p += (size_t) (s->strms[i].st_nmediafiles) - * sizeof(invt_mediafile_t); + for(j = 0; j < s->strms[i].st_nmediafiles; j++) { + xlate_invt_mediafile((invt_mediafile_t *)p, + (invt_mediafile_t *)tmpbuf, 1); + bcopy(tmpbuf, p, sizeof(invt_mediafile_t)); + p += sizeof(invt_mediafile_t); + } } /* sanity check the size of the buffer given to us vs. the size it diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfsdump-3.1.11/restore/content.c new/xfsdump-3.1.12/restore/content.c --- old/xfsdump-3.1.11/restore/content.c 2022-08-26 18:09:51.000000000 +0200 +++ new/xfsdump-3.1.12/restore/content.c 2022-12-15 06:38:56.000000000 +0100 @@ -5450,17 +5450,14 @@ * desc. */ sessp = 0; - if (!buflen) { - ok = BOOL_FALSE; - } else { - /* extract the session information from the buffer */ - if (stobj_unpack_sessinfo(bufp, buflen, &sessinfo)<0) { - ok = BOOL_FALSE; - } else { + ok = BOOL_FALSE; + /* extract the session information from the buffer */ + if (buflen && + stobj_unpack_sessinfo(bufp, buflen, &sessinfo)) { stobj_convert_sessinfo(&sessp, &sessinfo); ok = BOOL_TRUE; - } } + if (!ok || !sessp) { mlog(MLOG_DEBUG | MLOG_WARNING | MLOG_MEDIA, _( "on-media session "
