From 0ab63d5a6dca0cd190cd9968fce3f17815044c53 Mon Sep 17 00:00:00 2001
From: Ruben Rodriguez <ruben@trisquel.info>
Date: Fri, 26 Apr 2019 20:28:12 -0400
Subject: [PATCH] dpkg: updated Trisquel vendor file
---
helpers/DATA/dpkg/Trisquel.pm | 142 ++++++++++++++++++++++++++++------
1 file changed, 118 insertions(+), 24 deletions(-)
diff --git a/helpers/DATA/dpkg/Trisquel.pm b/helpers/DATA/dpkg/Trisquel.pm
index 8547b0b64..d0b9d606e 100644
--- a/helpers/DATA/dpkg/Trisquel.pm
+++ b/helpers/DATA/dpkg/Trisquel.pm
@@ -1,3 +1,7 @@
+# Copyright © 2008 Ian Jackson <ijackson@chiark.greenend.org.uk>
+# Copyright © 2008 Canonical, Ltd.
+# written by Colin Watson <cjwatson@ubuntu.com>
+# Copyright © 2008 James Westby <jw+debian@jameswestby.net>
# Copyright © 2009 Raphaël Hertzog <hertzog@debian.org>
#
# This program is free software; you can redistribute it and/or modify
@@ -11,18 +15,20 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
package Dpkg::Vendor::Trisquel;
use strict;
use warnings;
-our $VERSION = "0.01";
+our $VERSION = '0.01';
-use base qw(Dpkg::Vendor::Default);
+use Dpkg::ErrorHandling;
+use Dpkg::Gettext;
use Dpkg::Control::Types;
-use Dpkg::Vendor::Ubuntu;
+
+use parent qw(Dpkg::Vendor::Debian);
=encoding utf8
@@ -32,38 +38,126 @@ Dpkg::Vendor::Trisquel - Trisquel vendor object
=head1 DESCRIPTION
-This vendor object customize the behaviour of dpkg scripts
-for Debian specific actions.
+This vendor object customizes the behaviour of dpkg scripts for Trisquel
+specific behavior and policies.
=cut
sub run_hook {
my ($self, $hook, @params) = @_;
- if ($hook eq "keyrings") {
- return ('/usr/share/keyrings/trisquel-archive-keyring.gpg')
- } elsif ($hook eq "register-custom-fields") {
- return (
- [ "register", "Dm-Upload-Allowed",
- CTRL_INFO_SRC | CTRL_INDEX_SRC | CTRL_PKG_SRC ],
- [ "insert_after", CTRL_INDEX_SRC, "Uploaders", "Dm-Upload-Allowed" ],
- [ "insert_after", CTRL_PKG_SRC, "Uploaders", "Dm-Upload-Allowed" ],
- );
- } elsif ($hook eq "extend-patch-header") {
- my ($textref, $ch_info) = @params;
- if ($ch_info->{'Closes'}) {
- foreach my $bug (split(/\s+/, $ch_info->{'Closes'})) {
- $$textref .= "Bug-Debian: http://bugs.debian.org/$bug\n";
+ if ($hook eq 'before-source-build') {
+ my $src = shift @params;
+ my $fields = $src->{fields};
+
+ # check that Maintainer/XSBC-Original-Maintainer comply to
+ # https://wiki.ubuntu.com/DebianMaintainerField
+ if (defined($fields->{'Version'}) and defined($fields->{'Maintainer'}) and
+ $fields->{'Version'} =~ /ubuntu/) {
+ if ($fields->{'Maintainer'} !~ /ubuntu/i) {
+ if (length $ENV{DEBEMAIL} and $ENV{DEBEMAIL} =~ /\@ubuntu\.com/) {
+ error(g_('Version number suggests Ubuntu changes, but Maintainer: does not have Ubuntu address'));
+ } else {
+ warning(g_('Version number suggests Ubuntu changes, but Maintainer: does not have Ubuntu address'));
+ }
+ }
+ unless ($fields->{'Original-Maintainer'}) {
+ warning(g_('Version number suggests Ubuntu changes, but there is no XSBC-Original-Maintainer field'));
+ }
+ }
+
+ } elsif ($hook eq 'keyrings') {
+ return $self->run_hook('package-keyrings', @params);
+ } elsif ($hook eq 'package-keyrings') {
+ return ($self->SUPER::run_hook($hook),
+ '/usr/share/keyrings/trisquel-archive-keyring.gpg');
+ } elsif ($hook eq 'archive-keyrings') {
+ return ($self->SUPER::run_hook($hook),
+ '/usr/share/keyrings/trisquel-archive-keyring.gpg');
+ } elsif ($hook eq 'archive-keyrings-historic') {
+ return ($self->SUPER::run_hook($hook),
+ '/usr/share/keyrings/trisquel-archive-removed-keys.gpg');
+ } elsif ($hook eq 'register-custom-fields') {
+ my @field_ops = $self->SUPER::run_hook($hook);
+ push @field_ops,
+ [ 'register', 'Launchpad-Bugs-Fixed',
+ CTRL_FILE_CHANGES | CTRL_CHANGELOG ],
+ [ 'insert_after', CTRL_FILE_CHANGES, 'Closes', 'Launchpad-Bugs-Fixed' ],
+ [ 'insert_after', CTRL_CHANGELOG, 'Closes', 'Launchpad-Bugs-Fixed' ];
+ return @field_ops;
+
+ } elsif ($hook eq 'post-process-changelog-entry') {
+ my $fields = shift @params;
+
+ # Add Launchpad-Bugs-Fixed field
+ my $bugs = find_launchpad_closes($fields->{'Changes'} // '');
+ if (scalar(@$bugs)) {
+ $fields->{'Launchpad-Bugs-Fixed'} = join(' ', @$bugs);
+ }
+
+ } elsif ($hook eq 'update-buildflags') {
+ my $flags = shift @params;
+
+ require Dpkg::BuildOptions;
+
+ my $build_opts = Dpkg::BuildOptions->new();
+
+ if (!$build_opts->has('noopt')) {
+ require Dpkg::Arch;
+
+ my $arch = Dpkg::Arch::get_host_arch();
+ if (Dpkg::Arch::debarch_eq($arch, 'ppc64el')) {
+ for my $flag (qw(CFLAGS CXXFLAGS OBJCFLAGS OBJCXXFLAGS GCJFLAGS
+ FFLAGS FCFLAGS)) {
+ $flags->set($flag, '-g -O3', 'vendor');
+ }
}
}
+ # Per https://wiki.ubuntu.com/DistCompilerFlags
+ $flags->set('LDFLAGS', '-Wl,-Bsymbolic-functions', 'vendor');
- my $b = Dpkg::Vendor::Ubuntu::find_launchpad_closes($ch_info->{'Changes'});
- foreach my $bug (@$b) {
- $$textref .= "Bug-Ubuntu: https://bugs.launchpad.net/bugs/$bug\n";
- }
+ # Run the Debian hook to add hardening flags
+ $self->SUPER::run_hook($hook, $flags);
} else {
return $self->SUPER::run_hook($hook, @params);
}
+
+}
+
+=head1 PUBLIC FUNCTIONS
+
+=over
+
+=item $bugs = Dpkg::Vendor::Ubuntu::find_launchpad_closes($changes)
+
+Takes one string as argument and finds "LP: #123456, #654321" statements,
+which are references to bugs on Launchpad. Returns all closed bug
+numbers in an array reference.
+
+=cut
+
+sub find_launchpad_closes {
+ my $changes = shift;
+ my %closes;
+
+ while ($changes &&
+ ($changes =~ /lp:\s+\#\d+(?:,\s*\#\d+)*/pig)) {
+ $closes{$_} = 1 foreach (${^MATCH} =~ /\#?\s?(\d+)/g);
+ }
+
+ my @closes = sort { $a <=> $b } keys %closes;
+
+ return \@closes;
}
+=back
+
+=head1 CHANGES
+
+=head2 Version 0.xx
+
+This is a semi-private module. Only documented functions are public.
+
+=cut
+
1;
--
GitLab