diff -pruN 0.0~git20210826.33d0574-1/debian/changelog 0.0~git20210826.33d0574-2/debian/changelog
--- 0.0~git20210826.33d0574-1/debian/changelog	2021-10-24 09:32:11.000000000 +0000
+++ 0.0~git20210826.33d0574-2/debian/changelog	2022-04-04 07:23:26.000000000 +0000
@@ -1,3 +1,13 @@
+golang-github-fullsailor-pkcs7 (0.0~git20210826.33d0574-2) unstable; urgency=medium
+
+  * Team upload.
+  * Add GODEBUG=x509sha1=1 to workaround for testing with go1.18
+    (Closes: #1008394)
+  * Add Multi-Arch hint
+  * Update package description
+
+ -- Shengjing Zhu <zhsj@debian.org>  Mon, 04 Apr 2022 15:23:26 +0800
+
 golang-github-fullsailor-pkcs7 (0.0~git20210826.33d0574-1) unstable; urgency=medium
 
   * Team upload.
diff -pruN 0.0~git20210826.33d0574-1/debian/control 0.0~git20210826.33d0574-2/debian/control
--- 0.0~git20210826.33d0574-1/debian/control	2021-10-24 09:32:11.000000000 +0000
+++ 0.0~git20210826.33d0574-2/debian/control	2022-04-04 07:23:26.000000000 +0000
@@ -18,6 +18,9 @@ XS-Go-Import-Path: github.com/fullsailor
 
 Package: golang-github-fullsailor-pkcs7-dev
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends}
-Description: Implements a subset of PKCS#7/Crytpographic Message Syntax (rfc2315, rfc5652) (library)
+Description: Implements a subset of PKCS#7/Crytpographic Message Syntax
  pkcs7 implements parsing and creating signed and enveloped messages.
+ .
+ It contains the fork from https://github.com/mozilla-services/pkcs7.
diff -pruN 0.0~git20210826.33d0574-1/debian/gitlab-ci.yml 0.0~git20210826.33d0574-2/debian/gitlab-ci.yml
--- 0.0~git20210826.33d0574-1/debian/gitlab-ci.yml	2021-10-24 09:32:11.000000000 +0000
+++ 0.0~git20210826.33d0574-2/debian/gitlab-ci.yml	2022-04-04 07:23:26.000000000 +0000
@@ -1,26 +1,6 @@
 # auto-generated, DO NOT MODIFY.
 # The authoritative copy of this file lives at:
-# https://salsa.debian.org/go-team/ci/blob/master/config/gitlabciyml.go
-
-image: stapelberg/ci2
-
-test_the_archive:
-  artifacts:
-    paths:
-    - before-applying-commit.json
-    - after-applying-commit.json
-  script:
-    # Create an overlay to discard writes to /srv/gopath/src after the build:
-    - "rm -rf /cache/overlay/{upper,work}"
-    - "mkdir -p /cache/overlay/{upper,work}"
-    - "mount -t overlay overlay -o lowerdir=/srv/gopath/src,upperdir=/cache/overlay/upper,workdir=/cache/overlay/work /srv/gopath/src"
-    - "export GOPATH=/srv/gopath"
-    - "export GOCACHE=/cache/go"
-    # Build the world as-is:
-    - "ci-build -exemptions=/var/lib/ci-build/exemptions.json > before-applying-commit.json"
-    # Copy this package into the overlay:
-    - "GBP_CONF_FILES=:debian/gbp.conf gbp buildpackage --git-no-pristine-tar --git-ignore-branch --git-ignore-new --git-export-dir=/tmp/export --git-no-overlay --git-tarball-dir=/nonexistant --git-cleaner=/bin/true --git-builder='dpkg-buildpackage -S -d --no-sign'"
-    - "pgt-gopath -dsc /tmp/export/*.dsc"
-    # Rebuild the world:
-    - "ci-build -exemptions=/var/lib/ci-build/exemptions.json > after-applying-commit.json"
-    - "ci-diff before-applying-commit.json after-applying-commit.json"
+# https://salsa.debian.org/go-team/infra/pkg-go-tools/blob/master/config/gitlabciyml.go
+---
+include:
+  - https://salsa.debian.org/go-team/infra/pkg-go-tools/-/raw/master/pipeline/test-archive.yml
diff -pruN 0.0~git20210826.33d0574-1/debian/rules 0.0~git20210826.33d0574-2/debian/rules
--- 0.0~git20210826.33d0574-1/debian/rules	2021-10-24 09:32:11.000000000 +0000
+++ 0.0~git20210826.33d0574-2/debian/rules	2022-04-04 07:23:26.000000000 +0000
@@ -1,4 +1,6 @@
 #!/usr/bin/make -f
 
+export GODEBUG := x509sha1=1
+
 %:
 	dh $@ --builddirectory=_build --buildsystem=golang --with=golang