[perl-Frontier-RPC] Rebase patches to suppress creating *.orig files
Petr Pisar
ppisar at fedoraproject.org
Mon Apr 7 12:19:28 UTC 2014
commit 21e0bfccb5f4f6896cb57f9cc317283e1c3998ce
Author: Petr Písař <ppisar at redhat.com>
Date: Mon Apr 7 13:45:13 2014 +0200
Rebase patches to suppress creating *.orig files
apache2.patch | 46 +++++++++++++++++++++++++-----------
perl-Frontier-RPC.spec | 8 +++++-
perl-frontier-raw-call.patch | 26 +++++++++++++++++---
perl-frontier-undef-scalar.patch | 24 ++++++++++++++++--
security-xml-external-entity.patch | 27 +++++++++++++++++----
5 files changed, 104 insertions(+), 27 deletions(-)
---
diff --git a/apache2.patch b/apache2.patch
index 5cd9ebb..ad9a27a 100644
--- a/apache2.patch
+++ b/apache2.patch
@@ -1,47 +1,65 @@
---- Frontier-RPC-0.07b4p1/lib/Apache/XMLRPC.pm.apache2 2007-11-08 17:01:28.000000000 +0100
-+++ Frontier-RPC-0.07b4p1/lib/Apache/XMLRPC.pm 2007-11-08 17:24:46.000000000 +0100
-@@ -10,16 +10,18 @@
+From a6259081437a560451c0b6830204e1d81288e46a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Mon, 7 Apr 2014 13:53:40 +0200
+Subject: [PATCH] Apache2 support
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
- package Apache::XMLRPC;
+Signed-off-by: Petr Písař <ppisar at redhat.com>
+---
+ lib/Apache/XMLRPC.pm | 21 ++++++++++++---------
+ 1 file changed, 12 insertions(+), 9 deletions(-)
+diff --git a/lib/Apache/XMLRPC.pm b/lib/Apache/XMLRPC.pm
+index 1f2aec7..a9f16d2 100644
+--- a/lib/Apache/XMLRPC.pm
++++ b/lib/Apache/XMLRPC.pm
+@@ -10,16 +10,18 @@
+
+ package Apache::XMLRPC;
+
-use Apache::Constants qw(:common);
+use Apache2::Const;
+use Apache2::ServerUtil;
use Frontier::RPC2;
-
+
sub handler {
my $r = shift;
-
+
- my $conf = $r->server_root_relative( $r->dir_config( "XMLRPC_Config" ) );
+ my $path = $r->dir_config( "XMLRPC_Config" );
+ my $conf = Apache2::ServerUtil::server_root_relative( $r->pool, $path );
-
+
if( -f $conf ) {
- unless( $rt = do $conf ) {
+ unless( my $rt = do $conf ) {
die "Couldn\'t parse conf file ($conf): $@\n" if $@;
die "Couldn\'t compile conf file ($conf): $!\n" unless defined $rt;
die "Couldn\'t run conf file ($conf)\n" unless $rt;
-@@ -28,15 +30,16 @@
-
+@@ -28,15 +30,16 @@ sub handler {
+
my $decoder = Frontier::RPC2->new();
-
+
- my $content;
- $r->read( $content, $r->header_in( 'Content-length' ) );
+ if (defined $clength and $clength >= 0) {
+ my $content;
+ $r->read( $content, $r->headers_in->{'Content-length'} );
-
+
- my $answer = $decoder->serve( $content, $Apache::XMLRPC::map );
+ my $answer = $decoder->serve( $content, $Apache::XMLRPC::map );
-
+
- $r->send_http_header();
- $r->print($answer);
+ $r->print($answer);
+ }
-
+
- return OK;
+ return Apache2::Const::OK();
}
-
+
1;
+--
+1.9.0
+
diff --git a/perl-Frontier-RPC.spec b/perl-Frontier-RPC.spec
index 3cfdd18..118323d 100644
--- a/perl-Frontier-RPC.spec
+++ b/perl-Frontier-RPC.spec
@@ -1,7 +1,7 @@
Summary: A Perl interface for making and serving XML-RPC calls
Name: perl-Frontier-RPC
Version: 0.07b4p1
-Release: 19%{?dist}
+Release: 20%{?dist}
License: GPL+ or Artistic
Group: Development/Libraries
URL: http://search.cpan.org/dist/Frontier-RPC/
@@ -87,6 +87,12 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man3/*
%changelog
+* Mon Apr 07 2014 Petr Pisar <ppisar at redhat.com> - 0.07b4p1-20
+- Rebase perl-frontier-raw-call.patch to suppress *.orig files
+- Rebase perl-frontier-undef-scalar.patch to suppress *.orig files
+- Rebase apache2.patch to suppress *.orig files
+- Rebase security-xml-external-entity.patch to suppress *.orig files
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.07b4p1-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/perl-frontier-raw-call.patch b/perl-frontier-raw-call.patch
index f989e92..7b69ad9 100644
--- a/perl-frontier-raw-call.patch
+++ b/perl-frontier-raw-call.patch
@@ -1,6 +1,21 @@
---- Frontier-RPC-0.06/lib/Frontier/Client.pm.orig Sat Nov 20 19:13:21 1999
-+++ Frontier-RPC-0.06/lib/Frontier/Client.pm Wed Dec 19 18:42:55 2001
-@@ -50,6 +50,26 @@
+From aa8833ac7d92fa9d9903a849420dcffc33a00974 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Mon, 7 Apr 2014 13:42:03 +0200
+Subject: [PATCH] Add Frontier::Client::raw_call subroutine
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Petr Písař <ppisar at redhat.com>
+---
+ lib/Frontier/Client.pm | 34 +++++++++++++++++++++-------------
+ 1 file changed, 21 insertions(+), 13 deletions(-)
+
+diff --git a/lib/Frontier/Client.pm b/lib/Frontier/Client.pm
+index 800acab..6ea7b60 100644
+--- a/lib/Frontier/Client.pm
++++ b/lib/Frontier/Client.pm
+@@ -55,6 +55,26 @@ sub new {
sub call {
my $self = shift;
@@ -27,7 +42,7 @@
my $text = $self->{'enc'}->encode_call(@_);
if ($self->{'debug'}) {
-@@ -67,19 +87,7 @@
+@@ -72,19 +92,7 @@ sub call {
my $content = $response->content;
@@ -48,3 +63,6 @@
}
# shortcuts
+--
+1.9.0
+
diff --git a/perl-frontier-undef-scalar.patch b/perl-frontier-undef-scalar.patch
index 5655f97..0c06856 100644
--- a/perl-frontier-undef-scalar.patch
+++ b/perl-frontier-undef-scalar.patch
@@ -1,6 +1,21 @@
---- Frontier-RPC-0.06/lib/Frontier/RPC2.pm.undef-scalar 2005-06-15 11:28:48.323851492 -0400
-+++ Frontier-RPC-0.06/lib/Frontier/RPC2.pm 2005-06-15 12:24:44.739297487 -0400
-@@ -226,6 +226,8 @@
+From 63aa8513a5b5ace0c101a7e320a1d9d1ab2d60e7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Mon, 7 Apr 2014 13:47:10 +0200
+Subject: [PATCH] Supress undefined warning
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Petr Písař <ppisar at redhat.com>
+---
+ lib/Frontier/RPC2.pm | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/lib/Frontier/RPC2.pm b/lib/Frontier/RPC2.pm
+index f721ef1..ed17a8e 100644
+--- a/lib/Frontier/RPC2.pm
++++ b/lib/Frontier/RPC2.pm
+@@ -230,6 +230,8 @@ sub _array {
sub _scalar {
my $self = shift; my $value = shift;
@@ -9,3 +24,6 @@
# these are from `perldata(1)'
if ($value =~ /^[+-]?\d+$/) {
return ("<value><i4>$value</i4></value>");
+--
+1.9.0
+
diff --git a/security-xml-external-entity.patch b/security-xml-external-entity.patch
index 00d9cb9..3718280 100644
--- a/security-xml-external-entity.patch
+++ b/security-xml-external-entity.patch
@@ -1,13 +1,30 @@
---- Frontier-RPC-0.07b3-orig/lib/Frontier/RPC2.pm Mon Apr 23 15:17:32 2001
-+++ Frontier-RPC-0.07b3/lib/Frontier/RPC2.pm Wed Oct 30 00:03:39 2002
-@@ -302,6 +302,9 @@
+From 5223c81b75f3653c0752106c5a1bb286cb93d47f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Mon, 7 Apr 2014 13:59:42 +0200
+Subject: [PATCH] security XML external entity
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Petr Písař <ppisar at redhat.com>
+---
+ lib/Frontier/RPC2.pm | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/lib/Frontier/RPC2.pm b/lib/Frontier/RPC2.pm
+index ed17a8e..6d98938 100644
+--- a/lib/Frontier/RPC2.pm
++++ b/lib/Frontier/RPC2.pm
+@@ -307,6 +307,9 @@ sub date_time {
### XML::Parser callbacks
###
-
+
+sub externent { '' }
+sub externentfin { '' }
+
sub die {
my $expat = shift; my $message = shift;
-
+
+--
+1.9.0
More information about the scm-commits
mailing list