From 0b895e419f4eb08615f583d0ef80217b9c874b86 Mon Sep 17 00:00:00 2001 From: Jacob Bachmeyer Date: Tue, 14 Mar 2023 21:22:34 -0500 Subject: [PATCH] Remove obsolete scripts for tasks now handled using the keymaster tool --- build-keyring.pl | 52 ------------------------------------------------ ftp-addkey.sh | 48 -------------------------------------------- ftp-rmkey.sh | 47 ------------------------------------------- 3 files changed, 147 deletions(-) delete mode 100755 build-keyring.pl delete mode 100755 ftp-addkey.sh delete mode 100755 ftp-rmkey.sh diff --git a/build-keyring.pl b/build-keyring.pl deleted file mode 100755 index 5fe873c..0000000 --- a/build-keyring.pl +++ /dev/null @@ -1,52 +0,0 @@ -#!/usr/bin/perl -w -# Version 2005-01-11 -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# This script will combine any pubring.gpg/oldring.gpg files found in the packages -# directories into a global public keyring, which can then be used to verify all -# packages on the ftp server. -# -# Written by Ward Vandewege (ward@gnu.org), 2005-01-11 - -# currently invoked by cron: - -# MAILTO=sysadmin@gnu.org -# SHELL=/bin/bash -# 22 * * * * gatekpr /home/gatekpr/build-keyring.pl && cp -f /home/gatekpr/pub.ring /home/ftp/gnu/gnu-keyring.gpg && /usr/local/bin/send-gpg-public-keys.sh - - -use strict; - -my $PACKAGES = './packages'; -my $RING = './pub.ring'; -my $DEBUG = 0; -my $EXPIRED_KEYRING = "/home/gatekpr/expired-gnu-keys.gpg"; - -opendir(DIR, $PACKAGES) || die "can't opendir $PACKAGES: $!"; -my @subdirs = grep { !/^\./ && -d "$PACKAGES/$_" } readdir(DIR); -closedir DIR; - -foreach my $subdir (@subdirs) { - print "subdir : $subdir\n" if ($DEBUG); - opendir(DIR, "$PACKAGES/$subdir") || die "can't opendir $PACKAGES/$subdir: $!"; - my @keyrings = grep { /(oldring|pubring)\.gpg$/ && -f "$PACKAGES/$subdir/$_" } readdir(DIR); - closedir DIR; - foreach (@keyrings) { - print "keyring : $_\n" if ($DEBUG); - my $dummy = system("gpg --no-default-keyring --keyring $RING --import $PACKAGES/$subdir/$_ >> /dev/null 2>&1"); - } -} - -# baughj, 2006.04.05 -# RT #283343 - We want to keep old keys around in the big GNU keyring so that -# we don't have signatures on the FTP site that are unverifiable because a key -# was expired / changed. - -my $dummy2 = system("gpg --no-default-keyring --keyring $RING --import $EXPIRED_KEYRING >> /dev/null 2>&1"); diff --git a/ftp-addkey.sh b/ftp-addkey.sh deleted file mode 100755 index 57e8763..0000000 --- a/ftp-addkey.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash -# -# Adds a specified user & their key to the maintainer keyring on -# ftp.gnu.org. -# - -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - - -PACKAGES=/home/gatekpr/packages - -if ( ([ "$1" = "" ]) || ([ "$2" = "" ]) || ([ "$3" = "" ]) ) -then - echo "ftp-addkey.sh " - exit -fi - -if ! [ -d $PACKAGES/$1 ] -then - echo "$1 is a new package. Creating a directory for it." - mkdir $PACKAGES/$1 -fi - -# Add email address to list of maintainers - -echo "Adding $2 to maintainer list." -echo $2 >> $PACKAGES/$1/email - -# Import keys - -echo "Adding key..." - -gpg --no-default-keyring --keyring $PACKAGES/$1/pubring.gpg --import $3 - -chmod -R 755 $PACKAGES/$1 - -echo "Done." diff --git a/ftp-rmkey.sh b/ftp-rmkey.sh deleted file mode 100755 index 156e22a..0000000 --- a/ftp-rmkey.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash -# -# This places a key in the GNU expired keyring at -# /home/gatekpr/expired-gnu-keys.gpg. It is useful for when a -# maintainer may not wish to use the FTP upload system, or their -# registered key has expired, so that their key still stays in the -# GNU keyring (so old signatures are still verifiable) -# -# written by baughj, 2006.04.05 - -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - - -PACKAGES=/home/gatekpr/packages -EXPIRED_KEYRING=/home/gatekpr/expired-gnu-keys.gpg - -if ( ([ "$1" = "" ]) || ([ "$2" = "" ]) ) -then - echo "ftp-rmkey.sh " - exit -fi - -if ! [ -d $PACKAGES/$1 ] -then - echo "ERROR: $1 isn't a known package." - exit -1 -fi - -echo "Importing old key into $EXPIRED_KEYRING..." -gpg --no-default-keyring --keyring $PACKAGES/$1/pubring.gpg --export $2 \ - | gpg --no-default-keyring --keyring $EXPIRED_KEYRING --import - -echo "Removing key..." -gpg --no-default-keyring --keyring $PACKAGES/$1/pubring.gpg --delete-key $2 - -echo "Make sure to remove the email address from $PACKAGES/$1/email." -- 2.25.1