diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2016-07-19 11:22:56 -0300 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2016-07-19 11:22:56 -0300 |
| commit | b477a8de4ebb45915691f5967166dcc28d6cf22a (patch) | |
| tree | 13fdfaf6be42b27e91c942391c75afdae57ba091 | |
| parent | 9209b864091c89356be4ac907b8ad268cec2c277 (diff) | |
| parent | 046b2792cc342929ed86bbb185d092541cd24848 (diff) | |
| download | FreeBSD-ports-b477a8de4ebb45915691f5967166dcc28d6cf22a.zip FreeBSD-ports-b477a8de4ebb45915691f5967166dcc28d6cf22a.tar.gz | |
Merge remote-tracking branch 'origin/branches/2016Q3' into RELENG_2_3
106 files changed, 929 insertions, 393 deletions
diff --git a/archivers/p7zip/Makefile b/archivers/p7zip/Makefile index 809bf8bd..5ee63e0 100644 --- a/archivers/p7zip/Makefile +++ b/archivers/p7zip/Makefile @@ -3,6 +3,7 @@ PORTNAME= p7zip PORTVERSION= 15.14 +PORTREVISION?= 1 CATEGORIES= archivers MASTER_SITES= SF DISTNAME= ${PORTNAME}_${DISTVERSION}_src_all diff --git a/archivers/p7zip/files/patch-CPP_7zip_Archive_HfsHandler.cpp b/archivers/p7zip/files/patch-CPP_7zip_Archive_HfsHandler.cpp new file mode 100644 index 0000000..2ff5cd7 --- /dev/null +++ b/archivers/p7zip/files/patch-CPP_7zip_Archive_HfsHandler.cpp @@ -0,0 +1,25 @@ +Patch for CVE-2016-2334. + +Obtained from: https://sourceforge.net/p/p7zip/discussion/383043/thread/9d0fb86b/ +--- CPP/7zip/Archive/HfsHandler.cpp.orig Fri Jun 19 06:52:08 2015 ++++ CPP/7zip/Archive/HfsHandler.cpp Mon May 23 20:37:42 2016 +@@ -987,7 +987,9 @@ HRESULT CDatabase::LoadCatalog(const CFork &fork, cons + item.GroupID = Get32(r + 0x24); + item.AdminFlags = r[0x28]; + item.OwnerFlags = r[0x29]; ++ */ + item.FileMode = Get16(r + 0x2A); ++ /* + item.special.iNodeNum = Get16(r + 0x2C); // or .linkCount + item.FileType = Get32(r + 0x30); + item.FileCreator = Get32(r + 0x34); +@@ -1571,6 +1573,9 @@ HRESULT CHandler::ExtractZlibFile( + blockSize = (UInt32)rem; + + UInt32 size = GetUi32(tableBuf + i * 8 + 4); ++ ++ if (size > buf.Size() || size > kCompressionBlockSize + 1) ++ return S_FALSE; + + RINOK(ReadStream_FALSE(inStream, buf, size)); + diff --git a/archivers/p7zip/files/patch-CPP_7zip_Archive_Udf_UdfIn.cpp b/archivers/p7zip/files/patch-CPP_7zip_Archive_Udf_UdfIn.cpp new file mode 100644 index 0000000..54c5006 --- /dev/null +++ b/archivers/p7zip/files/patch-CPP_7zip_Archive_Udf_UdfIn.cpp @@ -0,0 +1,18 @@ +Patch for CVE-2016-2335. + +Obtained from: https://sourceforge.net/p/p7zip/discussion/383043/thread/9d0fb86b/ +--- CPP/7zip/Archive/Udf/UdfIn.cpp.orig Fri Nov 20 15:40:08 2015 ++++ CPP/7zip/Archive/Udf/UdfIn.cpp Mon May 23 20:37:46 2016 +@@ -389,7 +389,11 @@ HRESULT CInArchive::ReadFileItem(int volIndex, int fsI + return S_FALSE; + CFile &file = Files.Back(); + const CLogVol &vol = LogVols[volIndex]; +- CPartition &partition = Partitions[vol.PartitionMaps[lad.Location.PartitionRef].PartitionIndex]; ++ unsigned partitionRef = lad.Location.PartitionRef; ++ ++ if (partitionRef >= vol.PartitionMaps.Size()) ++ return S_FALSE; ++ CPartition &partition = Partitions[vol.PartitionMaps[partitionRef].PartitionIndex]; + + UInt32 key = lad.Location.Pos; + UInt32 value; diff --git a/devel/p4/Makefile b/devel/p4/Makefile index 84a1584..a052906 100644 --- a/devel/p4/Makefile +++ b/devel/p4/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= p4 -PORTVERSION= 2015.1.1384697 +PORTVERSION= 2016.1.1411799 CATEGORIES= devel MASTER_SITES= ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ \ http://filehost.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ diff --git a/devel/p4/Makefile.inc b/devel/p4/Makefile.inc index d0e769f..e54facf 100644 --- a/devel/p4/Makefile.inc +++ b/devel/p4/Makefile.inc @@ -7,14 +7,14 @@ ONLY_FOR_ARCHS?= amd64 i386 . if ${OSVERSION} >= 1000100 PLATFORM= freebsd100x86_64 . else -PLATFORM= freebsd70x86_64 +IGNORE= unsupported OS release, sorry . endif .elif ${ARCH} == i386 . if ${OSVERSION} >= 1000100 PLATFORM= freebsd100x86 . else -PLATFORM= freebsd70x86 +IGNORE= unsupported OS release, sorry . endif .else diff --git a/devel/p4/distinfo.freebsd100x86 b/devel/p4/distinfo.freebsd100x86 index c705acb..323aec2 100644 --- a/devel/p4/distinfo.freebsd100x86 +++ b/devel/p4/distinfo.freebsd100x86 @@ -1,2 +1,3 @@ -SHA256 (perforce/2015.1.1384697/bin.freebsd100x86/p4) = 4a6c85571f06b4ff9477dcb5258b3ba652e4e167566f04932ea54e53df23d9c9 -SIZE (perforce/2015.1.1384697/bin.freebsd100x86/p4) = 2537872 +TIMESTAMP = 1468601506 +SHA256 (perforce/2016.1.1411799/bin.freebsd100x86/p4) = 135720e2ae526f6340c8278897bca2aaa2d9f539a8d2625235f362658712d2fb +SIZE (perforce/2016.1.1411799/bin.freebsd100x86/p4) = 3072840 diff --git a/devel/p4/distinfo.freebsd100x86_64 b/devel/p4/distinfo.freebsd100x86_64 index 5a64859..c997653 100644 --- a/devel/p4/distinfo.freebsd100x86_64 +++ b/devel/p4/distinfo.freebsd100x86_64 @@ -1,2 +1,3 @@ -SHA256 (perforce/2015.1.1384697/bin.freebsd100x86_64/p4) = 9dedcaf430156679fc6d76c766f6db61434f3bad1ebce274a0397c8cc4c646e0 -SIZE (perforce/2015.1.1384697/bin.freebsd100x86_64/p4) = 2795184 +TIMESTAMP = 1468601502 +SHA256 (perforce/2016.1.1411799/bin.freebsd100x86_64/p4) = 71894b9b8bdd5627640e4756ef4474d26ea6217f708334eeb31a06ad1d884bcb +SIZE (perforce/2016.1.1411799/bin.freebsd100x86_64/p4) = 3334728 diff --git a/devel/p4/distinfo.freebsd70x86 b/devel/p4/distinfo.freebsd70x86 deleted file mode 100644 index c5c16b2..0000000 --- a/devel/p4/distinfo.freebsd70x86 +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (perforce/2015.1.1384697/bin.freebsd70x86/p4) = 2f2f1a4f7131ae01fc9f684ff4ecca2dbecc24e56d32de6927931d2b627ceb79 -SIZE (perforce/2015.1.1384697/bin.freebsd70x86/p4) = 2612156 diff --git a/devel/p4/distinfo.freebsd70x86_64 b/devel/p4/distinfo.freebsd70x86_64 deleted file mode 100644 index 1a0c975..0000000 --- a/devel/p4/distinfo.freebsd70x86_64 +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (perforce/2015.1.1384697/bin.freebsd70x86_64/p4) = c4617e864aae46d6b1f49e764160171dc13f65b54447c24c47d38b9b18359e0e -SIZE (perforce/2015.1.1384697/bin.freebsd70x86_64/p4) = 2778456 diff --git a/devel/p4api/Makefile b/devel/p4api/Makefile index 878cab8..7ef0d41 100644 --- a/devel/p4api/Makefile +++ b/devel/p4api/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= p4api -PORTVERSION= 2015.1.1384697 +PORTVERSION= 2016.1.1411799 CATEGORIES= devel MASTER_SITES= ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/:tar \ ftp://ftp.perforce.com/perforce/${P4VERSION}/doc/manuals/p4api/:pdf diff --git a/devel/p4api/distinfo.freebsd100x86 b/devel/p4api/distinfo.freebsd100x86 index a797d44..f691b4f 100644 --- a/devel/p4api/distinfo.freebsd100x86 +++ b/devel/p4api/distinfo.freebsd100x86 @@ -1,4 +1,5 @@ -SHA256 (perforce/2015.1.1384697/bin.freebsd100x86/p4api.tgz) = f070bf6501854316a81787dd125f4bbf349c1cd51ed6bd975b03da75d68b7c7b -SIZE (perforce/2015.1.1384697/bin.freebsd100x86/p4api.tgz) = 1434822 -SHA256 (perforce/2015.1.1384697/bin.freebsd100x86/p4api.pdf) = 16e6e6548fe4e51210239cc643b08f07ed97159f004a7ef513cfd6f16403e1bd -SIZE (perforce/2015.1.1384697/bin.freebsd100x86/p4api.pdf) = 1623596 +TIMESTAMP = 1468601594 +SHA256 (perforce/2016.1.1411799/bin.freebsd100x86/p4api.tgz) = 66d9c5e8362c4bd475c2ea4058c1a3197c1e17505b4ec56b1b31a27c6bbed11b +SIZE (perforce/2016.1.1411799/bin.freebsd100x86/p4api.tgz) = 3901043 +SHA256 (perforce/2016.1.1411799/bin.freebsd100x86/p4api.pdf) = 601bc053b9b5316b71981449df76b32b9ca318a99752d3d5f46b46327bdc67b8 +SIZE (perforce/2016.1.1411799/bin.freebsd100x86/p4api.pdf) = 1908708 diff --git a/devel/p4api/distinfo.freebsd100x86_64 b/devel/p4api/distinfo.freebsd100x86_64 index 83cadfb..6fbc108 100644 --- a/devel/p4api/distinfo.freebsd100x86_64 +++ b/devel/p4api/distinfo.freebsd100x86_64 @@ -1,4 +1,5 @@ -SHA256 (perforce/2015.1.1384697/bin.freebsd100x86_64/p4api.tgz) = dcacdee2067848406e9a985ee7bce40910b91e285db5123ad1f1d45bf784fe4c -SIZE (perforce/2015.1.1384697/bin.freebsd100x86_64/p4api.tgz) = 1470120 -SHA256 (perforce/2015.1.1384697/bin.freebsd100x86_64/p4api.pdf) = 16e6e6548fe4e51210239cc643b08f07ed97159f004a7ef513cfd6f16403e1bd -SIZE (perforce/2015.1.1384697/bin.freebsd100x86_64/p4api.pdf) = 1623596 +TIMESTAMP = 1468601587 +SHA256 (perforce/2016.1.1411799/bin.freebsd100x86_64/p4api.tgz) = 36047b7db9cff24dc1dbbcd12a005915bb1c12fd3147b304c9c64b51498fe0c4 +SIZE (perforce/2016.1.1411799/bin.freebsd100x86_64/p4api.tgz) = 4165577 +SHA256 (perforce/2016.1.1411799/bin.freebsd100x86_64/p4api.pdf) = 601bc053b9b5316b71981449df76b32b9ca318a99752d3d5f46b46327bdc67b8 +SIZE (perforce/2016.1.1411799/bin.freebsd100x86_64/p4api.pdf) = 1908708 diff --git a/devel/p4api/distinfo.freebsd70x86 b/devel/p4api/distinfo.freebsd70x86 deleted file mode 100644 index e2ba646..0000000 --- a/devel/p4api/distinfo.freebsd70x86 +++ /dev/null @@ -1,4 +0,0 @@ -SHA256 (perforce/2015.1.1384697/bin.freebsd70x86/p4api.tgz) = a3178e8de513decbd0289355f4fb7f53238f3220653960b1ad9c97059fefe746 -SIZE (perforce/2015.1.1384697/bin.freebsd70x86/p4api.tgz) = 1448361 -SHA256 (perforce/2015.1.1384697/bin.freebsd70x86/p4api.pdf) = 16e6e6548fe4e51210239cc643b08f07ed97159f004a7ef513cfd6f16403e1bd -SIZE (perforce/2015.1.1384697/bin.freebsd70x86/p4api.pdf) = 1623596 diff --git a/devel/p4api/distinfo.freebsd70x86_64 b/devel/p4api/distinfo.freebsd70x86_64 deleted file mode 100644 index 468760e..0000000 --- a/devel/p4api/distinfo.freebsd70x86_64 +++ /dev/null @@ -1,4 +0,0 @@ -SHA256 (perforce/2015.1.1384697/bin.freebsd70x86_64/p4api.tgz) = 2bb7ad7946cee01db2a8712092de71a9d1c480b17dfa971efd1ad3abc287e551 -SIZE (perforce/2015.1.1384697/bin.freebsd70x86_64/p4api.tgz) = 1468147 -SHA256 (perforce/2015.1.1384697/bin.freebsd70x86_64/p4api.pdf) = 16e6e6548fe4e51210239cc643b08f07ed97159f004a7ef513cfd6f16403e1bd -SIZE (perforce/2015.1.1384697/bin.freebsd70x86_64/p4api.pdf) = 1623596 diff --git a/devel/p4api/pkg-plist b/devel/p4api/pkg-plist index 3a1ad9e..04e0d26 100644 --- a/devel/p4api/pkg-plist +++ b/devel/p4api/pkg-plist @@ -9,6 +9,7 @@ include/perforce/clientuser.h include/perforce/datetime.h include/perforce/debug.h include/perforce/diff.h +include/perforce/diffmerge.h include/perforce/echoctl.h include/perforce/enviro.h include/perforce/error.h @@ -22,6 +23,8 @@ include/perforce/ident.h include/perforce/ignore.h include/perforce/keepalive.h include/perforce/macfile.h +include/perforce/macutil.h +include/perforce/mangle.h include/perforce/mapapi.h include/perforce/md5.h include/perforce/msgclient.h @@ -40,6 +43,7 @@ include/perforce/options.h include/perforce/p4tags.h include/perforce/pathsys.h include/perforce/runcmd.h +include/perforce/serverhelperapi.h include/perforce/signaler.h include/perforce/spec.h include/perforce/stdhdrs.h @@ -64,3 +68,4 @@ lib/perforce/libsupp.a %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Version %%PORTEXAMPLES%%%%EXAMPLESDIR%%/clientuser.cc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/p4api.cc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/p4dvcsapi.cc diff --git a/devel/p4d/Makefile b/devel/p4d/Makefile index b3a353a..5b6df25 100644 --- a/devel/p4d/Makefile +++ b/devel/p4d/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= p4d -PORTVERSION= 2015.1.1384697 +PORTVERSION= 2016.1.1411799 CATEGORIES= devel MASTER_SITES= ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ \ http://filehost.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ diff --git a/devel/p4d/distinfo.freebsd100x86 b/devel/p4d/distinfo.freebsd100x86 index 8a94514..bb3d2d5 100644 --- a/devel/p4d/distinfo.freebsd100x86 +++ b/devel/p4d/distinfo.freebsd100x86 @@ -1,2 +1,3 @@ -SHA256 (perforce/2015.1.1384697/bin.freebsd100x86/p4d) = db23a2c1ac3514a61a362aa08dc632695080a91d324504cd4f27fb662e3af1fe -SIZE (perforce/2015.1.1384697/bin.freebsd100x86/p4d) = 5208536 +TIMESTAMP = 1468601645 +SHA256 (perforce/2016.1.1411799/bin.freebsd100x86/p4d) = 4e230f2d1b9c27ad7a0cd09ee064ee372aff021addf5b1df51528ad005dfb781 +SIZE (perforce/2016.1.1411799/bin.freebsd100x86/p4d) = 5758152 diff --git a/devel/p4d/distinfo.freebsd100x86_64 b/devel/p4d/distinfo.freebsd100x86_64 index 7cb581f..c7d6c8c 100644 --- a/devel/p4d/distinfo.freebsd100x86_64 +++ b/devel/p4d/distinfo.freebsd100x86_64 @@ -1,2 +1,3 @@ -SHA256 (perforce/2015.1.1384697/bin.freebsd100x86_64/p4d) = 04b96019640a0934fe92ea0e3e699a8dd724278486168d3bda18051e06411e3d -SIZE (perforce/2015.1.1384697/bin.freebsd100x86_64/p4d) = 5361008 +TIMESTAMP = 1468601641 +SHA256 (perforce/2016.1.1411799/bin.freebsd100x86_64/p4d) = 2d699bd51b0e461fc1a4726aaac9e9896ae85b78e7e8cefcbc138d6e15260f96 +SIZE (perforce/2016.1.1411799/bin.freebsd100x86_64/p4d) = 5892472 diff --git a/devel/p4d/distinfo.freebsd70x86 b/devel/p4d/distinfo.freebsd70x86 deleted file mode 100644 index 25cd57c..0000000 --- a/devel/p4d/distinfo.freebsd70x86 +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (perforce/2015.1.1384697/bin.freebsd70x86/p4d) = c51acc46f7cb676294e8d094c1431321330427ce6a11384c1503f6767e87e237 -SIZE (perforce/2015.1.1384697/bin.freebsd70x86/p4d) = 5574716 diff --git a/devel/p4d/distinfo.freebsd70x86_64 b/devel/p4d/distinfo.freebsd70x86_64 deleted file mode 100644 index 61bf321..0000000 --- a/devel/p4d/distinfo.freebsd70x86_64 +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (perforce/2015.1.1384697/bin.freebsd70x86_64/p4d) = 5ef6be917a1d7196be6503aae69b64e029b41a7e8c48d4f9d93af476f26e6d4a -SIZE (perforce/2015.1.1384697/bin.freebsd70x86_64/p4d) = 5754872 diff --git a/devel/p4ftpd/Makefile b/devel/p4ftpd/Makefile index 2b75b63..54d6545 100644 --- a/devel/p4ftpd/Makefile +++ b/devel/p4ftpd/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= p4ftpd -PORTVERSION= 2015.1.1384697 +PORTVERSION= 2016.1.1387479 CATEGORIES= devel MASTER_SITES= ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ \ http://filehost.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ diff --git a/devel/p4ftpd/distinfo.freebsd100x86 b/devel/p4ftpd/distinfo.freebsd100x86 index a810f63..6acd35c 100644 --- a/devel/p4ftpd/distinfo.freebsd100x86 +++ b/devel/p4ftpd/distinfo.freebsd100x86 @@ -1,2 +1,3 @@ -SHA256 (perforce/2015.1.1384697/bin.freebsd100x86/p4ftpd) = ae68ed35dcce72afa2e50ae550c33d71b3afb792a803db1b585ed78f6db8024d -SIZE (perforce/2015.1.1384697/bin.freebsd100x86/p4ftpd) = 2582272 +TIMESTAMP = 1467868251 +SHA256 (perforce/2016.1.1387479/bin.freebsd100x86/p4ftpd) = 0b65a6d7e09d229a71bb3a47d51abda6daeadaeca098f59b8417653b5b194b3c +SIZE (perforce/2016.1.1387479/bin.freebsd100x86/p4ftpd) = 2633452 diff --git a/devel/p4ftpd/distinfo.freebsd100x86_64 b/devel/p4ftpd/distinfo.freebsd100x86_64 index 6b892ca..18a9e6c 100644 --- a/devel/p4ftpd/distinfo.freebsd100x86_64 +++ b/devel/p4ftpd/distinfo.freebsd100x86_64 @@ -1,2 +1,3 @@ -SHA256 (perforce/2015.1.1384697/bin.freebsd100x86_64/p4ftpd) = 4fef3546a731e7f7b1c74bf8bb9c6c7c5afa7d3d74136af16c4151fc7237dbc5 -SIZE (perforce/2015.1.1384697/bin.freebsd100x86_64/p4ftpd) = 2840992 +TIMESTAMP = 1467701312 +SHA256 (perforce/2016.1.1387479/bin.freebsd100x86_64/p4ftpd) = d87a021072099e368d5266ac196216dd5c61be66dae4d7b0551be5190d6f6c0a +SIZE (perforce/2016.1.1387479/bin.freebsd100x86_64/p4ftpd) = 2890456 diff --git a/devel/p4ftpd/distinfo.freebsd70x86 b/devel/p4ftpd/distinfo.freebsd70x86 deleted file mode 100644 index f12b4da..0000000 --- a/devel/p4ftpd/distinfo.freebsd70x86 +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (perforce/2015.1.1384697/bin.freebsd70x86/p4ftpd) = 5c32eb20b4c976805ba69a690f8ded3fe69f7d0782249fb808e222899735bb32 -SIZE (perforce/2015.1.1384697/bin.freebsd70x86/p4ftpd) = 2656688 diff --git a/devel/p4ftpd/distinfo.freebsd70x86_64 b/devel/p4ftpd/distinfo.freebsd70x86_64 deleted file mode 100644 index 1d51b34..0000000 --- a/devel/p4ftpd/distinfo.freebsd70x86_64 +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (perforce/2015.1.1384697/bin.freebsd70x86_64/p4ftpd) = f5c56a9db0529c5612e423e55addaa7d6077916182760b4dc0ab72f999d3e39f -SIZE (perforce/2015.1.1384697/bin.freebsd70x86_64/p4ftpd) = 2827720 diff --git a/devel/p4p/Makefile b/devel/p4p/Makefile index 4cc55e3..4251198 100644 --- a/devel/p4p/Makefile +++ b/devel/p4p/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= p4p -PORTVERSION= 2015.1.1384697 +PORTVERSION= 2016.1.1404799 CATEGORIES= devel MASTER_SITES= ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ \ http://filehost.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ diff --git a/devel/p4p/distinfo.freebsd100x86 b/devel/p4p/distinfo.freebsd100x86 index 4623968..ed1bd43 100644 --- a/devel/p4p/distinfo.freebsd100x86 +++ b/devel/p4p/distinfo.freebsd100x86 @@ -1,2 +1,3 @@ -SHA256 (perforce/2015.1.1384697/bin.freebsd100x86/p4p) = 08ad15fcb958705c0f6c849971337732204ed0883151c93a5110be6074d9f2eb -SIZE (perforce/2015.1.1384697/bin.freebsd100x86/p4p) = 2338644 +TIMESTAMP = 1467701344 +SHA256 (perforce/2016.1.1404799/bin.freebsd100x86/p4p) = 3f36f51e9aab3209f9660efb1d917300e831a831bdaa63936b0618d936b8976a +SIZE (perforce/2016.1.1404799/bin.freebsd100x86/p4p) = 2438480 diff --git a/devel/p4p/distinfo.freebsd100x86_64 b/devel/p4p/distinfo.freebsd100x86_64 index e7d1a0d..7b9d5da 100644 --- a/devel/p4p/distinfo.freebsd100x86_64 +++ b/devel/p4p/distinfo.freebsd100x86_64 @@ -1,2 +1,3 @@ -SHA256 (perforce/2015.1.1384697/bin.freebsd100x86_64/p4p) = b80ec1ec6de65e62a3e0aec0805a8bba88e4c6203feac0bd938f2ae41e59f5f7 -SIZE (perforce/2015.1.1384697/bin.freebsd100x86_64/p4p) = 2607536 +TIMESTAMP = 1467701341 +SHA256 (perforce/2016.1.1404799/bin.freebsd100x86_64/p4p) = 73132d3092ac0f835d4d57f2f5014487692eafff75afe7ae5df2102a53abc540 +SIZE (perforce/2016.1.1404799/bin.freebsd100x86_64/p4p) = 2706664 diff --git a/devel/p4p/distinfo.freebsd70x86 b/devel/p4p/distinfo.freebsd70x86 deleted file mode 100644 index 752d586..0000000 --- a/devel/p4p/distinfo.freebsd70x86 +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (perforce/2015.1.1384697/bin.freebsd70x86/p4p) = 6f7f0b5ffdd319ee846a1fc098a8c89d459c947e87c813410019d8f0f7c661cd -SIZE (perforce/2015.1.1384697/bin.freebsd70x86/p4p) = 2381692 diff --git a/devel/p4p/distinfo.freebsd70x86_64 b/devel/p4p/distinfo.freebsd70x86_64 deleted file mode 100644 index cdf7ccc..0000000 --- a/devel/p4p/distinfo.freebsd70x86_64 +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (perforce/2015.1.1384697/bin.freebsd70x86_64/p4p) = 64454192594ccab9ed3b11541e3c54b6013e18c30e2c7df782f2257353acbbaf -SIZE (perforce/2015.1.1384697/bin.freebsd70x86_64/p4p) = 2585176 diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile index 64e67ee..7adcd21 100644 --- a/dns/bind9-devel/Makefile +++ b/dns/bind9-devel/Makefile @@ -13,11 +13,11 @@ DISTNAME= ${PORTNAME}9-${HASH} MAINTAINER= mat@FreeBSD.org COMMENT= BIND DNS suite with updated DNSSEC and DNS64 -LICENSE= ISCL +LICENSE= MPL # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.11.0.a20160627 -HASH= 33d0a77 +ISCVERSION= 9.12.0a.2016.07.14 +HASH= 203b693 MAKE_JOBS_UNSAFE= yes diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo index a56ff38..fbebb20 100644 --- a/dns/bind9-devel/distinfo +++ b/dns/bind9-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1467029021 -SHA256 (bind9-33d0a77.tar.gz) = 87a43c83b074357d4af9dbd131ba268c35b2dfd9497c5c56cf5bac2815375a2c -SIZE (bind9-33d0a77.tar.gz) = 11759207 +TIMESTAMP = 1468926927 +SHA256 (bind9-203b693.tar.gz) = 1702e2e597c88234c319b2ab83a286e28e6e58e23790858d0165dee6de1f5957 +SIZE (bind9-203b693.tar.gz) = 11763050 diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl index 95193c9..7639b30 100644 --- a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl +++ b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl @@ -1,4 +1,4 @@ ---- bin/named/config.c.orig 2016-06-27 05:29:38 UTC +--- bin/named/config.c.orig 2016-07-14 05:13:57 UTC +++ bin/named/config.c @@ -151,6 +151,8 @@ options {\n\ lame-ttl 600;\n\ @@ -9,9 +9,9 @@ max-cache-ttl 604800; /* 1 week */\n\ transfer-format many-answers;\n\ max-cache-size 90%;\n\ ---- bin/named/server.c.orig 2016-06-27 05:29:38 UTC +--- bin/named/server.c.orig 2016-07-14 05:13:57 UTC +++ bin/named/server.c -@@ -3521,6 +3521,16 @@ configure_view(dns_view_t *view, dns_vie +@@ -3549,6 +3549,16 @@ configure_view(dns_view_t *view, dns_vie } obj = NULL; @@ -28,7 +28,7 @@ result = ns_config_get(maps, "max-cache-ttl", &obj); INSIST(result == ISC_R_SUCCESS); view->maxcachettl = cfg_obj_asuint32(obj); ---- lib/dns/include/dns/view.h.orig 2016-06-27 05:29:38 UTC +--- lib/dns/include/dns/view.h.orig 2016-07-14 05:13:57 UTC +++ lib/dns/include/dns/view.h @@ -145,6 +145,8 @@ struct dns_view { isc_boolean_t requestnsid; @@ -39,7 +39,7 @@ dns_ttl_t maxncachettl; isc_uint32_t nta_lifetime; isc_uint32_t nta_recheck; ---- lib/dns/resolver.c.orig 2016-06-27 05:29:38 UTC +--- lib/dns/resolver.c.orig 2016-07-14 05:13:57 UTC +++ lib/dns/resolver.c @@ -5431,6 +5431,18 @@ cache_name(fetchctx_t *fctx, dns_name_t } @@ -60,7 +60,7 @@ * Enforce the configure maximum cache TTL. */ if (rdataset->ttl > res->view->maxcachettl) ---- lib/isccfg/namedconf.c.orig 2016-06-27 05:29:38 UTC +--- lib/isccfg/namedconf.c.orig 2016-07-14 05:13:57 UTC +++ lib/isccfg/namedconf.c @@ -1707,6 +1707,8 @@ view_clauses[] = { { "nosit-udp-size", &cfg_type_uint32, CFG_CLAUSEFLAG_OBSOLETE }, diff --git a/dns/bind9-devel/files/patch-configure b/dns/bind9-devel/files/patch-configure index 55acdbe..da037e5 100644 --- a/dns/bind9-devel/files/patch-configure +++ b/dns/bind9-devel/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2016-06-27 05:29:38 UTC +--- configure.orig 2016-07-14 05:13:57 UTC +++ configure -@@ -14205,27 +14205,9 @@ done +@@ -14338,27 +14338,9 @@ done # problems start to show up. saved_libs="$LIBS" for TRY_LIBS in \ @@ -30,7 +30,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking linking as $TRY_LIBS" >&5 $as_echo_n "checking linking as $TRY_LIBS... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -14268,47 +14250,7 @@ $as_echo "no" >&6; } ;; +@@ -14401,47 +14383,7 @@ $as_echo "no" >&6; } ;; no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;; esac @@ -79,7 +79,7 @@ DNS_GSSAPI_LIBS="$LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5 -@@ -22147,7 +22089,7 @@ $as_echo "" >&6; } +@@ -22318,7 +22260,7 @@ $as_echo "" >&6; } # Check other locations for includes. # Order is important (sigh). diff --git a/dns/bind910/Makefile b/dns/bind910/Makefile index a82981bc..450ecfe 100644 --- a/dns/bind910/Makefile +++ b/dns/bind910/Makefile @@ -29,7 +29,7 @@ COMMENT= BIND DNS suite with updated DNSSEC and DNS64 LICENSE= ISCL # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.10.4-P1 +ISCVERSION= 9.10.4-P2 MAKE_JOBS_UNSAFE= yes diff --git a/dns/bind910/distinfo b/dns/bind910/distinfo index 7ae67c2..39e9db2 100644 --- a/dns/bind910/distinfo +++ b/dns/bind910/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1464252479 -SHA256 (bind-9.10.4-P1.tar.gz) = 7c3b7d1afe48a6bbead8f11f6971fb09eb57fa257dc32a088fcc20a0218131a2 -SIZE (bind-9.10.4-P1.tar.gz) = 9293605 +TIMESTAMP = 1468926862 +SHA256 (bind-9.10.4-P2.tar.gz) = b35b8af8fe030196d03b3e487f5ecd0c0836b5e124abc7a3ecd184740b444423 +SIZE (bind-9.10.4-P2.tar.gz) = 9298010 diff --git a/dns/bind99/Makefile b/dns/bind99/Makefile index 7d4065a..e5c49e1 100644 --- a/dns/bind99/Makefile +++ b/dns/bind99/Makefile @@ -15,7 +15,7 @@ COMMENT= BIND DNS suite with updated DNSSEC and DNS64 LICENSE= ISCL # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.9.9-P1 +ISCVERSION= 9.9.9-P2 MAKE_JOBS_UNSAFE= yes diff --git a/dns/bind99/distinfo b/dns/bind99/distinfo index b2874b3..c5d0ef7 100644 --- a/dns/bind99/distinfo +++ b/dns/bind99/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1464252734 -SHA256 (bind-9.9.9-P1.tar.gz) = 9bcc76b8cbee2e64210e80fc6b57a8e8ff07780f994f87d5a2aa312cdfa24aa4 -SIZE (bind-9.9.9-P1.tar.gz) = 8758793 -SHA256 (9.9.9-P1-rpz2+rl.14038.05.patch.xz) = 230ab0dbf30e8cf956ea6557d00046618abe158cb2fc3c2204c021ace58e5588 -SIZE (9.9.9-P1-rpz2+rl.14038.05.patch.xz) = 39284 +TIMESTAMP = 1468930264 +SHA256 (bind-9.9.9-P2.tar.gz) = 7746cc29071cb7e10f10be013cea836a3027b820a367ce3986cd366c01863bf2 +SIZE (bind-9.9.9-P2.tar.gz) = 8762371 +SHA256 (9.9.9-P2-rpz2+rl.14038.05.patch.xz) = d7ddc47641b95f4135baf6c7fd1e39ce06a599e1a97ba589e11c02d3be28ceed +SIZE (9.9.9-P2-rpz2+rl.14038.05.patch.xz) = 39288 diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile index ebe0d9b..d7230f0 100644 --- a/editors/openoffice-4/Makefile +++ b/editors/openoffice-4/Makefile @@ -3,7 +3,7 @@ PORTNAME= apache-openoffice PORTVERSION= ${AOOVERSION} -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= editors java MASTER_SITES= APACHE/openoffice/${PORTVERSION}/source \ http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \ @@ -47,50 +47,50 @@ LICENSE_PERMS_TWAIN= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LICENSE_PERMS_W3C= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept BUILD_DEPENDS= \ - p5-Archive-Zip>=0:archivers/p5-Archive-Zip \ - p5-libwww>=0:www/p5-libwww \ - p5-XML-Parser>=0:textproc/p5-XML-Parser \ - ${LOCALBASE}/bin/unzip:archivers/unzip \ - zip:archivers/zip \ - ant:devel/apache-ant \ + p5-Archive-Zip>=0:archivers/p5-Archive-Zip \ + p5-libwww>=0:www/p5-libwww \ + p5-XML-Parser>=0:textproc/p5-XML-Parser \ + ${LOCALBASE}/bin/unzip:archivers/unzip \ + zip:archivers/zip \ + ant:devel/apache-ant \ ${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs \ - dmake:devel/dmake \ - epm:devel/epm \ - ${LOCALBASE}/bin/gperf:devel/gperf \ - imake:devel/imake \ - gpatch:devel/patch \ - ${LOCALBASE}/include/sane/sane.h:graphics/sane-backends \ - ${LOCALBASE}/bin/vigra-config:graphics/vigra \ + dmake:devel/dmake \ + epm:devel/epm \ + ${LOCALBASE}/bin/gperf:devel/gperf \ + imake:devel/imake \ + gpatch:devel/patch \ + ${LOCALBASE}/include/sane/sane.h:graphics/sane-backends \ + ${LOCALBASE}/bin/vigra-config:graphics/vigra \ ${JAVALIBDIR}/commons-httpclient.jar:java/jakarta-commons-httpclient \ ${JAVALIBDIR}/commons-lang.jar:java/jakarta-commons-lang \ - ${JAVALIBDIR}/junit.jar:java/junit \ - ${JAVALIBDIR}/bsh.jar:lang/bsh \ - bash:shells/bash \ - ${JAVALIBDIR}/lucene-core-3.6.2.jar:textproc/lucene \ + ${JAVALIBDIR}/junit.jar:java/junit \ + ${JAVALIBDIR}/bsh.jar:lang/bsh \ + bash:shells/bash \ + ${JAVALIBDIR}/lucene-core-3.6.2.jar:textproc/lucene \ p5-libwww>=0:www/p5-libwww LIB_DEPENDS= \ - libapr-1.so:devel/apr1 \ - libnspr4.so:devel/nspr \ - libcurl.so:ftp/curl \ - libcairo.so:graphics/cairo \ - libpng.so:graphics/png \ - libpoppler-glib.so:graphics/poppler-glib \ - libgraphite.so:graphics/silgraphite \ - libCoinMP.so:math/coinmp \ - libfreetype.so:print/freetype2 \ - libnss3.so:security/nss \ - libexpat.so:textproc/expat2 \ - libhunspell-1.3.so:textproc/hunspell \ - libhyphen.so:textproc/hyphen \ - libtextcat.so:textproc/libtextcat \ - libmythes-1.2.so:textproc/mythes \ - librdf.so:textproc/redland \ - libserf-1.so:www/serf \ + libapr-1.so:devel/apr1 \ + libnspr4.so:devel/nspr \ + libcurl.so:ftp/curl \ + libcairo.so:graphics/cairo \ + libpng.so:graphics/png \ + libpoppler-glib.so:graphics/poppler-glib \ + libgraphite.so:graphics/silgraphite \ + libCoinMP.so:math/coinmp \ + libfreetype.so:print/freetype2 \ + libnss3.so:security/nss \ + libexpat.so:textproc/expat2 \ + libhunspell-1.3.so:textproc/hunspell \ + libhyphen.so:textproc/hyphen \ + libtextcat.so:textproc/libtextcat \ + libmythes-1.2.so:textproc/mythes \ + librdf.so:textproc/redland \ + libserf-1.so:www/serf \ libfontconfig.so:x11-fonts/fontconfig RUN_DEPENDS= \ ${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme \ ${JAVALIBDIR}/commons-httpclient.jar:java/jakarta-commons-httpclient \ - ${JAVALIBDIR}/bsh.jar:lang/bsh \ + ${JAVALIBDIR}/bsh.jar:lang/bsh \ ${LOCALBASE}/share/fonts/Caladea/Caladea-Bold.ttf:x11-fonts/crosextrafonts-caladea-ttf \ ${LOCALBASE}/share/fonts/Carlito/Carlito-Bold.ttf:x11-fonts/crosextrafonts-carlito-ttf \ ${LOCALBASE}/share/fonts/ChromeOS/Arimo-Bold.ttf:x11-fonts/croscorefonts-fonts-ttf @@ -113,6 +113,7 @@ INSTALLATION_BASEDIR?= openoffice-${AOOSUFFIX} PRINSTALLATION_BASEDIR= ${PREFIX}/${INSTALLATION_BASEDIR} OOPATH= ${PRINSTALLATION_BASEDIR}/openoffice${AOOVERSION1} XDGDIR= ${OOPATH}/share/xdg +XDGREL= ../../${INSTALLATION_BASEDIR}/openoffice${AOOVERSION1}/share/xdg EXECBASE?= openoffice-${AOOSUFFIX} ONLY_FOR_ARCHS= i386 amd64 @@ -125,12 +126,12 @@ JAVA_RUN= jdk JAVA_VENDOR= openjdk JAVA_VERSION= 1.6+ USE_PERL5= build -USE_XORG= ice x11 xau xaw xcomposite xcursor xdamage xext xfixes xi \ - xrandr xrender xt +USE_XORG= ice sm x11 xau xaw xcomposite xcursor xdamage xext xfixes xi \ + xinerama xrandr xrender xt USES= autoreconf:autoconf bison compiler:c++11-lib cpe \ desktop-file-utils \ gettext-runtime gmake iconv jpeg perl5 pkgconfig python \ - shared-mime-info tar:bzip2 + shared-mime-info ssl tar:bzip2 INSTALLS_ICONS= yes WITHOUT_CPU_CFLAGS= true CPE_PRODUCT= ${PORTNAME:S|apache-||} @@ -149,7 +150,8 @@ CUPS_CONFIGURE_ENABLE= cups CUPS_LIB_DEPENDS= libcups.so:print/cups GNOME_CONFIGURE_ENABLE= dbus gconf lockdown -GNOME_LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib +GNOME_LIB_DEPENDS= libdbus-1.so:devel/dbus \ + libdbus-glib-1.so:devel/dbus-glib GNOME_USE= GNOME=gconf2 GNOMEVFS_CONFIGURE_ENABLE= gnome-vfs @@ -158,6 +160,7 @@ GNOMEVFS_CONFIGURE_ON= --disable-gio GNOMEVFS_USE= GNOME=gnomevfs2 MMEDIA_CONFIGURE_ENABLE= gstreamer +MMEDIA_LIB_DEPENDS= libgstreamer-0.10.so:multimedia/gstreamer MMEDIA_USE= GSTREAMER=yes SDK_CONFIGURE_ENABLE= odk @@ -238,7 +241,7 @@ CONFIGURE_ARGS+= \ --with-system-hyphen \ --with-external-hyph-dir=${LOCALBASE}/share/hyphen \ --with-system-jpeg \ - --with-junit=${LOCALBASE}/share/java/classes/junit.jar \ + --with-junit=${JAVALIBDIR}/junit.jar \ --with-system-libtextcat \ --disable-kde \ --disable-kde4 \ @@ -394,7 +397,7 @@ do-build: fi ; \ fi ; \ cd ${WRKSRC}/instsetoo_native ; \ - . ../${FREEBSD_ENV_SET} ; \ + . ../${FREEBSD_ENV_SET} ; \ LANG=C LC_ALL=C build.pl --all -P$${numproc} -- -P$${dmproc} do-install: @@ -423,7 +426,7 @@ do-install: ${LN} -f ${EXECBASE} ${EXECBASE}-$${i} ; \ done @${ECHO_CMD} "adding desktop support" - @${LN} -sf ${XDGDIR} ${STAGEDIR}${DESKTOPDIR}/${EXECBASE} + @${LN} -sf ${XDGREL} ${STAGEDIR}${DESKTOPDIR}/${EXECBASE} @cd ${WRKSRC}/sysui/unxfbsd?.pro/misc/openoffice ; \ DESTDIR=${STAGEDIR} \ GNOMEDIR=${PREFIX} \ diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile index 4253625..a09269f 100644 --- a/editors/openoffice-devel/Makefile +++ b/editors/openoffice-devel/Makefile @@ -3,7 +3,7 @@ PORTNAME= apache-openoffice PORTVERSION= ${AOOVERSION1}.${AOOVERSION2}.${SVNREVISION} -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 4 CATEGORIES= editors java MASTER_SITES= https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}-${AOORC}-r${SVNREVISION}/source/ \ @@ -49,50 +49,50 @@ LICENSE_PERMS_TWAIN= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LICENSE_PERMS_W3C= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept BUILD_DEPENDS= \ - p5-Archive-Zip>=0:archivers/p5-Archive-Zip \ - p5-libwww>=0:www/p5-libwww \ - p5-XML-Parser>=0:textproc/p5-XML-Parser \ - ${LOCALBASE}/bin/unzip:archivers/unzip \ - zip:archivers/zip \ - ant:devel/apache-ant \ + p5-Archive-Zip>=0:archivers/p5-Archive-Zip \ + p5-libwww>=0:www/p5-libwww \ + p5-XML-Parser>=0:textproc/p5-XML-Parser \ + ${LOCALBASE}/bin/unzip:archivers/unzip \ + zip:archivers/zip \ + ant:devel/apache-ant \ ${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs \ - dmake:devel/dmake \ - epm:devel/epm \ - ${LOCALBASE}/bin/gperf:devel/gperf \ - imake:devel/imake \ - gpatch:devel/patch \ - ${LOCALBASE}/include/sane/sane.h:graphics/sane-backends \ - ${LOCALBASE}/bin/vigra-config:graphics/vigra \ + dmake:devel/dmake \ + epm:devel/epm \ + ${LOCALBASE}/bin/gperf:devel/gperf \ + imake:devel/imake \ + gpatch:devel/patch \ + ${LOCALBASE}/include/sane/sane.h:graphics/sane-backends \ + ${LOCALBASE}/bin/vigra-config:graphics/vigra \ ${JAVALIBDIR}/commons-httpclient.jar:java/jakarta-commons-httpclient \ ${JAVALIBDIR}/commons-lang.jar:java/jakarta-commons-lang \ - ${JAVALIBDIR}/junit.jar:java/junit \ - ${JAVALIBDIR}/bsh.jar:lang/bsh \ - bash:shells/bash \ - ${JAVALIBDIR}/lucene-core-3.6.2.jar:textproc/lucene \ + ${JAVALIBDIR}/junit.jar:java/junit \ + ${JAVALIBDIR}/bsh.jar:lang/bsh \ + bash:shells/bash \ + ${JAVALIBDIR}/lucene-core-3.6.2.jar:textproc/lucene \ p5-libwww>=0:www/p5-libwww LIB_DEPENDS= \ - libapr-1.so:devel/apr1 \ - libnspr4.so:devel/nspr \ - libcurl.so:ftp/curl \ - libcairo.so:graphics/cairo \ - libpng.so:graphics/png \ - libpoppler-glib.so:graphics/poppler-glib \ - libgraphite.so:graphics/silgraphite \ - libCoinMP.so:math/coinmp \ - libfreetype.so:print/freetype2 \ - libnss3.so:security/nss \ - libexpat.so:textproc/expat2 \ - libhunspell-1.3.so:textproc/hunspell \ - libhyphen.so:textproc/hyphen \ - libtextcat.so:textproc/libtextcat \ - libmythes-1.2.so:textproc/mythes \ - librdf.so:textproc/redland \ - libserf-1.so:www/serf \ + libapr-1.so:devel/apr1 \ + libnspr4.so:devel/nspr \ + libcurl.so:ftp/curl \ + libcairo.so:graphics/cairo \ + libpng.so:graphics/png \ + libpoppler-glib.so:graphics/poppler-glib \ + libgraphite.so:graphics/silgraphite \ + libCoinMP.so:math/coinmp \ + libfreetype.so:print/freetype2 \ + libnss3.so:security/nss \ + libexpat.so:textproc/expat2 \ + libhunspell-1.3.so:textproc/hunspell \ + libhyphen.so:textproc/hyphen \ + libtextcat.so:textproc/libtextcat \ + libmythes-1.2.so:textproc/mythes \ + librdf.so:textproc/redland \ + libserf-1.so:www/serf \ libfontconfig.so:x11-fonts/fontconfig RUN_DEPENDS= \ ${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme \ ${JAVALIBDIR}/commons-httpclient.jar:java/jakarta-commons-httpclient \ - ${JAVALIBDIR}/bsh.jar:lang/bsh \ + ${JAVALIBDIR}/bsh.jar:lang/bsh \ ${LOCALBASE}/share/fonts/Caladea/Caladea-Bold.ttf:x11-fonts/crosextrafonts-caladea-ttf \ ${LOCALBASE}/share/fonts/Carlito/Carlito-Bold.ttf:x11-fonts/crosextrafonts-carlito-ttf \ ${LOCALBASE}/share/fonts/ChromeOS/Arimo-Bold.ttf:x11-fonts/croscorefonts-fonts-ttf @@ -125,6 +125,7 @@ INSTALLATION_BASEDIR?= openoffice-${AOOSUFFIX} PRINSTALLATION_BASEDIR= ${PREFIX}/${INSTALLATION_BASEDIR} OOPATH= ${PRINSTALLATION_BASEDIR}/openoffice${AOOVERSION1} XDGDIR= ${OOPATH}/share/xdg +XDGREL= ../../${INSTALLATION_BASEDIR}/openoffice${AOOVERSION1}/share/xdg EXECBASE?= openoffice-${AOOSUFFIX} ONLY_FOR_ARCHS= i386 amd64 @@ -137,12 +138,12 @@ JAVA_RUN= jdk JAVA_VENDOR= openjdk JAVA_VERSION= 1.6+ USE_PERL5= build -USE_XORG= ice x11 xau xaw xcomposite xcursor xdamage xext xfixes xi \ - xrandr xrender xt +USE_XORG= ice sm x11 xau xaw xcomposite xcursor xdamage xext xfixes xi \ + xinerama xrandr xrender xt USES= autoreconf:autoconf bison compiler:c++11-lib cpe \ desktop-file-utils \ gettext-runtime gmake iconv jpeg perl5 pkgconfig python \ - shared-mime-info tar:${TARTYPE} + shared-mime-info ssl tar:${TARTYPE} INSTALLS_ICONS= yes WITHOUT_CPU_CFLAGS= true CPE_PRODUCT= ${PORTNAME:S|apache-||} @@ -162,7 +163,8 @@ CUPS_CONFIGURE_ENABLE= cups CUPS_LIB_DEPENDS= libcups.so:print/cups GNOME_CONFIGURE_ENABLE= dbus gconf lockdown -GNOME_LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib +GNOME_LIB_DEPENDS= libdbus-1.so:devel/dbus \ + libdbus-glib-1.so:devel/dbus-glib GNOME_USE= GNOME=gconf2 GNOMEVFS_CONFIGURE_ENABLE= gnome-vfs @@ -171,11 +173,13 @@ GNOMEVFS_CONFIGURE_ON= --disable-gio GNOMEVFS_USE= GNOME=gnomevfs2 MMEDIA_CONFIGURE_ENABLE= gstreamer +MMEDIA_LIB_DEPENDS= libgstreamer-0.10.so:multimedia/gstreamer MMEDIA_USE= GSTREAMER=yes SDK_CONFIGURE_ENABLE= odk PDFIMPORT_CONFIGURE_ENABLE= pdfimport +PDFIMPORT_LIB_DEPENDS= libpoppler.so:graphics/poppler WIKI_PUBLISHER_CONFIGURE_ENABLE= wiki-publisher @@ -252,7 +256,7 @@ CONFIGURE_ARGS+= \ --with-system-hyphen \ --with-external-hyph-dir=${LOCALBASE}/share/hyphen \ --with-system-jpeg \ - --with-junit=${LOCALBASE}/share/java/classes/junit.jar \ + --with-junit=${JAVALIBDIR}/junit.jar \ --with-system-libtextcat \ --disable-kde \ --disable-kde4 \ @@ -404,7 +408,7 @@ do-build: fi ; \ fi ; \ cd ${WRKSRC}/instsetoo_native ; \ - . ../${FREEBSD_ENV_SET} ; \ + . ../${FREEBSD_ENV_SET} ; \ LANG=C LC_ALL=C build.pl --all -P$${numproc} -- -P$${dmproc} do-install: @@ -433,7 +437,7 @@ do-install: ${LN} -f ${EXECBASE} ${EXECBASE}-$${i} ; \ done @${ECHO_CMD} "adding desktop support" - @${LN} -sf ${XDGDIR} ${STAGEDIR}${DESKTOPDIR}/${EXECBASE} + @${LN} -sf ${XDGREL} ${STAGEDIR}${DESKTOPDIR}/${EXECBASE} @cd ${WRKSRC}/sysui/unxfbsd?.pro/misc/openoffice ; \ DESTDIR=${STAGEDIR} \ GNOMEDIR=${PREFIX} \ diff --git a/emulators/i386-wine-devel/Makefile.inc b/emulators/i386-wine-devel/Makefile.inc index 15d2cc4..a1acfe1 100644 --- a/emulators/i386-wine-devel/Makefile.inc +++ b/emulators/i386-wine-devel/Makefile.inc @@ -42,7 +42,7 @@ USE_LDCONFIG32= ${PREFIX}/lib32 ${PREFIX}/lib32/wine USES= tar:xz BUNDLE_LIBS= yes -GECKO_RUN_DEPENDS= ${DATADIR}/gecko/wine_gecko-2.44-x86.msi:emulators/wine-gecko-devel +GECKO_RUN_DEPENDS= ${DATADIR}/gecko/wine_gecko-2.47-x86.msi:emulators/wine-gecko-devel MONO_RUN_DEPENDS= ${DATADIR}/mono/wine-mono-4.6.3.msi:emulators/wine-mono-devel # Included for OPSYS and OSVERSION diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile index 16c8efb..c366e74 100644 --- a/graphics/tiff/Makefile +++ b/graphics/tiff/Makefile @@ -3,7 +3,7 @@ PORTNAME= tiff PORTVERSION= 4.0.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= ftp://ftp.remotesensing.org/pub/libtiff/ \ http://download.osgeo.org/libtiff/ diff --git a/graphics/tiff/files/patch-libtiff_tif__pixarlog.c b/graphics/tiff/files/patch-libtiff_tif__pixarlog.c new file mode 100644 index 0000000..4976524 --- /dev/null +++ b/graphics/tiff/files/patch-libtiff_tif__pixarlog.c @@ -0,0 +1,34 @@ +CVE-2016-5875(, dup?) +https://marc.info/?l=oss-security&m=146720235906569&w=2 + +--- libtiff/tif_pixarlog.c.orig Sat Aug 29 00:16:22 2015 ++++ libtiff/tif_pixarlog.c Fri Jul 1 13:04:52 2016 +@@ -457,6 +457,7 @@ horizontalAccumulate8abgr(uint16 *wp, int n, int strid + typedef struct { + TIFFPredictorState predict; + z_stream stream; ++ tmsize_t tbuf_size; /* only set/used on reading for now */ + uint16 *tbuf; + uint16 stride; + int state; +@@ -692,6 +693,7 @@ PixarLogSetupDecode(TIFF* tif) + sp->tbuf = (uint16 *) _TIFFmalloc(tbuf_size); + if (sp->tbuf == NULL) + return (0); ++ sp->tbuf_size = tbuf_size; + if (sp->user_datafmt == PIXARLOGDATAFMT_UNKNOWN) + sp->user_datafmt = PixarLogGuessDataFmt(td); + if (sp->user_datafmt == PIXARLOGDATAFMT_UNKNOWN) { +@@ -779,6 +781,12 @@ PixarLogDecode(TIFF* tif, uint8* op, tmsize_t occ, uin + if (sp->stream.avail_out != nsamples * sizeof(uint16)) + { + TIFFErrorExt(tif->tif_clientdata, module, "ZLib cannot deal with buffers this size"); ++ return (0); ++ } ++ /* Check that we will not fill more than what was allocated */ ++ if (sp->stream.avail_out > sp->tbuf_size) ++ { ++ TIFFErrorExt(tif->tif_clientdata, module, "sp->stream.avail_out > sp->tbuf_size"); + return (0); + } + do { diff --git a/graphics/tiff/files/patch-tools_gif2tiff.c b/graphics/tiff/files/patch-tools_gif2tiff.c new file mode 100644 index 0000000..cba2d90 --- /dev/null +++ b/graphics/tiff/files/patch-tools_gif2tiff.c @@ -0,0 +1,14 @@ +CVE-2016-3186, patch from: +https://bugzilla.redhat.com/show_bug.cgi?id=1319666 + +--- tools/gif2tiff.c.orig Fri Jul 1 13:11:43 2016 ++++ tools/gif2tiff.c Fri Jul 1 13:12:07 2016 +@@ -349,7 +349,7 @@ readextension(void) + int status = 1; + + (void) getc(infile); +- while ((count = getc(infile)) && count <= 255) ++ while ((count = getc(infile)) && count >= 0 && count <= 255) + if (fread(buf, 1, count, infile) != (size_t) count) { + fprintf(stderr, "short read from file %s (%s)\n", + filename, strerror(errno)); diff --git a/mail/postsrsd/Makefile b/mail/postsrsd/Makefile index 8359bbf..153baee 100644 --- a/mail/postsrsd/Makefile +++ b/mail/postsrsd/Makefile @@ -3,7 +3,7 @@ PORTNAME= postsrsd PORTVERSION= 1.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MAINTAINER= ports@bsdserwis.com @@ -23,7 +23,6 @@ USES= cmake pkgconfig CMAKE_ARGS= --no-warn-unused-cli \ -DCMAKE_INCLUDE_PATH="${LOCALBASE}/include" \ -DCMAKE_LIBRARY_PATH="${LOCALBASE}/lib" -USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME} USE_RC_SUBR= ${PORTNAME} PORTDOCS= README.md main.cf.ex README_UPGRADE.md diff --git a/misc/freebsd-doc-all/Makefile b/misc/freebsd-doc-all/Makefile index cc9edf8..28e18fe 100644 --- a/misc/freebsd-doc-all/Makefile +++ b/misc/freebsd-doc-all/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= freebsd-doc-all -PORTVERSION= 48963 +PORTVERSION= 49071 PORTEPOCH= 1 CATEGORIES= misc docs diff --git a/misc/freebsd-doc-de/pkg-plist.html-common b/misc/freebsd-doc-de/pkg-plist.html-common index 539beba..a8c3d65 100644 --- a/misc/freebsd-doc-de/pkg-plist.html-common +++ b/misc/freebsd-doc-de/pkg-plist.html-common @@ -48,6 +48,7 @@ %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-adduser2.png %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-adduser3.png %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-boot-loader-menu.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-boot-options-menu.png %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-choose-mode.png %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-config-components.png %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-config-crashdump.png @@ -76,6 +77,7 @@ %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-mainexit.png %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-netinstall-files.png %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-netinstall-mirrorselect.png +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-newboot-loader-menu.png %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-part-entire-part.png %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-part-guided-disk.png %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-part-guided-manual.png diff --git a/misc/freebsd-doc-de/pkg-plist.html-split b/misc/freebsd-doc-de/pkg-plist.html-split index 9062eb6..0a222d3 100644 --- a/misc/freebsd-doc-de/pkg-plist.html-split +++ b/misc/freebsd-doc-de/pkg-plist.html-split @@ -256,7 +256,6 @@ %%DOCSDIR%%/%%DOCLANG%%/books/handbook/consoles.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/creating-cds.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/creating-dvds.html -%%DOCSDIR%%/%%DOCLANG%%/books/handbook/ctm.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/current-stable.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/desktop-browsers.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/desktop-finance.html @@ -365,7 +364,6 @@ %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail-trouble.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail-using.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail.html -%%DOCSDIR%%/%%DOCLANG%%/books/handbook/make-delete-old.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/makeworld.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mirrors-ftp.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mirrors-rsync.html @@ -426,6 +424,7 @@ %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security-intro.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security-pkg.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security-resourcelimits.html +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/security-sudo.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/sendmail.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/serial.html diff --git a/misc/freebsd-doc-en/Makefile b/misc/freebsd-doc-en/Makefile index 11d1697..e4d4118 100644 --- a/misc/freebsd-doc-en/Makefile +++ b/misc/freebsd-doc-en/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= freebsd-doc -PORTVERSION= 48963 +PORTVERSION= 49071 PORTEPOCH= 1 CATEGORIES= misc docs MASTER_SITES= LOCAL/blackend diff --git a/misc/freebsd-doc-en/distinfo b/misc/freebsd-doc-en/distinfo index 1ff4f6a..9c14071 100644 --- a/misc/freebsd-doc-en/distinfo +++ b/misc/freebsd-doc-en/distinfo @@ -1,2 +1,2 @@ -SHA256 (freebsd-doc-48963.tar.gz) = 85a4b5b5a13853926a66516f0b6873c6b2c4da606526615ef0063791d6a8ec68 -SIZE (freebsd-doc-48963.tar.gz) = 49712463 +SHA256 (freebsd-doc-49071.tar.gz) = a5ea42f8f5f8f05ea9e71a3992f17a53f75308d8719066b9998bc8ed14e2be10 +SIZE (freebsd-doc-49071.tar.gz) = 49784305 diff --git a/misc/freebsd-doc-en/pkg-plist.html-split b/misc/freebsd-doc-en/pkg-plist.html-split index 6115952..13cc323 100644 --- a/misc/freebsd-doc-en/pkg-plist.html-split +++ b/misc/freebsd-doc-en/pkg-plist.html-split @@ -1030,6 +1030,7 @@ %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses-pear.html %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses-perl5.html %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses-pgsql.html +%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses-php.html %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses-pkgconfig.html %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses-pure.html %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses-pyqt.html @@ -1041,6 +1042,7 @@ %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses-shared-mime-info.html %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses-shebangfix.html %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses-sqlite.html +%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses-ssl.html %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses-tar.html %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses-tcl.html %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses-terminfo.html diff --git a/misc/freebsd-doc-zh_tw/pkg-plist.html-split b/misc/freebsd-doc-zh_tw/pkg-plist.html-split index 37c7383..ab3515c3 100644 --- a/misc/freebsd-doc-zh_tw/pkg-plist.html-split +++ b/misc/freebsd-doc-zh_tw/pkg-plist.html-split @@ -121,52 +121,76 @@ %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/x86-unix-filters.html %%DOCSDIR%%/%%DOCLANG%%/books/developers-handbook/x86.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/doc-build-makefiles.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/doc-build-toolset.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/doc-build.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/docbook-markup-block-elements.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/docbook-markup-document-structure.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/docbook-markup-fpi.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/docbook-markup-freebsd-extensions.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/docbook-markup-images.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/docbook-markup-inline-elements.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/docbook-markup-links.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/docbook-markup.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/editor-config-emacs.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/editor-config-nano.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/editor-config.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/examples-docbook-article.html -%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/examples-formatted.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/examples.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/index.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/ix01.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/legalnotice.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/make-includes.html -%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/overview-before.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/overview-quick-start.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/overview.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/po-translations-building.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/po-translations-creating.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/po-translations-quick-start.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/po-translations-submitting.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/po-translations-tips.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/po-translations-translating.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/po-translations.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/preface-acknowledgements.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/preface-conventions.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/preface-notes.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/preface.html -%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/psgml-mode.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/see-also-docbook.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/see-also-html.html -%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/see-also-linuxdoc.html -%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/see-also-sgml.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/see-also-xml.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/see-also.html -%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/sgml-markup-docbook.html -%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/sgml-markup.html -%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/sgml-primer-comments.html -%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/sgml-primer-conclusion.html -%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/sgml-primer-doctype-declaration.html -%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/sgml-primer-elements.html -%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/sgml-primer-entities.html -%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/sgml-primer-include.html -%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/sgml-primer-marked-sections.html -%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/sgml-primer-sgml-escape.html -%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/sgml-primer.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/structure-document.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/structure-locale.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/structure.html -%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/stylesheets-css.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/stylesheets.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/the-website-build.html -%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/the-website-env.html -%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/the-website-install.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/the-website.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/tools-optional.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/tools.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/translations.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/working-copy-checking-out.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/working-copy-choosing-directory.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/working-copy-making-diff.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/working-copy-revert.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/working-copy-subversion-references.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/working-copy-updating.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/working-copy.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/writing-style-guide.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/writing-style-guidelines.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/writing-style-word-list.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/writing-style.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xhtml-markup-block-elements.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xhtml-markup-fpi.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xhtml-markup-inline-elements.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xhtml-markup-sectional-elements.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xhtml-markup.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xml-primer-comments.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xml-primer-conclusion.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xml-primer-doctype-declaration.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xml-primer-elements.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xml-primer-entities.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xml-primer-include.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xml-primer-marked-sections.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xml-primer-xml-escape.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xml-primer.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/ACPI-debug.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/MAC-examplehttpd.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/SMTP-Auth.html diff --git a/multimedia/mpeg4ip/files/patch-server_mp4live_audio__oss__source.cpp b/multimedia/mpeg4ip/files/patch-server_mp4live_audio__oss__source.cpp new file mode 100644 index 0000000..320f9fd --- /dev/null +++ b/multimedia/mpeg4ip/files/patch-server_mp4live_audio__oss__source.cpp @@ -0,0 +1,20 @@ +--- server/mp4live/audio_oss_source.cpp.orig 2005-09-07 22:28:01 UTC ++++ server/mp4live/audio_oss_source.cpp +@@ -265,7 +265,7 @@ bool COSSAudioSource::InitDevice(void) + + rc = ioctl(m_audioDevice, SNDCTL_DSP_SPEED, &samplingRate); + +- if (rc < 0 || abs(samplingRate - targetSamplingRate) > 1) { ++ if (rc < 0 || abs((int)(samplingRate - targetSamplingRate) > 1)) { + error_message("Couldn't set sampling rate for %s", deviceName); + close(m_audioDevice); + return false; +@@ -450,7 +450,7 @@ bool CAudioCapabilities::ProbeDevice() + rc = ioctl(audioDevice, SNDCTL_DSP_SPEED, &samplingRate); + + // invalid sampling rate, allow deviation of 1 sample/sec +- if (rc < 0 || abs(samplingRate - targetRate) > 1) { ++ if (rc < 0 || abs((int)(samplingRate - targetRate) > 1)) { + debug_message("audio device %s doesn't support sampling rate %u", + m_deviceName, targetRate); + continue; diff --git a/multimedia/mpeg4ip/files/patch-server_mp4live_audio__oss__source.h b/multimedia/mpeg4ip/files/patch-server_mp4live_audio__oss__source.h new file mode 100644 index 0000000..c3e0f7a --- /dev/null +++ b/multimedia/mpeg4ip/files/patch-server_mp4live_audio__oss__source.h @@ -0,0 +1,11 @@ +--- server/mp4live/audio_oss_source.h.orig 2006-05-15 17:52:52 UTC ++++ server/mp4live/audio_oss_source.h +@@ -104,7 +104,7 @@ class CAudioCapabilities : public CCapab + return rate; + } + int32_t calc; +- calc = abs(m_samplingRates[ix] - rate); ++ calc = abs((int)(m_samplingRates[ix] - rate)); + if (calc < diff) { + diff = calc; + ret_rate = m_samplingRates[ix]; diff --git a/multimedia/vapoursynth/Makefile b/multimedia/vapoursynth/Makefile index de65133..350c4fb 100644 --- a/multimedia/vapoursynth/Makefile +++ b/multimedia/vapoursynth/Makefile @@ -24,6 +24,13 @@ OPTIONS_DEFINE= DEBUG DOCS FRAME_GUARD OPTIONS_DEFAULT=${OPTIONS_GROUP_COMPS} ${OPTIONS_GROUP_PLUGINS} OPTIONS_SUB= yes +# XXX After r417413 poudriere requires textproc/py-sphinx being built +# with the same python version as USES=python here but it's currently +# not possible due to https://github.com/freebsd/poudriere/issues/259 +.if defined(PACKAGE_BUILDING) +OPTIONS_EXCLUDE=DOCS +.endif + OPTIONS_DEFINE_amd64= SIMD OPTIONS_DEFINE_i386= SIMD OPTIONS_DEFAULT_amd64= SIMD diff --git a/net-im/telepathy-qt4/Makefile b/net-im/telepathy-qt4/Makefile index 3799a38..002beb2 100644 --- a/net-im/telepathy-qt4/Makefile +++ b/net-im/telepathy-qt4/Makefile @@ -3,6 +3,7 @@ PORTNAME= telepathy-qt4 PORTVERSION= 0.9.6.1 +PORTREVISION= 1 CATEGORIES= net-im MASTER_SITES= https://telepathy.freedesktop.org/releases/${PORTNAME:C/4//}/ DISTNAME= ${PORTNAME:C/4//}-${PORTVERSION} @@ -19,11 +20,11 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_dbus_bindings.so:devel/py-dbus OPTIONS_DEFINE= DOCS -USE_GNOME= libxslt:build +USE_GNOME= glib20 libxslt:build USE_GSTREAMER= yes USE_QT4= corelib dbus gui network qtestlib_build xml \ moc_build qmake_build rcc_build uic_build -USES= cmake:outsource pathfix pkgconfig python:build +USES= cmake:outsource gettext pathfix pkgconfig python:build CMAKE_ARGS= -DENABLE_EXAMPLES:BOOL=False \ -DENABLE_FARSIGHT:BOOL=False \ -DENABLE_FARSTREAM:BOOL=True \ diff --git a/net/asterisk13/Makefile b/net/asterisk13/Makefile index b5fde8f..6a441b9 100644 --- a/net/asterisk13/Makefile +++ b/net/asterisk13/Makefile @@ -2,7 +2,7 @@ PORTNAME= asterisk PORTVERSION= 13.9.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729 MASTER_SITE_SUBDIR= asterisk/ \ diff --git a/net/asterisk13/files/patch-res_res__pjsip_pjsip__cli.c b/net/asterisk13/files/patch-res_res__pjsip_pjsip__cli.c new file mode 100644 index 0000000..f1d6aa4 --- /dev/null +++ b/net/asterisk13/files/patch-res_res__pjsip_pjsip__cli.c @@ -0,0 +1,11 @@ +--- res/res_pjsip/pjsip_cli.c.orig 2016-05-13 17:41:41 UTC ++++ res/res_pjsip/pjsip_cli.c +@@ -172,7 +172,7 @@ char *ast_sip_cli_traverse_objects(struc + } + regex = a->argv[4]; + } else { +- regex = ""; ++ regex = "."; + } + + if (cmd == CLI_GENERATE diff --git a/net/mDNSResponder/files/patch-dnsextd__lexer.l b/net/mDNSResponder/files/patch-dnsextd__lexer.l new file mode 100644 index 0000000..69ac4be --- /dev/null +++ b/net/mDNSResponder/files/patch-dnsextd__lexer.l @@ -0,0 +1,16 @@ +--- mDNSShared/dnsextd_lexer.l.orig 2016-07-01 01:07:18 UTC ++++ mDNSShared/dnsextd_lexer.l +@@ -23,6 +23,13 @@ + + extern YYSTYPE yylval; + ++#if !defined YYSTYPE_yylineno ++#if YY_FLEX_MAJOR_VERSION <= 2 && YY_FLEX_MINOR_VERSION <= 5 && YY_FLEX_SUBMINOR_VERSION <= 4 ++int yylineno = 1; ++#endif ++#endif ++ ++ + #define YY_NO_INPUT 1 + int yylex(void); + diff --git a/net/samba42/Makefile b/net/samba42/Makefile index 6926de6..b1fc599 100644 --- a/net/samba42/Makefile +++ b/net/samba42/Makefile @@ -19,7 +19,7 @@ EXTRA_PATCHES= ${PATCHDIR}/extra-patch-progress:-p1 SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 -SAMBA4_VERSION= 4.2.12 +SAMBA4_VERSION= 4.2.14 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} diff --git a/net/samba42/distinfo b/net/samba42/distinfo index 9699f19..57153a4 100644 --- a/net/samba42/distinfo +++ b/net/samba42/distinfo @@ -1,2 +1,3 @@ -SHA256 (samba-4.2.12.tar.gz) = b334a86a92a1c2759c0b3dce20965e7fe820f0abafee38e6fd82eb9c5cd80514 -SIZE (samba-4.2.12.tar.gz) = 20878216 +TIMESTAMP = 1468280138 +SHA256 (samba-4.2.14.tar.gz) = db820a9947e44f04b0eb25e4aa0c3db32c4042fca541775ee8e2905093e888e6 +SIZE (samba-4.2.14.tar.gz) = 20883281 diff --git a/net/samba43/Makefile b/net/samba43/Makefile index 4971698..b96f0e5 100644 --- a/net/samba43/Makefile +++ b/net/samba43/Makefile @@ -3,7 +3,7 @@ PORTNAME?= ${SAMBA4_BASENAME}43 PORTVERSION?= ${SAMBA4_VERSION} -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= net MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc DISTNAME= ${SAMBA4_DISTNAME} @@ -15,11 +15,11 @@ LICENSE= GPLv3 CONFLICTS?= *samba3[2-6]-3.* samba4-4.0.* samba41-4.1.* samba42-4.2.* samba44-4.4.* -EXTRA_PATCHES= ${PATCHDIR}/extra-patch-progress:-p1 +#EXTRA_PATCHES= ${PATCHDIR}/extra-patch-progress:-p1 SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 -SAMBA4_VERSION= 4.3.9 +SAMBA4_VERSION= 4.3.11 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} @@ -89,6 +89,10 @@ BUILD_DEPENDS+= p5-Parse-Pidl>=4.3.1:devel/p5-Parse-Pidl BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython PLIST_SUB+= PY_DNSPYTHON="@comment " +# +BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601 +PLIST_SUB+= PY_ISO8601="@comment " # talloc BUILD_DEPENDS+= talloc>=2.1.5:devel/talloc RUN_DEPENDS+= talloc>=2.1.5:devel/talloc diff --git a/net/samba43/distinfo b/net/samba43/distinfo index f8cafa72..0e40bd30 100644 --- a/net/samba43/distinfo +++ b/net/samba43/distinfo @@ -1,2 +1,3 @@ -SHA256 (samba-4.3.9.tar.gz) = 1f22c61a7f24c5357a9ef4d10833a2cd161f40f3db03bcbe586d7cd3a56139f3 -SIZE (samba-4.3.9.tar.gz) = 20570849 +TIMESTAMP = 1468280731 +SHA256 (samba-4.3.11.tar.gz) = 90a967310e34a31d5c9fc5f86855f334fc19815e7e59f5c2d72a9bba23cf4fec +SIZE (samba-4.3.11.tar.gz) = 20573432 diff --git a/net/samba43/files/extra-patch-progress b/net/samba43/files/extra-patch-progress deleted file mode 100644 index 64a6636..0000000 --- a/net/samba43/files/extra-patch-progress +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c -index c65fb08..13713fc 100644 ---- a/source3/passdb/pdb_ldap.c -+++ b/source3/passdb/pdb_ldap.c -@@ -1005,7 +1005,7 @@ static bool init_sam_from_ldap(struct ldapsam_privates *ldap_state, - entry, - "gecos", - ctx); -- if (unix_pw.pw_gecos) { -+ if (unix_pw.pw_gecos==NULL) { - unix_pw.pw_gecos = fullname; - } - unix_pw.pw_dir = smbldap_talloc_single_attribute( -@@ -1013,7 +1013,7 @@ static bool init_sam_from_ldap(struct ldapsam_privates *ldap_state, - entry, - "homeDirectory", - ctx); -- if (unix_pw.pw_dir) { -+ if (unix_pw.pw_dir==NULL) { - unix_pw.pw_dir = discard_const_p(char, ""); - } - unix_pw.pw_shell = smbldap_talloc_single_attribute( -@@ -1021,7 +1021,7 @@ static bool init_sam_from_ldap(struct ldapsam_privates *ldap_state, - entry, - "loginShell", - ctx); -- if (unix_pw.pw_shell) { -+ if (unix_pw.pw_shell==NULL) { - unix_pw.pw_shell = discard_const_p(char, ""); - } - diff --git a/net/samba43/files/patch-source3_client_smbspool_krb5_wrapper.c b/net/samba43/files/patch-source3_client_smbspool_krb5_wrapper.c deleted file mode 100644 index 4cc0fe1..0000000 --- a/net/samba43/files/patch-source3_client_smbspool_krb5_wrapper.c +++ /dev/null @@ -1,11 +0,0 @@ ---- source3/client/smbspool_krb5_wrapper.c.orig 2016-04-21 00:26:35.874203000 +0000 -+++ source3/client/smbspool_krb5_wrapper.c 2016-04-21 00:47:23.148722000 +0000 -@@ -195,7 +195,7 @@ - * Make sure we do not have LD_PRELOAD or other security relevant - * environment variables set. - */ -- clearenv(); -+ environ = NULL; - - CUPS_SMB_DEBUG("Setting KRB5CCNAME to '%s'", gen_cc); - setenv("KRB5CCNAME", gen_cc, 1); diff --git a/net/samba43/pkg-plist b/net/samba43/pkg-plist index bce6a93..b44a5a3 100644 --- a/net/samba43/pkg-plist +++ b/net/samba43/pkg-plist @@ -657,6 +657,7 @@ lib/shared-modules/vfs/zfsacl.so %%PYTHON_SITELIBDIR%%/samba/tests/samba3sam.py %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/__init__.py %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/base.py +%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/fsmo.py %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/gpo.py %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/group.py %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/ntacl.py @@ -673,10 +674,10 @@ lib/shared-modules/vfs/zfsacl.so %%PYTHON_SITELIBDIR%%/samba/tests/upgradeprovision.py %%PYTHON_SITELIBDIR%%/samba/tests/upgradeprovisionneeddc.py %%PYTHON_SITELIBDIR%%/samba/tests/xattr.py -%%PYTHON_SITELIBDIR%%/samba/third_party/__init__.py -%%PYTHON_SITELIBDIR%%/samba/third_party/iso8601/__init__.py -%%PYTHON_SITELIBDIR%%/samba/third_party/iso8601/iso8601.py -%%PYTHON_SITELIBDIR%%/samba/third_party/iso8601/test_iso8601.py +%%PY_ISO8601%%%%PYTHON_SITELIBDIR%%/samba/third_party/__init__.py +%%PY_ISO8601%%%%PYTHON_SITELIBDIR%%/samba/third_party/iso8601/__init__.py +%%PY_ISO8601%%%%PYTHON_SITELIBDIR%%/samba/third_party/iso8601/iso8601.py +%%PY_ISO8601%%%%PYTHON_SITELIBDIR%%/samba/third_party/iso8601/test_iso8601.py %%PYTHON_SITELIBDIR%%/samba/upgrade.py %%PYTHON_SITELIBDIR%%/samba/upgradehelpers.py %%PYTHON_SITELIBDIR%%/samba/web_server/__init__.py diff --git a/net/samba44/Makefile b/net/samba44/Makefile index 9bcb6dc..e017657 100644 --- a/net/samba44/Makefile +++ b/net/samba44/Makefile @@ -19,7 +19,7 @@ CONFLICTS?= *samba3[2-6]-3.* samba4-4.0.* samba41-4.1.* samba42-4.2.* samba43-4 SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 -SAMBA4_VERSION= 4.4.3 +SAMBA4_VERSION= 4.4.5 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} @@ -90,6 +90,10 @@ BUILD_DEPENDS+= p5-Parse-Pidl>=4.3.1:devel/p5-Parse-Pidl BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython PLIST_SUB+= PY_DNSPYTHON="@comment " +# +BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601 +PLIST_SUB+= PY_ISO8601="@comment " # talloc BUILD_DEPENDS+= talloc>=2.1.6:devel/talloc RUN_DEPENDS+= talloc>=2.1.6:devel/talloc diff --git a/net/samba44/distinfo b/net/samba44/distinfo index 41e89d2..69d31dd 100644 --- a/net/samba44/distinfo +++ b/net/samba44/distinfo @@ -1,2 +1,3 @@ -SHA256 (samba-4.4.3.tar.gz) = 031e6ada6d15deae6850845eed41497af32207fb679d6c6c74f19acc99d437ba -SIZE (samba-4.4.3.tar.gz) = 20705861 +TIMESTAMP = 1468271289 +SHA256 (samba-4.4.5.tar.gz) = b876ef2e63f66265490e80a122e66ef2d7616112b839df68f56ac2e1ce17a7bd +SIZE (samba-4.4.5.tar.gz) = 20715838 diff --git a/net/samba44/files/patch-source3_client_smbspool_krb5_wrapper.c b/net/samba44/files/patch-source3_client_smbspool_krb5_wrapper.c deleted file mode 100644 index 4cc0fe1..0000000 --- a/net/samba44/files/patch-source3_client_smbspool_krb5_wrapper.c +++ /dev/null @@ -1,11 +0,0 @@ ---- source3/client/smbspool_krb5_wrapper.c.orig 2016-04-21 00:26:35.874203000 +0000 -+++ source3/client/smbspool_krb5_wrapper.c 2016-04-21 00:47:23.148722000 +0000 -@@ -195,7 +195,7 @@ - * Make sure we do not have LD_PRELOAD or other security relevant - * environment variables set. - */ -- clearenv(); -+ environ = NULL; - - CUPS_SMB_DEBUG("Setting KRB5CCNAME to '%s'", gen_cc); - setenv("KRB5CCNAME", gen_cc, 1); diff --git a/net/samba44/pkg-plist b/net/samba44/pkg-plist index 7b57f3a..349a129 100644 --- a/net/samba44/pkg-plist +++ b/net/samba44/pkg-plist @@ -608,6 +608,7 @@ lib/shared-modules/vfs/zfsacl.so %%PYTHON_SITELIBDIR%%/samba/tests/samba3sam.py %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/__init__.py %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/base.py +%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/fsmo.py %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/gpo.py %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/group.py %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/ntacl.py @@ -625,10 +626,10 @@ lib/shared-modules/vfs/zfsacl.so %%PYTHON_SITELIBDIR%%/samba/tests/upgradeprovision.py %%PYTHON_SITELIBDIR%%/samba/tests/upgradeprovisionneeddc.py %%PYTHON_SITELIBDIR%%/samba/tests/xattr.py -%%PYTHON_SITELIBDIR%%/samba/third_party/__init__.py -%%PYTHON_SITELIBDIR%%/samba/third_party/iso8601/__init__.py -%%PYTHON_SITELIBDIR%%/samba/third_party/iso8601/iso8601.py -%%PYTHON_SITELIBDIR%%/samba/third_party/iso8601/test_iso8601.py +%%PY_ISO8601%%%%PYTHON_SITELIBDIR%%/samba/third_party/__init__.py +%%PY_ISO8601%%%%PYTHON_SITELIBDIR%%/samba/third_party/iso8601/__init__.py +%%PY_ISO8601%%%%PYTHON_SITELIBDIR%%/samba/third_party/iso8601/iso8601.py +%%PY_ISO8601%%%%PYTHON_SITELIBDIR%%/samba/third_party/iso8601/test_iso8601.py %%PYTHON_SITELIBDIR%%/samba/upgrade.py %%PYTHON_SITELIBDIR%%/samba/upgradehelpers.py %%PYTHON_SITELIBDIR%%/samba/web_server/__init__.py diff --git a/print/harfbuzz/Makefile b/print/harfbuzz/Makefile index 92707a5..da2ee68 100644 --- a/print/harfbuzz/Makefile +++ b/print/harfbuzz/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= harfbuzz -PORTVERSION= 1.2.3 +PORTVERSION= 1.2.7 CATEGORIES= print MASTER_SITES= http://www.freedesktop.org/software/harfbuzz/release/ @@ -19,13 +19,11 @@ USE_GNOME= cairo glib20 introspection:build GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-graphite2 --with-gobject=yes INSTALL_TARGET= install-strip +TEST_TARGET= check -PLIST_SUB+= LIBVER=0.10200.3 +PLIST_SUB+= LIBVER=0.10200.7 -.include <bsd.port.pre.mk> +EXTRA_PATCHES+= ${EXTRA_PATCHES_${OPSYS}_${OSREL:R}} +EXTRA_PATCHES_FreeBSD_9= ${PATCHDIR}/extra-src_hb-open-type-private.hh -.if ${OSVERSION} < 1000024 -EXTRA_PATCHES= ${PATCHDIR}/extra-src_hb-open-type-private.hh -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/print/harfbuzz/distinfo b/print/harfbuzz/distinfo index ec33b7a..11a9678 100644 --- a/print/harfbuzz/distinfo +++ b/print/harfbuzz/distinfo @@ -1,2 +1,2 @@ -SHA256 (harfbuzz-1.2.3.tar.bz2) = 8216d2404aaab7fde87be0365a90d64aa6c55928e104557cfcb37b54a096cb8c -SIZE (harfbuzz-1.2.3.tar.bz2) = 1337003 +SHA256 (harfbuzz-1.2.7.tar.bz2) = bba0600ae08b84384e6d2d7175bea10b5fc246c4583dc841498d01894d479026 +SIZE (harfbuzz-1.2.7.tar.bz2) = 1345389 diff --git a/sysutils/exfat-utils/Makefile b/sysutils/exfat-utils/Makefile index be7a1e4..7325744 100644 --- a/sysutils/exfat-utils/Makefile +++ b/sysutils/exfat-utils/Makefile @@ -1,41 +1,41 @@ # Created by: Alex Samorukov <samm@os2.kiev.ua> # $FreeBSD$ -PORTNAME= exfat-utils -PORTVERSION= 1.0.1 +PORTNAME= exfat +DISTVERSIONPREFIX= v +DISTVERSION= 1.2.4 CATEGORIES= sysutils -MASTER_SITES= GOOGLE_CODE +PKGNAMESUFFIX= -utils MAINTAINER= samm@os2.kiev.ua COMMENT= Utilities to create, check, label and dump exFAT filesystem -LICENSE= Microsoft-exFAT -LICENSE_NAME= Microsoft exFAT License -LICENSE_TEXT= Requires license from Microsoft, please see \ - http://www.microsoft.com/en-us/legal/intellectualproperty/IPLicensing/Programs/exFATFileSystem.aspx -LICENSE_PERMS= no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell +LICENSE= GPLv2+ MSPAT +LICENSE_COMB= multi +LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING +LICENSE_NAME_MSPAT= Microsoft exFAT Patent License +LICENSE_TEXT_MSPAT= It is important to note that open source and other publicly \ + available implementations of exFAT do not include a patent \ + license from Microsoft. A license is required in order to \ + implement exFAT and use it in a product or device. \ + https://www.microsoft.com/en-us/legal/intellectualproperty/mtl/exfat-licensing.aspx +LICENSE_PERMS_MSPAT= no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell LIB_DEPENDS= libublio.so:devel/libublio -PROJECTHOST= exfat +USE_GITHUB= yes +GH_ACCOUNT= relan -USES= scons +USES= autoreconf localbase pkgconfig +GNU_CONFIGURE= yes PLIST_FILES= sbin/exfatlabel sbin/dumpexfat sbin/exfatfsck sbin/mkexfatfs \ + sbin/fsck.exfat sbin/mkfs.exfat \ man/man8/exfatlabel.8.gz man/man8/mkexfatfs.8.gz man/man8/exfatfsck.8.gz \ man/man8/dumpexfat.8.gz -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/label/exfatlabel ${STAGEDIR}${PREFIX}/sbin - ${INSTALL_PROGRAM} ${WRKSRC}/dump/dumpexfat ${STAGEDIR}${PREFIX}/sbin - ${INSTALL_PROGRAM} ${WRKSRC}/fsck/exfatfsck ${STAGEDIR}${PREFIX}/sbin - ${INSTALL_PROGRAM} ${WRKSRC}/mkfs/mkexfatfs ${STAGEDIR}${PREFIX}/sbin - ${INSTALL_MAN} ${WRKSRC}/label/exfatlabel.8 ${STAGEDIR}${MAN8PREFIX}/man/man8 - ${INSTALL_MAN} ${WRKSRC}/mkfs/mkexfatfs.8 ${STAGEDIR}${MAN8PREFIX}/man/man8 - ${INSTALL_MAN} ${WRKSRC}/dump/dumpexfat.8 ${STAGEDIR}${MAN8PREFIX}/man/man8 - ${INSTALL_MAN} ${WRKSRC}/fsck/exfatfsck.8 ${STAGEDIR}${MAN8PREFIX}/man/man8 - post-patch: - @${REINPLACE_CMD} -e 's|/usr/local/|${PREFIX}/|' ${WRKSRC}/SConstruct + @${REINPLACE_CMD} -e '/fuse/d' ${WRKSRC}/configure.ac + @${REINPLACE_CMD} -e 's/ fuse//' ${WRKSRC}/Makefile.am .include <bsd.port.mk> diff --git a/sysutils/exfat-utils/distinfo b/sysutils/exfat-utils/distinfo index 6c24489..430d60c 100644 --- a/sysutils/exfat-utils/distinfo +++ b/sysutils/exfat-utils/distinfo @@ -1,2 +1,2 @@ -SHA256 (exfat-utils-1.0.1.tar.gz) = eeacedca1878065dc3886674ae39cd51149c37bd7d6d7e9325c971a1d1acdab3 -SIZE (exfat-utils-1.0.1.tar.gz) = 51905 +SHA256 (relan-exfat-v1.2.4_GH0.tar.gz) = e65ca1b47f35421a1663b93c66e48abfd737c3e2f0c7f7154128ce2d30ecd0d8 +SIZE (relan-exfat-v1.2.4_GH0.tar.gz) = 55172 diff --git a/sysutils/exfat-utils/files/patch-SConstruct b/sysutils/exfat-utils/files/patch-SConstruct deleted file mode 100644 index 5287bb2..0000000 --- a/sysutils/exfat-utils/files/patch-SConstruct +++ /dev/null @@ -1,14 +0,0 @@ ---- SConstruct.orig 2013-02-02 14:14:34 UTC -+++ SConstruct -@@ -22,10 +22,7 @@ import os - import platform - import SCons - --env = Environment(**ARGUMENTS) --for var in ['PATH', 'SYSROOT']: -- if var in os.environ: -- env['ENV'][var] = os.environ[var] -+env = Environment(ENV = os.environ, **ARGUMENTS) - - destdir = env.get('DESTDIR', '/sbin'); - libs = ['exfat'] diff --git a/sysutils/exfat-utils/files/patch-libexfat_platform.h b/sysutils/exfat-utils/files/patch-libexfat_platform.h new file mode 100644 index 0000000..0d0b85d --- /dev/null +++ b/sysutils/exfat-utils/files/patch-libexfat_platform.h @@ -0,0 +1,11 @@ +--- libexfat/platform.h.orig 2016-06-03 05:30:35 UTC ++++ libexfat/platform.h +@@ -46,7 +46,7 @@ + #define EXFAT_LITTLE_ENDIAN LITTLE_ENDIAN + #define EXFAT_BIG_ENDIAN BIG_ENDIAN + +-#elif defined(__FreeBSD__) || defined(__DragonFlyBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) ++#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__) + + #include <sys/endian.h> + #define exfat_bswap16(x) bswap16(x) diff --git a/sysutils/exfat-utils/files/patch-ublio b/sysutils/exfat-utils/files/patch-ublio new file mode 100644 index 0000000..afa1410 --- /dev/null +++ b/sysutils/exfat-utils/files/patch-ublio @@ -0,0 +1,176 @@ +# Revert 3959f7d to restore ublio support and add autoconf glue. + +diff --git README.md README.md +index 60d5c71..81446a6 100644 +--- README.md ++++ README.md +@@ -7,6 +7,7 @@ Supported operating systems: + + * GNU/Linux + * Mac OS X 10.5 or later ++* FreeBSD + * OpenBSD + + Most GNU/Linux distributions already have fuse-exfat and exfat-utils in their repositories, so you can just install and use them. The next chapter describes how to compile them from source. +diff --git configure.ac configure.ac +index b45db3f..2bcda4b 100644 +--- configure.ac ++++ configure.ac +@@ -31,6 +31,12 @@ AC_PROG_CC_C99 + AC_PROG_RANLIB + AM_PROG_AR + AC_SYS_LARGEFILE ++PKG_CHECK_MODULES([UBLIO], [libublio], [ ++ CFLAGS="$CFLAGS $UBLIO_CFLAGS" ++ LIBS="$LIBS $UBLIO_LIBS" ++ AC_DEFINE([USE_UBLIO], [1], ++ [Define if block devices are not supported.]) ++], [:]) + PKG_CHECK_MODULES([FUSE], [fuse]) + AC_CONFIG_HEADERS([libexfat/config.h]) + AC_CONFIG_FILES([ +diff --git libexfat/io.c libexfat/io.c +index 60f28e2..14c0151 100644 +--- libexfat/io.c ++++ libexfat/io.c +@@ -37,12 +37,20 @@ + #include <sys/ioctl.h> + #endif + #include <sys/mount.h> ++#ifdef USE_UBLIO ++#include <sys/uio.h> ++#include <ublio.h> ++#endif + + struct exfat_dev + { + int fd; + enum exfat_mode mode; + off_t size; /* in bytes */ ++#ifdef USE_UBLIO ++ off_t pos; ++ ublio_filehandle_t ufh; ++#endif + }; + + static int open_ro(const char* spec) +@@ -74,6 +82,9 @@ struct exfat_dev* exfat_open(const char* spec, enum exfat_mode mode) + { + struct exfat_dev* dev; + struct stat stbuf; ++#ifdef USE_UBLIO ++ struct ublio_param up; ++#endif + + dev = malloc(sizeof(struct exfat_dev)); + if (dev == NULL) +@@ -211,6 +222,24 @@ struct exfat_dev* exfat_open(const char* spec, enum exfat_mode mode) + } + } + ++#ifdef USE_UBLIO ++ memset(&up, 0, sizeof(struct ublio_param)); ++ up.up_blocksize = 256 * 1024; ++ up.up_items = 64; ++ up.up_grace = 32; ++ up.up_priv = &dev->fd; ++ ++ dev->pos = 0; ++ dev->ufh = ublio_open(&up); ++ if (dev->ufh == NULL) ++ { ++ close(dev->fd); ++ free(dev); ++ exfat_error("failed to initialize ublio"); ++ return NULL; ++ } ++#endif ++ + return dev; + } + +@@ -218,6 +247,13 @@ int exfat_close(struct exfat_dev* dev) + { + int rc = 0; + ++#ifdef USE_UBLIO ++ if (ublio_close(dev->ufh) != 0) ++ { ++ exfat_error("failed to close ublio"); ++ rc = -EIO; ++ } ++#endif + if (close(dev->fd) != 0) + { + exfat_error("failed to close device: %s", strerror(errno)); +@@ -231,6 +267,13 @@ int exfat_fsync(struct exfat_dev* dev) + { + int rc = 0; + ++#ifdef USE_UBLIO ++ if (ublio_fsync(dev->ufh) != 0) ++ { ++ exfat_error("ublio fsync failed"); ++ rc = -EIO; ++ } ++#endif + if (fsync(dev->fd) != 0) + { + exfat_error("fsync failed: %s", strerror(errno)); +@@ -251,29 +294,56 @@ off_t exfat_get_size(const struct exfat_dev* dev) + + off_t exfat_seek(struct exfat_dev* dev, off_t offset, int whence) + { ++#ifdef USE_UBLIO ++ /* XXX SEEK_CUR will be handled incorrectly */ ++ return dev->pos = lseek(dev->fd, offset, whence); ++#else + return lseek(dev->fd, offset, whence); ++#endif + } + + ssize_t exfat_read(struct exfat_dev* dev, void* buffer, size_t size) + { ++#ifdef USE_UBLIO ++ ssize_t result = ublio_pread(dev->ufh, buffer, size, dev->pos); ++ if (result >= 0) ++ dev->pos += size; ++ return result; ++#else + return read(dev->fd, buffer, size); ++#endif + } + + ssize_t exfat_write(struct exfat_dev* dev, const void* buffer, size_t size) + { ++#ifdef USE_UBLIO ++ ssize_t result = ublio_pwrite(dev->ufh, buffer, size, dev->pos); ++ if (result >= 0) ++ dev->pos += size; ++ return result; ++#else + return write(dev->fd, buffer, size); ++#endif + } + + ssize_t exfat_pread(struct exfat_dev* dev, void* buffer, size_t size, + off_t offset) + { ++#ifdef USE_UBLIO ++ return ublio_pread(dev->ufh, buffer, size, offset); ++#else + return pread(dev->fd, buffer, size, offset); ++#endif + } + + ssize_t exfat_pwrite(struct exfat_dev* dev, const void* buffer, size_t size, + off_t offset) + { ++#ifdef USE_UBLIO ++ return ublio_pwrite(dev->ufh, buffer, size, offset); ++#else + return pwrite(dev->fd, buffer, size, offset); ++#endif + } + + ssize_t exfat_generic_pread(const struct exfat* ef, struct exfat_node* node, diff --git a/sysutils/exfat-utils/pkg-descr b/sysutils/exfat-utils/pkg-descr index 470e466..fcc7119 100644 --- a/sysutils/exfat-utils/pkg-descr +++ b/sysutils/exfat-utils/pkg-descr @@ -4,4 +4,4 @@ It contains dumpexfat to dump properties of the filesystem, exfatfsck to report errors found on a exFAT filesystem, exfatlabel to label a exFAT filesystem and mkexfatfs to create a exFAT filesystem. -WWW: http://code.google.com/p/exfat/ +WWW: https://github.com/relan/exfat diff --git a/sysutils/fusefs-exfat/Makefile b/sysutils/fusefs-exfat/Makefile index ff34e92..dc22308 100644 --- a/sysutils/fusefs-exfat/Makefile +++ b/sysutils/fusefs-exfat/Makefile @@ -2,33 +2,34 @@ # $FreeBSD$ PORTNAME= exfat -PORTVERSION= 1.0.1 +DISTVERSIONPREFIX= v +DISTVERSION= 1.2.4 CATEGORIES= sysutils -MASTER_SITES= GOOGLE_CODE PKGNAMEPREFIX= fusefs- -DISTNAME= fuse-${PORTNAME}-${PORTVERSION} MAINTAINER= samm@os2.kiev.ua COMMENT= Full-featured exFAT FS implementation as a FUSE module -LICENSE= Microsoft-exFAT -LICENSE_NAME= Microsoft exFAT License -LICENSE_TEXT= Requires license from Microsoft, please see \ - http://www.microsoft.com/en-us/legal/intellectualproperty/IPLicensing/Programs/exFATFileSystem.aspx -LICENSE_PERMS= no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell +LICENSE= GPLv2+ MSPAT +LICENSE_COMB= multi +LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING +LICENSE_NAME_MSPAT= Microsoft exFAT Patent License +LICENSE_TEXT_MSPAT= It is important to note that open source and other publicly \ + available implementations of exFAT do not include a patent \ + license from Microsoft. A license is required in order to \ + implement exFAT and use it in a product or device. \ + https://www.microsoft.com/en-us/legal/intellectualproperty/mtl/exfat-licensing.aspx +LICENSE_PERMS_MSPAT= no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell LIB_DEPENDS= libublio.so:devel/libublio -USES= fuse iconv scons +USE_GITHUB= yes +GH_ACCOUNT= relan -PLIST_FILES= bin/mount.exfat-fuse bin/mount.exfat man/man8/mount.exfat-fuse.8.gz +USES= autoreconf fuse localbase pkgconfig +GNU_CONFIGURE= yes +MAKE_ARGS= SUBDIRS="libexfat fuse" -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/fuse/mount.exfat-fuse ${STAGEDIR}${PREFIX}/bin - ${LN} -s ${PREFIX}/bin/mount.exfat-fuse ${STAGEDIR}${PREFIX}/bin/mount.exfat - ${INSTALL_MAN} ${WRKSRC}/fuse/mount.exfat-fuse.8 ${STAGEDIR}${MAN8PREFIX}/man/man8 - -post-patch: - @${REINPLACE_CMD} -e 's|/usr/local/|${PREFIX}/|' ${WRKSRC}/SConstruct +PLIST_FILES= sbin/mount.exfat-fuse sbin/mount.exfat man/man8/mount.exfat-fuse.8.gz .include <bsd.port.mk> diff --git a/sysutils/fusefs-exfat/distinfo b/sysutils/fusefs-exfat/distinfo index cb6574d..430d60c 100644 --- a/sysutils/fusefs-exfat/distinfo +++ b/sysutils/fusefs-exfat/distinfo @@ -1,2 +1,2 @@ -SHA256 (fuse-exfat-1.0.1.tar.gz) = 12ac1ba1b7d4343bef64e7898176705a41cfe3b5a7a179e28549d242e2854758 -SIZE (fuse-exfat-1.0.1.tar.gz) = 39627 +SHA256 (relan-exfat-v1.2.4_GH0.tar.gz) = e65ca1b47f35421a1663b93c66e48abfd737c3e2f0c7f7154128ce2d30ecd0d8 +SIZE (relan-exfat-v1.2.4_GH0.tar.gz) = 55172 diff --git a/sysutils/fusefs-exfat/files/patch-SConstruct b/sysutils/fusefs-exfat/files/patch-SConstruct deleted file mode 100644 index 12f9270..0000000 --- a/sysutils/fusefs-exfat/files/patch-SConstruct +++ /dev/null @@ -1,14 +0,0 @@ ---- SConstruct.orig 2015-04-13 20:50:01.073662000 +0300 -+++ SConstruct 2015-04-13 20:54:33.231753000 +0300 -@@ -22,10 +22,7 @@ - import platform - import SCons - --env = Environment(**ARGUMENTS) --for var in ['PATH', 'SYSROOT']: -- if var in os.environ: -- env['ENV'][var] = os.environ[var] -+env = Environment(ENV = os.environ, **ARGUMENTS) - - destdir = env.get('DESTDIR', '/sbin'); - libs = ['exfat'] diff --git a/sysutils/fusefs-exfat/files/patch-libexfat_platform.h b/sysutils/fusefs-exfat/files/patch-libexfat_platform.h new file mode 100644 index 0000000..0d0b85d --- /dev/null +++ b/sysutils/fusefs-exfat/files/patch-libexfat_platform.h @@ -0,0 +1,11 @@ +--- libexfat/platform.h.orig 2016-06-03 05:30:35 UTC ++++ libexfat/platform.h +@@ -46,7 +46,7 @@ + #define EXFAT_LITTLE_ENDIAN LITTLE_ENDIAN + #define EXFAT_BIG_ENDIAN BIG_ENDIAN + +-#elif defined(__FreeBSD__) || defined(__DragonFlyBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) ++#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__) + + #include <sys/endian.h> + #define exfat_bswap16(x) bswap16(x) diff --git a/sysutils/fusefs-exfat/files/patch-ublio b/sysutils/fusefs-exfat/files/patch-ublio new file mode 100644 index 0000000..afa1410 --- /dev/null +++ b/sysutils/fusefs-exfat/files/patch-ublio @@ -0,0 +1,176 @@ +# Revert 3959f7d to restore ublio support and add autoconf glue. + +diff --git README.md README.md +index 60d5c71..81446a6 100644 +--- README.md ++++ README.md +@@ -7,6 +7,7 @@ Supported operating systems: + + * GNU/Linux + * Mac OS X 10.5 or later ++* FreeBSD + * OpenBSD + + Most GNU/Linux distributions already have fuse-exfat and exfat-utils in their repositories, so you can just install and use them. The next chapter describes how to compile them from source. +diff --git configure.ac configure.ac +index b45db3f..2bcda4b 100644 +--- configure.ac ++++ configure.ac +@@ -31,6 +31,12 @@ AC_PROG_CC_C99 + AC_PROG_RANLIB + AM_PROG_AR + AC_SYS_LARGEFILE ++PKG_CHECK_MODULES([UBLIO], [libublio], [ ++ CFLAGS="$CFLAGS $UBLIO_CFLAGS" ++ LIBS="$LIBS $UBLIO_LIBS" ++ AC_DEFINE([USE_UBLIO], [1], ++ [Define if block devices are not supported.]) ++], [:]) + PKG_CHECK_MODULES([FUSE], [fuse]) + AC_CONFIG_HEADERS([libexfat/config.h]) + AC_CONFIG_FILES([ +diff --git libexfat/io.c libexfat/io.c +index 60f28e2..14c0151 100644 +--- libexfat/io.c ++++ libexfat/io.c +@@ -37,12 +37,20 @@ + #include <sys/ioctl.h> + #endif + #include <sys/mount.h> ++#ifdef USE_UBLIO ++#include <sys/uio.h> ++#include <ublio.h> ++#endif + + struct exfat_dev + { + int fd; + enum exfat_mode mode; + off_t size; /* in bytes */ ++#ifdef USE_UBLIO ++ off_t pos; ++ ublio_filehandle_t ufh; ++#endif + }; + + static int open_ro(const char* spec) +@@ -74,6 +82,9 @@ struct exfat_dev* exfat_open(const char* spec, enum exfat_mode mode) + { + struct exfat_dev* dev; + struct stat stbuf; ++#ifdef USE_UBLIO ++ struct ublio_param up; ++#endif + + dev = malloc(sizeof(struct exfat_dev)); + if (dev == NULL) +@@ -211,6 +222,24 @@ struct exfat_dev* exfat_open(const char* spec, enum exfat_mode mode) + } + } + ++#ifdef USE_UBLIO ++ memset(&up, 0, sizeof(struct ublio_param)); ++ up.up_blocksize = 256 * 1024; ++ up.up_items = 64; ++ up.up_grace = 32; ++ up.up_priv = &dev->fd; ++ ++ dev->pos = 0; ++ dev->ufh = ublio_open(&up); ++ if (dev->ufh == NULL) ++ { ++ close(dev->fd); ++ free(dev); ++ exfat_error("failed to initialize ublio"); ++ return NULL; ++ } ++#endif ++ + return dev; + } + +@@ -218,6 +247,13 @@ int exfat_close(struct exfat_dev* dev) + { + int rc = 0; + ++#ifdef USE_UBLIO ++ if (ublio_close(dev->ufh) != 0) ++ { ++ exfat_error("failed to close ublio"); ++ rc = -EIO; ++ } ++#endif + if (close(dev->fd) != 0) + { + exfat_error("failed to close device: %s", strerror(errno)); +@@ -231,6 +267,13 @@ int exfat_fsync(struct exfat_dev* dev) + { + int rc = 0; + ++#ifdef USE_UBLIO ++ if (ublio_fsync(dev->ufh) != 0) ++ { ++ exfat_error("ublio fsync failed"); ++ rc = -EIO; ++ } ++#endif + if (fsync(dev->fd) != 0) + { + exfat_error("fsync failed: %s", strerror(errno)); +@@ -251,29 +294,56 @@ off_t exfat_get_size(const struct exfat_dev* dev) + + off_t exfat_seek(struct exfat_dev* dev, off_t offset, int whence) + { ++#ifdef USE_UBLIO ++ /* XXX SEEK_CUR will be handled incorrectly */ ++ return dev->pos = lseek(dev->fd, offset, whence); ++#else + return lseek(dev->fd, offset, whence); ++#endif + } + + ssize_t exfat_read(struct exfat_dev* dev, void* buffer, size_t size) + { ++#ifdef USE_UBLIO ++ ssize_t result = ublio_pread(dev->ufh, buffer, size, dev->pos); ++ if (result >= 0) ++ dev->pos += size; ++ return result; ++#else + return read(dev->fd, buffer, size); ++#endif + } + + ssize_t exfat_write(struct exfat_dev* dev, const void* buffer, size_t size) + { ++#ifdef USE_UBLIO ++ ssize_t result = ublio_pwrite(dev->ufh, buffer, size, dev->pos); ++ if (result >= 0) ++ dev->pos += size; ++ return result; ++#else + return write(dev->fd, buffer, size); ++#endif + } + + ssize_t exfat_pread(struct exfat_dev* dev, void* buffer, size_t size, + off_t offset) + { ++#ifdef USE_UBLIO ++ return ublio_pread(dev->ufh, buffer, size, offset); ++#else + return pread(dev->fd, buffer, size, offset); ++#endif + } + + ssize_t exfat_pwrite(struct exfat_dev* dev, const void* buffer, size_t size, + off_t offset) + { ++#ifdef USE_UBLIO ++ return ublio_pwrite(dev->ufh, buffer, size, offset); ++#else + return pwrite(dev->fd, buffer, size, offset); ++#endif + } + + ssize_t exfat_generic_pread(const struct exfat* ef, struct exfat_node* node, diff --git a/sysutils/fusefs-exfat/pkg-descr b/sysutils/fusefs-exfat/pkg-descr index aa98feb..859c708 100644 --- a/sysutils/fusefs-exfat/pkg-descr +++ b/sysutils/fusefs-exfat/pkg-descr @@ -3,4 +3,4 @@ exFAT is a simple file system created by Microsoft. It is intended to replace FAT32 removing some of it's limitations. exFAT is a standard FS for SDXC memory cards. -WWW: http://code.google.com/p/exfat/ +WWW: https://github.com/relan/exfat diff --git a/sysutils/iocage/Makefile b/sysutils/iocage/Makefile index 8210eb1..ebfd512 100644 --- a/sysutils/iocage/Makefile +++ b/sysutils/iocage/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= iocage -PORTVERSION= 1.7.4 +PORTVERSION= 1.7.5 DISTVERSIONPREFIX=v CATEGORIES= sysutils diff --git a/sysutils/iocage/distinfo b/sysutils/iocage/distinfo index 4355500..c160093 100644 --- a/sysutils/iocage/distinfo +++ b/sysutils/iocage/distinfo @@ -1,2 +1,3 @@ -SHA256 (iocage-iocage-v1.7.4_GH0.tar.gz) = e3c4463a6b7bb0a595cfd82a5ff829ceda658886b7596d59f0c8f5c182ca80f2 -SIZE (iocage-iocage-v1.7.4_GH0.tar.gz) = 297040 +TIMESTAMP = 1468403765 +SHA256 (iocage-iocage-v1.7.5_GH0.tar.gz) = 99c404c078c8f2239c2c03bd7aacc4acee7a47fbe95d4325ee65fe186b743160 +SIZE (iocage-iocage-v1.7.5_GH0.tar.gz) = 297453 diff --git a/sysutils/py-salt/Makefile b/sysutils/py-salt/Makefile index 479d050a..ab9817d 100644 --- a/sysutils/py-salt/Makefile +++ b/sysutils/py-salt/Makefile @@ -3,6 +3,7 @@ PORTNAME= salt PORTVERSION= 2016.3.1 +PORTREVISION= 1 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/sysutils/py-salt/files/patch-salt_grains_core.py b/sysutils/py-salt/files/patch-salt_grains_core.py new file mode 100644 index 0000000..04794a0 --- /dev/null +++ b/sysutils/py-salt/files/patch-salt_grains_core.py @@ -0,0 +1,12 @@ +# Issue #33608 +# https://github.com/saltstack/salt/issues/33608 +--- salt/grains/core.py.orig 2016-05-25 22:30:31 UTC ++++ salt/grains/core.py +@@ -1422,6 +1422,7 @@ def os_data(): + else: + grains['os'] = grains['kernel'] + if grains['kernel'] == 'FreeBSD': ++ grains.update(_bsd_cpudata(grains)) + try: + grains['osrelease'] = __salt__['cmd.run']('freebsd-version -u').split('-')[0] + except salt.exceptions.CommandExecutionError: diff --git a/sysutils/py-salt/files/patch-salt_states_cron.py b/sysutils/py-salt/files/patch-salt_states_cron.py new file mode 100644 index 0000000..325f446 --- /dev/null +++ b/sysutils/py-salt/files/patch-salt_states_cron.py @@ -0,0 +1,28 @@ +# Fixes cron.file from upstream issue #34094/#34095 [1]. This will be in +# 2016.3.2. +# https://github.com/saltstack/salt/issues/34094 +# https://github.com/saltstack/salt/pull/34095 +--- salt/states/cron.py.orig 2016-06-13 22:17:50 UTC ++++ salt/states/cron.py +@@ -540,6 +540,7 @@ def file(name, + __env__, + context, + defaults, ++ False, # skip_verify + **kwargs + ) + except Exception as exc: +@@ -573,12 +574,12 @@ def file(name, + ret['comment'] = 'Unable to manage file: {0}'.format(exc) + return ret + ++ cron_ret = None + if ret['changes']: + cron_ret = __salt__['cron.write_cron_file_verbose'](user, cron_path) + ret['changes'] = {'diff': ret['changes']['diff']} + ret['comment'] = 'Crontab for user {0} was updated'.format(user) + elif ret['result']: +- cron_ret = None + ret['comment'] = 'Crontab for user {0} is in the correct ' \ + 'state'.format(user) + diff --git a/textproc/markdown-mode.el/Makefile b/textproc/markdown-mode.el/Makefile index ada182a..634d43c 100644 --- a/textproc/markdown-mode.el/Makefile +++ b/textproc/markdown-mode.el/Makefile @@ -2,6 +2,7 @@ PORTNAME= markdown-mode.el PORTVERSION= 2.1 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= http://jblevins.org/projects/markdown-mode/ DISTNAME= markdown-mode.el @@ -12,6 +13,7 @@ EXTRACT_ONLY= # empty MAINTAINER= olgeni@FreeBSD.org COMMENT= Emacs/XEmacs major mode for editing Markdown-formatted text +NO_ARCH= yes NO_BUILD= yes NO_WRKSUBDIR= yes diff --git a/www/atutor/Makefile b/www/atutor/Makefile index 5f1400a..2150e8a 100644 --- a/www/atutor/Makefile +++ b/www/atutor/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= atutor -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES= www MASTER_SITES= SF/${PORTNAME}/ATutor%202/ DISTNAME= ATutor-${PORTVERSION} diff --git a/www/atutor/distinfo b/www/atutor/distinfo index 86fded7..ff02b24 100644 --- a/www/atutor/distinfo +++ b/www/atutor/distinfo @@ -1,2 +1,3 @@ -SHA256 (ATutor-2.2.1.tar.gz) = 949f8cd004d5dae72f9362cf2332c7efa353c5d57688d5e07606b6a3581c3828 -SIZE (ATutor-2.2.1.tar.gz) = 9034938 +TIMESTAMP = 1468165313 +SHA256 (ATutor-2.2.2.tar.gz) = 04dce5707a4e3f2ba44cc56df784f213376dbf28e73a599bbc3eaa6645cde3aa +SIZE (ATutor-2.2.2.tar.gz) = 9127998 diff --git a/www/linux-c6-flashplugin11/Makefile b/www/linux-c6-flashplugin11/Makefile index 897cf97..91b1b39 100644 --- a/www/linux-c6-flashplugin11/Makefile +++ b/www/linux-c6-flashplugin11/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= flashplugin -PORTVERSION= 11.2r202.626 +PORTVERSION= 11.2r202.632 CATEGORIES= www multimedia linux MASTER_SITES= http://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION:S/r/./}/:plugin \ LOCAL/nox:suplib diff --git a/www/linux-c6-flashplugin11/distinfo.i686 b/www/linux-c6-flashplugin11/distinfo.i686 index 2f145b8..cfd3958 100644 --- a/www/linux-c6-flashplugin11/distinfo.i686 +++ b/www/linux-c6-flashplugin11/distinfo.i686 @@ -1,5 +1,5 @@ -TIMESTAMP = 1466301006 -SHA256 (flashplugin/11.2r202.626/install_flash_player_11_linux.i386.tar.gz) = 1ec079f9d8578255435e15f704f05e4af69e749a480427af2be64fe447e2ca8c -SIZE (flashplugin/11.2r202.626/install_flash_player_11_linux.i386.tar.gz) = 6981743 -SHA256 (flashplugin/11.2r202.626/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf -SIZE (flashplugin/11.2r202.626/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 3455 +TIMESTAMP = 1468629151 +SHA256 (flashplugin/11.2r202.632/install_flash_player_11_linux.i386.tar.gz) = c455ba9b72318d87434c7199a94ca15dc0f1c7fca590ee3703e013cbdecce942 +SIZE (flashplugin/11.2r202.632/install_flash_player_11_linux.i386.tar.gz) = 6986419 +SHA256 (flashplugin/11.2r202.632/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf +SIZE (flashplugin/11.2r202.632/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 3455 diff --git a/www/linux-c6-flashplugin11/distinfo.x86_64 b/www/linux-c6-flashplugin11/distinfo.x86_64 index 2f145b8..cfd3958 100644 --- a/www/linux-c6-flashplugin11/distinfo.x86_64 +++ b/www/linux-c6-flashplugin11/distinfo.x86_64 @@ -1,5 +1,5 @@ -TIMESTAMP = 1466301006 -SHA256 (flashplugin/11.2r202.626/install_flash_player_11_linux.i386.tar.gz) = 1ec079f9d8578255435e15f704f05e4af69e749a480427af2be64fe447e2ca8c -SIZE (flashplugin/11.2r202.626/install_flash_player_11_linux.i386.tar.gz) = 6981743 -SHA256 (flashplugin/11.2r202.626/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf -SIZE (flashplugin/11.2r202.626/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 3455 +TIMESTAMP = 1468629151 +SHA256 (flashplugin/11.2r202.632/install_flash_player_11_linux.i386.tar.gz) = c455ba9b72318d87434c7199a94ca15dc0f1c7fca590ee3703e013cbdecce942 +SIZE (flashplugin/11.2r202.632/install_flash_player_11_linux.i386.tar.gz) = 6986419 +SHA256 (flashplugin/11.2r202.632/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf +SIZE (flashplugin/11.2r202.632/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 3455 diff --git a/www/moodle29/Makefile b/www/moodle29/Makefile index 54220fe..56e8072 100644 --- a/www/moodle29/Makefile +++ b/www/moodle29/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= moodle -PORTVERSION= 2.9.6 +PORTVERSION= 2.9.7 CATEGORIES= www MASTER_SITES= SF/moodle/Moodle/stable29/ PKGNAMESUFFIX= ${PKGORIGIN:T:S/moodle//} @@ -12,7 +12,7 @@ COMMENT= Course management system based on social constructionism LICENSE= GPLv3 -CONFLICTS= moodle31-3.1 moodle30-3.0.[0-9]* moodle28-2.8.[0-9]* +CONFLICTS= moodle31-3.1.[0-9]* moodle30-3.0.[0-9]* moodle28-2.8.[0-9]* USES= cpe tar:tgz USE_PHP= session gd pcre mbstring iconv tokenizer curl xml xmlrpc ctype \ diff --git a/www/moodle29/distinfo b/www/moodle29/distinfo index bd01717..c5be423 100644 --- a/www/moodle29/distinfo +++ b/www/moodle29/distinfo @@ -1,2 +1,3 @@ -SHA256 (moodle-2.9.6.tgz) = b5b17e869cc7f122d7f624a6ec3cf9fcfaa7166b3020e3c819c2135ae7327a15 -SIZE (moodle-2.9.6.tgz) = 36582260 +TIMESTAMP = 1468351649 +SHA256 (moodle-2.9.7.tgz) = 87261ce872ef7bab3c04a4ae28cc41168af2d5fdd1c35bab6aca02132e3725db +SIZE (moodle-2.9.7.tgz) = 36586018 diff --git a/www/moodle30/Makefile b/www/moodle30/Makefile index 0e6727a..65073b7 100644 --- a/www/moodle30/Makefile +++ b/www/moodle30/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= moodle -PORTVERSION= 3.0.4 +PORTVERSION= 3.0.5 CATEGORIES= www MASTER_SITES= SF/moodle/Moodle/stable30/ PKGNAMESUFFIX= ${PKGORIGIN:T:S/moodle//} @@ -12,7 +12,7 @@ COMMENT= Course management system based on social constructionism LICENSE= GPLv3 -CONFLICTS= moodle28-2.8.[0-9]* moodle29-2.9.[0-9]* moodle31-3.1 +CONFLICTS= moodle28-2.8.[0-9]* moodle29-2.9.[0-9]* moodle31-3.1.[0-9]* USES= cpe tar:tgz USE_PHP= ctype curl dom gd hash iconv intl json mbstring opcache \ diff --git a/www/moodle30/distinfo b/www/moodle30/distinfo index 338f483..8c4a8f0 100644 --- a/www/moodle30/distinfo +++ b/www/moodle30/distinfo @@ -1,2 +1,3 @@ -SHA256 (moodle-3.0.4.tgz) = 27e3f58d2bc1e63163f5c7d27aaf5548c216a433e87be7bf429030aada43b469 -SIZE (moodle-3.0.4.tgz) = 38110816 +TIMESTAMP = 1468349825 +SHA256 (moodle-3.0.5.tgz) = e8a6a3661e036b3cf0b6d89ed2a6af5da58561e1a94118512e92cab39071ca97 +SIZE (moodle-3.0.5.tgz) = 38156153 diff --git a/www/moodle31/Makefile b/www/moodle31/Makefile index befe908..0d35026 100644 --- a/www/moodle31/Makefile +++ b/www/moodle31/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= moodle -PORTVERSION= 3.1 +PORTVERSION= 3.1.1 CATEGORIES= www MASTER_SITES= SF/moodle/Moodle/stable31/ PKGNAMESUFFIX= ${PKGORIGIN:T:S/moodle//} diff --git a/www/moodle31/distinfo b/www/moodle31/distinfo index e2e6c48..6f96842 100644 --- a/www/moodle31/distinfo +++ b/www/moodle31/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1464077765 -SHA256 (moodle-3.1.tgz) = 5debb77fe2a82f28b25505f1244cc9e641b1c0b20dfefe831917c605da74151c -SIZE (moodle-3.1.tgz) = 37440572 +TIMESTAMP = 1468347071 +SHA256 (moodle-3.1.1.tgz) = 7460caa0ba242de1ba3ed83bce3aebe138ecc7472d1fa96f6d28946a8e38bac1 +SIZE (moodle-3.1.1.tgz) = 37479843 diff --git a/www/varnish4/Makefile b/www/varnish4/Makefile index e441bec..1816249 100644 --- a/www/varnish4/Makefile +++ b/www/varnish4/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= varnish -PORTVERSION= 4.1.2 +PORTVERSION= 4.1.3 PORTREVISION= 0 CATEGORIES= www MASTER_SITES= http://repo.varnish-cache.org/source/ diff --git a/www/varnish4/distinfo b/www/varnish4/distinfo index a4e581d..872d4d3 100644 --- a/www/varnish4/distinfo +++ b/www/varnish4/distinfo @@ -1,2 +1,3 @@ -SHA256 (varnish-4.1.2.tar.gz) = 9728da944d28eb5be90e7ab6799c2c4c831ef4df5e5154537eb7f2e5d5e348c4 -SIZE (varnish-4.1.2.tar.gz) = 2030846 +TIMESTAMP = 1468526411 +SHA256 (varnish-4.1.3.tar.gz) = 9f9469b9fda2a578da2a9d282c71c34eeb5c42eda7f8d8728284d92282108429 +SIZE (varnish-4.1.3.tar.gz) = 2134205 diff --git a/www/varnish4/pkg-descr b/www/varnish4/pkg-descr index d6e8c67..78d8803 100644 --- a/www/varnish4/pkg-descr +++ b/www/varnish4/pkg-descr @@ -1,12 +1,12 @@ This is the Varnish high-performance HTTP accelerator. Documentation and additional information about Varnish is available on -<URL:http://varnish.projects.linpro.no/>. +http://varnish-cache.org/docs/index.html Technical questions about Varnish and this release should be addressed -to <varnish-dev@projects.linpro.no>. +to <varnish-dev@varnish-cache.org> Questions about commercial support and services related to Varnish -should be addressed to <varnish@linpro.no>. +can be directed here: https://www.varnish-software.com/contact-us WWW: http://www.varnish-cache.org/ diff --git a/x11-fonts/webfonts/Makefile b/x11-fonts/webfonts/Makefile index c14335b..42eb759 100644 --- a/x11-fonts/webfonts/Makefile +++ b/x11-fonts/webfonts/Makefile @@ -3,11 +3,11 @@ PORTNAME= webfonts PORTVERSION= 0.30 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= x11-fonts MASTER_SITES= SF/corefonts/the%20fonts/final:group1 \ ftp://ftp.botik.ru/rented/znamensk/distributions/ftp.vsu.ru/pub/tex/font-packs/mscore/:group1 \ - http://download.microsoft.com/download/ie6sp1/finrel/6_sp1/W98NT42KMeXP/EN-US/:group2 + SF/corefonts/OldFiles/:group2 DISTFILES= andale32.exe:group1 arial32.exe:group1 arialb32.exe:group1 \ comic32.exe:group1 courie32.exe:group1 georgi32.exe:group1 \ impact32.exe:group1 times32.exe:group1 trebuc32.exe:group1 \ @@ -31,7 +31,7 @@ OPTIONS_DEFINE= EXTRAFONTS OPTIONS_SUB= yes EXTRAFONTS_DESC= Fonts licensed under MS Windows license -EXTRAFONTS_DISTFILES= ielpkth.cab:group2 +EXTRAFONTS_DISTFILES= IELPKTH.CAB:group2 SUB_FILES= pkg-message diff --git a/x11-fonts/webfonts/distinfo b/x11-fonts/webfonts/distinfo index 7c57de6..d78b5cf 100644 --- a/x11-fonts/webfonts/distinfo +++ b/x11-fonts/webfonts/distinfo @@ -1,3 +1,4 @@ +TIMESTAMP = 1468745172 SHA256 (webfonts/andale32.exe) = 0524fe42951adc3a7eb870e32f0920313c71f170c859b5f770d82b4ee111e970 SIZE (webfonts/andale32.exe) = 198384 SHA256 (webfonts/arial32.exe) = 85297a4d146e9c87ac6f74822734bdee5f4b2a722d7eaa584b7f2cbf76f478f6 @@ -20,5 +21,5 @@ SHA256 (webfonts/verdan32.exe) = c1cb61255e363166794e47664e2f21af8e3a26cb6346eb8 SIZE (webfonts/verdan32.exe) = 351992 SHA256 (webfonts/webdin32.exe) = 64595b5abc1080fba8610c5c34fab5863408e806aafe84653ca8575bed17d75a SIZE (webfonts/webdin32.exe) = 185072 -SHA256 (webfonts/ielpkth.cab) = c1be3fb8f0042570be76ec6daa03a99142c88367c1bc810240b85827c715961a -SIZE (webfonts/ielpkth.cab) = 411248 +SHA256 (webfonts/IELPKTH.CAB) = c1be3fb8f0042570be76ec6daa03a99142c88367c1bc810240b85827c715961a +SIZE (webfonts/IELPKTH.CAB) = 411248 |
