Hello community,
here is the log from the commit of package obs-service-recompress for
openSUSE:Factory checked in at 2016-02-25 22:10:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/obs-service-recompress (Old)
and /work/SRC/openSUSE:Factory/.obs-service-recompress.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "obs-service-recompress"
Changes:
--------
---
/work/SRC/openSUSE:Factory/obs-service-recompress/obs-service-recompress.changes
2015-08-01 11:35:50.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.obs-service-recompress.new/obs-service-recompress.changes
2016-02-26 00:37:08.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Feb 17 13:14:50 UTC 2016 - [email protected]
+
+- Update to version 0.3.1+git20160217.7897d3f:
+ + security fixes
+
+-------------------------------------------------------------------
Old:
----
obs-service-recompress-0.3.1+git20150622.d908b54.tar.gz
New:
----
obs-service-recompress-0.3.1+git20160217.7897d3f.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ obs-service-recompress.spec ++++++
--- /var/tmp/diff_new_pack.p6jePe/_old 2016-02-26 00:37:09.000000000 +0100
+++ /var/tmp/diff_new_pack.p6jePe/_new 2016-02-26 00:37:09.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package obs-service-recompress
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
%define service recompress
Name: obs-service-%{service}
-Version: 0.3.1+git20150622.d908b54
+Version: 0.3.1+git20160217.7897d3f
Release: 0
Summary: An OBS source service: Recompress files
License: GPL-2.0+
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.p6jePe/_old 2016-02-26 00:37:09.000000000 +0100
+++ /var/tmp/diff_new_pack.p6jePe/_new 2016-02-26 00:37:09.000000000 +0100
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param
name="url">[email protected]:openSUSE/obs-service-recompress.git</param>
- <param
name="changesrevision">d908b54ba0197706bf9a5e5781717f8e4ad6a62d</param></service></servicedata>
\ No newline at end of file
+ <param
name="changesrevision">7897d3fd693fb16a4726da3cc258194c97e619de</param></service></servicedata>
\ No newline at end of file
++++++ debian.dsc ++++++
--- /var/tmp/diff_new_pack.p6jePe/_old 2016-02-26 00:37:09.000000000 +0100
+++ /var/tmp/diff_new_pack.p6jePe/_new 2016-02-26 00:37:09.000000000 +0100
@@ -1,6 +1,6 @@
Format: 1.0
Source: obs-service-recompress
-Version: 0.3.1+git20150622.d908b54
+Version: 0.3.1+git20160217.7897d3f
Binary: obs-service-recompress
Maintainer: Adrian Schroeter <[email protected]>
Architecture: all
++++++ obs-service-recompress-0.3.1+git20150622.d908b54.tar.gz ->
obs-service-recompress-0.3.1+git20160217.7897d3f.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-recompress-0.3.1+git20150622.d908b54/Makefile
new/obs-service-recompress-0.3.1+git20160217.7897d3f/Makefile
--- old/obs-service-recompress-0.3.1+git20150622.d908b54/Makefile
2015-06-24 17:56:34.000000000 +0200
+++ new/obs-service-recompress-0.3.1+git20160217.7897d3f/Makefile
2016-02-17 14:14:50.000000000 +0100
@@ -9,4 +9,7 @@
install -m 0755 recompress $(DESTDIR)$(servicedir)
install -m 0644 recompress.service $(DESTDIR)$(servicedir)
-.PHONY: all install
+test:
+ prove t/*.t
+
+.PHONY: all install test
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-recompress-0.3.1+git20150622.d908b54/recompress
new/obs-service-recompress-0.3.1+git20160217.7897d3f/recompress
--- old/obs-service-recompress-0.3.1+git20150622.d908b54/recompress
2015-06-24 17:56:34.000000000 +0200
+++ new/obs-service-recompress-0.3.1+git20160217.7897d3f/recompress
2016-02-17 14:14:50.000000000 +0100
@@ -89,7 +89,7 @@
fi
# do the real work
- $UNCOMPRESS "$FILE" | $COMPRESS > "$MYOUTDIR/$NEWFILE" || exit 1
+ $UNCOMPRESS -- "$FILE" | $COMPRESS > "$MYOUTDIR/$NEWFILE" || exit 1
# Check if the (compressed) target file already exists in the directory where
# the service is invoked and drop the newly generated one. Avoids overwriting
@@ -100,22 +100,22 @@
SRC_DIR="$PWD"
cd $DIFF_TMPDIR
mkdir new old
- $(cd new ; tar -xxf "$MYOUTDIR/$NEWFILE" 2> /dev/null || mv
"$MYOUTDIR/$NEWFILE" .)
- $(cd old ; tar -xxf "$SRC_DIR/$NEWFILE" 2> /dev/null || mv
"$SRC_DIR/$NEWFILE" .)
+ $(cd new ; tar -xf "$MYOUTDIR/$NEWFILE" 2> /dev/null || mv --
"$MYOUTDIR/$NEWFILE" .)
+ $(cd old ; tar -xf "$SRC_DIR/$NEWFILE" 2> /dev/null || mv --
"$SRC_DIR/$NEWFILE" .)
if diff -r new old > /dev/null ; then
echo "Identical target file $NEWFILE already exists, skipping.."
- rm -r "$MYOUTDIR/$NEWFILE"
+ rm -r -- "$MYOUTDIR/$NEWFILE"
else
echo "Compressed $FILE to $NEWFILE"
fi
cd $SRC_DIR
- rm -rf $DIFF_TMPDIR
+ rm -rf -- "$DIFF_TMPDIR"
else
echo "Compressed $FILE to $NEWFILE"
fi
# we can remove service files, no need to store them twice
- rm -f "$FILE"
+ rm -f -- "$FILE"
done
exit 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-recompress-0.3.1+git20150622.d908b54/t/000_base.t
new/obs-service-recompress-0.3.1+git20160217.7897d3f/t/000_base.t
--- old/obs-service-recompress-0.3.1+git20150622.d908b54/t/000_base.t
1970-01-01 01:00:00.000000000 +0100
+++ new/obs-service-recompress-0.3.1+git20160217.7897d3f/t/000_base.t
2016-02-17 14:14:50.000000000 +0100
@@ -0,0 +1,71 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+use FindBin;
+use Test::More tests => 8;
+use File::Copy;
+use Data::Dumper;
+
+my $temp_dir = $FindBin::Bin."/tmp";
+my $in_dir = $FindBin::Bin."/in";
+my $data_dir = $FindBin::Bin."/data";
+my $test_file = "testfile";
+my $last_ext='';
+
+# prepare test environment
+( -d $temp_dir ) || mkdir $temp_dir;
+( -d $in_dir ) || mkdir $in_dir;
+copy("$data_dir/$test_file","$in_dir/$test_file");
+
+# From To
+# none gz
+# gz bz2
+# bz2 xz
+# xz none
+
+for my $tc (qw/ gz bz2 xz none/ ) {
+
+ my $in_file = "$test_file".( ($last_ext) ? ".$last_ext" : '' );
+ my $out_file = "$temp_dir/$test_file".( ($tc ne 'none') ? ".$tc" : '' );
+
+ my $cmd="cd $in_dir;$FindBin::Bin/../recompress --outdir $temp_dir
--compression $tc --file $in_file;ls $temp_dir;ls";
+ `$cmd`;
+ ok( -f $out_file,"Checking creation of $tc");
+ ok(scalar(list_dir($temp_dir)) == 1,"Checking single file of $tc");
+ move($out_file,$in_dir);
+ $last_ext = $tc;
+
+}
+
+rm_r($in_dir);
+rm_r($temp_dir);
+
+exit 0;
+
+sub list_dir {
+ my @res;
+ opendir(my $dh,$_[0]);
+ while ( my $f = readdir($dh) ) { push(@res, $f) if ( $f ne '.' and $f
ne '..') }
+ closedir($dh);
+ return @res;
+}
+
+sub rm_r {
+ my $p = $_[0];
+ if ( -d $p ) {
+ opendir(my $dh,$p)|| die "Error while opening directory $p:
$!\n";
+
+ while ( my $f = readdir($dh) ) {
+ if ($f ne '.' and $f ne '..') {
+ if (-d "$p/$f" ) {
+ rm_r("$p/$f") if ( -d "$p/$f" );
+ } else {
+ unlink "$p/$f" || die "Could not unlink
$p/$f: $!\n";
+ }
+ }
+ }
+ closedir($dh);
+ }
+ unlink $p || die "Could not unlink $p: $!\n";
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-recompress-0.3.1+git20150622.d908b54/t/data/testfile
new/obs-service-recompress-0.3.1+git20160217.7897d3f/t/data/testfile
--- old/obs-service-recompress-0.3.1+git20150622.d908b54/t/data/testfile
1970-01-01 01:00:00.000000000 +0100
+++ new/obs-service-recompress-0.3.1+git20160217.7897d3f/t/data/testfile
2016-02-17 14:14:50.000000000 +0100
@@ -0,0 +1 @@
+test
