Merge pull request #378 from freedomofpress/drop-grsec-metapackage

Drop securedrop-workstation-grsec package

.circleci/config.yml

@@ -86,19 +86,6 @@ common-steps:
         echo $VERSION_TO_BUILD > ~/packaging/sd_version
         echo 'export VERSION_TO_BUILD=$(cat ~/packaging/sd_version)' >> $BASH_ENV
 
-  # TODO: remove duplication between this and above
-  - &setmetapackageversionplatform
-    run:
-      name: Get metapackage version via changelog for the current platform
-      command: |
-        export VERSION_CODENAME=$(~/project/scripts/codename)
-        CURRENT_VERSION=$(grep -oP "\d+\.\d+\.\d+" ${PKG_NAME}/debian/changelog-${VERSION_CODENAME} | head -n1)
-        export VERSION_TO_BUILD="$CURRENT_VERSION"
-        # Enable access to this env var in subsequent run steps
-        mkdir -p ~/packaging
-        echo $VERSION_TO_BUILD > ~/packaging/sd_version
-        echo 'export VERSION_TO_BUILD=$(cat ~/packaging/sd_version)' >> $BASH_ENV
-
   - &commitworkstationdebs
     run:
       name: Commit workstation debs for deployment to apt-test.freedom.press
@@ -259,28 +246,6 @@ jobs:
 
   build2-metapackage: *build-metapackage
 
-  build-bookworm-securedrop-workstation-grsec:
-    docker:
-      - image: debian:bookworm
-    environment:
-      PKG_NAME: securedrop-workstation-grsec
-    steps:
-      - checkout
-      - *installdeps
-      - *setmetapackageversionplatform
-      - *builddebianpackage
-
-  build-bullseye-securedrop-workstation-grsec:
-    docker:
-      - image: debian:bullseye
-    environment:
-      PKG_NAME: securedrop-workstation-grsec
-    steps:
-      - checkout
-      - *installdeps
-      - *setmetapackageversionplatform
-      - *builddebianpackage
-
   push-bullseye: &push
     docker:
       - image: debian:bullseye
@@ -325,8 +290,6 @@ workflows:
               image:
                 - bullseye
                 - bookworm
-      - build-bullseye-securedrop-workstation-grsec
-      - build-bookworm-securedrop-workstation-grsec
 
   nightly:
     triggers:

Makefile

@@ -12,10 +12,6 @@ securedrop-client: ## Builds Debian package for securedrop-client code
 securedrop-workstation-config: ## Builds Debian metapackage for Qubes Workstation base dependencies
 	PKG_NAME="securedrop-workstation-config" ./scripts/build-debianpackage
 
-.PHONY: securedrop-workstation-grsec
-securedrop-workstation-grsec: ## Builds Debian metapackage for Qubes Workstation hardened kernel
-	PKG_NAME="securedrop-workstation-grsec" ./scripts/build-debianpackage
-
 .PHONY: securedrop-workstation-svs-disp
 securedrop-workstation-svs-disp: ## Builds Debian metapackage for Disposable VM dependencies and tooling (DEPRECATED)
 	PKG_NAME="securedrop-workstation-svs-disp" ./scripts/build-debianpackage

scripts/update-changelog

@@ -46,8 +46,4 @@ else
     fi
 fi
 
-if [[ "$PKG_NAME" = "securedrop-workstation-grsec" ]]; then
-    dch -b --newversion "${PKG_VERSION}-1~${VERSION_CODENAME}" --distribution unstable -c "$changelog"
-else
-    dch -b --newversion "${PKG_VERSION}+${VERSION_CODENAME}" --distribution unstable -c "$changelog"
-fi
+dch -b --newversion "${PKG_VERSION}+${VERSION_CODENAME}" --distribution unstable -c "$changelog"

securedrop-keyring/debian/postinst

@@ -1,5 +1,5 @@
 #!/bin/sh
-# postinst script for securedrop-workstation-grsec
+# postinst script for securedrop-keyring
 #
 # see: dh_installdeb(1)