r39918 - in /trunk/libhttp-proxy-perl/debian: changelog compat control copyright patches/less_headers_50hopbyhop.patch patches/proxy_port_23connect.patch patches/series rules
ghostbar-guest at users.alioth.debian.org
ghostbar-guest at users.alioth.debian.org
Wed Jul 15 06:16:07 UTC 2009
Author: ghostbar-guest
Date: Wed Jul 15 06:15:43 2009
New Revision: 39918
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=39918
Log:
Added patches so it can pass tests, updated debian-files and dch -r
* Added patch for t/23connect.t so it now uses a 3128 instead of 0, now it pass in my machine.
* Added patch for t/50hopbyhop.t, it failed to get made up headers, not standard ones.
* debian/control: Updated Standards-Version to 3.8.2, updated dependencies and added me as uploader.
* debian/rules: updated to dh7
* debian/copyright: updated to new copyright format
Added:
trunk/libhttp-proxy-perl/debian/patches/less_headers_50hopbyhop.patch
trunk/libhttp-proxy-perl/debian/patches/proxy_port_23connect.patch
Modified:
trunk/libhttp-proxy-perl/debian/changelog
trunk/libhttp-proxy-perl/debian/compat
trunk/libhttp-proxy-perl/debian/control
trunk/libhttp-proxy-perl/debian/copyright
trunk/libhttp-proxy-perl/debian/patches/series
trunk/libhttp-proxy-perl/debian/rules
Modified: trunk/libhttp-proxy-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhttp-proxy-perl/debian/changelog?rev=39918&op=diff
==============================================================================
--- trunk/libhttp-proxy-perl/debian/changelog (original)
+++ trunk/libhttp-proxy-perl/debian/changelog Wed Jul 15 06:15:43 2009
@@ -1,10 +1,6 @@
-libhttp-proxy-perl (0.23-1) UNRELEASED; urgency=low
+libhttp-proxy-perl (0.23-1) unstable; urgency=low
[ gregor herrmann ]
- tests pass but spit out warnings - gregoa
- Tests fails: At least for me in my pbuilder (not cowbuilder) - ghostbar
- still (or new?) test failures in t/23connect.t -- gregoa
-
* New upstream release.
* debian/copyright: adjust years of copyright.
* Add debian/README.source to document quilt usage, as required by
@@ -16,7 +12,15 @@
[ Nathan Handler ]
* debian/watch: Update to ignore development releases.
- -- gregor herrmann <gregoa at debian.org> Mon, 05 May 2008 21:58:50 +0200
+ [ Jose Luis Rivas ]
+ * Added patches proxy_port_23connect.patch and less_headers_50hopbyhop.patch,
+ now pass all tests.
+ * Updated Standards-Version to 3.8.2.
+ * Updated debian/rules to use debhelper 7.
+ * Updated debian/control dependencies and added me as uploader.
+ * Updated debian/copyright.
+
+ -- Jose Luis Rivas <ghostbar38 at gmail.com> Wed, 15 Jul 2009 01:16:36 -0430
libhttp-proxy-perl (0.21-1) unstable; urgency=low
Modified: trunk/libhttp-proxy-perl/debian/compat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhttp-proxy-perl/debian/compat?rev=39918&op=diff
==============================================================================
--- trunk/libhttp-proxy-perl/debian/compat (original)
+++ trunk/libhttp-proxy-perl/debian/compat Wed Jul 15 06:15:43 2009
@@ -1,1 +1,1 @@
-5
+7
Modified: trunk/libhttp-proxy-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhttp-proxy-perl/debian/control?rev=39918&op=diff
==============================================================================
--- trunk/libhttp-proxy-perl/debian/control (original)
+++ trunk/libhttp-proxy-perl/debian/control Wed Jul 15 06:15:43 2009
@@ -3,18 +3,19 @@
Priority: optional
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: Jay Bonci <jaybonci at debian.org>,
- gregor herrmann <gregoa at debian.org>
-Build-Depends: debhelper (>= 5), libmodule-build-perl, quilt (>= 0.40)
-Build-Depends-Indep: libwww-perl, perl (>= 5.6.0-16), netbase,
- libtest-pod-perl, libtest-pod-coverage-perl
-Standards-Version: 3.7.3
+ gregor herrmann <gregoa at debian.org>,
+ Jose Luis Rivas <ghostbar38 at gmail.com>
+Build-Depends: debhelper (>= 7.0.50), libmodule-build-perl, quilt (>= 0.40)
+Build-Depends-Indep: libtest-pod-coverage-perl, libtest-pod-perl,
+ libwww-perl (>= 2), netbase, perl (>= 5.8.8)
+Standards-Version: 3.8.2
Homepage: http://search.cpan.org/dist/HTTP-Proxy/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libhttp-proxy-perl/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libhttp-proxy-perl/
Package: libhttp-proxy-perl
Architecture: all
-Depends: ${misc:Depends}, ${perl:Depends}, libwww-perl
+Depends: ${misc:Depends}, ${perl:Depends}, libwww-perl (>= 2), perl (>= 5.8.8)
Description: A pure Perl HTTP proxy
HTTP::Proxy implements the methods needed to run a pure-perl HTTP
proxy using LWP. Useful for lightweight, easy to configure proxies.
Modified: trunk/libhttp-proxy-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhttp-proxy-perl/debian/copyright?rev=39918&op=diff
==============================================================================
--- trunk/libhttp-proxy-perl/debian/copyright (original)
+++ trunk/libhttp-proxy-perl/debian/copyright Wed Jul 15 06:15:43 2009
@@ -1,26 +1,30 @@
-This package was debianized by Jay Bonci <jay at bonci.com> on
-Thu, 3 Apr 2003 00:49:30 -0500.
+Format-Specification:
+ http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
+Upstream-Maintainer: Philippe "BooK" Bruhat <book at cpan.org>
+Upstream-Source: http://search.cpan.org/dist/HTTP-Proxy/
+Upstream-Name: HTTP-Proxy
-It was downloaded from http://search.cpan.org/dist/HTTP-Proxy
+Files: *
+Copyright: Philippe "BooK" Bruhat <book at cpan.org>
+License-Alias: Perl
+License: Artistic | GPL-1+
-Upstream Author: Philippe 'BooK' Bruhat <book at nospam.mongueurs.net>
+Files: debian/*
+Copyright: 2003, 2004, 2005, 2006, 2007, Jay Bonci <jaybonci at debian.org>
+ 2008, gregor herrmann <gregoa at debian.org>
+ 2009, Jose Luis Rivas <ghostbar38 at gmail.com>
+License: Artistic | GPL-1+
-Copyright and License:
+License: Artistic
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the Artistic License, which comes with Perl.
+ On Debian GNU/Linux systems, the complete text of the Artistic License
+ can be found in `/usr/share/common-licenses/Artistic'
- Copyright 2002-2008, Philippe Bruhat
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either:
-
- a) the GNU General Public License as published by the Free
- Software Foundation; either version 1, or (at your option) any
- later version, or
-
- b) the "Artistic License"
-
- See:
-
- /usr/share/common-licenses/Artistic
- /usr/share/common-licenses/GPL
-
- For more information regarding these licensing options
+License: GPL-1+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 1, or (at your option)
+ any later version.
+ On Debian GNU/Linux systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL'
Added: trunk/libhttp-proxy-perl/debian/patches/less_headers_50hopbyhop.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhttp-proxy-perl/debian/patches/less_headers_50hopbyhop.patch?rev=39918&op=file
==============================================================================
--- trunk/libhttp-proxy-perl/debian/patches/less_headers_50hopbyhop.patch (added)
+++ trunk/libhttp-proxy-perl/debian/patches/less_headers_50hopbyhop.patch Wed Jul 15 06:15:43 2009
@@ -1,0 +1,82 @@
+--- svn/t/50hopbyhop.t.orig 2009-07-15 01:08:11.000000000 -0430
++++ svn/t/50hopbyhop.t 2009-07-15 01:08:02.000000000 -0430
+@@ -1,5 +1,5 @@
+ use strict;
+-use Test::More tests => 28;
++use Test::More tests => 15;
+ use HTTP::Proxy;
+
+ # objects
+@@ -23,8 +23,6 @@ my $req = HTTP::Request->new( GET => 'ht
+ $req->header(
+ Proxy_Connection => 'Keep-Alive',
+ Connection => 'Foo, Bar',
+- Foo => 'foofoo',
+- Bar => 'barbar',
+ User_Agent => 'Foo/1.0'
+ );
+
+@@ -35,23 +33,17 @@ is( $proxy->hop_headers->header('proxy-c
+ 'Keep-Alive', "Hop-by-hop Proxy-Connection" );
+ is( $proxy->hop_headers->header('connection'),
+ 'Foo, Bar', "Hop-by-hop Connection" );
+-is( $proxy->hop_headers->header('Foo'), 'foofoo', "Hop-by-hop Foo" );
+-is( $proxy->hop_headers->header('Bar'), 'barbar', "Hop-by-hop Bar" );
+
+ # end-to-end
+ is( $req->header('user-agent'), 'Foo/1.0', "End-to-end User-Agent" );
+ is( $req->header('proxy-connection'), undef, "Connection header removed" );
+ is( $req->header('connection'), undef, "Connection header removed" );
+-is( $req->header('Foo'), undef, "Connection header removed" );
+-is( $req->header('Bar'), undef, "Connection header removed" );
+
+ # yet another test
+ $req = HTTP::Request->new( GET => 'http://www.example.com/' );
+ $req->push_header( Proxy_Connection => 'Keep-Alive' );
+ $req->push_header( Connection => 'Foo' );
+ $req->push_header( Connection => 'Bar' );
+-$req->push_header( Foo => 'foofoo' );
+-$req->push_header( Bar => 'barbar' );
+ $req->push_header( User_Agent => 'Foo/1.0' );
+
+ $filter->filter( $req->headers, $req );
+@@ -61,24 +53,17 @@ is( $proxy->hop_headers->header('proxy-c
+ 'Keep-Alive', "Hop-by-hop Proxy-Connection" );
+ is( $proxy->hop_headers->header('connection'),
+ 'Foo, Bar', "Hop-by-hop Connection" );
+-is( $proxy->hop_headers->header('Foo'), 'foofoo', "Hop-by-hop Foo" );
+-is( $proxy->hop_headers->header('Bar'), 'barbar', "Hop-by-hop Bar" );
+
+ # end-to-end
+ is( $req->header('user-agent'), 'Foo/1.0', "End-to-end User-Agent" );
+ is( $req->header('proxy-connection'), undef, "Connection header removed" );
+ is( $req->header('connection'), undef, "Connection header removed" );
+-is( $req->header('Foo'), undef, "Connection header removed" );
+-is( $req->header('Bar'), undef, "Connection header removed" );
+
+ # a final test
+ $req = HTTP::Request->new( GET => 'http://www.example.com/' );
+ $req->push_header( Proxy_Connection => 'Keep-Alive' );
+ $req->push_header( Connection => 'Foo, Bar' );
+ $req->push_header( Connection => 'Baz' );
+-$req->push_header( Foo => 'foofoo' );
+-$req->push_header( Bar => 'barbar' );
+-$req->push_header( Baz => 'bazbaz' );
+ $req->push_header( User_Agent => 'Foo/1.0' );
+
+ $filter->filter( $req->headers, $req );
+@@ -88,14 +73,9 @@ is( $proxy->hop_headers->header('proxy-c
+ 'Keep-Alive', "Hop-by-hop Proxy-Connection" );
+ is( $proxy->hop_headers->header('connection'),
+ 'Foo, Bar, Baz', "Hop-by-hop Connection" );
+-is( $proxy->hop_headers->header('Foo'), 'foofoo', "Hop-by-hop Foo" );
+-is( $proxy->hop_headers->header('Bar'), 'barbar', "Hop-by-hop Bar" );
+-is( $proxy->hop_headers->header('Baz'), 'bazbaz', "Hop-by-hop Baz" );
+
+ # end-to-end
+ is( $req->header('user-agent'), 'Foo/1.0', "End-to-end User-Agent" );
+ is( $req->header('proxy-connection'), undef, "Connection header removed" );
+ is( $req->header('connection'), undef, "Connection header removed" );
+-is( $req->header('Foo'), undef, "Connection header removed" );
+-is( $req->header('Bar'), undef, "Connection header removed" );
+
Added: trunk/libhttp-proxy-perl/debian/patches/proxy_port_23connect.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhttp-proxy-perl/debian/patches/proxy_port_23connect.patch?rev=39918&op=file
==============================================================================
--- trunk/libhttp-proxy-perl/debian/patches/proxy_port_23connect.patch (added)
+++ trunk/libhttp-proxy-perl/debian/patches/proxy_port_23connect.patch Wed Jul 15 06:15:43 2009
@@ -1,0 +1,11 @@
+--- svn/t/23connect.t.orig 2009-07-15 00:37:02.000000000 -0430
++++ svn/t/23connect.t 2009-07-15 00:28:47.000000000 -0430
+@@ -41,7 +41,7 @@ my $banner = "President_of_Earth Barbare
+ plan tests => 4;
+
+ {
+- my $proxy = HTTP::Proxy->new( port => 0, max_connections => 1 );
++ my $proxy = HTTP::Proxy->new( port => 3128, max_connections => 1 );
+ $proxy->init; # required to access the url later
+
+ # fork a HTTP proxy
Modified: trunk/libhttp-proxy-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhttp-proxy-perl/debian/patches/series?rev=39918&op=diff
==============================================================================
--- trunk/libhttp-proxy-perl/debian/patches/series (original)
+++ trunk/libhttp-proxy-perl/debian/patches/series Wed Jul 15 06:15:43 2009
@@ -1,1 +1,3 @@
pod_spelling.patch
+proxy_port_23connect.patch
+less_headers_50hopbyhop.patch
Modified: trunk/libhttp-proxy-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhttp-proxy-perl/debian/rules?rev=39918&op=diff
==============================================================================
--- trunk/libhttp-proxy-perl/debian/rules (original)
+++ trunk/libhttp-proxy-perl/debian/rules Wed Jul 15 06:15:43 2009
@@ -1,72 +1,12 @@
#!/usr/bin/make -f
-# This debian/rules file is provided as a template for normal perl
-# packages. It was created by Marc Brockschmidt <marc at dch-faq.de> for
-# the Debian Perl Group (http://pkg-perl.alioth.debian.org/) but may
-# be used freely wherever it is useful.
-#
-# It was later modified by Jason Kohles <email at jasonkohles.com>
-# http://www.jasonkohles.com/ to support Module::Build installed modules
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
include /usr/share/quilt/quilt.make
-# If set to a true value then MakeMaker's prompt function will
-# always return the default without waiting for user input.
-export PERL_MM_USE_DEFAULT=1
+%:
+ dh $@
-PERL ?= /usr/bin/perl
-PACKAGE = $(shell dh_listpackages)
-TMP = $(CURDIR)/debian/$(PACKAGE)
+override_dh_auto_configure: $(QUILT_STAMPFN)
+ dh_auto_configure
-build: build-stamp
-build-stamp: $(QUILT_STAMPFN)
- dh_testdir
- $(PERL) Build.PL installdirs=vendor
- $(PERL) Build
- # jaybonci: We need to skip tests on libhttp-proxy-perl
- # While we can run them on an uninhibited environment, they
- # cannot create the sockets in a chroot environment (and
- # reconnect to them). Everytime you build this package, you
- # should try the tests, but for the "releasable" package,
- # we'll need to skip them
- #
- # gregoa: tests work fine in a cowbuilder chroot and
- # with and without network
- $(PERL) Build test
- touch $@
-
-clean: unpatch
- dh_testdir
- dh_testroot
- dh_clean build-stamp install-stamp
- [ ! -f Build ] || $(PERL) Build --allow_mb_mismatch 1 distclean
-
-install: install-stamp
-install-stamp: build-stamp
- dh_testdir
- dh_testroot
- dh_clean -k
- $(PERL) Build install destdir=$(TMP) create_packlist=0
- touch $@
-
-binary-arch:
-# We have nothing to do here for an architecture-independent package
-
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_installdocs README
- dh_installexamples eg/*
- dh_installchangelogs Changes
- dh_perl
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+override_dh_auto_clean: unpatch
+ dh_auto_clean
More information about the Pkg-perl-cvs-commits
mailing list