Don't link gpgv with libreadline

Also add a useful .gitignore file.

.gitignore

@@ -0,0 +1,74 @@
+Makefile.in
+aclocal.m4
+autom4te.cache/
+configure
+config.h.in
+config.h
+config.log
+config.status
+doc/stamp-vti
+po/POTFILES
+stamp-h1
+Makefile
+.deps/
+tools/gpg-zip
+*.o
+po/en@boldquot.insert-header
+po/en@boldquot.po
+po/en@quot.insert-header
+po/en@quot.po
+po/stamp-po
+po/gnupg.pot
+g10/gpg
+g10/gpgv
+mpi/sysdep.h
+mpi/asm-syntax.h
+mpi/mpi-asm-defs.h
+mpi/mpih-add1.S
+mpi/mpih-lshift.S
+mpi/mpih-mul1.S
+mpi/mpih-mul2.S
+mpi/mpih-mul3.S
+mpi/mpih-rshift.S
+mpi/mpih-sub1.S
+mpi/_mpih-add1.s
+mpi/_mpih-lshift.s
+mpi/_mpih-mul1.s
+mpi/_mpih-mul2.s
+mpi/_mpih-mul3.s
+mpi/_mpih-rshift.s
+mpi/_mpih-sub1.s
+keyserver/gpgkeys_curl
+keyserver/gpgkeys_finger
+keyserver/gpgkeys_hkp
+keyserver/gpgkeys_ldap
+keyserver/gpgkeys_mailto
+keyserver/gpgkeys_test
+checks/data-32000
+checks/data-500
+checks/data-80000
+checks/data-9000
+checks/gpg_dearmor
+checks/plain-1
+checks/plain-2
+checks/plain-3
+checks/plain-large
+checks/prepared.stamp
+checks/pubring.gpg
+checks/pubring.pkr
+checks/secring.gpg
+checks/secring.skr
+cipher/libcipher.a
+doc/gnupg1.info
+doc/gpg.1
+doc/gpg.ru.1
+doc/gpgv.1
+doc/version.texi
+po/gnupg2.pot
+tools/bftest
+tools/gpgtar
+tools/mpicalc
+tools/shmtest
+mpi/libmpi.a
+util/libcompat.a
+util/libutil.a

g10/Makefile.am

@@ -7,12 +7,12 @@
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # GnuPG is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 ## Process this file with automake to produce Makefile.in
@@ -73,7 +73,7 @@ common_source =  \
 	      signal.c
 
 if ENABLE_CARD_SUPPORT
-card_support_source_gpg = card-util.c 
+card_support_source_gpg = card-util.c
 card_support_source_scd = \
 	app-common.h \
 	app-openpgp.c \
@@ -83,7 +83,7 @@ card_support_source_scd = \
 card_support_source_local = cardglue.c cardglue.h tlv.c tlv.h
 else
 card_support_source_gpg =
-card_support_source_scd = 
+card_support_source_scd =
 card_support_source_local =
 endif
 
@@ -124,10 +124,10 @@ gpg_SOURCES  = gpg.c		\
 
 gpgv_SOURCES = gpgv.c           \
 	      $(common_source)  \
-	      verify.c          
+	      verify.c
 
-LDADD =  $(needed_libs) $(other_libs) @ZLIBS@ @W32LIBS@ @LIBREADLINE@
+LDADD =  $(needed_libs) $(other_libs) @ZLIBS@ @W32LIBS@
-gpg_LDADD = $(LDADD) @DLLIBS@ @NETLIBS@ @LIBUSB@
+gpg_LDADD = $(LDADD) @LIBREADLINE@ @DLLIBS@ @NETLIBS@ @LIBUSB@
 
 $(PROGRAMS): $(needed_libs)
 

g10/gpgv.c

@@ -56,7 +56,7 @@ enum cmd_and_opt_values { aNull = 0,
     oVerbose	  = 'v',
     oBatch	  = 500,
     oKeyring,
-    oIgnoreTimeConflict,                      
+    oIgnoreTimeConflict,
     oStatusFD,
     oLoggerFD,
     oHomedir,
@@ -70,7 +70,7 @@ static ARGPARSE_OPTS opts[] = {
     { oVerbose, "verbose",   0, N_("verbose") },
     { oQuiet,	"quiet",     0, N_("be somewhat more quiet") },
     { oKeyring, "keyring"   ,2, N_("take the keys from this keyring")},
-    { oIgnoreTimeConflict, "ignore-time-conflict", 0, 
+    { oIgnoreTimeConflict, "ignore-time-conflict", 0,
                            N_("make timestamp conflicts only a warning") },
     { oStatusFD, "status-fd" ,1, N_("|FD|write status info to this FD") },
     { oLoggerFD, "logger-fd",1, "@" },
@@ -151,7 +151,7 @@ main( int argc, char **argv )
     disable_dotlock();
 
     set_native_charset (NULL); /* Try to auto set the character set */
-    
+
     pargs.argc = &argc;
     pargs.argv = &argv;
     pargs.flags=  1;  /* do not remove the args */
@@ -181,9 +181,9 @@ main( int argc, char **argv )
         keydb_add_resource ("trustedkeys" EXTSEP_S "gpg", 8, 0);
     for(sl = nrings; sl; sl = sl->next )
         keydb_add_resource (sl->d, 8, 0 );
-    
+
     FREE_STRLIST(nrings);
-    
+
     if( (rc = verify_signatures( argc, argv ) ))
         log_error("verify signatures failed: %s\n", g10_errstr(rc) );
 
@@ -203,7 +203,7 @@ g10_exit( int rc )
 
 
 /* Stub:
- * We have to override the trustcheck from pkclist.c becuase 
+ * We have to override the trustcheck from pkclist.c becuase
  * this utility assumes that all keys in the keyring are trustworthy
  */
 int
@@ -216,7 +216,7 @@ void
 read_trust_options(byte *trust_model,ulong *created,ulong *nextcheck,
 		   byte *marginals,byte *completes,byte *cert_depth) {}
 
-/* Stub: 
+/* Stub:
  * We don't have the trustdb , so we have to provide some stub functions
  * instead
  */
@@ -336,7 +336,7 @@ check_secret_key( PKT_secret_key *sk, int n )
 }
 
 /* Stub:
- * No secret key, so no passphrase needed 
+ * No secret key, so no passphrase needed
  */
 DEK *
 passphrase_to_dek( u32 *keyid, int pubkey_algo,
@@ -425,6 +425,8 @@ void init_ttyfp (void) { }
 #ifdef HAVE_LIBREADLINE
 void tty_enable_completion(rl_completion_func_t *completer) {}
 void tty_disable_completion(void) {}
+void rl_cleanup_after_signal (void) {}
+void rl_free_line_state (void) {}
 #endif
 
 /* We do not do any locking, so use these stubs here */

po/.gitattributes

@@ -0,0 +1,7 @@
+# You should add
+#[filter "cleanpo"]
+#        clean = "awk '/^\"POT-Creation-Date:/&&!s{s=1;next};!/^#: /{print}'"
+# to your config file.  Normally, autogen.sh does this for you.
+
+/??.po     filter=cleanpo
+/??_??.po  filter=cleanpo

po/remove-potcdate.sed

@@ -1,11 +0,0 @@
-/^"POT-Creation-Date: .*"$/{
-x
-s/P/P/
-ta
-g
-d
-bb
-:a
-x
-:b
-}

scripts/ChangeLog

@@ -1,3 +1,7 @@
+2011-02-23  Werner Koch  <wk@g10code.com>
+
+	* autogen.sh: Add git setup checking.
+
 2010-10-18  Werner Koch  <wk@g10code.com>
 
 	* config.guess: Update to version 2010-09-24.
@@ -90,7 +94,7 @@
 2005-03-30  Werner Koch  <wk@g10code.com>
 
 	* w32installer.nsi: Allow including of WINPT source.  Include
-	libiconv source. 
+	libiconv source.
 	* mk-w32-dist: Add code to detect presence of source.  Calculate a
 	build number; add option --build-number to overide.
 
@@ -156,7 +160,7 @@
 
 2004-10-01  Werner Koch  <wk@g10code.com>
 
-	* mk-w32-dist: Updated from stable branch. 
+	* mk-w32-dist: Updated from stable branch.
 
 	* mk-gpg-texi: Changed to use the newer docbook2x-texi utility.
 
@@ -337,7 +341,7 @@
 	* to catch variations on the basic gpg man page (gpg, gpgv).  Mark
 	options.skel as a config file.  Do not include the FAQ/faq.html
 	twice (in /doc/ and /share/).
-	
+
 2002-01-02  Stefan Bellon  <sbellon@sbellon.de>
 
 	* build-riscos [__riscos__]: Set filetype of Makefile correctly.
@@ -378,7 +382,7 @@
 
 2001-08-07  Werner Koch  <wk@gnupg.org>
 
-	* autogen.sh: Adjusted --build-w32 for autoconf 2.52 
+	* autogen.sh: Adjusted --build-w32 for autoconf 2.52
 
 2001-07-09  Werner Koch  <wk@gnupg.org>
 
@@ -390,11 +394,11 @@
 
 2001-04-19  Werner Koch  <wk@gnupg.org>
 
-	* autogen.sh: Add VPATH build support for option --build-w32. 
+	* autogen.sh: Add VPATH build support for option --build-w32.
 
 2001-03-12  Werner Koch  <wk@gnupg.org>
 
-	* config.guess, config.sub: Replaced with the current GNU CVS ones. 
+	* config.guess, config.sub: Replaced with the current GNU CVS ones.
 
 2001-01-18  Werner Koch  <wk@gnupg.org>
 

scripts/autogen.sh

@@ -66,11 +66,11 @@ if test "$1" = "--build-w32"; then
     if [ -z "$crossbindir" ]; then
         echo "Cross compiler kit not installed" >&2
         echo "Under Debian GNU/Linux, you may install it using" >&2
-        echo "  apt-get install mingw32 mingw32-runtime mingw32-binutils" >&2 
+        echo "  apt-get install mingw32 mingw32-runtime mingw32-binutils" >&2
         echo "Stop." >&2
         exit 1
     fi
-   
+
     if [ -f "$tsdir/config.log" ]; then
         if ! head $tsdir/config.log | grep "$host" >/dev/null; then
             echo "Please run a 'make distclean' first" >&2
@@ -86,7 +86,7 @@ if test "$1" = "--build-w32"; then
             export $j
             disable_foo_tests="$disable_foo_tests --disable-`echo $i| \
                            sed 's,-config$,,'`-test"
-            if [ ! -f "${crossbindir}/$i" ]; then                   
+            if [ ! -f "${crossbindir}/$i" ]; then
                 echo "$i not installed for MingW32" >&2
                 DIE=yes
             fi
@@ -101,7 +101,7 @@ if test "$1" = "--build-w32"; then
 fi
 
 
-# This is the special case to build on a ColdFire platform under 
+# This is the special case to build on a ColdFire platform under
 # the uClinux kernel.  Tested on a MCF4249C3 board.
 if test "$1" = "--build-coldfire"; then
     tmp=`dirname $0`
@@ -121,7 +121,7 @@ if test "$1" = "--build-coldfire"; then
         exit 1
     fi
     build=`$tsdir/scripts/config.guess`
-        
+
     if [ -f "$tsdir/config.log" ]; then
         if ! head $tsdir/config.log | grep m68k-elf >/dev/null; then
             echo "Pease run a 'make distclean' first" >&2
@@ -151,7 +151,7 @@ if test "$1" = "--build-coldfire"; then
             export $j
             disable_foo_tests="$disable_foo_tests --disable-`echo $i| \
                            sed 's,-config$,,'`-test"
-            if [ ! -f "${crossbindir}/$i" ]; then                   
+            if [ ! -f "${crossbindir}/$i" ]; then
                 echo "$i not installed for ColdFire" >&2
                 DIE=yes
             fi
@@ -176,7 +176,7 @@ if test "$1" = "--build-coldfire"; then
 fi
 
 
-# This is the special case to build on a ColdFire platform under 
+# This is the special case to build on a ColdFire platform under
 # the uClinux kernel with uClinux-dist.  Tested on a MCF4249C3 board.
 if test "$1" = "--build-uclinux"; then
     tmp=`dirname $0`
@@ -189,7 +189,7 @@ if test "$1" = "--build-uclinux"; then
     fi
     build=`$tsdir/scripts/config.guess`
     host=m68k-elf
-        
+
     if [ -f "$tsdir/config.log" ]; then
         if ! head $tsdir/config.log | grep m68k-elf >/dev/null; then
             echo "Please run a 'make distclean' first" >&2
@@ -215,19 +215,19 @@ fi
 
 
 # Grep the required versions from configure.ac
-autoconf_vers=`sed -n '/^AC_PREREQ(/ { 
+autoconf_vers=`sed -n '/^AC_PREREQ(/ {
 s/^.*(\(.*\))/\1/p
 q
 }' ${configure_ac}`
 autoconf_vers_num=`echo "$autoconf_vers" | cvtver`
 
-automake_vers=`sed -n '/^min_automake_version=/ { 
+automake_vers=`sed -n '/^min_automake_version=/ {
 s/^.*="\(.*\)"/\1/p
 q
 }' ${configure_ac}`
 automake_vers_num=`echo "$automake_vers" | cvtver`
 
-gettext_vers=`sed -n '/^AM_GNU_GETTEXT_VERSION(/ { 
+gettext_vers=`sed -n '/^AM_GNU_GETTEXT_VERSION(/ {
 s/^.*(\(.*\))/\1/p
 q
 }' ${configure_ac}`
@@ -254,21 +254,44 @@ fi
 if test "$DIE" = "yes"; then
     cat <<EOF
 
-Note that you may use alternative versions of the tools by setting 
+Note that you may use alternative versions of the tools by setting
 the corresponding environment variables; see README.CVS for details.
-                   
+
 EOF
     exit 1
 fi
 
 
+# Check the git setup.
+if [ -d .git ]; then
+  if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then
+    cat <<EOF >&2
+*** Activating trailing whitespace git pre-commit hook. ***
+    For more information see this thread:
+      http://mail.gnome.org/archives/desktop-devel-list/2009-May/msg00084html
+    To deactivate this pre-commit hook again move .git/hooks/pre-commit
+    and .git/hooks/pre-commit.sample out of the way.
+EOF
+      cp -av .git/hooks/pre-commit.sample .git/hooks/pre-commit
+      chmod -c +x  .git/hooks/pre-commit
+  fi
+  tmp=$(git config --get filter.cleanpo.clean)
+  if [ "$tmp" != "awk '/^\"POT-Creation-Date:/&&!s{s=1;next};!/^#: /{print}'" ]
+  then
+    echo "*** Adding GIT filter.cleanpo.clean configuration." >&2
+    git config --add filter.cleanpo.clean \
+        "awk '/^\"POT-Creation-Date:/&&!s{s=1;next};!/^#: /{print}'"
+  fi
+fi
 echo "Running aclocal -I m4 ${ACLOCAL_FLAGS:+$ACLOCAL_FLAGS }..."
 $ACLOCAL -I m4 $ACLOCAL_FLAGS
 echo "Running autoheader..."
 $AUTOHEADER
 echo "Running automake --gnu --add-missing..."
-$AUTOMAKE --gnu --add-missing;
+$AUTOMAKE --gnu --add-missing
 echo "Running autoconf..."
 $AUTOCONF
 
-echo "You may now run \"./configure --enable-maintainer-mode && make\"."
+echo "You may now run
+  ./configure --enable-maintainer-mode && make
+"