[gnutls-dev] CVS gnutls/libextra

[Simon Josefsson]

Simon Josefsson <simon at josefsson.org> writes:

> Running git-cvsimport seems to fail, and I'm not sure it is worth the
> time to keep importing stuff from the CVS tree any longer.

In case someone knows why this happens, here is how it fails:

I first update the cvs repository:

LOCAL_CVS=/home/jas/self/private-cvs/gnutls
rsync --delete -e ssh -av cvs.gnupg.org:/cvs/gnutls/ $LOCAL_CVS

then I run git-cvsimport:

LOCAL_CVS=/home/jas/self/private-cvs/gnutls
LOCAL_GIT=/home/jas/self/private-git/gnutls
mkdir -p $LOCAL_GIT
cat<<EOF > /tmp/foo
wkoch:Werner Koch <wk at gnupg.org>
nmav:Nikos Mavrogiannopoulos <nmav at gnutls.org>
fiorinaf:Fabio Fiorina <fiorinaf at gnutls.org>
twoaday:Timo Schulz <twoaday at gnutls.org>
admcd:Andrew McDonald <admcd at gnutls.org>
jas:Simon Josefsson <simon at josefsson.org>
EOF
git-cvsimport -A /tmp/foo -k -d $LOCAL_CVS -C $LOCAL_GIT gnutls

Here $LOCAL_GIT is where my git repository is stored.  It is not a
checked out git repository, just a raw one.  The repository was created
by the exact same commands as above.

The output is below.

Perhaps I should ask on the git list...

/Simon

+ LOCAL_CVS=/home/jas/self/private-cvs/gnutls
+ LOCAL_GIT=/home/jas/self/private-git/gnutls
+ mkdir -p /home/jas/self/private-git/gnutls
+ cat
+ git-cvsimport -A /tmp/foo -k -d /home/jas/self/private-cvs/gnutls -C /home/jas/self/private-git/gnutls gnutls
.cvscopying: needs update
.cvsignore: needs update
.cvsusers: needs update
AUTHORS: needs update
COPYING: needs update
COPYING.LIB: needs update
ChangeLog: needs update
ChangeLog.1: needs update
GNUmakefile: needs update
Makefile.am: needs update
README: needs update
THANKS: needs update
build-aux/.cvsignore: needs update
build-aux/GNUmakefile: needs update
build-aux/config.rpath: needs update
build-aux/gendocs.sh: needs update
build-aux/link-warning.h: needs update
build-aux/maint.mk: needs update
configure.in: needs update
doc/.cvsignore: needs update
doc/Makefile.am: needs update
doc/README.CODING_STYLE: needs update
doc/README.CVS: needs update
doc/README.autoconf: needs update
doc/TODO: needs update
doc/arch/certificate-user-use-case.dia: needs update
doc/arch/certificate-user-use-case.eps: needs update
doc/arch/certificate-user-use-case.pdf: needs update
doc/arch/certificate-user-use-case.png: needs update
doc/arch/client-server-use-case.dia: needs update
doc/arch/client-server-use-case.eps: needs update
doc/arch/client-server-use-case.pdf: needs update
doc/arch/client-server-use-case.png: needs update
doc/arch/extensions_st.dia: needs update
doc/arch/extensions_st.eps: needs update
doc/arch/extensions_st.pdf: needs update
doc/arch/extensions_st.png: needs update
doc/arch/handshake-sequence.dia: needs update
doc/arch/handshake-sequence.eps: needs update
doc/arch/handshake-sequence.pdf: needs update
doc/arch/handshake-sequence.png: needs update
doc/arch/handshake-state.dia: needs update
doc/arch/handshake-state.eps: needs update
doc/arch/handshake-state.pdf: needs update
doc/arch/handshake-state.png: needs update
doc/arch/mod_auth_st.dia: needs update
doc/arch/mod_auth_st.eps: needs update
doc/arch/mod_auth_st.pdf: needs update
doc/arch/mod_auth_st.png: needs update
doc/arch/objects.dia: needs update
doc/arch/objects.eps: needs update
doc/arch/objects.pdf: needs update
doc/arch/objects.png: needs update
doc/certtool.cfg: needs update
doc/examples/.cvsignore: needs update
doc/examples/Makefile.am: needs update
doc/examples/ex-alert.c: needs update
doc/examples/ex-cert-select.c: needs update
doc/examples/ex-client-authz.c: needs update
doc/examples/ex-client-resume.c: needs update
doc/examples/ex-client-srp.c: needs update
doc/examples/ex-client-tlsia.c: needs update
doc/examples/ex-client1.c: needs update
doc/examples/ex-client2.c: needs update
doc/examples/ex-crq.c: needs update
doc/examples/ex-pkcs12.c: needs update
doc/examples/ex-rfc2818.c: needs update
doc/examples/ex-serv-anon.c: needs update
doc/examples/ex-serv-authz.c: needs update
doc/examples/ex-serv-export.c: needs update
doc/examples/ex-serv-pgp.c: needs update
doc/examples/ex-serv-srp.c: needs update
doc/examples/ex-serv1.c: needs update
doc/examples/ex-session-info.c: needs update
doc/examples/ex-verify.c: needs update
doc/examples/ex-x509-info.c: needs update
doc/examples/tcp.c: needs update
doc/fdl.texi: needs update
doc/gendocs_template: needs update
doc/gnutls-logo.eps: needs update
doc/gnutls-logo.pdf: needs update
doc/gnutls-logo.png: needs update
doc/gnutls.texi: needs update
doc/gpl.texi: needs update
doc/internals.dia: needs update
doc/internals.eps: needs update
doc/internals.pdf: needs update
doc/internals.png: needs update
doc/internals.texi: needs update
doc/layers.dia: needs update
doc/layers.eps: needs update
doc/layers.pdf: needs update
doc/layers.png: needs update
doc/lgpl.texi: needs update
doc/manpages/.cvsignore: needs update
doc/manpages/Makefile.am: needs update
doc/manpages/certtool.1: needs update
doc/manpages/gnutls-cli-debug.1: needs update
doc/manpages/gnutls-cli.1: needs update
doc/manpages/gnutls-serv.1: needs update
doc/manpages/psktool.1: needs update
doc/manpages/srptool.1: needs update
doc/my-bib-macros.texi: needs update
doc/pgp1.dia: needs update
doc/pgp1.eps: needs update
doc/pgp1.pdf: needs update
doc/pgp1.png: needs update
doc/protocol/draft-SP800-52.pdf: needs update
doc/protocol/draft-badra-hajjeh-mtls-00.txt: needs update
doc/protocol/draft-badra-hajjeh-mtls-01.txt: needs update
doc/protocol/draft-badra-tls-express-00.txt: needs update
doc/protocol/draft-badra-tls-key-exchange-00.txt: needs update
doc/protocol/draft-badra-tls-password-00.txt: needs update
doc/protocol/draft-badra-tls-password-ext-00.txt: needs update
doc/protocol/draft-benaloh-pct-00.txt: needs update
doc/protocol/draft-benaloh-pct-01.txt: needs update
doc/protocol/draft-chudov-cryptopro-cptls-02.txt: needs update
doc/protocol/draft-eronen-tls-psk-00.txt: needs update
doc/protocol/draft-freier-ssl-version3-02.txt: needs update
doc/protocol/draft-funk-tls-inner-application-extension-00.txt: needs update
doc/protocol/draft-funk-tls-inner-application-extension-01.txt: needs update
doc/protocol/draft-funk-tls-inner-application-extension-02.txt: needs update
doc/protocol/draft-funk-tls-inner-application-extension-03.txt: needs update
doc/protocol/draft-hajjeh-tls-identity-protection-00.txt: needs update
doc/protocol/draft-hajjeh-tls-sign-00.txt: needs update
doc/protocol/draft-hajjeh-tls-sign-01.txt: needs update
doc/protocol/draft-hajjeh-tls-sign-02.txt: needs update
doc/protocol/draft-hickman-netscape-ssl-00.txt: needs update
doc/protocol/draft-housley-evidence-extns-01.txt: needs update
doc/protocol/draft-housley-tls-authz-extns-00.txt: needs update
doc/protocol/draft-housley-tls-authz-extns-01.txt: needs update
doc/protocol/draft-housley-tls-authz-extns-03.txt: needs update
doc/protocol/draft-housley-tls-authz-extns-04.txt: needs update
doc/protocol/draft-housley-tls-authz-extns-05.txt: needs update
doc/protocol/draft-housley-tls-authz-extns-06.txt: needs update
doc/protocol/draft-housley-tls-authz-extns-07.txt: needs update
doc/protocol/draft-ietf-tls-56-bit-ciphersuites-01.txt: needs update
doc/protocol/draft-ietf-tls-ctr-01.txt: needs update
doc/protocol/draft-ietf-tls-ecc-04.txt: needs update
doc/protocol/draft-ietf-tls-ecc-07.txt: needs update
doc/protocol/draft-ietf-tls-ecc-09.txt: needs update
doc/protocol/draft-ietf-tls-ecc-10.txt: needs update
doc/protocol/draft-ietf-tls-ecc-11.txt: needs update
doc/protocol/draft-ietf-tls-ecc-new-mac-00.txt: needs update
doc/protocol/draft-ietf-tls-emailaddr-00.txt: needs update
doc/protocol/draft-ietf-tls-kerb-01.txt: needs update
doc/protocol/draft-ietf-tls-openpgp-keys-06.txt: needs update
doc/protocol/draft-ietf-tls-openpgp-keys-07.txt: needs update
doc/protocol/draft-ietf-tls-openpgp-keys-08.txt: needs update
doc/protocol/draft-ietf-tls-openpgp-keys-09.txt: needs update
doc/protocol/draft-ietf-tls-openpgp-keys-10.txt: needs update
doc/protocol/draft-ietf-tls-openpgp-keys-11.txt: needs update
doc/protocol/draft-ietf-tls-psk-01.txt: needs update
doc/protocol/draft-ietf-tls-psk-03.txt: needs update
doc/protocol/draft-ietf-tls-psk-04.txt: needs update
doc/protocol/draft-ietf-tls-psk-05.txt: needs update
doc/protocol/draft-ietf-tls-psk-06.txt: needs update
doc/protocol/draft-ietf-tls-psk-09.txt: needs update
doc/protocol/draft-ietf-tls-psk-null-01.txt: needs update
doc/protocol/draft-ietf-tls-psk-null-02.txt: needs update
doc/protocol/draft-ietf-tls-psk-null-03.txt: needs update
doc/protocol/draft-ietf-tls-rfc2246-bis-06.txt: needs update
doc/protocol/draft-ietf-tls-rfc2246-bis-08.txt: needs update
doc/protocol/draft-ietf-tls-rfc2246-bis-09.txt: needs update
doc/protocol/draft-ietf-tls-rfc2246-bis-10.txt: needs update
doc/protocol/draft-ietf-tls-rfc2246-bis-12.txt: needs update
doc/protocol/draft-ietf-tls-rfc2246-bis-13.txt: needs update
doc/protocol/draft-ietf-tls-rfc3546bis-00.txt: needs update
doc/protocol/draft-ietf-tls-rfc3546bis-01.txt: needs update
doc/protocol/draft-ietf-tls-rfc4346-bis-01.txt: needs update
doc/protocol/draft-ietf-tls-rfc4346-bis-02.txt: needs update
doc/protocol/draft-ietf-tls-rfc4346-bis-03.txt: needs update
doc/protocol/draft-ietf-tls-sharedkeys-02.txt: needs update
doc/protocol/draft-ietf-tls-srp-00.txt: needs update
doc/protocol/draft-ietf-tls-srp-01.txt: needs update
doc/protocol/draft-ietf-tls-srp-02.txt: needs update
doc/protocol/draft-ietf-tls-srp-03.txt: needs update
doc/protocol/draft-ietf-tls-srp-04.txt: needs update
doc/protocol/draft-ietf-tls-srp-05.txt: needs update
doc/protocol/draft-ietf-tls-srp-06.txt: needs update
doc/protocol/draft-ietf-tls-srp-07.txt: needs update
doc/protocol/draft-ietf-tls-srp-08.txt: needs update
doc/protocol/draft-ietf-tls-srp-09.txt: needs update
doc/protocol/draft-ietf-tls-srp-10.txt: needs update
doc/protocol/draft-ietf-tls-srp-11.txt: needs update
doc/protocol/draft-ietf-tls-srp-12.txt: needs update
doc/protocol/draft-ietf-tls-srp-13.txt: needs update
doc/protocol/draft-ietf-tls-ssl-mods-00.txt: needs update
doc/protocol/draft-ietf-tls-suiteb-00.txt: needs update
doc/protocol/draft-lee-tls-seed-01.txt: needs update
doc/protocol/draft-modadugu-tls-ctr-00.txt: needs update
doc/protocol/draft-nir-tee-pm-00.txt: needs update
doc/protocol/draft-otto-tls-sigma-ciphersuite-00.txt: needs update
doc/protocol/draft-rescorla-dtls-02.txt: needs update
doc/protocol/draft-rescorla-dtls-03.txt: needs update
doc/protocol/draft-rescorla-dtls-04.txt: needs update
doc/protocol/draft-rescorla-dtls-05.txt: needs update
doc/protocol/draft-rescorla-tls-extractor-00.txt: needs update
doc/protocol/draft-rescorla-tls-opaque-prf-input-00.txt: needs update
doc/protocol/draft-rescorla-tls-suiteb-00.txt: needs update
doc/protocol/draft-salowey-tls-rsa-aes-gcm-00.txt: needs update
doc/protocol/draft-salowey-tls-ticket-02.txt: needs update
doc/protocol/draft-salowey-tls-ticket-03.txt: needs update
doc/protocol/draft-salowey-tls-ticket-04.txt: needs update
doc/protocol/draft-salowey-tls-ticket-05.txt: needs update
doc/protocol/draft-salowey-tls-ticket-06.txt: needs update
doc/protocol/draft-salowey-tls-ticket-07.txt: needs update
doc/protocol/draft-santesson-tls-gssapi-01.txt: needs update
doc/protocol/draft-santesson-tls-supp-00.txt: needs update
doc/protocol/draft-santesson-tls-supp-01.txt: needs update
doc/protocol/draft-santesson-tls-supp-02.txt: needs update
doc/protocol/draft-santesson-tls-ume-00.txt: needs update
doc/protocol/draft-santesson-tls-ume-01.txt: needs update
doc/protocol/draft-santesson-tls-ume-02.txt: needs update
doc/protocol/draft-santesson-tls-ume-04.txt: needs update
doc/protocol/draft-santesson-tls-ume-05.txt: needs update
doc/protocol/draft-santesson-tls-ume-06.txt: needs update
doc/protocol/draft-santesson-tls-ume-07.txt: needs update
doc/protocol/rfc1422.txt: needs update
doc/protocol/rfc1423.txt: needs update
doc/protocol/rfc2246.txt: needs update
doc/protocol/rfc2253.txt: needs update
doc/protocol/rfc2279.txt: needs update
doc/protocol/rfc2313.txt: needs update
doc/protocol/rfc2440.txt: needs update
doc/protocol/rfc2631.txt: needs update
doc/protocol/rfc2712.txt: needs update
doc/protocol/rfc2817.txt: needs update
doc/protocol/rfc2818.txt: needs update
doc/protocol/rfc2945.txt: needs update
doc/protocol/rfc2985.txt: needs update
doc/protocol/rfc2986.txt: needs update
doc/protocol/rfc3039.txt: needs update
doc/protocol/rfc3268.txt: needs update
doc/protocol/rfc3279.txt: needs update
doc/protocol/rfc3280.txt: needs update
doc/protocol/rfc3546.txt: needs update
doc/protocol/rfc3749.txt: needs update
doc/protocol/rfc3943.txt: needs update
doc/protocol/rfc4132.txt: needs update
doc/protocol/rfc4158.txt: needs update
doc/protocol/rfc4162.txt: needs update
doc/protocol/rfc4279.txt: needs update
doc/protocol/rfc4346.txt: needs update
doc/protocol/rfc4347.txt: needs update
doc/protocol/rfc4366.txt: needs update
doc/protocol/rfc4507.txt: needs update
doc/protocol/rfc4680.txt: needs update
doc/protocol/rfc4681.txt: needs update
doc/protocol/rfc4785.txt: needs update
doc/protocol/rrc2.doc: needs update
doc/protocol/ssl-version2.txt: needs update
doc/protocol/tls-numbers.txt: needs update
doc/protocol/x509guide.txt: needs update
doc/reference/.cvsignore: needs update
doc/reference/Makefile.am: needs update
doc/reference/gnutls-docs.sgml: needs update
doc/reference/tmpl/.cvsignore: needs update
doc/reference/tmpl/gnutls-unused.sgml: needs update
doc/scripts/.cvsignore: needs update
doc/scripts/Makefile.am: needs update
doc/scripts/gdoc: needs update
doc/scripts/sort2.pl: needs update
doc/signatures.texi: needs update
doc/x509-1.dia: needs update
doc/x509-1.eps: needs update
doc/x509-1.pdf: needs update
doc/x509-1.png: needs update
gl/.cvsignore: needs update
gl/Makefile.am: needs update
gl/error.c: needs update
gl/error.h: needs update
gl/gai_strerror.c: needs update
gl/getaddrinfo.c: needs update
gl/getaddrinfo.h: needs update
gl/getdelim.c: needs update
gl/getdelim.h: needs update
gl/getline.c: needs update
gl/getline.h: needs update
gl/gettext.h: needs update
gl/gnulib.mk: needs update
gl/inet_ntop.c: needs update
gl/inet_ntop.h: needs update
gl/inet_pton.c: needs update
gl/inet_pton.h: needs update
gl/m4/absolute-header.m4: needs update
gl/m4/arpa_inet_h.m4: needs update
gl/m4/error.m4: needs update
gl/m4/extensions.m4: needs update
gl/m4/getaddrinfo.m4: needs update
gl/m4/getdelim.m4: needs update
gl/m4/getline.m4: needs update
gl/m4/gnulib-cache.m4: needs update
gl/m4/gnulib-common.m4: needs update
gl/m4/gnulib-comp.m4: needs update
gl/m4/gnulib-tool.m4: needs update
gl/m4/inet_ntop.m4: needs update
gl/m4/inet_pton.m4: needs update
gl/m4/lib-ld.m4: needs update
gl/m4/lib-link.m4: needs update
gl/m4/lib-prefix.m4: needs update
gl/m4/netinet_in_h.m4: needs update
gl/m4/onceonly_2_57.m4: needs update
gl/m4/readline.m4: needs update
gl/m4/socklen.m4: needs update
gl/m4/sockpfaf.m4: needs update
gl/m4/stdarg.m4: needs update
gl/m4/stdbool.m4: needs update
gl/m4/strdup.m4: needs update
gl/m4/string_h.m4: needs update
gl/m4/sys_socket_h.m4: needs update
gl/netinet_in_.h: needs update
gl/override/doc/gendocs_template.diff: needs update
gl/override/doc/gpl.texi.diff: needs update
gl/override/doc/lgpl.texi.diff: needs update
gl/progname.c: needs update
gl/progname.h: needs update
gl/readline.c: needs update
gl/readline.h: needs update
gl/stdbool_.h: needs update
gl/strdup.c: needs update
gl/string_.h: needs update
gl/sys_socket_.h: needs update
gl/version-etc-fsf.c: needs update
gl/version-etc.c: needs update
gl/version-etc.h: needs update
gtk-doc.make: needs update
includes/.cvsignore: needs update
includes/Makefile.am: needs update
includes/gnutls/.cvsignore: needs update
includes/gnutls/compat.h: needs update
includes/gnutls/extra.h: needs update
includes/gnutls/gnutls.h.in: needs update
includes/gnutls/gnutlsxx.h: needs update
includes/gnutls/openpgp.h: needs update
includes/gnutls/openssl.h: needs update
includes/gnutls/pkcs12.h: needs update
includes/gnutls/x509.h: needs update
lgl/.cvsignore: needs update
lgl/Makefile.am: needs update
lgl/alloca_.h: needs update
lgl/arcfour.c: needs update
lgl/arcfour.h: needs update
lgl/arctwo.c: needs update
lgl/arctwo.h: needs update
lgl/asnprintf.c: needs update
lgl/asprintf.c: needs update
lgl/des.c: needs update
lgl/des.h: needs update
lgl/dummy.c: needs update
lgl/float+.h: needs update
lgl/float_.h: needs update
lgl/fseeko.c: needs update
lgl/gc-gnulib.c: needs update
lgl/gc-libgcrypt.c: needs update
lgl/gc-pbkdf2-sha1.c: needs update
lgl/gc.h: needs update
lgl/getdelim.c: needs update
lgl/getdelim.h: needs update
lgl/getline.c: needs update
lgl/getline.h: needs update
lgl/getpass.c: needs update
lgl/getpass.h: needs update
lgl/gettext.h: needs update
lgl/hmac-md5.c: needs update
lgl/hmac-sha1.c: needs update
lgl/hmac.h: needs update
lgl/m4/absolute-header.m4: needs update
lgl/m4/alloca.m4: needs update
lgl/m4/arcfour.m4: needs update
lgl/m4/arctwo.m4: needs update
lgl/m4/codeset.m4: needs update
lgl/m4/des.m4: needs update
lgl/m4/eoverflow.m4: needs update
lgl/m4/extensions.m4: needs update
lgl/m4/float_h.m4: needs update
lgl/m4/fseeko.m4: needs update
lgl/m4/gc-arcfour.m4: needs update
lgl/m4/gc-arctwo.m4: needs update
lgl/m4/gc-des.m4: needs update
lgl/m4/gc-hmac-md5.m4: needs update
lgl/m4/gc-hmac-sha1.m4: needs update
lgl/m4/gc-md2.m4: needs update
lgl/m4/gc-md4.m4: needs update
lgl/m4/gc-md5.m4: needs update
lgl/m4/gc-pbkdf2-sha1.m4: needs update
lgl/m4/gc-random.m4: needs update
lgl/m4/gc-rijndael.m4: needs update
lgl/m4/gc-sha1.m4: needs update
lgl/m4/gc.m4: needs update
lgl/m4/getdelim.m4: needs update
lgl/m4/getline.m4: needs update
lgl/m4/getpass.m4: needs update
lgl/m4/gettext.m4: needs update
lgl/m4/glibc2.m4: needs update
lgl/m4/glibc21.m4: needs update
lgl/m4/gnulib-cache.m4: needs update
lgl/m4/gnulib-common.m4: needs update
lgl/m4/gnulib-comp.m4: needs update
lgl/m4/gnulib-tool.m4: needs update
lgl/m4/hmac-md5.m4: needs update
lgl/m4/hmac-sha1.m4: needs update
lgl/m4/iconv.m4: needs update
lgl/m4/intdiv0.m4: needs update
lgl/m4/intl.m4: needs update
lgl/m4/intldir.m4: needs update
lgl/m4/intmax.m4: needs update
lgl/m4/intmax_t.m4: needs update
lgl/m4/inttypes-pri.m4: needs update
lgl/m4/inttypes_h.m4: needs update
lgl/m4/lcmessage.m4: needs update
lgl/m4/lib-ld.m4: needs update
lgl/m4/lib-link.m4: needs update
lgl/m4/lib-prefix.m4: needs update
lgl/m4/lock.m4: needs update
lgl/m4/longlong.m4: needs update
lgl/m4/md2.m4: needs update
lgl/m4/md4.m4: needs update
lgl/m4/md5.m4: needs update
lgl/m4/memmem.m4: needs update
lgl/m4/memmove.m4: needs update
lgl/m4/memxor.m4: needs update
lgl/m4/minmax.m4: needs update
lgl/m4/nls.m4: needs update
lgl/m4/po.m4: needs update
lgl/m4/printf-posix.m4: needs update
lgl/m4/progtest.m4: needs update
lgl/m4/read-file.m4: needs update
lgl/m4/rijndael.m4: needs update
lgl/m4/sha1.m4: needs update
lgl/m4/size_max.m4: needs update
lgl/m4/snprintf.m4: needs update
lgl/m4/socklen.m4: needs update
lgl/m4/sockpfaf.m4: needs update
lgl/m4/stdbool.m4: needs update
lgl/m4/stdint.m4: needs update
lgl/m4/stdint_h.m4: needs update
lgl/m4/stdio_h.m4: needs update
lgl/m4/string_h.m4: needs update
lgl/m4/strverscmp.m4: needs update
lgl/m4/sys_socket_h.m4: needs update
lgl/m4/sys_stat_h.m4: needs update
lgl/m4/time_h.m4: needs update
lgl/m4/time_r.m4: needs update
lgl/m4/uintmax_t.m4: needs update
lgl/m4/ulonglong.m4: needs update
lgl/m4/unistd_h.m4: needs update
lgl/m4/vasnprintf.m4: needs update
lgl/m4/vasprintf.m4: needs update
lgl/m4/visibility.m4: needs update
lgl/m4/wchar.m4: needs update
lgl/m4/wchar_t.m4: needs update
lgl/m4/wint_t.m4: needs update
lgl/m4/xsize.m4: needs update
lgl/md2.c: needs update
lgl/md2.h: needs update
lgl/md4.c: needs update
lgl/md4.h: needs update
lgl/md5.c: needs update
lgl/md5.h: needs update
lgl/memmem.c: needs update
lgl/memmove.c: needs update
lgl/memxor.c: needs update
lgl/memxor.h: needs update
lgl/minmax.h: needs update
lgl/printf-args.c: needs update
lgl/printf-args.h: needs update
lgl/printf-parse.c: needs update
lgl/printf-parse.h: needs update
lgl/read-file.c: needs update
lgl/read-file.h: needs update
lgl/rijndael-alg-fst.c: needs update
lgl/rijndael-alg-fst.h: needs update
lgl/rijndael-api-fst.c: needs update
lgl/rijndael-api-fst.h: needs update
lgl/sha1.c: needs update
lgl/sha1.h: needs update
lgl/size_max.h: needs update
lgl/snprintf.c: needs update
lgl/stdbool_.h: needs update
lgl/stdint_.h: needs update
lgl/stdio_.h: needs update
lgl/string_.h: needs update
lgl/strverscmp.c: needs update
lgl/strverscmp.h: needs update
lgl/sys_socket_.h: needs update
lgl/sys_stat_.h: needs update
lgl/time_.h: needs update
lgl/time_r.c: needs update
lgl/unistd_.h: needs update
lgl/vasnprintf.c: needs update
lgl/vasnprintf.h: needs update
lgl/vasprintf.c: needs update
lgl/wchar_.h: needs update
lgl/xsize.h: needs update
lib/.cvsignore: needs update
lib/Makefile.am: needs update
lib/auth_anon.c: needs update
lib/auth_anon.h: needs update
lib/auth_cert.c: needs update
lib/auth_cert.h: needs update
lib/auth_dh_common.c: needs update
lib/auth_dh_common.h: needs update
lib/auth_dhe.c: needs update
lib/auth_dhe_psk.c: needs update
lib/auth_psk.c: needs update
lib/auth_psk.h: needs update
lib/auth_psk_passwd.c: needs update
lib/auth_psk_passwd.h: needs update
lib/auth_rsa.c: needs update
lib/auth_rsa_export.c: needs update
lib/auth_srp.c: needs update
lib/auth_srp.h: needs update
lib/auth_srp_passwd.c: needs update
lib/auth_srp_passwd.h: needs update
lib/auth_srp_rsa.c: needs update
lib/auth_srp_sb64.c: needs update
lib/debug.c: needs update
lib/debug.h: needs update
lib/defines.h: needs update
lib/ext_authz.c: needs update
lib/ext_authz.h: needs update
lib/ext_cert_type.c: needs update
lib/ext_cert_type.h: needs update
lib/ext_inner_application.c: needs update
lib/ext_inner_application.h: needs update
lib/ext_max_record.c: needs update
lib/ext_max_record.h: needs update
lib/ext_server_name.c: needs update
lib/ext_server_name.h: needs update
lib/ext_srp.c: needs update
lib/ext_srp.h: needs update
lib/gnutls.asn: needs update
lib/gnutls.pc.in: needs update
lib/gnutls_alert.c: needs update
lib/gnutls_algorithms.c: needs update
lib/gnutls_algorithms.h: needs update
lib/gnutls_anon_cred.c: needs update
lib/gnutls_asn1_tab.c: needs update
lib/gnutls_auth.c: needs update
lib/gnutls_auth.h: needs update
lib/gnutls_auth_int.h: needs update
lib/gnutls_buffer.h: needs update
lib/gnutls_buffers.c: needs update
lib/gnutls_buffers.h: needs update
lib/gnutls_cert.c: needs update
lib/gnutls_cert.h: needs update
lib/gnutls_cipher.c: needs update
lib/gnutls_cipher.h: needs update
lib/gnutls_cipher_int.c: needs update
lib/gnutls_cipher_int.h: needs update
lib/gnutls_compress.c: needs update
lib/gnutls_compress.h: needs update
lib/gnutls_compress_int.c: needs update
lib/gnutls_compress_int.h: needs update
lib/gnutls_constate.c: needs update
lib/gnutls_constate.h: needs update
lib/gnutls_datum.c: needs update
lib/gnutls_datum.h: needs update
lib/gnutls_db.c: needs update
lib/gnutls_db.h: needs update
lib/gnutls_dh.c: needs update
lib/gnutls_dh.h: needs update
lib/gnutls_dh_primes.c: needs update
lib/gnutls_errors.c: needs update
lib/gnutls_errors.h: needs update
lib/gnutls_extensions.c: needs update
lib/gnutls_extensions.h: needs update
lib/gnutls_extra_hooks.c: needs update
lib/gnutls_extra_hooks.h: needs update
lib/gnutls_global.c: needs update
lib/gnutls_global.h: needs update
lib/gnutls_handshake.c: needs update
lib/gnutls_handshake.h: needs update
lib/gnutls_hash_int.c: needs update
lib/gnutls_hash_int.h: needs update
lib/gnutls_helper.c: needs update
lib/gnutls_helper.h: needs update
lib/gnutls_int.h: needs update
lib/gnutls_kx.c: needs update
lib/gnutls_kx.h: needs update
lib/gnutls_mem.c: needs update
lib/gnutls_mem.h: needs update
lib/gnutls_mpi.c: needs update
lib/gnutls_mpi.h: needs update
lib/gnutls_num.c: needs update
lib/gnutls_num.h: needs update
lib/gnutls_pk.c: needs update
lib/gnutls_pk.h: needs update
lib/gnutls_priority.c: needs update
lib/gnutls_psk.c: needs update
lib/gnutls_record.c: needs update
lib/gnutls_record.h: needs update
lib/gnutls_rsa_export.c: needs update
lib/gnutls_rsa_export.h: needs update
lib/gnutls_session.c: needs update
lib/gnutls_session.h: needs update
lib/gnutls_session_pack.c: needs update
lib/gnutls_session_pack.h: needs update
lib/gnutls_sig.c: needs update
lib/gnutls_sig.h: needs update
lib/gnutls_srp.c: needs update
lib/gnutls_srp.h: needs update
lib/gnutls_state.c: needs update
lib/gnutls_state.h: needs update
lib/gnutls_str.c: needs update
lib/gnutls_str.h: needs update
lib/gnutls_supplemental.c: needs update
lib/gnutls_supplemental.h: needs update
lib/gnutls_ui.c: needs update
lib/gnutls_v2_compat.c: needs update
lib/gnutls_v2_compat.h: needs update
lib/gnutls_x509.c: needs update
lib/gnutls_x509.h: needs update
lib/gnutlsxx.cpp: needs update
lib/io_debug.h: needs update
lib/libgnutls-config.in: needs update
lib/libgnutls.m4: needs update
lib/libgnutls.vers: needs update
lib/libgnutlsxx.vers: needs update
lib/minitasn1/.cvsignore: needs update
lib/minitasn1/Makefile.am: needs update
lib/minitasn1/README: needs update
lib/minitasn1/coding.c: needs update
lib/minitasn1/decoding.c: needs update
lib/minitasn1/element.c: needs update
lib/minitasn1/element.h: needs update
lib/minitasn1/errors.c: needs update
lib/minitasn1/errors.h: needs update
lib/minitasn1/gstr.c: needs update
lib/minitasn1/gstr.h: needs update
lib/minitasn1/int.h: needs update
lib/minitasn1/libtasn1.h: needs update
lib/minitasn1/mem.h: needs update
lib/minitasn1/parser_aux.c: needs update
lib/minitasn1/parser_aux.h: needs update
lib/minitasn1/structure.c: needs update
lib/minitasn1/structure.h: needs update
lib/pkix.asn: needs update
lib/pkix_asn1_tab.c: needs update
lib/x509/.cvsignore: needs update
lib/x509/Makefile.am: needs update
lib/x509/common.c: needs update
lib/x509/common.h: needs update
lib/x509/crl.c: needs update
lib/x509/crl_write.c: needs update
lib/x509/crq.c: needs update
lib/x509/crq.h: needs update
lib/x509/dn.c: needs update
lib/x509/dn.h: needs update
lib/x509/dsa.c: needs update
lib/x509/dsa.h: needs update
lib/x509/extensions.c: needs update
lib/x509/extensions.h: needs update
lib/x509/mpi.c: needs update
lib/x509/mpi.h: needs update
lib/x509/output.c: needs update
lib/x509/pkcs12.c: needs update
lib/x509/pkcs12.h: needs update
lib/x509/pkcs12_bag.c: needs update
lib/x509/pkcs12_encr.c: needs update
lib/x509/pkcs7.c: needs update
lib/x509/pkcs7.h: needs update
lib/x509/privkey.c: needs update
lib/x509/privkey.h: needs update
lib/x509/privkey_pkcs8.c: needs update
lib/x509/rfc2818.h: needs update
lib/x509/rfc2818_hostname.c: needs update
lib/x509/sign.c: needs update
lib/x509/sign.h: needs update
lib/x509/verify.c: needs update
lib/x509/verify.h: needs update
lib/x509/x509.c: needs update
lib/x509/x509.h: needs update
lib/x509/x509_write.c: needs update
lib/x509/xml.c: needs update
lib/x509_b64.c: needs update
lib/x509_b64.h: needs update
libextra/.cvsignore: needs update
libextra/Makefile.am: needs update
libextra/gnutls-extra.pc.in: needs update
libextra/gnutls_extra.c: needs update
libextra/gnutls_extra.h: needs update
libextra/gnutls_ia.c: needs update
libextra/gnutls_openpgp.c: needs update
libextra/gnutls_openssl.c: needs update
libextra/libgnutls-extra-config.in: needs update
libextra/libgnutls-extra.m4: needs update
libextra/libgnutls-extra.vers: needs update
libextra/minilzo/.cvsignore: needs update
libextra/minilzo/Makefile.am: needs update
libextra/minilzo/README.LZO: needs update
libextra/minilzo/lzoconf.h: needs update
libextra/minilzo/lzodefs.h: needs update
libextra/minilzo/minilzo.c: needs update
libextra/minilzo/minilzo.h: needs update
libextra/minilzo/testmini.c: needs update
libextra/opencdk/.cvsignore: needs update
libextra/opencdk/Makefile.am: needs update
libextra/opencdk/README: needs update
libextra/opencdk/armor.c: needs update
libextra/opencdk/cipher.c: needs update
libextra/opencdk/compress.c: needs update
libextra/opencdk/context.h: needs update
libextra/opencdk/dummy.c: needs update
libextra/opencdk/filters.h: needs update
libextra/opencdk/kbnode.c: needs update
libextra/opencdk/keydb.c: needs update
libextra/opencdk/literal.c: needs update
libextra/opencdk/main.c: needs update
libextra/opencdk/main.h: needs update
libextra/opencdk/misc.c: needs update
libextra/opencdk/new-packet.c: needs update
libextra/opencdk/opencdk.h: needs update
libextra/opencdk/packet.h: needs update
libextra/opencdk/pubkey.c: needs update
libextra/opencdk/read-packet.c: needs update
libextra/opencdk/seskey.c: needs update
libextra/opencdk/sig-check.c: needs update
libextra/opencdk/stream.c: needs update
libextra/opencdk/stream.h: needs update
libextra/opencdk/types.h: needs update
libextra/opencdk/verify.c: needs update
libextra/opencdk/write-packet.c: needs update
libextra/openpgp/.cvsignore: needs update
libextra/openpgp/Makefile.am: needs update
libextra/openpgp/compat.c: needs update
libextra/openpgp/extras.c: needs update
libextra/openpgp/gnutls_openpgp.h: needs update
libextra/openpgp/openpgp.h: needs update
libextra/openpgp/pgp.c: needs update
libextra/openpgp/pgpverify.c: needs update
libextra/openpgp/privkey.c: needs update
libextra/openpgp/xml.c: needs update
libextra/openssl_compat.c: needs update
libextra/openssl_compat.h: needs update
m4/.cvsignore: needs update
m4/autobuild.m4: needs update
m4/ax_create_stdint_h.m4: needs update
m4/gc_random.m4: needs update
m4/gtk-doc.m4: needs update
m4/libgcrypt.m4: needs update
m4/libtasn1.m4: needs update
maint-cfg.mk: needs update
po/.cvsignore: needs update
po/LINGUAS: needs update
po/Makevars: needs update
po/POTFILES.in: needs update
po/de.po: needs update
po/pl.po: needs update
po/sv.po: needs update
src/.cvsignore: needs update
src/Makefile.am: needs update
src/README: needs update
src/README.srptool: needs update
src/certtool-cfg.c: needs update
src/certtool-cfg.h: needs update
src/certtool-gaa.c: needs update
src/certtool-gaa.h: needs update
src/certtool.c: needs update
src/certtool.gaa: needs update
src/cfg/.cvsignore: needs update
src/cfg/Makefile.am: needs update
src/cfg/cfg+.c: needs update
src/cfg/cfg+.h: needs update
src/cfg/cfgfile.c: needs update
src/cfg/cfgfile.h: needs update
src/cfg/cmdline.c: needs update
src/cfg/cmdline.h: needs update
src/cfg/parse.c: needs update
src/cfg/platon/.cvsignore: needs update
src/cfg/platon/Makefile.am: needs update
src/cfg/platon/str/.cvsignore: needs update
src/cfg/platon/str/Makefile.am: needs update
src/cfg/platon/str/dynfgets.c: needs update
src/cfg/platon/str/dynfgets.h: needs update
src/cfg/platon/str/strctype.c: needs update
src/cfg/platon/str/strctype.h: needs update
src/cfg/platon/str/strdyn.c: needs update
src/cfg/platon/str/strdyn.h: needs update
src/cfg/platon/str/strplus.c: needs update
src/cfg/platon/str/strplus.h: needs update
src/cfg/props.c: needs update
src/cfg/shared.c: needs update
src/cfg/shared.h: needs update
src/cli-gaa.c: needs update
src/cli-gaa.h: needs update
src/cli.c: needs update
src/cli.gaa: needs update
src/common.c: needs update
src/common.h: needs update
src/crypt-gaa.c: needs update
src/crypt-gaa.h: needs update
src/crypt.c: needs update
src/crypt.gaa: needs update
src/errcodes.c: needs update
src/gnutls-http-serv: needs update
src/list.h: needs update
src/openpgp/.cvsignore: needs update
src/openpgp/Makefile.am: needs update
src/openpgp/cli_pub.asc: needs update
src/openpgp/cli_ring.asc: needs update
src/openpgp/cli_ring.gpg: needs update
src/openpgp/cli_sec.asc: needs update
src/openpgp/pub.asc: needs update
src/openpgp/sec.asc: needs update
src/params.pem: needs update
src/pkcs1.asn: needs update
src/prime.c: needs update
src/psk-gaa.c: needs update
src/psk-gaa.h: needs update
src/psk.c: needs update
src/psk.gaa: needs update
src/select.c: needs update
src/serv-gaa.c: needs update
src/serv-gaa.h: needs update
src/serv.c: needs update
src/serv.gaa: needs update
src/srp/.cvsignore: needs update
src/srp/Makefile.am: needs update
src/srp/tpasswd: needs update
src/srp/tpasswd.conf: needs update
src/tests.c: needs update
src/tests.h: needs update
src/tls_test-gaa.c: needs update
src/tls_test-gaa.h: needs update
src/tls_test.c: needs update
src/tls_test.gaa: needs update
src/x509/.cvsignore: needs update
src/x509/Makefile.am: needs update
src/x509/ca.pem: needs update
src/x509/cert-dsa.pem: needs update
src/x509/cert.pem: needs update
src/x509/clicert-dsa.pem: needs update
src/x509/clicert.pem: needs update
src/x509/clikey-dsa.pem: needs update
src/x509/clikey.pem: needs update
src/x509/key-dsa.pem: needs update
src/x509/key.pem: needs update
tests/.cvsignore: needs update
tests/Makefile.am: needs update
tests/anonself.c: needs update
tests/ca.pem: needs update
tests/certder.c: needs update
tests/certificate_set_x509_crl.c: needs update
tests/dhepskself.c: needs update
tests/dn.c: needs update
tests/enc3pkcs8.pem: needs update
tests/gc.c: needs update
tests/hostname-check/.cvsignore: needs update
tests/hostname-check/Makefile.am: needs update
tests/hostname-check/README: needs update
tests/hostname-check/hostname-check.c: needs update
tests/key-id/.cvsignore: needs update
tests/key-id/Makefile.am: needs update
tests/key-id/README: needs update
tests/key-id/ca-gnutls-keyid.pem: needs update
tests/key-id/ca-no-keyid.pem: needs update
tests/key-id/ca-weird-keyid.pem: needs update
tests/key-id/key-ca.pem: needs update
tests/key-id/key-id: needs update
tests/key-id/key-user.pem: needs update
tests/nist-pkits/.cvsignore: needs update
tests/nist-pkits/PKITS.pdf: needs update
tests/nist-pkits/PKITS_data.zip: needs update
tests/nist-pkits/README: needs update
tests/nist-pkits/build-chain: needs update
tests/nist-pkits/gnutls-nist-tests.html: needs update
tests/nist-pkits/gnutls_test_entry: needs update
tests/nist-pkits/pkits: needs update
tests/nist-pkits/pkits_crl: needs update
tests/nist-pkits/pkits_crt: needs update
tests/nist-pkits/pkits_pkcs12: needs update
tests/nist-pkits/pkits_smime: needs update
tests/nist-pkits/pkits_test: needs update
tests/nist-pkits/pkits_test_list_generator.patch: needs update
tests/nist-pkits/pkits_test_list_generator.tgz: needs update
tests/openpgp/Makefile.am: needs update
tests/openpgp/keyring.c: needs update
tests/openpgp_test.c: needs update
tests/openssl.c: needs update
tests/pathlen/.cvsignore: needs update
tests/pathlen/Makefile.am: needs update
tests/pathlen/ca-no-pathlen.pem: needs update
tests/pathlen/no-ca-or-pathlen.pem: needs update
tests/pathlen/pathlen: needs update
tests/pkcs1-padding/.cvsignore: needs update
tests/pkcs1-padding/Makefile.am: needs update
tests/pkcs1-padding/pkcs1-pad: needs update
tests/pkcs1-padding/pkcs1-pad-broken.pem: needs update
tests/pkcs1-padding/pkcs1-pad-broken2.pem: needs update
tests/pkcs1-padding/pkcs1-pad-broken3.pem: needs update
tests/pkcs1-padding/pkcs1-pad-ok.pem: needs update
tests/pkcs1-padding/pkcs1-pad-ok2.pem: needs update
tests/pkcs12-decode/.cvsignore: needs update
tests/pkcs12-decode/Makefile.am: needs update
tests/pkcs12-decode/client.p12: needs update
tests/pkcs12-decode/noclient.p12: needs update
tests/pkcs12-decode/pkcs12: needs update
tests/pkcs12-decode/unclient.p12: needs update
tests/pkcs8-decode/.cvsignore: needs update
tests/pkcs8-decode/Makefile.am: needs update
tests/pkcs8-decode/enc2pkcs8.pem: needs update
tests/pkcs8-decode/encpkcs8.pem: needs update
tests/pkcs8-decode/pkcs8: needs update
tests/pkcs8-decode/unencpkcs8.pem: needs update
tests/pskself.c: needs update
tests/resume.c: needs update
tests/rsa-md5-collision/.cvsignore: needs update
tests/rsa-md5-collision/MD5CollisionCA.cer: needs update
tests/rsa-md5-collision/Makefile.am: needs update
tests/rsa-md5-collision/README: needs update
tests/rsa-md5-collision/TargetCollidingCertificate1.cer: needs update
tests/rsa-md5-collision/TargetCollidingCertificate2.cer: needs update
tests/rsa-md5-collision/mbox: needs update
tests/rsa-md5-collision/rsa-md5-collision: needs update
tests/set_pkcs12_cred.c: needs update
tests/sha2/.cvsignore: needs update
tests/sha2/Makefile.am: needs update
tests/sha2/key-ca.pem: needs update
tests/sha2/key-subca.pem: needs update
tests/sha2/key-subsubca.pem: needs update
tests/sha2/key-user.pem: needs update
tests/sha2/sha2: needs update
tests/simple.c: needs update
tests/test1.pem: needs update
tests/test10.pem: needs update
tests/test13.pem: needs update
tests/test2.pem: needs update
tests/test20.pem: needs update
tests/test21.pem: needs update
tests/test22.pem: needs update
tests/test23.pem: needs update
tests/test24.pem: needs update
tests/test25.pem: needs update
tests/test26.pem: needs update
tests/test3.pem: needs update
tests/tlsia.c: needs update
tests/userid/.cvsignore: needs update
tests/userid/Makefile.am: needs update
tests/userid/userid: needs update
tests/userid/userid.pem: needs update
tests/utils.c: needs update
tests/utils.h: needs update
tests/x509_test.c: needs update
tests/x509paths/.cvsignore: needs update
tests/x509paths/Certificate Path Validation Testing.pdf: needs update
tests/x509paths/README: needs update
tests/x509paths/chain: needs update
tests/x509paths/x509tests.tgz: needs update
fatal: Entry 'ChangeLog' would be overwritten by merge. Cannot merge.
Merge with strategy recursive failed.
Could not merge origin into the current branch.