Hello community, here is the log from the commit of package plowshare for openSUSE:Factory checked in at 2017-08-28 16:17:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plowshare (Old) and /work/SRC/openSUSE:Factory/.plowshare.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plowshare" Mon Aug 28 16:17:25 2017 rev:8 rq:519135 version:2.1.7 Changes: -------- --- /work/SRC/openSUSE:Factory/plowshare/plowshare.changes 2017-07-25 11:41:12.129515590 +0200 +++ /work/SRC/openSUSE:Factory/.plowshare.new/plowshare.changes 2017-08-28 16:17:25.900562612 +0200 @@ -1,0 +2,8 @@ +Mon Aug 28 13:10:13 UTC 2017 - mplus...@suse.com + +- Update to version 2.1.7: + * [plowdown] support --run-before/--run-after with spaces (#74) + * [plowdown] add --min-rate switch (#91) + * [core] user plowshare.conf can be a symbolic link (#95) + +------------------------------------------------------------------- Old: ---- plowshare-2.1.6.tar.gz New: ---- plowshare-2.1.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plowshare.spec ++++++ --- /var/tmp/diff_new_pack.8vSoKM/_old 2017-08-28 16:17:26.968412546 +0200 +++ /var/tmp/diff_new_pack.8vSoKM/_new 2017-08-28 16:17:27.008406926 +0200 @@ -17,7 +17,7 @@ Name: plowshare -Version: 2.1.6 +Version: 2.1.7 Release: 0 Summary: Download and upload files from file-sharing websites License: GPL-3.0+ ++++++ plowshare-2.1.6.tar.gz -> plowshare-2.1.7.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plowshare-2.1.6/.gitignore new/plowshare-2.1.7/.gitignore --- old/plowshare-2.1.6/.gitignore 2016-10-30 10:46:54.000000000 +0100 +++ new/plowshare-2.1.7/.gitignore 2017-08-07 16:58:28.000000000 +0200 @@ -2,3 +2,7 @@ *.rej *~ *.*.swp +debian/*.log +debian/*.substvars +debian/*/*/* +debian/files diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plowshare-2.1.6/CHANGELOG new/plowshare-2.1.7/CHANGELOG --- old/plowshare-2.1.6/CHANGELOG 2016-10-30 10:46:54.000000000 +0100 +++ new/plowshare-2.1.7/CHANGELOG 2017-08-07 16:58:28.000000000 +0200 @@ -1,3 +1,11 @@ +plowshare (2.1.7) stable; urgency=low + + * [plowdown] support --run-before/--run-after with spaces (#74) + * [plowdown] add --min-rate switch (#91) + * [core] user plowshare.conf can be a symbolic link (#95) + + -- Matthieu Crapet <mcra...@gmail.com> Mon, 07 Aug 2017 16:45:55 +0200 + plowshare (2.1.6) stable; urgency=low * API function delete_filter_line: eat lines until regexp is met. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plowshare-2.1.6/INSTALL new/plowshare-2.1.7/INSTALL --- old/plowshare-2.1.6/INSTALL 2016-10-30 10:46:54.000000000 +0100 +++ new/plowshare-2.1.7/INSTALL 2017-08-07 16:58:28.000000000 +0200 @@ -47,7 +47,7 @@ This is the easiest method, Plowshare is available for several Linux distribution: # Archlinux (https://www.archlinux.org/packages/community/any/plowshare/) -$ yaourt -Sy plowshare +$ pacman -Syu plowshare # Gentoo (http://packages.gentoo.org/package/net-misc/plowshare) $ emerge -av plowshare diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plowshare-2.1.6/README.md new/plowshare-2.1.7/README.md --- old/plowshare-2.1.6/README.md 2016-10-30 10:46:54.000000000 +0100 +++ new/plowshare-2.1.7/README.md 2017-08-07 16:58:28.000000000 +0200 @@ -15,7 +15,7 @@ Plowshare itself doesn't support any websites (named *module*). It's just the core engine. Concerning modules, few are available separately and must be installed in user directory (see [below](#install)). -### Features +### Features - Small footprint (few shell scripts). No java, no python. Run fast on embedded devices. - Few dependencies and portable. [Bash](https://www.gnu.org/software/bash/) and [cURL](http://curl.haxx.se/) are enough for most hosters. @@ -65,7 +65,7 @@ ```sh $ cat file_with_links.txt -# This is a comment +# This is a comment http://depositfiles.com/files/abcdefghi http://www.rapidshare.com/files/86545320/Tux-Trainer_25-01-2008.rar $ plowdown file_with_links.txt @@ -532,7 +532,7 @@ ```sh $ cat finalaria.sh #!/bin/bash -aria2c -x2 $4 +aria2c -x2 $4 >/dev/tty $ plowdown -a user:password --skip-final --run-after ./finalaria.sh \ http://depositfiles.com/files/fv2u9xqya diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plowshare-2.1.6/docs/plowdown.1 new/plowshare-2.1.7/docs/plowdown.1 --- old/plowshare-2.1.6/docs/plowdown.1 2016-10-30 10:46:54.000000000 +0100 +++ new/plowshare-2.1.7/docs/plowdown.1 2017-08-07 16:58:28.000000000 +0200 @@ -1,4 +1,4 @@ -.\" Copyright (c) 2010\-2016 Plowshare Team +.\" Copyright (c) 2010\-2017 Plowshare Team .\" .\" This is free documentation; you can redistribute it and/or .\" modify it under the terms of the GNU General Public License as @@ -19,7 +19,7 @@ .\" License along with this manual; if not, see .\" <http://www.gnu.org/licenses/>. -.TH "plowdown" "1" "July 13, 2016" "GPL" "Plowshare for Bash 4" +.TH "plowdown" "1" "April 2, 2017" "GPL" "Plowshare for Bash 4" .SH NAME plowdown \- Simple download manager for file sharing websites @@ -187,6 +187,9 @@ \fBm\fR or \fBMi\fR for mebibytes (mB or MiB i.e. 1024^2). .RE .TP +.BI " " " " --min-rate= SPEED +Limit download minimum speed in bytes per second (for a delay of 30 seconds). Suffixes are the same than \fB--max-rate\fR. +.TP .BI " " " " --temp-directory= DIRECTORY Directory for temporary files: final link download, cookies, images, ... .TP @@ -205,7 +208,7 @@ limitation (usually one unique HTTP GET request for anonymous users), same IP address, etc. .TP .BI " " " " --run-before= PROGRAM -Call external program or script before new link processing. Provided executable can be located in \fIPATH\fR environment variable. +Call external program or script before new link processing (before calling module download function). Provided executable can be located in \fIPATH\fR environment variable. Messages can be sent to stderr, stdout is trashed. Three arguments are given: @@ -498,7 +501,7 @@ .SH AUTHORS Plowshare was initially written by Arnau Sanchez. See the AUTHORS file for a list of some of the many other contributors. -Plowshare is (C) 2010-2016 The Plowshare Team +Plowshare is (C) 2010-2017 The Plowshare Team .SH "SEE ALSO" .BR plowup (1), .BR plowdel (1), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plowshare-2.1.6/docs/plowlist.1 new/plowshare-2.1.7/docs/plowlist.1 --- old/plowshare-2.1.6/docs/plowlist.1 2016-10-30 10:46:54.000000000 +0100 +++ new/plowshare-2.1.7/docs/plowlist.1 2017-08-07 16:58:28.000000000 +0200 @@ -50,7 +50,7 @@ .TP .BI -t, " " --timeout= SECS This is useful for mirroring/multi-upload services. \ -Remote links may not be avaialble or partially, in this case, module exit status is \fB10\fR (temporary unavailable error). \ +Remote links may not be available or partially, in this case, module exit status is \fB10\fR (temporary unavailable error). \ plowlist will wait exponentially until \fISECS\fR (seconds) is reached. \ When unspecified, this option is zero (no wait, same legacy behavior) and applies for one single URL listing. Note: Don't give a too big value here (I'll advise few minutes), some hosters may be stuck in some "queued for upload" state. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plowshare-2.1.6/scripts/plowshare.completion new/plowshare-2.1.7/scripts/plowshare.completion --- old/plowshare-2.1.6/scripts/plowshare.completion 2016-10-30 10:46:54.000000000 +0100 +++ new/plowshare-2.1.7/scripts/plowshare.completion 2017-08-07 16:58:28.000000000 +0200 @@ -96,7 +96,7 @@ COMPREPLY=( $( compgen -W '0 1 2 3 4' -- $cur ) ) return 0 ;; - -a|-b|-p|--auth-free|--auth|--link-password|--9kweu|--antigate|--captchabhood|--captchacoin|--deathbycaptcha|--min-space|--max-rate|-r|--max-retries|-t|--timeout|--printf) + -a|-b|-p|--auth-free|--auth|--link-password|--9kweu|--antigate|--captchabhood|--captchacoin|--deathbycaptcha|--min-space|--max-rate|--min-rate|-r|--max-retries|-t|--timeout|--printf) # argument required but no completion available return 0 ;; @@ -125,7 +125,7 @@ if [[ $cur = -* ]]; then COMPREPLY=( $( compgen -W '--help --longhelp --version --quiet --verbose \ -v -q -i -o -m -r -t -x \ - --min-space --max-rate --interface --mark-downloaded --no-overwrite --cache \ + --min-space --max-rate --min-rate --interface --mark-downloaded --no-overwrite --cache \ --output-directory --temp-directory --temp-rename --timeout --max-retries \ --captchamethod --captchaprogram --9kweu --antigate --captchabhood --captchacoin --deathbycaptcha \ --fallback --printf --run-before --run-after --no-curlrc --curlrc --no-plowsharerc --plowsharerc' -- $cur ) ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plowshare-2.1.6/src/core.sh new/plowshare-2.1.7/src/core.sh --- old/plowshare-2.1.6/src/core.sh 2016-10-30 10:46:54.000000000 +0100 +++ new/plowshare-2.1.7/src/core.sh 2017-08-07 16:58:28.000000000 +0200 @@ -2965,8 +2965,8 @@ if [ -z "$3" ]; then CONFIG="$PLOWSHARE_CONFDIR/plowshare.conf" - test -f "$CONFIG" || CONFIG='/etc/plowshare.conf' - test -f "$CONFIG" || return 0 + test -r "$CONFIG" || CONFIG='/etc/plowshare.conf' + test -r "$CONFIG" || return 0 else CONFIG=$3 fi @@ -3011,25 +3011,28 @@ if [ -z "$4" ]; then CONFIG="$PLOWSHARE_CONFDIR/plowshare.conf" - test -f "$CONFIG" || CONFIG='/etc/plowshare.conf' - test -f "$CONFIG" || return 0 + test -r "$CONFIG" || CONFIG='/etc/plowshare.conf' + test -r "$CONFIG" || return 0 else CONFIG=$4 fi - # Security check - if [ -f "$CONFIG" ]; then - if [ -O "$CONFIG" ]; then - # First 10 characters: access rights (human readable form) - local FILE_PERM=$(ls -l "$CONFIG" 2>/dev/null) + # Security check (but don't check permission/ownership on global config) + if [ -r "$CONFIG" ]; then + if [ "$CONFIG" != '/etc/plowshare.conf' ]; then + if [ -O "$CONFIG" ]; then + # First 10 characters: access rights (human readable form) + local FILE_PERM=$(ls -l -L "$CONFIG" 2>/dev/null) - if [[ ${FILE_PERM:4:6} != '------' ]]; then - log_notice "WARNING: Wrong configuration file permissions. Fix it with: chmod 600 $CONFIG" + if [[ ${FILE_PERM:4:6} != '------' ]]; then + log_notice "WARNING: Wrong configuration file permissions. Fix it with: chmod 600 $CONFIG" + fi + else + log_notice "WARNING: Bad configuration file ownership. Fix it with: chown $USER $CONFIG" fi - else - log_notice "WARNING: Bad configuration file ownership. Fix it with: chown $USER $CONFIG" fi else + log_error "ERROR: cannot access file \`$CONFIG'" return 0 fi @@ -3273,7 +3276,7 @@ return $ERR_FATAL fi - echo "$F" + quote "$F" } # Check for positive speed rate diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plowshare-2.1.6/src/download.sh new/plowshare-2.1.7/src/download.sh --- old/plowshare-2.1.6/src/download.sh 2016-10-30 10:46:54.000000000 +0100 +++ new/plowshare-2.1.7/src/download.sh 2017-08-07 16:58:28.000000000 +0200 @@ -38,6 +38,7 @@ TEMP_DIR,,temp-directory,D=DIR,Directory for temporary files (final link download, cookies, images) TEMP_RENAME,,temp-rename,,Append .part suffix to filename while file is being downloaded MAX_LIMIT_RATE,,max-rate,r=SPEED,Limit maximum speed to bytes/sec (accept usual suffixes) +MIN_LIMIT_RATE,,min-rate,r=SPEED,Limit minimum speed to bytes/sec (during 30 seconds) MIN_LIMIT_SPACE,,min-space,R=LIMIT,Set the minimum amount of disk space to exit. INTERFACE,i,interface,s=IFACE,Force IFACE network interface TIMEOUT,t,timeout,n=SECS,Timeout after SECS seconds of waits @@ -843,6 +844,13 @@ fi fi +if [ -n "$MAX_LIMIT_RATE" -a -n "$MIN_LIMIT_RATE" ]; then + if (( MAX_LIMIT_RATE < MIN_LIMIT_RATE )); then + log_error "--min-rate ($MIN_LIMIT_RATE) is greater than --max-rate ($MAX_LIMIT_RATE)" + exit $ERR_BAD_COMMAND_LINE + fi +fi + if [ -n "$TEMP_DIR" ]; then TMPDIR=${TEMP_DIR%/} log_notice "Temporary directory: $TMPDIR" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plowshare-2.1.6/src/mod.sh new/plowshare-2.1.7/src/mod.sh --- old/plowshare-2.1.6/src/mod.sh 2016-10-30 10:46:54.000000000 +0100 +++ new/plowshare-2.1.7/src/mod.sh 2017-08-07 16:58:28.000000000 +0200 @@ -92,6 +92,7 @@ log_notice "- installing new directory: $L" if [ -d "$L" -a -n "$HAVE_GIT" ]; then + # Note: git -C <path> is available since v1.8.5 if git -C "$L" rev-parse --is-inside-work-tree &>/dev/null; then log_notice 'WARNING: directory already exists! Do a git pull.' git -C "$L" pull --quiet @@ -123,6 +124,7 @@ if [ -d "$L" ]; then if [ -n "$HAVE_GIT" ]; then + # Note: git -C <path> is available since v1.8.5 if git -C "$L" rev-parse --is-inside-work-tree &>/dev/null; then git -C "$L" pull --quiet else
