unpack: keep conf_files replaced with symlinks, unpack as .new-pkgver

tests/xbps/libxbps/shell/conf_files_test.sh

@@ -165,9 +165,70 @@ tc4_body() {
 	atf_check_equal $rval 0
 }
 
+# 5th test: configuration file replaced with symlink on disk, modified on upgrade.
+#	result: install new file as "<conf_file>.new-<version>".
+atf_test_case tc5
+
+tc5_head() {
+	atf_set "descr" "Tests for configuration file handling: on-disk replaced with symlink, upgrade modified"
+}
+
+tc5_body() {
+	mkdir repo
+	cd repo
+	mkdir pkg_a
+	echo "fooblah" > pkg_a/cf1.conf
+	chmod 644 pkg_a/cf1.conf
+	xbps-create -A noarch -n a-0.1_1 -s "pkg a" --config-files "/cf1.conf" pkg_a
+	atf_check_equal $? 0
+	rm -rf pkg_a
+	xbps-rindex -d -a $PWD/*.xbps
+	atf_check_equal $? 0
+	xbps-install -C null.conf -r rootdir --repository=$PWD -yvd a
+	atf_check_equal $? 0
+
+	mv rootdir/cf1.conf rootdir/foobar.conf
+	ln -sf foobar.conf rootdir/cf1.conf
+	sed -e 's,fooblah,blahfoo,' -i rootdir/foobar.conf
+	chmod 644 rootdir/foobar.conf
+
+	mkdir pkg_a
+	echo "bazbar" > pkg_a/cf1.conf
+	chmod 644 pkg_a/cf1.conf
+	xbps-create -A noarch -n a-0.2_1 -s "pkg a" --config-files "/cf1.conf" pkg_a
+	atf_check_equal $? 0
+
+	xbps-rindex -d -a $PWD/*.xbps
+	atf_check_equal $? 0
+	rm -rf pkg_a
+
+	xbps-install -C null.conf -r rootdir --repository=$PWD -yuvd
+	atf_check_equal $? 0
+
+	ls -lsa rootdir
+	test -h rootdir/cf1.conf
+	atf_check_equal $? 0
+
+	result="$(cat rootdir/cf1.conf)"
+	rval=1
+	if [ "${result}" = "blahfoo" ]; then
+		rval=0
+	fi
+
+	echo "result: ${result}"
+	echo "expected: blahfoo"
+	atf_check_equal $rval 0
+	rval=1
+	if [ -s rootdir/cf1.conf.new-0.2_1 ]; then
+		rval=0
+	fi
+	atf_check_equal $rval 0
+}
+
 atf_init_test_cases() {
 	atf_add_test_case tc1
 	atf_add_test_case tc2
 	atf_add_test_case tc3
 	atf_add_test_case tc4
+	atf_add_test_case tc5
 }