NEWS

@@ -1,12 +1,5 @@
 systemd System and Service Manager
 
-CHANGES WITH 260 in spe:
-
-        Feature Removals and Incompatible Changes:
-
-        * Meson options '-Dintegration-tests=' and '-Dcryptolib=' (deprecated
-          in v258) have been removed.
-
 CHANGES WITH 259:
 
         Announcements of Future Feature Removals and Incompatible Changes:

meson_options.txt

@@ -450,6 +450,7 @@ option('gnutls', type : 'feature', deprecated : { 'true' : 'enabled', 'false' :
        description : 'gnutls support')
 option('openssl', type : 'feature', deprecated : { 'true' : 'enabled', 'false' : 'disabled' },
        description : 'openssl support')
+option('cryptolib', type : 'combo', choices : ['auto', 'openssl', 'gcrypt'], deprecated : true)
 option('p11kit', type : 'feature', deprecated : { 'true' : 'enabled', 'false' : 'disabled' },
        description : 'p11kit support')
 option('libfido2', type : 'feature', deprecated : { 'true' : 'enabled', 'false' : 'disabled' },
@@ -527,6 +528,8 @@ option('install-tests', type : 'boolean', value : false,
        description : 'install test executables')
 option('log-message-verification', type : 'feature', deprecated : { 'true' : 'enabled', 'false' : 'disabled' },
        description : 'do fake printf() calls to verify format strings')
+option('integration-tests', type : 'boolean', value : false, deprecated : true,
+       description : 'run the integration tests')
 
 option('ok-color', type : 'combo',
        choices : ['black', 'red', 'green', 'yellow', 'blue', 'magenta', 'cyan',

mkosi/mkosi.pkgenv/mkosi.conf.d/debian-ubuntu.conf

@@ -9,5 +9,5 @@ Environment=
         GIT_URL=https://salsa.debian.org/systemd-team/systemd.git
         GIT_SUBDIR=debian
         GIT_BRANCH=debian/master
-        GIT_COMMIT=f05328feafba2156f31e17e0e2c144cfa7c66e72
+        GIT_COMMIT=d9f2aa1704bc98d1aec6519a863a07eaf12b76ad
         PKG_SUBDIR=debian