From 3296877a31cc0a256cd3374dc2f6f9883e1191b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Wed, 28 Mar 2012 13:42:49 +0200 Subject: [PATCH] 2.001 bump --- .gitignore | 1 + ...UNIX-sockaddr-padding-initialization.patch | 26 ------------------- perl-Socket.spec | 10 +++---- sources | 2 +- 4 files changed, 7 insertions(+), 32 deletions(-) delete mode 100644 Socket-2.000-Fix-AF_UNIX-sockaddr-padding-initialization.patch diff --git a/.gitignore b/.gitignore index a0573d3..149a03f 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /Socket-1.98.tar.gz /Socket-1.99.tar.gz /Socket-2.000.tar.gz +/Socket-2.001.tar.gz diff --git a/Socket-2.000-Fix-AF_UNIX-sockaddr-padding-initialization.patch b/Socket-2.000-Fix-AF_UNIX-sockaddr-padding-initialization.patch deleted file mode 100644 index 4d8a260..0000000 --- a/Socket-2.000-Fix-AF_UNIX-sockaddr-padding-initialization.patch +++ /dev/null @@ -1,26 +0,0 @@ -From f76970735bf4f9b2587d109aff732cd5a28b01ab Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Tue, 27 Mar 2012 09:26:40 +0200 -Subject: [PATCH] Fix AF_UNIX sockaddr padding initialization - -. ---- - Socket.xs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Socket.xs b/Socket.xs -index 3999c4b..fc0b39a 100644 ---- a/Socket.xs -+++ b/Socket.xs -@@ -712,7 +712,7 @@ unpack_sockaddr_un(sun_sv) - getpeername and getsockname is not equal to sizeof(addr). */ - if (sockaddrlen < sizeof(addr)) { - Copy(sun_ad, &addr, sockaddrlen, char); -- Zero(&addr+sockaddrlen, sizeof(addr)-sockaddrlen, char); -+ Zero(((char*)&addr)+sockaddrlen, sizeof(addr)-sockaddrlen, char); - } else { - Copy(sun_ad, &addr, sizeof(addr), char); - } --- -1.7.9.3 - diff --git a/perl-Socket.spec b/perl-Socket.spec index d2b0956..1cea97b 100644 --- a/perl-Socket.spec +++ b/perl-Socket.spec @@ -1,14 +1,12 @@ -%global cpan_version 2.000 +%global cpan_version 2.001 Name: perl-Socket Version: %(eval echo '%{cpan_version}' | tr '_' '.') -Release: 3%{?dist} +Release: 1%{?dist} Summary: C socket.h defines and structure manipulators License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Socket/ Source0: http://search.cpan.org/CPAN/authors/id/P/PE/PEVANS/Socket-%{cpan_version}.tar.gz -# Bug #806543, CPAN RT#76067 -Patch0: Socket-2.000-Fix-AF_UNIX-sockaddr-padding-initialization.patch BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(ExtUtils::CBuilder) BuildRequires: perl(ExtUtils::Constant) >= 0.23 @@ -32,7 +30,6 @@ includes all of the commonly used pound-defines like AF_INET, SOCK_STREAM, etc. %prep %setup -q -n Socket-%{cpan_version} -%patch0 -p1 %build %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" @@ -55,6 +52,9 @@ make test %{_mandir}/man3/* %changelog +* Wed Mar 28 2012 Petr Pisar - 2.001-1 +- 2.001 bump (bug-fixing release) + * Tue Mar 27 2012 Petr Pisar - 2.000-3 - Fix invalid write while unpacking AF_UNIX sockaddr (bug #806543) diff --git a/sources b/sources index 96f3fc2..8adca73 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b90932492a85571a8e88c102dbdf9266 Socket-2.000.tar.gz +6bd842241466568b0fcce0688ecff27c Socket-2.001.tar.gz