- Dillo-dev - lists.mailman3.com

tabs, https, ...

by taj＠www.linux.org.uk

I've been following the dillo mail list for a while getting a feel for what is up; Good things! With the external patches, I'd be willing to toss in a cvs server that mirrors the base dillo and has modified branches for various interests or even one merged branch. The intent would be to just keep a seperate single repository for external work which dillo could merge portions that fit it's philosophy. The offer would include www,cvs,ftp and shell access for developers that post their nontrivial patches to the official mail-list. -- Trent Jarvi taj(a)www.linux.org.uk

Nov. 17, 2003

Re: [Dillo-dev] gushort for port instead of guint

by Indan Zupancic

> What about the port in DilloUrl then? A port is always a unsigned short, can store it as an int if you want, but doesn't make much sense. I only looked at Dillo's IO code, so didn't notice the one in DilloUrl. It's really not very important, but in the case of SocketData it at least makes the structure smaller, DilloUrl stays the same size. Greetings, Indan

Nov. 16, 2003

Re: [Dillo-dev] HTTPS Patch

by Mike Eriksen

Thank you, Indan! This works great! I hope you will consider to match your HTTPS patch against Franks frames/tab patch once in a while. It makes life so much easier for amatuers like myself. If you guys manage to get the branching to work, this will of course be solved this way. A short note to people trying to compile on Red Hat 9.0: Add: EXPORT CPPFLAGS=-I/usr/kerberos/include in front of "./configure" (and don't forget to to change the zcat lines from "...patch" to "...patch.gz" as pointed out elsewhere) Mike On Fri, 14 Nov 2003, Indan Zupancic wrote: > Hello, > > I made a version of my https patch which works with Frank's tabs patch, > version 14 I think, there was one silly reject. I also made a simple > (unfinished) script to get a patched Dillo version from CVS, edit it for > your needs: > > ------- script ------- > #!/bin/sh > > CFLAGS="-O2 -s -pipe" > > mkdir Dillo-patched > cd Dillo-patched > echo "Getting Dillo source..." > cvs -z3 -d:pserver:anonymous@auriga.wearlab.de:/sfhome/cvs/dillo co -D > "11/10/03" dillo > > echo "Getting patches..." > wget "http://www.geocities.com/ikbenfrank/dillo-20031110-tabs.patch.gz" > wget "http://www.xs4all.nl/~dorinek/dillo/dillo-20031110-https.patch.gz" > cd dillo > > echo "Applying tabs patch..." > zcat ../dillo-20031110-tabs.patch | patch -p1 > echo "Applying https patch..." > zcat ../dillo-20031110-https.patch | patch -p1 > > ./autogen.sh > echo "Running configure..." > CFLAGS=$CFLAGS ./configure > > #echo "Compiling patched Dillo..." > #make > #echo "Install patched Dillo?" > #su > #make install > #exit > #cd ../../ > #rm -rf Dillo-patched > ------- end script ------- > > Greetings, > > Indan > > > _______________________________________________ > Dillo-dev mailing list > Dillo-dev(a)lists.auriga.wearlab.de > http://lists.auriga.wearlab.de/cgi-bin/mailman/listinfo/dillo-dev > -- Thinstation FAQ maintainer http://thinstation.sourceforge.net - a light, full featured linux based thin client OS

Nov. 16, 2003

Re: [Dillo-dev] gushort for port instead of guint

by Stephan Goetter

Am Sat, Nov 15, 2003 at 07:09:43PM +0100 schrieb Indan Zupancic und sprach: > Hello, > > Just a tiny cleanup, ports are always shorts, so no need to make it an > int. It also makes the structure SocketData 4 bytes smaller because of > less padding. > > diff -purN orig/src/IO/http.c https/src/IO/http.c > --- orig/src/IO/http.c 2003-11-11 22:15:39.000000000 +0100 > +++ https/src/IO/http.c 2003-11-15 18:26:01.000000000 +0100 > @@ -58,7 +58,7 @@ G_STMT_START { > typedef struct { > gint SockFD; > const DilloUrl *Url; /* reference to original URL */ > - guint port; /* need a separate port in order to support > PROXY */ > + gushort port; /* need a separate port in order to support > PROXY */ > gboolean use_proxy; /* indicates whether to use proxy or not */ > DilloWeb *web; /* reference to client's web structure */ > GSList *addr_list; /* Holds the DNS answer */ > What about the port in DilloUrl then? Stephan

Nov. 16, 2003

gushort for port instead of guint

by Indan Zupancic

Hello, Just a tiny cleanup, ports are always shorts, so no need to make it an int. It also makes the structure SocketData 4 bytes smaller because of less padding. Greetings, Indan diff -purN orig/src/IO/http.c https/src/IO/http.c --- orig/src/IO/http.c 2003-11-11 22:15:39.000000000 +0100 +++ https/src/IO/http.c 2003-11-15 18:26:01.000000000 +0100 @@ -58,7 +58,7 @@ G_STMT_START { typedef struct { gint SockFD; const DilloUrl *Url; /* reference to original URL */ - guint port; /* need a separate port in order to support PROXY */ + gushort port; /* need a separate port in order to support PROXY */ gboolean use_proxy; /* indicates whether to use proxy or not */ DilloWeb *web; /* reference to client's web structure */ GSList *addr_list; /* Holds the DNS answer */

Nov. 15, 2003

Re: [Dillo-dev] HTTPS Patch

by Indan Zupancic

> Should that be: > zcat ../dillo-20031110-tabs.patch.gz | patch -p1 Oops, yes, of course. As I said, edit it for your needs. ;) Seems like I copied the wrong (untested) version, I mean, I tested the thing and it worked, so didn't expect that I would send the not working version, silly me. Well, jet another reason to not send emails too hasty. Thanks for pointing it out. Indan

Nov. 15, 2003

Re: [Dillo-dev] HTTPS Patch

by Johann Koenig

On Friday November 14 at 03:35pm Indan Zupancic <indan(a)nul.nu> wrote: > echo "Getting patches..." > wget > "http://www.geocities.com/ikbenfrank/dillo-20031110-tabs.patch.gz" > wget > "http://www.xs4all.nl/~dorinek/dillo/dillo-20031110-https.patch.gz" cd > dillo > > echo "Applying tabs patch..." > zcat ../dillo-20031110-tabs.patch | patch -p1 > echo "Applying https patch..." > zcat ../dillo-20031110-https.patch | patch -p1 Should that be: zcat ../dillo-20031110-tabs.patch.gz | patch -p1 ^^^^^ -- -johann koenig Today is Pungenday, the 26th day of The Aftermath in the YOLD 3169 My public pgp key: http://mental-graffiti.com/pgp/johannkoenig.pgp

Nov. 15, 2003

Re: [Dillo-dev] HTTPS Patch

by Indan Zupancic

Hello, I made a version of my https patch which works with Frank's tabs patch, version 14 I think, there was one silly reject. I also made a simple (unfinished) script to get a patched Dillo version from CVS, edit it for your needs: ------- script ------- #!/bin/sh CFLAGS="-O2 -s -pipe" mkdir Dillo-patched cd Dillo-patched echo "Getting Dillo source..." cvs -z3 -d:pserver:anonymous@auriga.wearlab.de:/sfhome/cvs/dillo co -D "11/10/03" dillo echo "Getting patches..." wget "http://www.geocities.com/ikbenfrank/dillo-20031110-tabs.patch.gz" wget "http://www.xs4all.nl/~dorinek/dillo/dillo-20031110-https.patch.gz" cd dillo echo "Applying tabs patch..." zcat ../dillo-20031110-tabs.patch | patch -p1 echo "Applying https patch..." zcat ../dillo-20031110-https.patch | patch -p1 ./autogen.sh echo "Running configure..." CFLAGS=$CFLAGS ./configure #echo "Compiling patched Dillo..." #make #echo "Install patched Dillo?" #su #make install #exit #cd ../../ #rm -rf Dillo-patched ------- end script ------- Greetings, Indan

Nov. 14, 2003

Re: [Dillo-dev] HTTPS Patch

by Indan Zupancic

Hello, I looked a bit more into it, and found several revision systems, one of them Subversion. The most important part is how good the program is in merging branches, because that's the most work. Normal diff can't handle it very well, CVS makes it only easier to fix it manually from what I saw of it, so that is what the main advantages of Subversion and Arch should be, easy merging. After reading some docs it seems that Arch is harder to setup and handle, but probably better, and Subversion much easier to use, but not really distributed. Several sites said that Bitkeeper is the best, only it has a not too nice license and isn't open source. I think it's time to find other patch makers, and see how far we can come with plain diffs and CVS first. Using Arch would probably make it easier to handle multiple branches, but may also scare away potential patch makers (meaning that they probably will use diffs and that someone else must apply them to an Arch branch). Subversion has the advantage that it resembles CVS much more, so it's easier to start with. Greetings, Indan ------------------------------------------------------------------ HTTPS patch: http://www.xs4all.nl/~dorinek/dillo/dillo-ssl.diff.gz ------------------------------------------------------------------

Nov. 14, 2003

Re: [Dillo-dev] HTTPS Patch

by Paul Pelzl

Subversion is certainly "a compelling replacement for CVS" (to use the words of the SVN developers), but it lacks proper support for distributed repositories. I think this feature is ideal for Free software projects, as it makes it easy for developers to make contributions without having to worry about who has write access at a central repository. Paul On Fri, Nov 14, 2003 at 08:14:45AM +0100, Lars Segerlund wrote: > How about considering subversion ? ( www.tigris.org ). > > I have been using it at work for about a year with really good results. It can really do branches and such, also handles directories in a sane way. > > / regards, LArs Segerlund. > > On Thu, 13 Nov 2003 02:46:56 +0100 (CET) > "Indan Zupancic" <indan(a)nul.nu> wrote: > > > > I've made some scripts which create a temporary copy of the dillo CVS > > > dir and the patched dir, remove all unwanted crud from the patched dir, > > > do the diff and generate some statistics. I can send them if you want. > > > > Hm, a script, didn't thought about that. No need to send them though, can > > make my own if I need any. > > > > > Of course this still leaves the issues with patch makers constantly > > > being out of sync with eachother, and each patch being broken by updates > > > to CVS shortly after the patch was posted. More on that later... > > > > What about making a seperate Dillo repository, but instead of using CVS > > that is too centralized and can't handle branches very well (or so I > > heard), we could use GNU Arch (http://www.gnu.org/software/gnu-arch/, > > thanks to Paul Pelzl for the tip) or Bitkeeper? That way it should be much > > easier to manage all the patches, with one branch for each "patch" (one > > branch for https, one for tab+frames, etc). The hardest part should be to > > keep our main branch in sync with Dillo's CVS. > > > > Greetings, > > > > Indan > > > > > > _______________________________________________ > > Dillo-dev mailing list > > Dillo-dev(a)lists.auriga.wearlab.de > > http://lists.auriga.wearlab.de/cgi-bin/mailman/listinfo/dillo-dev > > _______________________________________________ > Dillo-dev mailing list > Dillo-dev(a)lists.auriga.wearlab.de > http://lists.auriga.wearlab.de/cgi-bin/mailman/listinfo/dillo-dev

Nov. 14, 2003