Browse Source

Drop things that were needed in bookworm

* Versioned dependencies that are satisfied even in oldstable
* Old Breaks:/Replaces:
* Old transition code
Christoph Biedl 10 months ago
parent
commit
7a3cc54049
3 changed files with 8 additions and 33 deletions
  1. 4 8
      debian/control
  2. 0 21
      debian/tang-common.postinst
  3. 4 4
      debian/tests/control

+ 4 - 8
debian/control

@@ -8,9 +8,9 @@ Build-Depends: debhelper-compat (= 13),
     asciidoctor,
     curl,
     jose,
-    libhttp-parser-dev (>= 2.8.0),
-    libjansson-dev (>= 2.10),
-    libjose-dev (>= 8),
+    libhttp-parser-dev,
+    libjansson-dev,
+    libjose-dev,
     meson,
     pkg-config,
     systemd,
@@ -50,11 +50,7 @@ Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends},
     adduser,
     jose,
-    libjansson4 (>= 2.10~),
-Breaks:
-    tang (<< 10-3~),
-Replaces:
-    tang (<< 10-3~),
+    libjansson4,
 Description: network-based cryptographic binding server - common files
  Tang is a service for binding cryptographic keys to network presence.
  It offers a secure, stateless, anonymous alternative to key escrow

+ 0 - 21
debian/tang-common.postinst

@@ -11,27 +11,6 @@ case "$1" in
             adduser --quiet --system --group --no-create-home --home /nonexistent --force-badname _tang
         fi
 
-        # Migrate tang db:
-        # * Change location
-        # * Give it to _tang user
-        # This cannot be anchored to a version since the initial setup used
-        # to be in the tang package.
-        # (Retire after bookworm release)
-        if
-            [ -d "$db_dir_old" ] &&
-                [ ! -d "$db_dir" ]
-        then
-            echo 'I: Migrating tang db'
-            mv "$db_dir_old" "$db_dir"
-            chown -R _tang:_tang "$db_dir"
-        fi
-
-        # Possibly remove /var/db/
-        # (Retire after bookworm release)
-        if [ -d /var/db/ ]; then
-            rmdir /var/db/ >/dev/null 2>&1 || :
-        fi
-
         # assert db directory
         mkdir -p "$db_dir"
         chown _tang:_tang "$db_dir"

+ 4 - 4
debian/tests/control

@@ -4,14 +4,14 @@ Depends:
     cmake,
     curl,
     jose,
-    libhttp-parser-dev (>= 2.8.0),
-    libjansson-dev (>= 2.10),
-    libjose-dev (>= 8),
+    libhttp-parser-dev,
+    libjansson-dev,
+    libjose-dev,
     meson,
     pkg-config,
     socat,
     systemd,
-    tang (>= 8-3~),
+    tang,
 Restrictions:
     allow-stderr,
 Architecture: linux-any