From: Josef Schlehofer <pepe.schlehofer@gmail.com>
Date: Wed, 31 Dec 2025 02:33:18 +0000 (+0100)
Subject: pigeonhole: change package versioning
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=547ac2e84ea205432e1eabc5588d31ad0652ed37;p=feed%2Fpackages.git

pigeonhole: change package versioning

The current pigeonhole Makefile is more complex than it needs to be, with
too many unique variables and the resulting package version
is currently this one:
```
dovecot-pigeonhole_2.3.21.0.5.21-r1_aarch64_cortex-a53.ipk
```

and based on Repology [1], it looks like we are the only GNU/Linux
distribution, who includes dovecot version and pigeonhole version
together. We should not include the extra dovecot version, because
even project [2]  website does not do it except their tarball.

What we can do better is that we added and modify a little bit
EXTRA_DEPENDS, which ensures that pigenhole 0.5.21.1 will be used
for Dovecot 2.3, because of that, we can have package version as
it should be.

```
dovecot-pigeonhole_0.5.21-r1_arm_cortex-a9_vfpv3-d16.ipk
```

Because of the changed versioning, we can remove the dynamic shell
execution for version extraction.

[1] https://repology.org/project/dovecot-pigeonhole/versions
[2] https://pigeonhole.dovecot.org/download

Fixes: 6c6a40ab57d1151f981237f81935b19486c45026 ("pigeonhole: fix runtime dependency on dovecot's ABI")

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
---

diff --git a/mail/pigeonhole/Makefile b/mail/pigeonhole/Makefile
index f55cc8c346..68bb2a30b4 100644
--- a/mail/pigeonhole/Makefile
+++ b/mail/pigeonhole/Makefile
@@ -8,14 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dovecot-pigeonhole
-PKG_VERSION_PLUGIN:=0.5.21
-PKG_VERSION_DOVECOT:=$(shell make --no-print-directory -C ../dovecot/ val.PKG_VERSION V=s)
-PKG_VERSION:=$(PKG_VERSION_DOVECOT).$(PKG_VERSION_PLUGIN)
-PKG_RELEASE:=2
+PKG_VERSION:=0.5.21
+PKG_RELEASE:=1
 
 DOVECOT_VERSION:=2.3
 
-PKG_SOURCE:=dovecot-$(DOVECOT_VERSION)-pigeonhole-$(PKG_VERSION_PLUGIN).tar.gz
+PKG_SOURCE:=dovecot-$(DOVECOT_VERSION)-pigeonhole-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://pigeonhole.dovecot.org/releases/$(DOVECOT_VERSION)
 PKG_HASH:=1ca71d2659076712058a72030288f150b2b076b0306453471c5261498d3ded27
 
@@ -24,7 +22,7 @@ PKG_LICENSE:=LGPL-2.1-or-later
 PKG_LICENSE_FILES:=COPYING COPYING.LGPL
 PKG_CPE_ID:=cpe:/a:dovecot:pigeonhole
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/dovecot-$(DOVECOT_VERSION)-pigeonhole-$(PKG_VERSION_PLUGIN)
+PKG_BUILD_DIR:=$(BUILD_DIR)/dovecot-$(DOVECOT_VERSION)-pigeonhole-$(PKG_VERSION)
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
@@ -34,7 +32,7 @@ define Package/dovecot-pigeonhole
   SECTION:=mail
   CATEGORY:=Mail
   DEPENDS:=+dovecot
-  EXTRA_DEPENDS:=dovecot (>=$(PKG_VERSION_DOVECOT))
+  EXTRA_DEPENDS:=dovecot (>=2.3.0), dovecot (<2.4.0)
   TITLE:=Mail filtering facilities for Dovecot
   URL:=https://pigeonhole.dovecot.org/
 endef