diff --git a/openvas-scanner-4.0.7-glibc-2.22.patch b/openvas-scanner-4.0.7-glibc-2.22.patch new file mode 100644 index 0000000..1b60b5f --- /dev/null +++ b/openvas-scanner-4.0.7-glibc-2.22.patch @@ -0,0 +1,12 @@ +diff -Nru openvas-scanner-4.0.7.orig/CMakeLists.txt openvas-scanner-4.0.7/CMakeLists.txt +--- openvas-scanner-4.0.7.orig/CMakeLists.txt 2015-03-04 11:49:44.000000000 +0100 ++++ openvas-scanner-4.0.7/CMakeLists.txt 2016-02-06 00:04:50.872602833 +0100 +@@ -242,7 +242,7 @@ + set (HARDENING_FLAGS "-Wformat -Wformat-security -O2 -D_FORTIFY_SOURCE=2 -fstack-protector -Wl,-z,relro -Wl,-z,now") + + set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Werror") +-set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${HARDENING_FLAGS} -Wall -D_BSD_SOURCE -D_ISOC99_SOURCE -D_SVID_SOURCE") ++set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${HARDENING_FLAGS} -Wall -D_DEFAULT_SOURCE -D_ISOC99_SOURCE") + + add_subdirectory (src) + diff --git a/openvas-scanner.spec b/openvas-scanner.spec index ba3b095..25f2a39 100644 --- a/openvas-scanner.spec +++ b/openvas-scanner.spec @@ -1,5 +1,5 @@ Name: openvas-scanner -Version: 3.1.0 +Version: 4.0.7 Release: 1mamba Summary: Server files for OpenVAS, an Open Vulnerability Assessment System Group: Network/Monitoring @@ -7,8 +7,9 @@ Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco URL: http://www.nessus.org -Source0: http://wald.intevation.org/frs/download.php/754/openvas-scanner-%{version}.tar.gz +Source0: http://wald.intevation.org/frs/download.php/2101/openvas-scanner-%{version}.tar.gz Source1: openvasd-initscript +Patch0: openvas-scanner-4.0.7-glibc-2.22.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -18,9 +19,6 @@ BuildRequires: libglib-devel BuildRequires: libgnutls-devel BuildRequires: libgpg-error-devel BuildRequires: libgpgme-devel -BuildRequires: libpcap-devel -BuildRequires: libuuid-devel -BuildRequires: openssl BuildRequires: openvas-libraries-devel ## AUTOBUILDREQ-END BuildRequires: libopenssl-devel @@ -33,7 +31,7 @@ Provides: libnasl Obsoletes: libnasl Provides: openvas-plugins Obsoletes: openvas-plugins -PreReq: openssl +Requires(pre): openssl # FIXME: # file /usr/include/nessus/includes.h from install of # nessus-devel-2.0.10-1qilnx conflicts with file from package @@ -62,99 +60,71 @@ This is the development package for the server related package. %prep %setup -q +%patch0 -p1 %build -%configure -# \ -# --prefix=%{_prefix} \ -# --localstatedir=/var \ -# --sharedstatedir=%{_sysconfdir} \ -# --sysconfdir=%{_sysconfdir} \ -# --mandir=%{_mandir} +%cmake -d build %make -# %{_smp_mflags} -#\ -# OPENVASD_LOGDIR=/var/log/openvas \ -# OPENVASD_CACHEDIR=/var/cache/openvas %install test x"%buildroot" != x/ && rm -rf "%buildroot" -%makeinstall +%makeinstall -C build #% makeoldinstall OPENVASD_LOGDIR=%{buildroot}/var/log/openvas OPENVASD_CACHEDIR=%{buildroot}/var/cache/openvas -install -D -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/openvasd +#install -D -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/openvasd #install -D -m0644 packaging/debian/openvasd.conf %{buildroot}%{_sysconfdir}/openvas/openvasd.conf -install -d -m0755 \ - %{buildroot}%{_sysconfdir}/openvas/CA \ - %{buildroot}/var/lib/openvas/plugins \ - %{buildroot}/var/cache/openvas -#mkdir -p %{buildroot}/var/cache/openvas/{CA,logs,users,jobs,} -#mkdir -p %{buildroot}/var/log/openvas - +#install -d -m0755 \ +# %{buildroot}%{_sysconfdir}/openvas/CA \ +# %{buildroot}/var/lib/openvas/plugins \ +# %{buildroot}/var/cache/openvas %clean test x"%buildroot" != x/ && rm -rf "%buildroot" +#%post +#if [ ! -e /var/lib/openvas/private/CA/cakey.pem ]; then +# %{_sbindir}/openvas-mkcert -q +# # chkconfig --add nessusd +# # %{_initrddir}/nessusd start +#fi +#exit 0 + +#%preun +#if [ $1 -eq 0 ]; then +# chkconfig --del openvasd 2>/dev/null +# service openvasd stop 2>/dev/null +#fi +#exit 0 + +#%postun +#if [ $1 -eq 1 ]; then +# test -e /var/lock/subsys/openvasd && \ +# service openvasd restart +#fi +#exit 0 + %files %defattr(-,root,root) -#%config %{_sysconfdir}/openvas/openvasd.conf -%{_bindir}/openvas-mkcert-client -%{_bindir}/openvas-mkrand +%{_sbindir}/openvas-mkcert-client %{_sbindir}/greenbone-nvt-sync -%{_sbindir}/openvas-adduser -#%{_sbindir}/openvas-check-signature %{_sbindir}/openvas-mkcert %{_sbindir}/openvas-nvt-sync -%{_sbindir}/openvas-rmuser %{_sbindir}/openvassd -%dir %{_libdir}/openvas -%dir %{_libdir}/openvas/plugins -%{_libdir}/openvas/plugins/*.nes -%{_mandir}/man1/openvas*.1.gz -%{_mandir}/man8/openvas*.8.gz -%{_initrddir}/openvasd -%dir %{_sysconfdir}/openvas -%dir %{_sysconfdir}/openvas/CA -%dir /var/lib/openvas -%dir /var/lib/openvas/plugins -%dir /var/lib/openvas/CA -%dir /var/lib/openvas/logs -%dir /var/lib/openvas/users -%dir /var/lib/openvas/jobs -%dir /var/lib/openvas/openvas-services -%dir /var/cache/openvas -%dir /var/log/openvas - -%files devel -%defattr(-,root,root) -#%{_bindir}/openvasd-config -#%{_includedir}/openvas/* - -%post -if [ ! -e /var/lib/openvas/private/CA/cakey.pem ]; then - %{_sbindir}/openvas-mkcert -q - # chkconfig --add nessusd - # %{_initrddir}/nessusd start -fi -exit 0 - -%preun -if [ $1 -eq 0 ]; then - chkconfig --del openvasd 2>/dev/null - service openvasd stop 2>/dev/null -fi -exit 0 - -%postun -if [ $1 -eq 1 ]; then - test -e /var/lock/subsys/openvasd && \ - service openvasd restart -fi -exit 0 +%{_mandir}/man8/greenbone-nvt-sync.8* +%{_mandir}/man8/openvas*.8* %changelog +* Sat Feb 06 2016 Silvan Calarco 4.0.7-1mamba +- update to 4.0.7 + +* Fri Nov 14 2014 Silvan Calarco 4.0.4-1mamba +- update to 4.0.4 + +* Sat Nov 15 2014 Automatic Build System 4.0.3-1mamba +- automatic version update by autodist + * Tue Aug 10 2010 Silvan Calarco 3.1.0-1mamba - update to 3.1.0 - renamed from openvas-server