Skip to Content.
Sympa Menu

sm-commit - Re: [SM-Commit] PERFORCE change 76711 by Mathieu Lonjaret for review

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: "Mathieu L." <lejatorn AT smgl.homelinux.net>
  • To: Mathieu Lonjaret <lejatorn AT sourcemage.org>
  • Cc: duane_malcolm <d.malcolm AT auckland.ac.nz>, Unet <unet AT sourcemage.org>, Gareth Clay <gareth AT caffeinefuelled.co.uk>, "George J. Sherwood" <george AT beernabeer.com>, Eric Sandall <eric AT sandall.us>, Ladislav Hagara <ladislav.hagara AT unob.cz>, Jeremy Blosser <jblosser AT sourcemage.org>, Pol Vinogradov <vin.public AT gmail.com>, SM-Commit Daemon <sm-commit AT lists.ibiblio.org>, Arjan Bouter <abouter AT gmail.com>, AndraXX ruskie Levstik <ruskie AT mages.ath.cx>, Andrew Stitt <a AT t.armory.com>, Juuso Alasuutari <iuso AT sourcemage.org>, Robin Cook <rcook AT wyrms.net>, Arwed von Merkatz <v.merkatz AT gmx.net>, David Kowis <dkowis+smgl-p4 AT shlrm.org>, vladimir_marek <vlmarek AT volny.cz>, Ethan Grammatikidis <eekee AT eekee.is-a-geek.org>, Maurizio Boriani <baux AT member.fsf.org>
  • Subject: Re: [SM-Commit] PERFORCE change 76711 by Mathieu Lonjaret for review
  • Date: Sat, 25 Mar 2006 12:36:27 +0100

ok, I've been told it's working fine so pulling it into test.
Can it be pulled to stable too if nobody complains please?

Cheers,
Mathieu.

On Fri, Mar 24, 2006 at 04:15:00PM +0000, Perforce Review Daemon wrote:
> Change 76711 by mathieu_lonjaret@lejatorn-gluon on 2006/03/24 16:12:05
>
> reworked query
>
> Affected files ...
>
> ... //sgl/grimoires/devel/ftp/proftpd/BUILD#3 edit
> ... //sgl/grimoires/devel/ftp/proftpd/CONFIGURE#3 edit
> ... //sgl/grimoires/devel/ftp/proftpd/HISTORY#10 edit
>
> Differences ...
>
> ==== //sgl/grimoires/devel/ftp/proftpd/BUILD#3 (xtext) ====
>
> @@ -1,11 +1,9 @@
> if [[ $PROFTPD_DEVEL == "n" ]]; then
> if [[ -z $PROFTPD_CAPS ]]; then
> - if [[ $PROFTPD_NOPRELINK == "y" ]]; then
> CFLAGS=${CFLAGS/-fPIC} &&
> CFLAGS=${CFLAGS/-DPIC} &&
> CXXFLAGS=${CXXFLAGS/-fPIC} &&
> CXXFLAGS=${CXXFLAGS/-DPIC}
> - fi
> fi
> fi &&
>
>
> ==== //sgl/grimoires/devel/ftp/proftpd/CONFIGURE#3 (xtext) ====
>
> @@ -1,11 +1,11 @@
> +. $GRIMOIRE/FUNCTIONS &&
> if [[ $PROFTPD_DEVEL == "n" ]]; then
> - config_query_option PROFTPD_CAPS "Disable capabilities?" n
> \
> - "--disable-cap" ""
> &&
> - if [[ -z $PROFTPD_CAPS ]]; then
> - config_query PROFTPD_NOPRELINK "Disable prelink? (do that if it fails
> with \
> -an asm error)" n
> + if [[ $(get_sorcery_kernel_config CONFIG_SECURITY) != y ]]; then
> + config_query_option PROFTPD_CAPS \
> + "You don't have capabilities enabled in your kernel, do you still \
> + want to build them?" n "" "--disable-cap"
> fi
> -fi
> &&
> +fi &&
>
> #rest of the file still needs to be rewritten properly
> if ! grep -q 'CONFIGURED=\"y\"' ${DEPENDS_CONFIG}/proftpd; then
>
> ==== //sgl/grimoires/devel/ftp/proftpd/HISTORY#10 (text) ====
>
> @@ -1,3 +1,6 @@
> +2006-03-24 Mathieu Lonjaret <lejatorn AT sourcemage.org>
> + *BUILD, CONFIGURE: reworked query
> +
> 2006-03-20 Mathieu Lonjaret <lejatorn AT sourcemage.org>
> *BUILD, CONFIGURE, DETAILS, PREPARE: added queries to build even
> when capabilities are not kernel enabled.




Archive powered by MHonArc 2.6.24.

Top of Page