openafs-modules-dkms fails to build with latest Precise kernel

The upstream fix was committed last week, and will be in 1.6.11:

http://gerrit.openafs.org/11659
http://git.openafs.org/?p=openafs.git;a=commit;h=860764da5ee2e48a2c3f7552fad1766e19eae47f

Things to note about the test case:

1. The affected kernel 3.2.0-76 is in precise-proposed. precise-updates with 3.2.0-75 is not yet affected.

2. This is a DKMS build failure, which is not, strictly speaking, a FTBFS. After building openafs from its source package (which doesn’t build any kernel modules), you still need to verify that linux-headers-3.2.0-76-generic and openafs-modules-dkms can be successfully installed.

Thank you Anders for pointing me to the upstream fix. I will pick it
for the Precise dkms package.

And yes, you're right -- I am testing it by installing the
openafs-modules-dkms in a Precise system, running the 3.2.0-76
kernel.

Ok, looks like the upstream fix doesn't apply to this old version of the package. Based on it, I've came up with the following debdiff that seems to fix the Precise package (I'm still running a few more tests). Anders, what do you think?

That looks fine. Also, the kernel update entered precise-security today, so we should get this out as soon as we can.

Also affects openafs-modules-dkms 1.6.7-1~ubuntu12.04.2 in precise-backports.

Hi,
I've been trying to sponsor this for Precise, but I notice that the debdiff also contains changes to 'debian/patches/debian-changes'. What I'd expect is just to add Luis' patch without those additional changes; however I think this is some underlying packaging problem. If I just 'quilt import' the patch and 'debuild -S' I get modifications in debian-changes, which then causes the patches to not apply cleanly because debian-changes also adds the changes from all other patches. Any suggestions for fixing this?

In Luis’s debdiff, the modifications to debian/patches/debian-changes are just line number changes in the diff headers. The effect of the patch is not being modified. All the actual modifications are in debian/patches/Linux-d_alias-becomes-d_u.d_alias.patch.

Oh I see what you mean. It has nothing to do with the present patch—rebuilding the current source package with no changes results in a non-working source package.

$ dget -d https://launchpad.net/ubuntu/+archive/primary/+files/openafs_1.6.1-1+ubuntu0.4.dsc
$ dpkg-source -x openafs_1.6.1-1+ubuntu0.4.dsc
$ cd openafs-1.6.1
$ debuild -S
$ cd ..
$ dpkg-source -x openafs_1.6.1-1+ubuntu0.4.dsc
dpkg-source: info: extracting openafs in openafs-1.6.1
dpkg-source: info: unpacking openafs_1.6.1.orig.tar.gz
dpkg-source: info: unpacking openafs_1.6.1-1+ubuntu0.4.debian.tar.xz
dpkg-source: info: applying debian-changes
dpkg-source: info: applying openafs-sa-2013-001.patch
patching file src/libacl/aclprocs.c
Reversed (or previously applied) patch detected! Skipping patch.
4 out of 4 hunks ignored
patching file src/libadmin/client/afs_clientAdmin.c
Reversed (or previously applied) patch detected! Skipping patch.
2 out of 2 hunks ignored
patching file src/venus/fs.c
Reversed (or previously applied) patch detected! Skipping patch.
4 out of 4 hunks ignored
dpkg-source: info: the patch has fuzz which is not allowed, or is malformed
dpkg-source: info: if patch 'openafs-sa-2013-001.patch' is correctly applied by quilt, use 'quilt refresh' to update it
dpkg-source: error: LC_ALL=C patch -t -F 0 -N -p1 -u -V never -g0 -E -b -B .pc/openafs-sa-2013-001.patch/ --reject-file=- < openafs-1.6.1/debian/patches/openafs-sa-2013-001.patch gave error exit status 1

Is this a dpkg bug?

A workaround is to delete debian/source/options (which contains ‘single-debian-patch’) after extracting the package.

Re-built openafs-1.6.1 from source and applied openafs.debdiff patch.

Existing 12.04 installs upgraded the following packages and openafs-modules-dkms built the openafs kernel module successfully.

openafs-client amd64 1.6.1-1+ubuntu0.5
openafs-doc all 1.6.1-1+ubuntu0.5
openafs-modules-dkms all 1.6.1-1+ubuntu0.5

Adding a custom repository with updated packages during Ubuntu 12.04 preseed install also installs and builds the openafs packages and modules correctly.

Added packages to PPA: https://launchpad.net/~ecliptik/+archive/ubuntu/openafs-1416375

Requested escalation of bug to promote packages with patch to precise-security and/or precise-updates upstream repositories via Canonical TAM.

Ok, I was finally able to reproduce the build failure as described in comment #9. But I reproduced it in an non-Precise environment (I tried it in Vivid). Actually, I see already an error when running the debuild command:

...
Now running lintian...
dpkg-source: error: LC_ALL=C patch -t -F 0 -N -p1 -u -V never -g0 -E -b -B .pc/openafs-sa-2013-001.patch/ --reject-file=- < /tmp/temp-lintian-lab-qzRinCxzql/pool/o/openafs/openafs_1.6.1-1+ubuntu0.4_source/unpacked/debian/patches/openafs-sa-2013-001.patch gave error exit status 1
internal error: dpkg-source -x failed with status 2 at /usr/share/lintian/collection/unpacked line 69.
warning: collect info unpacked about package openafs failed
warning: skipping check of source package openafs
Finished running lintian.

If I execute the same steps in a Precise system I don't see any error. Note that I've generated the debdiff in a Precise system, which is, I believe, the right thing to do.

Sponsored for Precise.

I'm attaching a new debdiff that includes the suggestion in comment #9: it also drops option 'single-debian-patch' from debian/source/options. This fixes the additional changes to the 'debian/patches/debian-changes' file.

Hello Luis, or anyone else affected,

Accepted openafs into precise-proposed. The package will build now and be available at http://launchpad.net/ubuntu/+source/openafs/1.6.1-1+ubuntu0.5 in a few hours, and then in the -proposed repository.

Please help us by testing this new package. See https://wiki.ubuntu.com/Testing/EnableProposed for documentation how to enable and use -proposed. Your feedback will aid us getting this update out to other Ubuntu users.

If this package fixes the bug for you, please add a comment to this bug, mentioning the version of the package you tested, and change the tag from verification-needed to verification-done. If it does not fix the bug for you, please add a comment stating that, and change the tag to verification-failed. In either case, details of your testing will help us make a better decision.

Further information regarding the verification process can be found at https://wiki.ubuntu.com/QATeam/PerformingSRUVerification . Thank you in advance!

The package currently in -proposed (1.6.1-1+ubuntu0.5) successfully installs and builds the dkms modules. Tagging this bug as verified.

This bug was fixed in the package openafs - 1.6.1-1+ubuntu0.5

---------------
openafs (1.6.1-1+ubuntu0.5) precise; urgency=low

  * Upstream v3.2.66 porting (LP: #1416375):
    - 'd_alias' member of struct dentry has been moved into the 'd_u' union
  * Dropped 'single-debian-patch' from debian/source/options
 -- Luis Henriques <email address hidden> Thu, 05 Feb 2015 12:44:14 -0600

The verification of the Stable Release Update for openafs has completed successfully and the package has now been released to -updates. Subsequently, the Ubuntu Stable Release Updates Team is being unsubscribed and will not receive messages about this bug report. In the event that you encounter a regression using the package from -updates please report a new bug using ubuntu-bug and tag the bug report regression-update so we can easily find any regressions.