From mboxrd@z Thu Jan  1 00:00:00 1970
Delivery-date: Fri, 28 Oct 2022 16:44:52 +0200
Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33])
	by lore.white.stw.pengutronix.de with esmtps  (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
	(Exim 4.94.2)
	(envelope-from <ptxdist-bounces+lore=lore.pengutronix.de@pengutronix.de>)
	id 1ooQbM-005SXH-CH
	for lore@lore.pengutronix.de; Fri, 28 Oct 2022 16:44:52 +0200
Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de)
	by metis.ext.pengutronix.de with esmtp (Exim 4.92)
	(envelope-from <ptxdist-bounces@pengutronix.de>)
	id 1ooQbL-00070v-61; Fri, 28 Oct 2022 16:44:51 +0200
Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2])
 by metis.ext.pengutronix.de with esmtps
 (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92)
 (envelope-from <mol@pengutronix.de>)
 id 1ooQaf-0006Jw-3d; Fri, 28 Oct 2022 16:44:09 +0200
Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de)
 by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2)
 (envelope-from <mol@pengutronix.de>)
 id 1ooQaf-000v25-CE; Fri, 28 Oct 2022 16:44:08 +0200
Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.94.2)
 (envelope-from <mol@pengutronix.de>)
 id 1ooQad-009Q7o-QH; Fri, 28 Oct 2022 16:44:07 +0200
From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Date: Fri, 28 Oct 2022 16:44:07 +0200
Message-Id: <20221028144407.2244650-1-m.olbrich@pengutronix.de>
X-Mailer: git-send-email 2.30.2
In-Reply-To: <Y052K561zUeaCSVq@lenoch>
References: <Y052K561zUeaCSVq@lenoch>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: Re: [ptxdist] [APPLIED] proftpd: Use ptx/endis to enable options
X-BeenThere: ptxdist@pengutronix.de
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/cgi-bin/mailman/private/ptxdist/>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Reply-To: ptxdist@pengutronix.de
Cc: Ladislav Michl <oss-lists@triops.cz>
Sender: "ptxdist" <ptxdist-bounces@pengutronix.de>
X-SA-Exim-Connect-IP: 127.0.0.1
X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de
X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false

Thanks, applied as ccf0340b89cb754cf171fb9f8e88d2dc308b923c.

Michael

[sent from post-receive hook]

On Fri, 28 Oct 2022 16:44:07 +0200, Ladislav Michl <oss-lists@triops.cz> wrote:
> Remove some ifdefs and replace deprecated variables while there.
> 
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> Message-Id: <Y052K561zUeaCSVq@lenoch>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/proftpd.make b/rules/proftpd.make
> index 6554dced73b8..889a9fef8e69 100644
> --- a/rules/proftpd.make
> +++ b/rules/proftpd.make
> @@ -27,39 +27,20 @@ PROFTPD_DIR		:= $(BUILDDIR)/$(PROFTPD)
>  # Prepare
>  # ----------------------------------------------------------------------------
>  
> -PROFTPD_COMPILE_ENV	:= $(CROSS_ENV_CC_FOR_BUILD)
> +PROFTPD_MAKE_ENV	:= $(CROSS_ENV_CC_FOR_BUILD)
>  
>  #
>  # autoconf
>  #
> -PROFTPD_AUTOCONF	:= \
> +PROFTPD_CONF_TOOL	:= autoconf
> +PROFTPD_CONF_OPT	:= \
>  	$(CROSS_AUTOCONF_USR) \
>  	$(GLOBAL_IPV6_OPTION) \
> -	--disable-cap
> -
> -ifdef PTXCONF_PROFTPD_PAM
> -PROFTPD_AUTOCONF += --enable-auth-pam
> -else
> -PROFTPD_AUTOCONF += --disable-auth-pam
> -endif
> -
> -ifdef PTXCONF_PROFTPD_SENDFILE
> -PROFTPD_AUTOCONF += --enable-sendfile
> -else
> -PROFTPD_AUTOCONF += --disable-sendfile
> -endif
> -
> -ifdef PTXCONF_PROFTPD_SHADOW
> -PROFTPD_AUTOCONF += --enable-shadow
> -else
> -PROFTPD_AUTOCONF += --disable-shadow
> -endif
> -
> -ifdef PTXCONF_PROFTPD_AUTOSHADOW
> -PROFTPD_AUTOCONF += --enable-autoshadow
> -else
> -PROFTPD_AUTOCONF += --disable-autoshadow
> -endif
> +	--disable-cap \
> +	--$(call ptx/endis, PTXCONF_PROFTPD_PAM)-auth-pam \
> +	--$(call ptx/endis, PTXCONF_PROFTPD_SENDFILE)-sendfile \
> +	--$(call ptx/endis, PTXCONF_PROFTPD_SHADOW)-shadow \
> +	--$(call ptx/endis, PTXCONF_PROFTPD_AUTOSHADOW)-autoshadow
>  
>  PROFTPD_MAKE_PAR := NO
>