Alexander Pyhalov
2016-11-25 f2bc8b7c390d0b2a3afb68f7ac251b5d3fc4890c
gnutls: update to 2.12.24, use libgcrypt
6 files deleted
5 files modified
835 ■■■■■ changed files
components/library/gnutls/Makefile 17 ●●●● patch | view | raw | blame | history
components/library/gnutls/gnutls.p5m 24 ●●●● patch | view | raw | blame | history
components/library/gnutls/manifests/sample-manifest.p5m 24 ●●●● patch | view | raw | blame | history
components/library/gnutls/patches/01-not-build-example.patch 16 ●●●● patch | view | raw | blame | history
components/library/gnutls/patches/02-CVE-2014-0092.patch 102 ●●●●● patch | view | raw | blame | history
components/library/gnutls/patches/03-CVE-2014-3466.patch 26 ●●●●● patch | view | raw | blame | history
components/library/gnutls/patches/04-CVE-2015-0294.patch 71 ●●●●● patch | view | raw | blame | history
components/library/gnutls/patches/05-CVE-2015-0282.patch 480 ●●●●● patch | view | raw | blame | history
components/library/gnutls/patches/06-fix_tls_poodle.patch 19 ●●●●● patch | view | raw | blame | history
components/library/gnutls/patches/07-CVE-2015-7575.patch 42 ●●●●● patch | view | raw | blame | history
components/library/gnutls/patches/08-not-build-docs.patch 14 ●●●● patch | view | raw | blame | history
components/library/gnutls/Makefile
@@ -16,14 +16,16 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= gnutls
COMPONENT_VERSION= 2.12.23
COMPONENT_VERSION= 2.12.24
COMPONENT_SUMMARY= GNU transport layer security library
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.bz2
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.xz
COMPONENT_ARCHIVE_HASH= \
  sha256:dfa67a7e40727eb0913e75f3c44911d5d8cd58d1ead5acfe73dd933fc0d17ed2
  sha256:792e127c97e5b72bacbbdad16ba7532dc7d81a6197087a574549f473c1627ce7
COMPONENT_ARCHIVE_URL= \
  ftp://ftp.gnutls.org/gcrypt/gnutls/v2.12/$(COMPONENT_ARCHIVE)
COMPONENT_SIG_URL=
  ftp://ftp.gnutls.org/gcrypt/gnutls/v2.12/$(COMPONENT_ARCHIVE).sig
COMPONENT_PROJECT_URL = http://www.gnutls.org
COMPONENT_FMRI = library/gnutls
COMPONENT_CLASSIFICATION = System/Libraries
@@ -42,6 +44,7 @@
CONFIGURE_OPTIONS += --enable-guile=no
CONFIGURE_OPTIONS += --disable-camellia
CONFIGURE_OPTIONS += --without-p11-kit
CONFIGURE_OPTIONS += --with-libgcrypt
CONFIGURE_ENV += CPPFLAGS="$(CPPFLAGS)"
@@ -50,3 +53,11 @@
install: $(INSTALL_32_and_64)
test: $(TEST_32_and_64)
REQUIRED_PACKAGES += library/libtasn1
REQUIRED_PACKAGES += library/readline
REQUIRED_PACKAGES += library/zlib
REQUIRED_PACKAGES += system/library
REQUIRED_PACKAGES += system/library/g++-4-runtime
REQUIRED_PACKAGES += system/library/gcc-4-runtime
REQUIRED_PACKAGES += system/library/security/libgcrypt
components/library/gnutls/gnutls.p5m
@@ -49,32 +49,32 @@
file path=usr/include/gnutls/pkcs11.h
file path=usr/include/gnutls/pkcs12.h
file path=usr/include/gnutls/x509.h
link path=usr/lib/$(MACH64)/libgnutls-extra.so target=libgnutls-extra.so.26.22.6
link path=usr/lib/$(MACH64)/libgnutls-extra.so target=libgnutls-extra.so.26.22.7
link path=usr/lib/$(MACH64)/libgnutls-extra.so.26 \
    target=libgnutls-extra.so.26.22.6
file path=usr/lib/$(MACH64)/libgnutls-extra.so.26.22.6
    target=libgnutls-extra.so.26.22.7
file path=usr/lib/$(MACH64)/libgnutls-extra.so.26.22.7
link path=usr/lib/$(MACH64)/libgnutls-openssl.so \
    target=libgnutls-openssl.so.27.0.0
link path=usr/lib/$(MACH64)/libgnutls-openssl.so.27 \
    target=libgnutls-openssl.so.27.0.0
file path=usr/lib/$(MACH64)/libgnutls-openssl.so.27.0.0
link path=usr/lib/$(MACH64)/libgnutls.so target=libgnutls.so.26.22.6
link path=usr/lib/$(MACH64)/libgnutls.so.26 target=libgnutls.so.26.22.6
file path=usr/lib/$(MACH64)/libgnutls.so.26.22.6
link path=usr/lib/$(MACH64)/libgnutls.so target=libgnutls.so.26.22.7
link path=usr/lib/$(MACH64)/libgnutls.so.26 target=libgnutls.so.26.22.7
file path=usr/lib/$(MACH64)/libgnutls.so.26.22.7
link path=usr/lib/$(MACH64)/libgnutlsxx.so target=libgnutlsxx.so.27.0.0
link path=usr/lib/$(MACH64)/libgnutlsxx.so.27 target=libgnutlsxx.so.27.0.0
file path=usr/lib/$(MACH64)/libgnutlsxx.so.27.0.0
file path=usr/lib/$(MACH64)/pkgconfig/gnutls-extra.pc
file path=usr/lib/$(MACH64)/pkgconfig/gnutls.pc
link path=usr/lib/libgnutls-extra.so target=libgnutls-extra.so.26.22.6
link path=usr/lib/libgnutls-extra.so.26 target=libgnutls-extra.so.26.22.6
file path=usr/lib/libgnutls-extra.so.26.22.6
link path=usr/lib/libgnutls-extra.so target=libgnutls-extra.so.26.22.7
link path=usr/lib/libgnutls-extra.so.26 target=libgnutls-extra.so.26.22.7
file path=usr/lib/libgnutls-extra.so.26.22.7
link path=usr/lib/libgnutls-openssl.so target=libgnutls-openssl.so.27.0.0
link path=usr/lib/libgnutls-openssl.so.27 target=libgnutls-openssl.so.27.0.0
file path=usr/lib/libgnutls-openssl.so.27.0.0
link path=usr/lib/libgnutls.so target=libgnutls.so.26.22.6
link path=usr/lib/libgnutls.so.26 target=libgnutls.so.26.22.6
file path=usr/lib/libgnutls.so.26.22.6
link path=usr/lib/libgnutls.so target=libgnutls.so.26.22.7
link path=usr/lib/libgnutls.so.26 target=libgnutls.so.26.22.7
file path=usr/lib/libgnutls.so.26.22.7
link path=usr/lib/libgnutlsxx.so target=libgnutlsxx.so.27.0.0
link path=usr/lib/libgnutlsxx.so.27 target=libgnutlsxx.so.27.0.0
file path=usr/lib/libgnutlsxx.so.27.0.0
components/library/gnutls/manifests/sample-manifest.p5m
@@ -46,10 +46,10 @@
file path=usr/include/gnutls/pkcs12.h
file path=usr/include/gnutls/x509.h
file path=usr/lib/$(MACH64)/libgnutls-extra.a
link path=usr/lib/$(MACH64)/libgnutls-extra.so target=libgnutls-extra.so.26.22.6
link path=usr/lib/$(MACH64)/libgnutls-extra.so target=libgnutls-extra.so.26.22.7
link path=usr/lib/$(MACH64)/libgnutls-extra.so.26 \
    target=libgnutls-extra.so.26.22.6
file path=usr/lib/$(MACH64)/libgnutls-extra.so.26.22.6
    target=libgnutls-extra.so.26.22.7
file path=usr/lib/$(MACH64)/libgnutls-extra.so.26.22.7
file path=usr/lib/$(MACH64)/libgnutls-openssl.a
link path=usr/lib/$(MACH64)/libgnutls-openssl.so \
    target=libgnutls-openssl.so.27.0.0
@@ -57,9 +57,9 @@
    target=libgnutls-openssl.so.27.0.0
file path=usr/lib/$(MACH64)/libgnutls-openssl.so.27.0.0
file path=usr/lib/$(MACH64)/libgnutls.a
link path=usr/lib/$(MACH64)/libgnutls.so target=libgnutls.so.26.22.6
link path=usr/lib/$(MACH64)/libgnutls.so.26 target=libgnutls.so.26.22.6
file path=usr/lib/$(MACH64)/libgnutls.so.26.22.6
link path=usr/lib/$(MACH64)/libgnutls.so target=libgnutls.so.26.22.7
link path=usr/lib/$(MACH64)/libgnutls.so.26 target=libgnutls.so.26.22.7
file path=usr/lib/$(MACH64)/libgnutls.so.26.22.7
file path=usr/lib/$(MACH64)/libgnutlsxx.a
link path=usr/lib/$(MACH64)/libgnutlsxx.so target=libgnutlsxx.so.27.0.0
link path=usr/lib/$(MACH64)/libgnutlsxx.so.27 target=libgnutlsxx.so.27.0.0
@@ -67,17 +67,17 @@
file path=usr/lib/$(MACH64)/pkgconfig/gnutls-extra.pc
file path=usr/lib/$(MACH64)/pkgconfig/gnutls.pc
file path=usr/lib/libgnutls-extra.a
link path=usr/lib/libgnutls-extra.so target=libgnutls-extra.so.26.22.6
link path=usr/lib/libgnutls-extra.so.26 target=libgnutls-extra.so.26.22.6
file path=usr/lib/libgnutls-extra.so.26.22.6
link path=usr/lib/libgnutls-extra.so target=libgnutls-extra.so.26.22.7
link path=usr/lib/libgnutls-extra.so.26 target=libgnutls-extra.so.26.22.7
file path=usr/lib/libgnutls-extra.so.26.22.7
file path=usr/lib/libgnutls-openssl.a
link path=usr/lib/libgnutls-openssl.so target=libgnutls-openssl.so.27.0.0
link path=usr/lib/libgnutls-openssl.so.27 target=libgnutls-openssl.so.27.0.0
file path=usr/lib/libgnutls-openssl.so.27.0.0
file path=usr/lib/libgnutls.a
link path=usr/lib/libgnutls.so target=libgnutls.so.26.22.6
link path=usr/lib/libgnutls.so.26 target=libgnutls.so.26.22.6
file path=usr/lib/libgnutls.so.26.22.6
link path=usr/lib/libgnutls.so target=libgnutls.so.26.22.7
link path=usr/lib/libgnutls.so.26 target=libgnutls.so.26.22.7
file path=usr/lib/libgnutls.so.26.22.7
file path=usr/lib/libgnutlsxx.a
link path=usr/lib/libgnutlsxx.so target=libgnutlsxx.so.27.0.0
link path=usr/lib/libgnutlsxx.so.27 target=libgnutlsxx.so.27.0.0
components/library/gnutls/patches/01-not-build-example.patch
@@ -1,15 +1,15 @@
--- gnutls-2.12.21/doc/Makefile.in.~1~    2012-11-09 02:43:20.000000000 +0400
+++ gnutls-2.12.21/doc/Makefile.in    2016-05-06 15:37:51.063922134 +0300
@@ -268,7 +268,7 @@
     distdir
--- gnutls-2.12.24/doc/Makefile.in.~1~    2016-11-04 09:55:28.000000000 +0300
+++ gnutls-2.12.24/doc/Makefile.in    2016-11-25 15:04:09.206411814 +0300
@@ -362,7 +362,7 @@
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = examples cyclo scripts manpages credentials reference
+DIST_SUBDIRS = cyclo scripts manpages credentials reference
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
@@ -1192,7 +1192,7 @@
 am__DIST_COMMON = $(gnutls_TEXINFOS) $(srcdir)/Makefile.in \
     $(top_srcdir)/build-aux/depcomp \
     $(top_srcdir)/build-aux/mdate-sh \
@@ -1295,7 +1295,7 @@
 EXTRA_DIST = TODO certtool.cfg gnutls.ps gnutls.pdf gnutls.html \
     doxygen/Doxyfile.in doxygen/Doxyfile.orig texinfo.css \
     $(guile_texi) extract-guile-c-doc.scm
components/library/gnutls/patches/02-CVE-2014-0092.patch
File was deleted
components/library/gnutls/patches/03-CVE-2014-3466.patch
File was deleted
components/library/gnutls/patches/04-CVE-2015-0294.patch
File was deleted
components/library/gnutls/patches/05-CVE-2015-0282.patch
File was deleted
components/library/gnutls/patches/06-fix_tls_poodle.patch
File was deleted
components/library/gnutls/patches/07-CVE-2015-7575.patch
File was deleted
components/library/gnutls/patches/08-not-build-docs.patch
@@ -1,11 +1,11 @@
--- gnutls-2.12.21/doc/Makefile.in.1    2016-05-06 19:01:59.898970739 +0300
+++ gnutls-2.12.21/doc/Makefile.in    2016-05-06 19:03:18.581109789 +0300
@@ -209,7 +209,7 @@
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(errcodes_SOURCES) $(printlist_SOURCES)
 DIST_SOURCES = $(errcodes_SOURCES) $(printlist_SOURCES)
--- gnutls-2.12.24/doc/Makefile.in.~2~    2016-11-25 15:07:11.563940567 +0300
+++ gnutls-2.12.24/doc/Makefile.in    2016-11-25 15:07:57.913288748 +0300
@@ -282,7 +282,7 @@
 am__v_texidevnull_ = $(am__v_texidevnull_@AM_DEFAULT_V@)
 am__v_texidevnull_0 = > /dev/null
 am__v_texidevnull_1 =
-INFO_DEPS = $(srcdir)/gnutls.info
+INFO_DEPS =
+INFO_DEPS =
 TEXINFO_TEX = $(top_srcdir)/build-aux/texinfo.tex
 am__TEXINFO_TEX_DIR = $(top_srcdir)/build-aux
 DVIS = gnutls.dvi