[csw-devel] SF.net SVN: gar:[6136] csw/mgar/pkg/wgetpaste/trunk

wahwah at users.sourceforge.net wahwah at users.sourceforge.net
Sat Aug 29 11:27:20 CEST 2009


Revision: 6136
          http://gar.svn.sourceforge.net/gar/?rev=6136&view=rev
Author:   wahwah
Date:     2009-08-29 09:27:20 +0000 (Sat, 29 Aug 2009)

Log Message:
-----------
wgetpaste: Using CSWbash.  http://opencsw.org/bugtrack/view.php?id=3871

Modified Paths:
--------------
    csw/mgar/pkg/wgetpaste/trunk/Makefile
    csw/mgar/pkg/wgetpaste/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/wgetpaste/trunk/files/0001-Using-gwhoami-instead-of-whoami.patch
    csw/mgar/pkg/wgetpaste/trunk/files/0002-CSW-bash.patch

Removed Paths:
-------------
    csw/mgar/pkg/wgetpaste/trunk/files/wgetpaste-2.13.patch

Modified: csw/mgar/pkg/wgetpaste/trunk/Makefile
===================================================================
--- csw/mgar/pkg/wgetpaste/trunk/Makefile	2009-08-29 08:55:59 UTC (rev 6135)
+++ csw/mgar/pkg/wgetpaste/trunk/Makefile	2009-08-29 09:27:20 UTC (rev 6136)
@@ -15,9 +15,10 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
 
-REQUIRED_PKGS = CSWshutils CSWwget CSWcswclassutils
+REQUIRED_PKGS = CSWshutils CSWwget CSWcswclassutils CSWbash
 
-PATCHFILES = wgetpaste-$(GARVERSION).patch
+PATCHFILES  = 0001-Using-gwhoami-instead-of-whoami.patch
+PATCHFILES += 0002-CSW-bash.patch
 
 ARCHALL = 1
 

Modified: csw/mgar/pkg/wgetpaste/trunk/checksums
===================================================================
--- csw/mgar/pkg/wgetpaste/trunk/checksums	2009-08-29 08:55:59 UTC (rev 6135)
+++ csw/mgar/pkg/wgetpaste/trunk/checksums	2009-08-29 09:27:20 UTC (rev 6136)
@@ -1,3 +1,4 @@
-8d328f55faaa8eee181c9083f2c0525b  download/wgetpaste-2.13.patch
+0a96eee7e51fe1b7e9054dd302ca0508  download/0001-Using-gwhoami-instead-of-whoami.patch
+4ce4101e5be2ea7af5b5ea18be7f8693  download/0002-CSW-bash.patch
 a341c778d745b0a7ad11163a4a2c1ea9  download/wgetpaste-2.13.tar.bz2
 67425820c0281729a7f63e3e3339c49f  download/wgetpaste.conf

Added: 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	                        (rev 0)
+++ csw/mgar/pkg/wgetpaste/trunk/files/0001-Using-gwhoami-instead-of-whoami.patch	2009-08-29 09:27:20 UTC (rev 6136)
@@ -0,0 +1,57 @@
+From c98a64ed5f18a50d9d249bd4bd0916374272a597 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at build8s.(none)>
+Date: Sat, 29 Aug 2009 11:20:28 +0200
+Subject: [PATCH 1/2] Using gwhoami instead of whoami
+
+---
+ wgetpaste |   10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/wgetpaste b/wgetpaste
+index d4addbd..9b40432 100755
+--- a/wgetpaste
++++ b/wgetpaste
+@@ -99,7 +99,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/g or
+ per user in ~/.wgetpaste.conf to use another program (such as e.g. xcut or
+ klipper) to $2 your clipboard.
+ 
+@@ -288,11 +288,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/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
+ }
+@@ -568,7 +568,7 @@ load_configs() {
+ 	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
+@@ -589,7 +589,7 @@ load_configs() {
+ }
+ load_configs
+ [[ $SERVICESET ]] && verifyservice "$SERVICESET" && SERVICE=$(escape "$SERVICESET")
+-DEFAULT_NICK=${DEFAULT_NICK:-$(whoami)} || die "whoami failed"
++DEFAULT_NICK=${DEFAULT_NICK:-$(gwhoami)} || die "whoami failed"
+ DEFAULT_SERVICE=${DEFAULT_SERVICE:-dpaste}
+ DEFAULT_LANGUAGE=${DEFAULT_LANGUAGE:-Plain Text}
+ DEFAULT_EXPIRATION=${DEFAULT_EXPIRATION:-1 month}
+-- 
+1.6.3.2
+

Added: csw/mgar/pkg/wgetpaste/trunk/files/0002-CSW-bash.patch
===================================================================
--- csw/mgar/pkg/wgetpaste/trunk/files/0002-CSW-bash.patch	                        (rev 0)
+++ csw/mgar/pkg/wgetpaste/trunk/files/0002-CSW-bash.patch	2009-08-29 09:27:20 UTC (rev 6136)
@@ -0,0 +1,22 @@
+From f40b9334fad600f6270280a7f3b4e769dabfb9e2 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at build8s.(none)>
+Date: Sat, 29 Aug 2009 11:24:37 +0200
+Subject: [PATCH 2/2] CSW bash
+
+---
+ wgetpaste |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/wgetpaste b/wgetpaste
+index 9b40432..f536fbc 100755
+--- a/wgetpaste
++++ b/wgetpaste
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/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
+

Deleted: csw/mgar/pkg/wgetpaste/trunk/files/wgetpaste-2.13.patch
===================================================================
--- csw/mgar/pkg/wgetpaste/trunk/files/wgetpaste-2.13.patch	2009-08-29 08:55:59 UTC (rev 6135)
+++ csw/mgar/pkg/wgetpaste/trunk/files/wgetpaste-2.13.patch	2009-08-29 09:27:20 UTC (rev 6136)
@@ -1,44 +0,0 @@
-diff -ru wgetpaste-2.13.orig/wgetpaste wgetpaste-2.13/wgetpaste
---- wgetpaste-2.13.orig/wgetpaste	2009-07-28 14:38:30.336410148 +0100
-+++ wgetpaste-2.13/wgetpaste	2009-07-28 18:28:16.513748108 +0100
-@@ -99,7 +99,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.
- 
-@@ -288,11 +288,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
- }
-@@ -568,7 +568,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
-@@ -589,7 +589,7 @@
- }
- load_configs
- [[ $SERVICESET ]] && verifyservice "$SERVICESET" && SERVICE=$(escape "$SERVICESET")
--DEFAULT_NICK=${DEFAULT_NICK:-$(whoami)} || die "whoami failed"
-+DEFAULT_NICK=${DEFAULT_NICK:-$(gwhoami)} || die "whoami failed"
- DEFAULT_SERVICE=${DEFAULT_SERVICE:-dpaste}
- DEFAULT_LANGUAGE=${DEFAULT_LANGUAGE:-Plain Text}
- DEFAULT_EXPIRATION=${DEFAULT_EXPIRATION:-1 month}


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