From cd725954f6df5b809fe8d90ee135e222d1cef30e Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 19 Aug 2010 00:32:56 +0200 Subject: [PATCH] sign the created Release files with our own dummy key "Joe Sixpack" --- test/integration/framework | 15 ++++++++++++--- test/integration/joesixpack.pub | Bin 0 -> 639 bytes test/integration/joesixpack.sec | Bin 0 -> 1290 bytes 3 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 test/integration/joesixpack.pub create mode 100644 test/integration/joesixpack.sec diff --git a/test/integration/framework b/test/integration/framework index e964235b0..01b795ba9 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -82,7 +82,7 @@ setupenvironment() { local OLDWORKINGDIRECTORY=$(pwd) trap "cd /; rm -rf $TMPWORKINGDIRECTORY; cd $OLDWORKINGDIRECTORY" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM cd $TMPWORKINGDIRECTORY - mkdir rootdir aptarchive + mkdir rootdir aptarchive keys cd rootdir mkdir -p etc/apt/apt.conf.d etc/apt/sources.list.d etc/apt/trusted.gpg.d etc/apt/preferences.d var/cache mkdir -p var/log/apt var/lib/apt @@ -93,7 +93,7 @@ setupenvironment() { else touch var/lib/dpkg/status fi - touch var/lib/apt/extended_states var/lib/dpkg/available + touch var/lib/dpkg/available mkdir -p usr/lib/apt ln -s ${BUILDDIRECTORY}/methods usr/lib/apt/methods cd .. @@ -103,6 +103,8 @@ setupenvironment() { else touch aptarchive/Packages fi + cp $(find $TESTDIR -name '*.pub' -o -name '*.sec') keys/ + ln -s ${TMPWORKINGDIRECTORY}/keys/joesixpack.pub rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg echo "Dir \"${TMPWORKINGDIRECTORY}/rootdir\";" > aptconfig.conf echo "Debug::NoLocking \"true\";" >> aptconfig.conf echo "APT::Get::Show-User-Simulation-Note \"false\";" >> aptconfig.conf @@ -275,7 +277,7 @@ buildaptarchivefromincoming() { msgdone "info" msgninfo "\tGenerate Release files… " for dir in $(find ./dists -mindepth 1 -maxdepth 1 -type d); do - aptftparchive -qq release $dir | sed -e '/0 Release$/ d' > $dir/Release # remove the self reference + aptftparchive -qq release $dir -o APT::FTPArchive::Release::Codename="$(echo "$dir" | cut -d'/' -f 3)" | sed -e '/0 Release$/ d' > $dir/Release # remove the self reference done cd - > /dev/null msgdone "info" @@ -342,7 +344,14 @@ setupaptarchive() { else setupflataptarchive fi + msgninfo "\tSign archive with Joe Sixpack key… " + for RELEASE in $(find aptarchive/ -name Release); do + gpg --no-default-keyring --secret-keyring ./keys/joesixpack.sec --keyring ./keys/joesixpack.pub --default-key Joe -abs -o ${RELEASE}.gpg ${RELEASE} + done + msgdone "info" + msgninfo "\tSync APT's cache with the archive… " aptget update -qq + msgdone "info" } diff() { diff --git a/test/integration/joesixpack.pub b/test/integration/joesixpack.pub new file mode 100644 index 0000000000000000000000000000000000000000..2b40b97b6dbb6b03e9c1b53c3e1e934c9df058dc GIT binary patch literal 639 zcmV-_0)YLQ0SyF9Y#7!72msAjACp6k{c`JY-&Z}&9FW@YpXidYsEK(*Y z1C+>|ep#PZ*_*4i)@AYyIEKu|YTOknvs~()a4Spzyq}jdLE0f(fBW4A zRIrS1@uPpPfVaKDOJ6~C5YLOA4?M0-`42~A1}f7t&o?B2-d+H_XxX$XrH(|ZiK6uj zMoNFjIeRa~pbO&3F4F)J0RRECGfHn|AX900aA9L>ASgjlR3KDkb97^2b7gZNM0IU# zc_|<~YHwvgWq4t2aBO8RZ*pfoi2*kR69EVSAq4_VY#7!88v_Lk2?z%R1r-Vj2nz)k z0s{d60v-VZ7k~f?2@qP4(Lvj+jjn8a2mUlnX}{k#H7Ik{c`JY-&Z}&9FW@YpXidYsEK(*Y z1C+>|ep#PZ*_*4i)@AYyIEKu|YTOknvs~()a4Spzyq}jdLE0f(fBW4A zRIrS1@uPpPfVaKDOJ6~C5YLOA4?M0-`42~A1}f7t&o?B2-d+H_XxX$XrH(|ZiK6uj zMoNFjIeRa~pbO&3F4F)J0RRC22m1z`)Fk_COyUv;LM0(4JHeevtaGzn(`zUFo~s_A zL>Rkuu?e`#`32W)jIq7Z!Y^5MXS>c=uYmyAW?A0^-0g{q(8-`yKAw@EBKZ!c;sb*g zr@Xs@)o~HkQKXk7ToJG**1E!CHR%po+s{m~?2>dvE!ZOdB2Y2OT~Xu;S01_0!cw7! z%=Hbug?VUGYc1Vh9Y8_^h?cR?9s84%?ua<&`^`dQ@x;vOMCM$mZ3LVEMZUcQy#JJp zX3-yb$rXUiVsg1sF-N3Bdnp?4hDSO_=q3_n&yf8|dZgwJ&TwA1vjG%x^@LS0GNBCD z+>KMRs>_y@J;6AZJh(9IZ#4t}+l)(cV0HmYY!kbL+k)5k@!D)ceXAn&iDcPELi*sm z6waU}3;{P~FjF6q?{wiT2%}7MtJW`eD{rcf)0mdvzUo$|v^Z7o8z`yWAht4aag1OV@D@iR*= z*+##!1(Gwcq%pA>tw1six<+`U@aMl}oXa|n{i5x0s`+D=Ayo||edT!$U58U^=m2OiQmMyB_dqGad~X=7h)5AM~kZ6r8srJKeN1N^fN# zQ)zf`VPk6`C_zwEAXH^@bYo$2Wpf}zb!}~VDIh#*Z)HGbcwudDY-KKQa%Vn?0XGB_ z0SEvg1p-WL7}f$C0|g5S2nPcN6$%Lm3k4Pe0|5X69svRufB*^!5L%GYLEEg2u55b; z{xnQ!zuz`BD14UjJ5@khqLRPCO5w49K=t$&elk^tXV3^weFnn-FyBl2n4t5nfj~vT zbzZ$zr63z5i73(BmhW?rL)fm9r4B?ww>4hzZ3%kX-9t1)m^L=2g%+EUkn@0T`2d4i z0^&W#tM_zwGS%?;AX-E+C>CN^Y0QxhEr*Jkb(w<~Iv~h`an_y70B<$^)w~B_(&ape zE_!U)?_dEXS>p>lOiK?f=cG`m;6$-sO>!&hk|H&Ux ze{jn2|C67lw;k*%b(Q