From: Dietmar Maurer Date: Tue, 21 Jan 2014 08:18:01 +0000 (+0100) Subject: depend on libpve-access-control X-Git-Url: https://git.proxmox.com/?p=librados2-perl.git;a=commitdiff_plain;h=e2171b36224f8dc0b87d5dbee56e13af5388439c depend on libpve-access-control We need to be able to close open server sockets. --- diff --git a/Makefile b/Makefile index c67550a..0b42cc8 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ RELEASE=3.1 VERSION=0.72.1 PACKAGE=librados2-perl -PKGREL=2 +PKGREL=3 DESTDIR= PREFIX=/usr diff --git a/PVE/RADOS.pm b/PVE/RADOS.pm index a9d5dfd..f40f0a0 100644 --- a/PVE/RADOS.pm +++ b/PVE/RADOS.pm @@ -6,7 +6,9 @@ use warnings; use Carp; use JSON; use Socket; - +use PVE::INotify; +use PVE::RPCEnvironment; + require Exporter; our @ISA = qw(Exporter); @@ -77,6 +79,8 @@ my $readdata = sub { sub new { my ($class, %params) = @_; + my $rpcenv = PVE::RPCEnvironment::get(); + socketpair(my $child, my $parent, AF_UNIX, SOCK_STREAM, PF_UNSPEC) || die "socketpair: $!"; @@ -99,7 +103,13 @@ sub new { } else { # child $0 = 'pverados'; - + + PVE::INotify::inotify_close(); + + if (my $atfork = $rpcenv->{atfork}) { + &$atfork(); + } + # fixme: timeout? close $child; diff --git a/changelog.Debian b/changelog.Debian index bb23092..cf98e3c 100644 --- 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 Tue, 21 Jan 2014 09:17:44 +0100 + librados2-perl (0.72.1-2) unstable; urgency=low * always fork worker process diff --git a/control.in b/control.in index 21c1a8b..38e8157 100644 --- a/control.in +++ b/control.in @@ -3,7 +3,7 @@ Version: @@VERSION@@-@@PKGRELEASE@@ 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 Description: Perl bindings for librados This package contains librados perl binding used by Proxmox VE.