--- reiser4progs-1.0.7.orig/debian/copyright +++ reiser4progs-1.0.7/debian/copyright @@ -0,0 +1,62 @@ +This package was debianized by Domenico Andreoli on +Sat, 20 Dec 2003 17:35:28 +0100. + +It was downloaded from ftp://ftp.kernel.org/pub/linux/utils/fs/reiser4/reiser4progs/ + +Upstream Authors: Hans Reiser + Yury Umanets + Vitaly Fertman + +Copyright: Copyright (C) 2001-2005 by Hans Reiser + +License: + Reiser4 is hereby licensed under the GNU General + Public License version 2. + + Source code files that contain the phrase "licensing governed by + COPYING" are "governed files" throughout this file. Governed + files are licensed under the GPL. The portions of them owned by Hans + Reiser, or authorized to be licensed by him, have been in the past, + and likely will be in the future, licensed to other parties under + other licenses. If you add your code to governed files, and don't + want it to be owned by Hans Reiser, put your copyright label on that + code so the poor blight and his customers can keep things straight. + All portions of governed files not labeled otherwise are owned by Hans + Reiser, and by adding your code to it, widely distributing it to + others or sending us a patch, and leaving the sentence in stating that + licensing is governed by the statement in this file, you accept this. + It will be a kindness if you identify whether Hans Reiser is allowed + to license code labeled as owned by you on your behalf other than + under the GPL, because he wants to know if it is okay to do so and put + a check in the mail to you (for non-trivial improvements) when he + makes his next sale. He makes no guarantees as to the amount if any, + though he feels motivated to motivate contributors, and you can surely + discuss this with him before or after contributing. You have the + right to decline to allow him to license your code contribution other + than under the GPL. + + Further licensing options are available for commercial and/or other + interests directly from Hans Reiser: reiser@namesys.com. If you interpret + the GPL as not allowing those additional licensing options, you read + it wrongly, and Richard Stallman agrees with me, when carefully read + you can see that those restrictions on additional terms do not apply + to the owner of the copyright, and my interpretation of this shall + govern for this license. + + Finally, nothing in this license shall be interpreted to allow you to + fail to fairly credit me, or to remove my credits such as by creating + a front end that hides my credits from the user or renaming mkreiser4 + to mkyourcompanyfs or even just make_filesystem, without my + permission, unless you are an end user not redistributing to others. + If you have doubts about how to properly do that, or about what is + fair, ask. (Last I spoke with him Richard was contemplating how best + to address the fair crediting issue in the next GPL version.) + + Also, a clustering file system built to work on top of this file + system shall be considered a derivative work for the purposes of + interpreting the GPL license granted herein. Plugins are also to be + considered derivative works. Share code or pay money, we give you the + choice. + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL-2'. --- reiser4progs-1.0.7.orig/debian/testLibreiser4.c +++ reiser4progs-1.0.7/debian/testLibreiser4.c @@ -0,0 +1,12 @@ +#include +#include "../include/reiser4/libreiser4.h" + +int main(int argc, char **argv){ + + const char *lib_ver; + lib_ver = (const char *)libreiser4_version(); + printf("%s\n", lib_ver); + return 0; + +} + --- reiser4progs-1.0.7.orig/debian/changelog +++ reiser4progs-1.0.7/debian/changelog @@ -0,0 +1,293 @@ +reiser4progs (1.0.7-6.3fakesync2) quantal; urgency=low + + * Rebuild for new armel compiler default of ARMv5t. + + -- Colin Watson Mon, 08 Oct 2012 22:50:40 +0100 + +reiser4progs (1.0.7-6.3fakesync1) precise; urgency=low + + * Fakesync due to mismatched orig tarball (LP: #889991) + + -- Daniel T Chen Mon, 12 Dec 2011 22:39:53 -0600 + +reiser4progs (1.0.7-6.3) unstable; urgency=low + + * Non-maintainer upload. + * Modified the test target in debian/rules, to prevent a circular + build-dependency which resulted in a FTBFS behavior. Checked it with + pdebuild. Then removed the test, which is not necessary to build the + package. + * checked that the dependencies of the built binaries are now + libreadline5-dev and libreadline-gplv2-dev, which are compatible. + Closes: #634654 + * bumped Standards version to 3.9.2 + + -- Georges Khaznadar Sat, 17 Sep 2011 14:56:27 +0200 + +reiser4progs (1.0.7-6.2) unstable; urgency=low + + * Non-maintainer upload. + * applied one patch from Thomas Tsai, to fix a bug whose notification + was published in http://www.spinics.net/lists/reiserfs-devel/msg01698.html + * added Thomas Tsai's simple test to check whether a program can be linked + with libreiser4 in debian/rules + + -- Georges Khaznadar Mon, 05 Sep 2011 18:52:46 +0200 + +reiser4progs (1.0.7-6.1) unstable; urgency=low + + * Non-maintainer upload. + * Modified the build-dependency: libreadline-gplv2-dev rather than + libreadlin5-dev: Closes: #634683 + * Applied Guus Sliepen's patch. Closes: #632633 + + -- Georges Khaznadar Sat, 27 Aug 2011 00:35:06 +0200 + +reiser4progs (1.0.7-6) unstable; urgency=low + + * Remove udebs. Very unlikely that d-i will ever use them. Request by + Frans Pop. (Closes: #567858) + * Bump Standards-Version to 3.8.4. + + -- Felix Zielcke Mon, 01 Feb 2010 13:50:40 +0100 + +reiser4progs (1.0.7-5) unstable; urgency=low + + * Build depend on libreadline-dev instead of libreadline5-dev. + + -- Felix Zielcke Sun, 13 Sep 2009 16:53:49 +0200 + +reiser4progs (1.0.7-4) unstable; urgency=low + + * Remove libaal.la, libaal-minimal.la and librepair.la from libreiser4-dev. + * Update Standards-Version to 3.8.3. + * Really remove the Suggests: kernel-patch-2.6-reiser4. + + -- Felix Zielcke Tue, 25 Aug 2009 12:50:33 +0200 + +reiser4progs (1.0.7-3) unstable; urgency=low + + * Add a build dependency on autotools-dev so CDBS updates config.guess + and config.sub. + * Update Standards-Version to 3.8.2. No changes needed. + * Remove Suggests: kernel-patch-2.6-reiser4. It has been removed from + Debian 2007. + + -- Felix Zielcke Sat, 18 Jul 2009 14:03:46 +0200 + +reiser4progs (1.0.7-2) unstable; urgency=low + + * Remove /sbin/make_reiser4 hardlink. + + -- Felix Zielcke Wed, 04 Mar 2009 10:29:35 +0100 + +reiser4progs (1.0.7-1) unstable; urgency=low + + * New maintainer (Closes: #483027) + * New upstream version. + * Rewrite build system using CDBS debhelper.mk. + - configure udebs with `--with-readline=no' (Closes: #497413) + * Switch quilt patch system to CDBS simple-patchsys. + * Change download url in debian/copyright to the kernel.org one. + * debian/patches/02_fix_ldconfig: New patch to run `run-ldconfig' from + `$(top_srcdir)' instead of `./' + * Change debhelper compat level to 6 and build-depend on it. + * Add a debian/watch file. + + -- Felix Zielcke Sun, 08 Feb 2009 17:02:43 +0100 + +reiser4progs (1.0.6-2) unstable; urgency=low + + * QA upload. + + Set maintainer to Debian QA Group . + * Add quilt patch system. + + 01_gcc_4_4.diff - Build with gcc-4.4. (Closes: #504839). + + Thanks to Martin Michlmayr for the fix! + * Make clean not ignore errors. + * Remove old lintian overrides. + * Remove dead Homepage URL from package descriptions. + * Replace pwd with $(CURDIR) in rules. + * Add ${misc:Depends} to binary packages. + * Add appropriate Copyright holder to debian/copyright. + + Change license path to point to GPL-2 license. + * Bump debhelper build-dep and compat to 5. + * Bump Standards Version to 3.8.0. + + -- Barry deFreese Fri, 06 Feb 2009 22:44:38 -0500 + +reiser4progs (1.0.6-1) unstable; urgency=low + + * New upstream release (closes: #423684). + + -- Domenico Andreoli Wed, 23 May 2007 01:45:27 +0200 + +reiser4progs (1.0.5-2) unstable; urgency=low + + * Minimal library (required to add reiser4 support to grub) is now + built using --enable-libminimal configure switch. + * Moved previous debconf note to README.Debian (closes: #388955). + * Removed all the debconf translations (closes: #333169). + Thanks to all the translators! + + -- Domenico Andreoli Fri, 29 Sep 2006 09:19:20 +0200 + +reiser4progs (1.0.5-1) unstable; urgency=low + + * New upstream release. + + -- Domenico Andreoli Thu, 18 Aug 2005 13:00:20 +0200 + +reiser4progs (1.0.4-2) unstable; urgency=low + + * Fixed gcc 4.0 build errors (closes: #305613). + * Added German debconf translation (closes: #318733). + * Added Vietnamese debconf translation (closes: #317644). + + -- Domenico Andreoli Fri, 22 Jul 2005 00:46:45 +0200 + +reiser4progs (1.0.4-1) unstable; urgency=low + + * New upstream release. + * Removed cpfs and resizefs utilities. These were only place holders + with no real functionality. + * Added Brazilian Portuguese debconf translation (closes: #297033). + + -- Domenico Andreoli Mon, 28 Feb 2005 13:12:26 +0100 + +reiser4progs (1.0.3-3) unstable; urgency=low + + * Updated build dependency on libreadline5-dev (closes: #292312). + + -- Domenico Andreoli Wed, 26 Jan 2005 11:38:25 +0100 + +reiser4progs (1.0.3-2) unstable; urgency=low + + * Fixed bus error on sparc64 (closes: #289747). + Patch courtesy of Vitaly Fertman. + * Fixed FTBFS on amd64/gcc-4.0 (closes: #288414). + Patch courtesy of Vitaly Fertman. + + -- Domenico Andreoli Thu, 20 Jan 2005 12:51:50 +0100 + +reiser4progs (1.0.3-1) unstable; urgency=low + + * New upstream release. + * Added Czech debconf translation (closes: #273843). + * Added Italian debconf translation (closes: #277697). + * Improved udebs short descriptions (closes: #282448). + + -- Domenico Andreoli Fri, 10 Dec 2004 23:55:20 +0100 + +reiser4progs (1.0.2-1) unstable; urgency=low + + * New upstream release. + * Added watch file. + + -- Domenico Andreoli Fri, 19 Nov 2004 11:42:51 +0100 + +reiser4progs (1.0.0-5) unstable; urgency=low + + * Uses debhelper to build udebs. + + -- Domenico Andreoli Fri, 3 Sep 2004 14:41:52 +0200 + +reiser4progs (1.0.0-4) experimental; urgency=low + + * Added udebs for debian-installer. + * Added French debconf translation (closes: #268062). + * Added Japanese debconf translation (closes: #269011). + + -- Domenico Andreoli Wed, 1 Sep 2004 17:05:53 +0200 + +reiser4progs (1.0.0-3) unstable; urgency=medium + + * Fixed conversion instructions for pre-0.5.5 disk formats + (closes: #267930). + * Added support for conditional build of udeb packages (disabled + by default). + + -- Domenico Andreoli Wed, 1 Sep 2004 14:10:13 +0200 + +reiser4progs (1.0.0-2) unstable; urgency=medium + + * Reworded final warning of the debconf note. + + -- Domenico Andreoli Tue, 17 Aug 2004 12:18:40 +0200 + +reiser4progs (1.0.0-1) unstable; urgency=low + + * New upstream release (closes: #265763). + + -- Domenico Andreoli Mon, 16 Aug 2004 14:19:30 +0200 + +reiser4progs (0.5.6-3) unstable; urgency=medium + + * Package is now always installed. The user is simply informed about + the requirements for the new disk format (closes: #264582). + * Switched to po-debconf (closes: #264334). + + -- Domenico Andreoli Fri, 13 Aug 2004 13:50:02 +0200 + +reiser4progs (0.5.6-2) unstable; urgency=low + + * If required, package installation is now interrupted by the preinst + script instead of the postinst one. + + -- Domenico Andreoli Thu, 5 Aug 2004 10:55:28 +0200 + +reiser4progs (0.5.6-1) unstable; urgency=low + + * New upstream release. + + -- Domenico Andreoli Wed, 4 Aug 2004 23:08:09 +0200 + +reiser4progs (0.5.5-1) experimental; urgency=low + + * New upstream (testing) release. + + -- Domenico Andreoli Wed, 16 Jun 2004 22:19:29 +0200 + +reiser4progs (0.5.4-3) experimental; urgency=low + + * Updated to depend on latest libaal with memory manager in stand + alone library. + + -- Domenico Andreoli Fri, 23 Apr 2004 02:33:44 +0200 + +reiser4progs (0.5.4-2) experimental; urgency=low + + * Stand alone library is now installed by libreiser4-dev. It is useful + to build support in tools such as grub. + + -- Domenico Andreoli Thu, 22 Apr 2004 14:03:02 +0200 + +reiser4progs (0.5.4-1) experimental; urgency=low + + * New upstream (testing) release. + + -- Domenico Andreoli Wed, 21 Apr 2004 15:07:38 +0200 + +reiser4progs (0.5.3-1) unstable; urgency=low + + * New upstream release. + + -- Domenico Andreoli Fri, 2 Apr 2004 16:09:35 +0200 + +reiser4progs (0.5.1-1) unstable; urgency=low + + * New upstream release. + * No shared libraries are provided at the moment. + + -- Domenico Andreoli Sat, 28 Feb 2004 17:03:26 +0100 + +reiser4progs (0.5.0-1) unstable; urgency=low + + * New upstream release. + + -- Domenico Andreoli Thu, 12 Feb 2004 14:49:39 +0100 + +reiser4progs (0.4.20-1) unstable; urgency=low + + * Initial release (closes: #165939). + + -- Domenico Andreoli Mon, 19 Jan 2004 22:51:33 +0100 --- reiser4progs-1.0.7.orig/debian/reiser4progs.README +++ reiser4progs-1.0.7/debian/reiser4progs.README @@ -0,0 +1,12 @@ +This version of Reiser4 user-space tools works with a new disk +format. In order to use this new disk format your kernel must be built +with a recent version of the Reiser4 patch (ie. the one provided by +package kernel-patch-2.6-reiser4 20040813-3). + +Existing Reiser4 filesystems continue to be supported by both old and +new kernel patches but will result corrupted if checked with the new +Reiser4 fsck. Conversion of old Reiser4 filesystems is explained in +file /usr/share/doc/reiser4progs/NEWS.Debian. + +Please read /usr/share/doc/reiser4progs/NEWS.Debian in order not to +lose your data. --- reiser4progs-1.0.7.orig/debian/watch +++ reiser4progs-1.0.7/debian/watch @@ -0,0 +1,2 @@ +version=3 +ftp://ftp.kernel.org/pub/linux/utils/fs/reiser4/reiser4progs/reiser4progs-([0-9.]+).tar.gz debian uupdate --- reiser4progs-1.0.7.orig/debian/reiser4progs.manpages +++ reiser4progs-1.0.7/debian/reiser4progs.manpages @@ -0,0 +1,4 @@ +doc/debugfs.reiser4.8 +doc/fsck.reiser4.8 +doc/measurefs.reiser4.8 +doc/mkfs.reiser4.8 --- reiser4progs-1.0.7.orig/debian/reiser4progs.NEWS +++ reiser4progs-1.0.7/debian/reiser4progs.NEWS @@ -0,0 +1,68 @@ +reiser4progs (1.0.0-1) unstable; urgency=low + + This release introduces a new layout of blocks containing the backup + of file system metadata. + + Post 0.5.5 users + ~~~~~~~~~~~~~~~~ + No kernel patch update is required (but a recent one like 20040813 + is always advised). + + To fix the layout of these blocks, issue the following command: + + # debugfs.reiser4 -C + + Do not use fsck.reiser4 1.0.0 before this command or you could + loose data. + + After this conversion it is a good idea to check the file system with + the new fsck.reiser4 1.0.0. It could complain about "wrong bytes" + inconsistencies, which are not harmful. Making it fix them is enough. + + + Pre 0.5.5 users + ~~~~~~~~~~~~~~~ + A recent version of the Reiser4 kernel patch is also required to be + applied in the kernel build in order to use the new disk format. + + If you are coming from a pre 0.5.5 disk format and you likely have + only reiser4progs 1.0.0, this is the right command sequence for you: + + 1. # fsck.reiser4 --build-sb + 2. # debugfs.reiser4 -C + 3. # fsck.reiser4 + + You should also issue any other invocation command 3. asks to fix + the filesystem. + + + Both these playings with the file system should preserve existing + data but a good backup could preserve it better. + + -- Domenico Andreoli Mon, 16 Aug 2004 14:19:30 +0200 + +reiser4progs (0.5.5-1) experimental; urgency=low + + This release introduced a new formatting policy and the plugin sets. + A recent version of the Reiser4 kernel patch is also required to be + applied in the kernel build in order to use the new disk format. + + To update the formatting policy id in the superblock of an existing + Reiser4 file system, the following command is required: + + # fsck.reiser4 --build-sb + + Then, to add the pset to the root directory: + + # fsck.reiser4 --fix + + A simpler way could be to invoke: + + # fsck.reiser4 + + and then issue any other invocation it asks for. + + This conversion should preserve all the data already present in the + file system but a recent backup could be safer than these words. + + -- Domenico Andreoli Wed, 16 Jun 2004 22:19:29 +0200 --- reiser4progs-1.0.7.orig/debian/control +++ reiser4progs-1.0.7/debian/control @@ -0,0 +1,31 @@ +Source: reiser4progs +Section: admin +Priority: optional +Maintainer: Felix Zielcke +DM-Upload-Allowed: yes +Build-Depends: debhelper (>= 6), cdbs, libaal-dev (>= 1.0.5-2), libaal-dev (<< 1.0.6), uuid-dev, libreadline-gplv2-dev, libncurses5-dev, + autotools-dev +Standards-Version: 3.9.2 + +Package: reiser4progs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: administration utilities for the Reiser4 filesystem + The following utilities to manage Reiser4 filesystems are provided: + . + - debugfs.reiser4 + - fsck.reiser4 + - measurefs.reiser4 + - mkfs.reiser4 + +Package: libreiser4-dev +Section: libdevel +Priority: extra +Architecture: any +Depends: ${misc:Depends}, libc6-dev | libc-dev, libaal-dev (>= 1.0.4-1), uuid-dev, libreadline-gplv2-dev, libncurses5-dev +Description: Reiser4's filesystem access and manipulation library + These are the development files for Reiser4 libraries. Stand alone + libraries are also provided to allow the build of grub with support + for Reiser4. + . + They are part of the Reiser4's filesystem support tools. --- reiser4progs-1.0.7.orig/debian/rules +++ reiser4progs-1.0.7/debian/rules @@ -0,0 +1,99 @@ +#! /usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +SHELL := bash + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +CFLAGS += -I$(CURDIR) + +CONFIGURE = CFLAGS="$(CFLAGS)" $(CURDIR)/configure --host=$(DEB_HOST_GNU_TYPE) \ + --build=$(DEB_BUILD_GNU_TYPE) \ + --prefix=/usr \ + --mandir=\$${prefix}/share/man \ + --disable-shared \ + --enable-libminimal + +configure/reiser4progs configure/libreiser4-dev:: configure-reiser4progs-stamp +configure-reiser4progs-stamp:: + mkdir -p $(CURDIR)/build/reiser4progs + cd $(CURDIR)/build/reiser4progs && $(CONFIGURE) --with-readline + touch $@ + +#configure/mkreiser4-udeb configure/reiser4progs-udeb:: configure-udebs-stamp +#configure-udebs-stamp:: +# mkdir -p $(CURDIR)/build/udebs +# cd $(CURDIR)/build/udebs && $(CONFIGURE) --with-readline=no +# touch $@ + +build/libreiser4-dev build/reiser4progs:: build-reiser4progs-stamp +build-reiser4progs-stamp:: + $(MAKE) -C $(CURDIR)/build/reiser4progs + touch $@ + +#build/mkreiser4-udeb build/reiser4progs-udeb:: build-udebs-stamp +#build-udebs-stamp:: +# $(MAKE) -C $(CURDIR)/build/udebs +# touch $@ + +install/reiser4progs:: install-reiser4progs-stamp +install-reiser4progs-stamp:: + $(MAKE) -C $(CURDIR)/build/reiser4progs install DESTDIR=$(CURDIR)/debian/reiser4progs/ + mv $(CURDIR)/debian/reiser4progs/usr/sbin $(CURDIR)/debian/reiser4progs/ + rm -rf $(CURDIR)/debian/reiser4progs/sbin/make_reiser4 + rm -rf $(CURDIR)/debian/reiser4progs/usr/{include,lib,share/aclocal} + ln debian/reiser4progs/sbin/mkfs.reiser4 debian/reiser4progs/sbin/mkreiser4 + dh_link -preiser4progs usr/share/man/man8/mkfs.reiser4.8.gz usr/share/man/man8/mkreiser4.8.gz + +# this target can be activated at any time. It is no more required by +# install/libreiser4-dev since version 1.0.7-6.3 +debian/testLibreiser4: + cd debian; gcc -c -I ../include testLibreiser4.c; gcc testLibreiser4.o -L ../debian/libreiser4-dev/usr/lib -lreiser4 -laal -o testLibreiser4 && rm -f testLibreiser4.o testLibreiser4 + +install/libreiser4-dev:: install-libreiser4-dev-stamp +install-libreiser4-dev-stamp:: + $(MAKE) -C $(CURDIR)/build/reiser4progs install DESTDIR=$(CURDIR)/debian/libreiser4-dev/ + rm -rf $(CURDIR)/debian/libreiser4-dev/usr/{sbin,share/man} + rm -rf $(CURDIR)/debian/libreiser4-dev/usr/share/doc/{AUTHORS,BUGS,README,THANKS} + rm -f $(CURDIR)/debian/libreiser4-dev/usr/lib/*.la + +#install/mkreiser4-udeb:: install-mkreiser4-udeb-stamp +#install-mkreiser4-udeb-stamp:: +# $(MAKE) -C $(CURDIR)/build/udebs install DESTDIR=$(CURDIR)/debian/mkreiser4-udeb/ +# mv $(CURDIR)/debian/mkreiser4-udeb/usr/sbin $(CURDIR)/debian/mkreiser4-udeb/ +# rm -rf $(CURDIR)/debian/mkreiser4-udeb/sbin/make_reiser4 +# rm -rf $(CURDIR)/debian/mkreiser4-udeb/usr +# rm -rf $(CURDIR)/debian/mkreiser4-udeb/sbin/{debugfs.reiser4,fsck.reiser4,measurefs.reiser4} + +#install/reiser4progs-udeb:: install-reiser4progs-udeb-stamp +#install-reiser4progs-udeb-stamp:: +# $(MAKE) -C $(CURDIR)/build/udebs install DESTDIR=$(CURDIR)/debian/reiser4progs-udeb/ +# mv $(CURDIR)/debian/reiser4progs-udeb/usr/sbin $(CURDIR)/debian/reiser4progs-udeb/ +# rm -rf $(CURDIR)/debian/reiser4progs-udeb/sbin/make_reiser4 +# rm -rf $(CURDIR)/debian/reiser4progs-udeb/usr +# rm -rf $(CURDIR)/debian/reiser4progs-udeb/sbin/{mkfs.reiser4,measurefs.reiser4} + +clean:: + rm -rf build + rm -f *-stamp + # clean test files + cd debian; rm -f testLibreiser4.o testLibreiser4 --- reiser4progs-1.0.7.orig/debian/compat +++ reiser4progs-1.0.7/debian/compat @@ -0,0 +1 @@ +6 --- reiser4progs-1.0.7.orig/debian/patches/02_fix_ldconfig.patch +++ reiser4progs-1.0.7/debian/patches/02_fix_ldconfig.patch @@ -0,0 +1,12 @@ +diff -u reiser4progs-1.0.7.orig/Makefile.in reiser4progs-1.0.7/Makefile.in +--- reiser4progs-1.0.7.orig/Makefile.in 2009-01-16 17:25:06.000000000 +0100 ++++ reiser4progs-1.0.7/Makefile.in 2009-02-08 12:42:43.000000000 +0100 +@@ -659,7 +659,7 @@ + $(all-sources) | xargs -- ctags -w -o TAGS + + install-exec-hook: +- ./run-ldconfig $(libdir) ++ $(top_srcdir)/run-ldconfig $(libdir) + + uninstall-hook: + ./run-ldconfig $(libdir) --- reiser4progs-1.0.7.orig/debian/patches/01_gcc_4_4.diff +++ reiser4progs-1.0.7/debian/patches/01_gcc_4_4.diff @@ -0,0 +1,15 @@ +Patch to build with gcc-4.4 + +Index: reiser4progs-1.0.6/plugin/node/node40/node40.c +=================================================================== +--- reiser4progs-1.0.6.orig/plugin/node/node40/node40.c 2009-02-06 22:55:12.000000000 -0500 ++++ reiser4progs-1.0.6/plugin/node/node40/node40.c 2009-02-06 22:56:06.000000000 -0500 +@@ -996,7 +996,7 @@ + func = cb_comp_key3; + #elif defined(ENABLE_LARGE_KEYS) + func = cb_comp_key4; +-#elif ++#else + func = NULL; + #endif + --- reiser4progs-1.0.7.orig/debian/patches/05_libreiser4~profile.c.patch +++ reiser4progs-1.0.7/debian/patches/05_libreiser4~profile.c.patch @@ -0,0 +1,30 @@ +--- reiser4progs-1.0.6.orig/libreiser4/profile.c ++++ reiser4progs-1.0.6/libreiser4/profile.c +@@ -5,7 +5,8 @@ + + + #include +-#include ++#include ++#include + + /* All default plugin ids. This is used for getting plugin id if it cannot be + obtained by usual way (get from disk structures, etc.). All these may be +@@ -332,6 +333,7 @@ + reiser4_plug_t *plug; + long long int val; + uint8_t i; ++ char *error; + + aal_assert("umka-924", slot != NULL); + aal_assert("umka-923", name != NULL); +@@ -354,7 +356,8 @@ + } + + if (defprof.pid[i].id.type == PARAM_PLUG_TYPE) { +- if ((val = misc_str2long((char *)name, 10)) == INVAL_DIG) { ++ val = strtol((char *)name, &error, 10); ++ if (errno == ERANGE || *error) { + aal_error("Invalid value \"%s\" is provided for the " + "profile slot \"%s\".", (char *)name, + defprof.pid[i].name); --- reiser4progs-1.0.7.orig/libmisc/gauge.c +++ reiser4progs-1.0.7/libmisc/gauge.c @@ -95,31 +95,8 @@ gauge->value_func(gauge); if (gauge->value != -1) { - uint32_t width, count; - - width = misc_screen_width(); - if (width < 10) - goto done; - - width -= 10; - - if (width > 50) - width = 50; - - fprintf(stderr, "["); - count = width * gauge->value / 100; - width -= count; - while (count--) { - fprintf(stderr, "="); - } - misc_gauge_blit(); - - while(width--) { - fprintf(stderr, " "); - } - - fprintf(stderr, "] %lld%%", gauge->value); + fprintf(stderr, " %lld%%", gauge->value); } else { misc_gauge_blit(); } --- reiser4progs-1.0.7.orig/librepair/repair.c +++ reiser4progs-1.0.7/librepair/repair.c @@ -210,7 +210,8 @@ is a node). */ static errno_t cb_region_mark(blk_t blk, uint64_t count, void *data) { repair_control_t *control = (repair_control_t *)data; - uint32_t i; + //uint32_t i; // BUG! block number is 64 bit. + blk_t i; aal_assert("vpf-561", control != NULL);