From owner-svn-ports-branches@freebsd.org Sun Aug 16 05:35:31 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0555D9B9284; Sun, 16 Aug 2015 05:35:31 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E7B621839; Sun, 16 Aug 2015 05:35:30 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7G5ZUYu079890; Sun, 16 Aug 2015 05:35:30 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7G5ZTWa079880; Sun, 16 Aug 2015 05:35:29 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201508160535.t7G5ZTWa079880@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 16 Aug 2015 05:35:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r394388 - in branches/2015Q3/mail: linux-thunderbird thunderbird thunderbird-i18n X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Aug 2015 05:35:31 -0000 Author: jbeich Date: Sun Aug 16 05:35:28 2015 New Revision: 394388 URL: https://svnweb.freebsd.org/changeset/ports/394388 Log: MFH: r394369 - Update Thunderbird to 38.2.0 Changes: https://www.mozilla.org/thunderbird/38.2.0/releasenotes/ Security: https://vuxml.freebsd.org/freebsd/c66a5632-708a-4727-8236-d65b2d5b2739.html Approved by: ports-secteam (feld) Modified: branches/2015Q3/mail/linux-thunderbird/Makefile branches/2015Q3/mail/linux-thunderbird/distinfo branches/2015Q3/mail/linux-thunderbird/pkg-plist branches/2015Q3/mail/thunderbird-i18n/Makefile branches/2015Q3/mail/thunderbird-i18n/distinfo branches/2015Q3/mail/thunderbird/Makefile branches/2015Q3/mail/thunderbird/distinfo Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/mail/linux-thunderbird/Makefile ============================================================================== --- branches/2015Q3/mail/linux-thunderbird/Makefile Sun Aug 16 04:12:18 2015 (r394387) +++ branches/2015Q3/mail/linux-thunderbird/Makefile Sun Aug 16 05:35:28 2015 (r394388) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= thunderbird -DISTVERSION= 38.1.0 +DISTVERSION= 38.2.0 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/linux-i686/en-US Modified: branches/2015Q3/mail/linux-thunderbird/distinfo ============================================================================== --- branches/2015Q3/mail/linux-thunderbird/distinfo Sun Aug 16 04:12:18 2015 (r394387) +++ branches/2015Q3/mail/linux-thunderbird/distinfo Sun Aug 16 05:35:28 2015 (r394388) @@ -1,5 +1,5 @@ -SHA256 (thunderbird-38.1.0.tar.bz2) = 3ef348d181d5a8ef35dd2781ac468e365878139e67a9c34fa817055928b95b3c -SIZE (thunderbird-38.1.0.tar.bz2) = 41827825 +SHA256 (thunderbird-38.2.0.tar.bz2) = b67e15ad84d7ad17f94d22e773e3f960d7fd628db2a94f6a6254bb34b11ac2f2 +SIZE (thunderbird-38.2.0.tar.bz2) = 41839153 SHA256 (glib2-2.22.2-2.fc12.i686.rpm) = e3b459c245ec14e7248e9de4b506963a4773407f3e58835db5070d0ed02ecc99 SIZE (glib2-2.22.2-2.fc12.i686.rpm) = 1162908 SHA256 (gtk2-2.18.3-19.fc12.i686.rpm) = aea9cf7ffe9c8dae0faa2bf3d2aa1b2117c55dce03da72dcce8c268279ec0a4b Modified: branches/2015Q3/mail/linux-thunderbird/pkg-plist ============================================================================== --- branches/2015Q3/mail/linux-thunderbird/pkg-plist Sun Aug 16 04:12:18 2015 (r394387) +++ branches/2015Q3/mail/linux-thunderbird/pkg-plist Sun Aug 16 05:35:28 2015 (r394388) @@ -21,7 +21,7 @@ lib/%%APP_NAME%%/defaults/pref/channel-p lib/%%APP_NAME%%/dependentlibs.list lib/%%APP_NAME%%/dictionaries/en-US.aff lib/%%APP_NAME%%/dictionaries/en-US.dic -lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/application.ini +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/app.ini lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calAlarm.js lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calAlarmMonitor.js lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calAlarmService.js Modified: branches/2015Q3/mail/thunderbird-i18n/Makefile ============================================================================== --- branches/2015Q3/mail/thunderbird-i18n/Makefile Sun Aug 16 04:12:18 2015 (r394387) +++ branches/2015Q3/mail/thunderbird-i18n/Makefile Sun Aug 16 05:35:28 2015 (r394388) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= thunderbird-i18n -PORTVERSION= 38.1.0 +PORTVERSION= 38.2.0 CATEGORIES= mail news net-im MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}/linux-i686/xpi \ MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build1/linux-i686/xpi Modified: branches/2015Q3/mail/thunderbird-i18n/distinfo ============================================================================== --- branches/2015Q3/mail/thunderbird-i18n/distinfo Sun Aug 16 04:12:18 2015 (r394387) +++ branches/2015Q3/mail/thunderbird-i18n/distinfo Sun Aug 16 05:35:28 2015 (r394388) @@ -1,116 +1,116 @@ -SHA256 (xpi/thunderbird-i18n-38.1.0/ar.xpi) = 8bc4384ede05efcb02e67a8888651a81f22cbaea3bbf6072e156d707e2a9ad49 -SIZE (xpi/thunderbird-i18n-38.1.0/ar.xpi) = 475295 -SHA256 (xpi/thunderbird-i18n-38.1.0/ast.xpi) = 2a8b35fb65014cc2789e38a396a9c153b8726f5cc5c50ec042e29d9c7972b4fb -SIZE (xpi/thunderbird-i18n-38.1.0/ast.xpi) = 405893 -SHA256 (xpi/thunderbird-i18n-38.1.0/be.xpi) = 0bd3e4dcc65e44d62127fb1832803f75a0bad4cd179135375460327363e81864 -SIZE (xpi/thunderbird-i18n-38.1.0/be.xpi) = 442473 -SHA256 (xpi/thunderbird-i18n-38.1.0/bg.xpi) = 806a7f2d151db0f5334b2791dbd708b3f631b2ec214b2f6edfa7aa95abe0b59a -SIZE (xpi/thunderbird-i18n-38.1.0/bg.xpi) = 506149 -SHA256 (xpi/thunderbird-i18n-38.1.0/bn-BD.xpi) = 5f16873ea47e84fb01a263f7ab59a90188ad6c5b57ab13b90c925b4a8d0bf06a -SIZE (xpi/thunderbird-i18n-38.1.0/bn-BD.xpi) = 560648 -SHA256 (xpi/thunderbird-i18n-38.1.0/br.xpi) = c976d2fdb520e178df568a5824f4416b043f9ebbe436ddbfb81ef5b5f972d6e9 -SIZE (xpi/thunderbird-i18n-38.1.0/br.xpi) = 449788 -SHA256 (xpi/thunderbird-i18n-38.1.0/ca.xpi) = 82a2eef48fefe335f1f8d53d21861a45f7b73b4ad8b65c912f9820bf69273309 -SIZE (xpi/thunderbird-i18n-38.1.0/ca.xpi) = 450347 -SHA256 (xpi/thunderbird-i18n-38.1.0/cs.xpi) = a1e0b882b599705e1150a66139fee97dc009be2a8e64e6a7c2b1158373bfd3ca -SIZE (xpi/thunderbird-i18n-38.1.0/cs.xpi) = 448723 -SHA256 (xpi/thunderbird-i18n-38.1.0/cy.xpi) = 877cbe5d9dba3f90c2754788baaa137fb45bf9e2d071a50df69e970f341a6365 -SIZE (xpi/thunderbird-i18n-38.1.0/cy.xpi) = 434848 -SHA256 (xpi/thunderbird-i18n-38.1.0/da.xpi) = fad0fc825311a1b546eb117c8cc838f542485ff87cb71c5a656c449366a71526 -SIZE (xpi/thunderbird-i18n-38.1.0/da.xpi) = 425828 -SHA256 (xpi/thunderbird-i18n-38.1.0/de.xpi) = bc900b8f0f2db4c0e5527780db826789d61bf5b265ccf62033909fbb4f21e12e -SIZE (xpi/thunderbird-i18n-38.1.0/de.xpi) = 429876 -SHA256 (xpi/thunderbird-i18n-38.1.0/dsb.xpi) = 06ebda860118ac5833c6d8884a4e94bab7265622a48978c0e1b472055f784314 -SIZE (xpi/thunderbird-i18n-38.1.0/dsb.xpi) = 458486 -SHA256 (xpi/thunderbird-i18n-38.1.0/el.xpi) = d6df1e34d17723f2b52aecea1fab9af964bd936816f51e5dc0f335bbf59a9a6c -SIZE (xpi/thunderbird-i18n-38.1.0/el.xpi) = 493511 -SHA256 (xpi/thunderbird-i18n-38.1.0/en-GB.xpi) = 07e443159860c85c82f01dbc57e0c83904fa7788dd69fb234970ef0484afdc81 -SIZE (xpi/thunderbird-i18n-38.1.0/en-GB.xpi) = 416571 -SHA256 (xpi/thunderbird-i18n-38.1.0/en-US.xpi) = ef68841d061f743ab199e087ab45c12a2f1c4b481d2017f535bcadab2e8902ad -SIZE (xpi/thunderbird-i18n-38.1.0/en-US.xpi) = 416640 -SHA256 (xpi/thunderbird-i18n-38.1.0/es-AR.xpi) = c5b0d927e51ef06414cc14a64ab84d0d4e3b86f2833dd0bc1211a056507d425d -SIZE (xpi/thunderbird-i18n-38.1.0/es-AR.xpi) = 442640 -SHA256 (xpi/thunderbird-i18n-38.1.0/es-ES.xpi) = 79bb32e02108f6f8971c6504adc39ff45a202cb91b6e7daca286a3b0aaa6e1b0 -SIZE (xpi/thunderbird-i18n-38.1.0/es-ES.xpi) = 376066 -SHA256 (xpi/thunderbird-i18n-38.1.0/et.xpi) = 9fe401fa441232dd29fee49d26fcb65af34ccffc2666bf2fb09546a947d91e9d -SIZE (xpi/thunderbird-i18n-38.1.0/et.xpi) = 438262 -SHA256 (xpi/thunderbird-i18n-38.1.0/eu.xpi) = 0d54de9beec9e2f232a016d93d0b626bf8be86a1966ad6fb02c8d1cfe531a3f0 -SIZE (xpi/thunderbird-i18n-38.1.0/eu.xpi) = 434837 -SHA256 (xpi/thunderbird-i18n-38.1.0/fi.xpi) = cc7bf6325bf7d4c914cb7958687c776db8e2444cd969ac16e91d6a67be0ab729 -SIZE (xpi/thunderbird-i18n-38.1.0/fi.xpi) = 438889 -SHA256 (xpi/thunderbird-i18n-38.1.0/fr.xpi) = 56dbffbc5e1286f71eeb33961e209a6c6a9dd3916c4b3432733baf8f10c10e77 -SIZE (xpi/thunderbird-i18n-38.1.0/fr.xpi) = 448227 -SHA256 (xpi/thunderbird-i18n-38.1.0/fy-NL.xpi) = 00ec21c0bab139981ab81902051d7c59a5fa3a6ae7865e9613ebd95c0fe1bf87 -SIZE (xpi/thunderbird-i18n-38.1.0/fy-NL.xpi) = 442161 -SHA256 (xpi/thunderbird-i18n-38.1.0/ga-IE.xpi) = 76384620c71115c8ebb3afcc4b30de9de45d1230e44983b4bd3d1473bb9c144e -SIZE (xpi/thunderbird-i18n-38.1.0/ga-IE.xpi) = 457412 -SHA256 (xpi/thunderbird-i18n-38.1.0/gd.xpi) = 1da8565cafbb009abb0b0424fc15e0dc2bcf2c3048e14f7e1cf5e62bb5618835 -SIZE (xpi/thunderbird-i18n-38.1.0/gd.xpi) = 456317 -SHA256 (xpi/thunderbird-i18n-38.1.0/gl.xpi) = ff3d29d1a050b74e64e0a4450b65edb247a5eb36a1b8df6b57dc3851b1658fd3 -SIZE (xpi/thunderbird-i18n-38.1.0/gl.xpi) = 457860 -SHA256 (xpi/thunderbird-i18n-38.1.0/he.xpi) = aab3240dca233f9e6ec9077be40a3d0033d75ccbd196a9ccce2726261c9d4c41 -SIZE (xpi/thunderbird-i18n-38.1.0/he.xpi) = 485888 -SHA256 (xpi/thunderbird-i18n-38.1.0/hr.xpi) = f368ccd53d7d405c07149b351f56d391142b40e8774d9d7fa623ff3318428b6a -SIZE (xpi/thunderbird-i18n-38.1.0/hr.xpi) = 440419 -SHA256 (xpi/thunderbird-i18n-38.1.0/hsb.xpi) = f47a8a2ff662acef03541ead6caf3e900706ce348b7577cd656222e9dcc2c47a -SIZE (xpi/thunderbird-i18n-38.1.0/hsb.xpi) = 456454 -SHA256 (xpi/thunderbird-i18n-38.1.0/hu.xpi) = c8393cb2f5c8aab62fec71e53f19791e7ce4d3acc37814a4796e7b390a4e1fcf -SIZE (xpi/thunderbird-i18n-38.1.0/hu.xpi) = 457987 -SHA256 (xpi/thunderbird-i18n-38.1.0/hy-AM.xpi) = 56454db77528fd2bc02abd4f4ecde69adbe278cbe807842e3e92d709d5df526c -SIZE (xpi/thunderbird-i18n-38.1.0/hy-AM.xpi) = 500379 -SHA256 (xpi/thunderbird-i18n-38.1.0/id.xpi) = 913db42b7530f55a8f3836d4dd493cf45df86509c77cfc64aca28c4bf60c6321 -SIZE (xpi/thunderbird-i18n-38.1.0/id.xpi) = 483209 -SHA256 (xpi/thunderbird-i18n-38.1.0/is.xpi) = 0a0194046282ea36e3c48238f08bfa9ffff07531d473b9a800628b6fb22b4970 -SIZE (xpi/thunderbird-i18n-38.1.0/is.xpi) = 443008 -SHA256 (xpi/thunderbird-i18n-38.1.0/it.xpi) = 2b7659c9a0c57e608d05f64bff90b3f6e631ce089ed1135465e89a133482fca7 -SIZE (xpi/thunderbird-i18n-38.1.0/it.xpi) = 369023 -SHA256 (xpi/thunderbird-i18n-38.1.0/ja.xpi) = c790816d9a735d0ff3e3d82516b6c10076a94c6e278fdea05f04d52615984257 -SIZE (xpi/thunderbird-i18n-38.1.0/ja.xpi) = 492860 -SHA256 (xpi/thunderbird-i18n-38.1.0/ko.xpi) = 42a147ac06a0cd7995a78f014259464db2e51391aec4ea16a548e0d5f156d951 -SIZE (xpi/thunderbird-i18n-38.1.0/ko.xpi) = 454852 -SHA256 (xpi/thunderbird-i18n-38.1.0/lt.xpi) = bbdb182ae21c8b8da1175b5a936e8563250838e538004a45b7847d27a0b192ad -SIZE (xpi/thunderbird-i18n-38.1.0/lt.xpi) = 454571 -SHA256 (xpi/thunderbird-i18n-38.1.0/nb-NO.xpi) = e4b10c9cfd80c6f9b683880e454cc3dcd2e9eb01acdc0090e73b6c6b6b71a7d3 -SIZE (xpi/thunderbird-i18n-38.1.0/nb-NO.xpi) = 434340 -SHA256 (xpi/thunderbird-i18n-38.1.0/nl.xpi) = 032f473e1fce313d8d9cdcc49cdaf390711c266069c45df4dbee2e9c81e19b0d -SIZE (xpi/thunderbird-i18n-38.1.0/nl.xpi) = 435107 -SHA256 (xpi/thunderbird-i18n-38.1.0/nn-NO.xpi) = 361710679e3229b98aa5785b1cf36afa493e5ded84353a69574e4cbe7f5bbe29 -SIZE (xpi/thunderbird-i18n-38.1.0/nn-NO.xpi) = 436622 -SHA256 (xpi/thunderbird-i18n-38.1.0/pa-IN.xpi) = 53afb6a6ff09df13b97ffc88f95a527d860e751fd79e873a78be2e7bd977a15e -SIZE (xpi/thunderbird-i18n-38.1.0/pa-IN.xpi) = 530483 -SHA256 (xpi/thunderbird-i18n-38.1.0/pl.xpi) = d9c770408d6b8cc52df4113ccfeb339fc7e34ca45a62df49ee5f24e70a5e3503 -SIZE (xpi/thunderbird-i18n-38.1.0/pl.xpi) = 411508 -SHA256 (xpi/thunderbird-i18n-38.1.0/pt-BR.xpi) = 8160379e9ff6319939e7a9e2d37c0a7f66f436796f16c0c3ef8a70f1a2e17ea0 -SIZE (xpi/thunderbird-i18n-38.1.0/pt-BR.xpi) = 443773 -SHA256 (xpi/thunderbird-i18n-38.1.0/pt-PT.xpi) = d6354d745df58c48d15792c35aa8f4874d11bff0980df6b567de58f659357efe -SIZE (xpi/thunderbird-i18n-38.1.0/pt-PT.xpi) = 442063 -SHA256 (xpi/thunderbird-i18n-38.1.0/rm.xpi) = fbc4bb3603cd5927c98e82ca83e830bd0c0807cc63ee0215f60e1cea66cc4400 -SIZE (xpi/thunderbird-i18n-38.1.0/rm.xpi) = 442112 -SHA256 (xpi/thunderbird-i18n-38.1.0/ro.xpi) = 2e768e1a2e9ae04bafea1948c19b2b6e83f436f3a2841a94550f95bde7b30b42 -SIZE (xpi/thunderbird-i18n-38.1.0/ro.xpi) = 448347 -SHA256 (xpi/thunderbird-i18n-38.1.0/ru.xpi) = 85ab5454186b1a35c1268a8854b2407f1a260857a092de2cdc1c0fb84e278104 -SIZE (xpi/thunderbird-i18n-38.1.0/ru.xpi) = 437591 -SHA256 (xpi/thunderbird-i18n-38.1.0/si.xpi) = 8df4c4ca6dbb901f419b69b37da8b0762483e080513b6cebe0d4424444f6ce25 -SIZE (xpi/thunderbird-i18n-38.1.0/si.xpi) = 535362 -SHA256 (xpi/thunderbird-i18n-38.1.0/sk.xpi) = 8b34d932a49e56cc47b9dae57f7a515b40bcc1ae4efa50f1dd275855abb30659 -SIZE (xpi/thunderbird-i18n-38.1.0/sk.xpi) = 456606 -SHA256 (xpi/thunderbird-i18n-38.1.0/sl.xpi) = 7d2bbe2b04052165bde61b4e24f2c928460f914a57c8bec36d3496de67d5dd66 -SIZE (xpi/thunderbird-i18n-38.1.0/sl.xpi) = 437847 -SHA256 (xpi/thunderbird-i18n-38.1.0/sq.xpi) = 0e41b9ab3ec7853e3c8d19ad6380598ccc4d04884426f64be577a045f876cdd6 -SIZE (xpi/thunderbird-i18n-38.1.0/sq.xpi) = 446896 -SHA256 (xpi/thunderbird-i18n-38.1.0/sr.xpi) = c2d6d4a751580f2107aaeec7f23584ca7a8803cd15289fbf863d124a1801ffee -SIZE (xpi/thunderbird-i18n-38.1.0/sr.xpi) = 543336 -SHA256 (xpi/thunderbird-i18n-38.1.0/sv-SE.xpi) = 59cfe9b9ee411b92e288d0050ba3baddd5bc7bb779ed4fbff7681ae252053133 -SIZE (xpi/thunderbird-i18n-38.1.0/sv-SE.xpi) = 439633 -SHA256 (xpi/thunderbird-i18n-38.1.0/ta-LK.xpi) = 891b12e9f7722c570189c0c47a814e96ac3ef9e16b2d50625a4766085649d16f -SIZE (xpi/thunderbird-i18n-38.1.0/ta-LK.xpi) = 558759 -SHA256 (xpi/thunderbird-i18n-38.1.0/tr.xpi) = 5b42a203b0a6938a9967ce982fb800bd4db8ef0d2def1b9966e1352e843729fc -SIZE (xpi/thunderbird-i18n-38.1.0/tr.xpi) = 447799 -SHA256 (xpi/thunderbird-i18n-38.1.0/uk.xpi) = e32214709147900c4336af83dce5445614b72d4059dad67b6f703a0853ec2ad1 -SIZE (xpi/thunderbird-i18n-38.1.0/uk.xpi) = 509621 -SHA256 (xpi/thunderbird-i18n-38.1.0/vi.xpi) = 6d9b056f1d13e7dd95b79780c65e202c5c428f87e206370a5264644579a41626 -SIZE (xpi/thunderbird-i18n-38.1.0/vi.xpi) = 519864 -SHA256 (xpi/thunderbird-i18n-38.1.0/zh-CN.xpi) = 9d00bbc2f01c6974877923f9d770e16112b5e859788a728a7244052361f1ea7b -SIZE (xpi/thunderbird-i18n-38.1.0/zh-CN.xpi) = 466411 -SHA256 (xpi/thunderbird-i18n-38.1.0/zh-TW.xpi) = 65dd33db3a18a4f8eeb54b953650a3a592a8821765e44888849f15531bcf88ca -SIZE (xpi/thunderbird-i18n-38.1.0/zh-TW.xpi) = 466660 +SHA256 (xpi/thunderbird-i18n-38.2.0/ar.xpi) = 9098f6665f740fc371a5bf4dcdd04f729f30a7d52354a210e691292d09c9c748 +SIZE (xpi/thunderbird-i18n-38.2.0/ar.xpi) = 475296 +SHA256 (xpi/thunderbird-i18n-38.2.0/ast.xpi) = d84deb50ad04d47895ef48496da0c8f06442575b16500eec79a57e42cb470219 +SIZE (xpi/thunderbird-i18n-38.2.0/ast.xpi) = 405894 +SHA256 (xpi/thunderbird-i18n-38.2.0/be.xpi) = 2144494aa25681d9dd6fe123615d5b2abf3c6aeb76e9885d2a3eb05557958a22 +SIZE (xpi/thunderbird-i18n-38.2.0/be.xpi) = 442474 +SHA256 (xpi/thunderbird-i18n-38.2.0/bg.xpi) = 7b180ca9c20f1c451f422a72de51dae5fbb7a29c38f63ac1b98c7757dfc00a4a +SIZE (xpi/thunderbird-i18n-38.2.0/bg.xpi) = 506146 +SHA256 (xpi/thunderbird-i18n-38.2.0/bn-BD.xpi) = bf023343d9bae46779886304017486cd2cb08507d92c388da60f62b82732d61a +SIZE (xpi/thunderbird-i18n-38.2.0/bn-BD.xpi) = 560648 +SHA256 (xpi/thunderbird-i18n-38.2.0/br.xpi) = 00e4e5d34419eae7e9f5a02a2ce2545fc509795c8c34eea7474ec978a076f54c +SIZE (xpi/thunderbird-i18n-38.2.0/br.xpi) = 449789 +SHA256 (xpi/thunderbird-i18n-38.2.0/ca.xpi) = 9aeee1bb2e8977883e1eea24286b2e4433d56f5a941a1bd6dd2d35c33403e898 +SIZE (xpi/thunderbird-i18n-38.2.0/ca.xpi) = 450347 +SHA256 (xpi/thunderbird-i18n-38.2.0/cs.xpi) = ec642029803c46da7c6f4a6326c8fa076ff4fa93d190f1c43fb0a25aa03fd4ab +SIZE (xpi/thunderbird-i18n-38.2.0/cs.xpi) = 448724 +SHA256 (xpi/thunderbird-i18n-38.2.0/cy.xpi) = ab60a050b4ab69b546e2a2798debc432f179f3b456dec33abc4687aaf763041e +SIZE (xpi/thunderbird-i18n-38.2.0/cy.xpi) = 434848 +SHA256 (xpi/thunderbird-i18n-38.2.0/da.xpi) = 6e6c97a5151245124424c501fa6f5ef5b36802c4fef8d2b8fae858db5f758fb2 +SIZE (xpi/thunderbird-i18n-38.2.0/da.xpi) = 425828 +SHA256 (xpi/thunderbird-i18n-38.2.0/de.xpi) = 16386d48e2bcf83f3caf3a38555f05a5b419a095518249a1c4367f3dde31e951 +SIZE (xpi/thunderbird-i18n-38.2.0/de.xpi) = 429877 +SHA256 (xpi/thunderbird-i18n-38.2.0/dsb.xpi) = 8d4f8240c778f78a3c1a09c68ad7dc4ec1a5d522f6447a5788dc504a990d8f0d +SIZE (xpi/thunderbird-i18n-38.2.0/dsb.xpi) = 458487 +SHA256 (xpi/thunderbird-i18n-38.2.0/el.xpi) = 26ac749beb090e13eef2347b9b264d385ea69995770abff3c883219ebb4e5fc8 +SIZE (xpi/thunderbird-i18n-38.2.0/el.xpi) = 493512 +SHA256 (xpi/thunderbird-i18n-38.2.0/en-GB.xpi) = cccc7c3957231f15075da844b92482e2820ed5a76779967e41749a7cbaa8c14b +SIZE (xpi/thunderbird-i18n-38.2.0/en-GB.xpi) = 416572 +SHA256 (xpi/thunderbird-i18n-38.2.0/en-US.xpi) = 741bb4141984b0d2f812e7cdead5585f3de055e124c604e762ae165f0550c09c +SIZE (xpi/thunderbird-i18n-38.2.0/en-US.xpi) = 416640 +SHA256 (xpi/thunderbird-i18n-38.2.0/es-AR.xpi) = 2bad7f085b2be607fb23e316e954483a9ebf33e3b53ceebc95f0c844c6c00f44 +SIZE (xpi/thunderbird-i18n-38.2.0/es-AR.xpi) = 442641 +SHA256 (xpi/thunderbird-i18n-38.2.0/es-ES.xpi) = 1f7c13cbb2f52a6396d73661cfe612df447f41438199f0089a7b9e0976ce32a2 +SIZE (xpi/thunderbird-i18n-38.2.0/es-ES.xpi) = 376067 +SHA256 (xpi/thunderbird-i18n-38.2.0/et.xpi) = 7b94fbea65c3c83eed004de5ca3fe83b44a41b2896257a4e6f86d6b7292f525b +SIZE (xpi/thunderbird-i18n-38.2.0/et.xpi) = 438262 +SHA256 (xpi/thunderbird-i18n-38.2.0/eu.xpi) = 249719b70ce5a693101dd93d92c3e6eb4c538222f623a5effd654c096b65a7ce +SIZE (xpi/thunderbird-i18n-38.2.0/eu.xpi) = 434837 +SHA256 (xpi/thunderbird-i18n-38.2.0/fi.xpi) = 169d338bd699dcc90f5e1e87e2aab0965bcc93d0ceb3954719726bc157117154 +SIZE (xpi/thunderbird-i18n-38.2.0/fi.xpi) = 438889 +SHA256 (xpi/thunderbird-i18n-38.2.0/fr.xpi) = ff44e3feb26895a51b2d49cd89ffeea28070780c0d6a1cd996a8aaa19578ac69 +SIZE (xpi/thunderbird-i18n-38.2.0/fr.xpi) = 448227 +SHA256 (xpi/thunderbird-i18n-38.2.0/fy-NL.xpi) = abebe200c6f4349b2283b9ff580d07439f4e2349c07b3df811f2b55806191a69 +SIZE (xpi/thunderbird-i18n-38.2.0/fy-NL.xpi) = 442162 +SHA256 (xpi/thunderbird-i18n-38.2.0/ga-IE.xpi) = 1d41006e6f48585cb39b450f715da59db11e697624fddea8c03db41d1e7bde7c +SIZE (xpi/thunderbird-i18n-38.2.0/ga-IE.xpi) = 457412 +SHA256 (xpi/thunderbird-i18n-38.2.0/gd.xpi) = a7cd4e81e55843b865eb3f7489022e76e2b20a81a666f54c5fb2ecde7cdd5ce2 +SIZE (xpi/thunderbird-i18n-38.2.0/gd.xpi) = 456317 +SHA256 (xpi/thunderbird-i18n-38.2.0/gl.xpi) = ef38ee1792936cfe31d7a885669f206a8a8870610e8d344d37e75649168a3471 +SIZE (xpi/thunderbird-i18n-38.2.0/gl.xpi) = 457861 +SHA256 (xpi/thunderbird-i18n-38.2.0/he.xpi) = 6dcaf1b2caea0dc059481ce4a91a81ecf59f13a1998449700b1e159203144f4c +SIZE (xpi/thunderbird-i18n-38.2.0/he.xpi) = 485889 +SHA256 (xpi/thunderbird-i18n-38.2.0/hr.xpi) = fe2548abeb34d5b562c0c9dbeea8a268a01112ce7a24303077b7fc61e273c13a +SIZE (xpi/thunderbird-i18n-38.2.0/hr.xpi) = 440420 +SHA256 (xpi/thunderbird-i18n-38.2.0/hsb.xpi) = d0aaeca9daf1f4366af1093d756972b5ac95c173eca4fa2e801f1cc5cfdea136 +SIZE (xpi/thunderbird-i18n-38.2.0/hsb.xpi) = 456451 +SHA256 (xpi/thunderbird-i18n-38.2.0/hu.xpi) = 56c17fd8383a246d6b0c787a78b79267a08dba2fe959b8b00979900c974e9985 +SIZE (xpi/thunderbird-i18n-38.2.0/hu.xpi) = 457988 +SHA256 (xpi/thunderbird-i18n-38.2.0/hy-AM.xpi) = b47b617e0b521bae29eefb7268253ec87a16a5c0d39b60d3a7193eb8eb6580c9 +SIZE (xpi/thunderbird-i18n-38.2.0/hy-AM.xpi) = 500377 +SHA256 (xpi/thunderbird-i18n-38.2.0/id.xpi) = 1876f8c429e7c892333a88ba300115d4a5c163f2f2ec8cdf441ebefdc39f1e7a +SIZE (xpi/thunderbird-i18n-38.2.0/id.xpi) = 483209 +SHA256 (xpi/thunderbird-i18n-38.2.0/is.xpi) = dcc3d628212b921e2e4836dcdfe6994a70d75b7a2712b283d2277660f8549f85 +SIZE (xpi/thunderbird-i18n-38.2.0/is.xpi) = 443008 +SHA256 (xpi/thunderbird-i18n-38.2.0/it.xpi) = 786694c8b4d64c252c338a29acef06b787f95c74d90af403d61ca60002775cd3 +SIZE (xpi/thunderbird-i18n-38.2.0/it.xpi) = 369024 +SHA256 (xpi/thunderbird-i18n-38.2.0/ja.xpi) = c4937083d159697b068d97c1f60d1ff988f50ff2a0c330d78c51d03c10f637b8 +SIZE (xpi/thunderbird-i18n-38.2.0/ja.xpi) = 492861 +SHA256 (xpi/thunderbird-i18n-38.2.0/ko.xpi) = c3fb6a4d1953e9ad235b996477ab097dbe7e7de114713f8f18df98e39e3a1bb3 +SIZE (xpi/thunderbird-i18n-38.2.0/ko.xpi) = 454852 +SHA256 (xpi/thunderbird-i18n-38.2.0/lt.xpi) = bab8d740b889f2de6c342da09a0e1781182f45d2481a03aab769cd635e3837d3 +SIZE (xpi/thunderbird-i18n-38.2.0/lt.xpi) = 454572 +SHA256 (xpi/thunderbird-i18n-38.2.0/nb-NO.xpi) = 841b9ea0945a1334614b335e01ef3fd9c812c13ea39fc508cc060b13aa5f2fcd +SIZE (xpi/thunderbird-i18n-38.2.0/nb-NO.xpi) = 434340 +SHA256 (xpi/thunderbird-i18n-38.2.0/nl.xpi) = a237053483f81b7ae53cb6ada04a8dab0ea1d840de33ab4c0f8453e38901089b +SIZE (xpi/thunderbird-i18n-38.2.0/nl.xpi) = 435108 +SHA256 (xpi/thunderbird-i18n-38.2.0/nn-NO.xpi) = 944e1ce71ac7b79f274bb273f92d493a83b3dcd774c5d874add869db3dc6fbbf +SIZE (xpi/thunderbird-i18n-38.2.0/nn-NO.xpi) = 436623 +SHA256 (xpi/thunderbird-i18n-38.2.0/pa-IN.xpi) = c91ec0f7a4652f260bde662bfd1fe73dd6ba067a4e4655dd008d81a67736bc61 +SIZE (xpi/thunderbird-i18n-38.2.0/pa-IN.xpi) = 530483 +SHA256 (xpi/thunderbird-i18n-38.2.0/pl.xpi) = 4f2b78757594d919109b22ebe23098d724147035822f58d0235ae071f91ebcc3 +SIZE (xpi/thunderbird-i18n-38.2.0/pl.xpi) = 411509 +SHA256 (xpi/thunderbird-i18n-38.2.0/pt-BR.xpi) = 12912d7eecb1bf47b6a68f9089e9157cb0df7c25ab688681c9da8f6f8b2c1650 +SIZE (xpi/thunderbird-i18n-38.2.0/pt-BR.xpi) = 443774 +SHA256 (xpi/thunderbird-i18n-38.2.0/pt-PT.xpi) = 3cfe6d0dcc70ac662d07d2b8dc446bf37cab39719e2276b87fbaa55126ccee42 +SIZE (xpi/thunderbird-i18n-38.2.0/pt-PT.xpi) = 442064 +SHA256 (xpi/thunderbird-i18n-38.2.0/rm.xpi) = 0a7691e4bfd1395d39cd4752954f687de4cd11a7fa541eb90949ad93e497f151 +SIZE (xpi/thunderbird-i18n-38.2.0/rm.xpi) = 442112 +SHA256 (xpi/thunderbird-i18n-38.2.0/ro.xpi) = e7d119cfee6180b5afd5b35adf8429f94fe50b3e08737aadb0503395df22f7d2 +SIZE (xpi/thunderbird-i18n-38.2.0/ro.xpi) = 448349 +SHA256 (xpi/thunderbird-i18n-38.2.0/ru.xpi) = ac800282f8096fb66e235f3918254235b45768a1ad2f202b344db91023435a2a +SIZE (xpi/thunderbird-i18n-38.2.0/ru.xpi) = 437591 +SHA256 (xpi/thunderbird-i18n-38.2.0/si.xpi) = 401b14f056c84605a2071b182a57d42853976546b01974ba5d69e9d813d29299 +SIZE (xpi/thunderbird-i18n-38.2.0/si.xpi) = 535363 +SHA256 (xpi/thunderbird-i18n-38.2.0/sk.xpi) = 37ee0495c8886cf17f95f4a153d58d768763778e429539cb8b657ce9b72ec0d6 +SIZE (xpi/thunderbird-i18n-38.2.0/sk.xpi) = 456606 +SHA256 (xpi/thunderbird-i18n-38.2.0/sl.xpi) = 5e23988a9ed60d301edcf5bcd384a7788774a9473b75d2713c7cbaa46de838b7 +SIZE (xpi/thunderbird-i18n-38.2.0/sl.xpi) = 437847 +SHA256 (xpi/thunderbird-i18n-38.2.0/sq.xpi) = 3139466f0a15bd888656856a1a4cf2a47eb449ad950adc190d975c099c10a390 +SIZE (xpi/thunderbird-i18n-38.2.0/sq.xpi) = 446897 +SHA256 (xpi/thunderbird-i18n-38.2.0/sr.xpi) = a3c8a7f2bda919098daf6d3277a5f4ef82e9eeae7eed54decba302ca6000c47d +SIZE (xpi/thunderbird-i18n-38.2.0/sr.xpi) = 543336 +SHA256 (xpi/thunderbird-i18n-38.2.0/sv-SE.xpi) = b308e65ff10ad62091b89eeb9fcb9e6e8d3c76ddf0de32b6a9ca3a4101552816 +SIZE (xpi/thunderbird-i18n-38.2.0/sv-SE.xpi) = 439633 +SHA256 (xpi/thunderbird-i18n-38.2.0/ta-LK.xpi) = ac7f32d19cee21c16bee288883091fc50bca8bc68b0b28fc7f768ef3a53daa12 +SIZE (xpi/thunderbird-i18n-38.2.0/ta-LK.xpi) = 558760 +SHA256 (xpi/thunderbird-i18n-38.2.0/tr.xpi) = 2063f17091816acd829caed8ba091c900df6638c8b5cbf2873c3b4fb83124e8a +SIZE (xpi/thunderbird-i18n-38.2.0/tr.xpi) = 447799 +SHA256 (xpi/thunderbird-i18n-38.2.0/uk.xpi) = 776b376d5ba62a9544bfd5689922a84e17cb30546e2a65d54597927af6decd86 +SIZE (xpi/thunderbird-i18n-38.2.0/uk.xpi) = 509622 +SHA256 (xpi/thunderbird-i18n-38.2.0/vi.xpi) = 21f4a2f7530ed099577a199e4b1529c3bd34a383b4dd76b1b78f41da155e4cf2 +SIZE (xpi/thunderbird-i18n-38.2.0/vi.xpi) = 519865 +SHA256 (xpi/thunderbird-i18n-38.2.0/zh-CN.xpi) = 030e2d1b57e3d0b547aaaa5230e00d0f42e62028a8500377042e61b87f332e32 +SIZE (xpi/thunderbird-i18n-38.2.0/zh-CN.xpi) = 466412 +SHA256 (xpi/thunderbird-i18n-38.2.0/zh-TW.xpi) = 4f0750f5b53d3c961d4b972ff33953c89bd0638282f03eedd0a09fcb647dd33a +SIZE (xpi/thunderbird-i18n-38.2.0/zh-TW.xpi) = 466662 Modified: branches/2015Q3/mail/thunderbird/Makefile ============================================================================== --- branches/2015Q3/mail/thunderbird/Makefile Sun Aug 16 04:12:18 2015 (r394387) +++ branches/2015Q3/mail/thunderbird/Makefile Sun Aug 16 05:35:28 2015 (r394388) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= thunderbird -DISTVERSION= 38.1.0 -PORTREVISION= 3 +DISTVERSION= 38.2.0 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source @@ -33,7 +32,7 @@ BUILD_DEPENDS= nspr>=4.10.8:${PORTSDIR}/ LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l EM_VERSION= 1.8.2 -L_VERSION= 4.0.1 +L_VERSION= 4.0.2 SSP_UNSAFE= yes USE_GECKO= gecko Modified: branches/2015Q3/mail/thunderbird/distinfo ============================================================================== --- branches/2015Q3/mail/thunderbird/distinfo Sun Aug 16 04:12:18 2015 (r394387) +++ branches/2015Q3/mail/thunderbird/distinfo Sun Aug 16 05:35:28 2015 (r394388) @@ -1,4 +1,4 @@ -SHA256 (thunderbird-38.1.0.source.tar.bz2) = ddf1fd6048f07370bb0375eac76e687c19d29100c19e9f86fc04bb88d4409787 -SIZE (thunderbird-38.1.0.source.tar.bz2) = 204161689 +SHA256 (thunderbird-38.2.0.source.tar.bz2) = 4881cf0a721a9d0204a6cff01e20a6c54010f4b576df2820cd699d17892ac2d0 +SIZE (thunderbird-38.2.0.source.tar.bz2) = 204448261 SHA256 (enigmail-1.8.2.tar.gz) = 1d2700799bc52aaa8e8c9f7a0f5111281ff9fbdffc093cdff070657d574eb2a6 SIZE (enigmail-1.8.2.tar.gz) = 1604159 From owner-svn-ports-branches@freebsd.org Sun Aug 16 12:45:44 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 32BBE9B972B; Sun, 16 Aug 2015 12:45:44 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2367CD60; Sun, 16 Aug 2015 12:45:44 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7GCjiTR058253; Sun, 16 Aug 2015 12:45:44 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7GCjiIG058252; Sun, 16 Aug 2015 12:45:44 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201508161245.t7GCjiIG058252@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Sun, 16 Aug 2015 12:45:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r394407 - branches/2015Q3/comms/chirp X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Aug 2015 12:45:44 -0000 Author: feld Date: Sun Aug 16 12:45:43 2015 New Revision: 394407 URL: https://svnweb.freebsd.org/changeset/ports/394407 Log: MFH: r394319 Add missing RUN_DEPENDS Sort USES PR: 202338 Approved by: ports-secteam (with hat) Modified: branches/2015Q3/comms/chirp/Makefile Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/comms/chirp/Makefile ============================================================================== --- branches/2015Q3/comms/chirp/Makefile Sun Aug 16 12:40:39 2015 (r394406) +++ branches/2015Q3/comms/chirp/Makefile Sun Aug 16 12:45:43 2015 (r394407) @@ -2,20 +2,21 @@ PORTNAME= chirp PORTVERSION= 0.4.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= comms hamradio MASTER_SITES= http://chirp.danplanet.com/download/${PORTVERSION}/ \ LOCAL/db MAINTAINER= hamradio@FreeBSD.org -COMMENT= Chirp is a free, open-source tool for programming your amateur radio +COMMENT= Free, open-source tool for programming your amateur radio LICENSE= GPLv3 -BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/serial:${PORTSDIR}/comms/py-serial \ - ${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2 +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libxml2>0:${PORTSDIR}/textproc/py-libxml2 \ + ${PYTHON_PKGNAMEPREFIX}serial>0:${PORTSDIR}/comms/py-serial +RUN_DEPENDS= ${BUILD_DEPENDS} -USES= gettext python desktop-file-utils +USES= desktop-file-utils gettext python USE_PYTHON= distutils OPTIONS_DEFINE= DOCS From owner-svn-ports-branches@freebsd.org Mon Aug 17 03:36:53 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4C2329BADE4; Mon, 17 Aug 2015 03:36:53 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 31F6817DC; Mon, 17 Aug 2015 03:36:53 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7H3ar16050947; Mon, 17 Aug 2015 03:36:53 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7H3arnj050946; Mon, 17 Aug 2015 03:36:53 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201508170336.t7H3arnj050946@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 17 Aug 2015 03:36:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r394435 - branches/2015Q3/multimedia/openh264/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Aug 2015 03:36:53 -0000 Author: jbeich Date: Mon Aug 17 03:36:52 2015 New Revision: 394435 URL: https://svnweb.freebsd.org/changeset/ports/394435 Log: MFH: r394430 multimedia/openh264: unbreak build on armv6 Disable NEON support for armv6 (softfp). Alas, MACHINE_CPU is underspecified on arm* to conditionalize NEON check within a port. PR: 201273 Reported by: pkg-fallout Submitted by: mikael.urankar@gmail.com Approved by: ports-secteam (delphij) Added: branches/2015Q3/multimedia/openh264/files/patch-build_arch.mk - copied unchanged from r394430, head/multimedia/openh264/files/patch-build_arch.mk Modified: Directory Properties: branches/2015Q3/ (props changed) Copied: branches/2015Q3/multimedia/openh264/files/patch-build_arch.mk (from r394430, head/multimedia/openh264/files/patch-build_arch.mk) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q3/multimedia/openh264/files/patch-build_arch.mk Mon Aug 17 03:36:52 2015 (r394435, copy of r394430, head/multimedia/openh264/files/patch-build_arch.mk) @@ -0,0 +1,11 @@ +--- build/arch.mk.orig 2015-08-09 21:14:55 UTC ++++ build/arch.mk +@@ -1,7 +1,7 @@ + ifneq ($(filter %86 x86_64, $(ARCH)),) + include $(SRC_PATH)build/x86-common.mk + endif +-ifneq ($(filter-out arm64, $(filter arm%, $(ARCH))),) ++ifneq ($(filter-out armv6 arm64, $(filter arm%, $(ARCH))),) + ifeq ($(USE_ASM), Yes) + ASM_ARCH = arm + ASMFLAGS += -I$(SRC_PATH)codec/common/arm/ From owner-svn-ports-branches@freebsd.org Mon Aug 17 08:10:28 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 947229BB44A; Mon, 17 Aug 2015 08:10:28 +0000 (UTC) (envelope-from erwin@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 83B0C1FD1; Mon, 17 Aug 2015 08:10:28 +0000 (UTC) (envelope-from erwin@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7H8ASo2060813; Mon, 17 Aug 2015 08:10:28 GMT (envelope-from erwin@FreeBSD.org) Received: (from erwin@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7H8ARLK060518; Mon, 17 Aug 2015 08:10:27 GMT (envelope-from erwin@FreeBSD.org) Message-Id: <201508170810.t7H8ARLK060518@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: erwin set sender to erwin@FreeBSD.org using -f From: Erwin Lansing Date: Mon, 17 Aug 2015 08:10:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r394439 - in branches/2015Q3/devel/subversion: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Aug 2015 08:10:28 -0000 Author: erwin Date: Mon Aug 17 08:10:26 2015 New Revision: 394439 URL: https://svnweb.freebsd.org/changeset/ports/394439 Log: MFH: r393662 (1) Update to latest subversion 1.8.14. (2) Make FreeBSD template configurable. PR: [2] 201989 Submitted by: [2] Edward Tomasz Napierala Security: [1] CVE-2015-3184, CVE-2015-3187, 57bb5e3d-3c4f-11e5-a4d4-001e8c75030d Approved by: maintainer timeout (security fix) Sponsored by: DK Hostmaster A/S Modified: branches/2015Q3/devel/subversion/Makefile.common branches/2015Q3/devel/subversion/distinfo branches/2015Q3/devel/subversion/files/build-outputs.mk.addons branches/2015Q3/devel/subversion/files/extra-patch-fbsd-template Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/devel/subversion/Makefile.common ============================================================================== --- branches/2015Q3/devel/subversion/Makefile.common Mon Aug 17 07:31:45 2015 (r394438) +++ branches/2015Q3/devel/subversion/Makefile.common Mon Aug 17 08:10:26 2015 (r394439) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME?= subversion -PORTVERSION= 1.8.13 -PORTREVISION?= 2 +PORTVERSION= 1.8.14 +PORTREVISION?= 0 CATEGORIES+= devel MASTER_SITES= APACHE/subversion DIST_SUBDIR= subversion18 Modified: branches/2015Q3/devel/subversion/distinfo ============================================================================== --- branches/2015Q3/devel/subversion/distinfo Mon Aug 17 07:31:45 2015 (r394438) +++ branches/2015Q3/devel/subversion/distinfo Mon Aug 17 08:10:26 2015 (r394439) @@ -1,2 +1,2 @@ -SHA256 (subversion18/subversion-1.8.13.tar.bz2) = 1099cc68840753b48aedb3a27ebd1e2afbcc84ddb871412e5d500e843d607579 -SIZE (subversion18/subversion-1.8.13.tar.bz2) = 6863330 +SHA256 (subversion18/subversion-1.8.14.tar.bz2) = 7f3883cdfcad4174e06dd94d6e3e8ec91856823268eebe60c924be76f5229a1f +SIZE (subversion18/subversion-1.8.14.tar.bz2) = 6850562 Modified: branches/2015Q3/devel/subversion/files/build-outputs.mk.addons ============================================================================== --- branches/2015Q3/devel/subversion/files/build-outputs.mk.addons Mon Aug 17 07:31:45 2015 (r394438) +++ branches/2015Q3/devel/subversion/files/build-outputs.mk.addons Mon Aug 17 08:10:26 2015 (r394439) @@ -26,15 +26,15 @@ BDB_TEST_DEPS = subversion/tests/libsvn_ BDB_TEST_PROGRAMS = subversion/tests/libsvn_fs_base/changes-test$(EXEEXT) subversion/tests/libsvn_fs_base/fs-base-test$(EXEEXT) subversion/tests/libsvn_fs_base/strings-reps-test$(EXEEXT) -TEST_DEPS = subversion/tests/cmdline/atomic-ra-revprop-change$(EXEEXT) subversion/tests/libsvn_subr/auth-test$(EXEEXT) subversion/tests/libsvn_subr/cache-test$(EXEEXT) subversion/tests/libsvn_subr/checksum-test$(EXEEXT) subversion/tests/libsvn_client/client-test$(EXEEXT) subversion/tests/libsvn_subr/compat-test$(EXEEXT) subversion/tests/libsvn_subr/config-test$(EXEEXT) subversion/tests/libsvn_wc/conflict-data-test$(EXEEXT) subversion/tests/libsvn_subr/crypto-test$(EXEEXT) subversion/tests/libsvn_wc/db-test$(EXEEXT) subversion/tests/libsvn_diff/diff-diff3-test$(EXEEXT) subversion/tests/libsvn_subr/dirent_uri-test$(EXEEXT) subversion/tests/libsvn_wc/entries-compat-test$(EXEEXT) subversion/tests/cmdline/entries-dump$(EXEEXT) subversion/tests/libsvn_subr/error-code-test$(EXEEXT) subversion/tests/libsvn_subr/error-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-pack-test$(EXEEXT) subversion/tests/libsvn_fs/fs-test$(EXEEXT) subversion/tests/libsvn_subr/hashdump-test$(EXEEXT) subversion/tes ts/libsvn_subr/io-test$(EXEEXT) subversion/tests/libsvn_fs/locks-test$(EXEEXT) subversion/tests/libsvn_subr/mergeinfo-test$(EXEEXT) subversion/tests/libsvn_subr/named_atomic-test$(EXEEXT) subversion/tests/libsvn_wc/op-depth-test$(EXEEXT) subversion/tests/libsvn_subr/opt-test$(EXEEXT) subversion/tests/libsvn_diff/parse-diff-test$(EXEEXT) subversion/tests/libsvn_subr/path-test$(EXEEXT) subversion/tests/libsvn_wc/pristine-store-test$(EXEEXT) subversion/tests/libsvn_ra_local/ra-local-test$(EXEEXT) subversion/tests/libsvn_ra/ra-test$(EXEEXT) subversion/tests/libsvn_delta/random-test$(EXEEXT) subversion/tests/libsvn_repos/repos-test$(EXEEXT) subversion/tests/libsvn_subr/revision-test$(EXEEXT) subversion/tests/libsvn_subr/skel-test$(EXEEXT) subversion/tests/libsvn_subr/spillbuf-test$(EXEEXT) subversion/tests/libsvn_subr/stream-test$(EXEEXT) subversion/tests/libsvn_subr/string-test$(EXEEXT) subversion/tests/libsvn_subr/subst_translate-test$(EXEEXT) tools/server-side/svnauthz$(EXEEXT) tools/ server-side/svnauthz-validate$(EXEEXT) subve! rsion/tests/libsvn_delta/svndiff-test$(EXEEXT) subversion/tests/libsvn_subr/time-test$(EXEEXT) subversion/tests/libsvn_subr/translate-test$(EXEEXT) subversion/tests/libsvn_subr/utf-test$(EXEEXT) subversion/tests/libsvn_delta/vdelta-test$(EXEEXT) subversion/tests/libsvn_wc/wc-incomplete-tester$(EXEEXT) subversion/tests/libsvn_wc/wc-lock-tester$(EXEEXT) subversion/tests/libsvn_wc/wc-queries-test$(EXEEXT) subversion/tests/libsvn_wc/wc-test$(EXEEXT) subversion/tests/libsvn_delta/window-test$(EXEEXT) subversion/tests/cmdline/authz_tests.py subversion/tests/cmdline/autoprop_tests.py subversion/tests/cmdline/basic_tests.py subversion/tests/cmdline/blame_tests.py subversion/tests/cmdline/cat_tests.py subversion/tests/cmdline/changelist_tests.py subversion/tests/cmdline/checkout_tests.py subversion/tests/cmdline/commit_tests.py subversion/tests/cmdline/copy_tests.py subversion/tests/cmdline/depth_tests.py subversion/tests/cmdline/diff_tests.py subversion/tests/cmdline/entries_tests.py subver sion/tests/cmdline/export_tests.py subversion/tests/cmdline/externals_tests.py subversion/tests/cmdline/getopt_tests.py subversion/tests/cmdline/history_tests.py subversion/tests/cmdline/import_tests.py subversion/tests/cmdline/info_tests.py subversion/tests/cmdline/input_validation_tests.py subversion/tests/cmdline/iprop_authz_tests.py subversion/tests/cmdline/iprop_tests.py subversion/tests/cmdline/lock_tests.py subversion/tests/cmdline/log_tests.py subversion/tests/cmdline/merge_authz_tests.py subversion/tests/cmdline/merge_automatic_tests.py subversion/tests/cmdline/merge_reintegrate_tests.py subversion/tests/cmdline/merge_tests.py subversion/tests/cmdline/merge_tree_conflict_tests.py subversion/tests/cmdline/mergeinfo_tests.py subversion/tests/cmdline/move_tests.py subversion/tests/cmdline/patch_tests.py subversion/tests/cmdline/prop_tests.py subversion/tests/cmdline/redirect_tests.py subversion/tests/cmdline/relocate_tests.py subversion/tests/cmdline/resolve_tests.py subversio n/tests/cmdline/revert_tests.py subversion/t! ests/cmdl! ine/schedule_tests.py subversion/tests/cmdline/special_tests.py subversion/tests/cmdline/stat_tests.py subversion/tests/cmdline/svnadmin_tests.py subversion/tests/cmdline/svnauthz_tests.py subversion/tests/cmdline/svndumpfilter_tests.py subversion/tests/cmdline/svnlook_tests.py subversion/tests/cmdline/svnmucc_tests.py subversion/tests/cmdline/svnrdump_tests.py subversion/tests/cmdline/svnsync_authz_tests.py subversion/tests/cmdline/svnsync_tests.py subversion/tests/cmdline/svnversion_tests.py subversion/tests/cmdline/switch_tests.py subversion/tests/cmdline/trans_tests.py subversion/tests/cmdline/tree_conflict_tests.py subversion/tests/cmdline/update_tests.py subversion/tests/cmdline/upgrade_tests.py subversion/tests/cmdline/wc_tests.py +TEST_DEPS = subversion/tests/cmdline/atomic-ra-revprop-change$(EXEEXT) subversion/tests/libsvn_subr/auth-test$(EXEEXT) subversion/tests/libsvn_subr/cache-test$(EXEEXT) subversion/tests/libsvn_subr/checksum-test$(EXEEXT) subversion/tests/libsvn_client/client-test$(EXEEXT) subversion/tests/libsvn_subr/compat-test$(EXEEXT) subversion/tests/libsvn_subr/config-test$(EXEEXT) subversion/tests/libsvn_wc/conflict-data-test$(EXEEXT) subversion/tests/libsvn_subr/crypto-test$(EXEEXT) subversion/tests/libsvn_wc/db-test$(EXEEXT) subversion/tests/libsvn_diff/diff-diff3-test$(EXEEXT) subversion/tests/libsvn_subr/dirent_uri-test$(EXEEXT) subversion/tests/libsvn_wc/entries-compat-test$(EXEEXT) subversion/tests/cmdline/entries-dump$(EXEEXT) subversion/tests/libsvn_subr/error-code-test$(EXEEXT) subversion/tests/libsvn_subr/error-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-pack-test$(EXEEXT) subversion/tests/libsvn_fs/fs-test$(EXEEXT) subversion/tests/libsvn_subr/hashdump-test$(EXEEXT) subversion/tes ts/libsvn_subr/io-test$(EXEEXT) subversion/tests/libsvn_fs/locks-test$(EXEEXT) subversion/tests/libsvn_subr/mergeinfo-test$(EXEEXT) subversion/tests/libsvn_subr/named_atomic-test$(EXEEXT) subversion/tests/libsvn_wc/op-depth-test$(EXEEXT) subversion/tests/libsvn_subr/opt-test$(EXEEXT) subversion/tests/libsvn_diff/parse-diff-test$(EXEEXT) subversion/tests/libsvn_subr/path-test$(EXEEXT) subversion/tests/libsvn_wc/pristine-store-test$(EXEEXT) subversion/tests/libsvn_ra_local/ra-local-test$(EXEEXT) subversion/tests/libsvn_ra/ra-test$(EXEEXT) subversion/tests/libsvn_delta/random-test$(EXEEXT) subversion/tests/libsvn_repos/repos-test$(EXEEXT) subversion/tests/libsvn_subr/revision-test$(EXEEXT) subversion/tests/libsvn_subr/skel-test$(EXEEXT) subversion/tests/libsvn_subr/spillbuf-test$(EXEEXT) subversion/tests/libsvn_subr/stream-test$(EXEEXT) subversion/tests/libsvn_subr/string-test$(EXEEXT) subversion/tests/libsvn_subr/subst_translate-test$(EXEEXT) tools/server-side/svnauthz$(EXEEXT) tools/ server-side/svnauthz-validate$(EXEEXT) subve! rsion/tests/libsvn_delta/svndiff-test$(EXEEXT) subversion/tests/libsvn_subr/time-test$(EXEEXT) subversion/tests/libsvn_subr/translate-test$(EXEEXT) subversion/tests/libsvn_subr/utf-test$(EXEEXT) subversion/tests/libsvn_delta/vdelta-test$(EXEEXT) subversion/tests/libsvn_wc/wc-incomplete-tester$(EXEEXT) subversion/tests/libsvn_wc/wc-lock-tester$(EXEEXT) subversion/tests/libsvn_wc/wc-queries-test$(EXEEXT) subversion/tests/libsvn_wc/wc-test$(EXEEXT) subversion/tests/libsvn_delta/window-test$(EXEEXT) subversion/tests/cmdline/authz_tests.py subversion/tests/cmdline/autoprop_tests.py subversion/tests/cmdline/basic_tests.py subversion/tests/cmdline/blame_tests.py subversion/tests/cmdline/cat_tests.py subversion/tests/cmdline/changelist_tests.py subversion/tests/cmdline/checkout_tests.py subversion/tests/cmdline/commit_tests.py subversion/tests/cmdline/copy_tests.py subversion/tests/cmdline/depth_tests.py subversion/tests/cmdline/diff_tests.py subversion/tests/cmdline/entries_tests.py subver sion/tests/cmdline/export_tests.py subversion/tests/cmdline/externals_tests.py subversion/tests/cmdline/getopt_tests.py subversion/tests/cmdline/history_tests.py subversion/tests/cmdline/import_tests.py subversion/tests/cmdline/info_tests.py subversion/tests/cmdline/input_validation_tests.py subversion/tests/cmdline/iprop_authz_tests.py subversion/tests/cmdline/iprop_tests.py subversion/tests/cmdline/lock_tests.py subversion/tests/cmdline/log_tests.py subversion/tests/cmdline/merge_authz_tests.py subversion/tests/cmdline/merge_automatic_tests.py subversion/tests/cmdline/merge_reintegrate_tests.py subversion/tests/cmdline/merge_tests.py subversion/tests/cmdline/merge_tree_conflict_tests.py subversion/tests/cmdline/mergeinfo_tests.py subversion/tests/cmdline/mod_authz_svn_tests.py subversion/tests/cmdline/move_tests.py subversion/tests/cmdline/patch_tests.py subversion/tests/cmdline/prop_tests.py subversion/tests/cmdline/redirect_tests.py subversion/tests/cmdline/relocate_tests.py sub version/tests/cmdline/resolve_tests.py subve! rsion/tes! ts/cmdline/revert_tests.py subversion/tests/cmdline/schedule_tests.py subversion/tests/cmdline/special_tests.py subversion/tests/cmdline/stat_tests.py subversion/tests/cmdline/svnadmin_tests.py subversion/tests/cmdline/svnauthz_tests.py subversion/tests/cmdline/svndumpfilter_tests.py subversion/tests/cmdline/svnlook_tests.py subversion/tests/cmdline/svnmucc_tests.py subversion/tests/cmdline/svnrdump_tests.py subversion/tests/cmdline/svnsync_authz_tests.py subversion/tests/cmdline/svnsync_tests.py subversion/tests/cmdline/svnversion_tests.py subversion/tests/cmdline/switch_tests.py subversion/tests/cmdline/trans_tests.py subversion/tests/cmdline/tree_conflict_tests.py subversion/tests/cmdline/update_tests.py subversion/tests/cmdline/upgrade_tests.py subversion/tests/cmdline/wc_tests.py -TEST_PROGRAMS = subversion/tests/libsvn_subr/auth-test$(EXEEXT) subversion/tests/libsvn_subr/cache-test$(EXEEXT) subversion/tests/libsvn_subr/checksum-test$(EXEEXT) subversion/tests/libsvn_client/client-test$(EXEEXT) subversion/tests/libsvn_subr/compat-test$(EXEEXT) subversion/tests/libsvn_subr/config-test$(EXEEXT) subversion/tests/libsvn_wc/conflict-data-test$(EXEEXT) subversion/tests/libsvn_subr/crypto-test$(EXEEXT) subversion/tests/libsvn_wc/db-test$(EXEEXT) subversion/tests/libsvn_diff/diff-diff3-test$(EXEEXT) subversion/tests/libsvn_subr/dirent_uri-test$(EXEEXT) subversion/tests/libsvn_wc/entries-compat-test$(EXEEXT) subversion/tests/libsvn_subr/error-code-test$(EXEEXT) subversion/tests/libsvn_subr/error-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-pack-test$(EXEEXT) subversion/tests/libsvn_fs/fs-test$(EXEEXT) subversion/tests/libsvn_subr/hashdump-test$(EXEEXT) subversion/tests/libsvn_subr/io-test$(EXEEXT) subversion/tests/libsvn_fs/locks-test$(EXEEXT) subversion/tests/libsvn _subr/mergeinfo-test$(EXEEXT) subversion/tests/libsvn_subr/named_atomic-test$(EXEEXT) subversion/tests/libsvn_wc/op-depth-test$(EXEEXT) subversion/tests/libsvn_subr/opt-test$(EXEEXT) subversion/tests/libsvn_diff/parse-diff-test$(EXEEXT) subversion/tests/libsvn_subr/path-test$(EXEEXT) subversion/tests/libsvn_wc/pristine-store-test$(EXEEXT) subversion/tests/libsvn_ra_local/ra-local-test$(EXEEXT) subversion/tests/libsvn_ra/ra-test$(EXEEXT) subversion/tests/libsvn_delta/random-test$(EXEEXT) subversion/tests/libsvn_repos/repos-test$(EXEEXT) subversion/tests/libsvn_subr/revision-test$(EXEEXT) subversion/tests/libsvn_subr/skel-test$(EXEEXT) subversion/tests/libsvn_subr/spillbuf-test$(EXEEXT) subversion/tests/libsvn_subr/stream-test$(EXEEXT) subversion/tests/libsvn_subr/string-test$(EXEEXT) subversion/tests/libsvn_subr/subst_translate-test$(EXEEXT) subversion/tests/libsvn_subr/time-test$(EXEEXT) subversion/tests/libsvn_subr/translate-test$(EXEEXT) subversion/tests/libsvn_subr/utf-test$(EXEE XT) subversion/tests/libsvn_wc/wc-queries-te! st$(EXEEXT) subversion/tests/libsvn_wc/wc-test$(EXEEXT) subversion/tests/libsvn_delta/window-test$(EXEEXT) subversion/tests/cmdline/authz_tests.py subversion/tests/cmdline/autoprop_tests.py subversion/tests/cmdline/basic_tests.py subversion/tests/cmdline/blame_tests.py subversion/tests/cmdline/cat_tests.py subversion/tests/cmdline/changelist_tests.py subversion/tests/cmdline/checkout_tests.py subversion/tests/cmdline/commit_tests.py subversion/tests/cmdline/copy_tests.py subversion/tests/cmdline/depth_tests.py subversion/tests/cmdline/diff_tests.py subversion/tests/cmdline/entries_tests.py subversion/tests/cmdline/export_tests.py subversion/tests/cmdline/externals_tests.py subversion/tests/cmdline/getopt_tests.py subversion/tests/cmdline/history_tests.py subversion/tests/cmdline/import_tests.py subversion/tests/cmdline/info_tests.py subversion/tests/cmdline/input_validation_tests.py subversion/tests/cmdline/iprop_authz_tests.py subversion/tests/cmdline/iprop_tests.py subversion/test s/cmdline/lock_tests.py subversion/tests/cmdline/log_tests.py subversion/tests/cmdline/merge_authz_tests.py subversion/tests/cmdline/merge_automatic_tests.py subversion/tests/cmdline/merge_reintegrate_tests.py subversion/tests/cmdline/merge_tests.py subversion/tests/cmdline/merge_tree_conflict_tests.py subversion/tests/cmdline/mergeinfo_tests.py subversion/tests/cmdline/move_tests.py subversion/tests/cmdline/patch_tests.py subversion/tests/cmdline/prop_tests.py subversion/tests/cmdline/redirect_tests.py subversion/tests/cmdline/relocate_tests.py subversion/tests/cmdline/resolve_tests.py subversion/tests/cmdline/revert_tests.py subversion/tests/cmdline/schedule_tests.py subversion/tests/cmdline/special_tests.py subversion/tests/cmdline/stat_tests.py subversion/tests/cmdline/svnadmin_tests.py subversion/tests/cmdline/svnauthz_tests.py subversion/tests/cmdline/svndumpfilter_tests.py subversion/tests/cmdline/svnlook_tests.py subversion/tests/cmdline/svnmucc_tests.py subversion/tests/cmd line/svnrdump_tests.py subversion/tests/cmdl! ine/svnsy! nc_authz_tests.py subversion/tests/cmdline/svnsync_tests.py subversion/tests/cmdline/svnversion_tests.py subversion/tests/cmdline/switch_tests.py subversion/tests/cmdline/trans_tests.py subversion/tests/cmdline/tree_conflict_tests.py subversion/tests/cmdline/update_tests.py subversion/tests/cmdline/upgrade_tests.py subversion/tests/cmdline/wc_tests.py +TEST_PROGRAMS = subversion/tests/libsvn_subr/auth-test$(EXEEXT) subversion/tests/libsvn_subr/cache-test$(EXEEXT) subversion/tests/libsvn_subr/checksum-test$(EXEEXT) subversion/tests/libsvn_client/client-test$(EXEEXT) subversion/tests/libsvn_subr/compat-test$(EXEEXT) subversion/tests/libsvn_subr/config-test$(EXEEXT) subversion/tests/libsvn_wc/conflict-data-test$(EXEEXT) subversion/tests/libsvn_subr/crypto-test$(EXEEXT) subversion/tests/libsvn_wc/db-test$(EXEEXT) subversion/tests/libsvn_diff/diff-diff3-test$(EXEEXT) subversion/tests/libsvn_subr/dirent_uri-test$(EXEEXT) subversion/tests/libsvn_wc/entries-compat-test$(EXEEXT) subversion/tests/libsvn_subr/error-code-test$(EXEEXT) subversion/tests/libsvn_subr/error-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-pack-test$(EXEEXT) subversion/tests/libsvn_fs/fs-test$(EXEEXT) subversion/tests/libsvn_subr/hashdump-test$(EXEEXT) subversion/tests/libsvn_subr/io-test$(EXEEXT) subversion/tests/libsvn_fs/locks-test$(EXEEXT) subversion/tests/libsvn _subr/mergeinfo-test$(EXEEXT) subversion/tests/libsvn_subr/named_atomic-test$(EXEEXT) subversion/tests/libsvn_wc/op-depth-test$(EXEEXT) subversion/tests/libsvn_subr/opt-test$(EXEEXT) subversion/tests/libsvn_diff/parse-diff-test$(EXEEXT) subversion/tests/libsvn_subr/path-test$(EXEEXT) subversion/tests/libsvn_wc/pristine-store-test$(EXEEXT) subversion/tests/libsvn_ra_local/ra-local-test$(EXEEXT) subversion/tests/libsvn_ra/ra-test$(EXEEXT) subversion/tests/libsvn_delta/random-test$(EXEEXT) subversion/tests/libsvn_repos/repos-test$(EXEEXT) subversion/tests/libsvn_subr/revision-test$(EXEEXT) subversion/tests/libsvn_subr/skel-test$(EXEEXT) subversion/tests/libsvn_subr/spillbuf-test$(EXEEXT) subversion/tests/libsvn_subr/stream-test$(EXEEXT) subversion/tests/libsvn_subr/string-test$(EXEEXT) subversion/tests/libsvn_subr/subst_translate-test$(EXEEXT) subversion/tests/libsvn_subr/time-test$(EXEEXT) subversion/tests/libsvn_subr/translate-test$(EXEEXT) subversion/tests/libsvn_subr/utf-test$(EXEE XT) subversion/tests/libsvn_wc/wc-queries-te! st$(EXEEXT) subversion/tests/libsvn_wc/wc-test$(EXEEXT) subversion/tests/libsvn_delta/window-test$(EXEEXT) subversion/tests/cmdline/authz_tests.py subversion/tests/cmdline/autoprop_tests.py subversion/tests/cmdline/basic_tests.py subversion/tests/cmdline/blame_tests.py subversion/tests/cmdline/cat_tests.py subversion/tests/cmdline/changelist_tests.py subversion/tests/cmdline/checkout_tests.py subversion/tests/cmdline/commit_tests.py subversion/tests/cmdline/copy_tests.py subversion/tests/cmdline/depth_tests.py subversion/tests/cmdline/diff_tests.py subversion/tests/cmdline/entries_tests.py subversion/tests/cmdline/export_tests.py subversion/tests/cmdline/externals_tests.py subversion/tests/cmdline/getopt_tests.py subversion/tests/cmdline/history_tests.py subversion/tests/cmdline/import_tests.py subversion/tests/cmdline/info_tests.py subversion/tests/cmdline/input_validation_tests.py subversion/tests/cmdline/iprop_authz_tests.py subversion/tests/cmdline/iprop_tests.py subversion/test s/cmdline/lock_tests.py subversion/tests/cmdline/log_tests.py subversion/tests/cmdline/merge_authz_tests.py subversion/tests/cmdline/merge_automatic_tests.py subversion/tests/cmdline/merge_reintegrate_tests.py subversion/tests/cmdline/merge_tests.py subversion/tests/cmdline/merge_tree_conflict_tests.py subversion/tests/cmdline/mergeinfo_tests.py subversion/tests/cmdline/mod_authz_svn_tests.py subversion/tests/cmdline/move_tests.py subversion/tests/cmdline/patch_tests.py subversion/tests/cmdline/prop_tests.py subversion/tests/cmdline/redirect_tests.py subversion/tests/cmdline/relocate_tests.py subversion/tests/cmdline/resolve_tests.py subversion/tests/cmdline/revert_tests.py subversion/tests/cmdline/schedule_tests.py subversion/tests/cmdline/special_tests.py subversion/tests/cmdline/stat_tests.py subversion/tests/cmdline/svnadmin_tests.py subversion/tests/cmdline/svnauthz_tests.py subversion/tests/cmdline/svndumpfilter_tests.py subversion/tests/cmdline/svnlook_tests.py subversion/tes ts/cmdline/svnmucc_tests.py subversion/tests! /cmdline/! svnrdump_tests.py subversion/tests/cmdline/svnsync_authz_tests.py subversion/tests/cmdline/svnsync_tests.py subversion/tests/cmdline/svnversion_tests.py subversion/tests/cmdline/switch_tests.py subversion/tests/cmdline/trans_tests.py subversion/tests/cmdline/tree_conflict_tests.py subversion/tests/cmdline/update_tests.py subversion/tests/cmdline/upgrade_tests.py subversion/tests/cmdline/wc_tests.py check-deps test-deps: subversion/tests/cmdline/atomic-ra-revprop-change$(EXEEXT) subversion/tests/cmdline/entries-dump$(EXEEXT) tools/server-side/svnauthz$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) subversion/tests/libsvn_delta/svndiff-test$(EXEEXT) subversion/tests/libsvn_delta/vdelta-test$(EXEEXT) subversion/tests/libsvn_wc/wc-incomplete-tester$(EXEEXT) subversion/tests/libsvn_wc/wc-lock-tester$(EXEEXT) MANPAGES = subversion/svn/svn.1 subversion/svnadmin/svnadmin.1 subversion/svndumpfilter/svndumpfilter.1 subversion/svnlook/svnlook.1 subversion/svnmucc/svnmucc.1 subversion/svnrdump/svnrdump.1 subversion/svnserve/svnserve.8 subversion/svnserve/svnserve.conf.5 subversion/svnsync/svnsync.1 subversion/svnversion/svnversion.1 -CLEAN_FILES = subversion/bindings/cxxhl/cxxhl-tests$(EXEEXT) subversion/svn/svn$(EXEEXT) subversion/svnadmin/svnadmin$(EXEEXT) subversion/svndumpfilter/svndumpfilter$(EXEEXT) subversion/svnlook/svnlook$(EXEEXT) subversion/svnmucc/svnmucc$(EXEEXT) subversion/svnrdump/svnrdump$(EXEEXT) subversion/svnserve/svnserve$(EXEEXT) subversion/svnsync/svnsync$(EXEEXT) subversion/svnversion/svnversion$(EXEEXT) subversion/tests/cmdline/atomic-ra-revprop-change$(EXEEXT) subversion/tests/cmdline/authz_tests.pyc subversion/tests/cmdline/autoprop_tests.pyc subversion/tests/cmdline/basic_tests.pyc subversion/tests/cmdline/blame_tests.pyc subversion/tests/cmdline/cat_tests.pyc subversion/tests/cmdline/changelist_tests.pyc subversion/tests/cmdline/checkout_tests.pyc subversion/tests/cmdline/commit_tests.pyc subversion/tests/cmdline/copy_tests.pyc subversion/tests/cmdline/depth_tests.pyc subversion/tests/cmdline/diff_tests.pyc subversion/tests/cmdline/entries-dump$(EXEEXT) subversion/tests/cmdline/entrie s_tests.pyc subversion/tests/cmdline/export_tests.pyc subversion/tests/cmdline/externals_tests.pyc subversion/tests/cmdline/getopt_tests.pyc subversion/tests/cmdline/history_tests.pyc subversion/tests/cmdline/import_tests.pyc subversion/tests/cmdline/info_tests.pyc subversion/tests/cmdline/input_validation_tests.pyc subversion/tests/cmdline/iprop_authz_tests.pyc subversion/tests/cmdline/iprop_tests.pyc subversion/tests/cmdline/lock_tests.pyc subversion/tests/cmdline/log_tests.pyc subversion/tests/cmdline/merge_authz_tests.pyc subversion/tests/cmdline/merge_automatic_tests.pyc subversion/tests/cmdline/merge_reintegrate_tests.pyc subversion/tests/cmdline/merge_tests.pyc subversion/tests/cmdline/merge_tree_conflict_tests.pyc subversion/tests/cmdline/mergeinfo_tests.pyc subversion/tests/cmdline/move_tests.pyc subversion/tests/cmdline/patch_tests.pyc subversion/tests/cmdline/prop_tests.pyc subversion/tests/cmdline/redirect_tests.pyc subversion/tests/cmdline/relocate_tests.pyc subversion/ tests/cmdline/resolve_tests.pyc subversion/t! ests/cmdline/revert_tests.pyc subversion/tests/cmdline/schedule_tests.pyc subversion/tests/cmdline/special_tests.pyc subversion/tests/cmdline/stat_tests.pyc subversion/tests/cmdline/svnadmin_tests.pyc subversion/tests/cmdline/svnauthz_tests.pyc subversion/tests/cmdline/svndumpfilter_tests.pyc subversion/tests/cmdline/svnlook_tests.pyc subversion/tests/cmdline/svnmucc_tests.pyc subversion/tests/cmdline/svnrdump_tests.pyc subversion/tests/cmdline/svnsync_authz_tests.pyc subversion/tests/cmdline/svnsync_tests.pyc subversion/tests/cmdline/svnversion_tests.pyc subversion/tests/cmdline/switch_tests.pyc subversion/tests/cmdline/trans_tests.pyc subversion/tests/cmdline/tree_conflict_tests.pyc subversion/tests/cmdline/update_tests.pyc subversion/tests/cmdline/upgrade_tests.pyc subversion/tests/cmdline/wc_tests.pyc subversion/tests/libsvn_client/client-test$(EXEEXT) subversion/tests/libsvn_delta/random-test$(EXEEXT) subversion/tests/libsvn_delta/svndiff-test$(EXEEXT) subversion/tests/libsvn_d elta/vdelta-test$(EXEEXT) subversion/tests/libsvn_delta/window-test$(EXEEXT) subversion/tests/libsvn_diff/diff-diff3-test$(EXEEXT) subversion/tests/libsvn_diff/parse-diff-test$(EXEEXT) subversion/tests/libsvn_fs/fs-test$(EXEEXT) subversion/tests/libsvn_fs/locks-test$(EXEEXT) subversion/tests/libsvn_fs_base/changes-test$(EXEEXT) subversion/tests/libsvn_fs_base/fs-base-test$(EXEEXT) subversion/tests/libsvn_fs_base/strings-reps-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-pack-test$(EXEEXT) subversion/tests/libsvn_ra/ra-test$(EXEEXT) subversion/tests/libsvn_ra_local/ra-local-test$(EXEEXT) subversion/tests/libsvn_repos/repos-test$(EXEEXT) subversion/tests/libsvn_subr/auth-test$(EXEEXT) subversion/tests/libsvn_subr/cache-test$(EXEEXT) subversion/tests/libsvn_subr/checksum-test$(EXEEXT) subversion/tests/libsvn_subr/compat-test$(EXEEXT) subversion/tests/libsvn_subr/config-test$(EXEEXT) subversion/tests/libsvn_subr/crypto-test$(EXEEXT) subversion/tests/libsvn_subr/dirent_uri-test$(EXEEXT) subversion/tests/libsvn_subr/error-code-tes! t$(EXEEXT! ) subversion/tests/libsvn_subr/error-test$(EXEEXT) subversion/tests/libsvn_subr/hashdump-test$(EXEEXT) subversion/tests/libsvn_subr/io-test$(EXEEXT) subversion/tests/libsvn_subr/mergeinfo-test$(EXEEXT) subversion/tests/libsvn_subr/named_atomic-proc-test$(EXEEXT) subversion/tests/libsvn_subr/named_atomic-test$(EXEEXT) subversion/tests/libsvn_subr/opt-test$(EXEEXT) subversion/tests/libsvn_subr/path-test$(EXEEXT) subversion/tests/libsvn_subr/revision-test$(EXEEXT) subversion/tests/libsvn_subr/skel-test$(EXEEXT) subversion/tests/libsvn_subr/spillbuf-test$(EXEEXT) subversion/tests/libsvn_subr/stream-test$(EXEEXT) subversion/tests/libsvn_subr/string-test$(EXEEXT) subversion/tests/libsvn_subr/subst_translate-test$(EXEEXT) subversion/tests/libsvn_subr/time-test$(EXEEXT) subversion/tests/libsvn_subr/translate-test$(EXEEXT) subversion/tests/libsvn_subr/utf-test$(EXEEXT) subversion/tests/libsvn_wc/conflict-data-test$(EXEEXT) subversion/tests/libsvn_wc/db-test$(EXEEXT) subversion/tests/libsvn_w c/entries-compat-test$(EXEEXT) subversion/tests/libsvn_wc/op-depth-test$(EXEEXT) subversion/tests/libsvn_wc/pristine-store-test$(EXEEXT) subversion/tests/libsvn_wc/wc-incomplete-tester$(EXEEXT) subversion/tests/libsvn_wc/wc-lock-tester$(EXEEXT) subversion/tests/libsvn_wc/wc-queries-test$(EXEEXT) subversion/tests/libsvn_wc/wc-test$(EXEEXT) tools/client-side/svn-bench/svn-bench$(EXEEXT) tools/dev/fsfs-access-map$(EXEEXT) tools/dev/fsfs-reorg$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT) tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/fsfs-stats$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) +CLEAN_FILES = subversion/bindings/cxxhl/cxxhl-tests$(EXEEXT) subversion/svn/svn$(EXEEXT) subversion/svnadmin/svnadmin$(EXEEXT) subversion/svndumpfilter/svndumpfilter$(EXEEXT) subversion/svnlook/svnlook$(EXEEXT) subversion/svnmucc/svnmucc$(EXEEXT) subversion/svnrdump/svnrdump$(EXEEXT) subversion/svnserve/svnserve$(EXEEXT) subversion/svnsync/svnsync$(EXEEXT) subversion/svnversion/svnversion$(EXEEXT) subversion/tests/cmdline/atomic-ra-revprop-change$(EXEEXT) subversion/tests/cmdline/authz_tests.pyc subversion/tests/cmdline/autoprop_tests.pyc subversion/tests/cmdline/basic_tests.pyc subversion/tests/cmdline/blame_tests.pyc subversion/tests/cmdline/cat_tests.pyc subversion/tests/cmdline/changelist_tests.pyc subversion/tests/cmdline/checkout_tests.pyc subversion/tests/cmdline/commit_tests.pyc subversion/tests/cmdline/copy_tests.pyc subversion/tests/cmdline/depth_tests.pyc subversion/tests/cmdline/diff_tests.pyc subversion/tests/cmdline/entries-dump$(EXEEXT) subversion/tests/cmdline/entrie s_tests.pyc subversion/tests/cmdline/export_tests.pyc subversion/tests/cmdline/externals_tests.pyc subversion/tests/cmdline/getopt_tests.pyc subversion/tests/cmdline/history_tests.pyc subversion/tests/cmdline/import_tests.pyc subversion/tests/cmdline/info_tests.pyc subversion/tests/cmdline/input_validation_tests.pyc subversion/tests/cmdline/iprop_authz_tests.pyc subversion/tests/cmdline/iprop_tests.pyc subversion/tests/cmdline/lock_tests.pyc subversion/tests/cmdline/log_tests.pyc subversion/tests/cmdline/merge_authz_tests.pyc subversion/tests/cmdline/merge_automatic_tests.pyc subversion/tests/cmdline/merge_reintegrate_tests.pyc subversion/tests/cmdline/merge_tests.pyc subversion/tests/cmdline/merge_tree_conflict_tests.pyc subversion/tests/cmdline/mergeinfo_tests.pyc subversion/tests/cmdline/mod_authz_svn_tests.pyc subversion/tests/cmdline/move_tests.pyc subversion/tests/cmdline/patch_tests.pyc subversion/tests/cmdline/prop_tests.pyc subversion/tests/cmdline/redirect_tests.pyc subver sion/tests/cmdline/relocate_tests.pyc subver! sion/tests/cmdline/resolve_tests.pyc subversion/tests/cmdline/revert_tests.pyc subversion/tests/cmdline/schedule_tests.pyc subversion/tests/cmdline/special_tests.pyc subversion/tests/cmdline/stat_tests.pyc subversion/tests/cmdline/svnadmin_tests.pyc subversion/tests/cmdline/svnauthz_tests.pyc subversion/tests/cmdline/svndumpfilter_tests.pyc subversion/tests/cmdline/svnlook_tests.pyc subversion/tests/cmdline/svnmucc_tests.pyc subversion/tests/cmdline/svnrdump_tests.pyc subversion/tests/cmdline/svnsync_authz_tests.pyc subversion/tests/cmdline/svnsync_tests.pyc subversion/tests/cmdline/svnversion_tests.pyc subversion/tests/cmdline/switch_tests.pyc subversion/tests/cmdline/trans_tests.pyc subversion/tests/cmdline/tree_conflict_tests.pyc subversion/tests/cmdline/update_tests.pyc subversion/tests/cmdline/upgrade_tests.pyc subversion/tests/cmdline/wc_tests.pyc subversion/tests/libsvn_client/client-test$(EXEEXT) subversion/tests/libsvn_delta/random-test$(EXEEXT) subversion/tests/libsvn_delt a/svndiff-test$(EXEEXT) subversion/tests/libsvn_delta/vdelta-test$(EXEEXT) subversion/tests/libsvn_delta/window-test$(EXEEXT) subversion/tests/libsvn_diff/diff-diff3-test$(EXEEXT) subversion/tests/libsvn_diff/parse-diff-test$(EXEEXT) subversion/tests/libsvn_fs/fs-test$(EXEEXT) subversion/tests/libsvn_fs/locks-test$(EXEEXT) subversion/tests/libsvn_fs_base/changes-test$(EXEEXT) subversion/tests/libsvn_fs_base/fs-base-test$(EXEEXT) subversion/tests/libsvn_fs_base/strings-reps-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-pack-test$(EXEEXT) subversion/tests/libsvn_ra/ra-test$(EXEEXT) subversion/tests/libsvn_ra_local/ra-local-test$(EXEEXT) subversion/tests/libsvn_repos/repos-test$(EXEEXT) subversion/tests/libsvn_subr/auth-test$(EXEEXT) subversion/tests/libsvn_subr/cache-test$(EXEEXT) subversion/tests/libsvn_subr/checksum-test$(EXEEXT) subversion/tests/libsvn_subr/compat-test$(EXEEXT) subversion/tests/libsvn_subr/config-test$(EXEEXT) subversion/tests/libsvn_subr/crypto-test$(EXEEXT) subv ersion/tests/libsvn_subr/dirent_uri-test$(EX! EEXT) sub! version/tests/libsvn_subr/error-code-test$(EXEEXT) subversion/tests/libsvn_subr/error-test$(EXEEXT) subversion/tests/libsvn_subr/hashdump-test$(EXEEXT) subversion/tests/libsvn_subr/io-test$(EXEEXT) subversion/tests/libsvn_subr/mergeinfo-test$(EXEEXT) subversion/tests/libsvn_subr/named_atomic-proc-test$(EXEEXT) subversion/tests/libsvn_subr/named_atomic-test$(EXEEXT) subversion/tests/libsvn_subr/opt-test$(EXEEXT) subversion/tests/libsvn_subr/path-test$(EXEEXT) subversion/tests/libsvn_subr/revision-test$(EXEEXT) subversion/tests/libsvn_subr/skel-test$(EXEEXT) subversion/tests/libsvn_subr/spillbuf-test$(EXEEXT) subversion/tests/libsvn_subr/stream-test$(EXEEXT) subversion/tests/libsvn_subr/string-test$(EXEEXT) subversion/tests/libsvn_subr/subst_translate-test$(EXEEXT) subversion/tests/libsvn_subr/time-test$(EXEEXT) subversion/tests/libsvn_subr/translate-test$(EXEEXT) subversion/tests/libsvn_subr/utf-test$(EXEEXT) subversion/tests/libsvn_wc/conflict-data-test$(EXEEXT) subversion/tests/lib svn_wc/db-test$(EXEEXT) subversion/tests/libsvn_wc/entries-compat-test$(EXEEXT) subversion/tests/libsvn_wc/op-depth-test$(EXEEXT) subversion/tests/libsvn_wc/pristine-store-test$(EXEEXT) subversion/tests/libsvn_wc/wc-incomplete-tester$(EXEEXT) subversion/tests/libsvn_wc/wc-lock-tester$(EXEEXT) subversion/tests/libsvn_wc/wc-queries-test$(EXEEXT) subversion/tests/libsvn_wc/wc-test$(EXEEXT) tools/client-side/svn-bench/svn-bench$(EXEEXT) tools/dev/fsfs-access-map$(EXEEXT) tools/dev/fsfs-reorg$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT) tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/fsfs-stats$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) EXTRACLEAN_FILES = subversion/libsvn_fs_fs/rep-cache-db.h subversion/libsvn_subr/internal_statements.h subversion/libsvn_wc/wc-queries.h SWIG_INCLUDES = -I$(abs_builddir)/subversion \ @@ -2513,7 +2513,7 @@ subversion/libsvn_wc/wcroot_anchor.lo: s subversion/libsvn_wc/workqueue.lo: subversion/libsvn_wc/workqueue.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/props.h subversion/libsvn_wc/trans late.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h -subversion/mod_authz_svn/mod_authz_svn.lo: subversion/mod_authz_svn/mod_authz_svn.c subversion/include/mod_authz_svn.h subversion/include/mod_dav_svn.h subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h +subversion/mod_authz_svn/mod_authz_svn.lo: subversion/mod_authz_svn/mod_authz_svn.c subversion/include/mod_authz_svn.h subversion/include/mod_dav_svn.h subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h if $(INSTALL_APACHE_MODS) ; then $(COMPILE_APACHE_MOD) $(canonicalized_srcdir)subversion/mod_authz_svn/mod_authz_svn.c ; else echo "fake" > subversion/mod_authz_svn/mod_authz_svn.lo ; fi subversion/mod_dav_svn/activity.lo: subversion/mod_dav_svn/activity.c subversion/include/mod_authz_svn.h subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_xml.h subversion/mod_dav_svn/dav_svn.h @@ -2759,7 +2759,7 @@ subversion/tests/libsvn_fs_base/fs-base- subversion/tests/libsvn_fs_base/strings-reps-test.lo: subversion/tests/libsvn_fs_base/strings-reps-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/reps-table.h subversion/libsvn_fs_base/bdb/strings-table.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_base/util/fs_skels.h subversion/svn_private_config.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h -subversion/tests/libsvn_fs_fs/fs-pack-test.lo: subversion/tests/libsvn_fs_fs/fs-pack-test.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_named_atomic.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h su bversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs_fs/fs.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h +subversion/tests/libsvn_fs_fs/fs-pack-test.lo: subversion/tests/libsvn_fs_fs/fs-pack-test.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_named_atomic.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h sub version/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_fs/fs.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h subversion/tests/libsvn_ra/ra-test.lo: subversion/tests/libsvn_ra/ra-test.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/libsvn_ra_local/ra_local.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h Modified: branches/2015Q3/devel/subversion/files/extra-patch-fbsd-template ============================================================================== --- branches/2015Q3/devel/subversion/files/extra-patch-fbsd-template Mon Aug 17 07:31:45 2015 (r394438) +++ branches/2015Q3/devel/subversion/files/extra-patch-fbsd-template Mon Aug 17 08:10:26 2015 (r394439) @@ -1,6 +1,6 @@ ---- subversion/svn/util.c.orig 2013-07-10 04:00:05 UTC -+++ subversion/svn/util.c -@@ -66,6 +66,9 @@ +--- subversion/svn/util.c.orig 2013-07-10 06:00:05.000000000 +0200 ++++ subversion/svn/util.c 2015-07-30 13:00:04.642537000 +0200 +@@ -66,6 +69,9 @@ #include "private/svn_client_private.h" #include "private/svn_cmdline_private.h" #include "private/svn_string_private.h" @@ -10,7 +10,7 @@ -@@ -322,6 +325,70 @@ truncate_buffer_at_prefix(apr_size_t *ne +@@ -322,6 +328,70 @@ truncate_buffer_at_prefix(apr_size_t *ne } @@ -81,7 +81,14 @@ #define EDITOR_EOF_PREFIX _("--This line, and those below, will be ignored--") svn_error_t * -@@ -337,8 +404,38 @@ svn_cl__get_log_message(const char **log +@@ -334,11 +404,54 @@ svn_cl__get_log_message(const char **log + svn_stringbuf_t *default_msg = NULL; + struct log_msg_baton *lmb = baton; + svn_stringbuf_t *message = NULL; ++ svn_config_t *cfg; ++ const char *mfc_after, *sponsored_by; ++ ++ cfg = lmb->config ? svn_hash_gets(lmb->config, SVN_CONFIG_CATEGORY_CONFIG) : NULL; /* Set default message. */ default_msg = svn_stringbuf_create(APR_EOL_STR, pool); @@ -91,15 +98,24 @@ + svn_stringbuf_appendcstr(default_msg, "Reviewed by:\t" APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "Approved by:\t" APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "Obtained from:\t" APR_EOL_STR); -+ svn_stringbuf_appendcstr(default_msg, "MFC after:\t" APR_EOL_STR); ++ svn_stringbuf_appendcstr(default_msg, "MFC after:\t"); ++ svn_config_get(cfg, &mfc_after, SVN_CONFIG_SECTION_MISCELLANY, "freebsd-mfc-after", NULL); ++ if (mfc_after != NULL) ++ svn_stringbuf_appendcstr(default_msg, mfc_after); ++ svn_stringbuf_appendcstr(default_msg, APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "MFH:\t\t" APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "Relnotes:\t" APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "Security:\t" APR_EOL_STR); -+ svn_stringbuf_appendcstr(default_msg, "Sponsored by:\t" ++ svn_stringbuf_appendcstr(default_msg, "Sponsored by:\t"); ++ svn_config_get(cfg, &sponsored_by, SVN_CONFIG_SECTION_MISCELLANY, "freebsd-sponsored-by", +#ifdef HAS_ORGANIZATION_NAME -+ ORGANIZATION_NAME ++ ORGANIZATION_NAME); ++#else ++ NULL); +#endif -+ APR_EOL_STR); ++ if (sponsored_by != NULL) ++ svn_stringbuf_appendcstr(default_msg, sponsored_by); ++ svn_stringbuf_appendcstr(default_msg, APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "Differential Revision:\t" APR_EOL_STR); svn_stringbuf_appendcstr(default_msg, EDITOR_EOF_PREFIX); - svn_stringbuf_appendcstr(default_msg, APR_EOL_STR APR_EOL_STR); @@ -121,7 +137,7 @@ *tmp_file = NULL; if (lmb->message) -@@ -350,6 +447,7 @@ svn_cl__get_log_message(const char **log +@@ -350,6 +463,7 @@ svn_cl__get_log_message(const char **log that follows it. */ truncate_buffer_at_prefix(&(log_msg_buf->len), log_msg_buf->data, EDITOR_EOF_PREFIX); @@ -129,7 +145,7 @@ /* Make a string from a stringbuf, sharing the data allocation. */ log_msg_str->data = log_msg_buf->data; -@@ -470,6 +568,13 @@ svn_cl__get_log_message(const char **log +@@ -470,6 +584,13 @@ svn_cl__get_log_message(const char **log if (message) truncate_buffer_at_prefix(&message->len, message->data, EDITOR_EOF_PREFIX); From owner-svn-ports-branches@freebsd.org Mon Aug 17 09:21:45 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 53A179BB72C; Mon, 17 Aug 2015 09:21:45 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 42989136E; Mon, 17 Aug 2015 09:21:45 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7H9LjAQ095127; Mon, 17 Aug 2015 09:21:45 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7H9Lb2C095092; Mon, 17 Aug 2015 09:21:37 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201508170921.t7H9Lb2C095092@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Mon, 17 Aug 2015 09:21:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r394445 - in branches/2015Q3/databases: mariadb100-client/files mariadb100-server mariadb100-server/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Aug 2015 09:21:45 -0000 Author: brnrd Date: Mon Aug 17 09:21:37 2015 New Revision: 394445 URL: https://svnweb.freebsd.org/changeset/ports/394445 Log: MFH: r394020 databases/mariadb100-server: Update to 10.0.21 - Update to 10.0.21 - Updates mariadb100-client as well (slave-port) - Silence portlint - Re-roll patches with makepatch [1] https://mariadb.atlassian.net/browse/MDEV-7398 [2] https://mariadb.atlassian.net/browse/MDEV-8128 Changes: https://mariadb.com/kb/en/mariadb/mariadb-10021-changelog/ Differential revision: https://reviews.freebsd.org/D2771 Reviewed by: koobs (mentor), vsevolod (mentor) Approved by: vsevolod (mentor) Approved by: ports-secteam (feld) PR: 200097 Security: 36bd352d-299b-11e5-86ff-14dae9d210b8 Added: branches/2015Q3/databases/mariadb100-server/files/extra-patch-include_my__compare.h - copied unchanged from r394020, head/databases/mariadb100-server/files/extra-patch-include_my__compare.h branches/2015Q3/databases/mariadb100-server/files/patch-cmake_jemalloc.cmake - copied unchanged from r394020, head/databases/mariadb100-server/files/patch-cmake_jemalloc.cmake branches/2015Q3/databases/mariadb100-server/files/patch-mysys_my__default.c - copied unchanged from r394020, head/databases/mariadb100-server/files/patch-mysys_my__default.c branches/2015Q3/databases/mariadb100-server/files/patch-scripts_mysql__config.sh - copied unchanged from r394020, head/databases/mariadb100-server/files/patch-scripts_mysql__config.sh branches/2015Q3/databases/mariadb100-server/files/patch-scripts_mysqld__safe.sh - copied unchanged from r394020, head/databases/mariadb100-server/files/patch-scripts_mysqld__safe.sh branches/2015Q3/databases/mariadb100-server/files/patch-sql_sql__trigger.cc - copied unchanged from r394020, head/databases/mariadb100-server/files/patch-sql_sql__trigger.cc branches/2015Q3/databases/mariadb100-server/files/patch-sql_sql__view.cc - copied unchanged from r394020, head/databases/mariadb100-server/files/patch-sql_sql__view.cc branches/2015Q3/databases/mariadb100-server/files/patch-sql_sys__vars.cc - copied unchanged from r394020, head/databases/mariadb100-server/files/patch-sql_sys__vars.cc Deleted: branches/2015Q3/databases/mariadb100-server/files/extra-patch-include_my_compare.h branches/2015Q3/databases/mariadb100-server/files/patch-cmake__jemalloc.cmake branches/2015Q3/databases/mariadb100-server/files/patch-mysys_my_default.c branches/2015Q3/databases/mariadb100-server/files/patch-scripts_mysql_config.sh branches/2015Q3/databases/mariadb100-server/files/patch-scripts_mysqld_safe.sh branches/2015Q3/databases/mariadb100-server/files/patch-sql_sql_trigger.cc branches/2015Q3/databases/mariadb100-server/files/patch-sql_sql_view.cc branches/2015Q3/databases/mariadb100-server/files/patch-sql_sys_vars.cc Modified: branches/2015Q3/databases/mariadb100-client/files/patch-CMakeLists.txt branches/2015Q3/databases/mariadb100-server/Makefile branches/2015Q3/databases/mariadb100-server/distinfo branches/2015Q3/databases/mariadb100-server/files/patch-CMakeLists.txt branches/2015Q3/databases/mariadb100-server/files/patch-client_CMakeLists.txt branches/2015Q3/databases/mariadb100-server/files/patch-extra_CMakeLists.txt branches/2015Q3/databases/mariadb100-server/files/patch-extra_yassl_taocrypt_src_integer.cpp branches/2015Q3/databases/mariadb100-server/files/patch-include_CMakeLists.txt branches/2015Q3/databases/mariadb100-server/files/patch-libmysql_CMakeLists.txt branches/2015Q3/databases/mariadb100-server/files/patch-libservices_CMakeLists.txt branches/2015Q3/databases/mariadb100-server/files/patch-man_CMakeLists.txt branches/2015Q3/databases/mariadb100-server/files/patch-pcre_CMakeLists.txt branches/2015Q3/databases/mariadb100-server/files/patch-scripts_CMakeLists.txt branches/2015Q3/databases/mariadb100-server/files/patch-sql_CMakeLists.txt branches/2015Q3/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_cmake__modules_TokuFeatureDetection.cmake branches/2015Q3/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_portability_memory.cc branches/2015Q3/databases/mariadb100-server/files/patch-support-files_CMakeLists.txt branches/2015Q3/databases/mariadb100-server/pkg-plist Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/databases/mariadb100-client/files/patch-CMakeLists.txt ============================================================================== --- branches/2015Q3/databases/mariadb100-client/files/patch-CMakeLists.txt Mon Aug 17 09:17:56 2015 (r394444) +++ branches/2015Q3/databases/mariadb100-client/files/patch-CMakeLists.txt Mon Aug 17 09:21:37 2015 (r394445) @@ -1,43 +1,25 @@ ---- CMakeLists.txt.orig 2014-09-25 00:29:47.000000000 +0200 -+++ CMakeLists.txt 2014-09-27 09:57:32.000000000 +0200 -@@ -430,28 +430,8 @@ +--- CMakeLists.txt.orig 2015-08-05 20:11:27.000000000 +0200 ++++ CMakeLists.txt 2015-08-07 12:05:52.895578945 +0200 +@@ -405,9 +405,9 @@ ADD_SUBDIRECTORY(client) ADD_SUBDIRECTORY(extra) ADD_SUBDIRECTORY(libservices) ADD_SUBDIRECTORY(scripts) -ADD_SUBDIRECTORY(sql/share) ADD_SUBDIRECTORY(support-files) --IF(NOT WITHOUT_SERVER) -- ADD_SUBDIRECTORY(tests) -- ADD_SUBDIRECTORY(sql) -- OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF) -- IF(WITH_EMBEDDED_SERVER) -- ADD_SUBDIRECTORY(libmysqld) -- ADD_SUBDIRECTORY(libmysqld/examples) -- ENDIF(WITH_EMBEDDED_SERVER) -- -- ADD_SUBDIRECTORY(mysql-test) -- ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) -- ADD_SUBDIRECTORY(sql-bench) -- -- IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt) -- ADD_SUBDIRECTORY(internal) -- ENDIF() -- ADD_SUBDIRECTORY(packaging/rpm-oel) --ENDIF() -- - IF(UNIX) - ADD_SUBDIRECTORY(man) - ENDIF() -@@ -463,7 +443,6 @@ - ADD_SUBDIRECTORY(win/upgrade_wizard) - ADD_SUBDIRECTORY(win/packaging) ++IF(FALSE) + IF(NOT WITHOUT_SERVER) + ADD_SUBDIRECTORY(tests) + ADD_SUBDIRECTORY(sql) +@@ -425,6 +426,7 @@ IF(NOT WITHOUT_SERVER) + ADD_SUBDIRECTORY(internal) + ENDIF() ENDIF() --ADD_SUBDIRECTORY(packaging/solaris) ++ENDIF() - IF(NOT CMAKE_CROSSCOMPILING) - SET(EXPORTED comp_err comp_sql factorial) -@@ -506,6 +485,7 @@ + IF(UNIX) + ADD_SUBDIRECTORY(man) +@@ -480,6 +482,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) @@ -45,7 +27,7 @@ INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.LESSER EXCEPTIONS-CLIENT COMPONENT Readme) -@@ -516,6 +496,7 @@ +@@ -490,6 +493,7 @@ INSTALL_DOCUMENTATION(README CREDITS COP IF(UNIX) INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme) ENDIF() Modified: branches/2015Q3/databases/mariadb100-server/Makefile ============================================================================== --- branches/2015Q3/databases/mariadb100-server/Makefile Mon Aug 17 09:17:56 2015 (r394444) +++ branches/2015Q3/databases/mariadb100-server/Makefile Mon Aug 17 09:21:37 2015 (r394445) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.0.17 +PORTVERSION= 10.0.21 CATEGORIES= databases ipv6 MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \ http://mirrors.supportex.net/${SITESDIR}/ \ @@ -13,7 +13,7 @@ MASTER_SITES= http://ftp.osuosl.org/pub/ http://mirror.switch.ch/mirror/${SITESDIR}/ PKGNAMESUFFIX?= 100-server -MAINTAINER= spil.oss@gmail.com +MAINTAINER= brnrd@FreeBSD.org COMMENT?= Multithreaded SQL database (server) LICENSE= GPLv2 @@ -21,13 +21,13 @@ LICENSE= GPLv2 SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message +UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} SLAVEDIRS= databases/mariadb100-client USES= bison:build cmake execinfo gmake shebangfix cpe +USE_LDCONFIG= ${PREFIX}/lib/mysql ${PREFIX}/lib/mysql/plugin SHEBANG_FILES= scripts/*.sh SITESDIR= mariadb/mariadb-${PORTVERSION}/source -BROKEN_armv6= Does not compile on arm - OPTIONS_DEFINE= FASTMTX OPTIONS_RADIO= SSL OPTIONS_RADIO_SSL= BUNDLED_SSL OPENSSL WITHOUT_SSL @@ -59,15 +59,16 @@ CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc -DEXECINFO_ROOT=${LOCALBASE} \ -DCOMPILATION_COMMENT="FreeBSD Ports" +DATADIR= ${PREFIX}/share/mysql + .ifdef USE_MYSQL -.error You have USE_MYSQL variable defined either in environment or in make(1) arguments. Please undefine and try again. +.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. This leads to a circular dependency. Please undefine and try again. .endif -DATADIR= ${PREFIX}/share/mysql - .if !defined(CLIENT_ONLY) # MySQL-Server options USE_MYSQL= yes +USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin OPTIONS_DEFINE+= INNODB MAXKEY MROONGA OQGRAPH OPTIONS_DEFAULT+= MAXKEY OPTIONS_SUB= yes @@ -104,10 +105,11 @@ CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 INNODB_CMAKE_OFF= -DWITHOUT_INNOBASE=1 -MAXKEY_EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include_my_compare.h +MAXKEY_EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include_my__compare.h MROONGA_CMAKE_OFF= -DWITHOUT_MROONGA=1 OQGRAPH_CMAKE_OFF= -DWITHOUT_OQGRAPH=1 -OQGRAPH_LIB_DEPENDS= libboost_system.so:${PORTSDIR}/devel/boost-libs +OQGRAPH_LIB_DEPENDS= libboost_system.so:${PORTSDIR}/devel/boost-libs \ + libJudy.so:${PORTSDIR}/devel/judy post-install: # Remove programs to avoid conflict with mariadb100-client @@ -132,6 +134,11 @@ CMAKE_ARGS+= -DWITH_JEMALLOC="no" USE_GCC= yes .endif +.if ${PORT_OPTIONS:MOQGRPAH} +IGNORE= currently MariaDB doesn't build correctly with OQGraph \ + See https://mariadb.atlassian.net/browse/MDEV-8128. +.endif + post-patch: @${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/my_default.c Modified: branches/2015Q3/databases/mariadb100-server/distinfo ============================================================================== --- branches/2015Q3/databases/mariadb100-server/distinfo Mon Aug 17 09:17:56 2015 (r394444) +++ branches/2015Q3/databases/mariadb100-server/distinfo Mon Aug 17 09:21:37 2015 (r394445) @@ -1,2 +1,2 @@ -SHA256 (mariadb-10.0.17.tar.gz) = 9cd394e99942c3700b13f2bf126895fe587e668bfcaffcfd81f0cd878fc19311 -SIZE (mariadb-10.0.17.tar.gz) = 55989700 +SHA256 (mariadb-10.0.21.tar.gz) = 4b9a32e15ceadefdb1057a02eb3e0addf702b75aef631a3c9194b832ecfa3545 +SIZE (mariadb-10.0.21.tar.gz) = 56216903 Copied: branches/2015Q3/databases/mariadb100-server/files/extra-patch-include_my__compare.h (from r394020, head/databases/mariadb100-server/files/extra-patch-include_my__compare.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q3/databases/mariadb100-server/files/extra-patch-include_my__compare.h Mon Aug 17 09:21:37 2015 (r394445, copy of r394020, head/databases/mariadb100-server/files/extra-patch-include_my__compare.h) @@ -0,0 +1,11 @@ +--- include/my_compare.h.orig 2012-11-28 17:49:43.000000000 +0200 ++++ include/my_compare.h 2012-12-23 02:45:51.000000000 +0200 +@@ -40,7 +40,7 @@ + But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH. + */ + +-#define HA_MAX_KEY_LENGTH 1000 /* Max length in bytes */ ++#define HA_MAX_KEY_LENGTH 4000 /* Max length in bytes */ + #define HA_MAX_KEY_SEG 32 /* Max segments for key */ + + #define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24+ 6+6) Modified: branches/2015Q3/databases/mariadb100-server/files/patch-CMakeLists.txt ============================================================================== --- branches/2015Q3/databases/mariadb100-server/files/patch-CMakeLists.txt Mon Aug 17 09:17:56 2015 (r394444) +++ branches/2015Q3/databases/mariadb100-server/files/patch-CMakeLists.txt Mon Aug 17 09:21:37 2015 (r394445) @@ -1,22 +1,14 @@ ---- CMakeLists.txt.orig 2014-08-09 00:13:37.000000000 +0200 -+++ CMakeLists.txt 2014-09-05 18:22:34.646409575 +0200 -@@ -463,7 +463,6 @@ - ADD_SUBDIRECTORY(win/upgrade_wizard) - ADD_SUBDIRECTORY(win/packaging) - ENDIF() --ADD_SUBDIRECTORY(packaging/solaris) - - IF(NOT CMAKE_CROSSCOMPILING) - SET(EXPORTED comp_err comp_sql factorial gen_lex_hash) -@@ -503,6 +502,7 @@ +--- CMakeLists.txt.orig 2015-08-05 18:11:27 UTC ++++ CMakeLists.txt +@@ -480,6 +480,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) +IF(FALSE) INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.LESSER EXCEPTIONS-CLIENT COMPONENT Readme) - INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC -@@ -511,6 +511,7 @@ + +@@ -490,6 +491,7 @@ INSTALL_DOCUMENTATION(README CREDITS COP IF(UNIX) INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme) ENDIF() Modified: branches/2015Q3/databases/mariadb100-server/files/patch-client_CMakeLists.txt ============================================================================== --- branches/2015Q3/databases/mariadb100-server/files/patch-client_CMakeLists.txt Mon Aug 17 09:17:56 2015 (r394444) +++ branches/2015Q3/databases/mariadb100-server/files/patch-client_CMakeLists.txt Mon Aug 17 09:21:37 2015 (r394445) @@ -1,6 +1,6 @@ ---- client/CMakeLists.txt.orig 2014-08-09 00:13:48.000000000 +0200 -+++ client/CMakeLists.txt 2014-09-07 21:19:33.000000000 +0200 -@@ -30,6 +30,7 @@ +--- client/CMakeLists.txt.orig 2015-06-17 14:54:11 UTC ++++ client/CMakeLists.txt +@@ -30,6 +30,7 @@ INCLUDE_DIRECTORIES( COPY_OPENSSL_DLLS(copy_openssl_client) ADD_DEFINITIONS(${SSL_DEFINES}) @@ -8,7 +8,7 @@ MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc ${CMAKE_SOURCE_DIR}/sql/sql_string.cc) TARGET_LINK_LIBRARIES(mysql mysqlclient) -@@ -37,6 +38,7 @@ +@@ -37,6 +38,7 @@ IF(UNIX) TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY}) SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE) ENDIF(UNIX) @@ -16,7 +16,7 @@ MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") -@@ -44,6 +46,7 @@ +@@ -44,6 +46,7 @@ TARGET_LINK_LIBRARIES(mysqltest mysqlcli SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE) @@ -24,7 +24,7 @@ MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) -@@ -52,17 +55,21 @@ +@@ -52,17 +55,21 @@ TARGET_LINK_LIBRARIES(mysqldump mysqlcli MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) @@ -46,7 +46,7 @@ MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) -@@ -72,17 +79,20 @@ +@@ -72,17 +79,20 @@ TARGET_LINK_LIBRARIES(mysqladmin mysqlcl MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c) SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS") TARGET_LINK_LIBRARIES(mysqlslap mysqlclient) Copied: branches/2015Q3/databases/mariadb100-server/files/patch-cmake_jemalloc.cmake (from r394020, head/databases/mariadb100-server/files/patch-cmake_jemalloc.cmake) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q3/databases/mariadb100-server/files/patch-cmake_jemalloc.cmake Mon Aug 17 09:21:37 2015 (r394445, copy of r394020, head/databases/mariadb100-server/files/patch-cmake_jemalloc.cmake) @@ -0,0 +1,18 @@ +--- cmake/jemalloc.cmake.orig 2015-06-17 14:54:11 UTC ++++ cmake/jemalloc.cmake +@@ -24,12 +24,12 @@ MACRO (CHECK_JEMALLOC) + SET(what system) + ENDIF() + +- CHECK_LIBRARY_EXISTS(${libname} malloc_stats_print "" HAVE_JEMALLOC) ++ CHECK_LIBRARY_EXISTS(c malloc_stats_print "" HAVE_JEMALLOC) + SET(CMAKE_REQUIRED_LIBRARIES) + + IF (HAVE_JEMALLOC) +- SET(LIBJEMALLOC ${libname}) +- SET(MALLOC_LIBRARY "${what} jemalloc") ++ SET(LIBJEMALLOC c) ++ SET(MALLOC_LIBRARY "system jemalloc") + ELSEIF (NOT WITH_JEMALLOC STREQUAL "auto") + MESSAGE(FATAL_ERROR "${libname} is not found") + ENDIF() Modified: branches/2015Q3/databases/mariadb100-server/files/patch-extra_CMakeLists.txt ============================================================================== --- branches/2015Q3/databases/mariadb100-server/files/patch-extra_CMakeLists.txt Mon Aug 17 09:17:56 2015 (r394444) +++ branches/2015Q3/databases/mariadb100-server/files/patch-extra_CMakeLists.txt Mon Aug 17 09:21:37 2015 (r394445) @@ -1,6 +1,6 @@ ---- extra/CMakeLists.txt.orig 2014-08-09 00:13:40.000000000 +0200 -+++ extra/CMakeLists.txt 2014-09-05 18:32:20.555373233 +0200 -@@ -80,6 +80,8 @@ +--- extra/CMakeLists.txt.orig 2015-06-17 14:54:11 UTC ++++ extra/CMakeLists.txt +@@ -78,9 +78,11 @@ IF(UNIX) MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c) TARGET_LINK_LIBRARIES(resolve_stack_dump mysys) @@ -9,3 +9,6 @@ TARGET_LINK_LIBRARIES(mysql_waitpid mysys) ENDIF() +ENDIF() + + + # Add path to the InnoDB headers Modified: branches/2015Q3/databases/mariadb100-server/files/patch-extra_yassl_taocrypt_src_integer.cpp ============================================================================== --- branches/2015Q3/databases/mariadb100-server/files/patch-extra_yassl_taocrypt_src_integer.cpp Mon Aug 17 09:17:56 2015 (r394444) +++ branches/2015Q3/databases/mariadb100-server/files/patch-extra_yassl_taocrypt_src_integer.cpp Mon Aug 17 09:21:37 2015 (r394445) @@ -1,6 +1,6 @@ ---- extra/yassl/taocrypt/src/integer.cpp.orig 2014-04-15 14:02:39.000000000 +0300 -+++ extra/yassl/taocrypt/src/integer.cpp 2014-05-16 17:00:15.000000000 +0300 -@@ -75,7 +75,7 @@ +--- extra/yassl/taocrypt/src/integer.cpp.orig 2015-06-17 14:54:11 UTC ++++ extra/yassl/taocrypt/src/integer.cpp +@@ -74,7 +74,7 @@ template CPP_TYPENAME AlignedAllocator::pointer AlignedAllocator::allocate( size_type n, const void *) { Modified: branches/2015Q3/databases/mariadb100-server/files/patch-include_CMakeLists.txt ============================================================================== --- branches/2015Q3/databases/mariadb100-server/files/patch-include_CMakeLists.txt Mon Aug 17 09:17:56 2015 (r394444) +++ branches/2015Q3/databases/mariadb100-server/files/patch-include_CMakeLists.txt Mon Aug 17 09:21:37 2015 (r394445) @@ -1,6 +1,6 @@ ---- include/CMakeLists.txt.orig 2014-08-09 00:13:38.000000000 +0200 -+++ include/CMakeLists.txt 2014-09-05 18:38:18.461346954 +0200 -@@ -62,17 +62,21 @@ +--- include/CMakeLists.txt.orig 2015-06-17 14:54:11 UTC ++++ include/CMakeLists.txt +@@ -62,17 +62,21 @@ SET(HEADERS handler_ername.h ) Modified: branches/2015Q3/databases/mariadb100-server/files/patch-libmysql_CMakeLists.txt ============================================================================== --- branches/2015Q3/databases/mariadb100-server/files/patch-libmysql_CMakeLists.txt Mon Aug 17 09:17:56 2015 (r394444) +++ branches/2015Q3/databases/mariadb100-server/files/patch-libmysql_CMakeLists.txt Mon Aug 17 09:21:37 2015 (r394445) @@ -1,6 +1,6 @@ ---- libmysql/CMakeLists.txt.orig 2014-08-09 00:13:37.000000000 +0200 -+++ libmysql/CMakeLists.txt 2014-09-05 18:46:34.420323119 +0200 -@@ -403,7 +403,7 @@ +--- libmysql/CMakeLists.txt.orig 2015-06-17 14:54:11 UTC ++++ libmysql/CMakeLists.txt +@@ -410,7 +410,7 @@ SET(LIBS clientlib dbug strings vio mysy # Merge several convenience libraries into one big mysqlclient # and link them together into shared library. @@ -9,7 +9,7 @@ # Visual Studio users need debug static library for debug projects IF(MSVC) -@@ -411,6 +411,7 @@ +@@ -418,6 +418,7 @@ IF(MSVC) INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug) ENDIF() @@ -17,7 +17,7 @@ IF(UNIX) MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME) SET(DOT_VERSION ".${VERSION}") -@@ -425,11 +426,13 @@ +@@ -432,11 +433,13 @@ IF(UNIX) ENDMACRO() INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development) ENDIF() @@ -32,7 +32,7 @@ IF(UNIX) # libtool compatability IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) -@@ -477,3 +480,4 @@ +@@ -484,3 +487,4 @@ IF(NOT DISABLE_SHARED) ENDFOREACH() ENDIF() ENDIF() Modified: branches/2015Q3/databases/mariadb100-server/files/patch-libservices_CMakeLists.txt ============================================================================== --- branches/2015Q3/databases/mariadb100-server/files/patch-libservices_CMakeLists.txt Mon Aug 17 09:17:56 2015 (r394444) +++ branches/2015Q3/databases/mariadb100-server/files/patch-libservices_CMakeLists.txt Mon Aug 17 09:21:37 2015 (r394445) @@ -1,6 +1,6 @@ ---- libservices/CMakeLists.txt.orig 2014-08-09 00:13:47.000000000 +0200 -+++ libservices/CMakeLists.txt 2014-09-05 18:48:40.074297131 +0200 -@@ -29,4 +29,6 @@ +--- libservices/CMakeLists.txt.orig 2015-06-17 14:54:11 UTC ++++ libservices/CMakeLists.txt +@@ -29,4 +29,6 @@ SET(MYSQLSERVICES_SOURCES logger_service.c) ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES}) Modified: branches/2015Q3/databases/mariadb100-server/files/patch-man_CMakeLists.txt ============================================================================== --- branches/2015Q3/databases/mariadb100-server/files/patch-man_CMakeLists.txt Mon Aug 17 09:17:56 2015 (r394444) +++ branches/2015Q3/databases/mariadb100-server/files/patch-man_CMakeLists.txt Mon Aug 17 09:21:37 2015 (r394445) @@ -1,6 +1,6 @@ ---- man/CMakeLists.txt.orig 2014-06-13 13:58:21.397251542 +0300 -+++ man/CMakeLists.txt 2014-06-13 14:00:24.132245109 +0300 -@@ -33,7 +33,8 @@ +--- man/CMakeLists.txt.orig 2015-06-17 14:54:11 UTC ++++ man/CMakeLists.txt +@@ -34,7 +34,8 @@ SET(MAN1_TEST mysql-stress-test.pl.1 mys INSTALL(FILES ${MAN1_SERVER} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesServer) INSTALL(FILES ${MAN8_SERVER} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPagesServer) Copied: branches/2015Q3/databases/mariadb100-server/files/patch-mysys_my__default.c (from r394020, head/databases/mariadb100-server/files/patch-mysys_my__default.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q3/databases/mariadb100-server/files/patch-mysys_my__default.c Mon Aug 17 09:21:37 2015 (r394445, copy of r394020, head/databases/mariadb100-server/files/patch-mysys_my__default.c) @@ -0,0 +1,61 @@ +--- mysys/my_default.c.orig 2015-06-17 14:54:12 UTC ++++ mysys/my_default.c +@@ -90,7 +90,7 @@ static my_bool defaults_already_read= FA + + /* Which directories are searched for options (and in which order) */ + +-#define MAX_DEFAULT_DIRS 6 ++#define MAX_DEFAULT_DIRS 7 + #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */ + static const char **default_directories = NULL; + +@@ -785,7 +785,7 @@ static int search_default_file_with_ext( + { + MY_STAT stat_info; + if (!my_stat(name,&stat_info,MYF(0))) +- return 1; ++ return 0; + /* + Ignore world-writable regular files. + This is mainly done to protect us to not read a file created by +@@ -803,6 +803,14 @@ static int search_default_file_with_ext( + if (!(fp= mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0)))) + return 1; /* Ignore wrong files */ + ++ if (strstr(name, "/etc") == name) ++ { ++ fprintf(stderr, ++ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n", ++ name,name); ++ goto err; ++ } ++ + while (mysql_file_fgets(buff, sizeof(buff) - 1, fp)) + { + line++; +@@ -1067,7 +1075,8 @@ void my_print_default_files(const char * + if (name[0] == FN_HOMELIB) /* Add . to filenames in home */ + *end++= '.'; + strxmov(end, conf_file, *ext, " ", NullS); +- fputs(name, stdout); ++ if (strstr(name, "/etc") != name) ++ fputs(name, stdout); + } + } + } +@@ -1223,13 +1232,10 @@ static const char **init_default_directo + + #else + +-#if defined(DEFAULT_SYSCONFDIR) +- if (DEFAULT_SYSCONFDIR[0]) +- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); +-#else + errors += add_directory(alloc, "/etc/", dirs); + errors += add_directory(alloc, "/etc/mysql/", dirs); +-#endif /* DEFAULT_SYSCONFDIR */ ++ errors += add_directory(alloc, "/usr/local/etc/", dirs); ++ errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs); + + #endif + Modified: branches/2015Q3/databases/mariadb100-server/files/patch-pcre_CMakeLists.txt ============================================================================== --- branches/2015Q3/databases/mariadb100-server/files/patch-pcre_CMakeLists.txt Mon Aug 17 09:17:56 2015 (r394444) +++ branches/2015Q3/databases/mariadb100-server/files/patch-pcre_CMakeLists.txt Mon Aug 17 09:21:37 2015 (r394445) @@ -1,6 +1,6 @@ ---- pcre/CMakeLists.txt.orig 2014-08-09 00:13:36.000000000 +0200 -+++ pcre/CMakeLists.txt 2014-09-05 20:08:49.090972949 +0200 -@@ -513,6 +513,8 @@ +--- pcre/CMakeLists.txt.orig 2015-06-17 14:54:12 UTC ++++ pcre/CMakeLists.txt +@@ -513,6 +513,8 @@ IF(PCRE_SHOW_REPORT) MESSAGE(STATUS "") ENDIF(PCRE_SHOW_REPORT) Modified: branches/2015Q3/databases/mariadb100-server/files/patch-scripts_CMakeLists.txt ============================================================================== --- branches/2015Q3/databases/mariadb100-server/files/patch-scripts_CMakeLists.txt Mon Aug 17 09:17:56 2015 (r394444) +++ branches/2015Q3/databases/mariadb100-server/files/patch-scripts_CMakeLists.txt Mon Aug 17 09:21:37 2015 (r394445) @@ -1,6 +1,6 @@ ---- scripts/CMakeLists.txt.orig 2014-08-09 00:13:37.000000000 +0200 -+++ scripts/CMakeLists.txt 2014-09-05 19:06:46.206250221 +0200 -@@ -281,6 +281,8 @@ +--- scripts/CMakeLists.txt.orig 2015-06-17 14:54:12 UTC ++++ scripts/CMakeLists.txt +@@ -269,6 +269,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) STRING(REGEX REPLACE "^lib" "" lib "${lib}") SET(${var} "${${var}}-l${lib} " ) ENDIF() Copied: branches/2015Q3/databases/mariadb100-server/files/patch-scripts_mysql__config.sh (from r394020, head/databases/mariadb100-server/files/patch-scripts_mysql__config.sh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q3/databases/mariadb100-server/files/patch-scripts_mysql__config.sh Mon Aug 17 09:21:37 2015 (r394445, copy of r394020, head/databases/mariadb100-server/files/patch-scripts_mysql__config.sh) @@ -0,0 +1,14 @@ +--- scripts/mysql_config.sh.orig 2015-06-17 14:54:12 UTC ++++ scripts/mysql_config.sh +@@ -109,8 +109,11 @@ fi + # We intentionally add a space to the beginning and end of lib strings, simplifies replace later + libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@" + libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ " ++libs="$libs -L%%LOCALBASE%%/lib " + libs_r=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ " ++libs_r="$libs_r -L%%LOCALBASE%%/lib " + embedded_libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ " ++embedded_libs="$embedded_libs -L%%LOCALBASE%%/lib " + + if [ -r "$pkglibdir/libmygcc.a" ]; then + # When linking against the static library with a different version of GCC Copied: branches/2015Q3/databases/mariadb100-server/files/patch-scripts_mysqld__safe.sh (from r394020, head/databases/mariadb100-server/files/patch-scripts_mysqld__safe.sh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q3/databases/mariadb100-server/files/patch-scripts_mysqld__safe.sh Mon Aug 17 09:21:37 2015 (r394445, copy of r394020, head/databases/mariadb100-server/files/patch-scripts_mysqld__safe.sh) @@ -0,0 +1,24 @@ +--- scripts/mysqld_safe.sh.orig 2015-06-17 14:54:12 UTC ++++ scripts/mysqld_safe.sh +@@ -445,10 +445,10 @@ fi + + if test -z "$MYSQL_HOME" + then +- if test -r "$MY_BASEDIR_VERSION/my.cnf" && test -r "$DATADIR/my.cnf" ++ if test -r "$MY_BASEDIR_VERSION/etc/my.cnf" && test -r "$DATADIR/my.cnf" + then + log_error "WARNING: Found two instances of my.cnf - +-$MY_BASEDIR_VERSION/my.cnf and ++$MY_BASEDIR_VERSION/etc/my.cnf and + $DATADIR/my.cnf + IGNORING $DATADIR/my.cnf" + +@@ -457,7 +457,7 @@ IGNORING $DATADIR/my.cnf" + then + log_error "WARNING: Found $DATADIR/my.cnf + The data directory is a deprecated location for my.cnf, please move it to +-$MY_BASEDIR_VERSION/my.cnf" ++$MY_BASEDIR_VERSION/etc/my.cnf" + MYSQL_HOME=$DATADIR + else + MYSQL_HOME=$MY_BASEDIR_VERSION Modified: branches/2015Q3/databases/mariadb100-server/files/patch-sql_CMakeLists.txt ============================================================================== --- branches/2015Q3/databases/mariadb100-server/files/patch-sql_CMakeLists.txt Mon Aug 17 09:17:56 2015 (r394444) +++ branches/2015Q3/databases/mariadb100-server/files/patch-sql_CMakeLists.txt Mon Aug 17 09:21:37 2015 (r394445) @@ -1,6 +1,6 @@ ---- sql/CMakeLists.txt.orig 2013-05-22 01:09:51.000000000 +0300 -+++ sql/CMakeLists.txt 2013-06-08 14:13:06.000000000 +0300 -@@ -278,6 +278,7 @@ +--- sql/CMakeLists.txt.orig 2015-06-17 14:54:12 UTC ++++ sql/CMakeLists.txt +@@ -312,6 +312,7 @@ ADD_CUSTOM_TARGET(distclean VERBATIM ) @@ -8,7 +8,7 @@ IF(INSTALL_LAYOUT STREQUAL "STANDALONE") # Copy db.opt into data/test/ -@@ -321,6 +322,7 @@ +@@ -355,6 +356,7 @@ ELSE() INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles) ENDIF(WIN32 AND MYSQLD_EXECUTABLE) ENDIF(INSTALL_LAYOUT STREQUAL "STANDALONE") @@ -16,7 +16,7 @@ IF(WIN32) SET(my_bootstrap_sql ${CMAKE_CURRENT_BINARY_DIR}/my_bootstrap.sql) -@@ -363,8 +365,10 @@ +@@ -397,8 +399,10 @@ IF(WIN32) TARGET_LINK_LIBRARIES(mysql_upgrade_service mysys winservice) ENDIF(WIN32) Copied: branches/2015Q3/databases/mariadb100-server/files/patch-sql_sql__trigger.cc (from r394020, head/databases/mariadb100-server/files/patch-sql_sql__trigger.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q3/databases/mariadb100-server/files/patch-sql_sql__trigger.cc Mon Aug 17 09:21:37 2015 (r394445, copy of r394020, head/databases/mariadb100-server/files/patch-sql_sql__trigger.cc) @@ -0,0 +1,50 @@ +--- sql/sql_trigger.cc.orig 2015-06-17 14:54:12 UTC ++++ sql/sql_trigger.cc +@@ -192,32 +192,32 @@ static File_option triggers_file_paramet + { + { + { C_STRING_WITH_LEN("triggers") }, +- my_offsetof(class Table_triggers_list, definitions_list), ++ static_cast(my_offsetof(class Table_triggers_list, definitions_list)), + FILE_OPTIONS_STRLIST + }, + { + { C_STRING_WITH_LEN("sql_modes") }, +- my_offsetof(class Table_triggers_list, definition_modes_list), ++ static_cast(my_offsetof(class Table_triggers_list, definition_modes_list)), + FILE_OPTIONS_ULLLIST + }, + { + { C_STRING_WITH_LEN("definers") }, +- my_offsetof(class Table_triggers_list, definers_list), ++ static_cast(my_offsetof(class Table_triggers_list, definers_list)), + FILE_OPTIONS_STRLIST + }, + { + { C_STRING_WITH_LEN("client_cs_names") }, +- my_offsetof(class Table_triggers_list, client_cs_names), ++ static_cast(my_offsetof(class Table_triggers_list, client_cs_names)), + FILE_OPTIONS_STRLIST + }, + { + { C_STRING_WITH_LEN("connection_cl_names") }, +- my_offsetof(class Table_triggers_list, connection_cl_names), ++ static_cast(my_offsetof(class Table_triggers_list, connection_cl_names)), + FILE_OPTIONS_STRLIST + }, + { + { C_STRING_WITH_LEN("db_cl_names") }, +- my_offsetof(class Table_triggers_list, db_cl_names), ++ static_cast(my_offsetof(class Table_triggers_list, db_cl_names)), + FILE_OPTIONS_STRLIST + }, + { { 0, 0 }, 0, FILE_OPTIONS_STRING } +@@ -226,7 +226,7 @@ static File_option triggers_file_paramet + File_option sql_modes_parameters= + { + { C_STRING_WITH_LEN("sql_modes") }, +- my_offsetof(class Table_triggers_list, definition_modes_list), ++ static_cast(my_offsetof(class Table_triggers_list, definition_modes_list)), + FILE_OPTIONS_ULLLIST + }; + Copied: branches/2015Q3/databases/mariadb100-server/files/patch-sql_sql__view.cc (from r394020, head/databases/mariadb100-server/files/patch-sql_sql__view.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q3/databases/mariadb100-server/files/patch-sql_sql__view.cc Mon Aug 17 09:21:37 2015 (r394445, copy of r394020, head/databases/mariadb100-server/files/patch-sql_sql__view.cc) @@ -0,0 +1,63 @@ +--- sql/sql_view.cc.orig 2015-06-17 14:54:12 UTC ++++ sql/sql_view.cc +@@ -716,46 +716,46 @@ static const int required_view_parameter + */ + static File_option view_parameters[]= + {{{ C_STRING_WITH_LEN("query")}, +- my_offsetof(TABLE_LIST, select_stmt), ++ static_cast(my_offsetof(TABLE_LIST, select_stmt)), + FILE_OPTIONS_ESTRING}, + {{ C_STRING_WITH_LEN("md5")}, +- my_offsetof(TABLE_LIST, md5), ++ static_cast(my_offsetof(TABLE_LIST, md5)), + FILE_OPTIONS_STRING}, + {{ C_STRING_WITH_LEN("updatable")}, +- my_offsetof(TABLE_LIST, updatable_view), ++ static_cast(my_offsetof(TABLE_LIST, updatable_view)), + FILE_OPTIONS_ULONGLONG}, + {{ C_STRING_WITH_LEN("algorithm")}, +- my_offsetof(TABLE_LIST, algorithm), ++ static_cast(my_offsetof(TABLE_LIST, algorithm)), + FILE_OPTIONS_VIEW_ALGO}, + {{ C_STRING_WITH_LEN("definer_user")}, +- my_offsetof(TABLE_LIST, definer.user), ++ static_cast(my_offsetof(TABLE_LIST, definer.user)), + FILE_OPTIONS_STRING}, + {{ C_STRING_WITH_LEN("definer_host")}, +- my_offsetof(TABLE_LIST, definer.host), ++ static_cast(my_offsetof(TABLE_LIST, definer.host)), + FILE_OPTIONS_STRING}, + {{ C_STRING_WITH_LEN("suid")}, +- my_offsetof(TABLE_LIST, view_suid), ++ static_cast(my_offsetof(TABLE_LIST, view_suid)), + FILE_OPTIONS_ULONGLONG}, + {{ C_STRING_WITH_LEN("with_check_option")}, +- my_offsetof(TABLE_LIST, with_check), ++ static_cast(my_offsetof(TABLE_LIST, with_check)), + FILE_OPTIONS_ULONGLONG}, + {{ C_STRING_WITH_LEN("timestamp")}, +- my_offsetof(TABLE_LIST, timestamp), ++ static_cast(my_offsetof(TABLE_LIST, timestamp)), + FILE_OPTIONS_TIMESTAMP}, + {{ C_STRING_WITH_LEN("create-version")}, +- my_offsetof(TABLE_LIST, file_version), ++ static_cast(my_offsetof(TABLE_LIST, file_version)), + FILE_OPTIONS_ULONGLONG}, + {{ C_STRING_WITH_LEN("source")}, +- my_offsetof(TABLE_LIST, source), ++ static_cast(my_offsetof(TABLE_LIST, source)), + FILE_OPTIONS_ESTRING}, + {{(char*) STRING_WITH_LEN("client_cs_name")}, +- my_offsetof(TABLE_LIST, view_client_cs_name), ++ static_cast(my_offsetof(TABLE_LIST, view_client_cs_name)), + FILE_OPTIONS_STRING}, + {{(char*) STRING_WITH_LEN("connection_cl_name")}, +- my_offsetof(TABLE_LIST, view_connection_cl_name), ++ static_cast(my_offsetof(TABLE_LIST, view_connection_cl_name)), + FILE_OPTIONS_STRING}, + {{(char*) STRING_WITH_LEN("view_body_utf8")}, +- my_offsetof(TABLE_LIST, view_body_utf8), ++ static_cast(my_offsetof(TABLE_LIST, view_body_utf8)), + FILE_OPTIONS_ESTRING}, + {{ C_STRING_WITH_LEN("mariadb-version")}, + my_offsetof(TABLE_LIST, mariadb_version), Copied: branches/2015Q3/databases/mariadb100-server/files/patch-sql_sys__vars.cc (from r394020, head/databases/mariadb100-server/files/patch-sql_sys__vars.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q3/databases/mariadb100-server/files/patch-sql_sys__vars.cc Mon Aug 17 09:21:37 2015 (r394445, copy of r394020, head/databases/mariadb100-server/files/patch-sql_sys__vars.cc) @@ -0,0 +1,38 @@ +--- sql/sys_vars.cc.orig 2015-06-17 14:54:13 UTC ++++ sql/sys_vars.cc +@@ -1012,7 +1012,7 @@ static Sys_var_ulong Sys_interactive_tim + "connection before closing it", + SESSION_VAR(net_interactive_timeout), + CMD_LINE(REQUIRED_ARG), +- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); ++ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); + + static Sys_var_ulonglong Sys_join_buffer_size( + "join_buffer_size", +@@ -2046,7 +2046,7 @@ static Sys_var_ulong Sys_net_read_timeou + "Number of seconds to wait for more data from a connection before " + "aborting the read", + SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG), +- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1), ++ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1), + NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), + ON_UPDATE(fix_net_read_timeout)); + +@@ -2061,7 +2061,7 @@ static Sys_var_ulong Sys_net_write_timeo + "Number of seconds to wait for a block to be written to a connection " + "before aborting the write", + SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG), +- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1), ++ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1), + NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), + ON_UPDATE(fix_net_write_timeout)); + +@@ -3291,7 +3291,7 @@ static Sys_var_ulong Sys_net_wait_timeou + "The number of seconds the server waits for activity on a " + "connection before closing it", + SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG), +- VALID_RANGE(1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT)), ++ VALID_RANGE(1, INT_MAX32/1000), + DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); + + static Sys_var_plugin Sys_default_storage_engine( Modified: branches/2015Q3/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_cmake__modules_TokuFeatureDetection.cmake ============================================================================== --- branches/2015Q3/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_cmake__modules_TokuFeatureDetection.cmake Mon Aug 17 09:17:56 2015 (r394444) +++ branches/2015Q3/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_cmake__modules_TokuFeatureDetection.cmake Mon Aug 17 09:21:37 2015 (r394445) @@ -1,4 +1,4 @@ ---- storage/tokudb/ft-index/cmake_modules/TokuFeatureDetection.cmake.orig 2014-09-24 22:29:47 UTC +--- storage/tokudb/ft-index/cmake_modules/TokuFeatureDetection.cmake.orig 2015-06-17 14:54:13 UTC +++ storage/tokudb/ft-index/cmake_modules/TokuFeatureDetection.cmake @@ -87,13 +87,7 @@ if (NOT HAVE_DLSYM_WITHOUT_DL) endif () Modified: branches/2015Q3/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_portability_memory.cc ============================================================================== --- branches/2015Q3/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_portability_memory.cc Mon Aug 17 09:17:56 2015 (r394444) +++ branches/2015Q3/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_portability_memory.cc Mon Aug 17 09:21:37 2015 (r394445) @@ -1,4 +1,4 @@ ---- storage/tokudb/ft-index/portability/memory.cc.orig 2014-09-24 22:29:47 UTC +--- storage/tokudb/ft-index/portability/memory.cc.orig 2015-06-17 14:54:13 UTC +++ storage/tokudb/ft-index/portability/memory.cc @@ -94,11 +94,6 @@ PATENT RIGHTS GRANT: #include Modified: branches/2015Q3/databases/mariadb100-server/files/patch-support-files_CMakeLists.txt ============================================================================== --- branches/2015Q3/databases/mariadb100-server/files/patch-support-files_CMakeLists.txt Mon Aug 17 09:17:56 2015 (r394444) +++ branches/2015Q3/databases/mariadb100-server/files/patch-support-files_CMakeLists.txt Mon Aug 17 09:21:37 2015 (r394445) @@ -1,6 +1,6 @@ ---- support-files/CMakeLists.txt.orig 2012-11-28 17:49:47.000000000 +0200 -+++ support-files/CMakeLists.txt 2012-12-23 05:40:39.000000000 +0200 -@@ -66,10 +66,11 @@ +--- support-files/CMakeLists.txt.orig 2015-06-17 14:54:14 UTC ++++ support-files/CMakeLists.txt +@@ -67,10 +67,11 @@ IF(UNIX) ENDFOREACH() IF(INSTALL_SUPPORTFILESDIR) INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) Modified: branches/2015Q3/databases/mariadb100-server/pkg-plist ============================================================================== --- branches/2015Q3/databases/mariadb100-server/pkg-plist Mon Aug 17 09:17:56 2015 (r394444) +++ branches/2015Q3/databases/mariadb100-server/pkg-plist Mon Aug 17 09:21:37 2015 (r394445) @@ -1,4 +1,3 @@ -@stopdaemon mysql-server bin/aria_chk bin/aria_dump_log bin/aria_ftdump From owner-svn-ports-branches@freebsd.org Mon Aug 17 10:12:27 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 930FD9BB3B9; Mon, 17 Aug 2015 10:12:27 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 83FF31DD7; Mon, 17 Aug 2015 10:12:27 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7HACRJC017967; Mon, 17 Aug 2015 10:12:27 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7HACRuI017966; Mon, 17 Aug 2015 10:12:27 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201508171012.t7HACRuI017966@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 17 Aug 2015 10:12:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r394449 - branches/2015Q3/security/rubygem-net-ssh X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Aug 2015 10:12:27 -0000 Author: amdmi3 Date: Mon Aug 17 10:12:26 2015 New Revision: 394449 URL: https://svnweb.freebsd.org/changeset/ports/394449 Log: MFH: r394448 - Fix shebangs - Add NO_ARCH Approved by: portmgr blanket Approved by: ports-secteam shebang fix blanket Modified: branches/2015Q3/security/rubygem-net-ssh/Makefile Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/security/rubygem-net-ssh/Makefile ============================================================================== --- branches/2015Q3/security/rubygem-net-ssh/Makefile Mon Aug 17 10:09:14 2015 (r394448) +++ branches/2015Q3/security/rubygem-net-ssh/Makefile Mon Aug 17 10:12:26 2015 (r394449) @@ -4,6 +4,7 @@ PORTNAME= net-ssh PORTVERSION= 2.9.2 PORTEPOCH= 2 +PORTREVISION= 1 CATEGORIES= security rubygems MASTER_SITES= RG @@ -17,9 +18,12 @@ OPTIONS_DEFAULT=PROMPT_PASSPHRASES OPTIONSFILE?= ${PORT_DBDIR}/rubygem-${PORTNAME}/options PROMPT_PASSPHRASES_DESC= Prompt for passphrases on keys +NO_ARCH= yes USE_RUBY= yes USE_RUBYGEMS= yes RUBYGEM_AUTOPLIST= yes +USES= shebangfix +SHEBANG_FILES= support/ssh_tunnel_bug.rb PROMPT_PASSPHRASES_RUN_DEPENDS= rubygem-ruby-termios>=0:${PORTSDIR}/comms/rubygem-ruby-termios From owner-svn-ports-branches@freebsd.org Mon Aug 17 10:13:30 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2B4219BB41D; Mon, 17 Aug 2015 10:13:30 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1BEDE1EEA; Mon, 17 Aug 2015 10:13:30 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7HADTnv018185; Mon, 17 Aug 2015 10:13:29 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7HADTk6018184; Mon, 17 Aug 2015 10:13:29 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201508171013.t7HADTk6018184@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 17 Aug 2015 10:13:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r394450 - branches/2015Q3/devel/rubygem-mercenary X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Aug 2015 10:13:30 -0000 Author: amdmi3 Date: Mon Aug 17 10:13:28 2015 New Revision: 394450 URL: https://svnweb.freebsd.org/changeset/ports/394450 Log: MFH: r394447 - Fix shebangs Approved by: portmgr blanket Approved by: ports-secteam shebang fix blanket Modified: branches/2015Q3/devel/rubygem-mercenary/Makefile Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/devel/rubygem-mercenary/Makefile ============================================================================== --- branches/2015Q3/devel/rubygem-mercenary/Makefile Mon Aug 17 10:12:26 2015 (r394449) +++ branches/2015Q3/devel/rubygem-mercenary/Makefile Mon Aug 17 10:13:28 2015 (r394450) @@ -3,6 +3,7 @@ PORTNAME= mercenary PORTVERSION= 0.3.5 +PORTREVISION= 1 CATEGORIES= devel rubygems MASTER_SITES= RG @@ -14,5 +15,7 @@ LICENSE= MIT USE_RUBY= yes USE_RUBYGEMS= yes RUBYGEM_AUTOPLIST= yes +USES= shebangfix +SHEBANG_FILES= script/console script/examples .include From owner-svn-ports-branches@freebsd.org Mon Aug 17 12:02:37 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 200379B9323; Mon, 17 Aug 2015 12:02:37 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 105F116D8; Mon, 17 Aug 2015 12:02:37 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7HC2aWx066997; Mon, 17 Aug 2015 12:02:36 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7HC2aHC066996; Mon, 17 Aug 2015 12:02:36 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201508171202.t7HC2aHC066996@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 17 Aug 2015 12:02:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r394452 - branches/2015Q3/devel/rubygem-rubyinline X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Aug 2015 12:02:37 -0000 Author: amdmi3 Date: Mon Aug 17 12:02:36 2015 New Revision: 394452 URL: https://svnweb.freebsd.org/changeset/ports/394452 Log: MFH: r394446 - Fix shebangs Approved by: portmgr blanket Approved by: ports-secteam shebang fix blanket Modified: branches/2015Q3/devel/rubygem-rubyinline/Makefile Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/devel/rubygem-rubyinline/Makefile ============================================================================== --- branches/2015Q3/devel/rubygem-rubyinline/Makefile Mon Aug 17 11:03:12 2015 (r394451) +++ branches/2015Q3/devel/rubygem-rubyinline/Makefile Mon Aug 17 12:02:36 2015 (r394452) @@ -3,6 +3,7 @@ PORTNAME= rubyinline PORTVERSION= 3.12.4 +PORTREVISION= 1 CATEGORIES= devel rubygems MASTER_SITES= RG DISTNAME= RubyInline-${PORTVERSION} @@ -19,5 +20,8 @@ GEM_NAME= ${DISTNAME} USE_RUBY= yes USE_RUBYGEMS= yes RUBYGEM_AUTOPLIST= yes +USES= shebangfix +SHEBANG_FILES= tutorial/example1.rb \ + tutorial/example2.rb .include From owner-svn-ports-branches@freebsd.org Mon Aug 17 14:23:34 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3F9379BBE4F; Mon, 17 Aug 2015 14:23:34 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2B9E21627; Mon, 17 Aug 2015 14:23:34 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7HENY3o048344; Mon, 17 Aug 2015 14:23:34 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7HENYlt048343; Mon, 17 Aug 2015 14:23:34 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201508171423.t7HENYlt048343@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Mon, 17 Aug 2015 14:23:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r394509 - branches/2015Q3/comms/chirp X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Aug 2015 14:23:34 -0000 Author: feld Date: Mon Aug 17 14:23:33 2015 New Revision: 394509 URL: https://svnweb.freebsd.org/changeset/ports/394509 Log: MFH: r394507 Last update was causing pollution of BUILD_DEPENDS into RUN_DEPENDS PR: 202338 Approved by: ports-secteam (with hat) Modified: branches/2015Q3/comms/chirp/Makefile Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/comms/chirp/Makefile ============================================================================== --- branches/2015Q3/comms/chirp/Makefile Mon Aug 17 14:20:40 2015 (r394508) +++ branches/2015Q3/comms/chirp/Makefile Mon Aug 17 14:23:33 2015 (r394509) @@ -2,7 +2,7 @@ PORTNAME= chirp PORTVERSION= 0.4.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= comms hamradio MASTER_SITES= http://chirp.danplanet.com/download/${PORTVERSION}/ \ LOCAL/db @@ -12,9 +12,10 @@ COMMENT= Free, open-source tool for prog LICENSE= GPLv3 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libxml2>0:${PORTSDIR}/textproc/py-libxml2 \ +BUILD_DEPENDS= ${CHIRP_DEPENDS} +RUN_DEPENDS= ${CHIRP_DEPENDS} +CHIRP_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libxml2>0:${PORTSDIR}/textproc/py-libxml2 \ ${PYTHON_PKGNAMEPREFIX}serial>0:${PORTSDIR}/comms/py-serial -RUN_DEPENDS= ${BUILD_DEPENDS} USES= desktop-file-utils gettext python USE_PYTHON= distutils From owner-svn-ports-branches@freebsd.org Mon Aug 17 15:08:45 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BD6519BB849; Mon, 17 Aug 2015 15:08:45 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AD9951FA5; Mon, 17 Aug 2015 15:08:45 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7HF8jRb070439; Mon, 17 Aug 2015 15:08:45 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7HF8jKT070437; Mon, 17 Aug 2015 15:08:45 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201508171508.t7HF8jKT070437@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Mon, 17 Aug 2015 15:08:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r394512 - branches/2015Q3/lang/php56 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Aug 2015 15:08:45 -0000 Author: junovitch Date: Mon Aug 17 15:08:44 2015 New Revision: 394512 URL: https://svnweb.freebsd.org/changeset/ports/394512 Log: MFH: r394286 Update to 5.6.12 release. Security: 787ef75e-44da-11e5-93ad-002590263bf5 Approved by: ports-secteam (feld), feld (mentor) Modified: branches/2015Q3/lang/php56/Makefile branches/2015Q3/lang/php56/distinfo Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/lang/php56/Makefile ============================================================================== --- branches/2015Q3/lang/php56/Makefile Mon Aug 17 14:59:20 2015 (r394511) +++ branches/2015Q3/lang/php56/Makefile Mon Aug 17 15:08:44 2015 (r394512) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= php56 -PORTVERSION= 5.6.11 +PORTVERSION= 5.6.12 PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions Modified: branches/2015Q3/lang/php56/distinfo ============================================================================== --- branches/2015Q3/lang/php56/distinfo Mon Aug 17 14:59:20 2015 (r394511) +++ branches/2015Q3/lang/php56/distinfo Mon Aug 17 15:08:44 2015 (r394512) @@ -1,4 +1,4 @@ -SHA256 (php-5.6.11.tar.bz2) = bd6b260816764c267244749ead07482120dbf8d1920ebbbb0dcb2aa411033866 -SIZE (php-5.6.11.tar.bz2) = 14081292 +SHA256 (php-5.6.12.tar.bz2) = 6f27104272af7b2a996f85e4100fac627630fbdaf39d7bd263f16cf529c8853a +SIZE (php-5.6.12.tar.bz2) = 14094148 SHA256 (php-5.5.x-mail-header.patch) = b0b5a7c961b2052eb14d9528e76155cbeaa881fb9b4a49f452f9dab07b6fb1c4 SIZE (php-5.5.x-mail-header.patch) = 3379 From owner-svn-ports-branches@freebsd.org Mon Aug 17 15:09:48 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BCFD59BB88F; Mon, 17 Aug 2015 15:09:48 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AD76B10B5; Mon, 17 Aug 2015 15:09:48 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7HF9m7n070749; Mon, 17 Aug 2015 15:09:48 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7HF9mB7070746; Mon, 17 Aug 2015 15:09:48 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201508171509.t7HF9mB7070746@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Mon, 17 Aug 2015 15:09:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r394513 - branches/2015Q3/lang/php55 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Aug 2015 15:09:48 -0000 Author: junovitch Date: Mon Aug 17 15:09:47 2015 New Revision: 394513 URL: https://svnweb.freebsd.org/changeset/ports/394513 Log: MFH: r394289 Update to 5.5.28 release. Security: 787ef75e-44da-11e5-93ad-002590263bf5 Approved by: ports-secteam (feld), feld (mentor) Modified: branches/2015Q3/lang/php55/Makefile branches/2015Q3/lang/php55/distinfo Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/lang/php55/Makefile ============================================================================== --- branches/2015Q3/lang/php55/Makefile Mon Aug 17 15:08:44 2015 (r394512) +++ branches/2015Q3/lang/php55/Makefile Mon Aug 17 15:09:47 2015 (r394513) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= php55 -PORTVERSION= 5.5.27 +PORTVERSION= 5.5.28 PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions Modified: branches/2015Q3/lang/php55/distinfo ============================================================================== --- branches/2015Q3/lang/php55/distinfo Mon Aug 17 15:08:44 2015 (r394512) +++ branches/2015Q3/lang/php55/distinfo Mon Aug 17 15:09:47 2015 (r394513) @@ -1,4 +1,4 @@ -SHA256 (php-5.5.27.tar.bz2) = c4b4c6a534c0ca67a9ae39bec4f51e52d13e820135dd016eae230e15337e1f70 -SIZE (php-5.5.27.tar.bz2) = 13692811 +SHA256 (php-5.5.28.tar.bz2) = 197d2c572e030c177e53d3763d59ac6d363d7c78dc22e6cc1e2ac65573d9c2f3 +SIZE (php-5.5.28.tar.bz2) = 13249927 SHA256 (php-5.5.x-mail-header.patch) = b0b5a7c961b2052eb14d9528e76155cbeaa881fb9b4a49f452f9dab07b6fb1c4 SIZE (php-5.5.x-mail-header.patch) = 3379 From owner-svn-ports-branches@freebsd.org Mon Aug 17 15:11:03 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0634F9BB9A0; Mon, 17 Aug 2015 15:11:03 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D17CE123B; Mon, 17 Aug 2015 15:11:02 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7HFB22n074252; Mon, 17 Aug 2015 15:11:02 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7HFB2Gn074247; Mon, 17 Aug 2015 15:11:02 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201508171511.t7HFB2Gn074247@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Mon, 17 Aug 2015 15:11:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r394514 - in branches/2015Q3: graphics/php5-gd lang/php5 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Aug 2015 15:11:03 -0000 Author: junovitch Date: Mon Aug 17 15:11:01 2015 New Revision: 394514 URL: https://svnweb.freebsd.org/changeset/ports/394514 Log: MFH: r394290 Update to 5.4.44 release. Security: 787ef75e-44da-11e5-93ad-002590263bf5 Approved by: ports-secteam (feld), feld (mentor) Modified: branches/2015Q3/graphics/php5-gd/Makefile branches/2015Q3/lang/php5/Makefile branches/2015Q3/lang/php5/distinfo Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/graphics/php5-gd/Makefile ============================================================================== --- branches/2015Q3/graphics/php5-gd/Makefile Mon Aug 17 15:09:47 2015 (r394513) +++ branches/2015Q3/graphics/php5-gd/Makefile Mon Aug 17 15:11:01 2015 (r394514) @@ -1,7 +1,6 @@ # Created by: Alex Dupre # $FreeBSD$ -PORTREVISION= 1 CATEGORIES= graphics MASTERDIR= ${.CURDIR}/../../lang/php5 Modified: branches/2015Q3/lang/php5/Makefile ============================================================================== --- branches/2015Q3/lang/php5/Makefile Mon Aug 17 15:09:47 2015 (r394513) +++ branches/2015Q3/lang/php5/Makefile Mon Aug 17 15:11:01 2015 (r394514) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= php5 -PORTVERSION= 5.4.43 +PORTVERSION= 5.4.44 PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions Modified: branches/2015Q3/lang/php5/distinfo ============================================================================== --- branches/2015Q3/lang/php5/distinfo Mon Aug 17 15:09:47 2015 (r394513) +++ branches/2015Q3/lang/php5/distinfo Mon Aug 17 15:11:01 2015 (r394514) @@ -1,4 +1,4 @@ -SHA256 (php-5.4.43.tar.bz2) = 25d7724fb00ad1b520f5bad2173717031153d0a8e3de2c75e7a084c76f8ecd6b -SIZE (php-5.4.43.tar.bz2) = 12708452 +SHA256 (php-5.4.44.tar.bz2) = 8dd59e5ce9248cf36ac3de5412a518b8b24c01ace6c46ce3d12e4ce981a3856d +SIZE (php-5.4.44.tar.bz2) = 12705644 SHA256 (php-5.4.x-mail-header.patch) = 005ae1cd8ed17c72d7b09dee9c4466e8b16d4ecba7fe11276731ed6ff9fbb344 SIZE (php-5.4.x-mail-header.patch) = 3379 From owner-svn-ports-branches@freebsd.org Mon Aug 17 15:15:17 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2D1719BBA1C; Mon, 17 Aug 2015 15:15:17 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0B22217E9; Mon, 17 Aug 2015 15:15:17 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7HFFG1C075535; Mon, 17 Aug 2015 15:15:16 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7HFFG5Y075533; Mon, 17 Aug 2015 15:15:16 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201508171515.t7HFFG5Y075533@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Mon, 17 Aug 2015 15:15:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r394515 - in branches/2015Q3/sysutils/xen-tools: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Aug 2015 15:15:17 -0000 Author: junovitch Date: Mon Aug 17 15:15:15 2015 New Revision: 394515 URL: https://svnweb.freebsd.org/changeset/ports/394515 Log: MFH: r391737 Fix XSA-137 / CVE-2015-3259 PR: 201416 Submitted by: Jason Unovitch Approved by: ports-secteam (feld), feld (mentor) Added: branches/2015Q3/sysutils/xen-tools/files/xsa137.patch - copied unchanged from r391737, head/sysutils/xen-tools/files/xsa137.patch Modified: branches/2015Q3/sysutils/xen-tools/Makefile Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/sysutils/xen-tools/Makefile ============================================================================== --- branches/2015Q3/sysutils/xen-tools/Makefile Mon Aug 17 15:11:01 2015 (r394514) +++ branches/2015Q3/sysutils/xen-tools/Makefile Mon Aug 17 15:15:15 2015 (r394515) @@ -3,7 +3,7 @@ PORTNAME= xen PKGNAMESUFFIX= -tools PORTVERSION= 4.5.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= sysutils emulators MASTER_SITES= http://bits.xensource.com/oss-xen/release/${PORTVERSION}/ \ http://code.coreboot.org/p/seabios/downloads/get/:seabios @@ -49,6 +49,7 @@ QEMU_ARGS= --disable-gtk \ EXTRA_PATCHES= ${FILESDIR}/xsa119-unstable.patch:-p1 \ ${FILESDIR}/xsa125.patch:-p1 \ + ${FILESDIR}/xsa137.patch:-p1 \ ${FILESDIR}/0001-libelf-fix-elf_parse_bsdsyms-call.patch:-p1 \ ${FILESDIR}/0002-libxc-fix-xc_dom_load_elf_symtab.patch:-p1 Copied: branches/2015Q3/sysutils/xen-tools/files/xsa137.patch (from r391737, head/sysutils/xen-tools/files/xsa137.patch) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q3/sysutils/xen-tools/files/xsa137.patch Mon Aug 17 15:15:15 2015 (r394515, copy of r391737, head/sysutils/xen-tools/files/xsa137.patch) @@ -0,0 +1,231 @@ +From 593fe52faa1b85567a7ec20c69d8cfbc7368ae5b Mon Sep 17 00:00:00 2001 +From: Ian Jackson +Date: Mon, 15 Jun 2015 14:50:42 +0100 +Subject: [PATCH] xl: Sane handling of extra config file arguments + +Various xl sub-commands take additional parameters containing = as +additional config fragments. + +The handling of these config fragments has a number of bugs: + + 1. Use of a static 1024-byte buffer. (If truncation would occur, + with semi-trusted input, a security risk arises due to quotes + being lost.) + + 2. Mishandling of the return value from snprintf, so that if + truncation occurs, the to-write pointer is updated with the + wanted-to-write length, resulting in stack corruption. (This is + XSA-137.) + + 3. Clone-and-hack of the code for constructing the appended + config file. + +These are fixed here, by introducing a new function +`string_realloc_append' and using it everywhere. The `extra_info' +buffers are replaced by pointers, which start off NULL and are +explicitly freed on all return paths. + +The separate variable which will become dom_info.extra_config is +abolished (which involves moving the clearing of dom_info). + +Additional bugs I observe, not fixed here: + + 4. The functions which now call string_realloc_append use ad-hoc + error returns, with multiple calls to `return'. This currently + necessitates multiple new calls to `free'. + + 5. Many of the paths in xl call exit(-rc) where rc is a libxl status + code. This is a ridiculous exit status `convention'. + + 6. The loops for handling extra config data are clone-and-hacks. + + 7. Once the extra config buffer is accumulated, it must be combined + with the appropriate main config file. The code to do this + combining is clone-and-hacked too. + +Signed-off-by: Ian Jackson +Tested-by: Ian Jackson +Acked-by: Ian Campbell +--- +v2: Use SSIZE_MAX, not INT_MAX. + Check *accumulate for NULL, not accumulate. + Move memset of dom_info. +--- + tools/libxl/xl_cmdimpl.c | 64 +++++++++++++++++++++++++++++----------------- + 1 file changed, 40 insertions(+), 24 deletions(-) + +diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c +index c858068..c01a851 100644 +--- a/tools/libxl/xl_cmdimpl.c ++++ b/tools/libxl/xl_cmdimpl.c +@@ -151,7 +151,7 @@ struct domain_create { + int console_autoconnect; + int checkpointed_stream; + const char *config_file; +- const char *extra_config; /* extra config string */ ++ char *extra_config; /* extra config string */ + const char *restore_file; + int migrate_fd; /* -1 means none */ + char **migration_domname_r; /* from malloc */ +@@ -4805,11 +4805,25 @@ int main_vm_list(int argc, char **argv) + return 0; + } + ++static void string_realloc_append(char **accumulate, const char *more) ++{ ++ /* Appends more to accumulate. Accumulate is either NULL, or ++ * points (always) to a malloc'd nul-terminated string. */ ++ ++ size_t oldlen = *accumulate ? strlen(*accumulate) : 0; ++ size_t morelen = strlen(more) + 1/*nul*/; ++ if (oldlen > SSIZE_MAX || morelen > SSIZE_MAX - oldlen) { ++ fprintf(stderr,"Additional config data far too large\n"); ++ exit(-ERROR_FAIL); ++ } ++ ++ *accumulate = xrealloc(*accumulate, oldlen + morelen); ++ memcpy(*accumulate + oldlen, more, morelen); ++} ++ + int main_create(int argc, char **argv) + { + const char *filename = NULL; +- char *p; +- char extra_config[1024]; + struct domain_create dom_info; + int paused = 0, debug = 0, daemonize = 1, console_autoconnect = 0, + quiet = 0, monitor = 1, vnc = 0, vncautopass = 0; +@@ -4824,6 +4838,8 @@ int main_create(int argc, char **argv) + {0, 0, 0, 0} + }; + ++ dom_info.extra_config = NULL; ++ + if (argv[1] && argv[1][0] != '-' && !strchr(argv[1], '=')) { + filename = argv[1]; + argc--; argv++; +@@ -4863,20 +4879,21 @@ int main_create(int argc, char **argv) + break; + } + +- extra_config[0] = '\0'; +- for (p = extra_config; optind < argc; optind++) { ++ memset(&dom_info, 0, sizeof(dom_info)); ++ ++ for (; optind < argc; optind++) { + if (strchr(argv[optind], '=') != NULL) { +- p += snprintf(p, sizeof(extra_config) - (p - extra_config), +- "%s\n", argv[optind]); ++ string_realloc_append(&dom_info.extra_config, argv[optind]); ++ string_realloc_append(&dom_info.extra_config, "\n"); + } else if (!filename) { + filename = argv[optind]; + } else { + help("create"); ++ free(dom_info.extra_config); + return 2; + } + } + +- memset(&dom_info, 0, sizeof(dom_info)); + dom_info.debug = debug; + dom_info.daemonize = daemonize; + dom_info.monitor = monitor; +@@ -4884,16 +4901,18 @@ int main_create(int argc, char **argv) + dom_info.dryrun = dryrun_only; + dom_info.quiet = quiet; + dom_info.config_file = filename; +- dom_info.extra_config = extra_config; + dom_info.migrate_fd = -1; + dom_info.vnc = vnc; + dom_info.vncautopass = vncautopass; + dom_info.console_autoconnect = console_autoconnect; + + rc = create_domain(&dom_info); +- if (rc < 0) ++ if (rc < 0) { ++ free(dom_info.extra_config); + return -rc; ++ } + ++ free(dom_info.extra_config); + return 0; + } + +@@ -4901,8 +4920,7 @@ int main_config_update(int argc, char **argv) + { + uint32_t domid; + const char *filename = NULL; +- char *p; +- char extra_config[1024]; ++ char *extra_config = NULL; + void *config_data = 0; + int config_len = 0; + libxl_domain_config d_config; +@@ -4940,15 +4958,15 @@ int main_config_update(int argc, char **argv) + break; + } + +- extra_config[0] = '\0'; +- for (p = extra_config; optind < argc; optind++) { ++ for (; optind < argc; optind++) { + if (strchr(argv[optind], '=') != NULL) { +- p += snprintf(p, sizeof(extra_config) - (p - extra_config), +- "%s\n", argv[optind]); ++ string_realloc_append(&extra_config, argv[optind]); ++ string_realloc_append(&extra_config, "\n"); + } else if (!filename) { + filename = argv[optind]; + } else { + help("create"); ++ free(extra_config); + return 2; + } + } +@@ -4957,7 +4975,8 @@ int main_config_update(int argc, char **argv) + rc = libxl_read_file_contents(ctx, filename, + &config_data, &config_len); + if (rc) { fprintf(stderr, "Failed to read config file: %s: %s\n", +- filename, strerror(errno)); return ERROR_FAIL; } ++ filename, strerror(errno)); ++ free(extra_config); return ERROR_FAIL; } + if (strlen(extra_config)) { + if (config_len > INT_MAX - (strlen(extra_config) + 2 + 1)) { + fprintf(stderr, "Failed to attach extra configration\n"); +@@ -4998,7 +5017,7 @@ int main_config_update(int argc, char **argv) + libxl_domain_config_dispose(&d_config); + + free(config_data); +- ++ free(extra_config); + return 0; + } + +@@ -7255,7 +7274,7 @@ int main_cpupoolcreate(int argc, char **argv) + { + const char *filename = NULL, *config_src=NULL; + const char *p; +- char extra_config[1024]; ++ char *extra_config = NULL; + int opt; + static struct option opts[] = { + {"defconfig", 1, 0, 'f'}, +@@ -7289,13 +7308,10 @@ int main_cpupoolcreate(int argc, char **argv) + break; + } + +- memset(extra_config, 0, sizeof(extra_config)); + while (optind < argc) { + if ((p = strchr(argv[optind], '='))) { +- if (strlen(extra_config) + 1 + strlen(argv[optind]) < sizeof(extra_config)) { +- strcat(extra_config, "\n"); +- strcat(extra_config, argv[optind]); +- } ++ string_realloc_append(&extra_config, "\n"); ++ string_realloc_append(&extra_config, argv[optind]); + } else if (!filename) { + filename = argv[optind]; + } else { +-- +1.7.10.4 + From owner-svn-ports-branches@freebsd.org Mon Aug 17 15:16:51 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id ECCED9BBA57; Mon, 17 Aug 2015 15:16:51 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DBCF41908; Mon, 17 Aug 2015 15:16:51 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7HFGpwu075995; Mon, 17 Aug 2015 15:16:51 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7HFGoQR075988; Mon, 17 Aug 2015 15:16:50 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201508171516.t7HFGoQR075988@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Mon, 17 Aug 2015 15:16:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r394516 - in branches/2015Q3/sysutils/xen-tools: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Aug 2015 15:16:52 -0000 Author: junovitch Date: Mon Aug 17 15:16:49 2015 New Revision: 394516 URL: https://svnweb.freebsd.org/changeset/ports/394516 Log: MFH: r393514 Fix XSA-138 / CVE-2015-5154 PR: 201931 Security: CVE-2015-5154 Security: da451130-365d-11e5-a4a5-002590263bf5 Approved by: ports-secteam (delphij,feld), delphij,feld (mentor) Added: branches/2015Q3/sysutils/xen-tools/files/xsa138-qemut-1.patch - copied unchanged from r393514, head/sysutils/xen-tools/files/xsa138-qemut-1.patch branches/2015Q3/sysutils/xen-tools/files/xsa138-qemut-2.patch - copied unchanged from r393514, head/sysutils/xen-tools/files/xsa138-qemut-2.patch branches/2015Q3/sysutils/xen-tools/files/xsa138-qemuu-1.patch - copied unchanged from r393514, head/sysutils/xen-tools/files/xsa138-qemuu-1.patch branches/2015Q3/sysutils/xen-tools/files/xsa138-qemuu-2.patch - copied unchanged from r393514, head/sysutils/xen-tools/files/xsa138-qemuu-2.patch branches/2015Q3/sysutils/xen-tools/files/xsa138-qemuu-3.patch - copied unchanged from r393514, head/sysutils/xen-tools/files/xsa138-qemuu-3.patch Modified: branches/2015Q3/sysutils/xen-tools/Makefile Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/sysutils/xen-tools/Makefile ============================================================================== --- branches/2015Q3/sysutils/xen-tools/Makefile Mon Aug 17 15:15:15 2015 (r394515) +++ branches/2015Q3/sysutils/xen-tools/Makefile Mon Aug 17 15:16:49 2015 (r394516) @@ -3,7 +3,7 @@ PORTNAME= xen PKGNAMESUFFIX= -tools PORTVERSION= 4.5.0 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= sysutils emulators MASTER_SITES= http://bits.xensource.com/oss-xen/release/${PORTVERSION}/ \ http://code.coreboot.org/p/seabios/downloads/get/:seabios Copied: branches/2015Q3/sysutils/xen-tools/files/xsa138-qemut-1.patch (from r393514, head/sysutils/xen-tools/files/xsa138-qemut-1.patch) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q3/sysutils/xen-tools/files/xsa138-qemut-1.patch Mon Aug 17 15:16:49 2015 (r394516, copy of r393514, head/sysutils/xen-tools/files/xsa138-qemut-1.patch) @@ -0,0 +1,77 @@ +From 510952d4c33ee69574167ce30829b21c815a165b Mon Sep 17 00:00:00 2001 +From: Kevin Wolf +Date: Wed, 3 Jun 2015 14:13:31 +0200 +Subject: [PATCH 1/2] ide: Check array bounds before writing to io_buffer + (CVE-2015-5154) + +If the end_transfer_func of a command is called because enough data has +been read or written for the current PIO transfer, and it fails to +correctly call the command completion functions, the DRQ bit in the +status register and s->end_transfer_func may remain set. This allows the +guest to access further bytes in s->io_buffer beyond s->data_end, and +eventually overflowing the io_buffer. + +One case where this currently happens is emulation of the ATAPI command +START STOP UNIT. + +This patch fixes the problem by adding explicit array bounds checks +before accessing the buffer instead of relying on end_transfer_func to +function correctly. + +Cc: qemu-stable@nongnu.org +Signed-off-by: Kevin Wolf +--- + hw/ide.c | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +diff --git a/hw/ide.c b/hw/ide.c +index 791666b..211ec88 100644 +--- a/hw/ide.c ++++ b/hw/ide.c +@@ -3002,6 +3002,10 @@ static void ide_data_writew(void *opaque, uint32_t addr, uint32_t val) + buffered_pio_write(s, addr, 2); + + p = s->data_ptr; ++ if (p + 2 > s->data_end) { ++ return; ++ } ++ + *(uint16_t *)p = le16_to_cpu(val); + p += 2; + s->data_ptr = p; +@@ -3021,6 +3025,10 @@ static uint32_t ide_data_readw(void *opaque, uint32_t addr) + buffered_pio_read(s, addr, 2); + + p = s->data_ptr; ++ if (p + 2 > s->data_end) { ++ return 0; ++ } ++ + ret = cpu_to_le16(*(uint16_t *)p); + p += 2; + s->data_ptr = p; +@@ -3040,6 +3048,10 @@ static void ide_data_writel(void *opaque, uint32_t addr, uint32_t val) + buffered_pio_write(s, addr, 4); + + p = s->data_ptr; ++ if (p + 4 > s->data_end) { ++ return; ++ } ++ + *(uint32_t *)p = le32_to_cpu(val); + p += 4; + s->data_ptr = p; +@@ -3059,6 +3071,10 @@ static uint32_t ide_data_readl(void *opaque, uint32_t addr) + buffered_pio_read(s, addr, 4); + + p = s->data_ptr; ++ if (p + 4 > s->data_end) { ++ return 0; ++ } ++ + ret = cpu_to_le32(*(uint32_t *)p); + p += 4; + s->data_ptr = p; +-- +2.1.4 + Copied: branches/2015Q3/sysutils/xen-tools/files/xsa138-qemut-2.patch (from r393514, head/sysutils/xen-tools/files/xsa138-qemut-2.patch) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q3/sysutils/xen-tools/files/xsa138-qemut-2.patch Mon Aug 17 15:16:49 2015 (r394516, copy of r393514, head/sysutils/xen-tools/files/xsa138-qemut-2.patch) @@ -0,0 +1,71 @@ +From 1ac0f60d558b7fca55c69a61ab4c4538af1f02f9 Mon Sep 17 00:00:00 2001 +From: Kevin Wolf +Date: Wed, 3 Jun 2015 14:41:27 +0200 +Subject: [PATCH 2/2] ide: Clear DRQ after handling all expected accesses + +This is additional hardening against an end_transfer_func that fails to +clear the DRQ status bit. The bit must be unset as soon as the PIO +transfer has completed, so it's better to do this in a central place +instead of duplicating the code in all commands (and forgetting it in +some). + +Signed-off-by: Kevin Wolf +--- + hw/ide.c | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) + +diff --git a/hw/ide.c b/hw/ide.c +index 211ec88..7b84d1b 100644 +--- a/hw/ide.c ++++ b/hw/ide.c +@@ -3009,8 +3009,10 @@ static void ide_data_writew(void *opaque, uint32_t addr, uint32_t val) + *(uint16_t *)p = le16_to_cpu(val); + p += 2; + s->data_ptr = p; +- if (p >= s->data_end) ++ if (p >= s->data_end) { ++ s->status &= ~DRQ_STAT; + s->end_transfer_func(s); ++ } + } + + static uint32_t ide_data_readw(void *opaque, uint32_t addr) +@@ -3032,8 +3034,10 @@ static uint32_t ide_data_readw(void *opaque, uint32_t addr) + ret = cpu_to_le16(*(uint16_t *)p); + p += 2; + s->data_ptr = p; +- if (p >= s->data_end) ++ if (p >= s->data_end) { ++ s->status &= ~DRQ_STAT; + s->end_transfer_func(s); ++ } + return ret; + } + +@@ -3055,8 +3059,10 @@ static void ide_data_writel(void *opaque, uint32_t addr, uint32_t val) + *(uint32_t *)p = le32_to_cpu(val); + p += 4; + s->data_ptr = p; +- if (p >= s->data_end) ++ if (p >= s->data_end) { ++ s->status &= ~DRQ_STAT; + s->end_transfer_func(s); ++ } + } + + static uint32_t ide_data_readl(void *opaque, uint32_t addr) +@@ -3078,8 +3084,10 @@ static uint32_t ide_data_readl(void *opaque, uint32_t addr) + ret = cpu_to_le32(*(uint32_t *)p); + p += 4; + s->data_ptr = p; +- if (p >= s->data_end) ++ if (p >= s->data_end) { ++ s->status &= ~DRQ_STAT; + s->end_transfer_func(s); ++ } + return ret; + } + +-- +2.1.4 + Copied: branches/2015Q3/sysutils/xen-tools/files/xsa138-qemuu-1.patch (from r393514, head/sysutils/xen-tools/files/xsa138-qemuu-1.patch) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q3/sysutils/xen-tools/files/xsa138-qemuu-1.patch Mon Aug 17 15:16:49 2015 (r394516, copy of r393514, head/sysutils/xen-tools/files/xsa138-qemuu-1.patch) @@ -0,0 +1,76 @@ +From a9de14175548c04e0f8be7fae219246509ba46a9 Mon Sep 17 00:00:00 2001 +From: Kevin Wolf +Date: Wed, 3 Jun 2015 14:13:31 +0200 +Subject: [PATCH 1/3] ide: Check array bounds before writing to io_buffer + (CVE-2015-5154) + +If the end_transfer_func of a command is called because enough data has +been read or written for the current PIO transfer, and it fails to +correctly call the command completion functions, the DRQ bit in the +status register and s->end_transfer_func may remain set. This allows the +guest to access further bytes in s->io_buffer beyond s->data_end, and +eventually overflowing the io_buffer. + +One case where this currently happens is emulation of the ATAPI command +START STOP UNIT. + +This patch fixes the problem by adding explicit array bounds checks +before accessing the buffer instead of relying on end_transfer_func to +function correctly. + +Cc: qemu-stable@nongnu.org +Signed-off-by: Kevin Wolf +--- + hw/ide/core.c | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +diff --git a/hw/ide/core.c b/hw/ide/core.c +index 122e955..44fcc23 100644 +--- a/hw/ide/core.c ++++ b/hw/ide/core.c +@@ -2021,6 +2021,10 @@ void ide_data_writew(void *opaque, uint32_t addr, uint32_t val) + } + + p = s->data_ptr; ++ if (p + 2 > s->data_end) { ++ return; ++ } ++ + *(uint16_t *)p = le16_to_cpu(val); + p += 2; + s->data_ptr = p; +@@ -2042,6 +2046,10 @@ uint32_t ide_data_readw(void *opaque, uint32_t addr) + } + + p = s->data_ptr; ++ if (p + 2 > s->data_end) { ++ return 0; ++ } ++ + ret = cpu_to_le16(*(uint16_t *)p); + p += 2; + s->data_ptr = p; +@@ -2063,6 +2071,10 @@ void ide_data_writel(void *opaque, uint32_t addr, uint32_t val) + } + + p = s->data_ptr; ++ if (p + 4 > s->data_end) { ++ return; ++ } ++ + *(uint32_t *)p = le32_to_cpu(val); + p += 4; + s->data_ptr = p; +@@ -2084,6 +2096,10 @@ uint32_t ide_data_readl(void *opaque, uint32_t addr) + } + + p = s->data_ptr; ++ if (p + 4 > s->data_end) { ++ return 0; ++ } ++ + ret = cpu_to_le32(*(uint32_t *)p); + p += 4; + s->data_ptr = p; +-- +1.8.3.1 Copied: branches/2015Q3/sysutils/xen-tools/files/xsa138-qemuu-2.patch (from r393514, head/sysutils/xen-tools/files/xsa138-qemuu-2.patch) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q3/sysutils/xen-tools/files/xsa138-qemuu-2.patch Mon Aug 17 15:16:49 2015 (r394516, copy of r393514, head/sysutils/xen-tools/files/xsa138-qemuu-2.patch) @@ -0,0 +1,28 @@ +From aa851d30acfbb9580098ac1dc82885530cb8b3c1 Mon Sep 17 00:00:00 2001 +From: Kevin Wolf +Date: Wed, 3 Jun 2015 14:17:46 +0200 +Subject: [PATCH 2/3] ide/atapi: Fix START STOP UNIT command completion + +The command must be completed on all code paths. START STOP UNIT with +pwrcnd set should succeed without doing anything. + +Signed-off-by: Kevin Wolf +--- + hw/ide/atapi.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c +index 950e311..79dd167 100644 +--- a/hw/ide/atapi.c ++++ b/hw/ide/atapi.c +@@ -983,6 +983,7 @@ static void cmd_start_stop_unit(IDEState *s, uint8_t* buf) + + if (pwrcnd) { + /* eject/load only happens for power condition == 0 */ ++ ide_atapi_cmd_ok(s); + return; + } + +-- +1.8.3.1 + Copied: branches/2015Q3/sysutils/xen-tools/files/xsa138-qemuu-3.patch (from r393514, head/sysutils/xen-tools/files/xsa138-qemuu-3.patch) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q3/sysutils/xen-tools/files/xsa138-qemuu-3.patch Mon Aug 17 15:16:49 2015 (r394516, copy of r393514, head/sysutils/xen-tools/files/xsa138-qemuu-3.patch) @@ -0,0 +1,71 @@ +From 1d3c2268f8708126a34064c2e0c1000b40e6f3e5 Mon Sep 17 00:00:00 2001 +From: Kevin Wolf +Date: Wed, 3 Jun 2015 14:41:27 +0200 +Subject: [PATCH 3/3] ide: Clear DRQ after handling all expected accesses + +This is additional hardening against an end_transfer_func that fails to +clear the DRQ status bit. The bit must be unset as soon as the PIO +transfer has completed, so it's better to do this in a central place +instead of duplicating the code in all commands (and forgetting it in +some). + +Signed-off-by: Kevin Wolf +--- + hw/ide/core.c | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) + +diff --git a/hw/ide/core.c b/hw/ide/core.c +index 44fcc23..50449ca 100644 +--- a/hw/ide/core.c ++++ b/hw/ide/core.c +@@ -2028,8 +2028,10 @@ void ide_data_writew(void *opaque, uint32_t addr, uint32_t val) + *(uint16_t *)p = le16_to_cpu(val); + p += 2; + s->data_ptr = p; +- if (p >= s->data_end) ++ if (p >= s->data_end) { ++ s->status &= ~DRQ_STAT; + s->end_transfer_func(s); ++ } + } + + uint32_t ide_data_readw(void *opaque, uint32_t addr) +@@ -2053,8 +2055,10 @@ uint32_t ide_data_readw(void *opaque, uint32_t addr) + ret = cpu_to_le16(*(uint16_t *)p); + p += 2; + s->data_ptr = p; +- if (p >= s->data_end) ++ if (p >= s->data_end) { ++ s->status &= ~DRQ_STAT; + s->end_transfer_func(s); ++ } + return ret; + } + +@@ -2078,8 +2082,10 @@ void ide_data_writel(void *opaque, uint32_t addr, uint32_t val) + *(uint32_t *)p = le32_to_cpu(val); + p += 4; + s->data_ptr = p; +- if (p >= s->data_end) ++ if (p >= s->data_end) { ++ s->status &= ~DRQ_STAT; + s->end_transfer_func(s); ++ } + } + + uint32_t ide_data_readl(void *opaque, uint32_t addr) +@@ -2103,8 +2109,10 @@ uint32_t ide_data_readl(void *opaque, uint32_t addr) + ret = cpu_to_le32(*(uint32_t *)p); + p += 4; + s->data_ptr = p; +- if (p >= s->data_end) ++ if (p >= s->data_end) { ++ s->status &= ~DRQ_STAT; + s->end_transfer_func(s); ++ } + return ret; + } + +-- +1.8.3.1 + From owner-svn-ports-branches@freebsd.org Mon Aug 17 15:18:15 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6F4D19BBA9D; Mon, 17 Aug 2015 15:18:15 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5D20F1A20; Mon, 17 Aug 2015 15:18:15 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7HFIFFe076909; Mon, 17 Aug 2015 15:18:15 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7HFICpA076892; Mon, 17 Aug 2015 15:18:12 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201508171518.t7HFICpA076892@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Mon, 17 Aug 2015 15:18:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r394517 - in branches/2015Q3/sysutils/xen-tools: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Aug 2015 15:18:15 -0000 Author: junovitch Date: Mon Aug 17 15:18:11 2015 New Revision: 394517 URL: https://svnweb.freebsd.org/changeset/ports/394517 Log: MFH: r394506 sysutils/xen-tools: Update to 4.5.1 and apply XSA-139/XSA-140 patches - Update to 4.5.1 - Remove XSA-117 to XSA-136 and elf_parse_bsdsyms patches now part of 4.5.1 - Leave XSA-135 QEMU traditional patches due an oversight in 4.5.1 - Apply patches for XSA-139/XSA-140 - Set USE_LDCONFIG, sort USES, use ${PATCH}, and reorder Makefile (portlint) PR: 201931 Security: CVE-2015-5166 Security: ee99899d-4347-11e5-93ad-002590263bf5 Security: CVE-2015-5165 Security: f06f20dc-4347-11e5-93ad-002590263bf5 Approved by: bapt (maintainer), feld (mentor) Approved by: ports-secteam (feld) Added: branches/2015Q3/sysutils/xen-tools/files/xsa139-qemuu-4.5.patch - copied unchanged from r394506, head/sysutils/xen-tools/files/xsa139-qemuu-4.5.patch branches/2015Q3/sysutils/xen-tools/files/xsa140-qemuu-unstable-1.patch - copied unchanged from r394506, head/sysutils/xen-tools/files/xsa140-qemuu-unstable-1.patch branches/2015Q3/sysutils/xen-tools/files/xsa140-qemuu-unstable-2.patch - copied unchanged from r394506, head/sysutils/xen-tools/files/xsa140-qemuu-unstable-2.patch branches/2015Q3/sysutils/xen-tools/files/xsa140-qemuu-unstable-3.patch - copied unchanged from r394506, head/sysutils/xen-tools/files/xsa140-qemuu-unstable-3.patch branches/2015Q3/sysutils/xen-tools/files/xsa140-qemuu-unstable-4.patch - copied unchanged from r394506, head/sysutils/xen-tools/files/xsa140-qemuu-unstable-4.patch branches/2015Q3/sysutils/xen-tools/files/xsa140-qemuu-unstable-5.patch - copied unchanged from r394506, head/sysutils/xen-tools/files/xsa140-qemuu-unstable-5.patch branches/2015Q3/sysutils/xen-tools/files/xsa140-qemuu-unstable-6.patch - copied unchanged from r394506, head/sysutils/xen-tools/files/xsa140-qemuu-unstable-6.patch branches/2015Q3/sysutils/xen-tools/files/xsa140-qemuu-unstable-7.patch - copied unchanged from r394506, head/sysutils/xen-tools/files/xsa140-qemuu-unstable-7.patch Deleted: branches/2015Q3/sysutils/xen-tools/files/0001-libelf-fix-elf_parse_bsdsyms-call.patch branches/2015Q3/sysutils/xen-tools/files/xsa119-unstable.patch branches/2015Q3/sysutils/xen-tools/files/xsa125.patch branches/2015Q3/sysutils/xen-tools/files/xsa126-qemut.patch branches/2015Q3/sysutils/xen-tools/files/xsa126-qemuu.patch branches/2015Q3/sysutils/xen-tools/files/xsa128-qemut.patch branches/2015Q3/sysutils/xen-tools/files/xsa128-qemuu.patch branches/2015Q3/sysutils/xen-tools/files/xsa129-qemut.patch branches/2015Q3/sysutils/xen-tools/files/xsa129-qemuu.patch branches/2015Q3/sysutils/xen-tools/files/xsa130-qemut.patch branches/2015Q3/sysutils/xen-tools/files/xsa130-qemuu.patch branches/2015Q3/sysutils/xen-tools/files/xsa131-qemut-1.patch branches/2015Q3/sysutils/xen-tools/files/xsa131-qemut-2.patch branches/2015Q3/sysutils/xen-tools/files/xsa131-qemut-3.patch branches/2015Q3/sysutils/xen-tools/files/xsa131-qemut-4.patch branches/2015Q3/sysutils/xen-tools/files/xsa131-qemut-5.patch branches/2015Q3/sysutils/xen-tools/files/xsa131-qemut-6.patch branches/2015Q3/sysutils/xen-tools/files/xsa131-qemut-7.patch branches/2015Q3/sysutils/xen-tools/files/xsa131-qemut-8.patch branches/2015Q3/sysutils/xen-tools/files/xsa131-qemuu-1.patch branches/2015Q3/sysutils/xen-tools/files/xsa131-qemuu-2.patch branches/2015Q3/sysutils/xen-tools/files/xsa131-qemuu-3.patch branches/2015Q3/sysutils/xen-tools/files/xsa131-qemuu-4.patch branches/2015Q3/sysutils/xen-tools/files/xsa131-qemuu-5.patch branches/2015Q3/sysutils/xen-tools/files/xsa131-qemuu-6.patch branches/2015Q3/sysutils/xen-tools/files/xsa131-qemuu-7.patch branches/2015Q3/sysutils/xen-tools/files/xsa131-qemuu-8.patch branches/2015Q3/sysutils/xen-tools/files/xsa133-qemut.patch branches/2015Q3/sysutils/xen-tools/files/xsa133-qemuu.patch branches/2015Q3/sysutils/xen-tools/files/xsa135-qemuu-4.5-1.patch branches/2015Q3/sysutils/xen-tools/files/xsa135-qemuu-4.5-2.patch Modified: branches/2015Q3/sysutils/xen-tools/Makefile branches/2015Q3/sysutils/xen-tools/distinfo branches/2015Q3/sysutils/xen-tools/pkg-plist Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/sysutils/xen-tools/Makefile ============================================================================== --- branches/2015Q3/sysutils/xen-tools/Makefile Mon Aug 17 15:16:49 2015 (r394516) +++ branches/2015Q3/sysutils/xen-tools/Makefile Mon Aug 17 15:18:11 2015 (r394517) @@ -1,12 +1,11 @@ # $FreeBSD$ PORTNAME= xen -PKGNAMESUFFIX= -tools -PORTVERSION= 4.5.0 -PORTREVISION= 9 +PORTVERSION= 4.5.1 CATEGORIES= sysutils emulators MASTER_SITES= http://bits.xensource.com/oss-xen/release/${PORTVERSION}/ \ http://code.coreboot.org/p/seabios/downloads/get/:seabios +PKGNAMESUFFIX= -tools MAINTAINER= bapt@FreeBSD.org COMMENT= Xen management tool, based on LibXenlight @@ -14,13 +13,13 @@ COMMENT= Xen management tool, based on L LICENSE= GPLv2 LGPL3 LICENSE_COMB= multi -OPTIONS_DEFINE= DOCS - LIB_DEPENDS= libyajl.so:${PORTSDIR}/devel/yajl \ liblzo2.so:${PORTSDIR}/archivers/lzo2 \ libpixman-1.so:${PORTSDIR}/x11/pixman BUILD_DEPENDS= dev86>0:${PORTSDIR}/devel/dev86 +OPTIONS_DEFINE= DOCS + ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= "not yet ported to anything other than amd64" @@ -30,8 +29,9 @@ DISTFILES+= ${DISTNAME}.tar.gz \ WRKSRC= ${WRKDIR}/xen-${PORTVERSION} -USES= cpe gmake perl5 python shebangfix libtool pkgconfig +USES= cpe gmake libtool perl5 pkgconfig python shebangfix USE_GNOME= glib20 +USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ENV= HOSTCC="${CC}" CC="${CC}" \ ac_cv_path_BASH=${TRUE} \ @@ -47,10 +47,7 @@ QEMU_ARGS= --disable-gtk \ --disable-curl \ --cxx=c++ -EXTRA_PATCHES= ${FILESDIR}/xsa119-unstable.patch:-p1 \ - ${FILESDIR}/xsa125.patch:-p1 \ - ${FILESDIR}/xsa137.patch:-p1 \ - ${FILESDIR}/0001-libelf-fix-elf_parse_bsdsyms-call.patch:-p1 \ +EXTRA_PATCHES= ${FILESDIR}/xsa137.patch:-p1 \ ${FILESDIR}/0002-libxc-fix-xc_dom_load_elf_symtab.patch:-p1 CONFIGURE_ARGS+= --with-extra-qemuu-configure-args="${QEMU_ARGS}" @@ -63,7 +60,7 @@ INSTALL_TARGET= install-tools install-do .include .if ${OPSYS} != FreeBSD -IGNORE= Only supported on FreeBSD +IGNORE= only supported on FreeBSD .endif post-extract: @@ -80,11 +77,11 @@ post-patch: ${WRKSRC}/docs/man/* @for p in ${FILESDIR}/*qemut*.patch; do \ ${ECHO_CMD} "====> Applying $${p##*/}" ; \ - patch -s -p1 -i $${p} -d ${WRKSRC}/tools/qemu-xen-traditional ; \ + ${PATCH} -s -p1 -i $${p} -d ${WRKSRC}/tools/qemu-xen-traditional ; \ done @for p in ${FILESDIR}/*qemuu*.patch; do \ ${ECHO_CMD} "====> Applying $${p##*/}" ; \ - patch -s -p1 -i $${p} -d ${WRKSRC}/tools/qemu-xen ; \ + ${PATCH} -s -p1 -i $${p} -d ${WRKSRC}/tools/qemu-xen ; \ done post-install: Modified: branches/2015Q3/sysutils/xen-tools/distinfo ============================================================================== --- branches/2015Q3/sysutils/xen-tools/distinfo Mon Aug 17 15:16:49 2015 (r394516) +++ branches/2015Q3/sysutils/xen-tools/distinfo Mon Aug 17 15:18:11 2015 (r394517) @@ -1,4 +1,4 @@ -SHA256 (xen-4.5.0.tar.gz) = 5bdb40e2b28d2eeb541bd71a9777f40cbe2ae444b987521d33f099541a006f3b -SIZE (xen-4.5.0.tar.gz) = 18404933 +SHA256 (xen-4.5.1.tar.gz) = 668c11d4fca67ac44329e369f810356eacd37b28d28fb96e66aac77f3c5e1371 +SIZE (xen-4.5.1.tar.gz) = 18410400 SHA256 (seabios-1.8.1.tar.gz) = 283bd848f5ce9d4bc52add973a856347e02c9ce89a9e6bc92c99359b87c9871d SIZE (seabios-1.8.1.tar.gz) = 537712 Copied: branches/2015Q3/sysutils/xen-tools/files/xsa139-qemuu-4.5.patch (from r394506, head/sysutils/xen-tools/files/xsa139-qemuu-4.5.patch) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q3/sysutils/xen-tools/files/xsa139-qemuu-4.5.patch Mon Aug 17 15:18:11 2015 (r394517, copy of r394506, head/sysutils/xen-tools/files/xsa139-qemuu-4.5.patch) @@ -0,0 +1,38 @@ +pci_piix3_xen_ide_unplug should completely unhook the unplugged +IDEDevice from the corresponding BlockBackend, otherwise the next call +to release_drive will try to detach the drive again. + +Suggested-by: Kevin Wolf +Signed-off-by: Stefano Stabellini +--- + hw/ide/piix.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/hw/ide/piix.c b/hw/ide/piix.c +index 40757eb..0524dce 100644 +--- a/hw/ide/piix.c ++++ b/hw/ide/piix.c +@@ -172,6 +172,7 @@ int pci_piix3_xen_ide_unplug(DeviceState *dev) + PCIIDEState *pci_ide; + DriveInfo *di; + int i = 0; ++ IDEDevice *idedev; + + pci_ide = PCI_IDE(dev); + +@@ -184,6 +185,12 @@ int pci_piix3_xen_ide_unplug(DeviceState *dev) + } + bdrv_close(di->bdrv); + pci_ide->bus[di->bus].ifs[di->unit].bs = NULL; ++ if (!(i % 2)) { ++ idedev = pci_ide->bus[di->bus].master; ++ } else { ++ idedev = pci_ide->bus[di->bus].slave; ++ } ++ idedev->conf.bs = NULL; + drive_put_ref(di); + } + } +-- +2.1.4 + Copied: branches/2015Q3/sysutils/xen-tools/files/xsa140-qemuu-unstable-1.patch (from r394506, head/sysutils/xen-tools/files/xsa140-qemuu-unstable-1.patch) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q3/sysutils/xen-tools/files/xsa140-qemuu-unstable-1.patch Mon Aug 17 15:18:11 2015 (r394517, copy of r394506, head/sysutils/xen-tools/files/xsa140-qemuu-unstable-1.patch) @@ -0,0 +1,82 @@ +From 5e0c290415b9d57077a86e70c8e6a058868334d3 Mon Sep 17 00:00:00 2001 +From: Stefan Hajnoczi +Date: Wed, 15 Jul 2015 18:16:58 +0100 +Subject: [PATCH 1/7] rtl8139: avoid nested ifs in IP header parsing + +Transmit offload needs to parse packet headers. If header fields have +unexpected values the offload processing is skipped. + +The code currently uses nested ifs because there is relatively little +input validation. The next patches will add missing input validation +and a goto label is more appropriate to avoid deep if statement nesting. + +Signed-off-by: Stefan Hajnoczi +--- + hw/net/rtl8139.c | 41 ++++++++++++++++++++++------------------- + 1 file changed, 22 insertions(+), 19 deletions(-) + +diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c +index 5f0197c..91ba33b 100644 +--- a/hw/net/rtl8139.c ++++ b/hw/net/rtl8139.c +@@ -2174,28 +2174,30 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s) + size_t eth_payload_len = 0; + + int proto = be16_to_cpu(*(uint16_t *)(saved_buffer + 12)); +- if (proto == ETH_P_IP) ++ if (proto != ETH_P_IP) + { +- DPRINTF("+++ C+ mode has IP packet\n"); +- +- /* not aligned */ +- eth_payload_data = saved_buffer + ETH_HLEN; +- eth_payload_len = saved_size - ETH_HLEN; +- +- ip = (ip_header*)eth_payload_data; +- +- if (IP_HEADER_VERSION(ip) != IP_HEADER_VERSION_4) { +- DPRINTF("+++ C+ mode packet has bad IP version %d " +- "expected %d\n", IP_HEADER_VERSION(ip), +- IP_HEADER_VERSION_4); +- ip = NULL; +- } else { +- hlen = IP_HEADER_LENGTH(ip); +- ip_protocol = ip->ip_p; +- ip_data_len = be16_to_cpu(ip->ip_len) - hlen; +- } ++ goto skip_offload; + } + ++ DPRINTF("+++ C+ mode has IP packet\n"); ++ ++ /* not aligned */ ++ eth_payload_data = saved_buffer + ETH_HLEN; ++ eth_payload_len = saved_size - ETH_HLEN; ++ ++ ip = (ip_header*)eth_payload_data; ++ ++ if (IP_HEADER_VERSION(ip) != IP_HEADER_VERSION_4) { ++ DPRINTF("+++ C+ mode packet has bad IP version %d " ++ "expected %d\n", IP_HEADER_VERSION(ip), ++ IP_HEADER_VERSION_4); ++ goto skip_offload; ++ } ++ ++ hlen = IP_HEADER_LENGTH(ip); ++ ip_protocol = ip->ip_p; ++ ip_data_len = be16_to_cpu(ip->ip_len) - hlen; ++ + if (ip) + { + if (txdw0 & CP_TX_IPCS) +@@ -2391,6 +2393,7 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s) + } + } + ++skip_offload: + /* update tally counter */ + ++s->tally_counters.TxOk; + +-- +2.1.4 + Copied: branches/2015Q3/sysutils/xen-tools/files/xsa140-qemuu-unstable-2.patch (from r394506, head/sysutils/xen-tools/files/xsa140-qemuu-unstable-2.patch) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q3/sysutils/xen-tools/files/xsa140-qemuu-unstable-2.patch Mon Aug 17 15:18:11 2015 (r394517, copy of r394506, head/sysutils/xen-tools/files/xsa140-qemuu-unstable-2.patch) @@ -0,0 +1,373 @@ +From 2d7d80e8dc160904fa7276cc05da26c062a50066 Mon Sep 17 00:00:00 2001 +From: Stefan Hajnoczi +Date: Wed, 15 Jul 2015 18:16:59 +0100 +Subject: [PATCH 2/7] rtl8139: drop tautologous if (ip) {...} statement + +The previous patch stopped using the ip pointer as an indicator that the +IP header is present. When we reach the if (ip) {...} statement we know +ip is always non-NULL. + +Remove the if statement to reduce nesting. + +Signed-off-by: Stefan Hajnoczi +--- + hw/net/rtl8139.c | 305 +++++++++++++++++++++++++++---------------------------- + 1 file changed, 151 insertions(+), 154 deletions(-) + +diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c +index 91ba33b..2f12d42 100644 +--- a/hw/net/rtl8139.c ++++ b/hw/net/rtl8139.c +@@ -2198,198 +2198,195 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s) + ip_protocol = ip->ip_p; + ip_data_len = be16_to_cpu(ip->ip_len) - hlen; + +- if (ip) ++ if (txdw0 & CP_TX_IPCS) + { +- if (txdw0 & CP_TX_IPCS) +- { +- DPRINTF("+++ C+ mode need IP checksum\n"); ++ DPRINTF("+++ C+ mode need IP checksum\n"); + +- if (hleneth_payload_len) {/* min header length */ +- /* bad packet header len */ +- /* or packet too short */ +- } +- else +- { +- ip->ip_sum = 0; +- ip->ip_sum = ip_checksum(ip, hlen); +- DPRINTF("+++ C+ mode IP header len=%d checksum=%04x\n", +- hlen, ip->ip_sum); +- } ++ if (hleneth_payload_len) {/* min header length */ ++ /* bad packet header len */ ++ /* or packet too short */ + } +- +- if ((txdw0 & CP_TX_LGSEN) && ip_protocol == IP_PROTO_TCP) ++ else + { +- int large_send_mss = (txdw0 >> 16) & CP_TC_LGSEN_MSS_MASK; ++ ip->ip_sum = 0; ++ ip->ip_sum = ip_checksum(ip, hlen); ++ DPRINTF("+++ C+ mode IP header len=%d checksum=%04x\n", ++ hlen, ip->ip_sum); ++ } ++ } + +- DPRINTF("+++ C+ mode offloaded task TSO MTU=%d IP data %d " +- "frame data %d specified MSS=%d\n", ETH_MTU, +- ip_data_len, saved_size - ETH_HLEN, large_send_mss); ++ if ((txdw0 & CP_TX_LGSEN) && ip_protocol == IP_PROTO_TCP) ++ { ++ int large_send_mss = (txdw0 >> 16) & CP_TC_LGSEN_MSS_MASK; + +- int tcp_send_offset = 0; +- int send_count = 0; ++ DPRINTF("+++ C+ mode offloaded task TSO MTU=%d IP data %d " ++ "frame data %d specified MSS=%d\n", ETH_MTU, ++ ip_data_len, saved_size - ETH_HLEN, large_send_mss); + +- /* maximum IP header length is 60 bytes */ +- uint8_t saved_ip_header[60]; ++ int tcp_send_offset = 0; ++ int send_count = 0; + +- /* save IP header template; data area is used in tcp checksum calculation */ +- memcpy(saved_ip_header, eth_payload_data, hlen); ++ /* maximum IP header length is 60 bytes */ ++ uint8_t saved_ip_header[60]; + +- /* a placeholder for checksum calculation routine in tcp case */ +- uint8_t *data_to_checksum = eth_payload_data + hlen - 12; +- // size_t data_to_checksum_len = eth_payload_len - hlen + 12; ++ /* save IP header template; data area is used in tcp checksum calculation */ ++ memcpy(saved_ip_header, eth_payload_data, hlen); + +- /* pointer to TCP header */ +- tcp_header *p_tcp_hdr = (tcp_header*)(eth_payload_data + hlen); ++ /* a placeholder for checksum calculation routine in tcp case */ ++ uint8_t *data_to_checksum = eth_payload_data + hlen - 12; ++ // size_t data_to_checksum_len = eth_payload_len - hlen + 12; + +- int tcp_hlen = TCP_HEADER_DATA_OFFSET(p_tcp_hdr); ++ /* pointer to TCP header */ ++ tcp_header *p_tcp_hdr = (tcp_header*)(eth_payload_data + hlen); + +- /* ETH_MTU = ip header len + tcp header len + payload */ +- int tcp_data_len = ip_data_len - tcp_hlen; +- int tcp_chunk_size = ETH_MTU - hlen - tcp_hlen; ++ int tcp_hlen = TCP_HEADER_DATA_OFFSET(p_tcp_hdr); + +- DPRINTF("+++ C+ mode TSO IP data len %d TCP hlen %d TCP " +- "data len %d TCP chunk size %d\n", ip_data_len, +- tcp_hlen, tcp_data_len, tcp_chunk_size); ++ /* ETH_MTU = ip header len + tcp header len + payload */ ++ int tcp_data_len = ip_data_len - tcp_hlen; ++ int tcp_chunk_size = ETH_MTU - hlen - tcp_hlen; + +- /* note the cycle below overwrites IP header data, +- but restores it from saved_ip_header before sending packet */ ++ DPRINTF("+++ C+ mode TSO IP data len %d TCP hlen %d TCP " ++ "data len %d TCP chunk size %d\n", ip_data_len, ++ tcp_hlen, tcp_data_len, tcp_chunk_size); + +- int is_last_frame = 0; ++ /* note the cycle below overwrites IP header data, ++ but restores it from saved_ip_header before sending packet */ + +- for (tcp_send_offset = 0; tcp_send_offset < tcp_data_len; tcp_send_offset += tcp_chunk_size) +- { +- uint16_t chunk_size = tcp_chunk_size; +- +- /* check if this is the last frame */ +- if (tcp_send_offset + tcp_chunk_size >= tcp_data_len) +- { +- is_last_frame = 1; +- chunk_size = tcp_data_len - tcp_send_offset; +- } +- +- DPRINTF("+++ C+ mode TSO TCP seqno %08x\n", +- be32_to_cpu(p_tcp_hdr->th_seq)); +- +- /* add 4 TCP pseudoheader fields */ +- /* copy IP source and destination fields */ +- memcpy(data_to_checksum, saved_ip_header + 12, 8); +- +- DPRINTF("+++ C+ mode TSO calculating TCP checksum for " +- "packet with %d bytes data\n", tcp_hlen + +- chunk_size); +- +- if (tcp_send_offset) +- { +- memcpy((uint8_t*)p_tcp_hdr + tcp_hlen, (uint8_t*)p_tcp_hdr + tcp_hlen + tcp_send_offset, chunk_size); +- } +- +- /* keep PUSH and FIN flags only for the last frame */ +- if (!is_last_frame) +- { +- TCP_HEADER_CLEAR_FLAGS(p_tcp_hdr, TCP_FLAG_PUSH|TCP_FLAG_FIN); +- } +- +- /* recalculate TCP checksum */ +- ip_pseudo_header *p_tcpip_hdr = (ip_pseudo_header *)data_to_checksum; +- p_tcpip_hdr->zeros = 0; +- p_tcpip_hdr->ip_proto = IP_PROTO_TCP; +- p_tcpip_hdr->ip_payload = cpu_to_be16(tcp_hlen + chunk_size); +- +- p_tcp_hdr->th_sum = 0; +- +- int tcp_checksum = ip_checksum(data_to_checksum, tcp_hlen + chunk_size + 12); +- DPRINTF("+++ C+ mode TSO TCP checksum %04x\n", +- tcp_checksum); +- +- p_tcp_hdr->th_sum = tcp_checksum; +- +- /* restore IP header */ +- memcpy(eth_payload_data, saved_ip_header, hlen); +- +- /* set IP data length and recalculate IP checksum */ +- ip->ip_len = cpu_to_be16(hlen + tcp_hlen + chunk_size); +- +- /* increment IP id for subsequent frames */ +- ip->ip_id = cpu_to_be16(tcp_send_offset/tcp_chunk_size + be16_to_cpu(ip->ip_id)); +- +- ip->ip_sum = 0; +- ip->ip_sum = ip_checksum(eth_payload_data, hlen); +- DPRINTF("+++ C+ mode TSO IP header len=%d " +- "checksum=%04x\n", hlen, ip->ip_sum); +- +- int tso_send_size = ETH_HLEN + hlen + tcp_hlen + chunk_size; +- DPRINTF("+++ C+ mode TSO transferring packet size " +- "%d\n", tso_send_size); +- rtl8139_transfer_frame(s, saved_buffer, tso_send_size, +- 0, (uint8_t *) dot1q_buffer); +- +- /* add transferred count to TCP sequence number */ +- p_tcp_hdr->th_seq = cpu_to_be32(chunk_size + be32_to_cpu(p_tcp_hdr->th_seq)); +- ++send_count; +- } ++ int is_last_frame = 0; + +- /* Stop sending this frame */ +- saved_size = 0; +- } +- else if (txdw0 & (CP_TX_TCPCS|CP_TX_UDPCS)) ++ for (tcp_send_offset = 0; tcp_send_offset < tcp_data_len; tcp_send_offset += tcp_chunk_size) + { +- DPRINTF("+++ C+ mode need TCP or UDP checksum\n"); ++ uint16_t chunk_size = tcp_chunk_size; + +- /* maximum IP header length is 60 bytes */ +- uint8_t saved_ip_header[60]; +- memcpy(saved_ip_header, eth_payload_data, hlen); ++ /* check if this is the last frame */ ++ if (tcp_send_offset + tcp_chunk_size >= tcp_data_len) ++ { ++ is_last_frame = 1; ++ chunk_size = tcp_data_len - tcp_send_offset; ++ } + +- uint8_t *data_to_checksum = eth_payload_data + hlen - 12; +- // size_t data_to_checksum_len = eth_payload_len - hlen + 12; ++ DPRINTF("+++ C+ mode TSO TCP seqno %08x\n", ++ be32_to_cpu(p_tcp_hdr->th_seq)); + + /* add 4 TCP pseudoheader fields */ + /* copy IP source and destination fields */ + memcpy(data_to_checksum, saved_ip_header + 12, 8); + +- if ((txdw0 & CP_TX_TCPCS) && ip_protocol == IP_PROTO_TCP) ++ DPRINTF("+++ C+ mode TSO calculating TCP checksum for " ++ "packet with %d bytes data\n", tcp_hlen + ++ chunk_size); ++ ++ if (tcp_send_offset) + { +- DPRINTF("+++ C+ mode calculating TCP checksum for " +- "packet with %d bytes data\n", ip_data_len); ++ memcpy((uint8_t*)p_tcp_hdr + tcp_hlen, (uint8_t*)p_tcp_hdr + tcp_hlen + tcp_send_offset, chunk_size); ++ } + +- ip_pseudo_header *p_tcpip_hdr = (ip_pseudo_header *)data_to_checksum; +- p_tcpip_hdr->zeros = 0; +- p_tcpip_hdr->ip_proto = IP_PROTO_TCP; +- p_tcpip_hdr->ip_payload = cpu_to_be16(ip_data_len); ++ /* keep PUSH and FIN flags only for the last frame */ ++ if (!is_last_frame) ++ { ++ TCP_HEADER_CLEAR_FLAGS(p_tcp_hdr, TCP_FLAG_PUSH|TCP_FLAG_FIN); ++ } + +- tcp_header* p_tcp_hdr = (tcp_header *) (data_to_checksum+12); ++ /* recalculate TCP checksum */ ++ ip_pseudo_header *p_tcpip_hdr = (ip_pseudo_header *)data_to_checksum; ++ p_tcpip_hdr->zeros = 0; ++ p_tcpip_hdr->ip_proto = IP_PROTO_TCP; ++ p_tcpip_hdr->ip_payload = cpu_to_be16(tcp_hlen + chunk_size); + +- p_tcp_hdr->th_sum = 0; ++ p_tcp_hdr->th_sum = 0; + +- int tcp_checksum = ip_checksum(data_to_checksum, ip_data_len + 12); +- DPRINTF("+++ C+ mode TCP checksum %04x\n", +- tcp_checksum); ++ int tcp_checksum = ip_checksum(data_to_checksum, tcp_hlen + chunk_size + 12); ++ DPRINTF("+++ C+ mode TSO TCP checksum %04x\n", ++ tcp_checksum); + +- p_tcp_hdr->th_sum = tcp_checksum; +- } +- else if ((txdw0 & CP_TX_UDPCS) && ip_protocol == IP_PROTO_UDP) +- { +- DPRINTF("+++ C+ mode calculating UDP checksum for " +- "packet with %d bytes data\n", ip_data_len); ++ p_tcp_hdr->th_sum = tcp_checksum; + +- ip_pseudo_header *p_udpip_hdr = (ip_pseudo_header *)data_to_checksum; +- p_udpip_hdr->zeros = 0; +- p_udpip_hdr->ip_proto = IP_PROTO_UDP; +- p_udpip_hdr->ip_payload = cpu_to_be16(ip_data_len); ++ /* restore IP header */ ++ memcpy(eth_payload_data, saved_ip_header, hlen); + +- udp_header *p_udp_hdr = (udp_header *) (data_to_checksum+12); ++ /* set IP data length and recalculate IP checksum */ ++ ip->ip_len = cpu_to_be16(hlen + tcp_hlen + chunk_size); + +- p_udp_hdr->uh_sum = 0; ++ /* increment IP id for subsequent frames */ ++ ip->ip_id = cpu_to_be16(tcp_send_offset/tcp_chunk_size + be16_to_cpu(ip->ip_id)); + +- int udp_checksum = ip_checksum(data_to_checksum, ip_data_len + 12); +- DPRINTF("+++ C+ mode UDP checksum %04x\n", +- udp_checksum); ++ ip->ip_sum = 0; ++ ip->ip_sum = ip_checksum(eth_payload_data, hlen); ++ DPRINTF("+++ C+ mode TSO IP header len=%d " ++ "checksum=%04x\n", hlen, ip->ip_sum); + +- p_udp_hdr->uh_sum = udp_checksum; +- } ++ int tso_send_size = ETH_HLEN + hlen + tcp_hlen + chunk_size; ++ DPRINTF("+++ C+ mode TSO transferring packet size " ++ "%d\n", tso_send_size); ++ rtl8139_transfer_frame(s, saved_buffer, tso_send_size, ++ 0, (uint8_t *) dot1q_buffer); + +- /* restore IP header */ +- memcpy(eth_payload_data, saved_ip_header, hlen); ++ /* add transferred count to TCP sequence number */ ++ p_tcp_hdr->th_seq = cpu_to_be32(chunk_size + be32_to_cpu(p_tcp_hdr->th_seq)); ++ ++send_count; + } ++ ++ /* Stop sending this frame */ ++ saved_size = 0; ++ } ++ else if (txdw0 & (CP_TX_TCPCS|CP_TX_UDPCS)) ++ { ++ DPRINTF("+++ C+ mode need TCP or UDP checksum\n"); ++ ++ /* maximum IP header length is 60 bytes */ ++ uint8_t saved_ip_header[60]; ++ memcpy(saved_ip_header, eth_payload_data, hlen); ++ ++ uint8_t *data_to_checksum = eth_payload_data + hlen - 12; ++ // size_t data_to_checksum_len = eth_payload_len - hlen + 12; ++ ++ /* add 4 TCP pseudoheader fields */ ++ /* copy IP source and destination fields */ ++ memcpy(data_to_checksum, saved_ip_header + 12, 8); ++ ++ if ((txdw0 & CP_TX_TCPCS) && ip_protocol == IP_PROTO_TCP) ++ { ++ DPRINTF("+++ C+ mode calculating TCP checksum for " ++ "packet with %d bytes data\n", ip_data_len); ++ ++ ip_pseudo_header *p_tcpip_hdr = (ip_pseudo_header *)data_to_checksum; ++ p_tcpip_hdr->zeros = 0; ++ p_tcpip_hdr->ip_proto = IP_PROTO_TCP; ++ p_tcpip_hdr->ip_payload = cpu_to_be16(ip_data_len); ++ ++ tcp_header* p_tcp_hdr = (tcp_header *) (data_to_checksum+12); ++ ++ p_tcp_hdr->th_sum = 0; ++ ++ int tcp_checksum = ip_checksum(data_to_checksum, ip_data_len + 12); ++ DPRINTF("+++ C+ mode TCP checksum %04x\n", ++ tcp_checksum); ++ ++ p_tcp_hdr->th_sum = tcp_checksum; ++ } ++ else if ((txdw0 & CP_TX_UDPCS) && ip_protocol == IP_PROTO_UDP) ++ { ++ DPRINTF("+++ C+ mode calculating UDP checksum for " ++ "packet with %d bytes data\n", ip_data_len); ++ ++ ip_pseudo_header *p_udpip_hdr = (ip_pseudo_header *)data_to_checksum; ++ p_udpip_hdr->zeros = 0; ++ p_udpip_hdr->ip_proto = IP_PROTO_UDP; ++ p_udpip_hdr->ip_payload = cpu_to_be16(ip_data_len); ++ ++ udp_header *p_udp_hdr = (udp_header *) (data_to_checksum+12); ++ ++ p_udp_hdr->uh_sum = 0; ++ ++ int udp_checksum = ip_checksum(data_to_checksum, ip_data_len + 12); ++ DPRINTF("+++ C+ mode UDP checksum %04x\n", ++ udp_checksum); ++ ++ p_udp_hdr->uh_sum = udp_checksum; ++ } ++ ++ /* restore IP header */ ++ memcpy(eth_payload_data, saved_ip_header, hlen); + } + } + +-- +2.1.4 + Copied: branches/2015Q3/sysutils/xen-tools/files/xsa140-qemuu-unstable-3.patch (from r394506, head/sysutils/xen-tools/files/xsa140-qemuu-unstable-3.patch) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q3/sysutils/xen-tools/files/xsa140-qemuu-unstable-3.patch Mon Aug 17 15:18:11 2015 (r394517, copy of r394506, head/sysutils/xen-tools/files/xsa140-qemuu-unstable-3.patch) @@ -0,0 +1,39 @@ +From 043d28507ef7c5fdc34866f5e3b27a72bd0cd072 Mon Sep 17 00:00:00 2001 +From: Stefan Hajnoczi +Date: Wed, 15 Jul 2015 18:17:00 +0100 +Subject: [PATCH 3/7] rtl8139: skip offload on short Ethernet/IP header + +Transmit offload features access Ethernet and IP headers the packet. If +the packet is too short we must not attempt to access header fields: + + int proto = be16_to_cpu(*(uint16_t *)(saved_buffer + 12)); + ... + eth_payload_data = saved_buffer + ETH_HLEN; + ... + ip = (ip_header*)eth_payload_data; + if (IP_HEADER_VERSION(ip) != IP_HEADER_VERSION_4) { + +Signed-off-by: Stefan Hajnoczi +--- + hw/net/rtl8139.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c +index 2f12d42..d377b6b 100644 +--- a/hw/net/rtl8139.c ++++ b/hw/net/rtl8139.c +@@ -2164,6 +2164,11 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s) + { + DPRINTF("+++ C+ mode offloaded task checksum\n"); + ++ /* Large enough for Ethernet and IP headers? */ ++ if (saved_size < ETH_HLEN + sizeof(ip_header)) { ++ goto skip_offload; ++ } ++ + /* ip packet header */ + ip_header *ip = NULL; + int hlen = 0; +-- +2.1.4 + Copied: branches/2015Q3/sysutils/xen-tools/files/xsa140-qemuu-unstable-4.patch (from r394506, head/sysutils/xen-tools/files/xsa140-qemuu-unstable-4.patch) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q3/sysutils/xen-tools/files/xsa140-qemuu-unstable-4.patch Mon Aug 17 15:18:11 2015 (r394517, copy of r394506, head/sysutils/xen-tools/files/xsa140-qemuu-unstable-4.patch) @@ -0,0 +1,53 @@ +From 5a75d242fe019d05b46ef9bc330a6892525c84a7 Mon Sep 17 00:00:00 2001 +From: Stefan Hajnoczi +Date: Wed, 15 Jul 2015 18:17:01 +0100 +Subject: [PATCH 4/7] rtl8139: check IP Header Length field + +The IP Header Length field was only checked in the IP checksum case, but +is used in other cases too. + +Signed-off-by: Stefan Hajnoczi +--- + hw/net/rtl8139.c | 19 ++++++++----------- + 1 file changed, 8 insertions(+), 11 deletions(-) + +diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c +index d377b6b..cd5ac05 100644 +--- a/hw/net/rtl8139.c ++++ b/hw/net/rtl8139.c +@@ -2200,6 +2200,10 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s) + } + + hlen = IP_HEADER_LENGTH(ip); ++ if (hlen < sizeof(ip_header) || hlen > eth_payload_len) { ++ goto skip_offload; ++ } ++ + ip_protocol = ip->ip_p; + ip_data_len = be16_to_cpu(ip->ip_len) - hlen; + +@@ -2207,17 +2211,10 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s) + { + DPRINTF("+++ C+ mode need IP checksum\n"); + +- if (hleneth_payload_len) {/* min header length */ +- /* bad packet header len */ +- /* or packet too short */ +- } +- else +- { +- ip->ip_sum = 0; +- ip->ip_sum = ip_checksum(ip, hlen); +- DPRINTF("+++ C+ mode IP header len=%d checksum=%04x\n", +- hlen, ip->ip_sum); +- } ++ ip->ip_sum = 0; ++ ip->ip_sum = ip_checksum(ip, hlen); ++ DPRINTF("+++ C+ mode IP header len=%d checksum=%04x\n", ++ hlen, ip->ip_sum); + } + + if ((txdw0 & CP_TX_LGSEN) && ip_protocol == IP_PROTO_TCP) +-- +2.1.4 + Copied: branches/2015Q3/sysutils/xen-tools/files/xsa140-qemuu-unstable-5.patch (from r394506, head/sysutils/xen-tools/files/xsa140-qemuu-unstable-5.patch) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q3/sysutils/xen-tools/files/xsa140-qemuu-unstable-5.patch Mon Aug 17 15:18:11 2015 (r394517, copy of r394506, head/sysutils/xen-tools/files/xsa140-qemuu-unstable-5.patch) @@ -0,0 +1,34 @@ +From 6c79ea275d72bc1fd88bdcf1e7d231b2c9c865de Mon Sep 17 00:00:00 2001 +From: Stefan Hajnoczi +Date: Wed, 15 Jul 2015 18:17:02 +0100 +Subject: [PATCH 5/7] rtl8139: check IP Total Length field + +The IP Total Length field includes the IP header and data. Make sure it +is valid and does not exceed the Ethernet payload size. + +Signed-off-by: Stefan Hajnoczi +--- + hw/net/rtl8139.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c +index cd5ac05..ed2b23b 100644 +--- a/hw/net/rtl8139.c ++++ b/hw/net/rtl8139.c +@@ -2205,7 +2205,12 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s) + } + + ip_protocol = ip->ip_p; +- ip_data_len = be16_to_cpu(ip->ip_len) - hlen; ++ ++ ip_data_len = be16_to_cpu(ip->ip_len); ++ if (ip_data_len < hlen || ip_data_len > eth_payload_len) { ++ goto skip_offload; ++ } ++ ip_data_len -= hlen; + + if (txdw0 & CP_TX_IPCS) + { +-- +2.1.4 + Copied: branches/2015Q3/sysutils/xen-tools/files/xsa140-qemuu-unstable-6.patch (from r394506, head/sysutils/xen-tools/files/xsa140-qemuu-unstable-6.patch) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q3/sysutils/xen-tools/files/xsa140-qemuu-unstable-6.patch Mon Aug 17 15:18:11 2015 (r394517, copy of r394506, head/sysutils/xen-tools/files/xsa140-qemuu-unstable-6.patch) @@ -0,0 +1,35 @@ +From 30aa7be430e7c982e9163f3bcc745d3aa57b6aa4 Mon Sep 17 00:00:00 2001 +From: Stefan Hajnoczi +Date: Wed, 15 Jul 2015 18:17:03 +0100 +Subject: [PATCH 6/7] rtl8139: skip offload on short TCP header + +TCP Large Segment Offload accesses the TCP header in the packet. If the +packet is too short we must not attempt to access header fields: + + tcp_header *p_tcp_hdr = (tcp_header*)(eth_payload_data + hlen); + int tcp_hlen = TCP_HEADER_DATA_OFFSET(p_tcp_hdr); + +Signed-off-by: Stefan Hajnoczi +--- + hw/net/rtl8139.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c +index ed2b23b..c8f0df9 100644 +--- a/hw/net/rtl8139.c ++++ b/hw/net/rtl8139.c +@@ -2224,6 +2224,11 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s) + + if ((txdw0 & CP_TX_LGSEN) && ip_protocol == IP_PROTO_TCP) + { ++ /* Large enough for the TCP header? */ ++ if (ip_data_len < sizeof(tcp_header)) { ++ goto skip_offload; ++ } ++ + int large_send_mss = (txdw0 >> 16) & CP_TC_LGSEN_MSS_MASK; + + DPRINTF("+++ C+ mode offloaded task TSO MTU=%d IP data %d " +-- +2.1.4 + Copied: branches/2015Q3/sysutils/xen-tools/files/xsa140-qemuu-unstable-7.patch (from r394506, head/sysutils/xen-tools/files/xsa140-qemuu-unstable-7.patch) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q3/sysutils/xen-tools/files/xsa140-qemuu-unstable-7.patch Mon Aug 17 15:18:11 2015 (r394517, copy of r394506, head/sysutils/xen-tools/files/xsa140-qemuu-unstable-7.patch) @@ -0,0 +1,32 @@ +From 9a084807bf6ca7c16d997a236d304111894a6539 Mon Sep 17 00:00:00 2001 +From: Stefan Hajnoczi +Date: Wed, 15 Jul 2015 18:17:04 +0100 +Subject: [PATCH 7/7] rtl8139: check TCP Data Offset field + +The TCP Data Offset field contains the length of the header. Make sure +it is valid and does not exceed the IP data length. + +Signed-off-by: Stefan Hajnoczi +--- + hw/net/rtl8139.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c +index c8f0df9..2df4a51 100644 +--- a/hw/net/rtl8139.c ++++ b/hw/net/rtl8139.c +@@ -2253,6 +2253,11 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s) + + int tcp_hlen = TCP_HEADER_DATA_OFFSET(p_tcp_hdr); + ++ /* Invalid TCP data offset? */ ++ if (tcp_hlen < sizeof(tcp_header) || tcp_hlen > ip_data_len) { ++ goto skip_offload; ++ } ++ + /* ETH_MTU = ip header len + tcp header len + payload */ + int tcp_data_len = ip_data_len - tcp_hlen; + int tcp_chunk_size = ETH_MTU - hlen - tcp_hlen; +-- +2.1.4 + Modified: branches/2015Q3/sysutils/xen-tools/pkg-plist ============================================================================== --- branches/2015Q3/sysutils/xen-tools/pkg-plist Mon Aug 17 15:16:49 2015 (r394516) +++ branches/2015Q3/sysutils/xen-tools/pkg-plist Mon Aug 17 15:18:11 2015 (r394517) @@ -36,6 +36,7 @@ include/libxl_event.h include/libxl_json.h include/libxl_utils.h include/libxl_uuid.h +include/libxlutil.h include/xen/COPYING include/xen/arch-arm.h include/xen/arch-arm/hvm/save.h From owner-svn-ports-branches@freebsd.org Mon Aug 17 18:49:43 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5D9489BBA0B; Mon, 17 Aug 2015 18:49:43 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4EC3715EF; Mon, 17 Aug 2015 18:49:43 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7HInhVe077350; Mon, 17 Aug 2015 18:49:43 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7HInhcI077349; Mon, 17 Aug 2015 18:49:43 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201508171849.t7HInhcI077349@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 17 Aug 2015 18:49:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r394521 - branches/2015Q3/deskutils/taskwarrior X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Aug 2015 18:49:43 -0000 Author: amdmi3 Date: Mon Aug 17 18:49:42 2015 New Revision: 394521 URL: https://svnweb.freebsd.org/changeset/ports/394521 Log: MFH: r394520 - Fix shebangs Approved by: portmgr blanket Approved by: ports-secteam shebang fix blanket Modified: branches/2015Q3/deskutils/taskwarrior/Makefile Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/deskutils/taskwarrior/Makefile ============================================================================== --- branches/2015Q3/deskutils/taskwarrior/Makefile Mon Aug 17 18:48:40 2015 (r394520) +++ branches/2015Q3/deskutils/taskwarrior/Makefile Mon Aug 17 18:49:42 2015 (r394521) @@ -3,6 +3,7 @@ PORTNAME= taskwarrior PORTVERSION= 2.4.4 +PORTREVISION= 1 CATEGORIES= deskutils MASTER_SITES= http://taskwarrior.org/download/ DISTNAME= task-${PORTVERSION} @@ -33,7 +34,8 @@ USES= cmake:outsource shebangfix SHEBANG_FILES= scripts/*/*.pl \ scripts/*/*.rb \ scripts/*/*.py \ - doc/rc/refresh + doc/rc/refresh \ + scripts/bash/context CMAKE_ARGS+= -DTASK_DOCDIR:STRING=${DATADIR:S/${PREFIX}\///} \ -DTASK_MAN1DIR:STRING=man/man1 \ -DTASK_MAN5DIR:STRING=man/man5 From owner-svn-ports-branches@freebsd.org Mon Aug 17 18:58:19 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5E4E59BBC05; Mon, 17 Aug 2015 18:58:19 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4E8B71C80; Mon, 17 Aug 2015 18:58:19 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7HIwJr2081440; Mon, 17 Aug 2015 18:58:19 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7HIwJS3081439; Mon, 17 Aug 2015 18:58:19 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201508171858.t7HIwJS3081439@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Mon, 17 Aug 2015 18:58:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r394522 - branches/2015Q3/multimedia/ffmpeg X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Aug 2015 18:58:19 -0000 Author: riggs Date: Mon Aug 17 18:58:18 2015 New Revision: 394522 URL: https://svnweb.freebsd.org/changeset/ports/394522 Log: MFH: r394414 Fix SIGBUS crashes on several popular ARM SoCs PR: 200609 Submitted by: rwestlun@gmail.com Approved by: ports-secteam (delphij) Modified: branches/2015Q3/multimedia/ffmpeg/Makefile Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/multimedia/ffmpeg/Makefile ============================================================================== --- branches/2015Q3/multimedia/ffmpeg/Makefile Mon Aug 17 18:49:42 2015 (r394521) +++ branches/2015Q3/multimedia/ffmpeg/Makefile Mon Aug 17 18:58:18 2015 (r394522) @@ -19,7 +19,7 @@ BUILD_DEPENDS= yasm:${PORTSDIR}/devel/ya HAS_CONFIGURE= yes CONFIGURE_LOG= config.err -USES= cpe gmake pkgconfig perl5 tar:bzip2 +USES= compiler cpe gmake pkgconfig perl5 tar:bzip2 USE_LDCONFIG= yes USE_PERL5= build WANT_SDL= yes @@ -245,8 +245,11 @@ CONFIGURE_ARGS+= --enable-memalign-hack .endif .if ${ARCH} == "armv6" +CONFIGURE_ARGS+= --disable-fast-unaligned +.if ${CHOSEN_COMPILER_TYPE} == "clang" CONFIGURE_ENV+= ASFLAGS=-no-integrated-as .endif +.endif DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} From owner-svn-ports-branches@freebsd.org Mon Aug 17 19:00:42 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B34F19BBD0D; Mon, 17 Aug 2015 19:00:42 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A3B3310E6; Mon, 17 Aug 2015 19:00:42 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7HJ0g8u083852; Mon, 17 Aug 2015 19:00:42 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7HJ0gQb083851; Mon, 17 Aug 2015 19:00:42 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201508171900.t7HJ0gQb083851@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 17 Aug 2015 19:00:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r394525 - branches/2015Q3/net/rubygem-packetfu X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Aug 2015 19:00:42 -0000 Author: amdmi3 Date: Mon Aug 17 19:00:41 2015 New Revision: 394525 URL: https://svnweb.freebsd.org/changeset/ports/394525 Log: MFH: r394523 - Fix shebangs Approved by: portmgr blanket Approved by: ports-secteam shebang fix blanket Modified: branches/2015Q3/net/rubygem-packetfu/Makefile Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/net/rubygem-packetfu/Makefile ============================================================================== --- branches/2015Q3/net/rubygem-packetfu/Makefile Mon Aug 17 19:00:33 2015 (r394524) +++ branches/2015Q3/net/rubygem-packetfu/Makefile Mon Aug 17 19:00:41 2015 (r394525) @@ -2,6 +2,7 @@ PORTNAME= packetfu PORTVERSION= 1.1.10 +PORTREVISION= 1 CATEGORIES= net rubygems MASTER_SITES= RG @@ -13,5 +14,7 @@ LICENSE= BSD3CLAUSE USE_RUBY= yes USE_RUBYGEMS= yes RUBYGEM_AUTOPLIST=yes +USES= shebangfix +SHEBANG_FILES= test/func_lldp.rb .include From owner-svn-ports-branches@freebsd.org Mon Aug 17 19:02:19 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2EC8B9BBE5B; Mon, 17 Aug 2015 19:02:19 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1D0481369; Mon, 17 Aug 2015 19:02:19 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7HJ2IcH085707; Mon, 17 Aug 2015 19:02:18 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7HJ2IiH085706; Mon, 17 Aug 2015 19:02:18 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201508171902.t7HJ2IiH085706@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 17 Aug 2015 19:02:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r394526 - branches/2015Q3/devel/rubygem-caesars X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Aug 2015 19:02:19 -0000 Author: amdmi3 Date: Mon Aug 17 19:02:18 2015 New Revision: 394526 URL: https://svnweb.freebsd.org/changeset/ports/394526 Log: MFH: r394524 - Fix shebangs Approved by: portmgr blanket Approved by: ports-secteam shebang fix blanket Modified: branches/2015Q3/devel/rubygem-caesars/Makefile Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/devel/rubygem-caesars/Makefile ============================================================================== --- branches/2015Q3/devel/rubygem-caesars/Makefile Mon Aug 17 19:00:41 2015 (r394525) +++ branches/2015Q3/devel/rubygem-caesars/Makefile Mon Aug 17 19:02:18 2015 (r394526) @@ -3,6 +3,7 @@ PORTNAME= caesars PORTVERSION= 0.7.4 +PORTREVISION= 1 CATEGORIES= devel rubygems MASTER_SITES= RG @@ -12,5 +13,7 @@ COMMENT= Rapid DSL prototyping in Ruby USE_RUBY= yes USE_RUBYGEMS= yes RUBYGEM_AUTOPLIST= yes +USES= shebangfix +SHEBANG_FILES= bin/example .include From owner-svn-ports-branches@freebsd.org Mon Aug 17 20:08:19 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CB98A9BC8A0; Mon, 17 Aug 2015 20:08:19 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BC28112F5; Mon, 17 Aug 2015 20:08:19 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7HK8JSE010793; Mon, 17 Aug 2015 20:08:19 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7HK8JWv010790; Mon, 17 Aug 2015 20:08:19 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201508172008.t7HK8JWv010790@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 17 Aug 2015 20:08:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r394529 - branches/2015Q3/games/openra X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Aug 2015 20:08:19 -0000 Author: jbeich Date: Mon Aug 17 20:08:18 2015 New Revision: 394529 URL: https://svnweb.freebsd.org/changeset/ports/394529 Log: MFH: r394378 games/openra: update GeoLite2 to August snapshot Approved by: ports-secteam (feld) Modified: branches/2015Q3/games/openra/Makefile branches/2015Q3/games/openra/distinfo Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/games/openra/Makefile ============================================================================== --- branches/2015Q3/games/openra/Makefile Mon Aug 17 19:31:00 2015 (r394528) +++ branches/2015Q3/games/openra/Makefile Mon Aug 17 20:08:18 2015 (r394529) @@ -3,7 +3,7 @@ PORTNAME= openra PORTVERSION= 20150614 DISTVERSIONPREFIX= release- -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games # XXX Convert to USES=nuget or package dependencies instead MASTER_SITES= https://nuget.org/api/v2/package/StyleCopPlus.MSBuild/4.7.49.5?dummy=/:StyleCopPlus \ Modified: branches/2015Q3/games/openra/distinfo ============================================================================== --- branches/2015Q3/games/openra/distinfo Mon Aug 17 19:31:00 2015 (r394528) +++ branches/2015Q3/games/openra/distinfo Mon Aug 17 20:08:18 2015 (r394529) @@ -26,5 +26,5 @@ SHA256 (SDL2-CS.dll) = 61ea325dad3c58544 SIZE (SDL2-CS.dll) = 2882560 SHA256 (Eluant.dll) = abb67679c241ae35a430f79696792cbd9093ceda5998f6f578d0fd763ee440b0 SIZE (Eluant.dll) = 64000 -SHA256 (GeoLite2-Country.mmdb.gz) = 4819459376f61423f5fb96eff141bf486d8e6133c47acd832d2ba87a39f2a922 -SIZE (GeoLite2-Country.mmdb.gz) = 2355980 +SHA256 (GeoLite2-Country.mmdb.gz) = f43c191618a57b05ea3a1fb23f19fd71e0f8be8cb7bc0a50222f7be4e67a9b53 +SIZE (GeoLite2-Country.mmdb.gz) = 1015224 From owner-svn-ports-branches@freebsd.org Mon Aug 17 23:01:04 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E05D09BC48F; Mon, 17 Aug 2015 23:01:04 +0000 (UTC) (envelope-from girgen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C59071F77; Mon, 17 Aug 2015 23:01:04 +0000 (UTC) (envelope-from girgen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7HN14Sl081199; Mon, 17 Aug 2015 23:01:04 GMT (envelope-from girgen@FreeBSD.org) Received: (from girgen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7HN14DB081197; Mon, 17 Aug 2015 23:01:04 GMT (envelope-from girgen@FreeBSD.org) Message-Id: <201508172301.t7HN14DB081197@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: girgen set sender to girgen@FreeBSD.org using -f From: Palle Girgensohn Date: Mon, 17 Aug 2015 23:01:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r394535 - branches/2015Q3/www/mod_jk X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Aug 2015 23:01:05 -0000 Author: girgen Date: Mon Aug 17 23:01:03 2015 New Revision: 394535 URL: https://svnweb.freebsd.org/changeset/ports/394535 Log: MFH: r394519 Update mod_jk to fix security problem. Security: CVE-2014-8111 Approved by: ports-secteam (feld) Modified: branches/2015Q3/www/mod_jk/Makefile branches/2015Q3/www/mod_jk/distinfo Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/www/mod_jk/Makefile ============================================================================== --- branches/2015Q3/www/mod_jk/Makefile Mon Aug 17 21:18:39 2015 (r394534) +++ branches/2015Q3/www/mod_jk/Makefile Mon Aug 17 23:01:03 2015 (r394535) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= mod_jk -PORTVERSION= 1.2.40 -PORTEPOCH?= 1 +PORTVERSION= 1.2.41 +PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= APACHE/tomcat/tomcat-connectors/jk/ PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX} Modified: branches/2015Q3/www/mod_jk/distinfo ============================================================================== --- branches/2015Q3/www/mod_jk/distinfo Mon Aug 17 21:18:39 2015 (r394534) +++ branches/2015Q3/www/mod_jk/distinfo Mon Aug 17 23:01:03 2015 (r394535) @@ -1,2 +1,2 @@ -SHA256 (tomcat-connectors-1.2.40-src.tar.gz) = 895e347c4dff74049a848603fb29958e6cf429ea0fc708d514b3a8958236705d -SIZE (tomcat-connectors-1.2.40-src.tar.gz) = 1526449 +SHA256 (tomcat-connectors-1.2.41-src.tar.gz) = f193b02aeec71daab13fc5bbb99f13eca9d916b79a024f8035a65f39559bc7fd +SIZE (tomcat-connectors-1.2.41-src.tar.gz) = 1554935 From owner-svn-ports-branches@freebsd.org Tue Aug 18 02:04:42 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4D4A89BB3C5; Tue, 18 Aug 2015 02:04:42 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3E1E61748; Tue, 18 Aug 2015 02:04:42 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7I24gOB053675; Tue, 18 Aug 2015 02:04:42 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7I24gGU053674; Tue, 18 Aug 2015 02:04:42 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201508180204.t7I24gGU053674@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 18 Aug 2015 02:04:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r394544 - branches/2015Q3/games/warmux X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Aug 2015 02:04:42 -0000 Author: amdmi3 Date: Tue Aug 18 02:04:41 2015 New Revision: 394544 URL: https://svnweb.freebsd.org/changeset/ports/394544 Log: MFH: r394543 - Fix build when CXX is set to a path instead of just an executable name (fixes cross-builds) Approved by: portmgr blanket Approved by: ports-secteam build fix blanket Modified: branches/2015Q3/games/warmux/Makefile Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/games/warmux/Makefile ============================================================================== --- branches/2015Q3/games/warmux/Makefile Tue Aug 18 02:03:07 2015 (r394543) +++ branches/2015Q3/games/warmux/Makefile Tue Aug 18 02:04:41 2015 (r394544) @@ -17,6 +17,7 @@ LIB_DEPENDS= libxml++-2.6.so:${PORTSDIR} CONFLICTS_INSTALL= wormux-* GNU_CONFIGURE= yes +CONFIGURE_ENV= cxx_present=yes USES= dos2unix gmake pkgconfig tar:bzip2 USE_SDL= sdl image mixer ttf gfx net DOS2UNIX_GLOB= fixed_class.h From owner-svn-ports-branches@freebsd.org Tue Aug 18 03:30:03 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6C5E89B74F6; Tue, 18 Aug 2015 03:30:03 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 52EA61DD0; Tue, 18 Aug 2015 03:30:03 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7I3U3KB088141; Tue, 18 Aug 2015 03:30:03 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7I3U1lU088133; Tue, 18 Aug 2015 03:30:01 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <201508180330.t7I3U1lU088133@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Tue, 18 Aug 2015 03:30:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r394550 - branches/2015Q3/devel/p4d X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Aug 2015 03:30:03 -0000 Author: gordon Date: Tue Aug 18 03:30:01 2015 New Revision: 394550 URL: https://svnweb.freebsd.org/changeset/ports/394550 Log: MFH: r394429 Update devel/p4d to 2015.1/1217912 Approved by: mat (mentor) Approved by: ports-secteam (delphij) Differential Revision: https://reviews.freebsd.org/D3396 Modified: branches/2015Q3/devel/p4d/Makefile branches/2015Q3/devel/p4d/distinfo.freebsd100x86 branches/2015Q3/devel/p4d/distinfo.freebsd100x86_64 branches/2015Q3/devel/p4d/distinfo.freebsd70x86 branches/2015Q3/devel/p4d/distinfo.freebsd70x86_64 Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/devel/p4d/Makefile ============================================================================== --- branches/2015Q3/devel/p4d/Makefile Tue Aug 18 03:21:24 2015 (r394549) +++ branches/2015Q3/devel/p4d/Makefile Tue Aug 18 03:30:01 2015 (r394550) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= p4d -PORTVERSION= 2015.1.1204891 +PORTVERSION= 2015.1.1217912 CATEGORIES= devel MASTER_SITES= ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ \ http://filehost.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ Modified: branches/2015Q3/devel/p4d/distinfo.freebsd100x86 ============================================================================== --- branches/2015Q3/devel/p4d/distinfo.freebsd100x86 Tue Aug 18 03:21:24 2015 (r394549) +++ branches/2015Q3/devel/p4d/distinfo.freebsd100x86 Tue Aug 18 03:30:01 2015 (r394550) @@ -1,2 +1,2 @@ -SHA256 (perforce/2015.1.1204891/bin.freebsd100x86/p4d) = 64352599d74fe55a0fe6e9aa3b0df242e0fce76ad2703da96cb15be85c6841a4 -SIZE (perforce/2015.1.1204891/bin.freebsd100x86/p4d) = 5222188 +SHA256 (perforce/2015.1.1217912/bin.freebsd100x86/p4d) = 3510941abfcf76c46198fd00103d1ee5e235067a429916aafd129240089491b0 +SIZE (perforce/2015.1.1217912/bin.freebsd100x86/p4d) = 5222196 Modified: branches/2015Q3/devel/p4d/distinfo.freebsd100x86_64 ============================================================================== --- branches/2015Q3/devel/p4d/distinfo.freebsd100x86_64 Tue Aug 18 03:21:24 2015 (r394549) +++ branches/2015Q3/devel/p4d/distinfo.freebsd100x86_64 Tue Aug 18 03:30:01 2015 (r394550) @@ -1,2 +1,2 @@ -SHA256 (perforce/2015.1.1204891/bin.freebsd100x86_64/p4d) = 666dfd4fb7eb07cc191d5a3f65d750354e0631b1fd0fce921fd72beea897887e -SIZE (perforce/2015.1.1204891/bin.freebsd100x86_64/p4d) = 5371744 +SHA256 (perforce/2015.1.1217912/bin.freebsd100x86_64/p4d) = e7fe058462393084941533cae5dbc6ea8676855c850edc22eac8649eba5cc615 +SIZE (perforce/2015.1.1217912/bin.freebsd100x86_64/p4d) = 5371920 Modified: branches/2015Q3/devel/p4d/distinfo.freebsd70x86 ============================================================================== --- branches/2015Q3/devel/p4d/distinfo.freebsd70x86 Tue Aug 18 03:21:24 2015 (r394549) +++ branches/2015Q3/devel/p4d/distinfo.freebsd70x86 Tue Aug 18 03:30:01 2015 (r394550) @@ -1,2 +1,2 @@ -SHA256 (perforce/2015.1.1204891/bin.freebsd70x86/p4d) = d6841e58624b6b946066d898dab3386a7a3c4e82ac18fd11620bacbdede51158 -SIZE (perforce/2015.1.1204891/bin.freebsd70x86/p4d) = 5584896 +SHA256 (perforce/2015.1.1217912/bin.freebsd70x86/p4d) = e4513dca951a8c342463b63b6b9261ee529835d7a8a13ecf51495227444fd08a +SIZE (perforce/2015.1.1217912/bin.freebsd70x86/p4d) = 5587712 Modified: branches/2015Q3/devel/p4d/distinfo.freebsd70x86_64 ============================================================================== --- branches/2015Q3/devel/p4d/distinfo.freebsd70x86_64 Tue Aug 18 03:21:24 2015 (r394549) +++ branches/2015Q3/devel/p4d/distinfo.freebsd70x86_64 Tue Aug 18 03:30:01 2015 (r394550) @@ -1,2 +1,2 @@ -SHA256 (perforce/2015.1.1204891/bin.freebsd70x86_64/p4d) = 0888fcffb1e6e537eb1820e7f3c7ad7adcab16b8baaabf6a572f3d7eccee86b1 -SIZE (perforce/2015.1.1204891/bin.freebsd70x86_64/p4d) = 5762272 +SHA256 (perforce/2015.1.1217912/bin.freebsd70x86_64/p4d) = 627d057c844456823629f0f48c4a65bdf2cc4b10c86ca658679b9faeec7673f8 +SIZE (perforce/2015.1.1217912/bin.freebsd70x86_64/p4d) = 5762752 From owner-svn-ports-branches@freebsd.org Tue Aug 18 06:37:04 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 785DD9BCC82; Tue, 18 Aug 2015 06:37:04 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4EF8F1328; Tue, 18 Aug 2015 06:37:04 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7I6b4p1065905; Tue, 18 Aug 2015 06:37:04 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7I6b410065904; Tue, 18 Aug 2015 06:37:04 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201508180637.t7I6b410065904@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 18 Aug 2015 06:37:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r394560 - branches/2015Q3/multimedia/mpv X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Aug 2015 06:37:04 -0000 Author: jbeich Date: Tue Aug 18 06:37:03 2015 New Revision: 394560 URL: https://svnweb.freebsd.org/changeset/ports/394560 Log: MFH: r394552 multimedia/mpv: expose ASS, DVDREAD, DVDNAV options PR: 202403 Submitted by: Carlos J Puga Medina (maintainer) Approved by: ports-secteam (delphij) Modified: branches/2015Q3/multimedia/mpv/Makefile Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/multimedia/mpv/Makefile ============================================================================== --- branches/2015Q3/multimedia/mpv/Makefile Tue Aug 18 06:01:55 2015 (r394559) +++ branches/2015Q3/multimedia/mpv/Makefile Tue Aug 18 06:37:03 2015 (r394560) @@ -4,6 +4,7 @@ PORTNAME= mpv PORTVERSION= 0.9.2 DISTVERSIONPREFIX= v +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= multimedia audio MASTER_SITES= http://ftp.waf.io/pub/release/:1 \ @@ -16,10 +17,7 @@ COMMENT= Free and open-source general-pu LICENSE= GPLv2 -LIB_DEPENDS= libavcodec26.so:${PORTSDIR}/multimedia/ffmpeg26 \ - libass.so:${PORTSDIR}/multimedia/libass \ - libdvdread.so:${PORTSDIR}/multimedia/libdvdread \ - libdvdnav.so:${PORTSDIR}/multimedia/libdvdnav +LIB_DEPENDS= libavcodec26.so:${PORTSDIR}/multimedia/ffmpeg26 BUILD_DEPENDS= rst2man:${PORTSDIR}/textproc/py-docutils USE_GITHUB= yes @@ -44,14 +42,19 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \ --disable-alsa \ --disable-pdf -OPTIONS_DEFINE= BS2B DOCS ENCA LADSPA LCMS2 LIBGUESS LUAJIT ZSH +OPTIONS_DEFINE= ASS BS2B DOCS ENCA LADSPA LCMS2 \ + LIBGUESS LUAJIT ZSH +OPTIONS_DEFAULT= ASS DVDREAD DVDNAV OPTIONS_GROUP= IN VO AO -OPTIONS_GROUP_IN= CDIO LIBBLURAY V4L YTDL SMB +OPTIONS_GROUP_IN= CDIO DVDREAD DVDNAV LIBBLURAY V4L YTDL SMB OPTIONS_GROUP_VO= CACA OPENGL VAAPI VDPAU XINERAMA OPTIONS_GROUP_AO= JACK PULSEAUDIO OPTIONS_SUB= yes +ASS_DESC= ASS/SSA subtitle and OSD rendering BS2B_DESC= Enable Bauer Stereophonic-to-Binaural DSP support +DVDREAD_DESC= DVD Playback support +DVDNAV_DESC= DVD menu navigation ENCA_DESC= Enable encoding detection support LIBGUESS_DESC= Enable high-speed character set detection support LUAJIT_DESC= Use LuaJIT instead of Lua @@ -60,9 +63,18 @@ IN_DESC= Input VO_DESC= Video Output AO_DESC= Audio Output +ASS_LIB_DEPENDS= libass.so:${PORTSDIR}/multimedia/libass +ASS_CONFIGURE_ENABLE= libass + BS2B_LIB_DEPENDS= libbs2b.so:${PORTSDIR}/audio/libbs2b BS2B_CONFIGURE_ENABLE= libbs2b +DVDREAD_LIB_DEPENDS= libdvdread.so:${PORTSDIR}/multimedia/libdvdread +DVDREAD_CONFIGURE_ENABLE= dvdread + +DVDNAV_LIB_DEPENDS= libdvdnav.so:${PORTSDIR}/multimedia/libdvdnav +DVDNAV_CONFIGURE_ENABLE= dvdnav + ENCA_LIB_DEPENDS= libenca.so:${PORTSDIR}/converters/enca ENCA_CONFIGURE_ENABLE= enca From owner-svn-ports-branches@freebsd.org Tue Aug 18 17:46:33 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D2EF89BD00F; Tue, 18 Aug 2015 17:46:33 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AA39CC3A; Tue, 18 Aug 2015 17:46:33 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7IHkXpQ046337; Tue, 18 Aug 2015 17:46:33 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7IHkXMR046335; Tue, 18 Aug 2015 17:46:33 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201508181746.t7IHkXMR046335@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Tue, 18 Aug 2015 17:46:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r394628 - in branches/2015Q3/multimedia/vlc: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Aug 2015 17:46:33 -0000 Author: delphij Date: Tue Aug 18 17:46:32 2015 New Revision: 394628 URL: https://svnweb.freebsd.org/changeset/ports/394628 Log: MFH: r394625 Apply vendor changeset ce91452: demux: mp4: correctly match release function Obtained from: VLC Approved by: ports-secteam Added: branches/2015Q3/multimedia/vlc/files/patch-vendor-00-ce91452 - copied unchanged from r394625, head/multimedia/vlc/files/patch-vendor-00-ce91452 Modified: branches/2015Q3/multimedia/vlc/Makefile Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/multimedia/vlc/Makefile ============================================================================== --- branches/2015Q3/multimedia/vlc/Makefile Tue Aug 18 17:45:45 2015 (r394627) +++ branches/2015Q3/multimedia/vlc/Makefile Tue Aug 18 17:46:32 2015 (r394628) @@ -3,7 +3,7 @@ PORTNAME= vlc DISTVERSION= 2.2.1 -PORTREVISION= 1 +PORTREVISION= 5 PORTEPOCH= 4 CATEGORIES= multimedia audio ipv6 net www MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \ Copied: branches/2015Q3/multimedia/vlc/files/patch-vendor-00-ce91452 (from r394625, head/multimedia/vlc/files/patch-vendor-00-ce91452) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q3/multimedia/vlc/files/patch-vendor-00-ce91452 Tue Aug 18 17:46:32 2015 (r394628, copy of r394625, head/multimedia/vlc/files/patch-vendor-00-ce91452) @@ -0,0 +1,29 @@ +From ce91452460a75d7424b165c4dc8db98114c3cbd9 Mon Sep 17 00:00:00 2001 +From: Francois Cartegnie +Date: Mon, 3 Aug 2015 15:17:32 +0200 +Subject: [PATCH] demux: mp4: correctly match release function + +Signed-off-by: Jean-Baptiste Kempf +--- + modules/demux/mp4/libmp4.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git modules/demux/mp4/libmp4.c modules/demux/mp4/libmp4.c +index 331262b..f220e51 100644 +--- modules/demux/mp4/libmp4.c ++++ modules/demux/mp4/libmp4.c +@@ -3643,6 +3643,11 @@ void MP4_BoxFree( stream_t *s, MP4_Box_t *p_box ) + { + for( i_index = 0; ; i_index++ ) + { ++ if ( MP4_Box_Function[i_index].i_parent && ++ p_box->p_father && ++ p_box->p_father->i_type != MP4_Box_Function[i_index].i_parent ) ++ continue; ++ + if( ( MP4_Box_Function[i_index].i_type == p_box->i_type )|| + ( MP4_Box_Function[i_index].i_type == 0 ) ) + { +-- +1.7.10.4 + From owner-svn-ports-branches@freebsd.org Tue Aug 18 18:28:10 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 94DED9BD908; Tue, 18 Aug 2015 18:28:10 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 85A24B3D; Tue, 18 Aug 2015 18:28:10 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7IISA0P063402; Tue, 18 Aug 2015 18:28:10 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7IISASt063400; Tue, 18 Aug 2015 18:28:10 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201508181828.t7IISASt063400@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Tue, 18 Aug 2015 18:28:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r394633 - in branches/2015Q3/irc/unreal: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Aug 2015 18:28:10 -0000 Author: feld Date: Tue Aug 18 18:28:09 2015 New Revision: 394633 URL: https://svnweb.freebsd.org/changeset/ports/394633 Log: MFH: r394632 Update irc/unreal to 3.2.10.5 This release fixes a SASL Denial of Service issue Security: 0ecc1f55-45d0-11e5-adde-14dae9d210b8 Approved by: ports-secteam (with hat) Deleted: branches/2015Q3/irc/unreal/files/patch-configure.ac branches/2015Q3/irc/unreal/files/patch-include_dynconf.h branches/2015Q3/irc/unreal/files/patch-src_random.c Modified: branches/2015Q3/irc/unreal/Makefile branches/2015Q3/irc/unreal/distinfo Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/irc/unreal/Makefile ============================================================================== --- branches/2015Q3/irc/unreal/Makefile Tue Aug 18 18:24:23 2015 (r394632) +++ branches/2015Q3/irc/unreal/Makefile Tue Aug 18 18:28:09 2015 (r394633) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= Unreal -PORTVERSION= 3.2.10.4 -PORTREVISION= 2 +PORTVERSION= 3.2.10.5 +PORTREVISION= 0 CATEGORIES= irc ipv6 MASTER_SITES= http://www.unrealircd.com/downloads/ DISTNAME= ${PORTNAME}${PORTVERSION} Modified: branches/2015Q3/irc/unreal/distinfo ============================================================================== --- branches/2015Q3/irc/unreal/distinfo Tue Aug 18 18:24:23 2015 (r394632) +++ branches/2015Q3/irc/unreal/distinfo Tue Aug 18 18:28:09 2015 (r394633) @@ -1,2 +1,2 @@ -SHA256 (Unreal3.2.10.4.tar.gz) = 5041b67745d0bd2072cf9b74c07853085b8b5b07330263f0986bdc56eda98aa8 -SIZE (Unreal3.2.10.4.tar.gz) = 3540227 +SHA256 (Unreal3.2.10.5.tar.gz) = fd1482356763dce30144ad425704e5d6527195acf564a02419006004c8c632fd +SIZE (Unreal3.2.10.5.tar.gz) = 3537602 From owner-svn-ports-branches@freebsd.org Tue Aug 18 18:36:43 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 774BD9BDB66; Tue, 18 Aug 2015 18:36:43 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 67F0C119C; Tue, 18 Aug 2015 18:36:43 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7IIah2c067700; Tue, 18 Aug 2015 18:36:43 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7IIagrM067698; Tue, 18 Aug 2015 18:36:42 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201508181836.t7IIagrM067698@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Tue, 18 Aug 2015 18:36:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r394635 - branches/2015Q3/textproc/freexl X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Aug 2015 18:36:43 -0000 Author: feld Date: Tue Aug 18 18:36:42 2015 New Revision: 394635 URL: https://svnweb.freebsd.org/changeset/ports/394635 Log: MFH: r394634 textproc/freexl update to 1.0.2 This update resolves an integer overflow still awaiting CVE assignment Security: a59e263a-45cd-11e5-adde-14dae9d210b8 Approved by: ports-secteam (with hat) Modified: branches/2015Q3/textproc/freexl/Makefile branches/2015Q3/textproc/freexl/distinfo Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/textproc/freexl/Makefile ============================================================================== --- branches/2015Q3/textproc/freexl/Makefile Tue Aug 18 18:33:09 2015 (r394634) +++ branches/2015Q3/textproc/freexl/Makefile Tue Aug 18 18:36:42 2015 (r394635) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= freexl -DISTVERSION= 1.0.0i +PORTVERSION= 1.0.2 CATEGORIES= textproc MASTER_SITES= http://www.gaia-gis.it/gaia-sins/freexl-sources/ Modified: branches/2015Q3/textproc/freexl/distinfo ============================================================================== --- branches/2015Q3/textproc/freexl/distinfo Tue Aug 18 18:33:09 2015 (r394634) +++ branches/2015Q3/textproc/freexl/distinfo Tue Aug 18 18:36:42 2015 (r394635) @@ -1,2 +1,2 @@ -SHA256 (freexl-1.0.0i.tar.gz) = facef8070230730b16b06c98874c35046942be153236cc348b2898dfa7443b23 -SIZE (freexl-1.0.0i.tar.gz) = 933104 +SHA256 (freexl-1.0.2.tar.gz) = b39a4814a0f53f5e09a9192c41e3e51bd658843f770399023a963eb064f6409d +SIZE (freexl-1.0.2.tar.gz) = 939064 From owner-svn-ports-branches@freebsd.org Tue Aug 18 18:45:21 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 35C699BDD26; Tue, 18 Aug 2015 18:45:21 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 262EA183B; Tue, 18 Aug 2015 18:45:21 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7IIjL9J071890; Tue, 18 Aug 2015 18:45:21 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7IIjLLA071889; Tue, 18 Aug 2015 18:45:21 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201508181845.t7IIjLLA071889@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 18 Aug 2015 18:45:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r394637 - branches/2015Q3/security/rubygem-razorback-scriptNugget X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Aug 2015 18:45:21 -0000 Author: amdmi3 Date: Tue Aug 18 18:45:20 2015 New Revision: 394637 URL: https://svnweb.freebsd.org/changeset/ports/394637 Log: MFH: r394631 - Fix shebangs Approved by: portmgr blanket Approved by: ports-secteam shebang fix blanket Modified: branches/2015Q3/security/rubygem-razorback-scriptNugget/Makefile Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/security/rubygem-razorback-scriptNugget/Makefile ============================================================================== --- branches/2015Q3/security/rubygem-razorback-scriptNugget/Makefile Tue Aug 18 18:44:12 2015 (r394636) +++ branches/2015Q3/security/rubygem-razorback-scriptNugget/Makefile Tue Aug 18 18:45:20 2015 (r394637) @@ -3,6 +3,7 @@ PORTNAME= razorback-scriptNugget PORTVERSION= 0.5.0 +PORTREVISION= 1 CATEGORIES= security rubygems MASTER_SITES= SF/razorbacktm/Bindings DISTNAME= scriptNugget-ruby-${PORTVERSION} @@ -14,5 +15,7 @@ GEM_NAME= ${DISTNAME} USE_RUBY= yes USE_RUBYGEMS= yes RUBYGEM_AUTOPLIST= yes +USES= shebangfix +SHEBANG_FILES= lib/razorback.rb .include From owner-svn-ports-branches@freebsd.org Tue Aug 18 19:17:55 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4302D9BC551; Tue, 18 Aug 2015 19:17:55 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3357CFF1; Tue, 18 Aug 2015 19:17:55 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7IJHtRH084856; Tue, 18 Aug 2015 19:17:55 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7IJHtC1084855; Tue, 18 Aug 2015 19:17:55 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201508181917.t7IJHtC1084855@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 18 Aug 2015 19:17:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r394640 - branches/2015Q3/devel/rubygem-shoulda-matchers X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Aug 2015 19:17:55 -0000 Author: amdmi3 Date: Tue Aug 18 19:17:54 2015 New Revision: 394640 URL: https://svnweb.freebsd.org/changeset/ports/394640 Log: MFH: r394639 - Fix shebangs Approved by: portmgr blanket Approved by: ports-secteam shebang fix blanket Modified: branches/2015Q3/devel/rubygem-shoulda-matchers/Makefile Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/devel/rubygem-shoulda-matchers/Makefile ============================================================================== --- branches/2015Q3/devel/rubygem-shoulda-matchers/Makefile Tue Aug 18 19:15:01 2015 (r394639) +++ branches/2015Q3/devel/rubygem-shoulda-matchers/Makefile Tue Aug 18 19:17:54 2015 (r394640) @@ -3,6 +3,7 @@ PORTNAME= shoulda-matchers PORTVERSION= 2.8.0 +PORTREVISION= 1 CATEGORIES= devel rubygems MASTER_SITES= RG @@ -16,5 +17,9 @@ RUN_DEPENDS= rubygem-activesupport>=3.0. USE_RUBY= yes USE_RUBYGEMS= yes RUBYGEM_AUTOPLIST= yes +USES= shebangfix +SHEBANG_FILES= script/install_gems_in_all_appraisals \ + script/run_all_tests \ + script/update_gem_in_all_appraisals .include From owner-svn-ports-branches@freebsd.org Tue Aug 18 20:16:53 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 208369BD814; Tue, 18 Aug 2015 20:16:53 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1131C11A1; Tue, 18 Aug 2015 20:16:53 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7IKGq6Y011845; Tue, 18 Aug 2015 20:16:52 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7IKGqvE011844; Tue, 18 Aug 2015 20:16:52 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201508182016.t7IKGqvE011844@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 18 Aug 2015 20:16:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r394655 - branches/2015Q3/devel/rubygem-multi_test X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Aug 2015 20:16:53 -0000 Author: amdmi3 Date: Tue Aug 18 20:16:52 2015 New Revision: 394655 URL: https://svnweb.freebsd.org/changeset/ports/394655 Log: MFH: r394654 - Fix shebangs Approved by: portmgr blanket Approved by: ports-secteam shebang fix blanket Modified: branches/2015Q3/devel/rubygem-multi_test/Makefile Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/devel/rubygem-multi_test/Makefile ============================================================================== --- branches/2015Q3/devel/rubygem-multi_test/Makefile Tue Aug 18 20:15:49 2015 (r394654) +++ branches/2015Q3/devel/rubygem-multi_test/Makefile Tue Aug 18 20:16:52 2015 (r394655) @@ -2,6 +2,7 @@ PORTNAME= multi_test PORTVERSION= 0.1.2 +PORTREVISION= 1 CATEGORIES= devel rubygems MASTER_SITES= RG @@ -13,5 +14,7 @@ LICENSE= MIT USE_RUBY= yes USE_RUBYGEMS= yes RUBYGEM_AUTOPLIST= yes +USES= shebangfix +SHEBANG_FILES= test/all test/run .include From owner-svn-ports-branches@freebsd.org Wed Aug 19 11:08:47 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 98AE49BC76C; Wed, 19 Aug 2015 11:08:47 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6F8981E9F; Wed, 19 Aug 2015 11:08:47 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7JB8lQG087010; Wed, 19 Aug 2015 11:08:47 GMT (envelope-from kwm@FreeBSD.org) Received: (from kwm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7JB8kJY087007; Wed, 19 Aug 2015 11:08:46 GMT (envelope-from kwm@FreeBSD.org) Message-Id: <201508191108.t7JB8kJY087007@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kwm set sender to kwm@FreeBSD.org using -f From: Koop Mast Date: Wed, 19 Aug 2015 11:08:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r394774 - branches/2015Q3/graphics/gdk-pixbuf2 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Aug 2015 11:08:47 -0000 Author: kwm Date: Wed Aug 19 11:08:46 2015 New Revision: 394774 URL: https://svnweb.freebsd.org/changeset/ports/394774 Log: MFH: r394773 Update gdkpixbuf2 to 2.31.6. This corrects CVE-2015-4491. Approved by: portmgr (erwin@) Security: f5b8b670-465c-11e5-a49d-bcaec565249c Modified: branches/2015Q3/graphics/gdk-pixbuf2/Makefile branches/2015Q3/graphics/gdk-pixbuf2/distinfo branches/2015Q3/graphics/gdk-pixbuf2/pkg-plist Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/graphics/gdk-pixbuf2/Makefile ============================================================================== --- branches/2015Q3/graphics/gdk-pixbuf2/Makefile Wed Aug 19 10:41:10 2015 (r394773) +++ branches/2015Q3/graphics/gdk-pixbuf2/Makefile Wed Aug 19 11:08:46 2015 (r394774) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= gdk-pixbuf -PORTVERSION= 2.31.2 -PORTREVISION= 2 +PORTVERSION= 2.31.6 CATEGORIES= graphics MASTER_SITES= GNOME PKGNAMESUFFIX= 2 Modified: branches/2015Q3/graphics/gdk-pixbuf2/distinfo ============================================================================== --- branches/2015Q3/graphics/gdk-pixbuf2/distinfo Wed Aug 19 10:41:10 2015 (r394773) +++ branches/2015Q3/graphics/gdk-pixbuf2/distinfo Wed Aug 19 11:08:46 2015 (r394774) @@ -1,2 +1,2 @@ -SHA256 (gnome2/gdk-pixbuf-2.31.2.tar.xz) = 9e467ed09894c802499fb2399cd9a89ed21c81700ce8f27f970a833efb1e47aa -SIZE (gnome2/gdk-pixbuf-2.31.2.tar.xz) = 1624496 +SHA256 (gnome2/gdk-pixbuf-2.31.6.tar.xz) = 111203d6f295d69d36e7190204248331cd37285130ac483becdedcd3f0135d18 +SIZE (gnome2/gdk-pixbuf-2.31.6.tar.xz) = 2405268 Modified: branches/2015Q3/graphics/gdk-pixbuf2/pkg-plist ============================================================================== --- branches/2015Q3/graphics/gdk-pixbuf2/pkg-plist Wed Aug 19 10:41:10 2015 (r394773) +++ branches/2015Q3/graphics/gdk-pixbuf2/pkg-plist Wed Aug 19 11:08:46 2015 (r394774) @@ -34,10 +34,10 @@ lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/load lib/girepository-1.0/GdkPixbuf-2.0.typelib lib/libgdk_pixbuf-2.0.so lib/libgdk_pixbuf-2.0.so.0 -lib/libgdk_pixbuf-2.0.so.0.3100.2 +lib/libgdk_pixbuf-2.0.so.0.3100.6 lib/libgdk_pixbuf_xlib-2.0.so lib/libgdk_pixbuf_xlib-2.0.so.0 -lib/libgdk_pixbuf_xlib-2.0.so.0.3100.2 +lib/libgdk_pixbuf_xlib-2.0.so.0.3100.6 libdata/pkgconfig/gdk-pixbuf-2.0.pc libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc man/man1/gdk-pixbuf-csource.1.gz From owner-svn-ports-branches@freebsd.org Wed Aug 19 15:29:33 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F01339BCF5C; Wed, 19 Aug 2015 15:29:32 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E081DA83; Wed, 19 Aug 2015 15:29:32 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7JFTWVd000654; Wed, 19 Aug 2015 15:29:32 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7JFTVvQ000648; Wed, 19 Aug 2015 15:29:31 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201508191529.t7JFTVvQ000648@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Wed, 19 Aug 2015 15:29:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r394794 - in branches/2015Q3/www: py-django py-django14 py-django17 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Aug 2015 15:29:33 -0000 Author: feld Date: Wed Aug 19 15:29:30 2015 New Revision: 394794 URL: https://svnweb.freebsd.org/changeset/ports/394794 Log: MFH: r394793 www/py-django: Update to 1.8.4 www/py-django17: Update to 1.7.10 www/py-django14: Update to 1.4.22 Relnotes: https://www.djangoproject.com/weblog/2015/aug/18/security-releases/ Security: b0e54dc1-45d2-11e5-adde-14dae9d210b8 Security: CVE-2015-5963 Security: CVE-2015-5964 Approved by: ports-secteam (with hat) Modified: branches/2015Q3/www/py-django/Makefile branches/2015Q3/www/py-django/distinfo branches/2015Q3/www/py-django14/Makefile branches/2015Q3/www/py-django14/distinfo branches/2015Q3/www/py-django17/Makefile branches/2015Q3/www/py-django17/distinfo Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/www/py-django/Makefile ============================================================================== --- branches/2015Q3/www/py-django/Makefile Wed Aug 19 15:22:25 2015 (r394793) +++ branches/2015Q3/www/py-django/Makefile Wed Aug 19 15:29:30 2015 (r394794) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= django -PORTVERSION= 1.8.3 +PORTVERSION= 1.8.4 CATEGORIES= www python MASTER_SITES= https://www.djangoproject.com/m/releases/${PORTVERSION}/ \ CHEESESHOP Modified: branches/2015Q3/www/py-django/distinfo ============================================================================== --- branches/2015Q3/www/py-django/distinfo Wed Aug 19 15:22:25 2015 (r394793) +++ branches/2015Q3/www/py-django/distinfo Wed Aug 19 15:29:30 2015 (r394794) @@ -1,2 +1,2 @@ -SHA256 (python/Django-1.8.3.tar.gz) = 2bb654fcc05fd53017c88caf2bc38b5c5ea23c91f8ac7f0a28b290daf2305bba -SIZE (python/Django-1.8.3.tar.gz) = 7284327 +SHA256 (python/Django-1.8.4.tar.gz) = 826996c81e1cc773500124d5c19212e4a7681a55ee169fab9085f2b3015a70d8 +SIZE (python/Django-1.8.4.tar.gz) = 7265101 Modified: branches/2015Q3/www/py-django14/Makefile ============================================================================== --- branches/2015Q3/www/py-django14/Makefile Wed Aug 19 15:22:25 2015 (r394793) +++ branches/2015Q3/www/py-django14/Makefile Wed Aug 19 15:29:30 2015 (r394794) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= django -PORTVERSION= 1.4.21 +PORTVERSION= 1.4.22 CATEGORIES= www python MASTER_SITES= https://www.djangoproject.com/m/releases/${PORTVERSION:R}/ \ CHEESESHOP Modified: branches/2015Q3/www/py-django14/distinfo ============================================================================== --- branches/2015Q3/www/py-django14/distinfo Wed Aug 19 15:22:25 2015 (r394793) +++ branches/2015Q3/www/py-django14/distinfo Wed Aug 19 15:29:30 2015 (r394794) @@ -1,2 +1,2 @@ -SHA256 (python/Django-1.4.21.tar.gz) = 934f1975218680d51c4da9d63a39bc5fb1ddaac48476fd34b9ab7903fd98bcf4 -SIZE (python/Django-1.4.21.tar.gz) = 7878015 +SHA256 (python/Django-1.4.22.tar.gz) = d0e2c9d772fcab2cf9c09e1c05e711cf5fe5eb93225762b29f0739d65e0d1784 +SIZE (python/Django-1.4.22.tar.gz) = 7802249 Modified: branches/2015Q3/www/py-django17/Makefile ============================================================================== --- branches/2015Q3/www/py-django17/Makefile Wed Aug 19 15:22:25 2015 (r394793) +++ branches/2015Q3/www/py-django17/Makefile Wed Aug 19 15:29:30 2015 (r394794) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= django -PORTVERSION= 1.7.9 +PORTVERSION= 1.7.10 CATEGORIES= www python MASTER_SITES= https://www.djangoproject.com/m/releases/${PORTVERSION}/ \ CHEESESHOP Modified: branches/2015Q3/www/py-django17/distinfo ============================================================================== --- branches/2015Q3/www/py-django17/distinfo Wed Aug 19 15:22:25 2015 (r394793) +++ branches/2015Q3/www/py-django17/distinfo Wed Aug 19 15:29:30 2015 (r394794) @@ -1,2 +1,2 @@ -SHA256 (python/Django-1.7.9.tar.gz) = 4f3f9fe4e5d20ff8ed6a90b5d2f2df2d8fc054e478cdcc3db81c6b29bd217860 -SIZE (python/Django-1.7.9.tar.gz) = 7605194 +SHA256 (python/Django-1.7.10.tar.gz) = b9357d2cebe61997055d417d607f9c650e817cd1a383b9a1b88bf1edad797c75 +SIZE (python/Django-1.7.10.tar.gz) = 7584312 From owner-svn-ports-branches@freebsd.org Thu Aug 20 10:37:43 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8F4089BCF50; Thu, 20 Aug 2015 10:37:43 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7F72FC65; Thu, 20 Aug 2015 10:37:43 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7KAbhsj074794; Thu, 20 Aug 2015 10:37:43 GMT (envelope-from kwm@FreeBSD.org) Received: (from kwm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7KAbhMb074793; Thu, 20 Aug 2015 10:37:43 GMT (envelope-from kwm@FreeBSD.org) Message-Id: <201508201037.t7KAbhMb074793@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kwm set sender to kwm@FreeBSD.org using -f From: Koop Mast Date: Thu, 20 Aug 2015 10:37:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r394845 - in branches/2015Q3/graphics/gdk-pixbuf2: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Aug 2015 10:37:43 -0000 Author: kwm Date: Thu Aug 20 10:37:42 2015 New Revision: 394845 URL: https://svnweb.freebsd.org/changeset/ports/394845 Log: The update to 2.31.6 in the 2015Q3 branch wasn't complete. There where other changes between the 2.31.2 and 2.31.6 which where missed. So to fix this, remove two patches that are now included in 2.31.6, and update the plist for this version. Submitted by: pkg-fallout Approved by: portmgr@ (antoine@) Deleted: branches/2015Q3/graphics/gdk-pixbuf2/files/patch-gdk-pixbuf_gdk-pixbuf-loader.c branches/2015Q3/graphics/gdk-pixbuf2/files/patch-gdk-pixbuf_pixops_pixops.c Modified: branches/2015Q3/graphics/gdk-pixbuf2/pkg-plist Modified: branches/2015Q3/graphics/gdk-pixbuf2/pkg-plist ============================================================================== --- branches/2015Q3/graphics/gdk-pixbuf2/pkg-plist Thu Aug 20 10:28:04 2015 (r394844) +++ branches/2015Q3/graphics/gdk-pixbuf2/pkg-plist Thu Aug 20 10:37:42 2015 (r394845) @@ -4,6 +4,7 @@ bin/gdk-pixbuf-query-loaders include/gdk-pixbuf-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h include/gdk-pixbuf-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-animation.h +include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-autocleanups.h include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-core.h include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-features.h @@ -91,6 +92,7 @@ share/gir-1.0/GdkPixbuf-2.0.gir %%NLS%%share/locale/it/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/ja/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/ka/LC_MESSAGES/gdk-pixbuf.mo +%%NLS%%share/locale/kk/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/km/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/kn/LC_MESSAGES/gdk-pixbuf.mo %%NLS%%share/locale/ko/LC_MESSAGES/gdk-pixbuf.mo From owner-svn-ports-branches@freebsd.org Thu Aug 20 15:56:05 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D4CA79BE508; Thu, 20 Aug 2015 15:56:05 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C2D388BB; Thu, 20 Aug 2015 15:56:05 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7KFu5M9009858; Thu, 20 Aug 2015 15:56:05 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7KFu4bk009854; Thu, 20 Aug 2015 15:56:04 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201508201556.t7KFu4bk009854@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Thu, 20 Aug 2015 15:56:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r394892 - in branches/2015Q3/sysutils/froxlor: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Aug 2015 15:56:05 -0000 Author: junovitch Date: Thu Aug 20 15:56:04 2015 New Revision: 394892 URL: https://svnweb.freebsd.org/changeset/ports/394892 Log: MFH: r394890 sysutils/froxlor: security update 0.9.32_3 -> 0.9.33.2 - Update to 0.9.33.2 - Minor option and format fixes (support Dovecot 2, use default Apache version) - Add security hint to pkg-message - Add NO_ARCH - Drop @dirrmtry as all pkg-plist files are under PREFIX PR: 202262 Security: CVE-2015-5959 Security: 9ee72858-4159-11e5-93ad-002590263bf5 Submitted by: Marco Steinbach (maintainer) Approved by: ports-secteam (feld), feld (mentor) Modified: branches/2015Q3/sysutils/froxlor/Makefile branches/2015Q3/sysutils/froxlor/distinfo branches/2015Q3/sysutils/froxlor/files/pkg-message.in branches/2015Q3/sysutils/froxlor/pkg-plist Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/sysutils/froxlor/Makefile ============================================================================== --- branches/2015Q3/sysutils/froxlor/Makefile Thu Aug 20 15:54:19 2015 (r394891) +++ branches/2015Q3/sysutils/froxlor/Makefile Thu Aug 20 15:56:04 2015 (r394892) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= froxlor -PORTVERSION= 0.9.32 -PORTREVISION= 3 +PORTVERSION= 0.9.33.2 CATEGORIES= sysutils www MASTER_SITES= http://files.froxlor.org/releases/ @@ -14,17 +13,17 @@ LICENSE= GPLv2 WRKSRC= ${WRKDIR} -NO_BUILD= YES - SUB_FILES+= pkg-message pkg-deinstall SUB_LIST+= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} PLIST_SUB+= ${SUB_LIST} USE_PHP= bcmath curl filter ftp json mysql mysqli pdo_mysql posix session xml -WANT_PHP_CLI= YES +WANT_PHP_CLI= yes USES= shebangfix +NO_ARCH= yes +NO_BUILD= yes SHEBANG_FILES= froxlor/install/tsmarty2c.php @@ -33,7 +32,7 @@ OPTIONS_DEFINE= LIBNSS LOGROTATE MYSQLS OPTIONS_RADIO= WEB SMTP IMAPPOP3 FTP DNS OPTIONS_RADIO_WEB= APACHE LIGHTTPD NGINX OPTIONS_RADIO_SMTP= POSTFIX EXIM -OPTIONS_RADIO_IMAPPOP3= DOVECOT COURIER +OPTIONS_RADIO_IMAPPOP3= DOVECOT DOVECOT2 COURIER OPTIONS_RADIO_FTP= PROFTPD PUREFTPD OPTIONS_RADIO_DNS= POWERDNS ISCDNS OPTIONS_MULTI= WWWST @@ -45,7 +44,7 @@ SMTP_DESC= SMTP server dependency IMAPPOP3_DESC= IMAP/POP3 server dependency DNS_DESC= DNS server dependency FTP_DESC= FTP server dependency -APACHE_DESC= Apache (2.2) as HTTP/HTTPS server +APACHE_DESC= Apache as HTTP/HTTPS server LIGHTTPD_DESC= Lighttpd as HTTP/HTTPS server NGINX_DESC= Nginx as HTTP/HTTPS server MYSQLC_DESC= MySQL database client only @@ -53,7 +52,8 @@ MYSQLS_DESC= MySQL database server and c POSTFIX_DESC= Postfix as SMTP server EXIM_DESC= Exim as SMTP server DKIM_DESC= OpenDKIM for DomainKeys Identified Mail -DOVECOT_DESC= Dovecot as IMAP/POP3 server +DOVECOT_DESC= Dovecot 1.x as IMAP/POP3 server +DOVECOT2_DESC= Dovecot 2.x as IMAP/POP3 server COURIER_DESC= Courier as IMAP/POP3 server PROFTPD_DESC= ProFTPd as FTP server PUREFTPD_DESC= Pure-FTPd as FTP server @@ -75,7 +75,9 @@ EXIM_RUN_DEPENDS= exim:${PORTSDIR}/mail/ DKIM_RUN_DEPENDS= opendkim:${PORTSDIR}/mail/opendkim -DOVECOT_RUN_DEPENDS= dovecot:${PORTSDIR}/mail/dovecot +DOVECOT_RUN_DEPENDS= dovecot>1:${PORTSDIR}/mail/dovecot + +DOVECOT2_RUN_DEPENDS= dovecot2>=2:${PORTSDIR}/mail/dovecot2 COURIER_RUN_DEPENDS= courier:${PORTSDIR}/mail/courier @@ -99,7 +101,7 @@ LIGHTTPD_RUN_DEPENDS= lighttpd:${PORTSDI NGINX_RUN_DEPENDS= nginx:${PORTSDIR}/www/nginx -APACHE_USE= APACHE_RUN=22 +APACHE_USE= yes MYSQLS_USE= MYSQL=server @@ -111,7 +113,7 @@ NLS_USE= PHP=gettext .include .if ${PORT_OPTIONS:MAPACHE} -WANT_PHP_MOD= YES +WANT_PHP_MOD= yes .endif do-install: Modified: branches/2015Q3/sysutils/froxlor/distinfo ============================================================================== --- branches/2015Q3/sysutils/froxlor/distinfo Thu Aug 20 15:54:19 2015 (r394891) +++ branches/2015Q3/sysutils/froxlor/distinfo Thu Aug 20 15:56:04 2015 (r394892) @@ -1,2 +1,2 @@ -SHA256 (froxlor-0.9.32.tar.gz) = f032440d33bddc03265656ed03126926ff618f82b71925c1c1684e46a219dfc9 -SIZE (froxlor-0.9.32.tar.gz) = 1406808 +SHA256 (froxlor-0.9.33.2.tar.gz) = 7693a0d7d17ff9183f6ddab4e68eda86d8215394ec8e1003c5ed076cd8d9a634 +SIZE (froxlor-0.9.33.2.tar.gz) = 1250837 Modified: branches/2015Q3/sysutils/froxlor/files/pkg-message.in ============================================================================== --- branches/2015Q3/sysutils/froxlor/files/pkg-message.in Thu Aug 20 15:54:19 2015 (r394891) +++ branches/2015Q3/sysutils/froxlor/files/pkg-message.in Thu Aug 20 15:56:04 2015 (r394892) @@ -1,5 +1,10 @@ ------------------------------------------------------- +RELEASES PRIOR TO 0.99.3.2 MAY HAVE LEAKED SENSITIVE +INFORMATION INTO %%WWWDIR%%/logs. + +Please visit froxlor's website for more information. + You will want to check and eventually modify some of the paths used by froxlor, as this port currently does not make any attempts to change the defaults as given Modified: branches/2015Q3/sysutils/froxlor/pkg-plist ============================================================================== --- branches/2015Q3/sysutils/froxlor/pkg-plist Thu Aug 20 15:54:19 2015 (r394891) +++ branches/2015Q3/sysutils/froxlor/pkg-plist Thu Aug 20 15:56:04 2015 (r394892) @@ -48,11 +48,11 @@ %%WWWDIR%%/css/images/ui-bg_gloss-wave_35_f6a828_500x100.png %%WWWDIR%%/css/images/ui-bg_highlight-soft_100_eeeeee_1x100.png %%WWWDIR%%/css/images/ui-bg_highlight-soft_75_ffe45c_1x100.png -%%WWWDIR%%/css/images/ui-icons_222222_256x240.png -%%WWWDIR%%/css/images/ui-icons_228ef1_256x240.png -%%WWWDIR%%/css/images/ui-icons_ef8c08_256x240.png -%%WWWDIR%%/css/images/ui-icons_ffd27a_256x240.png -%%WWWDIR%%/css/images/ui-icons_ffffff_256x240.png +%%WWWDIR%%/css/images/ui-icons_222222_256x%%APACHE_VERSION%%0.png +%%WWWDIR%%/css/images/ui-icons_228ef1_256x%%APACHE_VERSION%%0.png +%%WWWDIR%%/css/images/ui-icons_ef8c08_256x%%APACHE_VERSION%%0.png +%%WWWDIR%%/css/images/ui-icons_ffd27a_256x%%APACHE_VERSION%%0.png +%%WWWDIR%%/css/images/ui-icons_ffffff_256x%%APACHE_VERSION%%0.png %%WWWDIR%%/css/jquery-ui.min.css %%WWWDIR%%/customer_domains.php %%WWWDIR%%/customer_email.php @@ -99,517 +99,161 @@ %%WWWDIR%%/js/jquery.min.js %%WWWDIR%%/js/jquery.tablesorter.min.js %%WWWDIR%%/js/plugins/jquery.flot.resize.min.js +%%WWWDIR%%/js/plugins/jquery.tablesorter.sizeparser.min.js %%WWWDIR%%/lib/ajax.php %%WWWDIR%%/lib/classes/Smarty -%%WWWDIR%%/lib/classes/Smarty-3.1.15/COPYING.lib -%%WWWDIR%%/lib/classes/Smarty-3.1.15/README -%%WWWDIR%%/lib/classes/Smarty-3.1.15/SMARTY_2_BC_NOTES.txt -%%WWWDIR%%/lib/classes/Smarty-3.1.15/SMARTY_3.0_BC_NOTES.txt -%%WWWDIR%%/lib/classes/Smarty-3.1.15/SMARTY_3.1_NOTES.txt -%%WWWDIR%%/lib/classes/Smarty-3.1.15/change_log.txt -%%WWWDIR%%/lib/classes/Smarty-3.1.15/demo/configs/test.conf -%%WWWDIR%%/lib/classes/Smarty-3.1.15/demo/index.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/demo/plugins/cacheresource.apc.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/demo/plugins/cacheresource.memcache.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/demo/plugins/cacheresource.mysql.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/demo/plugins/resource.extendsall.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/demo/plugins/resource.mysql.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/demo/plugins/resource.mysqls.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/demo/templates/footer.tpl -%%WWWDIR%%/lib/classes/Smarty-3.1.15/demo/templates/header.tpl -%%WWWDIR%%/lib/classes/Smarty-3.1.15/demo/templates/index.tpl -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/Smarty.class.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/SmartyBC.class.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/debug.tpl -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/plugins/block.textformat.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/plugins/function.counter.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/plugins/function.cycle.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/plugins/function.fetch.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/plugins/function.html_checkboxes.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/plugins/function.html_image.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/plugins/function.html_options.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/plugins/function.html_radios.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/plugins/function.html_select_date.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/plugins/function.html_select_time.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/plugins/function.html_table.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/plugins/function.mailto.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/plugins/function.math.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/plugins/modifier.capitalize.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/plugins/modifier.date_format.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/plugins/modifier.debug_print_var.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/plugins/modifier.escape.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/plugins/modifier.regex_replace.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/plugins/modifier.replace.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/plugins/modifier.spacify.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/plugins/modifier.truncate.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/plugins/modifiercompiler.cat.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/plugins/modifiercompiler.count_characters.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/plugins/modifiercompiler.count_paragraphs.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/plugins/modifiercompiler.count_sentences.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/plugins/modifiercompiler.count_words.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/plugins/modifiercompiler.default.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/plugins/modifiercompiler.escape.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/plugins/modifiercompiler.from_charset.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/plugins/modifiercompiler.indent.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/plugins/modifiercompiler.lower.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/plugins/modifiercompiler.noprint.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/plugins/modifiercompiler.string_format.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/plugins/modifiercompiler.strip.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/plugins/modifiercompiler.strip_tags.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/plugins/modifiercompiler.to_charset.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/plugins/modifiercompiler.unescape.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/plugins/modifiercompiler.upper.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/plugins/modifiercompiler.wordwrap.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/plugins/outputfilter.trimwhitespace.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/plugins/shared.escape_special_chars.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/plugins/shared.literal_compiler_param.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/plugins/shared.make_timestamp.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/plugins/shared.mb_str_replace.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/plugins/shared.mb_unicode.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/plugins/shared.mb_wordwrap.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/plugins/variablefilter.htmlspecialchars.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_cacheresource.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_cacheresource_custom.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_cacheresource_keyvaluestore.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_config_source.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_cacheresource_file.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_compile_append.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_compile_assign.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_compile_block.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_compile_break.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_compile_call.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_compile_capture.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_compile_config_load.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_compile_continue.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_compile_debug.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_compile_eval.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_compile_extends.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_compile_for.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_compile_foreach.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_compile_function.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_compile_if.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_compile_include.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_compile_include_php.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_compile_insert.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_compile_ldelim.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_compile_nocache.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_compile_private_block_plugin.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_compile_private_function_plugin.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_compile_private_modifier.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_compile_private_object_block_function.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_compile_private_object_function.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_compile_private_print_expression.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_compile_private_registered_block.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_compile_private_registered_function.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_compile_private_special_variable.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_compile_rdelim.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_compile_section.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_compile_setfilter.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_compile_while.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_compilebase.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_config.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_config_file_compiler.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_configfilelexer.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_configfileparser.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_data.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_debug.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_filter_handler.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_function_call_handler.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_get_include_path.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_nocache_insert.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_parsetree.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_resource_eval.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_resource_extends.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_resource_file.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_resource_php.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_resource_registered.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_resource_stream.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_resource_string.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_smartytemplatecompiler.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_template.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_templatebase.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_templatecompilerbase.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_templatelexer.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_templateparser.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_utility.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_internal_write_file.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_resource.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_resource_custom.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_resource_recompiled.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_resource_uncompiled.php -%%WWWDIR%%/lib/classes/Smarty-3.1.15/libs/sysplugins/smarty_security.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/COPYING.lib +%%WWWDIR%%/lib/classes/Smarty-3.1.21/README +%%WWWDIR%%/lib/classes/Smarty-3.1.21/SMARTY_2_BC_NOTES.txt +%%WWWDIR%%/lib/classes/Smarty-3.1.21/SMARTY_3.0_BC_NOTES.txt +%%WWWDIR%%/lib/classes/Smarty-3.1.21/SMARTY_3.1_NOTES.txt +%%WWWDIR%%/lib/classes/Smarty-3.1.21/change_log.txt +%%WWWDIR%%/lib/classes/Smarty-3.1.21/demo/configs/test.conf +%%WWWDIR%%/lib/classes/Smarty-3.1.21/demo/index.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/demo/plugins/cacheresource.apc.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/demo/plugins/cacheresource.memcache.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/demo/plugins/cacheresource.mysql.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/demo/plugins/resource.extendsall.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/demo/plugins/resource.mysql.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/demo/plugins/resource.mysqls.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/demo/templates/footer.tpl +%%WWWDIR%%/lib/classes/Smarty-3.1.21/demo/templates/header.tpl +%%WWWDIR%%/lib/classes/Smarty-3.1.21/demo/templates/index.tpl +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/Smarty.class.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/SmartyBC.class.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/debug.tpl +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/plugins/block.textformat.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/plugins/function.counter.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/plugins/function.cycle.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/plugins/function.fetch.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/plugins/function.html_checkboxes.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/plugins/function.html_image.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/plugins/function.html_options.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/plugins/function.html_radios.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/plugins/function.html_select_date.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/plugins/function.html_select_time.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/plugins/function.html_table.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/plugins/function.mailto.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/plugins/function.math.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/plugins/modifier.capitalize.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/plugins/modifier.date_format.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/plugins/modifier.debug_print_var.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/plugins/modifier.escape.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/plugins/modifier.regex_replace.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/plugins/modifier.replace.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/plugins/modifier.spacify.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/plugins/modifier.truncate.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/plugins/modifiercompiler.cat.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/plugins/modifiercompiler.count_characters.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/plugins/modifiercompiler.count_paragraphs.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/plugins/modifiercompiler.count_sentences.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/plugins/modifiercompiler.count_words.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/plugins/modifiercompiler.default.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/plugins/modifiercompiler.escape.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/plugins/modifiercompiler.from_charset.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/plugins/modifiercompiler.indent.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/plugins/modifiercompiler.lower.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/plugins/modifiercompiler.noprint.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/plugins/modifiercompiler.string_format.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/plugins/modifiercompiler.strip.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/plugins/modifiercompiler.strip_tags.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/plugins/modifiercompiler.to_charset.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/plugins/modifiercompiler.unescape.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/plugins/modifiercompiler.upper.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/plugins/modifiercompiler.wordwrap.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/plugins/outputfilter.trimwhitespace.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/plugins/shared.escape_special_chars.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/plugins/shared.literal_compiler_param.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/plugins/shared.make_timestamp.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/plugins/shared.mb_str_replace.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/plugins/shared.mb_unicode.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/plugins/shared.mb_wordwrap.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/plugins/variablefilter.htmlspecialchars.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_cacheresource.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_cacheresource_custom.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_cacheresource_keyvaluestore.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_config_source.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_cacheresource_file.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_compile_append.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_compile_assign.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_compile_block.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_compile_break.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_compile_call.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_compile_capture.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_compile_config_load.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_compile_continue.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_compile_debug.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_compile_eval.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_compile_extends.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_compile_for.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_compile_foreach.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_compile_function.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_compile_if.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_compile_include.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_compile_include_php.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_compile_insert.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_compile_ldelim.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_compile_nocache.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_compile_private_block_plugin.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_compile_private_function_plugin.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_compile_private_modifier.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_compile_private_object_block_function.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_compile_private_object_function.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_compile_private_print_expression.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_compile_private_registered_block.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_compile_private_registered_function.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_compile_private_special_variable.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_compile_rdelim.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_compile_section.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_compile_setfilter.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_compile_while.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_compilebase.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_config.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_config_file_compiler.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_configfilelexer.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_configfileparser.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_data.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_debug.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_filter_handler.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_function_call_handler.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_get_include_path.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_nocache_insert.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_parsetree.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_resource_eval.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_resource_extends.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_resource_file.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_resource_php.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_resource_registered.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_resource_stream.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_resource_string.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_smartytemplatecompiler.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_template.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_templatebase.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_templatecompilerbase.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_templatelexer.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_templateparser.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_utility.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_internal_write_file.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_resource.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_resource_custom.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_resource_recompiled.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_resource_uncompiled.php +%%WWWDIR%%/lib/classes/Smarty-3.1.21/libs/sysplugins/smarty_security.php +%%WWWDIR%%/lib/classes/bulk/class.DomainBulkAction.php %%WWWDIR%%/lib/classes/database/class.Database.php %%WWWDIR%%/lib/classes/database/class.DbManager.php %%WWWDIR%%/lib/classes/database/manager/class.DbManagerMySQL.php -%%WWWDIR%%/lib/classes/htmlpurifier/CREDITS -%%WWWDIR%%/lib/classes/htmlpurifier/LICENSE -%%WWWDIR%%/lib/classes/htmlpurifier/VERSION -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier.auto.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier.autoload.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier.composer.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier.func.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier.includes.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier.kses.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier.path.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier.safe-includes.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrCollections.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrDef.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrDef/CSS.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/AlphaValue.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Background.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Border.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Color.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Composite.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Filter.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Font.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/FontFamily.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Ident.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/ImportantDecorator.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Length.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/ListStyle.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Multiple.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Number.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Percentage.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/TextDecoration.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/URI.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrDef/Clone.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrDef/Enum.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Bool.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Class.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Color.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/FrameTarget.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/ID.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Length.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/LinkTypes.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/MultiLength.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Nmtokens.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/Pixels.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrDef/Integer.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrDef/Lang.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrDef/Switch.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrDef/Text.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrDef/URI.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrDef/URI/Email.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrDef/URI/Host.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrDef/URI/IPv4.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrDef/URI/IPv6.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrTransform.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrTransform/Background.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrTransform/BdoDir.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrTransform/BgColor.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrTransform/BoolToCSS.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrTransform/Border.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrTransform/EnumToCSS.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrTransform/ImgRequired.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrTransform/ImgSpace.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrTransform/Input.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrTransform/Lang.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrTransform/Length.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrTransform/Name.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrTransform/NameSync.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrTransform/Nofollow.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeEmbed.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeObject.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeParam.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrTransform/ScriptRequired.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrTransform/TargetBlank.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrTransform/Textarea.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrTypes.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/AttrValidator.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/Bootstrap.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/CSSDefinition.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ChildDef.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ChildDef/Chameleon.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ChildDef/Custom.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ChildDef/Empty.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ChildDef/List.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ChildDef/Optional.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ChildDef/Required.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ChildDef/StrictBlockquote.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ChildDef/Table.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/Config.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/Builder/Xml.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/Exception.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange/Directive.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange/Id.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/InterchangeBuilder.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/Validator.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/ValidatorAtom.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema.ser -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedClasses.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.ClassUseCDATA.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultImageAlt.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.ForbiddenClasses.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.DisplayLinkURI.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.DocURL.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.RemoveNbsp.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveEmpty.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.RemoveSpansWithoutAttributes.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowImportant.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowTricky.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedFonts.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.AllowedProperties.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.ForbiddenProperties.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.MaxImgLength.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/CSS.Trusted.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPermissions.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.DisableExcludes.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EnableIDNA.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.Language.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.NormalizeNewlines.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveProcessingInstructions.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.Custom.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Escaping.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.Scope.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.TidyImpl.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocks.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Filter.YouTube.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedComments.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedCommentsRegexp.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Attr.Name.UseCDATA.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.FlashAllowFullScreen.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenAttributes.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.ForbiddenElements.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.MaxImgLength.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Nofollow.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeEmbed.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeIframe.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeObject.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.SafeScripting.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TargetBlank.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.FixInnerHTML.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.FlashCompat.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.SortAttr.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Base.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Host.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.MungeResources.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.MungeSecretKey.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/URI.SafeIframeRegexp.txt -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ConfigSchema/schema/info.ini -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ContentSets.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/Context.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/Definition.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/DefinitionCache.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/Memory.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/Template.php.in -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/DefinitionCache/Null.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer/README -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/DefinitionCacheFactory.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/Doctype.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/DoctypeRegistry.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ElementDef.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/Encoder.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/EntityLookup.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/EntityLookup/entities.ser -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/EntityParser.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ErrorCollector.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/ErrorStruct.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/Exception.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/Filter.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/Filter/ExtractStyleBlocks.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/Filter/YouTube.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/Generator.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/HTMLDefinition.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/HTMLModule.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/HTMLModule/Bdo.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/HTMLModule/CommonAttributes.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/HTMLModule/Edit.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/HTMLModule/Forms.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/HTMLModule/Hypertext.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/HTMLModule/Iframe.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/HTMLModule/Image.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/HTMLModule/Legacy.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/HTMLModule/List.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/HTMLModule/Name.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/HTMLModule/Nofollow.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/HTMLModule/NonXMLCommonAttributes.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/HTMLModule/Object.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/HTMLModule/Presentation.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/HTMLModule/Proprietary.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/HTMLModule/Ruby.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/HTMLModule/SafeEmbed.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/HTMLModule/SafeObject.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/HTMLModule/SafeScripting.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/HTMLModule/Scripting.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/HTMLModule/StyleAttribute.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/HTMLModule/Tables.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/HTMLModule/Target.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/HTMLModule/TargetBlank.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/HTMLModule/Text.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Name.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Proprietary.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Strict.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/Transitional.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/XHTML.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/HTMLModule/XMLCommonAttributes.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/HTMLModuleManager.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/IDAccumulator.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/Injector.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/Injector/AutoParagraph.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/Injector/DisplayLinkURI.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/Injector/Linkify.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/Injector/PurifierLinkify.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/Injector/RemoveEmpty.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/Injector/SafeObject.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/Language.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/Language/classes/en-x-test.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/Language/messages/en-x-test.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/Language/messages/en-x-testmini.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/Language/messages/en.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/LanguageFactory.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/Length.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/Lexer.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/Lexer/DOMLex.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/Lexer/DirectLex.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/Lexer/PEARSax3.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/Lexer/PH5P.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/PercentEncoder.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/Printer.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/Printer/CSSDefinition.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.css -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.js -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/Printer/HTMLDefinition.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/PropertyList.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/PropertyListIterator.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/Strategy.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/Strategy/Composite.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/Strategy/Core.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/Strategy/FixNesting.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/Strategy/MakeWellFormed.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/Strategy/RemoveForeignElements.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/Strategy/ValidateAttributes.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/StringHash.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/StringHashParser.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/TagTransform.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/TagTransform/Font.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/TagTransform/Simple.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/Token.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/Token/Comment.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/Token/Empty.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/Token/End.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/Token/Start.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/Token/Tag.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/Token/Text.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/TokenFactory.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/URI.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/URIDefinition.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/URIFilter.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/URIFilter/DisableExternal.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/URIFilter/DisableExternalResources.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/URIFilter/DisableResources.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/URIFilter/HostBlacklist.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/URIFilter/MakeAbsolute.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/URIFilter/Munge.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/URIFilter/SafeIframe.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/URIParser.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/URIScheme.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/URIScheme/data.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/URIScheme/file.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/URIScheme/ftp.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/URIScheme/http.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/URIScheme/https.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/URIScheme/mailto.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/URIScheme/news.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/URIScheme/nntp.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/URISchemeRegistry.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/UnitConverter.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/VarParser.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/VarParser/Flexible.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/VarParser/Native.php -%%WWWDIR%%/lib/classes/htmlpurifier/library/HTMLPurifier/VarParserException.php %%WWWDIR%%/lib/classes/idna/class.idna_convert.php %%WWWDIR%%/lib/classes/idna/class.idna_convert_wrapper.php %%WWWDIR%%/lib/classes/idna/npdata.ser %%WWWDIR%%/lib/classes/integrity/class.IntegrityCheck.php +%%WWWDIR%%/lib/classes/io/class.frxDirectory.php %%WWWDIR%%/lib/classes/logger/abstract.AbstractLogger.php %%WWWDIR%%/lib/classes/logger/class.FileLogger.php %%WWWDIR%%/lib/classes/logger/class.FroxlorLogger.php %%WWWDIR%%/lib/classes/logger/class.MysqlLogger.php %%WWWDIR%%/lib/classes/logger/class.SysLogger.php %%WWWDIR%%/lib/classes/mail/class.mailLogParser.php -%%WWWDIR%%/lib/classes/output/class.Minify_HTML.php %%WWWDIR%%/lib/classes/output/class.htmlform.php %%WWWDIR%%/lib/classes/output/class.languageSelect.php %%WWWDIR%%/lib/classes/output/class.linker.php @@ -630,9 +274,11 @@ %%WWWDIR%%/lib/configfiles/gentoo.inc.php %%WWWDIR%%/lib/configfiles/lucid.inc.php %%WWWDIR%%/lib/configfiles/precise.inc.php +%%WWWDIR%%/lib/configfiles/rhel7.inc.php %%WWWDIR%%/lib/configfiles/sle10.inc.php +%%WWWDIR%%/lib/configfiles/sle11.inc.php %%WWWDIR%%/lib/configfiles/squeeze.inc.php -%%WWWDIR%%/lib/configfiles/suse11.inc.php +%%WWWDIR%%/lib/configfiles/trusty.inc.php %%WWWDIR%%/lib/configfiles/wheezy.inc.php %%WWWDIR%%/lib/configfiles_index.inc.php %%WWWDIR%%/lib/cron_init.php @@ -644,6 +290,7 @@ %%WWWDIR%%/lib/formfields/admin/customer/formfield.customer_edit.php %%WWWDIR%%/lib/formfields/admin/domains/formfield.domains_add.php %%WWWDIR%%/lib/formfields/admin/domains/formfield.domains_edit.php +%%WWWDIR%%/lib/formfields/admin/domains/formfield.domains_import.php %%WWWDIR%%/lib/formfields/admin/ipsandports/formfield.ipsandports_add.php %%WWWDIR%%/lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php %%WWWDIR%%/lib/formfields/admin/phpconfig/formfield.phpconfig_add.php @@ -679,7 +326,6 @@ %%WWWDIR%%/lib/functions/database/function.correctMysqlUsers.php %%WWWDIR%%/lib/functions/filedir/function.fileImmutable.php %%WWWDIR%%/lib/functions/filedir/function.findDirs.php -%%WWWDIR%%/lib/functions/filedir/function.isConfigDir.php %%WWWDIR%%/lib/functions/filedir/function.makeChownWithNewStats.php %%WWWDIR%%/lib/functions/filedir/function.makeCorrectDir.php %%WWWDIR%%/lib/functions/filedir/function.makeCorrectFile.php @@ -695,6 +341,8 @@ %%WWWDIR%%/lib/functions/formfields/date/function.getFormFieldOutputDate.php %%WWWDIR%%/lib/functions/formfields/date/function.manipulateFormFieldDataDate.php %%WWWDIR%%/lib/functions/formfields/date/function.validateFormFieldDate.php +%%WWWDIR%%/lib/functions/formfields/file/function.getFormFieldOutputFile.php +%%WWWDIR%%/lib/functions/formfields/file/function.validateFormFieldFile.php %%WWWDIR%%/lib/functions/formfields/function.buildForm.php %%WWWDIR%%/lib/functions/formfields/function.buildFormEx.php %%WWWDIR%%/lib/functions/formfields/function.checkPlausibilityFormField.php @@ -730,7 +378,6 @@ %%WWWDIR%%/lib/functions/%%AP_NAME%%/function.CorrectErrorDocument.php %%WWWDIR%%/lib/functions/%%AP_NAME%%/function.CronjobFunctions.php %%WWWDIR%%/lib/functions/%%AP_NAME%%/function.checkCrondConfigurationFile.php -%%WWWDIR%%/lib/functions/%%AP_NAME%%/function.convertUtf8.php %%WWWDIR%%/lib/functions/%%AP_NAME%%/function.createAWStatsConf.php %%WWWDIR%%/lib/functions/%%AP_NAME%%/function.customerHasPerlEnabled.php %%WWWDIR%%/lib/functions/%%AP_NAME%%/function.domainHasMainSubDomains.php @@ -746,8 +393,8 @@ %%WWWDIR%%/lib/functions/%%AP_NAME%%/function.getThemes.php %%WWWDIR%%/lib/functions/%%AP_NAME%%/function.inserttask.php %%WWWDIR%%/lib/functions/%%AP_NAME%%/function.isCustomerStdSubdomain.php -%%WWWDIR%%/lib/functions/%%AP_NAME%%/function.isUtf8.php %%WWWDIR%%/lib/functions/%%AP_NAME%%/function.loadConfigArrayDir.php +%%WWWDIR%%/lib/functions/%%AP_NAME%%/function.moveCustomerToAdmin.php %%WWWDIR%%/lib/functions/%%AP_NAME%%/function.phpErrHandler.php %%WWWDIR%%/lib/functions/%%AP_NAME%%/function.updateCounters.php %%WWWDIR%%/lib/functions/%%AP_NAME%%/function.updateFunctions.php @@ -756,6 +403,7 @@ %%WWWDIR%%/lib/functions/output/function.RedirectCode.php %%WWWDIR%%/lib/functions/output/function.ask_yesno.php %%WWWDIR%%/lib/functions/output/function.buildNavigation.php +%%WWWDIR%%/lib/functions/output/function.dieWithMail.php %%WWWDIR%%/lib/functions/output/function.getCorrectFullUserDetails.php %%WWWDIR%%/lib/functions/output/function.getCorrectUserSalutation.php %%WWWDIR%%/lib/functions/output/function.getTemplate.php @@ -787,6 +435,7 @@ %%WWWDIR%%/lib/functions/settings/function.storeSettingResetCatchall.php %%WWWDIR%%/lib/functions/smarty_plugins/gettext-prefilter.php %%WWWDIR%%/lib/functions/system/function.checklastguid.php +%%WWWDIR%%/lib/functions/system/function.getAvailablePasswordHashes.php %%WWWDIR%%/lib/functions/system/function.isFreeBSD.php %%WWWDIR%%/lib/functions/system/function.makeCryptPassword.php %%WWWDIR%%/lib/functions/validate/function.appendOpenbasedirPath.php @@ -805,6 +454,7 @@ %%WWWDIR%%/lib/functions/validate/function.validateDomain.php %%WWWDIR%%/lib/functions/validate/function.validateEmail.php %%WWWDIR%%/lib/functions/validate/function.validatePassword.php +%%WWWDIR%%/lib/functions/validate/function.validatePasswordLogin.php %%WWWDIR%%/lib/functions/validate/function.validateSqlInterval.php %%WWWDIR%%/lib/functions/validate/function.validateUrl.php %%WWWDIR%%/lib/functions/validate/function.validateUsername.php @@ -825,6 +475,7 @@ %%WWWDIR%%/locales/de/LC_MESSAGES/default.po %%WWWDIR%%/locales/en/LC_MESSAGES/default.po %%WWWDIR%%/logs/.keep +%%WWWDIR%%/logs/index.html %%WWWDIR%%/scripts/%%AP_NAME%%_master_cronjob.php %%WWWDIR%%/scripts/jobs/cron_mailboxsize.php %%WWWDIR%%/scripts/jobs/cron_tasks.inc.dns.10.bind.php @@ -868,6 +519,7 @@ %%WWWDIR%%/templates/Sparkle/admin/domains/domains_add.tpl %%WWWDIR%%/templates/Sparkle/admin/domains/domains_domain.tpl %%WWWDIR%%/templates/Sparkle/admin/domains/domains_edit.tpl +%%WWWDIR%%/templates/Sparkle/admin/domains/domains_import.tpl %%WWWDIR%%/templates/Sparkle/admin/index/change_language.tpl %%WWWDIR%%/templates/Sparkle/admin/index/change_password.tpl %%WWWDIR%%/templates/Sparkle/admin/index/change_theme.tpl @@ -937,9 +589,7 @@ %%WWWDIR%%/templates/Sparkle/assets/css/%%AP_NAME%%.css %%WWWDIR%%/templates/Sparkle/assets/css/main.css %%WWWDIR%%/templates/Sparkle/assets/css/main_ie.css -%%WWWDIR%%/templates/Sparkle/assets/img/default.png %%WWWDIR%%/templates/Sparkle/assets/img/favicon.ico -%%WWWDIR%%/templates/Sparkle/assets/img/header_g_%%AP_NAME%%.png %%WWWDIR%%/templates/Sparkle/assets/img/icons/add.png %%WWWDIR%%/templates/Sparkle/assets/img/icons/aps_big.png %%WWWDIR%%/templates/Sparkle/assets/img/icons/aps_upload_big.png @@ -981,6 +631,7 @@ %%WWWDIR%%/templates/Sparkle/assets/img/icons/htpasswd_add_big.png %%WWWDIR%%/templates/Sparkle/assets/img/icons/htpasswd_big.png %%WWWDIR%%/templates/Sparkle/assets/img/icons/htpasswd_edit_big.png +%%WWWDIR%%/templates/Sparkle/assets/img/icons/info.png %%WWWDIR%%/templates/Sparkle/assets/img/icons/info_big.png %%WWWDIR%%/templates/Sparkle/assets/img/icons/ipsports_add_big.png %%WWWDIR%%/templates/Sparkle/assets/img/icons/ipsports_big.png @@ -1090,6 +741,7 @@ %%WWWDIR%%/templates/Sparkle/customer/traffic/traffic_traffic.tpl %%WWWDIR%%/templates/Sparkle/footer.tpl %%WWWDIR%%/templates/Sparkle/formfields/bool.tpl +%%WWWDIR%%/templates/Sparkle/formfields/file.tpl %%WWWDIR%%/templates/Sparkle/formfields/hidden.tpl %%WWWDIR%%/templates/Sparkle/formfields/hiddenstring.tpl %%WWWDIR%%/templates/Sparkle/formfields/label.tpl @@ -1106,6 +758,7 @@ %%WWWDIR%%/templates/Sparkle/misc/configurehint.tpl %%WWWDIR%%/templates/Sparkle/misc/dberrornice.tpl %%WWWDIR%%/templates/Sparkle/misc/error.tpl +%%WWWDIR%%/templates/Sparkle/misc/form/input_file.tpl %%WWWDIR%%/templates/Sparkle/misc/form/input_text.tpl %%WWWDIR%%/templates/Sparkle/misc/form/input_textarea.tpl %%WWWDIR%%/templates/Sparkle/misc/form/table_end.tpl @@ -1132,6 +785,7 @@ %%WWWDIR%%/templates/Sparkle/webftp/webftp_main_multiple.tpl %%WWWDIR%%/templates/Sparkle/webftp/webftp_main_prompt.tpl %%WWWDIR%%/templates/Sparkle/webftp/webftp_main_rename.tpl +%%WWWDIR%%/templates/Sparkle/webftp/webftp_navigation_element.tpl %%WWWDIR%%/templates/misc/awstatsmodel/awstats.%%AP_NAME%%.model.conf %%WWWDIR%%/templates/misc/configfiles/debian_squeeze/apache2/etc_apache2_mods-enabled_fastcgi.conf %%WWWDIR%%/templates/misc/configfiles/debian_squeeze/courier/etc_courier_authdaemonrc @@ -1192,7 +846,9 @@ %%WWWDIR%%/templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_10-master.conf %%WWWDIR%%/templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_15-lda.conf %%WWWDIR%%/templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_20-imap.conf +%%WWWDIR%%/templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_20-managesieve.conf %%WWWDIR%%/templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_20-pop3.conf +%%WWWDIR%%/templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_90-sieve.conf %%WWWDIR%%/templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_auth-sql.conf.ext %%WWWDIR%%/templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_dovecot-sql.conf.ext %%WWWDIR%%/templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_dovecot.conf @@ -1263,6 +919,8 @@ %%WWWDIR%%/templates/misc/configfiles/freebsd/postfix_mxaccess/etc_postfix_mx_access %%WWWDIR%%/templates/misc/configfiles/freebsd/powerdns/usr_local_etc_pdns_pdns.conf %%WWWDIR%%/templates/misc/configfiles/freebsd/proftpd/etc_proftpd_proftpd.conf +%%WWWDIR%%/templates/misc/configfiles/freebsd/pure-ftpd/usr_local_etc_pure-ftpd.conf +%%WWWDIR%%/templates/misc/configfiles/freebsd/pure-ftpd/usr_local_etc_pureftpd-mysql.conf %%WWWDIR%%/templates/misc/configfiles/gentoo/apache2/etc_apache2_modules.d_70_fastcgi.conf %%WWWDIR%%/templates/misc/configfiles/gentoo/bind/etc_bind_default.zone %%WWWDIR%%/templates/misc/configfiles/gentoo/courier/etc_courier-imap_imapd @@ -1334,6 +992,28 @@ %%WWWDIR%%/templates/misc/configfiles/opensuse_11_x/proftpd/etc_proftpd_proftpd.conf %%WWWDIR%%/templates/misc/configfiles/opensuse_11_x/pure-ftpd/etc_pure-ftpd.conf %%WWWDIR%%/templates/misc/configfiles/opensuse_11_x/pure-ftpd/etc_pure-ftpd_mysql.conf +%%WWWDIR%%/templates/misc/configfiles/rhel7/cron/etc_cron.d_%%AP_NAME%% +%%WWWDIR%%/templates/misc/configfiles/rhel7/dovecot/etc_dovecot_conf.d_10-auth.conf +%%WWWDIR%%/templates/misc/configfiles/rhel7/dovecot/etc_dovecot_conf.d_10-logging.conf +%%WWWDIR%%/templates/misc/configfiles/rhel7/dovecot/etc_dovecot_conf.d_10-mail.conf +%%WWWDIR%%/templates/misc/configfiles/rhel7/dovecot/etc_dovecot_conf.d_10-master.conf +%%WWWDIR%%/templates/misc/configfiles/rhel7/dovecot/etc_dovecot_conf.d_10-ssl.conf +%%WWWDIR%%/templates/misc/configfiles/rhel7/dovecot/etc_dovecot_conf.d_15-lda.conf +%%WWWDIR%%/templates/misc/configfiles/rhel7/dovecot/etc_dovecot_conf.d_15-mailboxes.conf +%%WWWDIR%%/templates/misc/configfiles/rhel7/dovecot/etc_dovecot_conf.d_20-imap.conf +%%WWWDIR%%/templates/misc/configfiles/rhel7/dovecot/etc_dovecot_conf.d_20-lmtp.conf +%%WWWDIR%%/templates/misc/configfiles/rhel7/dovecot/etc_dovecot_conf.d_20-managesieve.conf +%%WWWDIR%%/templates/misc/configfiles/rhel7/dovecot/etc_dovecot_conf.d_20-pop3.conf +%%WWWDIR%%/templates/misc/configfiles/rhel7/dovecot/etc_dovecot_conf.d_90-sieve.conf +%%WWWDIR%%/templates/misc/configfiles/rhel7/dovecot/etc_dovecot_dovecot-sql.conf.ext +%%WWWDIR%%/templates/misc/configfiles/rhel7/dovecot/etc_dovecot_dovecot.conf +%%WWWDIR%%/templates/misc/configfiles/rhel7/postfix/etc_postfix_main.cf +%%WWWDIR%%/templates/misc/configfiles/rhel7/postfix/etc_postfix_master.cf +%%WWWDIR%%/templates/misc/configfiles/rhel7/postfix/etc_postfix_mysql-virtual_alias_maps.cf +%%WWWDIR%%/templates/misc/configfiles/rhel7/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf +%%WWWDIR%%/templates/misc/configfiles/rhel7/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf +%%WWWDIR%%/templates/misc/configfiles/rhel7/postfix/etc_postfix_mysql-virtual_sender_permissions.cf +%%WWWDIR%%/templates/misc/configfiles/rhel7/proftpd/etc_proftpd_proftpd.conf %%WWWDIR%%/templates/misc/configfiles/sle_10/courier/etc_authlib_authdaemonrc %%WWWDIR%%/templates/misc/configfiles/sle_10/courier/etc_authlib_authmysqlrc %%WWWDIR%%/templates/misc/configfiles/sle_10/cron/etc_cron.d_%%AP_NAME%% @@ -1443,287 +1123,50 @@ %%WWWDIR%%/templates/misc/configfiles/ubuntu_precise/pure-ftpd/etc_pure-ftpd_conf_NoAnonymous %%WWWDIR%%/templates/misc/configfiles/ubuntu_precise/pure-ftpd/etc_pure-ftpd_conf_PAMAuthentication %%WWWDIR%%/templates/misc/configfiles/ubuntu_precise/pure-ftpd/etc_pure-ftpd_db_mysql.conf +%%WWWDIR%%/templates/misc/configfiles/ubuntu_trusty/apache2/etc_apache2_mods-enabled_fastcgi.conf +%%WWWDIR%%/templates/misc/configfiles/ubuntu_trusty/courier/etc_courier_authdaemonrc +%%WWWDIR%%/templates/misc/configfiles/ubuntu_trusty/courier/etc_courier_authmysqlrc +%%WWWDIR%%/templates/misc/configfiles/ubuntu_trusty/cron/etc_cron.d_%%AP_NAME%% +%%WWWDIR%%/templates/misc/configfiles/ubuntu_trusty/dovecot/etc_dovecot_conf.d_01_mail_stack_delivery.conf +%%WWWDIR%%/templates/misc/configfiles/ubuntu_trusty/dovecot/etc_dovecot_conf.d_10_auth.conf +%%WWWDIR%%/templates/misc/configfiles/ubuntu_trusty/dovecot/etc_dovecot_dovecot-sql.conf.ext +%%WWWDIR%%/templates/misc/configfiles/ubuntu_trusty/libnss/etc_libnss-mysql-root.cfg +%%WWWDIR%%/templates/misc/configfiles/ubuntu_trusty/libnss/etc_libnss-mysql.cfg +%%WWWDIR%%/templates/misc/configfiles/ubuntu_trusty/libnss/etc_nsswitch.conf +%%WWWDIR%%/templates/misc/configfiles/ubuntu_trusty/lighttpd/etc_lighttpd.conf +%%WWWDIR%%/templates/misc/configfiles/ubuntu_trusty/logrotate/etc_logrotated_%%AP_NAME%% +%%WWWDIR%%/templates/misc/configfiles/ubuntu_trusty/nginx/etc_init.d_php-fcgi +%%WWWDIR%%/templates/misc/configfiles/ubuntu_trusty/nginx/etc_nginx_fastcgi.conf +%%WWWDIR%%/templates/misc/configfiles/ubuntu_trusty/nginx/etc_nginx_nginx.conf +%%WWWDIR%%/templates/misc/configfiles/ubuntu_trusty/postfix_courier/etc_postfix_main.cf +%%WWWDIR%%/templates/misc/configfiles/ubuntu_trusty/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf +%%WWWDIR%%/templates/misc/configfiles/ubuntu_trusty/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf +%%WWWDIR%%/templates/misc/configfiles/ubuntu_trusty/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf +%%WWWDIR%%/templates/misc/configfiles/ubuntu_trusty/postfix_courier/etc_postfix_mysql-virtual_sender_permissions.cf +%%WWWDIR%%/templates/misc/configfiles/ubuntu_trusty/postfix_courier/etc_postfix_sasl_smtpd.conf +%%WWWDIR%%/templates/misc/configfiles/ubuntu_trusty/postfix_dovecot/etc_postfix_main.cf +%%WWWDIR%%/templates/misc/configfiles/ubuntu_trusty/postfix_dovecot/etc_postfix_master.cf *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-branches@freebsd.org Thu Aug 20 18:21:05 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3AB129BFD0B; Thu, 20 Aug 2015 18:21:05 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2A5D61D01; Thu, 20 Aug 2015 18:21:05 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7KIL5rl070251; Thu, 20 Aug 2015 18:21:05 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7KIL4po070245; Thu, 20 Aug 2015 18:21:04 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201508201821.t7KIL4po070245@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Thu, 20 Aug 2015 18:21:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r394903 - in branches/2015Q3/www/chromium: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Aug 2015 18:21:05 -0000 Author: rene Date: Thu Aug 20 18:21:03 2015 New Revision: 394903 URL: https://svnweb.freebsd.org/changeset/ports/394903 Log: MFH: r394902 - Update to 44.0.2403.155 [1] - Add a non-default option to install Chrome Driver [2][3] PR: 202368 [2] PR: 202370 [3] Submitted by: LeFroid via GitHub [1] Submitted by: stb@lassitu.de [2][3] Approved by: ports-secteam (feld) Modified: branches/2015Q3/www/chromium/Makefile branches/2015Q3/www/chromium/distinfo branches/2015Q3/www/chromium/files/chrome.in branches/2015Q3/www/chromium/pkg-plist Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/www/chromium/Makefile ============================================================================== --- branches/2015Q3/www/chromium/Makefile Thu Aug 20 18:11:56 2015 (r394902) +++ branches/2015Q3/www/chromium/Makefile Thu Aug 20 18:21:03 2015 (r394903) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 44.0.2403.130 +PORTVERSION= 44.0.2403.155 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} # default, but needed to get distinfo correct if TEST is on @@ -128,10 +128,12 @@ GYP_DEFINES+= google_api_key=AIzaSyBsp9n SUB_FILES= chromium-browser.desktop chrome SUB_LIST+= COMMENT="${COMMENT}" -OPTIONS_DEFINE= CODECS GCONF PULSEAUDIO TEST KERBEROS DEBUG +OPTIONS_DEFINE= CODECS GCONF PULSEAUDIO TEST KERBEROS DEBUG DRIVER CODECS_DESC= Compile and enable patented codecs like H.264 +DRIVER_DESC= Install chromedriver OPTIONS_DEFAULT= CODECS GCONF KERBEROS +OPTIONS_SUB= yes GCONF_USE= GNOME=gconf2 PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio @@ -195,6 +197,7 @@ CONFIGURE_ENV+= CC="${CC}" \ MAKE_ENV+= BUILDTYPE=${BUILDTYPE} \ GPERF="${LOCALBASE}/bin/gperf" MAKE_ARGS= -C out/${BUILDTYPE} +DRIVER_MAKE_ARGS=chromedriver .include @@ -379,6 +382,10 @@ do-install: ${STAGEDIR}${DESKTOPDIR} ${INSTALL_SCRIPT} ${WRKDIR}/chrome ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/mksnapshot \ - ${STAGEDIR}${DATADIR}/mksnapshot + ${STAGEDIR}${DATADIR} +.if ${PORT_OPTIONS:MDRIVER} + ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chromedriver \ + ${STAGEDIR}${PREFIX}/bin +.endif .include Modified: branches/2015Q3/www/chromium/distinfo ============================================================================== --- branches/2015Q3/www/chromium/distinfo Thu Aug 20 18:11:56 2015 (r394902) +++ branches/2015Q3/www/chromium/distinfo Thu Aug 20 18:21:03 2015 (r394903) @@ -1,4 +1,4 @@ -SHA256 (chromium-44.0.2403.130.tar.xz) = 37779b2f4844e1a6ac75d69897031955541ad97f3dd1d4ad641c371c1d63b414 -SIZE (chromium-44.0.2403.130.tar.xz) = 293332128 -SHA256 (chromium-44.0.2403.130-testdata.tar.xz) = 47a0e7808f7c98ea02fb4aaaedf83fcbd78901da134de3cf1d53312a56710f49 -SIZE (chromium-44.0.2403.130-testdata.tar.xz) = 128611776 +SHA256 (chromium-44.0.2403.155.tar.xz) = eba271c210a020dd61b72c940abeecdafc562a1d15fb45615dda72bcb6219f3c +SIZE (chromium-44.0.2403.155.tar.xz) = 293362744 +SHA256 (chromium-44.0.2403.155-testdata.tar.xz) = 1fbcfc5bb94db75970f04055163a82560814f3961dece961db4ed5c11014f3d4 +SIZE (chromium-44.0.2403.155-testdata.tar.xz) = 128600128 Modified: branches/2015Q3/www/chromium/files/chrome.in ============================================================================== --- branches/2015Q3/www/chromium/files/chrome.in Thu Aug 20 18:11:56 2015 (r394902) +++ branches/2015Q3/www/chromium/files/chrome.in Thu Aug 20 18:21:03 2015 (r394903) @@ -15,4 +15,4 @@ $SYSCTL=1 EOMSG exit 1 fi -%%PREFIX%%/share/chromium/chrome $* +exec %%PREFIX%%/share/chromium/chrome $* Modified: branches/2015Q3/www/chromium/pkg-plist ============================================================================== --- branches/2015Q3/www/chromium/pkg-plist Thu Aug 20 18:11:56 2015 (r394902) +++ branches/2015Q3/www/chromium/pkg-plist Thu Aug 20 18:21:03 2015 (r394903) @@ -1,5 +1,6 @@ bin/chrome man/man1/chrome.1.gz +%%DRIVER%%bin/chromedriver share/applications/chromium-browser.desktop %%DATADIR%%/chrome %%DATADIR%%/chrome-wrapper From owner-svn-ports-branches@freebsd.org Fri Aug 21 14:26:19 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AC5E69BFC03; Fri, 21 Aug 2015 14:26:19 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 82FF36D4; Fri, 21 Aug 2015 14:26:19 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7LEQJJJ005589; Fri, 21 Aug 2015 14:26:19 GMT (envelope-from cperciva@FreeBSD.org) Received: (from cperciva@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7LEQJFq005587; Fri, 21 Aug 2015 14:26:19 GMT (envelope-from cperciva@FreeBSD.org) Message-Id: <201508211426.t7LEQJFq005587@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cperciva set sender to cperciva@FreeBSD.org using -f From: Colin Percival Date: Fri, 21 Aug 2015 14:26:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r394957 - branches/2015Q3/sysutils/tarsnap X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Aug 2015 14:26:19 -0000 Author: cperciva Date: Fri Aug 21 14:26:18 2015 New Revision: 394957 URL: https://svnweb.freebsd.org/changeset/ports/394957 Log: MFH: r394955 Update tarsnap to 1.0.36. This removes the SSE2 option since tarsnap now detects that cpu feature at run-time. Security: Fixes a denial of service and a maybe-exploitable overflow. Approved by: ports-secteam (feld) Modified: branches/2015Q3/sysutils/tarsnap/Makefile branches/2015Q3/sysutils/tarsnap/distinfo Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/sysutils/tarsnap/Makefile ============================================================================== --- branches/2015Q3/sysutils/tarsnap/Makefile Fri Aug 21 14:23:17 2015 (r394956) +++ branches/2015Q3/sysutils/tarsnap/Makefile Fri Aug 21 14:26:18 2015 (r394957) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= tarsnap -PORTVERSION= 1.0.35 -PORTREVISION= 2 +PORTVERSION= 1.0.36 CATEGORIES= sysutils MASTER_SITES= http://www.tarsnap.com/download-http/ DISTNAME= ${PORTNAME}-autoconf-${PORTVERSION} @@ -14,12 +13,6 @@ COMMENT= Online encrypted backup service GNU_CONFIGURE= yes USES= gmake tar:tgz -OPTIONS_DEFINE= SSE2 -SSE2_DESC= Use SSE2-optimized code - -SSE2_CONFIGURE_ENABLE= sse2 -SSE2_CFLAGS= -msse2 - .include # safety check to ensure that we don't violate the license Modified: branches/2015Q3/sysutils/tarsnap/distinfo ============================================================================== --- branches/2015Q3/sysutils/tarsnap/distinfo Fri Aug 21 14:23:17 2015 (r394956) +++ branches/2015Q3/sysutils/tarsnap/distinfo Fri Aug 21 14:26:18 2015 (r394957) @@ -1,2 +1,2 @@ -SHA256 (tarsnap-autoconf-1.0.35.tgz) = 6c9f6756bc43bc225b842f7e3a0ec7204e0cf606e10559d27704e1cc33098c9a -SIZE (tarsnap-autoconf-1.0.35.tgz) = 600115 +SHA256 (tarsnap-autoconf-1.0.36.tgz) = 2335ccc38c7520bc898d48a8eee575d42107c72bce6e9b414ce441dd649ec968 +SIZE (tarsnap-autoconf-1.0.36.tgz) = 615709 From owner-svn-ports-branches@freebsd.org Fri Aug 21 14:58:45 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C067F9BF213; Fri, 21 Aug 2015 14:58:45 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B106513CC; Fri, 21 Aug 2015 14:58:45 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7LEwjn2019520; Fri, 21 Aug 2015 14:58:45 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7LEwj2W019517; Fri, 21 Aug 2015 14:58:45 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201508211458.t7LEwj2W019517@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Fri, 21 Aug 2015 14:58:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r394958 - branches/2015Q3/www/drupal6 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Aug 2015 14:58:45 -0000 Author: pi Date: Fri Aug 21 14:58:44 2015 New Revision: 394958 URL: https://svnweb.freebsd.org/changeset/ports/394958 Log: MFH: r394913 www/drupal6: 6.36 -> 6.37 - This release fixes security vulnerabilities. Sites are urged to upgrade immediately after reading the notes below and the security announcement: Drupal Core - Critical - Multiple Vulnerabilities - SA-CORE-2015-003 PR: 202526 Submitted by: simon.wright@gmx.net (maintainer) Approved by: ports-secteam Modified: branches/2015Q3/www/drupal6/Makefile branches/2015Q3/www/drupal6/distinfo Modified: branches/2015Q3/www/drupal6/Makefile ============================================================================== --- branches/2015Q3/www/drupal6/Makefile Fri Aug 21 14:26:18 2015 (r394957) +++ branches/2015Q3/www/drupal6/Makefile Fri Aug 21 14:58:44 2015 (r394958) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= drupal6 -PORTVERSION= 6.36 +PORTVERSION= 6.37 CATEGORIES= www MASTER_SITES= http://ftp.drupal.org/files/projects/ DISTNAME= drupal-${PORTVERSION} Modified: branches/2015Q3/www/drupal6/distinfo ============================================================================== --- branches/2015Q3/www/drupal6/distinfo Fri Aug 21 14:26:18 2015 (r394957) +++ branches/2015Q3/www/drupal6/distinfo Fri Aug 21 14:58:44 2015 (r394958) @@ -1,2 +1,2 @@ -SHA256 (drupal/drupal-6.36.tar.gz) = e70fc70c7bb268e262bfa57d265dcc4c88daf17e918619d607aaac7285d22ac4 -SIZE (drupal/drupal-6.36.tar.gz) = 1112226 +SHA256 (drupal/drupal-6.37.tar.gz) = e3db44fdeefa9c4b3edf31816a8cfcaffe300986dbebdc22769ec739d3296d5d +SIZE (drupal/drupal-6.37.tar.gz) = 1112775 From owner-svn-ports-branches@freebsd.org Fri Aug 21 23:20:38 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5A39A9BF0BF; Fri, 21 Aug 2015 23:20:38 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3F87DD75; Fri, 21 Aug 2015 23:20:38 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7LNKcf5044587; Fri, 21 Aug 2015 23:20:38 GMT (envelope-from jhale@FreeBSD.org) Received: (from jhale@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7LNKaiO044582; Fri, 21 Aug 2015 23:20:36 GMT (envelope-from jhale@FreeBSD.org) Message-Id: <201508212320.t7LNKaiO044582@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhale set sender to jhale@FreeBSD.org using -f From: "Jason E. Hale" Date: Fri, 21 Aug 2015 23:20:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r395000 - in branches/2015Q3/graphics: digikam-kde4 libpgf libpgf/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Aug 2015 23:20:38 -0000 Author: jhale Date: Fri Aug 21 23:20:36 2015 New Revision: 395000 URL: https://svnweb.freebsd.org/changeset/ports/395000 Log: MFH: r394934 - Update graphics/libpgf to 7.15.32 - Chase shlib bump Security: 9a71953a-474a-11e5-adde-14dae9d210b8 Approved by: ports-secteam (feld) Deleted: branches/2015Q3/graphics/libpgf/files/patch-configure.ac branches/2015Q3/graphics/libpgf/files/patch-src__Makefile.am Modified: branches/2015Q3/graphics/digikam-kde4/Makefile branches/2015Q3/graphics/libpgf/Makefile branches/2015Q3/graphics/libpgf/distinfo branches/2015Q3/graphics/libpgf/files/patch-Makefile.am branches/2015Q3/graphics/libpgf/pkg-plist Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/graphics/digikam-kde4/Makefile ============================================================================== --- branches/2015Q3/graphics/digikam-kde4/Makefile Fri Aug 21 22:08:34 2015 (r394999) +++ branches/2015Q3/graphics/digikam-kde4/Makefile Fri Aug 21 23:20:36 2015 (r395000) @@ -3,7 +3,7 @@ PORTNAME= digikam PORTVERSION= ${DIGIKAM_VER} -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 2 CATEGORIES= graphics kde Modified: branches/2015Q3/graphics/libpgf/Makefile ============================================================================== --- branches/2015Q3/graphics/libpgf/Makefile Fri Aug 21 22:08:34 2015 (r394999) +++ branches/2015Q3/graphics/libpgf/Makefile Fri Aug 21 23:20:36 2015 (r395000) @@ -1,24 +1,24 @@ # $FreeBSD$ PORTNAME= libpgf -PORTVERSION= 6.14.12 +PORTVERSION= 7.15.32 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}-latest/ \ SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/ -DISTNAME= ${PORTNAME}-src-${PORTVERSION} +DISTNAME= libPGF-codec-and-console-src MAINTAINER= jhale@FreeBSD.org COMMENT= Progressive Graphics Format (PGF) library LICENSE= LGPL21 -USES= autoreconf dos2unix libtool +USES= autoreconf dos2unix libtool zip USE_LDCONFIG= yes DOS2UNIX_FILES= configure.ac GNU_CONFIGURE= yes INSTALL_TARGET= install-strip -WRKSRC= ${WRKDIR}/${PORTNAME} +WRKSRC= ${WRKDIR}/PGF/Codec .include Modified: branches/2015Q3/graphics/libpgf/distinfo ============================================================================== --- branches/2015Q3/graphics/libpgf/distinfo Fri Aug 21 22:08:34 2015 (r394999) +++ branches/2015Q3/graphics/libpgf/distinfo Fri Aug 21 23:20:36 2015 (r395000) @@ -1,2 +1,2 @@ -SHA256 (libpgf-src-6.14.12.tar.gz) = bda5995d80762966a25fca3f6a9821f4458657aa87d8631c014c166ae09258eb -SIZE (libpgf-src-6.14.12.tar.gz) = 91154 +SHA256 (libPGF-codec-and-console-src.zip) = f1dd054b09b0f3651209d67529490b4cbc156a985d8b019ff3bfe575260f4221 +SIZE (libPGF-codec-and-console-src.zip) = 1268177 Modified: branches/2015Q3/graphics/libpgf/files/patch-Makefile.am ============================================================================== --- branches/2015Q3/graphics/libpgf/files/patch-Makefile.am Fri Aug 21 22:08:34 2015 (r394999) +++ branches/2015Q3/graphics/libpgf/files/patch-Makefile.am Fri Aug 21 23:20:36 2015 (r395000) @@ -1,5 +1,5 @@ ---- ./Makefile.am.orig 2012-06-05 08:24:12.000000000 -0400 -+++ ./Makefile.am 2012-06-05 08:26:55.000000000 -0400 +--- Makefile.am.orig 2015-08-06 23:49:54 UTC ++++ Makefile.am @@ -1,9 +1,9 @@ SUBDIRS = src include @@ -13,8 +13,8 @@ PACKAGE = @PACKAGE@ VERSION = @VERSION@ -@@ -20,8 +20,8 @@ - RPMRELEASE=$(PACKAGE_RELEASE) +@@ -22,8 +22,8 @@ RPMRELEASE=$(PACKAGE_RELEASE) + ACLOCAL_AMFLAGS = -I m4 install-data-local:: $(PACKAGE).pc - $(mkinstalldirs) $(DESTDIR)$(libdir)/pkgconfig Modified: branches/2015Q3/graphics/libpgf/pkg-plist ============================================================================== --- branches/2015Q3/graphics/libpgf/pkg-plist Fri Aug 21 22:08:34 2015 (r394999) +++ branches/2015Q3/graphics/libpgf/pkg-plist Fri Aug 21 23:20:36 2015 (r395000) @@ -4,6 +4,6 @@ include/libpgf/PGFstream.h include/libpgf/PGFtypes.h lib/libpgf.a lib/libpgf.so -lib/libpgf.so.6 -lib/libpgf.so.6.0.11 +lib/libpgf.so.7 +lib/libpgf.so.7.0.15 libdata/pkgconfig/libpgf.pc From owner-svn-ports-branches@freebsd.org Sat Aug 22 06:59:18 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C75979C0FB1; Sat, 22 Aug 2015 06:59:18 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B896F86F; Sat, 22 Aug 2015 06:59:18 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7M6xIvC037702; Sat, 22 Aug 2015 06:59:18 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7M6xI1S037700; Sat, 22 Aug 2015 06:59:18 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201508220659.t7M6xI1S037700@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Sat, 22 Aug 2015 06:59:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r395016 - branches/2015Q3/www/drupal7 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Aug 2015 06:59:18 -0000 Author: delphij Date: Sat Aug 22 06:59:17 2015 New Revision: 395016 URL: https://svnweb.freebsd.org/changeset/ports/395016 Log: MFH: r395015 Security Update to 7.39. PR: ports/202527 Submitted by: Simon Wright (maintainer) Approved by: ports-secteam Modified: branches/2015Q3/www/drupal7/Makefile branches/2015Q3/www/drupal7/distinfo Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/www/drupal7/Makefile ============================================================================== --- branches/2015Q3/www/drupal7/Makefile Sat Aug 22 06:58:32 2015 (r395015) +++ branches/2015Q3/www/drupal7/Makefile Sat Aug 22 06:59:17 2015 (r395016) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= drupal7 -PORTVERSION= 7.38 +PORTVERSION= 7.39 CATEGORIES= www MASTER_SITES= http://ftp.drupal.org/files/projects/ DISTNAME= drupal-${PORTVERSION} Modified: branches/2015Q3/www/drupal7/distinfo ============================================================================== --- branches/2015Q3/www/drupal7/distinfo Sat Aug 22 06:58:32 2015 (r395015) +++ branches/2015Q3/www/drupal7/distinfo Sat Aug 22 06:59:17 2015 (r395016) @@ -1,2 +1,2 @@ -SHA256 (drupal/drupal-7.38.tar.gz) = dccf3f12135183e94baaf960ce0993ad99c47afefe830b193cd30a17a317853e -SIZE (drupal/drupal-7.38.tar.gz) = 3247864 +SHA256 (drupal/drupal-7.39.tar.gz) = afad72be4389e2a2dfc630fc8582277ed185d884101978890139e0d14e4ddbab +SIZE (drupal/drupal-7.39.tar.gz) = 3249343 From owner-svn-ports-branches@freebsd.org Sat Aug 22 09:45:45 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7797F9C0724; Sat, 22 Aug 2015 09:45:45 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4BD4717CB; Sat, 22 Aug 2015 09:45:45 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7M9jjtr008557; Sat, 22 Aug 2015 09:45:45 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7M9jjiq008556; Sat, 22 Aug 2015 09:45:45 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201508220945.t7M9jjiq008556@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Sat, 22 Aug 2015 09:45:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r395025 - branches/2015Q3/www/chromium X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Aug 2015 09:45:45 -0000 Author: rene Date: Sat Aug 22 09:45:44 2015 New Revision: 395025 URL: https://svnweb.freebsd.org/changeset/ports/395025 Log: MFH: r395024 Move definitions of MAKE_ARGS up to ensure that chromedriver is built when requested [1] While here sort USES PR: 202560 [1] Submitted by: Carlos J Puga Medina [1] Approved by: ports-secteam (delphij) Modified: branches/2015Q3/www/chromium/Makefile Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/www/chromium/Makefile ============================================================================== --- branches/2015Q3/www/chromium/Makefile Sat Aug 22 09:29:14 2015 (r395024) +++ branches/2015Q3/www/chromium/Makefile Sat Aug 22 09:45:44 2015 (r395025) @@ -55,13 +55,14 @@ RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/l xdg-open:${PORTSDIR}/devel/xdg-utils ONLY_FOR_ARCHS= i386 amd64 -USES= bison compiler:c++11-lib cpe desktop-file-utils jpeg pkgconfig \ - perl5 shebangfix ninja tar:xz python:2,build execinfo +USES= bison compiler:c++11-lib cpe desktop-file-utils execinfo jpeg \ + ninja perl5 pkgconfig python:2,build shebangfix tar:xz CPE_VENDOR= google CPE_PRODUCT= chrome USE_PERL5= build USE_XORG= scrnsaverproto x11 xproto xscrnsaver xtst USE_GNOME= atk glib20 gtk20 dconf libxslt +MAKE_ARGS= -C out/${BUILDTYPE} SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper ALL_TARGET= chrome INSTALLS_ICONS= yes @@ -137,7 +138,7 @@ OPTIONS_SUB= yes GCONF_USE= GNOME=gconf2 PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio - +DRIVER_MAKE_ARGS=chromedriver TEST_DISTFILES= ${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX} BROKEN_FreeBSD_8= Does not compile, missing locale @@ -196,8 +197,6 @@ CONFIGURE_ENV+= CC="${CC}" \ GYP_DEFINES="${GYP_DEFINES}" MAKE_ENV+= BUILDTYPE=${BUILDTYPE} \ GPERF="${LOCALBASE}/bin/gperf" -MAKE_ARGS= -C out/${BUILDTYPE} -DRIVER_MAKE_ARGS=chromedriver .include