r59334 - in /trunk/libnet-ident-perl: Changes Ident.pm MANIFEST META.yml Makefile.PL debian/changelog t/hosts
chrisb at users.alioth.debian.org
chrisb at users.alioth.debian.org
Sun Jun 13 14:37:53 UTC 2010
Author: chrisb
Date: Sun Jun 13 14:37:37 2010
New Revision: 59334
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=59334
Log:
New upstream release
Added:
trunk/libnet-ident-perl/META.yml
- copied unchanged from r59333, branches/upstream/libnet-ident-perl/current/META.yml
Modified:
trunk/libnet-ident-perl/Changes
trunk/libnet-ident-perl/Ident.pm
trunk/libnet-ident-perl/MANIFEST
trunk/libnet-ident-perl/Makefile.PL
trunk/libnet-ident-perl/debian/changelog
trunk/libnet-ident-perl/t/hosts
Modified: trunk/libnet-ident-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-ident-perl/Changes?rev=59334&op=diff
==============================================================================
--- trunk/libnet-ident-perl/Changes (original)
+++ trunk/libnet-ident-perl/Changes Sun Jun 13 14:37:37 2010
@@ -1,63 +1,73 @@
Revision history for Perl extension Net::Ident.
+1.21 Fri Jun 11 09:00:00 CST 2010
+ - Remove Apache (mod_perl) as a dep for this module
+1.21 Fri Jun 11 01:00:00 CST 2010
+ - Move sub around to fix prototyping bug.
+ - Remove broken ident hosts from list so tests don't break. Right now
+ i know of no working public ident hosts. Patches welcome!
+ - Update Makefile.PL with new options
+ - Add META.yml to module
+ - use %! to determine if error was EINPROGRESS to function in other languages
+
1.20 Fri Aug 27 00:59:24 CEST 1999
- - Public release
- - Added a few more apache layouts to the Makefile.PL to autodetect.
+ - Public release
+ - Added a few more apache layouts to the Makefile.PL to autodetect.
1.19 Mon Aug 2 22:50:21 CEST 1999
- - Added the often asked for, long promised lookupFromInaddr method.
- - No longer imports ident_lookup into package FileHandle by
- default, unless you explicitly ask for it (or unless you
- installed it that way during compile time for compatibility
- reasons).
- - Allow adding an ident_lookup method to the Apache::Connection
- class, as a convenience for mod_perl script writers.
- - Rewritten tests, included test for the Apache::Connection method
- by actually launching apache and performing ident lookups from
- within mod_perl.
- - Moved selection of FileHandle/IO::Handle class out of the
- Makefile.PL. PAUSE/CPAN didn't really like modules that weren't
- present in the distribution, and it didn't allow you to upgrade
- your perl version underneath.
+ - Added the often asked for, long promised lookupFromInaddr method.
+ - No longer imports ident_lookup into package FileHandle by
+ default, unless you explicitly ask for it (or unless you
+ installed it that way during compile time for compatibility
+ reasons).
+ - Allow adding an ident_lookup method to the Apache::Connection
+ class, as a convenience for mod_perl script writers.
+ - Rewritten tests, included test for the Apache::Connection method
+ by actually launching apache and performing ident lookups from
+ within mod_perl.
+ - Moved selection of FileHandle/IO::Handle class out of the
+ Makefile.PL. PAUSE/CPAN didn't really like modules that weren't
+ present in the distribution, and it didn't allow you to upgrade
+ your perl version underneath.
-1.11 Wed Jan 15 01:49:15 MET 1997
- - Several bugfixes, and some slight interface changes:
- - constructor now called `new' instead of `initconnect',
- constructor now always succeeds, if something has gone
- wrong in the constructor, all methods return undef (like
- `getfh'), except for `geterror', which returns the error
- message.
- - The recommended exported function is now `ident_lookup'
- instead of `lookup'
- - Fixed a bug: now chooses O_NDELAY or O_NONBLOCK from
- %Config, instead of hardcoding O_NDELAY (argh)
- - Adding a method to FileHandle would break in perl5.004, it
- should get added in IO::Handle. Added intelligence in
- Makefile.PL to detect that and choose the appropriate
- package.
- - Miscellaneous pod fixes.
- - Test script now actually tests multiple different things.
+1.11 Wed Jan 15 01:49:15 MET 1999
+ - Several bugfixes, and some slight interface changes:
+ - constructor now called `new' instead of `initconnect',
+ constructor now always succeeds, if something has gone
+ wrong in the constructor, all methods return undef (like
+ `getfh'), except for `geterror', which returns the error
+ message.
+ - The recommended exported function is now `ident_lookup'
+ instead of `lookup'
+ - Fixed a bug: now chooses O_NDELAY or O_NONBLOCK from
+ %Config, instead of hardcoding O_NDELAY (argh)
+ - Adding a method to FileHandle would break in perl5.004, it
+ should get added in IO::Handle. Added intelligence in
+ Makefile.PL to detect that and choose the appropriate
+ package.
+ - Miscellaneous pod fixes.
+ - Test script now actually tests multiple different things.
1.10 Sat Jan 11 19:05:35 1997
- - original version; created by h2xs 1.16. First release
- as a perl5 module, complete rewrite for perl5, based
- on rfc931.pl
+ - original version; created by h2xs 1.16. First release
+ as a perl5 module, complete rewrite for perl5, based
+ on rfc931.pl
1.02 Fri Jan 20 18:20:32 1995
- - Quite a big bugfix: "connection
- refused" to the ident port would kill the perl process
- with a SIGPIPE if the connect didn't immediately
- signal it (ie. almost always on remote machines). Also
- recognises the perl5 package separator :: now on fully
- qualified descriptors. This is still perl4-compatible,
- a perl5- only version would require a rewrite to make
- it neater. Fixed the constants normally found in .ph
- files (but you shouldn't use those anyway).
+ - Quite a big bugfix: "connection
+ refused" to the ident port would kill the perl process
+ with a SIGPIPE if the connect didn't immediately
+ signal it (ie. almost always on remote machines). Also
+ recognises the perl5 package separator :: now on fully
+ qualified descriptors. This is still perl4-compatible,
+ a perl5- only version would require a rewrite to make
+ it neater. Fixed the constants normally found in .ph
+ files (but you shouldn't use those anyway).
1.01 Some Novish evening 1994
- - Removed a spurious perl5 -w complaint. First public release.
- Has been tested against perl 5.000 and perl 4.036.
+ - Removed a spurious perl5 -w complaint. First public release.
+ Has been tested against perl 5.000 and perl 4.036.
1.00 Somewhere in 1994
- - First neat collection of dusty routines put in a package.
+ - First neat collection of dusty routines put in a package.
Modified: trunk/libnet-ident-perl/Ident.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-ident-perl/Ident.pm?rev=59334&op=diff
==============================================================================
--- trunk/libnet-ident-perl/Ident.pm (original)
+++ trunk/libnet-ident-perl/Ident.pm Sun Jun 13 14:37:37 2010
@@ -9,6 +9,7 @@
use FileHandle;
use Carp;
use Config;
+use Errno;
require Exporter;
use vars qw(@ISA @EXPORT_OK $DEBUG $VERSION %EXPORT_TAGS @EXPORT_FAIL
@@ -25,12 +26,24 @@
'debug' => \&_set_debug,
);
+# provide import magic
+sub _export_hooks () {
+ my($tag, $hook);
+ while ( ($tag, $hook) = each %EXPORT_HOOKS ) {
+ my $hookname = "_export_hook_$tag"; # pseudo-function name
+ $EXPORT_TAGS{$tag} = [$hookname];
+ push @EXPORT_OK, $hookname;
+ push @EXPORT_FAIL, $hookname;
+ }
+}
+
+
# put the export hooks in the standard Exporter structures
_export_hooks();
# for compatibility mode, uncomment the next line @@ s/^#\s*// @@
# @EXPORT = qw(_export_hook_fh);
-$VERSION = sprintf("%d.%02d", q$Revision: 1.20 $ =~ /: (\d+)\.(\d+)/);
+$VERSION = "1.22";
$DEBUG ||= 0;
*STDDBG = *STDERR;
@@ -126,7 +139,6 @@
sub newFromInAddr {
my($class, $localaddr, $remoteaddr, $timeout) = @_;
- my $e;
my $self = {};
print STDDBG "Net::Ident::newFromInAddr localaddr=",
@@ -139,58 +151,61 @@
if $DEBUG > 1;
eval {
- # unpack addresses and store in
- my($localip, $remoteip);
- ($self->{localport}, $localip) = sockaddr_in($localaddr);
- ($self->{remoteport}, $remoteip) = sockaddr_in($remoteaddr);
-
- # create a local binding port. We cannot bind to INADDR_ANY, it has
- # to be bind (bound?) to the same IP address as the connection we're
- # interested in on machines with multiple IP addresses
- my $localbind = sockaddr_in(0, $localip);
-
- # store max time
- $self->{maxtime} = defined($timeout) ? time + $timeout : undef;
-
- # create a remote connect point
- my $identbind = sockaddr_in($identport, $remoteip);
-
- # create a new FileHandle
- $self->{fh} = new FileHandle;
-
- # create a stream socket.
- socket($self->{fh}, PF_INET, SOCK_STREAM, $tcpproto) or
- die "= socket failed: $!\n";
-
- # bind it to the same IP number as the local end of THESOCK
- bind($self->{fh}, $localbind) or die "= bind failed: $!\n";
-
- # make it a non-blocking socket
- fcntl($self->{fh}, F_SETFL, $NONBLOCK) or die "= fcntl failed: $!\n";
-
- # connect it to the remote identd port, this can return EINPROGRESS.
- # for some reason, reading $! twice doesn't work as it should
- connect($self->{fh}, $identbind) or ($e=$!) =~ /in progress/ or
- die "= connect failed: $e\n";
+ # unpack addresses and store in
+ my($localip, $remoteip);
+ ($self->{localport}, $localip) = sockaddr_in($localaddr);
+ ($self->{remoteport}, $remoteip) = sockaddr_in($remoteaddr);
+
+ # create a local binding port. We cannot bind to INADDR_ANY, it has
+ # to be bind (bound?) to the same IP address as the connection we're
+ # interested in on machines with multiple IP addresses
+ my $localbind = sockaddr_in(0, $localip);
+
+ # store max time
+ $self->{maxtime} = defined($timeout) ? time + $timeout : undef;
+
+ # create a remote connect point
+ my $identbind = sockaddr_in($identport, $remoteip);
+
+ # create a new FileHandle
+ $self->{fh} = new FileHandle;
+
+ # create a stream socket.
+ socket($self->{fh}, PF_INET, SOCK_STREAM, $tcpproto) or
+ die "= socket failed: $!\n";
+
+ # bind it to the same IP number as the local end of THESOCK
+ bind($self->{fh}, $localbind) or die "= bind failed: $!\n";
+
+ # make it a non-blocking socket
+ fcntl($self->{fh}, F_SETFL, $NONBLOCK) or die "= fcntl failed: $!\n";
+
+ # connect it to the remote identd port, this can return EINPROGRESS.
+ # for some reason, reading $! twice doesn't work as it should
+ connect($self->{fh}, $identbind) or $!{EINPROGRESS} or
+ die "= connect failed: $!\n";
};
if ( $@ =~ /^= (.*)/ ) {
- # here's the catch of the throw
- # return false, try to preserve errno
- local($!);
- $self->{error} = "Net::Ident::new: $1\n";
- print STDDBG $self->{error} if $DEBUG;
- # this deletes the FileHandle, which gets closed,
- # so that might change errno
- delete $self->{fh};
- # do NOT return, so the constructor always succeeds
+ # here's the catch of the throw
+ # return false, try to preserve errno
+ local($!);
+ $self->{error} = "Net::Ident::new: $1\n";
+ print STDDBG $self->{error} if $DEBUG;
+ # this deletes the FileHandle, which gets closed,
+ # so that might change errno
+ delete $self->{fh};
+ # do NOT return, so the constructor always succeeds
}
elsif ( $@ ) {
- # something else went wrong. barf up completely.
- confess($@);
+ # something else went wrong. barf up completely.
+ confess($@);
}
# clear errno in case it contains EINPROGRESS
- $! = 0 if ( $e && $e =~ /in progress/ );
+ if($!{EINPROGRESS}) {
+ $! = 0;
+ $!{EINPROGRESS} = 0;
+ }
# mark the state of the connection
$self->{state} = 'connect';
@@ -504,17 +519,6 @@
$self->{error};
}
-# provide import magic
-sub _export_hooks () {
- my($tag, $hook);
- while ( ($tag, $hook) = each %EXPORT_HOOKS ) {
- my $hookname = "_export_hook_$tag"; # pseudo-function name
- $EXPORT_TAGS{$tag} = [$hookname];
- push @EXPORT_OK, $hookname;
- push @EXPORT_FAIL, $hookname;
- }
-}
-
# this is called whenever a function in @EXPORT_FAIL is imported.
# simply calls the installed export hooks from %EXPORT_HOOKS, or
# passes along the export_fail up the inheritance chain
Modified: trunk/libnet-ident-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-ident-perl/MANIFEST?rev=59334&op=diff
==============================================================================
--- trunk/libnet-ident-perl/MANIFEST (original)
+++ trunk/libnet-ident-perl/MANIFEST Sun Jun 13 14:37:37 2010
@@ -18,3 +18,4 @@
t/apache/perl/testmodperl script to test mod_perl operates OK
t/apache/perl/testident script to actually test ident within mod_perl
t/apache/logs/.exists Directory for the logfiles
+META.yml
Modified: trunk/libnet-ident-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-ident-perl/Makefile.PL?rev=59334&op=diff
==============================================================================
--- trunk/libnet-ident-perl/Makefile.PL (original)
+++ trunk/libnet-ident-perl/Makefile.PL Sun Jun 13 14:37:37 2010
@@ -611,8 +611,35 @@
# back to your regular scheduled MakeMaker
WriteMakefile(
- 'NAME' => 'Net::Ident',
- 'VERSION_FROM' => 'Ident.pm', # finds $VERSION
- 'clean' =>
- {FILES => "t/apache/conf/access.conf t/apache/conf/apache_config.pl t/apache/conf/httpd.conf t/apache/conf/srm.conf t/apache/logs/access_log t/apache/logs/error_log t/apache/perl/inc"},
+ NAME => 'Net::Ident',
+ ABSTRACT => 'Lookup the username on the remote end of a TCP/IP connection',
+ AUTHOR => 'Jan-Pieter Cornet <johnpc at xs4all.nl>',
+ VERSION_FROM => 'Ident.pm', # finds $VERSION
+ PREREQ_PM => {
+ Socket => '0',
+ Fcntl => '0',
+ FileHandle => '0',
+ Carp => '0',
+ Config => '0',
+ Exporter => '0',
+ vars => '0',
+ },
+ dist => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', },
+ clean => {
+ FILES => "Net-Ident-* t/apache/conf/access.conf t/apache/conf/apache_config.pl t/apache/conf/httpd.conf t/apache/conf/srm.conf t/apache/logs/access_log t/apache/logs/error_log t/apache/perl/inc"
+ },
+ META_MERGE => {
+ build_requires => {
+# 'Apache' => 0, # mod_perl is crazy hard to install. It's not a fair thing to require
+# 'Apache::Constants' => 0, # mod_perl is crazy hard to install. It's not a fair thing to require
+ 'IO::Socket', # For testing
+ },
+ resources => {
+ license => 'http://dev.perl.org/licenses/',
+ homepage => 'http://wiki.github.com/toddr/Net-Ident/',
+# bugtracker => 'https://rt.cpan.org/Dist/Display.html?Queue=Net-Ident',
+ repository => 'http://github.com/toddr/Net-Ident',
+# MailingList => 'http://groups.google.com/group/perl-net-ident',
+ },
+ },
);
Modified: trunk/libnet-ident-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-ident-perl/debian/changelog?rev=59334&op=diff
==============================================================================
--- trunk/libnet-ident-perl/debian/changelog (original)
+++ trunk/libnet-ident-perl/debian/changelog Sun Jun 13 14:37:37 2010
@@ -1,4 +1,4 @@
-libnet-ident-perl (1.20-6) UNRELEASED; urgency=low
+libnet-ident-perl (1.22-1) UNRELEASED; urgency=low
[ gregor herrmann ]
* Refresh debian/rules, no functional changes.
@@ -12,7 +12,10 @@
[ Nathan Handler ]
* debian/watch: Update to ignore development releases.
- -- gregor herrmann <gregoa at debian.org> Fri, 20 Jun 2008 19:37:36 +0200
+ [ Chris Butler ]
+ * New upstream release
+
+ -- Chris Butler <chrisb at debian.org> Sun, 13 Jun 2010 15:34:04 +0100
libnet-ident-perl (1.20-5) unstable; urgency=low
Modified: trunk/libnet-ident-perl/t/hosts
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-ident-perl/t/hosts?rev=59334&op=diff
==============================================================================
--- trunk/libnet-ident-perl/t/hosts (original)
+++ trunk/libnet-ident-perl/t/hosts Sun Jun 13 14:37:37 2010
@@ -4,8 +4,11 @@
# note that these tests actually rely on a common buglet in identd
# implementations, in that they let you perform an ident lookup on
# a connection that is incoming.
-pc.xs4all.nl
-xs4all.nl
-lyrix.xs4all.nl
-lysator.liu.se
+#
+# Right now we know of no ident servers on the internet that serve out.
+# Patches welcome http://github.com/toddr/Net-Ident
127.0.0.1
+#pc.xs4all.nl
+#xs4all.nl
+#lyrix.xs4all.nl
+#lysator.liu.se
More information about the Pkg-perl-cvs-commits
mailing list