--- oval-interpreter-5.7.2.orig/debian/copyright +++ oval-interpreter-5.7.2/debian/copyright @@ -0,0 +1,41 @@ +This package was debianized by Pavel Vinogradov +on Fri, 3 Aug 2007 10:57:04 +0500. + +It was downloaded from http://oval.mitre.org/ + +Upstream Author: + + The MITRE Corporation + +Copyright: + + Copyright (C) 2002-2009 The MITRE Corporation + +License: + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * Neither the name of The MITRE Corporation nor the names of its + contributors may be used to endorse or promote products derived from this + software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +The Debian packaging is Copyright (C) 2007-2009, Pavel Vinogradov + and is licensed under the GPL, see +`/usr/share/common-licenses/GPL'. --- oval-interpreter-5.7.2.orig/debian/changelog +++ oval-interpreter-5.7.2/debian/changelog @@ -0,0 +1,107 @@ +oval-interpreter (5.7.2-1.2) unstable; urgency=high + + * Non maintainer upload. + * Fix build failure with GCC 4.7. Closes: #667317. + + -- Matthias Klose Wed, 09 May 2012 22:37:22 +0000 + +oval-interpreter (5.7.2-1.1) unstable; urgency=low + + * Non-maintainer upload. + * fix-no-add-needed-build.patch: Fix build with ld --no-add-needed + (Closes: #615759, LP: #756041). Thanks Julian Taylor for the patch. + + -- Stefano Rivera Wed, 06 Jul 2011 23:53:50 +0200 + +oval-interpreter (5.7.2-1) unstable; urgency=low + + * New upstream release + * Add libgcrypt-dev to the Build-Dependencies as this new upstream release + uses FSF's general purpose cryptographic library. + * Upgrade to standards version 3.9.1 (no changes) + [ Javier Fernandez-Sanguino ] + * Add libldap2-dev to debian/control + * Add nologtofile.patch to the series to prevent ovaldi from writing log + files all over the place. + + -- Pavel Vinogradov Sun, 08 Aug 2010 21:39:58 +0400 + +oval-interpreter (5.7.1-1) unstable; urgency=low + + * New upstream release + * Upgrade to standards version 3.8.4 (no changes) + * Remove manual permission fix for xml files (Closes: #548460) + + -- Pavel Vinogradov Mon, 18 May 2010 07:37:32 +0500 + +oval-interpreter (5.6.4-1) unstable; urgency=low + + * New upstream release + * Delete debian.manpage.hyphen, debian.spelling patches (already applied + in upstream) + + -- Pavel Vinogradov Sun, 10 Jan 2010 00:43:38 +0400 + +oval-interpreter (5.6.1-2) unstable; urgency=low + + * Add patch debian.spelling.patch - fix spelling error found by lintian. + * Add patch debian.manpage.hyphen.patch - fix hyphen-used-as-minus-sign + lintian warning. + * Add debian/README.source - fix lintian warning. + * Update debian/copyright - fix lintian warning. + * Add description to each patch in DEP-3 format and fix + quilt-patch-missing-description lintian warning. + + -- Pavel Vinogradov Mon, 14 Sep 2009 08:14:43 +0500 + +oval-interpreter (5.6.1-1) unstable; urgency=low + + * New upstream release + + -- Pavel Vinogradov Sat, 12 Sep 2009 22:33:52 +0500 + +oval-interpreter (5.5.25-1) unstable; urgency=low + + * New upstream release (Closes: #539893) + * Update debian.xsddir.patch for new release. + * Switch to mergeWithUpstream mode in svn-buildpackage + * Upgrade to standards version 3.8.3 (no changes) + [ Javier Fernandez-Sanguino ] + * debian/rules: Adjust permissions in XML definition files in which + are executable in the source package, probably due to Windows to Unix + copying (lintian fix) + + -- Pavel Vinogradov Sat, 12 Sep 2009 22:33:49 +0500 + +oval-interpreter (5.5.4-1) unstable; urgency=low + + * New upstream release + * Upgrade to standards version 3.7.3 (no changes) + * Cleanup unused and commented debhelper lines from debian/rules + * Update link to homepage + + -- Pavel Vinogradov Sat, 02 May 2009 15:27:27 +0500 + +oval-interpreter (5.4.2-1) unstable; urgency=low + + * New upstream release + * Remove oval.gcc43.patch, oval.misc.patch (applied upstream) + * Update watch file to new project page at SF . Closes: #450243. + * Update build dependency to libxerces-2c-dev. Closes: #479192. + * Upgrade to standards version 3.7.3 (no changes) + * Update control file (Add Homepage field, rename XS-Vcs-* fields) + + -- Pavel Vinogradov Wed, 14 May 2008 23:45:10 +0500 + +oval-interpreter (5.3-2) unstable; urgency=low + + * Add patch debian.gcc43.patch - missing includes for GCC 4.3 (Closes: #455333) + + -- Pavel Vinogradov Sun, 09 Mar 2008 01:09:30 +0400 + +oval-interpreter (5.3-1) unstable; urgency=low + + * Initial release (Closes: #436941) + + -- Pavel Vinogradov Fri, 3 Aug 2007 10:13:04 +0500 + --- oval-interpreter-5.7.2.orig/debian/compat +++ oval-interpreter-5.7.2/debian/compat @@ -0,0 +1 @@ +5 --- oval-interpreter-5.7.2.orig/debian/README.Debian +++ oval-interpreter-5.7.2/debian/README.Debian @@ -0,0 +1,15 @@ +ovaldi for Debian +--------------- + + This package contains the OVAL referenced interpreter adapted to use in + Debian distribution. This work was made as part of Google Summer of Code 2007 + project. The Open Vulnerability and Assessment Language is used to generate + unified definition of vulnerabilities. For more information see: + http://oval.mitre.org/ + + You can find some example definitions in the /usr/share/doc/ovaldi/examples + directory. These definitions do not represent any actual vulnerability + information but can be used as examples to write you own definition or test + how the OVAL interpreter works. + + -- Pavel Vinogradov Fri, 3 Aug 2007 10:13:04 +0500 --- oval-interpreter-5.7.2.orig/debian/dirs +++ oval-interpreter-5.7.2/debian/dirs @@ -0,0 +1,3 @@ +usr/bin +usr/share/man/man1 +usr/share/doc/ovaldi --- oval-interpreter-5.7.2.orig/debian/control +++ oval-interpreter-5.7.2/debian/control @@ -0,0 +1,23 @@ +Source: oval-interpreter +Section: admin +Priority: optional +Maintainer: Pavel Vinogradov +Standards-Version: 3.9.1 +Build-Depends: debhelper (>= 5), autotools-dev, quilt (>= 0.40), libpcre3-dev, libxerces-c2-dev, libxalan110-dev (>= 1.10-3.3), libapt-pkg-dev, libpopt-dev, libgcrypt-dev, libldap-dev +Homepage: https://sourceforge.net/projects/ovaldi/ +Vcs-Svn: svn://svn.debian.org/svn/oval/trunk/ovaldi +Vcs-Browser: http://svn.debian.org/wsvn/oval/trunk/ovaldi + +Package: ovaldi +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Open Vulnerability and Assessment Language reference interpreter + OVAL is an international, information security, community + standard to promote open and publicly available security + content, and to standardize the transfer of this + information across the entire spectrum of security tools + and services. + . + This package includes the reference interpreter, adapted to be used in Debian + systems. It does not, however, include any definitions for vulnerability + tests. --- oval-interpreter-5.7.2.orig/debian/watch +++ oval-interpreter-5.7.2/debian/watch @@ -0,0 +1,7 @@ +# Compulsory line, this is a version 3 file +version=3 + +# Uncomment to examine a Webpage +# +#http://oval.mitre.org/language/download/interpreter/ version[\d\.]+/interpreters\.src-(.*)\.tbz2 +http://sf.net/ovaldi/ ovaldi-(.+)-src\.tar.bz2 --- oval-interpreter-5.7.2.orig/debian/docs +++ oval-interpreter-5.7.2/debian/docs @@ -0,0 +1,2 @@ +docs/README.txt +docs/version.txt --- oval-interpreter-5.7.2.orig/debian/README.source +++ oval-interpreter-5.7.2/debian/README.source @@ -0,0 +1,6 @@ +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +Please refer to /usr/share/doc/quilt/README.source for detailed +quilt description. --- oval-interpreter-5.7.2.orig/debian/TODO.Debian +++ oval-interpreter-5.7.2/debian/TODO.Debian @@ -0,0 +1,4 @@ +deb-package: + + Cleanup unused and commented debhelper lines from debian/rules (by Jay Berkenbilt ) + - Use upstream *.bz2 tarball as original-source instead of repack it. (by Jay Berkenbilt ) + - Update dsa-examples for Lenny release --- oval-interpreter-5.7.2.orig/debian/rules +++ oval-interpreter-5.7.2/debian/rules @@ -0,0 +1,88 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + + + +# quilt support +include /usr/share/quilt/quilt.make + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +configure: configure-stamp +configure-stamp: patch + dh_testdir + # Add here commands to configure the package. + + touch configure-stamp + + +build: build-stamp + +build-stamp: configure-stamp + dh_testdir + + # Add here commands to compile the package. + mkdir -p project/linux/Release/obj + cd project/linux && $(MAKE) + #docbook-to-man debian/oval.sgml > oval.1 + + touch $@ + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + # Add here commands to clean up after the build process. + [ ! -f Makefile ] || $(MAKE) clean + rm -rf project/linux/Release + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/oval. + #$(MAKE) DESTDIR=$(CURDIR)/debian/oval install + dh_install -s + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_installexamples + dh_installman docs/ovaldi.1 + dh_strip + dh_compress -X.xml + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- oval-interpreter-5.7.2.orig/debian/install +++ oval-interpreter-5.7.2/debian/install @@ -0,0 +1,3 @@ +project/linux/Release/ovaldi usr/bin +xml usr/share/ovaldi +debian/examples usr/share/doc/ovaldi --- oval-interpreter-5.7.2.orig/debian/examples/dsa1325_example.xml +++ oval-interpreter-5.7.2/debian/examples/dsa1325_example.xml @@ -0,0 +1,252 @@ + + + + Debian + 5.3 + 2007-08-08T22:49:20.188-04:00 + + + + + several vulnerabilities + + Debian GNU/Linux 4.0 + Debian GNU/Linux 3.1 + evolution + + + + What information can i put there? + + 2007-06-29 + +Several remote vulnerabilities have been discovered in Evolution, a +groupware suite with mail client and organizer. The Common Vulnerabilities +and Exposures project identifies the following problems: +Ulf Härnhammar discovered that a format string vulnerability in + the handling of shared calendars may allow the execution of arbitrary + code. +It was discovered that the IMAP code in the Evolution Data Server + performs insufficient sanitising of a value later used an array index, + which can lead to the execution of arbitrary code. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /etc + debian_version + \d\.\d + + + + evolution-common + + + evolution-dbg + + + evolution + + + evolution-dev + + + evolution-plugins + + + evolution-plugins-experimental + + + + + 4.0 + + + 0:2.6.3-6etch1 + + + s390x + + + x86-64 + + + sparc + + + arm + + + i686 + + + ia64 + + + alpha + + + ppc + + + mipsel + + + hppa + + + 3.1 + + + m68k + + + 0:2.0.4-2sarge2 + + + --- oval-interpreter-5.7.2.orig/debian/examples/package_example.xml +++ oval-interpreter-5.7.2/debian/examples/package_example.xml @@ -0,0 +1,69 @@ + + + + Debian + 5.3 + 2007-08-08T22:23:18.188-04:00 + + + + + Grub package installed on i386 or amd64 architecture + + Debian GNU/Linux 4.0 + grub + + Check if grub package installed on Debian 4.0 (etch) on i386 or amd64 arch + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /etc + debian_version + \d\.\d + + + + grub + + + + + 4.0 + + + x86-64 + + + i686 + + + --- oval-interpreter-5.7.2.orig/debian/examples/release_example.xml +++ oval-interpreter-5.7.2/debian/examples/release_example.xml @@ -0,0 +1,40 @@ + + + + Debian + 5.3 + 2007-08-08T22:18:08.188-04:00 + + + + + Debian release example definition + + Debian GNU/Linux 4.0 + + Test instalation of Debian 4.0 (etch) release + + + + + + + + + + + + + + + /etc + debian_version + \d\.\d + + + + + 4.0 + + + --- oval-interpreter-5.7.2.orig/debian/patches/nologtofile.patch +++ oval-interpreter-5.7.2/debian/patches/nologtofile.patch @@ -0,0 +1,188 @@ +#Description: Introduce the option to log to file or not. +# Standard ovaldi always creates a log file 'ovaldi.log' and +# writes to it its messages. Always writting to a log file is not considered +# good behaviour since it fills the filesystem with crufts and can, even, be a +# security issue if the logfile name is static (as is the case here) and the +# user is running in a place any other users can write to (as this makes him +# vulnerable to logfile attacks) +# +# This patch modifies the Log filesytem so that logfile writting is +# disabled by default and only enabled if the user explicitly requests +# logs either by setting the 'debug' flag or by explicitly defining a log file. +# +#Forwaded: No +#Author: Javier Fernández-Sanguino Peña +#Last-Update: 2010-09-08 + +diff -ru ovaldi-5.7.2-src.orig/src//Log.cpp oval-interpreter-5.7.2/src//Log.cpp +--- ovaldi-5.7.2-src.orig/src//Log.cpp 2010-07-14 15:29:33.000000000 +0200 ++++ oval-interpreter-5.7.2/src//Log.cpp 2010-08-09 00:15:35.000000000 +0200 +@@ -35,6 +35,7 @@ + // Initialize static variables. + int Log::level = Log::DEBUG; + bool Log::toScreen = true; ++bool Log::toFile = false; + bool Log::initialized = false; + string Log::logFilename = ""; + ofstream Log::logFile; +@@ -44,13 +45,13 @@ + //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~// + void Log::Shutdown() { + +- if(Log::logFile.is_open()) ++ if( Log::toFile && Log::logFile.is_open()) + Log::logFile.close(); + +- Log::initialized = false; ++ Log::initialized = false; + } + +-void Log::Init(int level, string logFile, bool toScreen) { ++void Log::Init(int level, string logFile, bool toScreen, bool toFile) { + + if(!Log::initialized) { + +@@ -63,13 +64,19 @@ + // init the to screen flag + Log::toScreen = toScreen; + +- // Reset the log file +- Log::logFile.open(logFilename.c_str(), ios::trunc | ios::out); ++ // init the to file flag ++ Log::toFile = toFile; + +- if(!Log::logFile.is_open() || Log::logFile.fail()) { +- Log::logFile.close(); +- throw Exception("Error initializing log system. Unable to clear log file."); +- } ++ if ( Log::toFile ) { ++ ++ // Reset the log file ++ Log::logFile.open(logFilename.c_str(), ios::trunc | ios::out); ++ ++ if(!Log::logFile.is_open() || Log::logFile.fail()) { ++ Log::logFile.close(); ++ throw Exception("Error initializing log system. Unable to clear log file."); ++ } ++ } + + Log::initialized = true; + } +@@ -81,7 +88,8 @@ + + bool tmp = Log::toScreen; + Log::toScreen = false; +- Log::logFile << msg << endl; ++ if ( Log::toFile ) ++ Log::logFile << msg << endl; + Log::toScreen = tmp; + } + +@@ -149,10 +157,17 @@ + Log::toScreen = screen; + } + ++void Log::SetToFile(bool file) { ++ Log::toFile = file; ++} ++ + bool Log::GetToScreen(){ + return Log::toScreen; + } + ++bool Log::GetToFile(){ ++ return Log::toFile; ++} + bool Log::IsDebug() { + return (Log::GetLevel() <= Log::DEBUG); + } +@@ -177,12 +192,14 @@ + //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~// + void Log::WriteLog(string logMessageIn, bool fileOnly) { + +- Log::logFile << logMessageIn << endl; +- Log::logFile.flush(); +- +- if(Log::toScreen && !fileOnly) { +- cout << logMessageIn << endl; +- } ++ if (Log::toFile ) { ++ Log::logFile << logMessageIn << endl; ++ Log::logFile.flush(); ++ } ++ ++ if(Log::toScreen && !fileOnly) { ++ cout << logMessageIn << endl; ++ } + } + + string Log::LevelToString(int level) { +diff -ru ovaldi-5.7.2-src.orig/src//Log.h oval-interpreter-5.7.2/src//Log.h +--- ovaldi-5.7.2-src.orig/src//Log.h 2010-05-14 19:45:51.000000000 +0200 ++++ oval-interpreter-5.7.2/src//Log.h 2010-08-09 00:18:45.000000000 +0200 +@@ -59,7 +59,7 @@ + @param toScreen when true the log messages will be written to std out. + @throws Exception Thrown when the existing log file can not be cleared. + */ +- static void Init(int level = DEBUG, std::string logFile = "", bool toScreen = false); ++ static void Init(int level = DEBUG, std::string logFile = "", bool toScreen = false, bool toFile = false); + + /** Shutdown the logger. Simply has to close the log file. */ + static void Shutdown(); +@@ -97,7 +97,9 @@ + static void SetLevel(std::string strLevel); + static void SetLevel(int level); + static void SetToScreen(bool screen); ++ static void SetToFile(bool file); + static bool GetToScreen(); ++ static bool GetToFile(); + + /** Return true if the Logger the current level is less than or equal to DEBUG. */ + static bool IsDebug(); +@@ -145,8 +147,9 @@ + static std::string logFilename; + static int level; + static bool toScreen; ++ static bool toFile; + static bool initialized; +- static std::ofstream logFile; ++ static std::ofstream logFile; + + }; + +diff -ru ovaldi-5.7.2-src.orig/src//Main.cpp oval-interpreter-5.7.2/src//Main.cpp +--- ovaldi-5.7.2-src.orig/src//Main.cpp 2010-07-29 14:53:41.000000000 +0200 ++++ oval-interpreter-5.7.2/src//Main.cpp 2010-08-09 00:18:24.000000000 +0200 +@@ -81,6 +81,7 @@ + #ifdef _DEBUG + Log::SetLevel(Log::DEBUG); + Log::SetToScreen(false); ++ Log::SetToScreen(true); + #else + Log::SetLevel(Log::INFO); + Log::SetToScreen(false); +@@ -97,7 +98,7 @@ + + try { + // init the log system - set the log level here +- Log::Init(Log::GetLevel(), Common::GetLogFileLocation(), Log::GetToScreen()); ++ Log::Init(Log::GetLevel(), Common::GetLogFileLocation(), Log::GetToScreen(), Log::GetToFile()); + } catch (Exception ex) { + cout << "*** Log initialization error: " << ex.GetErrorMessage() << "\n\n\n----------------------------------------------------" << endl; + Usage(); +@@ -691,6 +692,7 @@ + exit( EXIT_FAILURE ); + } else { + Common::SetLogFileLocation(argv[2]); ++ Log::SetToFile(true); + ++argv; + --argc; + } +@@ -716,6 +718,7 @@ + + Log::SetLevel(Log::DEBUG); + Log::SetToScreen(true); ++ Log::SetToFile(true); + + break; + --- oval-interpreter-5.7.2.orig/debian/patches/debian.makefile.patch +++ oval-interpreter-5.7.2/debian/patches/debian.makefile.patch @@ -0,0 +1,63 @@ +#Description: Change order in which we check rpm and dpkg library availability. +# In Debian we can have both rpm and dpkg library installed, in this case +# ovaldi will build with RPM support, not dpkg. +# . +# Upstream is not interested in switch library check order. +# Patch require updates with new ovaldi releases to apply without fuzz and +# offset warnings. +# +#Forwaded: Yes, but rejected +#Author: Javier Fernández-Sanguino Peña +#Last-Update: 2010-08-08 + +diff -urN ovaldi-mitre/project/linux/Makefile ovaldi-debian/project/linux/Makefile +--- ovaldi-mitre/project/linux/Makefile 2008-04-20 19:12:24.000000000 +0500 ++++ ovaldi-debian/project/linux/Makefile 2008-04-20 20:55:50.000000000 +0500 +@@ -66,13 +66,14 @@ + PACKAGE_DPKG = $(shell /usr/bin/env dpkg --version 2>/dev/null) + PACKAGE_MANAGERS = + ++ifneq (${PACKAGE_DPKG}, ) ++ LIBS += -lapt-pkg ++ PACKAGE_MANAGERS += -DPACKAGE_DPKG ++else + ifneq (${PACKAGE_RPM}, ) + LIBS += -lrpm -lrpmdb -lrpmio + PACKAGE_MANAGERS += -DPACKAGE_RPM + endif +-ifneq (${PACKAGE_DPKG}, ) +- LIBS += -lapt-pkg +- PACKAGE_MANAGERS += -DPACKAGE_DPKG + endif + + # What object code are we expecting? +@@ -175,11 +176,12 @@ + Directive.obj \ + LDAPProbe.obj + ++ifneq (${PACKAGE_DPKG}, ) ++ OBJS += DPKGInfoProbe.obj ++else + ifneq (${PACKAGE_RPM}, ) + OBJS += RPMInfoProbe.obj + endif +-ifneq (${PACKAGE_DPKG}, ) +- OBJS += DPKGInfoProbe.obj + endif + + REL_OBJS = \ +@@ -281,11 +283,12 @@ + $(BUILDDIR)/Directive.obj \ + $(BUILDDIR)/LDAPProbe.obj + ++ifneq (${PACKAGE_DPKG}, ) ++ REL_OBJS += $(BUILDDIR)/DPKGInfoProbe.obj ++else + ifneq (${PACKAGE_RPM}, ) + REL_OBJS += $(BUILDDIR)/RPMInfoProbe.obj + endif +-ifneq (${PACKAGE_DPKG}, ) +- REL_OBJS += $(BUILDDIR)/DPKGInfoProbe.obj + endif + + # Search the output directory for object files --- oval-interpreter-5.7.2.orig/debian/patches/ftbfs-gcc-4.7.diff +++ oval-interpreter-5.7.2/debian/patches/ftbfs-gcc-4.7.diff @@ -0,0 +1,12 @@ +Index: oval-interpreter-5.7.2/src/probes/unix/InterfaceProbe.cpp +=================================================================== +--- oval-interpreter-5.7.2.orig/src/probes/unix/InterfaceProbe.cpp 2010-05-26 21:29:37.000000000 +0000 ++++ oval-interpreter-5.7.2/src/probes/unix/InterfaceProbe.cpp 2012-05-09 22:39:06.840489057 +0000 +@@ -29,6 +29,7 @@ + //****************************************************************************************// + + #include "InterfaceProbe.h" ++#include + + using namespace std; + --- oval-interpreter-5.7.2.orig/debian/patches/debian.xsddir.patch +++ oval-interpreter-5.7.2/debian/patches/debian.xsddir.patch @@ -0,0 +1,20 @@ +#Description: Change path to shared xsd files, which used during ovadi execution +# By default ovadi search current directory for required xsd files, +# but in Debian package this files was moved to /usr/share/ovaldi/xml dir. +# . +# Patch was rewrited for 5.7.2 due to chenges in xsd handling. +#Forwarded: no +#Author: Pavel Vinogradov +#Last-Update: 2010-08-08 +diff -urN ovaldi-5.7.2-orig/src/Common.cpp ovaldi-5.7.2-debian/src/Common.cpp +--- ovaldi-5.7.2-orig/src/Common.cpp 2010-08-08 22:16:10.000000000 +0400 ++++ ovaldi-5.7.2-debian/src/Common.cpp 2010-08-08 22:16:26.000000000 +0400 +@@ -50,7 +50,7 @@ + #ifdef WIN32 + string Common::schemapath = "xml"; + #else +-string Common::schemapath = "/usr/share/ovaldi"; ++string Common::schemapath = "/usr/share/ovaldi/xml"; + #endif + string Common::outputFilename = "results.xml"; + string Common::externalVariablesFile = "external-variables.xml"; --- oval-interpreter-5.7.2.orig/debian/patches/fix-no-add-needed-build.patch +++ oval-interpreter-5.7.2/debian/patches/fix-no-add-needed-build.patch @@ -0,0 +1,16 @@ +Description: fix build with ld --no-add-needed + requires explicit link against liblber +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/oval-interpreter/+bug/756041 +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=615759 +Author: Julian Taylor +--- a/project/linux/Makefile ++++ b/project/linux/Makefile +@@ -56,7 +56,7 @@ + LIBDIR = -L/usr/local/lib -L/usr/lib + + # What libraries do we need? +-LIBS = -lxerces-c -lxalan-c -lpcre -lpopt -lgcrypt -lldap ++LIBS = -lxerces-c -lxalan-c -lpcre -lpopt -lgcrypt -lldap -llber + + # Determine what platform the source is being build on + PLATFORM = $(shell uname | tr '[a-z]' '[A-Z]') --- oval-interpreter-5.7.2.orig/debian/patches/series +++ oval-interpreter-5.7.2/debian/patches/series @@ -0,0 +1,6 @@ +debian.manpage.patch +debian.xsddir.patch +debian.makefile.patch +nologtofile.patch +fix-no-add-needed-build.patch +ftbfs-gcc-4.7.diff --- oval-interpreter-5.7.2.orig/debian/patches/debian.manpage.patch +++ oval-interpreter-5.7.2/debian/patches/debian.manpage.patch @@ -0,0 +1,75 @@ +diff -urN ovaldi-5.6.4/docs/ovaldi.1 ovaldi-5.6.4.debian/docs/ovaldi.1 +--- ovaldi-5.6.4/docs/ovaldi.1 2010-01-05 04:58:38.000000000 +0400 ++++ ovaldi-5.6.4.debian/docs/ovaldi.1 2010-01-10 09:53:13.000000000 +0400 +@@ -20,12 +20,12 @@ + .B \-o filename + Specifies the pathname of the OVAL Definition document to use. If none is + specified then the OVAL Interpreter will default to "definitions.xml" in the +-OVAL Interpreter directory. ++current directory. + .TP + .B \-v filename + Specifies the pathname of the OVAL Variables document to use. If none is + specified then the OVAL Interpreter will default to "external-variables.xml" in +-the OVAL Interpreter directory. ++the current directory. + .TP + .B \-e definition id list + Specifies a list of OVAL Definition ids to evaluate in the input OVAL +@@ -53,7 +53,8 @@ + .B \-c filename + Specifies the pathname of the oval-definitions-schematron.xsl to be used for + Schematron validation. If none is specified then the OVAL Interpreter will +-default to "oval-definitions-schematron.xsl" in the OVAL Interpreter directory. ++default to "oval-definitions-schematron.xsl" in the /usr/share/ovaldi/xml ++directory. + .TP + .B \-a dir name + Specifies the pathname of the directory that contains the OVAL Language Schema +@@ -79,7 +80,7 @@ + Specifies the pathname of the file to which analysis results are to be saved. + This data is stored according to the format defined by the OVAL Results Schema. + If none is specified than the OVAL Interpreter will default to "results.xml" in +-the OVAL Interpreter directory. ++the current directory. + .TP + .B \-s + If set do not apply the XSL to the OVAL Results xml. +@@ -87,12 +88,12 @@ + .B \-t filename + Specifies the pathname of the XSL file which should be used to transform the + OVAL Results document. If none is specified then the OVAL Interpreter will +-default to "results_to_html.xsl" in the OVAL Interpreter directory. ++default to "results_to_html.xsl" in the /usr/share/ovaldi/xml directory. + .TP + .B \-x filename + Specifies the pathname of the file which XSL transform results are to be saved. + If none is specified then the OVAL Interpreter will default to "results.html" +-in the OVAL Interpreter directory. ++in the current directory. + .TP + .B \-l + Logging level. Log messages at the specified level. +@@ -112,15 +113,17 @@ + from the OVAL Web site. + .SH EXAMPLES + .TP +-Run the OVAL Interpreter against an OVAL Definitions document, without ++Run the OVAL Interpreter against an Debian example definitions document, without + verifying MD5 checksum: + .B ovaldi +-\-a /usr/share/ovaldi +-\-o linux.definitions.xml ++\-a /usr/share/ovaldi/xml ++\-o /usr/share/doc/ovaldi/examples/package_example.xml + \-m + .SH FILES + .TP +-/usr/share/ovaldi/*.xsd ++/usr/share/ovaldi/xml/*.xsd + The OVAL Language scheam files. +-.SH AUTHOR ++.SH AUTHORS + Man page written by Jonathan Baker (bakerj@mitre.org) ++.br ++Man page adapted for Debian by Pavel Vinogradov (Pavel.Vinogradov@nixdev.net)