Bug 1802047 - Use system-installed libcmark-gfm to get latest Markdown improvements

Author: loganrosen

Bugzilla/Markdown.pm

@@ -25,19 +25,14 @@ has 'bugzilla_shorthand' => (
 );
 
 sub _build_markdown_parser {
-  if (Bugzilla->has_feature('alien_cmark')) {
-    require Bugzilla::Markdown::GFM;
-    require Bugzilla::Markdown::GFM::Parser;
-    return Bugzilla::Markdown::GFM::Parser->new({
-      hardbreaks    => 1,
-      validate_utf8 => 1,
-      safe          => 1,
-      extensions    => [qw( autolink tagfilter table strikethrough )],
-    });
-  }
-  else {
-    return undef;
-  }
+  require Bugzilla::Markdown::GFM;
+  require Bugzilla::Markdown::GFM::Parser;
+  return Bugzilla::Markdown::GFM::Parser->new({
+    hardbreaks    => 1,
+    validate_utf8 => 1,
+    safe          => 1,
+    extensions    => [qw( autolink tagfilter table strikethrough )],
+  });
 }
 
 my $MARKDOWN_OFF = quotemeta '#[markdown(off)]';

Bugzilla/Markdown/GFM.pm

@@ -4,9 +4,9 @@ use 5.10.1;
 use strict;
 use warnings;
 
-use Alien::libcmark_gfm;
-use FFI::Platypus;
+use FFI::Platypus 2.00;
 use FFI::Platypus::Buffer qw( scalar_to_buffer buffer_to_scalar );
+use FFI::CheckLib qw( find_lib );
 use Exporter qw(import);
 
 use Bugzilla::Markdown::GFM::SyntaxExtension;
@@ -33,7 +33,12 @@ my %OPTIONS = (
 );
 
 my $FFI = FFI::Platypus->new(
-  lib => [grep { not -l $_ } Alien::libcmark_gfm->dynamic_libs],);
+  api => 2,
+  lib => [
+    scalar find_lib(lib => 'cmark-gfm'),
+    scalar find_lib(lib => 'cmark-gfm-extensions')
+  ]
+);
 
 $FFI->custom_type(
   markdown_options_t => {

Dockerfile

@@ -17,7 +17,7 @@ ENV LOCALCONFIG_ENV=1
 
 RUN apt-get update \
     && apt-get upgrade -y \
-    && apt-get install -y rsync curl \
+    && apt-get install -y rsync curl libcmark-gfm-dev libcmark-gfm-extensions-dev \
     && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /app

Dockerfile.bmo-slim

@@ -47,6 +47,8 @@ RUN apt-get update \
        git \
        graphviz \
        libcap2-bin \
+       libcmark-gfm-dev \
+       libcmark-gfm-extensions-dev \
        rsync \
        $(cat /app/PACKAGES) \
     && rm -rf /var/cache/apt/* /var/lib/apt/lists/*

Makefile.PL

@@ -62,7 +62,7 @@ my %requires = (
   'Email::MIME'                         => '1.904',
   'Email::MIME::ContentType'            => 0,
   'Email::Sender'                       => 0,
-  'FFI::Platypus'                       => 0,
+  'FFI::Platypus'                       => '2.00',
   'Future'                              => '0.34',
   'Graph'                               => 0,
   'HTML::Escape'                        => '1.10',
@@ -133,10 +133,6 @@ my %optional_features = (
     prereqs =>
       {runtime => {requires => {'Mojolicious::Plugin::ForwardedFor' => 0}}}
   },
-  alien_cmark => {
-    description => 'Support GitHub-flavored markdown',
-    prereqs     => {runtime => {requires => {'Alien::libcmark_gfm' => '3'},},},
-  },
   argon2 => {
     description => 'Support hashing passwords with Argon2',
     prereqs     => {runtime => {requires => {'Crypt::Argon2' => '0.004',},},},

cpanfile

@@ -1,5 +1,4 @@
 requires 'Algorithm::BloomFilter', '0.02';
-requires 'Alien::libcmark_gfm', '3';
 requires 'Auth::GoogleAuth', '1.01';
 requires 'Authen::SASL';
 requires 'BSD::Resource';
@@ -45,7 +44,8 @@ requires 'Email::Reply';
 requires 'Email::Sender';
 requires 'Encode', '2.21';
 requires 'Encode::Detect';
-requires 'FFI::Platypus';
+requires 'FFI::CheckLib';
+requires 'FFI::Platypus', '2.00';
 requires 'File::Copy::Recursive';
 requires 'File::MimeInfo::Magic';
 requires 'File::Which';