[Pkg-freeipa-devel] [Git][freeipa-team/389-ds-base][master] 2 commits: dont-run-rpm.diff: Use dpkg-query to check for cockpit/firewalld. (Closes: #1010136)

[Timo Aaltonen (@tjaalton)]

Timo Aaltonen pushed to branch master at FreeIPA packaging / 389-ds-base


Commits:
02244343 by Timo Aaltonen at 2023-01-20T23:14:17+02:00
dont-run-rpm.diff: Use dpkg-query to check for cockpit/firewalld. (Closes: #1010136)

- - - - -
d60eda6e by Timo Aaltonen at 2023-01-20T23:16:20+02:00
releasing package 389-ds-base version 2.3.1-1

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/dont-run-rpm.diff
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,6 +1,8 @@
-389-ds-base (2.3.1-1) UNRELEASED; urgency=medium
+389-ds-base (2.3.1-1) unstable; urgency=medium
 
-  * New upstream release.
+  * New upstream release. (Closes: #1028177)
+    - CVE-2022-1949 (Closes: #1016446)
+    - CVE-2022-2850 (Closes: #1018054)
   * watch: Updated to use releases instead of tags.
   * control: Add liblmdb-dev to build-depends.
   * control: Add libjson-c-dev to build-depends.
@@ -8,8 +10,10 @@
   * Build with rust enabled.
   * rules: Don't use a separate builddir for now.
   * 5610-fix-linking.diff: Fix linking libslapd.so.
+  * dont-run-rpm.diff: Use dpkg-query to check for cockpit/firewalld.
+    (Closes: #1010136)
 
- -- Timo Aaltonen <tjaalton at debian.org>  Thu, 19 Jan 2023 12:52:17 +0200
+ -- Timo Aaltonen <tjaalton at debian.org>  Fri, 20 Jan 2023 23:15:49 +0200
 
 389-ds-base (2.0.15-1) unstable; urgency=medium
 


=====================================
debian/patches/dont-run-rpm.diff
=====================================
@@ -0,0 +1,41 @@
+--- a/src/lib389/lib389/cli_ctl/cockpit.py
++++ b/src/lib389/lib389/cli_ctl/cockpit.py
+@@ -10,9 +10,13 @@ import os
+ import subprocess
+ 
+ def cockpit_present():
+-    rpm_handle = os.popen('rpm -qa --qf "%{NAME}\n"')
+-    rpm_list = rpm_handle.read().splitlines()
+-    if 'cockpit' in rpm_list:
++    if os.popen('dpkg-query -l cockpit'):
++        return True
++    else:
++        return False
++
++def firewalld_present():
++    if os.popen('dpkg-query -l firewalld'):
+         return True
+     else:
+         return False
+@@ -36,8 +40,8 @@ def open_firewall(inst, log, args):
+     """
+     Open the firewall for Cockpit service
+     """
+-    if not cockpit_present():
+-        raise ValueError("The 'cockpit' package is not installed on this system")
++    if not firewalld_present():
++        raise ValueError("The 'firewalld' package is not installed on this system")
+ 
+     OPEN_CMD = ['sudo', 'firewall-cmd', '--add-service=cockpit', '--permanent']
+     if args.zone is not None:
+@@ -66,8 +70,8 @@ def close_firewall(inst, log, args):
+     """
+     Close firewall for Cockpit service
+     """
+-    if not cockpit_present():
+-        raise ValueError("The 'cockpit' package is not installed on this system")
++    if not firewalld_present():
++        raise ValueError("The 'firewalld' package is not installed on this system")
+ 
+     CLOSE_CMD = ['sudo', 'firewall-cmd', '--remove-service=cockpit', '--permanent']
+     try:


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
 fix-saslpath.diff
 5610-fix-linking.diff
+dont-run-rpm.diff



View it on GitLab: https://salsa.debian.org/freeipa-team/389-ds-base/-/compare/eb1b57084f2e83a8ee0582fd29a5e92b4872433e...d60eda6e94a419e47d41d2da556484435bb60ed7

-- 
View it on GitLab: https://salsa.debian.org/freeipa-team/389-ds-base/-/compare/eb1b57084f2e83a8ee0582fd29a5e92b4872433e...d60eda6e94a419e47d41d2da556484435bb60ed7
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-freeipa-devel/attachments/20230120/9c626ff5/attachment-0001.htm>