Updated patch.
(The previous one FTBFS when building arch:all only).
Thanks.
commit 57191aacf5ba3411d59a81e07971051319d0cc7d
Author: Santiago Vila <sanv...@debian.org>
Date: Thu Mar 13 13:10:00 2025 +0100
Build and use alpine-mlock.
Drop dependency on mlock.
diff --git a/debian/alpine.install b/debian/alpine.install
index 2603d52..6ac323b 100644
--- a/debian/alpine.install
+++ b/debian/alpine.install
@@ -1,3 +1,4 @@
usr/bin/alpine usr/bin
usr/bin/rpdump usr/bin
usr/bin/rpload usr/bin
+usr/bin/alpine-mlock usr/bin
diff --git a/debian/control b/debian/control
index 3562df8..521806b 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends:
libncurses-dev,
libpam0g-dev,
libssl-dev
-Rules-Requires-Root: no
+Rules-Requires-Root: binary-targets
Standards-Version: 4.7.0
Vcs-Browser: https://salsa.debian.org/debian/alpine
Vcs-Git: https://salsa.debian.org/debian/alpine.git
@@ -21,7 +21,7 @@ Homepage: https://alpineapp.email/
Package: alpine
Architecture: any
-Depends: mlock, ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Recommends: alpine-doc, sensible-utils
Suggests: aspell, default-mta | mail-transport-agent
Conflicts: pine
diff --git a/debian/patches/series b/debian/patches/series
index 7ef03ef..0679a9b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
10_alpine_1.10_spooldir.patch
40_fix_browser_hardcoded_paths.patch
fix-build-with-gettext-0.23.patch
+use-alpine-mlock.patch
diff --git a/debian/patches/use-alpine-mlock.patch
b/debian/patches/use-alpine-mlock.patch
new file mode 100644
index 0000000..68dcf98
--- /dev/null
+++ b/debian/patches/use-alpine-mlock.patch
@@ -0,0 +1,15 @@
+Description: Use alpine-mlock
+Author: Santiago Vila <sanv...@debian.org>
+Bug-Debian: https://bugs.debian.org/1091777
+
+--- a/imap/src/osdep/unix/Makefile
++++ b/imap/src/osdep/unix/Makefile
+@@ -105,7 +105,7 @@
+ RSHPATH=/usr/ucb/rsh
+ MD5PWD=/etc/cram-md5.pwd
+ # Tries one of the test alternatives below if not specified.
+-LOCKPGM=
++LOCKPGM=/usr/bin/alpine-mlock
+ # Test alternatives if LOCKPGM not specified
+ LOCKPGM1=/usr/libexec/mlock
+ LOCKPGM2=/usr/sbin/mlock
diff --git a/debian/rules b/debian/rules
index 5811256..5d6bdca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,8 +21,10 @@ override_dh_auto_configure:
override_dh_auto_build:
# force cross compilers onto make as they are not propagated from
configure
dh_auto_build --buildsystem=makefile
+ $(MAKE) -C imap/mlock
override_dh_install-arch:
+ cp -p imap/mlock/mlock debian/tmp/usr/bin/alpine-mlock
dh_install --arch
# Rename pico to pico.alpine.
# alpine-pico.install puts this in the alpine-pico package.
@@ -39,6 +41,11 @@ override_dh_installman-arch:
dh_installman --arch
mv debian/alpine-pico/usr/share/man/man1/pico.1
debian/alpine-pico/usr/share/man/man1/pico.alpine.1
+override_dh_fixperms-arch:
+ dh_fixperms
+ chown root:mail debian/alpine/usr/bin/alpine-mlock
+ chmod 2755 debian/alpine/usr/bin/alpine-mlock
+
override_dh_missing:
dh_missing --fail-missing
