From 72cec884d6a2d39af0012d9e4b407456611eb9c4 Mon Sep 17 00:00:00 2001 From: Dirk Steinkopf Date: Sun, 2 Dec 2018 07:45:40 +0100 Subject: T1060: add version 1 for webproxy --- Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.am b/Makefile.am index ccf5fe83..6759bdc4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -125,6 +125,7 @@ curver_DATA += cfg-version/ssh@1 curver_DATA += cfg-version/l2tp@1 curver_DATA += cfg-version/pptp@1 curver_DATA += cfg-version/ntp@1 +curver_DATA += cfg-version/webproxy@1 cpiop = find . ! -regex '\(.*~\|.*\.bak\|.*\.swp\|.*\#.*\#\)' -print0 | \ cpio -0pd -- cgit v1.2.3 From 9d35610c173a6e0331b95de4864dfb4d986c6be8 Mon Sep 17 00:00:00 2001 From: Dirk Steinkopf Date: Thu, 6 Dec 2018 08:24:18 +0100 Subject: T1060: add missing version file for webproxy --- cfg-version/webproxy@1 | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 cfg-version/webproxy@1 diff --git a/cfg-version/webproxy@1 b/cfg-version/webproxy@1 new file mode 100644 index 00000000..e69de29b -- cgit v1.2.3 From c1008389a525994feebfb059d1e7bedb785e2804 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Fri, 7 Dec 2018 20:00:14 +0100 Subject: T1060: build fix for wrong config-version number Commit 9d35610c173 ("T1060: add missing version file for webproxy") assumed that there is a webproxy config version of 0 but we already have 1. This lead to duplicate files detected by apt. --- Makefile.am | 2 +- cfg-version/webproxy@1 | 0 cfg-version/webproxy@2 | 0 3 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 cfg-version/webproxy@1 create mode 100644 cfg-version/webproxy@2 diff --git a/Makefile.am b/Makefile.am index 6759bdc4..ce970826 100644 --- a/Makefile.am +++ b/Makefile.am @@ -125,7 +125,7 @@ curver_DATA += cfg-version/ssh@1 curver_DATA += cfg-version/l2tp@1 curver_DATA += cfg-version/pptp@1 curver_DATA += cfg-version/ntp@1 -curver_DATA += cfg-version/webproxy@1 +curver_DATA += cfg-version/webproxy@2 cpiop = find . ! -regex '\(.*~\|.*\.bak\|.*\.swp\|.*\#.*\#\)' -print0 | \ cpio -0pd diff --git a/cfg-version/webproxy@1 b/cfg-version/webproxy@1 deleted file mode 100644 index e69de29b..00000000 diff --git a/cfg-version/webproxy@2 b/cfg-version/webproxy@2 new file mode 100644 index 00000000..e69de29b -- cgit v1.2.3