r60514 - in /trunk/liblwp-protocol-socks-perl: Changes META.yml README debian/changelog debian/control debian/copyright debian/rules debian/source/ debian/source/format lib/LWP/Protocol/socks.pm lib/URI/socks.pm t/LWP-Protocol-socks.t
ansgar-guest at users.alioth.debian.org
ansgar-guest at users.alioth.debian.org
Sat Jul 24 06:20:40 UTC 2010
Author: ansgar-guest
Date: Sat Jul 24 06:20:26 2010
New Revision: 60514
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=60514
Log:
* New upstream release.
* Add (build-)dep on liburi-perl for URI::Escape.
* Use tiny debian/rules.
* Use source format 3.0 (quilt).
* debian/copyright: Formatting changes for current DEP-5 proposal.
* Bump Standards-Version to 3.9.0.
* Add myself to Uploaders.
Added:
trunk/liblwp-protocol-socks-perl/debian/source/
trunk/liblwp-protocol-socks-perl/debian/source/format
Modified:
trunk/liblwp-protocol-socks-perl/Changes
trunk/liblwp-protocol-socks-perl/META.yml
trunk/liblwp-protocol-socks-perl/README
trunk/liblwp-protocol-socks-perl/debian/changelog
trunk/liblwp-protocol-socks-perl/debian/control
trunk/liblwp-protocol-socks-perl/debian/copyright
trunk/liblwp-protocol-socks-perl/debian/rules
trunk/liblwp-protocol-socks-perl/lib/LWP/Protocol/socks.pm
trunk/liblwp-protocol-socks-perl/lib/URI/socks.pm
trunk/liblwp-protocol-socks-perl/t/LWP-Protocol-socks.t
Modified: trunk/liblwp-protocol-socks-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblwp-protocol-socks-perl/Changes?rev=60514&op=diff
==============================================================================
--- trunk/liblwp-protocol-socks-perl/Changes (original)
+++ trunk/liblwp-protocol-socks-perl/Changes Sat Jul 24 06:20:26 2010
@@ -1,5 +1,9 @@
Revision history for Perl extension LWP::Protocol::socks.
+1.3 Fri Jul 24 12:00:00 2010
+ - Working on Adding user:pass support for https://rt.cpan.org/Ticket/Display.html?id=48172
+1.2 Fri Jul 23 08:10:00 2010
+ - Making work when LWP::Protocol::https::Socket uses Net::SSL
0.01 Mon Jul 7 21:30:04 2008
- original version; created by h2xs 1.23 with options
-b 5.6.1 -AXn LWP::Protocol::socks
Modified: trunk/liblwp-protocol-socks-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblwp-protocol-socks-perl/META.yml?rev=60514&op=diff
==============================================================================
--- trunk/liblwp-protocol-socks-perl/META.yml (original)
+++ trunk/liblwp-protocol-socks-perl/META.yml Sat Jul 24 06:20:26 2010
@@ -1,12 +1,15 @@
-# http://module-build.sourceforge.net/META-spec.html
-#XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX#
-name: LWP-Protocol-socks
-version: 1.1
-version_from: lib/LWP/Protocol/socks.pm
-installdirs: site
-requires:
+--- #YAML:1.0
+name: LWP-Protocol-socks
+version: 1.3
+abstract: adds support for the socks protocol and proxy facility
+license: ~
+author:
+ - Sheridan Rawlins <scr at corp.yahoo.com>
+generated_by: ExtUtils::MakeMaker version 6.42
+distribution_type: module
+requires:
IO::Socket::Socks: 0.1
IO::Socket::SSL: 0.96
-
-distribution_type: module
-generated_by: ExtUtils::MakeMaker version 6.30
+meta-spec:
+ url: http://module-build.sourceforge.net/META-spec-v1.3.html
+ version: 1.3
Modified: trunk/liblwp-protocol-socks-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblwp-protocol-socks-perl/README?rev=60514&op=diff
==============================================================================
--- trunk/liblwp-protocol-socks-perl/README (original)
+++ trunk/liblwp-protocol-socks-perl/README Sat Jul 24 06:20:26 2010
@@ -1,5 +1,9 @@
-LWP-Protocol-socks version 0.01
+LWP-Protocol-socks
===============================
+
+FYI, files are checked into git at github.com:scr/cpan.git
+
+ git clone git at github.com:scr/cpan.git
The README is used to introduce the module and provide instructions on
how to install the module, any machine dependencies it may have (for
Modified: trunk/liblwp-protocol-socks-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblwp-protocol-socks-perl/debian/changelog?rev=60514&op=diff
==============================================================================
--- trunk/liblwp-protocol-socks-perl/debian/changelog (original)
+++ trunk/liblwp-protocol-socks-perl/debian/changelog Sat Jul 24 06:20:26 2010
@@ -1,4 +1,4 @@
-liblwp-protocol-socks-perl (1.1-2) UNRELEASED; urgency=low
+liblwp-protocol-socks-perl (1.3-1) unstable; urgency=low
[ Nathan Handler ]
* debian/watch: Update to ignore development releases.
@@ -8,7 +8,16 @@
perl (>= 5.6.0-{12,16}) with an unversioned dependency on perl (as
permitted by Debian Policy 3.8.3).
- -- Nathan Handler <nhandler at ubuntu.com> Sat, 06 Jun 2009 01:34:47 +0000
+ [ Ansgar Burchardt ]
+ * New upstream release.
+ * Add (build-)dep on liburi-perl for URI::Escape.
+ * Use tiny debian/rules.
+ * Use source format 3.0 (quilt).
+ * debian/copyright: Formatting changes for current DEP-5 proposal.
+ * Bump Standards-Version to 3.9.0.
+ * Add myself to Uploaders.
+
+ -- Ansgar Burchardt <ansgar at 43-1.org> Sat, 24 Jul 2010 15:18:57 +0900
liblwp-protocol-socks-perl (1.1-1) unstable; urgency=low
Modified: trunk/liblwp-protocol-socks-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblwp-protocol-socks-perl/debian/control?rev=60514&op=diff
==============================================================================
--- trunk/liblwp-protocol-socks-perl/debian/control (original)
+++ trunk/liblwp-protocol-socks-perl/debian/control Sat Jul 24 06:20:26 2010
@@ -3,10 +3,11 @@
Priority: optional
Build-Depends: debhelper (>= 7)
Build-Depends-Indep: libwww-perl, libio-socket-socks-perl (>= 0.1),
- libio-socket-ssl-perl (>= 0.96), perl
+ libio-socket-ssl-perl (>= 0.96), liburi-perl, perl
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Uploaders: Pierre Neyron <pierre.neyron at free.fr>
-Standards-Version: 3.8.1
+Uploaders: Pierre Neyron <pierre.neyron at free.fr>,
+ Ansgar Burchardt <ansgar at 43-1.org>
+Standards-Version: 3.9.0
Homepage: http://search.cpan.org/dist/LWP-Protocol-socks/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/liblwp-protocol-socks-perl/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/liblwp-protocol-socks-perl/
@@ -14,7 +15,8 @@
Package: liblwp-protocol-socks-perl
Architecture: all
Depends: ${misc:Depends}, ${perl:Depends}, libwww-perl,
- libio-socket-socks-perl (>= 0.1), libio-socket-ssl-perl (>= 0.96)
+ libio-socket-socks-perl (>= 0.1), libio-socket-ssl-perl (>= 0.96),
+ liburi-perl
Description: SOCKS proxy support for LWP
LWP::Protocol::socks implements the SOCKS protocol for Perl WWW library. It
provides the essential hooks into the LWP system to add the capability to
Modified: trunk/liblwp-protocol-socks-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblwp-protocol-socks-perl/debian/copyright?rev=60514&op=diff
==============================================================================
--- trunk/liblwp-protocol-socks-perl/debian/copyright (original)
+++ trunk/liblwp-protocol-socks-perl/debian/copyright Sat Jul 24 06:20:26 2010
@@ -1,16 +1,14 @@
-Format-Specification:
- http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
-Upstream-Maintainer: Sheridan C Rawlins <scr at yahoo-inc.com>
-Upstream-Source: http://search.cpan.org/dist/LWP-Protocol-socks/
-Upstream-Name: LWP-Protocol-socks
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Maintainer: Sheridan C Rawlins <scr at yahoo-inc.com>
+Source: http://search.cpan.org/dist/LWP-Protocol-socks/
+Name: LWP-Protocol-socks
-Files: *
Copyright: 2008, Sheridan C Rawlins <scr at yahoo-inc.com>
-License: Artistic | GPL-1+
+License: Artistic or GPL-1+
Files: debian/*
Copyright: 2009, Pierre Neyron <pierre.neyron at free.fr>
-License: Artistic | GPL-1+
+License: Artistic or GPL-1+
License: Artistic
This program is free software; you can redistribute it and/or modify
Modified: trunk/liblwp-protocol-socks-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblwp-protocol-socks-perl/debian/rules?rev=60514&op=diff
==============================================================================
--- trunk/liblwp-protocol-socks-perl/debian/rules (original)
+++ trunk/liblwp-protocol-socks-perl/debian/rules Sat Jul 24 06:20:26 2010
@@ -1,23 +1,4 @@
#!/usr/bin/make -f
-build: build-stamp
-build-stamp:
- dh build
- touch $@
-
-clean:
+%:
dh $@
-
-install: install-stamp
-install-stamp: build-stamp
- dh install
- touch $@
-
-binary-arch:
-
-binary-indep: install
- dh $@
-
-binary: binary-arch binary-indep
-
-.PHONY: binary binary-arch binary-indep install clean build
Added: trunk/liblwp-protocol-socks-perl/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblwp-protocol-socks-perl/debian/source/format?rev=60514&op=file
==============================================================================
--- trunk/liblwp-protocol-socks-perl/debian/source/format (added)
+++ trunk/liblwp-protocol-socks-perl/debian/source/format Sat Jul 24 06:20:26 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)
Modified: trunk/liblwp-protocol-socks-perl/lib/LWP/Protocol/socks.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblwp-protocol-socks-perl/lib/LWP/Protocol/socks.pm?rev=60514&op=diff
==============================================================================
--- trunk/liblwp-protocol-socks-perl/lib/LWP/Protocol/socks.pm (original)
+++ trunk/liblwp-protocol-socks-perl/lib/LWP/Protocol/socks.pm Sat Jul 24 06:20:26 2010
@@ -2,7 +2,7 @@
package LWP::Protocol::http::socks;
require LWP::Protocol::http;
our @ISA = qw(LWP::Protocol::http);
-our $VERSION = "1.1";
+our $VERSION = "1.3";
LWP::Protocol::implementor('http::socks' => 'LWP::Protocol::http::socks');
sub new {
@@ -63,7 +63,7 @@
require IO::Socket::Socks;
use IO::Socket::SSL;
require Net::HTTPS;
-our @ISA = qw(LWP::Protocol::https::Socket);
+our @ISA = qw(IO::Socket::SSL LWP::Protocol::https::Socket);
sub new {
my $class = shift;
@@ -101,6 +101,16 @@
$protocol->{proxy_sock_opts} = [ProxyAddr => $proxy->host,
ProxyPort => $proxy->port,
];
+
+ # [RT 48172] Adding user/pass functionality
+ if ( $proxy->userinfo() ) {
+ push(@{$protocol->{proxy_sock_opts}},
+ AuthType => 'userpass',
+ Username => $proxy->user(),
+ Password => $proxy->pass(),
+ );
+ }
+
$protocol->request($request, undef, $arg, $size, $timeout);
}
Modified: trunk/liblwp-protocol-socks-perl/lib/URI/socks.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblwp-protocol-socks-perl/lib/URI/socks.pm?rev=60514&op=diff
==============================================================================
--- trunk/liblwp-protocol-socks-perl/lib/URI/socks.pm (original)
+++ trunk/liblwp-protocol-socks-perl/lib/URI/socks.pm Sat Jul 24 06:20:26 2010
@@ -1,7 +1,25 @@
##############################
package URI::socks;
require URI::http;
+use URI::Escape;
#URI::implementor(socks => 'URI::http');
our @ISA = qw(URI::http);
+# [RT 48172] Adding user/pass functionality
+sub user {
+ my $self = shift;
+
+ my $userinfo = $self->userinfo();
+ my($user) = split(/:/, $userinfo);
+ uri_unescape($user);
+}
+
+sub pass {
+ my $self = shift;
+
+ my $userinfo = $self->userinfo();
+ my(undef, $pass) = split(/:/, $userinfo);
+ uri_unescape($pass);
+}
+
1;
Modified: trunk/liblwp-protocol-socks-perl/t/LWP-Protocol-socks.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblwp-protocol-socks-perl/t/LWP-Protocol-socks.t?rev=60514&op=diff
==============================================================================
--- trunk/liblwp-protocol-socks-perl/t/LWP-Protocol-socks.t (original)
+++ trunk/liblwp-protocol-socks-perl/t/LWP-Protocol-socks.t Sat Jul 24 06:20:26 2010
@@ -1,3 +1,4 @@
+# -*- mode: perl -*-
# Before `make install' is performed this script should be runnable with
# `make test'. After `make install' it should work as `perl LWP-Protocol-socks.t'
@@ -5,13 +6,17 @@
# change 'tests => 1' to 'tests => last_test_to_print';
-use Test;
-BEGIN { plan tests => 1 };
-use LWP::Protocol::socks;
-ok(1); # If we made it this far, we're ok.
-
+use Test::More tests => 6;
+use_ok(qw(LWP::Protocol::socks));
#########################
# Insert your test code below, the Test::More module is use()ed here so read
# its man page ( perldoc Test::More ) for help writing this test script.
+# Tests for https://rt.cpan.org/Ticket/Display.html?id=48172
+my $u = new URI('socks://user%3auser:pass%3apass@foobar.com/path/query=1');
+ok($u);
+is(ref($u), 'URI::socks', 'isa URI::socks');
+is($u->scheme(), 'socks', 'scheme eq socks');
+is($u->user(), 'user:user', 'user eq "user:user"');
+is($u->pass(), 'pass:pass', 'pass eq "pass:pass"');
More information about the Pkg-perl-cvs-commits
mailing list