Re: Bad news on LEAP fix patch

2007-07-11 Thread Aaron Konstam
On Wed, 2007-07-11 at 09:18 +0100, Jon Escombe wrote:
 - Aaron Konstam [EMAIL PROTECTED] wrote:
  I took the src rpm :NetworkManager-0.6.5-7.fc7.src.rpm and recompiled it
  using the LEAP patch NetworkManager-0.6.5-LEAP_passwd.patch developed by
  Jon Escombe. Nothing improved. The behavior is the same.
 
 Thinking about it, are you confident the patch applied ok? Did you build a 
 new version of the RPM, applying the patch in the .spec file?
 
 Cheers,
 Jon.
That is exactly what I did.
In the spec file  NetworkManager.spec I had the lines:
Patch0: NetworkManager-0.6.4-startup-dhcdbd.patch
Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch
Patch2: linkdebug.patch
Patch3: NetworkManager-0.6.5-no-killswitch-fix.patch
Patch4: NetworkManager-0.6.5-LEAP_passwd.patch

And I added the NetworkManager-0.6.5-LEAP_passwd.patch file to the 
/usr/src/redhat/SOURCES 
directory.

Then I recompiled the rpms by execuuting:
rpmbuild -ba  NetworkManager.spec 

Does that seem right?

-- 
Aaron Konstam [EMAIL PROTECTED]

___
NetworkManager-list mailing list
NetworkManager-list@gnome.org
http://mail.gnome.org/mailman/listinfo/networkmanager-list


Re: Bad news on LEAP fix patch

2007-07-11 Thread Derek Atkins
Aaron Konstam [EMAIL PROTECTED] writes:

 That is exactly what I did.
 In the spec file  NetworkManager.spec I had the lines:
 Patch0: NetworkManager-0.6.4-startup-dhcdbd.patch
 Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch
 Patch2: linkdebug.patch
 Patch3: NetworkManager-0.6.5-no-killswitch-fix.patch
 Patch4: NetworkManager-0.6.5-LEAP_passwd.patch

 And I added the NetworkManager-0.6.5-LEAP_passwd.patch file to the 
 /usr/src/redhat/SOURCES 
 directory.

In the %prep section did you add the appropriate %patchN (where 'N' is
the PatchN: you added here)?

 Then I recompiled the rpms by execuuting:
 rpmbuild -ba  NetworkManager.spec 

 Does that seem right?

See above..  It's correct IFF you also added the %patchN

-derek
-- 
   Derek Atkins, SB '93 MIT EE, SM '95 MIT Media Laboratory
   Member, MIT Student Information Processing Board  (SIPB)
   URL: http://web.mit.edu/warlord/PP-ASEL-IA N1NWH
   [EMAIL PROTECTED]PGP key available
___
NetworkManager-list mailing list
NetworkManager-list@gnome.org
http://mail.gnome.org/mailman/listinfo/networkmanager-list


Re: Bad news on LEAP fix patch

2007-07-11 Thread Aaron Konstam
On Wed, 2007-07-11 at 18:06 +0100, Jon Escombe wrote:
 - Derek Atkins [EMAIL PROTECTED] wrote:
  Aaron Konstam [EMAIL PROTECTED] writes:
  
   That is exactly what I did.
  
  In the %prep section did you add the appropriate %patchN (where 'N' is
  the PatchN: you added here)?
 
 Well spotted, I'd missed that. 
 Fingers crossed that was the missing piece and the patch is okay ;)
 
 Regards,
 Jon.
Well that is right ,I blew it. I will make that change and try again.
I assume the added line should be:

%patch4 -p1 -b .LEAP_passwd

Someone let me know if this is not correct.
-- 
Aaron Konstam [EMAIL PROTECTED]

___
NetworkManager-list mailing list
NetworkManager-list@gnome.org
http://mail.gnome.org/mailman/listinfo/networkmanager-list


Re: Bad news on LEAP fix patch

2007-07-11 Thread Jon Escombe

- Aaron Konstam [EMAIL PROTECTED] wrote:
 On Wed, 2007-07-11 at 18:06 +0100, Jon Escombe wrote:
  - Derek Atkins [EMAIL PROTECTED] wrote:
   Aaron Konstam [EMAIL PROTECTED] writes:
   
That is exactly what I did.
   
   In the %prep section did you add the appropriate %patchN (where 'N' is
   the PatchN: you added here)?
  
  Well spotted, I'd missed that. 
  Fingers crossed that was the missing piece and the patch is okay ;)
  
  Regards,
  Jon.
 Well that is right ,I blew it. I will make that change and try again.
 I assume the added line should be:
 
 %patch4 -p1 -b .LEAP_passwd
 
 Someone let me know if this is not correct.

Yep, that last parameter is just a suffix for a backup copy of the file, so can 
be whatever you like..

The last spec file I have has the applet patches in a second section (just 
underneath the tar command), you'll want to put this one there too..

Cheers,
Jon.

___
NetworkManager-list mailing list
NetworkManager-list@gnome.org
http://mail.gnome.org/mailman/listinfo/networkmanager-list


Re: Bad news on LEAP fix patch

2007-07-11 Thread Derek Atkins
Quoting Aaron Konstam [EMAIL PROTECTED]:

 Well that is right ,I blew it. I will make that change and try again.
 I assume the added line should be:

 %patch4 -p1 -b .LEAP_passwd

 Someone let me know if this is not correct.

Um, maybe?  without seeing the patch and the rest of the SPEC I can't
tell you for sure, but I can say that this is certainly the correct
format of the line you need to insert.

 Aaron Konstam [EMAIL PROTECTED]

-derek

-- 
   Derek Atkins, SB '93 MIT EE, SM '95 MIT Media Laboratory
   Member, MIT Student Information Processing Board  (SIPB)
   URL: http://web.mit.edu/warlord/PP-ASEL-IA N1NWH
   [EMAIL PROTECTED]PGP key available

___
NetworkManager-list mailing list
NetworkManager-list@gnome.org
http://mail.gnome.org/mailman/listinfo/networkmanager-list


Re: Bad news on LEAP fix patch

2007-07-11 Thread Jon Escombe

- Aaron Konstam [EMAIL PROTECTED] wrote:

 Now I am in trouble when I added the line:
 %patch4 -p1 -b .LEAP_passwd

 What am I supposed to enter here or have I gone really astray?
 

No, I must have ;)

Looks like the patch I posted doesn't apply against the latest source RPM. 
I'll generate another one in a couple of hours..

Cheers,
Jon.

___
NetworkManager-list mailing list
NetworkManager-list@gnome.org
http://mail.gnome.org/mailman/listinfo/networkmanager-list


Re: Bad news on LEAP fix patch - the story continues

2007-07-11 Thread Aaron Konstam
On Wed, 2007-07-11 at 22:27 +0100, Jon Escombe wrote:
 - Aaron Konstam [EMAIL PROTECTED] wrote:
  On Wed, 2007-07-11 at 18:06 +0100, Jon Escombe wrote:
   - Derek Atkins [EMAIL PROTECTED] wrote:
Aaron Konstam [EMAIL PROTECTED] writes:

 That is exactly what I did.

In the %prep section did you add the appropriate %patchN (where 'N' is
the PatchN: you added here)?
   
   Well spotted, I'd missed that. 
   Fingers crossed that was the missing piece and the patch is okay ;)
   
   Regards,
   Jon.
  Well that is right ,I blew it. I will make that change and try again.
  I assume the added line should be:
  
  %patch4 -p1 -b .LEAP_passwd
  
  Someone let me know if this is not correct.
 
 Yep, that last parameter is just a suffix for a backup copy of the file, so 
 can be whatever you like..
 
 The last spec file I have has the applet patches in a second section (just 
 underneath the tar command), you'll want to put this one there too..
 
 Cheers,
 Jon.
 
Now we are really getting into black magic. I changed the lines:

%prep
%setup -q
%patch0 -p1 -b .startup-dhcdbd
%patch2 -p1 -b .linkdebug
%patch3 -p1 -b .no-killswitch-fix
%patch4 -p1 -b .LEAP_passwd

# unpack the applet
tar -xjf %{SOURCE1}
%patch1 -p1 -b .buildfix

To:

%prep
%setup -q
%patch0 -p1 -b .startup-dhcdbd
%patch2 -p1 -b .linkdebug
%patch3 -p1 -b .no-killswitch-fix

# unpack the applet
tar -xjf %{SOURCE1}
%patch1 -p1 -b .buildfix
%patch4 -p1 -b .LEAP_passwd

and now executing rpmbuild -ba gives a successful compile.

Will someone confirm that this is ok and I can install the rpms
produced.?




--
===
I think the world is run by C students. -- Al McGuire
===
Aaron Konstam telephone: (210) 656-0355 e-mail: [EMAIL PROTECTED]

___
NetworkManager-list mailing list
NetworkManager-list@gnome.org
http://mail.gnome.org/mailman/listinfo/networkmanager-list


Re: Bad news on LEAP fix patch - the story continues

2007-07-11 Thread Derek Atkins
Quoting Aaron Konstam [EMAIL PROTECTED]:

In the %prep section did you add the appropriate %patchN (where 'N' is
the PatchN: you added here)?
  
[snip]

 The last spec file I have has the applet patches in a second section 
 (just underneath the tar command), you'll want to put this one there 
 too..

 Cheers,
 Jon.

 Now we are really getting into black magic. I changed the lines:

[snip]
 %prep
 %setup -q
 %patch0 -p1 -b .startup-dhcdbd
 %patch2 -p1 -b .linkdebug
 %patch3 -p1 -b .no-killswitch-fix

 # unpack the applet
 tar -xjf %{SOURCE1}
 %patch1 -p1 -b .buildfix
 %patch4 -p1 -b .LEAP_passwd

 and now executing rpmbuild -ba gives a successful compile.

 Will someone confirm that this is ok and I can install the rpms
 produced.?

That looks correct...  And if the rpmbuild succeeded then the resulting
RPMS should have the LEAP_password patch in it.  Whether THAT works is
a different story ;)

-derek
-- 
   Derek Atkins, SB '93 MIT EE, SM '95 MIT Media Laboratory
   Member, MIT Student Information Processing Board  (SIPB)
   URL: http://web.mit.edu/warlord/PP-ASEL-IA N1NWH
   [EMAIL PROTECTED]PGP key available

___
NetworkManager-list mailing list
NetworkManager-list@gnome.org
http://mail.gnome.org/mailman/listinfo/networkmanager-list


Network Manager Overwrites resolv.conf

2007-07-11 Thread Ken
I'm running FC6 with NetworkManager-0.6.4-5.fc6 .  I have PEERDNS=no
in /etc/sysconfig/network-scripts/ifcfg-wlan0.  This is supposed to
stop my resolv.conf from being overwritten.  Network Manager ignores
this directive and overwrites resolv.conf anyway.  How can I make this
stop?


-- 
Ken

echo 16i[q]sa[ln0=aln100%Pln100/snlbx]sbA0D4D465452snlb xq |dc
___
NetworkManager-list mailing list
NetworkManager-list@gnome.org
http://mail.gnome.org/mailman/listinfo/networkmanager-list


Re: Bad news on LEAP fix patch - the story continues

2007-07-11 Thread Jon Escombe

- Aaron Konstam [EMAIL PROTECTED] wrote:

  
 Now we are really getting into black magic. I changed the lines:
 
 %prep
 %setup -q
 %patch0 -p1 -b .startup-dhcdbd
 %patch2 -p1 -b .linkdebug
 %patch3 -p1 -b .no-killswitch-fix
 %patch4 -p1 -b .LEAP_passwd
 
 # unpack the applet
 tar -xjf %{SOURCE1}
 %patch1 -p1 -b .buildfix
 
 To:
 
 %prep
 %setup -q
 %patch0 -p1 -b .startup-dhcdbd
 %patch2 -p1 -b .linkdebug
 %patch3 -p1 -b .no-killswitch-fix
 
 # unpack the applet
 tar -xjf %{SOURCE1}
 %patch1 -p1 -b .buildfix
 %patch4 -p1 -b .LEAP_passwd
 
 and now executing rpmbuild -ba gives a successful compile.
 
 Will someone confirm that this is ok and I can install the rpms
 produced.?

Ah yes, that would have done it.. 
The first example would be trying to patch the applet source code before it had 
been unpacked.

Regards,
Jon.

___
NetworkManager-list mailing list
NetworkManager-list@gnome.org
http://mail.gnome.org/mailman/listinfo/networkmanager-list


Re: Bad news on LEAP fix patch - the story continues

2007-07-11 Thread Dan Williams
On Wed, 2007-07-11 at 23:17 -0400, Ryan Novosielski wrote:
 -BEGIN PGP SIGNED MESSAGE-
 Hash: SHA1
 
 Jon Escombe wrote:
  - Aaron Konstam [EMAIL PROTECTED] wrote:
  
  Now we are really getting into black magic. I changed the lines:
 
  %prep
  %setup -q
  %patch0 -p1 -b .startup-dhcdbd
  %patch2 -p1 -b .linkdebug
  %patch3 -p1 -b .no-killswitch-fix
  %patch4 -p1 -b .LEAP_passwd
 
  # unpack the applet
  tar -xjf %{SOURCE1}
  %patch1 -p1 -b .buildfix
 
  To:
 
  %prep
  %setup -q
  %patch0 -p1 -b .startup-dhcdbd
  %patch2 -p1 -b .linkdebug
  %patch3 -p1 -b .no-killswitch-fix
 
  # unpack the applet
  tar -xjf %{SOURCE1}
  %patch1 -p1 -b .buildfix
  %patch4 -p1 -b .LEAP_passwd
 
  and now executing rpmbuild -ba gives a successful compile.
 
  Will someone confirm that this is ok and I can install the rpms
  produced.?
  
  Ah yes, that would have done it.. 
  The first example would be trying to patch the applet source code before it 
  had been unpacked.
 
 Makes me wonder how those other patches are supposed to be getting
 applied (the 3 that occur before the unpack).

It was too late to separate out the applet from the NM rpm for F7, so I
had to put the applet tarball into F7.  Hopefully for F8 NM and the
applet can be completely separate SRPMs.

Dan


 - --
   _  _ _  _ ___  _  _  _
  |Y#| |  | |\/| |  \ |\ |  | |Ryan Novosielski - Systems Programmer III
  |$| |__| |  | |__/ | \| _| |[EMAIL PROTECTED] - 973/972.0922 (2-0922)
  \__/ Univ. of Med. and Dent.|IST/AST - NJMS Medical Science Bldg - C630
 -BEGIN PGP SIGNATURE-
 Version: GnuPG v1.4.6 (GNU/Linux)
 Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
 
 iD8DBQFGlZ1Cmb+gadEcsb4RAg1pAJ0d87s9KTuvcshALiyUZvlC2htMvQCfS4ER
 EAAOICi32lWZVkjJUaQnAqo=
 =6Odv
 -END PGP SIGNATURE-
 ___
 NetworkManager-list mailing list
 NetworkManager-list@gnome.org
 http://mail.gnome.org/mailman/listinfo/networkmanager-list

___
NetworkManager-list mailing list
NetworkManager-list@gnome.org
http://mail.gnome.org/mailman/listinfo/networkmanager-list


Re: Network Manager Overwrites resolv.conf

2007-07-11 Thread Dan Williams
On Wed, 2007-07-11 at 16:25 -0700, Ken wrote:
 I'm running FC6 with NetworkManager-0.6.4-5.fc6 .  I have PEERDNS=no
 in /etc/sysconfig/network-scripts/ifcfg-wlan0.  This is supposed to
 stop my resolv.conf from being overwritten.  Network Manager ignores
 this directive and overwrites resolv.conf anyway.  How can I make this
 stop?

You actually can't.  When NM is managing any connections, it will
overwrite your resolv.conf.

Dan


___
NetworkManager-list mailing list
NetworkManager-list@gnome.org
http://mail.gnome.org/mailman/listinfo/networkmanager-list