Author: misc
Date: Sun Nov 12 23:40:30 2006
New Revision: 83553
Added:
packages/cooker/perl-DJabberd/current/SOURCES/djabberd-pid_file.patch
Removed:
packages/cooker/perl-DJabberd/current/SOURCES/djabberd_test.diff
Modified:
packages/cooker/perl-DJabberd/current/SPECS/perl-DJabberd.spec
Log:
- add patch for pidfile, from subversion
- remove patch about test and muc, integrated upstream with 0.81
Added: packages/cooker/perl-DJabberd/current/SOURCES/djabberd-pid_file.patch
==============================================================================
--- (empty file)
+++ packages/cooker/perl-DJabberd/current/SOURCES/djabberd-pid_file.patch
Sun Nov 12 23:40:30 2006
@@ -0,0 +1,37 @@
+Index: lib/DJabberd.pm
+===================================================================
+--- lib/DJabberd.pm (r�vision 728)
++++ lib/DJabberd.pm (r�vision 729)
+@@ -152,9 +152,7 @@
+
+ sub set_config_pidfile {
+ my ($self, $val) = @_;
+- open(PIDFILE,'>',$val) or croak("Can't open pidfile $val for writing");
+- print PIDFILE "$$\n";
+- close(PIDFILE);
++ $self->{pid_file} = $val;
+ }
+
+ our %fake_peers;
+@@ -270,7 +268,12 @@
+ my $self = shift;
+ daemonize() if $self->{daemonize};
+ local $SIG{'PIPE'} = "IGNORE"; # handled manually
+-
++ if ($self->{pid_file}) {
++ $logger->debug("Logging PID to file $self->{pid_file}");
++ open(PIDFILE,'>',$self->{pid_file}) or $logger->logdie("Can't open
pidfile $self->{pid_file} for writing");
++ print PIDFILE "$$\n";
++ close(PIDFILE);
++ }
+ $self->start_c2s_server();
+
+ # {=s2soptional}
+@@ -282,6 +285,7 @@
+
+ DJabberd::Connection::Admin->on_startup;
+ Danga::Socket->EventLoop();
++ unlink($self->{pid_file}) if (-f $self->{pid_file});
+ }
+
+ sub _start_server {
Modified: packages/cooker/perl-DJabberd/current/SPECS/perl-DJabberd.spec
==============================================================================
--- packages/cooker/perl-DJabberd/current/SPECS/perl-DJabberd.spec
(original)
+++ packages/cooker/perl-DJabberd/current/SPECS/perl-DJabberd.spec Sun Nov
12 23:40:30 2006
@@ -18,7 +18,8 @@
Source3: djabberd.sysconfig
Source4: djabberd.log.conf
Source5: djabberd.logrotate
-Patch: djabberd_test.diff
+# taken from svn
+Patch1: djabberd-pid_file.patch
%if %{mdkversion} < 1010
BuildRequires: perl-devel
%endif
@@ -52,6 +53,7 @@
%prep
%setup -q -n %{module}-%{version}
+%patch1 -p0
mkdir -p doc/DJabberd/Component/
# do notprovides it, as it pulls a non packaged module
#mv ./lib/DJabberd/Component/Example.pm doc/DJabberd/Component/
