summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2007-12-12 12:39:04 +0100
committerLudovic Courtès <ludo@gnu.org>2007-12-12 12:39:04 +0100
commit340960352828c4e9bf973a072ceb100298a1c90b (patch)
tree5696955e27f947dce4f284f14feda71b29b42898
parent9920c18dc607a5d08811aa679b6642abb98ea7e0 (diff)
parent3ba1e6fc605a9cae783e1b3a7bfb28359441ab8e (diff)
downloadgnutls-340960352828c4e9bf973a072ceb100298a1c90b.tar.gz
Merge branch 'gnutls_2_2_x' of ssh://civodul@git.savannah.gnu.org/srv/git/gnutls into gnutls_2_2_x
-rw-r--r--GNUmakefile1
-rw-r--r--NEWS12
-rw-r--r--maint-cfg.mk1
3 files changed, 6 insertions, 8 deletions
diff --git a/GNUmakefile b/GNUmakefile
index 96f00f3432..8bef04f65d 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -3,7 +3,6 @@ ifneq ($(have-gnulib-files),yes)
gnulib.mk:
ln -s build-aux/GNUmakefile gnulib.mk || cp build-aux/GNUmakefile gnulib.mk
ln -s build-aux/maint.mk maint.mk || cp build-aux/maint.mk maint.mk
- mv build-aux/config.rpath{,-}
endif
-include gnulib.mk
diff --git a/NEWS b/NEWS
index c8d43c4a30..9f72f6461a 100644
--- a/NEWS
+++ b/NEWS
@@ -12,7 +12,7 @@ This fixes the self-test "rsa-md5-collision" under MinGW+Wine with
recent versions of libgcrypt. The problem was that Wine with the
libgcrypt RNG generates huge amounts of debugging output.
-** Changes compared to the v2.0 branch:
+** Major changes compared to the v2.0 branch:
*** SRP support aligned with newly published RFC 5054.
@@ -43,7 +43,7 @@ disabling padding.
*** Other minor improvements and bug fixes.
-*** Backwards incompatible API/ABI changes in GnuTLS 2.2
+** Backwards incompatible API/ABI changes in GnuTLS 2.2
To adapt to changes in the TLS extension specifications for OpenPGP
and SRP, the GnuTLS API had to be modified. This means breaking the
API and ABI backwards compatibility. That is something we try to
@@ -67,7 +67,7 @@ However, using those new APIs is not required to use GnuTLS 2.2 since
the old functions continue are still supported. This text only
discuss what you minimally have to modify.
-**** XML related changes
+*** XML related changes
The function `gnutls_x509_crt_to_xml' has been removed. It has been
deprecated and only returned an error code since GnuTLS version
1.2.11. Nobody has complained, so users doesn't seem to miss the
@@ -77,7 +77,7 @@ isn't the right place for this kind of functionality. If you want
help to find some other library to use here, please explain and
discuss your use case on help-gnutls@gnu.org.
-**** TLS Authorization related changes
+*** TLS Authorization related changes
Everything related to TLS authorizations have been removed, they were
only stub functions that returned an error code:
@@ -91,7 +91,7 @@ only stub functions that returned an error code:
gnutls_authz_send_x509_attr_cert_url
gnutls_authz_send_saml_assertion_url
-**** SRP related changes
+*** SRP related changes
The callback gnutls_srp_client_credentials_function has a new
prototype, and its semantic has changed. You need to rewrite the
callback, see the updated function documentation and SRP example code
@@ -107,7 +107,7 @@ alerts, since they are now mapped to the same value. The solution is
to drop the SRP alerts from such switch cases, as they are now
deprecated in favor of GNUTLS_A_UNKNOWN_PSK_IDENTITY.
-**** OpenPGP related changes
+*** OpenPGP related changes
The function `gnutls_certificate_set_openpgp_keyserver' have been
removed. There is no replacement functionality inside GnuTLS. If you
need keyserver functionality, consider using the GnuPG tools.
diff --git a/maint-cfg.mk b/maint-cfg.mk
index bd4e92f9b7..1d77fba6b0 100644
--- a/maint-cfg.mk
+++ b/maint-cfg.mk
@@ -28,7 +28,6 @@ endif
autoreconf:
test -f ./configure || autoreconf --install
- mv build-aux/config.rpath{-,}
bootstrap: autoreconf
./configure $(CFGFLAGS)