diff options
Diffstat (limited to 'dev-libs/ucommon/files')
4 files changed, 0 insertions, 251 deletions
diff --git a/dev-libs/ucommon/files/ucommon-6.0.3-disable_rtf_gen_doxy.patch b/dev-libs/ucommon/files/ucommon-6.0.3-disable_rtf_gen_doxy.patch deleted file mode 100644 index a872f54ffe23..000000000000 --- a/dev-libs/ucommon/files/ucommon-6.0.3-disable_rtf_gen_doxy.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/Doxyfile -+++ b/Doxyfile -@@ -37,13 +37,13 @@ - GENERATE_HTMLHELP = YES - GENERATE_TREEVIEW = YES - TREEVIEW_WIDTH = 256 --GENERATE_LATEX = YES -+GENERATE_LATEX = NO - COMPACT_LATEX = YES - PDF_HYPERLINKS = YES - USE_PDFLATEX = NO - LATEX_BATCHMODE = YES - LATEX_HIDE_INDICES = NO --GENERATE_RTF = YES -+GENERATE_RTF = NO - COMPACT_RTF = YES - RTF_HYPERLINKS = NO - GENERATE_MAN = NO diff --git a/dev-libs/ucommon/files/ucommon-6.0.3-gcrypt_autotools.patch b/dev-libs/ucommon/files/ucommon-6.0.3-gcrypt_autotools.patch deleted file mode 100644 index ff69e836a9d9..000000000000 --- a/dev-libs/ucommon/files/ucommon-6.0.3-gcrypt_autotools.patch +++ /dev/null @@ -1,59 +0,0 @@ ---- a/Makefile.am -+++ b/Makefile.am -@@ -8,6 +8,8 @@ - # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the - # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -+ACLOCAL_AMFLAGS = -I m4 -+ - AUTOMAKE_OPTIONS = no-dependencies dist-zip - EXTRA_DIST = autogen.sh README* *.pc.in *.spec.in *.spec *-config.in \ - *-config.1 Doxyfile cmodel.sh BUILDS SUPPORT COPYING* COPYRIGHT \ ---- a/configure.ac -+++ b/configure.ac -@@ -37,8 +37,12 @@ - UCOMMON_LIBS="" - OPENSSL_LINK="" - -+AM_SILENT_RULES([yes]) -+ - CHECKFLAGS="$CHECKFLAGS" - -+m4_include([m4/libgcrypt.m4]) -+ - case "$with_crypto" in - ssl|openssl) - ssl="openssl" -@@ -664,7 +668,8 @@ - ;; - gnutls|gnu) - if test ! -z "$GNUTLS_LIBS" ; then -- SECURE_LIBS="$GNUTLS_LIBS" -+ AM_PATH_LIBGCRYPT -+ SECURE_LIBS="$GNUTLS_LIBS $LIBGCRYPT_LIBS" - SECURE="gnutls" - fi - ;; ---- a/utils/Makefile.am -+++ b/utils/Makefile.am -@@ -9,9 +9,9 @@ - # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - - MAINTAINERCLEANFILES = Makefile.in Makefile --AM_CXXFLAGS = -I$(top_srcdir)/inc @UCOMMON_FLAGS@ -+AM_CXXFLAGS = -I$(top_srcdir)/inc @UCOMMON_FLAGS@ @LIBGCRYPT_CFLAGS@ - INCLUDES = -I$(top_srcdir)/inc --LDADD = ../corelib/libucommon.la @UCOMMON_LIBS@ @UCOMMON_CLINK@ -+LDADD = ../corelib/libucommon.la @UCOMMON_LIBS@ @UCOMMON_CLINK@ @LIBGCRYPT_LIBS@ - EXTRA_DIST = *.1 - - man_MANS = args.1 scrub-files.1 mdsum.1 zerofill.1 car.1 sockaddr.1 pdetach.1 -@@ -27,7 +27,7 @@ - scrub_files_LDFLAGS = @SECURE_LOCAL@ - - mdsum_SOURCES = mdsum.cpp --mdsum_LDFLAGS = @SECURE_LOCAL@ -+mdsum_LDFLAGS = @SECURE_LOCAL@ @LIBGCRYPT_LIBS@ - - zerofill_SOURCES = zerofill.cpp - zerofill_LDFLAGS = @SECURE_LOCAL@ diff --git a/dev-libs/ucommon/files/ucommon-6.0.3-install_gcrypt.m4_file.patch b/dev-libs/ucommon/files/ucommon-6.0.3-install_gcrypt.m4_file.patch deleted file mode 100644 index 502a27b1844b..000000000000 --- a/dev-libs/ucommon/files/ucommon-6.0.3-install_gcrypt.m4_file.patch +++ /dev/null @@ -1,126 +0,0 @@ ---- /dev/null -+++ m4/libgcrypt.m4 -@@ -0,0 +1,123 @@ -+dnl Autoconf macros for libgcrypt -+dnl Copyright (C) 2002, 2004 Free Software Foundation, Inc. -+dnl -+dnl This file is free software; as a special exception the author gives -+dnl unlimited permission to copy and/or distribute it, with or without -+dnl modifications, as long as this notice is preserved. -+dnl -+dnl This file is distributed in the hope that it will be useful, but -+dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -+dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -+ -+ -+dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION, -+dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) -+dnl Test for libgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS. -+dnl MINIMUN-VERSION is a string with the version number optionalliy prefixed -+dnl with the API version to also check the API compatibility. Example: -+dnl a MINIMUN-VERSION of 1:1.2.5 won't pass the test unless the installed -+dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1. Using -+dnl this features allows to prevent build against newer versions of libgcrypt -+dnl with a changed API. -+dnl -+AC_DEFUN([AM_PATH_LIBGCRYPT], -+[ AC_ARG_WITH(libgcrypt-prefix, -+ AC_HELP_STRING([--with-libgcrypt-prefix=PFX], -+ [prefix where LIBGCRYPT is installed (optional)]), -+ libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="") -+ if test x$libgcrypt_config_prefix != x ; then -+ if test x${LIBGCRYPT_CONFIG+set} != xset ; then -+ LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config -+ fi -+ fi -+ -+ AC_PATH_TOOL(LIBGCRYPT_CONFIG, libgcrypt-config, no) -+ tmp=ifelse([$1], ,1:1.2.0,$1) -+ if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then -+ req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` -+ min_libgcrypt_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` -+ else -+ req_libgcrypt_api=0 -+ min_libgcrypt_version="$tmp" -+ fi -+ -+ AC_MSG_CHECKING(for LIBGCRYPT - version >= $min_libgcrypt_version) -+ ok=no -+ if test "$LIBGCRYPT_CONFIG" != "no" ; then -+ req_major=`echo $min_libgcrypt_version | \ -+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` -+ req_minor=`echo $min_libgcrypt_version | \ -+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` -+ req_micro=`echo $min_libgcrypt_version | \ -+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` -+ libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version` -+ major=`echo $libgcrypt_config_version | \ -+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` -+ minor=`echo $libgcrypt_config_version | \ -+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'` -+ micro=`echo $libgcrypt_config_version | \ -+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'` -+ if test "$major" -gt "$req_major"; then -+ ok=yes -+ else -+ if test "$major" -eq "$req_major"; then -+ if test "$minor" -gt "$req_minor"; then -+ ok=yes -+ else -+ if test "$minor" -eq "$req_minor"; then -+ if test "$micro" -ge "$req_micro"; then -+ ok=yes -+ fi -+ fi -+ fi -+ fi -+ fi -+ fi -+ if test $ok = yes; then -+ AC_MSG_RESULT([yes ($libgcrypt_config_version)]) -+ else -+ AC_MSG_RESULT(no) -+ fi -+ if test $ok = yes; then -+ # If we have a recent libgcrypt, we should also check that the -+ # API is compatible -+ if test "$req_libgcrypt_api" -gt 0 ; then -+ tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0` -+ if test "$tmp" -gt 0 ; then -+ AC_MSG_CHECKING([LIBGCRYPT API version]) -+ if test "$req_libgcrypt_api" -eq "$tmp" ; then -+ AC_MSG_RESULT([okay]) -+ else -+ ok=no -+ AC_MSG_RESULT([does not match. want=$req_libgcrypt_api got=$tmp]) -+ fi -+ fi -+ fi -+ fi -+ if test $ok = yes; then -+ LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags` -+ LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs` -+ ifelse([$2], , :, [$2]) -+ if test x"$host" != x ; then -+ libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none` -+ if test x"$libgcrypt_config_host" != xnone ; then -+ if test x"$libgcrypt_config_host" != x"$host" ; then -+ AC_MSG_WARN([[ -+*** -+*** The config script $LIBGCRYPT_CONFIG was -+*** built for $libgcrypt_config_host and thus may not match the -+*** used host $host. -+*** You may want to use the configure option --with-libgcrypt-prefix -+*** to specify a matching config script. -+***]]) -+ fi -+ fi -+ fi -+ else -+ LIBGCRYPT_CFLAGS="" -+ LIBGCRYPT_LIBS="" -+ ifelse([$3], , :, [$3]) -+ fi -+ AC_SUBST(LIBGCRYPT_CFLAGS) -+ AC_SUBST(LIBGCRYPT_LIBS) -+]) diff --git a/dev-libs/ucommon/files/ucommon-6.3.1-gcrypt_autotools.patch b/dev-libs/ucommon/files/ucommon-6.3.1-gcrypt_autotools.patch deleted file mode 100644 index 7221890a9b7c..000000000000 --- a/dev-libs/ucommon/files/ucommon-6.3.1-gcrypt_autotools.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -38,8 +38,12 @@ - OPENSSL_LINK="" - MODULE_FLAGS="-module -shared -avoid-version" - -+AM_SILENT_RULES([yes]) -+ - CHECKFLAGS="$CHECKFLAGS" - -+m4_include([m4/libgcrypt.m4]) -+ - case "$with_crypto" in - ssl|openssl) - ssl="openssl" -@@ -598,7 +602,8 @@ - ;; - gnutls|gnu) - if test ! -z "$GNUTLS_LIBS" ; then -- SECURE_LIBS="$GNUTLS_LIBS" -+ AM_PATH_LIBGCRYPT -+ SECURE_LIBS="$GNUTLS_LIBS $LIBGCRYPT_LIBS" - SECURE="gnutls" - fi - ;; ---- a/utils/Makefile.am -+++ b/utils/Makefile.am -@@ -10,9 +10,9 @@ - # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - - MAINTAINERCLEANFILES = Makefile.in Makefile --AM_CXXFLAGS = -I$(top_srcdir)/inc @UCOMMON_FLAGS@ -+AM_CXXFLAGS = -I$(top_srcdir)/inc @UCOMMON_FLAGS@ @LIBGCRYPT_CFLAGS@ - AM_CPPFLAGS = -I$(top_srcdir)/inc --LDADD = ../corelib/libucommon.la @UCOMMON_LIBS@ -+LDADD = ../corelib/libucommon.la @UCOMMON_LIBS@ @LIBGCRYPT_LIBS@ - EXTRA_DIST = *.1 CMakeLists.txt - - man_MANS = args.1 scrub-files.1 mdsum.1 zerofill.1 car.1 sockaddr.1 \ -@@ -21,7 +21,7 @@ - - noinst_PROGRAMS = demoSSL - demoSSL_SOURCES = ssl.cpp --demoSSL_LDFLAGS = @SECURE_LOCAL@ -+demoSSL_LDFLAGS = @SECURE_LOCAL@ @LIBGCRYPT_LIBS@ - - args_SOURCES = args.cpp - |