Hello community, here is the log from the commit of package lrzip for openSUSE:Factory checked in at 2016-10-23 12:52:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lrzip (Old) and /work/SRC/openSUSE:Factory/.lrzip.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lrzip" Changes: -------- --- /work/SRC/openSUSE:Factory/lrzip/lrzip.changes 2016-07-01 09:59:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lrzip.new/lrzip.changes 2016-10-23 12:52:37.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Oct 21 14:18:08 UTC 2016 - [email protected] + +- Update to version 0.631: + * No changelog available +- Small spec file cleanup + +------------------------------------------------------------------- Old: ---- lrzip-0.630.tar.bz2 New: ---- lrzip-0.631.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lrzip.spec ++++++ --- /var/tmp/diff_new_pack.Qcv3yU/_old 2016-10-23 12:52:39.000000000 +0200 +++ /var/tmp/diff_new_pack.Qcv3yU/_new 2016-10-23 12:52:39.000000000 +0200 @@ -17,9 +17,9 @@ # -%define soname 0 +%define sover 0 Name: lrzip -Version: 0.630 +Version: 0.631 Release: 0 Summary: Very High Ratio and Speed Compression Designed for Large Files License: GPL-2.0 @@ -45,11 +45,11 @@ speed optimizations allows for either better compression than even lzma can provide, or better speed than gzip, but with bzip2 sized compression levels. -%package -n liblrzip%{soname} +%package -n liblrzip%{sover} Summary: Very High Ratio and Speed Compression Designed for Large Files Group: System/Libraries -%description -n liblrzip%{soname} +%description -n liblrzip%{sover} LRZIP is a compression program that can achieve very high compression ratios and speed when used with large files. It uses the combined compression algorithms of lzma for maximum compression, lzo for maximum speed, and the long @@ -61,7 +61,7 @@ %package -n liblrzip-devel Summary: Very High Ratio and Speed Compression Designed for Large Files Group: Development/Libraries/C and C++ -Requires: liblrzip%{soname} = %{version} +Requires: liblrzip%{sover} = %{version} %description -n liblrzip-devel LRZIP is a compression program that can achieve very high compression @@ -76,12 +76,11 @@ %setup -q %build -export LDFLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now" %configure make %{?_smp_mflags} V=1 %install -make %{?_smp_mflags} DESTDIR=%{buildroot} install +%make_install rm "%{buildroot}%{_libdir}"/*.{a,la} rm -rf "%{buildroot}%{_datadir}/doc" @@ -89,8 +88,8 @@ rm doc/Makefile* chmod 0644 README* COPYING doc/README* -%post -n liblrzip%{soname} -p /sbin/ldconfig -%postun -n liblrzip%{soname} -p /sbin/ldconfig +%post -n liblrzip%{sover} -p /sbin/ldconfig +%postun -n liblrzip%{sover} -p /sbin/ldconfig %files %defattr(-,root,root) @@ -110,10 +109,9 @@ %{_mandir}/man1/lrzuntar.1%{ext_man} %{_mandir}/man5/lrzip.conf.5%{ext_man} -%files -n liblrzip%{soname} +%files -n liblrzip%{sover} %defattr(-,root,root) -%{_libdir}/liblrzip.so.%{soname} -%{_libdir}/liblrzip.so.%{soname}.* +%{_libdir}/liblrzip.so.%{sover}* %files -n liblrzip-devel %defattr(-,root,root) ++++++ lrzip-0.630.tar.bz2 -> lrzip-0.631.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lrzip-0.630/configure new/lrzip-0.631/configure --- old/lrzip-0.630/configure 2016-06-11 01:30:54.000000000 +0200 +++ new/lrzip-0.631/configure 2016-10-21 03:09:19.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for lrzip 0.630. +# Generated by GNU Autoconf 2.69 for lrzip 0.631. # # Report bugs to <[email protected]>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='lrzip' PACKAGE_TARNAME='lrzip' -PACKAGE_VERSION='0.630' -PACKAGE_STRING='lrzip 0.630' +PACKAGE_VERSION='0.631' +PACKAGE_STRING='lrzip 0.631' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='' @@ -1356,7 +1356,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures lrzip 0.630 to adapt to many kinds of systems. +\`configure' configures lrzip 0.631 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1427,7 +1427,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of lrzip 0.630:";; + short | recursive ) echo "Configuration of lrzip 0.631:";; esac cat <<\_ACEOF @@ -1545,7 +1545,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -lrzip configure 0.630 +lrzip configure 0.631 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2272,7 +2272,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by lrzip $as_me 0.630, which was +It was created by lrzip $as_me 0.631, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3141,7 +3141,7 @@ # Define the identity of the package. PACKAGE='lrzip' - VERSION='0.630' + VERSION='0.631' cat >>confdefs.h <<_ACEOF @@ -12475,10 +12475,10 @@ cat >>confdefs.h <<_ACEOF -#define LRZIP_MINOR_SUBVERSION 30 +#define LRZIP_MINOR_SUBVERSION 31 _ACEOF -version_info="6:30:6" +version_info="6:31:6" release_info="" @@ -19168,7 +19168,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by lrzip $as_me 0.630, which was +This file was extended by lrzip $as_me 0.631, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -19234,7 +19234,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -lrzip config.status 0.630 +lrzip config.status 0.631 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lrzip-0.630/configure.ac new/lrzip-0.631/configure.ac --- old/lrzip-0.630/configure.ac 2016-06-11 01:30:26.000000000 +0200 +++ new/lrzip-0.631/configure.ac 2016-10-21 03:08:48.000000000 +0200 @@ -2,7 +2,7 @@ ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## m4_define([v_maj], [0]) m4_define([v_min], [6]) -m4_define([v_mic], [30]) +m4_define([v_mic], [31]) ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## m4_define([v_v], m4_join([], v_min, v_mic)) m4_define([v_ver], [v_maj.v_v]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lrzip-0.630/lrzip.c new/lrzip-0.631/lrzip.c --- old/lrzip-0.630/lrzip.c 2016-06-10 09:14:52.000000000 +0200 +++ new/lrzip-0.631/lrzip.c 2016-10-17 12:36:13.000000000 +0200 @@ -1246,6 +1246,11 @@ if (ENCRYPT) release_hashes(control); + if (unlikely(!STDIN && !STDOUT && !preserve_times(control, fd_in))) { + fatal("Failed to preserve times on output file\n"); + goto error; + } + if (unlikely(close(fd_in))) { fatal("Failed to close fd_in\n"); fd_in = -1; @@ -1264,14 +1269,16 @@ free(control->outfile); return true; error: - if (STDIN && (fd_in > 0)) close(fd_in); - if ((!STDOUT) && (fd_out > 0)) close(fd_out); + if (STDIN && (fd_in > 0)) + close(fd_in); + if ((!STDOUT) && (fd_out > 0)) + close(fd_out); return false; } bool initialise_control(rzip_control *control) { - struct timeval tv; + time_t now_t, tdiff; char *eptr; /* for environment */ memset(control, 0, sizeof(rzip_control)); @@ -1292,9 +1299,17 @@ /* The first 5 bytes of the salt is the time in seconds. * The next 2 bytes encode how many times to hash the password. * The last 9 bytes are random data, making 16 bytes of salt */ - if (unlikely(gettimeofday(&tv, NULL))) - fatal_return(("Failed to gettimeofday in main\n"), false); - control->secs = tv.tv_sec; + if (unlikely((now_t = time(NULL)) == ((time_t)-1))) + fatal_return(("Failed to call time in main\n"), false); + if (unlikely(now_t < T_ZERO)) { + print_output("Warning your time reads before the year 2011, check your system clock\n"); + now_t = T_ZERO; + } + /* Workaround for CPUs no longer keeping up with Moore's law! + * This way we keep the magic header format unchanged. */ + tdiff = (now_t - T_ZERO) / 4; + now_t = T_ZERO + tdiff; + control->secs = now_t; control->encloops = nloops(control->secs, control->salt, control->salt + 1); if (unlikely(!get_rand(control, control->salt + 2, 6))) return false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lrzip-0.630/main.c new/lrzip-0.631/main.c --- old/lrzip-0.630/main.c 2016-06-10 13:05:39.000000000 +0200 +++ new/lrzip-0.631/main.c 2016-10-17 12:30:47.000000000 +0200 @@ -98,11 +98,12 @@ print_output(" -f, --force force overwrite of any existing files\n"); if (compat) print_output(" -k, --keep don't delete source files on de/compression\n"); - print_output(" -%s, --keep-broken keep broken or damaged output files\n", compat ? "K" : "k, -K"); + print_output(" -K, --keep-broken keep broken or damaged output files\n"); print_output(" -o, --outfile filename specify the output file name and/or path\n"); print_output(" -O, --outdir directory specify the output directory when -o is not used\n"); print_output(" -S, --suffix suffix specify compressed suffix (default '.lrz')\n"); print_output("Options affecting compression:\n"); + print_output(" --lzma lzma compression (default)\n"); print_output(" -b, --bzip2 bzip2 compression\n"); print_output(" -g, --gzip gzip compression using zlib\n"); print_output(" -l, --lzo lzo compression (ultra fast)\n"); @@ -114,7 +115,8 @@ print_output(" --fast alias for -1\n"); print_output(" --best alias for -9\n"); } - print_output(" -L, --level level set lzma/bzip2/gzip compression level (1-9, default 7)\n"); + if (!compat) + print_output(" -L, --level level set lzma/bzip2/gzip compression level (1-9, default 7)\n"); print_output(" -N, --nice-level value Set nice value to value (default %d)\n", compat ? 0 : 19); print_output(" -p, --threads value Set processor count to override number of threads\n"); print_output(" -m, --maxram size Set maximim available ram in hundreds of MB\n"); @@ -130,6 +132,17 @@ } +static void license(void) +{ + print_output("lrz version %s\n", PACKAGE_VERSION); + print_output("Copyright (C) Con Kolivas 2006-2016\n"); + print_output("Based on rzip "); + print_output("Copyright (C) Andrew Tridgell 1998-2003\n\n"); + print_output("This is free software. You may redistribute copies of it under the terms of\n"); + print_output("the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.\n"); + print_output("There is NO WARRANTY, to the extent permitted by law.\n"); +} + static void sighandler(int sig __UNUSED__) { struct termios termios_p; @@ -224,24 +237,26 @@ {"keep-broken", no_argument, 0, 'k'}, {"keep-broken", no_argument, 0, 'K'}, {"lzo", no_argument, 0, 'l'}, - {"level", required_argument, 0, 'L'}, - {"maxram", required_argument, 0, 'm'}, /* 15 */ + {"lzma", no_argument, 0, '/'}, + {"level", optional_argument, 0, 'L'}, /* 15 */ + {"license", no_argument, 0, 'L'}, + {"maxram", required_argument, 0, 'm'}, {"no-compress", no_argument, 0, 'n'}, {"nice-level", required_argument, 0, 'N'}, {"outfile", required_argument, 0, 'o'}, - {"outdir", required_argument, 0, 'O'}, - {"threads", required_argument, 0, 'p'}, /* 20 */ + {"outdir", required_argument, 0, 'O'}, /* 20 */ + {"threads", required_argument, 0, 'p'}, {"progress", no_argument, 0, 'P'}, {"quiet", no_argument, 0, 'q'}, {"recursive", no_argument, 0, 'r'}, {"suffix", required_argument, 0, 'S'}, - {"test", no_argument, 0, 't'}, - {"threshold", required_argument, 0, 'T'}, /* 25 */ + {"test", no_argument, 0, 't'}, /* 25 */ + {"threshold", required_argument, 0, 'T'}, {"unlimited", no_argument, 0, 'U'}, {"verbose", no_argument, 0, 'v'}, {"version", no_argument, 0, 'V'}, - {"window", required_argument, 0, 'w'}, - {"zpaq", no_argument, 0, 'z'}, /* 30 */ + {"window", required_argument, 0, 'w'}, /* 30 */ + {"zpaq", no_argument, 0, 'z'}, {"fast", no_argument, 0, '1'}, {"best", no_argument, 0, '9'}, {0, 0, 0, 0}, @@ -287,6 +302,9 @@ closedir(dirp); } +static const char *loptions = "bcCdDefghHiKlL:nN:o:O:p:PqrS:tTUm:vVw:z?"; +static const char *coptions = "bcCdefghHikKlLnN:o:O:p:PrS:tTUm:vVw:z?123456789"; + int main(int argc, char *argv[]) { bool lrzcat = false, compat = false, recurse = false; @@ -331,7 +349,7 @@ else if (!strstr(eptr,"NOCONFIG")) read_config(control); - while ((c = getopt_long(argc, argv, "bcCdDefghHikKlL:nN:o:O:pPqrS:tTUm:vVw:z?123456789", long_options, &i)) != -1) { + while ((c = getopt_long(argc, argv, compat ? coptions : loptions, long_options, &i)) != -1) { switch (c) { case 'b': if (control->flags & FLAG_NOT_LZMA) @@ -389,6 +407,10 @@ control->flags |= FLAG_LZO_COMPRESS; break; case 'L': + if (compat) { + license(); + exit(0); + } control->compression_level = atoi(optarg); if (control->compression_level < 1 || control->compression_level > 9) failure("Invalid compression level (must be 1-9)\n"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lrzip-0.630/man/lrz.1.pod new/lrzip-0.631/man/lrz.1.pod --- old/lrzip-0.630/man/lrz.1.pod 2016-06-10 13:05:39.000000000 +0200 +++ new/lrzip-0.631/man/lrz.1.pod 2016-06-14 05:47:51.000000000 +0200 @@ -1,3 +1,5 @@ +#!/usr/bin/perl -w + # Copyright # # Copyright (C) 2016 Con Kolivas @@ -38,63 +40,278 @@ =pod +=encoding utf8 + =head1 NAME lrz - gzip compatible command line variant of lrzip + =head1 SYNOPSIS - lrz [OPTIONS] <file> +B<lrz> [options] I<file> + =head1 DESCRIPTION -lrz is identical to the lrzip application however its command line options and -behaviour are made to be as compatible with gzip as possible. +B<lrz> is identical to the B<lrzip> application, however, its command +line options and behaviour are made to be as compatible with B<gzip> +as possible. =head1 OPTIONS -lrz differs from lrzip by accepting the following commands: +=head2 General options + +=over 9 + +=item B<--stdout> + +=item B<-c> + +Output to STDOUT. + + +=item B<--check> + +=item B<-C> + +Check integrity of file written on decompression. + + +=item B<--decompress> + +=item B<-d> + +Decompress. + + +=item B<--encrypt> + +=item B<-e> + +Password protect sha512/aes128 encryption on compression. + + +=item B<--help> + +=item B<-h> + +=item B<-?> + +Show help. + + +=item B<--hash> + +=item B<-H> + +Display md5 hash integrity information. + + +=item B<--info> + +=item B<-i> + +Show compressed file information. + + +=item B<--license> + +=item B<-L> + +Display software version and license. + + +=item B<--progress> + +=item B<-P> + +Show compression progress. + + +=item B<--recursive> + +=item B<-r> + +Operate recursively on directories. + + +=item B<--test> + +=item B<-t> + +Test compressed file integrity. + + +=item B<--verbose> + +=item B<-v[vv]> + +Increase verbosity. + + +=item B<--version> + +=item B<-V> + +Show version. + + +=back + + +=head2 Options affecting output + +=over 9 + +=item B<--force> + +=item B<-f> + +Force overwrite of any existing files. + + +=item B<--keep> + +=item B<-k> + +Don't delete source files on de/compression. + + +=item B<--keep-broken> + +=item B<-K> + +Keep broken or damaged output files. + + +=item B<--outfile> I<name> + +=item B<-o> I<name> + +Specify the output file name and/or path. + + +=item B<--outdir> I<dir> + +=item B<-O> I<dir> + +Specify the output directory when B<-o> is not used. + + +=item B<--suffix> I<suffix> + +=item B<-S> I<suffix> + +Specify compressed suffix (default '.lrz'). + + +=back + +=head2 Options affecting compression + +=over 9 + +=item B<--bzip2> + +=item B<-b> + +Bzip2 compression. + +=item B<--gzip> + +=item B<-g> + +Gzip compression using zlib. + +=item B<--lzo> + +=item B<-l> + +Lzo compression (ultra fast). + +=item B<--lzma> + +Lzma compression (default). + +=item B<--no-compress> + +=item B<-n> + +No backend compression - prepare for other compressor. + +=item B<--zpaq> + +=item B<-z> + +Zpaq compression (best, extreme compression, extremely slow). + + +=back + +=head2 Low level options + +=over 9 + +=item B<-1> .. B<-9> + +=item B<--level> I<level> + +=item B<-L> I<level> + +Set lzma/bzip2/gzip compression level (1-9, default 7). + + +=item B<--fast> + +Alias for B<-1>. + + +=item B<--best> + +Alias for B<-9>. + + +=item B<--nice-level> I<value> + +=item B<-N> I<value> + +Set nice value to I<value> (default 0). + + +=item B<--threads> I<value> + +=item B<-P> I<value> + +Set processor count to override number of threads. + +=item B<--maxram> I<size> + +=item B<-m> I<size> + +Set maximim available ram as I<size> * 100 MB. +Overrides detected amount of available ram. + +=item B<--threshold> + +=item B<-T> + +Disable LZO compressibility testing. + +=item B<--unlimited> + +=item B<-U> + +Use unlimited window size beyond ramsize (potentially much slower). + +=item B<--window> I<size> + +=item B<-w> I<size> + +Set maximum compression window as I<size> * 100 MB. +Default chosen by heuristic dependent on ram and chosen compression. -General options: - -c, --stdout output to STDOUT - -C, --check check integrity of file written on decompression - -d, --decompress decompress - -e, --encrypt password protected sha512/aes128 encryption on compression - -h, -?, --help show help - -H, --hash display md5 hash integrity information - -i, --info show compressed file information - -L, --license display software version and license - -P, --progress show compression progress - -r, --recursive operate recursively on directories - -t, --test test compressed file integrity - -v[vv], --verbose Increase verbosity - -V, --version show version -Options affecting output: - -f, --force force overwrite of any existing files - -k, --keep don't delete source files on de/compression - -K, --keep-broken keep broken or damaged output files - -o, --outfile filename specify the output file name and/or path - -O, --outdir directory specify the output directory when -o is not used - -S, --suffix suffix specify compressed suffix (default '.lrz') -Options affecting compression: - -b, --bzip2 bzip2 compression - -g, --gzip gzip compression using zlib - -l, --lzo lzo compression (ultra fast) - -n, --no-compress no backend compression - prepare for other compressor - -z, --zpaq zpaq compression (best, extreme compression, extremely slow) -Low level options: - -1 .. -9 set lzma/bzip2/gzip compression level (1-9, default 7) - --fast alias for -1 - --best alias for -9 - -L, --level level set lzma/bzip2/gzip compression level (1-9, default 7) - -N, --nice-level value Set nice value to value (default 0) - -p, --threads value Set processor count to override number of threads - -m, --maxram size Set maximim available ram in hundreds of MB - overrides detected ammount of available ram - -T, --threshold Disable LZO compressibility testing - -U, --unlimited Use unlimited window size beyond ramsize (potentially much slower) - -w, --window size maximum compression window in hundreds of MB - default chosen by heuristic dependent on ram and chosen compression +=back See also lrzip(1)
