Hello community, here is the log from the commit of package glib-networking for openSUSE:Factory checked in at 2013-08-16 12:25:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/glib-networking (Old) and /work/SRC/openSUSE:Factory/.glib-networking.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "glib-networking" Changes: -------- --- /work/SRC/openSUSE:Factory/glib-networking/glib-networking.changes 2013-07-19 18:01:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.glib-networking.new/glib-networking.changes 2013-08-16 12:25:39.000000000 +0200 @@ -1,0 +2,9 @@ +Tue Jul 30 07:06:44 UTC 2013 - [email protected] + +- Update to version 2.37.5: + + gnutls: minimum version is now 2.12.8 (with 3.x preferred...). + + glib-networking now supports the --enable-installed-tests flag, + to install its test programs to run at other times (ie, after + updating glib). + +------------------------------------------------------------------- Old: ---- glib-networking-2.37.4.tar.xz New: ---- glib-networking-2.37.5.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glib-networking.spec ++++++ --- /var/tmp/diff_new_pack.rAQXZU/_old 2013-08-16 12:25:42.000000000 +0200 +++ /var/tmp/diff_new_pack.rAQXZU/_new 2013-08-16 12:25:42.000000000 +0200 @@ -17,7 +17,7 @@ Name: glib-networking -Version: 2.37.4 +Version: 2.37.5 Release: 0 Summary: Network-related GIO modules for glib License: LGPL-2.1+ @@ -33,7 +33,7 @@ BuildRequires: translation-update-upstream # If this BuildRequires changes because of a gio library version change, change gio_real_package accordingly BuildRequires: pkgconfig(gio-2.0) >= 2.35.8 -BuildRequires: pkgconfig(gnutls) >= 2.11.0 +BuildRequires: pkgconfig(gnutls) >= 2.12.8 BuildRequires: pkgconfig(gsettings-desktop-schemas) BuildRequires: pkgconfig(libproxy-1.0) BuildRequires: pkgconfig(p11-kit-1) >= 0.8 ++++++ glib-networking-2.37.4.tar.xz -> glib-networking-2.37.5.tar.xz ++++++ ++++ 8639 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/glib-networking-2.37.4/Makefile.am new/glib-networking-2.37.5/Makefile.am --- old/glib-networking-2.37.4/Makefile.am 2013-06-24 18:09:18.000000000 +0200 +++ new/glib-networking-2.37.5/Makefile.am 2013-07-13 22:37:52.000000000 +0200 @@ -1,5 +1,5 @@ ## Process this file with automake to produce Makefile.in -include $(top_srcdir)/Makefile.decl +include $(top_srcdir)/glib-networking.mk ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/glib-networking-2.37.4/Makefile.decl new/glib-networking-2.37.5/Makefile.decl --- old/glib-networking-2.37.4/Makefile.decl 2013-06-08 17:48:47.000000000 +0200 +++ new/glib-networking-2.37.5/Makefile.decl 1970-01-01 01:00:00.000000000 +0100 @@ -1,103 +0,0 @@ -### glib-networking declarations - -NULL = - -module_flags = -export_dynamic -avoid-version -module -no-undefined -export-symbols-regex '^g_io_module_(load|unload|query)' - -giomoduledir = $(GIO_MODULE_DIR) - -INCLUDES = \ - -DG_LOG_DOMAIN=\"GLib-Net\" \ - -DG_DISABLE_DEPRECATED \ - $(GLIB_CFLAGS) \ - $(NULL) - - -### gtester stuff from glib - -GTESTER = gtester # for non-GLIB packages -GTESTER_REPORT = gtester-report # for the GLIB package - -# initialize variables for unconditional += appending -EXTRA_DIST = -TEST_PROGS = - -### testing rules - -# test: run all tests in cwd and subdirs -test: test-nonrecursive - @ for subdir in $(SUBDIRS) . ; do \ - test "$$subdir" = "." -o "$$subdir" = "po" || \ - ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \ - done - -# test-nonrecursive: run tests only in cwd -test-nonrecursive: ${TEST_PROGS} - @test -z "$(strip ${TEST_PROGS})" || ${TEST_ENVIRONMENT} ${GTESTER} --verbose ${TEST_PROGS} - -# test-report: run tests in subdirs and generate report -# perf-report: run tests in subdirs with -m perf and generate report -# full-report: like test-report: with -m perf and -m slow -test-report perf-report full-report: ${TEST_PROGS} - @test -z "$(strip ${TEST_PROGS})" || { \ - case $@ in \ - test-report) test_options="-k";; \ - perf-report) test_options="-k -m=perf";; \ - full-report) test_options="-k -m=perf -m=slow";; \ - esac ; \ - if test -z "$$GTESTER_LOGDIR" ; then \ - ${GTESTER} --verbose $$test_options -o test-report.xml ${TEST_PROGS} ; \ - elif test -n "$(strip ${TEST_PROGS})" ; then \ - ${GTESTER} --verbose $$test_options -o `mktemp "$$GTESTER_LOGDIR/log-XXXXXX"` ${TEST_PROGS} ; \ - fi ; \ - } - @ ignore_logdir=true ; \ - if test -z "$$GTESTER_LOGDIR" ; then \ - GTESTER_LOGDIR=`mktemp -d "\`pwd\`/.testlogs-XXXXXX"`; export GTESTER_LOGDIR ; \ - ignore_logdir=false ; \ - fi ; \ - if test -d "$(top_srcdir)/.git" ; then \ - REVISION=`git describe` ; \ - else \ - REVISION=$(VERSION) ; \ - fi ; \ - for subdir in $(SUBDIRS) . ; do \ - test "$$subdir" = "." -o "$$subdir" = "po" || \ - ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \ - done ; \ - $$ignore_logdir || { \ - echo '<?xml version="1.0"?>' > [email protected] ; \ - echo '<report-collection>' >> [email protected] ; \ - echo '<info>' >> [email protected] ; \ - echo ' <package>$(PACKAGE)</package>' >> [email protected] ; \ - echo ' <version>$(VERSION)</version>' >> [email protected] ; \ - echo " <revision>$$REVISION</revision>" >> [email protected] ; \ - echo '</info>' >> [email protected] ; \ - for lf in `ls -L "$$GTESTER_LOGDIR"/.` ; do \ - sed '1,1s/^<?xml\b[^>?]*?>//' <"$$GTESTER_LOGDIR"/"$$lf" >> [email protected] ; \ - done ; \ - echo >> [email protected] ; \ - echo '</report-collection>' >> [email protected] ; \ - rm -rf "$$GTESTER_LOGDIR"/ ; \ - ${GTESTER_REPORT} --version 2>/dev/null 1>&2 ; test "$$?" != 0 || ${GTESTER_REPORT} [email protected] >[email protected] ; \ - } -.PHONY: test test-report perf-report full-report test-nonrecursive - -.PHONY: lcov genlcov lcov-clean -# use recursive makes in order to ignore errors during check -lcov: - find $(top_builddir) -name '*.gcda' -delete - -$(MAKE) $(AM_MAKEFLAGS) -k check - $(MAKE) $(AM_MAKEFLAGS) genlcov - -genlcov: - $(LTP) --directory $(top_builddir) --capture --output-file glib-lcov.info --test-name GLIB_PERF --no-checksum --compat-libtool - LANG=C $(LTP_GENHTML) --prefix $(top_builddir) --output-directory glib-lcov --title "GLib Code Coverage" --legend --show-details glib-lcov.info - -lcov-clean: - -$(LTP) --directory $(top_builddir) -z - -rm -rf glib-lcov.info glib-lcov - -find -name '*.gcda' -print | xargs rm - -# run tests in cwd as part of make check -check-local: test-nonrecursive diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/glib-networking-2.37.4/NEWS new/glib-networking-2.37.5/NEWS --- old/glib-networking-2.37.4/NEWS 2013-07-09 15:45:27.000000000 +0200 +++ new/glib-networking-2.37.5/NEWS 2013-07-29 23:21:08.000000000 +0200 @@ -1,3 +1,11 @@ +2.37.5 +====== + * gnutls: minimum version is now 2.12.8 (with 3.x preferred...) + + * glib-networking now supports the --enable-installed-tests flag, to + install its test programs to run at other times (ie, after + updating glib) + 2.37.4 ====== * proxy/gnome: further improve GNOME session detection (#701377) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/glib-networking-2.37.4/configure.ac new/glib-networking-2.37.5/configure.ac --- old/glib-networking-2.37.4/configure.ac 2013-07-09 15:44:03.000000000 +0200 +++ new/glib-networking-2.37.5/configure.ac 2013-07-29 23:21:15.000000000 +0200 @@ -1,7 +1,7 @@ AC_PREREQ(2.65) AC_CONFIG_MACRO_DIR([m4]) -AC_INIT([glib-networking],[2.37.4],[http://bugzilla.gnome.org/enter_bug.cgi?product=glib&component=network]) +AC_INIT([glib-networking],[2.37.5],[http://bugzilla.gnome.org/enter_bug.cgi?product=glib&component=network]) AC_CONFIG_SRCDIR([proxy/libproxy/glibproxyresolver.h]) AC_CONFIG_HEADERS([config.h]) @@ -44,6 +44,8 @@ AC_PATH_PROG(GIO_QUERYMODULES, gio-querymodules) AC_SUBST(GIO_QUERYMODULES) +GLIB_TESTS + dnl ***************************** dnl *** Checks for LibProxy *** dnl ***************************** @@ -82,8 +84,7 @@ dnl *** Checks for GNUTLS *** dnl ***************************** -GNUTLS_MIN_REQUIRED=2.11.0 -GNUTLS_MIN_PKCS11=2.12.8 +GNUTLS_MIN_REQUIRED=2.12.8 AC_ARG_WITH(gnutls, [AC_HELP_STRING([--with-gnutls], @@ -141,7 +142,7 @@ [with_pkcs11=check]) if test "x$with_pkcs11" != "xno"; then PKG_CHECK_MODULES(PKCS11, - [p11-kit-1 >= $P11_KIT_REQUIRED gnutls >= $GNUTLS_MIN_PKCS11], + [p11-kit-1 >= $P11_KIT_REQUIRED], [with_pkcs11=yes pkcs11_support=p11-kit tls_support="${tls_support}gnutls-pkcs11 " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/glib-networking-2.37.4/glib-networking.mk new/glib-networking-2.37.5/glib-networking.mk --- old/glib-networking-2.37.4/glib-networking.mk 1970-01-01 01:00:00.000000000 +0100 +++ new/glib-networking-2.37.5/glib-networking.mk 2013-07-13 22:37:52.000000000 +0200 @@ -0,0 +1,13 @@ +### glib-networking declarations + +module_flags = -export_dynamic -avoid-version -module -no-undefined -export-symbols-regex '^g_io_module_(load|unload|query)' + +giomoduledir = $(GIO_MODULE_DIR) + +AM_CPPFLAGS = \ + -DG_LOG_DOMAIN=\"GLib-Net\" \ + -DG_DISABLE_DEPRECATED \ + $(GLIB_CFLAGS) \ + $(NULL) + +include $(top_srcdir)/glib.mk diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/glib-networking-2.37.4/glib.mk new/glib-networking-2.37.5/glib.mk --- old/glib-networking-2.37.4/glib.mk 1970-01-01 01:00:00.000000000 +0100 +++ new/glib-networking-2.37.5/glib.mk 2013-07-13 22:37:52.000000000 +0200 @@ -0,0 +1,216 @@ +# GLIB - Library of useful C routines + +GTESTER = gtester # for non-GLIB packages +GTESTER_REPORT = gtester-report # for non-GLIB packages +#GTESTER = $(top_builddir)/glib/gtester # for the GLIB package +#GTESTER_REPORT = $(top_builddir)/glib/gtester-report # for the GLIB package +NULL = + +# initialize variables for unconditional += appending +BUILT_SOURCES = +BUILT_EXTRA_DIST = +CLEANFILES = *.log *.trs +DISTCLEANFILES = +MAINTAINERCLEANFILES = +EXTRA_DIST = +TEST_PROGS = + +installed_test_LTLIBRARIES = +installed_test_PROGRAMS = +installed_test_SCRIPTS = +nobase_installed_test_DATA = + +noinst_LTLIBRARIES = +noinst_PROGRAMS = +noinst_SCRIPTS = +noinst_DATA = + +check_LTLIBRARIES = +check_PROGRAMS = +check_SCRIPTS = +check_DATA = + +TESTS = + +### testing rules + +# test: run all tests in cwd and subdirs +test: test-nonrecursive + @ for subdir in $(SUBDIRS) . ; do \ + test "$$subdir" = "." -o "$$subdir" = "po" || \ + ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \ + done + +# test-nonrecursive: run tests only in cwd +test-nonrecursive: ${TEST_PROGS} + @test -z "${TEST_PROGS}" || G_TEST_SRCDIR="$(abs_srcdir)" G_TEST_BUILDDIR="$(abs_builddir)" G_DEBUG=gc-friendly MALLOC_CHECK_=2 MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256)) ${GTESTER} --verbose ${TEST_PROGS} + +# test-report: run tests in subdirs and generate report +# perf-report: run tests in subdirs with -m perf and generate report +# full-report: like test-report: with -m perf and -m slow +test-report perf-report full-report: ${TEST_PROGS} + @test -z "${TEST_PROGS}" || { \ + case $@ in \ + test-report) test_options="-k";; \ + perf-report) test_options="-k -m=perf";; \ + full-report) test_options="-k -m=perf -m=slow";; \ + esac ; \ + if test -z "$$GTESTER_LOGDIR" ; then \ + G_TEST_SRCDIR="$(abs_srcdir)" G_TEST_BUILDDIR="$(abs_builddir)" ${GTESTER} --verbose $$test_options -o test-report.xml ${TEST_PROGS} ; \ + elif test -n "${TEST_PROGS}" ; then \ + G_TEST_SRCDIR="$(abs_srcdir)" G_TEST_BUILDDIR="$(abs_builddir)" ${GTESTER} --verbose $$test_options -o `mktemp "$$GTESTER_LOGDIR/log-XXXXXX"` ${TEST_PROGS} ; \ + fi ; \ + } + @ ignore_logdir=true ; \ + if test -z "$$GTESTER_LOGDIR" ; then \ + GTESTER_LOGDIR=`mktemp -d "\`pwd\`/.testlogs-XXXXXX"`; export GTESTER_LOGDIR ; \ + ignore_logdir=false ; \ + fi ; \ + if test -d "$(top_srcdir)/.git" ; then \ + REVISION=`git describe` ; \ + else \ + REVISION=$(VERSION) ; \ + fi ; \ + for subdir in $(SUBDIRS) . ; do \ + test "$$subdir" = "." -o "$$subdir" = "po" || \ + ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \ + done ; \ + $$ignore_logdir || { \ + echo '<?xml version="1.0"?>' > [email protected] ; \ + echo '<report-collection>' >> [email protected] ; \ + echo '<info>' >> [email protected] ; \ + echo ' <package>$(PACKAGE)</package>' >> [email protected] ; \ + echo ' <version>$(VERSION)</version>' >> [email protected] ; \ + echo " <revision>$$REVISION</revision>" >> [email protected] ; \ + echo '</info>' >> [email protected] ; \ + for lf in `ls -L "$$GTESTER_LOGDIR"/.` ; do \ + sed '1,1s/^<?xml\b[^>?]*?>//' <"$$GTESTER_LOGDIR"/"$$lf" >> [email protected] ; \ + done ; \ + echo >> [email protected] ; \ + echo '</report-collection>' >> [email protected] ; \ + rm -rf "$$GTESTER_LOGDIR"/ ; \ + ${GTESTER_REPORT} --version 2>/dev/null 1>&2 ; test "$$?" != 0 || ${GTESTER_REPORT} [email protected] >[email protected] ; \ + } +.PHONY: test test-report perf-report full-report test-nonrecursive + +.PHONY: lcov genlcov lcov-clean +# use recursive makes in order to ignore errors during check +lcov: + -$(MAKE) $(AM_MAKEFLAGS) -k check + $(MAKE) $(AM_MAKEFLAGS) genlcov + +# we have to massage the lcov.info file slightly to hide the effect of libtool +# placing the objects files in the .libs/ directory separate from the *.c +# we also have to delete tests/.libs/libmoduletestplugin_*.gcda +genlcov: + rm -f $(top_builddir)/tests/.libs/libmoduletestplugin_*.gcda + $(LTP) --directory $(top_builddir) --capture --output-file glib-lcov.info --test-name GLIB_PERF --no-checksum --compat-libtool + LANG=C $(LTP_GENHTML) --prefix $(top_builddir) --output-directory glib-lcov --title "GLib Code Coverage" --legend --show-details glib-lcov.info + @echo "file://$(abs_top_builddir)/glib-lcov/index.html" + +lcov-clean: + -$(LTP) --directory $(top_builddir) -z + -rm -rf glib-lcov.info glib-lcov + -find -name '*.gcda' -print | xargs rm + +# run tests in cwd as part of make check +check-local: test-nonrecursive + +# We support a fairly large range of possible variables. It is expected that all types of files in a test suite +# will belong in exactly one of the following variables. +# +# First, we support the usual automake suffixes, but in lowercase, with the customary meaning: +# +# test_programs, test_scripts, test_data, test_ltlibraries +# +# The above are used to list files that are involved in both uninstalled and installed testing. The +# test_programs and test_scripts are taken to be actual testcases and will be run as part of the test suite. +# Note that _data is always used with the nobase_ automake variable name to ensure that installed test data is +# installed in the same way as it appears in the package layout. +# +# In order to mark a particular file as being only for one type of testing, use 'installed' or 'uninstalled', +# like so: +# +# installed_test_programs, uninstalled_test_programs +# installed_test_scripts, uninstalled_test_scripts +# installed_test_data, uninstalled_test_data +# installed_test_ltlibraries, uninstalled_test_ltlibraries +# +# Additionally, we support 'extra' infixes for programs and scripts. This is used for support programs/scripts +# that should not themselves be run as testcases (but exist to be used from other testcases): +# +# test_extra_programs, installed_test_extra_programs, uninstalled_test_extra_programs +# test_extra_scripts, installed_test_extra_scripts, uninstalled_test_extra_scripts +# +# Additionally, for _scripts and _data, we support the customary dist_ prefix so that the named script or data +# file automatically end up in the tarball. +# +# dist_test_scripts, dist_test_data, dist_test_extra_scripts +# dist_installed_test_scripts, dist_installed_test_data, dist_installed_test_extra_scripts +# dist_uninstalled_test_scripts, dist_uninstalled_test_data, dist_uninstalled_test_extra_scripts +# +# Note that no file is automatically disted unless it appears in one of the dist_ variables. This follows the +# standard automake convention of not disting programs scripts or data by default. +# +# test_programs, test_scripts, uninstalled_test_programs and uninstalled_test_scripts (as well as their disted +# variants) will be run as part of the in-tree 'make check'. These are all assumed to be runnable under +# gtester. That's a bit strange for scripts, but it's possible. + +# we use test -z "$(TEST_PROGS)" above, so make sure we have no extra whitespace... +TEST_PROGS += $(strip $(test_programs) $(test_scripts) $(uninstalled_test_programs) $(uninstalled_test_scripts) \ + $(dist_test_scripts) $(dist_uninstalled_test_scripts)) + +# Note: build even the installed-only targets during 'make check' to ensure that they still work. +# We need to do a bit of trickery here and manage disting via EXTRA_DIST instead of using dist_ prefixes to +# prevent automake from mistreating gmake functions like $(wildcard ...) and $(addprefix ...) as if they were +# filenames, including removing duplicate instances of the opening part before the space, eg. '$(addprefix'. +all_test_programs = $(test_programs) $(uninstalled_test_programs) $(installed_test_programs) \ + $(test_extra_programs) $(uninstalled_test_extra_programs) $(installed_test_extra_programs) +all_test_scripts = $(test_scripts) $(uninstalled_test_scripts) $(installed_test_scripts) \ + $(test_extra_scripts) $(uninstalled_test_extra_scripts) $(installed_test_extra_scripts) +all_dist_test_scripts = $(dist_test_scripts) $(dist_uninstalled_test_scripts) $(dist_installed_test_scripts) \ + $(dist_test_extra_scripts) $(dist_uninstalled_test_extra_scripts) $(dist_installed_test_extra_scripts) +all_test_scripts += $(all_dist_test_scripts) +EXTRA_DIST += $(all_dist_test_scripts) +all_test_data = $(test_data) $(uninstalled_test_data) $(installed_test_data) +all_dist_test_data = $(dist_test_data) $(dist_uninstalled_test_data) $(dist_installed_test_data) +all_test_data += $(all_dist_test_data) +EXTRA_DIST += $(all_dist_test_data) +all_test_ltlibs = $(test_ltlibraries) $(uninstalled_test_ltlibraries) $(installed_test_ltlibraries) + +if ENABLE_ALWAYS_BUILD_TESTS +noinst_LTLIBRARIES += $(all_test_ltlibs) +noinst_PROGRAMS += $(all_test_programs) +noinst_SCRIPTS += $(all_test_scripts) +noinst_DATA += $(all_test_data) +else +check_LTLIBRARIES += $(all_test_ltlibs) +check_PROGRAMS += $(all_test_programs) +check_SCRIPTS += $(all_test_scripts) +check_DATA += $(all_test_data) +endif + +if ENABLE_INSTALLED_TESTS +installed_test_PROGRAMS += $(test_programs) $(installed_test_programs) \ + $(test_extra_programs) $(installed_test_extra_programs) +installed_test_SCRIPTS += $(test_scripts) $(installed_test_scripts) \ + $(test_extra_scripts) $(test_installed_extra_scripts) +installed_test_SCRIPTS += $(dist_test_scripts) $(dist_test_extra_scripts) \ + $(dist_installed_test_scripts) $(dist_installed_test_extra_scripts) +nobase_installed_test_DATA += $(test_data) $(installed_test_data) +nobase_installed_test_DATA += $(dist_test_data) $(dist_installed_test_data) +installed_test_LTLIBRARIES += $(test_ltlibraries) $(installed_test_ltlibraries) +installed_testcases = $(test_programs) $(installed_test_programs) \ + $(test_scripts) $(installed_test_scripts) \ + $(dist_test_scripts) $(dist_installed_test_scripts) + +installed_test_meta_DATA = $(installed_testcases:=.test) + +%.test: %$(EXEEXT) Makefile + $(AM_V_GEN) (echo '[Test]' > [email protected]; \ + echo 'Type=session' >> [email protected]; \ + echo 'Exec=$(installed_testdir)/$<' >> [email protected]; \ + mv [email protected] $@) + +CLEANFILES += $(installed_test_meta_DATA) +endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/glib-networking-2.37.4/m4/glibtests.m4 new/glib-networking-2.37.5/m4/glibtests.m4 --- old/glib-networking-2.37.4/m4/glibtests.m4 1970-01-01 01:00:00.000000000 +0100 +++ new/glib-networking-2.37.5/m4/glibtests.m4 2013-07-13 21:59:04.000000000 +0200 @@ -0,0 +1,28 @@ +dnl GLIB_TESTS +dnl + +AC_DEFUN([GLIB_TESTS], +[ + AC_ARG_ENABLE(installed-tests, + AS_HELP_STRING([--enable-installed-tests], + [Enable installation of some test cases]), + [case ${enableval} in + yes) ENABLE_INSTALLED_TESTS="1" ;; + no) ENABLE_INSTALLED_TESTS="" ;; + *) AC_MSG_ERROR([bad value ${enableval} for --enable-installed-tests]) ;; + esac]) + AM_CONDITIONAL([ENABLE_INSTALLED_TESTS], test "$ENABLE_INSTALLED_TESTS" = "1") + AC_ARG_ENABLE(always-build-tests, + AS_HELP_STRING([--enable-always-build-tests], + [Enable always building tests during 'make all']), + [case ${enableval} in + yes) ENABLE_ALWAYS_BUILD_TESTS="1" ;; + no) ENABLE_ALWAYS_BUILD_TESTS="" ;; + *) AC_MSG_ERROR([bad value ${enableval} for --enable-always-build-tests]) ;; + esac]) + AM_CONDITIONAL([ENABLE_ALWAYS_BUILD_TESTS], test "$ENABLE_ALWAYS_BUILD_TESTS" = "1") + if test "$ENABLE_INSTALLED_TESTS" == "1"; then + AC_SUBST(installed_test_metadir, [${datadir}/installed-tests/]AC_PACKAGE_NAME) + AC_SUBST(installed_testdir, [${libexecdir}/installed-tests/]AC_PACKAGE_NAME) + fi +]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/glib-networking-2.37.4/proxy/gnome/Makefile.am new/glib-networking-2.37.5/proxy/gnome/Makefile.am --- old/glib-networking-2.37.4/proxy/gnome/Makefile.am 2011-12-30 15:14:01.000000000 +0100 +++ new/glib-networking-2.37.5/proxy/gnome/Makefile.am 2013-07-13 22:37:52.000000000 +0200 @@ -1,4 +1,4 @@ -include $(top_srcdir)/Makefile.decl +include $(top_srcdir)/glib-networking.mk giomodule_LTLIBRARIES = libgiognomeproxy.la @@ -8,7 +8,7 @@ gnome-proxy-module.c \ $(NULL) -INCLUDES += $(GSETTINGS_DESKTOP_SCHEMAS_CFLAGS) +AM_CPPFLAGS += $(GSETTINGS_DESKTOP_SCHEMAS_CFLAGS) libgiognomeproxy_la_LDFLAGS = $(module_flags) libgiognomeproxy_la_LIBADD = \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/glib-networking-2.37.4/proxy/libproxy/Makefile.am new/glib-networking-2.37.5/proxy/libproxy/Makefile.am --- old/glib-networking-2.37.4/proxy/libproxy/Makefile.am 2013-02-22 21:25:07.000000000 +0100 +++ new/glib-networking-2.37.5/proxy/libproxy/Makefile.am 2013-07-13 22:37:52.000000000 +0200 @@ -1,6 +1,6 @@ -include $(top_srcdir)/Makefile.decl +include $(top_srcdir)/glib-networking.mk -INCLUDES += $(LIBPROXY_CFLAGS) +AM_CPPFLAGS += $(LIBPROXY_CFLAGS) giomodule_LTLIBRARIES = libgiolibproxy.la @@ -36,7 +36,7 @@ service_DATA = $(service_in_files:.service.in=.service) EXTRA_DIST += $(service_in_files) -CLEANFILES = $(service_DATA) +CLEANFILES += $(service_DATA) org.gtk.GLib.PACRunner.service: org.gtk.GLib.PACRunner.service.in Makefile $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/glib-networking-2.37.4/proxy/tests/Makefile.am new/glib-networking-2.37.5/proxy/tests/Makefile.am --- old/glib-networking-2.37.4/proxy/tests/Makefile.am 2013-06-08 17:48:47.000000000 +0200 +++ new/glib-networking-2.37.5/proxy/tests/Makefile.am 2013-07-13 22:37:52.000000000 +0200 @@ -1,22 +1,22 @@ -include $(top_srcdir)/Makefile.decl +include $(top_srcdir)/glib-networking.mk -INCLUDES += \ +AM_CPPFLAGS += \ $(GSETTINGS_DESKTOP_SCHEMAS_CFLAGS) \ -I$(top_srcdir)/proxy \ -DSRCDIR=\""$(srcdir)"\" \ -DTOP_BUILDDIR=\""$(top_builddir)"\" -noinst_PROGRAMS = $(TEST_PROGS) - LDADD = \ $(GLIB_LIBS) +test_programs = + if HAVE_GNOME_PROXY -TEST_PROGS += gnome +test_programs += gnome endif if HAVE_LIBPROXY -TEST_PROGS += libproxy +test_programs += libproxy endif EXTRA_DIST += common.c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/glib-networking-2.37.4/test-driver new/glib-networking-2.37.5/test-driver --- old/glib-networking-2.37.4/test-driver 1970-01-01 01:00:00.000000000 +0100 +++ new/glib-networking-2.37.5/test-driver 2013-07-29 23:24:12.000000000 +0200 @@ -0,0 +1,127 @@ +#! /bin/sh +# test-driver - basic testsuite driver script. + +scriptversion=2012-06-27.10; # UTC + +# Copyright (C) 2011-2013 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program 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/>. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to <[email protected]> or send patches to +# <[email protected]>. + +# Make unconditional expansion of undefined variables an error. This +# helps a lot in preventing typo-related bugs. +set -u + +usage_error () +{ + echo "$0: $*" >&2 + print_usage >&2 + exit 2 +} + +print_usage () +{ + cat <<END +Usage: + test-driver --test-name=NAME --log-file=PATH --trs-file=PATH + [--expect-failure={yes|no}] [--color-tests={yes|no}] + [--enable-hard-errors={yes|no}] [--] TEST-SCRIPT +The '--test-name', '--log-file' and '--trs-file' options are mandatory. +END +} + +# TODO: better error handling in option parsing (in particular, ensure +# TODO: $log_file, $trs_file and $test_name are defined). +test_name= # Used for reporting. +log_file= # Where to save the output of the test script. +trs_file= # Where to save the metadata of the test run. +expect_failure=no +color_tests=no +enable_hard_errors=yes +while test $# -gt 0; do + case $1 in + --help) print_usage; exit $?;; + --version) echo "test-driver $scriptversion"; exit $?;; + --test-name) test_name=$2; shift;; + --log-file) log_file=$2; shift;; + --trs-file) trs_file=$2; shift;; + --color-tests) color_tests=$2; shift;; + --expect-failure) expect_failure=$2; shift;; + --enable-hard-errors) enable_hard_errors=$2; shift;; + --) shift; break;; + -*) usage_error "invalid option: '$1'";; + esac + shift +done + +if test $color_tests = yes; then + # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'. + red='[0;31m' # Red. + grn='[0;32m' # Green. + lgn='[1;32m' # Light green. + blu='[1;34m' # Blue. + mgn='[0;35m' # Magenta. + std='[m' # No color. +else + red= grn= lgn= blu= mgn= std= +fi + +do_exit='rm -f $log_file $trs_file; (exit $st); exit $st' +trap "st=129; $do_exit" 1 +trap "st=130; $do_exit" 2 +trap "st=141; $do_exit" 13 +trap "st=143; $do_exit" 15 + +# Test script is run here. +"$@" >$log_file 2>&1 +estatus=$? +if test $enable_hard_errors = no && test $estatus -eq 99; then + estatus=1 +fi + +case $estatus:$expect_failure in + 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;; + 0:*) col=$grn res=PASS recheck=no gcopy=no;; + 77:*) col=$blu res=SKIP recheck=no gcopy=yes;; + 99:*) col=$mgn res=ERROR recheck=yes gcopy=yes;; + *:yes) col=$lgn res=XFAIL recheck=no gcopy=yes;; + *:*) col=$red res=FAIL recheck=yes gcopy=yes;; +esac + +# Report outcome to console. +echo "${col}${res}${std}: $test_name" + +# Register the test result, and other relevant metadata. +echo ":test-result: $res" > $trs_file +echo ":global-test-result: $res" >> $trs_file +echo ":recheck: $recheck" >> $trs_file +echo ":copy-in-global-log: $gcopy" >> $trs_file + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/glib-networking-2.37.4/tls/gnutls/Makefile.am new/glib-networking-2.37.5/tls/gnutls/Makefile.am --- old/glib-networking-2.37.4/tls/gnutls/Makefile.am 2013-06-24 18:09:18.000000000 +0200 +++ new/glib-networking-2.37.5/tls/gnutls/Makefile.am 2013-07-13 22:37:52.000000000 +0200 @@ -1,4 +1,4 @@ -include $(top_srcdir)/Makefile.decl +include $(top_srcdir)/glib-networking.mk giomodule_LTLIBRARIES = libgiognutls.la @@ -47,7 +47,7 @@ $(P11_SRCS) \ $(NULL) -INCLUDES += \ +AM_CPPFLAGS += \ $(P11_CFLAGS) \ $(GNUTLS_CFLAGS) \ $(NULL) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/glib-networking-2.37.4/tls/gnutls/gtlsbackend-gnutls.c new/glib-networking-2.37.5/tls/gnutls/gtlsbackend-gnutls.c --- old/glib-networking-2.37.4/tls/gnutls/gtlsbackend-gnutls.c 2013-04-08 16:48:04.000000000 +0200 +++ new/glib-networking-2.37.5/tls/gnutls/gtlsbackend-gnutls.c 2013-07-25 18:13:19.000000000 +0200 @@ -212,7 +212,7 @@ } static GHashTable * -get_session_cache (gnutls_connection_end_t type, +get_session_cache (unsigned int type, gboolean create) { GHashTable **cache_p; @@ -227,7 +227,7 @@ } void -g_tls_backend_gnutls_store_session (gnutls_connection_end_t type, +g_tls_backend_gnutls_store_session (unsigned int type, GBytes *session_id, GBytes *session_data) { @@ -263,7 +263,7 @@ } void -g_tls_backend_gnutls_remove_session (gnutls_connection_end_t type, +g_tls_backend_gnutls_remove_session (unsigned int type, GBytes *session_id) { GHashTable *cache; @@ -278,7 +278,7 @@ } GBytes * -g_tls_backend_gnutls_lookup_session (gnutls_connection_end_t type, +g_tls_backend_gnutls_lookup_session (unsigned int type, GBytes *session_id) { GTlsBackendGnutlsCacheData *cache_data; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/glib-networking-2.37.4/tls/gnutls/gtlsbackend-gnutls.h new/glib-networking-2.37.5/tls/gnutls/gtlsbackend-gnutls.h --- old/glib-networking-2.37.4/tls/gnutls/gtlsbackend-gnutls.h 2012-01-24 01:31:22.000000000 +0100 +++ new/glib-networking-2.37.5/tls/gnutls/gtlsbackend-gnutls.h 2013-07-13 21:47:38.000000000 +0200 @@ -46,12 +46,12 @@ GType g_tls_backend_gnutls_get_type (void) G_GNUC_CONST; void g_tls_backend_gnutls_register (GIOModule *module); -void g_tls_backend_gnutls_store_session (gnutls_connection_end_t type, +void g_tls_backend_gnutls_store_session (unsigned int type, GBytes *session_id, GBytes *session_data); -void g_tls_backend_gnutls_remove_session (gnutls_connection_end_t type, +void g_tls_backend_gnutls_remove_session (unsigned int type, GBytes *session_id); -GBytes *g_tls_backend_gnutls_lookup_session (gnutls_connection_end_t type, +GBytes *g_tls_backend_gnutls_lookup_session (unsigned int type, GBytes *session_id); G_END_DECLS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/glib-networking-2.37.4/tls/gnutls/gtlscertificate-gnutls.c new/glib-networking-2.37.5/tls/gnutls/gtlscertificate-gnutls.c --- old/glib-networking-2.37.4/tls/gnutls/gtlscertificate-gnutls.c 2013-05-25 15:50:15.000000000 +0200 +++ new/glib-networking-2.37.5/tls/gnutls/gtlscertificate-gnutls.c 2013-07-13 21:47:38.000000000 +0200 @@ -371,7 +371,7 @@ gnutls_retr2_st *st) { gnutls_x509_crt_t cert; - gnutls_datum data; + gnutls_datum_t data; size_t size = 0; gnutls_x509_crt_export (gnutls->priv->cert, GNUTLS_X509_FMT_DER, @@ -429,8 +429,8 @@ } GTlsCertificate * -g_tls_certificate_gnutls_new (const gnutls_datum *datum, - GTlsCertificate *issuer) +g_tls_certificate_gnutls_new (const gnutls_datum_t *datum, + GTlsCertificate *issuer) { GTlsCertificateGnutls *gnutls; @@ -444,7 +444,7 @@ void g_tls_certificate_gnutls_set_data (GTlsCertificateGnutls *gnutls, - const gnutls_datum *datum) + const gnutls_datum_t *datum) { g_return_if_fail (G_IS_TLS_CERTIFICATE_GNUTLS (gnutls)); g_return_if_fail (!gnutls->priv->have_cert); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/glib-networking-2.37.4/tls/gnutls/gtlscertificate-gnutls.h new/glib-networking-2.37.5/tls/gnutls/gtlscertificate-gnutls.h --- old/glib-networking-2.37.4/tls/gnutls/gtlscertificate-gnutls.h 2013-05-25 15:50:15.000000000 +0200 +++ new/glib-networking-2.37.5/tls/gnutls/gtlscertificate-gnutls.h 2013-07-13 21:47:38.000000000 +0200 @@ -46,13 +46,13 @@ GType g_tls_certificate_gnutls_get_type (void) G_GNUC_CONST; -GTlsCertificate * g_tls_certificate_gnutls_new (const gnutls_datum *datum, +GTlsCertificate * g_tls_certificate_gnutls_new (const gnutls_datum_t *datum, GTlsCertificate *issuer); GBytes * g_tls_certificate_gnutls_get_bytes (GTlsCertificateGnutls *gnutls); void g_tls_certificate_gnutls_set_data (GTlsCertificateGnutls *gnutls, - const gnutls_datum *datum); + const gnutls_datum_t *datum); const gnutls_x509_crt_t g_tls_certificate_gnutls_get_cert (GTlsCertificateGnutls *gnutls); gboolean g_tls_certificate_gnutls_has_key (GTlsCertificateGnutls *gnutls); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/glib-networking-2.37.4/tls/gnutls/gtlsclientconnection-gnutls.c new/glib-networking-2.37.5/tls/gnutls/gtlsclientconnection-gnutls.c --- old/glib-networking-2.37.4/tls/gnutls/gtlsclientconnection-gnutls.c 2013-06-24 18:09:18.000000000 +0200 +++ new/glib-networking-2.37.5/tls/gnutls/gtlsclientconnection-gnutls.c 2013-07-13 21:47:38.000000000 +0200 @@ -311,7 +311,7 @@ if (gnutls->priv->session_id) { - gnutls_datum session_datum; + gnutls_datum_t session_datum; if (!*inout_error && gnutls_session_get_data2 (g_tls_connection_gnutls_get_session (conn), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/glib-networking-2.37.4/tls/gnutls/gtlsconnection-gnutls.c new/glib-networking-2.37.5/tls/gnutls/gtlsconnection-gnutls.c --- old/glib-networking-2.37.4/tls/gnutls/gtlsconnection-gnutls.c 2013-06-24 23:35:38.000000000 +0200 +++ new/glib-networking-2.37.5/tls/gnutls/gtlsconnection-gnutls.c 2013-07-13 21:47:38.000000000 +0200 @@ -95,8 +95,8 @@ GPollableInputStream *base_istream; GPollableOutputStream *base_ostream; - gnutls_certificate_credentials creds; - gnutls_session session; + gnutls_certificate_credentials_t creds; + gnutls_session_t session; GTlsCertificate *certificate, *peer_certificate; GTlsCertificateFlags peer_certificate_errors; @@ -464,13 +464,13 @@ } } -gnutls_certificate_credentials +gnutls_certificate_credentials_t g_tls_connection_gnutls_get_credentials (GTlsConnectionGnutls *gnutls) { return gnutls->priv->creds; } -gnutls_session +gnutls_session_t g_tls_connection_gnutls_get_session (GTlsConnectionGnutls *gnutls) { /* Ideally we would initialize gnutls->priv->session from diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/glib-networking-2.37.4/tls/gnutls/gtlsconnection-gnutls.h new/glib-networking-2.37.5/tls/gnutls/gtlsconnection-gnutls.h --- old/glib-networking-2.37.4/tls/gnutls/gtlsconnection-gnutls.h 2013-06-24 18:09:18.000000000 +0200 +++ new/glib-networking-2.37.5/tls/gnutls/gtlsconnection-gnutls.h 2013-07-13 21:47:38.000000000 +0200 @@ -48,9 +48,9 @@ GType g_tls_connection_gnutls_get_type (void) G_GNUC_CONST; -gnutls_certificate_credentials g_tls_connection_gnutls_get_credentials (GTlsConnectionGnutls *connection); -gnutls_session g_tls_connection_gnutls_get_session (GTlsConnectionGnutls *connection); -void g_tls_connection_gnutls_get_certificate (GTlsConnectionGnutls *gnutls, +gnutls_certificate_credentials_t g_tls_connection_gnutls_get_credentials (GTlsConnectionGnutls *connection); +gnutls_session_t g_tls_connection_gnutls_get_session (GTlsConnectionGnutls *connection); +void g_tls_connection_gnutls_get_certificate (GTlsConnectionGnutls *gnutls, gnutls_retr2_st *st); gssize g_tls_connection_gnutls_read (GTlsConnectionGnutls *gnutls, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/glib-networking-2.37.4/tls/pkcs11/Makefile.am new/glib-networking-2.37.5/tls/pkcs11/Makefile.am --- old/glib-networking-2.37.4/tls/pkcs11/Makefile.am 2012-06-22 19:27:51.000000000 +0200 +++ new/glib-networking-2.37.5/tls/pkcs11/Makefile.am 2013-07-13 22:37:52.000000000 +0200 @@ -1,6 +1,6 @@ -include $(top_srcdir)/Makefile.decl +include $(top_srcdir)/glib-networking.mk -noinst_LTLIBRARIES = \ +noinst_LTLIBRARIES += \ libgiopkcs11.la libgiopkcs11_la_SOURCES = \ @@ -19,6 +19,6 @@ $(GLIB_LIBS) \ $(NULL) -INCLUDES += \ +AM_CPPFLAGS += \ $(PKCS11_CFLAGS) \ -DG_DISABLE_DEPRECATED diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/glib-networking-2.37.4/tls/tests/Makefile.am new/glib-networking-2.37.5/tls/tests/Makefile.am --- old/glib-networking-2.37.4/tls/tests/Makefile.am 2013-06-24 18:09:18.000000000 +0200 +++ new/glib-networking-2.37.5/tls/tests/Makefile.am 2013-07-13 22:37:52.000000000 +0200 @@ -1,17 +1,15 @@ -include $(top_srcdir)/Makefile.decl +include $(top_srcdir)/glib-networking.mk -INCLUDES += \ +AM_CPPFLAGS += \ -I$(top_srcdir)/tls \ -I$(top_builddir)/tls \ -DSRCDIR=\""$(abs_srcdir)"\" \ -DTOP_BUILDDIR=\""$(top_builddir)"\" -noinst_PROGRAMS = $(TEST_PROGS) - LDADD = \ $(GLIB_LIBS) -TEST_PROGS += \ +test_programs = \ certificate \ file-database \ connection \ @@ -19,13 +17,13 @@ if HAVE_PKCS11 -TEST_PROGS += \ +test_programs += \ pkcs11-util \ pkcs11-array \ pkcs11-pin \ pkcs11-slot -INCLUDES += \ +AM_CPPFLAGS += \ $(PKCS11_CFLAGS) \ $(GNUTLS_CFLAGS) @@ -37,9 +35,6 @@ endif -DISTCLEANFILES = \ - $(NULL) - EXTRA_DIST += \ files \ $(NULL) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
