From f7201021e2ec8b5aba773fe9b8c4f054921e029c Mon Sep 17 00:00:00 2001
From: Emmanuel Seyman <emman...@seyman.fr>
Date: Sun, 20 Nov 2016 09:20:32 +0100
Subject: Update to 0.05 and drop upstreamed patches
---
.gitignore | 1 +
...et-Netlink-0.04-Fix-nlmsgerr-length-check.patch | 41 ----------------
Socket-Netlink-0.04-Fix-tests-for-big-endian.patch | 55 ----------------------
perl-Socket-Netlink.spec | 14 +++---
sources | 2 +-
5 files changed, 8 insertions(+), 105 deletions(-)
delete mode 100644 Socket-Netlink-0.04-Fix-nlmsgerr-length-check.patch
delete mode 100644 Socket-Netlink-0.04-Fix-tests-for-big-endian.patch
diff --git a/.gitignore b/.gitignore
index db8d548..09b19ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/Socket-Netlink-0.03.tar.gz
/Socket-Netlink-0.04.tar.gz
+/Socket-Netlink-0.05.tar.gz
diff --git a/Socket-Netlink-0.04-Fix-nlmsgerr-length-check.patch
b/Socket-Netlink-0.04-Fix-nlmsgerr-length-check.patch
deleted file mode 100644
index e554ea2..0000000
--- a/Socket-Netlink-0.04-Fix-nlmsgerr-length-check.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 01a86755a7d1ac97b1218ffe43ae8d1a8fdc4aab Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppi...@redhat.com>
-Date: Wed, 9 Nov 2016 10:42:23 +0100
-Subject: [PATCH] Fix nlmsgerr length check
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-There was a wrong boolean expression reported by a GCC warning:
-
-lib/Socket/Netlink.xs: In function 'XS_Socket__Netlink_unpack_nlmsgerr':
-lib/Socket/Netlink.xs:195:20: warning: comparison of constant '20ul' with
boolean expression is always false [-Wbool-compare]
- if(!SvCUR(msg) == sizeof(nlmsgerr))
- ^~
-lib/Socket/Netlink.xs:195:20: warning: logical not is only applied to the left
hand side of comparison [-Wlogical-not-parentheses]
-
-This patch fixes it.
-
-CPAN RT#118688.
-
-Signed-off-by: Petr Písař <ppi...@redhat.com>
----
- lib/Socket/Netlink.xs | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/Socket/Netlink.xs b/lib/Socket/Netlink.xs
-index 6211b7f..6900819 100644
---- a/lib/Socket/Netlink.xs
-+++ b/lib/Socket/Netlink.xs
-@@ -192,7 +192,7 @@ unpack_nlmsgerr(msg)
- PPCODE:
- if(!SvPOK(msg))
- croak("Expected a string message");
-- if(!SvCUR(msg) == sizeof(nlmsgerr))
-+ if(SvCUR(msg) != sizeof(nlmsgerr))
- croak("Expected %d bytes of message", sizeof(nlmsgerr));
-
- Copy(SvPVbyte_nolen(msg), &nlmsgerr, sizeof(nlmsgerr), char);
---
-2.7.4
-
diff --git a/Socket-Netlink-0.04-Fix-tests-for-big-endian.patch
b/Socket-Netlink-0.04-Fix-tests-for-big-endian.patch
deleted file mode 100644
index 4304bf9..0000000
--- a/Socket-Netlink-0.04-Fix-tests-for-big-endian.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From ab1700d55b1b802e2eae4657b53b6017ae68047b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppi...@redhat.com>
-Date: Wed, 9 Nov 2016 13:17:40 +0100
-Subject: [PATCH] Fix tests for big endian
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Tests in t/13netlink-message-attrs.t and
-t/20io-socket-netlink-generic.t failed on 64-bit big-endian PowerPC
-machines.
-
-This patch fixes erroneous bswap() calls in the tests by splitting
-nlmsg_type and nlmsg_flags fields in t/20io-socket-netlink-generic.t
-and handling zero-terminted byte-string literaly in
-t/13netlink-message-attrs.t. It also fixes incorrect length
-specification of a zero-terminated byte-string.
-
-CPAN RT#71112
-
-Signed-off-by: Petr Písař <ppi...@redhat.com>
----
- t/13netlink-message-attrs.t | 2 +-
- t/20io-socket-netlink-generic.t | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/t/13netlink-message-attrs.t b/t/13netlink-message-attrs.t
-index 133d18e..132587f 100644
---- a/t/13netlink-message-attrs.t
-+++ b/t/13netlink-message-attrs.t
-@@ -87,7 +87,7 @@ $message = $sock->unpack_message(
- bswap("\5\0").bswap("\1\0").bswap("\7")."\0\0\0".
- bswap("\6\0").bswap("\2\0").bswap("\x59\0")."\0\0".
- bswap("\x08\0").bswap("\3\0").bswap("\xf3\3\0\0").
-- bswap("\7\0").bswap("\4\0").bswap("FGH\0").
-+ bswap("\x08\0").bswap("\4\0")."FGH\0".
- bswap("\x0a\0").bswap("\5\0")."X\0Y\0Z\0\0\0".
- bswap("\x0c\0").bswap("\6\0").
- bswap("\5\0").bswap("\1\0").bswap("\x15")."\0\0\0",
-diff --git a/t/20io-socket-netlink-generic.t b/t/20io-socket-netlink-generic.t
-index 16fb29e..c5cadde 100644
---- a/t/20io-socket-netlink-generic.t
-+++ b/t/20io-socket-netlink-generic.t
-@@ -53,7 +53,7 @@ isa_ok( $message, 'IO::Socket::Netlink::Generic::_Message',
'$message' );
- ok( $message->can( "cmd" ), '$message has ->cmd accessor' );
-
- is_hexstr( $message->pack,
-- bswap("\x14\0\0\0").bswap("\x1e\0\0\0")."\0\0\0\0\0\0\0\0".
-+ bswap("\x14\0\0\0").bswap("\x1e\0").bswap("\0\0")."\0\0\0\0\0\0\0\0".
- "\1\2\0\0",
- '$message->pack' );
-
---
-2.7.4
-
diff --git a/perl-Socket-Netlink.spec b/perl-Socket-Netlink.spec
index 45fe16b..fb45f86 100644
--- a/perl-Socket-Netlink.spec
+++ b/perl-Socket-Netlink.spec
@@ -1,15 +1,11 @@
Name: perl-Socket-Netlink
-Version: 0.04
-Release: 17%{?dist}
+Version: 0.05
+Release: 1%{?dist}
Summary: Interface to Linux's PF_NETLINK socket family
License: GPL+ or Artistic
URL: http://search.cpan.org/dist/Socket-Netlink/
Source0:
http://www.cpan.org/authors/id/P/PE/PEVANS/Socket-Netlink-%{version}.tar.gz
-# Fix nlmsgerr length check, CPAN RT#118688
-Patch0: Socket-Netlink-0.04-Fix-nlmsgerr-length-check.patch
-# Fix tests for big endian, CPAN RT#71112
-Patch1: Socket-Netlink-0.04-Fix-tests-for-big-endian.patch
BuildRequires: findutils
BuildRequires: gcc
@@ -61,8 +57,6 @@ IO::Socket::Netlink.
%prep
%setup -q -n Socket-Netlink-%{version}
-%patch0 -p1
-%patch1 -p1
%build
@@ -90,6 +84,10 @@ find %{buildroot} -type f -name '*.bs' -size 0 -delete
%changelog
+* Sun Nov 20 2016 Emmanuel Seyman <emman...@seyman.fr> - 0.05-1
+- Update to 0.05
+- Drop upstreamed patches
+
* Wed Nov 09 2016 Petr Pisar <ppi...@redhat.com> - 0.04-17
- Fix nlmsgerr length check (CPAN RT#118688)
- Fix tests for big endian (CPAN RT#71112)
diff --git a/sources b/sources
index 5ae2327..ef2c132 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-085eea9642268af6654b47a713e6c8ee Socket-Netlink-0.04.tar.gz
+a9a58b71e397cad368a3baa3689254df Socket-Netlink-0.05.tar.gz
--
cgit v0.12
http://pkgs.fedoraproject.org/cgit/perl-Socket-Netlink.git/commit/?h=master&id=f7201021e2ec8b5aba773fe9b8c4f054921e029c
_______________________________________________
perl-devel mailing list -- perl-devel@lists.fedoraproject.org
To unsubscribe send an email to perl-devel-le...@lists.fedoraproject.org
