[svn] GnuPG - r5422 - in branches/STABLE-BRANCH-1-4: . checks

[svn author wk]

Author: wk
Date: 2010-09-23 11:09:49 +0200 (Thu, 23 Sep 2010)
New Revision: 5422

Modified:
   branches/STABLE-BRANCH-1-4/ChangeLog
   branches/STABLE-BRANCH-1-4/Makefile.am
   branches/STABLE-BRANCH-1-4/checks/armor.test
Log:
"make distcheck" fix


Modified: branches/STABLE-BRANCH-1-4/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/ChangeLog	2010-09-23 08:15:45 UTC (rev 5421)
+++ branches/STABLE-BRANCH-1-4/ChangeLog	2010-09-23 09:09:49 UTC (rev 5422)
@@ -2,6 +2,9 @@
 
 	Release 1.4.11rc1.
 
+	* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Remove
+	--enable-selinux-support option.
+
 2009-09-02  Werner Koch  <wk at g10code.com>
 
 	Release 1.4.10.

Modified: branches/STABLE-BRANCH-1-4/Makefile.am
===================================================================
--- branches/STABLE-BRANCH-1-4/Makefile.am	2010-09-23 08:15:45 UTC (rev 5421)
+++ branches/STABLE-BRANCH-1-4/Makefile.am	2010-09-23 09:09:49 UTC (rev 5422)
@@ -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

Modified: branches/STABLE-BRANCH-1-4/checks/armor.test
===================================================================
--- branches/STABLE-BRANCH-1-4/checks/armor.test	2010-09-23 08:15:45 UTC (rev 5421)
+++ branches/STABLE-BRANCH-1-4/checks/armor.test	2010-09-23 09:09:49 UTC (rev 5422)
@@ -735,8 +735,8 @@
 
 # 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