2 files changed, 17 insertions, 0 deletions
diff --git a/apt-pkg/cachefilter-patterns.cc b/apt-pkg/cachefilter-patterns.cc
index aeed31263..2ba89e5d4 100644
--- a/apt-pkg/cachefilter-patterns.cc
+++ b/apt-pkg/cachefilter-patterns.cc
@@ -238,6 +238,8 @@ std::unique_ptr<APT::CacheFilter::Matcher> PatternParser::aPattern(std::unique_p
       return std::make_unique<APT::CacheFilter::NOTMatcher>(aPattern(node->arguments[0]).release());
    if (node->matches("?obsolete", 0, 0))
       return std::make_unique<Patterns::PackageIsObsolete>();
+   if (node->matches("?origin", 1, 1))
+      return std::make_unique<Patterns::VersionIsOrigin>(aWord(node->arguments[0]));
    if (node->matches("?source-package", 1, 1))
       return std::make_unique<Patterns::VersionIsSourcePackage>(aWord(node->arguments[0]));
    if (node->matches("?source-version", 1, 1))
diff --git a/apt-pkg/cachefilter-patterns.h b/apt-pkg/cachefilter-patterns.h
index c92a152d6..3d1735442 100644
--- a/apt-pkg/cachefilter-patterns.h
+++ b/apt-pkg/cachefilter-patterns.h
@@ -275,6 +275,21 @@ struct VersionIsArchive : public VersionAnyMatcher
    }
 };
 
+struct VersionIsOrigin : public VersionAnyMatcher
+{
+   BaseRegexMatcher matcher;
+   VersionIsOrigin(std::string const &pattern) : matcher(pattern) {}
+   bool operator()(pkgCache::VerIterator const &Ver) override
+   {
+      for (auto VF = Ver.FileList(); not VF.end(); VF++)
+      {
+	 if (VF.File().Origin() && matcher(VF.File().Origin()))
+	    return true;
+      }
+      return false;
+   }
+};
+
 struct VersionIsSourcePackage : public VersionAnyMatcher
 {
    BaseRegexMatcher matcher;