Merge ~sergiodj/ubuntu/+source/net-snmp:merge-5.9.1-jammy into ubuntu/+source/net-snmp:debian/sid

Proposed by Sergio Durigan Junior
Status: Merged
Merge reported by: Sergio Durigan Junior
Merged at revision: cb289636f03c6bbb4dabac250ecb0ba87ce25072
Proposed branch: ~sergiodj/ubuntu/+source/net-snmp:merge-5.9.1-jammy
Merge into: ubuntu/+source/net-snmp:debian/sid
Diff against target: 1374 lines (+1132/-4)
7 files modified
debian/changelog (+986/-0)
debian/control (+4/-3)
debian/patches/lp1945960-Fix-the-build-against-OpenSSL-3.0.patch (+33/-0)
debian/patches/lp1945960-configure-static-linking-Fix-SSL-checks.patch (+66/-0)
debian/patches/series (+2/-0)
debian/rules (+5/-1)
debian/source.apport (+36/-0)
Reviewer Review Type Date Requested Status
Andreas Hasenack (community) Approve
Canonical Server Pending
Review via email: mp+413995@code.qastaging.launchpad.net

Description of the change

This is the merge of net-snmp 5.9.1 from Debian unstable.

This merge is relatively straightforward; we currently have net-snmp 5.9 in Ubuntu. Fortunately, it allows us to drop two changes from our delta: one which was a backport from an upstream patch that is now present on 5.9.1, and another which was incorporated in the Debian package.

Another good thing is that bug #1912390 is also fixed with this merge (kudos to Bryce for leaving a reminder in the merge bug).

We still have to carry the OpenSSL 3 patches because they haven't been included in this release. They will become redundant in the next one, though.

There's a PPA with the proposed changes here:

https://launchpad.net/~sergiodj/+archive/ubuntu/net-snmp-merge/+packages

autopkgtest is still OK:

autopkgtest [21:04:04]: @@@@@@@@@@@@@@@@@@@@ summary
command1 PASS (superficial)
trap PASS

To post a comment you must log in.
Revision history for this message
Andreas Hasenack (ahasenack) wrote :

Looks good, +1

review: Approve
Revision history for this message
Andreas Hasenack (ahasenack) wrote (last edit ):

Actually, one thing to check. This change introduced in the new debian version:

@@ -121,6 +122,7 @@ Depends: libc6-dev, libsnmp40 (=${binary:Version}), libnetsnmptrapd40 (=${binary
          libwrap0-dev, libssl-dev, procps,
          libkvm-dev [kfreebsd-any], libsensors-dev [linux-any], ${misc:Depends},
          libpci-dev
+Recommends: libsnmp-perl
 Description: SNMP (Simple Network Management Protocol) development files
  The Simple Network Management Protocol (SNMP) provides a framework
  for the exchange of management information between agents (servers)

git diff -U10 sergiodj/lp1946877/old/debian..sergiodj/lp1946877/new/debian -- debian/control

That's adding Recommends: libsnmp-perl to libsnmp-dev. libsnmp-perl is in universe, and libsnmp-dev is in main. I don't think that's allowed, we will have to change that to Suggests afaik, can you confirm? I'll flip this to "needs fixing" until you analyze it.

Revision history for this message
Andreas Hasenack (ahasenack) :
review: Needs Fixing
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

So the new dependency is
 libsnmp-dev | 5.9+dfsg-3ubuntu4 | jammy | amd64, arm64, armhf, i386, ppc64el, riscv64, s390x
to
 libsnmp-perl | 5.9+dfsg-3ubuntu4 | jammy/universe | amd64, arm64, armhf, i386, ppc64el, riscv64, s390x

But the only reason to have libsnmp-dev:

$ reverse-depends --release jammy libsnmp-dev
Reverse-Depends
* libgvm-dev
* libifstat-dev

Is because -dev and -doc are auto-included by germinate unless you do something about it.

See
https://people.canonical.com/~ubuntu-archive/germinate-output/ubuntu.jammy/all

libsnmp-dev | net-snmp | Rescued from net-snmp | Ubuntu Developers <email address hidden> | 205104 | 1282

Whenever you see rescued that is due to the auto-inclusion.
We can handle that without delta on the package by adding an extra-exclude to

https://git.launchpad.net/~ubuntu-core-dev/ubuntu-seeds/+git/ubuntu/tree/supported#n124
We can review that change in the team and push it (core-dev) then this won't be a problem on upload.

Revision history for this message
Sergio Durigan Junior (sergiodj) wrote :

On Wednesday, January 12 2022, Christian Ehrhardt  wrote:

> So the new dependency is
> libsnmp-dev | 5.9+dfsg-3ubuntu4 | jammy | amd64, arm64, armhf, i386, ppc64el, riscv64, s390x
> to
> libsnmp-perl | 5.9+dfsg-3ubuntu4 | jammy/universe | amd64, arm64, armhf, i386, ppc64el, riscv64, s390x

Thank you for catching this, Andreas. And thank you Christian for the
further explanation.

> But the only reason to have libsnmp-dev:
>
> $ reverse-depends --release jammy libsnmp-dev
> Reverse-Depends
> * libgvm-dev
> * libifstat-dev
>
> Is because -dev and -doc are auto-included by germinate unless you do something about it.
>
> See
> https://people.canonical.com/~ubuntu-archive/germinate-output/ubuntu.jammy/all
>
> libsnmp-dev | net-snmp | Rescued from net-snmp | Ubuntu Developers
> <email address hidden> | 205104 | 1282
>
> Whenever you see rescued that is due to the auto-inclusion.
> We can handle that without delta on the package by adding an extra-exclude to
>
> https://git.launchpad.net/~ubuntu-core-dev/ubuntu-seeds/+git/ubuntu/tree/supported#n124
> We can review that change in the team and push it (core-dev) then this won't be a problem on upload.

Ah, got it. I will file an MP against the ubuntu-seeds/+git/ubuntu repo
and mark you guys to review it.

Thanks,

--
Sergio
GPG key ID: E92F D0B3 6B14 F1F4 D8E0 EB2F 106D A1C8 C3CB BF14

Revision history for this message
Sergio Durigan Junior (sergiodj) wrote :

On Wednesday, January 12 2022, Sergio Durigan Junior wrote:

> Ah, got it. I will file an MP against the ubuntu-seeds/+git/ubuntu repo
> and mark you guys to review it.

MP filed: https://code.launchpad.net/~sergiodj/ubuntu-seeds/+git/ubuntu/+merge/414063

--
Sergio
GPG key ID: E92F D0B3 6B14 F1F4 D8E0 EB2F 106D A1C8 C3CB BF14

Revision history for this message
Sergio Durigan Junior (sergiodj) wrote :

Alright, now that the ubuntu-seeds MP has been merged, I think it is OK to proceed with this one.

Andreas, I talked to Christian during standup and he's happy with the MP. Judging from your comments, I understand that you were a +1 modulo the libsnmp-perl thing, which has since been resolved. Therefore, I'm going to go ahead and upload the package. Thanks both of you for the reviews.

$ dput net-snmp_5.9.1+dfsg-1ubuntu1_source.changes
Trying to upload package to ubuntu
Checking signature on .changes
gpg: /home/sergio/work/net-snmp/net-snmp_5.9.1+dfsg-1ubuntu1_source.changes: Valid signature from 106DA1C8C3CBBF14
Checking signature on .dsc
gpg: /home/sergio/work/net-snmp/net-snmp_5.9.1+dfsg-1ubuntu1.dsc: Valid signature from 106DA1C8C3CBBF14
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading net-snmp_5.9.1+dfsg-1ubuntu1.dsc: done.
  Uploading net-snmp_5.9.1+dfsg.orig.tar.xz: done.
  Uploading net-snmp_5.9.1+dfsg-1ubuntu1.debian.tar.xz: done.
  Uploading net-snmp_5.9.1+dfsg-1ubuntu1_source.buildinfo: done.
  Uploading net-snmp_5.9.1+dfsg-1ubuntu1_source.changes: done.
Successfully uploaded packages.

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

yes, should be good

review: Approve
Revision history for this message
Andreas Hasenack (ahasenack) wrote :

This migrated a long time ago, could you please set the MP status to "merged"?

Revision history for this message
Sergio Durigan Junior (sergiodj) wrote :

On Monday, March 07 2022, Andreas Hasenack wrote:

> This migrated a long time ago, could you please set the MP status to "merged"?

Done, thanks.

--
Sergio
GPG key ID: E92F D0B3 6B14 F1F4 D8E0 EB2F 106D A1C8 C3CB BF14

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches