May 2016 - macports-changes - lists.macosforge.org

[148304] trunk/dports/sysutils/tardiff
by raimue＠macports.org 03 May '16

03 May '16

Revision: 148304 https://trac.macports.org/changeset/148304 Author: raimue(a)macports.org Date: 2016-05-03 07:43:01 -0700 (Tue, 03 May 2016) Log Message: ----------- sysutils/tardiff: Add patches for CVE-2015-0857, CVE-2015-0858, and other bugs, closes #51292 Modified Paths: -------------- trunk/dports/sysutils/tardiff/Portfile Added Paths: ----------- trunk/dports/sysutils/tardiff/files/patch-CVE-2015-0857.diff trunk/dports/sysutils/tardiff/files/patch-CVE-2015-0858.diff trunk/dports/sysutils/tardiff/files/patch-fix-statistic.diff trunk/dports/sysutils/tardiff/files/patch-fix-unique-uniquebase.diff Modified: trunk/dports/sysutils/tardiff/Portfile =================================================================== --- trunk/dports/sysutils/tardiff/Portfile 2016-05-03 13:23:58 UTC (rev 148303) +++ trunk/dports/sysutils/tardiff/Portfile 2016-05-03 14:43:01 UTC (rev 148304) @@ -5,11 +5,12 @@ name tardiff version 0.1 -revision 3 +revision 4 categories sysutils textproc devel archivers license GPL platforms darwin -maintainers ryandesign +maintainers ryandesign \ + openmaintainer supported_archs noarch description compares the contents of two tarballs @@ -38,7 +39,11 @@ copy ${distpath}/${name} ${worksrcpath} } -patchfiles patch-tardiff.diff +patchfiles patch-tardiff.diff \ + patch-fix-statistic.diff \ + patch-fix-unique-uniquebase.diff \ + patch-CVE-2015-0857.diff \ + patch-CVE-2015-0858.diff use_configure no Added: trunk/dports/sysutils/tardiff/files/patch-CVE-2015-0857.diff =================================================================== --- trunk/dports/sysutils/tardiff/files/patch-CVE-2015-0857.diff (rev 0) +++ trunk/dports/sysutils/tardiff/files/patch-CVE-2015-0857.diff 2016-05-03 14:43:01 UTC (rev 148304) @@ -0,0 +1,44 @@ +Upstream: https://anonscm.debian.org/cgit/collab-maint/tardiff.git/tree/debian/patche… +Edit: gnutar instead of tar + +Description: Fix local code execution when calling diff (CVE-2015-0857) + Reported by Rainer Müller <raimue(a)codingfarm.de>. Implemented using + Text::Diff instead of diff and backticks. +Author: Axel Beckert <abe(a)debian.org> +Bug-CVE: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-0857 + +Index: tardiff +=================================================================== +--- tardiff 2016-04-28 19:19:02.194646937 +0200 ++++ tardiff 2016-04-28 19:36:41.253948109 +0200 +@@ -6,6 +6,7 @@ + # Published under GNU GPL conditions + + use strict; ++use Text::Diff; + + my $VERSION = '0.1'; + +@@ -73,7 +74,12 @@ + $flag = "-j"; + } + +- my $list = `gnutar -C $tempdir $flag -xvf $tarball 2>/dev/null`; ++ open(TARLIST, '-|', qw(gnutar -C), $tempdir, $flag, qw(-xvf), $tarball) ++ or die "Can't call tar as expected: $!"; ++ local $/ = undef; # slurp mode ++ my $list = <TARLIST> or die "Couldn't read from tar"; ++ close(TARLIST) or warn "tar exited with non-zero exit code"; ++ + return $list; + } + +@@ -116,7 +122,7 @@ + if(-d $file1 and -d $file2){ + return 0; + }elsif(-f $file1 and -f $file2){ +- my $diff = `diff $file1 $file2`; ++ my $diff = diff $file1, $file2, { STYLE => "OldStyle" }; + if($diff){ + if($opt_stats){ + my $plus = 0; Added: trunk/dports/sysutils/tardiff/files/patch-CVE-2015-0858.diff =================================================================== --- trunk/dports/sysutils/tardiff/files/patch-CVE-2015-0858.diff (rev 0) +++ trunk/dports/sysutils/tardiff/files/patch-CVE-2015-0858.diff 2016-05-03 14:43:01 UTC (rev 148304) @@ -0,0 +1,49 @@ +Upstream: https://anonscm.debian.org/cgit/collab-maint/tardiff.git/tree/debian/patche… + +Description: Fix race condition when creating temporary files (CVE-2015-0858) + Reported by Florian Weimer <fw(a)deneb.enyo.de>. Implemented using + File::Temp instead of just using the process ID inside the directory + name as suggested by Florian. +Author: Axel Beckert <abe(a)debian.org> +Bug-CVE: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-0858 + +Index: tardiff +=================================================================== +--- tardiff 2016-04-28 20:24:06.913565891 +0200 ++++ tardiff 2016-04-28 20:24:06.909565907 +0200 +@@ -7,12 +7,13 @@ + + use strict; + use Text::Diff; ++use File::Temp qw(tempdir); + + my $VERSION = '0.1'; + + my ($tarball1, $tarball2); + my ($opt_list, $opt_modified, $opt_autoskip, $opt_stats); +-my $tempdir; ++my $tempdir = tempdir( CLEANUP => 1 ); + + $SIG{'__DIE__'} = 'cleanup'; + $SIG{'TERM'} = 'cleanup'; +@@ -173,9 +174,6 @@ + sub tardiff{ + my $error = 0; + +- $tempdir = "/tmp/tardiff-$$"; +- mkdir $tempdir; +- + my $filelist1 = untar($tarball1) or die "Error: Could not unpack $tarball1."; + my $filelist2 = untar($tarball2) or die "Error: Could not unpack $tarball2."; + +@@ -216,10 +214,6 @@ + sub cleanup{ + my $handler = shift(@_); + +- if($tempdir){ +- system("rm -rf $tempdir"); +- } +- + if($handler eq "INT" or $handler eq "TERM"){ + exit 1; + } Added: trunk/dports/sysutils/tardiff/files/patch-fix-statistic.diff =================================================================== --- trunk/dports/sysutils/tardiff/files/patch-fix-statistic.diff (rev 0) +++ trunk/dports/sysutils/tardiff/files/patch-fix-statistic.diff 2016-05-03 14:43:01 UTC (rev 148304) @@ -0,0 +1,31 @@ +Upstream: https://anonscm.debian.org/cgit/collab-maint/tardiff.git/tree/debian/patche… + +Description: Fix calculation of statistics (option -s) + Using normal instead of unique diff is far easier to parse + unambiguously. +Author: Axel Beckert <abe(a)debian.org> +Bug-Debian: https://bugs.debian.org/802098 + +Index: tardiff +=================================================================== +--- tardiff 2015-10-17 16:37:09.675959837 +0200 ++++ tardiff 2015-10-17 16:40:07.739438492 +0200 +@@ -116,15 +116,15 @@ + if(-d $file1 and -d $file2){ + return 0; + }elsif(-f $file1 and -f $file2){ +- my $diff = `diff -u $file1 $file2`; ++ my $diff = `diff $file1 $file2`; + if($diff){ + if($opt_stats){ + my $plus = 0; + my $minus = 0; + foreach my $line(split(/\n/, $diff)){ +- if($line =~ /^+\ /){ ++ if($line =~ /^>/){ + $plus++; +- }elsif($line =~ /^-\ /){ ++ }elsif($line =~ /^</){ + $minus++; + } + } Added: trunk/dports/sysutils/tardiff/files/patch-fix-unique-uniquebase.diff =================================================================== --- trunk/dports/sysutils/tardiff/files/patch-fix-unique-uniquebase.diff (rev 0) +++ trunk/dports/sysutils/tardiff/files/patch-fix-unique-uniquebase.diff 2016-05-03 14:43:01 UTC (rev 148304) @@ -0,0 +1,58 @@ +Upstream: https://anonscm.debian.org/cgit/collab-maint/tardiff.git/tree/debian/patche… + +Patch to allow to compare to tar balls with the same base +directory. Also fixes an issue with listing a directory as present in +the wrong tar ball. + +Author: Axel Beckert <abe(a)debian.org> + +Index: tardiff +=================================================================== +--- tardiff 2005-05-17 14:52:27.000000000 +0200 ++++ tardiff 2011-12-01 21:56:59.000000000 +0100 +@@ -80,6 +80,7 @@ + sub analyzetar{ + my $filelist = shift(@_); + my $filehash = shift(@_); ++ my $tarball = shift(@_); + + my %files = %{$filehash}; + +@@ -92,12 +93,12 @@ + if(!$uniquebase){ + $uniquebase = $base; + }else{ +- ($base eq $uniquebase) or die "$tarball1 contains different base dirs: $base and $uniquebase"; ++ ($base eq $uniquebase) or die "$tarball contains different base dirs: $base and $uniquebase"; + } + if($files{$remainder}){ + $files{$remainder} = "__both"; + }else{ +- $files{$remainder} = "$uniquebase"; ++ $files{$remainder} = "$tarball"; + } + } + +@@ -174,8 +175,8 @@ + + my %files; + +- my ($base1, %files) = analyzetar($filelist1, \%files); +- my ($base2, %files) = analyzetar($filelist2, \%files); ++ my ($base1, %files) = analyzetar($filelist1, \%files, $tarball1); ++ my ($base2, %files) = analyzetar($filelist2, \%files, $tarball2); + + foreach my $file(sort(keys(%files))){ + next if $file eq ""; +@@ -196,9 +197,9 @@ + if($opt_list and not $modified){ + print " $file\n"; + } +- }elsif($base eq $base1){ ++ }elsif($base eq $tarball1){ + print "- $file\n"; +- }elsif($base eq $base2){ ++ }elsif($base eq $tarball2){ + print "+ $file\n"; + }else{ + print "? $file\n";

1 0

[148303] trunk/dports/databases/mongodb/Portfile
by ryandesign＠macports.org 03 May '16

03 May '16

Revision: 148303 https://trac.macports.org/changeset/148303 Author: ryandesign(a)macports.org Date: 2016-05-03 06:23:58 -0700 (Tue, 03 May 2016) Log Message: ----------- mongodb: update to 3.2.6 Modified Paths: -------------- trunk/dports/databases/mongodb/Portfile Modified: trunk/dports/databases/mongodb/Portfile =================================================================== --- trunk/dports/databases/mongodb/Portfile 2016-05-03 13:12:43 UTC (rev 148302) +++ trunk/dports/databases/mongodb/Portfile 2016-05-03 13:23:58 UTC (rev 148303) @@ -8,7 +8,7 @@ name mongodb epoch 1 -version 3.2.5 +version 3.2.6 license {AGPL-3 OpenSSLException} categories databases maintainers ryandesign @@ -22,8 +22,8 @@ master_sites http://downloads.mongodb.org/src/ distname ${name}-src-r${version} -checksums rmd160 063e93e20ed55769f2bfca118e2589ca46df58d4 \ - sha256 e99e00ee243945309c1a779bd3bc73d4fdf09ece900b14b5fa429e02142d1385 +checksums rmd160 5ff3ef27495e57d683a47105a5b1f95f48b72ffc \ + sha256 0415a9b503f62e40d2ba87f555b553757a14fac281d1d6a583d8d880b8720921 depends_build port:scons

1 0

[MacPorts] BadContent modified
by MacPorts 03 May '16

03 May '16

Page "BadContent" was changed by ryandesign(a)macports.org Diff URL: <https://trac.macports.org/wiki/BadContent?action=diff&version=217> Revision 217 Changes: -------8<------8<------8<------8<------8<------8<------8<------8<-------- Index: BadContent ========================================================================= --- BadContent (version: 216) +++ BadContent (version: 217) @@ -636,4 +636,6 @@ (?i)vks\.singh4109(a)gmail\.com (?i)sunilmaurya276402(a)gmail\.com (?i)kumartinkusingh08(a)gmail\.com +(?i)alicer-gunderson2017(a)yandex\.com +(?i)get.money }}} -------8<------8<------8<------8<------8<------8<------8<------8<-------- -- Page URL: <https://trac.macports.org/wiki/BadContent> MacPorts <https://www.macports.org/> Ports system for OS X This is an automated message. Someone added your email address to be notified of changes on 'BadContent' page. If it was not you, please report to .

1 0

[148302] trunk/dports/lang/php/Portfile
by ryandesign＠macports.org 03 May '16

03 May '16

Revision: 148302 https://trac.macports.org/changeset/148302 Author: ryandesign(a)macports.org Date: 2016-05-03 06:12:43 -0700 (Tue, 03 May 2016) Log Message: ----------- php: update php56 to 5.6.21 Modified Paths: -------------- trunk/dports/lang/php/Portfile Modified: trunk/dports/lang/php/Portfile =================================================================== --- trunk/dports/lang/php/Portfile 2016-05-03 13:00:28 UTC (rev 148301) +++ trunk/dports/lang/php/Portfile 2016-05-03 13:12:43 UTC (rev 148302) @@ -104,10 +104,10 @@ } 5.6 { epoch 2 - version 5.6.20 + version 5.6.21 use_xz yes - checksums rmd160 2e5899d6fb2a4019b37ba79f7974c6f506c4ec11 \ - sha256 2b87d40213361112af49157a435e0d4cdfd334c9b7c731c8b844932b1f444e7a + checksums rmd160 c5ae05d1666f8122199c59d5f33f2166c5842e48 \ + sha256 566ff1a486cb0485ed477a91ea292423f77a58671270ff73b74e67e3ce7084f9 } 7.0 { epoch 2

1 0

[148301] trunk/dports/devel/virtuoso-7/Portfile
by snc＠macports.org 03 May '16

03 May '16

Revision: 148301 https://trac.macports.org/changeset/148301 Author: snc(a)macports.org Date: 2016-05-03 06:00:28 -0700 (Tue, 03 May 2016) Log Message: ----------- virtuoso-7: update to 7.2.4.2 Modified Paths: -------------- trunk/dports/devel/virtuoso-7/Portfile Modified: trunk/dports/devel/virtuoso-7/Portfile =================================================================== --- trunk/dports/devel/virtuoso-7/Portfile 2016-05-03 12:43:10 UTC (rev 148300) +++ trunk/dports/devel/virtuoso-7/Portfile 2016-05-03 13:00:28 UTC (rev 148301) @@ -6,8 +6,7 @@ name virtuoso-7 set myname virtuoso -version 7.2.2 -revision 1 +version 7.2.4.2 categories devel maintainers snc openmaintainer license GPL @@ -19,8 +18,8 @@ master_sites sourceforge:project/${myname}/${myname}/${version} distname ${myname}-opensource-${version} -checksums rmd160 4af90ad754aa0ee38bf8c84d1cdb1d4ae00ccafe \ - sha256 b9324201906c5cdf24db2ea039976b6ee5afe842231d9c542c210cf2a3e65e44 +checksums rmd160 b4e432642b06dd6f6adc0d345528d75fdd3a265c \ + sha256 028075d3cf1970dbb9b79f660c833771de8be5be7403b9001d6907f64255b889 supported_archs x86_64 conflicts virtuoso-6

1 0

[148300] trunk/dports/net/snort/Portfile
by mps＠macports.org 03 May '16

03 May '16

Revision: 148300 https://trac.macports.org/changeset/148300 Author: mps(a)macports.org Date: 2016-05-03 05:43:10 -0700 (Tue, 03 May 2016) Log Message: ----------- snort: replaced depends_lib with depends_build for El Capitan openssl headers. Modified Paths: -------------- trunk/dports/net/snort/Portfile Modified: trunk/dports/net/snort/Portfile =================================================================== --- trunk/dports/net/snort/Portfile 2016-05-03 12:35:18 UTC (rev 148299) +++ trunk/dports/net/snort/Portfile 2016-05-03 12:43:10 UTC (rev 148300) @@ -120,7 +120,7 @@ platform darwin 15 { #El Capitan lacks openssl headers - depends_lib-append port:openssl + depends_build-append port:openssl } if {![variant_isset mysql51] && ![variant_isset mysql55] && ![variant_isset mariadb] && ![variant_isset percona] } {

1 0

[148299] trunk/dports/sysutils/rkhunter
by mps＠macports.org 03 May '16

03 May '16

Revision: 148299 https://trac.macports.org/changeset/148299 Author: mps(a)macports.org Date: 2016-05-03 05:35:18 -0700 (Tue, 03 May 2016) Log Message: ----------- rkhunter: code cleanup. Modified Paths: -------------- trunk/dports/sysutils/rkhunter/Portfile trunk/dports/sysutils/rkhunter/files/rkhunter.conf.local.sample Modified: trunk/dports/sysutils/rkhunter/Portfile =================================================================== --- trunk/dports/sysutils/rkhunter/Portfile 2016-05-03 12:21:54 UTC (rev 148298) +++ trunk/dports/sysutils/rkhunter/Portfile 2016-05-03 12:35:18 UTC (rev 148299) @@ -12,7 +12,7 @@ long_description ${description} platforms darwin homepage http://rkhunter.sourceforge.net/ -master_sites sourceforge +master_sites sourceforge:project/rkhunter/rkhunter/${version}/ checksums rmd160 3aa8823583117ef9a0257b6fdb2a25d84fc9622d \ sha256 789cc84a21faf669da81e648eead2e62654cfbe0b2d927119d8b1e55b22b65c3 @@ -32,11 +32,11 @@ destroot.cmd ./installer.sh destroot.args --layout custom ${prefix} --install destroot.keepdirs ${destroot}${prefix}/var/log/rkhunter -destroot.target {} +destroot.target post-destroot { xinstall ${filespath}/rkhunter.conf.local.sample ${destroot}${prefix}/etc/rkhunter - + reinplace -W ${destroot}${prefix}/etc/rkhunter "s|@PREFIX@|${prefix}|g" rkhunter.conf.local.sample xinstall -m 755 -d ${destroot}${prefix}/var/log/rkhunter } Modified: trunk/dports/sysutils/rkhunter/files/rkhunter.conf.local.sample =================================================================== --- trunk/dports/sysutils/rkhunter/files/rkhunter.conf.local.sample 2016-05-03 12:21:54 UTC (rev 148298) +++ trunk/dports/sysutils/rkhunter/files/rkhunter.conf.local.sample 2016-05-03 12:35:18 UTC (rev 148299) @@ -1,7 +1,7 @@ # rkhunter.conf.local -# version 1.0.0 -# 20150316 +# version 1.0.1 +# 20160503 # by Marius Schamschula # Tested under OS X 10.9.5 @@ -16,5 +16,5 @@ SCRIPTWHITELIST=/usr/bin/shasum # MacPorts installed scripts -SCRIPTWHITELIST=/opt/local/bin/egrep -SCRIPTWHITELIST=/opt/local/bin/fgrep +SCRIPTWHITELIST=@PREFIX@/bin/egrep +SCRIPTWHITELIST=@PREFIX@/bin/fgrep

1 0

[148298] trunk/dports/math/dolfin/Portfile
by mps＠macports.org 03 May '16

03 May '16

Revision: 148298 https://trac.macports.org/changeset/148298 Author: mps(a)macports.org Date: 2016-05-03 05:21:54 -0700 (Tue, 03 May 2016) Log Message: ----------- dolfin: code cleanup. Modified Paths: -------------- trunk/dports/math/dolfin/Portfile Modified: trunk/dports/math/dolfin/Portfile =================================================================== --- trunk/dports/math/dolfin/Portfile 2016-05-03 09:48:49 UTC (rev 148297) +++ trunk/dports/math/dolfin/Portfile 2016-05-03 12:21:54 UTC (rev 148298) @@ -150,8 +150,7 @@ } variant vtk6 description {Build with vtk6} { - depends_lib-append port:vtk - depends_lib-delete port:vtk5 + depends_lib-replace port:vtk5 port:vtk } default_variants +suitesparse

1 0

[148297] trunk/dports/science/hdf5-18/Portfile
by takeshi＠macports.org 03 May '16

03 May '16

Revision: 148297 https://trac.macports.org/changeset/148297 Author: takeshi(a)macports.org Date: 2016-05-03 02:48:49 -0700 (Tue, 03 May 2016) Log Message: ----------- hdf5-18: correct warnings Modified Paths: -------------- trunk/dports/science/hdf5-18/Portfile Modified: trunk/dports/science/hdf5-18/Portfile =================================================================== --- trunk/dports/science/hdf5-18/Portfile 2016-05-03 05:40:36 UTC (rev 148296) +++ trunk/dports/science/hdf5-18/Portfile 2016-05-03 09:48:49 UTC (rev 148297) @@ -174,8 +174,8 @@ notes { !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -hdf5 has been installed in an unsupported "Experimental" mode due to\ -selected variants. See "port variants hdf5 | grep EXPERIMENTAL" for more\ +hdf5-18 has been installed in an unsupported "Experimental" mode due to\ +selected variants. See "port variants hdf5-18 | grep EXPERIMENTAL" for more\ information. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! } @@ -183,8 +183,8 @@ pre-configure { ui_warn { !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -hdf5 will been configured in an unsupported "Experimental" mode due to\ -selected variants. See "port variants hdf5 | grep EXPERIMENTAL" for more\ +hdf5-18 will been configured in an unsupported "Experimental" mode due to\ +selected variants. See "port variants hdf5-18 | grep EXPERIMENTAL" for more\ information. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! }

1 0

[148296] trunk/dports/php/php-amqp/Portfile
by ryandesign＠macports.org 03 May '16

03 May '16

Revision: 148296 https://trac.macports.org/changeset/148296 Author: ryandesign(a)macports.org Date: 2016-05-02 22:40:36 -0700 (Mon, 02 May 2016) Log Message: ----------- php-amqp: update to 1.7.0; add php70-amqp subport Modified Paths: -------------- trunk/dports/php/php-amqp/Portfile Modified: trunk/dports/php/php-amqp/Portfile =================================================================== --- trunk/dports/php/php-amqp/Portfile 2016-05-03 05:39:48 UTC (rev 148295) +++ trunk/dports/php/php-amqp/Portfile 2016-05-03 05:40:36 UTC (rev 148296) @@ -6,13 +6,13 @@ name php-amqp epoch 1 -version 1.6.1 +version 1.7.0 categories php net platforms darwin maintainers ryandesign openmaintainer license PHP-3.01 -php.branches 5.3 5.4 5.5 5.6 +php.branches 5.3 5.4 5.5 5.6 7.0 php.pecl yes description AMQP interface for PHP @@ -23,8 +23,8 @@ and queues, as well as publish to any exchange and \ consume from any queue. -checksums rmd160 18bd3341b980f35c6790fcf391b5bc93eeb3a6f4 \ - sha256 cc24ddf7d4140fa68c127af98a59b72f8b51f73a663816e3e82d676566701d62 +checksums rmd160 900ea17b22580017802bfd68c2a6635f6bb814f1 \ + sha256 b9a642c0ae60cc5e049c169a017cc355bfc0f2478db588b20925eaa63d358e83 depends_lib-append port:rabbitmq-c

1 0