Hello community, here is the log from the commit of package rear for openSUSE:Factory checked in at 2014-05-09 20:30:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rear (Old) and /work/SRC/openSUSE:Factory/.rear.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rear" Changes: -------- --- /work/SRC/openSUSE:Factory/rear/rear.changes 2014-02-11 15:25:39.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rear.new/rear.changes 2014-05-09 20:30:45.000000000 +0200 @@ -1,0 +2,27 @@ +Fri May 9 14:48:24 CEST 2014 - [email protected] + +- Version upgrade to 1.16 from upstream (fate#316508) + that has in particular VLAN tagging support (fate#317032). + For details see the rear-release-notes.txt file. + Warning for users who upgrade Relax-and-Recover (rear): + Users who already use it must re-validate that their + particular disaster recovery procedure still works. + See in particular "Version upgrades" at + http://en.opensuse.org/SDB:Disaster_Recovery +- bug-859436_40_restore_with_tsm.sh.diff is obsolete + because the issue is fixed in the uptream sources. +- rear-release-notes.txt-1.16 replaces the outdated + doc/rear-release-notes.txt from rear-1.16.tar.gz. +- traditional_style_for_bash_3.diff replaces bash 4.x syntax + with traditional style for bash 3.x if bash 3.x is used + (i.e. up to openSUSE:11.1 and SLE11 where we have bash 3.x) + where the test in the build environment assumes that the + same bash major version is also used by the end-user in his + runtime environment but even if the end-user had upgraded + his bash it should not matter because bash 3.x syntax + should also work for bash 4.x. +- Added an explicit os.conf to not depend on LSB dependencies + to avoid calling "lsb_release" in config-functions.sh + that might result inconsistent values (bnc#877042). + +------------------------------------------------------------------- @@ -4 +31 @@ -- Added "Requires: lsb-release" because Rear calls "lsb_release" +- Added "Requires: lsb-release" because rear calls "lsb_release" @@ -12 +39 @@ - only those RPM packages that are mandatory for Rear + only those RPM packages that are mandatory for rear @@ -20 +47 @@ - needed by Rear (in particular various graphical libraries, + needed by rear (in particular various graphical libraries, @@ -21,0 +49,7 @@ +- Replaced rear-1.15.tar.gz with the current one from upstream at + https://sourceforge.net/projects/rear/files/rear/1.15/rear-1.15.tar.gz + that contains exactly same files but the tarball differs + (probably it was re-packed at upstream) and that causes + failures of our automated factory-auto check scripts like: + "download_files is configured to fail when the upstream file + is different then the committed file". @@ -32 +66 @@ -- Warning for users who upgrade from Rear 1.10.0 +- Warning for users who upgrade from rear 1.10.0 @@ -37,2 +71,2 @@ - "dr workflow" that has been removed in Rear 1.14). - Users who already use Rear must completely re-validate that + "dr workflow" that has been removed in rear 1.14). + Users who already use rear must completely re-validate that Old: ---- bug-859436_40_restore_with_tsm.sh.diff rear-1.15.tar.gz New: ---- rear-1.16.tar.gz rear-release-notes.txt-1.16 traditional_style_for_bash_3.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rear.spec ++++++ --- /var/tmp/diff_new_pack.c24uof/_old 2014-05-09 20:30:46.000000000 +0200 +++ /var/tmp/diff_new_pack.c24uof/_new 2014-05-09 20:30:46.000000000 +0200 @@ -19,23 +19,22 @@ %bcond_without use_mkisofs Name: rear -Version: 1.15 +Version: 1.16 Release: 0 -Summary: Relax and Recover (ReaR) is a Linux Disaster Recovery framework +Summary: Relax-and-Recover (abbreviated rear) is a Linux Disaster Recovery framework License: GPL-2.0+ Group: Productivity/Archiving/Backup - Url: http://relax-and-recover.org/ # as GitHub stopped with download section we need to go back to Sourceforge for downloads -Source0: https://sourceforge.net/projects/rear/files/rear/%{version}/rear-%{version}.tar.gz +Source0: http://sourceforge.net/projects/rear/files/rear/%{version}/rear-%{version}.tar.gz +# Source1 rear-release-notes.txt-1.16 was created by calling +# w3m -dump -cols 78 http://relax-and-recover.org/documentation/release-notes-1-16 >rear-release-notes.txt-1.16 +# because rear-1.16.tar.gz does not contain an up to date doc/rear-release-notes.txt file: +Source1: rear-release-notes.txt-1.16 +# Patch1 replaces bash 4.x syntax with traditional style for bash 3.x if bash 3.x is used: +Patch1: traditional_style_for_bash_3.diff BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build - -# Patch01 bug-859436_40_restore_with_tsm.sh.diff fixes -# recovery with TSM 6.4 that results in error message ANS1102E -# as fixed upstream https://github.com/rear/rear/issues/356 -Patch01: bug-859436_40_restore_with_tsm.sh.diff - # LSB RPM Requires: # Begin of "Requires: lsb" cleanup: # Rear upstream has "Requires: lsb" but that requires much too much, @@ -159,7 +158,7 @@ %else Requires: %{_bindir}/genisoimage %endif -# recent SuSE versions have an extra nfs-client package +# recent SUSE versions have an extra nfs-client package Requires: nfs-client # Rear calls openssl in /usr/share/rear/rescue/default/50_ssh.sh Requires: openssl @@ -168,62 +167,100 @@ Requires: syslinux %description -Relax and Recover (abbreviated rear) is a highly modular disaster recovery -framework for GNU/Linux based systems, but can be easily extended to other -UNIX alike systems. The disaster recovery information (and maybe the backups) -can be stored via the network, local on hard disks or USB devices, DVD/CD-R, -tape, etc. The result is also a bootable image that is capable of booting via -PXE, DVD/CD and USB media. - -Relax and Recover integrates with other backup software and provides integrated -bare metal disaster recovery abilities to the compatible backup software. +Relax-and-Recover (abbreviated rear) is a highly modular +disaster recovery framework for GNU/Linux based systems, +but can be easily extended to other UNIX alike systems. +The disaster recovery information (and maybe the backups) +can be stored via the network, local on hard disks or +USB devices, DVD/CD-R, tape, etc. The result is also a +bootable image that is capable of booting via PXE, +DVD/CD and USB media. + +Relax-and-Recover integrates with other backup software +and provides integrated bare metal disaster recovery +abilities to the compatible backup software. + +Warning for users who like to upgrade Relax-and-Recover: +Users who already use it must re-validate that their +particular disaster recovery procedure still works. +See in particular "Version upgrades" at +http://en.opensuse.org/SDB:Disaster_Recovery + +Additionally when you already use Relax-and-Recover and +you upgrade software that is related to the basic system +(e.g. kernel, storage, bootloader, init, networking) or +you do other changes in your basic system, you must also +re-validate that your particular disaster recovery +procedure still works for you. %prep -%setup -q -# Patch01 bug-859436_40_restore_with_tsm.sh.diff fixes -# recovery with TSM 6.4 that results in error message ANS1102E -# as fixed upstream https://github.com/rear/rear/issues/356 -%patch01 -p1 +%setup -q -n rear-%{version} +# add a specific os.conf to not depend on LSB dependencies +# (otherwise it calls "lsb_release" in /usr/share/rear/lib/config-functions.sh) +# for the suse_version values see the listing at +# http://en.opensuse.org/openSUSE:Build_Service_cross_distribution_howto +# in particular see there the "Note" that reads +# "sles_version is no longer set in SLES 11. Use suse_version == 1110 instead.": +%if 0%{?suse_version} == 1110 +# SLE 11 +OS_VERSION="11" +%endif +%if 0%{?suse_version} == 1140 +# openSUSE 11.4 +OS_VERSION="11.4" +%endif +%if 0%{?suse_version} == 1210 +# openSUSE 12.1 +OS_VERSION="12.1" +%endif +%if 0%{?suse_version} == 1220 +# openSUSE 12.2 +OS_VERSION="12.2" +%endif +%if 0%{?suse_version} == 1230 +# openSUSE 12.3 +OS_VERSION="12.3" +%endif +%if 0%{?suse_version} == 1310 +# openSUSE 13.1 +OS_VERSION="13.1" +%endif +%if 0%{?suse_version} == 1315 +# SLE 12 +OS_VERSION="12" +%endif +%if 0%{?suse_version} == 1320 +# openSUSE 13.2 +OS_VERSION="13.2" +%endif +echo -e "OS_VENDOR=SUSE_LINUX\nOS_VERSION=$OS_VERSION" >etc/rear/os.conf +# replace bash 4.x syntax with traditional style for bash 3.x if bash 3.x is used +# where the test in the build environment assumes that the same bash major version +# is also used by the end-user in his runtime environment. If the end-user had +# upgraded his bash it should not matter because bash 3.x syntax also works for bash 4.x. +# Up to openSUSE:11.1 and SLE11 we have bash 3.x and since openSUSE:11.2 we have bash 4.x: +%if 0%{?suse_version} < 1120 +%patch1 -p1 +%endif +# replace outdated doc/rear-release-notes.txt from rear-1.16.tar.gz +# with the up to date rear-release-notes.txt-1.16 in Source1: +cp %{SOURCE1} doc/rear-release-notes.txt %build # no code to compile - all bash scripts +# but at least test if the syntax is o.k.: +find . -name '*.sh' | xargs -n 1 bash -n %install -find . -type f -name .gitignore -delete - -# create directories -mkdir -vp \ - $RPM_BUILD_ROOT%{_mandir}/man8 \ - $RPM_BUILD_ROOT%{_datadir} \ - $RPM_BUILD_ROOT%{_sysconfdir} \ - $RPM_BUILD_ROOT%{_sbindir} \ - $RPM_BUILD_ROOT%{_localstatedir}/lib/rear - -# copy rear components into directories -cp -av usr/share/rear $RPM_BUILD_ROOT%{_datadir}/ -cp -av usr/sbin/rear $RPM_BUILD_ROOT%{_sbindir}/ -cp -av etc/rear $RPM_BUILD_ROOT%{_sysconfdir}/ - -# patch rear main script with correct locations for rear components -sed -i -e 's#^CONFIG_DIR=.*#CONFIG_DIR="%{_sysconfdir}/rear"#' \ - -e 's#^SHARE_DIR=.*#SHARE_DIR="%{_datadir}/rear"#' \ - -e 's#^VAR_DIR=.*#VAR_DIR="%{_localstatedir}/lib/rear"#' \ - $RPM_BUILD_ROOT%{_sbindir}/rear - -# update man page with correct locations -sed -e 's#/etc#%{_sysconfdir}#' \ - -e 's#/usr/sbin#%{_sbindir}#' \ - -e 's#/usr/share#%{_datadir}#' \ - -e 's#/usr/share/doc/packages#%{_docdir}#' \ - doc/rear.8 >$RPM_BUILD_ROOT%{_mandir}/man8/rear.8 +make install DESTDIR="%{buildroot}" %files %defattr(-,root,root,-) -%doc AUTHORS COPYING README doc/user-guide doc/rear-presentation.txt doc/rear-release-notes.txt +%doc AUTHORS COPYING README doc/*.txt doc/user-guide +%doc %{_mandir}/man8/rear.8* +%config(noreplace) %{_sysconfdir}/rear/ +%{_datadir}/rear/ +%{_localstatedir}/lib/rear/ %{_sbindir}/rear -%{_datadir}/rear -%{_localstatedir}/lib/rear -%{_mandir}/man8/rear* -%config(noreplace) %{_sysconfdir}/rear %changelog ++++++ rear-1.15.tar.gz -> rear-1.16.tar.gz ++++++ ++++ 4419 lines of diff (skipped) ++++++ rear-release-notes.txt-1.16 ++++++ ++++ 764 lines (skipped) ++++++ traditional_style_for_bash_3.diff ++++++ diff -rup rear-1.16.orig/usr/share/rear/format/USB/default/20_check_usb_layout.sh rear-1.16/usr/share/rear/format/USB/default/20_check_usb_layout.sh --- rear-1.16.orig/usr/share/rear/format/USB/default/20_check_usb_layout.sh 2012-10-31 16:02:09.000000000 +0100 +++ rear-1.16/usr/share/rear/format/USB/default/20_check_usb_layout.sh 2014-05-08 14:23:26.000000000 +0200 @@ -53,7 +53,7 @@ ID_FS_TYPE=$( esac ) -[[ "$ID_FS_TYPE" == @(btr*|ext*) ]] +[[ "$ID_FS_TYPE" == btr* || "$ID_FS_TYPE" == ext* ]] if (( $? != 0 )) && [[ -z "$YES" ]]; then echo "USB device $REAL_USB_DEVICE must be formatted with ext2/3/4 or btrfs file system" echo "Please type Yes to format $REAL_USB_DEVICE in ext3 format:" diff -rup rear-1.16.orig/usr/share/rear/layout/save/GNU/Linux/20_partition_layout.sh rear-1.16/usr/share/rear/layout/save/GNU/Linux/20_partition_layout.sh --- rear-1.16.orig/usr/share/rear/layout/save/GNU/Linux/20_partition_layout.sh 2014-01-22 09:57:13.000000000 +0100 +++ rear-1.16/usr/share/rear/layout/save/GNU/Linux/20_partition_layout.sh 2014-05-08 14:32:49.000000000 +0200 @@ -161,7 +161,7 @@ extract_partitions() { ### only report flags parted can actually recreate flags="" for flag in $flaglist ; do - if [[ "$flag" = @(boot|root|swap|hidden|raid|lvm|lba|palo|legacy_boot|bios_grub) ]] ; then + if [[ "$flag" = boot || "$flag" = root || "$flag" = swap || "$flag" = hidden || "$flag" = raid || "$flag" = lvm || "$flag" = lba || "$flag" = palo || "$flag" = legacy_boot || "$flag" = bios_grub ]] ; then flags="$flags$flag," fi done @@ -193,7 +193,7 @@ extract_partitions() { ### only report flags parted can actually recreate flags="" for flag in $flaglist ; do - if [[ "$flag" = @(boot|root|swap|hidden|raid|lvm|lba|palo|legacy_boot|bios_grub) ]] ; then + if [[ "$flag" = boot || "$flag" = root || "$flag" = swap || "$flag" = hidden || "$flag" = raid || "$flag" = lvm || "$flag" = lba || "$flag" = palo || "$flag" = legacy_boot || "$flag" = bios_grub ]] ; then flags="$flags$flag," fi done @@ -215,7 +215,7 @@ extract_partitions() { if has_binary sfdisk ; then declare partition_id=$(sfdisk -c $device $partition_nr 2>&8) ### extended partitions are either DOS_EXT, EXT_LBA or LINUX_EXT - if [[ "$partition_id" = @(5|f|85) ]]; then + if [[ "$partition_id" = 5 || "$partition_id" = f || "$partition_id" = 85 ]]; then sed -i /^$partition_nr\ /s/\ primary\ /\ extended\ / $TMP_DIR/partitions fi else @@ -245,7 +245,8 @@ Log "Saving disk partitions." # Disk sizes # format: disk <disk> <sectors> <partition label type> for disk in /sys/block/* ; do - if [[ ${disk#/sys/block/} = @(hd*|sd*|cciss*|vd*|xvd*) ]] ; then + blockd=${disk#/sys/block/} + if [[ $blockd = hd* || $blockd = sd* || $blockd = cciss* || $blockd = vd* || $blockd = xvd* ]] ; then devname=$(get_device_name $disk) devsize=$(get_disk_size ${disk#/sys/block/}) diff -rup rear-1.16.orig/usr/share/rear/lib/framework-functions.sh rear-1.16/usr/share/rear/lib/framework-functions.sh --- rear-1.16.orig/usr/share/rear/lib/framework-functions.sh 2013-09-16 10:12:43.000000000 +0200 +++ rear-1.16/usr/share/rear/lib/framework-functions.sh 2014-05-08 14:39:51.000000000 +0200 @@ -33,13 +33,13 @@ function Source() { LogPrint "Source $relname" else # step-by-step mode or brakepoint if needed - [[ "$STEPBYSTEP" || ( "$BREAKPOINT" && "$relname" == @($BREAKPOINT) ) ]] && read -p "Press ENTER to include '$1' ..." 2>&1 + [[ "$STEPBYSTEP" || ( "$BREAKPOINT" && "$relname" == "$BREAKPOINT" ) ]] && read -p "Press ENTER to include '$1' ..." 2>&1 Log "Including ${1##$SHARE_DIR/}" test "$DEBUGSCRIPTS" && set -x . "$1" test "$DEBUGSCRIPTS" && set +x - [[ "$BREAKPOINT" && "$relname" == @($BREAKPOINT) ]] && read -p "Press ENTER to continue ..." 2>&1 + [[ "$BREAKPOINT" && "$relname" == "$BREAKPOINT" ]] && read -p "Press ENTER to continue ..." 2>&1 fi else Debug "Skipping $1 (file not found or empty)" diff -rup rear-1.16.orig/usr/share/rear/prep/default/03_translate_tape.sh rear-1.16/usr/share/rear/prep/default/03_translate_tape.sh --- rear-1.16.orig/usr/share/rear/prep/default/03_translate_tape.sh 2012-06-25 10:34:09.000000000 +0200 +++ rear-1.16/usr/share/rear/prep/default/03_translate_tape.sh 2014-05-08 14:21:12.000000000 +0200 @@ -2,7 +2,7 @@ if [[ "$BACKUP_URL" ]] ; then backup_scheme=$(url_scheme "$BACKUP_URL") - if [[ "$backup_scheme" == @(tape|obdr) ]] ; then + if [[ "$backup_scheme" == tape || "$backup_scheme" == obdr ]] ; then testdevice=$(url_path "$BACKUP_URL") ### Complain when both are specified, but don't match if [[ "$TAPE_DEVICE" && "$TAPE_DEVICE" != "$testdevice" ]]; then diff -rup rear-1.16.orig/usr/share/rear/prep/default/50_guess_bootloader.sh rear-1.16/usr/share/rear/prep/default/50_guess_bootloader.sh --- rear-1.16.orig/usr/share/rear/prep/default/50_guess_bootloader.sh 2014-03-07 15:57:26.000000000 +0100 +++ rear-1.16/usr/share/rear/prep/default/50_guess_bootloader.sh 2014-05-08 14:18:11.000000000 +0200 @@ -8,7 +8,8 @@ if [[ -f /etc/sysconfig/bootloader ]]; t fi fi for disk in /sys/block/* ; do - if [[ ${disk#/sys/block/} = @(hd*|sd*|cciss*|vd*|xvd*) ]] ; then + blockd=${disk#/sys/block/} + if [[ $blockd = hd* || $blockd = sd* || $blockd = cciss* || $blockd = vd* || $blockd = xvd* ]] ; then devname=$(get_device_name $disk) dd if=$devname bs=512 count=4 | strings > $TMP_DIR/bootloader grep -q "EFI" $TMP_DIR/bootloader && { -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
