opentracker: update to git HEAD

Most notably opentracker now supported simultanous listening on IPv4 and
IPv6. Hence we no longer need two build variants.

See project git history for details about changes:
https://erdgeist.org/gitweb/opentracker/log/?id=c854b3db9bf620e86481acfcc9fc31eba64bc8e6

Signed-off-by: Daniel Golle <redacted>

diff --git a/net/opentracker/Makefile b/net/opentracker/Makefile
index 030947a88c2fbb6d7147033b0fdd54ba853e261a..3348495432fb6b0bb0f454dc74b5bc9e718e7239 100644 (file)
--- a/net/opentracker/Makefile
+++ b/net/opentracker/Makefile
@@ -9,9 +9,9 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://erdgeist.org/gitweb/opentracker
-PKG_SOURCE_DATE:=2021-08-23
-PKG_SOURCE_VERSION:=110868ec4ebe60521d5a4ced63feca6a1cf0aa2a
-PKG_MIRROR_HASH:=9c48e442c1ac28d9141146cdf58cd733cf82a18bbef7880df1c61231b01e1329
+PKG_SOURCE_DATE:=2024-06-22
+PKG_SOURCE_VERSION:=c854b3db9bf620e86481acfcc9fc31eba64bc8e6
+PKG_MIRROR_HASH:=50d0fc8166ae927aa4dad7701f23c9faab80afb0680f7ea460e7b048f8f01a16
 
 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
 PKG_LICENSE:=Beerware
@@ -20,28 +20,17 @@ PKG_BUILD_DEPENDS:=libowfat
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/opentracker/Default
+define Package/opentracker
   SUBMENU:=BitTorrent
   SECTION:=net
   CATEGORY:=Network
   TITLE:=opentracker
   URL:=http://erdgeist.org/arts/software/opentracker/
   DEPENDS:=+zlib +libpthread
+  PROVIDES:=opentracker6
 endef
 
-define Package/opentracker
-$(call Package/opentracker/Default)
-  VARIANT:=ipv4
-endef
-
-define Package/opentracker6
-$(call Package/opentracker/Default)
-  TITLE+= (IPv6 build)
-  VARIANT:=ipv6
-endef
-
-
-define Package/opentracker-default/description
+define Package/opentracker/description
  opentracker - An open and free bittorrent tracker
 
  opentracker is an open and free bittorrent tracker project.
@@ -49,37 +38,18 @@ define Package/opentracker-default/description
  Currently it is deployed as an open and free tracker instance.
  Read our free and open tracker blog and announce your torrents there
  (but do not hesitate to setup your own free trackers!).
-endef
-
-define Package/opentracker/description
- $(call Package/opentracker-default/description)
-
- This package contains the IPv4-build of opentracker.
 
+ opentracker now supports listening on both IPv4 and IPv6 at the same time.
 endef
 
-define Package/opentracker6/description
- $(call Package/opentracker-default/description)
-
- This package contains the IPv6-build of opentracker.
-
-endef
-
-
 MAKE_FLAGS += PREFIX="$(STAGING_DIR)/usr"
 
-ifeq ($(BUILD_VARIANT),ipv6)
-  MAKE_FLAGS += FEATURES="-DWANT_V6"
-endif
+TARGET_CFLAGS += -DWANT_NO_AUTO_FREE
 
 define Package/opentracker/conffiles
 /etc/opentracker.conf
 endef
 
-define Package/opentracker6/conffiles
-/etc/opentracker6.conf
-endef
-
 define Package/opentracker/install
        $(INSTALL_DIR) $(1)/usr/bin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/opentracker $(1)/usr/bin
@@ -89,14 +59,4 @@ define Package/opentracker/install
        $(INSTALL_BIN) ./files/opentracker.init $(1)/etc/init.d/opentracker
 endef
 
-define Package/opentracker6/install
-       $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/opentracker $(1)/usr/bin/opentracker6
-       $(INSTALL_DIR) $(1)/etc
-       $(INSTALL_CONF) $(PKG_BUILD_DIR)/opentracker.conf.sample $(1)/etc/opentracker6.conf
-       $(INSTALL_DIR) $(1)/etc/init.d
-       $(INSTALL_BIN) ./files/opentracker6.init $(1)/etc/init.d/opentracker6
-endef
-
 $(eval $(call BuildPackage,opentracker))
-$(eval $(call BuildPackage,opentracker6))

diff --git a/net/opentracker/files/opentracker6.init b/net/opentracker/files/opentracker6.init
deleted file mode 100755 (executable)
index 02417f3..0000000
--- a/net/opentracker/files/opentracker6.init
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=10
-STOP=15
-
-NAME="opentracker6"
-PROG="/usr/bin/opentracker6"
-OPTIONS="-f /etc/opentracker6.conf"
-USE_PROCD=1
-
-start_service()
-{
-       procd_open_instance
-       procd_set_param command $PROG $OPTIONS
-       procd_close_instance
-}

diff --git a/net/opentracker/patches/100-makefile.patch b/net/opentracker/patches/100-makefile.patch
index cde4496ffa1cebfb468234fcc014d1adbeb44d23..42c8712303188caca1c1ecbd30b0fda5a256e4e2 100644 (file)
--- a/net/opentracker/patches/100-makefile.patch
+++ b/net/opentracker/patches/100-makefile.patch
@@ -1,6 +1,6 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -9,13 +9,13 @@ CC?=gcc
+@@ -7,13 +7,13 @@
  
  # BSD flavour
  # PREFIX?=/usr/local