Re: Patching a Newly-Built System
Nerius Landys writes: > By "bringing the patch level up to date" I assume you mean a tag such > as this one: > > *default release=cvs tag=RELENG_8_0 That is what I meant. > in your standard-supfile file, and then doing the "make buildworld" > etc. prodedure outlined in the Handbook. > > The release branches (such as RELENG_8_0) get only very minor > modifications from the time the release is made. The patches are only > ones that address really serious issues, and the extent of the changes > is usually very minimal. Whather you install ports before or after > you update to the latest patch for your release should make absolutely > no difference. That is what I suspected but I wanted to start on the right foot so I thought I would check. Thank you. Martin McCormick ___ 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 a Newly-Built System
>> Does it make any difference if one adds packages to a new system >> before or after using cvsup to bring the patch level up to date? > > By "bringing the patch level up to date" I assume you mean a tag such > as this one: > > *default release=cvs tag=RELENG_8_0 > > in your standard-supfile file, and then doing the "make buildworld" > etc. prodedure outlined in the Handbook. > > The release branches (such as RELENG_8_0) get only very minor > modifications from the time the release is made. The patches are only > ones that address really serious issues, and the extent of the changes > is usually very minimal. Whather you install ports before or after > you update to the latest patch for your release should make absolutely > no difference. To clarify, ports (/usr/ports/) and your base system (/usr/src/) are independent. When RELENG_8_0 gets a new patch, it has nothing to do with ports. Are you using precompiled packages or building from ports? Precompiled packages don't get updated after a release is made. I think most people build ports from source instead of using the precompiled package system. This way, your ports will continue to be updated with the latest fixes. By building ports from source I mean ``cd /usr/ports/category/portname/ ; make install clean''. ___ 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 a Newly-Built System
> Does it make any difference if one adds packages to a new system > before or after using cvsup to bring the patch level up to date? By "bringing the patch level up to date" I assume you mean a tag such as this one: *default release=cvs tag=RELENG_8_0 in your standard-supfile file, and then doing the "make buildworld" etc. prodedure outlined in the Handbook. The release branches (such as RELENG_8_0) get only very minor modifications from the time the release is made. The patches are only ones that address really serious issues, and the extent of the changes is usually very minimal. Whather you install ports before or after you update to the latest patch for your release should make absolutely no difference. ___ 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 Fri, May 29, 2009 at 07:06, Steve Bertrand wrote: > Kurt Buff wrote: >> On Wed, May 27, 2009 at 11:36, Mel Flynn >> 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 >>> 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"
Re: Patching? Probably a trivial question, but...
Kurt Buff wrote: > On Wed, May 27, 2009 at 11:36, Mel Flynn > 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 >> >>> 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 Wed, May 27, 2009 at 11:36, Mel Flynn 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 > >> 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"
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 > 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...
Er, I also need to learn that reply-all skill! This'll make for easy understanding in the Archives 2009/5/27 Kurt Buff : > On Wed, May 27, 2009 at 08:48, Chris Rees wrote: >> 2009/5/27 Kurt Buff : >>> 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 >> >>> 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: Patching? Probably a trivial question, but...
On Wed, May 27, 2009 at 08:48, Chris Rees wrote: > 2009/5/27 Kurt Buff : >> 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 > >> 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"
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...
2009/5/27 Kurt Buff : > 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 > 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 / Updating / Upgrading
On Tue, 03 Feb 2009 14:30:14 +0200 "DA Forsyth" wrote: > use RELEASE for a production server, STABLE on a desktop or test > machine. IMHO I'd say follow what it says in the handbook and use a release unless you have a good reason to use stable, such as support for a particular piece of hardware. If you use stable then every time you update for an advisory, you may pick-up new features, which means you should pay as much attention as you would with 7.0 -> 7.1. With point releases you are only getting minor patches, so there is no need for mergemaster. I just run a single script that does the full update. Also you can't use freebsd-update with stable. ___ 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 / Updating / Upgrading
*Snipping for those who don't want to have an inbox full of my text, and out of being polite* Thanks very much! I've been thinking about setting up another FreeBSD machine so I can test both CVS and FreeBSD-update without mixing the two together which from what I hear is a bad idea, and I think that would also help me learn both ways of doing it. Thanks again for the help! I think first I'll test out the freebsd-update way of things since, well, that's the closest to what I'm used to and will have a much smaller learning curve if any at all. Ad then I can set up a machine to do it with cvsup. I was really having some trouble understanding what they meant by RELEASE VS STABLE in the context of fixes and so on. The idea of it wasn't new as Slackware uses a very VERY similar method for talking about versions of their stuff, which I guess is a good thing. And my Slackware books used to have BSDi logos on them so I guess it's nice to see a Linux distro and BSD getting along. Patrick seems to be more appreciative of BSD than other Linux distros as it is. (If you read up on Slackware, he flat out tells you to just look for BSD texts because they are more technical and better written than the PR style Linux stuff you generally find) which leads me to believe that Patrick likes BSD quite a bit. Thanks again, -Allen ___ 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 / Updating / Upgrading
Message: 4 Date: Mon, 02 Feb 2009 16:37:14 -0500 From: Akenner Subject: Patching / Updating / Upgrading To: freebsd-questions@freebsd.org Hello all, > So if anyone could lend a little but in typing out what they use for > updates and how they go about it, I'd appreciate it. I've already > gotten a full CVSup file sent to me by a member on here which was a > great help in deciding how to set up the file. I'm more or less > wondering with CVSup if I keep using RELEASE or do I use Stable. use RELEASE for a production server, STABLE on a desktop or test machine. IMHO use CVS if you have to build a custom kernel, I do this on my two production servers. On my minimal install print servers, I use freebsd-update about once a month. it is a bit fiddly to get through a proxy that needs auth, but it can be done. > And of course if anyone uses freebsd-update if they have suggestions > I'd love to hear those as well :) it works, it is quick, if you use the generic kernel. > -Allen -- DA Fo rsythNetwork Supervisor Principal Technical Officer -- Institute for Water Research http://www.ru.ac.za/institutes/iwr/ ___ 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 / Updating / Upgrading
Akenner wrote: > Hello all, > > I've been using this list to my advantage for a while to learn things > I can't seem to grasp, and I've gotten great amounts of help. > > I have a question in regards to the process of patching / Updating / > Upgrading I'd like a hand with. I have two machines running FreeBSD > 7.1-RELEASE and I'd like to make sure I've got security fixes on my > test machine. I'm saying test amchine because the box I'm typing this > from is an active needed desktop system I'm using for a lot of things > right now, and I figured my best bet would be to set up another > machine with a similar installation set so I could test out new ideas > on that instead of risking breaking something on this one. Definitely a good idea, if you have machines to spare. > > Anyway, I've been reading up on the CVS idea and asking things about > freebsd-update, and I guess my question is more along these lines: > > If I wanted to just make sure I've got bug fixes and security patches, > would CVS or FreeBSD-Update be best for this? Or are they both good > for this? I know in the Unix world there are generally a lot of things > that do one thing very well but can generally do other things too. For getting just the security fixes for your -RELEASE version, freebsd-update is by far the easiest way to go. Only thing you need to do is run: # freebsd-update fetch # freebsd-update install These can even be combined into one: # freebsd-update fetch install Depending on whether a new kernel was installed, you may or may not have to reboot. (it is easy to see on the messages whether a new /boot/kernel/kernel file was installed). If you are using a custom kernel, the process is slightly more involved: Every time the updates touch the kernel, you will have to rebuild your custom kernel. If you know nothing on custom kernels (yet) you are running GENERIC and you just need the above procedure. For details, please refer to: http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/updating-upgrading-freebsdupdate.html (esp. sect 24.2.2) > > I'm reading on CVS right now and it seems I could use this to keep the > machine updated, but I'm having some issues understanding the idea of > how it works. Basically, if I'm running 7.1-RELEASE, isn't that > already the updated version? Or, have I maybe misunderstood something, > and the tree RELEASE for 7.1 has bug fixes and security patches added > to it, and I could CVSup to the newest release of 7.1 ? > 7.1 is the latest RELEASE. Although new feature will not be added into it, you could use csup/cvsup to get the security fixes. These would be the same as the ones you can get (without recompiling anything) with freebsd-update as described above. If you really wish to track a development version of FreeBSD, you can use CVSup to get 7-STABLE (this is the continuing development branch, based on the work of 7.1. In the future, developments from this branch will get us to 7.2-RELEASE). Or, if you are really adventurous, you could try running -CURRENT (which will in time become FreeBSD 8.0-RELEASE). More info is here: http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/current-stable.html If you just need the security updates for 7.1-RELEASE, freebsd-update is really the painless way to go. But CVSup can also do it, and it will be a nice exercise ;) > Also, FreeBSD-update came across my reading, and it seems to be > similar to swaret in the Slackware world. I know it isn't the same > thing as BSD seems much more source based than other OSs, but I would > like to get at least one of the ways to keep updated picked out, and > started using on the test machine to make sure I fully understand it > before using it to update my main box. > Go ahead and use it on your main system. Freebsd-update is safe (you can even rollback the updates if need be). As I said, unless you are running a custom kernel (and you are not probably), this is just two commands. And there no other settings needed beforehand. > One of the things I did was make two copies of the example CVS > standard supfile; one I made in that directory as standard.bak and > then I copied a copy of it to the /root directory to look at and maybe > edit as well, but as I said, I could use a hand in deciding which > option is going to work best. > If you decide to go the CVSup way for the security fixes, you would need to make sure you have this line: *default release=cvs tag=RELENG_7_1 (This is already in the standard supfile normally) To move to 7-STABLE, you would need to change it to: *default release=cvs tag=RELENG_7 (You will find this in the sample stable-supfile) Then, follow the instructions in chapter 24. If you are getting confused with the many different possible tags, this will probably make them clear: http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/cvs-tags.html > So if anyone could lend a little but in typing out what they use for > updates and how they go about it, I'd appreciate
Re: Patching php port
On Wed, Oct 01, 2008 at 01:14:03PM +0100, Tamar Lea wrote: > Thanks for your reply, Jeremy. I now understand why it didn't work, but I > have absolutely no idea how to edit configure.in. I have only just figured > out what my patch is doing today. I think it would be easier to tell the > makefile to modify configure after the autoconf, but I don't know how to do > that either. This is the patch I wish to apply: Welcome to the pains of the GNU autotools! Here's what you'll need: http://www.gnu.org/software/autoconf/manual/html_node/index.html You should be able to examine the configure.in file and "reverse engineer" how to accomplish what you need. Remember: it's just a mix of sh, m4, and macros. Don't let it diminish your morale. :-) -- | Jeremy Chadwickjdc at parodius.com | | Parodius Networking http://www.parodius.com/ | | UNIX Systems Administrator Mountain View, CA, USA | | Making life hard for others since 1977. PGP: 4BD6C0CB | ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to "[EMAIL PROTECTED]"
Re: Patching php port
Thanks for your reply, Jeremy. I now understand why it didn't work, but I
have absolutely no idea how to edit configure.in. I have only just figured
out what my patch is doing today. I think it would be easier to tell the
makefile to modify configure after the autoconf, but I don't know how to do
that either. This is the patch I wish to apply:
diff -pruN php-5.2.6/configure php-5.2.6-thttpd225b/configure
--- php-5.2.6/configure 2007-11-08 23:36:28.0 +0800
+++ php-5.2.6-thttpd225b/configure 2007-12-06 13:10:13.0 +0800
@@ -11525,10 +11525,14 @@ if test "$PHP_THTTPD" != "no"; then
patch="test -f $THTTPD/php_patched || \
(cd $THTTPD && patch -p1 < $abs_srcdir/sapi/thttpd/thttpd_patch && touch
php_patched)"
+ elif grep thttpd.2.25b $PHP_THTTPD/version.h >/dev/null; then
+ patch="test -f $THTTPD/php_patched || \
+ (cd $THTTPD && patch -p1 < $abs_srcdir/sapi/thttpd/thttpd-2.25b_patch &&
touch php_patched)"
+
elif grep Premium $PHP_THTTPD/version.h >/dev/null; then
patch=
else
- { echo "configure: error: This version only supports thttpd-2.21b and
Premium thttpd" 1>&2; exit 1; }
+ { echo "configure: error: This version only supports thttpd-2.21b,
thttpd-2.25b and Premium thttpd" 1>&2; exit 1; }
fi
Ideally I would like to do this myself but I think the learning curve is too
steep right now. Any suggestions appreciated.
Tamar
On Wed, Oct 1, 2008 at 12:06 PM, Jeremy Chadwick <[EMAIL PROTECTED]> wrote:
> On Wed, Oct 01, 2008 at 11:37:29AM +0100, Tamar Lea wrote:
> > Hello all
> >
> > I am trying to install the php 5.2.6 port with thttpd. I have a patch
> file
> > to make it compile with version 2.25b, because the standard version only
> > works with 2.21. The patch works but the files always get overwritten
> when I
> > run the build again. How do I do this?
> >
> > These are the commands I used
> >
> > cd /usr/ports/lang/php5
> > make extract
> > make patch
> > cd work
> > patch -p0 < ~/ports/thttpd.diff
> > vi php-5.2.6/configure # and other checks to see if the patch worked
> > cd ..
> > make install
> >
> > This results in an error in the configure file, which has reverted to the
> > original. What am I doing wrong?
>
> Never modify "configure" scripts. You need to modify the autoconf
> template the configure script is built off of.
>
> In the case of lang/php5, autoconf is run to build the configure script
> during the "make configure" stage (which is being executed during part
> of "make install"). Note the USE_AUTOTOOLS line in the Makefile.
>
> Make your changes to configure.in.
>
> --
> | Jeremy Chadwickjdc at parodius.com |
> | Parodius Networking http://www.parodius.com/ |
> | UNIX Systems Administrator Mountain View, CA, USA |
> | Making life hard for others since 1977. PGP: 4BD6C0CB |
>
>
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to "[EMAIL PROTECTED]"
Re: Patching php port
On Wed, Oct 01, 2008 at 11:37:29AM +0100, Tamar Lea wrote: > Hello all > > I am trying to install the php 5.2.6 port with thttpd. I have a patch file > to make it compile with version 2.25b, because the standard version only > works with 2.21. The patch works but the files always get overwritten when I > run the build again. How do I do this? > > These are the commands I used > > cd /usr/ports/lang/php5 > make extract > make patch > cd work > patch -p0 < ~/ports/thttpd.diff > vi php-5.2.6/configure # and other checks to see if the patch worked > cd .. > make install > > This results in an error in the configure file, which has reverted to the > original. What am I doing wrong? Never modify "configure" scripts. You need to modify the autoconf template the configure script is built off of. In the case of lang/php5, autoconf is run to build the configure script during the "make configure" stage (which is being executed during part of "make install"). Note the USE_AUTOTOOLS line in the Makefile. Make your changes to configure.in. -- | Jeremy Chadwickjdc at parodius.com | | Parodius Networking http://www.parodius.com/ | | UNIX Systems Administrator Mountain View, CA, USA | | Making life hard for others since 1977. PGP: 4BD6C0CB | ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to "[EMAIL PROTECTED]"
Re: Patching with freebsd-update from 6.2-RELEASE-p4 to 6.2-RELEASE-p5
Stevan Tiefert wrote: > The problem is that in these two chapters of the handbook is not > handling freebsd-update... And if you use freebsd-update you need not > necessarily to do a buildkernel or buildworld. I've been meaning to write a handbook chapter about FreeBSD Update for many months, but haven't managed to find time, unfortunately. Obviously if someone else wants to write such a chapter, I'd be overjoyed to review it and help get it committed. :-) Colin Percival ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to "[EMAIL PROTECTED]"
Re: Patching with freebsd-update from 6.2-RELEASE-p4 to 6.2-RELEASE-p5
Am Montag, den 09.07.2007, 17:37 -0500 schrieb [EMAIL PROTECTED]: > On 09/07/07, Stevan Tiefert <[EMAIL PROTECTED]> wrote: > > Hello list, > > > > I wanted to update via freebsd-update from 6.2-RELEASE-p4 to > > 6.2-RELEASE-p5. But like you can see my system is after the update still > > p4! > > > > I have saved a script of my doing: > > > > Script started on Mon Jul 9 22:55:13 2007 > > vagabund# freebsd-update fetch > > Looking up update.FreeBSD.org mirrors... 1 mirrors found. > > Fetching metadata signature from update1.FreeBSD.org... done. > > Fetching metadata index... done. > > Inspecting system... done. > > Preparing to download files... done. > > > > No updates needed to update system to 6.2-RELEASE-p5. > > vagabund# freebsd-update install > > No updates are available to install. > > Run '/usr/sbin/freebsd-update fetch' first. > > vagabund# uname -a > > FreeBSD vagabund.w33 6.2-RELEASE-p4 FreeBSD 6.2-RELEASE-p4 #0: Thu Apr > > 26 17:40:53 UTC 2007 > > [EMAIL PROTECTED]:/usr/obj/usr/src/sys/GENERIC i386 > > vagabund# exit > > exit > > > > Script done on Mon Jul 9 22:55:45 2007 > > $ > > > > > > What is going wrong? Why he is not updating? > > http://security.freebsd.org/advisories/FreeBSD-SA-07:04.file.asc > > -p5 only affects one utility in userland, and not the kernel. > So the kernel at -p4 is itself ostensibly secure and doesn't > need to be updated. > Thanks. Normally I did everytime a buildworld and buildkernel and the uname -a was everytime changed. And now I was feared something gone wrong. Thanks again :-) ___ Der frühe Vogel fängt den Wurm. Hier gelangen Sie zum neuen Yahoo! Mail: http://mail.yahoo.de ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to "[EMAIL PROTECTED]"
Re: Patching with freebsd-update from 6.2-RELEASE-p4 to 6.2-RELEASE-p5
Am Montag, den 09.07.2007, 17:11 -0700 schrieb Jay Chandler: > Stevan Tiefert wrote: > > > > What is going wrong? Why he is not updating? > > > > Really dumb question-- have you tried rebooting to commit the uname -a > display change? > Really dumb answer. Yes I did! ___ Telefonate ohne weitere Kosten vom PC zum PC: http://messenger.yahoo.de ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to "[EMAIL PROTECTED]"
Re: Patching with freebsd-update from 6.2-RELEASE-p4 to 6.2-RELEASE-p5
Am Montag, den 09.07.2007, 19:16 -0400 schrieb Gerard: > On July 09, 2007 at 04:59PM Stevan Tiefert wrote: > > > > What is going wrong? Why he is not updating? > > You should check out these two URL's to get a better idea of what you > are attempting to do as well as how to accomplish it. > > > http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/cutting-edge.html > > > http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig.html > > The problem is that in these two chapters of the handbook is not handling freebsd-update... And if you use freebsd-update you need not necessarily to do a buildkernel or buildworld. ___ Telefonate ohne weitere Kosten vom PC zum PC: http://messenger.yahoo.de ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to "[EMAIL PROTECTED]"
Re: Patching with freebsd-update from 6.2-RELEASE-p4 to 6.2-RELEASE-p5
Stevan Tiefert wrote: What is going wrong? Why he is not updating? Really dumb question-- have you tried rebooting to commit the uname -a display change? -- Jay Chandler Systems Exorcist ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to "[EMAIL PROTECTED]"
Re: Patching with freebsd-update from 6.2-RELEASE-p4 to 6.2-RELEASE-p5
On July 09, 2007 at 04:59PM Stevan Tiefert wrote: > What is going wrong? Why he is not updating? You should check out these two URL's to get a better idea of what you are attempting to do as well as how to accomplish it. http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/cutting-edge.html http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig.html -- Gerard ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to "[EMAIL PROTECTED]"
Re: Patching with freebsd-update from 6.2-RELEASE-p4 to 6.2-RELEASE-p5
On 09/07/07, Stevan Tiefert <[EMAIL PROTECTED]> wrote: Hello list, I wanted to update via freebsd-update from 6.2-RELEASE-p4 to 6.2-RELEASE-p5. But like you can see my system is after the update still p4! I have saved a script of my doing: Script started on Mon Jul 9 22:55:13 2007 vagabund# freebsd-update fetch Looking up update.FreeBSD.org mirrors... 1 mirrors found. Fetching metadata signature from update1.FreeBSD.org... done. Fetching metadata index... done. Inspecting system... done. Preparing to download files... done. No updates needed to update system to 6.2-RELEASE-p5. vagabund# freebsd-update install No updates are available to install. Run '/usr/sbin/freebsd-update fetch' first. vagabund# uname -a FreeBSD vagabund.w33 6.2-RELEASE-p4 FreeBSD 6.2-RELEASE-p4 #0: Thu Apr 26 17:40:53 UTC 2007 [EMAIL PROTECTED]:/usr/obj/usr/src/sys/GENERIC i386 vagabund# exit exit Script done on Mon Jul 9 22:55:45 2007 $ What is going wrong? Why he is not updating? http://security.freebsd.org/advisories/FreeBSD-SA-07:04.file.asc -p5 only affects one utility in userland, and not the kernel. So the kernel at -p4 is itself ostensibly secure and doesn't need to be updated. -- -- ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to "[EMAIL PROTECTED]"
Re: Patching with freebsd-update from 6.2-RELEASE-p4 to 6.2-RELEASE-p5
Stevan Tiefert wrote: > Hello list, > > I wanted to update via freebsd-update from 6.2-RELEASE-p4 to > 6.2-RELEASE-p5. But like you can see my system is after the update still > p4! > > I have saved a script of my doing: > > Script started on Mon Jul 9 22:55:13 2007 > vagabund# freebsd-update fetch > Looking up update.FreeBSD.org mirrors... 1 mirrors found. > Fetching metadata signature from update1.FreeBSD.org... done. > Fetching metadata index... done. > Inspecting system... done. > Preparing to download files... done. > > No updates needed to update system to 6.2-RELEASE-p5. > vagabund# freebsd-update install > No updates are available to install. > Run '/usr/sbin/freebsd-update fetch' first. > vagabund# uname -a > FreeBSD vagabund.w33 6.2-RELEASE-p4 FreeBSD 6.2-RELEASE-p4 #0: Thu Apr > 26 17:40:53 UTC 2007 > [EMAIL PROTECTED]:/usr/obj/usr/src/sys/GENERIC i386 > vagabund# exit > exit > > Script done on Mon Jul 9 22:55:45 2007 > $ > > > What is going wrong? Why he is not updating? > > With regards > Stevan Tiefert > > It has updated. Recompile your kernel: As root: cd /usr/src make buildkernel KERNCONF=GENERIC make installkernel KERNCONF=GENERIC reboot uname -a will then show 6.2-RELEASE-p5 ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to "[EMAIL PROTECTED]"
Re: Patching a port
On Friday 16 December 2005 18:18, Markus Trippelsdorf wrote: > On 2005-12-16, Ian Moore <[EMAIL PROTECTED]> wrote: > > I'm having some trouble with the www/sarg port. The writer has sent me > > a=20 couple of .patch files to apply and I'm wondering if there's some > > way to=20 apply those patches and still use the ports system to build & > > install the=20 port. > > I know the source code installs stuff in places that aren't the standard > > FB= SD=20 > > locations - I assume they are the norm for Linux. The port fixes that > > and=20 puts stuff where we expect it to be. > > It would make life easier if I could apply the patches and then build the > > p= ort=20 > > make patch > -apply your patches- > make install clean Thanks, I'll knew it would be something really easy. Cheers, -- Ian gpg key: http://home.swiftdsl.com.au/~imoore/no-spam.asc pgpRFLxdNOSXw.pgp Description: PGP signature
Re: Patching a port
On 2005-12-16, Ian Moore <[EMAIL PROTECTED]> wrote: > I'm having some trouble with the www/sarg port. The writer has sent me a=20 > couple of .patch files to apply and I'm wondering if there's some way to=20 > apply those patches and still use the ports system to build & install the=20 > port. > I know the source code installs stuff in places that aren't the standard FB= > SD=20 > locations - I assume they are the norm for Linux. The port fixes that and=20 > puts stuff where we expect it to be. > It would make life easier if I could apply the patches and then build the p= > ort=20 make patch -apply your patches- make install clean -- Markus ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to "[EMAIL PROTECTED]"
Re: Patching to FreeBSD 5.4-p7
David Kirchner wrote: On 10/9/05, Deepak Naidu <[EMAIL PROTECTED]> wrote: Hi, I want to know ow to upgarde or patch my FreeBSD 5.4 version to FreeBSD 5.4-p7 Cheers, Deepak Naidu. The common response to this is that it's in the handbook. I'm trying to find it there, though, and am having a lot of trouble. "upgrade" and "patch" search terms don't find it. There is some mention of using cvsup in "Cutting edge", but given the title I don't think that's what is recommended for everyone. I could just be missing the magic search keyword for this, though. Maybe someone here has it? In any case, I believe you can run cvsup, using the example file /usr/share/examples/cvsup/standard-supfile , using the tag RELENG_5_4 . I'm not exactly sure what the official patch recommendation is though. When I did it I followed the directions in "Cutting edge" only I used the RELENG_5_4 tag. Also, freebsd-update http://www.daemonology.net/freebsd-update/ is supposed to allow you to install security patches. It's in the ports under /usr/ports/security/freebsd-update. HTH Micah ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to "[EMAIL PROTECTED]"
Re: Patching to FreeBSD 5.4-p7
On 10/9/05, Deepak Naidu <[EMAIL PROTECTED]> wrote: > Hi, > I want to know ow to upgarde or patch my FreeBSD 5.4 version to FreeBSD > 5.4-p7 > > Cheers, > Deepak Naidu. The common response to this is that it's in the handbook. I'm trying to find it there, though, and am having a lot of trouble. "upgrade" and "patch" search terms don't find it. There is some mention of using cvsup in "Cutting edge", but given the title I don't think that's what is recommended for everyone. I could just be missing the magic search keyword for this, though. Maybe someone here has it? In any case, I believe you can run cvsup, using the example file /usr/share/examples/cvsup/standard-supfile , using the tag RELENG_5_4 . I'm not exactly sure what the official patch recommendation is though. ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to "[EMAIL PROTECTED]"
Re: patching a file with blanks in the name
> > --- foo bar/meow~ Fri Mar 11 09:00:49 2005 > > +++ foo bar/meowFri Jun 10 12:17:22 2005 > > - a = 0; > > + a = 1; > > > > With the above example patch searches only for `foo', then gives up and > > asks for help. I tried quoting the entire file name and escaping the > > blanks with backslashes -- neither method works... Any ideas? Thanks! > > There was a discussion and maybe even a fix proposed for this issue on one > of the GNU lists, probably <[EMAIL PROTECTED]>? Anyway, I don't think > the current release version of patch will handle paths containing spaces... Strange... I can't imagine the fix being that complex... Instead of cutting the file-name on the first blank, I'd cut it on the last tab. People with tabs in the filenames would have to append one more tab at the end. Regular, diff-generated patches (vast majority of them all) would not be affected at all, as they always have timestamps (after a tab). I could do the coding -- would anyone be interested in comitting it? Some of the port-ed software (like the blasted java/eclipse) has blanks in directory names :-( -mi ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to "[EMAIL PROTECTED]"
Re: patching a file with blanks in the name
Mikhail Teterin wrote: How does one make a patch for a while, that has blanks in the path: --- foo bar/meow~ Fri Mar 11 09:00:49 2005 +++ foo bar/meowFri Jun 10 12:17:22 2005 - a = 0; + a = 1; With the above example, patch searches only for `foo', then gives up and asks for help. I tried quoting the entire file name and escaping the blanks with backslashes -- neither method works... Any ideas? Thanks! There was a discussion and maybe even a fix proposed for this issue on one of the GNU lists, probably <[EMAIL PROTECTED]>? Anyway, I don't think the current release version of patch will handle paths containing spaces... -- -Chuck ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to "[EMAIL PROTECTED]"
Re: Patching
On Fri, Nov 19, 2004 at 01:43:00AM -0500, RL wrote: > Hi, if you update your source tree through cvsup now and them, is it > still necessary to follow the FreeBSD security advisories and patch > your system? In others words, when you cvsup the source through > RELENG_5_3 and make the world, does it include all the security > patches you see at FreeBSD.org? Yes (if by "make the world" you really mean "rebuild the kernel and world" as described in the updating documentation). Kris pgpc5yMP09sYe.pgp Description: PGP signature
Re: Patching ports
Hi,
> How do I add a patch to a certain port? Usually I would use the "patch"
> program to add the patch to the source code. But when using ports the
> system begins compiling right after rewtrieving the source. Thus not
> giving me a change to apply the patch. I've seen a folder named "files"
> in which patches part of the port seem to be located. But just adding
> the patchfile here apperently wont do much good. I've tried using the
> "PATCHFILES" variable in the Makefile but then the system complains the
> my patchfile does not have a matching MD5 hash. Does anyone know how to
> handle this issue?
You can use ``make patch'' to extract the port and apply existing
FreeBSD patches to it. Now you can create your own local patches
(relative to ${WRKDIR} which is
/usr/ports///work/ by
default), and put them into into the files subdirectory of your port.
Please note, that the FreeBSD port system will ignore patches that do
not start with the ``patch-'' prefix (you could use the EXTRA_PATCHES
macro to work around or exploit that fact) (``grep'' the ports
tree for examples)
You can find more information on how to work on the ports collection in
the porters handbook:
http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/index.html
file:///usr/share/doc/en_US.ISO8859-1/books/porters-handbook/index.html
One last side remark:
If you think that your patches are useful for either the FreeBSD or the
whole open source community, it would be really nice if you sent them as
a problem report (send-pr(1), see the porter's handbook) or to the author
of the software.
Regards,
Simon
signature.asc
Description: Digital signature
Re: Patching ports
On Wednesday 05 May 2004 12:29, Matthew Seaman wrote: > On Wed, May 05, 2004 at 12:11:22PM +, Mikkel Christensen wrote: > > > How do I add a patch to a certain port? > > Usually I would use the "patch" program to add the patch to the source code. > > But when using ports the system begins compiling right after rewtrieving the > > source. Thus not giving me a change to apply the patch. > > I've seen a folder named "files" in which patches part of the port seem to be > > located. But just adding the patchfile here apperently wont do much good. > > I've tried using the "PATCHFILES" variable in the Makefile but then the system > > complains the my patchfile does not have a matching MD5 hash. > > Does anyone know how to handle this issue? > > When building a port you can type: > > # make extract > > which will download any sources, check the size and checksums, unpack > the sources into the work directory and apply any patches that come > with the port. And then stop. At this point you can make whatever > modifications you wish to yourself, and then finish off the build by > > # make > > So long as your patch doesn't add or delete files from the expected > packing list then just doing a: > > # make install > > will work. > > It is also possible to put your patch file into the port's files > directory and have it automatically applied, but you need to take care > to account for the order that patch files get applied. > Thank you both for a quick and explaning reply. The last par of your answer brings up a short question though. Will patch-files automatically be run if they are placed in the "files" folder? It did not seem that way when I tried but I might have done something wrong:) - Mikkel ___ [EMAIL PROTECTED] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to "[EMAIL PROTECTED]"
Re: Patching ports
On Wed, May 05, 2004 at 12:11:22PM +, Mikkel Christensen wrote: > How do I add a patch to a certain port? > Usually I would use the "patch" program to add the patch to the source code. > But when using ports the system begins compiling right after rewtrieving the source. > Thus not giving me a change to apply the patch. > I've seen a folder named "files" in which patches part of the port seem to be > located. But just adding the patchfile here apperently wont do much good. > I've tried using the "PATCHFILES" variable in the Makefile but then the system > complains the my patchfile does not have a matching MD5 hash. > Does anyone know how to handle this issue? When building a port you can type: # make extract which will download any sources, check the size and checksums, unpack the sources into the work directory and apply any patches that come with the port. And then stop. At this point you can make whatever modifications you wish to yourself, and then finish off the build by # make So long as your patch doesn't add or delete files from the expected packing list then just doing a: # make install will work. It is also possible to put your patch file into the port's files directory and have it automatically applied, but you need to take care to account for the order that patch files get applied. Cheers, Matthew -- Dr Matthew J Seaman MA, D.Phil. 26 The Paddocks Savill Way PGP: http://www.infracaninophile.co.uk/pgpkey Marlow Tel: +44 1628 476614 Bucks., SL7 1TH UK pgp0.pgp Description: PGP signature
Re: Patching ports
Mikkel Christensen wrote: Hi How do I add a patch to a certain port? Usually I would use the "patch" program to add the patch to the source code. But when using ports the system begins compiling right after rewtrieving the source. Thus > not giving me a change to apply the patch. I've seen a folder named "files" in which patches part of the port seem to be located. > But just adding the patchfile here apperently wont do much good. I've tried using the "PATCHFILES" variable in the Makefile but then the system complains > the my patchfile does not have a matching MD5 hash. Does anyone know how to handle this issue? The manual way to patch stuff is this: make extract cd work/ cd make "make extract" will fetch the tarball and extract it into the work directory. There you can patch it to your heart's content and return to do "make" when done. You can also do "make patch" instead of "make extract" - this will do the extract step and also apply any patches provided by FreeBSD. It's a matter of whether you want to apply your patches before or after the FreeBSD patches. -- Bill Moran Potential Technologies http://www.potentialtech.com ___ [EMAIL PROTECTED] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to "[EMAIL PROTECTED]"
RE: Patching the system
Hi, you should install cvsup, and update your entire source branch, install it from ports and have a look at the /usr/share/examples/cvsup files. then go to /usr/src/usr.bin/script and make && make install, If it isn't a freebsd patch perhaps fetching the patch into /usr/src/usr.bin/script and applying it with patch -p0 < patchfile can help. Hope this helps you a little. -- Kind regards, Remko Lodder Elvandar.org/DSINet.org www.mostly-harmless.nl Dutch community for helping newcomers on the hackerscene mrtg.grunn.org Dutch mirror of MRTG -Oorspronkelijk bericht- Van: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] MHA Verzonden: maandag 23 februari 2004 19:24 Aan: [EMAIL PROTECTED] Onderwerp: Patching the system Hi all (and excuse my English, please) I need to patch "script" (/usr/src/usr.bin/script - /usr/bin/script), but I don't know how to do it correctly. Here is the patch and the bug report: http://www.freebsd.org/cgi/query-pr.cgi?pr=56166 I think "script" is the problem, I have some errors with portupgrade and script like this: ** Command failed [exit code 1]: /usr/bin/script -qa \ /tmp/portupgrade932.5 make I have search in the handbook, FAQ and onlamp.com/fbsd, but I haven't find anything useful, sorry if this question is explained in any of these places. Thanks for your help. Regards, Manu ___ [EMAIL PROTECTED] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to "[EMAIL PROTECTED]" ___ [EMAIL PROTECTED] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to "[EMAIL PROTECTED]"
RE: patching a device driver
ok,
i have answered my own question. a few additions to my if_fxp.c file,
and a kernel recompile and bingo. make sure you get the order right.
static u_char fxp_cb_config_template[] = {
0x0, 0x0, /* cb_status */
0x0, 0x0, /* cb_command */
0x0, 0x0, 0x0, 0x0, /* link_addr */
0x0,/* 0 */
0x0,/* 1 */
0x0,/* 2 */
0x0,/* 3 */
0x0,/* 4 */
0x0,/* 5 */
0x32, /* 6 */
0x0,/* 7 */
0x0,/* 8 */
0x0,/* 9 */
0x6,/* 10 */
0x0,/* 11 */
0x0,/* 12 */
0x0,/* 13 */
0xf2, /* 14 */
0x48, /* 15 */
0x0,/* 16 */
0x02, /* 17 */ <= added by me
0x40, /* 18 */
0xf0, /* 19 */
0x0,/* 20 */
0x3f, /* 21 */
0x5 /* 22 */
};
struct fxp_ident {
u_int16_t devid;
char*name;
};
/*
* Claim various Intel PCI device identifiers for this driver. The
* sub-vendor and sub-device field are extensively used to identify
* particular variants, but we don't currently differentiate between
* them.
*/
static struct fxp_ident fxp_ident_table[] = {
{ 0x1029, "Intel 82559 PCI/CardBus Pro/100" },
{ 0x1030, "Intel 82559 Pro/100 Ethernet" },
{ 0x1031, "Intel 82801CAM (ICH3) Pro/100 VE Ethernet" },
{ 0x1032, "Intel 82801CAM (ICH3) Pro/100 VE Ethernet" },
{ 0x1033, "Intel 82801CAM (ICH3) Pro/100 VM Ethernet" },
{ 0x1034, "Intel 82801CAM (ICH3) Pro/100 VM Ethernet" },
{ 0x1035, "Intel 82801CAM (ICH3) Pro/100 Ethernet" },
{ 0x1036, "Intel 82801CAM (ICH3) Pro/100 Ethernet" },
{ 0x1037, "Intel 82801CAM (ICH3) Pro/100 Ethernet" },
{ 0x1038, "Intel 82801CAM (ICH3) Pro/100 VM Ethernet" },
{ 0x1039, "Intel 82801DB (ICH4) Pro/100 VE Ethernet" },
{ 0x103A, "Intel 82801DB (ICH4) Pro/100 Ethernet" },
{ 0x103B, "Intel 82801DB (ICH4) Pro/100 VM Ethernet" },
{ 0x103C, "Intel 82801DB (ICH4) Pro/100 Ethernet" },
{ 0x103D, "Intel 82801DB (ICH4) Pro/100 VE Ethernet" },
{ 0x103E, "Intel 82801DB (ICH4) Pro/100 VM Ethernet" },
{ 0x1050, "Intel 82562EZ PHY 10/100 Fast Ethernet" }, <= added by
me
{ 0x1059, "Intel 82551QM Pro/100 M Mobile Connection" },
{ 0x1209, "Intel 82559ER Embedded 10/100 Ethernet" },
{ 0x1229, "Intel 82557/8/9 EtherExpress Pro/100(B) Ethernet" },
{ 0x2449, "Intel 82801BA/CAM (ICH2/3) Pro/100 Ethernet" },
{ 0,NULL },
};
> -Original Message-
> From: [EMAIL PROTECTED]
> [mailto:[EMAIL PROTECTED] Behalf Of carmoda
> Sent: Tuesday, 28 October 2003 3:55 PM
> To: [EMAIL PROTECTED]
> Subject: patching a device driver
>
>
> Hi,
>
> I have found some instructions on how to patch a device
> driver [so as to get
> an onboard network card to get picked up]. I was wondering if
> anyone had any
> instructions on how to go about adding the patch, i have never done it
> before...
>
> [EMAIL PROTECTED]
>
> http://lists.freebsd.org/pipermail/freebsd-bugs/2003-June/001240.html
>
>
>
>
>
>
>
>
>
>
> ___
> [EMAIL PROTECTED] mailing list
> http://lists.freebsd.org/mailman/listinfo/freebsd-questions
> To unsubscribe, send any mail to
> "[EMAIL PROTECTED]"
>
___
[EMAIL PROTECTED] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to "[EMAIL PROTECTED]"
Re: Patching source in a port
Any patches named files/patch-* in the port's directory will be applied as the port is built. So you should be able to add your patch and do a 'make clean build' to create patched binaries. You can also 'make patch' to just apply the patches, then inspect the results under the work directory. Have a look at file:/usr/share/doc/en/books/porters-handbook/index.html for all the details. - Original Message - From: "Jamie" <[EMAIL PROTECTED]> Subject: Patching source in a port > > >Is it possible to patch the source code in a port, and then make, make > install again to get it to install the patched code? I tried applying the > sendmail patch. I had previously installed 8.12.9 from ports. > > This is basically what I did: > > cd /usr/ports/mail/sendmail-sasl/work/sendmail-8.9.12/sendmail > > patch < /path/to/patch > > -patch confirms that it went successfully. > > -I also edited version.c and changed the version number. > > cd ../../../ > > make PREFIX=/usr > make PREFIX=/usr install > > But the patch doesn't seem to be taking effect. After restarting > sendmail I: > > sendmail -bt -d0.11 < /dev/null > > and it tells me that it is still version 8.12.9. > > Am I doing something obviously wrong? The compilation seemed to run > successfully. > > > - Jamie > > > > > > "A friend is someone who lets you have total freedom to be yourself." > > ___ > [EMAIL PROTECTED] mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-questions > To unsubscribe, send any mail to "[EMAIL PROTECTED]" > ___ [EMAIL PROTECTED] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to "[EMAIL PROTECTED]"
Re: Patching sshd in FreeBSD 4.7
Kevin G <[EMAIL PROTECTED]> writes: > *** 5,11 > > #define SSH_VERSION (ssh_version_get()) > #define SSH_VERSION_BASE"OpenSSH_3.4p1" > ! #define SSH_VERSION_ADDENDUM"FreeBSD-20030917" > > const char *ssh_version_get(void); > void ssh_version_set_addendum(const char *add); > --- 5,11 > > #define SSH_VERSION (ssh_version_get()) > #define SSH_VERSION_BASE"OpenSSH_3.4p1" > ! #define SSH_VERSION_ADDENDUM"FreeBSD-20030924" > > const char *ssh_version_get(void); > void ssh_version_set_addendum(const char *add); > > > I've never had any problems patching before, I could use > some help. I can't see why the patch would fail, but it looks like you should be able to easily make the change by hand (putting the later-dated string in the file). Or you could ignore it -- it doesn't really affect anything. ___ [EMAIL PROTECTED] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to "[EMAIL PROTECTED]"
Re: Patching SSH
On Wed, Sep 17, 2003 at 04:01:40PM -0800, Jon Reynolds wrote: > I have SSH installed with the base install of 4.7. I downloaded the > patch and followed the directions: cd /usr/src - patch < /path/to/patch. > when I issue that command it asks me which file I would like to patch I > type in buffer.c and it tells me this file cannot be found. What file do > I need to patch if not buffer.c? If that is an otherwise unpatched 4.7-RELEASE system, then there are more security patches to apply than just the latest fun'n'games with openssh. The simplest way to get a fully patched source tree is to use cvsup(1) with a sup-file like this (should be substantially the same as /usr/share/examples/cvsup/standard-supfile): *default host=cvsup7.us.FreeBSD.org *default base=/usr *default prefix=/usr *default release=cvs tag=RELENG_4_7 *default delete use-rel-suffix *default compress src-all Then either do a complete build,install world+kernel or just rebuild the selected parts of the source tree as intructed in the security advisories. Cheers, Matthew -- Dr Matthew J Seaman MA, D.Phil. 26 The Paddocks Savill Way PGP: http://www.infracaninophile.co.uk/pgpkey Marlow Tel: +44 1628 476614 Bucks., SL7 1TH UK pgp0.pgp Description: PGP signature
Re: Patching SSH
On Wed, 17 Sep 2003, Jon Reynolds wrote: > I have SSH installed with the base install of 4.7. I downloaded the > patch and followed the directions: cd /usr/src - patch < /path/to/patch. > when I issue that command it asks me which file I would like to patch I > type in buffer.c and it tells me this file cannot be found. What file do > I need to patch if not buffer.c? Hi Jon, I may not have done it the "correct" way, but what I did was to download openssh-3.7.1p1 from ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ and build and install that: tar zxf openssh-3.7.1*tar.gz cd openssh-3.7.1* ./configure --with-md5-passwords --with-pam make su make install --with-md5-passwords *shouldn't* be necessary since we're using pam, but I've found it necessary to include that on more than one system. You can always try it without and see if the resulting sshd will authenticate you correctly, and if not include it when you rebuild it. Note that this way will put stuff under /usr/local by default (which you can always change of course), so any customizations you had to sshd_config should be merged with the new /usr/local/etc/sshd_config. Because of this, I added the following in /etc/rc.conf: sshd_program="/usr/local/sbin/sshd" Hope that helps, Mike ___ [EMAIL PROTECTED] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to "[EMAIL PROTECTED]"
Re: Patching Openssh on 4.9 PRERELEASE
Okay, so I could go and put any date in there that I like but how would I verify that the update has worked? My manually changing the date to give myself peace of mind doesn't sit well with me. Thanx, David --- FreeBSD Mail Lists <[EMAIL PROTECTED]> wrote: > David; > > You need to edit version.h within > /usr/src/crypto/openssh/version.h > > and change the FreeBSD-20030201 > to be FreeBSD-20030916. > > The patch doesnt update the date. > Only patches the security issue. > > On Tue, 16 Sep 2003, David Wagenheim wrote: > > > The other day I cvsup'd using the stable supfile, > did > > buildworld, installworld and built and installed a > new > > kernel. All of that went fine and I now have a > > 4.9-PRERELEASE box. > > > > Today, I went to patch OpenSSH and I did: > > > > # cd /usr/src > > # patch < /root/buffer46.patch > > # cd /usr/src/secure/lib/libssh > > # make clean > > # make depend && make all install > > # cd /usr/src/secure/usr.sbin/sshd > > # make clean > > # make depend && make all install > > # cd /usr/src/secure/usr.bin/ssh > > # make clean > > # make depend && make all install > > > > Everything went fine but when I checked the > version of > > the newly built sshd, it said: > > > > sshd Version OpenSSH_3.5p1 FreeBSD-20030201 > > > > but according to the advisory, for 4.8, it should > be: > > > > OpenSSH_3.5p1 FreeBSD-20030916 > > > > (For all versions of FreeBSD mentioned in the > > advisory, the version # of OpenSSH reflects > 20030916, > > so I assume mine should as well). > > > > Now I know that I don't have 4.8 but rather 4.9, > but > > does the fact that the version number doesn't > reflect > > September 16 mean that there currently isn't a way > to > > update sshd on a 4.9 system? > > > > If it is helpful, output from uname -a is: > > > > FreeBSD db.mydomain.com 4.9-PRERELEASE #0: Sun Sep > 14 > > 17:38:58 EST 2003 > > [EMAIL PROTECTED]:/usr/obj/usr/src/sys/GENERIC > > > > Thanx, > > > > David > > > > > > __ > > Do you Yahoo!? > > Yahoo! SiteBuilder - Free, easy-to-use web site > design software > > http://sitebuilder.yahoo.com > > ___ > > [EMAIL PROTECTED] mailing list > > > http://lists.freebsd.org/mailman/listinfo/freebsd-questions > > To unsubscribe, send any mail to > "[EMAIL PROTECTED]" > > __ Do you Yahoo!? Yahoo! SiteBuilder - Free, easy-to-use web site design software http://sitebuilder.yahoo.com ___ [EMAIL PROTECTED] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to "[EMAIL PROTECTED]"
Re: Patching Openssh on 4.9 PRERELEASE
David; You need to edit version.h within /usr/src/crypto/openssh/version.h and change the FreeBSD-20030201 to be FreeBSD-20030916. The patch doesnt update the date. Only patches the security issue. On Tue, 16 Sep 2003, David Wagenheim wrote: > The other day I cvsup'd using the stable supfile, did > buildworld, installworld and built and installed a new > kernel. All of that went fine and I now have a > 4.9-PRERELEASE box. > > Today, I went to patch OpenSSH and I did: > > # cd /usr/src > # patch < /root/buffer46.patch > # cd /usr/src/secure/lib/libssh > # make clean > # make depend && make all install > # cd /usr/src/secure/usr.sbin/sshd > # make clean > # make depend && make all install > # cd /usr/src/secure/usr.bin/ssh > # make clean > # make depend && make all install > > Everything went fine but when I checked the version of > the newly built sshd, it said: > > sshd Version OpenSSH_3.5p1 FreeBSD-20030201 > > but according to the advisory, for 4.8, it should be: > > OpenSSH_3.5p1 FreeBSD-20030916 > > (For all versions of FreeBSD mentioned in the > advisory, the version # of OpenSSH reflects 20030916, > so I assume mine should as well). > > Now I know that I don't have 4.8 but rather 4.9, but > does the fact that the version number doesn't reflect > September 16 mean that there currently isn't a way to > update sshd on a 4.9 system? > > If it is helpful, output from uname -a is: > > FreeBSD db.mydomain.com 4.9-PRERELEASE #0: Sun Sep 14 > 17:38:58 EST 2003 > [EMAIL PROTECTED]:/usr/obj/usr/src/sys/GENERIC > > Thanx, > > David > > > __ > Do you Yahoo!? > Yahoo! SiteBuilder - Free, easy-to-use web site design software > http://sitebuilder.yahoo.com > ___ > [EMAIL PROTECTED] mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-questions > To unsubscribe, send any mail to "[EMAIL PROTECTED]" > ___ [EMAIL PROTECTED] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to "[EMAIL PROTECTED]"
Re: Patching procedures
Hello Matthew Thank you for your very complete answer. I'm going to be experimenting with this for a while, and I'll do a lot of reading. Kind regards Guy On Thu, 2003-08-28 at 13:29, Matthew Seaman wrote: > On Thu, Aug 28, 2003 at 10:09:35AM +0200, Guy Van Sanden wrote: > > ** message didn't make it to the list - sending again ** > > > > > > I'm still relatively new to FreeBSD, and I was wondering what most of > > you use as a patching procedure for FreeBSD (not the ports) > > > > Up to now, I have always folowed the instructions in '2) To patch your > > present system:'. > > Yet somehow this seems like the long way to do it. > > > > Therefor, I'm wondering how most of you keep your systems up to date. > > > > For the moment, I'm only managing my home server (which is still > > critical), but I would also like to know how to manage this in a > > professional deployment (I used to manage Solaris networks, and we had > > these patch-clusters which were rahter nice). > > Unlike Solaris, FreeBSD generally operates by supplying patches to the > system source code. Colin Percival has a binary patch system under > development, but it's not an official FreeBSD thing yet -- see > http://www.daemonology.org/ for details. > > The standard way to keep a system up to date is to maintain an up to > date copy of the system sources -- either which ever one of the > release branches you've chosen, or 4-STABLE or 5-CURRENT -- and > compile and install from there. > > For the release branches you can achieve that by starting with the > sources as distributed on the CD Roms, and applying the patches as > shown in any security advisories -- any changes to a release branche > will be accompanied by an advisory notice, which is almost always a > security advisory. Technically it may be possible for a really > crucial but not security related patch to be applied to a release > branch, but it doesn't seem to happen much in practice. The > non-release branches (4-STABLE, 5-CURRENT) are under continuous > development, so there's not going to be any specific points at which > everyone will update, other than when large chunks of particularly > awaited new functionality or big bugfixes go into the tree. Or when > (like now) a new release is in the offing. Most private users > tracking STABLE or CURRENT will just update every week or month or so, > or when they get around to it. > > Whatever the release branch you've chosen, and particularly if you're > running 4-STABLE of 5-CURRENT, it's much more convenient to use > cvsup(1) to keep your sources up to date, rather than by applying > patches. There are a few other mechanisms around -- see Appendix A of > the handbook -- > > http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/mirrors.html > > but cvsup(1) is what the vast majority of the users use. > > If you're using FreeBSD in a commercial setting, then you should > certainly be tracking one of the release branches and be implementing > a testing regime on a spare server before pushing out updates to your > production servers. Whilst the FreeBSD project generally does > extremely well at keeping 4-STABLE and the RELEASE branches stable, > they do rely on bug reports from users and developers rather than > having the sort of comprehensive QC test cycles that Sun performs. > > The test box function can be combined quite neatly with being a build > server -- you can either make your own releases and cut them to CD-ROM > for installation on your production machines, or just NFS mount the > /usr/obj and /usr/src trees from the build box in order to install the > upgrade. With practice you can get an installkernel - reboot to > single user - installworld - mergemaster - reboot cycle down to under > 15mins downtime, which is a lot quicker than it takes to install some > Solaris patches. > > One other major difference between Solaris patches and FreeBSD updates > is that FreeBSD doesn't offer you a specific mechanism to back out any > changes you make. Always make sure you have good backups from > immediately before you start an upgrade cycle. > > Cheers, > > Matthew ___ [EMAIL PROTECTED] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to "[EMAIL PROTECTED]"
Re: Patching procedures
On Thu, Aug 28, 2003 at 10:09:35AM +0200, Guy Van Sanden wrote: > ** message didn't make it to the list - sending again ** > > > I'm still relatively new to FreeBSD, and I was wondering what most of > you use as a patching procedure for FreeBSD (not the ports) > > Up to now, I have always folowed the instructions in '2) To patch your > present system:'. > Yet somehow this seems like the long way to do it. > > Therefor, I'm wondering how most of you keep your systems up to date. > > For the moment, I'm only managing my home server (which is still > critical), but I would also like to know how to manage this in a > professional deployment (I used to manage Solaris networks, and we had > these patch-clusters which were rahter nice). Unlike Solaris, FreeBSD generally operates by supplying patches to the system source code. Colin Percival has a binary patch system under development, but it's not an official FreeBSD thing yet -- see http://www.daemonology.org/ for details. The standard way to keep a system up to date is to maintain an up to date copy of the system sources -- either which ever one of the release branches you've chosen, or 4-STABLE or 5-CURRENT -- and compile and install from there. For the release branches you can achieve that by starting with the sources as distributed on the CD Roms, and applying the patches as shown in any security advisories -- any changes to a release branche will be accompanied by an advisory notice, which is almost always a security advisory. Technically it may be possible for a really crucial but not security related patch to be applied to a release branch, but it doesn't seem to happen much in practice. The non-release branches (4-STABLE, 5-CURRENT) are under continuous development, so there's not going to be any specific points at which everyone will update, other than when large chunks of particularly awaited new functionality or big bugfixes go into the tree. Or when (like now) a new release is in the offing. Most private users tracking STABLE or CURRENT will just update every week or month or so, or when they get around to it. Whatever the release branch you've chosen, and particularly if you're running 4-STABLE of 5-CURRENT, it's much more convenient to use cvsup(1) to keep your sources up to date, rather than by applying patches. There are a few other mechanisms around -- see Appendix A of the handbook -- http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/mirrors.html but cvsup(1) is what the vast majority of the users use. If you're using FreeBSD in a commercial setting, then you should certainly be tracking one of the release branches and be implementing a testing regime on a spare server before pushing out updates to your production servers. Whilst the FreeBSD project generally does extremely well at keeping 4-STABLE and the RELEASE branches stable, they do rely on bug reports from users and developers rather than having the sort of comprehensive QC test cycles that Sun performs. The test box function can be combined quite neatly with being a build server -- you can either make your own releases and cut them to CD-ROM for installation on your production machines, or just NFS mount the /usr/obj and /usr/src trees from the build box in order to install the upgrade. With practice you can get an installkernel - reboot to single user - installworld - mergemaster - reboot cycle down to under 15mins downtime, which is a lot quicker than it takes to install some Solaris patches. One other major difference between Solaris patches and FreeBSD updates is that FreeBSD doesn't offer you a specific mechanism to back out any changes you make. Always make sure you have good backups from immediately before you start an upgrade cycle. Cheers, Matthew -- Dr Matthew J Seaman MA, D.Phil. 26 The Paddocks Savill Way PGP: http://www.infracaninophile.co.uk/pgpkey Marlow Tel: +44 1628 476614 Bucks., SL7 1TH UK pgp0.pgp Description: PGP signature
Re: patching
On 2003-01-07 12:51, Brian <[EMAIL PROTECTED]> wrote: > Right at the top of the patch man page it says: > but usually just > patch > I missed the <, my bad although that is most nonintuitive, wtf ever > happened to command argument? If it needs to read a textfile then > have it read what I put in. Well, a lot of programs on UNIX work as `filters'. There's nothing wrong with that :) To Unsubscribe: send mail to [EMAIL PROTECTED] with "unsubscribe freebsd-questions" in the body of the message
Re: patching
Freebies - On Tue, 7 Jan 2003, Brian wrote: > I downloaded the relevant patch and .asc files to /tmp this am, and then > execute > > patch /tmp/filedesc.patch >From 'man patch': = patch - apply a diff file to an original SYNOPSIS patch [options] [origfile [patchfile]] [+ [options] [orig- file]]... but usually just patch /. Name of file to patch:' - John Mills To Unsubscribe: send mail to [EMAIL PROTECTED] with "unsubscribe freebsd-questions" in the body of the message
Re: patching
Right at the top of the patch man page it says: but usually just patch Freebies - > > On Tue, 7 Jan 2003, Brian wrote: > > > I downloaded the relevant patch and .asc files to /tmp this am, and then > > execute > > > > patch /tmp/filedesc.patch > > >From 'man patch': > = >patch - apply a diff file to an original > > SYNOPSIS >patch [options] [origfile [patchfile]] [+ [options] [orig- >file]]... > >but usually just > >patch ... > = > > so try: > patch < /tmp/filedesc.patch > > > You may need to use '-p[1 2 3 ...]' depending on the relative paths to > directory from which the patch was made and to where you are applying the > patches. The usual indicator for this is an error message to the effect: > 'Cannot find file /. Name of file to patch:' > > - John Mills > To Unsubscribe: send mail to [EMAIL PROTECTED] with "unsubscribe freebsd-questions" in the body of the message
Re: patching
On Tue, Jan 07, 2003 at 12:21:23PM -0800, Brian wrote: > I know I am missing something totally obvious, but am stumped. > > I downloaded the relevant patch and .asc files to /tmp this am, and then > execute > > patch /tmp/filedesc.patch > > It just sits there, I let it sit for a good 20 minutes, it really shouldnt > take that long. I also tried it with the -p switch, it appears that was > the norm in some searches I found. > > Bri > > > To Unsubscribe: send mail to [EMAIL PROTECTED] > with "unsubscribe freebsd-questions" in the body of the message patch < /tmp/filedesc.patch Nathan -- GPG Public Key ID: 0x4250A04C gpg --keyserver pgp.mit.edu --recv-keys 4250A04C http://63.105.21.156/gpg_nkinkade_4250A04C.asc To Unsubscribe: send mail to [EMAIL PROTECTED] with "unsubscribe freebsd-questions" in the body of the message
Re: patching a file
# [EMAIL PROTECTED] / 2002-12-05 11:41:30 +: > On Thu, Dec 05, 2002 at 11:38:52AM +0100, Roman Neuhauser wrote: > > # [EMAIL PROTECTED] / 2002-12-04 16:22:03 +: > > > On Wed, Dec 04, 2002 at 09:46:40AM -0600, Kirk R. Wythers wrote: > > > No --- the source tarball will be downloaded to /usr/ports/distfile > > > (make fetch) from whence it will be compared to the pre-recorded > > > checksum (make checksum), and then untarred into the work directory > > > > make extract > I'm right about 'make checksum' I know. I had thought about munging the quoted text a bit more to make it clearer that I was correcting (or rather: completing) the part after the comma, but then decided it wasn't that ambiguous after all, and just sent it out. -- If you cc me or remove the list(s) completely I'll most likely ignore your message.see http://www.eyrie.org./~eagle/faqs/questions.html To Unsubscribe: send mail to [EMAIL PROTECTED] with "unsubscribe freebsd-questions" in the body of the message
Re: patching a file
On Thu, Dec 05, 2002 at 11:38:52AM +0100, Roman Neuhauser wrote: > # [EMAIL PROTECTED] / 2002-12-04 16:22:03 +: > > On Wed, Dec 04, 2002 at 09:46:40AM -0600, Kirk R. Wythers wrote: > > > Problem is, I confused over how to apply a patch to something in the > > > ports system. My ports tree is up to date, but I dont't see the source > > > in /usr/ports/converters/recode that the patch should be applied to. > > > Also, running "file" on /usr/ports/distfiles/recode-3.6.tar.gz returns > > > "file is empty". I thought that I could unpack the tarball manually > > > apply the patch, then tar it back up and build the port. I seem to be > > > all wet on this. > > > > No --- the source tarball will be downloaded to /usr/ports/distfile > > (make fetch) from whence it will be compared to the pre-recorded > > checksum (make checksum), and then untarred into the work directory > > make extract > > > and the patches applied (make unpack). > > make patch > > or has it changed lately? I'm right about 'make checksum', but I must yeild the point to you over 'make extract' and 'make patch'. You're right, and I should have looked at the ports(7) man page before sending. Cheers, Matthew -- Dr Matthew J Seaman MA, D.Phil. 26 The Paddocks Savill Way Marlow Tel: +44 1628 476614 Bucks., SL7 1TH UK To Unsubscribe: send mail to [EMAIL PROTECTED] with "unsubscribe freebsd-questions" in the body of the message
Re: patching a file
# [EMAIL PROTECTED] / 2002-12-04 16:22:03 +: > On Wed, Dec 04, 2002 at 09:46:40AM -0600, Kirk R. Wythers wrote: > > Problem is, I confused over how to apply a patch to something in the > > ports system. My ports tree is up to date, but I dont't see the source > > in /usr/ports/converters/recode that the patch should be applied to. > > Also, running "file" on /usr/ports/distfiles/recode-3.6.tar.gz returns > > "file is empty". I thought that I could unpack the tarball manually > > apply the patch, then tar it back up and build the port. I seem to be > > all wet on this. > > No --- the source tarball will be downloaded to /usr/ports/distfile > (make fetch) from whence it will be compared to the pre-recorded > checksum (make checksum), and then untarred into the work directory make extract > and the patches applied (make unpack). make patch or has it changed lately? -- If you cc me or remove the list(s) completely I'll most likely ignore your message.see http://www.eyrie.org./~eagle/faqs/questions.html To Unsubscribe: send mail to [EMAIL PROTECTED] with "unsubscribe freebsd-questions" in the body of the message
Re: patching a file
On Wed, Dec 04, 2002 at 09:46:40AM -0600, Kirk R. Wythers wrote: > I have a patch that should fix a build problem with one of freebsd's > ports, pybliographer. The patch needs to be applied to recode-3.6_1 to > make it compatable with pybliographer (which requires recode 3.5 > exactly). I want to test this patch out on my system, to see if it does > all it claims to do... Just put your patches into the 'files' directory of the port --- call them patch-aa, patch-ab, patch-ac ... if you want them to be applied in any particular order, and make sure the filenames in the patches are given relative to the 'work' directory the port uses to compile in. > Problem is, I confused over how to apply a patch to something in the > ports system. My ports tree is up to date, but I dont't see the source > in /usr/ports/converters/recode that the patch should be applied to. > Also, running "file" on /usr/ports/distfiles/recode-3.6.tar.gz returns > "file is empty". I thought that I could unpack the tarball manually > apply the patch, then tar it back up and build the port. I seem to be > all wet on this. No --- the source tarball will be downloaded to /usr/ports/distfile (make fetch) from whence it will be compared to the pre-recorded checksum (make checksum), and then untarred into the work directory and the patches applied (make unpack). If you modify the recode tarball, it will fail the checksum test and all sorts of ugly warning messages will be produced. Cheers, Matthew -- Dr Matthew J Seaman MA, D.Phil. 26 The Paddocks Savill Way Marlow Tel: +44 1628 476614 Bucks., SL7 1TH UK To Unsubscribe: send mail to [EMAIL PROTECTED] with "unsubscribe freebsd-questions" in the body of the message
