--- jfsutils-1.1.15.orig/libfs/log_work.c +++ jfsutils-1.1.15/libfs/log_work.c @@ -2406,6 +2406,7 @@ int32_t xlen, xlength; int16_t nword; int8_t upd_possible = 0; + struct dinode dip_local; /* Local copy of dinode data for alignment purposes */ if (ld->length <= 0) return (0); @@ -2708,7 +2709,8 @@ */ if (ino_rem == 0) { /* inode base segment */ - dip = (struct dinode *) data; + memcpy(&dip_local, data, size_dinode); + dip = &dip_local; if (ln == 1) { /* ibase only */ if (db->db_ibase & mask_8) --- jfsutils-1.1.15.orig/debian/copyright +++ jfsutils-1.1.15/debian/copyright @@ -0,0 +1,28 @@ +This package was debianized by Christopher L Cheney on +Mon, 18 Jun 2001 20:00:00 -0500. + +It was downloaded from http://oss.software.ibm.com/developer/opensource/jfs/project/pub/ + +Upstream Authors: + +Barry Arndt +Steve Best +William Braswell +Christoph Hellwig +Dave Kleikamp +Ross A. Knepper +Jim Nance +Joe Nuspl +Hiten Pandya +Terence Rokop +Jan Van Sweevelt +Karl Rister + +Copyright: + +Copyright (C) International Business Machines Corp., 2000-2007 + +You are free to distribute this software under the terms of the +GNU General Public License. On Debian systems, the complete text +of the GNU General Public License can be found in +/usr/share/common-licenses/GPL file. --- jfsutils-1.1.15.orig/debian/jfsutils-udeb.install +++ jfsutils-1.1.15/debian/jfsutils-udeb.install @@ -0,0 +1 @@ +debian/tmp/sbin \ No newline at end of file --- jfsutils-1.1.15.orig/debian/jfsutils.manpages +++ jfsutils-1.1.15/debian/jfsutils.manpages @@ -0,0 +1,8 @@ +debian/tmp/usr/share/man/man8/fsck.jfs.8 +debian/tmp/usr/share/man/man8/jfs_debugfs.8 +debian/tmp/usr/share/man/man8/jfs_fsck.8 +debian/tmp/usr/share/man/man8/jfs_fscklog.8 +debian/tmp/usr/share/man/man8/jfs_logdump.8 +debian/tmp/usr/share/man/man8/jfs_mkfs.8 +debian/tmp/usr/share/man/man8/jfs_tune.8 +debian/tmp/usr/share/man/man8/mkfs.jfs.8 --- jfsutils-1.1.15.orig/debian/changelog +++ jfsutils-1.1.15/debian/changelog @@ -0,0 +1,183 @@ +jfsutils (1.1.15-2.1) unstable; urgency=low + + * Non-maintainer upload. + * debian/patches/missing-include.diff: Apply patch from Ubuntu to fix build + failure with eglibc 2.17. (Closes: #701433) + + -- Sebastian Ramacher Fri, 05 Jul 2013 01:39:12 +0200 + +jfsutils (1.1.15-2) unstable; urgency=low + + * Include patchsys-quilt.mk and add new patch format-security-errors to fix + FTBFS with -Werror=format-security (thanks to Loïc Minier + for the patch) + + -- Stefan Hornburg (Racke) Fri, 02 Dec 2011 11:03:10 +0100 + +jfsutils (1.1.15-1) unstable; urgency=low + + * new upstream release (Closes: #504713) + + -- Stefan Hornburg (Racke) Mon, 11 Jul 2011 09:52:47 +0200 + +jfsutils (1.1.12-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix alignment problem causing SIGBUS on sparc. Closes: #499078 + + -- Steve McIntyre <93sam@debian.org> Sun, 29 Nov 2009 19:16:16 +0000 + +jfsutils (1.1.12-2) unstable; urgency=low + + * use different linking parameter on alpha to avoid FTBFS (Closes: #490881) + + -- Stefan Hornburg (Racke) Sat, 02 Aug 2008 09:32:24 +0200 + +jfsutils (1.1.12-1) unstable; urgency=low + + * new upstream release (Closes: #445488, thanks to Amit Gurdasani + ) + * upstream homepage added to debian/control + * debian/watch file added + * added copyright holder and updated authors in debian/copyright + * bumped up Standards-Version + + -- Stefan Hornburg (Racke) Thu, 03 Jul 2008 12:56:55 +0200 + +jfsutils (1.1.11-1) unstable; urgency=medium + + * new upstream release fixing stack buffer overflow (Closes: #343638) + * keep only reference to GPL in debian/copyright + * mark udeb package as such properly and create dependencies + (Closes: #381245, thanks to Frans Pop for the patch) + + -- Stefan Hornburg (Racke) Wed, 2 Aug 2006 21:15:09 +0200 + +jfsutils (1.1.8-1) unstable; urgency=medium + + * new upstream release which fixes bug corrupting inodes (Closes: #314753) + + -- Stefan Hornburg (Racke) Tue, 21 Jun 2005 11:37:16 +0200 + +jfsutils (1.1.7-1) unstable; urgency=low + + * new upstream release (Closes: #289106) + * start synopsis with lowercase + + -- Stefan Hornburg (Racke) Fri, 7 Jan 2005 10:12:20 +0100 + +jfsutils (1.1.6-1) unstable; urgency=low + + * new upstream release + + -- Stefan Hornburg (Racke) Thu, 15 Jul 2004 17:42:07 +0200 + +jfsutils (1.1.5-1) unstable; urgency=low + + * new upstream release + + -- Stefan Hornburg (Racke) Tue, 6 Apr 2004 19:20:35 +0200 + +jfsutils (1.1.4-2) unstable; urgency=low + + * udeb package for Debian installer added (Closes: #219878, thanks to + Chris Cheney and Colin Walters + for their help) + + -- Stefan Hornburg (Racke) Wed, 28 Jan 2004 15:21:16 +0100 + +jfsutils (1.1.4-1) unstable; urgency=low + + * First upload of new maintainer. + + -- Stefan Hornburg (Racke) Sat, 15 Nov 2003 22:01:01 +0100 + +jfsutils (1.1.4-0.1) unstable; urgency=low + + * New upstream. (Closes: #219877) + * Changed Maintainer to Stefan Hornburg (Racke) . + (Closes: #217101) + + -- Christopher L Cheney Sun, 9 Nov 2003 18:00:00 -0600 + +jfsutils (1.1.3-1) unstable; urgency=low + + * New upstream. (Closes: #216328) + + -- Christopher L Cheney Wed, 22 Oct 2003 02:00:00 -0500 + +jfsutils (1.1.2-1) unstable; urgency=low + + * New upstream. (Closes: #188219) + * Upstream enabled working on regular files. (Closes: #158103) + + -- Christopher L Cheney Tue, 5 Aug 2003 12:00:00 -0500 + +jfsutils (1.1.1-1) unstable; urgency=low + + * New upstream. + + -- Christopher L Cheney Thu, 13 Mar 2003 19:00:00 -0600 + +jfsutils (1.0.23-1) unstable; urgency=low + + * New upstream. + + -- Christopher L Cheney Tue, 8 Oct 2002 23:00:00 -0500 + +jfsutils (1.0.21-0.2) unstable; urgency=low + + * NMU + * Previous NMU had typo in bug number ... arrgh. 156996 belongs to another + package and has been re-opened. (Closes: #156966) + + -- Jefferson E. Noxon Fri, 6 Sep 2002 10:52:30 -0500 + +jfsutils (1.0.21-0.1) unstable; urgency=low + + * NMU + * New upstream. (Closes: #156996) + + -- Jefferson E. Noxon Fri, 6 Sep 2002 09:50:19 -0500 + +jfsutils (1.0.20-1) unstable; urgency=low + + * New upstream. + + -- Christopher L Cheney Wed, 31 Jul 2002 09:11:41 -0500 + +jfsutils (1.0.14-1) unstable; urgency=high + + * New upstream. + * Made rules use a build directory so source directory is clean. + + -- Christopher L Cheney Sun, 10 Feb 2002 01:00:00 -0600 + +jfsutils (1.0.9-1) unstable; urgency=high + + * New upstream. + * Upstream split apart the utils and patch and changed name to jfsutils. + (Closes: #101747) + + -- Christopher L Cheney Fri, 23 Nov 2001 20:10:19 -0600 + +jfs (1.0.2-1) unstable; urgency=low + + * New upstream. (Closes: #103427, #103506) + + -- Christopher L Cheney Mon, 6 Aug 2001 09:00:00 -0500 + +jfs (1.0.0-1) unstable; urgency=critical + + * New upstream. + * Upstream fixes critical bug which requires reformatting disk. + + -- Christopher L Cheney Sat, 30 Jun 2001 21:00:00 -0500 + +jfs (0.3.5-1) unstable; urgency=low + + * Initial Release. + + -- Christopher L Cheney Mon, 18 Jun 2001 20:00:00 -0500 + + --- jfsutils-1.1.15.orig/debian/jfsutils.install +++ jfsutils-1.1.15/debian/jfsutils.install @@ -0,0 +1 @@ +debian/tmp/sbin --- jfsutils-1.1.15.orig/debian/rules +++ jfsutils-1.1.15/debian/rules @@ -0,0 +1,30 @@ +#!/usr/bin/make -f +# -*- mode: makefile; coding: utf-8 -*- +# Copyright © 2003 Jeff Bailey +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 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., 59 Temple Place, Suite 330, Boston, MA +# 02111-1307 USA. + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/utils.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk + +ifeq ($(DEB_BUILD_ARCH),alpha) + LDFLAGS += -Wl,--no-relax +endif + +DEB_CONFIGURE_USER_FLAGS := --sbindir=/sbin +DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(CURDIR)/debian/tmp --- jfsutils-1.1.15.orig/debian/compat +++ jfsutils-1.1.15/debian/compat @@ -0,0 +1 @@ +4 --- jfsutils-1.1.15.orig/debian/jfsutils.README.Debian +++ jfsutils-1.1.15/debian/jfsutils.README.Debian @@ -0,0 +1,7 @@ +jfsutils for Debian +------------------- + +JFS is included in most recent kernels or you can download the jfs +kernel patch from the website listed in the copyright file. + + -- Christopher L Cheney , Mon, 18 Jun 2001 20:00:00 -0500 --- jfsutils-1.1.15.orig/debian/watch +++ jfsutils-1.1.15/debian/watch @@ -0,0 +1,3 @@ +version=3 +http://jfs.sourceforge.net/project/pub/jfsutils-(.+)\.tar\.gz + --- jfsutils-1.1.15.orig/debian/control +++ jfsutils-1.1.15/debian/control @@ -0,0 +1,40 @@ +Source: jfsutils +Section: admin +Priority: optional +Maintainer: Stefan Hornburg (Racke) +Build-Depends: cdbs, debhelper (>= 4.1.0), uuid-dev, quilt +Standards-Version: 3.8.0 +Homepage: http://jfs.sourceforge.net/ + +Package: jfsutils +Architecture: any +Depends: ${shlibs:Depends} +Description: utilities for managing the JFS filesystem + Utilities for managing IBM's Journaled File System (JFS) under Linux. + . + IBM's journaled file system technology, currently used in IBM + enterprise servers, is designed for high-throughput server + environments, key to running intranet and other high-performance + e-business file servers. + . + The following utilities are available: + fsck.jfs - initiate replay of the JFS transaction log, and check and repair a + JFS formatted device. + logdump - dump a JFS formatted device's journal log. + logredo - "replay" a JFS formatted device's journal log. + mkfs.jfs - create a JFS formatted partition. + xchkdmp - dump the contents of a JFS fsck log file created with xchklog. + xchklog - extract a log from the JFS fsck workspace into a file. + xpeek - shell-type JFS file system editor. + +Package: jfsutils-udeb +XC-Package-Type: udeb +Architecture: any +Section: debian-installer +Depends: ${shlibs:Depends} +Description: A stripped-down version of jfsutils, for debian-installer + This package is a jfsutils package built for reduced size, so that it + can help to save space in debian-installer. + . + Don't attempt to install this package, it has no support for a couple of + features you surely want. Anyway, it should fail to install. --- jfsutils-1.1.15.orig/debian/jfsutils.docs +++ jfsutils-1.1.15/debian/jfsutils.docs @@ -0,0 +1 @@ +NEWS --- jfsutils-1.1.15.orig/debian/patches/format-security-errors.patch +++ jfsutils-1.1.15/debian/patches/format-security-errors.patch @@ -0,0 +1,37 @@ +--- a/fscklog/display.c ++++ b/fscklog/display.c +@@ -182,7 +182,7 @@ void dump_service_log() + } else { + /* the record looks ok */ + msg_txt = &log_entry[log_entry_pos]; +- printf(msg_txt); ++ printf("%s", msg_txt); + /* + * set up for the next record + */ +--- a/fscklog/fscklog.c ++++ b/fscklog/fscklog.c +@@ -252,8 +252,8 @@ int v_send_msg(int msg_num, const char *file_name, int line_number, ...) { + + sprintf(debug_detail, " [%s:%d]\n", basename(file_name), line_number); + +- printf(msg_string); +- printf(debug_detail); ++ printf("%s", msg_string); ++ printf("%s", debug_detail); + + return 0; + } +--- a/logdump/helpers.c ++++ b/logdump/helpers.c +@@ -95,8 +95,8 @@ int v_fsck_send_msg(int msg_num, const char *file_name, int line_number, ...) { + + sprintf(debug_detail, " [%s:%d]\n", file_name, line_number); + +- printf(msg_string); +- printf(debug_detail); ++ printf("%s", msg_string); ++ printf("%s", debug_detail); + + return 0; + } --- jfsutils-1.1.15.orig/debian/patches/series +++ jfsutils-1.1.15/debian/patches/series @@ -0,0 +1,2 @@ +missing-includes.diff +format-security-errors.patch --- jfsutils-1.1.15.orig/debian/patches/missing-includes.diff +++ jfsutils-1.1.15/debian/patches/missing-includes.diff @@ -0,0 +1,17 @@ +Description: Add missing include to fix FTBFS with eglibc 2.17 +Origin: vendor, http://patches.ubuntu.com/j/jfsutils/jfsutils_1.1.15-2ubuntu1.patch +Bug-Debian: http://bugs.debian.org/701433 +Last-Update: 2013-07-05 + +Index: b/fscklog/extract.c +=================================================================== +--- a/fscklog/extract.c 2006-06-05 19:31:40.000000000 +0000 ++++ b/fscklog/extract.c 2013-04-02 07:13:08.737654963 +0000 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + #include "devices.h" + #include "diskmap.h"