diff options
Diffstat (limited to 'dev-libs/ucommon')
| -rw-r--r-- | dev-libs/ucommon/Manifest | 5 | ||||
| -rw-r--r-- | dev-libs/ucommon/files/6.1/disable_rtf_gen_doxy.patch | 11 | ||||
| -rw-r--r-- | dev-libs/ucommon/files/6.1/gcrypt_autotools.patch | 58 | ||||
| -rw-r--r-- | dev-libs/ucommon/files/6.1/install_gcrypt.m4_file.patch | 128 | ||||
| -rw-r--r-- | dev-libs/ucommon/files/disable_rtf_gen_doxy.patch | 18 | ||||
| -rw-r--r-- | dev-libs/ucommon/files/gcrypt_autotools.patch | 62 | ||||
| -rw-r--r-- | dev-libs/ucommon/files/install_gcrypt.m4_file.patch | 128 | ||||
| -rw-r--r-- | dev-libs/ucommon/files/ucommon-5.2.2-address.patch | 42 | ||||
| -rw-r--r-- | dev-libs/ucommon/files/ucommon-6.3.1-gcrypt_autotools.patch | 48 | ||||
| -rw-r--r-- | dev-libs/ucommon/metadata.xml | 16 | ||||
| -rw-r--r-- | dev-libs/ucommon/ucommon-5.2.2-r3.ebuild | 63 | ||||
| -rw-r--r-- | dev-libs/ucommon/ucommon-6.0.3.ebuild | 75 | ||||
| -rw-r--r-- | dev-libs/ucommon/ucommon-6.1.10.ebuild | 76 | ||||
| -rw-r--r-- | dev-libs/ucommon/ucommon-6.1.8.ebuild | 75 | ||||
| -rw-r--r-- | dev-libs/ucommon/ucommon-6.3.1.ebuild | 79 |
15 files changed, 884 insertions, 0 deletions
diff --git a/dev-libs/ucommon/Manifest b/dev-libs/ucommon/Manifest new file mode 100644 index 000000000000..2af3a37edb16 --- /dev/null +++ b/dev-libs/ucommon/Manifest @@ -0,0 +1,5 @@ +DIST ucommon-5.2.2.tar.gz 792081 SHA256 9d5f3f4d1ef897482fe470b0dd65b0df516aaeb874eac3a33a455abca13f39e9 SHA512 5d5e526675cb39dffea48c38a14dff4eb1316a59c60e2352cfdbb0727ff4db00417e9704026f106da5d34f92ec2be3385b0763d66196f345f0b775bf62eb0125 WHIRLPOOL f857c4b06aff4bbb1ff84edc810d674c7d77a92bb4bcdb62fed64e77e9979c7d736b93596166de6c5fb848745aa7efc1b666231bdb6a33c3b959953b4b114ac2 +DIST ucommon-6.0.3.tar.gz 806841 SHA256 228f3a0fa78173e9fa43e154250a7ed4f1e5be720a81fd2768506c088190c432 SHA512 3ff30865a7f3fae955717c9bc2d3b37ad8f63dff8d3addc05eb9ddefa2311792f21b97ede852e22959ae6aae5114cce777a04b937aa07d564dd92d6f25f77762 WHIRLPOOL 93135ae4ec3c0e6d5203ebed6c6736b9b768d623d99a20674ee0a0ce48622d783efea6b8ca4eb22d5c2653b5059ff9626a35bf0ccfbad7d422a5cdf6c190c7c8 +DIST ucommon-6.1.10.tar.gz 833384 SHA256 d7a15ed31e3c418b41d95d5ff5e1bc24dfc4c2a465a099c6fd30e0b6c9f7be92 SHA512 6d6e716dcb71d6a4e49307baa0e9e62b4b50f3dbe8301eb93e3b562d94eb9ccee73a733928059a5ed97deba55c00308af0326a32cec6a73dbf7884c322177050 WHIRLPOOL 31666dc7e4c00b9acc7ba9d7a26033ec7ff28674722597e9677ba426b79fae45a170c5caaaa4066738d072090c2dacd465dc861aebbbd50cde36877b3b1a1e59 +DIST ucommon-6.1.8.tar.gz 833017 SHA256 9a2b3eb0b71198adcccd74303df59551fdd016c3a2848fb8be003fb1ac2e7fc5 SHA512 86fcd9b2fbafd06d87470a16bc3d377716e7040f29ccb91bf1fbe9ce66ef88e936141bd7c388d4bb63b9d4dea5e22ec9a0aae39cf3cf58e8a0e3ac9cb9b546b4 WHIRLPOOL a87ae7a929920710ad601d04bbf907c626ca4ade92d19c18ac0cba004428505d52082742ff65a0ce00862f04507e69a31012a365ababdc9bbbf5b0866c557047 +DIST ucommon-6.3.1.tar.gz 830661 SHA256 b59aa5414e756935ef9c479ece837f5700e4a5f39b0a016daa90528b175f59d5 SHA512 6f4832ac53aaf1456f2d913730b66588a89a3c1292fb79f3f56da466a2542af9c836579c0a3c4daf3f896a0c3e35f861b71514f960052adcb4e3abb872b781ec WHIRLPOOL 0bad6d56c0f1111a1aa15f7532ce6507be897a2b7ce27e452e71c08064f3f854b6864d3f7ed58ed476edf6777fc256374ab08e9c89bbb4f4abfcef8486969fed diff --git a/dev-libs/ucommon/files/6.1/disable_rtf_gen_doxy.patch b/dev-libs/ucommon/files/6.1/disable_rtf_gen_doxy.patch new file mode 100644 index 000000000000..1aaf478ed320 --- /dev/null +++ b/dev-libs/ucommon/files/6.1/disable_rtf_gen_doxy.patch @@ -0,0 +1,11 @@ +--- Doxyfile.orig 2014-06-26 23:56:45.724303475 +0300 ++++ Doxyfile 2014-06-26 23:57:12.875021734 +0300 +@@ -40,7 +40,7 @@ + GENERATE_HTMLHELP = YES + GENERATE_TREEVIEW = NO + TREEVIEW_WIDTH = 256 +-GENERATE_LATEX = YES ++GENERATE_LATEX = NO + COMPACT_LATEX = YES + PDF_HYPERLINKS = YES + USE_PDFLATEX = NO diff --git a/dev-libs/ucommon/files/6.1/gcrypt_autotools.patch b/dev-libs/ucommon/files/6.1/gcrypt_autotools.patch new file mode 100644 index 000000000000..2ec0858245d9 --- /dev/null +++ b/dev-libs/ucommon/files/6.1/gcrypt_autotools.patch @@ -0,0 +1,58 @@ +diff --git a/Makefile.am b/Makefile.am +--- 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 ++ + EXTRA_DIST = autogen.sh README* *.pc.in *.spec.in *.spec *-config.in \ + *-config.1 Doxyfile cmodel.sh BUILDS SUPPORT COPYING* COPYRIGHT \ + CMakeLists.txt ucommon-config.cmake ucommon.pc.cmake cmake-abi.sh \ +diff --git a/configure.ac b/configure.ac +--- a/configure.ac ++++ b/configure.ac +@@ -40,6 +40,9 @@ + + CHECKFLAGS="$CHECKFLAGS" + ++m4_include([m4/libgcrypt.m4]) ++ ++ + case "$with_crypto" in + ssl|openssl) + ssl="openssl" +@@ -698,6 +701,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 + ;; +diff --git a/utils/Makefile.am b/utils/Makefile.am +--- 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@ + AM_CPPFLAGS = -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 \ +@@ -30,7 +30,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/6.1/install_gcrypt.m4_file.patch b/dev-libs/ucommon/files/6.1/install_gcrypt.m4_file.patch new file mode 100644 index 000000000000..5fb0cc3b878d --- /dev/null +++ b/dev-libs/ucommon/files/6.1/install_gcrypt.m4_file.patch @@ -0,0 +1,128 @@ +diff --git a/m4/libgcrypt.m4 b/m4/libgcrypt.m4 +new file mode 100644 +--- /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/disable_rtf_gen_doxy.patch b/dev-libs/ucommon/files/disable_rtf_gen_doxy.patch new file mode 100644 index 000000000000..2fca1f7bcad7 --- /dev/null +++ b/dev-libs/ucommon/files/disable_rtf_gen_doxy.patch @@ -0,0 +1,18 @@ +--- Doxyfile.orig 2010-03-14 04:33:22.303087693 +0200 ++++ Doxyfile 2010-03-14 04:34:34.495254330 +0200 +@@ -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/gcrypt_autotools.patch b/dev-libs/ucommon/files/gcrypt_autotools.patch new file mode 100644 index 000000000000..8a5b93ffbdcd --- /dev/null +++ b/dev-libs/ucommon/files/gcrypt_autotools.patch @@ -0,0 +1,62 @@ +diff --git a/Makefile.am b/Makefile.am +--- 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 \ +diff --git a/configure.ac b/configure.ac +--- 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 + ;; +diff --git a/utils/Makefile.am b/utils/Makefile.am +--- 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/install_gcrypt.m4_file.patch b/dev-libs/ucommon/files/install_gcrypt.m4_file.patch new file mode 100644 index 000000000000..5fb0cc3b878d --- /dev/null +++ b/dev-libs/ucommon/files/install_gcrypt.m4_file.patch @@ -0,0 +1,128 @@ +diff --git a/m4/libgcrypt.m4 b/m4/libgcrypt.m4 +new file mode 100644 +--- /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-5.2.2-address.patch b/dev-libs/ucommon/files/ucommon-5.2.2-address.patch new file mode 100644 index 000000000000..142aa5941f8c --- /dev/null +++ b/dev-libs/ucommon/files/ucommon-5.2.2-address.patch @@ -0,0 +1,42 @@ +This patch fixes memory errors + +Author: David Sugar + +--- commoncpp/address.cpp ++++ commoncpp/address.cpp +@@ -360,7 +360,7 @@ + if(ipaddr) + delete[] ipaddr; + ipaddr = new struct in_addr[1]; +- memset((void *)&ipaddr[0], 0, sizeof(ipaddr)); ++ memset((void *)&ipaddr[0], 0, sizeof(struct in_addr)); + return; + } + +@@ -498,7 +498,7 @@ + : validator(_validator), hostname(NULL) { + addr_count = 1; + ipaddr = new struct in6_addr[1]; +- memcpy(ipaddr, &in6addr_any, sizeof(in6_addr)); ++ memcpy(ipaddr, &in6addr_any, sizeof(struct in6_addr)); + } + + IPV6Address::IPV6Address(const char *address, const IPV6Validator *_validator) : +@@ -716,7 +716,7 @@ + if(ipaddr) + delete[] ipaddr; + ipaddr = new struct in6_addr[1]; +- memset((void *)&ipaddr[0], 0, sizeof(ipaddr)); ++ memset((void *)&ipaddr[0], 0, sizeof(struct in6_addr)); + return; + } + +@@ -796,7 +796,7 @@ + if(ipaddr) + delete[] ipaddr; + ipaddr = new struct in6_addr[1]; +- memset((void *)&ipaddr[0], 0, sizeof(ipaddr)); ++ memset((void *)&ipaddr[0], 0, sizeof(struct in6_addr)); + return; + } + 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 new file mode 100644 index 000000000000..fb04130a0a85 --- /dev/null +++ b/dev-libs/ucommon/files/ucommon-6.3.1-gcrypt_autotools.patch @@ -0,0 +1,48 @@ +--- ucommon-6.3.1/configure.ac ++++ ucommon-6.3.1/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 + ;; +--- ucommon-6.3.1/utils/Makefile.am ++++ ucommon-6.3.1/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 + diff --git a/dev-libs/ucommon/metadata.xml b/dev-libs/ucommon/metadata.xml new file mode 100644 index 000000000000..2b98dd2884d8 --- /dev/null +++ b/dev-libs/ucommon/metadata.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>proxy-maintainers</herd> +<maintainer> + <email>andreis.vinogradovs@gmail.com</email> + <name>Andrei Vinogradov</name> +</maintainer> +<maintainer> + <email>maksbotan@gentoo.org</email> + <name>Maxim Koltsov</name> +</maintainer> +<use> + <flag name='socks'>Build with socks proxy support</flag> +</use> +</pkgmetadata> diff --git a/dev-libs/ucommon/ucommon-5.2.2-r3.ebuild b/dev-libs/ucommon/ucommon-5.2.2-r3.ebuild new file mode 100644 index 000000000000..c766aaf2055f --- /dev/null +++ b/dev-libs/ucommon/ucommon-5.2.2-r3.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="4" + +inherit autotools-utils eutils + +DESCRIPTION="Portable C++ runtime for threads and sockets" +HOMEPAGE="http://www.gnu.org/software/commoncpp" +SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz" + +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux" +IUSE="doc static-libs socks +cxx debug ssl gnutls" + +RDEPEND="ssl? ( + !gnutls? ( dev-libs/openssl ) + gnutls? ( + net-libs/gnutls[-nettle] + dev-libs/libgcrypt:0 + ) + )" + +DEPEND="virtual/pkgconfig + doc? ( app-doc/doxygen ) + ${RDEPEND}" + +DOCS=(README NEWS SUPPORT ChangeLog AUTHORS) +PATCHES=( "${FILESDIR}"/disable_rtf_gen_doxy.patch + "${FILESDIR}/${P}-address.patch") +AUTOTOOLS_IN_SOURCE_BUILD=1 + +src_configure() { + local myconf="" + if use ssl; then + myconf+=" --with-sslstack=$(usex gnutls gnu ssl) " + else + myconf+=" --with-sslstack=nossl "; + fi + + local myeconfargs=( + $(use_enable socks) + $(use_enable cxx stdcpp) + ${myconf} + --enable-atomics + --with-pkg-config + ) + autotools-utils_src_configure +} + +src_compile() { + autotools-utils_src_compile + use doc && autotools-utils_src_compile doxy +} + +src_install() { + autotools-utils_src_install + if use doc; then + dohtml doc/html/* + fi +} diff --git a/dev-libs/ucommon/ucommon-6.0.3.ebuild b/dev-libs/ucommon/ucommon-6.0.3.ebuild new file mode 100644 index 000000000000..b0561c4db1a7 --- /dev/null +++ b/dev-libs/ucommon/ucommon-6.0.3.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +AUTOTOOLS_AUTORECONF=1 + +inherit autotools-utils eutils + +DESCRIPTION="Portable C++ runtime for threads and sockets" +HOMEPAGE="http://www.gnu.org/software/commoncpp" +SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz" + +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux" +IUSE="doc static-libs socks +cxx debug ssl gnutls" + +RDEPEND="ssl? ( + !gnutls? ( dev-libs/openssl ) + gnutls? ( + net-libs/gnutls + dev-libs/libgcrypt:0 + ) + )" + +DEPEND="virtual/pkgconfig + doc? ( app-doc/doxygen ) + ${RDEPEND}" + +DOCS=(README NEWS SUPPORT ChangeLog AUTHORS) +PATCHES=( "${FILESDIR}"/disable_rtf_gen_doxy.patch + "${FILESDIR}"/install_gcrypt.m4_file.patch + "${FILESDIR}"/gcrypt_autotools.patch ) + +AUTOTOOLS_IN_SOURCE_BUILD=1 + +src_prepare() { + + # Aclocal 1.13 deprecated error #467674 + sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' -i configure.ac || die + + autotools-utils_src_prepare +} + +src_configure() { + local myconf="" + if use ssl; then + myconf+=" --with-sslstack=$(usex gnutls gnu ssl) " + else + myconf+=" --with-sslstack=nossl "; + fi + + local myeconfargs=( + $(use_enable socks) + $(use_enable cxx stdcpp) + ${myconf} + --enable-atomics + --with-pkg-config + ) + autotools-utils_src_configure +} + +src_compile() { + autotools-utils_src_compile + use doc && autotools-utils_src_compile doxy +} + +src_install() { + autotools-utils_src_install + if use doc; then + dohtml doc/html/* + fi +} diff --git a/dev-libs/ucommon/ucommon-6.1.10.ebuild b/dev-libs/ucommon/ucommon-6.1.10.ebuild new file mode 100644 index 000000000000..3aa716a65d66 --- /dev/null +++ b/dev-libs/ucommon/ucommon-6.1.10.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +AUTOTOOLS_AUTORECONF=1 + +inherit autotools-utils eutils + +DESCRIPTION="Portable C++ runtime for threads and sockets" +HOMEPAGE="http://www.gnu.org/software/commoncpp" +SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz" + +LICENSE="LGPL-3" +SLOT="0/6" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux" +IUSE="doc static-libs socks +cxx debug ssl gnutls" + +RDEPEND=" + ssl? ( + !gnutls? ( dev-libs/openssl:0= ) + gnutls? ( + net-libs/gnutls:0= + dev-libs/libgcrypt:0= + ) + )" + +DEPEND="virtual/pkgconfig + doc? ( app-doc/doxygen ) + ${RDEPEND}" + +DOCS=(README NEWS SUPPORT ChangeLog AUTHORS) +PATCHES=( "${FILESDIR}"/6.1/disable_rtf_gen_doxy.patch + "${FILESDIR}"/6.1/install_gcrypt.m4_file.patch + "${FILESDIR}"/6.1/gcrypt_autotools.patch ) + +# Needed for doxygen, bug #526726 +AUTOTOOLS_IN_SOURCE_BUILD=1 + +src_prepare() { + # Aclocal 1.13 deprecated error BGO #467674 + sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' -i configure.ac || die + + autotools-utils_src_prepare +} + +src_configure() { + local myconf="" + if use ssl; then + myconf+=" --with-sslstack=$(usex gnutls gnu ssl) " + else + myconf+=" --with-sslstack=nossl "; + fi + + local myeconfargs=( + $(use_enable socks) + $(use_enable cxx stdcpp) + ${myconf} + --enable-atomics + --with-pkg-config + ) + autotools-utils_src_configure +} + +src_compile() { + autotools-utils_src_compile + use doc && autotools-utils_src_compile doxy +} + +src_install() { + autotools-utils_src_install + if use doc; then + dohtml doc/html/* + fi +} diff --git a/dev-libs/ucommon/ucommon-6.1.8.ebuild b/dev-libs/ucommon/ucommon-6.1.8.ebuild new file mode 100644 index 000000000000..1d48a7765bff --- /dev/null +++ b/dev-libs/ucommon/ucommon-6.1.8.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +AUTOTOOLS_AUTORECONF=1 + +inherit autotools-utils eutils + +DESCRIPTION="Portable C++ runtime for threads and sockets" +HOMEPAGE="http://www.gnu.org/software/commoncpp" +SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz" + +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux" +IUSE="doc static-libs socks +cxx debug ssl gnutls" + +RDEPEND="ssl? ( + !gnutls? ( dev-libs/openssl ) + gnutls? ( + net-libs/gnutls + dev-libs/libgcrypt + ) + )" + +DEPEND="virtual/pkgconfig + doc? ( app-doc/doxygen ) + ${RDEPEND}" + +DOCS=(README NEWS SUPPORT ChangeLog AUTHORS) +PATCHES=( "${FILESDIR}"/6.1/disable_rtf_gen_doxy.patch + "${FILESDIR}"/6.1/install_gcrypt.m4_file.patch + "${FILESDIR}"/6.1/gcrypt_autotools.patch ) + +#AUTOTOOLS_IN_SOURCE_BUILD=1 + +src_prepare() { + + # Aclocal 1.13 deprecated error BGO #467674 + sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' -i configure.ac || die + + autotools-utils_src_prepare +} + +src_configure() { + local myconf="" + if use ssl; then + myconf+=" --with-sslstack=$(usex gnutls gnu ssl) " + else + myconf+=" --with-sslstack=nossl "; + fi + + local myeconfargs=( + $(use_enable socks) + $(use_enable cxx stdcpp) + ${myconf} + --enable-atomics + --with-pkg-config + ) + autotools-utils_src_configure +} + +src_compile() { + autotools-utils_src_compile + use doc && autotools-utils_src_compile doxy +} + +src_install() { + autotools-utils_src_install + if use doc; then + dohtml doc/html/* + fi +} diff --git a/dev-libs/ucommon/ucommon-6.3.1.ebuild b/dev-libs/ucommon/ucommon-6.3.1.ebuild new file mode 100644 index 000000000000..938dae96ff67 --- /dev/null +++ b/dev-libs/ucommon/ucommon-6.3.1.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +AUTOTOOLS_AUTORECONF=1 + +inherit autotools-utils eutils + +DESCRIPTION="Portable C++ runtime for threads and sockets" +HOMEPAGE="http://www.gnu.org/software/commoncpp" +SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz" + +LICENSE="LGPL-3" +SLOT="0/6" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux" +IUSE="doc static-libs socks +cxx debug ssl gnutls" + +RDEPEND=" + ssl? ( + !gnutls? ( dev-libs/openssl:0= ) + gnutls? ( + net-libs/gnutls:0= + dev-libs/libgcrypt:0= + ) + )" + +DEPEND="virtual/pkgconfig + doc? ( app-doc/doxygen ) + ${RDEPEND}" + +DOCS=(README NEWS SUPPORT ChangeLog AUTHORS) +PATCHES=( "${FILESDIR}"/6.1/install_gcrypt.m4_file.patch + "${FILESDIR}"/${PN}-6.3.1-gcrypt_autotools.patch ) + +# Needed for doxygen, bug #526726 +AUTOTOOLS_IN_SOURCE_BUILD=1 + +src_prepare() { + # Aclocal 1.13 deprecated error BGO #467674 + sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' -i configure.ac || die + + # don't install latex and rtf documents + sed -e '/^GENERATE_LATEX/s@YES@NO@' -e '/^GENERATE_RTF/s@YES@NO@' \ + -i Doxyfile.in || die + + autotools-utils_src_prepare +} + +src_configure() { + local myconf="" + if use ssl; then + myconf+=" --with-sslstack=$(usex gnutls gnu ssl) " + else + myconf+=" --with-sslstack=nossl "; + fi + + local myeconfargs=( + $(use_enable socks) + $(use_enable cxx stdcpp) + ${myconf} + --enable-atomics + --with-pkg-config + ) + autotools-utils_src_configure +} + +src_compile() { + autotools-utils_src_compile + use doc && autotools-utils_src_compile doxy +} + +src_install() { + autotools-utils_src_install + if use doc; then + dohtml doc/html/* + fi +} |