Move Debian adaptations to Debian packaging rules

Also add lintian to pbuilder packages
This commit is contained in:
J. King 2021-07-09 20:45:52 -04:00
parent cd89472575
commit def4a3bc77
4 changed files with 27 additions and 29 deletions

View file

@ -201,14 +201,16 @@ class RoboFile extends \Robo\Tasks {
return $result; return $result;
} }
try { try {
// generate the Debian changelog; this also validates our original changelog
$debianChangelog = $this->changelogDebian($this->changelogParse(file_get_contents($dir."CHANGELOG"), $version), $version);
// save commit description to VERSION file for reference // save commit description to VERSION file for reference
$t->addTask($this->taskWriteToFile($dir."VERSION")->text($version)); $t->addTask($this->taskWriteToFile($dir."VERSION")->text($version));
// patch the Arch PKGBUILD file with the correct version string // patch the Arch PKGBUILD file with the correct version string
$t->addTask($this->taskReplaceInFile($dir."dist/arch/PKGBUILD")->regex('/^pkgver=.*$/m')->to("pkgver=$archVersion")); $t->addTask($this->taskReplaceInFile($dir."dist/arch/PKGBUILD")->regex('/^pkgver=.*$/m')->to("pkgver=$archVersion"));
// patch the Arch PKGBUILD file with the correct source file // patch the Arch PKGBUILD file with the correct source file
$t->addTask($this->taskReplaceInFile($dir."dist/arch/PKGBUILD")->regex('/^source=\("arsse-[^"]+"\)$/m')->to('source=("'.basename($tarball).'")')); $t->addTask($this->taskReplaceInFile($dir."dist/arch/PKGBUILD")->regex('/^source=\("arsse-[^"]+"\)$/m')->to('source=("'.basename($tarball).'")'));
// Prepare Debian-related files // save the Debian-format changelog
$this->prepDebian($t, $dir, $version); $t->addTask($this->taskWriteToFile($dir."dist/debian/changelog")->text($debianChangelog));
// perform Composer installation in the temp location with dev dependencies // perform Composer installation in the temp location with dev dependencies
$t->addTask($this->taskComposerInstall()->arg("-q")->dir($dir)); $t->addTask($this->taskComposerInstall()->arg("-q")->dir($dir));
// generate manpages // generate manpages
@ -288,7 +290,7 @@ class RoboFile extends \Robo\Tasks {
$t = $this->collectionBuilder(); $t = $this->collectionBuilder();
// build the generic release tarball if it doesn't exist // build the generic release tarball if it doesn't exist
if (!file_exists($tarball)) { if (!file_exists($tarball)) {
$t->addTask($this->taskExec(BASE."robo package $commit")); $t->addTask($this->taskExec(BASE."robo package:generic $commit"));
} }
// extract the PKGBUILD from the tarball // extract the PKGBUILD from the tarball
$t->addCode(function() use ($tarball, $dir) { $t->addCode(function() use ($tarball, $dir) {
@ -319,7 +321,7 @@ class RoboFile extends \Robo\Tasks {
$tarball = BASE."release/$version/arsse-$version.tar.gz"; $tarball = BASE."release/$version/arsse-$version.tar.gz";
// define some more variables // define some more variables
$tgz = BASE."release/pbuilder-arsse.tgz"; $tgz = BASE."release/pbuilder-arsse.tgz";
$bind = dirname(realpath($tarball)); $bind = dirname($tarball);
$script = BASE."dist/debian/pbuilder.sh"; $script = BASE."dist/debian/pbuilder.sh";
$user = trim(`id -un`); $user = trim(`id -un`);
$group = trim(`id -gn`); $group = trim(`id -gn`);
@ -328,11 +330,11 @@ class RoboFile extends \Robo\Tasks {
// check that the pbuilder base exists and create it if it does not // check that the pbuilder base exists and create it if it does not
if (!file_exists($tgz)) { if (!file_exists($tgz)) {
$t->addTask($this->taskFilesystemStack()->mkdir(BASE."release")); $t->addTask($this->taskFilesystemStack()->mkdir(BASE."release"));
$t->addTask($this->taskExec('sudo pbuilder create --basetgz '.escapeshellarg($tgz).' --mirror http://ftp.ca.debian.org/debian/ --extrapackages debhelper --extrapackages devscripts')); $t->addTask($this->taskExec('sudo pbuilder create --basetgz '.escapeshellarg($tgz).' --mirror http://ftp.ca.debian.org/debian/ --extrapackages "debhelper devscripts lintian"'));
} }
// build the generic release tarball if it doesn't exist // build the generic release tarball if it doesn't exist
if (!file_exists($tarball)) { if (!file_exists($tarball)) {
$t->addTask($this->taskExec(BASE."robo package $commit")); $t->addTask($this->taskExec(BASE."robo package:generic $commit"));
} }
// build the packages // build the packages
$t->addTask($this->taskExec('sudo pbuilder execute --basetgz '.escapeshellarg($tgz).' --bindmounts '.escapeshellarg($bind).' -- '.escapeshellarg($script).' '.escapeshellarg("$bind/".basename($tarball)))); $t->addTask($this->taskExec('sudo pbuilder execute --basetgz '.escapeshellarg($tgz).' --bindmounts '.escapeshellarg($bind).' -- '.escapeshellarg($script).' '.escapeshellarg("$bind/".basename($tarball))));
@ -567,25 +569,4 @@ class RoboFile extends \Robo\Tasks {
} }
return $out; return $out;
} }
protected function prepDebian(CollectionBuilder $t, string $dir, string $version): void {
// generate the Debian changelog; this also validates our original changelog
$debianChangelog = $this->changelogDebian($this->changelogParse(file_get_contents($dir."CHANGELOG"), $version), $version);
// save the Debian changelog
$t->addTask($this->taskWriteToFile($dir."dist/debian/changelog")->text($debianChangelog));
// adapt the systemd unit for Debian: this involves using only the "arsse-fetch" unit (renamed to "arsse"), removing the "PartOf" directive, and changing the user and group to "www-data"
$t->addTask($this->taskFilesystemStack()->copy($dir."dist/systemd/arsse-fetch.service", $dir."dist/debian/arsse.service"));
$t->addTask($this->taskReplaceInFile($dir."/dist/debian/arsse.service")->regex('/^PartOf=.*$/m')->to(""));
$t->addTask($this->taskReplaceInFile($dir."/dist/debian/arsse.service")->regex('/^(User|Group)=.*$/m')->to("$1=www-data"));
// adapt the init script for Debian: this involves changing the user and group to "www-data"
$t->addTask($this->taskFilesystemStack()->copy($dir."dist/init.sh", $dir."dist/debian/arsse.init"));
$t->addTask($this->taskReplaceInFile($dir."/dist/debian/arsse.init")->regex('/^(\s*)chown arsse:arsse $/m')->to("$1chown www-data:www-data "));
// change the user and group references in tmpfiles
$t->addTask($this->taskFilesystemStack()->copy($dir."dist/tmpfiles.conf", $dir."dist/debian/arsse.tmpfiles"));
$t->addTask($this->taskReplaceInFile($dir."dist/debian/arsse.tmpfiles")->regex('/(?<= )arsse(?= )/')->to("www-data"));
// change the user reference in the executable file
$t->addTask($this->taskFilesystemStack()->mkdir($dir."dist/debian/bin"));
$t->addTask($this->taskFilesystemStack()->copy($dir."dist/arsse", $dir."dist/debian/bin/arsse"));
$t->addTask($this->taskReplaceInFile($dir."dist/debian/bin/arsse")->from('posix_getpwnam("arsse"')->to('posix_getpwnam("www-data"'));
}
} }

View file

@ -15,4 +15,4 @@ dist/nginx etc/arsse/
dist/apache etc/arsse/ dist/apache etc/arsse/
dist/debian/config.php etc/arsse/ dist/debian/config.php etc/arsse/
dist/debian/dbconfig-common.php usr/share/arsse/ dist/debian/dbconfig-common.php usr/share/arsse/
dist/debian/bin/arsse usr/bin/ debian/bin/arsse usr/bin/

View file

@ -4,7 +4,7 @@
# This script is fed to pbuilder to build Debian packages. The base tarball # This script is fed to pbuilder to build Debian packages. The base tarball
# should be created with a command similar to the following: # should be created with a command similar to the following:
# #
# sudo pbuilder create --basetgz pbuilder-arsse.tgz --mirror http://ftp.ca.debian.org/debian/ --extrapackages debhelper --extrapackages devscripts # sudo pbuilder create --basetgz pbuilder-arsse.tgz --mirror http://ftp.ca.debian.org/debian/ --extrapackages "debhelper devscripts lintian"
# #
# Thereafter pbuilder can be used to build packages with this command: # Thereafter pbuilder can be used to build packages with this command:
# #

17
dist/debian/rules vendored
View file

@ -4,3 +4,20 @@ DH_VERBOSE = 1
%: %:
dh $@ dh $@
execute_before_dh_install:
# Adapt the systemd service for Debian: this involves using only the "arsse-fetch" unit (renamed to "arsse"), removing the "PartOf" directive, and changing the user and group to "www-data"
cp dist/systemd/arsse-fetch.service debian/arsse.service
sed -i -se 's/^PartOf=.*//' debian/arsse.service
sed -i -se 's/^\(User\|Group\)=.*/\1=www-data/' debian/arsse.service
# Adapt the init script for Debian: this involves changing the user and group to "www-data"
cp dist/init.sh debian/arsse.init
sed -i -se 's/^\([ \t]*chown\) arsse:arsse /\1 www-data:www-data /' debian/arsse.init
# Change the user and group references in tmpfiles
cp dist/tmpfiles.conf debian/arsse.tmpfiles
sed -i -se 's/ arsse / www-data /' debian/arsse.tmpfiles
sed -i -se 's/ arsse / www-data /' debian/arsse.tmpfiles
# Change the user reference in the executable file
mkdir -p debian/bin
cp dist/arsse debian/bin/arsse
sed -i -se 's/posix_getpwnam("arsse"/posix_getpwnam("www-data"/' debian/bin/arsse