From 3ab98ee1228e40e8de5aba0e6a0f813625572078 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 11 Jul 2017 17:12:08 +0100 Subject: changelog: finalise stable update Signed-off-by: Ian Jackson --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 26410b1..5ca1f5c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dgit (3.11~deb9u1) stretch; urgency=high + + * Rebuild and upload to stretch. + + -- Ian Jackson Tue, 11 Jul 2017 09:28:15 +0100 + dgit (3.11) unstable; urgency=high Important bugfixes to dgit: -- cgit v1.2.3 From a68894875ce0d11261882f62b2aa28a6e3eed673 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 15 Jul 2017 23:15:54 +0100 Subject: dgit import: Defend against broken symlinks in .. Provide a special error message if lstat succeeds but lstat fails. This is not hypothetical - currently even dgit import ../blah.dsc can generate this situation ! Signed-off-by: Ian Jackson --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 1d912c0..784269c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ dgit (3.12~) unstable; urgency=medium * Defend against commit subject lines which would generate patches which look like series files, etc. Involves adding .patch to all generated patch filenames. + * dgit import: Defend against broken symlinks in .. -- -- cgit v1.2.3 From 83af484ee17f5d18ee6a161b01aa0b546d8943cb Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 15 Jul 2017 23:21:13 +0100 Subject: dgit import: Right error message for missing files in .. Close examination of this code path reveals that: * The error is generated only if $there contains no slash. * This can only occur if $dscfn matches the first regexp, ie $dscfn is [./]../X in which case $there becomes X * So in this situation, $there is simply the dsc filename which is supposed to be in .. * What we should be testing is ../$f but that is $here which is what are trying to create and which we statted earlier and got ENOENT for. So this occurs when the dsc is in .. and a file it refers to is missing. Signed-off-by: Ian Jackson --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 784269c..eeaeb1f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ dgit (3.12~) unstable; urgency=medium look like series files, etc. Involves adding .patch to all generated patch filenames. * dgit import: Defend against broken symlinks in .. + * dgit import: Right error message for missing files in .. -- -- cgit v1.2.3 From 51a525fdc552ff2d5f388c47b29c38784f2e5fa4 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 15 Jul 2017 23:27:29 +0100 Subject: dgit import: Avoid making broken symlinks in .. In most cases we could carry on and fail later. But creating a broken symlink is undesirable, particularly because it might prevent dgit from trying to make a non-broken symlink pointing elsewhere in future (or prevent dget from downloading the file). Even worse, if the dsc is in .. but an absolute path was provided, we would make a circular symlink! Signed-off-by: Ian Jackson --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index eeaeb1f..ad43d41 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ dgit (3.12~) unstable; urgency=medium patch filenames. * dgit import: Defend against broken symlinks in .. * dgit import: Right error message for missing files in .. + * dgit import: Avoid making broken symlinks in .. -- -- cgit v1.2.3 From db7c7281e93d6f42c624bb361786fbb5a292f8c9 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 16 Jul 2017 00:46:16 +0100 Subject: test suite: t-report-fail: print $PWD as part of failure message This is really helpful when debugging. Signed-off-by: Ian Jackson --- debian/changelog | 3 +++ 1 file changed, 3 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ad43d41..3d7e003 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,9 @@ dgit (3.12~) unstable; urgency=medium * dgit import: Right error message for missing files in .. * dgit import: Avoid making broken symlinks in .. + Test suite: + * t-report-fail: print $PWD as part of failure message. + -- dgit (3.11~deb9u1) stretch; urgency=high -- cgit v1.2.3 From 823fc0fbb11e753520c5cf740bd106a38e775e59 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 16 Jul 2017 00:47:01 +0100 Subject: test suite: import-dsc: Test missing files, particularly in .. Signed-off-by: Ian Jackson --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3d7e003..769fa5c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ dgit (3.12~) unstable; urgency=medium Test suite: * t-report-fail: print $PWD as part of failure message. + * import-dsc: Test missing files, particularly in .. -- -- cgit v1.2.3 From 52b7b05bf7898c0c4c2a4a88fecb4426273ce72d Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 16 Jul 2017 02:23:26 +0100 Subject: dgit-repos-server: Do not reject commits with no author/committer email But still insist on date, and hence on the actual committer and author commit header fields. Peter Green reports that eg 66c65d90db100435 in upstream linux.git is such a commit (and is accepted by github). Closes:#863353. Signed-off-by: Ian Jackson --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 769fa5c..bbcec9e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,13 @@ dgit (3.12~) unstable; urgency=medium * dgit import: Right error message for missing files in .. * dgit import: Avoid making broken symlinks in .. + Important bugfixes to other components: + * dgit-repos-server: Do not reject commits with no author/committer + email address (but still insist on date, and hence on the actual + committer and author commit header fields). Peter Green reports that + eg 66c65d90db100435 in upstream linux.git is such a commit (and is + accepted by github). Closes:#863353. + Test suite: * t-report-fail: print $PWD as part of failure message. * import-dsc: Test missing files, particularly in .. -- cgit v1.2.3 From f96371b21cb6c5d74c58c058e2f6d794389dfa12 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 16 Jul 2017 12:35:10 +0100 Subject: test suite: run git gc on tests/worktrees/example_1.0.tar Specifically, git-gc --aggressive --prune=all This shrinks it quite a lot. Signed-off-by: Ian Jackson --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index bbcec9e..f91290e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,7 @@ dgit (3.12~) unstable; urgency=medium Test suite: * t-report-fail: print $PWD as part of failure message. * import-dsc: Test missing files, particularly in .. + * run git gc on tests/worktrees/example_1.0.tar. -- -- cgit v1.2.3 From 242ba73109ae30e7d8849b01f0c668b87d4f4d63 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 16 Jul 2017 11:28:50 +0100 Subject: dgit: unrepres. changes: Tolerate deletion of executable files We don't care what the old mode was; if we tell dpkg-source to record the deletion it can do so. But we do care that it was a file. Experimentally, dpkg-source on stretch ignores attempts to delete symlinks. The removal of the check for $newmode has no functional change, because in this context we know that $newmode is all 0s. If it wasn't, we would have been in "both old and new files exist", above. So that limb of the test will never match and should be removed. Signed-off-by: Ian Jackson --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f91290e..478ad5f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ dgit (3.12~) unstable; urgency=medium * dgit import: Defend against broken symlinks in .. * dgit import: Right error message for missing files in .. * dgit import: Avoid making broken symlinks in .. + * quilt fixup: Tolerate deletion of executable files. Important bugfixes to other components: * dgit-repos-server: Do not reject commits with no author/committer -- cgit v1.2.3 From c3db904b1de5630bd90655563f341d22e22986bc Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 16 Jul 2017 11:41:14 +0100 Subject: dgit: unrepres. changes: Tolerate creation of symlinks Experimentally, dpkg-source on stretch will create patches to create new symlinks. (It will fail on attempts to modify existing symlinks and it ignores attempts to change plain file executability.) Implementation: add an alternative which tolerates the git symlink mode. This replaces the check on $oldmode, which in this context we know is all 0s and can therefore never match. While we're here, change the error message. Closes:#857382. Signed-off-by: Ian Jackson --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 478ad5f..aaaee20 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ dgit (3.12~) unstable; urgency=medium * dgit import: Right error message for missing files in .. * dgit import: Avoid making broken symlinks in .. * quilt fixup: Tolerate deletion of executable files. + * quilt fixup: Tolerate symlink creation (make patches). Closes:#857382. Important bugfixes to other components: * dgit-repos-server: Do not reject commits with no author/committer -- cgit v1.2.3 From 1c1a95aa2d220dc8fb067fe93795a9a31043a98e Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 16 Jul 2017 12:54:11 +0100 Subject: quilt fixup: Check we can delete files with funny modes Signed-off-by: Ian Jackson --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index aaaee20..91c3daf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,7 @@ dgit (3.12~) unstable; urgency=medium * t-report-fail: print $PWD as part of failure message. * import-dsc: Test missing files, particularly in .. * run git gc on tests/worktrees/example_1.0.tar. + * quilt fixup: Check we can delete files with funny modes -- -- cgit v1.2.3 From ba5d46b8844b347f9dd54657b818c5017491bd13 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 16 Jul 2017 12:55:54 +0100 Subject: quilt fixup: Check that funny changes are represented properly Specifically, do dgit push --dry-run. This will check that the source package and git tree agree - ie, that what we have produced can round-trip through dpkg-source. Signed-off-by: Ian Jackson --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 91c3daf..e82332f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,7 @@ dgit (3.12~) unstable; urgency=medium * import-dsc: Test missing files, particularly in .. * run git gc on tests/worktrees/example_1.0.tar. * quilt fixup: Check we can delete files with funny modes + * quilt fixup: Check that funny changes are represented properly -- -- cgit v1.2.3 From a80f7d09b0f92b5e1bc39f828f7972f3ff7c41be Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 16 Jul 2017 21:37:03 +0100 Subject: changelog: finalise 3.12 Signed-off-by: Ian Jackson --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e82332f..5478618 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dgit (3.12~) unstable; urgency=medium +dgit (3.12) unstable; urgency=high Important bugfixes to dgit: * Pass --no-renames to git diff-tree -z, avoiding potential trouble. @@ -25,7 +25,7 @@ dgit (3.12~) unstable; urgency=medium * quilt fixup: Check we can delete files with funny modes * quilt fixup: Check that funny changes are represented properly - -- + -- Ian Jackson Sun, 16 Jul 2017 21:36:24 +0100 dgit (3.11~deb9u1) stretch; urgency=high -- cgit v1.2.3