r45554 - in /trunk/libapp-daemon-perl: Changes Daemon.pm META.yml README debian/changelog

bricas-guest at users.alioth.debian.org bricas-guest at users.alioth.debian.org
Fri Oct 9 01:39:20 UTC 2009


Author: bricas-guest
Date: Fri Oct  9 01:39:15 2009
New Revision: 45554

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=45554
Log:
New upstream release

Modified:
    trunk/libapp-daemon-perl/Changes
    trunk/libapp-daemon-perl/Daemon.pm
    trunk/libapp-daemon-perl/META.yml
    trunk/libapp-daemon-perl/README
    trunk/libapp-daemon-perl/debian/changelog

Modified: trunk/libapp-daemon-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapp-daemon-perl/Changes?rev=45554&op=diff
==============================================================================
--- trunk/libapp-daemon-perl/Changes (original)
+++ trunk/libapp-daemon-perl/Changes Fri Oct  9 01:39:15 2009
@@ -1,4 +1,14 @@
 Revision history for Perl extension App::Daemon.
+
+0.08 (10/08/2009)
+    (ms) [RT 50326] Fixed insecure dependency error in tainted mode
+         by untainting the string obtained by appname().
+
+0.07 (03/24/2009)
+    (ms) Applied patch by Sadrak [rt:44513] to check if Log4perl has
+         already been initialized and skip the easy_init call in this
+         case. Note that -v then has to be handled by the user-provided 
+         Log4perl configuration instead.
 
 0.06 (03/05/2009)
     (ms) Added detach() as an importable method for simple daemons.

Modified: trunk/libapp-daemon-perl/Daemon.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapp-daemon-perl/Daemon.pm?rev=45554&op=diff
==============================================================================
--- trunk/libapp-daemon-perl/Daemon.pm (original)
+++ trunk/libapp-daemon-perl/Daemon.pm Fri Oct  9 01:39:15 2009
@@ -2,7 +2,7 @@
 use strict;
 use warnings;
 
-our $VERSION = '0.06';
+our $VERSION = '0.07';
 
 use Getopt::Std;
 use Pod::Usage;
@@ -71,7 +71,9 @@
         $background = 0;
     }
 
-    if( $l4p_conf ) {
+    if( Log::Log4perl->initialized() ) {
+        DEBUG "Log4perl already initialized, doing nothing";
+    } elsif( $l4p_conf ) {
         Log::Log4perl->init( $l4p_conf );
     } elsif( !$background ) {
         Log::Log4perl->easy_init({ level => $loglevel, 
@@ -259,8 +261,12 @@
 ###########################################
 sub appname {
 ###########################################
-    my $base = basename($0);
-    return $base;
+    my $appname = basename($0);
+
+      # Make sure -T regards it as untainted now
+    ($appname) = ($appname =~ /([\w-]+)/);
+
+    return $appname;
 }
 
 ###########################################
@@ -481,12 +487,19 @@
 
 =item -l4p l4p.conf
 
-Path to Log4perl configuration file.
+Path to Log4perl configuration file. Note that in this case the -v option 
+will be ignored.
 
 =item -p pidfile
 
 Where to save the pid of the started process.
 Defaults to C</tmp/[appname].pid>.
+
+=item -v
+
+Increase default Log4perl verbosity from $INFO to $DEBUG. Note that this
+option will be ignored if Log4perl is initialized independently or if
+a user-provided Log4perl configuration file is used.
 
 =head2 Setting Parameters
 

Modified: trunk/libapp-daemon-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapp-daemon-perl/META.yml?rev=45554&op=diff
==============================================================================
--- trunk/libapp-daemon-perl/META.yml (original)
+++ trunk/libapp-daemon-perl/META.yml Fri Oct  9 01:39:15 2009
@@ -1,21 +1,29 @@
 --- #YAML:1.0
-name:                App-Daemon
-version:             0.06
-abstract:            Start an Application as a Daemon
-license:             ~
-generated_by:        ExtUtils::MakeMaker version 6.31
-distribution_type:   module
-requires:     
-    File::Basename:                0
-    File::Pid:                     0
-    File::Temp:                    0
-    Getopt::Std:                   0
-    Log::Log4perl:                 1.0
-    Pod::Usage:                    0
-    Proc::ProcessTable:            0
-    Test::More:                    0
-meta-spec:
-    url:     http://module-build.sourceforge.net/META-spec-v1.2.html
-    version: 1.2
+name:               App-Daemon
+version:            0.07
+abstract:           Start an Application as a Daemon
 author:
     - Mike Schilli <m at perlmeister.com>
+license:            unknown
+distribution_type:  module
+configure_requires:
+    ExtUtils::MakeMaker:  0
+build_requires:
+    ExtUtils::MakeMaker:  0
+requires:
+    File::Basename:      0
+    File::Pid:           0
+    File::Temp:          0
+    Getopt::Std:         0
+    Log::Log4perl:       1.0
+    Pod::Usage:          0
+    Proc::ProcessTable:  0
+    Test::More:          0
+no_index:
+    directory:
+        - t
+        - inc
+generated_by:       ExtUtils::MakeMaker version 6.50
+meta-spec:
+    url:      http://module-build.sourceforge.net/META-spec-v1.4.html
+    version:  1.4

Modified: trunk/libapp-daemon-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapp-daemon-perl/README?rev=45554&op=diff
==============================================================================
--- trunk/libapp-daemon-perl/README (original)
+++ trunk/libapp-daemon-perl/README Fri Oct  9 01:39:15 2009
@@ -1,5 +1,5 @@
 ######################################################################
-    App::Daemon 0.06
+    App::Daemon 0.07
 ######################################################################
 
 NAME
@@ -117,11 +117,17 @@
             User to run as if started as root. Defaults to 'nobody'.
 
         -l4p l4p.conf
-            Path to Log4perl configuration file.
+            Path to Log4perl configuration file. Note that in this case the
+            -v option will be ignored.
 
         -p pidfile
             Where to save the pid of the started process. Defaults to
             "/tmp/[appname].pid".
+
+        -v  Increase default Log4perl verbosity from $INFO to $DEBUG. Note
+            that this option will be ignored if Log4perl is initialized
+            independently or if a user-provided Log4perl configuration file
+            is used.
 
   Setting Parameters
             Instead of setting paramteters like the logfile, the pidfile

Modified: trunk/libapp-daemon-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapp-daemon-perl/debian/changelog?rev=45554&op=diff
==============================================================================
--- trunk/libapp-daemon-perl/debian/changelog (original)
+++ trunk/libapp-daemon-perl/debian/changelog Fri Oct  9 01:39:15 2009
@@ -1,3 +1,9 @@
+libapp-daemon-perl (0.07-1) UNRELEASED; urgency=low
+
+  * New upstream release
+
+ -- Brian Cassidy <brian.cassidy at gmail.com>  Thu, 08 Oct 2009 22:38:53 -0300
+
 libapp-daemon-perl (0.06-1) unstable; urgency=low
 
   * Initial Release (Closes: #550091)




More information about the Pkg-perl-cvs-commits mailing list