rpms/nessus-core/F-8 nessus-core-open.patch, NONE, 1.1 nessus-core.spec, 1.8, 1.9 nessusd.init, 1.1, 1.2
Andreas Bierfert (awjb)
fedora-extras-commits at redhat.com
Sat Dec 8 11:42:38 UTC 2007
- Previous message: rpms/nessus-core/F-7 nessus-core-open.patch, NONE, 1.1 nessus-core.spec, 1.8, 1.9 nessusd.init, 1.1, 1.2
- Next message: rpms/nessus-core/devel nessus-core-open.patch, NONE, 1.1 nessus-core.spec, 1.9, 1.10 nessusd.init, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: awjb
Update of /cvs/pkgs/rpms/nessus-core/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6989/F-8
Modified Files:
nessus-core.spec nessusd.init
Added Files:
nessus-core-open.patch
Log Message:
- fix build #399211 (patch from Oliver Falk)
- fix multilib issues #342661
- fix init scripts #246992
nessus-core-open.patch:
--- NEW FILE nessus-core-open.patch ---
diff -up nessus-core/nessusd/detached.c.openfix nessus-core/nessusd/detached.c
--- nessus-core/nessusd/detached.c.openfix 2007-11-26 11:05:58.000000000 +0100
+++ nessus-core/nessusd/detached.c 2007-11-26 11:06:25.000000000 +0100
@@ -408,13 +408,12 @@ detached_new_session(globals, target)
char * target;
{
char * fname = detached_fname(globals);
- int f = open(fname, O_CREAT|O_WRONLY|O_TRUNC);
+ int f = open(fname, O_CREAT|O_WRONLY|O_TRUNC, 0600);
if(f >= 0)
{
write(f, target, strlen(target));
fsync(f);
close(f);
- chmod(fname, 0600);
efree(&fname);
return getpid();
}
Index: nessus-core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nessus-core/F-8/nessus-core.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- nessus-core.spec 22 Aug 2007 13:26:13 -0000 1.8
+++ nessus-core.spec 8 Dec 2007 11:42:04 -0000 1.9
@@ -1,6 +1,6 @@
Name: nessus-core
Version: 2.2.10
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Network vulnerability scanner
Group: Applications/System
@@ -25,6 +25,9 @@
Patch8: nessus-core-2.2.4.nessus.tmpl.in.patch
Patch9: nessus-core-2.2.4.pid.patch
Patch10: nessus-core-2.2.4.pki.patch
+# fixes #399211 glibc open check
+Patch11: nessus-core-open.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: nessus-libraries-devel
@@ -36,7 +39,6 @@
BuildRequires: tcp_wrappers-devel
BuildRequires: desktop-file-utils
-
%define pkidir %{_sysconfdir}/pki/nessus
%description
@@ -101,6 +103,7 @@
%patch8 -p1
%patch9 -p1
%patch10 -p1
+%patch11 -p1
%build
# libdir is used by plugins
@@ -158,6 +161,9 @@
touch $RPM_BUILD_ROOT/%{_sysconfdir}/nessus/nessusd.{conf,rules}
chmod 600 $RPM_BUILD_ROOT/%{_sysconfdir}/nessus/nessusd.conf
+# fix multilib conflict for config.h (#342661)
+touch -r CHANGES $RPM_BUILD_ROOT%{_includedir}/nessus/config.h
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -227,6 +233,12 @@
%ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{_sysconfdir}/nessus/*
%changelog
+* Sat Dec 08 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 2.2.10-2
+- fix build #399211 (patch from Oliver Falk)
+- fix multilib issues #342661
+- fix init scripts #246992
+
* Wed Aug 22 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- 2.2.10-1
- version upgrade
Index: nessusd.init
===================================================================
RCS file: /cvs/pkgs/rpms/nessus-core/F-8/nessusd.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nessusd.init 7 Apr 2006 06:21:26 -0000 1.1
+++ nessusd.init 8 Dec 2007 11:42:04 -0000 1.2
@@ -8,6 +8,15 @@
# processname: nessusd
# config: /etc/nessus/nessusd.conf
# pidfile: /var/run/nessusd.pid
+### BEGIN INIT INFO
+# Required-Start: $local_fs $network
+# Required-Stop: $local_fs $network
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: start and stop the nessus daemon
+# Description: Starts and stops the nessus daemon so users can access it via
+# nessus clients
+### END INIT INFO
# Source function library.
. /etc/rc.d/init.d/functions
- Previous message: rpms/nessus-core/F-7 nessus-core-open.patch, NONE, 1.1 nessus-core.spec, 1.8, 1.9 nessusd.init, 1.1, 1.2
- Next message: rpms/nessus-core/devel nessus-core-open.patch, NONE, 1.1 nessus-core.spec, 1.9, 1.10 nessusd.init, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list