Thanks, applied as 0727b0e4f31f0264dadc25853803b49b6f6ebd46. Michael
[sent from post-receive hook] On Mon, 18 May 2026 09:54:10 +0200, Thorsten Scherer <[email protected]> wrote: > Signed-off-by: Thorsten Scherer <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git a/patches/ssmtp-2.64/0001-use-LDFLAGS-for-linking.patch > b/patches/ssmtp-2.64/0001-use-LDFLAGS-for-linking.patch > deleted file mode 100644 > index 9ad40df0efa4..000000000000 > --- a/patches/ssmtp-2.64/0001-use-LDFLAGS-for-linking.patch > +++ /dev/null > @@ -1,25 +0,0 @@ > -From: Robert Schwebel <[email protected]> > -Date: Wed, 14 Aug 2013 10:24:18 +0200 > -Subject: [PATCH] use LDFLAGS for linking > - > -Please use LDFLAGS, not CFLAGS, for linking. This makes it possible to > -overwrite the variable from the outside and do the correct thing. > - > -Signed-off-by: Robert Schwebel <[email protected]> > ---- > - Makefile.in | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/Makefile.in b/Makefile.in > -index f0aff41..d235182 100644 > ---- a/Makefile.in > -+++ b/Makefile.in > -@@ -79,7 +79,7 @@ uninstall-sendmail: uninstall > - > - # Binaries: > - ssmtp: $(OBJS) > -- $(CC) -o ssmtp $(OBJS) @LIBS@ $(CFLAGS) > -+ $(CC) -o ssmtp $(OBJS) $(LDFLAGS) @LIBS@ > - > - .PHONY: clean > - clean: > diff --git a/patches/ssmtp-2.64/0002-use-DESTDIR-when-installing.patch > b/patches/ssmtp-2.64/0002-use-DESTDIR-when-installing.patch > deleted file mode 100644 > index 537d012cdeb1..000000000000 > --- a/patches/ssmtp-2.64/0002-use-DESTDIR-when-installing.patch > +++ /dev/null > @@ -1,72 +0,0 @@ > -From: Robert Schwebel <[email protected]> > -Date: Wed, 14 Aug 2013 10:24:18 +0200 > -Subject: [PATCH] use DESTDIR when installing > - > -Prefix all paths with DESTDIR when installing > - > -Signed-off-by: Robert Schwebel <[email protected]> > ---- > - Makefile.in | 40 ++++++++++++++++++++-------------------- > - 1 file changed, 20 insertions(+), 20 deletions(-) > - > -diff --git a/Makefile.in b/Makefile.in > -index d235182..756d754 100644 > ---- a/Makefile.in > -+++ b/Makefile.in > -@@ -46,36 +46,36 @@ all: ssmtp > - > - .PHONY: install > - install: ssmtp $(GEN_CONFIG) > -- $(INSTALL) -d -m 755 $(bindir) > -- $(INSTALL) -s -m 755 ssmtp $(bindir)/ssmtp > -- $(INSTALL) -d -m 755 $(mandir) > -- $(INSTALL) -m 644 $(srcdir)/ssmtp.8 $(mandir)/ssmtp.8 > -- $(INSTALL) -d -m 755 $(SSMTPCONFDIR) > -- $(INSTALL) -m 644 $(srcdir)/revaliases $(INSTALLED_REVALIASES_FILE) > -- $(GEN_CONFIG) $(INSTALLED_CONFIGURATION_FILE) > -+ $(INSTALL) -d -m 755 $(DESTDIR)$(bindir) > -+ $(INSTALL) -s -m 755 ssmtp $(DESTDIR)$(bindir)/ssmtp > -+ $(INSTALL) -d -m 755 $(DESTDIR)$(mandir) > -+ $(INSTALL) -m 644 $(srcdir)/ssmtp.8 $(DESTDIR)$(mandir)/ssmtp.8 > -+ $(INSTALL) -d -m 755 $(DESTDIR)$(SSMTPCONFDIR) > -+ $(INSTALL) -m 644 $(srcdir)/revaliases > $(DESTDIR)$(INSTALLED_REVALIASES_FILE) > -+ $(GEN_CONFIG) $(DESTDIR)$(INSTALLED_CONFIGURATION_FILE) > - > - > - .PHONY: install-sendmail > - install-sendmail: install > -- $(RM) $(bindir)/sendmail > -- $(LN_S) ssmtp $(bindir)/sendmail > -- $(INSTALL) -d -m 755 $(libexecdir) > -- $(RM) $(libexecdir)/sendmail > -- $(LN_S) sendmail /lib/sendmail > -- $(RM) $(mandir)/sendmail.8 > -- $(LN_S) ssmtp.8 $(mandir)/sendmail.8 > -+ $(RM) $(DESTDIR)$(bindir)/sendmail > -+ $(LN_S) ssmtp $(DESTDIR)$(bindir)/sendmail > -+ $(INSTALL) -d -m 755 $(DESTDIR)$(libexecdir) > -+ $(RM) $(DESTDIR)$(libexecdir)/sendmail > -+ $(LN_S) sendmail $(DESTDIR)/lib/sendmail > -+ $(RM) $(DESTDIR)$(mandir)/sendmail.8 > -+ $(LN_S) ssmtp.8 $(DESTDIR)$(mandir)/sendmail.8 > - > - .PHONY: uninstall > - uninstall: > -- $(RM) $(bindir)/ssmtp > -- $(RM) $(mandir)/ssmtp.8 > -- $(RM) $(CONFIGURATION_FILE) $(REVALIASES_FILE) > -- $(RM) -r $(SSMTPCONFDIR) > -+ $(RM) $(DESTDIR)$(bindir)/ssmtp > -+ $(RM) $(DESTDIR)$(mandir)/ssmtp.8 > -+ $(RM) $$(DESTDIR)(CONFIGURATION_FILE) $(DESTDIR)$(REVALIASES_FILE) > -+ $(RM) -r $(DESTDIR)$(SSMTPCONFDIR) > - > - .PHONY: uninstall-sendmail > - uninstall-sendmail: uninstall > -- $(RM) $(bindir)/sendmail /lib/sendmail > -- $(RM) $(mandir)/sendmail.8 > -+ $(RM) $(DESTDIR)$(bindir)/sendmail $(DESTDIR)/lib/sendmail > -+ $(RM) $(DESTDIR)$(mandir)/sendmail.8 > - > - # Binaries: > - ssmtp: $(OBJS) > diff --git a/patches/ssmtp-2.64/0003-make-installing-non-interactive.patch > b/patches/ssmtp-2.64/0003-make-installing-non-interactive.patch > deleted file mode 100644 > index 0536d9aedba8..000000000000 > --- a/patches/ssmtp-2.64/0003-make-installing-non-interactive.patch > +++ /dev/null > @@ -1,34 +0,0 @@ > -From: Michael Olbrich <[email protected]> > -Date: Wed, 14 Aug 2013 10:24:18 +0200 > -Subject: [PATCH] make installing non-interactive > - > -$(GEN_CONFIG) need user ineraction to create a config file. > -It doesn't work for cross-compiling and we don't need it. > - > -Not for upstream. > - > -Signed-off-by: Michael Olbrich <[email protected]> > ---- > - Makefile.in | 3 +-- > - 1 file changed, 1 insertion(+), 2 deletions(-) > - > -diff --git a/Makefile.in b/Makefile.in > -index 756d754..cb3610c 100644 > ---- a/Makefile.in > -+++ b/Makefile.in > -@@ -45,14 +45,13 @@ all: ssmtp > - latex $< > - > - .PHONY: install > --install: ssmtp $(GEN_CONFIG) > -+install: ssmtp > - $(INSTALL) -d -m 755 $(DESTDIR)$(bindir) > - $(INSTALL) -s -m 755 ssmtp $(DESTDIR)$(bindir)/ssmtp > - $(INSTALL) -d -m 755 $(DESTDIR)$(mandir) > - $(INSTALL) -m 644 $(srcdir)/ssmtp.8 $(DESTDIR)$(mandir)/ssmtp.8 > - $(INSTALL) -d -m 755 $(DESTDIR)$(SSMTPCONFDIR) > - $(INSTALL) -m 644 $(srcdir)/revaliases > $(DESTDIR)$(INSTALLED_REVALIASES_FILE) > -- $(GEN_CONFIG) $(DESTDIR)$(INSTALLED_CONFIGURATION_FILE) > - > - > - .PHONY: install-sendmail > diff --git > a/patches/ssmtp-2.64/0004-configure-if-using-ssl-link-against-libcrypto-too.patch > > b/patches/ssmtp-2.64/0004-configure-if-using-ssl-link-against-libcrypto-too.patch > deleted file mode 100644 > index e69cf3483a61..000000000000 > --- > a/patches/ssmtp-2.64/0004-configure-if-using-ssl-link-against-libcrypto-too.patch > +++ /dev/null > @@ -1,35 +0,0 @@ > -From: Marc Kleine-Budde <[email protected]> > -Date: Wed, 14 Aug 2013 10:27:05 +0200 > -Subject: [PATCH] configure: if using ssl link against libcrypto, too > - > -otherwise linking fails with: > -arm-v5te-linux-gnueabi-gcc -o ssmtp ssmtp.o arpadate.o base64.o > xgethostname.o md5auth/md5c.o md5auth/hmac_md5.o -lnsl -lssl > -/opt/OSELAS.Toolchain-2012.12.1/arm-v5te-linux-gnueabi/gcc-4.7.2-glibc-2.16.0-binutils-2.22-kernel-3.6-sanitized/lib/gcc/arm-v5te-linux-gnueabi/4.7.2/../../../../arm-v5te-linux-gnueabi/bin/ld: > -ssmtp.o: undefined reference to symbol 'X509_free@@OPENSSL_1.0.0' > -/opt/OSELAS.Toolchain-2012.12.1/arm-v5te-linux-gnueabi/gcc-4.7.2-glibc-2.16.0-binutils-2.22-kernel-3.6-sanitized/lib/gcc/arm-v5te-linux-gnueabi/4.7.2/../../../../arm-v5te-linux-gnueabi/bin/ld: > -note: 'X509_free@@OPENSSL_1.0.0' is defined in DSO > -XXXXX/sysroot-target/usr/lib/libcrypto.so.1.0.0 so try adding it to the > -linker command line > -XXXXX/sysroot-target/usr/lib/libcrypto.so.1.0.0: could not read symbols: > -Invalid operation > -collect2: error: ld returned 1 exit status > - > -Reported-by: Alexander Dahl <[email protected]> > -Signed-off-by: Marc Kleine-Budde <[email protected]> > ---- > - configure.in | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/configure.in b/configure.in > -index 2d7221d..0633add 100644 > ---- a/configure.in > -+++ b/configure.in > -@@ -52,7 +52,7 @@ AC_ARG_ENABLE(ssl, > - [ --enable-ssl support for secure connection to mail server]) > - if test x$enableval = xyes ; then > - AC_DEFINE(HAVE_SSL) > -- LIBS="$LIBS -lssl" > -+ LIBS="$LIBS -lssl -lcrypto" > - fi > - enableval="" > - > diff --git a/patches/ssmtp-2.64/autogen.sh b/patches/ssmtp-2.64/autogen.sh > deleted file mode 120000 > index 9f8a4cb7ddcb..000000000000 > --- a/patches/ssmtp-2.64/autogen.sh > +++ /dev/null > @@ -1 +0,0 @@ > -../autogen.sh > \ No newline at end of file > diff --git a/patches/ssmtp-2.64/series b/patches/ssmtp-2.64/series > deleted file mode 100644 > index b89ac6363a30..000000000000 > --- a/patches/ssmtp-2.64/series > +++ /dev/null > @@ -1,7 +0,0 @@ > -# generated by git-ptx-patches > -#tag:base --start-number 1 > -0001-use-LDFLAGS-for-linking.patch > -0002-use-DESTDIR-when-installing.patch > -0003-make-installing-non-interactive.patch > -0004-configure-if-using-ssl-link-against-libcrypto-too.patch > -# 4ac054ecac57de7c903a18a4dfcd2270 - git-ptx-patches magic > diff --git a/rules/ssmtp.in b/rules/ssmtp.in > deleted file mode 100644 > index 4dc745c33546..000000000000 > --- a/rules/ssmtp.in > +++ /dev/null > @@ -1,47 +0,0 @@ > -## SECTION=staging > -## old section: > -### SECTION=communication > -menuconfig SSMTP > - tristate > - prompt "ssmtp " > - select OPENSSL > - help > - ssmtp is a small program which can be used to send emails. > - It supports SSL, IPv6 and MD5 authentication. > - > - STAGING: remove in PTXdist 2026.03.0 > - Unmaintained in PTXdist, upstream dead and fails to build with > - current toolchains. > - > -if SSMTP > - > -config SSMTP_REWRITE_DOMAIN > - bool > - prompt "domain rewriting support" > - default y > - help > - Support for rewriting the sending domain. > - > -config SSMTP_SSL > - bool > - prompt "ssl support" > - help > - Support for secure connection to mail server (needs SSL shared > libraries). > - > -config SSMTP_MD5AUTH > - bool > - prompt "md5sum support" > - help > - Support for MD5 authentication. > - > -config SSMTP_SENDMAIL > - bool > - prompt "sendmail link" > - depends on !BUSYBOX_SENDMAIL || ALLYES > - help > - Install 'sendmail' as a symlink to ssmtp. > - > -comment "busybox' sendmail is selected!" > - depends on BUSYBOX_SENDMAIL > - > -endif > diff --git a/rules/ssmtp.make b/rules/ssmtp.make > deleted file mode 100644 > index 002c730c02a8..000000000000 > --- a/rules/ssmtp.make > +++ /dev/null > @@ -1,73 +0,0 @@ > -# -*-makefile-*- > -# > -# Copyright (C) 2005 by Steven Scholz <[email protected]> > -# (C) 2010 by Michael Olbrich <[email protected]> > -# > -# For further information about the PTXdist project and license conditions > -# see the README file. > -# > - > -# > -# We provide this package > -# > -PACKAGES-$(PTXCONF_SSMTP) += ssmtp > - > -# > -# Paths and names > -# > -SSMTP_VERSION := 2.64 > -SSMTP_MD5 := 65b4e0df4934a6cd08c506cabcbe584f > -SSMTP := ssmtp-$(SSMTP_VERSION) > -SSMTP_SUFFIX := tar.bz2 > -SSMTP_SRC := ssmtp_$(SSMTP_VERSION).orig.$(SSMTP_SUFFIX) > -SSMTP_URL := $(call ptx/mirror, DEB, > pool/main/s/ssmtp/$(SSMTP_SRC)) > -SSMTP_SOURCE := $(SRCDIR)/$(SSMTP_SRC) > -SSMTP_DIR := $(BUILDDIR)/ssmtp-$(SSMTP_VERSION) > -SSMTP_LICENSE := GPL-2.0-or-later > - > -# > ---------------------------------------------------------------------------- > -# Prepare > -# > ---------------------------------------------------------------------------- > - > -# > -# autoconf > -# > -SSMTP_CONF_TOOL := autoconf > -SSMTP_CONF_OPT := $(CROSS_AUTOCONF_USR) \ > - --$(call ptx/endis, PTXCONF_SSMTP_REWRITE_DOMAIN)-rewrite-domain \ > - --$(call ptx/endis, PTXCONF_SSMTP_SSL)-ssl \ > - --$(call ptx/endis, PTXCONF_GLOBAL_IPV6)-inet6 \ > - --$(call ptx/endis, PTXCONF_SSMTP_MD5AUTH)-md5auth > - > -SSMTP_MAKE_ENV := $(CROSS_ENV) > -SSMTP_MAKE_PAR := NO > - > -# > ---------------------------------------------------------------------------- > -# Target-Install > -# > ---------------------------------------------------------------------------- > - > -$(STATEDIR)/ssmtp.targetinstall: > - @$(call targetinfo) > - > - @$(call install_init, ssmtp) > - @$(call install_fixup, ssmtp,PRIORITY,optional) > - @$(call install_fixup, ssmtp,SECTION,base) > - @$(call install_fixup, ssmtp,AUTHOR,"Robert Schwebel > <[email protected]>") > - @$(call install_fixup, ssmtp,DESCRIPTION,missing) > - > - @$(call install_copy, ssmtp, 0, 0, 0755, -, /usr/sbin/ssmtp) > - > - @$(call install_alternative, ssmtp, 0, 0, 0644, /etc/ssmtp/ssmtp.conf) > - @$(call install_replace, ssmtp, /etc/ssmtp/ssmtp.conf, @HOSTNAME@, \ > - $(call remove_quotes,$(PTXCONF_ROOTFS_ETC_HOSTNAME))) > - > -ifdef PTXCONF_SSMTP_SENDMAIL > - @$(call install_link, ssmtp, /usr/sbin/ssmtp, /usr/sbin/sendmail) > - @$(call install_link, ssmtp, /usr/sbin/sendmail, /usr/lib/sendmail) > -endif > - > - @$(call install_finish, ssmtp) > - > - @$(call touch) > - > -# vim: syntax=make
