openwrt/packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2026-02-04 12:06:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

pigeonhole: change package versioning

Browse Source 
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: 6c6a40ab57 ("pigeonhole: fix runtime dependency on dovecot's ABI")

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
This commit is contained in:
Josef Schlehofer
2025-12-31 03:33:18 +01:00
parent d4f9e59a96
commit 547ac2e84e
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mail/pigeonhole/Makefile
View File

@@ -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