[CVS] RPM: rpm/tests/ Makefile.am mdvbz23677-1.0-1.src.rpm

2011-10-14 Thread Per �yvind Karlsen 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Per Øyvind Karlsen
  Root:   /v/rpm/cvs   Email:  pkarl...@rpm5.org
  Module: rpm  Date:   14-Oct-2011 22:24:47
  Branch: HEAD Handle: 2011101420244600

  Added files:
rpm/tests   mdvbz23677-1.0-1.src.rpm
  Modified files:
rpm/tests   Makefile.am

  Log:
add a reproducer for mdvbz#23677

  Summary:
RevisionChanges Path
1.103   +7  -0  rpm/tests/Makefile.am
1.1 BLOBrpm/tests/mdvbz23677-1.0-1.src.rpm
  

  patch -p0 '@@ .'
  Index: rpm/tests/Makefile.am
  
  $ cvs diff -u -r1.102 -r1.103 Makefile.am
  --- rpm/tests/Makefile.am 12 Sep 2011 21:10:59 -  1.102
  +++ rpm/tests/Makefile.am 14 Oct 2011 20:24:46 -  1.103
  @@ -797,6 +797,13 @@
@${rpm} -qa --qf '[%{FILENAMES}: %{FILEREQUIRE}\n]'  /dev/null
@${rpm} -qa --qf '[%{FSNAMES}: %{FSSIZES}\n]'  /dev/null
   
  +check-mdvbz23677:
  + @echo === $@ ===
  + @${rpm} -U --noparentdirs --nodeps mdvbz23677/mdvbz23677-first*.rpm
  + @${rpm} -U --noparentdirs --nodeps mdvbz23677/mdvbz23677-second*.rpm || 
/bin/true
  + @${rpm} -q mdvbz23677-first  /dev/null
  + @${rpm} -q mdvbz23677-second  /dev/null; [ $$? -ne 0 ]
  +
   check-rpmv3:
@echo === $@ ===
@${rpm} -qlp simplestRPMv3-1.0-2.aix5.3.noarch.rpm
  @@ .
  (cd rpm/tests  \
   uudecode '@@ .'  \
   xdelta patch mdvbz23677-1.0-1.src.rpm.xdelta /dev/null 
mdvbz23677-1.0-1.src.rpm  \
   rm -f mdvbz23677-1.0-1.src.rpm.xdelta)
  Index: rpm/tests/mdvbz23677-1.0-1.src.rpm
  
  begin 664 mdvbz23677-1.0-1.src.rpm.xdelta
  M)5A$6C`P-4(`!$`$`!S:EE;$N-3DY-C(N
  M;G5L;'-H:65L82XU.3DV,BYA;P?BP@#[9=[!O%#/K\82;B%
  M$!J2R378V.!8[Y-2=##LF7)DJR'A06QM*M=?[L[WT,/!*0SI\`A.('$A
  MD$+,!-)00R%0`@V%$*!`IX10TDQ!TDX3GA$S#,W'WI+6=,FUG.M/I7^S8
  M_O;[]OO^_;;_=;K3R^.U%_]:S?'-CQPI`)UYV!8U7GPNZ+Q[;`WSH,
  MJS@#L=*BD.?![X_*?0S.K3HO]7P]VK$GR#]=7Y59\C^9@B7SDU-87D.SL
  MDK\!U5C/Z[$?E)3Z=]R1UM-%=8XBE568Y500ZVJ^VV/-+B@_L#.B`H;-Y^8
  M;UE9T0$LRR8O,R++;0X7CZ%C1NN7;M7=MV+FN#-R[[YAZ!K_P:]SI`V
  MV'1675*?MNA2))E.F5-)O4UO2EJ,25LK2.M,!IV-+WIS,4O/?9DM]CN;?CE
  M$Q/GUBVO@UC/CB=!QCN'D=/[0?VO^OG5:7.@RK_19^5V*ENJG]N?1^7X
  MUB(=J%NA1ER)S=8EK-/*!Q`?1?PXXH\0_P;K5L5Y*0?XKX*\2?8:4ZKKX:
  M\?E^=7K$!]#\C'$7R#Y%L3'$?\:\0G$#R'^$OT_Z_*_JL_1OP=DI]$?++,
  M-6B/H7XG#)75Y?CJ5F$6+FSX%5:@R-6(5Z*6(WTZQ?4YG31/BN8@]B.A
  M?1_BLY`\B+@.1SQ?*1/(FY\5*(W8@YQ!U(_WK$G8AO0NQ!]F]'$)RE/_J
  M)(K^5\`^JRO'9Z_JJRO'9Z?C_B2ICRU=R,F$3^*#@SB-_BVY_
  MYQ`_B/A%Q`\A?@GQ+L2OE/GL,63O=86=6(O2'.T='C\[`CBP:C#YW'BWO8^
  MW.$+.+TEL;H7+-L6UX*-B-FS5C=Z`-SD``I%7KI(K[V=-.=DM?=H`+
  M.Q.E[.]U]_!DYXTP7=S5N/R9_W=;#?=N`3/EB\1SIM:TUND-%UN-N:4
  MA?#AW5B/2JK;WD,![`K8V$QOMW\(:F*1=:F]UGC:HPZF-TC[!YH'
  MLHY8,*OM\'AC?)?H+3HCEIK9T,N9Y%S%7KC:B;F_00S4-LL3?=.@7Z,$N
  M60@5@@WO6M`2.I=+F-SMPG([KPS0W'-(9,Q'1:T8B2`#1%G'Q[O#D^T
  M76WOZ+Z^`Z[U41I!UT@P^BC;G^AH!5[^#R@S*D7:9BP)^BVXTPZ,AP']/J
  MM9T(:_K\E;W,-DEQVR%`9F4=[@R=-)C(OCC#:KE(I[758_`.:F(.H(
  MN(3B8!^5282)B;D37DB]H%6TDT9BX*SLV@%3H-N*YU1\FHKHG3Q@GE2P
  MK]F7LP[`VF[,\Y[F:*G7S87D!;^[3S(+`Y3KE/(.BSYJ;PS\RPJL+
  MQ#U94U#JCE)R)*1.LMK``!@6M')G=S`:;0VD#7XMWS/,#?7%VCWX3R;RX7
  M\59[).H!:EEW-1SH`UK$7$8Y[W+RW7PJW!%3!])^?5\JUANW9XPNG\X[
  MF!\*,UN)#3Z2Q91B?G!VW-$I7)A`W:.-`WB_J^#C6W;;ER]7+P_S/;WJ
  MTCEK][O^PR'$LF0N.6PP6JQ63*_187HL!'B!(^44$/`T)^`-O`!D%D\3-,+
  M`!?@/C(2S69PFL63G$3!KR@1#`-(+$+1(@Y_*CU3S9*/BXH.=H/2PN2H`@
  M2X]HUR)^%YMJ3^8Q`D`!/UP6YQ@2VI`XG`5Y(*ASY9)9IB@C/;$\BV,!
  MSA.I02(#XI@PH!5F2$2R,$YII4F+)4W2*4D/NPF6%.@@8L\2-%I.H53
  MT`!.D!DR5!K,YSPB`A#)+XH`NV4E*U%K4Z0DWG`X?#0%FZ1!2
  MXH(!*,(4AQ+-N(BQD,504^:V83AI`R@AU(P2G[A,JVF!)H7EI63G!C
  MFA9$J1$N@YPUEA2AF`]LI[@4QJE#^PRN-4LN@U,+?%',V6GXY8Y3,@GTT
  M*QP:2I*!JW=Q68)FL2,\MDMI8FXEQ`8$;#XI3Q`MB[+HED:3LBLP%QP
  M40S'9P$K:2,QX@8)4E\FU8K\%FSHJ+%F)(SEB.$%%6.XYI[2C%:C4DSJ3=8
  M3!L(:Q4ZK5;+!8S%9@,J;2-KW@MX+^(QS;+8'W[I3Y3L3.WVIN-ZHMUD,
  M1IO.4)K;A%W\ZN;I=T=#(B%D5=HDS6J%+`8I)Z89(B.J=(6T#C8X1`A)6A((
  MH9B0H!!@B1-L*J@0',+17;VD68#8DFF#87X)4M:`L*@$3=$-R:;+;4#L9
  M.%)8EL[2Q%LHAM#@$0@R+TD)1IADRDX6XG2%I12A!,AE/IIT4QTDD+:@:
  MUB0DCH]$:TCZOY0H%`!.I`,TPB!YUP@FIZ*^P1`@9(52O*PJVP)BVEV
  MC!-5Y2V8$90H*EDWYF)DXT@+Q-/,EGK$QTK!F92+#RB.*F5)JH8FD*(X
  MO+XST-U^D;+AI?BA7!8%AD[`946=K6PKTBA`.6[O%#%^_0(M)J4,[+`J-#Q
  M2(T,P-9E41H]RHM!27!=J9DS#C#9-VMD[K07:2WZ%CB@*9_`EAE#6`-)
  MBY)`)V4)7BFJ[Q5'20C/`(SR9RN5OBBGTW2A#5I24C$[,E)6/2WVTRL$:V)
  M+%==LDVL#13,@J_ZZLP35?U5V#0)@`$Y=B@PS!3S0WHDE0IUWFIS7K7
  M*%=AOVK0%,\S6989K'6J?KI8G782.[ZS#X/C'_FWW!T%-_:DIYX6)U2]:7

[CVS] RPM: rpm/tests/ Makefile.am

2011-09-12 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   12-Sep-2011 22:41:58
  Branch: HEAD Handle: 2011091220415800

  Modified files:
rpm/tests   Makefile.am

  Log:
- tests: sync with rpm-5_4 changes.

  Summary:
RevisionChanges Path
1.100   +10 -2  rpm/tests/Makefile.am
  

  patch -p0 '@@ .'
  Index: rpm/tests/Makefile.am
  
  $ cvs diff -u -r1.99 -r1.100 Makefile.am
  --- rpm/tests/Makefile.am 27 May 2011 06:57:19 -  1.99
  +++ rpm/tests/Makefile.am 12 Sep 2011 20:41:58 -  1.100
  @@ -111,7 +111,7 @@
   mtree =  $(abs_top_builddir)/tools/mtree
   ngsr =   $(abs_top_builddir)/js/ngsr
   rc = $(abs_top_builddir)/tools/rc
  -wget =   /usr/bin/wget
  +wget =   /usr/bin/wget -nv
   
   sudo =   sudo
   
  @@ -481,6 +481,12 @@
   # XXX notyet
   #MYTHDORA_mirror = http://mirror.beww.org/mythdora
   #MYTHDORA1223 =  $(MYTHDORA_mirror)/12.23/i386/os/Packages/
  +
  +# MAG -- Mageia
  +#MAG_mirror =  ftp://mirrors.us.kernel.org/mandriva/Mandrakelinux/official
  +MAG2011_uri =  /home/i586-mageia-2011.0/i586/media/core/release/
  +MAG2011_manifest = $(testdir)/ref/mag2011-medium.i586.manifest
  +
   # MDV -- Mandriva
   MDV_mirror = ftp://mirrors.us.kernel.org/mandriva/Mandrakelinux/official
   MDV2009_uri =$(MDV_mirror)/2009.0/i586/media/main/release/
  @@ -519,6 +525,8 @@
   # RF -- RPM Forge
   # SL -- Scientific Linux
   SL_mirror =  http://ftp.scientificlinux.org/linux/scientific
  +SL60_uri = $(SL_mirror)/6.0/i386/os/Packages
  +SL60_manifest = $(testdir)/ref/sl60-everything.manifest
   SL55_uri =   $(SL_mirror)/55/i386/SL/
   SL55_manifest = $(testdir)/ref/sl55-everything.manifest
   SL54_uri =   $(SL_mirror)/54/i386/SL/
  @@ -880,7 +888,7 @@
   test:check-init check-pubkeys check-markup check-macros \
check-build check-sign check-ACID check-install \
check-query check-verify check-rpmv3\
  - check-triggers check-convert # check-tools # check-repo
  + check-triggers # check-convert # check-tools # check-repo
   
   check-local: check-init
   
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/tests/ Makefile.am

2011-09-12 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   12-Sep-2011 23:10:59
  Branch: HEAD Handle: 2011091221105900

  Modified files:
rpm/tests   Makefile.am

  Log:
- tests: put 2 FIXME's onto todo++.

  Summary:
RevisionChanges Path
1.102   +4  -2  rpm/tests/Makefile.am
  

  patch -p0 '@@ .'
  Index: rpm/tests/Makefile.am
  
  $ cvs diff -u -r1.101 -r1.102 Makefile.am
  --- rpm/tests/Makefile.am 12 Sep 2011 20:47:29 -  1.101
  +++ rpm/tests/Makefile.am 12 Sep 2011 21:10:59 -  1.102
  @@ -281,7 +281,8 @@
   check-markup: $(POPTPKGS)
@echo === $@ ===
@${rpm} -qp --nosignature --qf '[%{*:yaml}\n]' popt*.rpm  tmp/popt.yaml
  - @diff -u {tmp,ref}/popt.yaml
  +# XXX FIXME: hmmm !!omap has gone AWOL here
  + @-diff -u {tmp,ref}/popt.yaml
@${rpm} -qp --nosignature --qf '[%{*:xml}\n]' popt*.rpm  tmp/popt.xml
@diff -u {tmp,ref}/popt.xml
   
  @@ -785,7 +786,8 @@
@${rpm} -qa --qf '%{PACKAGESTAT:base64}\n'  /dev/null
@${rpm} -qa --qf 
'%{PACKAGESTAT:stat(atime,ctime,blksize,blocks,dev,gid,gname,ino,link,mode,mtime,nlink,rdev,size,uid,uname)}\n'
  /dev/null
@${rpm} -qa --qf '[%{SUGGESTS}\n]'  /dev/null
  - @${rpm} -qa --qf '[%{providesqlentry}\n] [%{requiresqlentry}\n] 
[%{conflictsqlentry}\n] [%{obsoletesqlentry}\n] [%{filessqlentry1}\n] 
[%{filessqlentry2}\n]'  /dev/null
  +# XXX FIXME: invalid pointer segfault with MALLOC_PERTURB=54/MALLOC_CHECK_=3
  + @-${rpm} -qa --qf '[%{providesqlentry}\n] [%{requiresqlentry}\n] 
[%{conflictsqlentry}\n] [%{obsoletesqlentry}\n] [%{filessqlentry1}\n] 
[%{filessqlentry2}\n]'  /dev/null
@${rpm} -qa --qf '[%{FILENAMES:shescape}: %{FILEMTIMES:shescape} 
%{FILEFLAGS:perms} %{FILEMODES:fflags}\n]'  /dev/null
@${rpm} -qa --qf '[%{FILENAMES}: %{FILECLASS}\n]'  /dev/null
@${rpm} -qa --qf '[%{FILEPATHS}: %{FILECONTEXTS}\n]'  /dev/null
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/tests/ Makefile.am

2011-01-25 Thread Per �yvind Karlsen 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Per Øyvind Karlsen
  Root:   /v/rpm/cvs   Email:  pkarl...@rpm5.org
  Module: rpm  Date:   25-Jan-2011 18:55:08
  Branch: HEAD Handle: 2011012517550700

  Modified files:
rpm/tests   Makefile.am

  Log:
don't include genpgp.h in tarball, it needs to be generated during
build

  Summary:
RevisionChanges Path
1.97+2  -2  rpm/tests/Makefile.am
  

  patch -p0 '@@ .'
  Index: rpm/tests/Makefile.am
  
  $ cvs diff -u -r1.96 -r1.97 Makefile.am
  --- rpm/tests/Makefile.am 25 Dec 2010 18:07:08 -  1.96
  +++ rpm/tests/Makefile.am 25 Jan 2011 17:55:07 -  1.97
  @@ -176,11 +176,11 @@
   thkp_SOURCES = thkp.c
   thkp_LDADD = $(RPMIO_LDADD)
   
  -tkey_SOURCES = genpgp.h tkey.c
  +tkey_SOURCES = tkey.c
   tkey_LDADD = $(RPM_LDADD)
   tkey.c: genpgp.h
   
  -tpgp_SOURCES = genpgp.h tpgp.c
  +tpgp_SOURCES = tpgp.c
   tpgp_LDADD = $(RPM_LDADD)
   tpgp.c: genpgp.h
   genpgp.h: genpgp.sh
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/tests/ Makefile.am

2010-12-03 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   03-Dec-2010 19:23:20
  Branch: HEAD Handle: 2010120318231900

  Modified files:
rpm/tests   Makefile.am

  Log:
- tests: sync with rpm-5.3.6.

  Summary:
RevisionChanges Path
1.95+90 -20 rpm/tests/Makefile.am
  

  patch -p0 '@@ .'
  Index: rpm/tests/Makefile.am
  
  $ cvs diff -u -r1.94 -r1.95 Makefile.am
  --- rpm/tests/Makefile.am 18 Oct 2010 04:21:20 -  1.94
  +++ rpm/tests/Makefile.am 3 Dec 2010 18:23:19 -   1.95
  @@ -57,9 +57,20 @@
   rpmsolverA = ${rpm} -i -D '_dbpath %{_solve_A}' --justdb --nodeps
   rpmsolverB = ${rpm} -i -D '_dbpath %{_solve_B}' --justdb --nodeps
   
  +poky_topdir =/X/src/poky
  +poky_deploy =$(poky_topdir)/build/tmp/deploy/rpm
  +poky_pkgsdirA =  $(poky_deploy)/i586
  +poky_pkgsdirB =  $(poky_deploy)/all
  +poky_pkgsdirC =  $(poky_deploy)/qemux86
  +poky_options =   --noaid --nodeps --noorder --noscripts --notriggers 
--noparentdirs --nolinktos --stats
  +poky_force = --replacepkgs --replacefiles --oldpackage
  +poky_solverA =   ${rpm} -i $(poky_force) -D '_dbpath %{_solve_A}' 
--justdb $(poky_options)
  +poky_solverB =   ${rpm} -i $(poky_force) -D '_dbpath %{_solve_B}' 
--justdb $(poky_options)
  +poky_solverC =   ${rpm} -i $(poky_force) -D '_dbpath %{_solve_C}' 
--justdb $(poky_options)
  +
   tdsa =   ./tdsa
   tecdsa = ./tecdsa
  -thkp =   ./thkp -H localhost
  +thkp =   ./thkp
   tkey =   ./tkey
   tpgp =   ./tpgp --macros $(macros)
   trsa =   ./trsa
  @@ -78,17 +89,6 @@
   
   sudo =   sudo
   
  -poky_topdir =/X/src/poky
  -poky_deploy =$(poky_topdir)/build/tmp/deploy/rpm
  -poky_pkgsdirA =  $(poky_deploy)/i586
  -poky_pkgsdirB =  $(poky_deploy)/all
  -poky_pkgsdirC =  $(poky_deploy)/qemux86
  -poky_options =   --noaid --nodeps --noorder --noscripts --notriggers 
--noparentdirs --nolinktos --stats
  -poky_force = --replacepkgs --replacefiles --oldpackage
  -poky_solverA =   ${rpm} -i $(poky_force) -D '_dbpath %{_solve_A}' 
--justdb $(poky_options)
  -poky_solverB =   ${rpm} -i $(poky_force) -D '_dbpath %{_solve_B}' 
--justdb $(poky_options)
  -poky_solverC =   ${rpm} -i $(poky_force) -D '_dbpath %{_solve_C}' 
--justdb $(poky_options)
  -
   rpmdb =  $(testdir)/tmp/rpmdb
   rpmdb_Tables = \
$(rpmdb)/Arch   \
  @@ -164,11 +164,12 @@
   trsa_SOURCES = trsa.c
   trsa_LDADD = $(RPMIO_LDADD)
   
  -tssl_SOURCES = genpgp.h tssl.c
  +tssl_SOURCES = genssl.h tssl.c
   tssl_LDADD = $(RPM_LDADD)
   tssl.c: genssl.h
   genssl.h: genssl.sh
  - -sh $  $@
  + -touch $@
  +#-sh $  $@
   
   .PHONY:  check-init
   check-init: macros
  @@ -181,9 +182,9 @@
@-diff -u tmp/querytags ref/querytags || cp tmp/querytags ref/querytags
@${rpm} -v --showrc | sed -e s,$(abs_top_builddir),..,g  tmp/showrc
@-diff -u tmp/showrc ref/showrc || cp tmp/showrc ref/showrc
  - @${rpmdigest} --alldigests ref/[^C]*  tmp/.alldigests
  - @-diff -u tmp/.alldigests ref/.alldigests || cp tmp/.alldigests 
ref/.alldigests
  - @${mtree} -c -p ref | ${mtree} -p ref   # XXX mtime usecs need fixing
  +#@${rpmdigest} --alldigests ref/[^C]*  tmp/.alldigests
  +#@-diff -u tmp/.alldigests ref/.alldigests || cp tmp/.alldigests 
ref/.alldigests
  +#@-${mtree} -c -p ref | ${mtree} -p ref  # XXX mtime usecs need fixing
   
   POPTURI =http://rpm5.org/files/popt/
   POPTPKGS =   \
  @@ -289,6 +290,11 @@
@-${rpm} -E '%{python:print --   python: Snake Eggs!,}'
@-${rpm} -E '%{ficl:.( -- ficl: Das OpenBoot!)}'
   
  +check-srpm:
  + if [ -f rpm.spec -a -f rpm/r...@package_version@.tar.gz -a -f 
rpm/cpu-os-macros.tar.gz ]; then \
  +   ${rpm} -bs --nodeps rpm.spec  mv rpm/*.src.rpm . ; \
  + fi
  +
   %.spec: $(wildcard %-*.src.rpm)
@${rpm2cpio} $(wildcard $*-*.src.rpm) | ${cpio} -i --quiet $@
   
  @@ -529,7 +535,7 @@
C55 C54 C53 C52 C51 C50 \
IDMS \
MDV2009 MDV2010 \
  - MOBLIN21 \
  + MEEGO MOBLIN21 \
OJUBA4 \
OWL2 \
PLD3 \
  @@ -620,6 +626,30 @@
ls -al $...@d}/solve
@echo `${now}` == $...@d}: Imported. | tee -a $...@d}/import
   
  +%/digests: %/RPMS
  + @echo === $@ ===
  + @rm -f $@
  + @touch $@
  +
  +%/sha256 %/sha224 %/sha384 %/sha512 %/md5 %/sha1: %/digests
  + @echo === $@

[CVS] RPM: rpm/tests/ Makefile.am

2010-10-16 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   17-Oct-2010 02:25:01
  Branch: HEAD Handle: 201010170025

  Modified files:
rpm/tests   Makefile.am

  Log:
- tests: add beecrypt cppflags.

  Summary:
RevisionChanges Path
1.92+2  -1  rpm/tests/Makefile.am
  

  patch -p0 '@@ .'
  Index: rpm/tests/Makefile.am
  
  $ cvs diff -u -r1.91 -r1.92 Makefile.am
  --- rpm/tests/Makefile.am 13 Oct 2010 18:41:37 -  1.91
  +++ rpm/tests/Makefile.am 17 Oct 2010 00:25:00 -  1.92
  @@ -20,6 +20,7 @@
-I$(top_srcdir)/rpmdb \
-I$(top_srcdir)/rpmio \
-I$(top_srcdir)/misc \
  + @WITH_BEECRYPT_CPPFLAGS@ \
@WITH_DB_CPPFLAGS@ \
@WITH_ZLIB_CPPFLAGS@ \
@WITH_LUA_CPPFLAGS@ \
  @@ -57,7 +58,7 @@
   
   tdsa =   ./tdsa
   tecdsa = ./tecdsa
  -thkp =   ./thkp
  +thkp =   ./thkp -H localhost
   tkey =   ./tkey
   tpgp =   ./tpgp --macros $(macros)
   trsa =   ./trsa
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/tests/ Makefile.am

2010-10-16 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   17-Oct-2010 02:44:28
  Branch: HEAD Handle: 2010101700442800

  Modified files:
rpm/tests   Makefile.am

  Log:
- tests: tweak the check-verify target.

  Summary:
RevisionChanges Path
1.93+7  -7  rpm/tests/Makefile.am
  

  patch -p0 '@@ .'
  Index: rpm/tests/Makefile.am
  
  $ cvs diff -u -r1.92 -r1.93 Makefile.am
  --- rpm/tests/Makefile.am 17 Oct 2010 00:25:00 -  1.92
  +++ rpm/tests/Makefile.am 17 Oct 2010 00:44:28 -  1.93
  @@ -726,18 +726,18 @@
   
   check-verify:
@echo === $@ ===
  - @${rpm} -e probes devtool-sanity
  + @-${rpm} -e probes devtool-sanity
@-${rpm} -U --justdb --nodeps tmp/manifest
@-${rpm} -V probes devtool-sanity  /dev/null
@-${rpm} -Va  /dev/null
   #XXX @-${rpm} -Vp tmp/manifest
  - @${rpm} -e --noscripts --notriggers --allmatches '^triggers-.*'
  - @${rpm} -e car engine wheel door tyre window glass
  - @${rpm} -e battery bicycle electric-engine gasoline-engine
  - @${rpm} -e solar-collector tire turbo
  + @-${rpm} -e --noscripts --notriggers --allmatches '^triggers-.*'
  + @-${rpm} -e car engine wheel door tyre window glass
  + @-${rpm} -e battery bicycle electric-engine gasoline-engine
  + @-${rpm} -e solar-collector tire turbo
@-${rpm} -e --justdb popt
  - @${rpm} -e probes
  - @${rpm} -e devtool-sanity
  + @-${rpm} -e probes
  + @-${rpm} -e devtool-sanity
   
   check-tools:
@echo === $@ ===
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/tests/ Makefile.am

2010-10-13 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   13-Oct-2010 20:41:37
  Branch: HEAD Handle: 2010101318413700

  Modified files:
rpm/tests   Makefile.am

  Log:
- tests: add --nosignature to --json for now.

  Summary:
RevisionChanges Path
1.91+4  -2  rpm/tests/Makefile.am
  

  patch -p0 '@@ .'
  Index: rpm/tests/Makefile.am
  
  $ cvs diff -u -r1.90 -r1.91 Makefile.am
  --- rpm/tests/Makefile.am 13 Oct 2010 04:49:35 -  1.90
  +++ rpm/tests/Makefile.am 13 Oct 2010 18:41:37 -  1.91
  @@ -579,17 +579,18 @@
   
   .PRECIOUS: %/json
   %/json: %/RPMS
  + @echo === $@ ===
@rm -f $...@d}/export
@echo `${now}` == $...@d}: Exporting ... | tee -a $...@d}/export
for F in $/*.rpm; do \
  echo -- $$F; \
  -   ${rpm} -qp --json $$F | tee -a $@ | ${mongo} ${mongoserver}/$...@d}; \
  +   ${rpm} -qp --nosignature --json $$F | tee -a $@ | ${mongo} 
${mongoserver}/$...@d}; \
done
  - @ls -al $...@d}/json
@echo `${now}` == $...@d}: Exported. | tee -a $...@d}/export
   
   .PRECIOUS: %/repodata
   %/repodata: %/RPMS
  + @echo === $@ ===
@rm -f $...@d}/generate
   #-rm -f $...@d}/repodata
@echo `${now}` == $...@d}: Generating ... | tee -a $...@d}/generate
  @@ -601,6 +602,7 @@
   
   .PRECIOUS: %/solve
   %/solve: %/todo
  + @echo === $@ ===
@rm -f $...@d}/import
@echo `${now}` == $...@d}: Creating ... | tee -a $...@d}/import
@mkdir -p $@/log $@/tmp
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/tests/ Makefile.am fetchmeego.sh

2010-10-12 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   13-Oct-2010 06:49:35
  Branch: HEAD Handle: 2010101304493500

  Added files:
rpm/tests   fetchmeego.sh
  Modified files:
rpm/tests   Makefile.am

  Log:
- tests: add MeeGo fetch, update the URI in use.

  Summary:
RevisionChanges Path
1.90+21 -5  rpm/tests/Makefile.am
1.1 +17 -0  rpm/tests/fetchmeego.sh
  

  patch -p0 '@@ .'
  Index: rpm/tests/Makefile.am
  
  $ cvs diff -u -r1.89 -r1.90 Makefile.am
  --- rpm/tests/Makefile.am 13 Oct 2010 00:58:18 -  1.89
  +++ rpm/tests/Makefile.am 13 Oct 2010 04:49:35 -  1.90
  @@ -133,7 +133,8 @@
   gsr =@__GSR@
   mkdir =  @__MKDIR@
   mongo =  @__MONGO@
  -mongoserver =198.178.231.189 # XXX mongo.rpm5.org
  +# XXX mongo.rpm5.org
  +mongoserver =198.178.231.189
   mv = @__MV@
   rm = @__RM@
   sqlite3 =@__SQLITE3@
  @@ -456,10 +457,11 @@
   MDV20101_manifest = $(testdir)/ref/Mandriva2010.1-bash.i586.manifest
   # MEEGO -- MeeGo
   # XXX lt-find: rpmdav.c:1331: htmlParse: Assertion `he  h' failed.
  -#MEEGO_mirror =  
http://repo.meego.com/MeeGo/builds/trunk/1.0.90.3.20100921.1
  -#MEEGO_uri = $(MEEGO_mirror)/core/repos/ia32/packages/i586/ \
  -#$(MEEGO_mirror)/core/repos/ia32/packages/i686/ \
  -#$(MEEGO_mirror)/core/repos/ia32/packages/noarch/
  +MEEGO_mirror =   http://repo.meego.com/MeeGo/builds/1.0.99/daily/
  +MEEGO_uri =  $(MEEGO_mirror)/core/repos/ia32/packages/i586/ \
  + $(MEEGO_mirror)/core/repos/ia32/packages/i686/ \
  + $(MEEGO_mirror)/core/repos/ia32/packages/noarch/
  +MEEGO_manifest = $(testdir)/ref/MeeGo-everything.manifest
   # MOBLIN -- Moblin
   MOBLIN_mirror =  http://mirrors.kernel.org/moblin/releases
   MOBLIN21_uri =   $(MOBLIN_mirror)/2.1/ia32/os/i586/ \
  @@ -575,6 +577,17 @@
  then ${find} $ -name '*.rpm' | sort -u  $@; \
fi
   
  +.PRECIOUS: %/json
  +%/json: %/RPMS
  + @rm -f $...@d}/export
  + @echo `${now}` == $...@d}: Exporting ... | tee -a $...@d}/export
  + for F in $/*.rpm; do \
  +   echo -- $$F; \
  +   ${rpm} -qp --json $$F | tee -a $@ | ${mongo} ${mongoserver}/$...@d}; \
  + done
  + @ls -al $...@d}/json
  + @echo `${now}` == $...@d}: Exported. | tee -a $...@d}/export
  +
   .PRECIOUS: %/repodata
   %/repodata: %/RPMS
@rm -f $...@d}/generate
  @@ -585,6 +598,7 @@
@echo `${now}` == $...@d}: Generated. | tee -a $...@d}/generate
   
   #  -D '_dbi_tags 
Packages:Name:Nvra:Providename:Dirnames:Basenames:Filepaths'
  +
   .PRECIOUS: %/solve
   %/solve: %/todo
@rm -f $...@d}/import
  @@ -594,6 +608,7 @@
@echo `${now}` == $...@d}: Created. | tee -a $...@d}/import
@echo `${now}` == $...@d}: Importing ... | tee -a $...@d}/import
@-${rpm} -i -D '_dbpath $...@d}/solve' --justdb --stats \
  +   -D '_hrmib_path %{nil}' \
  -D '__dbi_txn create nofsync lock log mpool txn auto_commit thread 
thread_count=64' \
  --noaid --ignoresize --nodeps --noorder --nosignature \
  $ \
  @@ -611,6 +626,7 @@
@-${sudo} ${rpm} -Uvh --nofdigests --stats \
  -r $(testdir)/$(D)/ROOT \
  -D '_dbpath /var/lib/rpm' \
  +   -D '_hrmib_path /var/cache/hrmib/%{___NVRA}' \
  -D '_solve_A $(D)/solve' \
  --noparentdirs --nolinktos --nosignature \
  $(D)/todo 21 | tee -a $(D)/install
  @@ .
  patch -p0 '@@ .'
  Index: rpm/tests/fetchmeego.sh
  
  $ cvs diff -u -r0 -r1.1 fetchmeego.sh
  --- /dev/null 2010-10-13 06:45:57.0 +0200
  +++ fetchmeego.sh 2010-10-13 06:49:35.578771591 +0200
  @@ -0,0 +1,17 @@
  +#!/bin/sh
  +
  +wget=/usr/bin/wget
  +
  
+uri=http://repo.meego.com/MeeGo/builds/1.0.99/daily/core/repos/ia32/packages/;
  +manifest=meego-everything.manifest
  +
  +for A in i586 i686 noarch; do
  +  $wget $uri/$A
  +  sed -e s,^img.*href=\,${uri}${A}/, -e 's,.*,,'  index.html | \
  +  grep '^http:'  $manifest
  +  rm -f index.html
  +done
  +
  +wc $manifest
  +
  +
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/tests/ Makefile.am rpm/tests/ref/ Mandriva2010.1-bash.i...

2010-09-30 Thread Per �yvind Karlsen 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Per Øyvind Karlsen
  Root:   /v/rpm/cvs   Email:  pkarl...@rpm5.org
  Module: rpm  Date:   30-Sep-2010 21:07:59
  Branch: HEAD Handle: 2010093019075801

  Added files:
rpm/tests/ref   Mandriva2010.1-bash.i586.manifest
  Modified files:
rpm/tests   Makefile.am

  Log:
add manifest for mandriva linux 2010.1

  Summary:
RevisionChanges Path
1.85+2  -0  rpm/tests/Makefile.am
1.1 +328 -0 rpm/tests/ref/Mandriva2010.1-bash.i586.manifest
  

  patch -p0 '@@ .'
  Index: rpm/tests/Makefile.am
  
  $ cvs diff -u -r1.84 -r1.85 Makefile.am
  --- rpm/tests/Makefile.am 29 Sep 2010 16:28:43 -  1.84
  +++ rpm/tests/Makefile.am 30 Sep 2010 19:07:58 -  1.85
  @@ -452,6 +452,8 @@
   MDV2009_manifest = $(testdir)/ref/Mandriva2009.0-bash.i586.manifest
   MDV2010_uri =$(MDV_mirror)/2010.0/i586/media/main/release/
   MDV2010_manifest = $(testdir)/ref/Mandriva2010.0-bash.i586.manifest
  +MDV20101_uri =   $(MDV_mirror)/2010.1/i586/media/main/release/
  +MDV20101_manifest = $(testdir)/ref/Mandriva2010.1-bash.i586.manifest
   # MEEGO -- MeeGo
   # XXX lt-find: rpmdav.c:1331: htmlParse: Assertion `he  h' failed.
   #MEEGO_mirror =  
http://repo.meego.com/MeeGo/builds/trunk/1.0.90.3.20100921.1
  @@ .
  patch -p0 '@@ .'
  Index: rpm/tests/ref/Mandriva2010.1-bash.i586.manifest
  
  $ cvs diff -u -r0 -r1.1 Mandriva2010.1-bash.i586.manifest
  --- /dev/null 2010-09-30 21:04:39.0 +0200
  +++ Mandriva2010.1-bash.i586.manifest 2010-09-30 21:07:59.204622711 +0200
  @@ -0,0 +1,328 @@
  
+http://distrib-coffee.ipsl.jussieu.fr/pub/linux/MandrivaLinux/official/2010.1/i586/media/main/release/GConf2-2.28.1-1mdv2010.1.i586.rpm
  
+http://distrib-coffee.ipsl.jussieu.fr/pub/linux/MandrivaLinux/official/2010.1/i586/media/main/release/ORBit2-2.14.18-2mdv2010.1.i586.rpm
  
+http://distrib-coffee.ipsl.jussieu.fr/pub/linux/MandrivaLinux/official/2010.1/i586/media/main/release/acl-2.2.49-2mdv2010.1.i586.rpm
  
+http://distrib-coffee.ipsl.jussieu.fr/pub/linux/MandrivaLinux/official/2010.1/i586/media/main/release/alsa-plugins-doc-1.0.23-2mdv2010.1.i586.rpm
  
+http://distrib-coffee.ipsl.jussieu.fr/pub/linux/MandrivaLinux/official/2010.1/i586/media/main/release/alsa-plugins-pulse-config-1.0.23-2mdv2010.1.i586.rpm
  
+http://distrib-coffee.ipsl.jussieu.fr/pub/linux/MandrivaLinux/official/2010.1/i586/media/main/release/atk1.0-common-1.30.0-1mdv2010.1.i586.rpm
  
+http://distrib-coffee.ipsl.jussieu.fr/pub/linux/MandrivaLinux/official/2010.1/i586/media/main/release/aumix-text-2.8-21mdv2010.1.i586.rpm
  
+http://distrib-coffee.ipsl.jussieu.fr/pub/linux/MandrivaLinux/official/2010.1/i586/media/main/release/avahi-0.6.25-5mdv2010.1.i586.rpm
  
+http://distrib-coffee.ipsl.jussieu.fr/pub/linux/MandrivaLinux/official/2010.1/i586/media/main/release/basesystem-minimal-2010.0-2mdv2010.1.i586.rpm
  
+http://distrib-coffee.ipsl.jussieu.fr/pub/linux/MandrivaLinux/official/2010.1/i586/media/main/release/bash-4.1-6mdv2010.1.i586.rpm
  
+http://distrib-coffee.ipsl.jussieu.fr/pub/linux/MandrivaLinux/official/2010.1/i586/media/main/release/bzip2-1.0.5-7mdv2010.1.i586.rpm
  
+http://distrib-coffee.ipsl.jussieu.fr/pub/linux/MandrivaLinux/official/2010.1/i586/media/main/release/canberra-common-0.24-2mdv2010.1.i586.rpm
  
+http://distrib-coffee.ipsl.jussieu.fr/pub/linux/MandrivaLinux/official/2010.1/i586/media/main/release/ccp-0.4.1-4mdv2010.1.noarch.rpm
  
+http://distrib-coffee.ipsl.jussieu.fr/pub/linux/MandrivaLinux/official/2010.1/i586/media/main/release/chkconfig-1.3.37-5mdv2010.1.i586.rpm
  
+http://distrib-coffee.ipsl.jussieu.fr/pub/linux/MandrivaLinux/official/2010.1/i586/media/main/release/common-licenses-1.0-16mdv2010.1.noarch.rpm
  
+http://distrib-coffee.ipsl.jussieu.fr/pub/linux/MandrivaLinux/official/2010.1/i586/media/main/release/consolekit-0.4.1-3mdv2010.1.i586.rpm
  
+http://distrib-coffee.ipsl.jussieu.fr/pub/linux/MandrivaLinux/official/2010.1/i586/media/main/release/coreutils-8.5-1mdv2010.1.i586.rpm
  
+http://distrib-coffee.ipsl.jussieu.fr/pub/linux/MandrivaLinux/official/2010.1/i586/media/main/release/cpio-2.11-1mdv2010.1.i586.rpm
  
+http://distrib-coffee.ipsl.jussieu.fr/pub/linux/MandrivaLinux/official/2010.1/i586/media/main/release/cracklib-dicts-2.8.16-1mdv2010.1.i586.rpm
  
+http://distrib-coffee.ipsl.jussieu.fr/pub/linux/MandrivaLinux/official/2010.1/i586/media/main/release/cronie-1.4.4-2mdv2010.1.i586.rpm

[CVS] RPM: rpm/tests/ Makefile.am

2010-09-30 Thread Per �yvind Karlsen 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Per Øyvind Karlsen
  Root:   /v/rpm/cvs   Email:  pkarl...@rpm5.org
  Module: rpm  Date:   30-Sep-2010 21:14:31
  Branch: HEAD Handle: 2010093019143100

  Modified files:
rpm/tests   Makefile.am

  Log:
switch to a US mirror for MDV

  Summary:
RevisionChanges Path
1.86+1  -1  rpm/tests/Makefile.am
  

  patch -p0 '@@ .'
  Index: rpm/tests/Makefile.am
  
  $ cvs diff -u -r1.85 -r1.86 Makefile.am
  --- rpm/tests/Makefile.am 30 Sep 2010 19:07:58 -  1.85
  +++ rpm/tests/Makefile.am 30 Sep 2010 19:14:31 -  1.86
  @@ -447,7 +447,7 @@
   #MYTHDORA_mirror = http://mirror.beww.org/mythdora
   #MYTHDORA1223 =  $(MYTHDORA_mirror)/12.23/i386/os/Packages/
   # MDV -- Mandriva
  -MDV_mirror = 
http://distrib-coffee.ipsl.jussieu.fr/pub/linux/MandrivaLinux/official
  +MDV_mirror = ftp://mirrors.us.kernel.org/mandriva/Mandrakelinux/official
   MDV2009_uri =$(MDV_mirror)/2009.0/i586/media/main/release/
   MDV2009_manifest = $(testdir)/ref/Mandriva2009.0-bash.i586.manifest
   MDV2010_uri =$(MDV_mirror)/2010.0/i586/media/main/release/
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/tests/ Makefile.am rpm/tests/ref/ DB_CONFIG

2010-09-29 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   29-Sep-2010 17:08:51
  Branch: HEAD Handle: 2010092915085100

  Modified files:
rpm/tests   Makefile.am
rpm/tests/ref   DB_CONFIG

  Log:
- tests: sync with rpm-5_3.

  Summary:
RevisionChanges Path
1.83+10 -17 rpm/tests/Makefile.am
1.3 +3  -0  rpm/tests/ref/DB_CONFIG
  

  patch -p0 '@@ .'
  Index: rpm/tests/Makefile.am
  
  $ cvs diff -u -r1.82 -r1.83 Makefile.am
  --- rpm/tests/Makefile.am 27 Sep 2010 21:52:08 -  1.82
  +++ rpm/tests/Makefile.am 29 Sep 2010 15:08:51 -  1.83
  @@ -139,7 +139,7 @@
   sqlite3 =@__SQLITE3@
   tar =@__TAR@
   
  -#tdsa_SOURCES = tdsa.c
  +#tdsa_SOURCES = tdsa.c 
   #tdsa_LDADD = $(RPMIO_LDADD)
   
   tecdsa_SOURCES = tecdsa.c
  @@ -286,12 +286,6 @@
@-${rpm} -E '%{python:print --   python: Snake Eggs!,}'
@-${rpm} -E '%{ficl:.( -- ficl: Das OpenBoot!)}'
   
  -# use a GNU make define command, that looks like a harmless dummy rule
  -# to BSD make, to hide parts of the Makefile from GNU make.
  -define IGNORED_BY_GNU_MAKE:
  -.if 0
  -endef
  -
   %.spec: $(wildcard %-*.src.rpm)
@${rpm2cpio} $(wildcard $*-*.src.rpm) | ${cpio} -i --quiet $@
   
  @@ -306,7 +300,7 @@
(cd $@  ${rpm} -q --specfile $...@.spec  ${rpm} -q --specsrpm 
$...@.spec  ${rpm} -q --specfile --specedit $...@.spec  ${rpm} -bb --nodeps 
$...@.spec || :)  /dev/null
   
   define IGNORED_BY_GNU_MAKE:
  -.endif
  +.endif 
   
   # neither .endif nor endef can be followed by a colon; each creates
   # warnings or errors in one or other version of make. we need some
  @@ -428,7 +422,7 @@
   CM14_uri =   $(CM_mirror)/14/oficial/i586/media/main/release/
   CM14_manifest =  $(testdir)/ref/cm14-bash.i586.manifest
   CM15_uri =   $(CM_mirror)/15/oficial/i586/media/main/release/
  -CM15_manifest =  $(testdir)/ref/cm15-minimal.manifest
  +#CM15_manifest = $(testdir)/ref/cm15-minimal.manifest
   # CAOS -- cAos
   CAOS_mirror =http://mirror.caoslinux.org
   CAOS2_uri =  $(CAOS_mirror)/cAos-2/core/i386/
  @@ -511,6 +505,7 @@
   # VINE -- Vine Linux
   VINE_mirror =http://ring.u-toyama.ac.jp/pub/linux/Vine
   VINE51_uri = $(VINE_mirror)/Vine-5.1/i386/Vine/RPMS/
  +VINE51_manifest = $(testdir)/ref/vine51-everything.manifest
   # YDL -- Yellow Dog Linug (ppc)
   YDL_mirror = http://ydl.oregonstate.edu/releases
   YDL61_uri =  $(YDL_mirror)/yellowdog-6.1/os/YellowDog/
  @@ -574,6 +569,7 @@
  then ${find} $ -name '*.rpm' | sort -u  $@; \
fi
   
  +#  -D '_dbi_tags 
Packages:Name:Nvra:Providename:Dirnames:Basenames:Filepaths'
   .PRECIOUS: %/solve
   %/solve: %/todo
@rm -f $...@d}/import
  @@ -583,11 +579,11 @@
@echo `${now}` == $...@d}: Created. | tee -a $...@d}/import
@echo `${now}` == $...@d}: Importing ... | tee -a $...@d}/import
@-${rpm} -i -D '_dbpath $...@d}/solve' --justdb --stats \
  -   --replacepkgs --replacefiles --oldpackage \
  -   --noaid --ignoresize --nodeps --noorder \
  -   --noscripts --notriggers --noparentdirs --nolinktos --nosignature \
  +   -D '__dbi_txn create nofsync lock log mpool txn auto_commit thread 
thread_count=64' \
  +   --noaid --ignoresize --nodeps --noorder --nosignature \
  $ \
  21 | tee -a $...@d}/import
  + ls -al $...@d}/solve
@echo `${now}` == $...@d}: Imported. | tee -a $...@d}/import
   
   Install-%: %/solve
  @@ -597,7 +593,7 @@
@${sudo} rm -rf $(D)/ROOT
@mkdir -p $(D)/ROOT/var/lib/rpm/log $(D)/ROOT/var/lib/rpm/tmp
@${cp} $(testdir)/ref/DB_CONFIG $(D)/ROOT/var/lib/rpm
  - @-${sudo} ${rpm} -Uvh --nofdigests \
  + @-${sudo} ${rpm} -Uvh --nofdigests --stats \
  -r $(testdir)/$(D)/ROOT \
  -D '_dbpath /var/lib/rpm' \
  -D '_solve_A $(D)/solve' \
  @@ -663,10 +659,7 @@
   
   check-query:
@echo === $@ ===
  - @${rpm} -qW .  /dev/null 21
  -#XXX -${rpm} -Uvv --justdb */*.rpm  /dev/null 21
  -#XXX -${rpm} -Uvh --justdb --nodeps */*.rpm  /dev/null 21
  -#XXX -${rpm} -i --justdb --nodeps */*.rpm  /dev/null 21
  +#XXX @${rpm} -qW .  /dev/null 21
@${rpm} -qa  /dev/null
@${rpm} -qa 'arch=noarch'  /dev/null
@${rpm} -qa 'arch=!noarch'  /dev/null
  @@ .
  patch -p0 '@@ .'
  Index: rpm/tests/ref/DB_CONFIG
  
  $ cvs diff -u -r1.2 -r1.3 DB_CONFIG
  ---

[CVS] RPM: rpm/tests/ Makefile.am

2010-09-29 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   29-Sep-2010 18:28:43
  Branch: HEAD Handle: 2010092916284300

  Modified files:
rpm/tests   Makefile.am

  Log:
- tests: add a repodata target.

  Summary:
RevisionChanges Path
1.84+9  -0  rpm/tests/Makefile.am
  

  patch -p0 '@@ .'
  Index: rpm/tests/Makefile.am
  
  $ cvs diff -u -r1.83 -r1.84 Makefile.am
  --- rpm/tests/Makefile.am 29 Sep 2010 15:08:51 -  1.83
  +++ rpm/tests/Makefile.am 29 Sep 2010 16:28:43 -  1.84
  @@ -569,6 +569,15 @@
  then ${find} $ -name '*.rpm' | sort -u  $@; \
fi
   
  +.PRECIOUS: %/repodata
  +%/repodata: %/RPMS
  + @rm -f $...@d}/generate
  +#-rm -f $...@d}/repodata
  + @echo `${now}` == $...@d}: Generating ... | tee -a $...@d}/generate
  + ${rpmrepo} --uncompressed --database --stats $...@d} 21 | tee -a 
$...@d}/generate
  + @ls -al $...@d}/repodata
  + @echo `${now}` == $...@d}: Generated. | tee -a $...@d}/generate
  +
   #  -D '_dbi_tags 
Packages:Name:Nvra:Providename:Dirnames:Basenames:Filepaths'
   .PRECIOUS: %/solve
   %/solve: %/todo
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/tests/ Makefile.am

2010-09-18 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   18-Sep-2010 16:10:34
  Branch: HEAD Handle: 2010091814103400

  Modified files:
rpm/tests   Makefile.am

  Log:
- mongo: wire up te unit tests.

  Summary:
RevisionChanges Path
1.81+6  -3  rpm/tests/Makefile.am
  

  patch -p0 '@@ .'
  Index: rpm/tests/Makefile.am
  
  $ cvs diff -u -r1.80 -r1.81 Makefile.am
  --- rpm/tests/Makefile.am 31 Aug 2010 16:30:54 -  1.80
  +++ rpm/tests/Makefile.am 18 Sep 2010 14:10:34 -  1.81
  @@ -7,7 +7,7 @@
   
   EXTRA_PROGRAMS = tecdsa thkp tkey tpgp trsa tssl
   
  -SUBDIRS =
  +SUBDIRS = mongo
   
   AM_CPPFLAGS = \
-I$(srcdir) \
  @@ -31,11 +31,14 @@
$(top_builddir)/misc/librpmmisc.la \
@LTLIBINTL@
   
  +RPMDB_LDADD = \
  + $(top_builddir)/rpmdb/librpmdb.la \
  + $(RPMIO_LDADD)
  +
   RPM_LDADD = \
$(top_builddir)/build/librpmbuild.la \
$(top_builddir)/lib/librpm.la \
  - $(top_builddir)/rpmdb/librpmdb.la \
  - $(RPMIO_LDADD)
  + $(RPMDB_LDADD)
   
   macros = $(abs_top_builddir)/macros/macros:$(testdir)/macros
   #XXX rpmpopt =   $(abs_top_builddir)/rpmpopt
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/tests/ Makefile.am rpm/tests/ref/ .alldigests popt.Kv

2010-06-12 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   12-Jun-2010 16:50:35
  Branch: HEAD Handle: 2010061214503401

  Modified files:
rpm/tests   Makefile.am
rpm/tests/ref   .alldigests popt.Kv

  Log:
- tests: wire up tomcrypt tests (stub-in cdsa tests).

  Summary:
RevisionChanges Path
1.76+12 -4  rpm/tests/Makefile.am
1.45+100 -100   rpm/tests/ref/.alldigests
1.3 +4  -4  rpm/tests/ref/popt.Kv
  

  patch -p0 '@@ .'
  Index: rpm/tests/Makefile.am
  
  $ cvs diff -u -r1.75 -r1.76 Makefile.am
  --- rpm/tests/Makefile.am 6 Jun 2010 20:33:29 -   1.75
  +++ rpm/tests/Makefile.am 12 Jun 2010 14:50:34 -  1.76
  @@ -189,9 +189,15 @@
@${echo} -n -- beecrypt: HKP
@${thkp} --usecrypto bc  /dev/null || :
@${tpgp} --usecrypto bc
  +#@${echo} -n -- cdsa: HKP
  +#@-${thkp} --usecrypto cdsa  /dev/null || :
  +#@-${tpgp} --usecrypto cdsa
@${echo} -n -- gcrypt: HKP
@-${thkp} --usecrypto gc  /dev/null 21 || :
@-${tpgp} --usecrypto gc
  + @${echo} -n -- tomcrypt: HKP
  + @-${thkp} --usecrypto ltc  /dev/null 21 || :
  + @-${tpgp} --usecrypto ltc
@${echo} -n -- nss: HKP
@-${thkp} --usecrypto nss  /dev/null || :
@-${tpgp} --usecrypto nss
  @@ -201,10 +207,12 @@
@${rpm} --import $(top_srcdir)/pubkeys/JBJ-GPG-KEY
@${rpm} -Kv $(POPTPKGS)  tmp/popt.Kv
@diff -u tmp/popt.Kv ref/popt.Kv
  - @${rpm} -Kvv --usecrypto bc $(POPTPKGS)  /dev/null 21
  - @-${rpm} -Kvv --usecrypto gc $(POPTPKGS)  /dev/null 21
  - @-${rpm} -Kvv --usecrypto nss $(POPTPKGS)  /dev/null 21
  - @-${rpm} -Kvv --usecrypto ssl $(POPTPKGS)  /dev/null 21
  + @${rpm} -Kvv --usecrypto bc   $(POPTPKGS)  /dev/null 21
  +#@-${rpm} -Kvv --usecrypto cdsa $(POPTPKGS)  /dev/null 21
  + @-${rpm} -Kvv --usecrypto gc   $(POPTPKGS)  /dev/null 21
  + @-${rpm} -Kvv --usecrypto ltc  $(POPTPKGS)  /dev/null 21
  + @-${rpm} -Kvv --usecrypto nss  $(POPTPKGS)  /dev/null 21
  + @-${rpm} -Kvv --usecrypto ssl  $(POPTPKGS)  /dev/null 21
@echo === $@ === done.
   
   .PHONY:  check-sign
  @@ .
  patch -p0 '@@ .'
  Index: rpm/tests/ref/.alldigests
  
  $ cvs diff -u -r1.44 -r1.45 .alldigests
  --- rpm/tests/ref/.alldigests 1 Jun 2010 22:00:32 -   1.44
  +++ rpm/tests/ref/.alldigests 12 Jun 2010 14:50:35 -  1.45
  @@ -2098,106 +2098,106 @@
   crc64:026e9e5a32352337  ref/other.xml
   adler32:9bc40fc4  ref/other.xml
   jlu32:0eb0c814  ref/other.xml
  -md2:ac397af7d1017a233cbc12be9ce807df  ref/popt.Kv
  -md4:9bdb25e40cec883ba61786049f2ab3ff  ref/popt.Kv
  -md5:69030599bba058addbef8dbc50b648c0  ref/popt.Kv
  -sha1:3a132f6500391803457d9424ab76949a9417f8d8  ref/popt.Kv
  -sha224:7fd63b95e6b8fa0d6ed0a87c34afe8f50ee8e50576e3a6a8f6386d35  ref/popt.Kv
  -sha256:5c4d0f7f9839d699bf3a02ffe33d3b4684b18097d6ea4a2d1f2889b007b4e6c0  
ref/popt.Kv
  
-sha384:ccb73c19064cb02a3d82bcd6d99c687a33f626d9f58c0d196b7d32b03ce08ad5eed00dbe806ec758cf9ac6a9cbc15779
  ref/popt.Kv
  
-sha512:2b27ff39474263d1546811e0b35982c4e2454be158db61c81924a528c6372e386c8635ad332aa15535c28369c930cee24ba62a9dba09807e494ddb918b018297
  ref/popt.Kv
  -skein-224:e8b86e037477fe5ac2710fb33470d95d83e478eaa727ff03cb287d27  
ref/popt.Kv
  -skein-256:54cd51748f52cb9049e1d118e0f71a20c876a882c20bc04d02964c2d17b842ac  
ref/popt.Kv
  
-skein-384:5bce72c7bd95c797848f0fdaa481ec8b8bc54f7a25e68a7bcc893a2b58f3c1642827183110bc8de2af5d8b9f0c0e9d4e
  ref/popt.Kv
  
-skein-512:19e4bd2526af1e621ffd818373f8bc696e1c9de4569ae91eb5288cd994715ff593c087d339f61182896c51a2e6d61ffadbf8d55a5e541f37c945284c4f8edc86
  ref/popt.Kv
  
-skein-1024:bbc24a861c2d2f6a1a8b340226ae4029bcc466624ce931e844c51605de023501ec8bb7305e2d7e760df3013385a04ffbeac45d0ff3f5eade4d8842937efc6dc1eb8b2c93279381327e03cf5120637addad4c66b2a881c245e367e1631a68643b1fadd0efef8ab42374591fe927a4bf160dda1339d518f8bdd410643441401f16
  ref/popt.Kv
  -arirang-224:06f2471b2d09fdd5f85e513edf9cd8dcbf634cc5f6e7cb885a58853f  
ref/popt.Kv
  -arirang-256:512c48156f42f16811a12127f21cb667903b1f04efafeff676ff6bdeb478cde6 
 ref/popt.Kv
  
-arirang-384:f3725be5aca22bb6cb0c0e3a41f4cd002a20652fb70376e241ba1e3d897d135661b1940a1c787697c9f214d045bd3090
  ref/popt.Kv
  
-arirang-512:1ff238a84f6bff695da01bbef3dac9c6fe028c81778db0565ff60c49747f6f1286fd721320ac47ddf57a77e7520e408ead714e92c7ab9d662fd31691b2b3f465
  ref/popt.Kv

[CVS] RPM: rpm/tests/ Makefile.am rpm/tests/ref/ sqldb-basic.out sqldb...

2010-04-08 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   09-Apr-2010 00:13:38
  Branch: HEAD Handle: 2010040822133800

  Added files:
rpm/tests/ref   sqldb-meta.sql
  Modified files:
rpm/tests   Makefile.am
rpm/tests/ref   sqldb-basic.out sqldb-basic.sql

  Log:
- tests: add simple SQL .foo meta coverage.

  Summary:
RevisionChanges Path
1.65+1  -1  rpm/tests/Makefile.am
1.2 +45 -0  rpm/tests/ref/sqldb-basic.out
1.2 +4  -0  rpm/tests/ref/sqldb-basic.sql
1.1 +19 -0  rpm/tests/ref/sqldb-meta.sql
  

  patch -p0 '@@ .'
  Index: rpm/tests/Makefile.am
  
  $ cvs diff -u -r1.64 -r1.65 Makefile.am
  --- rpm/tests/Makefile.am 8 Apr 2010 22:01:51 -   1.64
  +++ rpm/tests/Makefile.am 8 Apr 2010 22:13:38 -   1.65
  @@ -418,7 +418,7 @@
   check-sql:
@echo === $@ ===
@rm -rf tmp/sqldb*
  - @-${dbsql} -echo tmp/sqldb '.read ref/sqldb-basic.sql'  
tmp/sqldb-basic.out
  + @-${dbsql} -echo tmp/sqldb '.read ref/sqldb-basic.sql'  
tmp/sqldb-basic.out
@-diff -u {tmp,ref}/sqldb-basic.out || cp {tmp,ref}/sqldb-basic.out
   
   check-local: check-init check-pubkeys check-markup check-macros \
  @@ .
  patch -p0 '@@ .'
  Index: rpm/tests/ref/sqldb-basic.out
  
  $ cvs diff -u -r1.1 -r1.2 sqldb-basic.out
  --- rpm/tests/ref/sqldb-basic.out 8 Apr 2010 22:01:52 -   1.1
  +++ rpm/tests/ref/sqldb-basic.out 8 Apr 2010 22:13:38 -   1.2
  @@ -37,4 +37,49 @@
   SELECT * from Nvra;
   bing-1.2-3.noarch|1
   boom-7.8.9.noarch|3
  +.read ref/sqldb-meta.sql
  +.databases
  +seq  name file   
   
  +---  ---  
--
  +0main /X/src/wdj/tests/tmp/sqldb 
   
  +1temp
   
  +.echo on
  +.explain off
  +.headers off
  +.indices
  +.mode list
  +.nullvalue 
  +.output stdout
  +.prompt 'foo ' '--- '
  +.schema
  +CREATE TABLE Nvra (
  +  k  TEXT PRIMARY KEY NOT NULL,
  +  v  INTEGER REFERENCES Packages(i) ON UPDATE RESTRICT ON DELETE RESTRICT
  +);
  +CREATE TABLE Packages (
  +  i  INTEGER UNIQUE PRIMARY KEY NOT NULL,
  +  h  BLOB NOT NULL
  +);
  +CREATE TRIGGER delete_Packages BEFORE DELETE ON Packages
  +  BEGIN
  +DELETE FROM Nvra WHERE v = old.rowid;
  +  END;
  +CREATE TRIGGER insert_Packages AFTER INSERT ON Packages
  +  BEGIN
  +INSERT INTO Nvra (k,v)   VALUES ( new.h, new.rowid );
  +  END;
  +.separator |
  +.show
  + echo: on
  +  explain: off
  +  headers: off
  + mode: semi
  +nullvalue: 
  +   output: stdout
  +separator: |
  +width: 3 15 58 
  +.tables
  +Nvra  Packages
  +.timeout 1000
  +.timer off
   .exit
  @@ .
  patch -p0 '@@ .'
  Index: rpm/tests/ref/sqldb-basic.sql
  
  $ cvs diff -u -r1.1 -r1.2 sqldb-basic.sql
  --- rpm/tests/ref/sqldb-basic.sql 8 Apr 2010 22:01:52 -   1.1
  +++ rpm/tests/ref/sqldb-basic.sql 8 Apr 2010 22:13:38 -   1.2
  @@ -19,4 +19,8 @@
   
   SELECT * from Packages;
   SELECT * from Nvra;
  +
  +-- Basic .foo SQL metadata tests.
  +.read ref/sqldb-meta.sql
  +
   .exit
  @@ .
  patch -p0 '@@ .'
  Index: rpm/tests/ref/sqldb-meta.sql
  
  $ cvs diff -u -r0 -r1.1 sqldb-meta.sql
  --- /dev/null 2010-04-09 00:11:01.0 +0200
  +++ sqldb-meta.sql2010-04-09 00:13:38.639391653 +0200
  @@ -0,0 +1,19 @@
  +-- .dump Packages
  +-- .dump Nvra
  +
  +.databases
  +.echo on
  +.explain off
  +.headers off
  +.indices
  +-- .log stderr
  +.mode list
  +.nullvalue 
  +.output stdout
  +.prompt 'foo ' '--- '
  +.schema
  +.separator |
  +.show
  +.tables
  +.timeout 1000
  +.timer off
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/tests/ Makefile.am rpm/tests/ref/ sqldb-basic.out sqldb...

2010-04-08 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   09-Apr-2010 00:50:45
  Branch: HEAD Handle: 2010040822504401

  Modified files:
rpm/tests   Makefile.am
rpm/tests/ref   sqldb-basic.out sqldb-basic.sql sqldb-meta.sql

  Log:
- tests: stub-in the 3 basic executions needed to blueprint embedded
SQL.

  Summary:
RevisionChanges Path
1.66+15 -3  rpm/tests/Makefile.am
1.3 +0  -69 rpm/tests/ref/sqldb-basic.out
1.3 +1  -1  rpm/tests/ref/sqldb-basic.sql
1.2 +1  -1  rpm/tests/ref/sqldb-meta.sql
  

  patch -p0 '@@ .'
  Index: rpm/tests/Makefile.am
  
  $ cvs diff -u -r1.65 -r1.66 Makefile.am
  --- rpm/tests/Makefile.am 8 Apr 2010 22:13:38 -   1.65
  +++ rpm/tests/Makefile.am 8 Apr 2010 22:50:44 -   1.66
  @@ -43,7 +43,7 @@
   rpmcache =   $(abs_top_builddir)/tools/rpmcache --macros $(macros)
   rpmdigest =  $(abs_top_builddir)/tools/rpmdigest
   rpmrepo =$(abs_top_builddir)/tools/rpmrepo
  -dbsql =  $(abs_top_builddir)/tools/sqlite3
  +rpmsql = $(abs_top_builddir)/tools/sqlite3
   
   tpgp =   ./tpgp --macros $(macros)
   
  @@ -96,11 +96,13 @@
   db_checkpoint =  ${db_tool} db_checkpoint -h $(rpmdb) -v
   db_dump =${db_tool} db_dump  -h $(rpmdb)
   db_load =${db_tool} db_load  -h $(rpmdb)
  +db_log_verify =  ${db_tool} db_log_verify -h $(rpmdb)
   db_printlog =${db_tool} db_printlog  -h $(rpmdb)
   db_recover = ${db_tool} db_recover   -h $(rpmdb) -v
   db_stat =${db_tool} db_stat  -h $(rpmdb)
   db_upgrade = ${db_tool} db_upgrade   -h $(rpmdb) -v
   db_verify =  ${db_tool} db_verify-h $(rpmdb)
  +dbsql =  $(abs_top_builddir)/tools/dbsql
   
   cpio =   @__CPIO@
   diff =   @__DIFF@
  @@ -109,6 +111,7 @@
   mkdir =  @__MKDIR@
   mv = @__MV@
   rm = @__RM@
  +sqlite3 =/usr/bin/sqlite3
   tar =@__TAR@
   
   tpgp_SOURCES = genpgp.h tpgp.c
  @@ -417,9 +420,18 @@
   
   check-sql:
@echo === $@ ===
  - @rm -rf tmp/sqldb*
  - @-${dbsql} -echo tmp/sqldb '.read ref/sqldb-basic.sql'  
tmp/sqldb-basic.out
  + @echo -- sqlite3:
  + @rm -f tmp/sqldb*
  + @-${sqlite3} -echo tmp/sqldb .read ref/sqldb-basic.sql  
tmp/sqldb-basic.out
@-diff -u {tmp,ref}/sqldb-basic.out || cp {tmp,ref}/sqldb-basic.out
  + @echo -- rpm sqlite3:
  + @rm -f tmp/sqldb*
  + @-${rpmsql} -echo tmp/sqldb .read ref/sqldb-basic.sql  
tmp/sqldb-basic.out
  + @-diff -u {tmp,ref}/sqldb-basic.out
  + @echo -- rpm embedded:
  + @rm -f tmp/sqldb*
  + @-${rpm} -E '%{sql -echo tmp/sqldb:.read ref/sqldb-basic.sql}'  
tmp/sqldb-basic.out
  + @-diff -u {tmp,ref}/sqldb-basic.out
   
   check-local: check-init check-pubkeys check-markup check-macros \
check-build check-sign check-ACID check-install \
  @@ .
  patch -p0 '@@ .'
  Index: rpm/tests/ref/sqldb-basic.out
  
  $ cvs diff -u -r1.2 -r1.3 sqldb-basic.out
  --- rpm/tests/ref/sqldb-basic.out 8 Apr 2010 22:13:38 -   1.2
  +++ rpm/tests/ref/sqldb-basic.out 8 Apr 2010 22:50:44 -   1.3
  @@ -1,25 +1,4 @@
   .read ref/rpmdb.sql
  -CREATE TABLE Packages (
  -  i  INTEGER UNIQUE PRIMARY KEY NOT NULL,
  -  h  BLOB NOT NULL
  -);
  -CREATE TEMP TRIGGER insert_Packages AFTER INSERT ON Packages
  -  BEGIN
  -INSERT INTO Nvra (k,v)   VALUES ( new.h, new.rowid );
  -  END;
  -CREATE TEMP TRIGGER delete_Packages BEFORE DELETE ON Packages
  -  BEGIN
  -DELETE FROM Nvra WHERE v = old.rowid;
  -  END;
  -CREATE TABLE Nvra (
  -  k  TEXT PRIMARY KEY NOT NULL,
  -  v  INTEGER REFERENCES Packages(i) ON UPDATE RESTRICT ON DELETE RESTRICT
  -);
  -BEGIN TRANSACTION;
  -INSERT into Packages (h) VALUES ('bing-1.2-3.noarch');
  -INSERT into Packages (h) VALUES ('bang-4.5-6.noarch');
  -INSERT into Packages (h) VALUES ('boom-7.8.9.noarch');
  -COMMIT TRANSACTION;
   SELECT * from Packages;
   1|bing-1.2-3.noarch
   2|bang-4.5-6.noarch
  @@ -28,58 +7,10 @@
   bing-1.2-3.noarch|1
   bang-4.5-6.noarch|2
   boom-7.8.9.noarch|3
  -BEGIN TRANSACTION;
  -DELETE FROM Packages WHERE i = 2;
  -COMMIT TRANSACTION;
   SELECT * from Packages;
   1|bing-1.2-3.noarch
   3|boom-7.8.9.noarch
   SELECT * from Nvra;
   bing-1.2-3.noarch|1
   boom-7.8.9.noarch|3
  -.read ref/sqldb-meta.sql
  -.databases
  -seq  name file

[CVS] RPM: rpm/tests/ Makefile.am rpm-arg-max-doc.spec

2010-03-02 Thread Pinto Elia 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Pinto Elia
  Root:   /v/rpm/cvs   Email:  devzero2...@rpm5.org
  Module: rpm  Date:   02-Mar-2010 18:34:14
  Branch: HEAD Handle: 2010030217341400

  Added files:
rpm/tests   rpm-arg-max-doc.spec
  Modified files:
rpm/tests   Makefile.am

  Log:
add an rpm-arg-max-doc.spec toy test spec in tests

  Summary:
RevisionChanges Path
1.63+1  -0  rpm/tests/Makefile.am
1.1 +62 -0  rpm/tests/rpm-arg-max-doc.spec
  

  patch -p0 '@@ .'
  Index: rpm/tests/Makefile.am
  
  $ cvs diff -u -r1.62 -r1.63 Makefile.am
  --- rpm/tests/Makefile.am 23 Feb 2010 17:16:03 -  1.62
  +++ rpm/tests/Makefile.am 2 Mar 2010 17:34:14 -   1.63
  @@ -38,6 +38,7 @@
   #XXX rpmpopt =   $(abs_top_builddir)/rpmpopt
   
   rpm =$(abs_top_builddir)/rpm --macros $(macros)
  +rpmbuild =   $(abs_top_builddir)/rpmbuild  --macros $(macros)
   rpm2cpio =   $(abs_top_builddir)/tools/rpm2cpio
   rpmcache =   $(abs_top_builddir)/tools/rpmcache --macros $(macros)
   rpmdigest =  $(abs_top_builddir)/tools/rpmdigest
  @@ .
  patch -p0 '@@ .'
  Index: rpm/tests/rpm-arg-max-doc.spec
  
  $ cvs diff -u -r0 -r1.1 rpm-arg-max-doc.spec
  --- /dev/null 2010-03-02 18:34:08 +0100
  +++ rpm-arg-max-doc.spec  2010-03-02 18:34:14 +0100
  @@ -0,0 +1,62 @@
  +Summary: An toy rpm that could cause an arg list too long error in build
  +Name: rpm-arg-max-doc
  +Version: 1.0
  +Release: 1
  +License: LGPL
  +Group: Development/Tools
  +URL: http://rpm5.org
  +BuildRoot: %{_tmppath}/%{name}-%{version}-root
  +BuildArch: noarch
  +%description
  +%{summary}
  +
  +Visit this url for some background 
  +http://www.in-ulm.de/~mascheck/various/argmax/
  +information
  +
  +%prep
  +%setup -c -T
  +%build
  +%{__mkdir_p} %{name}-document
  +cd %{name}-document
  +ARG_MAX_MEDIUM=2
  +[ -x /usr/bin/getconf ]  { ARG_MAX=$(/usr/bin/getconf ARG_MAX 2-)  [ 
-n $ARG_MAX ]  || ARG_MAX=$ARG_MAX_MEDIUM ; }
  +[ -z $ARG_MAX ]  ARG_MAX=$ARG_MAX_MEDIUM 
  +[ $ARG_MAX -lt $ARG_MAX_MEDIUM ]  ARG_MAX=$ARG_MAX_MEDIUM
  +perl -e '
  +use diagnostics;
  +use Fcntl;
  +use POSIX qw(limits_h);
  +my $FILEHAND=filehandle;
  +if (@ARGV != 1) {
  + print usage: arg-max\n;
  + exit;
  +}
  +# XXX: ARG_MAX could be undefined
  +my $my_arg_max=$ARGV[0];
  +# XXX: 30 is almost the name file lenght
  +my $my_num_files=$my_arg_max/30;
  +if ($my_arg_max !~ /^\d+$/) { die arg-max is not a  number\n };
  +my $base_name = sprintf(document-%d-%d-, $$, time);
  +my $count = 0;
  +until(  $count++ $my_num_files ) {
  +   $base_name =~ s/-(\d+)$/- . (1 + $1)/e;
  +   sysopen($FILEHAND, $base_name, O_WRONLY|O_EXCL|O_CREAT);
  +}
  +' $ARG_MAX
  +
  +%install
  +#empty
  +rm -rf $RPM_BUILD_ROOT
  +exit 0
  +
  +%clean
  +rm -rf $RPM_BUILD_ROOT
  +
  +%files
  +%defattr(-,root,root,-)
  +%doc %{name}-document/doc*
  +
  +%changelog
  +* Tue Mar  2 2010 Elia Pinto devzero2...@rpm5.org 1.0-1
  +- First Built
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/tests/ Makefile.am simplestRPMv3-1.0-2.aix5.3.noarch.rp...

2010-02-23 Thread Pinto Elia 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Pinto Elia
  Root:   /v/rpm/cvs   Email:  devzero2...@rpm5.org
  Module: rpm  Date:   23-Feb-2010 18:16:03
  Branch: HEAD Handle: 2010022317160300

  Added files:
rpm/tests   simplestRPMv3-1.0-2.aix5.3.noarch.rpm
  Modified files:
rpm/tests   Makefile.am

  Log:
added a simplest toy rpm 3.0.5 aix 5.3 package

The test included should be work with rpm5 as the package
is not signed. But dunno if it is usefull or not

  Summary:
RevisionChanges Path
1.62+5  -1  rpm/tests/Makefile.am
1.1 BLOBrpm/tests/simplestRPMv3-1.0-2.aix5.3.noarch.rpm
  

  patch -p0 '@@ .'
  Index: rpm/tests/Makefile.am
  
  $ cvs diff -u -r1.61 -r1.62 Makefile.am
  --- rpm/tests/Makefile.am 31 Jan 2010 23:03:08 -  1.61
  +++ rpm/tests/Makefile.am 23 Feb 2010 17:16:03 -  1.62
  @@ -386,6 +386,10 @@
@${rpm} -qa --qf '[%{FILENAMES}: %{FILEREQUIRE}\n]'  /dev/null
@${rpm} -qa --qf '[%{FSNAMES}: %{FSSIZES}\n]'  /dev/null
   
  +check-rpmv3:
  + @echo === $@ ===
  + @${rpm} -qlp simplestRPMv3-1.0-2.aix5.3.noarch.rpm
  +
   check-verify:
@echo === $@ ===
@${rpm} -e probes devtool-sanity
  @@ -411,7 +415,7 @@
   
   check-local: check-init check-pubkeys check-markup check-macros \
check-build check-sign check-ACID check-install \
  - check-query check-verify \
  + check-query check-verify check-rpmv3\
check-triggers # check-tools # check-repo
   
   clean-local:
  @@ .
  (cd rpm/tests  \
   uudecode '@@ .'  \
   xdelta patch simplestRPMv3-1.0-2.aix5.3.noarch.rpm.xdelta /dev/null 
simplestRPMv3-1.0-2.aix5.3.noarch.rpm  \
   rm -f simplestRPMv3-1.0-2.aix5.3.noarch.rpm.xdelta)
  Index: rpm/tests/simplestRPMv3-1.0-2.aix5.3.noarch.rpm
  
  begin 664 simplestRPMv3-1.0-2.aix5.3.noarch.rpm.xdelta
  M)5A$6C`P-4(`!$`$`!S:EE;$N.34P.3`N
  M;G5L;'-H:65L82XY-3`Y,YA;p...@#`p```!^+```
  M``-C8a...@9f!@\...@bvw.sgv$3r\lSAEO?CC5`48`(Z3P[(
  )52581%HP,#0E
  `
  end
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/tests/ Makefile.am rpm/tests/ref/ .alldigests idms-mini...

2010-01-31 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   31-Jan-2010 22:47:24
  Branch: HEAD Handle: 2010013121472300

  Added files:
rpm/tests/ref   idms-minimal.i586.manifest
  Modified files:
rpm/tests   Makefile.am
rpm/tests/ref   .alldigests

  Log:
- add IDMS install to make check. 211 pkgs = flawless install.
nicely done!

  Summary:
RevisionChanges Path
1.60+10 -1  rpm/tests/Makefile.am
1.37+200 -100   rpm/tests/ref/.alldigests
1.1 +211 -0 rpm/tests/ref/idms-minimal.i586.manifest
  

  patch -p0 '@@ .'
  Index: rpm/tests/Makefile.am
  
  $ cvs diff -u -r1.59 -r1.60 Makefile.am
  --- rpm/tests/Makefile.am 31 Jan 2010 19:32:39 -  1.59
  +++ rpm/tests/Makefile.am 31 Jan 2010 21:47:23 -  1.60
  @@ -60,6 +60,7 @@
   suseroot =   $(abs_top_builddir)/tests/tmp/SUSE
   mandrivaroot =   $(abs_top_builddir)/tests/tmp/MANDRIVA
   caixaroot =  $(abs_top_builddir)/tests/tmp/CAIXA
  +idmsroot =   $(abs_top_builddir)/tests/tmp/IDMS
   
   rpmdb =  $(abs_top_builddir)/tests/tmp/rpmdb
   rpmdb_Tables = \
  @@ -310,6 +311,14 @@
   #-rm -f tmp/CM14/vixie-cron-4.1-9mdv2008.0.i586.rpm
-$(sudo) $(rpm) -Uvh --noparentdirs --nolinktos -r $(caixaroot) 
tmp/CM14/*.rpm
   
  +check-IDMS:
  + @echo === $@ ===
  + $(sudo) rm -rf $(idmsroot) tmp/repackage
  + @rm -rf tmp/idms-pkgs
  + @mkdir -p $(caixaroot) tmp/idms-pkgs tmp/repackage
  + @cd tmp/idms-pkgs  $(wget) -i ../../ref/idms-minimal.i586.manifest
  + -$(sudo) $(rpm) -Uvh --noparentdirs --nolinktos -r $(idmsroot) 
tmp/idms-pkgs/*.rpm
  +
   .PHONY:  check-triggers
   check-triggers:
@echo === $@ ===
  @@ -398,6 +407,6 @@
   
   clean-local:
rm -f genpgp.h
  - $(sudo) rm -rf $(caosroot) $(centosroot) $(suseroot) $(mandrivaroot) 
$(caixaroot) tmp/repackage
  + $(sudo) rm -rf $(caosroot) $(centosroot) $(suseroot) $(mandrivaroot) 
$(caixaroot) $(idmsroot) tmp/repackage
rm -rf tmp $(BUILD_DIRS)
rm -rf repodata/
  @@ .
  patch -p0 '@@ .'
  Index: rpm/tests/ref/.alldigests
  
  $ cvs diff -u -r1.36 -r1.37 .alldigests
  --- rpm/tests/ref/.alldigests 31 Jan 2010 19:32:39 -  1.36
  +++ rpm/tests/ref/.alldigests 31 Jan 2010 21:47:23 -  1.37
  @@ -1698,106 +1698,206 @@
   crc64:5aa3e0193a2726a0  ref/filelists.xml
   adler32:b84a906b  ref/filelists.xml
   jlu32:54496ac5  ref/filelists.xml
  -md2:160ccc92042f62be676f0a15fde3e141  ref/manifest
  -md4:4b1006cd71acb0eb673cd93b8f8298b8  ref/manifest
  -md5:dbe37e99aed43dfcaa2bfc24025a8737  ref/manifest
  -sha1:798677a51cb77ea969540fe653d33c7211b622ed  ref/manifest
  -sha224:3a40bc4a006092255c6a1ab76ee81509ed6c48dcb7ac15e9070cbd89  ref/manifest
  -sha256:331d4474e1a3ae78f374ce14409622571948678c49f41c575d42274184b3a661  
ref/manifest
  
-sha384:bfc55768fbb98ea8ddef8d54335766c85914972f4cbe5cbd4a917b2726b1edc5d6269fb4804830f42c51dc9286e878b9
  ref/manifest
  
-sha512:dd7bfa6017fc2432dc27d5a715e7d1be8a0c77fc534178b9467aec2b5c80e9735c581e9e405b52a7b0a5f2aa0d1028eb1987badee41aa963449cb8db288187e8
  ref/manifest
  -skein-224:72c0beef42847be2ca7c3dc541c9149cc33bbb07dd571e81d94cc2ac  
ref/manifest
  -skein-256:a297b792299db9d0fba1cd5628e6a629652812c2312a547be42491863a61e59f  
ref/manifest
  
-skein-384:ae4128073db1bcd9ce2a2fdcd4a84744fddb4da3bcc3e0b7ee3a7f825ab17f9b3a2fddfe2aa8c6d7e47ac78ba87d38e6
  ref/manifest
  
-skein-512:ec3fd4b7458c907101f2f822b0831075346b0eacc0b2e659babf18279a548f9b1902f003d18754a573d2fafb45d03fe1865c7424cea2726f33137a251223d244
  ref/manifest
  
-skein-1024:9491a474cc96cdcea33c237cb3e9a6d11fbb398e1ff96b2fd0e656fe151978979af79d27453d23ec7ae6902203dbd60d03396ebd12dc6dbd95e554ca03c5a8643de48c19f345a296b600588d3577dc2a3ca067b6d5a23912bb9e01ee8a156527094f37f106c526e4e3638d232969b0ea1bb9ef9bd1f4648c21e2e412f8939a9e
  ref/manifest
  -arirang-224:917b95195fe4ff88c459b09a6b29e8ded6e9e2645263ec3dbbf33573  
ref/manifest
  -arirang-256:76da6485824ae92a9053b9b3fba310a0b4889bbd8a885e963598998b9c3a8b72 
 ref/manifest
  
-arirang-384:6b7226f2d1a3b6d72f561aa1b8d0106cf13857f1d5c5cf23b9ae59942ed737641a44ce7af6c5be0a90a425bc60a20e1a
  ref/manifest
  
-arirang-512:dc12fef47f90eff0bf590d037c952462c49f3d1604ba7c20af52839a6ecc466375434db6d6a383b0361ba36b8c9a131bb862e6e5ca73cbe76b2adbfc7f05
  ref/manifest
  -blake-224:f8ced320f487a47fd32c77aa6efcb6515884dddf1d5c38f6ffee9e8e  
ref/manifest

[CVS] RPM: rpm/tests/ Makefile.am rpm/tests/ref/ .alldigests unity-min...

2010-01-31 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   01-Feb-2010 00:03:09
  Branch: HEAD Handle: 2010013123030801

  Added files:
rpm/tests/ref   unity-minimal.x86_64.manifest
  Modified files:
rpm/tests   Makefile.am
rpm/tests/ref   .alldigests

  Log:
- add Unity install to make check.

  Summary:
RevisionChanges Path
1.61+11 -2  rpm/tests/Makefile.am
1.38+200 -100   rpm/tests/ref/.alldigests
1.1 +141 -0 rpm/tests/ref/unity-minimal.x86_64.manifest
  

  patch -p0 '@@ .'
  Index: rpm/tests/Makefile.am
  
  $ cvs diff -u -r1.60 -r1.61 Makefile.am
  --- rpm/tests/Makefile.am 31 Jan 2010 21:47:23 -  1.60
  +++ rpm/tests/Makefile.am 31 Jan 2010 23:03:08 -  1.61
  @@ -61,6 +61,7 @@
   mandrivaroot =   $(abs_top_builddir)/tests/tmp/MANDRIVA
   caixaroot =  $(abs_top_builddir)/tests/tmp/CAIXA
   idmsroot =   $(abs_top_builddir)/tests/tmp/IDMS
  +unityroot =  $(abs_top_builddir)/tests/tmp/UNITY
   
   rpmdb =  $(abs_top_builddir)/tests/tmp/rpmdb
   rpmdb_Tables = \
  @@ -315,10 +316,18 @@
@echo === $@ ===
$(sudo) rm -rf $(idmsroot) tmp/repackage
@rm -rf tmp/idms-pkgs
  - @mkdir -p $(caixaroot) tmp/idms-pkgs tmp/repackage
  + @mkdir -p $(idmsroot) tmp/idms-pkgs tmp/repackage
@cd tmp/idms-pkgs  $(wget) -i ../../ref/idms-minimal.i586.manifest
-$(sudo) $(rpm) -Uvh --noparentdirs --nolinktos -r $(idmsroot) 
tmp/idms-pkgs/*.rpm
   
  +check-Unity:
  + @echo === $@ ===
  + $(sudo) rm -rf $(unityroot) tmp/repackage
  + @rm -rf tmp/unity-pkgs
  + @mkdir -p $(unityroot) tmp/unity-pkgs tmp/repackage
  + @cd tmp/unity-pkgs  $(wget) -i ../../ref/unity-minimal.x86_64.manifest
  + -$(sudo) $(rpm) -Uvh --noparentdirs --nolinktos -r $(unityroot) 
tmp/unity-pkgs/*.rpm
  +
   .PHONY:  check-triggers
   check-triggers:
@echo === $@ ===
  @@ -407,6 +416,6 @@
   
   clean-local:
rm -f genpgp.h
  - $(sudo) rm -rf $(caosroot) $(centosroot) $(suseroot) $(mandrivaroot) 
$(caixaroot) $(idmsroot) tmp/repackage
  + $(sudo) rm -rf $(caosroot) $(centosroot) $(suseroot) $(mandrivaroot) 
$(caixaroot) $(idmsroot) $(unityroot) tmp/repackage
rm -rf tmp $(BUILD_DIRS)
rm -rf repodata/
  @@ .
  patch -p0 '@@ .'
  Index: rpm/tests/ref/.alldigests
  
  $ cvs diff -u -r1.37 -r1.38 .alldigests
  --- rpm/tests/ref/.alldigests 31 Jan 2010 21:47:23 -  1.37
  +++ rpm/tests/ref/.alldigests 31 Jan 2010 23:03:09 -  1.38
  @@ -1798,106 +1798,106 @@
   crc64:8a506efa8984372e  ref/idms-minimal.i586.manifest
   adler32:81ff1dc4  ref/idms-minimal.i586.manifest
   jlu32:8bb546e4  ref/idms-minimal.i586.manifest
  -md2:218cb02ba2a52622e181de551685a7ee  ref/manifest
  -md4:7178ab52e5a32c2f33d896c8f8e1fe87  ref/manifest
  -md5:f5da8bf693bb42e1bfbba90a6232252f  ref/manifest
  -sha1:5afe9145b6be8777df82646323cd5a5c8d005d10  ref/manifest
  -sha224:c9d388f1bc2a4514899b381e8923833c725a6bd41f921be93bbf76b1  ref/manifest
  -sha256:4eabfd6368f4a2b1e027d1d91c3fa706e35209c6c18b4723ba69cd9a145327ae  
ref/manifest
  
-sha384:595f0a925efe002f84778cffd8a877867f7554d1ea2eb4fd097f6422ea6fbe82874a6f44e002058fa1b20e55b86b7116
  ref/manifest
  
-sha512:8ed57552ace756245c6034947ffed9e74d1427b58c1f5ac75700e43414b69d37ba4063597ff9f490d7a8b2b5b462177c48bd410300814b22f44ed79b358d47dc
  ref/manifest
  -skein-224:46c7b109bc4ea4ddbeaece92ddc0c6baca9b96ea8eb5f467f6f44e75  
ref/manifest
  -skein-256:292798a46930b2209a878e58692a8f46ecd005c97ae58193db078fdbbaf41149  
ref/manifest
  
-skein-384:cd31789a9339068cef0edc31f099d992e2604af3366894060d6ca974745473ac859d9e26506d41583098c70f910f9fbb
  ref/manifest
  
-skein-512:258b0881f6e9fe20e0ea44a8f9d376e71803cb534096128eb17950723b651e5b936529659ffce21d2d2189f617643ee35b8c78133119a9aab808b61b5c7a5cf9
  ref/manifest
  
-skein-1024:acdeee9c1f59494d86977214c93b69401042b5be5091a96dc7a7f0e01ca8c68999ef88bc6961493445989674732367d54dadbd016d4b3d2ab10b087858394bd0d0f3142a8b0397b64128f3f7a94352ef5c1fdd52e7aa6b746fdadb47fedb201d334274ddd1dcc80d6aaf5ab88be781eec725d595403bdc7425eea3d1ee97e9e5
  ref/manifest
  -arirang-224:06e2c44a44cd7af78bce4daab09e6738ef915b4cdd888b62b57a3aa6  
ref/manifest
  -arirang-256:2e7608373d2f0dc30d6e1bc5506cd16e613e57d25c3907f1e5ef344540d7305d 
 ref/manifest

[CVS] RPM: rpm/tests/ Makefile.am rpm/tests/ref/ Mandriva2009.0-bash.i...

2010-01-30 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   30-Jan-2010 16:33:01
  Branch: HEAD Handle: 2010013015330001

  Added files:
rpm/tests/ref   Mandriva2009.0-bash.i586.manifest
  Modified files:
rpm/tests   Makefile.am

  Log:
- add Mandriva 2009.0 - 2009.1 upgrade starting point.

  Summary:
RevisionChanges Path
1.56+15 -4  rpm/tests/Makefile.am
1.1 +156 -0 rpm/tests/ref/Mandriva2009.0-bash.i586.manifest
  

  patch -p0 '@@ .'
  Index: rpm/tests/Makefile.am
  
  $ cvs diff -u -r1.55 -r1.56 Makefile.am
  --- rpm/tests/Makefile.am 27 Jan 2010 03:46:46 -  1.55
  +++ rpm/tests/Makefile.am 30 Jan 2010 15:33:00 -  1.56
  @@ -58,6 +58,7 @@
   caosroot =   $(abs_top_builddir)/tests/tmp/CAOS
   centosroot = $(abs_top_builddir)/tests/tmp/CENTOS
   suseroot =   $(abs_top_builddir)/tests/tmp/SUSE
  +mandrivaroot =   $(abs_top_builddir)/tests/tmp/MANDRIVA
   
   rpmdb =  $(abs_top_builddir)/tests/tmp/rpmdb
   rpmdb_Tables = \
  @@ -271,7 +272,7 @@
@cd tmp/CentOS5.1  $(wget) -i ../../ref/CentOS5.1-bash.i386.manifest
$(sudo) $(rpm) -Uvh -r $(centosroot) tmp/CentOS5.1/*.rpm
@cd tmp/CentOS5.2  $(wget) -i ../../ref/CentOS5.2-bash.i386.manifest
  - -$(sudo) $(rpm) -Uvh -r $(centosroot) tmp/CentOS5.2/*.rpm
  + $(sudo) $(rpm) -Uvh -r $(centosroot) tmp/CentOS5.2/*.rpm
   
   check-SuSE:
@echo === $@ ===
  @@ -279,9 +280,19 @@
@rm -rf tmp/SuSE11.1 tmp/SuSE11.2
@mkdir -p $(suseroot) tmp/SuSE11.1 tmp/SuSE11.2 tmp/repackage
@cd tmp/SuSE11.1  $(wget) -i ../../ref/SuSE11.1-bash.i586.manifest
  - -$(sudo) $(rpm) -Uvh --nodeps -r $(suseroot) tmp/SuSE11.1/*.rpm
  + -$(sudo) $(rpm) -Uvh -r $(suseroot) tmp/SuSE11.1/*.rpm
@cd tmp/SuSE11.2  $(wget) -i ../../ref/SuSE11.2-bash.i586.manifest
  - -$(sudo) $(rpm) -Uvh --nodeps -r $(suseroot) tmp/SuSE11.2/*.rpm
  + -$(sudo) $(rpm) -Uvh -r $(suseroot) tmp/SuSE11.2/*.rpm
  +
  +check-Mandriva:
  + @echo === $@ ===
  + $(sudo) rm -rf $(mandrivaroot) tmp/repackage
  + @rm -rf tmp/Mandriva2009.0 tmp/Mandriva2009.1
  + @mkdir -p $(mandrivaroot) tmp/Mandriva2009.0 tmp/Mandriva2009.1 
tmp/repackage
  + @cd tmp/Mandriva2009.0  $(wget) -i 
../../ref/Mandriva2009.0-bash.i586.manifest
  + -$(sudo) $(rpm) -Uvh --noparentdirs --nolinktos -r $(mandrivaroot) 
tmp/Mandriva2009.0/*.rpm
  +#@cd tmp/Mandriva2009.1  $(wget) -i 
../../ref/Mandriva2009.1-bash.i586.manifest
  +#-$(sudo) $(rpm) -Uvh -r $(mandrivaroot) tmp/Mandriva2009.1/*.rpm
   
   .PHONY:  check-triggers
   check-triggers:
  @@ -371,6 +382,6 @@
   
   clean-local:
rm -f genpgp.h
  - $(sudo) rm -rf $(caosroot) $(centosroot) $(suseroot) tmp/repackage
  + $(sudo) rm -rf $(caosroot) $(centosroot) $(suseroot) $(mandrivaroot) 
tmp/repackage
rm -rf tmp $(BUILD_DIRS)
rm -rf repodata/
  @@ .
  patch -p0 '@@ .'
  Index: rpm/tests/ref/Mandriva2009.0-bash.i586.manifest
  
  $ cvs diff -u -r0 -r1.1 Mandriva2009.0-bash.i586.manifest
  --- /dev/null 2010-01-30 16:33:01 +0100
  +++ Mandriva2009.0-bash.i586.manifest 2010-01-30 16:33:01 +0100
  @@ -0,0 +1,156 @@
  
+http://mirror.cc.columbia.edu/pub/linux/mandriva/official/2009.0/i586/media/main/release/filesystem-2.1.9-5mdv2009.0.i586.rpm
  +
  
+http://mirror.cc.columbia.edu/pub/linux/mandriva/official/2009.0/i586/media/main/release/setup-2.7.13-1mdv2009.0.i586.rpm
 
  
+http://mirror.cc.columbia.edu/pub/linux/mandriva/official/2009.0/i586/media/main/release/shadow-utils-4.0.12-17mdv2009.0.i586.rpm
  
+http://mirror.cc.columbia.edu/pub/linux/mandriva/official/2009.0/i586/media/main/release/run-parts-1.15-2mdv2009.0.i586.rpm
  +
  
+http://mirror.cc.columbia.edu/pub/linux/mandriva/official/2009.0/i586/media/main/release/glibc-2.8-1.20080520.5mnb2.i586.rpm
  +
  
+http://mirror.cc.columbia.edu/pub/linux/mandriva/official/2009.0/i586/media/main/release/dash-static-0.5.4-9mdv2009.0.i586.rpm
  +
  
+http://mirror.cc.columbia.edu/pub/linux/mandriva/official/2009.0/i586/media/main/release/cracklib-dicts-2.8.12-1mdv2009.0.i586.rpm
  +
  
+http://mirror.cc.columbia.edu/pub/linux/mandriva/official/2009.0/i586/media/main/release/libaudit0-1.7.7-1mdv2009.0.i586.rpm
  
+http://mirror.cc.columbia.edu/pub/linux/mandriva/official/2009.0/i586/media/main/release/libdbnss4.6-4.6.21-9mdv2009.0.i586.rpm

[CVS] RPM: rpm/tests/ Makefile.am rpm/tests/ref/ .alldigests cAos2-min...

2010-01-30 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   31-Jan-2010 03:03:29
  Branch: HEAD Handle: 2010013102032801

  Added files:
rpm/tests/ref   cAos2-minimal.i386.manifest
  Modified files:
rpm/tests   Makefile.am
rpm/tests/ref   .alldigests

  Log:
- install cAos2-minimal (rather than cAos2-bash) for make
check-cAos.

  Summary:
RevisionChanges Path
1.58+7  -4  rpm/tests/Makefile.am
1.35+100 -0 rpm/tests/ref/.alldigests
1.1 +158 -0 rpm/tests/ref/cAos2-minimal.i386.manifest
  

  patch -p0 '@@ .'
  Index: rpm/tests/Makefile.am
  
  $ cvs diff -u -r1.57 -r1.58 Makefile.am
  --- rpm/tests/Makefile.am 31 Jan 2010 00:51:42 -  1.57
  +++ rpm/tests/Makefile.am 31 Jan 2010 02:03:28 -  1.58
  @@ -258,11 +258,14 @@
$(sudo) rm -rf $(caosroot) tmp/repackage
@rm -rf tmp/cAos-2 tmp/cAos-3
@mkdir -p $(caosroot) tmp/cAos-2 tmp/cAos-3 tmp/repackage
  - @cd tmp/cAos-2  $(wget) -i ../../ref/cAos2-bash.i386.manifest
  - $(sudo) $(rpm) -Uvh -r $(caosroot) tmp/cAos-2/*.rpm 
cAos2-stub/*.noarch.rpm
  +#@cd tmp/cAos-2  $(wget) -i ../../ref/cAos2-bash.i386.manifest
  +#$(sudo) $(rpm) -Uvh -r $(caosroot) tmp/cAos-2/*.rpm 
cAos2-stub/*.noarch.rpm
  + @cd tmp/cAos-2  $(wget) -i ../../ref/cAos2-minimal.i386.manifest
  + -$(sudo) $(rpm) -Uvh --noparentdirs --nolinktos -r $(caosroot) 
tmp/cAos-2/*.rpm
@cd tmp/cAos-3  $(wget) -i ../../ref/cAos3-bash.i386.manifest
  - $(sudo) $(rpm) -Uvh -r $(caosroot) tmp/cAos-3/ncurses-libs-*.rpm
  - -$(sudo) $(rpm) -Uvh -r $(caosroot) `echo tmp/cAos-3/*.rpm | sed -e 
's,tmp/cAos-3/ncurses-libs[^ ]*,,'`
  + @-rm -f tmp/cAos-3/mktemp-1.5-2.caos.i386.rpm
  + -$(sudo) $(rpm) -Uvh --noparentdirs --nolinktos --nodeps -r $(caosroot) 
tmp/cAos-3/ncurses-libs-*.rpm
  + -$(sudo) $(rpm) -Uvh --noparentdirs --nolinktos --nodeps -r $(caosroot) 
`echo tmp/cAos-3/*.rpm | sed -e 's,tmp/cAos-3/ncurses-libs[^ ]*,,'`
   
   check-CentOS:
@echo === $@ ===
  @@ .
  patch -p0 '@@ .'
  Index: rpm/tests/ref/.alldigests
  
  $ cvs diff -u -r1.34 -r1.35 .alldigests
  --- rpm/tests/ref/.alldigests 31 Jan 2010 00:51:42 -  1.34
  +++ rpm/tests/ref/.alldigests 31 Jan 2010 02:03:29 -  1.35
  @@ -698,6 +698,106 @@
   crc64:4e16fd9bd0c45e3b  ref/cAos2-bash.i386.manifest
   adler32:9a620e83  ref/cAos2-bash.i386.manifest
   jlu32:436413af  ref/cAos2-bash.i386.manifest
  +md2:bc73129d4e085a7fc6855229f6cd6a07  ref/cAos2-minimal.i386.manifest
  +md4:ee0b08300b409ccf9d9ad2fcbe2bf3df  ref/cAos2-minimal.i386.manifest
  +md5:c702512431a26602340ccf07f5e114d9  ref/cAos2-minimal.i386.manifest
  +sha1:822b082f4c2ce9a7f45accd5ee99e86bad704ffb  
ref/cAos2-minimal.i386.manifest
  +sha224:855debc347373c78de0927c354dbf94ab2bdd0ccb9c8606eaaf937f3  
ref/cAos2-minimal.i386.manifest
  +sha256:8d48f22b0cba5c0aad56dabcfc003bd7c2d708006e4d92b1b78f06ed66341674  
ref/cAos2-minimal.i386.manifest
  
+sha384:02fcedbaf4af74bdcfd33e58c90ca77af18d46509775c662a5389e5dbf5b818598e9d18e9b3e338ca9349996630040cf
  ref/cAos2-minimal.i386.manifest
  
+sha512:bb84296d1796dcd38098bd71bd13a58acc02c4ff8f26adc6ddb828ce22eb54e961ed91b96c68d0cc2fdefbe61de3db37c4fc32b2cbf2fa1b0154812283741c9a
  ref/cAos2-minimal.i386.manifest
  +skein-224:01a88155919a1df1de2ae441bb26e2a84145d5a21601fc233436e2ea  
ref/cAos2-minimal.i386.manifest
  +skein-256:f33369e2959d6184ce45fc6e448d16e8df6900b77c859a5ea956a388df0f3b3f  
ref/cAos2-minimal.i386.manifest
  
+skein-384:15705343adbc9584c37bdb63ebb082b7fd445ddd3ff4dfa9515cf5267a7351a539e7371dba20a0aa782e1750f80ae4fb
  ref/cAos2-minimal.i386.manifest
  
+skein-512:fd4b13cbe609936b955121c4b6b97745afd78131ee714338791ad1bd1cdd79ec493e3829c281f173ba04ba61138493eb6c8d56b9dfb834090cb435b1217b84e3
  ref/cAos2-minimal.i386.manifest
  
+skein-1024:26b2531b83f91381da950dbab9c25c7ac1c443d8986a41990d4da8c4e24c35a10491074e3b9a16af256ba7d65327fe1544427adea19264e84e330a0da568568b875287f9a34512c70a87cfc1d3f0d37d7b7f85a36a7baf85ebfb521d2cfd5197f1f8da7762b0fbbe948caa810fabca817943967dd00e6fc32d9279bdbdbdf1f1
  ref/cAos2-minimal.i386.manifest
  +arirang-224:b904301e8feef5399d0c0f9a5405674cf91116e0285bbffe56ac5275  
ref/cAos2-minimal.i386.manifest
  +arirang-256:7424f0ee0b397e73202e9a5a0fc4dd826422a82e66eb0179c129e604264a3de5 
 ref/cAos2-minimal.i386.manifest

[CVS] RPM: rpm/tests/ Makefile.am rpm/tests/ref/ .alldigests CentOS5.1...

2010-01-26 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   27-Jan-2010 03:57:15
  Branch: HEAD Handle: 2010012702571301

  Added files:
rpm/tests/ref   CentOS5.1-bash.i386.manifest
CentOS5.2-bash.i386.manifest
  Modified files:
rpm/tests   Makefile.am
rpm/tests/ref   .alldigests cAos3-bash.i386.manifest

  Log:
- tests: add make check-CentOS target to automate 5.1 - 5.2
upgrade.

  Summary:
RevisionChanges Path
1.54+16 -4  rpm/tests/Makefile.am
1.33+100 -100   rpm/tests/ref/.alldigests
1.1 +11 -0  rpm/tests/ref/CentOS5.1-bash.i386.manifest
1.1 +13 -0  rpm/tests/ref/CentOS5.2-bash.i386.manifest
1.2 +1  -0  rpm/tests/ref/cAos3-bash.i386.manifest
  

  patch -p0 '@@ .'
  Index: rpm/tests/Makefile.am
  
  $ cvs diff -u -r1.53 -r1.54 Makefile.am
  --- rpm/tests/Makefile.am 26 Jan 2010 19:21:24 -  1.53
  +++ rpm/tests/Makefile.am 27 Jan 2010 02:57:13 -  1.54
  @@ -56,6 +56,7 @@
   
   sudo =   sudo
   caosroot =   $(abs_top_builddir)/tests/tmp/CAOS
  +centosroot = $(abs_top_builddir)/tests/tmp/CENTOS
   
   rpmdb =  $(abs_top_builddir)/tests/tmp/rpmdb
   rpmdb_Tables = \
  @@ -252,13 +253,24 @@
   
   check-cAos:
@echo === $@ ===
  - $(sudo) rm -rf $(caosroot)
  + $(sudo) rm -rf $(caosroot) tmp/repackage
@rm -rf tmp/cAos-2 tmp/cAos-3
  - @mkdir -p $(caosroot) tmp/cAos-2 tmp/cAos-3
  + @mkdir -p $(caosroot) tmp/cAos-2 tmp/cAos-3 tmp/repackage
@cd tmp/cAos-2  $(wget) -i ../../ref/cAos2-bash.i386.manifest
$(sudo) $(rpm) -Uvh -r $(caosroot) tmp/cAos-2/*.rpm 
cAos2-stub/*.noarch.rpm
@cd tmp/cAos-3  $(wget) -i ../../ref/cAos3-bash.i386.manifest
  - $(sudo) $(rpm) -Uvh -r $(caosroot) tmp/cAos-3/*.rpm
  + $(sudo) $(rpm) -Uvh -r $(caosroot) tmp/cAos-3/ncurses-libs-*.rpm
  + -$(sudo) $(rpm) -Uvh -r $(caosroot) `echo tmp/cAos-3/*.rpm | sed -e 
's,tmp/cAos-3/ncurses-libs[^ ]*,,'`
  +
  +check-CentOS:
  + @echo === $@ ===
  + $(sudo) rm -rf $(centosroot) tmp/repackage
  + @rm -rf tmp/CentOS5.1 tmp/CentOS5.2
  + @mkdir -p $(centosroot) tmp/CentOS5.1 tmp/CentOS5.2 tmp/repackage
  + @cd tmp/CentOS5.1  $(wget) -i ../../ref/CentOS5.1-bash.i386.manifest
  + $(sudo) $(rpm) -Uvh -r $(centosroot) tmp/CentOS5.1/*.rpm
  + @cd tmp/CentOS5.2  $(wget) -i ../../ref/CentOS5.2-bash.i386.manifest
  + -$(sudo) $(rpm) -Uvh -r $(centosroot) tmp/CentOS5.2/*.rpm
   
   .PHONY:  check-triggers
   check-triggers:
  @@ -348,6 +360,6 @@
   
   clean-local:
rm -f genpgp.h
  - $(sudo) rm -rf $(caosroot) tmp/repackage
  + $(sudo) rm -rf $(caosroot) $(centosroot) tmp/repackage
rm -rf tmp $(BUILD_DIRS)
rm -rf repodata/
  @@ .
  patch -p0 '@@ .'
  Index: rpm/tests/ref/.alldigests
  
  $ cvs diff -u -r1.32 -r1.33 .alldigests
  --- rpm/tests/ref/.alldigests 26 Jan 2010 19:21:26 -  1.32
  +++ rpm/tests/ref/.alldigests 27 Jan 2010 02:57:14 -  1.33
  @@ -298,106 +298,106 @@
   crc64:4e16fd9bd0c45e3b  ref/cAos2-bash.i386.manifest
   adler32:9a620e83  ref/cAos2-bash.i386.manifest
   jlu32:436413af  ref/cAos2-bash.i386.manifest
  -md2:e2c623af75946e27ea095538388731bb  ref/cAos3-bash.i386.manifest
  -md4:42a8dde9518dbdbfee53929d8dfdae5d  ref/cAos3-bash.i386.manifest
  -md5:b03fdbb8b3773decea4f819bd8f29224  ref/cAos3-bash.i386.manifest
  -sha1:e5774047f3590dd035851c9bd7db51a420a78bee  ref/cAos3-bash.i386.manifest
  -sha224:be6c5460b694bcf85a929d9421129603900230d0ed40974a38ac83ea  
ref/cAos3-bash.i386.manifest
  -sha256:f4fd7f22a43dee81f79fd3f48645309440c978a14c362e93dad720c8c1e93f39  
ref/cAos3-bash.i386.manifest
  
-sha384:29672fab3774252db618d1803ae56bfed0375799f883cb11a38b2c941cb0cacc69cab97666f6f29e23fcae0335cbf27a
  ref/cAos3-bash.i386.manifest
  
-sha512:e754fc688e567aa083c2054f14fc34c202ec9018b4839fe084af22098c826c61eac9bb065c2ad24b7e0128a20d03970eb049c36fc170184eb6d9ad4f71a818aa
  ref/cAos3-bash.i386.manifest
  -skein-224:42ce90d25876355592899044b29dc906ef9cce593378fa118195b23c  
ref/cAos3-bash.i386.manifest
  -skein-256:9ad3db81ef30a741d070a657ea51718c02559b71469fcfc521ca4168b43e6657  
ref/cAos3-bash.i386.manifest
  
-skein-384:d91ae268b05009792e74f0845bdaa1090b3843a53f2a2ed3e4ece7b32c7caa7eabaee57fd9dda8879560eac37b1de7ce
  ref/cAos3-bash.i386.manifest

[CVS] RPM: rpm/tests/ Makefile.am

2010-01-26 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   27-Jan-2010 04:46:46
  Branch: HEAD Handle: 2010012703464600

  Modified files:
rpm/tests   Makefile.am

  Log:
- tests: add make check-SuSE to automate 11.1 - 11.2. more todo++.

  Summary:
RevisionChanges Path
1.55+12 -1  rpm/tests/Makefile.am
  

  patch -p0 '@@ .'
  Index: rpm/tests/Makefile.am
  
  $ cvs diff -u -r1.54 -r1.55 Makefile.am
  --- rpm/tests/Makefile.am 27 Jan 2010 02:57:13 -  1.54
  +++ rpm/tests/Makefile.am 27 Jan 2010 03:46:46 -  1.55
  @@ -57,6 +57,7 @@
   sudo =   sudo
   caosroot =   $(abs_top_builddir)/tests/tmp/CAOS
   centosroot = $(abs_top_builddir)/tests/tmp/CENTOS
  +suseroot =   $(abs_top_builddir)/tests/tmp/SUSE
   
   rpmdb =  $(abs_top_builddir)/tests/tmp/rpmdb
   rpmdb_Tables = \
  @@ -272,6 +273,16 @@
@cd tmp/CentOS5.2  $(wget) -i ../../ref/CentOS5.2-bash.i386.manifest
-$(sudo) $(rpm) -Uvh -r $(centosroot) tmp/CentOS5.2/*.rpm
   
  +check-SuSE:
  + @echo === $@ ===
  + $(sudo) rm -rf $(suseroot) tmp/repackage
  + @rm -rf tmp/SuSE11.1 tmp/SuSE11.2
  + @mkdir -p $(suseroot) tmp/SuSE11.1 tmp/SuSE11.2 tmp/repackage
  + @cd tmp/SuSE11.1  $(wget) -i ../../ref/SuSE11.1-bash.i586.manifest
  + -$(sudo) $(rpm) -Uvh --nodeps -r $(suseroot) tmp/SuSE11.1/*.rpm
  + @cd tmp/SuSE11.2  $(wget) -i ../../ref/SuSE11.2-bash.i586.manifest
  + -$(sudo) $(rpm) -Uvh --nodeps -r $(suseroot) tmp/SuSE11.2/*.rpm
  +
   .PHONY:  check-triggers
   check-triggers:
@echo === $@ ===
  @@ -360,6 +371,6 @@
   
   clean-local:
rm -f genpgp.h
  - $(sudo) rm -rf $(caosroot) $(centosroot) tmp/repackage
  + $(sudo) rm -rf $(caosroot) $(centosroot) $(suseroot) tmp/repackage
rm -rf tmp $(BUILD_DIRS)
rm -rf repodata/
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/tests/ Makefile.am

2010-01-07 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   08-Jan-2010 00:47:39
  Branch: HEAD Handle: 2010010723473900

  Modified files:
rpm/tests   Makefile.am

  Log:
- tests: add db_upgrade to check-ACID.
- tests: ignore embedded lua/js failures.

  Summary:
RevisionChanges Path
1.51+4  -2  rpm/tests/Makefile.am
  

  patch -p0 '@@ .'
  Index: rpm/tests/Makefile.am
  
  $ cvs diff -u -r1.50 -r1.51 Makefile.am
  --- rpm/tests/Makefile.am 4 Jan 2010 20:35:14 -   1.50
  +++ rpm/tests/Makefile.am 7 Jan 2010 23:47:39 -   1.51
  @@ -88,6 +88,7 @@
   db_printlog =${db_tool} db_printlog  -h $(rpmdb)
   db_recover = ${db_tool} db_recover   -h $(rpmdb) -v
   db_stat =${db_tool} db_stat  -h $(rpmdb)
  +db_upgrade = ${db_tool} db_upgrade   -h $(rpmdb) -v
   db_verify =  ${db_tool} db_verify-h $(rpmdb)
   
   cpio =   @__CPIO@
  @@ -180,8 +181,8 @@
@${rpm} -D 'foo %foo' -E '%foo'  /dev/null 21
@${rpm} -D 'foo bing' -D 'foo bang' -D 'foo boom' -E '%...@foo}'  
/dev/null 21
@${rpm}  -E '%(/bin/echo --   sh: Portable Shar!)'
  - @${rpm}  -E '%{lua:print(--  lua: Hard Rocks!)}'
  - @${rpm}  -E '%{js:print(--   js: Use GPSEE!)}'
  + @-${rpm}  -E '%{lua:print(--  lua: Hard Rocks!)}'
  + @-${rpm}  -E '%{js:print(--   js: Use GPSEE!)}'
@-${rpm} -E '%{ruby:print -- ruby: Puppet Gems!}'
@-${rpm} -E '%{tcl:puts --  tcl: Porticus Ports!}'
@-${rpm} -E '%{squirrel:print(-- squirrel: Eat Nuts!)}'
  @@ -223,6 +224,7 @@
   
   check-ACID:
@echo === $@ ===
  + @-${db_upgrade} Packages
@-${db_checkpoint} -1/dev/null 21
@${rpm} -Uvh --stats ref/edos.manifest
@-${db_dump} Packages | ${db_load} Packages
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/tests/ Makefile.am

2010-01-07 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   08-Jan-2010 06:06:00
  Branch: HEAD Handle: 201001080506

  Modified files:
rpm/tests   Makefile.am

  Log:
- tests: haul out some trash.

  Summary:
RevisionChanges Path
1.52+2  -7  rpm/tests/Makefile.am
  

  patch -p0 '@@ .'
  Index: rpm/tests/Makefile.am
  
  $ cvs diff -u -r1.51 -r1.52 Makefile.am
  --- rpm/tests/Makefile.am 7 Jan 2010 23:47:39 -   1.51
  +++ rpm/tests/Makefile.am 8 Jan 2010 05:06:00 -   1.52
  @@ -201,7 +201,7 @@
   $(BUILD_DIRS): $(wildcard %-*.src.rpm)
@echo === build $@ ===
${rpm} -i --nosignature --nodeps $...@-*.src.rpm
  - (cd $@  ${rpm} -q --specfile $...@.spec  ${rpm} -q --specsrpm 
$...@.spec  ${rpm} -q --specfile --specedit $...@.spec  ${rpm} -bb --nodeps 
$...@.spec)  /dev/null
  + (cd $@  ${rpm} -q --specfile $...@.spec  ${rpm} -q --specsrpm 
$...@.spec  ${rpm} -q --specfile --specedit $...@.spec  ${rpm} -bb --nodeps 
$...@.spec || :)  /dev/null
   
   check-build: $(BUILD_DIRS)
@echo === $@ ===
  @@ -217,7 +217,6 @@
@${rpm} -U -- edos-test/engine-2-* -turbo
@${rpm} -U -- edos-test/{wheel-3,tyre-1}-*
@${rpm} -F -- edos-test/{door-2,window-1,glass-2}-*
  - @${rpm} --rebuilddb #XXX masks DB_SECONDARY_BAD
@${rpm} -qaT | grep -v gpg-pubkey  tmp/edos.qa.2
@diff -u {tmp,ref}/edos.qa.2 || ${cp} {tmp,ref}/edos.qa.2
@${rpm} -e car engine wheel door tyre window glass
  @@ -252,7 +251,6 @@
   check-triggers:
@echo === $@ ===
@-${rpm} -e --noscripts --notriggers --allmatches '^triggers-.*'  
/dev/null 21
  - @-rm tmp/rpmdb/Triggername  #XXX masks DB_SECONDARY_BAD
@echo -- N:
@${rpm} -U --noparentdirs --nodeps triggers-N/triggers-N*.rpm
@${rpm} -e --noparentdirs --nodeps triggers-N-a triggers-N-b
  @@ -274,7 +272,6 @@
@echo -- DP:
@${rpm} -U --noparentdirs --nodeps triggers-DP/triggers-DP*.rpm
@${rpm} -e --noparentdirs --nodeps triggers-DP-a triggers-DP-b
  - @${rpm} --rebuilddb #XXX masks DB_SECONDARY_BAD
   
   check-query:
@echo === $@ ===
  @@ -311,17 +308,15 @@
   check-verify:
@echo === $@ ===
@${rpm} -e probes devtool-sanity
  - @${rpm} --rebuilddb #XXX masks DB_SECONDARY_BAD
@-${rpm} -U --justdb --nodeps tmp/manifest
@-${rpm} -V probes devtool-sanity  /dev/null
@-${rpm} -Va  /dev/null
   #XXX @-${rpm} -Vp tmp/manifest
@${rpm} -e --noscripts --notriggers --allmatches '^triggers-.*'
  - @-rm tmp/rpmdb/Triggername  #XXX masks DB_SECONDARY_BAD
@${rpm} -e car engine wheel door tyre window glass
@${rpm} -e battery bicycle electric-engine gasoline-engine
@${rpm} -e solar-collector tire turbo
  - @${rpm} -e --justdb popt
  + @-${rpm} -e --justdb popt
@${rpm} -e probes
@${rpm} -e devtool-sanity
   
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/tests/ Makefile.am

2010-01-04 Thread Anders F. Bj�rklund 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Anders F. Björklund
  Root:   /v/rpm/cvs   Email:  a...@rpm5.org
  Module: rpm  Date:   04-Jan-2010 21:35:14
  Branch: HEAD Handle: 2010010420351400

  Modified files:
rpm/tests   Makefile.am

  Log:
remove makefile bashism by expanding paths

  Summary:
RevisionChanges Path
1.50+5  -5  rpm/tests/Makefile.am
  

  patch -p0 '@@ .'
  Index: rpm/tests/Makefile.am
  
  $ cvs diff -u -r1.49 -r1.50 Makefile.am
  --- rpm/tests/Makefile.am 4 Jan 2010 03:51:38 -   1.49
  +++ rpm/tests/Makefile.am 4 Jan 2010 20:35:14 -   1.50
  @@ -112,13 +112,13 @@
@echo === $@ ===
@mkdir -p tmp/hrmib/ tmp/repackage/
@${rpm} -v --version tmp/version
  - @-diff -u {tmp,ref}/version || cp {tmp,ref}/version
  + @-diff -u tmp/version ref/version || cp tmp/version ref/version
@${rpm} -v --querytags   tmp/querytags
  - @-diff -u {tmp,ref}/querytags || cp {tmp,ref}/querytags
  + @-diff -u tmp/querytags ref/querytags || cp tmp/querytags ref/querytags
@${rpm} -v --showrc | sed -e s,$(abs_top_builddir),..,g  tmp/showrc
  - @-diff -u {tmp,ref}/showrc || cp {tmp,ref}/showrc
  + @-diff -u tmp/showrc ref/showrc || cp tmp/showrc ref/showrc
@${rpmdigest} --alldigests ref/[^C]*  tmp/.alldigests
  - @-diff -u {tmp,ref}/.alldigests || cp {tmp,ref}/.alldigests
  + @-diff -u tmp/.alldigests ref/.alldigests || cp tmp/.alldigests 
ref/.alldigests
@${mtree} -c -p ref | ${mtree} -p ref   # XXX mtime usecs need fixing
   
   POPTURI =http://rpm5.org/files/popt/
  @@ -133,7 +133,7 @@
   check-pubkeys: tpgp $(POPTPKGS)
@echo === $@ ===
@${rm} -rf tmp/rpmdb
  - @${mkdir} -p tmp/rpmdb/{log,tmp}
  + @${mkdir} -p tmp/rpmdb/log tmp/rpmdb/tmp
@${cp} ref/DB_CONFIG tmp/rpmdb
@${rpm} --import tmp/DSA.pubpem
@${rpm} --import tmp/RSA.pubpem
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/tests/ Makefile.am

2010-01-02 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   02-Jan-2010 23:51:30
  Branch: HEAD Handle: 2010010222513000

  Modified files:
rpm/tests   Makefile.am

  Log:
- tests: permit nss crypto (not included w devtool static) test
failures.

  Summary:
RevisionChanges Path
1.47+2  -2  rpm/tests/Makefile.am
  

  patch -p0 '@@ .'
  Index: rpm/tests/Makefile.am
  
  $ cvs diff -u -r1.46 -r1.47 Makefile.am
  --- rpm/tests/Makefile.am 2 Jan 2010 17:07:09 -   1.46
  +++ rpm/tests/Makefile.am 2 Jan 2010 22:51:30 -   1.47
  @@ -108,7 +108,7 @@
@echo -- gcrypt(note: MPI padding is BROKEN atm):
@-${tpgp} --usecrypto gc
@echo -n -- nss:
  - @${tpgp} --usecrypto nss
  + @-${tpgp} --usecrypto nss
@echo -n -- openssl:
@${tpgp} --usecrypto ssl
@${rpm} --import $(top_srcdir)/pubkeys/JBJ-GPG-KEY
  @@ -116,7 +116,7 @@
@diff -u {tmp,ref}/popt.Kv
@${rpm} -Kvv --usecrypto bc $(POPTPKGS)  /dev/null 21
@-${rpm} -Kvv --usecrypto gc $(POPTPKGS)  /dev/null 21
  - @${rpm} -Kvv --usecrypto nss $(POPTPKGS)  /dev/null 21
  + @-${rpm} -Kvv --usecrypto nss $(POPTPKGS)  /dev/null 21
@${rpm} -Kvv --usecrypto ssl $(POPTPKGS)  /dev/null 21
   
   .PHONY:  check-markup
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/tests/ Makefile.am

2010-01-01 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   01-Jan-2010 17:30:36
  Branch: HEAD Handle: 2010010116303500

  Modified files:
rpm/tests   Makefile.am

  Log:
- tests: don't define BUILT_SOURCES with genpgp.h

  Summary:
RevisionChanges Path
1.44+1  -3  rpm/tests/Makefile.am
  

  patch -p0 '@@ .'
  Index: rpm/tests/Makefile.am
  
  $ cvs diff -u -r1.43 -r1.44 Makefile.am
  --- rpm/tests/Makefile.am 31 Dec 2009 18:38:39 -  1.43
  +++ rpm/tests/Makefile.am 1 Jan 2010 16:30:35 -   1.44
  @@ -71,8 +71,6 @@
   genpgp.h: genpgp.sh
-sh ./genpgp.sh  genpgp.h
   
  -BUILT_SOURCES = genpgp.h
  -
   .PHONY:  check-init
   check-init: macros
@echo === $@ ===
  @@ -268,6 +266,6 @@
check-triggers check-tools # check-repo
   
   clean-local:
  - rm -f $(BUILT_SOURCES)
  + rm -f gengpg.h
rm -rf tmp $(BUILD_DIRS)
rm -rf repodata/
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/tests/ Makefile.am

2010-01-01 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   02-Jan-2010 02:20:43
  Branch: HEAD Handle: 2010010201204300

  Modified files:
rpm/tests   Makefile.am

  Log:
- tests: dyslexia.

  Summary:
RevisionChanges Path
1.45+2  -2  rpm/tests/Makefile.am
  

  patch -p0 '@@ .'
  Index: rpm/tests/Makefile.am
  
  $ cvs diff -u -r1.44 -r1.45 Makefile.am
  --- rpm/tests/Makefile.am 1 Jan 2010 16:30:35 -   1.44
  +++ rpm/tests/Makefile.am 2 Jan 2010 01:20:43 -   1.45
  @@ -69,7 +69,7 @@
   tpgp.c: genpgp.h
   
   genpgp.h: genpgp.sh
  - -sh ./genpgp.sh  genpgp.h
  + -sh $  $@
   
   .PHONY:  check-init
   check-init: macros
  @@ -266,6 +266,6 @@
check-triggers check-tools # check-repo
   
   clean-local:
  - rm -f gengpg.h
  + rm -f genpgp.h
rm -rf tmp $(BUILD_DIRS)
rm -rf repodata/
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/tests/ Makefile.am

2009-12-29 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   30-Dec-2009 03:14:49
  Branch: HEAD Handle: 2009123002144800

  Modified files:
rpm/tests   Makefile.am

  Log:
- tests: diddle up some --verify tests.

  Summary:
RevisionChanges Path
1.42+17 -7  rpm/tests/Makefile.am
  

  patch -p0 '@@ .'
  Index: rpm/tests/Makefile.am
  
  $ cvs diff -u -r1.41 -r1.42 Makefile.am
  --- rpm/tests/Makefile.am 28 Dec 2009 16:28:16 -  1.41
  +++ rpm/tests/Makefile.am 30 Dec 2009 02:14:48 -  1.42
  @@ -119,9 +119,9 @@
@${rpm} -U -- edos-test/engine-2-* -turbo
@${rpm} -U -- edos-test/{wheel-3,tyre-1}-*
@${rpm} -F -- edos-test/{door-2,window-1,glass-2}-*
  + @${rpm} --rebuilddb #XXX masks DB_SECONDARY_BAD
@${rpm} -qaT  tmp/edos.qa.2
@diff -u {tmp,ref}/edos.qa.2 || ${cp} {tmp,ref}/edos.qa.2
  - @${rpm} --rebuilddb # XXX masks DB_SECONDARY_BAD issue
@${rpm} -e car engine wheel door tyre window glass
   
   check-install:
  @@ -131,6 +131,8 @@
   
   check-triggers:
@echo === $@ ===
  + @-${rpm} -e --noscripts --notriggers --allmatches '^triggers-.*'  
/dev/null 21
  + @-rm tmp/rpmdb/Triggername  #XXX masks DB_SECONDARY_BAD
@echo -- N:
@${rpm} -U --noparentdirs --nodeps triggers-N/triggers-N*.rpm
@${rpm} -e --noparentdirs --nodeps triggers-N-a triggers-N-b
  @@ -152,6 +154,7 @@
@echo -- DP:
@${rpm} -U --noparentdirs --nodeps triggers-DP/triggers-DP*.rpm
@${rpm} -e --noparentdirs --nodeps triggers-DP-a triggers-DP-b
  + @${rpm} --rebuilddb #XXX masks DB_SECONDARY_BAD
   
   check-query:
@echo === $@ ===
  @@ -186,13 +189,20 @@
   
   check-verify:
@echo === $@ ===
  - @${rpm} --rebuilddb
  -#XXX -${rpm} -V devtool-sanity
  - @${rpm} -e devtool-sanity
  - @${rpm} -V probes
  - @${rpm} -Va  /dev/null
  + @${rpm} -e probes devtool-sanity
  + @${rpm} --rebuilddb #XXX masks DB_SECONDARY_BAD
  + @-${rpm} -U --justdb --nodeps tmp/manifest
  + @-${rpm} -V probes devtool-sanity  /dev/null
  + @-${rpm} -Va  /dev/null
  +#XXX @-${rpm} -Vp tmp/manifest
  + @${rpm} -e --noscripts --notriggers --allmatches '^triggers-.*'
  + @-rm tmp/rpmdb/Triggername  #XXX masks DB_SECONDARY_BAD
  + @${rpm} -e car engine wheel door tyre window glass
  + @${rpm} -e battery bicycle electric-engine gasoline-engine
  + @${rpm} -e solar-collector tire turbo
  + @${rpm} -e --justdb popt
@${rpm} -e probes
  -#XXX -${rpm} -Vp tmp/manifest  /dev/null
  + @${rpm} -e devtool-sanity
   
   check-tools:
@echo === $@ ===
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/tests/ Makefile.am rpm/tests/ref/ .alldigests showrc

2009-12-28 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   28-Dec-2009 17:28:16
  Branch: HEAD Handle: 2009122816281600

  Modified files:
rpm/tests   Makefile.am
rpm/tests/ref   .alldigests showrc

  Log:
anity.

  Summary:
RevisionChanges Path
1.41+1  -1  rpm/tests/Makefile.am
1.27+100 -100   rpm/tests/ref/.alldigests
1.19+2  -2  rpm/tests/ref/showrc
  

  patch -p0 '@@ .'
  Index: rpm/tests/Makefile.am
  
  $ cvs diff -u -r1.40 -r1.41 Makefile.am
  --- rpm/tests/Makefile.am 26 Dec 2009 16:31:48 -  1.40
  +++ rpm/tests/Makefile.am 28 Dec 2009 16:28:16 -  1.41
  @@ -204,7 +204,7 @@
   
   check-local: check-init check-pubkeys check-markup check-macros \
check-build check-install check-query check-verify \
  - check-triggers # check-tools # check-repo
  + check-triggers check-tools # check-repo
   
   clean-local:
rm -rf tmp $(BUILD_DIRS)
  @@ .
  patch -p0 '@@ .'
  Index: rpm/tests/ref/.alldigests
  
  $ cvs diff -u -r1.26 -r1.27 .alldigests
  --- rpm/tests/ref/.alldigests 25 Dec 2009 21:04:09 -  1.26
  +++ rpm/tests/ref/.alldigests 28 Dec 2009 16:28:16 -  1.27
  @@ -1498,106 +1498,106 @@
   crc64:78d006d5ebc0570c  ref/repomd.xml
   adler32:9e112467  ref/repomd.xml
   jlu32:6f662ac3  ref/repomd.xml
  -md2:65dce4bdd88cf183d295850b3f114525  ref/showrc
  -md4:249a8501b7ae8b7635f95720a7803b32  ref/showrc
  -md5:20183adad81037f6034fd4441b551aa0  ref/showrc
  -sha1:b7a19aa03bbd0f2fe99441003a518b651d59b83f  ref/showrc
  -sha224:4b2ad7ea9163274a29e7ce9e0e6b7fa8c7b2cbd9d1ea0d898c54f2b8  ref/showrc
  -sha256:790dac4c76be9ddada0e72200133965837bf423cb8120d1daa5cc6941b8683ca  
ref/showrc
  
-sha384:a1901c56c871e67e7b712123ab411c21400d2d0e77a7a0374d17ed5f26a17bbf027976a685d1e65356e75e178d88bdf7
  ref/showrc
  
-sha512:df74fa00fa3006555cf45f2d55641131be09afa7738ded6331505e1ac95f17215dcfd788c2acf453138898804f36994a792385731174f8071b976998032a0c4e
  ref/showrc
  -skein-224:985f76fc181bdc8be49e3d10e03647c8742cb9f6a36ad3809e593b89  
ref/showrc
  -skein-256:8dc5fcdfa9d322bfdafb55f366e10d2e4d3ead99225648244c966e5993508402  
ref/showrc
  
-skein-384:46db1a66e5fcc2af572cce597f2660cb0351ce2d2d767d80274704362619e8c26ff433e5efa9aefcc2bae6851397664f
  ref/showrc
  
-skein-512:8f95406796329b247448bed4cead14db3d45045bd4a66862027a2baf00f311b2535dfb8c9f79ef32e87087fd57ba52d341d86148b6fe4e55bf7efff714f03ed6
  ref/showrc
  
-skein-1024:efbc66019b6d6e1ef75ad9127d398e5562d0e1b8ad46530e3e2a386fed2bb246a93c4e67c2168fa93dfe37695ef94972eefa63b7ffcc3586278f0de6dd4cc5d7050e1be3efb649956ce18b70acf1e4e289206fc73e400a45e63a87c27a416eb513f13a432d3ac7cc0f828efdb4305d5bf3d6c62613b82b9d2d016fb11f12ce95
  ref/showrc
  -arirang-224:2c965561a69283984962e9a84f6dbdde1f2069be7721feb9ab80af4b  
ref/showrc
  -arirang-256:e6f02540a40cc11b115722c9baf722f2cbe901dc283354bd9a7100a96c0ddcbf 
 ref/showrc
  
-arirang-384:291a844f1ef19f2bd912821f3beb73e93910705586c47f097acb563f0a1528fdc9e99ee332f0e267b8ed6adde444ebe4
  ref/showrc
  
-arirang-512:7b409c2c508d9967e767310e5c977f521c2963cb58b83433a54102d6b7852194d935bc0527d2cf8db8ab35d4c93a92ff6483bdf4ad1b75742cee76cf3025
  ref/showrc
  -blake-224:85ec737bcf6c72a298e02deb4ca0cc7f459b3bf6a9e7fb7d1493445f  
ref/showrc
  -blake-256:e7205e720bde34d230213427266a4ac07d63c21bcb45c63047f8a0489e6bfdc7  
ref/showrc
  
-blake-384:be621eccc54069eb69c9a9bc5c8abd3c9b144e732303fa683e8cde8b4bbd2667d421c35035b175574c4920bdcab6c4fd
  ref/showrc
  
-blake-512:7b722756b1503628ebefc324b33200dde5e28d0b4863e4813218d60c2d16f164dfafbbc7ef1ee58d6e8ec0dadd9d33ecc4f99640f8dc45d92e9fa46912c9f29a
  ref/showrc
  -bmw-224:85402892b2aaec3b51ce5cc3e85fbcb4ba47e709d0079ff1d2b7f0c6  ref/showrc
  -bmw-256:ce17833bf2c1404c1cdc037462c2d72075decaee2328c74657ec5b670864d86b  
ref/showrc
  
-bmw-384:31c4367dc2a82e158983210efe0cd5902977f21d4b65efa5a1285b9019e54a57802dc704e34e6cb5588203fdb412
  ref/showrc
  
-bmw-512:17acb87d5c42060525c85f8e4660f4e002343f0648623baf68cd8ba54a8e57b433fdeb00bbaf01c738bdf75c8b38282c4b6a8c1a5a02f65e3f1d979799ec02b0
  ref/showrc
  -chi-224:306f7e8b6d2a6d45e1bd10043938e4b153b713aab5dbb4d26df18711  ref/showrc
  -chi-256:bc6fa53753cbe45cb93e37dbd2b5d3660abb5c70f73366833291dd10c12922e8  
ref/showrc
  
-chi-384:3c2c99fe52ac507cafd75ff426da842318924b49fc7a0c9a69dafd4eb607fb727ec4264183f89ef08a2d24b266e07277
  ref/showrc

[CVS] RPM: rpm/tests/ Makefile.am

2009-12-26 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   26-Dec-2009 17:31:49
  Branch: HEAD Handle: 2009122616314800

  Modified files:
rpm/tests   Makefile.am

  Log:
- tests: display embedded spewage, disable check-tools.

  Summary:
RevisionChanges Path
1.40+10 -10 rpm/tests/Makefile.am
  

  patch -p0 '@@ .'
  Index: rpm/tests/Makefile.am
  
  $ cvs diff -u -r1.39 -r1.40 Makefile.am
  --- rpm/tests/Makefile.am 26 Dec 2009 02:04:36 -  1.39
  +++ rpm/tests/Makefile.am 26 Dec 2009 16:31:48 -  1.40
  @@ -82,15 +82,15 @@
@${rpm} -D 'foo bar' -E '%dump%trace%foo'  /dev/null 21
@${rpm} -D 'foo %foo' -E '%foo'  /dev/null 21
@${rpm} -D 'foo bing' -D 'foo bang' -D 'foo boom' -E '%...@foo}'  
/dev/null 21
  - @${rpm} -E '%(/bin/echo Hello World!)'  /dev/null 21
  - @${rpm} -E '%{lua:print(Hello World!)}'  /dev/null 21
  - @${rpm} -E '%{js:print(Hello World!)}'  /dev/null 21
  - @-${rpm} -E '%{ruby:print Hello World!}'  /dev/null 21
  - @-${rpm} -E '%{tcl:puts Hello World!}'  /dev/null 21
  - @-${rpm} -E '%{squirrel:print(Hello World!)}'  /dev/null 21
  - @-${rpm} -E '%{perl:print Hello World!}'  /dev/null 21
  - @-${rpm} -E '%{python:print Hello World!}'  /dev/null 21
  - @-${rpm} -E '%{ficl:.( Hello World!) cr}'  /dev/null 21
  + @${rpm}  -E '%(/bin/echo --   sh: Portable Shar!)'
  + @${rpm}  -E '%{lua:print(--  lua: Hard Rocks!)}'
  + @${rpm}  -E '%{js:print(--   js: Use GPSEE!)}'
  + @-${rpm} -E '%{ruby:print -- ruby: Puppet Gems!}'
  + @-${rpm} -E '%{tcl:puts --  tcl: Porticus Ports!}'
  + @-${rpm} -E '%{squirrel:print(-- squirrel: Eat Nuts!)}'
  + @-${rpm} -E '%{perl:print -- perl: Artistic Scribbles!}'
  + @-${rpm} -E '%{python:print --   python: Snake Oil!,}'
  + @-${rpm} -E '%{ficl:.( -- ficl: Das OpenBoot!)}'
   
   %.spec: $(wildcard %-*.src.rpm)
@${rpm2cpio} $(wildcard $*-*.src.rpm) | ${cpio} -i --quiet $@
  @@ -204,7 +204,7 @@
   
   check-local: check-init check-pubkeys check-markup check-macros \
check-build check-install check-query check-verify \
  - check-triggers check-tools # check-repo
  + check-triggers # check-tools # check-repo
   
   clean-local:
rm -rf tmp $(BUILD_DIRS)
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/tests/ Makefile.am rpm/tests/ref/ .alldigests edos.qa.1...

2009-05-29 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   29-May-2009 17:31:16
  Branch: HEAD Handle: 2009052915311500

  Modified files:
rpm/tests   Makefile.am
rpm/tests/ref   .alldigests edos.qa.1 edos.qa.2 manifest querytags
showrc version

  Log:
- tests: rescuscitate.

  Summary:
RevisionChanges Path
1.36+5  -5  rpm/tests/Makefile.am
1.23+95 -95 rpm/tests/ref/.alldigests
1.5 +3  -3  rpm/tests/ref/edos.qa.1
1.3 +2  -2  rpm/tests/ref/edos.qa.2
1.13+8  -8  rpm/tests/ref/manifest
1.4 +12 -0  rpm/tests/ref/querytags
1.15+58 -59 rpm/tests/ref/showrc
1.4 +2  -2  rpm/tests/ref/version
  

  patch -p0 '@@ .'
  Index: rpm/tests/Makefile.am
  
  $ cvs diff -u -r1.35 -r1.36 Makefile.am
  --- rpm/tests/Makefile.am 5 Nov 2008 22:25:28 -   1.35
  +++ rpm/tests/Makefile.am 29 May 2009 15:31:15 -  1.36
  @@ -12,9 +12,9 @@
   rpm2cpio =   $(abs_top_builddir)/tools/rpm2cpio
   rpmcache =   $(abs_top_builddir)/tools/rpmcache --macros $(macros)
   rpmdigest =  $(abs_top_builddir)/tools/rpmdigest
  -rpmmtree =   $(abs_top_builddir)/tools/rpmmtree
  +mtree =  $(abs_top_builddir)/tools/mtree
   rpmrepo =$(abs_top_builddir)/tools/rpmrepo
  -rpmwget =wget
  +rpmwget =$(abs_top_builddir)/tools/wget
   cpio =   cpio
   
   .PHONY:  check-init
  @@ -28,7 +28,7 @@
@-diff -u {tmp,ref}/showrc || cp {tmp,ref}/showrc
@${rpmdigest} --alldigests ref/[^C]*  tmp/.alldigests
@-diff -u {tmp,ref}/.alldigests || cp {tmp,ref}/.alldigests
  - @${rpmmtree} -c -p ref | ${rpmmtree} -p ref
  + @${mtree} -c -p ref | ${mtree} -p ref
   
   POPTURI =http://rpm5.org/files/popt/
   POPTPKGS =   \
  @@ -71,12 +71,12 @@
@${rpm} -i -D '_dbpath $(testdir)/tmp/cachedb' --justdb --nodeps 
edos-test/*.rpm
@mkdir -p tmp/hrmib/ tmp/repackage/
@${rpm} -U -- edos-test/glass-1-*
  - @${rpm} -U -- +car +turbo +engine +wheel +window +door
  + @${rpm} -U -- +car +turbo edos-test/engine-1-* edos-test/wheel-2-* 
+window +door
@${rpm} -qaT  tmp/edos.qa.1
@diff -u {tmp,ref}/edos.qa.1 || cp {tmp,ref}/edos.qa.1
@${rpm} -U -- edos-test/engine-2-* -turbo
@${rpm} -U -- edos-test/{wheel-3,tyre-1}-*
  - @${rpm} -U -- edos-test/{door-2,window-1,glass-2}-*
  + @${rpm} -F -- edos-test/{door-2,window-1,glass-2}-*
@${rpm} -qaT  tmp/edos.qa.2
@diff -u {tmp,ref}/edos.qa.2 || cp {tmp,ref}/edos.qa.2
@${rpm} -e car engine wheel door tyre window glass
  @@ .
  patch -p0 '@@ .'
  Index: rpm/tests/ref/.alldigests
  
  $ cvs diff -u -r1.22 -r1.23 .alldigests
  --- rpm/tests/ref/.alldigests 20 Mar 2009 18:28:36 -  1.22
  +++ rpm/tests/ref/.alldigests 29 May 2009 15:31:15 -  1.23
  @@ -17,44 +17,44 @@
   crc64:e162a09823b73d2c  ref/cAos.i386.manifest
   adler32:bc4e3265  ref/cAos.i386.manifest
   jlu32:15e7c79f  ref/cAos.i386.manifest
  -md2:f30511942f45dd6dd1eb2164a059f89b  ref/edos.qa.1
  -md4:92c8fc36549479694da6f7f973c109aa  ref/edos.qa.1
  -md5:b9ba2a24b40d5057de64402a18bbf400  ref/edos.qa.1
  -sha1:35b82270809a8af63a3747ab5abd96f8b661b271  ref/edos.qa.1
  -sha224:c242bbe8661fd31d9ca1485a35190599ae9e4774daac0c46f8a89f9a  
ref/edos.qa.1
  -sha256:0abfe78e83bc65c134446992988c76f458406fd6bc550f473f2e6df950de8c33  
ref/edos.qa.1
  
-sha384:e3ca00e08c4df075509de4d186c5538745fb37237e4d93973102d6e66066c3dc0eec18864daafc0a875a683074d6b774
  ref/edos.qa.1
  
-sha512:559d64f79cfec1850bc21c4c9f3dc0da1532a6e9b4af158fb1e033afd8d8dac9b7580f52434518a38b6f7d18b7f737a9c3421944be7c70cb448c79129cee470c
  ref/edos.qa.1
  
-salsa10:d8473c19a27a1a683db1b837a891cda9fc4cda2bc583cf93ac817a64a4ee4fa541692a1bbaeeafeb1fc05e3f5a6c6715003b8a7ce9e7a9c10efad4b6451b94f3
  ref/edos.qa.1
  
-salsa20:560a42945c574e76cf6f2f090cc418a9ded1d1b57d45d58dcf8660113067db389e2b63e23f04a2bf7162abf008d7165bd2c577c4e275711fda539dc9212711dc
  ref/edos.qa.1
  -rmd128:f9a81596b44a5ce0b6d35fee7727a3da  ref/edos.qa.1
  -rmd160:de2c96457a02c47c7d3456f9ff91993d04e1d23c  ref/edos.qa.1
  -rmd256:47def147e8299fc9f2101cce69d024d1fcfcc6d65883d20bea0853521e57c8bd  
ref/edos.qa.1
  
-rmd320:d3e75141dcf71945317db38b706c8b3d26bf618cb8c5b515e338c0f95c33ffb607521662fa36582f
  ref/edos.qa.1

[CVS] RPM: rpm/tests/ Makefile.am

2008-07-31 Thread Arkadiusz Miskiewicz 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Arkadiusz Miskiewicz
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   01-Aug-2008 00:36:07
  Branch: HEAD Handle: 2008073122360700

  Modified files:
rpm/tests   Makefile.am

  Log:
Include ref/.alldigests

  Summary:
RevisionChanges Path
1.28+1  -1  rpm/tests/Makefile.am
  

  patch -p0 '@@ .'
  Index: rpm/tests/Makefile.am
  
  $ cvs diff -u -r1.27 -r1.28 Makefile.am
  --- rpm/tests/Makefile.am 30 Jul 2008 12:14:11 -  1.27
  +++ rpm/tests/Makefile.am 31 Jul 2008 22:36:07 -  1.28
  @@ -2,7 +2,7 @@
   
   AUTOMAKE_OPTIONS = 1.4 foreign
   
  -EXTRA_DIST = ref/*
  +EXTRA_DIST = ref/* ref/.alldigests
   SUBDIRS =
   
   macros = $(abs_top_builddir)/macros:$(testdir)/macros
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/tests/ Makefile.am rpm/tests/ref/ .alldigests showrc

2008-07-30 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   30-Jul-2008 14:14:13
  Branch: HEAD Handle: 2008073012141101

  Modified files:
rpm/tests   Makefile.am
rpm/tests/ref   .alldigests showrc

  Log:
- jbj: plateau w-i-p until stdint.h is excised.

  Summary:
RevisionChanges Path
1.27+10 -4  rpm/tests/Makefile.am
1.12+38 -38 rpm/tests/ref/.alldigests
1.6 +47 -0  rpm/tests/ref/showrc
  

  patch -p0 '@@ .'
  Index: rpm/tests/Makefile.am
  
  $ cvs diff -u -r1.26 -r1.27 Makefile.am
  --- rpm/tests/Makefile.am 16 Jun 2008 19:58:51 -  1.26
  +++ rpm/tests/Makefile.am 30 Jul 2008 12:14:11 -  1.27
  @@ -12,6 +12,7 @@
   rpmdigest =  $(abs_top_builddir)/tools/rpmdigest
   rpmmtree =   $(abs_top_builddir)/tools/rpmmtree
   rpmrepo =$(abs_top_builddir)/tools/rpmrepo
  +rpmwget =wget
   cpio =   cpio
   
   .PHONY:  check-init
  @@ -33,7 +34,7 @@
popt-1.14-1.i386.rpm
   
   $(POPTPKGS):
  - -wget $(POPTURI)$@
  + -${rpmwget} $(POPTURI)$@
   
   .PHONY:  check-pubkeys
   check-pubkeys: $(POPTPKGS)
  @@ -98,7 +99,7 @@
${rpm} -U --relocate /tmp/=$(testdir)/tmp/root/ --nodeps 
devtool-sanity/*.rpm
${rpm} -U probes-test/probes-2*.rpm
   
  -check-local: check-init check-pubkeys check-markup check-build check-install
  +check-query:
@${rpm} -qW .  /dev/null 21
[EMAIL PROTECTED] -U --justdb */*.rpm  /dev/null 21
[EMAIL PROTECTED] -Uvh --justdb --nodeps */*.rpm  /dev/null 21
  @@ -135,11 +136,16 @@
@-${rpm} -Vp tmp/manifest  /dev/null
@${rpm} -e probes
@${rpm} -e devtool-sanity
  - @-${rpm} -qp ref/cAos.i386.manifest  /dev/null
  +#@${rpm} -e --justdb `${rpm} -qa` --allmatches
  +
  +check-jbj:
  + @${rpm} -qp ref/cAos.i386.manifest  /dev/null
@-${rpm} -qp $(POPTURI)popt-1.14-1.i386.rpm  /dev/null
@-${rpm} -qW $(POPTURI)  /dev/null 21
@-${rpm} -qW ftp://localhost/pub/i386-linux/RPMS  /dev/null 21
  - @${rpm} -e --justdb `${rpm} -qa` --allmatches
  +
  +check-local: check-init check-pubkeys check-markup \
  + check-build check-install check-query check-jbj
   
   clean-local:
rm -rf tmp $(BUILD_DIRS) $(patsubst %,%.spec,$(BUILD_DIRS))
  @@ .
  patch -p0 '@@ .'
  Index: rpm/tests/ref/.alldigests
  
  $ cvs diff -u -r1.11 -r1.12 .alldigests
  --- rpm/tests/ref/.alldigests 16 Jun 2008 19:58:51 -  1.11
  +++ rpm/tests/ref/.alldigests 30 Jul 2008 12:14:12 -  1.12
  @@ -1,22 +1,22 @@
  -md2:420dd6052f97b71534d8d5154f798995  ref/cAos.i386.manifest
  -md4:f0e4addd20595577c679d6ab0578ca11  ref/cAos.i386.manifest
  -md5:23335894a6967e57816d33cdbbde4a56  ref/cAos.i386.manifest
  -sha1:be72ffb3fc9ddb1d4f821d7ab13a12bc7c8c9664  ref/cAos.i386.manifest
  -sha224:c2e86c0ce10d978e03c59e69d8509681d5321ab693e4ccfbca9d3c33  
ref/cAos.i386.manifest
  -sha256:860beabca94f2a47b078bd1a9b0fea88efab5a69ff77d91c409efcf776be9686  
ref/cAos.i386.manifest
  
-sha384:fc3a595cb1692566a648462ebba0dfbd11d0bdb2fab4a3743971e9a9e3ee1c57dec7273b1e008c2941761d8c330b9e3a
  ref/cAos.i386.manifest
  
-sha512:364ffead173f4e04db51d73c2554f9ab20899562d480fa7029dfe27ecfe6d5fc24f7d7074f67e556a4dffc221bc0a7596da2833c1fbfd1074c0fffb5bd9b82d0
  ref/cAos.i386.manifest
  
-salsa10:06df03b16a8b7fb23a8512f3201086dedff2ffe18e2c39ee88d2279ebf72f2f78e417f47f425e04bc464842b4e001b08894bc2f61f25cc7ecb8897068428a34f
  ref/cAos.i386.manifest
  
-salsa20:0ea3532a4d0a10205a00cbe748427c259c54da83bd53cb5b26ab4c7e3bd9b693de4c2daa123c12f41adcb4cfe5070ca9e554840e1165f15da3062ad41dfd
  ref/cAos.i386.manifest
  -rmd128:63b454d0373c1bb4df60aa05a1c3f52d  ref/cAos.i386.manifest
  -rmd160:76db640680392105f7647ad4e8321a51b2368708  ref/cAos.i386.manifest
  -rmd256:b2dc37cbb99de77ce6e0cec24a38b1d35e76603695b3a065a028aeb8b6137efe  
ref/cAos.i386.manifest
  
-rmd320:babd26dcabf247c71db236ac32d4554324a10ae345cde640dd678422558f095815d43e2f57c8c622
  ref/cAos.i386.manifest
  -tiger:30ba3f691c7d9039c152329a8799d35024986006f58aa6b7  
ref/cAos.i386.manifest
  -crc32:327613f7  ref/cAos.i386.manifest
  -crc64:bb5e0e19532d1a57  ref/cAos.i386.manifest
  -adler32:528a35b9  ref/cAos.i386.manifest
  -jlu32:e997aada  ref/cAos.i386.manifest
  +md2:bc73129d4e085a7fc6855229f6cd6a07  ref/cAos.i386.manifest
  +md4:ee0b08300b409ccf9d9ad2fcbe2bf3df  ref/cAos.i386.manifest
  +md5:c702512431a26602340ccf07f5e114d9

[CVS] RPM: rpm/tests/ Makefile.am edos-test-1-0.src.rpm rpm/tests/ref/...

2008-06-07 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   07-Jun-2008 18:18:28
  Branch: HEAD Handle: 2008060716182700

  Added files:
rpm/tests   edos-test-1-0.src.rpm
rpm/tests/ref   popt.Kv popt.Kv-beecrypt popt.Kv-nss popt.Kv-ssl
  Modified files:
rpm/tests   Makefile.am
rpm/tests/ref   .alldigests filelists.xml manifest other.xml
primary.xml repomd.xml

  Log:
- jbj: wire up edost-test-1-0.src.rpm and add most everywhere.
- jbj: oops add ref/popt.Kv files.

  Summary:
RevisionChanges Path
1.22+3  -3  rpm/tests/Makefile.am
1.1 BLOBrpm/tests/edos-test-1-0.src.rpm
1.5 +95 -95 rpm/tests/ref/.alldigests
1.3 +5  -1  rpm/tests/ref/filelists.xml
1.2 +8  -0  rpm/tests/ref/manifest
1.3 +5  -1  rpm/tests/ref/other.xml
1.2 +8  -0  rpm/tests/ref/popt.Kv
1.2 +8  -0  rpm/tests/ref/popt.Kv-beecrypt
1.2 +8  -0  rpm/tests/ref/popt.Kv-nss
1.2 +8  -0  rpm/tests/ref/popt.Kv-ssl
1.3 +29 -1  rpm/tests/ref/primary.xml
1.3 +9  -9  rpm/tests/ref/repomd.xml
  

  patch -p0 '@@ .'
  Index: rpm/tests/Makefile.am
  
  $ cvs diff -u -r1.21 -r1.22 Makefile.am
  --- rpm/tests/Makefile.am 6 Jun 2008 23:14:57 -   1.21
  +++ rpm/tests/Makefile.am 7 Jun 2008 16:18:27 -   1.22
  @@ -119,9 +119,9 @@
@-${rpm} -Vp tmp/manifest  /dev/null
@${rpm} -e devtool-sanity
@${rpm} -e --justdb `${rpm} -qa` --allmatches
  -#@-${rpm} -qp $(POPTURI)popt-1.14-1.i386.rpm  /dev/null
  -#@-${rpm} -qW $(POPTURI)  /dev/null 21
  -#@-${rpm} -qW ftp://localhost/pub/i386-linux/RPMS  /dev/null 21
  + @-${rpm} -qp $(POPTURI)popt-1.14-1.i386.rpm  /dev/null
  + @-${rpm} -qW $(POPTURI)  /dev/null 21
  + @-${rpm} -qW ftp://localhost/pub/i386-linux/RPMS  /dev/null 21
   
   clean-local:
rm -rf tmp $(BUILD_DIRS) $(patsubst %,%.spec,$(BUILD_DIRS))
  @@ .
  (cd rpm/tests  \
   uudecode '@@ .'  \
   xdelta patch edos-test-1-0.src.rpm.xdelta /dev/null edos-test-1-0.src.rpm  
\
   rm -f edos-test-1-0.src.rpm.xdelta)
  Index: rpm/tests/edos-test-1-0.src.rpm
  
  begin 664 edos-test-1-0.src.rpm.xdelta
  M)5A$6C`P-4(`!$`$`!S:EE;$N.38S,#8N
  M;G5L;'-H:65L82XY-C,P-BYA;[EMAIL PROTECTED],!G8146-$A\
  M8`IN`J;!/[EMAIL PROTECTED]R,SNYL.[.*P:IH)FEXR-/I5):%FJI
  M*/A(Y96E4F6!H=)+'3P\1GJ1F%VS[%U+KS^:[\SWNZ_OWCMW9JZ\?[4U
  M%/O?KEX/M;MO*B`;6^TJM`:[EMAIL PROTECTED]I$W!=LT1Y#OJ$7T5V)
  [EMAIL PROTECTED]R+9/_0:Z`OD_1E3RFQAT.PWKU,K-JIV,1JN@/!'*(.KWVE?5'L4V=
  MLTK?Z/AM670K]N9ULLV0\0ON'81G+_THJ;M[JJ,9%CU_8_V+$G9R#\GT
  M-,I(.TB3-9VRF`C:[EMAIL PROTECTED]F:(/):$HWDVE(C^M)HYRV*M]4UZQ(K,0[31MN
  MK2G(%TC$N9WUQH(!#;)N=[7#PU*6ZKQ2;DI15L2+3P::[?JD?(_`/!
  [EMAIL PROTECTED]:\`CP*^OW2`U\#?Q/P#=!W]_\VZ+.![T\.[EMAIL PROTECTED]@)
  M#WP7^'69E4J(OPE8TDDC^`ZPK@:.`+LMP%'0G]V`/!/@G%^Q/`4!OADX
  M[EMAIL PROTECTED]`#8GP,?FV`UM!?QDX'?RO`X^66=$/^G97S$4[EMAIL 
PROTECTED]@*
  M^$\[EMAIL PROTECTED]XQ`6R?;!ODKY0UBO#@!#P(FY?.5L`4!PP#3PN!C\$X'?
  M@/-`M`IP#O!H;Y4X!#L[/1(PB4$C4H*(I:(1LTUZJ9:(C6!Y3:@Q,+
  M2E:+'I5.E`M%;:EQ,1S-492H7!8H.6]SN#H]\)S?`Z.)=23!?.NK'[
  MB1%%SVB=;O'[EMAIL PROTECTED])T%+2.Z.(QCW;XBS,WC7H*1XY;N
  M#9ZK,QJ,!IPVFQQ$^$P$[2)N6-,*XY3%:$VWPCNH1EEATD+O[EMAIL PROTECTED]
  MV9ZU22]#YE1EQ9%T^HLGG$+O%L]!EF-\WI9BF5L6J-.E6CQS1JPDOA(J7%
  M_E6G.M60:K:35:C63XJ/`1;I5B))=GMBP2:PYV2E]$Z]%1`X?RY%VFN4H
  M.\FB%HIVG'/RJM1N%EZ54G%=K?(]#6C\0D+N(@[EMAIL PROTECTED]]U*2BJ)Q
  M'R2/`$/L$+6AT22A8]JOMLI;@LP;M!)_`^+T%UR]TT+\EU*!C$DD1(LP!?
  MA-\34,[+KP,Q,N`H)\N[5?_,3I(=/0'@B$)DD.!4B`H58V@`IP\N$LQ_
  MI2?W([EMAIL PROTECTED],#.^BH':.=2!9-7C\D`S!0]%_%LJXEXG)=H)CT_%JV6?R2\
  MH)('KT?BX71YKVN8.(];GX-PD64F^2]P6V/SZRX.J8XM%8DDA=PW6RT
  M1]EWU]13B-PUM-A0`KY`)67(AEZBU,ESPX4OAN3HU*//[EMAIL PROTECTED]:K$;
  M=U%^C:3`DJ3]O0_+S7+(^M$GT=TO3W*/4BLU#L,(#\MCSN=9#Y8.KQ6F(F^
  M@/[E/9,SC1I_H/_P4@2_JN1`];[_`T/+0KY2W[\M^Z`==4-V1I;*VZ
  M.;OC+#-GH]F[=6VBL;)89:Z\=L2WO'J-NS;D4V_-[RU6Q*]M3APZX9SY
  MN7-S-[_82?9$?_EB(9RP[VJ62ZFMC?W'\6-M3JZK/;O_BQ'LMO,:QN?^N1
  MK8;;44W=K1]_%7,KD'YJBL6X_:'RG=VY1P\DC=#G=R9^B$$55+7ENYKF+%
  MGOYRKCUV.R,KKQ.ME][V(:F%_+/%I:/[EMAIL PROTECTED];IA5FY-3='H^/[Q
  [EMAIL PROTECTED]/S\KX=3E^-NPY6#9PWZI5)T;:/UJW-L5F/Y87ZM^G;*I]L[AXM
  M[\%EB;I7;T5FROWQXYQOFM/?1FWGR3]NH]`%3RA=[EMAIL PROTECTED];5R