August 2017 - crux-commits

ports/opt (3.3): fakeroot: update to 1.22
by crux＠crux.nu 18 Aug '17

18 Aug '17

commit 6b81184a5082203290bfaffe69adf2b396c8b614 Author: Juergen Daubert <jue(a)jue.li> Date: Fri Aug 18 19:28:34 2017 +0200 fakeroot: update to 1.22 diff --git a/fakeroot/.md5sum b/fakeroot/.md5sum index 3f170e18b..ae685cc63 100644 --- a/fakeroot/.md5sum +++ b/fakeroot/.md5sum @@ -1,2 +1,2 @@ -be5c9a0e516869fca4a6758105968e5a fakeroot_1.21.orig.tar.gz +fae64c9aeb2c895ead8e1b99bf50c631 fakeroot_1.22.orig.tar.bz2 5fba0b541b5af39d804265223fda525c silence-dlerror.patch diff --git a/fakeroot/.signature b/fakeroot/.signature index ebe280a33..c53cdca1c 100644 --- a/fakeroot/.signature +++ b/fakeroot/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/Xp0mD5cMyh0fCDqrlNYnNBsTbgKAweq7iKSnz3TdyO0VhZ8qokgsUUvmtInn0sYch25aL0/3iZOPifkl4QowAg= -SHA256 (Pkgfile) = 212f167e2deb1aec32740d15a1b7e1a0a67a99673b9279e78d25e80df703b960 +RWSE3ohX2g5d/eLuFnXzdV9pNFNuIpRkLL0amFItbFM3Lbxzmm+e45KI3aLeJ6/8lHwogmprM8n2Or1c4eS+yEHW0daY8zUqzQw= +SHA256 (Pkgfile) = 2b191301abf6973cb63c8c8a882e709c82d5f53a3736493daddd3538af2603ca SHA256 (.footprint) = b372fbdfe6daf9611f08a5152cfd9b73e68dddf464ddfcd88820ad00fe061043 -SHA256 (fakeroot_1.21.orig.tar.gz) = 5d293c1b3604b2a9265d1811a9890c749887ef08aec55f3237d32bf35836171a +SHA256 (fakeroot_1.22.orig.tar.bz2) = bd806a4a1e641203eb3d4571a10089e8a038c10ec7e492fa1e061b03ae3ec6fe SHA256 (silence-dlerror.patch) = 347f6496c93ed0d91dcb554db92602b50520a16308e3b8bc33822bd69966267b diff --git a/fakeroot/Pkgfile b/fakeroot/Pkgfile index 80e1189a1..9a899fdf4 100644 --- a/fakeroot/Pkgfile +++ b/fakeroot/Pkgfile @@ -3,9 +3,9 @@ # Maintainer: Juergen Daubert, jue at crux dot nu name=fakeroot -version=1.21 -release=2 -source=(http://ftp.debian.org/debian/pool/main/f/$name/${name}_$version.orig.tar.gz +version=1.22 +release=1 +source=(http://ftp.debian.org/debian/pool/main/f/$name/${name}_$version.orig.tar.bz2 silence-dlerror.patch) build () {

1 0

ports/opt (3.3): cups-filters: update to 1.16.2
by crux＠crux.nu 18 Aug '17

18 Aug '17

commit 8c96f3400512cf61a23a86e89c04ee0341a2ab20 Author: Juergen Daubert <jue(a)jue.li> Date: Fri Aug 18 19:28:13 2017 +0200 cups-filters: update to 1.16.2 diff --git a/cups-filters/.footprint b/cups-filters/.footprint index 2d78e5cba..4fb07d102 100644 --- a/cups-filters/.footprint +++ b/cups-filters/.footprint @@ -8,8 +8,8 @@ drwxr-xr-x root/root etc/rc.d/ -rwxr-xr-x root/root etc/rc.d/cups-browsed drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -lrwxrwxrwx root/root usr/bin/driverless -> /usr/lib/cups/driver/driverless -lrwxrwxrwx root/root usr/bin/foomatic-rip -> /usr/lib/cups/filter/foomatic-rip +lrwxrwxrwx root/root usr/bin/driverless -> ../lib/cups/driver/driverless +lrwxrwxrwx root/root usr/bin/foomatic-rip -> ../lib/cups/filter/foomatic-rip -rwxr-xr-x root/root usr/bin/ttfread drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/include/cupsfilters/ @@ -29,7 +29,7 @@ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/cups/ drwxr-xr-x root/root usr/lib/cups/backend/ -rwxr-xr-x root/root usr/lib/cups/backend/beh -lrwxrwxrwx root/root usr/lib/cups/backend/driverless -> /usr/lib/cups/driver/driverless +lrwxrwxrwx root/root usr/lib/cups/backend/driverless -> ../driver/driverless -rwxr-xr-x root/root usr/lib/cups/backend/implicitclass -rwxr-xr-x root/root usr/lib/cups/backend/parallel -rwxr-xr-x root/root usr/lib/cups/backend/serial @@ -67,9 +67,9 @@ lrwxrwxrwx root/root usr/lib/libcupsfilters.so.1 -> libcupsfilters.so.1.0.0 -rwxr-xr-x root/root usr/lib/libcupsfilters.so.1.0.0 -rw-r--r-- root/root usr/lib/libfontembed.a -rwxr-xr-x root/root usr/lib/libfontembed.la -lrwxrwxrwx root/root usr/lib/libfontembed.so -> libfontembed.so.1.0.0 -lrwxrwxrwx root/root usr/lib/libfontembed.so.1 -> libfontembed.so.1.0.0 --rwxr-xr-x root/root usr/lib/libfontembed.so.1.0.0 +lrwxrwxrwx root/root usr/lib/libfontembed.so -> libfontembed.so.2.0.0 +lrwxrwxrwx root/root usr/lib/libfontembed.so.2 -> libfontembed.so.2.0.0 +-rwxr-xr-x root/root usr/lib/libfontembed.so.2.0.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libcupsfilters.pc -rw-r--r-- root/root usr/lib/pkgconfig/libfontembed.pc diff --git a/cups-filters/.md5sum b/cups-filters/.md5sum index 0d3131908..b7994f3c7 100644 --- a/cups-filters/.md5sum +++ b/cups-filters/.md5sum @@ -1,2 +1,2 @@ 7540a6989be0042429f41770b1cdf215 cups-browsed -f76d13c431257a95b233e5c87d10742f cups-filters-1.16.1.tar.xz +268878b63c43df4d05968f182d07e983 cups-filters-1.16.2.tar.xz diff --git a/cups-filters/.signature b/cups-filters/.signature index a272f3ebe..0ff1ce0a9 100644 --- a/cups-filters/.signature +++ b/cups-filters/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/fJkGaC3oaV5JMS/MQTs19LkGDH8YFyG1Rx1nHWTmQ2/EPKiR2OOf1xUD5gFQ5DcPcyZsuzIhY3nK7TehZ00YA4= -SHA256 (Pkgfile) = 4351a11ffbadab2dc16268c048a697bdc61bb4a3f6494091c666e36c396c663f -SHA256 (.footprint) = 914dcff552dfed529d3c3b89a671103710fcc7711081cf503e1a8a265646e6cc -SHA256 (cups-filters-1.16.1.tar.xz) = 32da05c059a8f7f74eb78abdfffe1dddad9dd8439771e2232be7aef71a4443a3 +RWSE3ohX2g5d/a6RLPWMBSLRiAetRDBS2GPlO8Ike5GgGEbVHdSewY5fU46C3g74P31740N5Jzc9S3acMC0V2MNzrlUGcquJjgg= +SHA256 (Pkgfile) = 734cb6a80bda926b353cabb72fae559ef71f5f6f17567d9d5f431cb7d270c347 +SHA256 (.footprint) = 7915bc008ae0196d88ea1e1fe71741d060adf5dcdf5f7438df533b61decfa862 +SHA256 (cups-filters-1.16.2.tar.xz) = 604e5605803889e421b2a30979bc1acb83a48334036725613cb8352085d3d273 SHA256 (cups-browsed) = 4c4900ee88d488078da20a5cabc949921382fa69bc28bb2a7f89fa5ae01afb5b diff --git a/cups-filters/Pkgfile b/cups-filters/Pkgfile index 330587234..d7c73ed95 100644 --- a/cups-filters/Pkgfile +++ b/cups-filters/Pkgfile @@ -4,7 +4,7 @@ # Depends on: cups ghostscript poppler qpdf mupdf name=cups-filters -version=1.16.1 +version=1.16.2 release=1 source=(http://www.openprinting.org/download/$name/$name-$version.tar.xz cups-browsed)

1 0

ports/contrib (3.3): openvpn: update signature
by crux＠crux.nu 18 Aug '17

18 Aug '17

commit 956796b36583a1e596cab2e578bd3e78c51d47fd Author: Thomas Penteker <tek(a)serverop.de> Date: Fri Aug 18 12:57:55 2017 +0200 openvpn: update signature diff --git a/openvpn/.md5sum b/openvpn/.md5sum index 5319d522..cbea0014 100644 --- a/openvpn/.md5sum +++ b/openvpn/.md5sum @@ -1,2 +1,2 @@ f8152ae5357778e949c32950874c03ac openvpn -177673c5e3f7d3433bb9c5f7728e5734 openvpn-2.4.3.tar.gz +e1929f82aff40f3d105e5f72aacff9c1 openvpn-2.4.3.tar.gz diff --git a/openvpn/.signature b/openvpn/.signature index 838c2be9..a6dd5d90 100644 --- a/openvpn/.signature +++ b/openvpn/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3y83jesvblPAJUskx0sG/B7oObMaC2Z4kqT3eVvWi7doPzVozkPVaHLNTFG8p8U5mxfaIoZVaqUFBq8G0HHu8QI= +RWSagIOpLGJF3x1g7UFxXi0YhsvPW//E+ERPp9Z5XROF4e8UrMVgT4xkcTh37F1puYGu/RJAXx6vyzDQBGpKqpAUmD1axIk9ewg= SHA256 (Pkgfile) = abe0e5e9e957107233f112e6f73f9175a350ba4fa129a11960c20e83d558f584 SHA256 (.footprint) = 8b555fee300d06be944c5003a877a44d04b2acd339546a5c6aef9d9a8ec68377 -SHA256 (openvpn-2.4.3.tar.gz) = 84a01aa3df0c12a3552ca3baaa39d700137b5bce4b6de683fe87fb79bfa5df0b +SHA256 (openvpn-2.4.3.tar.gz) = cee3d3ca462960a50a67c0ebd186e01b6d13db70275205663695152c9aca8579 SHA256 (openvpn) = 8f0b3932f074600cab2db334b33a7528ddcb4d1380e546f7d8103708413e89b0

1 0

ports/opt (3.3): qpdf: updated signatures. Closes FS#1458
by crux＠crux.nu 17 Aug '17

17 Aug '17

commit 6e169313e430828d29b9ab59d23d4f07fde7274b Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Thu Aug 17 22:14:50 2017 +0200 qpdf: updated signatures. Closes FS#1458 diff --git a/qpdf/.signature b/qpdf/.signature new file mode 100644 index 000000000..5572ccd39 --- /dev/null +++ b/qpdf/.signature @@ -0,0 +1,9 @@ +untrusted comment: verify with /etc/ports/opt.pub +RWSE3ohX2g5d/YJAZhWWLZUYLWPRsCYcpW33dackFko68OVeTlSx977CZXMi01uWOhIRVZAponEIRQ+ErUE0c9M3DfH0TTArwwY= +SHA256 (Pkgfile) = 48ab28428f3d935db825606f899011eba69f135142a808536958b0a8e6528bad +SHA256 (.footprint) = 85e6362fb2da951b8318d1de30c3cb3607fb78de108a8348944a3cb992cd37c3 +SHA256 (qpdf-6.0.0.tar.gz) = a9fdc7e94d38fcd3831f37b6e0fe36492bf79aa6d54f8f66062cf7f9c4155233 +SHA256 (qpdf-6.0.0-detect-recursions.patch) = 4c59e1ca6f7a209a07191ffacac0e28f8d70345801e282493e52cbce76c15a8e +SHA256 (qpdf-6.0.0-CVE-2017-9208.patch) = 0e2bce8c860aec84dff69739020c7320266f188dd5dfa7eb8e6fc8655d462014 +SHA256 (qpdf-6.0.0-CVE-2017-9209.patch) = 743aa98868aa887abeeaa3b3f4ec35efd9499bb80b3c1c72410afc064d7cc846 +SHA256 (qpdf-6.0.0-CVE-2017-9210.patch) = aff1f8ee13e7436d9982e14d5836172ff0236cb14b48e37c000ae7304185efde

1 0

ports/opt (3.3): qpdf: Patch CVE-2017-{9208, 9209, 9210}
by crux＠crux.nu 17 Aug '17

17 Aug '17

commit f6570385db2d33d5a4344ef944345ba1da9cc3a1 Author: Predrag Ivanovic <predivan(a)mts.rs> Date: Thu Aug 17 16:29:39 2017 +0200 qpdf: Patch CVE-2017-{9208,9209,9210} Reference: https://bugzilla.redhat.com/show_bug.cgi?id=1454820 diff --git a/qpdf/.md5sum b/qpdf/.md5sum index 74ebe5ded..aaf973f6c 100644 --- a/qpdf/.md5sum +++ b/qpdf/.md5sum @@ -1 +1,5 @@ +b3cc65446adae1fe4f164c010c59f64b qpdf-6.0.0-CVE-2017-9208.patch +491486ccdfddc450f2c3b1414eb369f9 qpdf-6.0.0-CVE-2017-9209.patch +5713ad31faa151c1b7bd9064d820a367 qpdf-6.0.0-CVE-2017-9210.patch +c9457b6f4430f43fe7aaad93736bd67a qpdf-6.0.0-detect-recursions.patch e014bd3ecf1c4d1a520bbc14d84ac20e qpdf-6.0.0.tar.gz diff --git a/qpdf/.signature b/qpdf/.signature deleted file mode 100644 index cc7b5644e..000000000 --- a/qpdf/.signature +++ /dev/null @@ -1,5 +0,0 @@ -untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/SgNXvxSnvi9WfYZ5yJZsFzdUiNb2UZGqPtWlrpfzmammdTilXO4kVjmqyTaEa6KtkRl+ptQvVuHbpuYAuCygwM= -SHA256 (Pkgfile) = 0296edc5293d7e31d19e379e923c4b34560991b6fadab1f53bdf97946db22f07 -SHA256 (.footprint) = 85e6362fb2da951b8318d1de30c3cb3607fb78de108a8348944a3cb992cd37c3 -SHA256 (qpdf-6.0.0.tar.gz) = a9fdc7e94d38fcd3831f37b6e0fe36492bf79aa6d54f8f66062cf7f9c4155233 diff --git a/qpdf/Pkgfile b/qpdf/Pkgfile index 9764cb6fd..9d1ad834a 100644 --- a/qpdf/Pkgfile +++ b/qpdf/Pkgfile @@ -5,11 +5,21 @@ name=qpdf version=6.0.0 -release=2 -source=(http://downloads.sourceforge.net/project/$name/$name/$version/$name-$version.tar.gz) +release=3 +source=(http://downloads.sourceforge.net/project/$name/$name/$version/$name-$version.tar.gz + qpdf-6.0.0-detect-recursions.patch + qpdf-6.0.0-CVE-2017-9208.patch + qpdf-6.0.0-CVE-2017-9209.patch + qpdf-6.0.0-CVE-2017-9210.patch) build() { cd $name-$version + + patch -p1 -i $SRC/qpdf-6.0.0-detect-recursions.patch + patch -p1 -i $SRC/qpdf-6.0.0-CVE-2017-9208.patch + patch -p1 -i $SRC/qpdf-6.0.0-CVE-2017-9209.patch + patch -p1 -i $SRC/qpdf-6.0.0-CVE-2017-9210.patch + ./configure --prefix=/usr make make DESTDIR=$PKG install diff --git a/qpdf/qpdf-6.0.0-CVE-2017-9208.patch b/qpdf/qpdf-6.0.0-CVE-2017-9208.patch new file mode 100644 index 000000000..0dce30995 --- /dev/null +++ b/qpdf/qpdf-6.0.0-CVE-2017-9208.patch @@ -0,0 +1,36 @@ +diff -up qpdf-6.0.0/libqpdf/QPDF.cc.CVE-2017-9208 qpdf-6.0.0/libqpdf/QPDF.cc +--- qpdf-6.0.0/libqpdf/QPDF.cc.CVE-2017-9208 2017-08-03 08:53:32.806072781 +0200 ++++ qpdf-6.0.0/libqpdf/QPDF.cc 2017-08-03 08:55:39.529073703 +0200 +@@ -1340,6 +1340,13 @@ QPDF::readObjectAtOffset(bool try_recove + objid = atoi(tobjid.getValue().c_str()); + generation = atoi(tgen.getValue().c_str()); + ++ if (objid == 0) ++ { ++ throw QPDFExc(qpdf_e_damaged_pdf, this->file->getName(), ++ this->last_object_description, offset, ++ "object with ID 0"); ++ } ++ + if ((exp_objid >= 0) && + (! ((objid == exp_objid) && (generation == exp_generation)))) + { +diff -up qpdf-6.0.0/libqpdf/QPDFObjectHandle.cc.CVE-2017-9208 qpdf-6.0.0/libqpdf/QPDFObjectHandle.cc +--- qpdf-6.0.0/libqpdf/QPDFObjectHandle.cc.CVE-2017-9208 2015-11-10 18:48:52.000000000 +0100 ++++ qpdf-6.0.0/libqpdf/QPDFObjectHandle.cc 2017-08-03 08:54:50.264499428 +0200 +@@ -1090,6 +1090,15 @@ QPDFObjectHandle::parseInternal(PointerH + QPDFObjectHandle + QPDFObjectHandle::newIndirect(QPDF* qpdf, int objid, int generation) + { ++ if (objid == 0) ++ { ++ // Special case: QPDF uses objid 0 as a sentinel for direct ++ // objects, and the PDF specification doesn't allow for object ++ // 0. Treat indirect references to object 0 as null so that we ++ // never create an indirect object with objid 0. ++ return newNull(); ++ } ++ + return QPDFObjectHandle(qpdf, objid, generation); + } + diff --git a/qpdf/qpdf-6.0.0-CVE-2017-9209.patch b/qpdf/qpdf-6.0.0-CVE-2017-9209.patch new file mode 100644 index 000000000..6af336f14 --- /dev/null +++ b/qpdf/qpdf-6.0.0-CVE-2017-9209.patch @@ -0,0 +1,37 @@ +diff -up qpdf-6.0.0/include/qpdf/QPDF.hh.CVE-2017-9209 qpdf-6.0.0/include/qpdf/QPDF.hh +--- qpdf-6.0.0/include/qpdf/QPDF.hh.CVE-2017-9209 2017-08-03 10:00:17.489291722 +0200 ++++ qpdf-6.0.0/include/qpdf/QPDF.hh 2017-08-03 10:00:17.494291685 +0200 +@@ -1095,6 +1095,7 @@ class QPDF + // copied_stream_data_provider is owned by copied_streams + CopiedStreamDataProvider* copied_stream_data_provider; + std::set<QPDFObjGen> attachment_streams; ++ bool reconstructed_xref; + + // Linearization data + qpdf_offset_t first_xref_item_offset; // actual value from file +diff -up qpdf-6.0.0/libqpdf/QPDF.cc.CVE-2017-9209 qpdf-6.0.0/libqpdf/QPDF.cc +--- qpdf-6.0.0/libqpdf/QPDF.cc.CVE-2017-9209 2017-08-03 10:00:17.491291707 +0200 ++++ qpdf-6.0.0/libqpdf/QPDF.cc 2017-08-03 10:01:43.243661883 +0200 +@@ -93,6 +93,7 @@ QPDF::QPDF() : + cached_key_generation(0), + pushed_inherited_attributes_to_pages(false), + copied_stream_data_provider(0), ++ reconstructed_xref(false), + first_xref_item_offset(0), + uncompressed_after_compressed(false) + { +@@ -331,6 +332,14 @@ QPDF::setTrailer(QPDFObjectHandle obj) + void + QPDF::reconstruct_xref(QPDFExc& e) + { ++ if (this->reconstructed_xref) ++ { ++ // Avoid xref reconstruction infinite loops ++ throw e; ++ } ++ ++ this->reconstructed_xref = true; ++ + PCRE obj_re("^\\s*(\\d+)\\s+(\\d+)\\s+obj\\b"); + PCRE endobj_re("^\\s*endobj\\b"); + PCRE trailer_re("^\\s*trailer\\b"); diff --git a/qpdf/qpdf-6.0.0-CVE-2017-9210.patch b/qpdf/qpdf-6.0.0-CVE-2017-9210.patch new file mode 100644 index 000000000..e3ce8e9a4 --- /dev/null +++ b/qpdf/qpdf-6.0.0-CVE-2017-9210.patch @@ -0,0 +1,13 @@ +diff -up qpdf-6.0.0/libqpdf/QPDFObjectHandle.cc.CVE-2017-9210 qpdf-6.0.0/libqpdf/QPDFObjectHandle.cc +--- qpdf-6.0.0/libqpdf/QPDFObjectHandle.cc.CVE-2017-9210 2017-08-03 10:09:46.670111267 +0200 ++++ qpdf-6.0.0/libqpdf/QPDFObjectHandle.cc 2017-08-03 10:10:56.430600663 +0200 +@@ -1076,8 +1076,7 @@ QPDFObjectHandle::parseInternal(PointerH + throw QPDFExc( + qpdf_e_damaged_pdf, + input->getName(), object_description, offset, +- std::string("dictionary key not name (") + +- key_obj.unparse() + ")"); ++ std::string("dictionary key is not not a name token")); + } + dict[key_obj.getName()] = val; + } diff --git a/qpdf/qpdf-6.0.0-detect-recursions.patch b/qpdf/qpdf-6.0.0-detect-recursions.patch new file mode 100644 index 000000000..ae87d8080 --- /dev/null +++ b/qpdf/qpdf-6.0.0-detect-recursions.patch @@ -0,0 +1,61 @@ +diff -up qpdf-6.0.0/include/qpdf/QPDF.hh.detect-recursions qpdf-6.0.0/include/qpdf/QPDF.hh +--- qpdf-6.0.0/include/qpdf/QPDF.hh.detect-recursions 2015-11-10 18:48:52.000000000 +0100 ++++ qpdf-6.0.0/include/qpdf/QPDF.hh 2017-08-02 08:41:17.500831407 +0200 +@@ -603,6 +603,25 @@ class QPDF + int gen; + }; + ++ class ResolveRecorder ++ { ++ public: ++ ResolveRecorder(QPDF* qpdf, QPDFObjGen const& og) : ++ qpdf(qpdf), ++ og(og) ++ { ++ qpdf->resolving.insert(og); ++ } ++ virtual ~ResolveRecorder() ++ { ++ this->qpdf->resolving.erase(og); ++ } ++ private: ++ QPDF* qpdf; ++ QPDFObjGen og; ++ }; ++ friend class ResolveRecorder; ++ + void parse(char const* password); + void warn(QPDFExc const& e); + void setTrailer(QPDFObjectHandle obj); +@@ -1065,6 +1084,7 @@ class QPDF + std::map<QPDFObjGen, QPDFXRefEntry> xref_table; + std::set<int> deleted_objects; + std::map<QPDFObjGen, ObjCache> obj_cache; ++ std::set<QPDFObjGen> resolving; + QPDFObjectHandle trailer; + std::vector<QPDFObjectHandle> all_pages; + std::map<QPDFObjGen, int> pageobj_to_pages_pos; +diff -up qpdf-6.0.0/libqpdf/QPDF.cc.detect-recursions qpdf-6.0.0/libqpdf/QPDF.cc +--- qpdf-6.0.0/libqpdf/QPDF.cc.detect-recursions 2015-11-10 18:48:52.000000000 +0100 ++++ qpdf-6.0.0/libqpdf/QPDF.cc 2017-08-02 08:42:19.070393817 +0200 +@@ -1453,6 +1453,20 @@ QPDF::resolve(int objid, int generation) + // to insert things into the object cache that don't actually + // exist in the file. + QPDFObjGen og(objid, generation); ++ if (this->resolving.count(og)) ++ { ++ // This can happen if an object references itself directly or ++ // indirectly in some key that has to be resolved during ++ // object parsing, such as stream length. ++ warn(QPDFExc(qpdf_e_damaged_pdf, this->file->getName(), ++ "", this->file->getLastOffset(), ++ "loop detected resolving object " + ++ QUtil::int_to_string(objid) + " " + ++ QUtil::int_to_string(generation))); ++ return new QPDF_Null; ++ } ++ ResolveRecorder rr(this, og); ++ + if (! this->obj_cache.count(og)) + { + if (! this->xref_table.count(og))

1 0

ports/opt (3.3): sysstat: updated to 11.4.6
by crux＠crux.nu 16 Aug '17

16 Aug '17

commit 4b20258a73f5f8a84685366873509684ff5dc7ff Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Mon Aug 14 18:13:20 2017 +0200 sysstat: updated to 11.4.6 diff --git a/sysstat/.md5sum b/sysstat/.md5sum index 4bbbf0ec4..226990b23 100644 --- a/sysstat/.md5sum +++ b/sysstat/.md5sum @@ -1 +1 @@ -6f2db850676116158e4f5929d9820603 sysstat-11.4.5.tar.xz +c7df961637bff4f48d9a2a4f34737212 sysstat-11.4.6.tar.xz diff --git a/sysstat/.signature b/sysstat/.signature index 27ce5e14d..605a47fb0 100644 --- a/sysstat/.signature +++ b/sysstat/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/VbsiRPf/j+51k0HogPtdBkc42W9FlRPz3y63gep6eXK27+3/dPa8EDbpwux+L3WwiloE/A7v83Iu+XDCzcbFwA= -SHA256 (Pkgfile) = 417183464bb6835af1ad32a0e99f79f97af430df16c73f7863b3115555f72d69 +RWSE3ohX2g5d/Y9VKc8phYtcQapkMfxCdxcaUXsnCzIsQtcAO8jyfubHkSkCdRYKXzTwpOIhDyCNFLZyJYU8r64JJEig9LFMJQM= +SHA256 (Pkgfile) = c76672a7c1af2c756355f6863e21ad8b073cbb3b6ee6f39d85d6fb47673f08b4 SHA256 (.footprint) = 40fa0a104999c90b74335e617aebe00964d7575c850421c8b732d300684808fc -SHA256 (sysstat-11.4.5.tar.xz) = 785d754d64c746b21190773a846539ef2ee789bf908f05cd8245c234d15784ff +SHA256 (sysstat-11.4.6.tar.xz) = 2bc1d98572169a901868afdf0c56f98580191353ba3bc5c7ce6efd12e7a7fa2e diff --git a/sysstat/Pkgfile b/sysstat/Pkgfile index 61f3a1b58..61b720fd8 100644 --- a/sysstat/Pkgfile +++ b/sysstat/Pkgfile @@ -4,7 +4,7 @@ # Depends on: name=sysstat -version=11.4.5 +version=11.4.6 release=1 source=(http://perso.orange.fr/sebastien.godard/$name-$version.tar.xz)

1 0

ports/contrib (3.3): x265: 2.0 -> 2.5
by crux＠crux.nu 16 Aug '17

16 Aug '17

commit 15e27f0a211adaacd5b4495487f554f08d878759 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Wed Aug 16 21:56:39 2017 +1000 x265: 2.0 -> 2.5 diff --git a/x265/.footprint b/x265/.footprint index 2b60aea2..c8b93c3b 100644 --- a/x265/.footprint +++ b/x265/.footprint @@ -6,7 +6,7 @@ drwxr-xr-x root/root usr/include/ -rw-r--r-- root/root usr/include/x265_config.h drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libx265.a -lrwxrwxrwx root/root usr/lib/libx265.so -> libx265.so.87 --rwxr-xr-x root/root usr/lib/libx265.so.87 +lrwxrwxrwx root/root usr/lib/libx265.so -> libx265.so.130 +-rwxr-xr-x root/root usr/lib/libx265.so.130 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/x265.pc diff --git a/x265/.md5sum b/x265/.md5sum index 027366e0..49f3a795 100644 --- a/x265/.md5sum +++ b/x265/.md5sum @@ -1 +1 @@ -a4f16c0f054f002d6d8c9c6f7fb03026 x265_2.0.tar.gz +192e54fa3068b594aa44ab2b703f071d x265_2.5.tar.gz diff --git a/x265/.signature b/x265/.signature index a85aebfd..5ebd3026 100644 --- a/x265/.signature +++ b/x265/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF36g0YYo/yFb+PKL9WeNo5GnDTONJe4pcZfKaKPQ2GCrfU/o+HUxnZOq5NhC6sXk8Wbp1YzMQAWPO8Qu1e2Ur6QQ= -SHA256 (Pkgfile) = 5f7d694a5de3c8e98ee965f0c3265facd853e67f77ecf06e36b3b06051e11c30 -SHA256 (.footprint) = ce49f904b11ff9d70774996a9f0066daa64de49cf3d19692b1eceb69600accf1 -SHA256 (x265_2.0.tar.gz) = 5a7f6797bee33310c690be5d9a6c63125f36663ac3478e98ac6b6142a70bce1f +RWSagIOpLGJF36ztxn7RZRIz8Q4N9WCVvhAk1qPMO43O4nsdCMNsuMOSw7NbNdVxS8zOmZxwOds9wIieaiMEAGtGbv7vt3rASQA= +SHA256 (Pkgfile) = b4891bdf5bc5afb823a77c4c03d9564c44f07f4c0b000cf828ba4e42d03da77f +SHA256 (.footprint) = bf68e2681452f41611d3373e9beb0fb652805ce079cb511de9e4e130f5fde66f +SHA256 (x265_2.5.tar.gz) = 2e53259b504a7edb9b21b9800163b1ff4c90e60c74e23e7001d423c69c5d3d17 diff --git a/x265/Pkgfile b/x265/Pkgfile index fd7bad00..de3e6e32 100644 --- a/x265/Pkgfile +++ b/x265/Pkgfile @@ -5,7 +5,7 @@ # Depends on: yasm cmake name=x265 -version=2.0 +version=2.5 release=1 source=(https://bitbucket.org/multicoreware/$name/downloads/${name}_$versio… @@ -17,6 +17,7 @@ build() { cmake ../source \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ -DHIGH_BIT_DEPTH='TRUE' \ -DMAIN12='TRUE' \ -DEXPORT_C_API='FALSE' \

1 0

ports/contrib (3.3): ffmpeg: 3.3.1 -> 3.3.3
by crux＠crux.nu 16 Aug '17

16 Aug '17

commit dfe424e8e08c0666e7c1861f07b902f1bb889d6f Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Wed Aug 16 21:51:06 2017 +1000 ffmpeg: 3.3.1 -> 3.3.3 diff --git a/ffmpeg/.md5sum b/ffmpeg/.md5sum index 4c88b3df..39ba2196 100644 --- a/ffmpeg/.md5sum +++ b/ffmpeg/.md5sum @@ -1,2 +1,2 @@ -eb3fff329cd7e72cf8c3b309dbbe1f9c ffmpeg-3.3.1.tar.bz2 +b3f4a71445171b2a2bb71fb6df5ced0f ffmpeg-3.3.3.tar.bz2 dae0c10c99399580c929fc100e79faef ffmpeg-x264-10bit.sh diff --git a/ffmpeg/.signature b/ffmpeg/.signature index 6ae39856..d144ee6e 100644 --- a/ffmpeg/.signature +++ b/ffmpeg/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF37xLpQH/ZcrDdbpxbAJAXxQoWG2XOH2NqAL1Y5rUpTRf6F3w1mufM9scfUwQ3wTma+AnN59TQa04svTOQt7vzAQ= -SHA256 (Pkgfile) = 176b5cb8fc309ae265aba8804ed3f1e0dab5b05019db5f3a62f3ea8ac369082a +RWSagIOpLGJF31ODWsx/C7BPXav6xHU9gpN2SmNbOv4oYaSFutYMgH+GemYkceNbSZ4Yi38u39qpVenKmWbZYAKbwxPLP3QbSwk= +SHA256 (Pkgfile) = 337e3342b8265a506dcb53ee302b95a6341192824d1cc774473146a0bfc44b28 SHA256 (.footprint) = 6744e3e205dfd5a77b147bf57c16d7d27b8b7b93eb7543dc091d14d4aa0f8132 -SHA256 (ffmpeg-3.3.1.tar.bz2) = fcb2cd7b77fcb66a00abccd5a04e34342a02cab9f89626f28cf1abca715b6730 +SHA256 (ffmpeg-3.3.3.tar.bz2) = 1069ac8fc7f52e566bea28b41b9c437246aeb5096f82fb26fa96dc7d5a10a473 SHA256 (ffmpeg-x264-10bit.sh) = dde9627c41800235fbcfe0f74d2181be96239a82cd2d0d277715dddb57eb9cb3 diff --git a/ffmpeg/Pkgfile b/ffmpeg/Pkgfile index c9c22325..c562c5cf 100644 --- a/ffmpeg/Pkgfile +++ b/ffmpeg/Pkgfile @@ -6,7 +6,7 @@ # Optional: alsa-lib fdk-aac gnutls lame libass libsdl2 libtheora libva libvdpau libvorbis libvpx libwebp opus x264 x265 name=ffmpeg -version=3.3.1 +version=3.3.3 release=1 source=(https://ffmpeg.org/releases/$name-$version.tar.bz2 ffmpeg-x264-10bit.sh)

1 0

ports/contrib (3.3): tint2: 0.12.12 -> 0.14.6
by crux＠crux.nu 16 Aug '17

16 Aug '17

commit ce5aeb1649e86758f804b4a1211617b0418e58ef Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Wed Aug 16 21:45:47 2017 +1000 tint2: 0.12.12 -> 0.14.6 diff --git a/tint2/.footprint b/tint2/.footprint index 5d27bc7d..16b818ce 100644 --- a/tint2/.footprint +++ b/tint2/.footprint @@ -1,10 +1,6 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/tint2 -drwxr-xr-x root/root usr/etc/ -drwxr-xr-x root/root usr/etc/xdg/ -drwxr-xr-x root/root usr/etc/xdg/tint2/ --rw-r--r-- root/root usr/etc/xdg/tint2/tint2rc drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/applications/ -rw-r--r-- root/root usr/share/applications/tint2.desktop diff --git a/tint2/.md5sum b/tint2/.md5sum index 3272e06f..b392e26d 100644 --- a/tint2/.md5sum +++ b/tint2/.md5sum @@ -1 +1 @@ -1fe0003fcbae92e38d5d27f89dad5b6d tint2-0.12.12.tar.gz +62b173d239f55f2de0c83d4a17b58812 tint2-0.14.6.tar.bz2 diff --git a/tint2/.signature b/tint2/.signature index f6a89028..a5773e50 100644 --- a/tint2/.signature +++ b/tint2/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF39AKONRzsPqIvu2M5qCl+G7VIm+XaUIIVW0dpg/0ajaSMsRACFqxhWxUZmwHeB7sXbCNuY/51oY/bIxp4nGi8QE= -SHA256 (Pkgfile) = afcbdfb5b9b8c7485b8c0359913e3c0891007b350f3440b1dfda9ff2d6167ec3 -SHA256 (.footprint) = d7ad8c4121e1c89104f46b15344009e3502fcb867cde3ebb6878d8c66f9f3d2d -SHA256 (tint2-0.12.12.tar.gz) = f91b0d4669b6cd7de6a21efe8bf3f26cfe8878ebf1ab8e8804bf0289a650034e +RWSagIOpLGJF3yUAaF70QYeroFd5xixfhYF9H6E1wbwhCuSrYcY9FY6H32L7poymNVljTlb863EcLvO2uZon65n6Of5UEVGCmwc= +SHA256 (Pkgfile) = 419c2a190592ed81b986e5bf8dbe1a7cc650be677d93214d31df8679fe5096f1 +SHA256 (.footprint) = a8995e665dd5ec299d9a5ed176d1db5aeae1f91a6902ff8e1b957514e1428c3f +SHA256 (tint2-0.14.6.tar.bz2) = b40079fb187aa248cd3b6957076f138d040c723b309e1b254ac0c8ec9826a451 diff --git a/tint2/Pkgfile b/tint2/Pkgfile index a9c27eaa..b2c25806 100644 --- a/tint2/Pkgfile +++ b/tint2/Pkgfile @@ -2,27 +2,25 @@ # URL: https://gitlab.com/o9000/tint2 # Packager: Vitaly Sinilin, vs at kp4 dot ru # Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: cmake imlib2 librsvg ninja startup-notification xorg-libxdamage +# Depends on: gtk imlib2 librsvg ninja startup-notification xorg-xrandr name=tint2 -version=0.12.12 +version=0.14.6 release=1 -source=(http://crux.ster.zone/downloads/$name/$name-$version.tar.gz) -#source=(https://gitlab.com/o9000/tint2/repository/archive.tar.gz?ref=$version) +source=(http://crux.ster.zone/downloads/$name/$name-$version.tar.bz2) +#source=(https://gitlab.com/o9000/tint2/repository/archive.tar.bz2?ref=$version) build() { cd $name-$version-* cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DENABLE_BATTERY=ON \ - -DENABLE_EXAMPLES=OFF \ + -DCMAKE_BUILD_TYPE=Release \ -DENABLE_TINT2CONF=OFF \ - -DSYSCONFDIR=/usr/etc \ -G Ninja ninja DESTDIR=$PKG ninja install - rm -rf $PKG/usr/share/{doc,locale} + rm -r $PKG/{etc,usr/share/doc} }

1 0

ports/contrib (3.3): jenkins: 2.73 -> 2.74
by crux＠crux.nu 16 Aug '17

16 Aug '17

commit 2673f514e052796ff4f9a32b37ee9ad50239ef3b Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Wed Aug 16 20:48:51 2017 +1000 jenkins: 2.73 -> 2.74 diff --git a/jenkins/.md5sum b/jenkins/.md5sum index 6db82ad9..9166fdfa 100644 --- a/jenkins/.md5sum +++ b/jenkins/.md5sum @@ -1,3 +1,3 @@ 9a39a724f6de3fb4da9d01c672a05345 jenkins.conf f9667704d220576e2ff3f30b74982c99 jenkins.rc -988698fa9b4d8a97fa9af3a556e18d4d jenkins.war +a4b731b54e271cba7941d3cb8964350d jenkins.war diff --git a/jenkins/.signature b/jenkins/.signature index 337d2fa9..8147d8c1 100644 --- a/jenkins/.signature +++ b/jenkins/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF39qhlFyYb3vCOTtBQyNz1/5GThhQR90LuqGwBgC3oVxOKYIPhRbXILPry9fKTCraPRm6Z7yPL8GvxOHau1am4QY= -SHA256 (Pkgfile) = a43ef8c567fe5e7ab798429064b6525fbc5551e99f2bd9d6b62f9ec68eaff1fa +RWSagIOpLGJF30xW5YWJx0/tj0m8kZesSDKc4i6ibBJC2k1xj+tYjJETMAqJ1CFnhMZSfcldZMuId+LTPEB67MfmwaGL1KS6Zgk= +SHA256 (Pkgfile) = 986c453216dbcc60f73d3ac007a900c62db533108e143ca285a223c912d7afa2 SHA256 (.footprint) = 2c6357e834b19efd641fa73bc526f3f7abf18242a32fa4d275efcb3110c1f3a0 -SHA256 (jenkins.war) = 68db613f303b2374758b562448e1d571fb3c7c98aa2f6de0aa540ff5e51638e1 +SHA256 (jenkins.war) = 9f37140d0ccb6a9aa7c3c8a522a79b37bd1123edddca0e7f8f6dd579ffe8cb86 SHA256 (jenkins.rc) = ffd41d851271f9458a1bba0c6abe680e34400af3f34257e39cb2bd0b3a8fc8f1 SHA256 (jenkins.conf) = ff391998f4182ef540f8d526939cb211a789b4c5fc6d2e9d54c45821478a6e05 diff --git a/jenkins/Pkgfile b/jenkins/Pkgfile index 63a4813a..84e918f9 100644 --- a/jenkins/Pkgfile +++ b/jenkins/Pkgfile @@ -5,7 +5,7 @@ # Depends on: jdk name=jenkins -version=2.73 +version=2.74 release=1 source=(http://mirrors.jenkins.io/war/$version/$name.war \ $name.rc $name.conf)

1 0