commit jfsutils for openSUSE:Factory
Hello community, here is the log from the commit of package jfsutils for openSUSE:Factory checked in at 2020-05-07 15:05:01 Comparing /work/SRC/openSUSE:Factory/jfsutils (Old) and /work/SRC/openSUSE:Factory/.jfsutils.new.2738 (New) Package is "jfsutils" Thu May 7 15:05:01 2020 rev:24 rq:70 version:1.1.15 Changes: --- /work/SRC/openSUSE:Factory/jfsutils/jfsutils.changes2018-08-07 09:40:35.657050453 +0200 +++ /work/SRC/openSUSE:Factory/.jfsutils.new.2738/jfsutils.changes 2020-05-07 15:05:24.611693264 +0200 @@ -1,0 +2,11 @@ +Wed Apr 29 13:46:30 UTC 2020 - Martin Liška + +- Added patch: libfs-Fixing-issue-with-variable-name-collision.patch +- Remove not needed -fcommon. + +--- +Mon Apr 27 19:21:25 UTC 2020 - Martin Liška + +- Enable -fcommon in order to fix boo#1160272. + +--- New: libfs-Fixing-issue-with-variable-name-collision.patch Other differences: -- ++ jfsutils.spec ++ --- /var/tmp/diff_new_pack.PcTjm2/_old 2020-05-07 15:05:26.407697237 +0200 +++ /var/tmp/diff_new_pack.PcTjm2/_new 2020-05-07 15:05:26.411697246 +0200 @@ -1,7 +1,7 @@ # # spec file for package jfsutils # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -23,7 +23,7 @@ Summary:IBM JFS Utility Programs License:GPL-2.0-or-later Group: System/Filesystems -Url:http://jfs.sf.net +URL:http://jfs.sf.net Source0: http://jfs.sourceforge.net/project/pub/%{name}-%{version}.tar.gz Source1:jfs.pdf Source2:jfslayout.pdf @@ -32,6 +32,7 @@ Source5:jfs.txt Patch1: jfs-headers.patch Patch2: sysmacros.patch +Patch3: libfs-Fixing-issue-with-variable-name-collision.patch BuildRequires: e2fsprogs-devel Provides: jfsprogs = %{version} Obsoletes: jfsprogs < %{version} @@ -56,6 +57,7 @@ %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build sed -i -e 's@^\./"@\." @' fsck/jfs_fsck.8 \ ++ libfs-Fixing-issue-with-variable-name-collision.patch ++ >From 1c7c01420d592e0e87e532ac688e61d5a2fafab2 Mon Sep 17 00:00:00 2001 From: Larry Dewey Date: Thu, 9 Jan 2020 14:36:45 -0700 Subject: [PATCH] libfs: Fixing issue with variable name collision Due to the structure of the old code, variable name collisions were occuring when building with the `-fno-common` flag. These changes fix the problem. [LD: BSC#1160272] Signed-off-by: Larry Dewey --- fscklog/display.c | 4 +- libfs/logredo.c | 127 +++--- 2 files changed, 66 insertions(+), 65 deletions(-) diff --git a/fscklog/display.c b/fscklog/display.c index a33d44f..ecb48ca 100644 --- a/fscklog/display.c +++ b/fscklog/display.c @@ -54,7 +54,7 @@ FILE *infp; * output: fsck extracted service log I/O buffer * */ -char xchklog_buffer[XCHKLOG_BUFSIZE]; +char display_xchklog_buffer[XCHKLOG_BUFSIZE]; /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + * @@ -98,7 +98,7 @@ int xchkdmp(struct fscklog_record *local_recptr) * Initialize the fscklog control block */ local_recptr->infile_buf_length = XCHKLOG_BUFSIZE; - local_recptr->infile_buf_ptr = xchklog_buffer; + local_recptr->infile_buf_ptr = display_xchklog_buffer; local_recptr->highest_msg_num = fsck_highest_msgid_defined + JFSCHKLOG_FIRSTMSGNUM; diff --git a/libfs/logredo.c b/libfs/logredo.c index eb897e8..c9934db 100644 --- a/libfs/logredo.c +++ b/libfs/logredo.c @@ -87,9 +87,9 @@ int32_t bmap_stg_bytes = 0; *S T U F FF O RT H EL O G * */ -struct logsuper logsup;/* log super block */ -int32_t numdoblk; /* number of do blocks used */ -int32_t numnodofile; /* number of nodo file blocks used */ +struct logsuper global_logsup; /* log super block */ +int32_t logredo_numdoblk; /* number of do blocks used */ +int32_t logredo_numnodofile; /* number of nodo file blocks used */ int32_t numExtDtPg = 0;/* number of extended dtpage blocks used */ /* @@ -129,7 +129,7 @@ int32_t use_2ndary_agg_superblock; */
commit jfsutils for openSUSE:Factory
Hello community, here is the log from the commit of package jfsutils for openSUSE:Factory checked in at 2018-08-07 09:40:34 Comparing /work/SRC/openSUSE:Factory/jfsutils (Old) and /work/SRC/openSUSE:Factory/.jfsutils.new (New) Package is "jfsutils" Tue Aug 7 09:40:34 2018 rev:23 rq:626999 version:1.1.15 Changes: --- /work/SRC/openSUSE:Factory/jfsutils/jfsutils.changes2015-03-29 20:15:49.0 +0200 +++ /work/SRC/openSUSE:Factory/.jfsutils.new/jfsutils.changes 2018-08-07 09:40:35.657050453 +0200 @@ -1,0 +2,5 @@ +Wed Aug 1 13:25:53 UTC 2018 - sch...@suse.de + +- sysmacros.patch: include for major + +--- New: sysmacros.patch Other differences: -- ++ jfsutils.spec ++ --- /var/tmp/diff_new_pack.2UiLhb/_old 2018-08-07 09:40:36.189051380 +0200 +++ /var/tmp/diff_new_pack.2UiLhb/_new 2018-08-07 09:40:36.193051387 +0200 @@ -1,7 +1,7 @@ # # spec file for package jfsutils # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,7 @@ Version:1.1.15 Release:0 Summary:IBM JFS Utility Programs -License:GPL-2.0+ +License:GPL-2.0-or-later Group: System/Filesystems Url:http://jfs.sf.net Source0: http://jfs.sourceforge.net/project/pub/%{name}-%{version}.tar.gz @@ -31,6 +31,7 @@ Source4:jfsroot.html Source5:jfs.txt Patch1: jfs-headers.patch +Patch2: sysmacros.patch BuildRequires: e2fsprogs-devel Provides: jfsprogs = %{version} Obsoletes: jfsprogs < %{version} @@ -54,6 +55,7 @@ %prep %setup -q %patch1 -p1 +%patch2 -p1 %build sed -i -e 's@^\./"@\." @' fsck/jfs_fsck.8 \ ++ sysmacros.patch ++ Index: jfsutils-1.1.15/libfs/devices.c === --- jfsutils-1.1.15.orig/libfs/devices.c +++ jfsutils-1.1.15/libfs/devices.c @@ -40,6 +40,7 @@ #include #include #include +#include #if defined(__DragonFly__) #include #include
commit jfsutils for openSUSE:Factory
Hello community, here is the log from the commit of package jfsutils for openSUSE:Factory checked in at 2015-03-29 20:15:47 Comparing /work/SRC/openSUSE:Factory/jfsutils (Old) and /work/SRC/openSUSE:Factory/.jfsutils.new (New) Package is jfsutils Changes: --- /work/SRC/openSUSE:Factory/jfsutils/jfsutils.changes2012-11-21 17:01:49.0 +0100 +++ /work/SRC/openSUSE:Factory/.jfsutils.new/jfsutils.changes 2015-03-29 20:15:49.0 +0200 @@ -1,0 +2,6 @@ +Wed Mar 18 12:18:59 UTC 2015 - mplus...@suse.com + +- Cleanup spec file with spec-cleaner +- Use url for source + +--- Old: jfsutils-1.1.15.tar.bz2 New: jfsutils-1.1.15.tar.gz Other differences: -- ++ jfsutils.spec ++ --- /var/tmp/diff_new_pack.kDJ9dx/_old 2015-03-29 20:15:50.0 +0200 +++ /var/tmp/diff_new_pack.kDJ9dx/_new 2015-03-29 20:15:50.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package jfsutils # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,28 +16,28 @@ # +%define _sbindir /sbin Name: jfsutils -BuildRequires: e2fsprogs-devel +Version:1.1.15 +Release:0 Summary:IBM JFS Utility Programs License:GPL-2.0+ Group: System/Filesystems -Version:1.1.15 -Release:0 -BuildRoot: %{_tmppath}/%{name}-%{version}-build Url:http://jfs.sf.net -Source: %name-%version.tar.bz2 +Source0: http://jfs.sourceforge.net/project/pub/%{name}-%{version}.tar.gz Source1:jfs.pdf Source2:jfslayout.pdf Source3:jfslog.pdf Source4:jfsroot.html Source5:jfs.txt Patch1: jfs-headers.patch -Provides: jfsprogs +BuildRequires: e2fsprogs-devel +Provides: jfsprogs = %{version} +Obsoletes: jfsprogs %{version} +BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} 1010 Supplements:filesystem(jfs) %endif -Obsoletes: jfsprogs -%define sbindir /sbin %description This package contains utilities for managing IBM's Journaled File @@ -63,23 +63,22 @@ tune/jfs_tune.8 \ xpeek/jfs_debugfs.8 tail +35 mkfs/jfs_mkfs.8 | head -10 -export CFLAGS=$RPM_OPT_FLAGS -fno-strict-aliasing -%configure --sbindir=%sbindir +%configure make %{?_smp_mflags} %install mkdir ./jfsdocs -install -m 644 %SOURCE1 ./jfsdocs -install -m 644 %SOURCE2 ./jfsdocs -install -m 644 %SOURCE3 ./jfsdocs -install -m 644 %SOURCE4 ./jfsdocs -install -m 644 %SOURCE5 ./jfsdocs -make install DESTDIR=$RPM_BUILD_ROOT +install -m 644 %{SOURCE1} ./jfsdocs +install -m 644 %{SOURCE2} ./jfsdocs +install -m 644 %{SOURCE3} ./jfsdocs +install -m 644 %{SOURCE4} ./jfsdocs +install -m 644 %{SOURCE5} ./jfsdocs +make DESTDIR=%{buildroot} install %{?_smp_mflags} %files %defattr(-,root,root) %doc AUTHORS COPYING NEWS ChangeLog jfsdocs/* -%_mandir/man8/* -%sbindir/* +%{_mandir}/man8/* +%{_sbindir}/* %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit jfsutils for openSUSE:Factory
Hello community, here is the log from the commit of package jfsutils for openSUSE:Factory checked in at 2012-11-21 17:01:48 Comparing /work/SRC/openSUSE:Factory/jfsutils (Old) and /work/SRC/openSUSE:Factory/.jfsutils.new (New) Package is jfsutils, Maintainer is mszer...@novell.com Changes: --- /work/SRC/openSUSE:Factory/jfsutils/jfsutils.changes2012-06-05 15:31:56.0 +0200 +++ /work/SRC/openSUSE:Factory/.jfsutils.new/jfsutils.changes 2012-11-21 17:01:49.0 +0100 @@ -1,0 +2,5 @@ +Fri Nov 16 19:22:02 UTC 2012 - a...@suse.de + +- Fix missing include (patch jfs-headers.patch). + +--- New: jfs-headers.patch Other differences: -- ++ jfsutils.spec ++ --- /var/tmp/diff_new_pack.sXbqhe/_old 2012-11-21 17:01:51.0 +0100 +++ /var/tmp/diff_new_pack.sXbqhe/_new 2012-11-21 17:01:51.0 +0100 @@ -31,6 +31,7 @@ Source3:jfslog.pdf Source4:jfsroot.html Source5:jfs.txt +Patch1: jfs-headers.patch Provides: jfsprogs %if 0%{?suse_version} 1010 Supplements:filesystem(jfs) @@ -52,6 +53,7 @@ %prep %setup -q +%patch1 -p1 %build sed -i -e 's@^\./@\. @' fsck/jfs_fsck.8 \ ++ jfs-headers.patch ++ Index: jfsutils-1.1.15/libfs/devices.h === --- jfsutils-1.1.15.orig/libfs/devices.h +++ jfsutils-1.1.15/libfs/devices.h @@ -42,6 +42,7 @@ struct stat; +#include stdint.h int ujfs_get_dev_size(FILE *, int64_t * size); int ujfs_rw_diskblocks(FILE *, int64_t, int32_t, void *, int32_t); int ujfs_flush_dev(FILE *); -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit jfsutils for openSUSE:Factory
Hello community, here is the log from the commit of package jfsutils for openSUSE:Factory checked in at 2012-06-05 15:31:55 Comparing /work/SRC/openSUSE:Factory/jfsutils (Old) and /work/SRC/openSUSE:Factory/.jfsutils.new (New) Package is jfsutils, Maintainer is mszer...@suse.com Changes: --- /work/SRC/openSUSE:Factory/jfsutils/jfsutils.changes2011-09-23 02:04:15.0 +0200 +++ /work/SRC/openSUSE:Factory/.jfsutils.new/jfsutils.changes 2012-06-05 15:31:56.0 +0200 @@ -1,0 +2,6 @@ +Sat May 26 12:41:22 UTC 2012 - jeng...@inai.de + +- Remove redundant tags/sections from specfile +- Parallel build with %_smp_mflags + +--- Other differences: -- ++ jfsutils.spec ++ --- /var/tmp/diff_new_pack.tuDdoU/_old 2012-06-05 15:31:57.0 +0200 +++ /var/tmp/diff_new_pack.tuDdoU/_new 2012-06-05 15:31:57.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package jfsutils # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,17 +15,15 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: jfsutils BuildRequires: e2fsprogs-devel Summary:IBM JFS Utility Programs -Version:1.1.15 -Release:1 License:GPL-2.0+ -BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/Filesystems +Version:1.1.15 +Release:0 +BuildRoot: %{_tmppath}/%{name}-%{version}-build Url:http://jfs.sf.net Source: %name-%version.tar.bz2 Source1:jfs.pdf @@ -52,14 +50,6 @@ from the JFS fsck workspace into a file o xpeek--shell-type JFS file system editor - - -Authors: - -Steve Best sb...@us.ibm.com -Dave Kleikamp sha...@us.ibm.com -Barry Arndt bar...@us.ibm.com - %prep %setup -q @@ -72,9 +62,8 @@ xpeek/jfs_debugfs.8 tail +35 mkfs/jfs_mkfs.8 | head -10 export CFLAGS=$RPM_OPT_FLAGS -fno-strict-aliasing -./configure --mandir=%_mandir \ ---sbindir=%sbindir -make +%configure --sbindir=%sbindir +make %{?_smp_mflags} %install mkdir ./jfsdocs @@ -85,9 +74,6 @@ install -m 644 %SOURCE5 ./jfsdocs make install DESTDIR=$RPM_BUILD_ROOT -%clean -rm -rf $RPM_BUILD_ROOT; - %files %defattr(-,root,root) %doc AUTHORS COPYING NEWS ChangeLog jfsdocs/* -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit jfsutils for openSUSE:Factory
Hello community, here is the log from the commit of package jfsutils for openSUSE:Factory checked in at Thu Jun 30 10:52:36 CEST 2011. --- jfsutils/jfsutils.changes 2009-11-28 18:19:36.0 +0100 +++ /mounts/work_src_done/STABLE/jfsutils/jfsutils.changes 2011-06-20 16:51:08.0 +0200 @@ -1,0 +2,9 @@ +Sun Jun 19 10:34:30 UTC 2011 - p...@opensuse.org + +- update to version 1.1.15 + * Several fixes for large filesystems where 64-bit variables are needed + * Fix incorrect size check on directories + * Make the timestamp format consistent +- spec: add sed-script to fix warnings wrt formatting of man-pages + +--- @@ -156,5 +165,5 @@ - � fix undefined reference to errno - � allow jfs_mkfs to run on regular file - � fix for-loop going past last element of vopen array - � sanity checking on variable this_ag - � s_label displayed incorrectly when 16 chars long + o fix undefined reference to errno + o allow jfs_mkfs to run on regular file + o fix for-loop going past last element of vopen array + o sanity checking on variable this_ag + o s_label displayed incorrectly when 16 chars long @@ -166,2 +175,2 @@ - � fix segmentation fault in mkfs.jfs when given bad block device - � fix jfs_debugfs to display directory index with directory entries + o fix segmentation fault in mkfs.jfs when given bad block device + o fix jfs_debugfs to display directory index with directory entries calling whatdependson for head-i586 Old: jfsutils-1.1.14.tar.bz2 New: jfsutils-1.1.15.tar.bz2 Other differences: -- ++ jfsutils.spec ++ --- /var/tmp/diff_new_pack.Wiqv2s/_old 2011-06-30 10:47:58.0 +0200 +++ /var/tmp/diff_new_pack.Wiqv2s/_new 2011-06-30 10:47:58.0 +0200 @@ -1,7 +1,7 @@ # -# spec file for package jfsutils (Version 1.1.14) +# spec file for package jfsutils # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,7 @@ Name: jfsutils BuildRequires: e2fsprogs-devel Summary:IBM JFS Utility Programs -Version:1.1.14 +Version:1.1.15 Release:1 License:GPLv2+ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -34,7 +34,9 @@ Source4:jfsroot.html Source5:jfs.txt Provides: jfsprogs +%if 0%{?suse_version} 1010 Supplements:filesystem(jfs) +%endif Obsoletes: jfsprogs %define sbindir /sbin @@ -62,6 +64,13 @@ %setup -q %build +sed -i -e 's@^\./@\. @' fsck/jfs_fsck.8 \ +fscklog/jfs_fscklog.8 \ +logdump/jfs_logdump.8 \ +mkfs/jfs_mkfs.8 \ +tune/jfs_tune.8 \ +xpeek/jfs_debugfs.8 +tail +35 mkfs/jfs_mkfs.8 | head -10 export CFLAGS=$RPM_OPT_FLAGS -fno-strict-aliasing ./configure --mandir=%_mandir \ --sbindir=%sbindir ++ jfsutils-1.1.14.tar.bz2 - jfsutils-1.1.15.tar.bz2 ++ 11604 lines of diff (skipped) retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/jfsutils-1.1.14/AUTHORS new/jfsutils-1.1.15/AUTHORS --- old/jfsutils-1.1.14/AUTHORS 2005-10-04 04:42:58.0 +0200 +++ new/jfsutils-1.1.15/AUTHORS 2011-03-04 20:14:37.0 +0100 @@ -2,7 +2,7 @@ Steve Best sb...@us.ibm.com William Braswell wlver...@nac.net Christoph Hellwig h...@infradead.org -Dave Kleikamp sha...@austin.ibm.com +Dave Kleikamp sha...@kernel.org Ross A. Knepper r...@nightmoose.net Jim Nance jlna...@intrex.net Joe Nuspl nu...@polyserve.com diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/jfsutils-1.1.14/ChangeLog new/jfsutils-1.1.15/ChangeLog --- old/jfsutils-1.1.14/ChangeLog 2009-04-06 21:00:42.0 +0200 +++ new/jfsutils-1.1.15/ChangeLog 2011-03-04 20:14:37.0 +0100 @@ -1,3 +1,32 @@ +2011-03-04 Dave Kleikamp sha...@vnet.linux.ibm.com + * configure.in: Bumped version to 1.1.15 + * NEWS: likewise + * README: likewise + * AUTHORS: update email address + * jfsutils.spec.in: likewise + +2011-02-25 Dave Kleikamp sha...@vnet.linux.ibm.com + * fsck/fsckdtre.c: directory size reflects size of directory index + *