From owner-svn-ports-all@FreeBSD.ORG Mon Jun 30 03:08:22 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 937FAD73; Mon, 30 Jun 2014 03:08:22 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7487822DA; Mon, 30 Jun 2014 03:08:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5U38MmS003262; Mon, 30 Jun 2014 03:08:22 GMT (envelope-from milki@svn.freebsd.org) Received: (from milki@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5U38MJX003260; Mon, 30 Jun 2014 03:08:22 GMT (envelope-from milki@svn.freebsd.org) Message-Id: <201406300308.s5U38MJX003260@svn.freebsd.org> From: Jonathan Chu Date: Mon, 30 Jun 2014 03:08:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r359799 - in head/sysutils/tartarus: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jun 2014 03:08:22 -0000 Author: milki Date: Mon Jun 30 03:08:21 2014 New Revision: 359799 URL: http://svnweb.freebsd.org/changeset/ports/359799 QAT: https://qat.redports.org/buildarchive/r359799/ Log: Update sysutils/tartarus to 0.9.8_1 - New RUN_DEPENDS - SFTP pubkey authentication - Turned off "CHECK_FOR_UPDATE" by default - Proper handling of "-u" for CURL PR: 1941450 Submitted by: Juraj Lutter (maintainer) Approved by: eadler (mentor) Added: head/sysutils/tartarus/files/ head/sysutils/tartarus/files/patch-bin__tartarus (contents, props changed) Modified: head/sysutils/tartarus/Makefile Modified: head/sysutils/tartarus/Makefile ============================================================================== --- head/sysutils/tartarus/Makefile Sun Jun 29 23:14:14 2014 (r359798) +++ head/sysutils/tartarus/Makefile Mon Jun 30 03:08:21 2014 (r359799) @@ -3,6 +3,7 @@ PORTNAME= tartarus PORTVERSION= 0.9.8 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://wertarbyte.de/tartarus/ \ http://ftp.wilbury.sk/pub/FreeBSD/local/distfiles/ @@ -13,7 +14,9 @@ COMMENT= Wrappers around common unix too LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash +RUN_DEPENDS= ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash \ + ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar \ + ${LOCALBASE}/bin/curl:${PORTSDIR}/ftp/curl USES= gmake perl5 shebangfix tar:bzip2 SHEBANG_FILES= ${WRKSRC}/bin/* Added: head/sysutils/tartarus/files/patch-bin__tartarus ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/tartarus/files/patch-bin__tartarus Mon Jun 30 03:08:21 2014 (r359799) @@ -0,0 +1,106 @@ +--- ./bin/tartarus.orig 2014-06-28 01:35:27.535761589 +0200 ++++ ./bin/tartarus 2014-06-28 01:38:03.361776923 +0200 +@@ -41,6 +41,8 @@ + set -f + shopt -s nocasematch + ++typeset -x PATH=/usr/local/bin:/usr/local/sbin:${PATH} ++ + CMD_INCREMENTAL="no" + CMD_UPDATE="no" + PROFILE="" +@@ -527,7 +529,7 @@ + # + # Disabling this option will stop Tartarus from checking its website for updates + # of itself. +-CHECK_FOR_UPDATE="yes" ++CHECK_FOR_UPDATE="no" + # + #=item FILE_LIST_CREATION + # +@@ -540,6 +542,37 @@ + # This defines the directory lists of the processed files are placed in. + FILE_LIST_DIRECTORY="" + # ++#=item SFTP_AUTH_METHOD ++# ++# Defines SFTP authentication method: can be "password" or "pubkey" ++SFTP_AUTH_METHOD="password" ++# ++#=item SFTP_AUTH_PRIVKEY ++# ++# Defines SSH private key for authentication ++SFTP_AUTH_PRIVKEY="" ++# ++#=item SFTP_AUTH_PUBKEY ++# ++# Defines SSH public key for authentication ++SFTP_AUTH_PUBKEY="" ++# ++#=item SFTP_AUTH_PRIVKEY_TYPE ++# ++# Defines SSH private key type (PEM|DER|ENG)A ++# Defaults to PEM ++SFTP_AUTH_PRIVKEY_TYPE="PEM" ++# ++#=item SFTP_AUTH_PRIVKEY_PASS ++# ++# Defines SFTP_AUTH_PRIVKEY passphrase ++SFTP_AUTH_PRIVKEY_PASS="" ++# ++#=item SFTP_AUTH_HOSTPUBMD5 ++# ++# Defines SFTP host MD5 pubkey ++SFTP_AUTH_HOSTPUBMD5="" ++# + #=back + # + #=cut +@@ -638,10 +671,10 @@ + case "$ASSEMBLY_METHOD" in + tar|"") + # use the traditional tar setup +- requireCommand tar || cleanup 1 ++ requireCommand gtar || cleanup 1 + collate() { + local TAROPTS="--no-unquote --no-recursion $TAR_OPTIONS" +- call tar cpf - $TAROPTS --null -T - ++ call gtar cpf - $TAROPTS --null -T - + local EXITCODE=$? + # exit code 1 means that some files have changed while backing them + # up, we think that is OK for now +@@ -678,17 +711,24 @@ + # define storage procedure + storage() { + # stay silent, but print error messages if aborting +- local OPTS="-u $STORAGE_FTP_USER:$STORAGE_FTP_PASSWORD -s -S" +- if isEnabled "$STORAGE_FTP_USE_SSL"; then +- OPTS="$OPTS --ftp-ssl" +- fi +- if isEnabled "$STORAGE_FTP_SSL_INSECURE"; then +- OPTS="$OPTS -k" +- fi ++ local OPTS="-s -S -u $STORAGE_FTP_USER:" + local PROTO="ftp" +- if isEnabled "$STORAGE_FTP_USE_SFTP"; then +- PROTO="sftp" +- fi ++ [ "$SFTP_AUTH_METHOD" != "pubkey" && "$STORAGE_FTP_PASSWORD" != "" ] && OPTS="${OPTS}${STORAGE_FTP_PASSWORD}" ++ if isEnabled "$STORAGE_FTP_USE_SFTP"; then ++ PROTO="sftp" ++ if isEnabled "$STORAGE_FTP_SSL_INSECURE"; then ++ OPTS="$OPTS -k" ++ fi ++ [ "$SFTP_AUTH_PRIVKEY" != "" ] && OPTS="$OPTS --key $SFTP_AUTH_PRIVKEY" ++ [ "$SFTP_AUTH_PUBKEY" != "" ] && OPTS="$OPTS --pubkey $SFTP_AUTH_PUBKEY" ++ [ "$SFTP_AUTH_PRIVKEY_TYPE" != "" ] && OPTS="$OPTS --key-type $SFTP_AUTH_PRIVKEY_TYPE" ++ [ "$SFTP_AUTH_PRIVKEY_PASS" != "" ] && OPTS="$OPTS --pass $SFTP_AUTH_PRIVKEY_PASS" ++ [ "$SFTP_AUTH_HOSTPUBMD5" != "" ] && OPTS="$OPTS --hostpubmd5 $SFTP_AUTH_HOSTPUBMD5" ++ else ++ if isEnabled "$STORAGE_FTP_USE_SSL"; then ++ OPTS="$OPTS --ftp-ssl" ++ fi ++ fi + local FILE=$(constructFilename) + local URL="$PROTO://$STORAGE_FTP_SERVER/$STORAGE_FTP_DIR/$FILE" + debug "Uploading backup to $URL..."