Hello community, here is the log from the commit of package libopenvas for openSUSE:Factory checked in at 2012-06-18 10:03:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libopenvas (Old) and /work/SRC/openSUSE:Factory/.libopenvas.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libopenvas", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libopenvas/libopenvas.changes 2011-11-07 14:20:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libopenvas.new/libopenvas.changes 2012-06-18 10:03:45.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jun 14 12:38:45 UTC 2012 - meiss...@suse.com + +- fixed build with current gnutls + +------------------------------------------------------------------- New: ---- openvas-fix-gnutls.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libopenvas.spec ++++++ --- /var/tmp/diff_new_pack.nnIiHr/_old 2012-06-18 10:03:47.000000000 +0200 +++ /var/tmp/diff_new_pack.nnIiHr/_new 2012-06-18 10:03:47.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libopenvas # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,25 +15,23 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild %define soname 4 Name: libopenvas Version: 4.0.6 -Release: 4 -License: GPL-2.0 -Group: Productivity/Networking/Security +Release: 0 Url: http://www.openvas.org Source: openvas-libraries-%{version}.tar.gz Patch0: openvas-libraries-4.0-rc4-no_Werror.patch Patch1: openvas-libraries-4.0.5-removelowat.patch +Patch2: openvas-fix-gnutls.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?fedora_version} || 0%{?scientificlinux_version} || 0%{?centos_version} BuildRequires: gpgme-devel -BuildRequires: openldap-devel BuildRequires: libuuid-devel +BuildRequires: openldap-devel %endif %if 0%{?mandriva_version} @@ -49,10 +47,10 @@ %if 0%{?suse_version} BuildRequires: free-ttf-fonts +BuildRequires: libgcrypt-devel BuildRequires: libgpgme-devel BuildRequires: libuuid-devel BuildRequires: openldap2-devel -BuildRequires: libgcrypt-devel %if 0%{?suse_version} > 1130 BuildRequires: libassuan-devel %endif @@ -67,53 +65,53 @@ BuildRequires: libpcap-devel BuildRequires: pkgconfig Summary: Support libraries for OpenVAS +License: GPL-2.0 +Group: Productivity/Networking/Security %description The support libraries for the Open Vulnerability Assessment System (OpenVAS). %package -n libopenvas_base%{soname} -Group: System/Libraries Summary: Support libraries for OpenVAS +Group: System/Libraries %description -n libopenvas_base%{soname} The support libraries for the Open Vulnerability Assessment System (OpenVAS). %package -n libopenvas_hg%{soname} -Group: System/Libraries Summary: Support libraries for OpenVAS +Group: System/Libraries %description -n libopenvas_hg%{soname} The support libraries for the Open Vulnerability Assessment System (OpenVAS). %package -n libopenvas_misc%{soname} -Group: System/Libraries Summary: Support libraries for OpenVAS +Group: System/Libraries %description -n libopenvas_misc%{soname} The support libraries for the Open Vulnerability Assessment System (OpenVAS). %package -n libopenvas_nasl%{soname} -Group: System/Libraries Summary: Support libraries for OpenVAS +Group: System/Libraries %description -n libopenvas_nasl%{soname} The support libraries for the Open Vulnerability Assessment System (OpenVAS). %package -n libopenvas_omp%{soname} -Group: System/Libraries Summary: Support libraries for OpenVAS +Group: System/Libraries %description -n libopenvas_omp%{soname} The support libraries for the Open Vulnerability Assessment System (OpenVAS). %package devel -License: GPL-2.0 -Group: Development/Libraries/C and C++ %if 0%{?fedora_version} || 0%{?scientificlinux_version} || 0%{?centos_version} Requires: gpgme-devel @@ -140,8 +138,13 @@ Requires: gnutls-devel Requires: libpcap-devel -Requires: libopenvas_base%{soname} = %{version} libopenvas_hg%{soname} = %{version} libopenvas_misc%{soname} = %{version} libopenvas_nasl%{soname} = %{version} libopenvas_omp%{soname} = %{version} +Requires: libopenvas_base%{soname} = %{version} +Requires: libopenvas_hg%{soname} = %{version} +Requires: libopenvas_misc%{soname} = %{version} +Requires: libopenvas_nasl%{soname} = %{version} +Requires: libopenvas_omp%{soname} = %{version} Summary: Development files for libopenvas +Group: Development/Libraries/C and C++ %description devel This package contains the development files (mainly C header files) for libopenvas. @@ -153,6 +156,7 @@ %if 0%{?suse_version} > 1200 %patch1 %endif +%patch2 -p1 %build export CFLAGS="%optflags" ++++++ openvas-fix-gnutls.patch ++++++ Index: openvas-libraries-4.0.6/misc/openvas_server.c =================================================================== --- openvas-libraries-4.0.6.orig/misc/openvas_server.c +++ openvas-libraries-4.0.6/misc/openvas_server.c @@ -610,7 +610,7 @@ openvas_server_sendf_xml (gnutls_session * @return 0 on success, -1 on error. */ int -openvas_server_new (gnutls_connection_end_t end_type, gchar * ca_cert_file, +openvas_server_new (unsigned int end_type, gchar * ca_cert_file, gchar * cert_file, gchar * key_file, gnutls_session_t * server_session, gnutls_certificate_credentials_t * server_credentials) Index: openvas-libraries-4.0.6/misc/openvas_server.h =================================================================== --- openvas-libraries-4.0.6.orig/misc/openvas_server.h +++ openvas-libraries-4.0.6/misc/openvas_server.h @@ -64,7 +64,7 @@ int openvas_server_sendf (gnutls_session int openvas_server_sendf_xml (gnutls_session_t *, const char *, ...); -int openvas_server_new (gnutls_connection_end_t, gchar *, gchar *, gchar *, +int openvas_server_new (unsigned int, gchar *, gchar *, gchar *, gnutls_session_t *, gnutls_certificate_credentials_t *); int openvas_server_free (int, gnutls_session_t, -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
