Add Debian bookworm (12)

diff --git a/jenkins/generate-pgdg-source b/jenkins/generate-pgdg-source
index a412f89caee54f5a953b11b84b47c0e59ada1c3c..746063ea2f9f31f2fd16fc7438eb20b556d538de 100755 (executable)
--- a/jenkins/generate-pgdg-source
+++ b/jenkins/generate-pgdg-source
@@ -211,6 +211,7 @@ case $PACKAGE in
       stretch) debhelper_compat 12 ;;
       buster) debhelper_compat 13 ;;
       bullseye) debhelper_compat 13 ;;
+      bookworm) debhelper_compat 13 ;;
       xenial) debhelper_compat 10 ;;
       bionic) debhelper_compat 12 ;;
       eoan|focal) debhelper_compat 12 ;;
@@ -222,6 +223,7 @@ case $PACKAGE in
       jessie|stretch) debhelper_compat 10 ;;
       buster) debhelper_compat 12 ;;
       bullseye) debhelper_compat 13 ;;
+      bookworm) debhelper_compat 13 ;;
       xenial) debhelper_compat 9 ;;
       bionic) debhelper_compat 11 ;;
       eoan|focal) debhelper_compat 12 ;;

diff --git a/jenkins/pgapt-jobs.yaml b/jenkins/pgapt-jobs.yaml
index 47cfaa724bac41143ad1eb4937fc1a873b88a9b2..4603f2ad2b8c227f422bc020c123b989772e59b3 100644 (file)
--- a/jenkins/pgapt-jobs.yaml
+++ b/jenkins/pgapt-jobs.yaml
@@ -129,6 +129,7 @@
             name: distribution
             values: &dist_list
                     - sid
+                    - bookworm
                     - bullseye
                     - buster
                     - stretch
@@ -141,6 +142,7 @@
             name: distribution
             values:
                     - sid
+                    - bookworm
                     - bullseye
                     - buster
                     - stretch

diff --git a/pgapt.conf b/pgapt.conf
index 6de3d53151105ed4e1b2fc09e8a85f2ef38833ad..d0a878bfdcf3793fe4195f3bdd4f836a9dec1660 100644 (file)
--- a/pgapt.conf
+++ b/pgapt.conf
@@ -3,10 +3,10 @@ PG_MAIN_VERSION=13
 PG_BETA_VERSION=14
 PG_DEVEL_VERSION=15
 # supported dists: actively updated
-PG_SUPPORTED_DISTS="sid bullseye buster stretch
+PG_SUPPORTED_DISTS="sid bookworm bullseye buster stretch
        impish hirsute focal bionic"
 # repository dists: kept in repository config
-PG_REPOSITORY_DISTS="sid bullseye buster stretch
+PG_REPOSITORY_DISTS="sid bookworm bullseye buster stretch
        impish hirsute groovy focal bionic xenial"
 
 set_dist_vars () { # args: $1 = distribution [$2 = architecture]
@@ -14,7 +14,7 @@ set_dist_vars () { # args: $1 = distribution [$2 = architecture]
   case $1 in
     # Debian
     sid)     PGDG_DISTRIBUTION="pgdg"      DISTRO="debian" RELEASE="unstable"              ARCHS="amd64 arm64 i386 ppc64el" COMPONENTS="main 8.2 8.3 8.4 9.0 9.1 9.2 9.3 9.4 9.5 9.6 10 11 12 13 14 15" ;;
-    bookworm) PGDG_DISTRIBUTION="pgdg120"  DISTRO="debian" RELEASE="12" ;;
+    bookworm) PGDG_DISTRIBUTION="pgdg120"  DISTRO="debian" RELEASE="12"                    ARCHS="amd64 arm64      ppc64el" COMPONENTS="main 8.2 8.3 8.4 9.0 9.1 9.2 9.3 9.4 9.5 9.6 10 11 12 13 14 15" ;;
     bullseye) PGDG_DISTRIBUTION="pgdg110"  DISTRO="debian" RELEASE="11"                    ARCHS="amd64 arm64      ppc64el" COMPONENTS="main 8.2 8.3 8.4 9.0 9.1 9.2 9.3 9.4 9.5 9.6 10 11 12 13 14 15" ;;
     buster)  PGDG_DISTRIBUTION="pgdg100"   DISTRO="debian" RELEASE="10"    HAS_BACKPORTS=1 ARCHS="amd64 arm64 i386 ppc64el" COMPONENTS="main 8.2 8.3 8.4 9.0 9.1 9.2 9.3 9.4 9.5 9.6 10 11 12 13 14 15" ;;
     stretch) PGDG_DISTRIBUTION="pgdg90"    DISTRO="debian" RELEASE="9"     HAS_BACKPORTS=1 ARCHS="amd64       i386 ppc64el" COMPONENTS="main 8.2 8.3 8.4 9.0 9.1 9.2 9.3 9.4 9.5 9.6 10 11 12 13 14" ;;
@@ -50,7 +50,7 @@ set_dist_vars () { # args: $1 = distribution [$2 = architecture]
       security_src="$security"
       case $1 in
         sid) ;; # no security support
-        bullseye) dist_security="$1-security" ;;
+        bookworm|bullseye) dist_security="$1-security" ;;
         buster) dist_security="$1/updates" ;;
         stretch) # 2021-03: stretch security gone for ppc64el
           case ${2:-undef} in

diff --git a/repo/conf/distributions b/repo/conf/distributions
index 5f98be44829183342ed43450092fd79f1a064c30..52d41338fe45afa59e37ff37574d5b3477454361 100644 (file)
--- a/repo/conf/distributions
+++ b/repo/conf/distributions
@@ -30,6 +30,38 @@ Contents: percomponent nocompatsymlink
 NotAutomatic: yes
 ButAutomaticUpgrades: yes
 
+Codename: bookworm-pgdg
+Suite: bookworm-pgdg
+Origin: apt.postgresql.org
+Label: PostgreSQL for Debian/Ubuntu repository
+Architectures: source amd64 arm64 ppc64el
+Components: main 8.2 8.3 8.4 9.0 9.1 9.2 9.3 9.4 9.5 9.6 10 11 12 13 14 15
+SignWith: ACCC4CF8
+Log: bookworm-pgdg.log
+Uploaders: uploaders
+DebIndices: Packages Release . .gz .bz2
+UDebIndices: Packages . .gz .bz2
+DscIndices: Sources Release .gz .bz2
+Tracking: minimal includebuildinfos keepsources
+Contents: percomponent nocompatsymlink
+
+Codename: bookworm-pgdg-testing
+Suite: bookworm-pgdg-testing
+Origin: apt.postgresql.org
+Label: PostgreSQL for Debian/Ubuntu repository
+Architectures: source amd64 arm64 ppc64el
+Components: main 8.2 8.3 8.4 9.0 9.1 9.2 9.3 9.4 9.5 9.6 10 11 12 13 14 15
+SignWith: ACCC4CF8
+Log: bookworm-pgdg-testing.log
+Uploaders: uploaders
+DebIndices: Packages Release . .gz .bz2
+UDebIndices: Packages . .gz .bz2
+DscIndices: Sources Release .gz .bz2
+Tracking: minimal includebuildinfos keepsources
+Contents: percomponent nocompatsymlink
+NotAutomatic: yes
+ButAutomaticUpgrades: yes
+
 Codename: bullseye-pgdg
 Suite: bullseye-pgdg
 Origin: apt.postgresql.org

diff --git a/repo/conf/incoming b/repo/conf/incoming
index aae7947b851ce11ac7b4ab6643174141a3e67d2b..1efc6c4527eb8d31e2429e7cbba4408f9f543459 100644 (file)
--- a/repo/conf/incoming
+++ b/repo/conf/incoming
@@ -8,6 +8,7 @@ Permit: unused_files
 Cleanup: unused_files
 Allow:
  sid-pgdg>sid-pgdg-testing
+ bookworm-pgdg>bookworm-pgdg-testing
  bullseye-pgdg>bullseye-pgdg-testing
  buster-pgdg>buster-pgdg-testing
  stretch-pgdg>stretch-pgdg-testing