[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#694862: marked as done (pre-approval for audit/1:1.7.18-2)



Your message dated Tue, 4 Dec 2012 00:13:51 +0100
with message-id <20121203231351.GA14821@ugent.be>
and subject line Re: Bug#694862: pre-approval for audit/1:1.7.18-2
has caused the Debian Bug report #694862,
regarding pre-approval for audit/1:1.7.18-2
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
694862: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=694862
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock


Hi,

I would like to upload audit 1:1.7.18-2 based on the attached patch, which
fixes #681457.

The patch contains a backport of arm support from a newer upstream version.
However, it seems syscall audit support is not enabled in wheezy arm kernels:
- support for AUDITSYSCALL on arm was introduced after 3.2 (I tested it with a
  3.6 kernel)
- AUDITSYSCALL conflicts with OABI_COMPAT, which seems to be enabled on all
  debian arm kernels

If you think this change is inappropriate for wheezy, do you think #681457
should be downgraded or tagged wheezy-ignore?


In addition to the change above, the patch also adds an autoreconf script,
based on upstream svn, to get it to build without a large diff in
autogenerated files.


Cheers,

Ivo


diff -Nru audit-1.7.18/debian/autogen.sh audit-1.7.18/debian/autogen.sh
--- audit-1.7.18/debian/autogen.sh	1970-01-01 01:00:00.000000000 +0100
+++ audit-1.7.18/debian/autogen.sh	2012-11-24 21:51:52.000000000 +0100
@@ -0,0 +1,21 @@
+#! /bin/sh
+# based on autogen.sh in upstream 1.8 svn branch
+
+autoreconf -fv --install
+
+cd system-config-audit
+
+autopoint -f
+# intltool bug: it tries to use $aux_dir/po/Makefile.in.in in older versions
+ln -s ../po admin/po
+# ... and it puts dummy intltool-*.in to ., not to $aux_dir in newer versions
+rm admin/intltool-{extract,merge,update}.in
+touch admin/intltool-{extract,merge,update}.in
+intltoolize --force
+rm admin/po
+
+aclocal -I m4
+autoconf -Wall
+autoheader -Wall
+automake -Wall --add-missing
+
diff -Nru audit-1.7.18/debian/changelog audit-1.7.18/debian/changelog
--- audit-1.7.18/debian/changelog	2012-01-31 16:36:25.000000000 +0100
+++ audit-1.7.18/debian/changelog	2012-11-24 23:24:55.000000000 +0100
@@ -1,3 +1,15 @@
+audit (1:1.7.18-2) unstable; urgency=low
+
+  * QA upload.
+  * Set Maintainer to Debian QA Group <packages@qa.debian.org> (cf. #692492).
+  * debian/control: Add Vcs-* fields 
+  * Backport patches to enable arm support (Closes: #681457) 
+  * Use autoreconf to update generated files with autogen.sh based on upstream
+    svn. This is necessary to build with changes in Makefile.am for arm
+    support.
+
+ -- Ivo De Decker <ivo.dedecker@ugent.be>  Sat, 24 Nov 2012 23:24:08 +0100
+
 audit (1:1.7.18-1.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -Nru audit-1.7.18/debian/control audit-1.7.18/debian/control
--- audit-1.7.18/debian/control	2011-07-29 23:22:06.000000000 +0200
+++ audit-1.7.18/debian/control	2012-11-24 21:44:49.000000000 +0100
@@ -1,15 +1,17 @@
 Source: audit
 Priority: extra
-Maintainer: Philipp Matthias Hahn <pmhahn@debian.org>
+Maintainer: Debian QA Group <packages@qa.debian.org>
 Build-Depends: debhelper (>= 8),
  python-all-dev (>= 2.6.6-3~), swig,
  automake1.10, autoconf (>= 2.59), libtool, autotools-dev,
  intltool, cvs, libprelude-dev, libldap2-dev, libev-dev, chrpath,
- libwrap0-dev, libkrb5-dev
+ libwrap0-dev, libkrb5-dev, dh-autoreconf, autopoint
 Build-Conflicts: autoconf2.13, automake1.4
 Standards-Version: 3.9.2
 Section: libs
 Homepage: http://people.redhat.com/sgrubb/audit/
+Vcs-Git: git://anonscm.debian.org/git/collab-maint/audit.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/audit.git
 
 Package: auditd
 Section: admin
diff -Nru audit-1.7.18/debian/patches/arm-support.diff audit-1.7.18/debian/patches/arm-support.diff
--- audit-1.7.18/debian/patches/arm-support.diff	1970-01-01 01:00:00.000000000 +0100
+++ audit-1.7.18/debian/patches/arm-support.diff	2012-11-24 23:22:50.000000000 +0100
@@ -0,0 +1,536 @@
+Description: arm support
+ Backport from trunk of support for arm architecture.
+
+ Please note that upstream calls this 'armeb', but it should work with the arm
+ ports in debian (armel and armhf).
+
+---
+Origin: upstream
+Bug-Debian: http://bugs.debian.org/681457
+Forwarded: not-needed
+Last-Update: 20121124
+
+--- audit-1.7.18.orig/lib/libaudit.h
++++ audit-1.7.18/lib/libaudit.h
+@@ -386,7 +386,8 @@ typedef enum {
+ 	MACH_PPC,
+ 	MACH_S390X,
+ 	MACH_S390,
+-        MACH_ALPHA
++	MACH_ALPHA,
++	MACH_ARMEB
+ } machine_t;
+ 
+ /* These are the valid audit failure tunable enum values */
+--- audit-1.7.18.orig/lib/lookup_table.c
++++ audit-1.7.18/lib/lookup_table.c
+@@ -37,6 +37,7 @@
+ #ifdef WITH_ALPHA
+ #include "alpha_tables.h"
+ #endif
++#include "armeb_tables.h"
+ #include "i386_tables.h"
+ #include "ia64_tables.h"
+ #include "ppc_tables.h"
+@@ -52,6 +53,10 @@
+ #include "msg_typetabs.h"
+ #include "optabs.h"
+ 
++#ifndef EM_ARM
++#define EM_ARM  40
++#endif
++
+ struct int_transtab {
+     int        key;
+     unsigned int  lvalue;
+@@ -68,6 +73,7 @@ static const struct int_transtab elftab[
+ #ifdef WITH_ALPHA
+     { MACH_ALPHA,   AUDIT_ARCH_ALPHA  }
+ #endif
++    { MACH_ARMEB,   AUDIT_ARCH_ARMEB  }
+ };
+ #define AUDIT_ELF_NAMES (sizeof(elftab)/sizeof(elftab[0]))
+ 
+@@ -116,6 +122,9 @@ int audit_name_to_syscall(const char *sc
+ 			found = alpha_syscall_s2i(sc, &res);
+ 			break;
+ #endif
++	        case MACH_ARMEB:
++			found = armeb_syscall_s2i(sc, &res);
++			break;
+ 		default:
+ 			return -1;
+ 	}
+@@ -146,6 +155,8 @@ const char *audit_syscall_to_name(int sc
+ 	        case MACH_ALPHA:
+ 			return alpha_syscall_i2s(sc);
+ #endif
++	        case MACH_ARMEB:
++			return armeb_syscall_i2s(sc);
+ 	}
+ 	return NULL;
+ }
+--- audit-1.7.18.orig/lib/syscall-update.txt
++++ audit-1.7.18/lib/syscall-update.txt
+@@ -6,4 +6,10 @@ arch/s390/include/asm/unistd.h
+ arch/powerpc/include/asm/unistd.h
+ arch/ia64/include/asm/unistd.h
+ arch/alpha/include/asm/unistd.h
++arch/arm/include/asm/unistd.h
+ 
++For adding new arches, the following might be useful to get a first pass file:
++
++cat unistd.h | grep '^#define __NR_' | tr -d ')' | tr 'NR+' ' ' | awk '{ printf "_S(%s, \"%s\")\n", $6, $3 }; '
++
++it will still need hand editing
+--- audit-1.7.18.orig/lib/Makefile.am
++++ audit-1.7.18/lib/Makefile.am
+@@ -43,6 +43,7 @@ BUILT_SOURCES = actiontabs.h errtabs.h f
+ if USE_ALPHA
+ BUILT_SOURCES += alpha_tables.h
+ endif
++BUILT_SOURCES += armeb_tables.h
+ noinst_PROGRAMS = gen_actiontabs_h gen_errtabs_h gen_fieldtabs_h \
+ 	gen_flagtabs_h gen_ftypetabs_h gen_i386_tables_h \
+ 	gen_ia64_tables_h gen_machinetabs_h gen_msg_typetabs_h \
+@@ -51,6 +52,7 @@ noinst_PROGRAMS = gen_actiontabs_h gen_e
+ if USE_ALPHA
+ noinst_PROGRAMS += gen_alpha_tables_h
+ endif
++noinst_PROGRAMS += gen_armeb_tables_h
+ gen_actiontabs_h_SOURCES = gen_tables.c gen_tables.h actiontab.h
+ gen_actiontabs_h_CFLAGS = $(AM_CFLAGS) '-DTABLE_H="actiontab.h"'
+ actiontabs.h: gen_actiontabs_h Makefile
+@@ -63,6 +65,11 @@ alpha_tables.h: gen_alpha_tables_h Makef
+ 	./gen_alpha_tables_h --lowercase --i2s --s2i alpha_syscall > $@
+ endif
+ 
++gen_armeb_tables_h_SOURCES = gen_tables.c gen_tables.h armeb_table.h
++gen_armeb_tables_h_CFLAGS = $(AM_CFLAGS) '-DTABLE_H="armeb_table.h"'
++armeb_tables.h: gen_armeb_tables_h Makefile
++	./gen_armeb_tables_h --lowercase --i2s --s2i armeb_syscall > $@
++
+ gen_errtabs_h_SOURCES = gen_tables.c gen_tables.h errtab.h
+ gen_errtabs_h_CFLAGS = $(AM_CFLAGS) '-DTABLE_H="errtab.h"'
+ errtabs.h: gen_errtabs_h Makefile
+--- audit-1.7.18.orig/lib/machinetab.h
++++ audit-1.7.18/lib/machinetab.h
+@@ -1,5 +1,5 @@
+ /* machine.h --
+- * Copyright 2005,2006,2009 Red Hat Inc., Durham, North Carolina.
++ * Copyright 2005,2006,2009,2012 Red Hat Inc., Durham, North Carolina.
+  * All Rights Reserved.
+  *
+  * This library is free software; you can redistribute it and/or
+@@ -33,3 +33,7 @@ _S(MACH_S390,    "s390"   )
+ #ifdef WITH_ALPHA
+ _S(MACH_ALPHA,   "alpha"  )
+ #endif
++_S(MACH_ARMEB,   "armeb"  )
++_S(MACH_ARMEB,   "armv5tejl")
++_S(MACH_ARMEB,   "armv7l")
++_S(MACH_ARMEB,   "armv6l")
+--- /dev/null
++++ audit-1.7.18/lib/armeb_table.h
+@@ -0,0 +1,342 @@
++_S(0, "restart_syscall")
++_S(1, "exit")
++_S(2, "fork")
++_S(3, "read")
++_S(4, "write")
++_S(5, "open")
++_S(6, "close")
++_S(8, "creat")
++_S(9, "link")
++_S(10, "unlink")
++_S(11, "execve")
++_S(12, "chdir")
++_S(13, "time")
++_S(14, "mknod")
++_S(15, "chmod")
++_S(16, "lchown")
++_S(19, "lseek")
++_S(20, "getpid")
++_S(21, "mount")
++_S(22, "umount")
++_S(23, "setuid")
++_S(24, "getuid")
++_S(25, "stime")
++_S(26, "ptrace")
++_S(27, "alarm")
++_S(29, "pause")
++_S(30, "utime")
++_S(33, "access")
++_S(34, "nice")
++_S(36, "sync")
++_S(37, "kill")
++_S(38, "rename")
++_S(39, "mkdir")
++_S(40, "rmdir")
++_S(41, "dup")
++_S(42, "pipe")
++_S(43, "times")
++_S(45, "brk")
++_S(46, "setgid")
++_S(47, "getgid")
++_S(49, "geteuid")
++_S(50, "getegid")
++_S(51, "acct")
++_S(52, "umount2")
++_S(54, "ioctl")
++_S(55, "fcntl")
++_S(57, "setpgid")
++_S(60, "umask")
++_S(61, "chroot")
++_S(62, "ustat")
++_S(63, "dup2")
++_S(64, "getppid")
++_S(65, "getpgrp")
++_S(66, "setsid")
++_S(67, "sigaction")
++_S(70, "setreuid")
++_S(71, "setregid")
++_S(72, "sigsuspend")
++_S(73, "sigpending")
++_S(74, "sethostname")
++_S(75, "setrlimit")
++_S(76, "getrlimit")
++_S(77, "getrusage")
++_S(78, "gettimeofday")
++_S(79, "settimeofday")
++_S(80, "getgroups")
++_S(81, "setgroups")
++_S(82, "select")
++_S(83, "symlink")
++_S(85, "readlink")
++_S(86, "uselib")
++_S(87, "swapon")
++_S(88, "reboot")
++_S(89, "readdir")
++_S(90, "mmap")
++_S(91, "munmap")
++_S(92, "truncate")
++_S(93, "ftruncate")
++_S(94, "fchmod")
++_S(95, "fchown")
++_S(96, "getpriority")
++_S(97, "setpriority")
++_S(99, "statfs")
++_S(100, "fstatfs")
++_S(102, "socketcall")
++_S(103, "syslog")
++_S(104, "setitimer")
++_S(105, "getitimer")
++_S(106, "stat")
++_S(107, "lstat")
++_S(108, "fstat")
++_S(111, "vhangup")
++_S(113, "syscall")
++_S(114, "wait4")
++_S(115, "swapoff")
++_S(116, "sysinfo")
++_S(117, "ipc")
++_S(118, "fsync")
++_S(119, "sigreturn")
++_S(120, "clone")
++_S(121, "setdomainname")
++_S(122, "uname")
++_S(124, "adjtimex")
++_S(125, "mprotect")
++_S(126, "sigprocmask")
++_S(128, "init_module")
++_S(129, "delete_module")
++_S(131, "quotactl")
++_S(132, "getpgid")
++_S(133, "fchdir")
++_S(134, "bdflush")
++_S(135, "sysfs")
++_S(136, "personality")
++_S(138, "setfsuid")
++_S(139, "setfsgid")
++_S(140, "llseek")
++_S(141, "getdents")
++_S(142, "newselect")
++_S(143, "flock")
++_S(144, "msync")
++_S(145, "readv")
++_S(146, "writev")
++_S(147, "getsid")
++_S(148, "fdatasync")
++_S(149, "sysctl")
++_S(150, "mlock")
++_S(151, "munlock")
++_S(152, "mlockall")
++_S(153, "munlockall")
++_S(154, "sched_setparam")
++_S(155, "sched_getparam")
++_S(156, "sched_setscheduler")
++_S(157, "sched_getscheduler")
++_S(158, "sched_yield")
++_S(159, "sched_get_priority_max")
++_S(160, "sched_get_priority_min")
++_S(161, "sched_rr_get_interval")
++_S(162, "nanosleep")
++_S(163, "mremap")
++_S(164, "setresuid")
++_S(165, "getresuid")
++_S(168, "poll")
++_S(169, "nfsservctl")
++_S(170, "setresgid")
++_S(171, "getresgid")
++_S(172, "prctl")
++_S(173, "rt_sigreturn")
++_S(174, "rt_sigaction")
++_S(175, "rt_sigprocmask")
++_S(176, "rt_sigpending")
++_S(177, "rt_sigtimedwait")
++_S(178, "rt_sigqueueinfo")
++_S(179, "rt_sigsuspend")
++_S(180, "pread64")
++_S(181, "pwrite64")
++_S(182, "chown")
++_S(183, "getcwd")
++_S(184, "capget")
++_S(185, "capset")
++_S(186, "sigaltstack")
++_S(187, "sendfile")
++_S(190, "vfork")
++_S(191, "ugetrlimit")
++_S(192, "mmap2")
++_S(193, "truncate64")
++_S(194, "ftruncate64")
++_S(195, "stat64")
++_S(196, "lstat64")
++_S(197, "fstat64")
++_S(198, "lchown32")
++_S(199, "getuid32")
++_S(200, "getgid32")
++_S(201, "geteuid32")
++_S(202, "getegid32")
++_S(203, "setreuid32")
++_S(204, "setregid32")
++_S(205, "getgroups32")
++_S(206, "setgroups32")
++_S(207, "fchown32")
++_S(208, "setresuid32")
++_S(209, "getresuid32")
++_S(210, "setresgid32")
++_S(211, "getresgid32")
++_S(212, "chown32")
++_S(213, "setuid32")
++_S(214, "setgid32")
++_S(215, "setfsuid32")
++_S(216, "setfsgid32")
++_S(217, "getdents64")
++_S(218, "pivot_root")
++_S(219, "mincore")
++_S(220, "madvise")
++_S(221, "fcntl64")
++_S(224, "gettid")
++_S(225, "readahead")
++_S(226, "setxattr")
++_S(227, "lsetxattr")
++_S(228, "fsetxattr")
++_S(229, "getxattr")
++_S(230, "lgetxattr")
++_S(231, "fgetxattr")
++_S(232, "listxattr")
++_S(233, "llistxattr")
++_S(234, "flistxattr")
++_S(235, "removexattr")
++_S(236, "lremovexattr")
++_S(237, "fremovexattr")
++_S(238, "tkill")
++_S(239, "sendfile64")
++_S(240, "futex")
++_S(241, "sched_setaffinity")
++_S(242, "sched_getaffinity")
++_S(243, "io_setup")
++_S(244, "io_destroy")
++_S(245, "io_getevents")
++_S(246, "io_submit")
++_S(247, "io_cancel")
++_S(248, "exit_group")
++_S(249, "lookup_dcookie")
++_S(250, "epoll_create")
++_S(251, "epoll_ctl")
++_S(252, "epoll_wait")
++_S(253, "remap_file_pages")
++_S(256, "set_tid_address")
++_S(257, "timer_create")
++_S(258, "timer_settime")
++_S(259, "timer_gettime")
++_S(260, "timer_getoverrun")
++_S(261, "timer_delete")
++_S(262, "clock_settime")
++_S(263, "clock_gettime")
++_S(264, "clock_getres")
++_S(265, "clock_nanosleep")
++_S(266, "statfs64")
++_S(267, "fstatfs64")
++_S(268, "tgkill")
++_S(269, "utimes")
++_S(270, "fadvise64_64")
++_S(271, "pciconfig_iobase")
++_S(272, "pciconfig_read")
++_S(273, "pciconfig_write")
++_S(274, "mq_open")
++_S(275, "mq_unlink")
++_S(276, "mq_timedsend")
++_S(277, "mq_timedreceive")
++_S(278, "mq_notify")
++_S(279, "mq_getsetattr")
++_S(280, "waitid")
++_S(281, "socket")
++_S(282, "bind")
++_S(283, "connect")
++_S(284, "listen")
++_S(285, "accept")
++_S(286, "getsockname")
++_S(287, "getpeername")
++_S(288, "socketpair")
++_S(289, "send")
++_S(290, "sendto")
++_S(291, "recv")
++_S(292, "recvfrom")
++_S(293, "shutdown")
++_S(294, "setsockopt")
++_S(295, "getsockopt")
++_S(296, "sendmsg")
++_S(297, "recvmsg")
++_S(298, "semop")
++_S(299, "semget")
++_S(300, "semctl")
++_S(301, "msgsnd")
++_S(302, "msgrcv")
++_S(303, "msgget")
++_S(304, "msgctl")
++_S(305, "shmat")
++_S(306, "shmdt")
++_S(307, "shmget")
++_S(308, "shmctl")
++_S(309, "add_key")
++_S(310, "request_key")
++_S(311, "keyctl")
++_S(312, "semtimedop")
++_S(313, "vserver")
++_S(314, "ioprio_set")
++_S(315, "ioprio_get")
++_S(316, "inotify_init")
++_S(317, "inotify_add_watch")
++_S(318, "inotify_rm_watch")
++_S(319, "mbind")
++_S(320, "get_mempolicy")
++_S(321, "set_mempolicy")
++_S(322, "openat")
++_S(323, "mkdirat")
++_S(324, "mknodat")
++_S(325, "fchownat")
++_S(326, "futimesat")
++_S(327, "fstatat64")
++_S(328, "unlinkat")
++_S(329, "renameat")
++_S(330, "linkat")
++_S(331, "symlinkat")
++_S(332, "readlinkat")
++_S(333, "fchmodat")
++_S(334, "faccessat")
++_S(337, "unshare")
++_S(338, "set_robust_list")
++_S(339, "get_robust_list")
++_S(340, "splice")
++_S(341, "sync_file_range")
++_S(342, "tee")
++_S(343, "vmsplice")
++_S(344, "move_pages")
++_S(345, "getcpu")
++_S(347, "kexec_load")
++_S(348, "utimensat")
++_S(349, "signalfd")
++_S(350, "timerfd_create")
++_S(351, "eventfd")
++_S(352, "fallocate")
++_S(353, "timerfd_settime")
++_S(354, "timerfd_gettime")
++_S(355, "signalfd4")
++_S(356, "eventfd2")
++_S(357, "epoll_create1")
++_S(358, "dup3")
++_S(359, "pipe2")
++_S(360, "inotify_init1")
++_S(361, "preadv")
++_S(362, "pwritev")
++_S(363, "rt_tgsigqueueinfo")
++_S(364, "perf_event_open")
++_S(365, "recvmmsg")
++_S(366, "accept4")
++_S(367, "fanotify_init")
++_S(368, "fanotify_mark")
++_S(369, "prlimit64")
++_S(370, "name_to_handle_at")
++_S(371, "open_by_handle_at")
++_S(372, "clock_adjtime")
++_S(373, "syncfs")
++_S(374, "sendmmsg")
++_S(375, "setns")
++_S(376, "process_vm_readv")
++_S(377, "process_vm_writev")
+--- audit-1.7.18.orig/lib/test/lookup_test.c
++++ audit-1.7.18/lib/test/lookup_test.c
+@@ -137,6 +137,22 @@ test_alpha_table(void)
+ #endif
+ 
+ static void
++test_armeb_table(void)
++{
++	static const struct entry t[] = {
++#include "../armeb_table.h"
++	};
++
++	printf("Testing armeb_table...\n");
++#define I2S(I) audit_syscall_to_name((I), MACH_ARMEB)
++#define S2I(S) audit_name_to_syscall((S), MACH_ARMEB)
++	TEST_I2S(0);
++	TEST_S2I(-1);
++#undef I2S
++#undef S2I
++}
++
++static void
+ test_i386_table(void)
+ {
+ 	static const struct entry t[] = {
+@@ -307,8 +323,10 @@ test_machinetab(void)
+ 	printf("Testing machinetab...\n");
+ #define I2S(I) audit_machine_to_name(I)
+ #define S2I(S) audit_name_to_machine(S)
+-	TEST_I2S(t[i].s[0] == 'i' && t[i].s[1] >= '4' && t[i].s[1] <= '6'
+-		 && strcmp(t[i].s + 2, "86") == 0);
++	TEST_I2S(
++		(t[i].s[0] == 'i' && t[i].s[1] >= '4' && t[i].s[1] <= '6'
++		 && strcmp(t[i].s + 2, "86") == 0)||
++		(strncmp(t[i].s,"armv",4) == 0));
+ 	TEST_S2I(-1);
+ #undef I2S
+ #undef S2I
+@@ -349,6 +367,7 @@ main(void)
+ #ifdef WITH_ALPHA
+ 	test_alpha_table();
+ #endif
++	test_armeb_table();
+ 	test_i386_table();
+ 	test_ia64_table();
+ 	test_ppc_table();
+--- audit-1.7.18.orig/tools/ausyscall/ausyscall.c
++++ audit-1.7.18/tools/ausyscall/ausyscall.c
+@@ -70,6 +70,10 @@ int main(int argc, char *argv[])
+ 					stderr);
+ 			exit(1);
+ #endif
++		} else if (strcmp("armeb", argv[i]) == 0) {
++			fputs("Arm eabi processor support is not enabled\n",
++					stderr);
++			exit(1);
+ 		} else {
+ 			if (name != NULL) {
+ 				fputs("Two syscall names not allowed\n",stderr);
diff -Nru audit-1.7.18/debian/patches/series audit-1.7.18/debian/patches/series
--- audit-1.7.18/debian/patches/series	2011-07-29 16:36:26.000000000 +0200
+++ audit-1.7.18/debian/patches/series	2012-11-24 20:15:20.000000000 +0100
@@ -9,3 +9,4 @@
 fix-desktopinfo.diff
 fix-spelling.diff
 manpage-dash.diff
+arm-support.diff
diff -Nru audit-1.7.18/debian/rules audit-1.7.18/debian/rules
--- audit-1.7.18/debian/rules	2011-07-29 23:06:09.000000000 +0200
+++ audit-1.7.18/debian/rules	2012-11-24 20:41:00.000000000 +0100
@@ -7,7 +7,7 @@
 PYVERS := $(filter-out $(PYDEFAULTVER), $(PYVERS)) # $(PYDEFAULTVER)
 
 %:
-	dh $@ --builddirectory=debian/build --buildsystem=autoconf --with autotools_dev --with python2
+	dh $@ --builddirectory=debian/build --buildsystem=autoconf --with autotools_dev --with python2 --with autoreconf
 
 override_dh_auto_configure: debian/config-python-stamp $(PYVERS:%=debian/config-python%-stamp)
 debian/config-python-stamp:
@@ -101,6 +101,9 @@
 	chrpath -d debian/system-config-audit/lib/system-config-audit-server
 	dh_makeshlibs
 
+override_dh_autoreconf:
+	dh_autoreconf debian/autogen.sh
+
 get-orig-source:
 	-uscan --upstream-version 0
 

--- End Message ---
--- Begin Message ---
Control: severity 681457 important

Hi Julien,

On Mon, Dec 03, 2012 at 09:46:19PM +0100, Julien Cristau wrote:
> On Sat, Dec  1, 2012 at 14:34:02 +0100, Ivo De Decker wrote:
> 
> > If you think this change is inappropriate for wheezy, do you think #681457
> > should be downgraded or tagged wheezy-ignore?
> > 
> I think it should be downgraded.

OK, thanks. Downgrading the original RC bug report and closing the unblock
pre-approval bug.

Cheers,

Ivo

--- End Message ---

Reply to: