From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 7 Feb 2010 14:54:46 +0000 (+0100)
Subject: perl: Copy patch files into repository.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d225ad95747e6375601fc9701dd3b08336931fc0;p=ipfire-3.x.git

perl: Copy patch files into repository.
---

diff --git a/pkgs/core/perl/patches/perl-5.10.0-page-1.patch b/pkgs/core/perl/patches/perl-5.10.0-page-1.patch
new file mode 100644
index 000000000..83b098636
--- /dev/null
+++ b/pkgs/core/perl/patches/perl-5.10.0-page-1.patch
@@ -0,0 +1,18 @@
+Submitted By: DJ Lucas <dj_AT_linuxfromscratch_DOT_org>
+Date: 2008-08-28
+Initial Package Version: 5.10.0
+Origin: Self
+Description: this patch removes the deprecated asm/page.h header.
+
+diff -Naur perl-5.10.0-orig/ext/IPC/SysV/SysV.xs perl-5.10.0/ext/IPC/SysV/SysV.xs
+--- perl-5.10.0-orig/ext/IPC/SysV/SysV.xs	2008-08-19 22:36:43.000000000 -0500
++++ perl-5.10.0/ext/IPC/SysV/SysV.xs	2007-12-18 04:47:07.000000000 -0600
+@@ -24,8 +24,6 @@
+ #      elif defined(HAS_GETPAGESIZE)
+ #          undef  SHMLBA /* not static: determined at boot time */
+ #          define SHMLBA getpagesize()
+-#      elif defined(__linux__)
+-#          include <asm/page.h>          
+ #      endif
+ #   endif
+ #endif
diff --git a/pkgs/core/perl/patches/perl-5.10.0-security_fix-1.patch b/pkgs/core/perl/patches/perl-5.10.0-security_fix-1.patch
new file mode 100644
index 000000000..76c62657a
--- /dev/null
+++ b/pkgs/core/perl/patches/perl-5.10.0-security_fix-1.patch
@@ -0,0 +1,22 @@
+Submitted by: DJ Lucas (dj AT linuxfromscratch DOT org)
+Date: 2008-08-28
+Initial Package Version: 5.10.0
+Upstream Status: Accepted
+Origin: rmtree.patch from upstream source
+    http://rt.cpan.org/Public/Bug/Display.html?id=36982
+
+--- perl-5.10.0-orig/lib/File/Path.pm
++++ perl-5.10.0/lib/File/Path.pm
+@@ -359,9 +359,9 @@ sub _rmtree {
+                 next ROOT_DIR;
+             }
+ 
+-            my $nperm = $perm & 07777 | 0600;
+-            if ($nperm != $perm and not chmod $nperm, $root) {
+-                if ($Force_Writeable) {
++            if ($Force_Writeable) {
++                my $nperm = $perm & 07777 | 0600;
++                if ($nperm != $perm and not chmod $nperm, $root) {
+                     _error($arg, "cannot make file writeable", $canon);
+                 }
+             }
diff --git a/pkgs/core/perl/perl.nm b/pkgs/core/perl/perl.nm
index b7813e6b7..362ddc500 100644
--- a/pkgs/core/perl/perl.nm
+++ b/pkgs/core/perl/perl.nm
@@ -50,9 +50,6 @@ endef
 
 PKG_TARBALL    = $(THISAPP).tar.gz
 
-PKG_PATCHES   += $(THISAPP)-page-1.patch
-PKG_PATCHES   += $(THISAPP)-security_fix-1.patch
-
 define QUALITY_AGENT_WHITELIST_RPATH
 	/usr/lib/perl5/*/auto/DB_File/DB_File.so \
 	/usr/lib/perl5/*/auto/Time/HiRes/HiRes.so \