aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2010-09-23 09:09:49 +0000
committerWerner Koch <[email protected]>2010-09-23 09:09:49 +0000
commit9921fb3a8cba1adda314def353cb7cbd89bbe15d (patch)
tree457409393e8fea5bc1395dde035edcee4850da14
parentPreparing a release candidate (diff)
downloadgnupg-9921fb3a8cba1adda314def353cb7cbd89bbe15d.tar.gz
gnupg-9921fb3a8cba1adda314def353cb7cbd89bbe15d.zip
"make distcheck" fix
-rw-r--r--ChangeLog3
-rw-r--r--Makefile.am5
-rwxr-xr-xchecks/armor.test4
3 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index b587598a5..a106c9b34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
Release 1.4.11rc1.
+ * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Remove
+ --enable-selinux-support option.
+
2009-09-02 Werner Koch <[email protected]>
Release 1.4.10.
diff --git a/Makefile.am b/Makefile.am
index 884f1b2bf..727ec15e8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,10 @@
## Process this file with automake to produce Makefile.in
ACLOCAL_AMFLAGS = -I m4
-DISTCHECK_CONFIGURE_FLAGS = --enable-selinux-support --enable-mailto
+# We can't use --enable-selinux-support because some of our regression
+# tests are importing secret keys and that is not allowed if
+# selinux-support is enabled.
+DISTCHECK_CONFIGURE_FLAGS = --enable-mailto
AUTOMAKE_OPTIONS = dist-bzip2 filename-length-max=99
if CROSS_COMPILING
diff --git a/checks/armor.test b/checks/armor.test
index 8e534a1fb..80256a029 100755
--- a/checks/armor.test
+++ b/checks/armor.test
@@ -735,8 +735,8 @@ wg7Md81a5RI3F2FG8747t9gX
# Bug 1179 solved 2010-05-12:
# It occured for messages of a multiple of the iobuf block size where
-# the last line had no pad character. Due to premature poppng of thea
-# rmor filter gpg swalled the CRC line and passed the '-----END...'
+# the last line had no pad character. Due to premature popping of the
+# armor filter gpg swalled the CRC line and passed the '-----END...'
# line on to the decryption layer.
i=alpha_seckey