r7898 - in /trunk/libmail-box-perl: debian/changelog debian/control debian/patches/ debian/patches/01_access_check_use_filetest::access.patch debian/patches/series debian/rules lib/Mail/Box/Dir.pm lib/Mail/Box/File.pm

dmn at users.alioth.debian.org dmn at users.alioth.debian.org
Sun Sep 23 07:59:58 UTC 2007


Author: dmn
Date: Sun Sep 23 07:59:58 2007
New Revision: 7898

URL: http://svn.debian.org/wsvn/?sc=1&rev=7898
Log:
* Moved change to Mail::Box::Dir and Mail::Box::File to a quilt patch

Added:
    trunk/libmail-box-perl/debian/patches/
    trunk/libmail-box-perl/debian/patches/01_access_check_use_filetest::access.patch
    trunk/libmail-box-perl/debian/patches/series
Modified:
    trunk/libmail-box-perl/debian/changelog
    trunk/libmail-box-perl/debian/control
    trunk/libmail-box-perl/debian/rules
    trunk/libmail-box-perl/lib/Mail/Box/Dir.pm
    trunk/libmail-box-perl/lib/Mail/Box/File.pm

Modified: trunk/libmail-box-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libmail-box-perl/debian/changelog?rev=7898&op=diff
==============================================================================
--- trunk/libmail-box-perl/debian/changelog (original)
+++ trunk/libmail-box-perl/debian/changelog Sun Sep 23 07:59:58 2007
@@ -1,8 +1,9 @@
-libmail-box-perl (2.074-1) unstable; urgency=low
+libmail-box-perl (2.074-1) UNRELEASED; urgency=low
 
   * New upstream bugfix release
-
- -- Damyan Ivanov <dmn at debian.org>  Sun, 23 Sep 2007 10:08:57 +0300
+  * Moved change to Mail::Box::Dir and Mail::Box::File to a quilt patch
+
+ -- Damyan Ivanov <dmn at debian.org>  Sun, 23 Sep 2007 10:56:03 +0300
 
 libmail-box-perl (2.073-1) unstable; urgency=low
 

Modified: trunk/libmail-box-perl/debian/control
URL: http://svn.debian.org/wsvn/trunk/libmail-box-perl/debian/control?rev=7898&op=diff
==============================================================================
--- trunk/libmail-box-perl/debian/control (original)
+++ trunk/libmail-box-perl/debian/control Sun Sep 23 07:59:58 2007
@@ -1,7 +1,7 @@
 Source: libmail-box-perl
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 5.0),
+Build-Depends: debhelper (>= 5.0), quilt
 Build-Depends-Indep: perl (>= 5.6.0-16), libtimedate-perl, libio-stringy-perl, libmime-types-perl (>= 1.004), libmailtools-perl, libobject-realize-later-perl (>= 0.14), libscalar-list-utils-perl (>= 1.13) | perl (>= 5.8.2-2), liburi-perl (>= 1.23), libdigest-hmac-perl, libuser-identity-perl, libfile-remove-perl, libtext-autoformat-perl, netbase, libhtml-format-perl, libtest-harness-perl (>= 2.62)
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Gunnar Wolf <gwolf at debian.org>, Gustavo Franco <stratus at debian.org>, Krzysztof Krzyzaniak (eloy) <eloy at debian.org>, gregor herrmann <gregor+debian at comodo.priv.at>

Added: trunk/libmail-box-perl/debian/patches/01_access_check_use_filetest::access.patch
URL: http://svn.debian.org/wsvn/trunk/libmail-box-perl/debian/patches/01_access_check_use_filetest%3A%3Aaccess.patch?rev=7898&op=file
==============================================================================
--- trunk/libmail-box-perl/debian/patches/01_access_check_use_filetest::access.patch (added)
+++ trunk/libmail-box-perl/debian/patches/01_access_check_use_filetest::access.patch Sun Sep 23 07:59:58 2007
@@ -1,0 +1,38 @@
+--- libmail-box-perl-2.074.orig/lib/Mail/Box/Dir.pm
++++ libmail-box-perl-2.074/lib/Mail/Box/Dir.pm
+@@ -58,9 +58,13 @@
+ 
+     # Check if we can write to the folder, if we need to.
+ 
+-    if($self->writable && -e $directory && ! -w $directory)
+-    {   $self->log(WARNING=> "Folder directory $directory is write-protected.");
+-        $self->{MB_access} = 'r';
++    {   # filetest 'access' is slower, but works correctly if we have a 
++	# filesystem with ACLs
++	use filetest 'access';
++	if($self->writable && -e $directory && ! -w $directory)
++	{   $self->log(WARNING=> "Folder directory $directory is write-protected.");
++	    $self->{MB_access} = 'r';
++	}
+     }
+ 
+     $self;
+--- libmail-box-perl-2.074.orig/lib/Mail/Box/File.pm
++++ libmail-box-perl-2.074/lib/Mail/Box/File.pm
+@@ -88,9 +88,13 @@
+ 
+     # Check if we can write to the folder, if we need to.
+ 
+-    if($self->writable && ! -w $filename)
+-    {   $self->log(WARNING => "Folder $self file $filename is write-protected.");
+-        $self->{MB_access} = 'r';
++    {   # filetest 'access' is slower, but works correctly if we have a 
++	# filesystem with ACLs
++	use filetest 'access';
++	if($self->writable && ! -w $filename)
++	{   $self->log(WARNING => "Folder $self file $filename is write-protected.");
++	    $self->{MB_access} = 'r';
++	}
+     }
+ 
+     # Start parser if reading is required.

Added: trunk/libmail-box-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/trunk/libmail-box-perl/debian/patches/series?rev=7898&op=file
==============================================================================
--- trunk/libmail-box-perl/debian/patches/series (added)
+++ trunk/libmail-box-perl/debian/patches/series Sun Sep 23 07:59:58 2007
@@ -1,0 +1,1 @@
+01_access_check_use_filetest::access.patch

Modified: trunk/libmail-box-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libmail-box-perl/debian/rules?rev=7898&op=diff
==============================================================================
--- trunk/libmail-box-perl/debian/rules (original)
+++ trunk/libmail-box-perl/debian/rules Sun Sep 23 07:59:58 2007
@@ -4,10 +4,12 @@
 export MAILBOX_INSTALL_OPTIONALS=no
 export MAILBOX_RUN_TESTS=yes
 
+include /usr/share/quilt/quilt.make
+
 PERL ?= /usr/bin/perl
 
 configure: configure-stamp
-configure-stamp:
+configure-stamp: patch
 	dh_testdir
 	$(PERL) Makefile.PL INSTALLDIRS=vendor
 	touch configure-stamp
@@ -19,7 +21,7 @@
 	$(MAKE) test
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp

Modified: trunk/libmail-box-perl/lib/Mail/Box/Dir.pm
URL: http://svn.debian.org/wsvn/trunk/libmail-box-perl/lib/Mail/Box/Dir.pm?rev=7898&op=diff
==============================================================================
--- trunk/libmail-box-perl/lib/Mail/Box/Dir.pm (original)
+++ trunk/libmail-box-perl/lib/Mail/Box/Dir.pm Sun Sep 23 07:59:58 2007
@@ -58,13 +58,9 @@
 
     # Check if we can write to the folder, if we need to.
 
-    {   # filetest 'access' is slower, but works correctly if we have a 
-	# filesystem with ACLs
-	use filetest 'access';
-	if($self->writable && -e $directory && ! -w $directory)
-	{   $self->log(WARNING=> "Folder directory $directory is write-protected.");
-	    $self->{MB_access} = 'r';
-	}
+    if($self->writable && -e $directory && ! -w $directory)
+    {   $self->log(WARNING=> "Folder directory $directory is write-protected.");
+        $self->{MB_access} = 'r';
     }
 
     $self;

Modified: trunk/libmail-box-perl/lib/Mail/Box/File.pm
URL: http://svn.debian.org/wsvn/trunk/libmail-box-perl/lib/Mail/Box/File.pm?rev=7898&op=diff
==============================================================================
--- trunk/libmail-box-perl/lib/Mail/Box/File.pm (original)
+++ trunk/libmail-box-perl/lib/Mail/Box/File.pm Sun Sep 23 07:59:58 2007
@@ -88,13 +88,9 @@
 
     # Check if we can write to the folder, if we need to.
 
-    {   # filetest 'access' is slower, but works correctly if we have a 
-	# filesystem with ACLs
-	use filetest 'access';
-	if($self->writable && ! -w $filename)
-	{   $self->log(WARNING => "Folder $self file $filename is write-protected.");
-	    $self->{MB_access} = 'r';
-	}
+    if($self->writable && ! -w $filename)
+    {   $self->log(WARNING => "Folder $self file $filename is write-protected.");
+        $self->{MB_access} = 'r';
     }
 
     # Start parser if reading is required.




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