From cbffab246997fb5a06211dfb706b54e5ae5bb59f Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 7 Apr 2024 16:58:51 +0200 Subject: Adding upstream version 1.21.22. Signed-off-by: Daniel Baumann --- tests/t-conffile-rename/Makefile | 34 ++++++++++++++++++++++ .../pkg-conff-rename-0/DEBIAN/conffiles | 1 + .../pkg-conff-rename-0/DEBIAN/control | 8 +++++ .../pkg-conff-rename-0/test-conffile-old | 1 + .../pkg-conff-rename-1/DEBIAN/conffiles | 1 + .../pkg-conff-rename-1/DEBIAN/control | 8 +++++ .../pkg-conff-rename-1/DEBIAN/postinst | 4 +++ .../pkg-conff-rename-1/DEBIAN/postrm | 4 +++ .../pkg-conff-rename-1/DEBIAN/preinst | 9 ++++++ .../pkg-conff-rename-1/test-conffile-new | 1 + 10 files changed, 71 insertions(+) create mode 100644 tests/t-conffile-rename/Makefile create mode 100644 tests/t-conffile-rename/pkg-conff-rename-0/DEBIAN/conffiles create mode 100644 tests/t-conffile-rename/pkg-conff-rename-0/DEBIAN/control create mode 100644 tests/t-conffile-rename/pkg-conff-rename-0/test-conffile-old create mode 100644 tests/t-conffile-rename/pkg-conff-rename-1/DEBIAN/conffiles create mode 100644 tests/t-conffile-rename/pkg-conff-rename-1/DEBIAN/control create mode 100755 tests/t-conffile-rename/pkg-conff-rename-1/DEBIAN/postinst create mode 100755 tests/t-conffile-rename/pkg-conff-rename-1/DEBIAN/postrm create mode 100755 tests/t-conffile-rename/pkg-conff-rename-1/DEBIAN/preinst create mode 100644 tests/t-conffile-rename/pkg-conff-rename-1/test-conffile-new (limited to 'tests/t-conffile-rename') diff --git a/tests/t-conffile-rename/Makefile b/tests/t-conffile-rename/Makefile new file mode 100644 index 0000000..a8d0272 --- /dev/null +++ b/tests/t-conffile-rename/Makefile @@ -0,0 +1,34 @@ +TESTS_DEB := pkg-conff-rename-0 pkg-conff-rename-1 + +include ../Test.mk + +test-case: + $(DPKG_INSTALL) pkg-conff-rename-0.deb + $(DPKG_INSTALL) pkg-conff-rename-1.deb + test -f '$(DPKG_INSTDIR)/test-conffile-new' + test ! -f '$(DPKG_INSTDIR)/test-conffile-old' + test ! -f '$(DPKG_INSTDIR)/test-conffile-old.dpkg-remove' + test ! -f '$(DPKG_INSTDIR)/test-conffile-old.dpkg-bak' + $(DPKG_PURGE) pkg-conff-rename + # Same upgrade but with modified conffile, should still not prompt + $(DPKG_INSTALL) pkg-conff-rename-0.deb + $(BEROOT) sh -c "echo foo >>'$(DPKG_INSTDIR)/test-conffile-old'" + $(DPKG_INSTALL) pkg-conff-rename-1.deb + test -f '$(DPKG_INSTDIR)/test-conffile-new' + test ! -f '$(DPKG_INSTDIR)/test-conffile-old' + test ! -f '$(DPKG_INSTDIR)/test-conffile-old.dpkg-remove' + test ! -f '$(DPKG_INSTDIR)/test-conffile-old.dpkg-bak' + $(DPKG_PURGE) pkg-conff-rename + # Abort-upgrade restores the to-be-renamed conffile + $(DPKG_INSTALL) pkg-conff-rename-0.deb + $(BEROOT) touch '$(DPKG_INSTDIR)/fail-preinst' + $(DPKG_INSTALL) pkg-conff-rename-1.deb || true + $(BEROOT) rm -f '$(DPKG_INSTDIR)/fail-preinst' + test -f '$(DPKG_INSTDIR)/test-conffile-old' + test ! -f '$(DPKG_INSTDIR)/test-conffile-new' + test ! -f '$(DPKG_INSTDIR)/test-conffile-old.dpkg-remove' + test ! -f '$(DPKG_INSTDIR)/test-conffile-old.dpkg-bak' + $(DPKG_PURGE) pkg-conff-rename + +test-clean: + diff --git a/tests/t-conffile-rename/pkg-conff-rename-0/DEBIAN/conffiles b/tests/t-conffile-rename/pkg-conff-rename-0/DEBIAN/conffiles new file mode 100644 index 0000000..3ba6940 --- /dev/null +++ b/tests/t-conffile-rename/pkg-conff-rename-0/DEBIAN/conffiles @@ -0,0 +1 @@ +/test-conffile-old diff --git a/tests/t-conffile-rename/pkg-conff-rename-0/DEBIAN/control b/tests/t-conffile-rename/pkg-conff-rename-0/DEBIAN/control new file mode 100644 index 0000000..b38b9b7 --- /dev/null +++ b/tests/t-conffile-rename/pkg-conff-rename-0/DEBIAN/control @@ -0,0 +1,8 @@ +Package: pkg-conff-rename +Version: 0 +Section: test +Priority: extra +Maintainer: Dpkg Developers +Architecture: all +Description: test package - conffile rename + diff --git a/tests/t-conffile-rename/pkg-conff-rename-0/test-conffile-old b/tests/t-conffile-rename/pkg-conff-rename-0/test-conffile-old new file mode 100644 index 0000000..6fbc8b5 --- /dev/null +++ b/tests/t-conffile-rename/pkg-conff-rename-0/test-conffile-old @@ -0,0 +1 @@ +test init diff --git a/tests/t-conffile-rename/pkg-conff-rename-1/DEBIAN/conffiles b/tests/t-conffile-rename/pkg-conff-rename-1/DEBIAN/conffiles new file mode 100644 index 0000000..e3d713a --- /dev/null +++ b/tests/t-conffile-rename/pkg-conff-rename-1/DEBIAN/conffiles @@ -0,0 +1 @@ +/test-conffile-new diff --git a/tests/t-conffile-rename/pkg-conff-rename-1/DEBIAN/control b/tests/t-conffile-rename/pkg-conff-rename-1/DEBIAN/control new file mode 100644 index 0000000..ffd083c --- /dev/null +++ b/tests/t-conffile-rename/pkg-conff-rename-1/DEBIAN/control @@ -0,0 +1,8 @@ +Package: pkg-conff-rename +Version: 1 +Section: test +Priority: extra +Maintainer: Dpkg Developers +Architecture: all +Description: test package - conffile rename + diff --git a/tests/t-conffile-rename/pkg-conff-rename-1/DEBIAN/postinst b/tests/t-conffile-rename/pkg-conff-rename-1/DEBIAN/postinst new file mode 100755 index 0000000..89c1f0b --- /dev/null +++ b/tests/t-conffile-rename/pkg-conff-rename-1/DEBIAN/postinst @@ -0,0 +1,4 @@ +#!/bin/sh +if dpkg-maintscript-helper supports mv_conffile; then + dpkg-maintscript-helper mv_conffile /test-conffile-old /test-conffile-new 0 -- "$@" +fi diff --git a/tests/t-conffile-rename/pkg-conff-rename-1/DEBIAN/postrm b/tests/t-conffile-rename/pkg-conff-rename-1/DEBIAN/postrm new file mode 100755 index 0000000..89c1f0b --- /dev/null +++ b/tests/t-conffile-rename/pkg-conff-rename-1/DEBIAN/postrm @@ -0,0 +1,4 @@ +#!/bin/sh +if dpkg-maintscript-helper supports mv_conffile; then + dpkg-maintscript-helper mv_conffile /test-conffile-old /test-conffile-new 0 -- "$@" +fi diff --git a/tests/t-conffile-rename/pkg-conff-rename-1/DEBIAN/preinst b/tests/t-conffile-rename/pkg-conff-rename-1/DEBIAN/preinst new file mode 100755 index 0000000..775093f --- /dev/null +++ b/tests/t-conffile-rename/pkg-conff-rename-1/DEBIAN/preinst @@ -0,0 +1,9 @@ +#!/bin/sh +if dpkg-maintscript-helper supports mv_conffile; then + dpkg-maintscript-helper mv_conffile /test-conffile-old /test-conffile-new 0 -- "$@" +fi + +if [ -e "$DPKG_ROOT/fail-preinst" ]; then + exit 1 +fi + diff --git a/tests/t-conffile-rename/pkg-conff-rename-1/test-conffile-new b/tests/t-conffile-rename/pkg-conff-rename-1/test-conffile-new new file mode 100644 index 0000000..39c0014 --- /dev/null +++ b/tests/t-conffile-rename/pkg-conff-rename-1/test-conffile-new @@ -0,0 +1 @@ +this is the new conffile -- cgit v1.2.3