Dear maintainer,
I've prepared an NMU for audit (versioned as 1.7.13-1.1). The diff
is attached to this message.
Regards.
diff -u audit-1.7.13/debian/changelog audit-1.7.13/debian/changelog
--- audit-1.7.13/debian/changelog
+++ audit-1.7.13/debian/changelog
@@ -1,3 +1,16 @@
+audit (1.7.13-1.1) UNRELEASED; urgency=low
+
+ * Non-maintainer upload.
+ * debian/patches/ld-no-add-needed.diff
+ - fix build with ld --no-add-needed, patch from bug; Closes: #553961
+ * debian/patches/add_missing_headers.diff
+ - Add missing headers to fix undefined reference to `S_ISREG' linker error,
+ from Ubuntu
+ * debian/python-audit.install, debian/rules
+ - use '*-packages' instead of 'site-packages', diff from Ubuntu
+
+ -- Sandro Tosi <mo...@debian.org> Wed, 25 May 2011 12:24:02 +0200
+
audit (1.7.13-1) unstable; urgency=low
* New upstream release.
diff -u audit-1.7.13/debian/python-audit.install audit-1.7.13/debian/python-audit.install
--- audit-1.7.13/debian/python-audit.install
+++ audit-1.7.13/debian/python-audit.install
@@ -1,2 +1,2 @@
-usr/lib/python*/site-packages/*.py
-usr/lib/python*/site-packages/*.so
+usr/lib/python*/*-packages/*.py
+usr/lib/python*/*-packages/*.so
diff -u audit-1.7.13/debian/rules audit-1.7.13/debian/rules
--- audit-1.7.13/debian/rules
+++ audit-1.7.13/debian/rules
@@ -100,9 +100,9 @@
$(RM) debian/tmp/usr/lib/libauparse.so
# The Debian way compiles Python packages on install
- $(RM) debian/tmp/usr/lib/python*/site-packages/_au*.*a
- $(RM) debian/tmp/usr/lib/python*/site-packages/auparse.*a
- $(RM) debian/tmp/usr/lib/python*/site-packages/au*.py[co]
+ $(RM) debian/tmp/usr/lib/python*/*-packages/_au*.*a
+ $(RM) debian/tmp/usr/lib/python*/*-packages/auparse.*a
+ $(RM) debian/tmp/usr/lib/python*/*-packages/au*.py[co]
$(RM) debian/tmp/usr/share/system-config-audit/*.py[co]
my-check:
@@ -129,8 +129,8 @@
chrpath -d $(CURDIR)/debian/auditd/usr/bin/aulastlog
chrpath -d $(CURDIR)/debian/auditd/usr/bin/ausyscall
chrpath -d $(CURDIR)/debian/libaudit0/lib/libauparse.so.0.0.0
- chrpath -d $(CURDIR)/debian/python-audit/usr/lib/python*/site-packages/_audit.so
- chrpath -d $(CURDIR)/debian/python-audit/usr/lib/python*/site-packages/auparse.so
+ chrpath -d $(CURDIR)/debian/python-audit/usr/lib/python*/*-packages/_audit.so
+ chrpath -d $(CURDIR)/debian/python-audit/usr/lib/python*/*-packages/auparse.so
chrpath -d $(CURDIR)/debian/system-config-audit/lib/system-config-audit-server
dh_link
diff -u audit-1.7.13/debian/patches/series audit-1.7.13/debian/patches/series
--- audit-1.7.13/debian/patches/series
+++ audit-1.7.13/debian/patches/series
@@ -4,0 +5,2 @@
+add_missing_headers.diff
+ld-no-add-needed.diff
only in patch2:
unchanged:
--- audit-1.7.13.orig/debian/patches/ld-no-add-needed.diff
+++ audit-1.7.13/debian/patches/ld-no-add-needed.diff
@@ -0,0 +1,54 @@
+--- audit-1.7.13.orig/audisp/plugins/remote/Makefile.in
++++ audit-1.7.13/audisp/plugins/remote/Makefile.in
+@@ -240,7 +240,7 @@
+ man_MANS = audisp-remote.8 audisp-remote.conf.5
+ audisp_remote_SOURCES = audisp-remote.c remote-config.c queue.c
+ audisp_remote_CFLAGS = -fPIE -DPIE -g -D_REENTRANT -D_GNU_SOURCE -Wundef
+-audisp_remote_LDFLAGS = -pie -Wl,-z,relro $(gss_libs)
++audisp_remote_LDFLAGS = -pie -Wl,-z,relro -lkrb5 $(gss_libs)
+ all: all-am
+
+ .SUFFIXES:
+--- audit-1.7.13.orig/audisp/plugins/remote/Makefile.am
++++ audit-1.7.13/audisp/plugins/remote/Makefile.am
+@@ -34,7 +34,7 @@
+
+ audisp_remote_SOURCES = audisp-remote.c remote-config.c queue.c
+ audisp_remote_CFLAGS = -fPIE -DPIE -g -D_REENTRANT -D_GNU_SOURCE -Wundef
+-audisp_remote_LDFLAGS = -pie -Wl,-z,relro $(gss_libs)
++audisp_remote_LDFLAGS = -pie -Wl,-z,relro -lkrb5 $(gss_libs)
+
+ install-data-hook:
+ mkdir -p -m 0750 ${DESTDIR}${plugin_confdir}
+--- audit-1.7.13.orig/src/Makefile.in
++++ audit-1.7.13/src/Makefile.in
+@@ -273,10 +273,10 @@
+ AM_CFLAGS = -D_REENTRANT -D_GNU_SOURCE
+ noinst_HEADERS = auditd-config.h auditd-event.h auditd-listen.h ausearch-llist.h ausearch-options.h auditctl-llist.h aureport-options.h ausearch-parse.h aureport-scan.h ausearch-lookup.h ausearch-int.h auditd-dispatch.h ausearch-string.h ausearch-nvpair.h ausearch-common.h ausearch-avc.h ausearch-time.h ausearch-lol.h
+ auditd_SOURCES = auditd.c auditd-event.c auditd-config.c auditd-reconfig.c auditd-sendmail.c auditd-dispatch.c auditd-listen.c
+-auditd_CFLAGS = -fPIE -DPIE -g -D_REENTRANT -D_GNU_SOURCE -fno-strict-aliasing
+-auditd_LDFLAGS = -pie -Wl,-z,relro
++auditd_CFLAGS = -pthread -fPIE -DPIE -g -D_REENTRANT -D_GNU_SOURCE -fno-strict-aliasing
++auditd_LDFLAGS = -pthread -pie -Wl,-z,relro
+ auditd_DEPENDENCIES = mt/libauditmt.a libev/libev.a
+-auditd_LDADD = @LIBWRAP_LIBS@ @libev_LIBS@ -Llibev -lev -lrt -lm $(gss_libs)
++auditd_LDADD = @LIBWRAP_LIBS@ @libev_LIBS@ -Llibev -lev -lrt -lm -lkrb5 $(gss_libs)
+ auditctl_SOURCES = auditctl.c auditctl-llist.c delete_all.c
+ auditctl_DEPENDENCIES = mt/libauditmt.a
+ aureport_SOURCES = aureport.c auditd-config.c ausearch-llist.c aureport-options.c ausearch-string.c ausearch-parse.c aureport-scan.c aureport-output.c ausearch-lookup.c ausearch-int.c ausearch-time.c ausearch-nvpair.c ausearch-avc.c ausearch-lol.c
+--- audit-1.7.13.orig/src/Makefile.am
++++ audit-1.7.13/src/Makefile.am
+@@ -31,10 +31,10 @@
+ noinst_HEADERS = auditd-config.h auditd-event.h auditd-listen.h ausearch-llist.h ausearch-options.h auditctl-llist.h aureport-options.h ausearch-parse.h aureport-scan.h ausearch-lookup.h ausearch-int.h auditd-dispatch.h ausearch-string.h ausearch-nvpair.h ausearch-common.h ausearch-avc.h ausearch-time.h ausearch-lol.h
+
+ auditd_SOURCES = auditd.c auditd-event.c auditd-config.c auditd-reconfig.c auditd-sendmail.c auditd-dispatch.c auditd-listen.c
+-auditd_CFLAGS = -fPIE -DPIE -g -D_REENTRANT -D_GNU_SOURCE -fno-strict-aliasing
+-auditd_LDFLAGS = -pie -Wl,-z,relro
++auditd_CFLAGS = -pthread -fPIE -DPIE -g -D_REENTRANT -D_GNU_SOURCE -fno-strict-aliasing
++auditd_LDFLAGS = -pthread -pie -Wl,-z,relro
+ auditd_DEPENDENCIES = mt/libauditmt.a libev/libev.a
+-auditd_LDADD = @LIBWRAP_LIBS@ @libev_LIBS@ -Llibev -lev -lrt -lm $(gss_libs)
++auditd_LDADD = @LIBWRAP_LIBS@ @libev_LIBS@ -Llibev -lev -lrt -lm -lkrb5 $(gss_libs)
+
+ auditctl_SOURCES = auditctl.c auditctl-llist.c delete_all.c
+ auditctl_DEPENDENCIES = mt/libauditmt.a
only in patch2:
unchanged:
--- audit-1.7.13.orig/debian/patches/add_missing_headers.diff
+++ audit-1.7.13/debian/patches/add_missing_headers.diff
@@ -0,0 +1,17 @@
+Description: Add missing headers to fix undefined reference to `S_ISREG' linker
+ error and hence FTBFS
+Author: Bhavani Shankar <bh...@ubuntu.com>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/600129
+Index: audit-1.7.13/lib/libaudit.c
+===========================================
+--- audit-1.7.13.orig/lib/libaudit.c
++++ audit-1.7.13/lib/libaudit.c
+@@ -36,6 +36,8 @@
+ #include <sys/utsname.h>
+ #include <fcntl.h> /* O_NOFOLLOW needs gnu defined */
+ #include <limits.h> /* for PATH_MAX */
++#include <sys/stat.h>
++#include <sys/types.h>
+
+ #include "libaudit.h"
+ #include "private.h"
