Changeset 588 in MondoRescue for trunk/mondo

Timestamp:

May 29, 2006, 11:47:20 AM (18 years ago)

Author:

bcornec

Message:

merge -r 560:587 $SVN_M/branches/stable

Location:

trunk/mondo

Files:

• ChangeLog (modified) (2 diffs)
• distributions/debian/changelog (modified) (1 diff)
• distributions/debian/control (modified) (2 diffs)
• distributions/debian/copyright (copied) (copied from branches/stable/mondo/distributions/debian/copyright )
• distributions/debian/mondo.dirs (modified) (1 diff)
• distributions/debian/mondo.docs (modified) (1 diff)
• distributions/debian/rules (modified) (5 diffs)
• distributions/gentoo/mondo.ebuild (modified) (1 diff)
• distributions/rpm/mondo.spec (modified) (1 diff)
• mondo/autorun (modified) (1 prop)
• mondo/common/libmondo-raid.c (modified) (3 diffs)
• mondo/common/libmondo-string-EXT.h (modified) (1 diff)
• mondo/common/libmondo-string.h (modified) (1 diff)
• mondo/common/newt-specific.c (modified) (1 diff)
• mondo/post-nuke.sample/usr/bin/post-nuke (modified) (1 prop)
• mondo/restore-scripts/etc (modified) (1 prop)
• mondo/restore-scripts/mondo (modified) (1 prop)
• mondo/restore-scripts/mondo/ask-me-a-question (modified) (1 prop)
• mondo/restore-scripts/mondo/compare-me (modified) (1 prop)
• mondo/restore-scripts/mondo/compare-subroutine-me (modified) (1 prop)
• mondo/restore-scripts/mondo/edit-mountlist (modified) (1 prop)
• mondo/restore-scripts/mondo/grub-MR (modified) (1 prop)
• mondo/restore-scripts/mondo/grub-install.patched (modified) (1 prop)
• mondo/restore-scripts/mondo/hack-elilo (modified) (1 prop)
• mondo/restore-scripts/mondo/hack-fstab (modified) (1 prop)
• mondo/restore-scripts/mondo/hack-grub (modified) (1 prop)
• mondo/restore-scripts/mondo/hack-lilo (modified) (1 prop)
• mondo/restore-scripts/mondo/ide-opt (modified) (1 prop)
• mondo/restore-scripts/mondo/ide-opt-off (modified) (1 prop)
• mondo/restore-scripts/mondo/label-partitions-as-necessary (modified) (1 prop)
• mondo/restore-scripts/mondo/make-me-bootable (modified) (1 prop)
• mondo/restore-scripts/mondo/mount-me (modified) (1 prop)
• mondo/restore-scripts/mondo/mount-subroutine-me (modified) (1 prop)
• mondo/restore-scripts/mondo/raw-MR (modified) (1 prop)
• mondo/restore-scripts/mondo/restore-bigfiles-from-iso (modified) (1 prop)
• mondo/restore-scripts/mondo/stabelilo-me (modified) (1 prop)
• mondo/restore-scripts/mondo/stabgrub-me (modified) (1 prop)
• mondo/restore-scripts/mondo/stablilo-me (modified) (1 prop)
• mondo/restore-scripts/mondo/stabraw-me (modified) (1 prop)
• mondo/restore-scripts/mondo/unmount-me (modified) (1 prop)
• mondo/restore-scripts/mondo/unmount-subroutine-me (modified) (1 prop)
• mondo/restore-scripts/usr (modified) (1 prop)
• mondo/restore-scripts/usr.bin (modified) (1 prop)
• mondo/restore-scripts/usr/bin (modified) (1 prop)

trunk/mondo/ChangeLog

@@ -3 +3 @@
 MONDO CHANGES
 
-trunk:
+v2.2.0 (2006-05-01) 
 - indent on source files
 - asprintf used instead of malloc_string + sprintf/strcpy/strcat without 
   verifications. Optimisations on memory consumption (allocate only size
   needed + remove memory leaks)
-
-v2.2.0 (2006-05-01) 
-=======
-
 - Internationalization (A huge thank to rene-marc dolhen
-<rmd_at_mecreant.org> who achieved that big task)
-- Fixed verify for NFS (Andree Leidenfrost)
-- Fix for Bug #6975 (Bruno Cornec)
-- Fix a bug when restoring interactively and having file names with blank
+  <rmd_at_mecreant.org> who achieved that big task)
+
+2.0.8 (2006-05-25)
+- new build process (Bruno Cornec)
+- Fix a bug in .spec for RPM build (%attr now unused)
   (Bruno Cornec)
-- Fix options -I and -E of mondoarchive which were not working 
+- Support of dm and LVM v2 (Andree Leidenfrost)
+- New mr_strtok functionn added and used for dm support (Andree Leidenfrost)
+- Complete doc is now a separate package. mondo still contains the 
+  man pages and howto in minimal useful formats
   (Bruno Cornec)
-- Removed 'ax' options from ps call in busybox (Andree Leidenfrost)
-
-v2.0.7 (2006-02-23)
+- HOWTO now contains a new chapter on unattended support for mondo
+- Increase size (4 times) of include|exclude variables
+- Fix a bug on -I and -E not working with multiple parameters
+- Fix a bug in verify for NFS by swapping nfs_remote_dir and isodir when
+  assembling name for image file to verify
+  (Andree Leidenfrost)
+- Fix mondo when restoring filenames containing blanks 
+  (still a problem for filenames with ')
+  (Bruno Cornec)
+- Fix a RPM generation bug for rh7.3 (i386-redhat-linux prefix for binaries)
+  (Bruno Cornec)
+
+2.0.7 (2006-03-10)
 - useless cat, sort|uniq commands removed 
   (Bruno Cornec/Sébastien Aperghis-Tramoni)
@@ -34 +44 @@
   (Andree Leidenfrost)
 - use df -P everywhere (Bruno Cornec)
+- Paypal incitations removed (Andree Leidenfrost)
+- mondo now uses /usr/share for the restore-scripts (Bruno Cornec)
+- rpmlint cleanups (Bruno Cornec)
+- no shared librairies and no X11 anymore (were useless) (Bruno Cornec)
+- files > 2GB are now really supported (Andree Leidenfrost)
+- new SGML based Mondo Rescue documentation + new Web site 
+  (Bruno Cornec/Andree Leidenfrost)
+- mondoarchive aborts when 'mindi --findkernel' gives a fatal error (See also Debian bug #352323.) (Andree Leidenfrost)
+- /tmp not excluded anymore from backup (Bruno Cornec)
+- New RPM Build environement (Bruno Cornec)
 
 v2.06 (2005-12-23)

trunk/mondo/distributions/debian/changelog

@@ -1 @@
-mondo (2.11r301-1) unstable; urgency=low
+mondo (2.0.8-1) unstable; urgency=low
 
-  * Initial Release.
+  * First upstream Debian package.
 
- -- Bruno Cornec <bcornec@users.berlios.de>  Thu, 12 Jan 2006 20:52:16 +1100
+ -- Bruno Cornec <bruno@mondorescue.org>  Sat, 17 May 2006 11:08:09 +0100

trunk/mondo/distributions/debian/control

@@ -2 +2 @@
 Section: utils
 Priority: optional
-Maintainer: Hector Garcia <hector@debian.org>
+Maintainer: Bruno Cornec <bruno@mondorescue.org>
 Build-Depends: debhelper (>= 4.2.20), libnewt-dev, libncurses5-dev
-Standards-Version: 3.6.2
-Uploaders: Andree Leidenfrost <aleidenf@bigpond.net.au>, Amaya Rodrigo Sastre <amaya@debian.org>
+Standards-Version: 3.6.1
 
 Package: mondo
-Architecture: i386
+Architecture: amd64 i386
 Section: utils
 Priority: optional
-Depends: ${shlibs:Depends}, ${misc:Depends}, mindi (>= 1.06), binutils, afio, buffer, gawk, cdrecord, lzop, dosfstools
+Depends: ${shlibs:Depends}, ${misc:Depends}, mindi (>= 1.0.8-1), afio, buffer, gawk, cdrecord, lzop
 Recommends: dvd+rw-tools
 Suggests: mondo-doc
@@ -28 +27 @@
  may even use it to backup non-Linux partitions, such as NTFS.
  .
- IMPORTANT NOTE: This is the uostream version of mondo. Please do not report
- bug to Debian's Bug Tracking System.
- .
  Homepage: http://www.mondorescue.org
-
-Package: mondo-doc
-Architecture: all
-Section: doc
-Priority: optional
-Suggests: mondo
-Description: manual for Mondo, a powerful disaster recovery suite
- Mondo is reliable. It backs up your Debian GNU/Linux server or workstation to
- tape, CD-R, CD-RW, NFS or hard disk partition. In the event of catastrophic
- data loss, you will be able to restore all of your data [or as much as you
- want], from bare metal if necessary. Mondo is in use by numerous blue-chip
- enterprises and large organizations, dozens of smaller companies, and tens of
- thousands of users.
- .
- Mondo is comprehensive. Mondo supports LVM, RAID, ext2, ext3, JFS, XFS,
- ReiserFS, VFAT, and can support additional file systems easily. It supports
- adjustments in disk geometry, including migration from non-RAID to RAID. Mondo
- runs on all major Linux distributions and is getting better all the time. You
- may even use it to backup non-Linux partitions, such as NTFS.
- .
- IMPORTANT NOTE: This is the uostream version of mondo. Please do not report
- bug to Debian's Bug Tracking System.
- .
- Homepage: http://www.mondorescue.org

trunk/mondo/distributions/debian/mondo.dirs

@@ -1 +1 @@
 usr/sbin
+usr/share/bug/mondo
 usr/share/man/man8
-usr/share/bug/mondo
-usr/share/lintian/overrides
+usr/share/mondo
+usr/share/pixmaps

trunk/mondo/distributions/debian/mondo.docs

@@ -1 +1 @@
 NEWS
 TODO
-debian/README
+README
+svn.log

trunk/mondo/distributions/debian/rules

@@ -3 +3 @@
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
+#
+# $Id$
+#
 
 # Uncomment this to turn on verbose mode.
@@ -14 +17 @@
 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
@@ -86 +88 @@
     # - start with upstream make install
     $(MAKE) install prefix=$(CURDIR)/debian/$(PACKAGE_NAME)/usr mandir=$(CURDIR)/debian/$(PACKAGE_NAME)/usr/share/man
-    # - fix library permissions
-    chmod 644 debian/$(PACKAGE_NAME)/usr/lib/libmondo.so.2.0.3      \
-                  debian/$(PACKAGE_NAME)/usr/lib/libmondo-newt.so.1.0.0 \
-                  debian/$(PACKAGE_NAME)/usr/lib/libmondo.la            \
-                  debian/$(PACKAGE_NAME)/usr/lib/libmondo-newt.la
-    # - remove library symlinks only relevant for development
-    rm -f debian/$(PACKAGE_NAME)/usr/lib/libmondo.so      \
-              debian/$(PACKAGE_NAME)/usr/lib/libmondo-newt.so
-    # - fix autorun script permissions
-    chmod 755 debian/$(PACKAGE_NAME)/usr/lib/mondo/autorun
-    # - relocate manual to temporary location because package directory mondo-doc doesn't exist yet
+    # - copy html manual to temporary location for renaming
     mkdir -p debian/doc-temp
-    mv debian/$(PACKAGE_NAME)/usr/share/doc/mondo-2.11 debian/doc-temp/html
+    cp -a docs/en/mondorescue-howto debian/doc-temp/html
 
     dh_install -s
@@ -118 +110 @@
     dh_installchangelogs ChangeLog
     dh_installdocs
-    dh_installexamples
     dh_installman
     dh_link
@@ -124 +115 @@
     dh_compress
     dh_fixperms
-    dh_makeshlibs
     dh_installdeb
-    dh_shlibdeps -l debian/$(PACKAGE_NAME)/usr/lib
+    dh_shlibdeps
     dh_gencontrol
     dh_md5sums

trunk/mondo/distributions/gentoo/mondo.ebuild

@@ -1 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
 # $Id$
 

trunk/mondo/distributions/rpm/mondo.spec

@@ -76 +76 @@
 
 %files
-%defattr(644,root,root,755)
 %doc ChangeLog svn.log
 %doc INSTALL COPYING README TODO AUTHORS NEWS
 %doc docs/en/mondorescue-howto.html docs/en/mondorescue-howto.pdf
 
-%attr(755,root,root) %{_sbindir}/*
-%attr(755,root,root) %{_datadir}/%{name}/restore-scripts/%{name}/*
-%attr(755,root,root) %{_datadir}/%{name}/autorun
-%attr(755,root,root) %{_datadir}/%{name}/post-nuke.sample/usr/bin/post-nuke
 %{_datadir}/locale/*/LC_MESSAGES/mondo.mo
-%{_datadir}/%{name}/*
+%{_sbindir}/*
+%{_datadir}/%{name}
 %{_mandir}/man8/*
 

trunk/mondo/mondo/common/libmondo-raid.c

@@ -993 +993 @@
     paranoid_free(token);
     // skip ':' and status
-    token = strtok (string, delims, &lastpos);
+    token = mr_strtok (string, delims, &lastpos);
     paranoid_free(token);
-    token = strtok (string, delims, &lastpos);
+    token = mr_strtok (string, delims, &lastpos);
     if (!strcmp(token, "inactive")) {
       log_msg(1, "RAID device '%s' inactive.\n",
@@ -1006 +1006 @@
 
     // get RAID level
-    token = strtok (string, delims, &lastpos);
+    token = mr_strtok (string, delims, &lastpos);
     if (!strcmp(token, "multipath")) {
       raidlist->el[raidlist->entries].raid_level = -2;
@@ -1036 +1036 @@
     raidlist->el[raidlist->entries].spare_disks.entries = 0;
     raidlist->el[raidlist->entries].failed_disks.entries = 0;
-    while((token = strtok (string, delims, &lastpos))) {
+    while((token = mr_strtok (string, delims, &lastpos))) {
       if ((pos = strstr(token, "("))) {
         type = *(pos+1);

trunk/mondo/mondo/common/libmondo-string-EXT.h

@@ -44 +44 @@
 extern inline void turn_wildcard_chars_into_literal_chars(char *out,
                                                           char *in);
+/* Valid external functions */
+extern char *mr_strtok(char *instr, const char *delims, int *lastpos);

trunk/mondo/mondo/common/libmondo-string.h

@@ -36 +36 @@
 
 /* Valid external functions */
-char *mr_strtok(char *instr, const char *delims, int *lastpos)
+char *mr_strtok(char *instr, const char *delims, int *lastpos);

trunk/mondo/mondo/common/newt-specific.c

@@ -869 +869 @@
             newtCls();
             newtPushHelpLine
-                (_("Welcome to Mondo Rescue, by Hugo Rabson and the Internet. All rights reversed."));
+                (_("Welcome to Mondo Rescue, by Dev Team and the Internet. All rights reversed."));
             /*  newtDrawRootText(28,0,"Welcome to Mondo Rescue"); */
             newtDrawRootText(18, 0, WELCOME_STRING);