diff -Nru click-reviewers-tools-0.34/clickreviews/cr_lint.py click-reviewers-tools-0.34/clickreviews/cr_lint.py --- click-reviewers-tools-0.34/clickreviews/cr_lint.py 2015-10-09 20:16:30.000000000 +0000 +++ click-reviewers-tools-0.34/clickreviews/cr_lint.py 2015-10-10 06:22:37.000000000 +0000 @@ -487,9 +487,50 @@ n = self._get_check_name('external_symlinks') s = 'OK' + common = '(-[0-9.]+)?\.so(\.[0-9.]+)?' + libc6_libs = ['ld-*.so', + 'libanl', + 'libBrokenLocale', + 'libc', + 'libcidn', + 'libcrypt', + 'libdl', + 'libmemusage', + 'libm', + 'libnsl', + 'libnss_compat', + 'libnss_dns', + 'libnss_files', + 'libnss_hesiod', + 'libnss_nisplus', + 'libnss_nis', + 'libpcprofile', + 'libpthread', + 'libresolv', + 'librt', + 'libSegFault', + 'libthread_db', + 'libutil', + ] + libc6_pats = [] + for lib in libc6_libs: + libc6_pats.append(re.compile(r'%s%s' % (lib, common))) + libc6_pats.append(re.compile(r'ld-*.so$')) + libc6_pats.append(re.compile(r'ld-linux-*.so\.[0-9.]+$')) + + def _in_patterns(pats, f): + for pat in pats: + if pat.search(f): + return True + return False + external_symlinks = list(filter(lambda link: not os.path.realpath(link).startswith( - self.unpack_dir), self.pkg_files)) + self.unpack_dir) and + not _in_patterns(libc6_pats, + os.path.basename(link)), + self.pkg_files)) + if external_symlinks: t = 'error' s = 'package contains external symlinks: %s' % \ @@ -846,6 +887,8 @@ t = 'error' s = "Hardcoded path '%s' found in '%s'." % ( bad_path, full_fn) + except FileNotFoundError: + pass except UnicodeDecodeError: pass self._add_result(t, n, s) diff -Nru click-reviewers-tools-0.34/debian/bzr-builder.manifest click-reviewers-tools-0.34/debian/bzr-builder.manifest --- click-reviewers-tools-0.34/debian/bzr-builder.manifest 2015-10-09 20:16:31.000000000 +0000 +++ click-reviewers-tools-0.34/debian/bzr-builder.manifest 2015-10-10 06:22:37.000000000 +0000 @@ -1,2 +1,2 @@ -# bzr-builder format 0.3 deb-version {debupstream}-0~524 -lp:click-reviewers-tools revid:jamie@ubuntu.com-20151009200149-1xhiz868qvyuzf4d +# bzr-builder format 0.3 deb-version {debupstream}-0~526 +lp:click-reviewers-tools revid:jamie@ubuntu.com-20151009221421-2ajmcno90f3t13t4 diff -Nru click-reviewers-tools-0.34/debian/changelog click-reviewers-tools-0.34/debian/changelog --- click-reviewers-tools-0.34/debian/changelog 2015-10-09 20:16:31.000000000 +0000 +++ click-reviewers-tools-0.34/debian/changelog 2015-10-10 06:22:37.000000000 +0000 @@ -1,21 +1,25 @@ -click-reviewers-tools (0.34-0~524~ubuntu14.04.1) trusty; urgency=low +click-reviewers-tools (0.34-0~526~ubuntu14.04.1) trusty; urgency=low * Auto build. - -- Daniel Holbach Fri, 09 Oct 2015 20:16:31 +0000 + -- Daniel Holbach Sat, 10 Oct 2015 06:22:37 +0000 click-reviewers-tools (0.34) UNRELEASED; urgency=medium [ Jamie Strandboge ] * multiple 'desktop' hooks should only be 'info' these days (LP: #1496402) * verify snaps that use 'bus-name' are of 'type: framework' - * snappy package.yaml defaults to 'architectures' and 'architecture' is - deprecated. Adjust and add a warning for deprecation. - * arm64 is a valid architecture now + * clickreviews/cr_lint.py: + - snappy package.yaml defaults to 'architectures' and 'architecture' is + deprecated. Adjust and add a warning for deprecation. + - arm64 is a valid architecture now + - don't warn on libc6 libraries with check_external_symlinks + - don't traceback on broken symlinks when checking for hardcoded paths + (LP: #1502962) * clickreviews/cr_security.py: don't complain about missing AppArmor template vars if we detect this is unconfined boilerplate policy - -- Jamie Strandboge Thu, 10 Sep 2015 14:28:13 -0500 + -- Jamie Strandboge Fri, 09 Oct 2015 17:07:28 -0500 click-reviewers-tools (0.33) wily; urgency=medium