depend on libpve-access-control

We need to be able to close open server sockets.

diff --git a/Makefile b/Makefile
index c67550a4e47800ed88620cae72dd7cf6c31d8dfc..0b42cc8ce0a37f26700d83b7e2087ae3cf12efc9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ RELEASE=3.1
 
 VERSION=0.72.1
 PACKAGE=librados2-perl
 
 VERSION=0.72.1
 PACKAGE=librados2-perl

-PKGREL=2
+PKGREL=3

 
 DESTDIR=
 PREFIX=/usr
 
 DESTDIR=
 PREFIX=/usr

diff --git a/PVE/RADOS.pm b/PVE/RADOS.pm
index a9d5dfd44ed4cad0642cb57a0c63f092a065aff5..f40f0a0db9af4cc574443ffb33f966c581cd31f8 100644 (file)
--- a/PVE/RADOS.pm
+++ b/PVE/RADOS.pm
@@ -6,7 +6,9 @@ use warnings;
 use Carp;
 use JSON;
 use Socket;
 use Carp;
 use JSON;
 use Socket;

- 
+use PVE::INotify;
+use PVE::RPCEnvironment;
+

 require Exporter;
 
 our @ISA = qw(Exporter);
 require Exporter;
 
 our @ISA = qw(Exporter);


@@ -77,6 +79,8 @@ my $readdata = sub {
 sub new {
     my ($class, %params) = @_;
 
 sub new {
     my ($class, %params) = @_;
 

+    my $rpcenv = PVE::RPCEnvironment::get();
+

     socketpair(my $child, my $parent, AF_UNIX, SOCK_STREAM, PF_UNSPEC)
        ||  die "socketpair: $!";
 
     socketpair(my $child, my $parent, AF_UNIX, SOCK_STREAM, PF_UNSPEC)
        ||  die "socketpair: $!";
 


@@ -99,7 +103,13 @@ sub new {
 
     } else { # child
        $0 = 'pverados';
 
     } else { # child
        $0 = 'pverados';

- 
+
+       PVE::INotify::inotify_close();
+
+       if (my $atfork = $rpcenv->{atfork}) {
+           &$atfork();
+       }
+

        # fixme: timeout?
 
        close $child;
        # fixme: timeout?
 
        close $child;

diff --git a/changelog.Debian b/changelog.Debian
index bb23092463f56d14bef4ebf65068112b9d7de051..cf98e3cb6e876baa41f7f1d25dd05630ee7e8e5d 100644 (file)
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -1,3 +1,9 @@
+librados2-perl (0.72.1-3) unstable; urgency=low
+
+  * depend on libpve-access-control
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 21 Jan 2014 09:17:44 +0100
+

 librados2-perl (0.72.1-2) unstable; urgency=low
 
   * always fork worker process
 librados2-perl (0.72.1-2) unstable; urgency=low
 
   * always fork worker process

diff --git a/control.in b/control.in
index 21c1a8b5c12c9f7365c25bec473c619c47698be1..38e8157c04753b3c9b7ccb24004a5e8a43272b29 100644 (file)
--- a/control.in
+++ b/control.in
@@ -3,7 +3,7 @@ Version: @@VERSION@@-@@PKGRELEASE@@
 Section: perl
 Priority: optional
 Architecture: @@ARCH@@
 Section: perl
 Priority: optional
 Architecture: @@ARCH@@

-Depends: libc6 (>= 2.2.5), perl (>= 5.14.2-21+deb7u1), perlapi-5.14.2, librados2 (>= 0.72.1)
+Depends: libc6 (>= 2.2.5), perl (>= 5.14.2-21+deb7u1), perlapi-5.14.2, librados2 (>= 0.72.1), libpve-access-control

 Maintainer: Proxmox Support Team <support@proxmox.com>
 Description: Perl bindings for librados
  This package contains librados perl binding used by Proxmox VE.
 Maintainer: Proxmox Support Team <support@proxmox.com>
 Description: Perl bindings for librados
  This package contains librados perl binding used by Proxmox VE.