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.000000000 +0100 +++ /mounts/work_src_done/STABLE/jfsutils/jfsutils.changes 2011-06-20 16:51:08.000000000 +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.000000000 +0200 +++ /var/tmp/diff_new_pack.Wiqv2s/_new 2011-06-30 10:47:58.000000000 +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.000000000 +0200 +++ new/jfsutils-1.1.15/AUTHORS 2011-03-04 20:14:37.000000000 +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.000000000 +0200 +++ new/jfsutils-1.1.15/ChangeLog 2011-03-04 20:14:37.000000000 +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 + * fsck/fsckmeta.c: another 64-bit fix + +2010-06-04 Dave Kleikamp <sha...@vnet.linux.ibm.com> + * fsck/xchkdsk.c: Fix inconsistent timestamp format + +2010-06-03 Dave Kleikamp <sha...@vnet.linux.ibm.com> + * fsck/fsckpfs.c: use 64-bit value to address extent length + * fsck/fsckwsp.c: use 64-bit values for block map size + * mkfs/mkfs.c: use 64-bit values for additional structures + +2010-01-07 Dave Kleikamp <sha...@vnet.linux.ibm.com> + * libfs/log_dump.c: handle positive error value from find_log() + +2009-11-30 Dave Kleikamp <sha...@vnet.linux.ibm.com> + * mkfs/initmap.c: use 64-bit integers to handle volumes over 32 TB + * mkfs/initmap.h: likewise + +2009-07-13 Dave Kleikamp <sha...@vnet.linux.ibm.com> + * tune/jfs_tune.8: file systems CAN share an external journal + 2009-04-06 Dave Kleikamp <sha...@vnet.linux.ibm.com> * configure.in: Bumped version to 1.1.14 * NEWS: likewise 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/INSTALL new/jfsutils-1.1.15/INSTALL --- old/jfsutils-1.1.14/INSTALL 2008-12-30 18:43:47.000000000 +0100 +++ new/jfsutils-1.1.15/INSTALL 2010-10-22 00:59:47.000000000 +0200 @@ -2,10 +2,12 @@ ************************* Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007, 2008 Free Software Foundation, Inc. +2006, 2007, 2008, 2009 Free Software Foundation, Inc. - This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. + Copying and distribution of this file, with or without modification, +are permitted in any medium without royalty provided the copyright +notice and this notice are preserved. This file is offered as-is, +without warranty of any kind. Basic Installation ================== @@ -13,7 +15,11 @@ Briefly, the shell commands `./configure; make; make install' should configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for -instructions specific to this package. +instructions specific to this package. Some packages provide this +`INSTALL' file but do not implement all of the features documented +below. The lack of an optional feature in a given package is not +necessarily a bug. More recommendations for GNU packages can be found +in *note Makefile Conventions: (standards)Makefile Conventions. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses @@ -42,7 +48,7 @@ you want to change it or regenerate `configure' using a newer version of `autoconf'. -The simplest way to compile this package is: + The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type `./configure' to configure the package for your system. @@ -53,12 +59,22 @@ 2. Type `make' to compile the package. 3. Optionally, type `make check' to run any self-tests that come with - the package. + the package, generally using the just-built uninstalled binaries. 4. Type `make install' to install the programs and any data files and - documentation. + documentation. When installing into a prefix owned by root, it is + recommended that the package be configured and built as a regular + user, and only the `make install' phase executed with root + privileges. + + 5. Optionally, type `make installcheck' to repeat any self-tests, but + this time using the binaries in their final installed location. + This target does not install anything. Running this target as a + regular user, particularly if the prior `make install' required + root privileges, verifies that the installation completed + correctly. - 5. You can remove the program binaries and object files from the + 6. You can remove the program binaries and object files from the source code directory by typing `make clean'. To also remove the files that `configure' created (so you can compile the package for a different kind of computer), type `make distclean'. There is @@ -67,8 +83,15 @@ all sorts of other programs in order to regenerate files that came with the distribution. - 6. Often, you can also type `make uninstall' to remove the installed - files again. + 7. Often, you can also type `make uninstall' to remove the installed + files again. In practice, not all packages have tested that + uninstallation works correctly, even though it is required by the + GNU Coding Standards. + + 8. Some packages, particularly those that use Automake, provide `make + distcheck', which can by used by developers to test that all other + targets like `make install' and `make uninstall' work correctly. + This target is generally not run by end users. Compilers and Options ===================== @@ -93,7 +116,8 @@ own directory. To do this, you can use GNU `make'. `cd' to the directory where you want the object files and executables to go and run the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. +source code in the directory that `configure' is in and in `..'. This +is known as a "VPATH" build. With a non-GNU `make', it is safer to compile the package for one architecture at a time in the source code directory. After you have @@ -120,7 +144,8 @@ By default, `make install' installs the package's commands under `/usr/local/bin', include files under `/usr/local/include', etc. You can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX'. +`configure' the option `--prefix=PREFIX', where PREFIX must be an +absolute file name. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you @@ -131,15 +156,46 @@ In addition, if you use an unusual directory layout you can give options like `--bindir=DIR' to specify different values for particular kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. +you can set and what kinds of files go in them. In general, the +default for these options is expressed in terms of `${prefix}', so that +specifying just `--prefix' will affect all of the other directory +specifications that were not explicitly provided. + + The most portable way to affect installation locations is to pass the +correct locations to `configure'; however, many packages provide one or +both of the following shortcuts of passing variable assignments to the +`make install' command line to change installation locations without +having to reconfigure or recompile. + + The first method involves providing an override variable for each +affected directory. For example, `make install +prefix=/alternate/directory' will choose an alternate location for all +directory configuration variables that were expressed in terms of +`${prefix}'. Any directories that were specified during `configure', +but not in terms of `${prefix}', must each be overridden at install +time for the entire installation to be relocated. The approach of +makefile variable overrides for each directory variable is required by +the GNU Coding Standards, and ideally causes no recompilation. +However, some platforms have known limitations with the semantics of +shared libraries that end up requiring recompilation when using this +method, particularly noticeable in packages that use GNU Libtool. + + The second method involves providing the `DESTDIR' variable. For +example, `make install DESTDIR=/alternate/directory' will prepend +`/alternate/directory' before all installation names. The approach of +`DESTDIR' overrides is not required by the GNU Coding Standards, and +does not work on platforms that have drive letters. On the other hand, +it does better at avoiding recompilation issues, and works well even +when some directory options were not specified in terms of `${prefix}' +at `configure' time. + +Optional Features +================= If the package supports it, you can cause programs to be installed with an extra prefix or suffix on their names by giving `configure' the option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. -Optional Features -================= - Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE @@ -152,6 +208,13 @@ you can use the `configure' options `--x-includes=DIR' and `--x-libraries=DIR' to specify their locations. + Some packages offer the ability to configure how verbose the +execution of `make' will be. For these packages, running `./configure +--enable-silent-rules' sets the default to minimal output, which can be +overridden with `make V=1'; while running `./configure +--disable-silent-rules' sets the default to verbose, which can be +overridden with `make V=0'. + Particular systems ================== @@ -159,7 +222,7 @@ CC is not installed, it is recommended to use the following options in order to use an ANSI C compiler: - ./configure CC="cc -Ae" + ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" and if that doesn't work, install pre-built binaries of GCC for HP-UX. @@ -174,6 +237,16 @@ ./configure CC="cc -nodtk" + On Solaris, don't put `/usr/ucb' early in your `PATH'. This +directory contains several dysfunctional programs; working variants of +these programs are available in `/usr/bin'. So, if you need `/usr/ucb' +in your `PATH', put it _after_ `/usr/bin'. + + On Haiku, software installed for all users goes in `/boot/common', +not `/usr/local'. It is recommended to use the following options: + + ./configure --prefix=/boot/common + Specifying the System Type ========================== @@ -189,7 +262,8 @@ where SYSTEM can have one of these forms: - OS KERNEL-OS + OS + KERNEL-OS See the file `config.sub' for the possible values of each field. If `config.sub' isn't included in this package, then this package doesn't @@ -277,7 +351,7 @@ `configure' can determine that directory automatically. `--prefix=DIR' - Use DIR as the installation prefix. *Note Installation Names:: + Use DIR as the installation prefix. *note Installation Names:: for more details, including other options available for fine-tuning the installation locations. 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/NEWS new/jfsutils-1.1.15/NEWS --- old/jfsutils-1.1.14/NEWS 2009-04-06 21:00:42.000000000 +0200 +++ new/jfsutils-1.1.15/NEWS 2011-03-04 20:14:37.000000000 +0100 @@ -1,5 +1,10 @@ NEWS - list of user-visible changes between releases of jfsutils +New in 1.1.15 - 2011-03-04 +* Several fixes for large filesystems where 64-bit variables are needed +* Fix incorrect size check on directories +* Make the timestamp format consistent + New in 1.1.14 - 2009-04-06 * Fix journal replay to handle records that span 3 pages * Increase the maximum inline journal size from 32 MB to 128 MB 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/README new/jfsutils-1.1.15/README --- old/jfsutils-1.1.14/README 2009-04-06 21:00:42.000000000 +0200 +++ new/jfsutils-1.1.15/README 2011-03-04 20:14:37.000000000 +0100 @@ -1,6 +1,6 @@ IBM's Journaled File System (JFS) for Linux JFS Utilities -Version 1.1.14, April 6, 2008 +Version 1.1.15, March 4, 2011 The NEWS file contains a brief overview of user-visible changes to the utilities. @@ -77,7 +77,7 @@ http://jfs.sourceforge.net/ -Please send bugs, comments, cards and letters to sha...@linux.vnet.ibm.com. +Please send bugs, comments, cards and letters to sha...@kernel.org The JFS mailing lists can be subscribed to by using any of the links containing "subscribe" along the left side of our web page at 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/config.h.in new/jfsutils-1.1.15/config.h.in --- old/jfsutils-1.1.14/config.h.in 2009-04-06 21:03:44.000000000 +0200 +++ new/jfsutils-1.1.15/config.h.in 2011-03-04 20:19:38.000000000 +0100 @@ -54,7 +54,7 @@ /* Define to 1 if you have the `strtoul' function. */ #undef HAVE_STRTOUL -/* Define to 1 if `st_rdev' is member of `struct stat'. */ +/* Define to 1 if `st_rdev' is a member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_RDEV /* Define to 1 if your `struct stat' has `st_rdev'. Deprecated, use @@ -106,6 +106,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION 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/configure.in new/jfsutils-1.1.15/configure.in --- old/jfsutils-1.1.14/configure.in 2009-04-06 21:00:42.000000000 +0200 +++ new/jfsutils-1.1.15/configure.in 2011-03-04 20:14:37.000000000 +0100 @@ -2,7 +2,7 @@ AC_INIT(libfs/super.c) dnl Package name and version -AM_INIT_AUTOMAKE(jfsutils, 1.1.14) +AM_INIT_AUTOMAKE(jfsutils, 1.1.15) AM_CONFIG_HEADER(config.h) dnl Don't include maintainer make-rules by default 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/fsck/fsckdtre.c new/jfsutils-1.1.15/fsck/fsckdtre.c --- old/jfsutils-1.1.14/fsck/fsckdtre.c 2006-06-05 21:31:39.000000000 +0200 +++ new/jfsutils-1.1.15/fsck/fsckdtre.c 2011-02-25 16:38:33.000000000 +0100 @@ -2362,8 +2362,9 @@ adjusted_length; agg_recptr->this_inode.all_blks += adjusted_length; - agg_recptr->this_inode.data_size += - adjusted_length * sb_ptr->s_bsize; + if (!(sb_ptr->s_flag & JFS_DIR_INDEX)) + agg_recptr->this_inode.data_size += + adjusted_length * sb_ptr->s_bsize; } else if (desired_action == FSCK_UNRECORD) { agg_recptr->blocks_this_fset -= adjusted_length; @@ -3084,7 +3085,8 @@ * described by the LAST level of * internal nodes. */ - agg_recptr->this_inode.data_size = 0; + if (!(sb_ptr->s_flag & JFS_DIR_INDEX)) + agg_recptr->this_inode.data_size = 0; } /* This is the size of the leaf nodes, so we only want ... */ 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/fsck/fsckmeta.c new/jfsutils-1.1.15/fsck/fsckmeta.c --- old/jfsutils-1.1.14/fsck/fsckmeta.c 2006-06-05 21:31:40.000000000 +0200 +++ new/jfsutils-1.1.15/fsck/fsckmeta.c 2011-02-25 16:26:49.000000000 +0100 @@ -2056,7 +2056,8 @@ 50; /* size in aggregate blocks */ fsck_blkmap_size_blks = - (fsck_blkmap_size_pages << L2PSIZE) / + ((int64_t)fsck_blkmap_size_pages << + L2PSIZE) / sb_ptr->s_bsize; /* * aggregate block offset of the fsck 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/fsck/fsckpfs.c new/jfsutils-1.1.15/fsck/fsckpfs.c --- old/jfsutils-1.1.14/fsck/fsckpfs.c 2007-08-23 06:01:40.000000000 +0200 +++ new/jfsutils-1.1.15/fsck/fsckpfs.c 2010-06-04 00:42:12.000000000 +0200 @@ -763,8 +763,8 @@ xad_t *xad_ptr; int8_t offset_found; int which_it; - uint32_t bytes_read, ext_bytes_left; - int64_t ext_bytes, offset_into_extent; + uint32_t bytes_read; + int64_t ext_bytes, ext_bytes_left, offset_into_extent; struct dmap *dmap_t_ptr; dmp_logical_fsblk_offset = @@ -844,7 +844,7 @@ * beyond the end of the extent, and if so, we need to * ignore the tag-along data. */ - ext_bytes = lengthXAD(xad_ptr) * sb_ptr->s_bsize; + ext_bytes = (int64_t)lengthXAD(xad_ptr) * sb_ptr->s_bsize; offset_into_extent = dmp_logical_byte_offset - ext_logical_byte_offset; ext_bytes_left = ext_bytes - offset_into_extent; 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/fsck/fsckwsp.c new/jfsutils-1.1.15/fsck/fsckwsp.c --- old/jfsutils-1.1.14/fsck/fsckwsp.c 2006-06-05 21:31:40.000000000 +0200 +++ new/jfsutils-1.1.15/fsck/fsckwsp.c 2010-06-04 00:42:12.000000000 +0200 @@ -262,7 +262,7 @@ { int awe_rc = FSCK_OK; struct wsp_ext_rec *new_fer; - int32_t extent_length = MEMSEGSIZE; + size_t extent_length = MEMSEGSIZE; char *extent_addr = NULL; int8_t from_high_memory = 0; @@ -1349,9 +1349,9 @@ int establish_wsp_block_map() { int ewbm_rc = FSCK_OK; - int32_t blkmap_size_bytes; - int32_t blkmap_size_in_pages; - int32_t idx; + int64_t blkmap_size_bytes; + int64_t blkmap_size_in_pages; + int64_t idx; int64_t this_device_offset; int I_am_logredo = 0; 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/fsck/xchkdsk.c new/jfsutils-1.1.15/fsck/xchkdsk.c --- old/jfsutils-1.1.14/fsck/xchkdsk.c 2007-08-23 06:01:40.000000000 +0200 +++ new/jfsutils-1.1.15/fsck/xchkdsk.c 2010-06-04 14:58:43.000000000 +0200 @@ -1445,7 +1445,7 @@ */ Current_Time = time(NULL); fsck_DateTime = localtime(&Current_Time); - sprintf(message_parm, "%d/%d/%d %d.%d.%d", + sprintf(message_parm, "%d/%d/%d %d:%02d:%02d", fsck_DateTime->tm_mon + 1, fsck_DateTime->tm_mday, (fsck_DateTime->tm_year + 1900), fsck_DateTime->tm_hour, fsck_DateTime->tm_min, fsck_DateTime->tm_sec); 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/include/jfs_version.h new/jfsutils-1.1.15/include/jfs_version.h --- old/jfsutils-1.1.14/include/jfs_version.h 2009-04-06 21:03:56.000000000 +0200 +++ new/jfsutils-1.1.15/include/jfs_version.h 2011-03-04 20:20:32.000000000 +0100 @@ -1 +1 @@ -#define JFSUTILS_DATE "06-Apr-2009" +#define JFSUTILS_DATE "04-Mar-2011" 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/jfsutils.spec new/jfsutils-1.1.15/jfsutils.spec --- old/jfsutils-1.1.14/jfsutils.spec 2009-04-06 21:03:56.000000000 +0200 +++ new/jfsutils-1.1.15/jfsutils.spec 2011-03-04 20:20:32.000000000 +0100 @@ -1,12 +1,12 @@ Name : jfsutils -Version : 1.1.14 +Version : 1.1.15 Release : 1 Group : System/Kernel Summary : IBM JFS utility programs Copyright : GPL -Packager : JFS/Linux team <sha...@linux.vnet.ibm.com> +Packager : JFS/Linux team <sha...@kernel.org> URL : http://jfs.sourceforge.net/ Buildroot : %{_tmppath}/%{name}-%{version} 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/jfsutils.spec.in new/jfsutils-1.1.15/jfsutils.spec.in --- old/jfsutils-1.1.14/jfsutils.spec.in 2009-04-06 21:00:42.000000000 +0200 +++ new/jfsutils-1.1.15/jfsutils.spec.in 2011-03-04 20:14:37.000000000 +0100 @@ -6,7 +6,7 @@ Summary : IBM JFS utility programs Copyright : GPL -Packager : JFS/Linux team <sha...@linux.vnet.ibm.com> +Packager : JFS/Linux team <sha...@kernel.org> URL : http://jfs.sourceforge.net/ Buildroot : %{_tmppath}/%{name}-%{version} 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/libfs/log_dump.c new/jfsutils-1.1.15/libfs/log_dump.c --- old/jfsutils-1.1.14/libfs/log_dump.c 2006-06-05 21:31:41.000000000 +0200 +++ new/jfsutils-1.1.15/libfs/log_dump.c 2010-01-07 14:30:31.000000000 +0100 @@ -220,7 +220,7 @@ LogOpenMode = O_RDONLY; rc = findLog(fp, &in_use); - if (rc < 0) { + if (rc != 0) { printf("JFS_LOGDUMP:Error occurred when open/read device\n"); fprintf(outfp, "??????????????????????????????????????????????????????\n"); fprintf(outfp, "JFS_LOGDUMP:Error occurred when open/read device\n"); 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/missing new/jfsutils-1.1.15/missing --- old/jfsutils-1.1.14/missing 2008-12-30 18:43:47.000000000 +0100 +++ new/jfsutils-1.1.15/missing 2010-10-22 00:59:47.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to <bug-autom...@gnu.org>." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: 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/mkfs/initmap.c new/jfsutils-1.1.15/mkfs/initmap.c --- old/jfsutils-1.1.14/mkfs/initmap.c 2006-05-24 16:13:33.000000000 +0200 +++ new/jfsutils-1.1.15/mkfs/initmap.c 2009-11-30 14:31:02.000000000 +0100 @@ -48,7 +48,7 @@ static unsigned sz_block_map_array; static unsigned cur_dmap_index; static struct dbmap *control_page; -static unsigned last_allocated; +static int64_t last_allocated; static struct dmap *empty_page; struct xtree_buf { @@ -232,7 +232,7 @@ * this dmapctl based upon the number of blocks covered by this dmapctl. */ l2cblks = L2BPERDMAP + level * L2LPERCTL; - cblks = (1 << l2cblks); + cblks = (1LL << l2cblks); nchild = nblocks >> l2cblks; nchild = (nblocks & (cblks - 1)) ? nchild + 1 : nchild; next_page = *start + PSIZE; @@ -398,7 +398,8 @@ */ static void initmap(int64_t nblocks, int *ag_size, int aggr_block_size) { - int index, nb, l2nl, n; + int index, l2nl, n; + int64_t nb; /* * Initialize base information @@ -547,7 +548,7 @@ * * RETURNS: NONE */ -int markit(int block, unsigned flag) +int markit(int64_t block, unsigned flag) { int page, rem, word, bit; struct dmap *p1; 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/mkfs/initmap.h new/jfsutils-1.1.15/mkfs/initmap.h --- old/jfsutils-1.1.14/mkfs/initmap.h 2005-11-22 21:43:55.000000000 +0100 +++ new/jfsutils-1.1.15/mkfs/initmap.h 2009-11-30 14:31:02.000000000 +0100 @@ -23,7 +23,7 @@ #define BADBLOCK 0x4 int calc_map_size(int64_t, struct dinode *, int, int *, unsigned); -int markit(int, unsigned); +int markit(int64_t, unsigned); int record_LVM_BadBlks( int, int, int, struct dinode *, int64_t ); int verify_last_blocks( FILE *, int, struct dinode * ); int write_block_map(FILE *, int64_t, int); 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/mkfs/mkfs.c new/jfsutils-1.1.15/mkfs/mkfs.c --- old/jfsutils-1.1.14/mkfs/mkfs.c 2009-01-09 17:00:22.000000000 +0100 +++ new/jfsutils-1.1.15/mkfs/mkfs.c 2010-06-04 00:42:12.000000000 +0200 @@ -216,7 +216,7 @@ int64_t secondary_ait_address, secondary_aimap_address; int64_t secondary_ait_end; int64_t fsck_wspace_address, num_bits; - int fsck_wspace_length, fsck_svclog_length, npages; + int64_t fsck_wspace_length, fsck_svclog_length, npages; unsigned inostamp; struct dinode fileset_inode; 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/tune/jfs_tune.8 new/jfsutils-1.1.15/tune/jfs_tune.8 --- old/jfsutils-1.1.14/tune/jfs_tune.8 2005-11-22 21:43:55.000000000 +0100 +++ new/jfsutils-1.1.15/tune/jfs_tune.8 2009-07-13 22:18:36.000000000 +0200 @@ -26,17 +26,13 @@ .TP .BI "\-J device="external-journal -.B Only supported on JFS versions (1.0.18 or later) that support external journal. Attach the JFS external journal located on .I external-journal to the JFS file system on .IR device . .IP -Currently, you may only attach a single JFS file system device to a single -JFS external journal (i.e. each JFS file system using an external journal -must have a unique external journal). -.IP -The external journal must already have been created using the command +The external journal must already have been created using the command. +More than one file system may share the same external journal. .IP .B mkfs.jfs -J journal_dev .I external-journal ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org