Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: Fix pam_adsys build #789

Merged
merged 1 commit into from
Sep 25, 2023
Merged

build: Fix pam_adsys build #789

merged 1 commit into from
Sep 25, 2023

Conversation

GabrielNagy
Copy link
Contributor

It looks like multiple -tags statements override each other so we must specify them in a comma separated way. This fixes the issue where pam_adsys is not built and shipped anymore.

@GabrielNagy GabrielNagy requested a review from a team as a code owner September 25, 2023 09:47
@GabrielNagy
Copy link
Contributor Author

And the proof:

root@mantic-b4519d33:~# diff -u 0.13.0.txt 0.13.0ppa2.txt
--- 0.13.0.txt	2023-09-25 08:54:37.648222755 +0000
+++ 0.13.0ppa2.txt	2023-09-25 09:46:37.018948908 +0000
@@ -2,8 +2,8 @@
 0

      118 bytes,     2 lines      conffiles
-     937 bytes,    17 lines      control
-    5587 bytes,    72 lines      md5sums
+     959 bytes,    17 lines      control
+    5664 bytes,    73 lines      md5sums
     7075 bytes,   147 lines   *  postinst             #!/bin/sh
      872 bytes,    21 lines   *  postrm               #!/bin/sh
      811 bytes,    21 lines   *  prerm                #!/bin/sh
@@ -11,7 +11,7 @@
 13
  Architecture: amd64
 ubuntu
- Installed-Size: 27172
+ Installed-Size: 27236
 34), libglib2
  Recommends: ubuntu-advantage-desktop-daemon
  Suggests: curlftpfs, ubuntu-proxy-manager, python3-cepces
@@ -43,6 +43,9 @@
 /lib/systemd/system/adsysd
 /lib/systemd/system/adsysd
 /lib/systemd/system/run-adsys
+/lib/x86_64-linux-gnu/
+/lib/x86_64-linux-gnu/security/
+/lib/x86_64-linux-gnu/security/pam_adsys
 /sbin/
 /sbin/adsysd
 /usr/

PPA build at: https://launchpad.net/~gabuscus/+archive/ubuntu/ppa/+sourcepub/15173272/+listing-archive-extra

debian/rules Show resolved Hide resolved
@codecov-commenter
Copy link

Codecov Report

Merging #789 (f293785) into main (542f9e5) will not change coverage.
Report is 2 commits behind head on main.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main     #789   +/-   ##
=======================================
  Coverage   86.07%   86.07%           
=======================================
  Files          77       77           
  Lines        8552     8552           
=======================================
  Hits         7361     7361           
  Misses        868      868           
  Partials      323      323           

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

Copy link
Member

@didrocks didrocks left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for working and fixing this promptly!

I just have a small suggestion on commenting, then, feel free to merge :)

EDIT: if you didn’t notice, the vulnerability is due to us needing rebuilding with Go 1.21.1. Let me quickly do a PR with this.

It looks like multiple -tags statements override each other so we must
specify them in a comma separated way. This fixes the issue where
pam_adsys is not built and shipped anymore.
@GabrielNagy GabrielNagy changed the title Fix pam_adsys build build: Fix pam_adsys build Sep 25, 2023
@GabrielNagy GabrielNagy merged commit 8bacc58 into main Sep 25, 2023
4 checks passed
@GabrielNagy GabrielNagy deleted the fix-pam-adsys-build branch September 25, 2023 10:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants