treewide: fix broken conffiles

Signed-off-by: Huangbin Zhan <zhanhb88@gmail.com>

diff --git a/admin/ipmitool/Makefile b/admin/ipmitool/Makefile
index 898e2e6cec9af477e24387a9274ea582cdecdbd4..243268efdf757f034b3ea328f6b2505f60121256 100644 (file)
--- a/admin/ipmitool/Makefile
+++ b/admin/ipmitool/Makefile
@@ -39,9 +39,6 @@ define Package/ipmitool/install
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/ipmitool $(1)/usr/sbin/
 endef
 
-define Package/ipmitool/conffiles
-endef
-
 CONFIGURE_ARGS += \
        --enable-intf-lan \
        --enable-intf-lanplus \

diff --git a/net/addrwatch/Makefile b/net/addrwatch/Makefile
index 15fc50519a121e348f584c2bd984c9153bf8e018..f91ff2bfa1ae789542ee176ec7c1dc1907c8831d 100644 (file)
--- a/net/addrwatch/Makefile
+++ b/net/addrwatch/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=addrwatch
 PKG_VERSION:=1.0.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/fln/addrwatch/releases/download/v$(PKG_VERSION)
@@ -41,7 +41,7 @@ define Package/addrwatch/description
 endef
 
 define Package/addrwatch/conffiles
-       /etc/config/addrwatch
+/etc/config/addrwatch
 endef
 
 define Package/addrwatch/install

diff --git a/net/i2pd/Makefile b/net/i2pd/Makefile
index 601640097b81bc9d92cd1d8878e3c0a4ff898807..f780e7f52de37d5347bdff45bf4c1dc96dc85ac2 100644 (file)
--- a/net/i2pd/Makefile
+++ b/net/i2pd/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=i2pd
 PKG_VERSION:=2.30.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_BUILD_PARALLEL:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -40,10 +40,10 @@ define Package/i2pd/description
 endef
 
 define Package/i2pd/conffiles
-       /etc/config/i2pd
-       /etc/i2pd/i2pd.conf
-       /etc/i2pd/tunnels.conf
-       /etc/i2pd/tunnels.d/*
+/etc/config/i2pd
+/etc/i2pd/i2pd.conf
+/etc/i2pd/tunnels.conf
+/etc/i2pd/tunnels.d/
 endef
 
 TARGET_LDFLAGS+=-latomic

diff --git a/net/noddos/Makefile b/net/noddos/Makefile
index 1cfec48b9add5782560823d407ff478264cc2f51..549a047be6ac300e041619257362ebcc8c3767fc 100644 (file)
--- a/net/noddos/Makefile
+++ b/net/noddos/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 # Name and release number of this package
 PKG_NAME:=noddos
 PKG_VERSION:=0.5.5
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://github.com/noddos/noddos/releases/download/v$(PKG_VERSION)/
@@ -39,7 +39,7 @@ Noddos discovers what devices you have in your network and tailors the firewall
 endef
 
 define Package/noddos/conffiles
-       /etc/config/noddos
+/etc/config/noddos
 endef
 
 define Package/noddos/install

diff --git a/net/openssh/Makefile b/net/openssh/Makefile
index 20a4e1b3cb8312c779d053f4540804169f87b3b9..a7bf7494c998adf13b2b04974863c44a93005cfd 100644 (file)
--- a/net/openssh/Makefile
+++ b/net/openssh/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openssh
 PKG_VERSION:=8.3p1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
@@ -94,8 +94,10 @@ endef
 
 define Package/openssh-server/conffiles
 /etc/ssh/sshd_config
-/etc/ssh/ssh_host_*_key
-/etc/ssh/ssh_host_*_key.pub
+/etc/ssh/ssh_host_ed25519_key
+/etc/ssh/ssh_host_ed25519_key.pub
+/etc/ssh/ssh_host_rsa_key
+/etc/ssh/ssh_host_rsa_key.pub
 endef
 
 define Package/openssh-server-pam

diff --git a/net/shorewall-core/Makefile b/net/shorewall-core/Makefile
index a6e39e2b7dd9b40fac1827ad2a70ac9c1d22bb04..7c96faa8fe1b0fcc8c38dfc2133b2c04985e78c2 100644 (file)
--- a/net/shorewall-core/Makefile
+++ b/net/shorewall-core/Makefile
@@ -14,7 +14,7 @@ PKG_BUGFIX_MAJOR_VERSION:=5
 PKG_BUGFIX_MINOR_VERSION:=.2
 PKG_VERSION:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)$(PKG_BUGFIX_MINOR_VERSION)
 PKG_DIRECTORY:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE_URL:=http://shorewall.org/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \
        http://slovakia.shorewall.net/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \
@@ -44,7 +44,7 @@ define Package/shorewall-core/description
 endef
 
 define Package/shorewall-core/conffiles
-       /usr/share/shorewall/shorewallrc
+/usr/share/shorewall/shorewallrc
 endef
 
 CONFIGURE_ARGS += \

diff --git a/net/softethervpn/Makefile b/net/softethervpn/Makefile
index 5710e8e0dfd7b4fbf320032c97ac745848fb68ba..d596b421c5db857c55b1268cb23dd2a3678f4917 100644 (file)
--- a/net/softethervpn/Makefile
+++ b/net/softethervpn/Makefile
@@ -12,7 +12,7 @@ PKG_NAME:=softethervpn
 PKG_VERSION:=4.29-9680
 PKG_VERREL:=rtm
 PKG_VERDATE:=2019.02.28
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE:=softether-src-v$(PKG_VERSION)-$(PKG_VERREL).tar.gz
 PKG_SOURCE_URL:=http://www.softether-download.com/files/softether/v$(PKG_VERSION)-$(PKG_VERREL)-$(PKG_VERDATE)-tree/Source_Code/
@@ -131,19 +131,19 @@ Package/softethervpn-bridge/description = $(Package/softethervpn/description)
 Package/softethervpn-client/description = $(Package/softethervpn/description)
 
 define Package/softethervpn-base/conffiles
-  /usr/libexec/softethervpn/lang.config
+/usr/libexec/softethervpn/lang.config
 endef
 
 define Package/softethervpn-server/conffiles
-  /usr/libexec/softethervpn/vpn_server.config
+/usr/libexec/softethervpn/vpn_server.config
 endef
 
 define Package/softethervpn-client/conffiles
-  /usr/libexec/softethervpn/vpn_client.config
+/usr/libexec/softethervpn/vpn_client.config
 endef
 
 define Package/softethervpn-bridge/conffiles
-  /usr/libexec/softethervpn/vpn_bridge.config
+/usr/libexec/softethervpn/vpn_bridge.config
 endef
 
 define Package/softethervpn-base/install

diff --git a/net/squid/Makefile b/net/squid/Makefile
index d8f27963cfb3087d4da7bce4b73d15d289c97658..c79021825376aad04233cf0af212944dcea448c9 100644 (file)
--- a/net/squid/Makefile
+++ b/net/squid/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=squid
 PKG_VERSION:=4.6
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://www3.us.squid-cache.org/Versions/v4/ \
@@ -58,8 +58,8 @@ define Package/squid/config
 endef
 
 define Package/squid/conffiles
-  /etc/config/squid
-  /etc/squid/squid.conf
+/etc/config/squid
+/etc/squid/squid.conf
 endef
 
 define Package/squid-mod-cachemgr

diff --git a/utils/sane-backends/Makefile b/utils/sane-backends/Makefile
index b1930936b7c1d8547df922101a4d9a96389a59f0..b85e48742f896a598ac54f8bf929f506d5d58d3e 100644 (file)
--- a/utils/sane-backends/Makefile
+++ b/utils/sane-backends/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sane-backends
 PKG_VERSION:=1.0.30
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://gitlab.com/sane-project/backends/uploads/c3dd60c9e054b5dee1e7b01a7edc98b0
@@ -290,7 +290,7 @@ This package contains the SANE backend for $(2).
   endef
 
   define Package/sane-$(1)/conffiles
-       /etc/sane.d/$(1).conf
+/etc/sane.d/$(1).conf
   endef
 
   $$(eval $$(call BuildPackage,sane-$(1)))