From ea314d2f45c40a006c0104157013ab4b857f665f Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 15 Apr 2024 20:35:28 +0200 Subject: Adding upstream version 1.22.4. Signed-off-by: Daniel Baumann --- .../Makefile | 61 ++++++++++++++++++++++ .../pkg-conff-original-0/DEBIAN/conffiles | 1 + .../pkg-conff-original-0/DEBIAN/control | 8 +++ .../pkg-conff-original-0/test-conffile | 1 + .../pkg-conff-original-0/test-original | 0 .../pkg-conff-original-1/DEBIAN/conffiles | 1 + .../pkg-conff-original-1/DEBIAN/control | 8 +++ .../pkg-conff-original-1/test-conffile | 1 + .../pkg-conff-original-1/test-original | 0 .../pkg-conff-takeover-0/DEBIAN/conffiles | 1 + .../pkg-conff-takeover-0/DEBIAN/control | 9 ++++ .../pkg-conff-takeover-0/test-conffile | 1 + .../pkg-conff-takeover-0/test-takeover | 0 .../pkg-conff-takeover-1/DEBIAN/conffiles | 1 + .../pkg-conff-takeover-1/DEBIAN/control | 9 ++++ .../pkg-conff-takeover-1/test-conffile | 1 + .../pkg-conff-takeover-1/test-takeover | 0 .../ref-conffile | 1 + 18 files changed, 104 insertions(+) create mode 100644 tests/t-conffile-replaces-existing-and-upgrade/Makefile create mode 100644 tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-original-0/DEBIAN/conffiles create mode 100644 tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-original-0/DEBIAN/control create mode 100644 tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-original-0/test-conffile create mode 100644 tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-original-0/test-original create mode 100644 tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-original-1/DEBIAN/conffiles create mode 100644 tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-original-1/DEBIAN/control create mode 100644 tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-original-1/test-conffile create mode 100644 tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-original-1/test-original create mode 100644 tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-takeover-0/DEBIAN/conffiles create mode 100644 tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-takeover-0/DEBIAN/control create mode 100644 tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-takeover-0/test-conffile create mode 100644 tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-takeover-0/test-takeover create mode 100644 tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-takeover-1/DEBIAN/conffiles create mode 100644 tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-takeover-1/DEBIAN/control create mode 100644 tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-takeover-1/test-conffile create mode 100644 tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-takeover-1/test-takeover create mode 100644 tests/t-conffile-replaces-existing-and-upgrade/ref-conffile (limited to 'tests/t-conffile-replaces-existing-and-upgrade') diff --git a/tests/t-conffile-replaces-existing-and-upgrade/Makefile b/tests/t-conffile-replaces-existing-and-upgrade/Makefile new file mode 100644 index 0000000..18ff9dd --- /dev/null +++ b/tests/t-conffile-replaces-existing-and-upgrade/Makefile @@ -0,0 +1,61 @@ +TESTS_DEB := pkg-conff-original-0 pkg-conff-original-1 \ + pkg-conff-takeover-0 pkg-conff-takeover-1 + +include ../Test.mk + +TEST_CASES += test-two-run-ordered +TEST_CASES += test-one-run-ordered +TEST_CASES += test-two-run-reverse +TEST_CASES += test-one-run-reverse + +test-case: $(TEST_CASES) + +define CONFFILES +$(DPKG_QUERY) -f '$${Package} @ $${Conffiles}\n' +endef + +define VERIFY +$(call pkg_is_installed,pkg-conff-original) +$(call pkg_is_installed,pkg-conff-takeover) +test "`$(DPKG_QUERY) -S /test-conffile`" = "pkg-conff-takeover: /test-conffile" +test "`$(CONFFILES) -W pkg-conff-original | grep obsolete | wc -l`" = "1" +test "`$(CONFFILES) -W pkg-conff-takeover | grep -v obsolete | wc -l`" = "1" +cmp ref-conffile "$(DPKG_INSTDIR)/test-conffile" +endef + +test-two-run-ordered: + # test-two-run-ordered + $(DPKG_INSTALL) pkg-conff-original-0.deb + $(DPKG_INSTALL) pkg-conff-original-1.deb + $(DPKG_INSTALL) pkg-conff-takeover-0.deb + $(DPKG_INSTALL) pkg-conff-takeover-1.deb + $(VERIFY) + $(DPKG_PURGE) pkg-conff-original pkg-conff-takeover + +test-one-run-ordered: + # test-one-run-ordered + $(DPKG_INSTALL) pkg-conff-original-0.deb + $(DPKG_INSTALL) pkg-conff-original-1.deb pkg-conff-takeover-0.deb + $(DPKG_INSTALL) pkg-conff-takeover-1.deb + $(VERIFY) + $(DPKG_PURGE) pkg-conff-original pkg-conff-takeover + +test-two-run-reverse: + # test-two-run-reverse + $(DPKG_INSTALL) pkg-conff-original-0.deb + $(DPKG_INSTALL) pkg-conff-takeover-0.deb + $(DPKG_INSTALL) pkg-conff-original-1.deb + $(DPKG_INSTALL) pkg-conff-takeover-1.deb + $(VERIFY) + $(DPKG_PURGE) pkg-conff-original pkg-conff-takeover + +test-one-run-reverse: + # test-one-run-reverse + $(DPKG_INSTALL) pkg-conff-original-0.deb + $(DPKG_INSTALL) pkg-conff-takeover-0.deb pkg-conff-original-1.deb + $(DPKG_INSTALL) pkg-conff-takeover-1.deb + $(VERIFY) + $(DPKG_PURGE) pkg-conff-original pkg-conff-takeover + +test-clean: + $(DPKG_PURGE) pkg-conff-original pkg-conff-takeover diff --git a/tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-original-0/DEBIAN/conffiles b/tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-original-0/DEBIAN/conffiles new file mode 100644 index 0000000..4fad7e9 --- /dev/null +++ b/tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-original-0/DEBIAN/conffiles @@ -0,0 +1 @@ +/test-conffile diff --git a/tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-original-0/DEBIAN/control b/tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-original-0/DEBIAN/control new file mode 100644 index 0000000..523e417 --- /dev/null +++ b/tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-original-0/DEBIAN/control @@ -0,0 +1,8 @@ +Package: pkg-conff-original +Version: 0 +Section: test +Priority: extra +Maintainer: Dpkg Developers +Architecture: all +Description: test package - provide a conffile + diff --git a/tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-original-0/test-conffile b/tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-original-0/test-conffile new file mode 100644 index 0000000..995e78d --- /dev/null +++ b/tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-original-0/test-conffile @@ -0,0 +1 @@ +test original 0 diff --git a/tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-original-0/test-original b/tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-original-0/test-original new file mode 100644 index 0000000..e69de29 diff --git a/tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-original-1/DEBIAN/conffiles b/tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-original-1/DEBIAN/conffiles new file mode 100644 index 0000000..4fad7e9 --- /dev/null +++ b/tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-original-1/DEBIAN/conffiles @@ -0,0 +1 @@ +/test-conffile diff --git a/tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-original-1/DEBIAN/control b/tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-original-1/DEBIAN/control new file mode 100644 index 0000000..aebf74d --- /dev/null +++ b/tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-original-1/DEBIAN/control @@ -0,0 +1,8 @@ +Package: pkg-conff-original +Version: 1 +Section: test +Priority: extra +Maintainer: Dpkg Developers +Architecture: all +Description: test package - provide a conffile + diff --git a/tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-original-1/test-conffile b/tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-original-1/test-conffile new file mode 100644 index 0000000..326ec44 --- /dev/null +++ b/tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-original-1/test-conffile @@ -0,0 +1 @@ +test original 1 diff --git a/tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-original-1/test-original b/tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-original-1/test-original new file mode 100644 index 0000000..e69de29 diff --git a/tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-takeover-0/DEBIAN/conffiles b/tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-takeover-0/DEBIAN/conffiles new file mode 100644 index 0000000..4fad7e9 --- /dev/null +++ b/tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-takeover-0/DEBIAN/conffiles @@ -0,0 +1 @@ +/test-conffile diff --git a/tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-takeover-0/DEBIAN/control b/tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-takeover-0/DEBIAN/control new file mode 100644 index 0000000..1f1e038 --- /dev/null +++ b/tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-takeover-0/DEBIAN/control @@ -0,0 +1,9 @@ +Package: pkg-conff-takeover +Version: 0 +Section: test +Priority: extra +Maintainer: Dpkg Developers +Architecture: all +Replaces: pkg-conff-original +Description: test package - conffile replaces takeover + diff --git a/tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-takeover-0/test-conffile b/tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-takeover-0/test-conffile new file mode 100644 index 0000000..01c117f --- /dev/null +++ b/tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-takeover-0/test-conffile @@ -0,0 +1 @@ +test takeover 0 diff --git a/tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-takeover-0/test-takeover b/tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-takeover-0/test-takeover new file mode 100644 index 0000000..e69de29 diff --git a/tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-takeover-1/DEBIAN/conffiles b/tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-takeover-1/DEBIAN/conffiles new file mode 100644 index 0000000..4fad7e9 --- /dev/null +++ b/tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-takeover-1/DEBIAN/conffiles @@ -0,0 +1 @@ +/test-conffile diff --git a/tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-takeover-1/DEBIAN/control b/tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-takeover-1/DEBIAN/control new file mode 100644 index 0000000..f323304 --- /dev/null +++ b/tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-takeover-1/DEBIAN/control @@ -0,0 +1,9 @@ +Package: pkg-conff-takeover +Version: 1 +Section: test +Priority: extra +Maintainer: Dpkg Developers +Architecture: all +Replaces: pkg-conff-original +Description: test package - conffile replaces takeover + diff --git a/tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-takeover-1/test-conffile b/tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-takeover-1/test-conffile new file mode 100644 index 0000000..1bc4643 --- /dev/null +++ b/tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-takeover-1/test-conffile @@ -0,0 +1 @@ +test takeover 1 diff --git a/tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-takeover-1/test-takeover b/tests/t-conffile-replaces-existing-and-upgrade/pkg-conff-takeover-1/test-takeover new file mode 100644 index 0000000..e69de29 diff --git a/tests/t-conffile-replaces-existing-and-upgrade/ref-conffile b/tests/t-conffile-replaces-existing-and-upgrade/ref-conffile new file mode 100644 index 0000000..1bc4643 --- /dev/null +++ b/tests/t-conffile-replaces-existing-and-upgrade/ref-conffile @@ -0,0 +1 @@ +test takeover 1 -- cgit v1.2.3