[CVS] RPM: rpm/tests/ arbitrarytag-1.0-1.src.rpm
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: 25-Dec-2010 18:59:55 Branch: HEAD Handle: 2010122517595500 Added files: rpm/tests arbitrarytag-1.0-1.src.rpm Log: - tests: missing dist file. Summary: RevisionChanges Path 1.2 BLOBrpm/tests/arbitrarytag-1.0-1.src.rpm (cd rpm/tests \ uudecode '@@ .' \ xdelta patch arbitrarytag-1.0-1.src.rpm.xdelta /dev/null arbitrarytag-1.0-1.src.rpm \ rm -f arbitrarytag-1.0-1.src.rpm.xdelta) Index: rpm/tests/arbitrarytag-1.0-1.src.rpm begin 664 arbitrarytag-1.0-1.src.rpm.xdelta M)5A$6C`P-4(`!$`$`!S:EE;$N.3(X,C,N M;G5L;'-H:65L82XY,c...@r,RYA;p...@#[9=y?!-5'L'-H4VI8(' M'@O(B(;#DOLN1\W5,VW3-DW;E%(GR229-IF93B9)T]H5Y!%`E8$Y/B`'*N( M*`4$10XY%A%1A)5...@7i1z$4*g9a@06Z;Y+74MS/9S_[QW[V+^?3F7G?W_7 M[[W?YE67?U=#SR/[L2?B^8L_YB']CLAR#Q3X+WA%@;6...@0c2)QDR=Y4` M3@'OOK$V`GSC+X(W#]R3(;=#^vd...@.j)_/z=.[...@_ct$b:-?0XIXR,-Q MR,)9#%S8DQ,CFY`X'A('+/A)`U^;LOLKN?P1T5R`KQ5,W(W:@MM8 M1;*ZK_V70_'N2F3%]'=SA(.MF4Q47?FCLVA5]V%:YRJGW0X-AN%NJT#B5 M2HE,IL)E2JU*I=!J7J%7MQRC0.532E`8L2OIVD'B0HO=/GT4+K]KOS`;I MM7?/`QCNBE@?UQ_7/^_J]^%%(d...@r\ty'HODD:CL3JT07N1@#;/OP(A M]_EV*=Qr...@kp#AODWC]?9L$_D*Y#;(%]%HON8MQ1R1\R?MP+R-:CO M[N\U^?#,6C['\AVH/P'Y+N2+D.]!OAIC'@_OPF9.X/`TB[`SD)\CW( M_)A]`IP?7G)L?A)XD/m#%...@?:C(`^`^C0!T*60!X$[1601\7FZ!K(%Z M(V0M],^G`:9...@9p!_?=#sh3^yr!g06z%g`w]x7sq2b%szsp$\,28?2)'UYE M3)^XO(d...@nv+])VZ%C$/#MD-=8+[vt8?q_dc...@+p!\b'(+9_Y;CJ MIH('XWW'L0$1I?E)F=CUHR+:BE1_.-JYIG)4;RXPY$;5?!O.!`B*3$.+ M+'FH4J004TVDQD=I=Q`Q.AV=%\OK\PD];ZO,4:EV17Fdg...@5'GH62! MG'i...@39ZU-52L;NS2G/\I=DZ73AZGJ[5Y.9$;:5NY21K6;TEA+'+DY_-2( M%95:G0-B0IJ534II*$BJ\P)E$C6EL(:,)2JZV%+K*C/DR74L92NREC%F MNXI1B5.K;DAX]D9NJI1^DTDM(/((?[%1G%F+6X,ZO\=16E]8(NU!\T1 M6W$1;A#LK`:#QL\ZDAOKQ([,3E-)P9HG;EJV6ISHT1EYT\37Y=*%I#8 MK7!4EU0;]4?ZFD',LPN*C53(:C!DV059TSQ\^FDGE.?27KRNPV?4. MB]R0ZRW.M^1EAND@Y0O)C)DC$M5)#$RLE*BV%BMMK(5+^E-,K4.=28:VZ MEF5M4E6166N]3+VW(*\0G-U5G59?EU6GEH3#M6%3-)RM9'O9VQV50XK(1T2 MCYDF[6;DDEUF^@:.C]5K],Y3/(`('RXJ4I*D8URE9IY0*ZUBA3U;8BYU MU101YG*Z5%'+]U`%K:6LM%T/:%QU\NL:JLRG%7NM/HLTG)7=G:1)LEI?S^ M3'N9*EMM9G(4UF*Q254GM]HQO*PD1UNLJRVJ-6%\3U8@'JT.^01?YW4I??7 M#)U=075YFIA4YF36RXJRBVAOQ/5DZX2W7`6%8N]K$97MWX\?SQME!= M+C]::J9\XW^H0P1C'`3+8$R$Q3R(51!I(@1]U-D``A9'/52892ET``1WLL M46`:$$Z]'E1@,:=J)OPX9R1Z[_RX_,M..,G6-1@,V4;Q459Q3KPT-M_9XZ M(JB3(MV$)\...@0i`?%4#_f9*@T/HKB3B^%#A=4]3A411VB\=*XEO#2=55\ M')TP`17CK%/,T'YQ-$*`S]'9\...@72h#q8cx?rgiqe,:-9@'1]T,Y0 M(@#SX[H$WHZHD]!H;VG+H1,T%)2'O`THAF$]PDQ3.+TB8,+G%P9Q+D'0 MW_3YW)(ZXY4BPJ%M6YT9$4L*530$TT3B0K*Z(9...@gwa@*0;5...@mw,00.7 M.FB-?`T,)]F#)W*253NJ113CB?[D)OQJ3I\A!,U4GZ,(,'RAW`?1?MQ MDA6;ZC`_[,#B)=EZ30Q-XM*SE,^...@r6(?$...@gF;HWVL=2FT2ERI6HT MHE3HW!H'`JY4Z%0*MT2!Z9TJN%O/0I@7`W^#;mz...@2)W^CLOFGP$AEH( M$A31.!JL92B:12%[H'L$$5(AIQ1HAD$$V!1;E59U!%D4S'X)@k...@js M#M2-(t...@zo2ce1d-!'XDSF(/P$6Q$!*:Z',?H,:`4#?F9%$7A9(46'?2(T( MF54*M-H%%J51,']...@y_u/:S]!%55H8#;!U8M25+G!D.3`%T2*JX#5'E M(c...@*w?!XJ2=JMA%,DJAf...@v9cmyba*!:J6#]-8ZR74[DP%H-2FL%! M,h...@!=c$Z%N[@cw5...@0##!0*p9SJ)']8`m%...@7%-)%,4DT9TN0 M;HHS%H,H,`...@g`iij+(3UBA0;4*,8BH!'^RB!SV!!,AAAM,8KF*!0TDYLY M`2RB3H!`BOJI?PXS,)'.(`LV(QQH.S54XZF$2H-*K[$BJ0%*N^'@g...@w MQ?BCW?6X-0KO8RS=WA(JTAH2*_RD,%G%9`5:])BFJCRU+[WR`B%/$\A27 m...@388?g=2/9G$I@:TN;T#%+!F8NO.An...@%yz:H3]RZ,GLD3@)$P+63'MC; M`I+P`:]GTL$;1)P'XX%*[P0K$OC23N;(?7OQU@.*D0KQU!,THHU]AX^: MC-\Q`$?)\HK=QA/xpe`4es6...@#c#ae4uw-h6s$/JO/A#(L61P(L[D=% M(A$JC3YET:_*YC]G8?P!=77=1\!XX;!;\^(]?5N*GSJCZ7RV]7H1SD9, M[9O$T=(9[RX4%9S#.$LC_[X(KE0-JIQZMS/QSS8W//W[,_/*7#S[K:Y`T MSAO=-KUU[ZLLLVC(*)Y]=)AO_1+:EJE6Z8.Y=,WSQC^WE_;[:T;EF#[ MAEQBYW_RY1KEF3/ED_97SOKI^^29*Q-%1Q1']_ST];%Q4Y?_L'S7^*\FKQ., msd^...@a;MOQ*5;+,U4K+SENQ)$D6Y;\]#$#^=OF??LF(_UX=?WYE*N`8MW M=H[5K],OV+%;L)[O'_C;I..Y:P]6YN\^;.AF_L*FQLK:KV6MMRE/CZ1: ML\\+=SRRZ=GJ8K?%,E[-Q[7?G2^^K6Y3NVGK^[P+WLEN3548V3.R_?.K:X M9=U.XJ+E\:78JI),]1C]FB[NGZZ.09B^[N7SHE7,5YN\;]*;JMQ*(I1L2 MCA\8F_;FQN31%NVUC8=K1I\SJR^?V/3D9:NEY?LU9U7OMK76J/U-0QNV M?K)B_%3JB5F\^DA^T[-?S34-G#)X$)\RME.V?[FP^D1(C4(4M3YZ]6P M;Y2KZ:G!QZ*NYUAG+7JXKF;Q_HOO6YQ#-?K!VP2;'L:=-'6ZYGYK_?GU: MQ!#,S_]YZ5=MN(m7[8n^0n!skfp^...@kco[_U.5C3K_%RXL9KW\QM.=T M?%[-A5MOY9HFWZO*I[\:^[-V]%GM+..$RKH:T3')RUFM2C$V:54+'3Q1/N1. MWMUQUSMW+GDJ')IKC_%.ZF'@ZUE$YK$OF)\0L*C_2[MZ[.UM*MLX:W M+97SNE*R/#T1TQKSD)(M?6BU;TS;E\.'SK;P1WNG.;_:E'VF9,G;G1H'V MT.534X\RUZ8OU,AFO#`XCE5=VB(NG,GD?[QZ9F?-+FV[[N]D2=/M4=NK4NZ$
[CVS] RPM: rpm/ CHANGES configure.ac
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: 25-Dec-2010 19:01:44 Branch: HEAD Handle: 2010122518013701 Modified files: rpm CHANGES configure.ac Log: - distcheck: make internal neon opt-in, avoid GSS-API wrestling. Summary: RevisionChanges Path 1.3517 +1 -0 rpm/CHANGES 2.474 +1 -1 rpm/configure.ac patch -p0 '@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3516 -r1.3517 CHANGES --- rpm/CHANGES 24 Dec 2010 19:56:05 - 1.3516 +++ rpm/CHANGES 25 Dec 2010 18:01:37 - 1.3517 @@ -1,4 +1,5 @@ 5.3.7 - 5.4a1: +- jbj: distcheck: make internal neon opt-in, avoid GSS-API wrestling. - jbj: verify: fix: NULL fnpyKey caused doubled parentdir/linkto check. - jbj: rpmal: add common exit point to control flow. - jbj: rpmdb: use Depchache store by default again. @@ . patch -p0 '@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.473 -r2.474 configure.ac --- rpm/configure.ac 16 Dec 2010 01:55:42 - 2.473 +++ rpm/configure.ac 25 Dec 2010 18:01:38 - 2.474 @@ -1364,7 +1364,7 @@ RPM_CHECK_LIB( [Neon], [neon], [neon], [ne_session_create], [ne_session.h], -[yes,internal:external:none], [neon:src:src], +[no,internal:external:none], [neon:src:src], [ if test .$RPM_CHECK_LIB_LOCATION = .internal; then AC_DEFINE(HAVE_NEON_NE_GET_RESPONSE_HEADER, 1, [Define to 1 if you have ne_get_response_header() in libneon.]) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac
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: 25-Dec-2010 19:02:28 Branch: rpm-5_4 Handle: 2010122518022601 Modified files: (Branch: rpm-5_4) rpm CHANGES configure.ac Log: - distcheck: make internal neon opt-in, avoid GSS-API wrestling. Summary: RevisionChanges Path 1.3501.2.18 +1 -0 rpm/CHANGES 2.472.2.3 +1 -1 rpm/configure.ac patch -p0 '@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.17 -r1.3501.2.18 CHANGES --- rpm/CHANGES 24 Dec 2010 19:56:50 - 1.3501.2.17 +++ rpm/CHANGES 25 Dec 2010 18:02:26 - 1.3501.2.18 @@ -1,4 +1,5 @@ 5.3.7 - 5.4.0: +- jbj: distcheck: make internal neon opt-in, avoid GSS-API wrestling. - jbj: verify: fix: NULL fnpyKey caused doubled parentdir/linkto check. - jbj: rpmal: add common exit point to control flow. - jbj: rpmdb: use Depchache store by default again. @@ . patch -p0 '@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.2 -r2.472.2.3 configure.ac --- rpm/configure.ac 23 Dec 2010 15:49:06 - 2.472.2.2 +++ rpm/configure.ac 25 Dec 2010 18:02:27 - 2.472.2.3 @@ -1371,7 +1371,7 @@ RPM_CHECK_LIB( [Neon], [neon], [neon], [ne_session_create], [ne_session.h], -[yes,internal:external:none], [neon:src:src], +[no,internal:external:none], [neon:src:src], [ if test .$RPM_CHECK_LIB_LOCATION = .internal; then AC_DEFINE(HAVE_NEON_NE_GET_RESPONSE_HEADER, 1, [Define to 1 if you have ne_get_response_header() in libneon.]) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES rpm/scripts/ Makefile.am rpm/tests/ Makefile.a...
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: 25-Dec-2010 19:07:08 Branch: HEAD Handle: 2010122518070701 Modified files: rpm CHANGES rpm/scripts Makefile.am rpm/tests Makefile.am Log: - distcheck: tests: move target from check to test. - distcheck: no globs, only explict lists, for EXTRA_DIST. Summary: RevisionChanges Path 1.3518 +2 -0 rpm/CHANGES 1.76+6 -3 rpm/scripts/Makefile.am 1.96+32 -5 rpm/tests/Makefile.am patch -p0 '@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3517 -r1.3518 CHANGES --- rpm/CHANGES 25 Dec 2010 18:01:37 - 1.3517 +++ rpm/CHANGES 25 Dec 2010 18:07:07 - 1.3518 @@ -1,4 +1,6 @@ 5.3.7 - 5.4a1: +- jbj: distcheck: tests: move target from check to test. +- jbj: distcheck: no globs, only explict lists, for EXTRA_DIST. - jbj: distcheck: make internal neon opt-in, avoid GSS-API wrestling. - jbj: verify: fix: NULL fnpyKey caused doubled parentdir/linkto check. - jbj: rpmal: add common exit point to control flow. @@ . patch -p0 '@@ .' Index: rpm/scripts/Makefile.am $ cvs diff -u -r1.75 -r1.76 Makefile.am --- rpm/scripts/Makefile.am 1 Dec 2010 16:02:41 - 1.75 +++ rpm/scripts/Makefile.am 25 Dec 2010 18:07:08 - 1.76 @@ -16,8 +16,10 @@ executabledeps.sh \ find-debuginfo.sh find-lang.sh find-prov.pl find-req.pl \ find-provides.ksyms find-requires.ksyms kmodtool \ - cpanflute cpanflute2 Specfile.pm find-provides.perl \ - find-requires.perl freshen.sh gendiff getpo.sh http.req \ + cpanflute cpanflute2 Specfile.pm \ + find-provides.perl find-requires.perl \ + find-provides.php find-requires.php \ + freshen.sh gendiff getpo.sh http.req \ check-java-closure.sh java.prov.sh java.req.sh \ javadeps.sh libtooldeps.sh \ mono-find-provides mono-find-requires \ @@ -36,7 +38,8 @@ xiu_stdenv \ yum_filelists_sqlite yum_other_sqlite yum_primary_sqlite \ yum_filelists_xml yum_other_xml yum_primary_xml \ - find-*.php find-php-* ${HELPERS} + find-php-provides find-php-requires \ + ${HELPERS} all: @@ . patch -p0 '@@ .' Index: rpm/tests/Makefile.am $ cvs diff -u -r1.95 -r1.96 Makefile.am --- rpm/tests/Makefile.am 3 Dec 2010 18:23:19 - 1.95 +++ rpm/tests/Makefile.am 25 Dec 2010 18:07:08 - 1.96 @@ -2,10 +2,35 @@ AUTOMAKE_OPTIONS = 1.4 foreign -# Note: *.src.rpm's cannot be added here because of suffix rules. EXTRA_DIST = \ - genpgp.sh genssl.sh tpgp.c tssl.c ref/[^C]* ref/.alldigests \ - gpsee/*.js spew spew.conf + genpgp.sh \ + genssl.sh \ + gpsee/gffi.js \ + ref/.alldigests \ + ref/DB_CONFIG \ + ref/edos.manifest \ + ref/edos.qa.1 \ + ref/edos.qa.2 \ + ref/filelists.xml \ + ref/hkp \ + ref/manifest \ + ref/other.xml \ + ref/popt.Kv \ + ref/popt.Kv-beecrypt \ + ref/popt.Kv-nss \ + ref/popt.Kv-ssl \ + ref/popt.xml \ + ref/popt.yaml \ + ref/primary.xml \ + ref/querytags \ + ref/repomd.xml \ + ref/rpmdb.sql \ + ref/showrc \ + ref/sqldb-basic.out \ + ref/sqldb-basic.sql \ + ref/version \ + spew spew.conf \ + tpgp.c tssl.c EXTRA_PROGRAMS = tecdsa thkp tkey tpgp trsa tssl @@ -592,7 +617,7 @@ @echo `${now}` == $...@d}: Exporting ... | tee -a $...@d}/export for F in $/*.rpm; do \ echo -- $$F; \ - ${rpm} -qp --nosignature --json $$F | tee -a $@ | ${mongo} ${mongoserver}/$...@d}; \ + ${rpm} -qp --nosignature --json $$F | tee -a $@ | ${mongo} ${mongoserver}/$...@d} /dev/null; \ done @echo `${now}` == $...@d}: Exported. | tee -a $...@d}/export @@ -851,11 +876,13 @@ ;; \ esac -check-local: check-init check-pubkeys check-markup check-macros \ +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-local: check-init
[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/scripts/ Makefile.am rpm/tests/ M...
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: 25-Dec-2010 19:09:03 Branch: rpm-5_4 Handle: 2010122518090201 Modified files: (Branch: rpm-5_4) rpm CHANGES rpm/scripts Makefile.am rpm/tests Makefile.am Log: - distcheck: tests: move target from check to test. - distcheck: no globs, only explict lists, for EXTRA_DIST. Summary: RevisionChanges Path 1.3501.2.19 +2 -0 rpm/CHANGES 1.75.2.1+6 -3 rpm/scripts/Makefile.am 1.95.2.1+33 -6 rpm/tests/Makefile.am patch -p0 '@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.18 -r1.3501.2.19 CHANGES --- rpm/CHANGES 25 Dec 2010 18:02:26 - 1.3501.2.18 +++ rpm/CHANGES 25 Dec 2010 18:09:02 - 1.3501.2.19 @@ -1,4 +1,6 @@ 5.3.7 - 5.4.0: +- jbj: distcheck: tests: move target from check to test. +- jbj: distcheck: no globs, only explict lists, for EXTRA_DIST. - jbj: distcheck: make internal neon opt-in, avoid GSS-API wrestling. - jbj: verify: fix: NULL fnpyKey caused doubled parentdir/linkto check. - jbj: rpmal: add common exit point to control flow. @@ . patch -p0 '@@ .' Index: rpm/scripts/Makefile.am $ cvs diff -u -r1.75 -r1.75.2.1 Makefile.am --- rpm/scripts/Makefile.am 1 Dec 2010 16:02:41 - 1.75 +++ rpm/scripts/Makefile.am 25 Dec 2010 18:09:02 - 1.75.2.1 @@ -16,8 +16,10 @@ executabledeps.sh \ find-debuginfo.sh find-lang.sh find-prov.pl find-req.pl \ find-provides.ksyms find-requires.ksyms kmodtool \ - cpanflute cpanflute2 Specfile.pm find-provides.perl \ - find-requires.perl freshen.sh gendiff getpo.sh http.req \ + cpanflute cpanflute2 Specfile.pm \ + find-provides.perl find-requires.perl \ + find-provides.php find-requires.php \ + freshen.sh gendiff getpo.sh http.req \ check-java-closure.sh java.prov.sh java.req.sh \ javadeps.sh libtooldeps.sh \ mono-find-provides mono-find-requires \ @@ -36,7 +38,8 @@ xiu_stdenv \ yum_filelists_sqlite yum_other_sqlite yum_primary_sqlite \ yum_filelists_xml yum_other_xml yum_primary_xml \ - find-*.php find-php-* ${HELPERS} + find-php-provides find-php-requires \ + ${HELPERS} all: @@ . patch -p0 '@@ .' Index: rpm/tests/Makefile.am $ cvs diff -u -r1.95 -r1.95.2.1 Makefile.am --- rpm/tests/Makefile.am 3 Dec 2010 18:23:19 - 1.95 +++ rpm/tests/Makefile.am 25 Dec 2010 18:09:03 - 1.95.2.1 @@ -2,10 +2,35 @@ AUTOMAKE_OPTIONS = 1.4 foreign -# Note: *.src.rpm's cannot be added here because of suffix rules. EXTRA_DIST = \ - genpgp.sh genssl.sh tpgp.c tssl.c ref/[^C]* ref/.alldigests \ - gpsee/*.js spew spew.conf + genpgp.sh \ + genssl.sh \ + gpsee/gffi.js \ + ref/.alldigests \ + ref/DB_CONFIG \ + ref/edos.manifest \ + ref/edos.qa.1 \ + ref/edos.qa.2 \ + ref/filelists.xml \ + ref/hkp \ + ref/manifest \ + ref/other.xml \ + ref/popt.Kv \ + ref/popt.Kv-beecrypt \ + ref/popt.Kv-nss \ + ref/popt.Kv-ssl \ + ref/popt.xml \ + ref/popt.yaml \ + ref/primary.xml \ + ref/querytags \ + ref/repomd.xml \ + ref/rpmdb.sql \ + ref/showrc \ + ref/sqldb-basic.out \ + ref/sqldb-basic.sql \ + ref/version \ + spew spew.conf \ + tpgp.c tssl.c EXTRA_PROGRAMS = tecdsa thkp tkey tpgp trsa tssl @@ -592,7 +617,7 @@ @echo `${now}` == $...@d}: Exporting ... | tee -a $...@d}/export for F in $/*.rpm; do \ echo -- $$F; \ - ${rpm} -qp --nosignature --json $$F | tee -a $@ | ${mongo} ${mongoserver}/$...@d}; \ + ${rpm} -qp --nosignature --json $$F | tee -a $@ | ${mongo} ${mongoserver}/$...@d} /dev/null; \ done @echo `${now}` == $...@d}: Exported. | tee -a $...@d}/export @@ -676,7 +701,7 @@ -sudo umount $(D)/ROOT/proc @echo `$(now)` == ${D}: Installed. | tee -a $(D)/install @-./spew ${D} ${D}/install.mongo - @-${mongo} ${mongoserver} ${D}/install.mongo +#@-${mongo} ${mongoserver} ${D}/install.mongo Verify-%: %/solve @echo === $@ === @@
[CVS] RPM: rpm/ CHANGES rpm/macros/ macros.in
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: 25-Dec-2010 20:10:31 Branch: HEAD Handle: 2010122519103001 Modified files: rpm CHANGES rpm/macros macros.in Log: - rpmdb: disable Depcache, --install and make test todo++. Summary: RevisionChanges Path 1.3519 +1 -0 rpm/CHANGES 1.42+2 -2 rpm/macros/macros.in patch -p0 '@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3518 -r1.3519 CHANGES --- rpm/CHANGES 25 Dec 2010 18:07:07 - 1.3518 +++ rpm/CHANGES 25 Dec 2010 19:10:30 - 1.3519 @@ -1,4 +1,5 @@ 5.3.7 - 5.4a1: +- jbj: rpmdb: disable Depcache, --install and make test todo++. - jbj: distcheck: tests: move target from check to test. - jbj: distcheck: no globs, only explict lists, for EXTRA_DIST. - jbj: distcheck: make internal neon opt-in, avoid GSS-API wrestling. @@ . patch -p0 '@@ .' Index: rpm/macros/macros.in $ cvs diff -u -r1.41 -r1.42 macros.in --- rpm/macros/macros.in 24 Dec 2010 17:31:41 - 1.41 +++ rpm/macros/macros.in 25 Dec 2010 19:10:31 - 1.42 @@ -1,7 +1,7 @@ #/*! \page config_macros Default configuration: @USRLIBRPM@/macros # \verbatim # -# $Id: macros.in,v 1.41 2010/12/24 17:31:41 jbj Exp $ +# $Id: macros.in,v 1.42 2010/12/25 19:10:31 jbj Exp $ # # This is a global RPM configuration file. All changes made here will # be lost when the rpm package is upgraded. Any per-system configuration @@ -334,7 +334,7 @@ %_bt_dupsortbt_dupsort primary=Packages %_h_dupsort h_dupsort primary=Packages -%_dbi_tags_3 Packages:Depcache:Name:Version:Release:Arch:Os:Basenames:Group:Providename:Requirename:Conflictname:Obsoletename:Triggername:Dirnames:Installtid:Sigmd5:Sha1header:Filedigests:Pubkeys:Packagecolor:Nvra:Sourcepkgid:Filepaths:Seqno:Btree:Hash:Queue:Recno +%_dbi_tags_3 Packages:Name:Version:Release:Arch:Os:Basenames:Group:Providename:Requirename:Conflictname:Obsoletename:Triggername:Dirnames:Installtid:Sigmd5:Sha1header:Filedigests:Pubkeys:Packagecolor:Nvra:Sourcepkgid:Filepaths:Seqno:Btree:Hash:Queue:Recno %_dbi_tags_4 Packages:Name:Version:Release:Arch:Os:Basenames:Group:Providename:Requirename:Conflictname:Obsoletename:Triggername:Dirnames:Installtid:Sigmd5:Sha1header:Filedigests:Pubkeys:Packagecolor:Nvra:Sourcepkgid:Filepaths @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/macros/ macros.in
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: 25-Dec-2010 20:11:06 Branch: rpm-5_4 Handle: 2010122519110501 Modified files: (Branch: rpm-5_4) rpm CHANGES rpm/macros macros.in Log: - rpmdb: disable Depcache, --install and make test todo++. Summary: RevisionChanges Path 1.3501.2.20 +1 -0 rpm/CHANGES 1.39.2.3+2 -2 rpm/macros/macros.in patch -p0 '@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.19 -r1.3501.2.20 CHANGES --- rpm/CHANGES 25 Dec 2010 18:09:02 - 1.3501.2.19 +++ rpm/CHANGES 25 Dec 2010 19:11:05 - 1.3501.2.20 @@ -1,4 +1,5 @@ 5.3.7 - 5.4.0: +- jbj: rpmdb: disable Depcache, --install and make test todo++. - jbj: distcheck: tests: move target from check to test. - jbj: distcheck: no globs, only explict lists, for EXTRA_DIST. - jbj: distcheck: make internal neon opt-in, avoid GSS-API wrestling. @@ . patch -p0 '@@ .' Index: rpm/macros/macros.in $ cvs diff -u -r1.39.2.2 -r1.39.2.3 macros.in --- rpm/macros/macros.in 24 Dec 2010 17:32:33 - 1.39.2.2 +++ rpm/macros/macros.in 25 Dec 2010 19:11:06 - 1.39.2.3 @@ -1,7 +1,7 @@ #/*! \page config_macros Default configuration: @USRLIBRPM@/macros # \verbatim # -# $Id: macros.in,v 1.39.2.2 2010/12/24 17:32:33 jbj Exp $ +# $Id: macros.in,v 1.39.2.3 2010/12/25 19:11:06 jbj Exp $ # # This is a global RPM configuration file. All changes made here will # be lost when the rpm package is upgraded. Any per-system configuration @@ -334,7 +334,7 @@ %_bt_dupsortbt_dupsort primary=Packages %_h_dupsort h_dupsort primary=Packages -%_dbi_tags_3 Packages:Depcache:Name:Version:Release:Arch:Os:Basenames:Group:Providename:Requirename:Conflictname:Obsoletename:Triggername:Dirnames:Installtid:Sigmd5:Sha1header:Filedigests:Pubkeys:Packagecolor:Nvra:Sourcepkgid:Filepaths:Seqno:Btree:Hash:Queue:Recno +%_dbi_tags_3 Packages:Name:Version:Release:Arch:Os:Basenames:Group:Providename:Requirename:Conflictname:Obsoletename:Triggername:Dirnames:Installtid:Sigmd5:Sha1header:Filedigests:Pubkeys:Packagecolor:Nvra:Sourcepkgid:Filepaths:Seqno:Btree:Hash:Queue:Recno %_dbi_tags_4 Packages:Name:Version:Release:Arch:Os:Basenames:Group:Providename:Requirename:Conflictname:Obsoletename:Triggername:Dirnames:Installtid:Sigmd5:Sha1header:Filedigests:Pubkeys:Packagecolor:Nvra:Sourcepkgid:Filepaths @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES rpm/lib/ rpmrc.c rpm/rpmio/ librpmio.vers look...
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-Dec-2010 21:39:05 Branch: HEAD Handle: 2010122520390302 Modified files: rpm CHANGES rpm/lib rpmrc.c rpm/rpmio librpmio.vers lookup3.c rpmio.c Log: lookup3: fix valgrind #ifdef and perform runtime check for valgrind in stead. Summary: RevisionChanges Path 1.3521 +2 -0 rpm/CHANGES 2.290 +4 -0 rpm/lib/rpmrc.c 2.200 +1 -0 rpm/rpmio/librpmio.vers 1.7 +72 -62 rpm/rpmio/lookup3.c 1.231 +4 -0 rpm/rpmio/rpmio.c patch -p0 '@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3520 -r1.3521 CHANGES --- rpm/CHANGES 25 Dec 2010 19:31:46 - 1.3520 +++ rpm/CHANGES 25 Dec 2010 20:39:03 - 1.3521 @@ -1,4 +1,6 @@ 5.3.7 - 5.4a1: +- proyvind: lookup3: fix valgrind #ifdef and perform runtime check for + valgrind in stead. - jbj: ISPRAS: upgrade to abi-compliance-checker-1.21.9. - jbj: ISPRAS: upgrade to api-sanity-autotest-1.11. - jbj: rpmdb: disable Depcache, --install and make test todo++. @@ . patch -p0 '@@ .' Index: rpm/lib/rpmrc.c $ cvs diff -u -r2.289 -r2.290 rpmrc.c --- rpm/lib/rpmrc.c 10 Dec 2009 18:52:18 - 2.289 +++ rpm/lib/rpmrc.c 25 Dec 2010 20:39:05 - 2.290 @@ -1070,6 +1070,10 @@ { int rc = 0; +#ifdef WITH_VALGRIND +_running_on_valgrind = RUNNING_ON_VALGRIND; +#endif + if (!defaultsInitialized) { setDefaults(); defaultsInitialized = 1; @@ . patch -p0 '@@ .' Index: rpm/rpmio/librpmio.vers $ cvs diff -u -r2.199 -r2.200 librpmio.vers --- rpm/rpmio/librpmio.vers 11 Oct 2010 18:39:37 - 2.199 +++ rpm/rpmio/librpmio.vers 25 Dec 2010 20:39:04 - 2.200 @@ -881,6 +881,7 @@ mongo_simple_int_command; mongo_simple_str_command; mongo_update; +_running_on_valgrind; local: *; }; @@ . patch -p0 '@@ .' Index: rpm/rpmio/lookup3.c $ cvs diff -u -r1.6 -r1.7 lookup3.c --- rpm/rpmio/lookup3.c 25 Dec 2008 18:36:36 - 1.6 +++ rpm/rpmio/lookup3.c 25 Dec 2010 20:39:04 - 1.7 @@ -255,7 +255,7 @@ u.ptr = key; if (HASH_LITTLE_ENDIAN ((u.i 0x3) == 0)) { const rpmuint32_t *k = (const rpmuint32_t *)key;/* read 32-bit chunks */ -#ifdef VALGRIND +#ifdef WITH_VALGRIND const rpmuint8_t *k8; #endif @@ -279,29 +279,13 @@ * still catch it and complain. The masking trick does make the hash * noticably faster for short strings (like English words). */ -#ifndef VALGRIND - - switch (size) { - case 12:c += k[2]; b+=k[1]; a+=k[0]; break; - case 11:c += k[2]0xff; b+=k[1]; a+=k[0]; break; - case 10:c += k[2]0x; b+=k[1]; a+=k[0]; break; - case 9:c += k[2]0xff; b+=k[1]; a+=k[0]; break; - case 8:b += k[1]; a+=k[0]; break; - case 7:b += k[1]0xff; a+=k[0]; break; - case 6:b += k[1]0x; a+=k[0]; break; - case 5:b += k[1]0xff; a+=k[0]; break; - case 4:a += k[0]; break; - case 3:a += k[0]0xff; break; - case 2:a += k[0]0x; break; - case 1:a += k[0]0xff; break; - case 0:goto exit; - } - -#else /* make valgrind happy */ +#ifdef WITH_VALGRIND + if(UNLIKELY(_running_on_valgrind)) { + /* make valgrind happy */ k8 = (const rpmuint8_t *)k; switch (size) { - case 12:c += k[2]; b+=k[1]; a+=k[0] break; + case 12:c += k[2]; b+=k[1]; a+=k[0];break; case 11:c += ((rpmuint32_t)k8[10])16; /*...@fallthrough@*/ case 10:c += ((rpmuint32_t)k8[9])8; /*...@fallthrough@*/ case 9:c += k8[8]; /*...@fallthrough@*/ @@ -316,6 +300,25 @@ case 0:goto exit; } + } else { +#endif + switch (size) { + case 12:c += k[2]; b+=k[1]; a+=k[0]; break; + case 11:c += k[2]0xff; b+=k[1]; a+=k[0];