Fix CVE-2017-6891 in minitasn1 code

[platform/upstream/gnutls.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
old mode 100644 (file)
new mode 100755 (executable)
index 0afe4bd..6221422
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,30 +21,61 @@
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-valgrind-tests
 
-SUBDIRS = gl lib extra po
+SUBDIRS = gl lib
 
-SUBDIRS += src doc tests
+if ENABLE_DANE
+SUBDIRS += libdane
+endif
+
+SUBDIRS += po src
+if ENABLE_DOC
+SUBDIRS += doc
+endif
+if ENABLE_TESTS
+SUBDIRS += tests
+endif
 
 if HAVE_GUILE
 SUBDIRS += guile
 endif
 
-ACLOCAL_AMFLAGS = -I m4 -I gl/m4 -I src/libopts/m4
+ACLOCAL_AMFLAGS = -I m4 -I gl/m4 -I src/libopts/m4 -I src/gl/m4
 
 EXTRA_DIST = cfg.mk maint.mk .clcopying
 
 dist-hook: 
+       make -C doc/ compare-makefile
+       make -C doc/ compare-exported
+       make -C doc/manpages compare-makefile
+       @echo "*****************************************************************"
+       @echo "Checking symbol changes. If the next step fails, verify that the"
+       @echo "symbols added or removed are correct and copy symbols.last.tmp as"
+       @echo "symbols.last"
+       @echo "*****************************************************************"
+       objdump -T $(srcdir)/lib/.libs/libgnutls.so.28  | grep -v ' \*UND\*' | awk '{print $$7 "@" $$6;}' | grep -v GNUTLS_FIPS140 | grep -v GNUTLS_PRIVATE | sort -u >symbols.last.tmp
+       diff -u symbols.last symbols.last.tmp >/dev/null 2>&1
+       rm -f symbols.last.tmp
        rm -f ChangeLog
        make ChangeLog
        cp -f ChangeLog $(distdir)/
-       sed 's/\@VERSION\@/$(VERSION)/g' -i $(distdir)/src/args-std.def
-       sed 's/\@\@VERSION\@\@/$(VERSION)/g' -i $(distdir)/doc/invoke-*.texi
+       $(SED) 's/\@VERSION\@/$(VERSION)/g' -i $(distdir)/src/args-std.def
+       $(SED) 's/\@YEAR\@/$(YEAR)/g' -i $(distdir)/src/args-std.def
+       $(SED) 's/\@PACKAGE_BUGREPORT\@/$(PACKAGE_BUGREPORT)/g' -i $(distdir)/src/args-std.def
        cd $(distdir)/src/ && for i in *.def;do \
                if test x"$$i" = x"args-std.def";then  continue; fi; \
                autogen $$i; \
                cp $$i $$i.tmp; \
-               sed -i 's/@subheading \(.*\)/@*\n@var{\1}\n@*/' $$i.tmp; \
+               $(SED) -i 's/@subheading \(.*\)/@*\n@var{\1}\n@*/' $$i.tmp; \
                autogen -Tagman-cmd.tpl $$i.tmp; \
                rm -f $$i.tmp; \
                mv -f *.1 ../doc/manpages/; \
        done
+       cd $(distdir)/src/ && for i in *-args.c *-args.h;do \
+               mv $$i $$i.bak; \
+       done
+       @echo "*****************************************************************"
+       @echo "Checking whether included libopts matches the system's. If the"
+       @echo "check fails upgrade the included libopts."
+       @echo "*****************************************************************"
+       test "`autoopts-config libsrc|cut -d '-' -f 2|sed 's/.tar.gz//'`" = "`cat src/libopts/autoopts/options.h |grep OPTIONS_VERSION_STRING|cut -d '"' -f 2|sed 's/:/./g'`"
+       touch $(distdir)/doc/*.html $(distdir)/doc/*.pdf $(distdir)/doc/*.info