On Thu 2016-07-14 20:06:27 +0200, Adam D. Barratt wrote: > Please could we have a debdiff, relative to the current package in > jessie, in this bug log? (We prefer p-u bugs to be self-contained, and > not have to rely on your git tree existing for arbitrary periods in the > future, or on it not changing after we give an ack.) sure. the debdiff is quite large, primarily due to upstream renaming effective_tld_names.dat to public_suffix_list.dat (and adding a python-based "linter", and changing how they produce their upstream changelog), but i've attached the gzip'ed debdiff below. The git tree's jessie branch which i'm proposing is at commit ID 6520ee81d3e2d73192e67685652ef6bccdb2e637, fwiw, so you don't have to worry about it changing. The non-changelog-related changes to the debian packaging have the following diffstat: README.Debian | 11 ++- control | 11 +-- copyright | 8 +- gbp.conf | 1 install | 2 links | 1 new-upstream-version | 22 ++++++ patches/0001-avoid-testing-the-rules-during-package-build.patch | 32 ++++++++++ patches/series | 1 publicsuffix.examples | 2 rules | 9 -- 11 files changed, 77 insertions(+), 23 deletions(-)
diff -Nru publicsuffix-20140902/debian/control publicsuffix-20160703/debian/control
--- publicsuffix-20140902/debian/control 2014-09-24 10:13:02.000000000 -0400
+++ publicsuffix-20160703/debian/control 2016-07-14 13:28:46.000000000 -0400
@@ -2,12 +2,11 @@
Section: net
Priority: extra
Maintainer: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Build-Depends:
- debhelper (>= 9.0)
-Standards-Version: 3.9.5
-Homepage: http://publicsuffix.org
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/publicsuffix.git
-Vcs-Git: git://anonscm.debian.org/collab-maint/publicsuffix.git
+Build-Depends: debhelper (>= 9~), python3-minimal
+Standards-Version: 3.9.8
+Homepage: https://publicsuffix.org
+Vcs-Browser: https://anonscm.debian.org/git/collab-maint/publicsuffix.git
+Vcs-Git: https://anonscm.debian.org/git/collab-maint/publicsuffix.git
Package: publicsuffix
Architecture: all
diff -Nru publicsuffix-20140902/debian/copyright publicsuffix-20160703/debian/copyright
--- publicsuffix-20140902/debian/copyright 2014-09-24 10:13:02.000000000 -0400
+++ publicsuffix-20160703/debian/copyright 2016-07-14 13:28:46.000000000 -0400
@@ -1,7 +1,7 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Public Suffix List
Upstream-Contact: Public Suffix List <contact@publicsuffix.org>
-Source: http://publicsuffix.org/
+Source: https://publicsuffix.org/
Files: *
Copyright: 2010-2012 Daniel Veditz,
@@ -19,7 +19,7 @@
Copyright: 2012 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
License: MPL-2.0
-Files: test_psl.txt
+Files: tests/test_psl.txt
Copyright: Dedicated to the Public Domain
License: CC0
@@ -383,7 +383,7 @@
.
This Source Code Form is subject to the terms of the Mozilla Public
License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ file, You can obtain one at https://www.mozilla.org/MPL/2.0/.
.
If it is not possible or desirable to put the notice in a particular
file, then You may include the notice in a location (such as a LICENSE
diff -Nru publicsuffix-20140902/debian/gbp.conf publicsuffix-20160703/debian/gbp.conf
--- publicsuffix-20140902/debian/gbp.conf 2014-09-24 10:13:02.000000000 -0400
+++ publicsuffix-20160703/debian/gbp.conf 2016-07-14 13:32:22.000000000 -0400
@@ -2,3 +2,4 @@
pristine-tar = False
upstream-tag = publicsuffix/%(version)s
debian-tag = publicsuffix_debian/%(version)s
+debian-branch = jessie
diff -Nru publicsuffix-20140902/debian/install publicsuffix-20160703/debian/install
--- publicsuffix-20140902/debian/install 2014-09-24 10:13:02.000000000 -0400
+++ publicsuffix-20160703/debian/install 2016-07-14 13:28:46.000000000 -0400
@@ -1 +1 @@
-effective_tld_names.dat usr/share/publicsuffix
+public_suffix_list.dat usr/share/publicsuffix
diff -Nru publicsuffix-20140902/debian/links publicsuffix-20160703/debian/links
--- publicsuffix-20140902/debian/links 1969-12-31 19:00:00.000000000 -0500
+++ publicsuffix-20160703/debian/links 2016-07-14 13:28:46.000000000 -0400
@@ -0,0 +1 @@
+usr/share/publicsuffix/public_suffix_list.dat usr/share/publicsuffix/effective_tld_names.dat
diff -Nru publicsuffix-20140902/debian/new-upstream-version publicsuffix-20160703/debian/new-upstream-version
--- publicsuffix-20140902/debian/new-upstream-version 1969-12-31 19:00:00.000000000 -0500
+++ publicsuffix-20160703/debian/new-upstream-version 2016-07-14 13:28:46.000000000 -0400
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+set -ex
+
+git remote update upstream
+git diff upstream..upstream/master
+date=$(git log -1 --date=short --pretty=format:%cd upstream/master | sed s/-//g)
+git tag "publicsuffix/${date}" upstream/master
+git merge -m "merge upstream changes to ${date}" "publicsuffix/${date}"
+git log -n30 upstream/master > debian/upstream-changes.txt
+git add debian/upstream-changes.txt
+dch --distribution unstable -v "${date}-1" 'new upstream version'
+git add debian/changelog
+git commit -m "new upstream version ${date}"
+gbp buildpackage -uc -us
+git branch -D upstream
+git branch upstream upstream/master
+debian/rules clean
+gbp buildpackage --git-tag -S
+dupload ../publicsuffix_${date}-1_source.changes
+git push gdo --follow-tags master upstream
+
diff -Nru publicsuffix-20140902/debian/patches/0001-avoid-testing-the-rules-during-package-build.patch publicsuffix-20160703/debian/patches/0001-avoid-testing-the-rules-during-package-build.patch
--- publicsuffix-20140902/debian/patches/0001-avoid-testing-the-rules-during-package-build.patch 1969-12-31 19:00:00.000000000 -0500
+++ publicsuffix-20160703/debian/patches/0001-avoid-testing-the-rules-during-package-build.patch 2016-07-14 13:28:46.000000000 -0400
@@ -0,0 +1,32 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Thu, 12 May 2016 11:36:54 -0400
+Subject: avoid testing the rules during package build
+
+Upstream auto-fetches code from the network and builds it for testing
+the rules. But these same verifications are handled by the libpsl
+package in debian, so we don't need them here (and we should avoid
+using the network during package build).
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index d5e1ae8..615dc71 100644
+--- a/Makefile
++++ b/Makefile
+@@ -3,7 +3,7 @@ Options = --with-psl-file=$(Dir)/public_suffix_list.dat --with-psl-testfile=$(Di
+
+ all: test
+
+-test: test-syntax test-rules
++test: test-syntax
+
+ test-rules: libpsl-libicu
+
+@@ -32,4 +32,4 @@ libpsl-libidn2: libpsl-config
+
+ # TEST PSL data with libidn (IDNA2003)
+ libpsl-libidn: libpsl-config
+- cd libpsl && ./configure -q -C --enable-runtime=libidn --enable-builtin=libidn $(Options) && make -s clean && make -s check -j4
+\ No newline at end of file
++ cd libpsl && ./configure -q -C --enable-runtime=libidn --enable-builtin=libidn $(Options) && make -s clean && make -s check -j4
diff -Nru publicsuffix-20140902/debian/patches/series publicsuffix-20160703/debian/patches/series
--- publicsuffix-20140902/debian/patches/series 1969-12-31 19:00:00.000000000 -0500
+++ publicsuffix-20160703/debian/patches/series 2016-07-14 13:28:46.000000000 -0400
@@ -0,0 +1 @@
+0001-avoid-testing-the-rules-during-package-build.patch
diff -Nru publicsuffix-20140902/debian/publicsuffix.examples publicsuffix-20160703/debian/publicsuffix.examples
--- publicsuffix-20140902/debian/publicsuffix.examples 2014-09-24 10:13:02.000000000 -0400
+++ publicsuffix-20160703/debian/publicsuffix.examples 2016-07-14 13:28:46.000000000 -0400
@@ -1 +1 @@
-test_psl.txt
+tests/test_psl.txt
diff -Nru publicsuffix-20140902/debian/README.Debian publicsuffix-20160703/debian/README.Debian
--- publicsuffix-20140902/debian/README.Debian 2014-09-24 10:13:02.000000000 -0400
+++ publicsuffix-20160703/debian/README.Debian 2016-07-14 13:28:46.000000000 -0400
@@ -4,22 +4,25 @@
This package installs the public suffix list in the standard
machine-parseable format:
- /usr/share/publicsuffix/effective_tld_names.dat
+ /usr/share/publicsuffix/public_suffix_list.dat
The public suffix list can be used to group domains by ownership
(e.g. for cookies, same-origin policies, spam collation, etc), and is
maintained by people within Mozilla.
You can read more about the public suffix list at
-http://publicsuffix.org/
+https://publicsuffix.org/
Changes to the contents of the public suffix list should be directed
to the public suffix project, as described at
-http://publicsuffix.org/submit/
+https://publicsuffix.org/submit/
+
+This package also provides a symlink from the historical name of the
+public suffix file, which was effective_tld_names.dat.
Changes to the debian packaging and distribution should be submitted
to the debian BTS, preferably by running:
reportbug publicsuffix
- -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>, Sun, 5 Aug 2012 12:45:32 -0400
+ -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>, Fri, 15 May 2015 12:27:07 -0400
diff -Nru publicsuffix-20140902/debian/rules publicsuffix-20160703/debian/rules
--- publicsuffix-20140902/debian/rules 2014-09-24 10:13:02.000000000 -0400
+++ publicsuffix-20160703/debian/rules 2016-07-14 13:28:46.000000000 -0400
@@ -4,13 +4,8 @@
%:
dh $@
-override_dh_installchangelogs:
- dh_installchangelogs changelog.xml
-
override_dh_compress:
dh_compress -Xusr/share/doc/publicsuffix/examples/test_psl.txt
-update:
- wget $(WGET_FLAGS) -O effective_tld_names.dat 'https://hg.mozilla.org/mozilla-central/raw-file/tip/netwerk/dns/effective_tld_names.dat'
- wget $(WGET_FLAGS) -O changelog.xml 'https://hg.mozilla.org/mozilla-central/atom-log/tip/netwerk/dns/effective_tld_names.dat'
- wget $(WGET_FLAGS) -O test_psl.txt 'https://hg.mozilla.org/mozilla-central/raw-file/tip/netwerk/test/unit/data/test_psl.txt'
+override_dh_installchangelogs:
+ dh_installchangelogs debian/upstream-changes.txt
I expect the packaging should be able to remain basically as-is for
jessie's lifetime, since we're basically just shipping a static global
file.
> How frequently would you imagine that the package would need to be
> updated in stable?
Upstream makes several additions to the psl per month, but the new
editions are rarely super-urgent. I'd imagine doing a "roll-up" release
of changes every month or two to more accurately track the state of
global DNS administrative boundaries.
let me know what you think,
--dkg
Attachment:
publicsuffix_20140902-1_20160703-0+deb8u1.debdiff.gz
Description: application/gzip