r20726 - in /trunk/libauthen-radius-perl/debian: changelog control patches/00list patches/01_radius_port.dpatch patches/01_radius_port.patch patches/02_use_dumper.dpatch patches/02_use_dumper.patch patches/series rules
gregoa at users.alioth.debian.org
gregoa at users.alioth.debian.org
Thu Jun 5 21:48:31 UTC 2008
Author: gregoa
Date: Thu Jun 5 21:48:31 2008
New Revision: 20726
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=20726
Log:
* Change patch system from dpatch to quilt.
* Refresh debian/rules, no functional changes.
Added:
trunk/libauthen-radius-perl/debian/patches/01_radius_port.patch
trunk/libauthen-radius-perl/debian/patches/02_use_dumper.patch
trunk/libauthen-radius-perl/debian/patches/series
Removed:
trunk/libauthen-radius-perl/debian/patches/00list
trunk/libauthen-radius-perl/debian/patches/01_radius_port.dpatch
trunk/libauthen-radius-perl/debian/patches/02_use_dumper.dpatch
Modified:
trunk/libauthen-radius-perl/debian/changelog
trunk/libauthen-radius-perl/debian/control
trunk/libauthen-radius-perl/debian/rules
Modified: trunk/libauthen-radius-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libauthen-radius-perl/debian/changelog?rev=20726&op=diff
==============================================================================
--- trunk/libauthen-radius-perl/debian/changelog (original)
+++ trunk/libauthen-radius-perl/debian/changelog Thu Jun 5 21:48:31 2008
@@ -5,6 +5,8 @@
Vcs-Svn fields.
* debian/watch: use dist-based URL.
* debian/rules: delete /usr/lib/perl5 only if it exists.
+ * Change patch system from dpatch to quilt.
+ * Refresh debian/rules, no functional changes.
-- gregor herrmann <gregor+debian at comodo.priv.at> Tue, 09 Oct 2007 22:27:19 +0200
Modified: trunk/libauthen-radius-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libauthen-radius-perl/debian/control?rev=20726&op=diff
==============================================================================
--- trunk/libauthen-radius-perl/debian/control (original)
+++ trunk/libauthen-radius-perl/debian/control Thu Jun 5 21:48:31 2008
@@ -7,7 +7,7 @@
Homepage: http://search.cpan.org/dist/Authen-Radius/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libauthen-radius-perl/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/libauthen-radius-perl/
-Build-Depends: debhelper (>= 5), dpatch (>= 2.0.9)
+Build-Depends: debhelper (>= 5), quilt (>= 0.40)
Package: libauthen-radius-perl
Architecture: all
Added: trunk/libauthen-radius-perl/debian/patches/01_radius_port.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libauthen-radius-perl/debian/patches/01_radius_port.patch?rev=20726&op=file
==============================================================================
--- trunk/libauthen-radius-perl/debian/patches/01_radius_port.patch (added)
+++ trunk/libauthen-radius-perl/debian/patches/01_radius_port.patch Thu Jun 5 21:48:31 2008
@@ -1,0 +1,23 @@
+Author: Stephen Quinney <sjq at debian.org>
+Description: The standard radius port on Debian is 1812 rather than
+1645 which is now "old-radius".
+--- libauthen-radius-perl.orig/Radius.pm
++++ libauthen-radius-perl/Radius.pm
+@@ -75,7 +75,7 @@
+ $port = getservbyname($service, 'udp') unless $port;
+
+ unless ($port) {
+- my %services = ( radius => 1645, radacct => 1646,
++ my %services = ( radius => 1812, radacct => 1646,
+ 'radius-acct' => 1813 );
+ if (exists($services{$service})) {
+ $port = $services{$service};
+@@ -469,7 +469,7 @@
+ The default C<Service> is C<radius>, the alternative is C<radius-acct>.
+ If you do not specify port in the C<Host> as a C<hostname:port>, then port
+ specified in your F</etc/services> will be used. If there is nothing
+-there, and you did not specify port either then default is 1645 for
++there, and you did not specify port either then default is 1812 for
+ C<radius> and 1813 for C<radius-acct>.
+
+ Optional parameter C<Debug> with a Perl "true" value turns on debugging
Added: trunk/libauthen-radius-perl/debian/patches/02_use_dumper.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libauthen-radius-perl/debian/patches/02_use_dumper.patch?rev=20726&op=file
==============================================================================
--- trunk/libauthen-radius-perl/debian/patches/02_use_dumper.patch (added)
+++ trunk/libauthen-radius-perl/debian/patches/02_use_dumper.patch Thu Jun 5 21:48:31 2008
@@ -1,0 +1,32 @@
+Author: Stephen Quinney <sjq at debian.org>
+Description: This removes the dependency on Data::HexDump which was being
+used exclusively for debugging purposes. It is switched instead
+to using Data::Dumper (which is a core Perl module).
+--- libauthen-radius-perl.orig/Radius.pm
++++ libauthen-radius-perl/Radius.pm
+@@ -22,7 +22,6 @@
+ use IO::Select;
+ use Digest::MD5;
+ use Data::Dumper;
+-use Data::HexDump;
+
+ use vars qw($VERSION @ISA @EXPORT);
+
+@@ -116,7 +115,7 @@
+ $request_id = ($request_id + 1) & 0xff;
+ if ($debug) {
+ print STDERR "Sending request:\n";
+- print STDERR HexDump($data);
++ print STDERR Data::Dumper::Dumper($data);
+ }
+ $self->{'sock'}->send ($data) || $self->set_error('ESENDFAIL');
+ }
+@@ -133,7 +132,7 @@
+ $self->{'sock'}->recv ($data, 65536) or return $self->set_error('ERECVFAIL');
+ if ($debug) {
+ print STDERR "Received response:\n";
+- print STDERR HexDump($data);
++ print STDERR Data::Dumper::Dumper($data);
+ }
+ ($type, $id, $length, $auth, $self->{'attributes'}) = unpack('C C n a16 a*', $data);
+ return $self->set_error('EBADAUTH') if $auth ne $self->calc_authenticator($type, $id, $length);
Added: trunk/libauthen-radius-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libauthen-radius-perl/debian/patches/series?rev=20726&op=file
==============================================================================
--- trunk/libauthen-radius-perl/debian/patches/series (added)
+++ trunk/libauthen-radius-perl/debian/patches/series Thu Jun 5 21:48:31 2008
@@ -1,0 +1,2 @@
+01_radius_port.patch
+02_use_dumper.patch
Modified: trunk/libauthen-radius-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libauthen-radius-perl/debian/rules?rev=20726&op=diff
==============================================================================
--- trunk/libauthen-radius-perl/debian/rules (original)
+++ trunk/libauthen-radius-perl/debian/rules Thu Jun 5 21:48:31 2008
@@ -1,68 +1,56 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+# 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.
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# Define the perl interpreter
+# 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
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
+PERL ?= /usr/bin/perl
PACKAGE = $(shell dh_listpackages)
+TMP = $(CURDIR)/debian/$(PACKAGE)
-TMP =`pwd`/debian/$(PACKAGE)
-
-PERL = /usr/bin/perl
-
-configure: configure-stamp
-configure-stamp:
+build: build-stamp
+build-stamp: $(QUILT_STAMPFN)
dh_testdir
-
- perl Makefile.PL verbose INSTALLDIRS=vendor
-
- touch configure-stamp
-
-build: patch build-stamp
-build-stamp: configure-stamp
- dh_testdir
-
+ $(PERL) Makefile.PL INSTALLDIRS=vendor
$(MAKE)
-
- touch build-stamp
+ $(MAKE) test
+ touch $@
clean: unpatch
dh_testdir
dh_testroot
+ dh_clean build-stamp install-stamp
+ [ ! -f Makefile ] || $(MAKE) realclean
- [ ! -f Makefile ] || $(MAKE) distclean
-
- dh_clean build-stamp configure-stamp
-
-install: build
+install: install-stamp
+install-stamp: build-stamp
dh_testdir
dh_testroot
dh_clean -k
- dh_installdirs
+ $(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
+ [ ! -d $(TMP)/usr/lib/perl5 ] || \
+ rmdir --ignore-fail-on-non-empty --parents --verbose \
+ $(TMP)/usr/lib/perl5
+ touch $@
- $(MAKE) install PREFIX=$(TMP)/usr
+binary-arch:
+# We have nothing to do here for an architecture-independent package
- # Remove any empty directories
-
- [ ! -d $(CURDIR)/debian/$(shell dh_listpackages)/usr/lib/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(CURDIR)/debian/$(shell dh_listpackages)/usr/lib/perl5
-
-# Build architecture-independent files here.
-binary-arch: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
binary-indep: build install
dh_testdir
dh_testroot
+ dh_installdocs README raddb
+ dh_installchangelogs Changes
dh_perl
- dh_installdocs README raddb
- dh_installman
- dh_installchangelogs Changes
dh_compress
dh_fixperms
dh_installdeb
@@ -71,4 +59,4 @@
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install
More information about the Pkg-perl-cvs-commits
mailing list