Switch to dzil

.gitignore

@@ -1,7 +1,6 @@
 blib/
 const-c.inc
 const-xs.inc
-inc/
 MANIFEST.bak
 Makefile
 Makefile.old

Changes

@@ -1,3 +1,6 @@
+ -- dzil fixed build environment from last build, META files were out of date.
+ -- Switch to dzil
+
 0.30
  -- Make it actually compile and work on OSX
  -- Make constants problems show up at compile time

MANIFEST.SKIP

@@ -0,0 +1,3 @@
+inc/PAMMakeMaker.pm
+MANIFEST.SKIP
+dist.ini

dist.ini

@@ -0,0 +1,23 @@
+name    = PAM
+version = 0.30
+author  = Jonathan Steinert <hachi@cpan.org>
+license = Perl_5
+copyright_holder = Jonathan Steinert
+
+[@Filter]
+  -bundle = @Classic
+  -remove = MakeMaker
+
+[=inc::PAMMakeMaker / PAMMakeMaker]
+
+[Prereqs / ConfigureRequires ]
+ExtUtils::Depends  = 0
+XS::Object::Magic  = 0
+
+[Prereqs / BuildRequires ]
+ExtUtils::Constant = 0
+ExtUtils::Embed    = 0
+XS::Object::Magic  = 0
+
+[Prereqs / RuntimeRequires ]
+XS::Object::Magic  = 0

Makefile.PL → inc/PAMMakeMaker.pm

@@ -1,32 +1,48 @@
-use inc::Module::Install;
-use ExtUtils::Depends;
+package inc::PAMMakeMaker;
 
-# Define metadata
-name           'PAM';
-all_from       'lib/PAM.pm';
+use strict;
+use warnings;
 
-requires 'ExtUtils::Constant' => 0;
-requires 'ExtUtils::Embed'    => 0;
-requires 'ExtUtils::Depends'  => 0;
-requires 'XS::Object::Magic'  => 0;
+use Moose;
 
-my $pkg = ExtUtils::Depends->new('PAM', 'XS::Object::Magic');
+extends 'Dist::Zilla::Plugin::MakeMaker::Awesome';
 
-makemaker_args(
-    $pkg->get_makefile_vars,
-    depend => { 'PAM.c' => 'const-xs.inc', '$(OBJECT)' => 'const-c.inc' },
+override _build_WriteMakefile_args => sub { +{
+    %{ super() },
     LIBS => [ '-lpam' ],
-);
+    clean => { FILES => "perlxsi.c perlxsi.o perl_helper.o perl_helper.so pam_perl.o pam_perl.so const-c.inc const-xs.inc" },
+} };
 
-my $pam_lib_dir = "/lib/security/";
+override _build_WriteMakefile_dump => sub {
+    return super() . <<'EOT';
 
-$pam_lib_dir = "/usr/lib/pam" if $^O eq 'darwin';
+use ExtUtils::Depends;
+my $pkg = ExtUtils::Depends->new('PAM', 'XS::Object::Magic');
 
-preamble(<<"EOT");
-PAM_LIB_DIR = $pam_lib_dir
+%WriteMakefileArgs = ($pkg->get_makefile_vars, %WriteMakefileArgs);
 EOT
+};
+
+override _build_MakeFile_PL_template => sub {
+    my ($self) = @_;
+    my $template = super();
+
+    $template .= <<'TEMPLATE';
+package MY;
 
-postamble(<<'EOT');
+sub depend {
+    return <<'EOT';
+PAM.c : const-xs.inc
+$(OBJECT) : const-c.inc
+EOT
+}
+
+sub postamble {
+    my $pam_lib_dir = "/lib/security/";
+
+    $pam_lib_dir = "/usr/lib/pam" if $^O eq 'darwin';
+
+    return "PAM_LIB_DIR = $pam_lib_dir\n" . <<'EOT'
 CCOPTS = $(shell $(PERLRUN) -MExtUtils::Embed -e ccopts)
 LDOPTS = $(shell $(PERLRUN) -MExtUtils::Embed -e ldopts)
 
@@ -55,15 +71,17 @@ pam-install: pam_perl.so perl_helper.so
 
 const-xs.inc const-c.inc :: pm_to_blib
 	$(PERLRUN) -MExtUtils::Constant=WriteConstants -Mblib -MPAM::Constants \
-                   -e 'WriteConstants(NAME => "PAM", NAMES => [ map { { name => $$_, macro => 1 } } @PAM::Constants::EXPORT_OK ])'
+		-e 'WriteConstants(NAME => "PAM", NAMES => [ map { { name => $$_, macro => 1 } } @PAM::Constants::EXPORT_OK ])'
 
 all :: pam
 
 install :: pam-install
 
-
 EOT
+}
+TEMPLATE
 
-clean_files(qw(perlxsi.c perlxsi.o perl_helper.o perl_helper.so pam_perl.o pam_perl.so const-c.inc const-xs.inc));
+    return $template;
+};
 
-WriteAll;
+__PACKAGE__->meta->make_immutable;

lib/PAM.pm

@@ -25,19 +25,28 @@ This Perl and PAM module allow you to invoke a perl interpreter and call package
 methods during pam phases. It also includes bindings for most of the pam functions
 and constants.
 
+=head1 STATUS
+
+Most of the interface is working at this point. I expect to be compatible at this
+point with both Linux PAM and OSX (Darwin) PAM. The major functions in pam_*
+should all be working. Some of the pam_{get,set}_item items are not implemented yet.
+
+I wouldn't call this module secure just yet. I will mark version 1.0 when I feel
+that is the case.
+
+This all said, the module is safe enough to be used. It should be cleaning up all
+memory that it consumes and barring mistakes in the perl code it invokes there
+should be no chance of it causing unexpected failures.
+
 =cut
 
 require 5.008001;
 use parent qw(DynaLoader);
 
-our $VERSION = '0.30';
-
 sub dl_load_flags {0x01}
 
 __PACKAGE__->bootstrap($VERSION);
 
-$VERSION = eval $VERSION;
-
 1;
 
 =head1 COPYRIGHT

lib/PAM/Constants.pm

@@ -1,5 +1,11 @@
 package PAM::Constants;
 
+=head1 NAME
+
+PAM::Constants - Module to import constants for use with PAM
+
+=cut
+
 use strict;
 use warnings;
 

lib/PAM/Handle.pm

@@ -1,5 +1,11 @@
 package PAM::Handle;
 
+=head1 NAME
+
+PAM::Handle - Perl representation of pam_handle_t object
+
+=cut
+
 use PAM;
 
 1;