Source: openscap Version: 0.5.6-1 Severity: serious Tags: patch User: [email protected] Usertags: kfreebsd Justification: FTBFS
Hello,Your package no longer builds from source on kfreebsd-*. The attached patch should fix this problem.
-- Jakub Wilk
diff -u openscap-0.5.6/debian/control openscap-0.5.6/debian/control
--- openscap-0.5.6/debian/control
+++ openscap-0.5.6/debian/control
@@ -8,7 +8,7 @@
swig,
python-all-dev, python-support (>= 0.5.3),
libperl-dev,
- libnl-dev,
+ libnl-dev [!kfreebsd-i386 kfreebsd-amd64],
pkg-config
XS-Python-Version: all
Standards-Version: 3.8.3
only in patch2:
unchanged:
--- openscap-0.5.6.orig/src/OVAL/probes/fsdev.c
+++ openscap-0.5.6/src/OVAL/probes/fsdev.c
@@ -11,7 +11,7 @@
#if defined(__linux__)
# include <mntent.h>
# include <unistd.h>
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
# include <sys/param.h>
# include <sys/ucred.h>
# include <sys/mount.h>
@@ -129,7 +129,7 @@
return (lfs);
}
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
static fsdev_t *__fsdev_init(fsdev_t * lfs, const char **fs, size_t fs_cnt)
{
struct statfs *mntbuf = NULL;
only in patch2:
unchanged:
--- openscap-0.5.6.orig/src/OVAL/probes/unix/runlevel.c
+++ openscap-0.5.6/src/OVAL/probes/unix/runlevel.c
@@ -43,7 +43,7 @@
static int get_runlevel (struct runlevel_req *req, struct runlevel_rep *rep);
-#if defined(__linux__)
+#if defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)
static int get_runlevel_redhat (struct runlevel_req *req, struct runlevel_rep *rep)
{
char pathbuf[PATH_MAX];
only in patch2:
unchanged:
--- openscap-0.5.6.orig/src/OVAL/probes/unix/file.c
+++ openscap-0.5.6/src/OVAL/probes/unix/file.c
@@ -24,7 +24,7 @@
#if defined(__FreeBSD__)
# define OS_FREEBSD
-#elif defined(__linux__)
+#elif defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)
# define OS_LINUX
#elif defined(sun) || defined(__sun)
# if defined(__SVR4) || defined(__svr4__)
signature.asc
Description: Digital signature
