* [ptxdist] ssmtp: two new patches
@ 2012-07-30 15:54 Alexander Dahl
2012-07-30 15:54 ` [ptxdist] [PATCH 1/2] ssmtp: install optional symlinks from sendmail to ssmtp Alexander Dahl
` (2 more replies)
0 siblings, 3 replies; 14+ messages in thread
From: Alexander Dahl @ 2012-07-30 15:54 UTC (permalink / raw)
To: ptxdist
Hei hei,
I got two patches for the ssmtp package. The first one is the revised
version of a patch we discussed a month ago. The second one fixes the
build so autoconf is called correctly and all options are set with the
current ptxdist mechanisms. I used those just by having a look at
other packages using them since a few months now.
The second patch will change the path of the binary from /sbin/ssmtp
to the default /usr/sbin/ssmtp. It has been /sbin/ssmtp because
autoconf was not called correctly. I hope this does not break anything
imported. Note: the path of sendmail is still the same as in the first
patch (and didn't even exist before).
HTH & Greets
Alex
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 14+ messages in thread
* [ptxdist] [PATCH 1/2] ssmtp: install optional symlinks from sendmail to ssmtp
2012-07-30 15:54 [ptxdist] ssmtp: two new patches Alexander Dahl
@ 2012-07-30 15:54 ` Alexander Dahl
2012-09-13 15:59 ` Michael Olbrich
2012-07-30 15:54 ` [ptxdist] [PATCH 2/2] ssmtp: update setting build options to current ptxdist mechanisms Alexander Dahl
2012-08-27 16:21 ` [ptxdist] ssmtp: two new patches Alexander Dahl
2 siblings, 1 reply; 14+ messages in thread
From: Alexander Dahl @ 2012-07-30 15:54 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Alexander Dahl <post@lespocky.de>
---
rules/ssmtp.in | 6 ++++++
rules/ssmtp.make | 5 +++++
2 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/rules/ssmtp.in b/rules/ssmtp.in
index 302dccc..5813eed 100644
--- a/rules/ssmtp.in
+++ b/rules/ssmtp.in
@@ -35,4 +35,10 @@ config SSMTP_MD5AUTH
help
Support for MD5 authentication.
+config SSMTP_SENDMAIL
+ bool
+ prompt "sendmail link"
+ help
+ Install 'sendmail' as a symlink to ssmtp.
+
endif
diff --git a/rules/ssmtp.make b/rules/ssmtp.make
index 36368b2..50753d0 100644
--- a/rules/ssmtp.make
+++ b/rules/ssmtp.make
@@ -73,6 +73,11 @@ $(STATEDIR)/ssmtp.targetinstall:
@$(call install_copy, ssmtp, 0, 0, 0755, -, /sbin/ssmtp)
+ifdef PTXCONF_SSMTP_SENDMAIL
+ @$(call install_link, ssmtp, /sbin/ssmtp, /usr/sbin/sendmail)
+ @$(call install_link, ssmtp, /usr/sbin/sendmail, /usr/lib/sendmail)
+endif
+
@$(call install_finish, ssmtp)
@$(call touch)
--
1.7.2.5
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 14+ messages in thread
* [ptxdist] [PATCH 2/2] ssmtp: update setting build options to current ptxdist mechanisms
2012-07-30 15:54 [ptxdist] ssmtp: two new patches Alexander Dahl
2012-07-30 15:54 ` [ptxdist] [PATCH 1/2] ssmtp: install optional symlinks from sendmail to ssmtp Alexander Dahl
@ 2012-07-30 15:54 ` Alexander Dahl
2012-09-13 16:00 ` Michael Olbrich
2012-08-27 16:21 ` [ptxdist] ssmtp: two new patches Alexander Dahl
2 siblings, 1 reply; 14+ messages in thread
From: Alexander Dahl @ 2012-07-30 15:54 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Alexander Dahl <post@lespocky.de>
---
rules/ssmtp.make | 27 ++++++++-------------------
1 files changed, 8 insertions(+), 19 deletions(-)
diff --git a/rules/ssmtp.make b/rules/ssmtp.make
index 50753d0..80c6bb8 100644
--- a/rules/ssmtp.make
+++ b/rules/ssmtp.make
@@ -37,23 +37,12 @@ SSMTP_CONF_ENV := $(CROSS_ENV)
#
# autoconf
#
-SSMTP_AUTOCONF := $(CROSS_AUTOCONF_ROOT)
-
-ifndef PTXCONF_SSMTP_REWRITE_DOMAIN
-SSMTP_AUTOCONF += --disable-rewrite-domain
-endif
-
-ifdef PTXCONF_SSMTP_SSL
-SSMTP_AUTOCONF += --enable-ssl
-endif
-
-ifdef PTXCONF_SSMTP_INET6
-SSMTP_AUTOCONF += --enable-inet6
-endif
-
-ifdef PTXCONF_SSMTP_MD5AUTH
-SSMTP_AUTOCONF += --enable-md5auth
-endif
+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_SSMTP_INET6)-inet6 \
+ --$(call ptx/endis, PTXCONF_SSMTP_MD5AUTH)-md5auth
SSMTP_MAKE_ENV := $(CROSS_ENV)
SSMTP_MAKE_PAR := NO
@@ -71,10 +60,10 @@ $(STATEDIR)/ssmtp.targetinstall:
@$(call install_fixup, ssmtp,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
@$(call install_fixup, ssmtp,DESCRIPTION,missing)
- @$(call install_copy, ssmtp, 0, 0, 0755, -, /sbin/ssmtp)
+ @$(call install_copy, ssmtp, 0, 0, 0755, -, /usr/sbin/ssmtp)
ifdef PTXCONF_SSMTP_SENDMAIL
- @$(call install_link, ssmtp, /sbin/ssmtp, /usr/sbin/sendmail)
+ @$(call install_link, ssmtp, /usr/sbin/ssmtp, /usr/sbin/sendmail)
@$(call install_link, ssmtp, /usr/sbin/sendmail, /usr/lib/sendmail)
endif
--
1.7.2.5
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [ptxdist] ssmtp: two new patches
2012-07-30 15:54 [ptxdist] ssmtp: two new patches Alexander Dahl
2012-07-30 15:54 ` [ptxdist] [PATCH 1/2] ssmtp: install optional symlinks from sendmail to ssmtp Alexander Dahl
2012-07-30 15:54 ` [ptxdist] [PATCH 2/2] ssmtp: update setting build options to current ptxdist mechanisms Alexander Dahl
@ 2012-08-27 16:21 ` Alexander Dahl
2012-09-12 9:07 ` Alexander Dahl
2 siblings, 1 reply; 14+ messages in thread
From: Alexander Dahl @ 2012-08-27 16:21 UTC (permalink / raw)
To: ptxdist
[-- Attachment #1.1: Type: text/plain, Size: 786 bytes --]
Hello,
On Mon, Jul 30, 2012 at 05:54:51PM +0200, Alexander Dahl wrote:
> I got two patches for the ssmtp package. The first one is the revised
> version of a patch we discussed a month ago. The second one fixes the
> build so autoconf is called correctly and all options are set with the
> current ptxdist mechanisms. I used those just by having a look at
> other packages using them since a few months now.
>
> The second patch will change the path of the binary from /sbin/ssmtp
> to the default /usr/sbin/ssmtp. It has been /sbin/ssmtp because
> autoconf was not called correctly. I hope this does not break anything
> imported. Note: the path of sendmail is still the same as in the first
> patch (and didn't even exist before).
What about those?
Greets
Alex
[-- Attachment #1.2: Type: application/pgp-signature, Size: 198 bytes --]
[-- Attachment #2: Type: text/plain, Size: 48 bytes --]
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [ptxdist] ssmtp: two new patches
2012-08-27 16:21 ` [ptxdist] ssmtp: two new patches Alexander Dahl
@ 2012-09-12 9:07 ` Alexander Dahl
0 siblings, 0 replies; 14+ messages in thread
From: Alexander Dahl @ 2012-09-12 9:07 UTC (permalink / raw)
To: ptxdist
Hei hei,
Am 2012-08-27 18:21, schrieb Alexander Dahl:
> What about those?
Did these patches appear on the list? O:-) ;-)
Greets
Alex
--
»With the first link, the chain is forged. The first speech censured,
the first thought forbidden, the first freedom denied, chains us all
irrevocably.« (Jean-Luc Picard, quoting Judge Aaron Satie)
*** GnuPG-FP: 02C8 A590 7FE5 CA5F 3601 D1D5 8FBA 7744 CC87 10D0 ***
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [ptxdist] [PATCH 1/2] ssmtp: install optional symlinks from sendmail to ssmtp
2012-07-30 15:54 ` [ptxdist] [PATCH 1/2] ssmtp: install optional symlinks from sendmail to ssmtp Alexander Dahl
@ 2012-09-13 15:59 ` Michael Olbrich
2012-09-24 13:21 ` [ptxdist] [PATCH] " Alexander Dahl
0 siblings, 1 reply; 14+ messages in thread
From: Michael Olbrich @ 2012-09-13 15:59 UTC (permalink / raw)
To: ptxdist
On Mon, Jul 30, 2012 at 05:54:52PM +0200, Alexander Dahl wrote:
>
> Signed-off-by: Alexander Dahl <post@lespocky.de>
> ---
> rules/ssmtp.in | 6 ++++++
> rules/ssmtp.make | 5 +++++
> 2 files changed, 11 insertions(+), 0 deletions(-)
>
> diff --git a/rules/ssmtp.in b/rules/ssmtp.in
> index 302dccc..5813eed 100644
> --- a/rules/ssmtp.in
> +++ b/rules/ssmtp.in
> @@ -35,4 +35,10 @@ config SSMTP_MD5AUTH
> help
> Support for MD5 authentication.
>
> +config SSMTP_SENDMAIL
> + bool
> + prompt "sendmail link"
> + help
> + Install 'sendmail' as a symlink to ssmtp.
This needs the usual check for BUSYBOX_SENDMAIL
Take a look at rules/coreutils.in if you don't know how to do this.
Michael
> +
> endif
> diff --git a/rules/ssmtp.make b/rules/ssmtp.make
> index 36368b2..50753d0 100644
> --- a/rules/ssmtp.make
> +++ b/rules/ssmtp.make
> @@ -73,6 +73,11 @@ $(STATEDIR)/ssmtp.targetinstall:
>
> @$(call install_copy, ssmtp, 0, 0, 0755, -, /sbin/ssmtp)
>
> +ifdef PTXCONF_SSMTP_SENDMAIL
> + @$(call install_link, ssmtp, /sbin/ssmtp, /usr/sbin/sendmail)
> + @$(call install_link, ssmtp, /usr/sbin/sendmail, /usr/lib/sendmail)
> +endif
> +
> @$(call install_finish, ssmtp)
>
> @$(call touch)
> --
> 1.7.2.5
>
>
> --
> ptxdist mailing list
> ptxdist@pengutronix.de
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [ptxdist] [PATCH 2/2] ssmtp: update setting build options to current ptxdist mechanisms
2012-07-30 15:54 ` [ptxdist] [PATCH 2/2] ssmtp: update setting build options to current ptxdist mechanisms Alexander Dahl
@ 2012-09-13 16:00 ` Michael Olbrich
2012-09-24 13:17 ` Alexander Dahl
0 siblings, 1 reply; 14+ messages in thread
From: Michael Olbrich @ 2012-09-13 16:00 UTC (permalink / raw)
To: ptxdist
On Mon, Jul 30, 2012 at 05:54:53PM +0200, Alexander Dahl wrote:
>
> Signed-off-by: Alexander Dahl <post@lespocky.de>
> ---
> rules/ssmtp.make | 27 ++++++++-------------------
> 1 files changed, 8 insertions(+), 19 deletions(-)
>
> diff --git a/rules/ssmtp.make b/rules/ssmtp.make
> index 50753d0..80c6bb8 100644
> --- a/rules/ssmtp.make
> +++ b/rules/ssmtp.make
> @@ -37,23 +37,12 @@ SSMTP_CONF_ENV := $(CROSS_ENV)
> #
> # autoconf
> #
> -SSMTP_AUTOCONF := $(CROSS_AUTOCONF_ROOT)
> -
> -ifndef PTXCONF_SSMTP_REWRITE_DOMAIN
> -SSMTP_AUTOCONF += --disable-rewrite-domain
> -endif
> -
> -ifdef PTXCONF_SSMTP_SSL
> -SSMTP_AUTOCONF += --enable-ssl
> -endif
> -
> -ifdef PTXCONF_SSMTP_INET6
> -SSMTP_AUTOCONF += --enable-inet6
> -endif
> -
> -ifdef PTXCONF_SSMTP_MD5AUTH
> -SSMTP_AUTOCONF += --enable-md5auth
> -endif
> +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_SSMTP_INET6)-inet6 \
> + --$(call ptx/endis, PTXCONF_SSMTP_MD5AUTH)-md5auth
any special reason why you switch from CROSS_AUTOCONF_ROOT to
CROSS_AUTOCONF_USR?
Michael
>
> SSMTP_MAKE_ENV := $(CROSS_ENV)
> SSMTP_MAKE_PAR := NO
> @@ -71,10 +60,10 @@ $(STATEDIR)/ssmtp.targetinstall:
> @$(call install_fixup, ssmtp,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
> @$(call install_fixup, ssmtp,DESCRIPTION,missing)
>
> - @$(call install_copy, ssmtp, 0, 0, 0755, -, /sbin/ssmtp)
> + @$(call install_copy, ssmtp, 0, 0, 0755, -, /usr/sbin/ssmtp)
>
> ifdef PTXCONF_SSMTP_SENDMAIL
> - @$(call install_link, ssmtp, /sbin/ssmtp, /usr/sbin/sendmail)
> + @$(call install_link, ssmtp, /usr/sbin/ssmtp, /usr/sbin/sendmail)
> @$(call install_link, ssmtp, /usr/sbin/sendmail, /usr/lib/sendmail)
> endif
>
> --
> 1.7.2.5
>
>
> --
> ptxdist mailing list
> ptxdist@pengutronix.de
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [ptxdist] [PATCH 2/2] ssmtp: update setting build options to current ptxdist mechanisms
2012-09-13 16:00 ` Michael Olbrich
@ 2012-09-24 13:17 ` Alexander Dahl
2012-09-30 13:01 ` Michael Olbrich
0 siblings, 1 reply; 14+ messages in thread
From: Alexander Dahl @ 2012-09-24 13:17 UTC (permalink / raw)
To: ptxdist
Hei hei,
Am 2012-09-13 18:00, schrieb Michael Olbrich:
> any special reason why you switch from CROSS_AUTOCONF_ROOT to
> CROSS_AUTOCONF_USR?
No reason. I guess this is what I saw in other packages and just
adopted. What's the difference? Where is it defined? What is the usual
content? O:-)
Greets
Alex
--
»With the first link, the chain is forged. The first speech censured,
the first thought forbidden, the first freedom denied, chains us all
irrevocably.« (Jean-Luc Picard, quoting Judge Aaron Satie)
*** GnuPG-FP: 02C8 A590 7FE5 CA5F 3601 D1D5 8FBA 7744 CC87 10D0 ***
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 14+ messages in thread
* [ptxdist] [PATCH] ssmtp: install optional symlinks from sendmail to ssmtp
2012-09-13 15:59 ` Michael Olbrich
@ 2012-09-24 13:21 ` Alexander Dahl
0 siblings, 0 replies; 14+ messages in thread
From: Alexander Dahl @ 2012-09-24 13:21 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Alexander Dahl <post@lespocky.de>
---
rules/ssmtp.in | 10 ++++++++++
rules/ssmtp.make | 5 +++++
2 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/rules/ssmtp.in b/rules/ssmtp.in
index 302dccc..5ba834a 100644
--- a/rules/ssmtp.in
+++ b/rules/ssmtp.in
@@ -35,4 +35,14 @@ config SSMTP_MD5AUTH
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
index 36368b2..50753d0 100644
--- a/rules/ssmtp.make
+++ b/rules/ssmtp.make
@@ -73,6 +73,11 @@ $(STATEDIR)/ssmtp.targetinstall:
@$(call install_copy, ssmtp, 0, 0, 0755, -, /sbin/ssmtp)
+ifdef PTXCONF_SSMTP_SENDMAIL
+ @$(call install_link, ssmtp, /sbin/ssmtp, /usr/sbin/sendmail)
+ @$(call install_link, ssmtp, /usr/sbin/sendmail, /usr/lib/sendmail)
+endif
+
@$(call install_finish, ssmtp)
@$(call touch)
--
1.7.2.5
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [ptxdist] [PATCH 2/2] ssmtp: update setting build options to current ptxdist mechanisms
2012-09-24 13:17 ` Alexander Dahl
@ 2012-09-30 13:01 ` Michael Olbrich
2012-09-30 13:56 ` Alexander Dahl
0 siblings, 1 reply; 14+ messages in thread
From: Michael Olbrich @ 2012-09-30 13:01 UTC (permalink / raw)
To: ptxdist
On Mon, Sep 24, 2012 at 03:17:09PM +0200, Alexander Dahl wrote:
> Am 2012-09-13 18:00, schrieb Michael Olbrich:
> > any special reason why you switch from CROSS_AUTOCONF_ROOT to
> > CROSS_AUTOCONF_USR?
>
> No reason.
Then leave it as it is.
> I guess this is what I saw in other packages and just
> adopted. What's the difference? Where is it defined? What is the usual
> content? O:-)
CROSS_AUTOCONF_ROOT -> configure is called with --prefix=/
CROSS_AUTOCONF_USR -> configure is called with --prefix=/usr
When I create a new package I usually use what other distros are using. In
most cases that's /usr. Unless there is a good reason, this should not be
changed for any existing package.
Michael
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [ptxdist] [PATCH 2/2] ssmtp: update setting build options to current ptxdist mechanisms
2012-09-30 13:01 ` Michael Olbrich
@ 2012-09-30 13:56 ` Alexander Dahl
2012-09-30 15:36 ` Michael Olbrich
0 siblings, 1 reply; 14+ messages in thread
From: Alexander Dahl @ 2012-09-30 13:56 UTC (permalink / raw)
To: ptxdist
[-- Attachment #1.1: Type: text/plain, Size: 1137 bytes --]
Hei hei,
On Sun, Sep 30, 2012 at 03:01:34PM +0200, Michael Olbrich wrote:
> CROSS_AUTOCONF_ROOT -> configure is called with --prefix=/
> CROSS_AUTOCONF_USR -> configure is called with --prefix=/usr
Ah I see. Thanks for explaining.
> When I create a new package I usually use what other distros are using. In
> most cases that's /usr. Unless there is a good reason, this should not be
> changed for any existing package.
Then this is some kind of conflict. In Debian (where ssmtp comes from)
and Ubuntu prefix is set to /usr so the paths end up /usr/sbin/ssmtp.
Without this would be /sbin/ssmtp as before in ptxdist. We could leave
it there but I'd like the symlink of sendmail to be in
/usr/sbin/sendmail.
I guess you assume this could break someones setup when changing from
/sbin/ssmtp to /usr/sbin/ssmtp right?
Greets
Alex
--
»With the first link, the chain is forged. The first speech censured,
the first thought forbidden, the first freedom denied, chains us all
irrevocably.« (Jean-Luc Picard, quoting Judge Aaron Satie)
*** GnuPG-FP: 02C8 A590 7FE5 CA5F 3601 D1D5 8FBA 7744 CC87 10D0 ***
[-- Attachment #1.2: Type: application/pgp-signature, Size: 198 bytes --]
[-- Attachment #2: Type: text/plain, Size: 48 bytes --]
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [ptxdist] [PATCH 2/2] ssmtp: update setting build options to current ptxdist mechanisms
2012-09-30 13:56 ` Alexander Dahl
@ 2012-09-30 15:36 ` Michael Olbrich
2012-10-01 9:03 ` [ptxdist] [PATCH] " Alexander Dahl
0 siblings, 1 reply; 14+ messages in thread
From: Michael Olbrich @ 2012-09-30 15:36 UTC (permalink / raw)
To: ptxdist
On Sun, Sep 30, 2012 at 03:56:19PM +0200, Alexander Dahl wrote:
> On Sun, Sep 30, 2012 at 03:01:34PM +0200, Michael Olbrich wrote:
> > When I create a new package I usually use what other distros are using. In
> > most cases that's /usr. Unless there is a good reason, this should not be
> > changed for any existing package.
>
> Then this is some kind of conflict. In Debian (where ssmtp comes from)
> and Ubuntu prefix is set to /usr so the paths end up /usr/sbin/ssmtp.
> Without this would be /sbin/ssmtp as before in ptxdist. We could leave
> it there but I'd like the symlink of sendmail to be in
> /usr/sbin/sendmail.
>
> I guess you assume this could break someones setup when changing from
> /sbin/ssmtp to /usr/sbin/ssmtp right?
Exactly. However, having a new symlink /usr/sbin/sendmail that points to
/sbin/ssmtp is not a problem. So I merged your first patch.
Michael
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 14+ messages in thread
* [ptxdist] [PATCH] ssmtp: update setting build options to current ptxdist mechanisms
2012-09-30 15:36 ` Michael Olbrich
@ 2012-10-01 9:03 ` Alexander Dahl
2012-10-12 9:58 ` Michael Olbrich
0 siblings, 1 reply; 14+ messages in thread
From: Alexander Dahl @ 2012-10-01 9:03 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Alexander Dahl <post@lespocky.de>
---
rules/ssmtp.make | 25 +++++++------------------
1 files changed, 7 insertions(+), 18 deletions(-)
diff --git a/rules/ssmtp.make b/rules/ssmtp.make
index 50753d0..f78ed0e 100644
--- a/rules/ssmtp.make
+++ b/rules/ssmtp.make
@@ -37,23 +37,12 @@ SSMTP_CONF_ENV := $(CROSS_ENV)
#
# autoconf
#
-SSMTP_AUTOCONF := $(CROSS_AUTOCONF_ROOT)
-
-ifndef PTXCONF_SSMTP_REWRITE_DOMAIN
-SSMTP_AUTOCONF += --disable-rewrite-domain
-endif
-
-ifdef PTXCONF_SSMTP_SSL
-SSMTP_AUTOCONF += --enable-ssl
-endif
-
-ifdef PTXCONF_SSMTP_INET6
-SSMTP_AUTOCONF += --enable-inet6
-endif
-
-ifdef PTXCONF_SSMTP_MD5AUTH
-SSMTP_AUTOCONF += --enable-md5auth
-endif
+SSMTP_CONF_TOOL := autoconf
+SSMTP_CONF_OPT := $(CROSS_AUTOCONF_ROOT) \
+ --$(call ptx/endis, PTXCONF_SSMTP_REWRITE_DOMAIN)-rewrite-domain \
+ --$(call ptx/endis, PTXCONF_SSMTP_SSL)-ssl \
+ --$(call ptx/endis, PTXCONF_SSMTP_INET6)-inet6 \
+ --$(call ptx/endis, PTXCONF_SSMTP_MD5AUTH)-md5auth
SSMTP_MAKE_ENV := $(CROSS_ENV)
SSMTP_MAKE_PAR := NO
@@ -71,7 +60,7 @@ $(STATEDIR)/ssmtp.targetinstall:
@$(call install_fixup, ssmtp,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
@$(call install_fixup, ssmtp,DESCRIPTION,missing)
- @$(call install_copy, ssmtp, 0, 0, 0755, -, /sbin/ssmtp)
+ @$(call install_copy, ssmtp, root, root, 0755, -, /sbin/ssmtp)
ifdef PTXCONF_SSMTP_SENDMAIL
@$(call install_link, ssmtp, /sbin/ssmtp, /usr/sbin/sendmail)
--
1.7.2.5
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [ptxdist] [PATCH] ssmtp: update setting build options to current ptxdist mechanisms
2012-10-01 9:03 ` [ptxdist] [PATCH] " Alexander Dahl
@ 2012-10-12 9:58 ` Michael Olbrich
0 siblings, 0 replies; 14+ messages in thread
From: Michael Olbrich @ 2012-10-12 9:58 UTC (permalink / raw)
To: ptxdist
On Mon, Oct 01, 2012 at 11:03:13AM +0200, Alexander Dahl wrote:
>
> Signed-off-by: Alexander Dahl <post@lespocky.de>
> ---
> rules/ssmtp.make | 25 +++++++------------------
> 1 files changed, 7 insertions(+), 18 deletions(-)
>
> diff --git a/rules/ssmtp.make b/rules/ssmtp.make
> index 50753d0..f78ed0e 100644
> --- a/rules/ssmtp.make
> +++ b/rules/ssmtp.make
> @@ -37,23 +37,12 @@ SSMTP_CONF_ENV := $(CROSS_ENV)
> #
> # autoconf
> #
> -SSMTP_AUTOCONF := $(CROSS_AUTOCONF_ROOT)
> -
> -ifndef PTXCONF_SSMTP_REWRITE_DOMAIN
> -SSMTP_AUTOCONF += --disable-rewrite-domain
> -endif
> -
> -ifdef PTXCONF_SSMTP_SSL
> -SSMTP_AUTOCONF += --enable-ssl
> -endif
> -
> -ifdef PTXCONF_SSMTP_INET6
> -SSMTP_AUTOCONF += --enable-inet6
> -endif
> -
> -ifdef PTXCONF_SSMTP_MD5AUTH
> -SSMTP_AUTOCONF += --enable-md5auth
> -endif
> +SSMTP_CONF_TOOL := autoconf
> +SSMTP_CONF_OPT := $(CROSS_AUTOCONF_ROOT) \
> + --$(call ptx/endis, PTXCONF_SSMTP_REWRITE_DOMAIN)-rewrite-domain \
> + --$(call ptx/endis, PTXCONF_SSMTP_SSL)-ssl \
> + --$(call ptx/endis, PTXCONF_SSMTP_INET6)-inet6 \
> + --$(call ptx/endis, PTXCONF_SSMTP_MD5AUTH)-md5auth
>
> SSMTP_MAKE_ENV := $(CROSS_ENV)
> SSMTP_MAKE_PAR := NO
> @@ -71,7 +60,7 @@ $(STATEDIR)/ssmtp.targetinstall:
> @$(call install_fixup, ssmtp,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
> @$(call install_fixup, ssmtp,DESCRIPTION,missing)
>
> - @$(call install_copy, ssmtp, 0, 0, 0755, -, /sbin/ssmtp)
> + @$(call install_copy, ssmtp, root, root, 0755, -, /sbin/ssmtp)
I've removed this part. For root numerical ids are ok.
I've applied the rest.
Thanks,
Michael
>
> ifdef PTXCONF_SSMTP_SENDMAIL
> @$(call install_link, ssmtp, /sbin/ssmtp, /usr/sbin/sendmail)
> --
> 1.7.2.5
>
>
> --
> ptxdist mailing list
> ptxdist@pengutronix.de
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2012-10-12 9:58 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-07-30 15:54 [ptxdist] ssmtp: two new patches Alexander Dahl
2012-07-30 15:54 ` [ptxdist] [PATCH 1/2] ssmtp: install optional symlinks from sendmail to ssmtp Alexander Dahl
2012-09-13 15:59 ` Michael Olbrich
2012-09-24 13:21 ` [ptxdist] [PATCH] " Alexander Dahl
2012-07-30 15:54 ` [ptxdist] [PATCH 2/2] ssmtp: update setting build options to current ptxdist mechanisms Alexander Dahl
2012-09-13 16:00 ` Michael Olbrich
2012-09-24 13:17 ` Alexander Dahl
2012-09-30 13:01 ` Michael Olbrich
2012-09-30 13:56 ` Alexander Dahl
2012-09-30 15:36 ` Michael Olbrich
2012-10-01 9:03 ` [ptxdist] [PATCH] " Alexander Dahl
2012-10-12 9:58 ` Michael Olbrich
2012-08-27 16:21 ` [ptxdist] ssmtp: two new patches Alexander Dahl
2012-09-12 9:07 ` Alexander Dahl
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox