[csw-devel] SF.net SVN: gar:[13963] csw/mgar/pkg/wgetpaste/trunk
wahwah at users.sourceforge.net
wahwah at users.sourceforge.net
Mon Mar 28 01:40:40 CEST 2011
Revision: 13963
http://gar.svn.sourceforge.net/gar/?rev=13963&view=rev
Author: wahwah
Date: 2011-03-27 23:40:40 +0000 (Sun, 27 Mar 2011)
Log Message:
-----------
pkg/wgetpaste/trunk: Update to 2.18, fixing #4316
Modified Paths:
--------------
csw/mgar/pkg/wgetpaste/trunk/Makefile
csw/mgar/pkg/wgetpaste/trunk/checksums
csw/mgar/pkg/wgetpaste/trunk/files/0001-Using-gwhoami-instead-of-whoami.patch
csw/mgar/pkg/wgetpaste/trunk/files/0002-CSW-bash.patch
Added Paths:
-----------
csw/mgar/pkg/wgetpaste/trunk/files/0003-using-gmktemp.patch
csw/mgar/pkg/wgetpaste/trunk/files/0004-OpenCSW-specific-config-directory.patch
Property Changed:
----------------
csw/mgar/pkg/wgetpaste/trunk/Makefile
Modified: csw/mgar/pkg/wgetpaste/trunk/Makefile
===================================================================
--- csw/mgar/pkg/wgetpaste/trunk/Makefile 2011-03-27 23:21:07 UTC (rev 13962)
+++ csw/mgar/pkg/wgetpaste/trunk/Makefile 2011-03-27 23:40:40 UTC (rev 13963)
@@ -1,5 +1,7 @@
+# $Id$
+
NAME = wgetpaste
-VERSION = 2.16
+VERSION = 2.18
CATEGORIES = utils
DESCRIPTION = A command-line utility for text pasting websites.
@@ -13,14 +15,14 @@
DISTFILES += wgetpaste.conf
DISTFILES += COPYING
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
-
-RUNTIME_DEP_PKGS = CSWbash
+RUNTIME_DEP_PKGS += CSWbash
RUNTIME_DEP_PKGS += CSWcoreutils
RUNTIME_DEP_PKGS += CSWwget
-PATCHFILES = 0001-Using-gwhoami-instead-of-whoami.patch
+PATCHFILES += 0001-Using-gwhoami-instead-of-whoami.patch
PATCHFILES += 0002-CSW-bash.patch
+PATCHFILES += 0003-using-gmktemp.patch
+PATCHFILES += 0004-OpenCSW-specific-config-directory.patch
ARCHALL = 1
@@ -37,9 +39,6 @@
CHECKPKG_OVERRIDES_CSWwgetpaste += surplus-dependency|CSWcoreutils
CHECKPKG_OVERRIDES_CSWwgetpaste += surplus-dependency|CSWwget
-# CSWcoreutils haven't been released yet.
-CHECKPKG_OVERRIDES_CSWwgetpaste += unidentified-dependency|CSWcoreutils
-
include gar/category.mk
install-wgetpaste:
Property changes on: csw/mgar/pkg/wgetpaste/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: csw/mgar/pkg/wgetpaste/trunk/checksums
===================================================================
--- csw/mgar/pkg/wgetpaste/trunk/checksums 2011-03-27 23:21:07 UTC (rev 13962)
+++ csw/mgar/pkg/wgetpaste/trunk/checksums 2011-03-27 23:40:40 UTC (rev 13963)
@@ -1,5 +1 @@
-ca8e4122a420d95c0cd96d731b5b9777 0001-Using-gwhoami-instead-of-whoami.patch
-4ce4101e5be2ea7af5b5ea18be7f8693 0002-CSW-bash.patch
-117ac37c24d02f3576903d24bca24421 COPYING
-f270d87c5ea9939b2818d38f43b51936 wgetpaste-2.16.tar.bz2
-67425820c0281729a7f63e3e3339c49f wgetpaste.conf
+0085d679445af9e6f695d036abee106d wgetpaste-2.18.tar.bz2
Modified: csw/mgar/pkg/wgetpaste/trunk/files/0001-Using-gwhoami-instead-of-whoami.patch
===================================================================
--- csw/mgar/pkg/wgetpaste/trunk/files/0001-Using-gwhoami-instead-of-whoami.patch 2011-03-27 23:21:07 UTC (rev 13962)
+++ csw/mgar/pkg/wgetpaste/trunk/files/0001-Using-gwhoami-instead-of-whoami.patch 2011-03-27 23:40:40 UTC (rev 13963)
@@ -1,37 +1,5 @@
--- wgetpaste-2.16/wgetpaste.orig 2010-01-05 14:42:30.127801164 +0100
+++ wgetpaste-2.16/wgetpaste 2010-01-05 14:43:42.007282206 +0100
-@@ -114,7 +114,7 @@
- noxclip() {
- cat <<EOF >&2
- Could not find xclip on your system. In order to use --x$1 you must either
--emerge x11-misc/xclip or define x_$1() globally in /etc/wgetpaste.conf or
-+emerge x11-misc/xclip or define x_$1() globally in /etc/opt/csw/wgetpaste.conf/g or
- per user in ~/.wgetpaste.conf to use another program (such as e.g. xcut or
- klipper) to $2 your clipboard.
-
-@@ -303,11 +303,11 @@
- --debug be *very* verbose (implies -v)
-
- -h, --help show this help
-- -g, --ignore-configs ignore /etc/wgetpaste.conf, ~/.wgetpaste.conf etc.
-+ -g, --ignore-configs ignore /etc/opt/csw/wgetpaste.conf/g, ~/.wgetpaste.conf etc.
- --version show version information
-
- Defaults (DEFAULT_{NICK,SERVICE,LANGUAGE,EXPIRATION}[_\${SERVICE}]) can be overridden
--globally in /etc/wgetpaste.conf or /etc/wgetpaste.d/*.conf or per user in any of
-+globally in /etc/opt/csw/wgetpaste.conf/g or /etc/wgetpaste.d/*.conf or per user in any of
- ~/.wgetpaste.conf or ~/.wgetpaste.d/*.conf.
- EOF
- }
-@@ -586,7 +586,7 @@
- if [[ ! $IGNORECONFIGS ]]; then
- # compatibility code
- local f deprecated=
-- for f in {/etc/,~/.}wgetpaste{.d/*.bash,}; do
-+ for f in {/etc/,/etc/opt/csw/,~/.}wgetpaste{.d/*.bash,}; do
- if [[ -f $f ]]; then
- if [[ -z $deprecated ]]; then
- echo "The config files for wgetpaste have changed to *.conf.$N" >&2
@@ -607,7 +607,7 @@
}
load_configs
Modified: csw/mgar/pkg/wgetpaste/trunk/files/0002-CSW-bash.patch
===================================================================
--- csw/mgar/pkg/wgetpaste/trunk/files/0002-CSW-bash.patch 2011-03-27 23:21:07 UTC (rev 13962)
+++ csw/mgar/pkg/wgetpaste/trunk/files/0002-CSW-bash.patch 2011-03-27 23:40:40 UTC (rev 13963)
@@ -8,7 +8,7 @@
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/wgetpaste b/wgetpaste
-index 9b40432..f536fbc 100755
+index bfaad61..9fc913e 100755
--- a/wgetpaste
+++ b/wgetpaste
@@ -1,4 +1,4 @@
@@ -16,7 +16,4 @@
+#!/opt/csw/bin/bash
# A Script that automates pasting to a number of pastebin services
# relying only on bash, sed, coreutils (mktemp/sort/tr/wc/whoami/tee) and wget
- # Copyright (c) 2007 Bo Ørsted Andresen <bo.andresen at zlin.dk>
---
-1.6.3.2
-
+ # Copyright (c) 2007-2009 Bo Ørsted Andresen <bo.andresen at zlin.dk>
Added: csw/mgar/pkg/wgetpaste/trunk/files/0003-using-gmktemp.patch
===================================================================
--- csw/mgar/pkg/wgetpaste/trunk/files/0003-using-gmktemp.patch (rev 0)
+++ csw/mgar/pkg/wgetpaste/trunk/files/0003-using-gmktemp.patch 2011-03-27 23:40:40 UTC (rev 13963)
@@ -0,0 +1,35 @@
+From 2cec712ea2e09737008bef1ea49adeafd3f874bf Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Mon, 28 Mar 2011 01:26:52 +0200
+Subject: [PATCH] using gmktemp
+
+In attempt to fix https://www.opencsw.org/mantis/view.php?id=4316
+---
+ wgetpaste | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/wgetpaste b/wgetpaste
+index 6a17c8e..06a755a 100755
+--- a/wgetpaste
++++ b/wgetpaste
+@@ -679,7 +679,7 @@ fi
+
+ # create tmpfile for use with tee
+ if [[ $TEE ]]; then
+- TMPF=$(mktemp /tmp/wgetpaste.XXXXXX)
++ TMPF=$(/opt/csw/bin/gmktemp /tmp/wgetpaste.XXXXXX)
+ [[ -f $TMPF ]] || die "Could not create a temporary file for use with tee."
+ fi
+
+@@ -775,7 +775,7 @@ if [[ $SERVICE == tinyurl ]]; then
+ else
+ # create temp file (wget is much more reliable reading
+ # large input via --post-file rather than --post-data)
+- [[ -f $TMPF ]] || TMPF=$(mktemp /tmp/wgetpaste.XXXXXX)
++ [[ -f $TMPF ]] || TMPF=$(/opt/csw/bin/gmktemp /tmp/wgetpaste.XXXXXX)
+ if [[ -f $TMPF ]]; then
+ postdata > "$TMPF" || die "Failed to write to temporary file: \"$TMPF\"."
+ WGETARGS="--post-file=$TMPF"
+--
+1.7.4.1
+
Added: csw/mgar/pkg/wgetpaste/trunk/files/0004-OpenCSW-specific-config-directory.patch
===================================================================
--- csw/mgar/pkg/wgetpaste/trunk/files/0004-OpenCSW-specific-config-directory.patch (rev 0)
+++ csw/mgar/pkg/wgetpaste/trunk/files/0004-OpenCSW-specific-config-directory.patch 2011-03-27 23:40:40 UTC (rev 13963)
@@ -0,0 +1,57 @@
+From d3484ffa165d4ba530268c4208b6cab51f35c993 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Mon, 28 Mar 2011 01:37:07 +0200
+Subject: [PATCH] OpenCSW-specific config directory
+
+---
+ wgetpaste | 10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/wgetpaste b/wgetpaste
+index 3eb47fc..d2a3629 100755
+--- a/wgetpaste
++++ b/wgetpaste
+@@ -114,7 +114,7 @@ notreadable() {
+ noxclip() {
+ cat <<EOF >&2
+ Could not find xclip on your system. In order to use --x$1 you must either
+-emerge x11-misc/xclip or define x_$1() globally in /etc/wgetpaste.conf or
++emerge x11-misc/xclip or define x_$1() globally in /etc/opt/csw/wgetpaste.conf or
+ per user in ~/.wgetpaste.conf to use another program (such as e.g. xcut or
+ klipper) to $2 your clipboard.
+
+@@ -303,11 +303,11 @@ Options:
+ --debug be *very* verbose (implies -v)
+
+ -h, --help show this help
+- -g, --ignore-configs ignore /etc/wgetpaste.conf, ~/.wgetpaste.conf etc.
++ -g, --ignore-configs ignore /etc/opt/csw/wgetpaste.conf, ~/.wgetpaste.conf etc.
+ --version show version information
+
+ Defaults (DEFAULT_{NICK,LANGUAGE,EXPIRATION}[_\${SERVICE}] and DEFAULT_SERVICE)
+-can be overridden globally in /etc/wgetpaste.conf or /etc/wgetpaste.d/*.conf or
++can be overridden globally in /etc/opt/csw/wgetpaste.conf or /etc/opt/csw/wgetpaste.d/*.conf or
+ per user in any of ~/.wgetpaste.conf or ~/.wgetpaste.d/*.conf.
+ EOF
+ }
+@@ -586,7 +586,7 @@ load_configs() {
+ if [[ ! $IGNORECONFIGS ]]; then
+ # compatibility code
+ local f deprecated=
+- for f in {/etc/,~/.}wgetpaste{.d/*.bash,}; do
++ for f in {/etc/opt/csw/,~/.}wgetpaste{.d/*.bash,}; do
+ if [[ -f $f ]]; then
+ if [[ -z $deprecated ]]; then
+ echo "The config files for wgetpaste have changed to *.conf.$N" >&2
+@@ -598,7 +598,7 @@ load_configs() {
+ done
+ [[ -n $deprecated ]] && echo >&2
+ # new locations override old ones in case they collide
+- for f in {/etc/,~/.}wgetpaste{.d/*,}.conf; do
++ for f in {/etc/opt/csw/,~/.}wgetpaste{.d/*,}.conf; do
+ if [[ -f $f ]]; then
+ source "$f" || die "Failed to source $f"
+ fi
+--
+1.7.4.1
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list