sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

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

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

On Sat, Mar 25, 2006 at 12:36:27PM +0100, Mathieu L. wrote:
> 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?

Let's give it a bit of time to soak in test to see if anyone complains,
prod one of us with stable access again in a week or so :)

> 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.
>

--
Arwed v. Merkatz Source Mage GNU/Linux developer
http://www.sourcemage.org

[SM-Commit] PERFORCE change 76711 by Mathieu Lonjaret for review, Perforce Review Daemon, 03/24/2006
- Re: [SM-Commit] PERFORCE change 76711 by Mathieu Lonjaret for review, Mathieu L., 03/25/2006
  - Re: [SM-Commit] PERFORCE change 76711 by Mathieu Lonjaret for review, Arwed von Merkatz, 03/26/2006