diff -Nru libnet-ldap-server-perl-0.4/Changelog libnet-ldap-server-perl-0.43/Changelog --- libnet-ldap-server-perl-0.4/Changelog 2007-10-27 09:43:54.000000000 +0000 +++ libnet-ldap-server-perl-0.43/Changelog 2011-05-26 19:09:58.000000000 +0000 @@ -1,5 +1,14 @@ -CHANGELOG -========= +version 0.43 (2011/05/26): + + - added support for Net::Server by allowing the usage of + distinct filehandles for input and output + (patch by Alexei Znamensky) + +version 0.42 (2009/10/01): + + - don't hangup when receiving abandonRequest in order to support + clients like Evolution which expect that the socket is still + alive after such a request (patch by Bill Lindley) version 0.4 (2007/10/27): diff -Nru libnet-ldap-server-perl-0.4/debian/changelog libnet-ldap-server-perl-0.43/debian/changelog --- libnet-ldap-server-perl-0.4/debian/changelog 2018-06-02 18:27:15.000000000 +0000 +++ libnet-ldap-server-perl-0.43/debian/changelog 2018-06-02 07:03:12.000000000 +0000 @@ -1,3 +1,20 @@ +libnet-ldap-server-perl (0.43-1) unstable; urgency=medium + + * Taken under Pkg-Perl Umbrella (Closes: #868692) + * Update debian/copyright to 1.0 format + * Use dh in debian/rules + * Add files: + - debian/upstream/metadata + - debian/watch + - debian/source/format + * Bump debhelper compatibility to 10 + * Declare compliance with policy 4.1.4 + * Import version 0.43 + * Update debian/copyright years + * Add examples/* + + -- Xavier Guimard Sat, 02 Jun 2018 09:03:12 +0200 + libnet-ldap-server-perl (0.4-2) unstable; urgency=low * Don't try to remove /usr/lib/perl5 if it's not there. diff -Nru libnet-ldap-server-perl-0.4/debian/compat libnet-ldap-server-perl-0.43/debian/compat --- libnet-ldap-server-perl-0.4/debian/compat 2018-06-02 18:27:15.000000000 +0000 +++ libnet-ldap-server-perl-0.43/debian/compat 2018-06-02 07:03:12.000000000 +0000 @@ -1 +1 @@ -5 +10 diff -Nru libnet-ldap-server-perl-0.4/debian/control libnet-ldap-server-perl-0.43/debian/control --- libnet-ldap-server-perl-0.4/debian/control 2018-06-02 18:27:15.000000000 +0000 +++ libnet-ldap-server-perl-0.43/debian/control 2018-06-02 07:03:12.000000000 +0000 @@ -1,14 +1,24 @@ Source: libnet-ldap-server-perl Section: perl -Priority: extra -Build-Depends: cdbs, debhelper -Build-Depends-Indep: perl (>= 5.6.0-16), libnet-ldap-perl, libconvert-asn1-perl -Maintainer: Matej Vela -Standards-Version: 3.7.3 +Priority: optional +Maintainer: Debian Perl Group +Uploaders: Xavier Guimard +Build-Depends: debhelper (>= 10) +Build-Depends-Indep: libconvert-asn1-perl, + libnet-ldap-perl, + perl +Standards-Version: 4.1.4 +Vcs-Browser: https://salsa.debian.org/perl-team/modules/packages/libnet-ldap-server-perl +Vcs-Git: https://salsa.debian.org/perl-team/modules/packages/libnet-ldap-server-perl.git +Homepage: https://metacpan.org/release/Net-LDAP-Server +Testsuite: autopkgtest-pkg-perl Package: libnet-ldap-server-perl Architecture: all -Depends: ${perl:Depends}, libnet-ldap-perl, libconvert-asn1-perl +Depends: ${misc:Depends}, + ${perl:Depends}, + libnet-ldap-perl, + libconvert-asn1-perl Suggests: libnet-daemon-perl Description: LDAP server-side protocol handling in Perl Net::LDAP::Server provides the protocol handling for an LDAP server. diff -Nru libnet-ldap-server-perl-0.4/debian/copyright libnet-ldap-server-perl-0.43/debian/copyright --- libnet-ldap-server-perl-0.4/debian/copyright 2018-06-02 18:27:15.000000000 +0000 +++ libnet-ldap-server-perl-0.43/debian/copyright 2018-06-02 07:03:12.000000000 +0000 @@ -1,20 +1,32 @@ -This is the Debian package for the Net::LDAP::Server module, put together by -Matej Vela from sources found on CPAN: - - - -Net::LDAP::Server was written by Alessandro Ranellucci, based on an earlier -Net::LDAP::Daemon module by Hans Klunder. - -Copyright (C) 2005 Alessandro Ranellucci -Copyright (C) 2005 Hans Klunder - -This library is free software; you can redistribute it and/or modify it -under the same terms as Perl itself. - -Perl is distributed under your choice of the GNU General Public License or -the Artistic License. On Debian GNU/Linux systems, the complete text of the -GNU General Public License can be found in `/usr/share/common-licenses/GPL' -and the Artistic License in `/usr/share/common-licenses/Artistic'. - -The Debian packaging is in the public domain. +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Source: https://metacpan.org/release/Net-LDAP-Server +Upstream-Contact: Alessandro Ranellucci +Upstream-Name: Net-LDAP-Server + +Files: * +Copyright: 2005-2007, Alessandro Ranellucci + 2005-2007, Hans Klunder +License: Artistic or GPL-1+ +Comment: Net::LDAP::Server was written by Alessandro Ranellucci, based on an + earlier Net::LDAP::Daemon module by Hans Klunder. + +Files: debian/* +Copyright: 2006-2008, Matej Vela + 2018, Xavier Guimard +License: Artistic or GPL-1+ + +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 systems, the complete text of the Artistic License can be + found in `/usr/share/common-licenses/Artistic'. + +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 systems, the complete text of version 1 of the GNU General + Public License can be found in `/usr/share/common-licenses/GPL-1'. diff -Nru libnet-ldap-server-perl-0.4/debian/libnet-ldap-server-perl.examples libnet-ldap-server-perl-0.43/debian/libnet-ldap-server-perl.examples --- libnet-ldap-server-perl-0.4/debian/libnet-ldap-server-perl.examples 1970-01-01 00:00:00.000000000 +0000 +++ libnet-ldap-server-perl-0.43/debian/libnet-ldap-server-perl.examples 2018-06-02 07:03:12.000000000 +0000 @@ -0,0 +1 @@ +examples/* diff -Nru libnet-ldap-server-perl-0.4/debian/rules libnet-ldap-server-perl-0.43/debian/rules --- libnet-ldap-server-perl-0.4/debian/rules 2018-06-02 18:27:15.000000000 +0000 +++ libnet-ldap-server-perl-0.43/debian/rules 2018-06-02 07:03:12.000000000 +0000 @@ -1,13 +1,4 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/perlmodule.mk - -# Stuff in the README is covered by the description and the dependencies. -DEB_INSTALL_DOCS_ALL := - -DEB_INSTALL_EXAMPLES_libnet-ldap-server-perl := examples/* - -install/libnet-ldap-server-perl:: - [ ! -d $(DEB_DESTDIR)/usr/lib/perl5 ] \ - || rmdir -p --ignore-fail-on-non-empty $(DEB_DESTDIR)/usr/lib/perl5 +%: + dh $@ diff -Nru libnet-ldap-server-perl-0.4/debian/source/format libnet-ldap-server-perl-0.43/debian/source/format --- libnet-ldap-server-perl-0.4/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ libnet-ldap-server-perl-0.43/debian/source/format 2018-06-02 07:03:12.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru libnet-ldap-server-perl-0.4/debian/tests/pkg-perl/syntax-skip libnet-ldap-server-perl-0.43/debian/tests/pkg-perl/syntax-skip --- libnet-ldap-server-perl-0.4/debian/tests/pkg-perl/syntax-skip 1970-01-01 00:00:00.000000000 +0000 +++ libnet-ldap-server-perl-0.43/debian/tests/pkg-perl/syntax-skip 2018-06-02 07:03:12.000000000 +0000 @@ -0,0 +1 @@ +# Empty file to check everything despite Suggests diff -Nru libnet-ldap-server-perl-0.4/debian/upstream/metadata libnet-ldap-server-perl-0.43/debian/upstream/metadata --- libnet-ldap-server-perl-0.4/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 +++ libnet-ldap-server-perl-0.43/debian/upstream/metadata 2018-06-02 07:03:12.000000000 +0000 @@ -0,0 +1,6 @@ +--- +Archive: CPAN +Contact: Alessandro Ranellucci +Name: Net-LDAP-Server +Repository: https://github.com/alexrj/Net-LDAP-Server.git +Repository-Browse: https://github.com/alexrj/Net-LDAP-Server diff -Nru libnet-ldap-server-perl-0.4/debian/watch libnet-ldap-server-perl-0.43/debian/watch --- libnet-ldap-server-perl-0.4/debian/watch 1970-01-01 00:00:00.000000000 +0000 +++ libnet-ldap-server-perl-0.43/debian/watch 2018-06-02 07:03:12.000000000 +0000 @@ -0,0 +1,2 @@ +version=3 +https://metacpan.org/release/Net-LDAP-Server .*/Net-LDAP-Server-v?(\d[\d.-]*)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)$ diff -Nru libnet-ldap-server-perl-0.4/examples/MyDemoServer.pm libnet-ldap-server-perl-0.43/examples/MyDemoServer.pm --- libnet-ldap-server-perl-0.4/examples/MyDemoServer.pm 2007-10-27 09:43:54.000000000 +0000 +++ libnet-ldap-server-perl-0.43/examples/MyDemoServer.pm 2011-05-26 19:04:42.000000000 +0000 @@ -18,9 +18,8 @@ # constructor sub new { - my ($class, $sock) = @_; - my $self = $class->SUPER::new($sock); - printf "Accepted connection from: %s\n", $sock->peerhost(); + my $class = shift; + my $self = $class->SUPER::new(@_); return $self; } @@ -28,7 +27,7 @@ sub bind { my $self = shift; my $reqData = shift; - print Dumper($reqData); + print STDERR Dumper($reqData); return RESULT_OK; } @@ -36,8 +35,8 @@ sub search { my $self = shift; my $reqData = shift; - print "Searching...\n"; - print Dumper($reqData); + print STDERR "Searching...\n"; + print STDERR Dumper($reqData); my $base = $reqData->{'baseObject'}; # plain die if dn contains 'dying' diff -Nru libnet-ldap-server-perl-0.4/lib/Net/LDAP/Server.pm libnet-ldap-server-perl-0.43/lib/Net/LDAP/Server.pm --- libnet-ldap-server-perl-0.4/lib/Net/LDAP/Server.pm 2007-10-27 10:26:31.000000000 +0000 +++ libnet-ldap-server-perl-0.43/lib/Net/LDAP/Server.pm 2011-05-26 19:10:30.000000000 +0000 @@ -17,9 +17,10 @@ use Net::LDAP::ASN qw(LDAPRequest LDAPResponse); use Net::LDAP::Constant qw(LDAP_OPERATIONS_ERROR LDAP_UNWILLING_TO_PERFORM); use Net::LDAP::Entry; +use Data::Dumper; -our $VERSION = '0.4'; -use fields qw(socket); +our $VERSION = '0.43'; +use fields qw(in out); our %respTypes=( 'bindRequest' => 'bindResponse', @@ -48,18 +49,27 @@ our @reqTypes = keys %respTypes; sub new { - my ($proto, $sock) = @_; + my ($proto, $input, $output) = @_; my $class = ref($proto) || $proto; my $self = fields::new($class); - $self->{socket} = $sock; + + #print STDERR Dumper($input); + #print STDERR Dumper($output); + + $self->{in} = $input; + $self->{out} = $output || $input; return $self; } sub handle { my Net::LDAP::Server $self = shift; - my $socket = $self->{socket}; + my $in = $self->{in}; + my $out = $self->{out}; - asn_read($socket, my $pdu); + #print STDERR Dumper($in); + #print STDERR Dumper($out); + + asn_read($in, my $pdu); #print '-' x 80,"\n"; #print "Received:\n"; #Convert::ASN1::asn_dump(\*STDOUT,$pdu); @@ -68,7 +78,7 @@ or return 1; #print "messageID: $mid\n"; - #use Data::Dumper; print Dumper($request); + #print Dumper($request); my $reqType; foreach my $type (@reqTypes) { @@ -77,12 +87,11 @@ last; } } - my $respType = $respTypes{$reqType} - or return 1; # if no response type is present hangup the connection - - my $reqData = $request->{$reqType}; - + return 1 if !exists $respTypes{$reqType}; # unknown request type: let's hangup + my $respType = $respTypes{$reqType}; + # here we can do something with the request of type $reqType + my $reqData = $request->{$reqType}; my $method = $functions{$reqType}; my $result; if ($self->can($method)){ @@ -118,7 +127,7 @@ } my $pdu = $LDAPResponse->encode($response); if ($pdu) { - print $socket $pdu; + print $out $pdu; } else { $result = undef; last; @@ -137,7 +146,7 @@ } # and now send the result to the client - print $socket &_encode_result($mid, $respType, $result); + print $out &_encode_result($mid, $respType, $result) if $respType; return 0; } @@ -202,6 +211,11 @@ my $handler = MyServer->new($socket); $handler->handle; + # or with distinct input and output handles + package main; + my $handler = MyServer->new( $input_handle, $output_handle ); + $handler->handle; + =head1 ABSTRACT This class provides the protocol handling for an LDAP server. You can subclass @@ -311,8 +325,13 @@ my $handler = MyServer->new($socket); $handler->handle; -See examples in I directory for sample servers, using L -or L. +Or, alternatively, you can pass two handles for input and output, respectively. + + my $handler = MyServer->new(*STDIN{IO},*STDOUT{IO}); + $handler->handle; + +See examples in I directory for sample servers, using L, +L or L. =head1 DEPENDENCIES @@ -325,7 +344,7 @@ =item L -=item Examples in I directory. +=item Examples in C directory. =back diff -Nru libnet-ldap-server-perl-0.4/Makefile.PL libnet-ldap-server-perl-0.43/Makefile.PL --- libnet-ldap-server-perl-0.4/Makefile.PL 2007-10-27 09:43:54.000000000 +0000 +++ libnet-ldap-server-perl-0.43/Makefile.PL 2011-05-26 19:06:05.000000000 +0000 @@ -1,4 +1,5 @@ use ExtUtils::MakeMaker; +use 5.006000; WriteMakefile( 'NAME' => 'Net::LDAP::Server', @@ -10,5 +11,15 @@ Net::LDAP => 0, Convert::ASN1 => 0 }, - 'dist' => { COMPRESS => 'gzip', SUFFIX => 'gz' } + 'dist' => { COMPRESS => 'gzip', SUFFIX => 'gz' }, + 'DISTNAME' => 'Net-LDAP-Server', + 'LICENSE' => 'perl', + 'test' => { + 'TESTS' => 't/*.t' + }, + 'META_MERGE' => { + resources => { + repository => 'git://git@github.com:alexrj/Net-LDAP-Server.git', + }, + }, ); diff -Nru libnet-ldap-server-perl-0.4/MANIFEST libnet-ldap-server-perl-0.43/MANIFEST --- libnet-ldap-server-perl-0.4/MANIFEST 2007-10-27 10:21:09.000000000 +0000 +++ libnet-ldap-server-perl-0.43/MANIFEST 2011-05-26 19:06:05.000000000 +0000 @@ -6,8 +6,8 @@ Makefile.PL MANIFEST This list of files MANIFEST.SKIP +META.yml Module meta-data (added by MakeMaker) README t/01-use.t t/02-pod.t t/03-podcoverage.t -META.yml Module meta-data (added by MakeMaker) Binary files /tmp/tmpzHtCmf/_B4EvZwziR/libnet-ldap-server-perl-0.4/._MANIFEST and /tmp/tmpzHtCmf/hggbuTVxGc/libnet-ldap-server-perl-0.43/._MANIFEST differ diff -Nru libnet-ldap-server-perl-0.4/MANIFEST.SKIP libnet-ldap-server-perl-0.43/MANIFEST.SKIP --- libnet-ldap-server-perl-0.4/MANIFEST.SKIP 2007-10-27 10:20:00.000000000 +0000 +++ libnet-ldap-server-perl-0.43/MANIFEST.SKIP 2011-05-26 19:06:05.000000000 +0000 @@ -1,6 +1,7 @@ makedocs.pl \.shipit \.brackup$ +\.DS_Store$ # Avoid version control files. \bRCS\b @@ -8,6 +9,7 @@ \bSCCS\b ,v$ \B\.svn\b +\B\.git\b \b_darcs\b # Avoid Makemaker generated and utility files. diff -Nru libnet-ldap-server-perl-0.4/META.yml libnet-ldap-server-perl-0.43/META.yml --- libnet-ldap-server-perl-0.4/META.yml 2007-10-27 10:26:41.000000000 +0000 +++ libnet-ldap-server-perl-0.43/META.yml 2011-05-26 19:11:30.000000000 +0000 @@ -1,12 +1,25 @@ -# http://module-build.sourceforge.net/META-spec.html -#XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX# -name: Net-LDAP-Server -version: 0.4 -version_from: lib/Net/LDAP/Server.pm -installdirs: site +--- #YAML:1.0 +name: Net-LDAP-Server +version: 0.43 +abstract: LDAP server side protocol handling +author: + - Alessandro Ranellucci +license: perl +distribution_type: module +configure_requires: + ExtUtils::MakeMaker: 0 +build_requires: + ExtUtils::MakeMaker: 0 requires: - Convert::ASN1: 0 - Net::LDAP: 0 - -distribution_type: module -generated_by: ExtUtils::MakeMaker version 6.17 + Convert::ASN1: 0 + Net::LDAP: 0 +resources: + repository: git://git@github.com:alexrj/Net-LDAP-Server.git +no_index: + directory: + - t + - inc +generated_by: ExtUtils::MakeMaker version 6.56 +meta-spec: + url: http://module-build.sourceforge.net/META-spec-v1.4.html + version: 1.4