<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a2b21112bb3516abba6e6fd000dac830ba86254b">https://github.com/macports/macports-ports/commit/a2b21112bb3516abba6e6fd000dac830ba86254b</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new a2b2111 mhash: Do not clutter PACKAGE_* in config header
</span>a2b2111 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a2b21112bb3516abba6e6fd000dac830ba86254b
</span>Author: Rainer Müller <raimue@macports.org>
AuthorDate: Mon Aug 28 18:01:47 2017 +0200
<span style='display:block; white-space:pre;color:#404040;'> mhash: Do not clutter PACKAGE_* in config header
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> By defining PACKAGE_* macros, the mhash header cluttered the autotools
</span><span style='display:block; white-space:pre;color:#404040;'> namespace, causing dependents to use the wrong name and version number.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This problem was discovered against mcrypt(1), which subsequently gets
</span><span style='display:block; white-space:pre;color:#404040;'> a rev-bump with this commit.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> $ port -q installed \( mhash mcrypt \) and active
</span><span style='display:block; white-space:pre;color:#404040;'> mcrypt @2.6.8_0 (active)
</span><span style='display:block; white-space:pre;color:#404040;'> mhash @0.9.9.9_0 (active)
</span><span style='display:block; white-space:pre;color:#404040;'> $ mcrypt --version |& head -n1
</span><span style='display:block; white-space:pre;color:#404040;'> Mcrypt v.0.9.9 (i386-apple-darwin16.0.0)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> With this patch, the output after rebuilding mcrypt will be correct:
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> $ port -q installed \( mhash mcrypt \) and active
</span><span style='display:block; white-space:pre;color:#404040;'> mcrypt @2.6.8_1 (active)
</span><span style='display:block; white-space:pre;color:#404040;'> mhash @0.9.9.9_1 (active)
</span><span style='display:block; white-space:pre;color:#404040;'> $ mcrypt --version |& head -n1
</span><span style='display:block; white-space:pre;color:#404040;'> Mcrypt v.2.6.8 (i386-apple-darwin16.7.0)
</span>---
devel/mhash/Portfile | 5 ++
.../files/patch-autotools-namespace-stomping.diff | 95 ++++++++++++++++++++++
sysutils/mcrypt/Portfile | 1 +
3 files changed, 101 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/mhash/Portfile b/devel/mhash/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 92a77db..0a0faa4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/mhash/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/mhash/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,6 +4,7 @@ PortSystem 1.0
</span>
name mhash
version 0.9.9.9
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories devel security
maintainers ryandesign openmaintainer
license LGPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,6 +26,10 @@ checksums \
</span> sha1 d6f324e70a42a8bbf7a5458521257225afcf0caf \
rmd160 4b3e8f601687e791aed62c90cbf5850ea714129b
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-autotools-namespace-stomping.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args \
--mandir=${prefix}/share/man
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/mhash/files/patch-autotools-namespace-stomping.diff b/devel/mhash/files/patch-autotools-namespace-stomping.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..c2d64c1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/mhash/files/patch-autotools-namespace-stomping.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,95 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Upstream: https://anonscm.debian.org/cgit/collab-maint/mhash.git/tree/debian/patches/0007-autotools-namespace-stomping.patch?id=0a8a6cc7cd11d4f1a7dea8e45f5bb353f9ff5f09
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: "Barak A. Pearlmutter" <bap@debian.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 24 Jun 2013 18:05:04 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: autotools-namespace-stomping
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Via: git://pkgs.fedoraproject.org/mhash.git
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Taken from Gentoo:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+http://mirror.its.uidaho.edu/pub/gentoo-portage/app-crypt/mhash/files/mhash-0.9.9-autotools-namespace-stomping.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.in | 1 +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include/mutils/config.h.in | 22 ++++++++++++++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include/mutils/mhash_config.h.in | 21 ---------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3 files changed, 23 insertions(+), 21 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ create mode 100644 include/mutils/config.h.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/configure.in b/configure.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 17836f9..a667d94 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/configure.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/configure.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([lib/mhash.c])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AM_INIT_AUTOMAKE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_DEFINE([MHASH_VERSION], PROGRAM_VERSION, "MHash Version")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_CONFIG_HEADER([include/mutils/config.h])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CONFIG_HEADER([include/mutils/mhash_config.h])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/include/mutils/config.h.in b/include/mutils/config.h.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+new file mode 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0000000..a8db4ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/include/mutils/config.h.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* Name of package */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#undef PACKAGE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* Define to the address where bug reports for this package should be sent. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#undef PACKAGE_BUGREPORT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* Define to the full name of this package. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#undef PACKAGE_NAME
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* Define to the full name and version of this package. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#undef PACKAGE_STRING
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* Define to the one symbol short name of this package. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#undef PACKAGE_TARNAME
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* Define to the version of this package. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#undef PACKAGE_VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* Version number of package */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#undef VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/include/mutils/mhash_config.h.in b/include/mutils/mhash_config.h.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ed22aa5..9e039e6 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/include/mutils/mhash_config.h.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/include/mutils/mhash_config.h.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -181,24 +181,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Define to 1 if your C compiler doesn't accept -c and -o together. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef NO_MINUS_C_MINUS_O
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/* Name of package */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#undef PACKAGE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/* Define to the address where bug reports for this package should be sent. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#undef PACKAGE_BUGREPORT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/* Define to the full name of this package. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#undef PACKAGE_NAME
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/* Define to the full name and version of this package. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#undef PACKAGE_STRING
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/* Define to the one symbol short name of this package. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#undef PACKAGE_TARNAME
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/* Define to the version of this package. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#undef PACKAGE_VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Define to 1 if the C compiler supports function prototypes. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef PROTOTYPES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -208,9 +190,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* dmalloc */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef USE_DMALLOC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/* Version number of package */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#undef VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Define if using the dmalloc debugging malloc package */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef WITH_DMALLOC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/mcrypt/Portfile b/sysutils/mcrypt/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e3da98b..39d52d8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/mcrypt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/mcrypt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,6 +4,7 @@ PortSystem 1.0
</span>
name mcrypt
version 2.6.8
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories sysutils security
maintainers snc openmaintainer
license GPL-3+
</pre><pre style='margin:0'>
</pre>