Received: by mail.netbsd.org (Postfix, from userid 605) id 49C6984D94; Sun, 29 Dec 2019 22:09:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id C3CDA84D50 for ; Sun, 29 Dec 2019 22:09:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 1rsJNlFA0CMX for ; Sun, 29 Dec 2019 22:09:39 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 2D52284C6C for ; Sun, 29 Dec 2019 22:09:39 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 1FCF9FA97; Sun, 29 Dec 2019 22:09:39 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_157765737933250" MIME-Version: 1.0 Date: Sun, 29 Dec 2019 22:09:39 +0000 From: "ng0" Subject: CVS commit: pkgsrc/net/wgetpaste To: pkgsrc-changes@NetBSD.org Reply-To: ng0@netbsd.org X-Mailer: log_accum Message-Id: <20191229220939.1FCF9FA97@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_157765737933250 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: ng0 Date: Sun Dec 29 22:09:39 UTC 2019 Modified Files: pkgsrc/net/wgetpaste: Makefile distinfo Added Files: pkgsrc/net/wgetpaste/patches: patch-wgetpaste Log Message: net/wgetpaste: Update to 2.29 No Changelog. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/wgetpaste/Makefile \ pkgsrc/net/wgetpaste/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/net/wgetpaste/patches/patch-wgetpaste Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_157765737933250 Content-Disposition: inline Content-Length: 3435 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/wgetpaste/Makefile diff -u pkgsrc/net/wgetpaste/Makefile:1.3 pkgsrc/net/wgetpaste/Makefile:1.4 --- pkgsrc/net/wgetpaste/Makefile:1.3 Sat Dec 13 14:27:35 2014 +++ pkgsrc/net/wgetpaste/Makefile Sun Dec 29 22:09:38 2019 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.3 2014/12/13 14:27:35 mef Exp $ +# $NetBSD: Makefile,v 1.4 2019/12/29 22:09:38 ng0 Exp $ -DISTNAME= wgetpaste-2.25 +DISTNAME= wgetpaste-2.29 CATEGORIES= net www MASTER_SITES= http://wgetpaste.zlin.dk/ EXTRACT_SUFX= .tar.bz2 @@ -8,7 +8,7 @@ EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://wgetpaste.zlin.dk/ COMMENT= Command line utility to upload to pastebin sites -LICENSE= public-domain +LICENSE= mit DEPENDS+= wget>=1.13.4:../../net/wget Index: pkgsrc/net/wgetpaste/distinfo diff -u pkgsrc/net/wgetpaste/distinfo:1.3 pkgsrc/net/wgetpaste/distinfo:1.4 --- pkgsrc/net/wgetpaste/distinfo:1.3 Wed Nov 4 00:35:44 2015 +++ pkgsrc/net/wgetpaste/distinfo Sun Dec 29 22:09:38 2019 @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.3 2015/11/04 00:35:44 agc Exp $ +$NetBSD: distinfo,v 1.4 2019/12/29 22:09:38 ng0 Exp $ -SHA1 (wgetpaste-2.25.tar.bz2) = 4f2220714522c724928dee67ed1c5d7feed1c207 -RMD160 (wgetpaste-2.25.tar.bz2) = 97c533349f4fbb594bcea9948119e64384eb716e -SHA512 (wgetpaste-2.25.tar.bz2) = c3cd56f32311c77ce5ac970f0cd6b2e8285cac3caaf61669237ac707ed3b9aab285fbe9dee6260ea13b8df41a22acfaa3b8439298560ab68c3a568d60557d82e -Size (wgetpaste-2.25.tar.bz2) = 11107 bytes +SHA1 (wgetpaste-2.29.tar.bz2) = 1cfd3e513c8c504a22851ab4120821344066eecf +RMD160 (wgetpaste-2.29.tar.bz2) = 1331aff97117ee0763ea63124cf6e4c4d99e814c +SHA512 (wgetpaste-2.29.tar.bz2) = 6596842733bb5d1d52cbb3cbcf61ba714f0cbfdc13acb4d6025ccfd27c214adaf886ac3a0a11baefaa4af3f33165619e5a3360b4e0807d29e8dc8ef5ff819bb6 +Size (wgetpaste-2.29.tar.bz2) = 12988 bytes +SHA1 (patch-wgetpaste) = 70601dda2cb39e031fa42ec67a52d7d81ccc62d5 Added files: Index: pkgsrc/net/wgetpaste/patches/patch-wgetpaste diff -u /dev/null pkgsrc/net/wgetpaste/patches/patch-wgetpaste:1.1 --- /dev/null Sun Dec 29 22:09:39 2019 +++ pkgsrc/net/wgetpaste/patches/patch-wgetpaste Sun Dec 29 22:09:38 2019 @@ -0,0 +1,34 @@ +$NetBSD: patch-wgetpaste,v 1.1 2019/12/29 22:09:38 ng0 Exp $ + +upstream commit 6175f89cb618fef83882ed86ab049a7fd1035770 +Fix handling of bpaste urls. bpaste is the default service. + +--- wgetpaste~ ++++ wgetpaste +@@ -181,7 +181,8 @@ xml+cheetah xml+django xml+evoque xml+lasso xml+mako xml+myghty xml+php xml+erb + xml+velocity xml xquery xslt xtend yaml" + EXPIRATIONS_pinnwand="1day 1week 1month never" + POST_pinnwand="submit=Paste! % % lexer expiry % code" +-REGEX_RAW_pinnwand='s|^\(https\?://[^/]*/\)show\(/[[:alnum:]]*/\?\)$|\1raw\2|' ++REGEX_LOC_pinnwand="\(/show/[^ ]*\).*$|https://bpaste.net\1" ++REGEX_RAW_pinnwand='s|^\(https\?://[^/]*/\)show\(/[^ ]*/\?\)$|\1raw\2|' + + ### errors + die() { +@@ -550,11 +551,15 @@ postdata() { + + # get url from response from server + geturl() { +- local regex ++ local regex location + regex=REGEX_URL_$ENGINE ++ location=REGEX_LOC_$ENGINE + if [[ -n ${!regex} ]]; then + [[ needstdout = $1 ]] && return 0 + sed -n -e "${!regex}" <<< "$*" ++ elif [[ -n ${!location} ]]; then ++ [[ needstdout = $1 ]] && return 1 ++ sed -n -e "s|^.*Location: ${!location}|p" <<< "$*" + else + [[ needstdout = $1 ]] && return 1 + sed -n -e 's|^.*Location: \(https\{0,1\}://[^ ]*\).*$|\1|p' <<< "$*" --_----------=_157765737933250--