Merge pull request #21 from DrDaveD/master

update to 1.17, replace expired gpg key

Author: DrDaveD

cvmfs-contrib.gpg

@@ -1,7 +1,7 @@
 # created by obsupdate.sh, do not edit by hand
-Debtransform-Tar: cvmfs-contrib-release-1.16.tar.gz
+Debtransform-Tar: cvmfs-contrib-release-1.17.tar.gz
 Format: 1.0
-Version: 1.16.1
+Version: 1.17.1
 Binary: cvmfs-contrib-release
 Source: cvmfs-contrib-release
 Maintainer: Dave Dykstra <dwd@fnal.gov>

debian/cvmfs-contrib-release.dsc

@@ -5,6 +5,7 @@
 
 HERE="`dirname $0`"
 ME="`basename $0`"
+cd $HERE
 PKG="`sed -n 's/^Source: //p' control`"
 SPECFILE="../rpm/$PKG.spec"
 VERSION="$(grep ^Version: $SPECFILE | awk '{print $2}')"

debian/obsupdate.sh

@@ -8,14 +8,14 @@ wgdxbOFspEKE4J3Ew5BudDqxp4PNe9vLGlfF45HCmNlCzMOup5LKuVv2+ILDS/Gs
 YA7dVlMLVXQZxkmWnOg1uHoq/e1kg42cV0V5VR+oLo2PplVgKl4U55R6TSTBh6R0
 kEnc7I7sEO+k0Qsktue0my8ej0hkEISHTTO1ABEBAAG0NmhvbWU6Y3ZtZnMgT0JT
 IFByb2plY3QgPGhvbWU6Y3ZtZnNAYnVpbGQub3BlbnN1c2Uub3JnPokBPgQTAQgA
-KAUCXhqZRAIbAwUJCD2k9AYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQr6cS
-6J6u2y0BQAgAoErIhI8jX6BdMUNZ00LurhbUvGkEuuev8b3FLbuDxm9fahHCKTC6
-bXTKJDHg2TFm42pbmKrbvv/Ne7oYX2Uai4erhx/xBIw1G8xg8z0q2VqZVUxp0kqi
-vx14MV1LZBZOz7b8X04ysmdrDK9kHC30JN+c0UKJHAInAJ5I81HtF0Pzzx3W9quA
-eRUZj1PK4kwG/MusGlTjgeOQ0A1WKSGPtkSK0QoHUcKGC9JpvMQCUAJTCnIS+51O
-6Zl2fCtfOmlOiIAW4TZSuMQjlQGvbX2obiBaejXneKmWw09Na/CQnK2Ww6sbUVQ5
-RHIxGdq0Wi7k1jYMkEXORV7PgwMz/nSPRYhGBBMRAgAGBQJZ+6RQAAoJEDswEbdr
+KAUCYjs9cQIbAwUJDF5JIQYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQr6cS
+6J6u2y39TAf+MvsKdbZb2gDRGgZ2DZSnFQ1G6vYgQYL1w3Z2M9jOAKG8dQ7MvZcF
+Gp5YZP3v/lOCDBrxoeKXh1A9wQDVEAgL0Cm8xF9yjSTn5ZvewzRh5iB4p9iVvFfv
+7vxX1gX7xjgWsPcH5Ahd2379cvNK4fbah5v+fR/ktNTZES+Snh7dUd6I5Y96H7Dq
+ZZgTIPYI3s7x9xdM3OvAxU0x/oC1NICY6YA3Kqyst+/g4rQ6yHUj3F4hAd8k/QGC
+8H/jSLtyhGeR3wdg/ymeb7uYyg5NPFDVBNVpOXXjJgWTIkHFaIUfO6Ej+v9HG3k6
+cDRR5p8lplyGZrcOAcWesx3GHIVm02/e9YhGBBMRAgAGBQJZ+6RQAAoJEDswEbdr
 nWUjBd0An3IA8UbLCe9skJdh57O5pB47ttiiAJ4oRY6Ug8mMRHU1pMHXO73r49QB
 oQ==
-=Ero6
+=HpyG
 -----END PGP PUBLIC KEY BLOCK-----

obs-signing-key.pub

@@ -1,7 +1,7 @@
 Name:           cvmfs-contrib-release
-Version:        1.16
+Version:        1.17
 # The release_prefix macro is used in the OBS prjconf, don't change its name
-%define release_prefix 2
+%define release_prefix 1
 # %{?dist} is left off intentionally; this rpm works on multiple OS releases
 Release:        %{release_prefix}
 Summary:        CernVM FileSystem Contrib packages yum repository configuration
@@ -78,6 +78,12 @@ if [ ! -e $REPO ]; then
 fi
 
 %changelog
+* Wed Mar 23 2022 Dave Dykstra <dwd@fnal.gov> - 1.17-1
+- Replace expired gpg key.  This one expires 2024-05-31.  It was extended
+  with the command "osc signkey --extend home:cvmfs", downloaded with
+  "osc signkey home:cvmfs", put into obs-signing-key.pub, and imported with
+  "gpg --keyring $PWD/cvmfs-contrib.gpg --no-default-keyring --import".
+
 * Mon Dec 13 2021 Dave Dykstra <dwd@fnal.gov>> - 1.16-2
 - Fix scripting around selecting el OS version.