Re: [e-smith-devinfo] e-smith-samba-1.2.0 patch help required
On Tue, 2 Jul 2002, Darrell May wrote:
I'm trying to rebuild e-smith-samba-1.2.0 the e-smith way by adding a patch.
Problem is it isn't working, yet I believe I've followed the e-smith
instructions provided.
You have indeed. However the HOWTO is wrong!
Where it says:
# Make a patch file containing your changes:
diff -ruN BUILD/e-smith-pkg-0.3-{3,4} \
SOURCES/e-smith-pkgs.fixes.2815001
it should say:
# Make a patch file containing your changes:
cd BUILD
diff -ruN e-smith-pkg-0.3-{3,4} \
SOURCES/e-smith-pkgs.fixes.2815001
Another way to fix the problem is to use -p2 on your patch line, rather
than -p1 as we have at present.
I guess this documentation isn't being used very widely :-)
My patch is very small and simply tries to add one template fragment
'11pidDirectory' with one line of code:
# cat e-smith-samba-1.2.0.patch.2002070100
diff -ruN
BUILD/e-smith-samba-1.2.0-02/root/etc/e-smith/templates/etc/smb.conf/11pidDirectory
BUILD/e-smith-samba-1.2.0-03dmc/root/etc/e-smith/templates/etc/smb.conf/11pidDirectory
---
BUILD/e-smith-samba-1.2.0-02/root/etc/e-smith/templates/etc/smb.conf/11pidDirectory
Wed Dec 31 16:00:00 1969
+++
BUILD/e-smith-samba-1.2.0-03dmc/root/etc/e-smith/templates/etc/smb.conf/11pidDirectory
Mon Jul 1 18:30:08 2002
@@ -0,0 +1 @@
+pid directory = /var/run
This is exactly what we have done in 5.5.
--
Charlie Brady [EMAIL PROTECTED]
Lead Product Developer
Network Server Solutions Grouphttp://www.e-smith.com/
Mitel Networks Corporationhttp://www.mitel.com/
Phone: +1 (613) 592 5660 or 592 2122 Fax: +1 (613) 592 1175
--
Please report bugs to [EMAIL PROTECTED]
Please mail [EMAIL PROTECTED] (only) to discuss security issues
Support for registered customers and partners to [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Archives by mail and http://www.mail-archive.com/devinfo%40lists.e-smith.org
Re: [e-smith-devinfo] e-smith-samba-1.2.0 patch help required
On Tue, Jul 02, 2002 at 04:58:01PM -0400, Charlie Brady [EMAIL PROTECTED] wrote:
[...]
it should say:
# Make a patch file containing your changes:
cd BUILD
diff -ruN e-smith-pkg-0.3-{3,4} \
SOURCES/e-smith-pkgs.fixes.2815001
[...]
or even
cd BUILD
diff -ruN e-smith-pkg-0.3-{3,4} \
../SOURCES/e-smith-pkgs.fixes.2815001
:-)
BTW - doco has been updated.
Gordon
--
Gordon Rowell[EMAIL PROTECTED]
Director, Engineering
Network Server Solutions Group http://www.e-smith.com
Mitel Networks Corporation http://www.mitel.com
--
Please report bugs to [EMAIL PROTECTED]
Please mail [EMAIL PROTECTED] (only) to discuss security issues
Support for registered customers and partners to [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Archives by mail and http://www.mail-archive.com/devinfo%40lists.e-smith.org
Re: [e-smith-devinfo] e-smith-samba-1.2.0 patch help required
On Tue, 2 Jul 2002, Gordon Rowell wrote:
On Tue, Jul 02, 2002 at 04:58:01PM -0400, Charlie Brady [EMAIL PROTECTED] wrote:
[...]
it should say:
# Make a patch file containing your changes:
cd BUILD
diff -ruN e-smith-pkg-0.3-{3,4} \
SOURCES/e-smith-pkgs.fixes.2815001
[...]
or even
cd BUILD
diff -ruN e-smith-pkg-0.3-{3,4} \
../SOURCES/e-smith-pkgs.fixes.2815001
Woops. Thanks.
My original draft of the documentation was correct on both fronts:
[snip]
* Generate patch file
diff -ruN e-smith-blah-x.y-z e-smith-blah-x.y-`expr z + 1` |\
../SOURCES/e-smith-blah.fixes.Aug.1
[snip]
I'm a victim of editorial interference! :-)
[The astute will notice a different error in my original :-)]
BTW - doco has been updated.
Thanks.
--
Charlie Brady [EMAIL PROTECTED]
Lead Product Developer
Network Server Solutions Grouphttp://www.e-smith.com/
Mitel Networks Corporationhttp://www.mitel.com/
Phone: +1 (613) 592 5660 or 592 2122 Fax: +1 (613) 592 1175
--
Please report bugs to [EMAIL PROTECTED]
Please mail [EMAIL PROTECTED] (only) to discuss security issues
Support for registered customers and partners to [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Archives by mail and http://www.mail-archive.com/devinfo%40lists.e-smith.org
Re: [e-smith-devinfo] e-smith-samba-1.2.0 patch help required
Charlie Brady [EMAIL PROTECTED] said: You have indeed. However the HOWTO is wrong! Thanks Charlie, that worked of course. Source is available here: http://myezserver.com/downloads/mitel/beta/samba-2.2.5-4/SRPMS/ e-smith-samba-1.2.0-03dmc.src.rpm Updated samba-2.2.5-4 install for 5.1.2 using e-smith-samba-1.2.0-03dmc.noarch.rpm is here: http://myezserver.com/downloads/mitel/beta/samba-2.2.5-4/SME-5.1.2/ As Charlie mentioned the change I made in the e-smith-samba rpm for 5.1.2 is built in to e-smith-samba that ships with 5.5. However the 5.5 rpm includes FormMagick code and will not work on 5.5 hence the need for the updated rpm above for =5.1.2. Regards, -- Darrell May DMC Netsourced.com http://netsourced.com http://myEZserver.com -- Please report bugs to [EMAIL PROTECTED] Please mail [EMAIL PROTECTED] (only) to discuss security issues Support for registered customers and partners to [EMAIL PROTECTED] To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] Archives by mail and http://www.mail-archive.com/devinfo%40lists.e-smith.org
