diff --git a/.woodpecker.yml b/.woodpecker.yml index 396c84c..50348da 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -31,7 +31,6 @@ steps: - echo "postfix postfix/mailname string example.org" | debconf-set-selections - echo "postfix postfix/main_mailer_type string 'Local only'" | debconf-set-selections - apt update; apt install --yes schleuder schleuder-cli postfix patch - - patch -d/ -p1 < test/01-ruby3cgi.patch # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1040257 - /usr/lib/postfix/configure-instance.sh - - echo "virtual_alias_maps = static:root" >> /etc/postfix/main.cf - /usr/sbin/postmulti -i - -p start diff --git a/test/01-ruby3cgi.patch b/test/01-ruby3cgi.patch deleted file mode 100644 index 25bc897..0000000 --- a/test/01-ruby3cgi.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/usr/lib/ruby/vendor_ruby/schleuder-cli.rb 2023-07-04 01:00:03.032907109 +0000 -+++ b/usr/lib/ruby/vendor_ruby/schleuder-cli.rb 2023-07-04 00:59:05.299382428 +0000 -@@ -3,6 +3,7 @@ - require 'pathname' - require 'net/https' - require 'uri' -+require 'cgi' - require 'singleton' - require 'yaml' - require 'base64' ---- a/usr/lib/ruby/vendor_ruby/schleuder-cli/helper.rb 2023-07-04 00:59:55.332884367 +0000 -+++ b/usr/lib/ruby/vendor_ruby/schleuder-cli/helper.rb 2023-07-04 00:59:20.859439658 +0000 -@@ -19,7 +19,7 @@ - u = "/#{args.join('/')}.json" - if params - paramstring = params.map do |k,v| -- "#{URI.escape(k.to_s)}=#{URI.escape(v.to_s)}" -+ "#{CGI.escape(k.to_s)}=#{CGI.escape(v.to_s)}" - end.join('&') - u << "?#{paramstring}" - end