dns2tcp: cleanup makefile

Co-authored-by: Tianling Shen <cnsztl@immortalwrt.org>

dns2tcp/Makefile

@@ -1,43 +1,44 @@
+# SPDX-License-Identifier: GPL-3.0-only
+#
+# Copyright (C) 2022 ImmortalWrt.org
+
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dns2tcp
 PKG_VERSION:=1.1.0
-PKG_RELEASE:=3
+PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/zfl9/dns2tcp.git
+PKG_SOURCE_DATE:=2020-05-05
 PKG_SOURCE_VERSION:=10ed687778f18d1b9c98bb51187a3a9086d3a0d9
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION)
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_SOURCE_SUBDIR)
+PKG_MIRROR_HASH:=bb40f027fef8534b0f905a827dbc3cc613fd06b705392148a12b80e1f9570a88
+
+PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
+PKG_LICENSE:=AGPL-3.0-only
+PKG_LICENSE_FILES:=LICENSE
 
 PKG_BUILD_PARALLEL:=1
 PKG_USE_MIPS16:=0
 
-PKG_LICENSE:=GPL-3.0
-PKG_LICENSE_FILES:=LICENSE
-PKG_MAINTAINER:=pexcn <i@pexcn.me>
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/dns2tcp
   SECTION:=net
   CATEGORY:=Network
-	TITLE:=Utility to convert DNS query from UDP to TCP
+  SUBMENU:=IP Addresses and Names
+  TITLE:=utility to convert dns query from udp to tcp
   URL:=https://github.com/zfl9/dns2tcp
 endef
 
-define Package/dns2tcp/description
-Utility to convert DNS query from UDP to TCP.
-endef
-
-define Package/dns2tcp/conffiles
-/etc/config/dns2tcp
-endef
+TARGET_CFLAGS+= $(FPIC) -flto
+MAKE_FLAGS+= \
+	CFLAGS="-std=c99 $(TARGET_CFLAGS)" \
+	EVCFLAGS="$(TARGET_CFLAGS)"
 
 define Package/dns2tcp/install
 	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dns2tcp $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dns2tcp $(1)/usr/bin/
 endef
 
 $(eval $(call BuildPackage,dns2tcp))

dns2tcp/patches/001-build-with-gcc-O3-optimizations.patch

@@ -1,31 +0,0 @@
-From 01fc93331291ea55e8306374f6406c130de951a8 Mon Sep 17 00:00:00 2001
-From: pexcn <i@pexcn.me>
-Date: Sun, 5 Apr 2020 22:30:26 +0800
-Subject: [PATCH] build with gcc -O3 optimizations
-
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index ae6c171..02b8587 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,12 +1,12 @@
- CC = gcc
--CFLAGS = -std=c99 -Wall -Wextra -O2
-+CFLAGS = -std=c99 -Wall -Wextra -O3
- LIBS = -lm
- SRCS = dns2tcp.c
- OBJS = $(SRCS:.c=.o)
- MAIN = dns2tcp
- DESTDIR = /usr/local/bin
- 
--EVCFLAGS = -w -O2
-+EVCFLAGS = -w -O3
- EVSRCFILE = libev/ev.c
- EVOBJFILE = ev.o
- 
--- 
-2.25.1
-