diff -Nru dyndns-2010.0301+gitdd160bd/debian/changelog dyndns-2010.0301+gitdd160bd/debian/changelog --- dyndns-2010.0301+gitdd160bd/debian/changelog 2010-03-02 18:55:36.000000000 +0200 +++ dyndns-2010.0301+gitdd160bd/debian/changelog 2010-10-22 09:16:04.000000000 +0300 @@ -1,3 +1,17 @@ +dyndns (2010.0301+gitdd160bd-2) unstable; urgency=low + + * bin/dyndns.pl + - Patch changes from upstream release2010.1011+git8070c97 + + Set --file-default as default (Closes: #593255). + + Fix IP detection in pt_BR locale (Closes: #593253). + * debian/control + - (Standards-Version): Update to 3.9.1. + * Makefile + - Patch changes from upstream release2010.1011+git8070c97 + + Fix manual page generation. + + -- Jari Aalto Fri, 22 Oct 2010 09:14:02 +0300 + dyndns (2010.0301+gitdd160bd-1) unstable; urgency=low * Initial release (Closes: #571012). diff -Nru dyndns-2010.0301+gitdd160bd/debian/control dyndns-2010.0301+gitdd160bd/debian/control --- dyndns-2010.0301+gitdd160bd/debian/control 2010-03-02 19:10:55.000000000 +0200 +++ dyndns-2010.0301+gitdd160bd/debian/control 2010-10-22 09:16:04.000000000 +0300 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Jari Aalto Build-Depends: debhelper (>= 7.1) -Standards-Version: 3.8.4 +Standards-Version: 3.9.1 Vcs-Browser: http://git.debian.org/?p=collab-maint/dyndns.git Vcs-Git: git://git.debian.org/git/collab-maint/dyndns.git Homepage: http://freshmeat.net/projects/perl-dyndns diff -Nru dyndns-2010.0301+gitdd160bd/debian/patches/debian-changes-2010.0301+gitdd160bd-2 dyndns-2010.0301+gitdd160bd/debian/patches/debian-changes-2010.0301+gitdd160bd-2 --- dyndns-2010.0301+gitdd160bd/debian/patches/debian-changes-2010.0301+gitdd160bd-2 1970-01-01 02:00:00.000000000 +0200 +++ dyndns-2010.0301+gitdd160bd/debian/patches/debian-changes-2010.0301+gitdd160bd-2 2010-10-22 09:18:18.000000000 +0300 @@ -0,0 +1,897 @@ +Description: Upstream changes introduced in version 2010.0301+gitdd160bd-2 + This patch has been created by dpkg-source during the package build. + Here's the last changelog entry, hopefully it gives details on why + those changes were made: + . + dyndns (2010.0301+gitdd160bd-2) unstable; urgency=low + . + * bin/dyndns.pl + - Patch changes from upstream release2010.1011+git8070c97 + + Set --file-default as default (Closes: #593255). + + Fix IP detection in pt_BR locale (Closes: #593253). + * debian/control + - (Standards-Version): Update to 3.9.1. + * Makefile + - Patch changes from upstream release2010.1011+git8070c97 + + Fix manual page generation. + . + The person named in the Author field signed this changelog entry. +Author: Jari Aalto +Bug-Debian: http://bugs.debian.org/593253 +Bug-Debian: http://bugs.debian.org/593255 + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: , +Bug: +Bug-Debian: http://bugs.debian.org/ +Bug-Ubuntu: https://launchpad.net/bugs/ +Forwarded: +Reviewed-By: +Last-Update: + +--- dyndns-2010.0301+gitdd160bd.orig/Makefile ++++ dyndns-2010.0301+gitdd160bd/Makefile +@@ -76,6 +76,7 @@ DATE = `date +"%Y.%m%d"` + VERSION = $(DATE) + RELEASE = $(PACKAGE)-$(VERSION) + ++PERL = perl + BIN = $(PACKAGE) + PL_SCRIPT = bin/$(BIN).pl + +@@ -104,7 +105,7 @@ distclean: clean + + realclean: clean + +-dist-git: ++dist-git: test + rm -f $(DIST_DIR)/$(RELEASE)* + + git archive --format=tar --prefix=$(RELEASE)/ master | \ +@@ -117,8 +118,8 @@ dist-git: + + # The "gt" is maintainer's program frontend to Git + # Rule: dist-snap - [maintainer] release snapshot from Git repository +-dist-snap: +- echo gt tar -q -z -p $(PACKAGE) -c -D master ++dist-snap: test ++ @echo gt tar -q -z -p $(PACKAGE) -c -D master + + # Rule: dist - [maintainer] release from Git repository + dist: dist-git +--- /dev/null ++++ dyndns-2010.0301+gitdd160bd/t.p +@@ -0,0 +1,355 @@ ++--- a/bin/dyndns.pl +++++ b/bin/dyndns.pl ++@@ -62,6 +62,27 @@ ++ ++ # Standard perl modules ++ +++# **************************************************************************** +++# +++# Globals +++# +++# **************************************************************************** +++ +++use vars qw ( $VERSION ); +++ +++# This is for use of Makefile.PL and ExtUtils::MakeMaker +++# +++# The following variable is updated by Emacs setup whenever +++# this file is saved. +++ +++$VERSION = '2010.1011.1220'; +++ +++# **************************************************************************** +++# +++# Standard perl modules +++# +++# **************************************************************************** +++ ++ use strict; ++ use English; ++ use File::Basename; ++@@ -69,7 +90,25 @@ use Getopt::Long; ++ use autouse 'Pod::Text' => qw( pod2text ); ++ use autouse 'Pod::Html' => qw( pod2html ); ++ ++-# External CPAN moudules +++IMPORT: # This is just a syntactic sugar: actually no-op +++{ +++ # Import following environment variables +++ +++ use Env; +++ use vars qw +++ ( +++ $PATH +++ $TMPDIR +++ $SYSTEMROOT +++ $WINDIR +++ ); +++} +++ +++# **************************************************************************** +++# +++# Modules from CPAN +++# +++# **************************************************************************** ++ ++ my @REQUIRE_FATAL = # Without these the program won't work ++ ( ++@@ -87,29 +126,6 @@ my @REQUIRE_OPTIONAL = ++ # Will be set at runtime ++ my @FEATURE_LIST_MODULES; ++ ++-IMPORT: # This is just a syntactic sugar: actually no-op ++-{ ++- # Import following environment variables ++- ++- use Env; ++- use vars qw ++- ( ++- $PATH ++- $TMPDIR ++- $SYSTEMROOT ++- $WINDIR ++- ); ++- ++- use vars qw ( $VERSION ); ++- ++- # This is for use of Makefile.PL and ExtUtils::MakeMaker ++- # ++- # The following variable is updated by Emacs setup whenever ++- # this file is saved. ++- ++- $VERSION = '2010.0301.1321'; ++-} ++- ++ # }}} ++ # {{{ Initialize ++ ++@@ -626,6 +642,8 @@ Windows, %WINDIR% is used. Under Linux the PREFIXes searched are ++ /var/log/ (system's standard) ++ $HOME/tmp or $HOME if process is not running under root ++ +++This options is by default activated if B<--file> is not in used. +++ ++ =item B<--proxy HOST> ++ ++ Use HOST as outgoing HTTP proxy. ++@@ -971,6 +989,11 @@ Print version and contact information. ++ ++ =head1 EXAMPLES ++ +++To update IP address periodically, use crontab(5) entry. The update +++will happen only if IP has changed since last time: +++ +++ 0 0-23 * * * perl /dyndns +++ ++ To check current IP address: ++ ++ dyndns --query [--urlping...] ++@@ -1163,13 +1186,26 @@ and copied one directorory up in order to use option B<--config ++ If program is run with Windows Activestate Perl, the log file is stored to ++ file C. ++ ++-=head1 SEE ALSO +++=head1 EXIT STATUS +++ +++Not defined. +++ +++=head1 DEPENDENCIES +++ +++Uses standard Perl modules. +++ +++HTTP::Headers +++HTTP::Request::Common +++LWP::UserAgent +++LWP::Simple +++Sys::Syslog ++ ++-syslog(3), Debian package ddclient(1) +++=head1 STANDARDS ++ ++-See other dyndns.org clients at http://clients.dyndns.org/ +++The client specification is at +++https://www.dyndns.com/developers/specs/ ++ ++-=head1 BUGS +++=head1 BUGS AND LIMITATIONS ++ ++ =head2 Cygwin syslog ++ ++@@ -1192,43 +1228,24 @@ you find bugs or need new features. ++ The program is primarily developed and maintained to support dyndns.org. ++ The other providers haven't been tested since 2003. ++ ++-=head1 AVAILABILITY ++- ++-http://freshmeat.net/projects/perl-dyndns ++- ++-=head1 STANDARDS ++- ++-The client specification is at ++-https://www.dyndns.com/developers/specs/ ++- ++-=head1 SCRIPT CATEGORIES ++- ++-C ++-C ++- ++-=head1 PREREQUISITES ++- ++-HTTP::Headers ++-HTTP::Request::Common ++-LWP::UserAgent ++-LWP::Simple ++-Sys::Syslog +++=head1 SEE ALSO ++ ++-=head1 COREQUISITES +++syslog(3), +++Debian package ddclient(1) ++ ++-None. +++See other client software at http://clients.dyndns.org ++ ++-=head1 OSNAMES +++=head1 AVAILABILITY ++ ++-C +++http://freshmeat.net/projects/perl-dyndns ++ ++ =head1 AUTHOR ++ ++-Copyright (C) 1999-2009 Jari Aalto. All rights reserved. This program ++-is free software; you can redistribute and/or modify program under the ++-terms of GNU General Public license v2 or later. +++This program is free software; you can redistribute and/or modify +++program under the terms of GNU General Public license either version 2 +++of the License, or (at your option) any later version. ++ ++-This documentation may be distributed subject to the terms and +++The documentation may be distributed subject to the terms and ++ conditions set forth in GNU General Public License v2 or later (GNU ++ GPL); or, at your option, distributed under the terms of GNU Free ++ Documentation License version 1.2 or later (GNU FDL). ++@@ -1247,8 +1264,8 @@ sub Help ( ; $ $ ) ++ } ++ elsif ( $type eq -man ) ++ { ++- eval "use Pod::Man"; ++- $EVAL_ERROR and die "$id: Cannot generate Man $EVAL_ERROR"; +++ eval { require Pod::Man; 1 } +++ or die "$id: Cannot generate Man: $EVAL_ERROR"; ++ ++ my %options; ++ $options{center} = 'Perl Dynamic DNS Update Client'; ++@@ -1258,7 +1275,7 @@ sub Help ( ; $ $ ) ++ } ++ else ++ { ++- pod2text $PROGRAM_NAME; +++ system "pod2text $PROGRAM_NAME"; ++ } ++ ++ if ( defined $msg ) ++@@ -1299,6 +1316,12 @@ sub VersionInfo () ++ Version() . " $AUTHOR $LICENSE $URL" ++ } ++ +++sub VersionPrint () +++{ +++ print( VersionInfo() . "\n"); +++ exit 0; +++} +++ ++ # ************************************************************** &args ******* ++ # ++ # DESCRIPTION ++@@ -1444,7 +1467,6 @@ sub HandleCommandLineArgsMain () ++ Getopt::Long::config( qw ++ ( ++ no_ignore_case ++- require_order ++ )); ++ ++ GetOptions # Getopt::Long ++@@ -1502,7 +1524,7 @@ sub HandleCommandLineArgsMain () ++ , "wildcard" => \$wildcard ++ ); ++ ++- $version and print( VersionInfo() . "\n"), exit; +++ $version and VersionPrint(); ++ ++ $help and Help(); ++ $helpHTML and Help undef, -html; ++@@ -1524,6 +1546,11 @@ sub HandleCommandLineArgsMain () ++ $OPT_MX = 'YES' if defined $mx; ++ $OPT_OFFLINE = 'YES' if defined $offline; ++ +++ unless ( $OPT_IP_FILE or $ipfileDefault ) +++ { +++ $ipfileDefault = 'on'; +++ } +++ ++ if ( $ipfileDefault ) ++ { ++ $OPT_IP_FILE = SystemLogDir(); ++@@ -2691,7 +2718,7 @@ sub IPvalidate ($) ++ ++ sub StringMatch ( $ $ ) ++ { ++- my $id = "StringMatch"; +++ my $id = "$LIB.StringMatch"; ++ my ($itemRef, $searchRef ) = @ARG; ++ ++ unless ( @$itemRef ) ++@@ -3949,7 +3976,7 @@ sub GetIpAddressIfconfig () ++ # collisions:46 txqueuelen:100 ++ # Interrupt:11 Base address:0xec00 ++ ++- # my $re = 'inet[ \t]+addr:[ \t]*(\d[\d.]+)'; +++ # my $re = '(?sm)inet[ \t]+addr:[ \t]*(\d[\d.]+)'; ++ ++ my $modifier = '(?sm)'; ++ my $inet = 'inet[ \t]+'; ++@@ -3957,8 +3984,10 @@ sub GetIpAddressIfconfig () ++ ++ my @regexpList; ++ push @regexpList, $modifier . $inet . "addr:" . $base; +++ push @regexpList, $modifier . $inet . '[^\r\n:]+:' . $base; ++ push @regexpList, $modifier . $inet . $base; ++ +++ $debug and print "$id: CMD [$cmd]\n"; ++ ++ my $ip; ++ ++@@ -4010,6 +4039,9 @@ sub GetIpAddress () ++ ++ if ( $OPT_HTTP_PING ) ++ { +++ +++ $debug and print "$id: OPT_HTTP_PING\n"; +++ ++ $ret = HttpPing -url => $OPT_HTTP_PING ++ , -regexp => $OPT_HTTP_PING_REGEXP ++ , -login => $OPT_HTTP_PING_LOGIN ++@@ -4018,10 +4050,12 @@ sub GetIpAddress () ++ } ++ elsif ( $OPT_HTTP_PING_DYNDNS ) ++ { +++ $debug and print "$id: OPT_HTTP_PING_DYNDNS\n"; ++ $ret = HttpPingDyndns(); ++ } ++ elsif ( $OPT_HTTP_PING_LINKSYS ) ++ { +++ $debug and print "$id: OPT_HTTP_PING_LINKSYS $OPT_HTTP_PING_LINKSYS\n"; ++ ++ local $ARG = $OPT_HTTP_PING_LINKSYS; ++ ++@@ -4042,10 +4076,12 @@ sub GetIpAddress () ++ } ++ elsif ( $WIN32 ) ++ { +++ $debug and print "$id: WIN32\n"; ++ $ret = GetIpAddressWin32(); ++ } ++ elsif ( -x "/sbin/ifconfig" or -x "/usr/sbin/ifconfig") ++ { +++ $debug and print "$id: ifconfig\n"; ++ $ret = GetIpAddressIfconfig(); ++ } ++ else ++@@ -5206,9 +5242,25 @@ sub TestDriver () ++ } ++ ++ my (@response, $ip); ++- my $linuxDefaultRegexp = '(?sm)inet[ \t]+addr:[ \t]*(\d[\d.]+)'; +++ +++ # Copy from GetIpAddressIfconfig() +++ my $modifier = '(?sm)'; +++ my $inet = 'inet[ \t]+'; +++ my $base = '[ \t]*(\d[\d.]+)'; +++ +++ my $linuxDefaultRegexp = $modifier . $inet . "addr:" . $base; +++ ++ my $regexp; ++ +++ # locale: pt_BR +++ @response = split /\r?\n/, ' +++eth0 Link encap:Ethernet Endereço de HW 00:15:c5:1b:e1:de +++ inet end.: 189.29.36.92 Bcast:189.29.39.255 Masc:255.255.248.0'; +++ +++ $regexp = $modifier . $inet . '[^\r\n:]+:' . $base; +++ +++ $ip = IpAddressGenericParser $regexp, @response; +++ ++ @response = split /\r?\n/, ' ++ eth0 Link encap:Ethernet HWaddr 00:10:5A:64:8D:32 ++ inet addr:12.246.164.15 Bcast:255.255.255.255 Mask:255.255.255.0 ++@@ -6520,6 +6572,7 @@ sub Main () ++ ++ # }}} ++ +++# TestDriver; die; ++ # TestDriverLinksysBEFW11S4; die; ++ # TestDriverLinksysBEFW11S4v4; die; ++ # TestDriverLinksysWRT54GL; die; +--- dyndns-2010.0301+gitdd160bd.orig/bin/dyndns.1 ++++ dyndns-2010.0301+gitdd160bd/bin/dyndns.1 +@@ -1,4 +1,4 @@ +-.\" Automatically generated by Pod::Man 2.22 (Pod::Simple 3.13) ++.\" Automatically generated by Pod::Man 2.22 (Pod::Simple 3.07) + .\" + .\" Standard preamble: + .\" ======================================================================== +@@ -124,7 +124,7 @@ + .\" ======================================================================== + .\" + .IX Title "DYNDNS 1" +-.TH DYNDNS 1 "2010-03-01" "perl v5.10.1" "Perl Dynamic DNS Update Client" ++.TH DYNDNS 1 "2010-10-22" "perl v5.10.1" "Perl Dynamic DNS Update Client" + .\" For nroff, turn off justification. Always turn off hyphenation; it makes + .\" way too many mistakes in technical documents. + .if n .ad l +@@ -348,6 +348,8 @@ Windows, \f(CW%WINDIR\fR% is used. Under + \& /var/log/ (system\*(Aqs standard) + \& $HOME/tmp or $HOME if process is not running under root + .Ve ++.Sp ++This options is by default activated if \fB\-\-file\fR is not in used. + .IP "\fB\-\-proxy \s-1HOST\s0\fR" 4 + .IX Item "--proxy HOST" + Use \s-1HOST\s0 as outgoing \s-1HTTP\s0 proxy. +@@ -697,6 +699,13 @@ Print informational messages. + Print version and contact information. + .SH "EXAMPLES" + .IX Header "EXAMPLES" ++To update \s-1IP\s0 address periodically, use \fIcrontab\fR\|(5) entry. The update ++will happen only if \s-1IP\s0 has changed since last time: ++.PP ++.Vb 1 ++\& 0 0\-23 * * * perl /dyndns ++.Ve ++.PP + To check current \s-1IP\s0 address: + .PP + .Vb 3 +@@ -901,13 +910,24 @@ and copied one directorory up in order t + .PP + If program is run with Windows Activestate Perl, the log file is stored to + file \f(CW\*(C`C:/syslog.txt\*(C'\fR. +-.SH "SEE ALSO" +-.IX Header "SEE ALSO" +-\&\fIsyslog\fR\|(3), Debian package \fIddclient\fR\|(1) ++.SH "EXIT STATUS" ++.IX Header "EXIT STATUS" ++Not defined. ++.SH "DEPENDENCIES" ++.IX Header "DEPENDENCIES" ++Uses standard Perl modules. + .PP +-See other dyndns.org clients at http://clients.dyndns.org/ +-.SH "BUGS" +-.IX Header "BUGS" ++HTTP::Headers ++HTTP::Request::Common ++LWP::UserAgent ++LWP::Simple ++Sys::Syslog ++.SH "STANDARDS" ++.IX Header "STANDARDS" ++The client specification is at ++https://www.dyndns.com/developers/specs/ ++.SH "BUGS AND LIMITATIONS" ++.IX Header "BUGS AND LIMITATIONS" + .SS "Cygwin syslog" + .IX Subsection "Cygwin syslog" + There is no syslog daemon in Cygwin. The Cygwin \s-1POSIX\s0 emulation layer takes +@@ -926,37 +946,22 @@ you find bugs or need new features. + .IX Subsection "About providers hnorg and noip" + The program is primarily developed and maintained to support dyndns.org. + The other providers haven't been tested since 2003. ++.SH "SEE ALSO" ++.IX Header "SEE ALSO" ++\&\fIsyslog\fR\|(3), ++Debian package \fIddclient\fR\|(1) ++.PP ++See other client software at http://clients.dyndns.org + .SH "AVAILABILITY" + .IX Header "AVAILABILITY" + http://freshmeat.net/projects/perl\-dyndns +-.SH "STANDARDS" +-.IX Header "STANDARDS" +-The client specification is at +-https://www.dyndns.com/developers/specs/ +-.SH "SCRIPT CATEGORIES" +-.IX Header "SCRIPT CATEGORIES" +-\&\f(CW\*(C`CPAN/Administrative\*(C'\fR +-\&\f(CW\*(C`CPAN/Networking\*(C'\fR +-.SH "PREREQUISITES" +-.IX Header "PREREQUISITES" +-HTTP::Headers +-HTTP::Request::Common +-LWP::UserAgent +-LWP::Simple +-Sys::Syslog +-.SH "COREQUISITES" +-.IX Header "COREQUISITES" +-None. +-.SH "OSNAMES" +-.IX Header "OSNAMES" +-\&\f(CW\*(C`any\*(C'\fR + .SH "AUTHOR" + .IX Header "AUTHOR" +-Copyright (C) 1999\-2009 Jari Aalto. All rights reserved. This program +-is free software; you can redistribute and/or modify program under the +-terms of \s-1GNU\s0 General Public license v2 or later. ++This program is free software; you can redistribute and/or modify ++program under the terms of \s-1GNU\s0 General Public license either version 2 ++of the License, or (at your option) any later version. + .PP +-This documentation may be distributed subject to the terms and ++The documentation may be distributed subject to the terms and + conditions set forth in \s-1GNU\s0 General Public License v2 or later (\s-1GNU\s0 + \&\s-1GPL\s0); or, at your option, distributed under the terms of \s-1GNU\s0 Free + Documentation License version 1.2 or later (\s-1GNU\s0 \s-1FDL\s0). +--- dyndns-2010.0301+gitdd160bd.orig/bin/dyndns.pl ++++ dyndns-2010.0301+gitdd160bd/bin/dyndns.pl +@@ -62,6 +62,27 @@ + + # Standard perl modules + ++# **************************************************************************** ++# ++# Globals ++# ++# **************************************************************************** ++ ++use vars qw ( $VERSION ); ++ ++# This is for use of Makefile.PL and ExtUtils::MakeMaker ++# ++# The following variable is updated by Emacs setup whenever ++# this file is saved. ++ ++$VERSION = '2010.1011.1220'; ++ ++# **************************************************************************** ++# ++# Standard perl modules ++# ++# **************************************************************************** ++ + use strict; + use English; + use File::Basename; +@@ -69,7 +90,25 @@ use Getopt::Long; + use autouse 'Pod::Text' => qw( pod2text ); + use autouse 'Pod::Html' => qw( pod2html ); + +-# External CPAN moudules ++IMPORT: # This is just a syntactic sugar: actually no-op ++{ ++ # Import following environment variables ++ ++ use Env; ++ use vars qw ++ ( ++ $PATH ++ $TMPDIR ++ $SYSTEMROOT ++ $WINDIR ++ ); ++} ++ ++# **************************************************************************** ++# ++# Modules from CPAN ++# ++# **************************************************************************** + + my @REQUIRE_FATAL = # Without these the program won't work + ( +@@ -87,29 +126,6 @@ my @REQUIRE_OPTIONAL = + # Will be set at runtime + my @FEATURE_LIST_MODULES; + +-IMPORT: # This is just a syntactic sugar: actually no-op +-{ +- # Import following environment variables +- +- use Env; +- use vars qw +- ( +- $PATH +- $TMPDIR +- $SYSTEMROOT +- $WINDIR +- ); +- +- use vars qw ( $VERSION ); +- +- # This is for use of Makefile.PL and ExtUtils::MakeMaker +- # +- # The following variable is updated by Emacs setup whenever +- # this file is saved. +- +- $VERSION = '2010.0301.1321'; +-} +- + # }}} + # {{{ Initialize + +@@ -626,6 +642,8 @@ Windows, %WINDIR% is used. Under Linux t + /var/log/ (system's standard) + $HOME/tmp or $HOME if process is not running under root + ++This options is by default activated if B<--file> is not in used. ++ + =item B<--proxy HOST> + + Use HOST as outgoing HTTP proxy. +@@ -971,6 +989,11 @@ Print version and contact information. + + =head1 EXAMPLES + ++To update IP address periodically, use crontab(5) entry. The update ++will happen only if IP has changed since last time: ++ ++ 0 0-23 * * * perl /dyndns ++ + To check current IP address: + + dyndns --query [--urlping...] +@@ -1163,13 +1186,26 @@ and copied one directorory up in order t + If program is run with Windows Activestate Perl, the log file is stored to + file C. + +-=head1 SEE ALSO ++=head1 EXIT STATUS ++ ++Not defined. ++ ++=head1 DEPENDENCIES ++ ++Uses standard Perl modules. ++ ++HTTP::Headers ++HTTP::Request::Common ++LWP::UserAgent ++LWP::Simple ++Sys::Syslog + +-syslog(3), Debian package ddclient(1) ++=head1 STANDARDS + +-See other dyndns.org clients at http://clients.dyndns.org/ ++The client specification is at ++https://www.dyndns.com/developers/specs/ + +-=head1 BUGS ++=head1 BUGS AND LIMITATIONS + + =head2 Cygwin syslog + +@@ -1192,43 +1228,24 @@ you find bugs or need new features. + The program is primarily developed and maintained to support dyndns.org. + The other providers haven't been tested since 2003. + +-=head1 AVAILABILITY +- +-http://freshmeat.net/projects/perl-dyndns +- +-=head1 STANDARDS +- +-The client specification is at +-https://www.dyndns.com/developers/specs/ +- +-=head1 SCRIPT CATEGORIES +- +-C +-C +- +-=head1 PREREQUISITES +- +-HTTP::Headers +-HTTP::Request::Common +-LWP::UserAgent +-LWP::Simple +-Sys::Syslog ++=head1 SEE ALSO + +-=head1 COREQUISITES ++syslog(3), ++Debian package ddclient(1) + +-None. ++See other client software at http://clients.dyndns.org + +-=head1 OSNAMES ++=head1 AVAILABILITY + +-C ++http://freshmeat.net/projects/perl-dyndns + + =head1 AUTHOR + +-Copyright (C) 1999-2009 Jari Aalto. All rights reserved. This program +-is free software; you can redistribute and/or modify program under the +-terms of GNU General Public license v2 or later. ++This program is free software; you can redistribute and/or modify ++program under the terms of GNU General Public license either version 2 ++of the License, or (at your option) any later version. + +-This documentation may be distributed subject to the terms and ++The documentation may be distributed subject to the terms and + conditions set forth in GNU General Public License v2 or later (GNU + GPL); or, at your option, distributed under the terms of GNU Free + Documentation License version 1.2 or later (GNU FDL). +@@ -1247,8 +1264,8 @@ sub Help ( ; $ $ ) + } + elsif ( $type eq -man ) + { +- eval "use Pod::Man"; +- $EVAL_ERROR and die "$id: Cannot generate Man $EVAL_ERROR"; ++ eval { require Pod::Man; 1 } ++ or die "$id: Cannot generate Man: $EVAL_ERROR"; + + my %options; + $options{center} = 'Perl Dynamic DNS Update Client'; +@@ -1258,7 +1275,7 @@ sub Help ( ; $ $ ) + } + else + { +- pod2text $PROGRAM_NAME; ++ system "pod2text $PROGRAM_NAME"; + } + + if ( defined $msg ) +@@ -1299,6 +1316,12 @@ sub VersionInfo () + Version() . " $AUTHOR $LICENSE $URL" + } + ++sub VersionPrint () ++{ ++ print( VersionInfo() . "\n"); ++ exit 0; ++} ++ + # ************************************************************** &args ******* + # + # DESCRIPTION +@@ -1444,7 +1467,6 @@ sub HandleCommandLineArgsMain () + Getopt::Long::config( qw + ( + no_ignore_case +- require_order + )); + + GetOptions # Getopt::Long +@@ -1502,7 +1524,7 @@ sub HandleCommandLineArgsMain () + , "wildcard" => \$wildcard + ); + +- $version and print( VersionInfo() . "\n"), exit; ++ $version and VersionPrint(); + + $help and Help(); + $helpHTML and Help undef, -html; +@@ -1524,6 +1546,11 @@ sub HandleCommandLineArgsMain () + $OPT_MX = 'YES' if defined $mx; + $OPT_OFFLINE = 'YES' if defined $offline; + ++ unless ( $OPT_IP_FILE or $ipfileDefault ) ++ { ++ $ipfileDefault = 'on'; ++ } ++ + if ( $ipfileDefault ) + { + $OPT_IP_FILE = SystemLogDir(); +@@ -2691,7 +2718,7 @@ sub IPvalidate ($) + + sub StringMatch ( $ $ ) + { +- my $id = "StringMatch"; ++ my $id = "$LIB.StringMatch"; + my ($itemRef, $searchRef ) = @ARG; + + unless ( @$itemRef ) +@@ -3949,7 +3976,7 @@ sub GetIpAddressIfconfig () + # collisions:46 txqueuelen:100 + # Interrupt:11 Base address:0xec00 + +- # my $re = 'inet[ \t]+addr:[ \t]*(\d[\d.]+)'; ++ # my $re = '(?sm)inet[ \t]+addr:[ \t]*(\d[\d.]+)'; + + my $modifier = '(?sm)'; + my $inet = 'inet[ \t]+'; +@@ -3957,8 +3984,10 @@ sub GetIpAddressIfconfig () + + my @regexpList; + push @regexpList, $modifier . $inet . "addr:" . $base; ++ push @regexpList, $modifier . $inet . '[^\r\n:]+:' . $base; + push @regexpList, $modifier . $inet . $base; + ++ $debug and print "$id: CMD [$cmd]\n"; + + my $ip; + +@@ -4010,6 +4039,9 @@ sub GetIpAddress () + + if ( $OPT_HTTP_PING ) + { ++ ++ $debug and print "$id: OPT_HTTP_PING\n"; ++ + $ret = HttpPing -url => $OPT_HTTP_PING + , -regexp => $OPT_HTTP_PING_REGEXP + , -login => $OPT_HTTP_PING_LOGIN +@@ -4018,10 +4050,12 @@ sub GetIpAddress () + } + elsif ( $OPT_HTTP_PING_DYNDNS ) + { ++ $debug and print "$id: OPT_HTTP_PING_DYNDNS\n"; + $ret = HttpPingDyndns(); + } + elsif ( $OPT_HTTP_PING_LINKSYS ) + { ++ $debug and print "$id: OPT_HTTP_PING_LINKSYS $OPT_HTTP_PING_LINKSYS\n"; + + local $ARG = $OPT_HTTP_PING_LINKSYS; + +@@ -4042,10 +4076,12 @@ sub GetIpAddress () + } + elsif ( $WIN32 ) + { ++ $debug and print "$id: WIN32\n"; + $ret = GetIpAddressWin32(); + } + elsif ( -x "/sbin/ifconfig" or -x "/usr/sbin/ifconfig") + { ++ $debug and print "$id: ifconfig\n"; + $ret = GetIpAddressIfconfig(); + } + else +@@ -5206,9 +5242,25 @@ sub TestDriver () + } + + my (@response, $ip); +- my $linuxDefaultRegexp = '(?sm)inet[ \t]+addr:[ \t]*(\d[\d.]+)'; ++ ++ # Copy from GetIpAddressIfconfig() ++ my $modifier = '(?sm)'; ++ my $inet = 'inet[ \t]+'; ++ my $base = '[ \t]*(\d[\d.]+)'; ++ ++ my $linuxDefaultRegexp = $modifier . $inet . "addr:" . $base; ++ + my $regexp; + ++ # locale: pt_BR ++ @response = split /\r?\n/, ' ++eth0 Link encap:Ethernet Endereço de HW 00:15:c5:1b:e1:de ++ inet end.: 189.29.36.92 Bcast:189.29.39.255 Masc:255.255.248.0'; ++ ++ $regexp = $modifier . $inet . '[^\r\n:]+:' . $base; ++ ++ $ip = IpAddressGenericParser $regexp, @response; ++ + @response = split /\r?\n/, ' + eth0 Link encap:Ethernet HWaddr 00:10:5A:64:8D:32 + inet addr:12.246.164.15 Bcast:255.255.255.255 Mask:255.255.255.0 +@@ -6520,6 +6572,7 @@ sub Main () + + # }}} + ++# TestDriver; die; + # TestDriverLinksysBEFW11S4; die; + # TestDriverLinksysBEFW11S4v4; die; + # TestDriverLinksysWRT54GL; die; diff -Nru dyndns-2010.0301+gitdd160bd/debian/patches/series dyndns-2010.0301+gitdd160bd/debian/patches/series --- dyndns-2010.0301+gitdd160bd/debian/patches/series 1970-01-01 02:00:00.000000000 +0200 +++ dyndns-2010.0301+gitdd160bd/debian/patches/series 2010-10-22 09:12:06.000000000 +0300 @@ -0,0 +1 @@ +debian-changes-2010.0301+gitdd160bd-2