From 9ef728e44ec66de291ba1aa5701911622964541f Mon Sep 17 00:00:00 2001
From: Rene Engelhard <rene@rene-engelhard.de>
Date: Mon, 14 Apr 2025 19:21:06 +0200
Subject: [PATCH] copy fixed secring.gpg into test/signing-keys/secring.gpg (closes: #1103056)

---
 changelog        |   6 +++
 rules            |   9 ++++
 test-secring.gpg | 110 +++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 125 insertions(+)
 create mode 100644 test-secring.gpg

diff --git a/changelog b/changelog
index 9dbe0778b..ab2eae207 100644
--- a/changelog
+++ b/changelog
@@ -7,6 +7,12 @@ libreoffice (4:25.2.2-2) UNRELEASED; urgency=medium
     - allow /etc/paperspecs (used by paperconf) (closes: #1100930)
   * debian/po:
     - add ca.po (closes: #1102089)
+  * debian/test-secring.gpg: add sq lint --fix'ed
+    test/signing-keys/secring.gpg, thanks
+    Justus Winter <justus@sequoia-pgp.org> for the hint
+  * debian/rules:
+    - copy fixed secring.gpg as above into test/signing-keys/secring.gpg
+      (closes: #1103056)
 
  -- Rene Engelhard <rene@debian.org>  Sun, 30 Mar 2025 11:35:54 +0200
 
diff --git a/rules b/rules
index a14f40dd3..b9589a1d3 100755
--- a/rules
+++ b/rules
@@ -2136,6 +2136,11 @@ endif
 			rm f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf; \
 		fi
 
+	# restore original secring.gpg for dpkg
+	if [ -e test/signing-keys/secring.gpg.orig ]; then \
+		mv test/signing-keys/secring.gpg.orig test/signing-keys/secring.gpg; \
+	fi
+
 	# Files created in debian directory
 	$(MAKE) -f debian/rules clean-debdir
 
@@ -2646,6 +2651,10 @@ ifeq "$(RUN_MAKE_CHECK)" "y"
 		USE_CPUS=$(NUM_CPUS) debian/scripts/locale-gen; \
 	fi
 
+	# copy linted secring.gpg (see #1103056)
+	mv test/signing-keys/secring.gpg test/signing-keys/secring.gpg.orig && \
+	cp debian/test-secring.gpg test/signing-keys/secring.gpg
+
         # and now run them
 	$(IGNORE_MAKE_FAILURES)t=`mktemp -q -d`; \
 	cd $(SOURCE_TREE) && \
diff --git a/test-secring.gpg b/test-secring.gpg
new file mode 100644
index 000000000..5d6b3b7c9
--- /dev/null
+++ b/test-secring.gpg
@@ -0,0 +1,110 @@
+-----BEGIN PGP PRIVATE KEY BLOCK-----
+
+xcLYBFon2c4BCADV3UD2aOgsvTVJryAjQb4JlEYLJ6eBFmeNE2AE2i7cx3v/m55I
+9RITnQKfvAvLlihVyi+AMtHheM+37r5L7CJ9f1/hYQDmWXM24GNoF+tIG1Mzc59y
+pbtHBF0AdqPizoauNAfkoSH18kYPxs4Wi1UciBRDLNNLQZeEas56nL1iRq3NwOL5
+jvxKIptOdt9ib2axy17ucD2S49++VYxF5c2en8WQVvoAd/ZnlTgtPer4Lmv7exEV
+FqmznViq8JdUyoIGMeHZE7uHpS3NKUY/P+8f66krq3f/cuoqfn+8ih8VfLbPXz4t
+bkxw1LyYqR0vmCrTqFgmyUsNqWmcZ6CypMl3ABEBAAEAB/wOms7yZOSiFYO7lfGI
+Ztdu+Qi1f05BkwGcUTvn6Ox1WEwf/wUWr2G+JCVHOkTF8OmtPiLzSsUpdCIfSfcF
+4UjTsCygjArPMEGdeEJhm+yN3ovWgilb33SEG4isXO3BMeBhqhz14IkcriBZuHZf
+dMFpsuNLWRbO11pdCRwzpFuMh+4gsqoQ4d1qr0VIgY53Gdvm7FnITooN21WcRRqQ
+6BQPA+EM8BSjyA3CEDx31Pn4zxcsRI9127OJ3GG8du5pwIlJkh72321nrcUEE+Sw
+vP/Yj5Xmn1gTX+TB9Lb29UAPvGfktGE8JW4IAtA/w5jna9IIqFQS8PxYnykSy2sM
+L8JJBADhej8cU/jn20UTi3lOTCZN4NyOOEuJhtmh1jVXSA/K26CM8DJbnWgp9ehS
+kpqs1hpkKFZ54etMxn1GjI6GgAiNI1Y8HCblkubNohPiIYV81Ow89zkEgweC3d9H
+9N3fbziDml+wlSVhvK3dGBTdkBQdLPNrhBr17HqpGIfAgG8ACQQA8tCPCAYsRU7S
+jLjnX+oUak95XwujsipVfZ82NbwMH9Bp+1iMog5ATV3pukVa7JPnPmboFpbyMnrm
+m4XKqdwrALEgqFdJUBKXnH6ojVmbLoHUAoPxBino7AqOomQ3wlMKtNENvgNwsIF7
+MzXiX+IOOSc+ZF5wBmMiW2M2r68s3X8D/3PFIP2oNlCyOsoFrpIaqP4TbZ4ZYmha
+qZ8+HEwqaRiujm2OaQPQA7THJomguznqLWvOm90zkcVVS1mLg+zpIJdYPxnmSxjP
+BDUiBtCJPhRzJdU3oOuwVxss5nARUCQeL/nFUYcuIlsaMsA/se+Llsp1Hu7OamzA
+HoA66QUJbtjJN8fNO3Rlc3Qga2V5IC0gb25seSBzaWduaW5nIDxsaWJyZW9mZmlj
+ZUBsaXN0cy5mcmVlZGVza3RvcC5vcmc+wsDSBBMBCACGBYJn/S9RBAsJCAcJEMRo
+oE/KUmqfRxQAAAAAAB4AIHNhbHRAbm90YXRpb25zLnNlcXVvaWEtcGdwLm9yZ0oD
+pP3NqcmGKGWGC/7eXPrlA6jeMQea9DzEupDUF2LkAxUICgQWAgMBAheAAhsDAh4B
+FiEEk/dYQDHZt0pXu4nfxGigT8pSap8AAMwmCACoqn8e6IFq3qqUHU46RBbTPtKh
+sNt8OJaHTpC7Kzn0S0FLZqVWOEUQ3CnwftP+DiAWI/dXj/MWgnxMXDd+Ic5xhgZE
+hnz1q3+ca8r5m/A7XT4ycVbn/G2+tKD1wan2be0Vw2+rJxUYvPB/ENpJVaGGZOWL
+EC6kTfxlMZF4DJRDEb4eqoIFff/2Yxqz841QZvVdyeDgEe+wDswqayob452RGVSI
+7w5YEci1LH2hG3r78jOM8dRT3Omz5cSDtRUUxT+zkQhiLktv7tvEYvtZUjtTRbfE
+ZudP69S4AdAPr6KxYrF7P5xzPfn/gvd7fXxEUkD/MbIUOERLh9NuG2W0FL6VwsCQ
+BBMBAgAjBQJaJ9nOAhsDBwsJCAcDAgEGFQgCCQoLBBYCAwECHgECF4AAIQkQxGig
+T8pSap8WIQST91hAMdm3Sle7id/EaKBPylJqnxSCB/9nHIaiTVh56BOEhxind1xJ
+kZ80y1vHmR1jTl5jqgMIszLP4CkC9WSX+m9aZTQwr1s2fyR/HJQVwn0bSvBqnMjC
+wvkuJ1ksdNhmMENmpKLMbkXVLBkr6xD2k8pFr1OoAwsRB+4AxFdjO/9mUWOvhsFj
+fNzgFFDE6HMw+jMOEKZSXEZ75BfDLdVcnOk1TtLD6LmNPJOhbgdc5SbMTG0jU1hk
+bdrDBI7phZvFZtyrR4I8BOyNwqIk7ObI3Ra+zV2KP+EcO35Pl0VOjmOOWopzomW0
+E5iGa/UXMyMA4eeUItRS0vIHTp/aFaVLrl9E5wOn93b8INcO4bn5GmP0/hnCBuS5
+xcLYBFpX8dEBCACup0GhtpcoFrTB+yc2XCmj4dRvCsaWWTkRbt0kPhWlpWsCmiMo
+3jsdRuViu1aAnsNK/OiyjKzP6sUxiJQf1L6y7p8JRG9w13zS3gR+HwbOriLSIWZq
+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
+=ives
+-----END PGP PRIVATE KEY BLOCK-----
-- 
2.47.2

