Re: Patching? Probably a trivial question, but...
Kurt Buff wrote: On Wed, May 27, 2009 at 11:36, Mel Flynn mel.flynn+fbsd.questi...@mailing.thruhere.net wrote: On Wednesday 27 May 2009 17:21:42 Kurt Buff wrote: All, I've gotten a patch for a program in the ports tree from one of the authors of the program - not the port maintainer - to fix a small problem, but don't know how to install the updated port. I cd'ed into the /usr/ports/%CATEGORY%/%PROGRAM%/work/%PROGRAM-VERSION% directory, then performed 'patch patch-name' successfully, AFAICT. Then I did a make, but got no output. So - I'm obviously lacking clue here. Anyone have a spare set? Don't feel like reading the entire thread atm, but for reference: - Patches need to have relative paths, where the root of the path corresponds to the port's notion of $PATCH_WRKSRC - You can find out this directory by running: Â Â Â Â % make -C /usr/ports/category/portname -V PATCH_WRKSRC Â The default is $WRKSRC which is $WRKDIR/$DISTNAME by default. Â Example: Â Â Â Â % make -C /usr/ports/sysutils/nagios-statd -V PATCH_WRKSRC Â Â Â Â /stable/usr/obj/usr/ports/sysutils/nagios-statd/work/nagios-statd-3.12 - Patches are automatically applied if they reside in the port's notion of PATCHDIR and are named patch-* - You can find out this directory by running: Â Â Â Â %make -C /usr/ports/category/portname -V PATCHDIR Â The default is $.CURDIR/files. Â Example: Â Â Â Â % make -C /usr/ports/sysutils/nagios-statd -V PATCHDIR Â Â Â Â /usr/ports/sysutils/nagios-statd/files - In order to apply a new patch after you have previously gone past the patch stage (configure, build, install), either run make clean or: Â Â Â Â % rm $(make -C /usr/ports/category/portname -V PATCH_COOKIE) Â The above can cause problems, with the build. The normal course of action is to make clean. Excellent. I will be trying this tomorrow - I'm leaving work early today to get some things taken care of. Kurt, I had to leave rather hastily the other day, but I did test the patch, and it worked ok. If this is a one-off thing, here is how I did it: # cd /usr/ports/category/program # make clean # ee source.patch (pasted the patch in) # make configure (which preps the source) # cd work/progname # patch ../../source.patch # cd ../.. # make # make install All worked well. Steve smime.p7s Description: S/MIME Cryptographic Signature
Re: Patching? Probably a trivial question, but...
On Fri, May 29, 2009 at 07:06, Steve Bertrand st...@ibctech.ca wrote: Kurt Buff wrote: On Wed, May 27, 2009 at 11:36, Mel Flynn mel.flynn+fbsd.questi...@mailing.thruhere.net wrote: On Wednesday 27 May 2009 17:21:42 Kurt Buff wrote: All, I've gotten a patch for a program in the ports tree from one of the authors of the program - not the port maintainer - to fix a small problem, but don't know how to install the updated port. I cd'ed into the /usr/ports/%CATEGORY%/%PROGRAM%/work/%PROGRAM-VERSION% directory, then performed 'patch patch-name' successfully, AFAICT. Then I did a make, but got no output. So - I'm obviously lacking clue here. Anyone have a spare set? Don't feel like reading the entire thread atm, but for reference: - Patches need to have relative paths, where the root of the path corresponds to the port's notion of $PATCH_WRKSRC - You can find out this directory by running: Â Â Â Â % make -C /usr/ports/category/portname -V PATCH_WRKSRC Â The default is $WRKSRC which is $WRKDIR/$DISTNAME by default. Â Example: Â Â Â Â % make -C /usr/ports/sysutils/nagios-statd -V PATCH_WRKSRC Â Â Â Â /stable/usr/obj/usr/ports/sysutils/nagios-statd/work/nagios-statd-3.12 - Patches are automatically applied if they reside in the port's notion of PATCHDIR and are named patch-* - You can find out this directory by running: Â Â Â Â %make -C /usr/ports/category/portname -V PATCHDIR Â The default is $.CURDIR/files. Â Example: Â Â Â Â % make -C /usr/ports/sysutils/nagios-statd -V PATCHDIR Â Â Â Â /usr/ports/sysutils/nagios-statd/files - In order to apply a new patch after you have previously gone past the patch stage (configure, build, install), either run make clean or: Â Â Â Â % rm $(make -C /usr/ports/category/portname -V PATCH_COOKIE) Â The above can cause problems, with the build. The normal course of action is to make clean. Excellent. I will be trying this tomorrow - I'm leaving work early today to get some things taken care of. Kurt, I had to leave rather hastily the other day, but I did test the patch, and it worked ok. If this is a one-off thing, here is how I did it: # cd /usr/ports/category/program # make clean # ee source.patch (pasted the patch in) # make configure (which preps the source) # cd work/progname # patch ../../source.patch # cd ../.. # make # make install All worked well. Steve I did as others have suggested, placing the patch in /usr/ports/www/squid30/files as patch-HttpHeader, then doing a 'make make clean'. After fixing the typo, it went just fine. I'll be installing at the end of the day today and testing with a few folks to see how this works. Kurt ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Patching? Probably a trivial question, but...
All, I've gotten a patch for a program in the ports tree from one of the authors of the program - not the port maintainer - to fix a small problem, but don't know how to install the updated port. I cd'ed into the /usr/ports/%CATEGORY%/%PROGRAM%/work/%PROGRAM-VERSION% directory, then performed 'patch patch-name' successfully, AFAICT. Then I did a make, but got no output. So - I'm obviously lacking clue here. Anyone have a spare set? Kurt ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Re: Patching? Probably a trivial question, but...
2009/5/27 Kurt Buff kurt.b...@gmail.com: All, I've gotten a patch for a program in the ports tree from one of the authors of the program - not the port maintainer - to fix a small problem, but don't know how to install the updated port. I cd'ed into the /usr/ports/%CATEGORY%/%PROGRAM%/work/%PROGRAM-VERSION% directory, then performed 'patch patch-name' successfully, AFAICT. Then I did a make, but got no output. So - I'm obviously lacking clue here. Anyone have a spare set? Kurt ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org Which directory did you run the make in? Chris -- A: Because it messes up the order in which people normally read text. Q: Why is top-posting such a bad thing? A: Top-posting. Q: What is the most annoying thing in a mailing list? ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Re: Patching? Probably a trivial question, but...
I've gotten a patch for a program in the ports tree from one of the authors of the program - not the port maintainer - to fix a small problem, but don't know how to install the updated port. i think it's best to add your patch to /usr/ports/blah/blah/files with name patch-something look at existing as an example ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Re: Patching? Probably a trivial question, but...
On Wed, May 27, 2009 at 08:48, Chris Rees utis...@googlemail.com wrote: 2009/5/27 Kurt Buff kurt.b...@gmail.com: All, I've gotten a patch for a program in the ports tree from one of the authors of the program - not the port maintainer - to fix a small problem, but don't know how to install the updated port. I cd'ed into the /usr/ports/%CATEGORY%/%PROGRAM%/work/%PROGRAM-VERSION% directory, then performed 'patch patch-name' successfully, AFAICT. Then I did a make, but got no output. So - I'm obviously lacking clue here. Anyone have a spare set? Kurt ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org Which directory did you run the make in? Chris /usr/ports/%CATEGORY%/%PROGRAM% ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Fwd: Patching? Probably a trivial question, but...
I really should learn to hit reply-all on these lists... Kurt On Wed, May 27, 2009 at 08:54, Wojciech Puchar woj...@wojtek.tensor.gdynia.pl wrote: I've gotten a patch for a program in the ports tree from one of the authors of the program - not the port maintainer - to fix a small problem, but don't know how to install the updated port. i think it's best to add your patch to /usr/ports/blah/blah/files with name patch-something look at existing as an example That didn't seem to work. However, I've deleted the work directory after placing patch as you suggested, and am watching 'make' do its thing - after starting script to record the session. I should be able to examine that and see if it does as you think. Kurt ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Re: Fwd: Patching? Probably a trivial question, but...
with name patch-something look at existing as an example That didn't seem to work. what exactly doesn't? could you please post error messages? ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Re: Patching? Probably a trivial question, but...
Er, I also need to learn that reply-all skill! This'll make for easy understanding in the Archives 2009/5/27 Kurt Buff kurt.b...@gmail.com: On Wed, May 27, 2009 at 08:48, Chris Rees utis...@googlemail.com wrote: 2009/5/27 Kurt Buff kurt.b...@gmail.com: All, I've gotten a patch for a program in the ports tree from one of the authors of the program - not the port maintainer - to fix a small problem, but don't know how to install the updated port. I cd'ed into the /usr/ports/%CATEGORY%/%PROGRAM%/work/%PROGRAM-VERSION% directory, then performed 'patch patch-name' successfully, AFAICT. Then I did a make, but got no output. So - I'm obviously lacking clue here. Anyone have a spare set? Kurt ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org Which directory did you run the make in? Chris /usr/ports/%CATEGORY%/%PROGRAM% There's the easy fix out the window. Perhaps you should try Wojciech's idea, and put the patch in the /u/p/c/n/files/ directory. Does that work? Chris -- A: Because it messes up the order in which people normally read text. Q: Why is top-posting such a bad thing? A: Top-posting. Q: What is the most annoying thing in a mailing list? ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Re: Fwd: Patching? Probably a trivial question, but...
On Wed, May 27, 2009 at 09:23, Wojciech Puchar woj...@wojtek.tensor.gdynia.pl wrote: with name patch-something look at existing as an example That didn't seem to work. what exactly doesn't? could you please post error messages? There were no error messages. Then, being the incredibly brilliant person I am, I tried again, this time after taking the blindingly obvious step of deleting the 'work' directory. This seems to be a key part of the process. The patch doesn't install correctly, as the make process generates the following: HttpHeader.cc:127: error: 'ftSTr' was not declared in this scope *** Error code 1 and halts after a few more errors, but at least that indicates that *something* is happening with the patch file. This smells like progress. Kurt ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Re: Fwd: Patching? Probably a trivial question, but...
time after taking the blindingly obvious step of deleting the 'work' directory. This seems to be a key part of the process. The patch doesn't install correctly, as the make process generates the it installs correctly for sure :) as you don't see errors following: HttpHeader.cc:127: error: 'ftSTr' was not declared in this scope *** Error code 1 and halts after a few more errors, but at least that indicates that *something* is happening with the patch file. This smells like progress. just patch a patch :) ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Re: Fwd: Patching? Probably a trivial question, but...
On Wed, May 27, 2009 at 09:41, Wojciech Puchar woj...@wojtek.tensor.gdynia.pl wrote: time after taking the blindingly obvious step of deleting the 'work' directory. This seems to be a key part of the process. The patch doesn't install correctly, as the make process generates the it installs correctly for sure :) as you don't see errors Heh. Well, to be exact, yes, the patch installs without error. However, it breaks the program install. following: HttpHeader.cc:127: error: 'ftSTr' was not declared in this scope *** Error code 1 and halts after a few more errors, but at least that indicates that *something* is happening with the patch file. This smells like progress. just patch a patch :) I'm working with the author on that... Kurt ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Re: Fwd: Patching? Probably a trivial question, but...
Kurt Buff wrote: On Wed, May 27, 2009 at 09:23, Wojciech Puchar woj...@wojtek.tensor.gdynia.pl wrote: with name patch-something look at existing as an example That didn't seem to work. what exactly doesn't? could you please post error messages? There were no error messages. Then, being the incredibly brilliant person I am, I tried again, this time after taking the blindingly obvious step of deleting the 'work' directory. This seems to be a key part of the process. The patch doesn't install correctly, as the make process generates the following: HttpHeader.cc:127: error: 'ftSTr' was not declared in this scope *** Error code 1 and halts after a few more errors, but at least that indicates that *something* is happening with the patch file. This smells like progress. Can you post the patch, and I'll test it out here? (Forgive me if you've done this and I missed it). Steve smime.p7s Description: S/MIME Cryptographic Signature
Re: Fwd: Patching? Probably a trivial question, but...
On Wed, May 27, 2009 at 09:51, Steve Bertrand st...@ibctech.ca wrote: Can you post the patch, and I'll test it out here? (Forgive me if you've done this and I missed it). Steve Sent off-list. ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Re: Fwd: Patching? Probably a trivial question, but...
Kurt Buff wrote: On Wed, May 27, 2009 at 09:51, Steve Bertrand st...@ibctech.ca wrote: Can you post the patch, and I'll test it out here? (Forgive me if you've done this and I missed it). Steve Sent off-list. Ok, got it. I'm pretty much taking an easy day today to recover my broken -STABLE ZFS system, so while I'm in discussion/learning about ZFS recovery in regards to that problem, I'll give the patch a try on a couple of VMs and see if I can help. Steve smime.p7s Description: S/MIME Cryptographic Signature
Re: Fwd: Patching? Probably a trivial question, but...
Kurt Buff wrote: On Wed, May 27, 2009 at 09:51, Steve Bertrand st...@ibctech.ca wrote: Can you post the patch, and I'll test it out here? (Forgive me if you've done this and I missed it). Steve Sent off-list. Kurt, can you please provide: # uname -a - the default tag you use in your ports supfile, and the last time you 'sup'd the ports tree Steve smime.p7s Description: S/MIME Cryptographic Signature
Re: Fwd: Patching? Probably a trivial question, but...
On Wed, May 27, 2009 at 11:02, Steve Bertrand st...@ibctech.ca wrote: Kurt Buff wrote: On Wed, May 27, 2009 at 09:51, Steve Bertrand st...@ibctech.ca wrote: Can you post the patch, and I'll test it out here? (Forgive me if you've done this and I missed it). Steve Sent off-list. Kurt, can you please provide: # uname -a - the default tag you use in your ports supfile, and the last time you 'sup'd the ports tree Steve I csup'ed on May 13, if my examination of the file system is accurate - I noted the date on the relevant file in /usr/ports/distfiles. #uname -a FreeBSD squid.mycompany.com 7.0-STABLE FreeBSD 7.0-STABLE #0: Mon Jun 30 17:27:53 PDT 2008 r...@squid.mycompany.com:/usr/obj/usr/src/sys/GENERIC i386 Contents of supfile: *default host=cvsup8.FreeBSD.org *default prefix=/usr *default base=/var/db *default release=cvs *default delete *default use-rel-suffix src-all tag=RELENG_7 ports-all tag=. doc-all tag=. ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Re: Fwd: Patching? Probably a trivial question, but...
Kurt Buff wrote: On Wed, May 27, 2009 at 11:02, Steve Bertrand st...@ibctech.ca wrote: Kurt Buff wrote: On Wed, May 27, 2009 at 09:51, Steve Bertrand st...@ibctech.ca wrote: Can you post the patch, and I'll test it out here? (Forgive me if you've done this and I missed it). Steve Sent off-list. Kurt, can you please provide: # uname -a - the default tag you use in your ports supfile, and the last time you 'sup'd the ports tree Steve I csup'ed on May 13, if my examination of the file system is accurate - I noted the date on the relevant file in /usr/ports/distfiles. #uname -a FreeBSD squid.mycompany.com 7.0-STABLE FreeBSD 7.0-STABLE #0: Mon Jun 30 17:27:53 PDT 2008 r...@squid.mycompany.com:/usr/obj/usr/src/sys/GENERIC i386 Ok. I'm building on both a 7.0-RELEASE, and a 7.2-RELEASE box, with ports updated to nearly the same spec as yours. Unfortunately, due to the racking overhaul we're doing in the datacentre, my really good build boxes are shut down, so it's going to take a bit longer ;) Steve smime.p7s Description: S/MIME Cryptographic Signature
Re: Patching? Probably a trivial question, but...
On Wednesday 27 May 2009 17:21:42 Kurt Buff wrote: All, I've gotten a patch for a program in the ports tree from one of the authors of the program - not the port maintainer - to fix a small problem, but don't know how to install the updated port. I cd'ed into the /usr/ports/%CATEGORY%/%PROGRAM%/work/%PROGRAM-VERSION% directory, then performed 'patch patch-name' successfully, AFAICT. Then I did a make, but got no output. So - I'm obviously lacking clue here. Anyone have a spare set? Don't feel like reading the entire thread atm, but for reference: - Patches need to have relative paths, where the root of the path corresponds to the port's notion of $PATCH_WRKSRC - You can find out this directory by running: % make -C /usr/ports/category/portname -V PATCH_WRKSRC The default is $WRKSRC which is $WRKDIR/$DISTNAME by default. Example: % make -C /usr/ports/sysutils/nagios-statd -V PATCH_WRKSRC /stable/usr/obj/usr/ports/sysutils/nagios-statd/work/nagios-statd-3.12 - Patches are automatically applied if they reside in the port's notion of PATCHDIR and are named patch-* - You can find out this directory by running: %make -C /usr/ports/category/portname -V PATCHDIR The default is $.CURDIR/files. Example: % make -C /usr/ports/sysutils/nagios-statd -V PATCHDIR /usr/ports/sysutils/nagios-statd/files - In order to apply a new patch after you have previously gone past the patch stage (configure, build, install), either run make clean or: % rm $(make -C /usr/ports/category/portname -V PATCH_COOKIE) The above can cause problems, with the build. The normal course of action is to make clean. -- Mel ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Re: Patching? Probably a trivial question, but...
On Wed, May 27, 2009 at 11:36, Mel Flynn mel.flynn+fbsd.questi...@mailing.thruhere.net wrote: On Wednesday 27 May 2009 17:21:42 Kurt Buff wrote: All, I've gotten a patch for a program in the ports tree from one of the authors of the program - not the port maintainer - to fix a small problem, but don't know how to install the updated port. I cd'ed into the /usr/ports/%CATEGORY%/%PROGRAM%/work/%PROGRAM-VERSION% directory, then performed 'patch patch-name' successfully, AFAICT. Then I did a make, but got no output. So - I'm obviously lacking clue here. Anyone have a spare set? Don't feel like reading the entire thread atm, but for reference: - Patches need to have relative paths, where the root of the path corresponds to the port's notion of $PATCH_WRKSRC - You can find out this directory by running: % make -C /usr/ports/category/portname -V PATCH_WRKSRC The default is $WRKSRC which is $WRKDIR/$DISTNAME by default. Example: % make -C /usr/ports/sysutils/nagios-statd -V PATCH_WRKSRC /stable/usr/obj/usr/ports/sysutils/nagios-statd/work/nagios-statd-3.12 - Patches are automatically applied if they reside in the port's notion of PATCHDIR and are named patch-* - You can find out this directory by running: %make -C /usr/ports/category/portname -V PATCHDIR The default is $.CURDIR/files. Example: % make -C /usr/ports/sysutils/nagios-statd -V PATCHDIR /usr/ports/sysutils/nagios-statd/files - In order to apply a new patch after you have previously gone past the patch stage (configure, build, install), either run make clean or: % rm $(make -C /usr/ports/category/portname -V PATCH_COOKIE) The above can cause problems, with the build. The normal course of action is to make clean. Excellent. I will be trying this tomorrow - I'm leaving work early today to get some things taken care of. Many thanks for this. Kurt ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
