From c216dc36e4cf09613fa91615f181cd9337bd4d8b Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 25 Aug 2014 00:56:11 +0100 Subject: [PATCH] wip --- .gitignore | 4 +++- Makefile | 13 ++++++++++++ access-table.lout | 29 +++++++++++++++++++-------- libavg.fig | 6 +++--- notes | 51 ++++++++++++++++++++++++++++------------------- 5 files changed, 70 insertions(+), 33 deletions(-) diff --git a/.gitignore b/.gitignore index 75f6127..1d06b32 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,12 @@ *~ lout.li *.lout.ld -libavg.ps +*.ps ps t t.* *.bak *.1 libavg-gitk-cut.ppm +slides.pdf +slides.ps diff --git a/Makefile b/Makefile index e323e14..e33bb68 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,8 @@ +SLIDES=libavg access-table + +SLIDEFILES=$(addsuffix .ps, $(SLIDES)) + o= >$@.new && mv -f $@.new $@ all: slides.pdf @@ -12,3 +16,12 @@ libavg.ps: libavg-gitk-cut.ppm libavg-clone.ppm iconv <$< >$@.1 -f UTF-8 -t ISO-8859-1 # wtf! LC_CTYPE=en_GB fig2dev -L ps -l dummy -z A4 <$@.1 $o + +%.ps: %.lout + lout $< $o + +slides.ps: $(SLIDEFILES) Makefile + cat $(SLIDEFILES) $o + +slides.pdf: slides.ps Makefile + ps2pdf $< $@ diff --git a/access-table.lout b/access-table.lout index c31d949..15ebbee 100644 --- a/access-table.lout +++ b/access-table.lout @@ -4,7 +4,7 @@ @SysInclude{docf} @SysInclude{tbl} @Use { @BasicSetup - @InitialFont { Times Base 20p } + @InitialFont { Times Base 18p } } @Use { @DocumentSetup @PageOrientation { Landscape } @@ -22,14 +22,14 @@ @Cell D } bformat { @StartHSpan @Cell A | @HSpan | @HSpan | @HSpan } { -@Rowb A { dgit access to Debian for various classes of user //2vx } -@Rowa A { } B { DD } C { DM } D { anonymous } +@Rowb A { dgit access to Debian for various classes of user //1vx } +@Rowa A { } B { DD |10m } C { DM } D { anonymous } @Rowa ruleabove { yes } A { "fetch/" //1vx "clone" } - B { {@Ding a19} @Sup 1 } + B { {@Ding a19} @Sup @Dagger,@DaggerDbl } C { red @Colour { Needs projectb data service } //1vx - "#727702", "#720590" } + "#727702", "#720590", @Dagger } D { red @Colour { Needs projectb data service } //1vx "#727702", "#720590" //1vx red @Colour { Needs move to new git server } //1vx @@ -38,16 +38,29 @@ @Rowa ruleabove { yes } A { "push" } - B { {@Ding a19} @Sup 1 } + B { {@Ding a19} @Sup @Dagger,@DaggerDbl } C { red @Colour { Needs move to new git server } //1vx "#720173", DSA RT } - D { Not desired } + D { grey @Colour { Not desirable } } } @LP @LP Notes @LP -1. User must have alioth account; requirement will be abolished +@Dagger. User must have alioth account; requirement will be abolished after move to new git server. +//1vx +@DaggerDbl. + +{Courier Base 12p} @Font { +"| ssh 'iwj@mirror.ftp-master.debian.org' 'export LANG=C; psql -A service=projectb -c '\\''" //1vx +" SELECT source.version, component.name, files.filename, files.sha256sum" //1vx +" FROM source" //1vx +" JOIN src_associations ON source.id = src_associations.source" //1vx +" JOIN suite ON suite.id = src_associations.suite" //1vx +" JOIN dsc_files ON dsc_files.source = source.id" //1vx +" ..." +} + @End @Text diff --git a/libavg.fig b/libavg.fig index b67fb43..4f974f4 100644 --- a/libavg.fig +++ b/libavg.fig @@ -7,9 +7,9 @@ A4 Single -2 1200 2 -2 5 0 1 0 -1 50 -1 -1 0.000 0 0 -1 0 0 5 - 0 libavg-clone.ppm - 495 270 7624 270 7624 5713 495 5713 495 270 2 5 0 1 0 -1 50 -1 -1 0.000 0 0 -1 0 0 5 0 libavg-gitk-cut.ppm 810 5940 12691 5940 12691 9098 810 9098 810 5940 +2 5 0 1 0 -1 50 -1 -1 0.000 0 0 -1 0 0 5 + 0 libavg-clone.ppm + 495 270 6625 270 6625 4950 495 4950 495 270 diff --git a/notes b/notes index 48b1759..cb873b5 100644 --- a/notes +++ b/notes @@ -86,6 +86,8 @@ commit to tie the invented commit into the previous dgit history. (QUILTY WORKFLOW) +[ synthetic patch example ] + At the moment, dgit doesn't attempt to do anything clever with `3.0 (quilt)' source packages. @@ -98,8 +100,10 @@ git log. Overall this means that currently when you work on a quilty package in dgit, you don't interact with the quilt patch stack. This is less -than ideal and I intend to improve this, perhaps by having dgit use -git-dpm as a bidirectional gateway between `3.0 (quilt)' and git. +than ideal. + +I intend to improve this, perhaps by having dgit use git-dpm as a +bidirectional gateway between `3.0 (quilt)' and git. This will generate a rebasing-style git branch. After a patch series has been edited with rebase, dgit push will have to generate a `fake @@ -110,23 +114,28 @@ a well-understood git manipulation.) [table] +Probably the biggest problem with dgit right now is that it is only +useable for DDs. This is particularly galling for a tool which is +especially useful for users, downstreams, mentees, and so forth. + +There are two obstacles to widening the access, relating to the +archive and to the git server. + +Firstly, dgit needs to query the archive to find the current version +of the package and obtain a copy of the .dsc. At the moment there is +no official interface which provides this data. There is the rmadison +server but it sometimes serves stale or wrong data and there is no +authentication - that is, there is no way for the client to tell that +the data is accurate. So what dgit does right now is ssh to coccia +and run SQL commands against its mirror of the ftpmaster database. +This is obviously mad. ftpmaster have promised me a proper query +service API (via HTTP and TLS). + +Secondly, dgit is currently using alioth as its git server, and the +collab-maint group there for authentication. This is not ideal for a +number of reasons. Alioth does a lot of other things and is therefore +less secure and reliable than would be ideal. dgit's required +authentication model is not a very good fit for alioth's +infrastructure. We intend to move this to a VM of its own - I've +spoken to DSA (in the person of Tollef) about this. - - works well for DDs - works badly for everyone else :-/ - serious problem, needs escalating - - access limitations - - ssh cocca psql -c SELECT BLAH - - ftpmaster have a plan to help with this but has not been implemented - - alioth collab-maint - - push by signed tag - - need to abandon alioth because of collab-maint security issues - - -xxx adoption -- 2.30.2