[145209] trunk/dports
raimue at macports.org
raimue at macports.org
Thu Jan 28 07:55:21 PST 2016
Revision: 145209
https://trac.macports.org/changeset/145209
Author: raimue at macports.org
Date: 2016-01-28 07:55:21 -0800 (Thu, 28 Jan 2016)
Log Message:
-----------
devel/openssl: Update to 1.0.2f
Fixes CVE-2016-0701, CVE-2015-3197.
Adapt clang detection patch for new version.
Also revbump freeradius, tor, and tor-devel.
Modified Paths:
--------------
trunk/dports/devel/openssl/Portfile
trunk/dports/devel/openssl/files/fix-Apple-clang-version-detection.patch
trunk/dports/security/tor/Portfile
trunk/dports/security/tor-devel/Portfile
trunk/dports/sysutils/freeradius/Portfile
Modified: trunk/dports/devel/openssl/Portfile
===================================================================
--- trunk/dports/devel/openssl/Portfile 2016-01-28 15:13:09 UTC (rev 145208)
+++ trunk/dports/devel/openssl/Portfile 2016-01-28 15:55:21 UTC (rev 145209)
@@ -6,7 +6,7 @@
name openssl
epoch 1
-version 1.0.2e
+version 1.0.2f
# Please revbump these ports when updating OpenSSL.
# - freeradius (#43461)
@@ -32,10 +32,10 @@
depends_lib port:zlib
master_sites http://www.openssl.org/source
-checksums md5 5262bfa25b60ed9de9f28d5d52d77fc5 \
- sha1 2c5691496761cb18f98476eefa4d35c835448fb6 \
- rmd160 324ed411043364af2ea908124225eece7d604a94 \
- sha256 e23ccafdb75cfcde782da0151731aa2185195ac745eea3846133f2e05c0e0bff
+checksums md5 b3bf73f507172be9292ea2a8c28b659d \
+ sha1 2047c592a6e5a42bd37970bdb4a931428110a927 \
+ rmd160 1065dfc99a4c549c34249700e834a08e6de9881c \
+ sha256 932b4ee4def2b434f85435d9e3e19ca8ba99ce9a065a61524b429a9d5e9b2e9c
patchfiles install-headers-HFS+.patch \
parallel-building.patch \
Modified: trunk/dports/devel/openssl/files/fix-Apple-clang-version-detection.patch
===================================================================
--- trunk/dports/devel/openssl/files/fix-Apple-clang-version-detection.patch 2016-01-28 15:13:09 UTC (rev 145208)
+++ trunk/dports/devel/openssl/files/fix-Apple-clang-version-detection.patch 2016-01-28 15:55:21 UTC (rev 145209)
@@ -19,7 +19,7 @@
$avx = ($1>=10) + ($1>=11);
}
--if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9]\.[0-9]+)/) {
+-if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|.*based on LLVM) ([3-9]\.[0-9]+)/) {
+if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^Apple (?:clang|LLVM) version) ([2-9]\.[0-9]+)/) {
+ # Apple clang versions 2.1 and 3.0 correspond to LLVM 3.0
+ # Apple clang versions 3.1 and 4.1 correspond to LLVM 3.1
@@ -27,7 +27,7 @@
+ $avx = ($2>=2.1) + ($2>=3.1);
+}
+
-+if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9]\.[0-9]+)/) {
++if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|.*based on LLVM) ([3-9]\.[0-9]+)/) {
$avx = ($2>=3.0) + ($2>3.0);
}
@@ -37,10 +37,10 @@
$avx=1 if (!$avx && $win64 && ($flavour =~ /masm/ || $ENV{ASM} =~ /ml64/) &&
`ml64 2>&1` =~ /Version ([0-9]+)\./ &&
$1>=10);
--$avx=1 if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9]\.[0-9]+)/ && $2>=3.0);
+-$avx=1 if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|.*based on LLVM) ([3-9]\.[0-9]+)/ && $2>=3.0);
+# Apple clang 2.1 and 3.0 correspond to LLVM 3.0, see http://trac.macports.org/wiki/XcodeVersionInfo
+$avx=1 if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^Apple (?:^clang|LLVM) version) ([2-9]\.[0-9]+)/ && $2>=2.1);
-+$avx=1 if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9]\.[0-9]+)/ && $2>=3.0);
++$avx=1 if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|.*based on LLVM) ([3-9]\.[0-9]+)/ && $2>=3.0);
$shaext=1; ### set to zero if compiling for 1.0.1
@@ -50,7 +50,7 @@
$avx = ($1>=10) + ($1>=12);
}
--if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9]\.[0-9]+)/) {
+-if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|.*based on LLVM) ([3-9]\.[0-9]+)/) {
+if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^Apple (?:clang|LLVM) version) ([2-9]\.[0-9]+)/) {
+ # Apple clang versions 2.1 and 3.0 correspond to LLVM 3.0
+ # Apple clang versions 3.1 and 4.1 correspond to LLVM 3.1
@@ -58,7 +58,7 @@
+ $avx = ($2>=2.1) + ($2>=3.1);
+}
+
-+if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9]\.[0-9]+)/) {
++if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|.*based on LLVM) ([3-9]\.[0-9]+)/) {
$avx = ($2>=3.0) + ($2>3.0);
}
@@ -68,13 +68,13 @@
$addx = ($1>=12);
}
--if (!$addx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9])\.([0-9]+)/) {
+-if (!$addx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|.*based on LLVM) ([3-9])\.([0-9]+)/) {
+if (!$addx && `$ENV{CC} -v 2>&1` =~ /(^Apple (?:clang|LLVM) version) ([5-9])\.([0-9]+)/) {
+ my $ver = $2 + $3/100.0; # 3.1->3.01, 3.10->3.10
+ $addx = ($ver>=5.00); # Apple LLVM version 5.0 corresponds to LLVM 3.3, see http://trac.macports.org/wiki/XcodeVersionInfo
+}
+
-+if (!$addx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9])\.([0-9]+)/) {
++if (!$addx && `$ENV{CC} -v 2>&1` =~ /(^clang version|.*based on LLVM) ([3-9])\.([0-9]+)/) {
my $ver = $2 + $3/100.0; # 3.1->3.01, 3.10->3.10
$addx = ($ver>=3.03);
}
@@ -84,13 +84,13 @@
$addx = ($1>=12);
}
--if (!$addx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9])\.([0-9]+)/) {
+-if (!$addx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|.*based on LLVM) ([3-9])\.([0-9]+)/) {
+if (!$addx && `$ENV{CC} -v 2>&1` =~ /(^Apple (?:clang|LLVM) version) ([5-9])\.([0-9]+)/) {
+ my $ver = $2 + $3/100.0; # 3.1->3.01, 3.10->3.10
+ $addx = ($ver>=5.00); # Apple LLVM version 5.0 corresponds to LLVM 3.3, see http://trac.macports.org/wiki/XcodeVersionInfo
+}
+
-+if (!$addx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9])\.([0-9]+)/) {
++if (!$addx && `$ENV{CC} -v 2>&1` =~ /(^clang version|.*based on LLVM) ([3-9])\.([0-9]+)/) {
my $ver = $2 + $3/100.0; # 3.1->3.01, 3.10->3.10
$addx = ($ver>=3.03);
}
@@ -100,13 +100,13 @@
$addx = ($1>=12);
}
--if (!$addx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9])\.([0-9]+)/) {
+-if (!$addx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|.*based on LLVM) ([3-9])\.([0-9]+)/) {
+if (!$addx && `$ENV{CC} -v 2>&1` =~ /(^Apple (?:clang|LLVM) version) ([5-9])\.([0-9]+)/) {
+ my $ver = $2 + $3/100.0; # 3.1->3.01, 3.10->3.10
+ $addx = ($ver>=5.00); # Apple LLVM version 5.0 corresponds to LLVM 3.3, see http://trac.macports.org/wiki/XcodeVersionInfo
+}
+
-+if (!$addx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9])\.([0-9]+)/) {
++if (!$addx && `$ENV{CC} -v 2>&1` =~ /(^clang version|.*based on LLVM) ([3-9])\.([0-9]+)/) {
my $ver = $2 + $3/100.0; # 3.1->3.01, 3.10->3.10
$addx = ($ver>=3.03);
}
@@ -116,7 +116,7 @@
$addx = ($1>=12);
}
--if (!$addx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9])\.([0-9]+)/) {
+-if (!$addx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|.*based on LLVM) ([3-9])\.([0-9]+)/) {
+if (!$addx && `$ENV{CC} -v 2>&1` =~ /(^Apple (?:clang|LLVM) version) ([2-9])\.([0-9]+)/) {
+ my $ver = $2 + $3/100.0; # 3.1->3.01, 3.10->3.10
+ # Apple clang versions 2.1 and 3.0 correspond to LLVM 3.0
@@ -126,7 +126,7 @@
+ $addx = ($ver>=5.00);
+}
+
-+if (!$addx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9])\.([0-9]+)/) {
++if (!$addx && `$ENV{CC} -v 2>&1` =~ /(^clang version|.*based on LLVM) ([3-9])\.([0-9]+)/) {
my $ver = $2 + $3/100.0; # 3.1->3.01, 3.10->3.10
$avx = ($ver>=3.0) + ($ver>=3.01);
$addx = ($ver>=3.03);
@@ -136,14 +136,14 @@
$avx = ($1>=10) + ($1>=11);
}
--if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9]\.[0-9]+)/) {
+-if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|.*based on LLVM) ([3-9]\.[0-9]+)/) {
+if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^Apple (?:^clang|LLVM) version) ([2-9]\.[0-9]+)/) {
+ # Apple clang versions 2.1 and 3.0 correspond to LLVM 3.0
+ # Apple clang versions 3.1 and 4.1 correspond to LLVM 3.1
+ $avx = ($2>=2.1) + ($2>=3.1);
+}
+
-+if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9]\.[0-9]+)/) {
++if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|.*based on LLVM) ([3-9]\.[0-9]+)/) {
$avx = ($2>=3.0) + ($2>3.0);
}
@@ -153,14 +153,14 @@
$avx = ($1>=10) + ($1>=11);
}
--if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9]\.[0-9]+)/) {
+-if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|.*based on LLVM) ([3-9]\.[0-9]+)/) {
+if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^Apple (?:^clang|LLVM) version) ([2-9]\.[0-9]+)/) {
+ # Apple clang versions 2.1 and 3.0 correspond to LLVM 3.0
+ # Apple clang versions 3.1 and 4.1 correspond to LLVM 3.1
+ $avx = ($2>=2.1) + ($2>=3.1);
+}
+
-+if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9]\.[0-9]+)/) {
++if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|.*based on LLVM) ([3-9]\.[0-9]+)/) {
$avx = ($2>=3.0) + ($2>3.0);
}
@@ -170,14 +170,14 @@
$avx = ($1>=10) + ($1>=11);
}
--if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9]\.[0-9]+)/) {
+-if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|.*based on LLVM) ([3-9]\.[0-9]+)/) {
+if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^Apple (?:^clang|LLVM) version) ([2-9]\.[0-9]+)/) {
+ # Apple clang versions 2.1 and 3.0 correspond to LLVM 3.0
+ # Apple clang versions 3.1 and 4.1 correspond to LLVM 3.1
+ $avx = ($2>=2.1) + ($2>=3.1);
+}
+
-+if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9]\.[0-9]+)/) {
++if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|.*based on LLVM) ([3-9]\.[0-9]+)/) {
$avx = ($2>=3.0) + ($2>3.0);
}
@@ -187,14 +187,14 @@
$avx = ($1>=10) + ($1>=11);
}
--if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([2-9]\.[0-9]+)/) {
+-if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|.*based on LLVM) ([2-9]\.[0-9]+)/) {
+if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^Apple (?:^clang|LLVM) version) ([2-9]\.[0-9]+)/) {
+ # Apple clang versions 2.1 and 3.0 correspond to LLVM 3.0
+ # Apple clang versions 3.1 and 4.1 correspond to LLVM 3.1
+ $avx = ($2>=2.1) + ($2>=3.1);
+}
+
-+if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9]\.[0-9]+)/) {
++if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|.*based on LLVM) ([3-9]\.[0-9]+)/) {
$avx = ($2>=3.0) + ($2>3.0);
}
@@ -204,14 +204,14 @@
$avx = ($1>=10) + ($1>=11);
}
--if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9]\.[0-9]+)/) {
+-if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|.*based on LLVM) ([3-9]\.[0-9]+)/) {
+if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^Apple (?:^clang|LLVM) version) ([2-9]\.[0-9]+)/) {
+ # Apple clang versions 2.1 and 3.0 correspond to LLVM 3.0
+ # Apple clang versions 3.1 and 4.1 correspond to LLVM 3.1
+ $avx = ($2>=2.1) + ($2>=3.1);
+}
+
-+if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9]\.[0-9]+)/) {
++if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|.*based on LLVM) ([3-9]\.[0-9]+)/) {
$avx = ($2>=3.0) + ($2>3.0);
}
@@ -221,14 +221,14 @@
$avx = ($1>=10) + ($1>=11);
}
--if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9]\.[0-9]+)/) {
+-if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|.*based on LLVM) ([3-9]\.[0-9]+)/) {
+if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^Apple (?:^clang|LLVM) version) ([2-9]\.[0-9]+)/) {
+ # Apple clang versions 2.1 and 3.0 correspond to LLVM 3.0
+ # Apple clang versions 3.1 and 4.1 correspond to LLVM 3.1
+ $avx = ($2>=2.1) + ($2>=3.1);
+}
+
-+if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9]\.[0-9]+)/) {
++if (!$avx && `$ENV{CC} -v 2>&1` =~ /(^clang version|.*based on LLVM) ([3-9]\.[0-9]+)/) {
$avx = ($2>=3.0) + ($2>3.0);
}
Modified: trunk/dports/security/tor/Portfile
===================================================================
--- trunk/dports/security/tor/Portfile 2016-01-28 15:13:09 UTC (rev 145208)
+++ trunk/dports/security/tor/Portfile 2016-01-28 15:55:21 UTC (rev 145209)
@@ -6,6 +6,7 @@
name tor
conflicts tor-devel
version 0.2.7.6
+revision 1
categories security
platforms darwin
maintainers maclemon.at:macports.org openmaintainer
Modified: trunk/dports/security/tor-devel/Portfile
===================================================================
--- trunk/dports/security/tor-devel/Portfile 2016-01-28 15:13:09 UTC (rev 145208)
+++ trunk/dports/security/tor-devel/Portfile 2016-01-28 15:55:21 UTC (rev 145209)
@@ -6,7 +6,7 @@
name tor-devel
conflicts tor
version 0.2.7.6
-#revision 0
+revision 1
categories security
platforms darwin
maintainers maclemon.at:macports.org openmaintainer
Modified: trunk/dports/sysutils/freeradius/Portfile
===================================================================
--- trunk/dports/sysutils/freeradius/Portfile 2016-01-28 15:13:09 UTC (rev 145208)
+++ trunk/dports/sysutils/freeradius/Portfile 2016-01-28 15:55:21 UTC (rev 145209)
@@ -5,7 +5,7 @@
name freeradius
version 2.2.4
-revision 8
+revision 9
categories sysutils
maintainers nomaintainer
homepage http://www.freeradius.org/
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160128/b5258ffa/attachment.html>
More information about the macports-changes
mailing list