[FFe] Update to inspircd 3.4.0-2 from Debian

PPA build available at ppa:racb/experimental

Proposed debdiff attached (package version string tweak required).

The PPA has one update, needed to not regress LDAP support:

diff -Nru inspircd-3.4.0/debian/rules inspircd-3.4.0/debian/rules
--- inspircd-3.4.0/debian/rules 2019-12-24 04:20:19.000000000 +0000
+++ inspircd-3.4.0/debian/rules 2020-03-04 09:59:54.000000000 +0000
@@ -31,6 +31,8 @@
                --example-dir=/usr/share/doc/inspircd/examples \
                --data-dir=/var/run/inspircd \
                --binary-dir=/usr/sbin
+ ./configure --disable-interactive \
+ --enable-extras=m_ldap.cpp

 override_dh_auto_build:
        dh_auto_build -- INSPIRCD_VERBOSE=1 all

And another note to self: I'll need to check I don't regress any other things that have become optional in the build.

FFe approved.

# apt-cache policy inspircd
inspircd:
  Installed: 3.4.0-2ubuntu1~ppa3
  Candidate: 3.4.0-2ubuntu1~ppa3
  Version table:
 *** 3.4.0-2ubuntu1~ppa3 500
        500 http://ppa.launchpad.net/racb/experimental/ubuntu focal/main amd64 Packages
        100 /var/lib/dpkg/status
     2.0.27-1ubuntu2 500
        500 http://archive.ubuntu.com/ubuntu focal/universe amd64 Packages

Log rotation confirmed to be working:

  # ls /var/log/inspircd
  inspircd.log
  # mv /var/log/inspircd/inspircd.log{,.1}
  # pkill -HUP inspircd
  # ls /var/log/inspircd
  inspircd.log inspircd.log.1
  # tail -n 1 /var/log/inspircd/inspircd.log.1
  Fri Mar 06 2020 07:59:07 MODULE: Rehashing m_ldapauth.so
  # head -n 1 /var/log/inspircd/inspircd.log
  Fri Mar 06 2020 07:59:07 HEADER: Log started for InspIRCd-3.4.0 (inspircd_module_300_7)

Same with additional LDAP logging:

Fri Mar 06 2020 07:59:53 CONNECT: Forbidden connection from jsing!jsing@192.168.200.1 (Invalid credentials (bind dn=uid=jsing,dc=nodomain))

Fri Mar 06 2020 08:01:19 CONNECT: Successful connection from jsing!jsing@192.168.200.1 (dn=uid=jsing,dc=nodomain)

Fri Mar 06 2020 08:02:59 ANNOUNCEMENT: Error binding as manager to LDAP server: Invalid credentials (bind dn=cn=adminz,dc=nodomain)

Thanks.

> And another note to self: I'll need to check I don't regress any other things that have become optional in the build.

It turns out there was another. Details in https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=953259 and now resolved in my latest debdiff attached. Ready for review.

> Ready for review.

A PPA build will be ready shortly in ppa:racb/experimental. I don't think further testing is needed, but the build log is helpful to verify that the expected modules are being built.

> verify that the expected modules are being built

(and shipped in the deb)

Taking a look

a) d/changelog version
Please drop the ppa suffix

b) 15_ldapauth_logging.diff
- can this be sent upstream and/or to debian?

+1 with (a) fixed, (b) you can do afterwards, but if you do it now, would be good to have the details in the dep3 header.

Thank you for the review!

On Fri, Mar 06, 2020 at 08:40:35PM -0000, Andreas Hasenack wrote:
> a) d/changelog version
> Please drop the ppa suffix

Of course :)

> b) 15_ldapauth_logging.diff
> - can this be sent upstream and/or to debian?

Joel is taking care of that (to go upstream).

This bug was fixed in the package inspircd - 3.4.0-2ubuntu1

---------------
inspircd (3.4.0-2ubuntu1) focal; urgency=low

  [ Joel Sing ]
  * Merge from Debian unstable (LP: #1865518). Remaining changes:
    - d/p/15_ldapauth_logging.diff (rewritten against 3.4)
  * Drop changes:
    - d/p/20_close-open-logs-on-rehash.diff: functionality now available
      upstream.

  [ Robie Basak ]
  * d/rules: reenable m_ldap and m_regex_stdlib.cpp to prevent regression in
    shipped modules. Thanks to Joel Sing. Closes: #953259.

inspircd (3.4.0-2) unstable; urgency=medium

  * Fix the pidfile location for apparmor support. Closes: #947281

inspircd (3.4.0-1) unstable; urgency=medium

  * New upstream version 3.4.0
  * Restore GeoIP support. Closes: #936039
  * Remove Guillaume Delacour from uploaders, thanks for all your
    work on that package.

inspircd (3.3.0-1) unstable; urgency=medium

  * New upstream version 3.3.0

inspircd (3.2.0-1) unstable; urgency=medium

  * New upstream version 3.2.0. Closes: #870858, #928759

 -- Robie Basak <email address hidden> Fri, 06 Mar 2020 23:26:40 +0000

GitHub pull request to upstream - https://github.com/inspircd/inspircd/pull/1757