[Pkg-swan-devel] Help with strongswan packaging

[Gerald Turner]

Hello strongswan maintainers, Yves-Alexis, Ondřej,

For a few years I've been maintaining a private fork of strongswan in
order to enable a couple plugins and rebuild to my private
stable-backports reprepro repository.  For decades I've made small
incremental attempts to learn the Debian tool chain, however I'm still
quite naive (also naive with git in general).  For the last half dozen
or so strongswan package releases, I've used the following recipe:

  >> gbp clone git at git.unzane.com:debian-strongswan strongswan
  >> cd strongswan
  >> git remote add debian https://salsa.debian.org/debian/strongswan.git
  >> git fetch debian
  >> git merge debian/master
  >> git status
  >> emacs # edit files with "both modified" status, likely debian/changelog
  >> git commit
  >> gbp dch -a --nmu
  >> emacs debian/changelog
  >> git commit debian/changelog
  >> gbp buildpackage --git-tag -ap -sa

The most recent time I've successfully executed this recipe was with the
5.6.3-1 release in June.  However today attempting to rebuild the
5.7.0-2 release, I'm getting git-buildpackage failures having to do with
the repository layout.

First problem is that branch debian/master no longer exists, seems to be
named debian/debian/master now.

  >> git merge debian/master
  > merge: debian/master - not something we can merge

  >> git merge debian/debian/master

That first problem seems to cascade to all other gbp subcommands
requiring --ignore-branch.

  >> gbp dch -a --nmu
  > gbp:error: You are not on branch 'debian/master' but on 'master'
  > gbp:error: Use --ignore-branch to ignore or --debian-branch to set the branch name.

  >> gbp dch -a --nmu --ignore-branch

  >> gbp buildpackage --git-tag -ap -sa
  > gbp:error: You are not on branch 'debian/master' but on 'master'
  > gbp:error: Use --git-ignore-branch to ignore or --git-debian-branch to set the branch name.

Second problem is gbp buildpackage subcommand fails to locate
pristine-tar delta.

  >> gbp buildpackage --git-tag -ap -sa --git-ignore-branch
  > gbp:warning: Pristine-tar branch "pristine-tar" not found
  > gbp:error: Pristine-tar couldn't checkout "strongswan_5.7.0.orig.tar.gz": fatal: Path 'strongswan_5.7.0.orig.tar.gz.delta' does not exist in 'refs/remotes/debian/pristine-tar'
  > pristine-tar: git show refs/remotes/debian/pristine-tar:strongswan_5.7.0.orig.tar.gz.delta failed

Poking around the pristine-tar branch, I see the file is using bzip2
instead of gzip.

  >> git checkout pristine-tar
  >> ls
  > strongswan_4.5.2.orig.tar.gz.delta
  > strongswan_4.5.2.orig.tar.gz.id
  > strongswan_5.7.0.orig.tar.bz2.delta
  > strongswan_5.7.0.orig.tar.bz2.id

However gbp buildpackage shows the bzip2 archive is corrupt:

  >> gbp buildpackage --git-tag -ap -sa --git-ignore-branch --git-compression=bzip2
  > gbp:error: Pristine-tar couldn't checkout "strongswan_5.7.0.orig.tar.bz2": xdelta3: target window checksum mismatch: XD3_INVALID_INPUT
  > xdelta3: normally this indicates that the source file is incorrect
  > xdelta3: please verify the source file with sha1sum or equivalent
  > xdelta3: target window checksum mismatch: XD3_INVALID_INPUT
  > xdelta3: normally this indicates that the source file is incorrect
  > xdelta3: please verify the source file with sha1sum or equivalent
  > xdelta3: target window checksum mismatch: XD3_INVALID_INPUT
  > xdelta3: normally this indicates that the source file is incorrect
  > xdelta3: please verify the source file with sha1sum or equivalent
  > xdelta3: target window checksum mismatch: XD3_INVALID_INPUT
  > xdelta3: normally this indicates that the source file is incorrect
  > xdelta3: please verify the source file with sha1sum or equivalent
  > pristine-tar: Failed to reproduce original tarball. Please file a bug report.
  > pristine-tar: failed to generate tarball

Could there have been some accidental breakage to the repository layout
on salsa?  Perhaps it's merely some incompatibilty with building on a
stretch host with an older toolchain (git-buildpackage 0.8.12.2
vs. 0.9.10, pristine-tar 1.38 vs. 1.44, etc.)?

-- 
Gerald Turner <gturner at unzane.com>        Encrypted mail preferred!
OpenPGP: 4096R / CA89 B27A 30FA 66C5 1B80  3858 EC94 2276 FDB8 716D
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 962 bytes
Desc: not available
URL: <http://alioth-lists.debian.net/pipermail/pkg-swan-devel/attachments/20181003/006024e3/attachment.sig>