diff -Nru audit-2.2.2/debian/changelog audit-2.2.2/debian/changelog --- audit-2.2.2/debian/changelog 2013-02-08 22:40:46.000000000 -0800 +++ audit-2.2.2/debian/changelog 2013-02-11 13:25:48.000000000 -0800 @@ -1,3 +1,16 @@ +audit (1:2.2.2-1ubuntu4) raring; urgency=low + + * debian/patches/fix-unused-result-warnings.patch: Adjust patch to reflect a + change made by upstream. Don't treat nice() failures as fatal during an + auditd reconfigure. + * debian/patches/fix-asprintf-warnings.patch, + debian/patches/fix-unused-result-warnings.patch, + debian/patches/fix-discards-const-qualifier-warnings.patch: Update patch + tags with potential release version and SVN commit id to indicate that + these patches were merged upstream. + + -- Tyler Hicks Mon, 11 Feb 2013 13:25:46 -0800 + audit (1:2.2.2-1ubuntu3) raring; urgency=low * Fix important build warnings (LP: #1026852) diff -Nru audit-2.2.2/debian/patches/fix-asprintf-warnings.patch audit-2.2.2/debian/patches/fix-asprintf-warnings.patch --- audit-2.2.2/debian/patches/fix-asprintf-warnings.patch 2013-02-08 22:40:46.000000000 -0800 +++ audit-2.2.2/debian/patches/fix-asprintf-warnings.patch 2013-02-11 12:53:09.000000000 -0800 @@ -4,6 +4,7 @@ into asprintf must be set to NULL upon error. Author: Tyler Hicks Fowarded: https://www.redhat.com/archives/linux-audit/2013-February/msg00005.html +Applied-Upstream: 2.2.3, commit:748 Index: audit-2.2.2/auparse/interpret.c =================================================================== --- audit-2.2.2.orig/auparse/interpret.c 2013-02-08 18:03:06.783190332 -0800 diff -Nru audit-2.2.2/debian/patches/fix-discards-const-qualifier-warnings.patch audit-2.2.2/debian/patches/fix-discards-const-qualifier-warnings.patch --- audit-2.2.2/debian/patches/fix-discards-const-qualifier-warnings.patch 2013-02-08 22:40:46.000000000 -0800 +++ audit-2.2.2/debian/patches/fix-discards-const-qualifier-warnings.patch 2013-02-11 12:54:01.000000000 -0800 @@ -9,6 +9,7 @@ allow unescape() to still take a const char * as its input parameter. Author: Tyler Hicks Fowarded: https://www.redhat.com/archives/linux-audit/2013-February/msg00006.html +Applied-Upstream: 2.2.3, commit:750 Index: audit-2.2.2/src/aureport-options.c =================================================================== --- audit-2.2.2.orig/src/aureport-options.c 2013-02-08 18:26:37.901175929 -0800 diff -Nru audit-2.2.2/debian/patches/fix-unused-result-warnings.patch audit-2.2.2/debian/patches/fix-unused-result-warnings.patch --- audit-2.2.2/debian/patches/fix-unused-result-warnings.patch 2013-02-08 22:40:46.000000000 -0800 +++ audit-2.2.2/debian/patches/fix-unused-result-warnings.patch 2013-02-11 13:30:36.000000000 -0800 @@ -34,10 +34,11 @@ opening the log file. Author: Tyler Hicks Fowarded: https://www.redhat.com/archives/linux-audit/2013-February/msg00004.html +Applied-Upstream: 2.2.3, commit:749 Index: audit-2.2.2/src/auditd.c =================================================================== ---- audit-2.2.2.orig/src/auditd.c 2013-02-08 18:16:17.643218420 -0800 -+++ audit-2.2.2/src/auditd.c 2013-02-08 18:20:21.507227078 -0800 +--- audit-2.2.2.orig/src/auditd.c 2013-02-11 13:28:52.112209082 -0800 ++++ audit-2.2.2/src/auditd.c 2013-02-11 13:28:52.100209081 -0800 @@ -240,7 +240,7 @@ static int write_pid_file(void) @@ -128,8 +129,8 @@ return 1; Index: audit-2.2.2/src/auditd-event.c =================================================================== ---- audit-2.2.2.orig/src/auditd-event.c 2013-02-08 18:16:17.643218420 -0800 -+++ audit-2.2.2/src/auditd-event.c 2013-02-08 18:20:21.511227076 -0800 +--- audit-2.2.2.orig/src/auditd-event.c 2013-02-11 13:28:52.112209082 -0800 ++++ audit-2.2.2/src/auditd-event.c 2013-02-11 13:30:34.324212712 -0800 @@ -708,10 +708,18 @@ if (data->config->num_logs < 2) return; @@ -177,7 +178,7 @@ data->log_fd = lfd; data->log_file = fdopen(lfd, "a"); -@@ -1089,8 +1108,18 @@ +@@ -1089,8 +1108,14 @@ // priority boost if (oconf->priority_boost != nconf->priority_boost) { @@ -187,20 +188,16 @@ - nice(-oconf->priority_boost); + errno = 0; + rc = nice(-oconf->priority_boost); -+ if (rc == -1 && errno) { -+ int saved_errno = errno; ++ if (rc == -1 && errno) + audit_msg(LOG_NOTICE, "Cannot change priority in " + "reconfigure (%s)", strerror(errno)); -+ do_disk_error_action("reconfig", data->config, -+ saved_errno); -+ } } // log format Index: audit-2.2.2/audisp/audispd.c =================================================================== ---- audit-2.2.2.orig/audisp/audispd.c 2013-02-08 18:20:21.479227078 -0800 -+++ audit-2.2.2/audisp/audispd.c 2013-02-08 18:20:21.511227076 -0800 +--- audit-2.2.2.orig/audisp/audispd.c 2013-02-11 13:28:52.112209082 -0800 ++++ audit-2.2.2/audisp/audispd.c 2013-02-11 13:28:52.100209081 -0800 @@ -369,9 +369,11 @@ /* Now boost priority to make sure we are getting time slices */ @@ -217,8 +214,8 @@ /* Stay alive as this is better than stopping */ Index: audit-2.2.2/src/autrace.c =================================================================== ---- audit-2.2.2.orig/src/autrace.c 2013-02-08 18:16:17.643218420 -0800 -+++ audit-2.2.2/src/autrace.c 2013-02-08 18:20:21.511227076 -0800 +--- audit-2.2.2.orig/src/autrace.c 2013-02-11 13:28:52.112209082 -0800 ++++ audit-2.2.2/src/autrace.c 2013-02-11 13:28:52.104209081 -0800 @@ -245,7 +245,11 @@ exit(1); }