Hello community, here is the log from the commit of package mirror for openSUSE:Factory checked in at 2017-02-01 09:54:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mirror (Old) and /work/SRC/openSUSE:Factory/.mirror.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mirror" Changes: -------- --- /work/SRC/openSUSE:Factory/mirror/mirror.changes 2013-03-28 13:21:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mirror.new/mirror.changes 2017-02-03 17:50:15.354184632 +0100 @@ -1,0 +2,14 @@ +Tue Jan 31 13:26:48 UTC 2017 - [email protected] + +- Cleanup with spec-cleaner, use sane description bsc#1022798 +- Refresh patches to use unified diff: + * dont-build-as-root.diff + * mirror-2.9.gzip.patch + * mirror-2.9.name_map-default.patch + * mirror-2.9.patch + * mirror-2.9.y2k-fix.patch + * mirror-exec-path.dif + * mirror-timelocal.patch + * mirror-2.9.ftp-ls-timeout.patch + +------------------------------------------------------------------- Old: ---- mirror-2.9.tar.bz2 New: ---- mirror-2.9.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mirror.spec ++++++ --- /var/tmp/diff_new_pack.Pxjegj/_old 2017-02-03 17:50:16.522019981 +0100 +++ /var/tmp/diff_new_pack.Pxjegj/_new 2017-02-03 17:50:16.526019418 +0100 @@ -1,7 +1,7 @@ # # spec file for package mirror # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -17,15 +17,14 @@ Name: mirror -Requires: perl = %{perl_version} Version: 2.9 Release: 0 Summary: Perl Scripts for Mirroring FTP Servers License: SUSE-mirror Group: Productivity/Networking/Web/Utilities -Url: http://sunsite.org.uk/packages/mirror/ -Source: ftp://sunsite.org.uk/packages/mirror/%{name}-%{version}.tar.bz2 -Patch: %{name}-%{version}.patch +Url: ftp://ftp.sai.msu.su/pub/unix/FTP/mirror/ +Source0: ftp://ftp.sai.msu.su/pub/unix/FTP/mirror/%{name}-%{version}.tar.gz +Patch0: %{name}-%{version}.patch Patch1: %{name}-%{version}.ftp-ls-timeout.patch Patch2: %{name}-%{version}.y2k-fix.patch Patch3: %{name}-%{version}.name_map-default.patch @@ -33,47 +32,43 @@ Patch5: mirror-exec-path.dif Patch6: dont-build-as-root.diff Patch7: mirror-timelocal.patch +Requires: perl = %{perl_version} BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description -Documentation: "man mirror" and "man mm". - - - -Authors: --------- - Lee McLoughlin <[email protected]> +Mirror is a package written in Perl that uses the FTP protocol to duplicate +a directory hierarchy between the machine it is run on and a remote host. It +avoids copying files unnecessarily by comparing the file time-stamps and +file sizes before transferring. Amongst other things, it can optionally +rename, compress, gzip, and split files. %prep -%setup -c -%patch -%patch1 +%setup -q -c +%patch0 +%patch1 -p1 %patch2 %patch3 %patch4 -%patch5 -p0 +%patch5 %patch6 %patch7 %build %install -rm -rf $RPM_BUILD_ROOT -install -d -m 755 $RPM_BUILD_ROOT%{perl_vendorlib} -install -d -m 755 $RPM_BUILD_ROOT/usr/bin -install -d -m 755 $RPM_BUILD_ROOT%{_mandir}/man1 -make "DESTDIR=$RPM_BUILD_ROOT" install PLDIR=%{perl_vendorlib} -cd $RPM_BUILD_ROOT/usr/bin/ +install -d -m 755 %{buildroot}%{perl_vendorlib} +install -d -m 755 %{buildroot}%{_prefix}/bin +install -d -m 755 %{buildroot}%{_mandir}/man1 +%make_install PLDIR=%{perl_vendorlib} +cd %{buildroot}%{_bindir}/ ln -sf mirror-master mm -%clean -rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root) %doc *.txt *.html mirror-on-dusk.gif mirror.defaults %{perl_vendorlib}/* -/usr/bin/* -%doc %{_mandir}/man1/* +%{_bindir}/* +%{_mandir}/man1/* %changelog ++++++ dont-build-as-root.diff ++++++ --- /var/tmp/diff_new_pack.Pxjegj/_old 2017-02-03 17:50:16.554015471 +0100 +++ /var/tmp/diff_new_pack.Pxjegj/_new 2017-02-03 17:50:16.554015471 +0100 @@ -1,6 +1,8 @@ ---- makefile +Index: makefile +=================================================================== +--- makefile.orig +++ makefile -@@ -64,8 +64,6 @@ +@@ -64,8 +64,6 @@ ci: PLMODE = 644 # mode to install executables EXMODE = 755 @@ -9,7 +11,7 @@ # directory to install .pl (perl library) files PLDIR = /usr/local/perl5/lib/perl5 # directory to install public executables -@@ -74,30 +72,30 @@ +@@ -74,30 +72,30 @@ BINDIR = /usr/bin MANDIR = /usr/share/man/man1 install: ++++++ mirror-2.9.ftp-ls-timeout.patch ++++++ --- /var/tmp/diff_new_pack.Pxjegj/_old 2017-02-03 17:50:16.574012651 +0100 +++ /var/tmp/diff_new_pack.Pxjegj/_new 2017-02-03 17:50:16.574012651 +0100 @@ -1,52 +1,45 @@ -*** ftp.pl.old Fri Jun 5 10:10:27 1998 ---- ftp.pl Fri Oct 29 10:29:30 1999 -*************** -*** 270,275 **** ---- 270,282 ---- - $SIG{ 'PIPE' } = "ftp'ftp__sighandler"; - } - -+ # Setup a signal handler for user interrupts. -+ sub ftp'set_user_signals -+ { -+ $ftp_logger = @_; -+ $SIG{ 'INT' } = "ftp'ftp__sighandler"; -+ } -+ - # &ftp'set_namemap( function to map outgoing name, function to map incoming ) - sub ftp'set_namemap - { -*************** -*** 279,285 **** - } - } - -- - # &ftp'open( hostname or address, - # port to use, - # retry on call failure, ---- 286,291 ---- -*************** -*** 581,586 **** ---- 587,595 ---- - return 0; - } - -+ # shut down our end of the socket -+ &close_data_socket; -+ - # read the close - # - $ret = &expect($timeout, -*************** -*** 590,598 **** - $ret = 0; - } - -- # shut down our end of the socket -- &close_data_socket; -- - if( ! $ret ){ - return 0; - } ---- 599,604 ---- +diff -urN mirror-2.9.old/ftp.pl mirror-2.9/ftp.pl +--- mirror-2.9.old/ftp.pl 2017-01-31 14:31:19.917551342 +0100 ++++ mirror-2.9/ftp.pl 2017-01-31 14:31:44.777631533 +0100 +@@ -270,6 +270,13 @@ + $SIG{ 'PIPE' } = "ftp'ftp__sighandler"; + } + ++# Setup a signal handler for user interrupts. ++sub ftp'set_user_signals ++{ ++ $ftp_logger = @_; ++ $SIG{ 'INT' } = "ftp'ftp__sighandler"; ++} ++ + # &ftp'set_namemap( function to map outgoing name, function to map incoming ) + sub ftp'set_namemap + { +@@ -279,7 +286,6 @@ + } + } + +- + # &ftp'open( hostname or address, + # port to use, + # retry on call failure, +@@ -581,6 +587,9 @@ + return 0; + } + ++ # shut down our end of the socket ++ &close_data_socket; ++ + # read the close + # + $ret = &expect($timeout, +@@ -590,9 +599,6 @@ + $ret = 0; + } + +- # shut down our end of the socket +- &close_data_socket; +- + if( ! $ret ){ + return 0; + } ++++++ mirror-2.9.gzip.patch ++++++ --- /var/tmp/diff_new_pack.Pxjegj/_old 2017-02-03 17:50:16.594009832 +0100 +++ /var/tmp/diff_new_pack.Pxjegj/_new 2017-02-03 17:50:16.594009832 +0100 @@ -1,6 +1,8 @@ ---- mirror.defaults -+++ mirror.defaults 2002/03/15 10:54:06 -@@ -33,7 +33,7 @@ +Index: mirror.defaults +=================================================================== +--- mirror.defaults.orig ++++ mirror.defaults +@@ -33,7 +33,7 @@ package=defaults exclude_patt=(^|/)(\.mirror$|\.mirror\.log|core$|\.cap|\.in\..*\.$|MIRROR\.LOG|#.*#|\.FSP|\.cache|\.zipped|\.notar|\.message|lost\+found/|Network Trash Folder)|suky.mpe?g # Do not to compress anything compress_patt= @@ -9,9 +11,11 @@ # Don't compress information files, files that don't benifit from # being compressed, files that tell ftpd, gopher, wais... to do things, # the sources for compression programs... ---- mirror.html -+++ mirror.html 2002/03/15 10:55:31 -@@ -1070,7 +1070,7 @@ +Index: mirror.html +=================================================================== +--- mirror.html.orig ++++ mirror.html +@@ -1070,7 +1070,7 @@ files not to compress (case insensitive) <TR VALIGN=TOP> <TD ALIGN=LEFT VALIGN=TOP><A NAME="compress_prog"></A><B><I>compress_prog</I></B></TD> @@ -20,9 +24,11 @@ <TD ALIGN=LEFT VALIGN=TOP>Program to compress files. If set to the word <B>compress</B> or <B>gzip</B>, the full pathname for the program and correct ---- mirror.txt -+++ mirror.txt 2002/03/15 10:54:56 -@@ -506,7 +506,7 @@ +Index: mirror.txt +=================================================================== +--- mirror.txt.orig ++++ mirror.txt +@@ -506,7 +506,7 @@ The keywords are grouped into the follow compress_excl \.(z|gz)$ Regexp of files not to compress (case insensitive). ++++++ mirror-2.9.name_map-default.patch ++++++ --- /var/tmp/diff_new_pack.Pxjegj/_old 2017-02-03 17:50:16.610007577 +0100 +++ /var/tmp/diff_new_pack.Pxjegj/_new 2017-02-03 17:50:16.610007577 +0100 @@ -1,6 +1,8 @@ ---- mirror.defaults -+++ mirror.defaults Mon Mar 12 11:21:13 2001 -@@ -62,3 +62,5 @@ +Index: mirror.defaults +=================================================================== +--- mirror.defaults.orig ++++ mirror.defaults +@@ -62,3 +62,5 @@ package=defaults timeout=300 #failed_gets_excl=\:\ Permission denied\.$ ++++++ mirror-2.9.patch ++++++ --- /var/tmp/diff_new_pack.Pxjegj/_old 2017-02-03 17:50:16.626005321 +0100 +++ /var/tmp/diff_new_pack.Pxjegj/_new 2017-02-03 17:50:16.626005321 +0100 @@ -1,14 +1,18 @@ ---- do_unlinks.pl -+++ do_unlinks.pl 2000/04/05 13:40:08 +Index: do_unlinks.pl +=================================================================== +--- do_unlinks.pl.orig ++++ do_unlinks.pl @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl -s +#!/usr/bin/perl -s # # # ---- makefile -+++ makefile 2000/04/05 13:42:53 -@@ -65,25 +65,26 @@ +Index: makefile +=================================================================== +--- makefile.orig ++++ makefile +@@ -65,25 +65,26 @@ PLMODE = 644 # mode to install executables EXMODE = 755 # group to own all the files @@ -48,9 +52,11 @@ # directory to install .pl (perl library) files for rperl RPLDIR = /usr/local/rperl5/lib/perl5 ---- mirror.defaults -+++ mirror.defaults 2000/04/05 13:40:08 -@@ -11,12 +11,12 @@ +Index: mirror.defaults +=================================================================== +--- mirror.defaults.orig ++++ mirror.defaults +@@ -11,12 +11,12 @@ package=defaults # The LOCAL hostname - if not the same as `hostname` # (I advertise the name sunsite.org.uk but the machine is # really swallow.sunsite.org.uk.) @@ -66,7 +72,7 @@ mail_to= # Don't mirror file modes. Set all dirs/files to these dir_mode=0755 -@@ -49,11 +49,16 @@ +@@ -49,11 +49,16 @@ package=defaults # Don't delete own mirror log, .notar or .cache files (incl in subdirs) # delete_excl=(^|/)\.(mirror|notar|cache)$ # Ignore any local readme and .mirror files @@ -84,9 +90,11 @@ + timeout=300 #failed_gets_excl=\:\ Permission denied\.$ ---- mirror.pl -+++ mirror.pl 2000/04/05 13:40:08 -@@ -163,8 +163,8 @@ +Index: mirror.pl +=================================================================== +--- mirror.pl.orig ++++ mirror.pl +@@ -163,8 +163,8 @@ $sum_prog = &find_prog( 'sum' ); # SPECIAL NOTE: This is eval'd, so DONT put double-quotes (") in it. # You can get local variables to appear as in the second example: @@ -97,7 +105,7 @@ # When scanning the local directory, how often to prod the remote # system to keep the connection alive -@@ -183,7 +183,7 @@ +@@ -183,7 +183,7 @@ $win_getcwd = 'Win32::GetCwd'; # Make sure that your PERLLIB environment variable can get you # all these or that they are installed. @@ -106,19 +114,19 @@ require 'lsparse.pl'; require 'dateconv.pl'; -@@ -2329,6 +2329,15 @@ - - if( $get_patt && $src_path0 !~ /$get_patt/ ){ - &msg( " do not xfer: $src_path0\n" ) if $debug > 1; -+ next; -+ } -+ +@@ -2332,6 +2332,15 @@ sub compare_dirs + next; + } + + # important security check - [email protected] + # we don't use an allow list but an deny list because otherwise + # we will get problems with umlaute and other stuff. And the + # hole is very small anyway. + if ( $src_path =~ m/[\\\n;&<>#\`!\$\*\|]/ || $src_path =~ m/\.\./) { + print STDERR "Error: source filename contains illegal characters: \"$src_path\"\n"; - next; - } - ++ next; ++ } ++ + # Just create any needed directories (the timestamps + # should be ignored) + if( $src_type[ $srci ] eq 'd' ){ ++++++ mirror-2.9.y2k-fix.patch ++++++ --- /var/tmp/diff_new_pack.Pxjegj/_old 2017-02-03 17:50:16.650001938 +0100 +++ /var/tmp/diff_new_pack.Pxjegj/_new 2017-02-03 17:50:16.650001938 +0100 @@ -1,5 +1,7 @@ ---- dateconv.pl -+++ dateconv.pl 2001/03/11 17:55:10 +Index: dateconv.pl +=================================================================== +--- dateconv.pl.orig ++++ dateconv.pl @@ -37,8 +37,8 @@ # @@ -11,7 +13,7 @@ sub lstime_to_standard { local( $ls ) = @_; -@@ -69,6 +69,7 @@ +@@ -69,6 +69,7 @@ $month_num{ "nov" } = 10; $month_num{ "dec" } = 11; ( $mn, $yr ) = (localtime)[ 4, 5 ]; @@ -19,7 +21,7 @@ # input date and time string from ftp "ls -l", such as Mmm dd yyyy or -@@ -125,13 +126,6 @@ +@@ -125,13 +126,6 @@ sub main'lstime_to_time $year-- if( $month > $mn ); } @@ -33,7 +35,7 @@ if( $use_timelocal ){ return &'timelocal( $secs, $mins, $hours, $day, $month, $year ); } -@@ -140,7 +134,7 @@ +@@ -140,7 +134,7 @@ sub main'lstime_to_time } } @@ -42,7 +44,7 @@ sub main'time_to_standard { package dateconv; -@@ -149,5 +143,6 @@ +@@ -149,5 +143,6 @@ sub main'time_to_standard local( $sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst ) = gmtime( $time ); @@ -50,9 +52,11 @@ + $year += 1900; + return sprintf( "%2d $months[ $mon + 1 ] %4d %02d:%02d", $mday, $year, $hour, $min ); } ---- mirror.pl -+++ mirror.pl 2001/03/11 17:44:52 -@@ -646,6 +646,7 @@ +Index: mirror.pl +=================================================================== +--- mirror.pl.orig ++++ mirror.pl +@@ -646,6 +646,7 @@ while( $ARGV[ 0 ] =~ /^-/ ){ $wday,$yday,$isdst ) = localtime( time ); $mon++; @@ -60,7 +64,7 @@ $upload_log = "$home/upload_log.$mday.$mon.$year"; } -@@ -3848,12 +3849,7 @@ +@@ -3857,12 +3858,7 @@ sub t2str } local($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = @t; ++++++ mirror-exec-path.dif ++++++ --- /var/tmp/diff_new_pack.Pxjegj/_old 2017-02-03 17:50:16.665999682 +0100 +++ /var/tmp/diff_new_pack.Pxjegj/_new 2017-02-03 17:50:16.669999119 +0100 @@ -1,6 +1,8 @@ +Index: mm.pl +=================================================================== --- mm.pl.orig +++ mm.pl -@@ -63,7 +63,7 @@ +@@ -63,7 +63,7 @@ $max = 6; # $pkg is the package number fixed up to replace characters likely to give # grief under unix. # This expects the directory logs to already exist. ++++++ mirror-timelocal.patch ++++++ --- /var/tmp/diff_new_pack.Pxjegj/_old 2017-02-03 17:50:16.681997426 +0100 +++ /var/tmp/diff_new_pack.Pxjegj/_new 2017-02-03 17:50:16.685996863 +0100 @@ -1,6 +1,8 @@ ---- dateconv.pl.orig 1998-05-29 21:04:32.000000000 +0200 -+++ dateconv.pl 2013-03-27 09:12:49.235125791 +0100 -@@ -47,7 +47,7 @@ +Index: dateconv.pl +=================================================================== +--- dateconv.pl.orig ++++ dateconv.pl +@@ -47,7 +47,7 @@ sub lstime_to_standard }
