RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: [email protected] Module: xar rpm pcre Date: 27-Apr-2010 21:45:50 Branch: rpm-5_1 Handle: 2008052414164360758946 Modified files: (Branch: rpm-5_1) rpm CHANGES configure.ac devtool.conf rpm/python Makefile.am rpm/tests Makefile.am rpm/tests/ref .alldigests edos.qa.1 edos.qa.2 querytags showrc Removed files: (Branch: rpm-5_1) pcre config.h.in install-sh xar/include config.h.in Log: - tests: "make check" for RHEL6 beta passes. - rescusitate existing "make check" reference points. Summary: Revision Changes Path 1.6 +0 -242 pcre/config.h.in 1.2 +0 -519 pcre/install-sh 1.2288.2.306+2 -0 rpm/CHANGES 2.289.2.23 +12 -0 rpm/configure.ac 2.205.2.40 +5 -3 rpm/devtool.conf 1.78.2.5 +1 -0 rpm/python/Makefile.am 1.9.4.13 +13 -5 rpm/tests/Makefile.am 1.1.2.12 +76 -76 rpm/tests/ref/.alldigests 1.1.2.5 +3 -3 rpm/tests/ref/edos.qa.1 1.1.2.5 +2 -2 rpm/tests/ref/edos.qa.2 1.1.2.5 +11 -0 rpm/tests/ref/querytags 1.1.2.9 +37 -23 rpm/tests/ref/showrc 1.7 +0 -199 xar/include/config.h.in ____________________________________________________________________________ rm -f pcre/config.h.in <<'@@ .' Index: pcre/config.h.in ============================================================================ [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . rm -f pcre/install-sh <<'@@ .' Index: pcre/install-sh ============================================================================ [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . patch -p0 <<'@@ .' Index: rpm/CHANGES ============================================================================ $ cvs diff -u -r1.2288.2.305 -r1.2288.2.306 CHANGES --- rpm/CHANGES 25 Jun 2009 12:41:16 -0000 1.2288.2.305 +++ rpm/CHANGES 27 Apr 2010 19:45:47 -0000 1.2288.2.306 @@ -1,4 +1,6 @@ 5.1.9 -> 5.1.10: + - jbj: tests: "make check" for RHEL6 beta passes. + - jbj: rescusitate existing "make check" reference points. - jbj: selinux: fix: disabler bit toggle sense was inverted. - jbj: change default dep whiteout to ensure filessystem before setup. - jbj: reserve ~1K in RPMSIGTAG_PADDING for now. @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac ============================================================================ $ cvs diff -u -r2.289.2.22 -r2.289.2.23 configure.ac --- rpm/configure.ac 13 Apr 2009 15:19:05 -0000 2.289.2.22 +++ rpm/configure.ac 27 Apr 2010 19:45:47 -0000 2.289.2.23 @@ -1194,6 +1194,18 @@ fi ], []) +dnl # FIXME: AutoFu tests for <sys/acl.h> and -lacl are needed w/o --with-xar +RPM_CHECK_LIB( + [ATTR], [attr], + [attr], [attr_get], [sys/xattr.h], + [no,external:none], [], + [], []) +RPM_CHECK_LIB( + [ACL], [acl], + [acl], [acl_free], [sys/acl.h], + [no,external:none], [], + [], []) + dnl # XAR RPM_CHECK_LIB( [XAR], [xar], @@ . patch -p0 <<'@@ .' Index: rpm/devtool.conf ============================================================================ $ cvs diff -u -r2.205.2.39 -r2.205.2.40 devtool.conf --- rpm/devtool.conf 13 Apr 2009 16:06:25 -0000 2.205.2.39 +++ rpm/devtool.conf 27 Apr 2010 19:45:47 -0000 2.205.2.40 @@ -14,7 +14,7 @@ %checkout for name in $MODULE_NAMES "$@"; do - release=MODULE_TAG_`echo ${name} | tr '[a-z]' '[A-Z]'` + release=MODULE_TAG_`echo ${name} | tr '[a-z/]' '[A-Z_]'` release=`eval echo \\$${release}` if [ ".${release}" = . ]; then if [ -d ${DEVTOOL_SRCDIR}/${name}/CVS ]; then @@ -84,13 +84,15 @@ --with-gcrypt=external \ --with-neon=external \ --with-pcre=internal \ - --with-uuid=external \ + --without-uuid \ + --with-attr \ + --with-acl \ --with-xar=internal \ --with-popt=external \ --with-keyutils=external \ --with-pthreads \ --with-libelf \ - --with-selinux \ + --without-selinux \ --with-python \ --with-perl \ --with-build-extlibdep \ @@ . patch -p0 <<'@@ .' Index: rpm/python/Makefile.am ============================================================================ $ cvs diff -u -r1.78.2.4 -r1.78.2.5 Makefile.am --- rpm/python/Makefile.am 21 Aug 2008 02:24:45 -0000 1.78.2.4 +++ rpm/python/Makefile.am 27 Apr 2010 19:45:48 -0000 1.78.2.5 @@ -19,6 +19,7 @@ @WITH_LUA_CPPFLAGS@ \ @WITH_FILE_CPPFLAGS@ \ @WITH_XAR_CPPFLAGS@ \ + @WITH_PCRE_CPPFLAGS@ \ -...@with_python_incdir@ noinst_HEADERS = header-py.h \ @@ . patch -p0 <<'@@ .' Index: rpm/tests/Makefile.am ============================================================================ $ cvs diff -u -r1.9.4.12 -r1.9.4.13 Makefile.am --- rpm/tests/Makefile.am 2 Nov 2008 02:31:41 -0000 1.9.4.12 +++ rpm/tests/Makefile.am 27 Apr 2010 19:45:49 -0000 1.9.4.13 @@ -19,6 +19,7 @@ .PHONY: check-init check-init: macros + @echo "=== $@ ===" @mkdir -p tmp/hrmib/ tmp/repackage/ @${rpm} -v --version > tmp/version @diff -u {tmp,ref}/version @@ -40,6 +41,7 @@ .PHONY: check-pubkeys check-pubkeys: $(POPTPKGS) + @echo "=== $@ ===" @rm -rf tmp/rpmdb @${rpm} --import $(top_srcdir)/pubkeys/JBJ-GPG-KEY # -...@${rpm} -Kv --usecrypto gcrypt $(POPTPKGS) > tmp/popt.Kv-gcrypt @@ -51,6 +53,7 @@ .PHONY: check-markup check-markup: $(POPTPKGS) + @echo "=== $@ ===" @${rpm} -qp --nosignature --qf '[%{*:yaml}\n]' popt*.rpm > tmp/popt.yaml @diff -u {tmp,ref}/popt.yaml @${rpm} -qp --nosignature --qf '[%{*:xml}\n]' popt*.rpm > tmp/popt.xml @@ -77,10 +80,12 @@ BUILD_DIRS = $(shell ${rpm} -qp --qf '%{NAME} ' --nosignature $(wildcard *.src.rpm)) $(BUILD_DIRS): $(wildcard %-*.src.rpm) + @echo "=== build $@ ===" ${rpm} -i --nosignature --nodeps $...@-*.src.rpm (cd $@ && ${rpm} -q --specfile [email protected] && ${rpm} -q --specsrpm [email protected] && ${rpm} -q --specfile --specedit [email protected] && ${rpm} -bb --nodeps [email protected]) > /dev/null check-build: $(BUILD_DIRS) + @echo "=== $@ ===" @ls -1 */*.rpm > tmp/manifest @diff -u {tmp,ref}/manifest @rm -rf tmp/cachedb @@ -98,10 +103,12 @@ @${rpm} -e car engine wheel door tyre window glass check-install: + @echo "=== $@ ===" ${rpm} -U --relocate /tmp/=$(testdir)/tmp/root/ --nodeps devtool-sanity/*.rpm ${rpm} -U probes-test/probes-2*.rpm check-triggers: + @echo "=== $@ ===" -${rpm} -Uv --noparentdirs --nodeps triggers-N/triggers-N*.rpm ${rpm} -ev --noparentdirs --nodeps triggers-N-a triggers-N-b -${rpm} -Uv --noparentdirs --nodeps triggers-P/triggers-P*.rpm @@ -120,6 +127,7 @@ ${rpm} -ev --noparentdirs --nodeps triggers-NA-a triggers-NA-b check-query: + @echo "=== $@ ===" @${rpm} -qW . > /dev/null 2>&1 -...@${rpm} -U --justdb */*.rpm > /dev/null 2>&1 -...@${rpm} -Uvh --justdb --nodeps */*.rpm > /dev/null 2>&1 @@ -135,9 +143,9 @@ @${rpm} -qal > /dev/null @${rpm} -qalv > /dev/null @${rpm} -qa --qf '%{INSTALLTIME} %{INSTALLTIME:date} %{INSTALLTIME:day} %{INSTALLTIME:dec} %{INSTALLTIME:hex} %{INSTALLTIME:oct}\n' > /dev/null - @${rpm} -qa --qf '%{INSTALLTIDUUID} %{INSTALLTIMEUUID} %{ORIGINTIDUUID} %{ORIGINTIMEUUID} %{BUILDTIMEUUID}\n' > /dev/null + @-${rpm} -qa --qf '%{INSTALLTIDUUID} %{INSTALLTIMEUUID} %{ORIGINTIDUUID} %{ORIGINTIMEUUID} %{BUILDTIMEUUID}\n' > /dev/null @${rpm} -qa --qf '%{DBINSTANCE} %{HDRID} %{PKGID} %{SOURCEPKGID}\n' > /dev/null - @${rpm} -qa --qf '%{HDRUUID} %{PKGUUID} %{SOURCEPKGUUID}\n' > /dev/null + @-${rpm} -qa --qf '%{HDRUUID} %{PKGUUID} %{SOURCEPKGUUID}\n' > /dev/null @${rpm} -qa --qf '%{PACKAGESIZE:rpn(511,+,512,/)}\n' > /dev/null @${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 @@ -153,10 +161,10 @@ # assertion failure # @${rpm} -qa --qf '[%{SUGGESTS}\n]' > /dev/null @${rpm} --rebuilddb - @-${rpm} -Va > /dev/null - @-${rpm} -Vp tmp/manifest > /dev/null + -...@${rpm} -Va > /dev/null + -...@${rpm} -Vp tmp/manifest > /dev/null @${rpm} -e probes - @${rpm} -e devtool-sanity + -...@${rpm} -e devtool-sanity # @${rpm} -e --justdb `${rpm} -qa` --allmatches check-jbj: @@ . patch -p0 <<'@@ .' Index: rpm/tests/ref/.alldigests ============================================================================ $ cvs diff -u -r1.1.2.11 -r1.1.2.12 .alldigests --- rpm/tests/ref/.alldigests 11 Jan 2009 20:53:37 -0000 1.1.2.11 +++ rpm/tests/ref/.alldigests 27 Apr 2010 19:45:49 -0000 1.1.2.12 @@ -17,44 +17,44 @@ crc64:e162a09823b73d2c ref/cAos.i386.manifest adler32:bc4e3265 ref/cAos.i386.manifest jlu32:15e7c79f ref/cAos.i386.manifest -md2:b0b1b416afcb82e89daffff15a512825 ref/edos.qa.1 -md4:8196ce53317576f229914b261ec95a8c ref/edos.qa.1 -md5:cb70eab26c69ea25deda7d8cd9d85ece ref/edos.qa.1 -sha1:72ca2ee39b845deedfc546d906614605f0d3e260 ref/edos.qa.1 -sha224:f2277a52570e223a142e6462575bb326895843d9244789c7c68b98cc ref/edos.qa.1 -sha256:4ea80de557127d5ffe5ab7d43bfef5b1f5b73635e412e5b03c5b9b91360fe0f6 ref/edos.qa.1 -sha384:97bd15ab54aa81dc4895c3906eaa801c52dec13ec9086a976a4b590fec3a134cc9ba04c377a47e48fa3dfcc74e8963d1 ref/edos.qa.1 -sha512:da5c8fea98ddff76f77e803f27589d92c4a07eee26960982e0673ff20edc605ce0008de9f3a5fa4d1f72f5ffe5545f37c9794c7de088acb3438ebf2585c73442 ref/edos.qa.1 -salsa10:77e583fbaf4563d272bcc953e715971227503b28b1980d68749ed3d2e24deb4005342daf6ffe986d40c627f9ec55fa1eec39e179cfd5e25c9a11e4f827befb85 ref/edos.qa.1 -salsa20:7d89818c622ab4d51eb17a5eb8467c985411923ad92717d8b1bc766613b06b08560485d76745c0021145bde8430495f6fd89811bbeee215762d2ee37df70d7ff ref/edos.qa.1 -rmd128:89658d4aad93df4cb01813493a620c39 ref/edos.qa.1 -rmd160:c78a043addf83f18138e315b22ac5f03a7d8a4d2 ref/edos.qa.1 -rmd256:44c6f98a77983ef6e5b59b04313c074016d13ad42e7c8638303bb19018e6938d ref/edos.qa.1 -rmd320:d2e26913b9351c6460a7b0050098940df32abfbc4933d20367356e4a5963ab3f8dfae45d300421b0 ref/edos.qa.1 -tiger:c30de14309540b5253e5abf3c590f070ecf53ae075e13888 ref/edos.qa.1 -crc32:5fadf960 ref/edos.qa.1 -crc64:f84fb29e743917be ref/edos.qa.1 -adler32:87582f0a ref/edos.qa.1 -jlu32:3facf310 ref/edos.qa.1 -md2:d79c034f963ddc1082212ded010b930f ref/edos.qa.2 -md4:a3cf76c2ed46507a0563506749ceddc0 ref/edos.qa.2 -md5:02c30c70c09ac8437b3c8c89b65ed243 ref/edos.qa.2 -sha1:b2aa2ab3769aa03cf12f91e40977efc9533a8c98 ref/edos.qa.2 -sha224:ca90a1c23e8a17514c80f5b52e92f1f1b525984f4f870eca63135900 ref/edos.qa.2 -sha256:b01c9c5514cba9b64e69cb2b11b31b99603b8e9f5b9118cea642e646814a10fd ref/edos.qa.2 -sha384:ea2ed735f3b2195c2edcd31fc6a85b379d77276fc1dc0c761a3be4ed3da614a9d21d9fccd3b1012005c5f5574e8de3c1 ref/edos.qa.2 -sha512:76ec30ea96beafa1d58842843e06a6892b10fce78f2dcce6b3299dd36db52c074b233b997eb5cf46796e8f0690c5b21e9396bd261608592c9a366517e8686630 ref/edos.qa.2 -salsa10:0a029256669345108d1855f2f3777b3517b3887a6c28c5af104c35f5d7010105f0c31da90f17f458c86b517a99e98f8f26e0387a08288f070170a23ed3d89275 ref/edos.qa.2 -salsa20:067f473bd596a3c6fd9a94343471a3bd033cf9859f3ab059c565275d4181c5b112c98d8ce2173022f906b9c5155e48d6a0104f661ca6029ad9915123130a0020 ref/edos.qa.2 -rmd128:ca0c51529d72d049460de001179c7449 ref/edos.qa.2 -rmd160:4a8e6ff1195e6bb61e53e963a7fe966552e4afb1 ref/edos.qa.2 -rmd256:9393568e4a3f2f1032131596776325e084e272adaa839b2624be4544792a5042 ref/edos.qa.2 -rmd320:f9cfc790d4f861953e874a8bcc185aedc979ecd7a9c7d0a34d6d00282d5dfd305280de6166077851 ref/edos.qa.2 -tiger:d7a35ea67bd3668fdabaaed14f6a300ba400dd891fc6ed6e ref/edos.qa.2 -crc32:256ffae8 ref/edos.qa.2 -crc64:5e3be0468ed60d1d ref/edos.qa.2 -adler32:49182ea7 ref/edos.qa.2 -jlu32:173c1140 ref/edos.qa.2 +md2:15c9d98656ff9aea586591085308a752 ref/edos.qa.1 +md4:30ba8d3b284753c9bd5650391aede163 ref/edos.qa.1 +md5:d3ee5e8b8636d2e8e41323bc1b7fabca ref/edos.qa.1 +sha1:cd00eea3e49a55fd7f2549cec4b5236bfe4432a6 ref/edos.qa.1 +sha224:e226de04c95ca6f32c99e04efd9784cf7e73e9089c3cf6bef35c05ed ref/edos.qa.1 +sha256:a16aac58748f5dabac446bd5083cda543238ee75dde870a719fac59a2e526b87 ref/edos.qa.1 +sha384:df1ab88c6ccdc9c6509644e242c7a9982882b0e6c7d1d133f4a904145c5b0a7abec83a693c1924213ac03e84a4990925 ref/edos.qa.1 +sha512:e60ae199ddbea1d3a153f4c95039d7953f2d2a4cd03882c0c9a0083b731dcc8a461fb29977997fda63d5ee8267062470729f73e787245e754d6766fb8b4869b2 ref/edos.qa.1 +salsa10:b8d3ba26612d09e0783b1aee7a47cc1ade3cd6f82de1bf0a75863c260fb12680c9479e0a7c4857ba718d0a4b53a65ced2217335a0fe29e3e74aa78f7c3b33d7c ref/edos.qa.1 +salsa20:1bf6f0789bbe62e2d50ca2740958257873526a2e326c3f7cb8cd4b2e52970e7d60e05312a5a9a52df04272ce95e0c9fc77746bfa3cf780950da7009b60acd985 ref/edos.qa.1 +rmd128:6bf0ea7b6add1ea073e8d244152c5530 ref/edos.qa.1 +rmd160:51897320da844aa5a16d9e5148e89949e019974c ref/edos.qa.1 +rmd256:5ff853e907425dc89a32ad1cec641eacc3b0d01158bfed708f23a92829bbe9de ref/edos.qa.1 +rmd320:09deb8eadb8045218938c5d2433653954466865d399f0d87cd7574a6ee1287b2c42d4f6ae787dbe8 ref/edos.qa.1 +tiger:e8ed8ada1d7876292d1224fafc4e88f4cc7360382078815f ref/edos.qa.1 +crc32:a29b183a ref/edos.qa.1 +crc64:d858d5789c626887 ref/edos.qa.1 +adler32:83002f0c ref/edos.qa.1 +jlu32:c7bb1e9b ref/edos.qa.1 +md2:b3f86708c948f0df63c7d6b639dcc44f ref/edos.qa.2 +md4:1de7e99acdfe20bcdd9912c4e2d37873 ref/edos.qa.2 +md5:72a35be51c371f98a825fe9d0a24117c ref/edos.qa.2 +sha1:c751b795c8b17055f18b10056c012bbf70a01559 ref/edos.qa.2 +sha224:90e32f6f56dbeed57cdb1000d4978f36e86679ea33f23e3c6e0e2993 ref/edos.qa.2 +sha256:56b142347eb67aded262d9e57ca0b148810bfc56d435fc66e266d3f646a55c92 ref/edos.qa.2 +sha384:6e0a980f44532fbadb8c7653f33b6aa0a99a99982924f1b1dadf95b43d8e2d54fc0d3a0555e9d0ae0bfaf51536ea0a47 ref/edos.qa.2 +sha512:030a356bad8c41398cf6bf9140a7043f5b4eae10b147a0b763364cd98fcc0851e714f705074bad01adf5b5c8c9f2a420c09034e88e2e634987cdc8f4c338ddc8 ref/edos.qa.2 +salsa10:af526800bc7e1edcbcf2bdff6eb1f4927e4d96138f36c7887b42b174cbf3b318e4f84218b95bc249d940414594001e5ff9863bb259c79d9d469db6f31e1f6acf ref/edos.qa.2 +salsa20:b7665e32a7593b06477165ff72cd3fe38eacb0b22171ea161d60516340192fbfa878b2ccaf432cf74e91e38a255867d5c11e552458766468a37519178408eecb ref/edos.qa.2 +rmd128:f40195562465860c597414819f1dcde1 ref/edos.qa.2 +rmd160:5377994baacbfb96ce69b6bfdbd50e2c114d0ed0 ref/edos.qa.2 +rmd256:a4184ceb54fe81cdd0df00378d632d7f2c8319e596d37fffcc4e527375d269e7 ref/edos.qa.2 +rmd320:95dba0c4de11685d247811ed57f0b1e1916e935b7fe36c02901bd97992b2562c9a6b1a6b5ef9256e ref/edos.qa.2 +tiger:adf7120aff3683d09f287f646caa0dc52cca8761235beb50 ref/edos.qa.2 +crc32:26805a50 ref/edos.qa.2 +crc64:6e73c8b2f84ee27d ref/edos.qa.2 +adler32:54732ea8 ref/edos.qa.2 +jlu32:b08d313a ref/edos.qa.2 md2:37f6df01dd4409c4208c9614bd8ef9e8 ref/filelists.xml md4:41db1bddbfb39d06657ebf0716843aa3 ref/filelists.xml md5:9ffb2aa2fe21207be29d9e7c91c249e3 ref/filelists.xml @@ -226,25 +226,25 @@ crc64:ec620cfa13a53c0b ref/primary.xml adler32:50d00aef ref/primary.xml jlu32:958bd7a7 ref/primary.xml -md2:1a45abf1ff5c4315c45d17e2347697f4 ref/querytags -md4:dd2dc843423ca71b209dfd74f99b48ac ref/querytags -md5:9ddca2fba2e4e5ea1f2a7b782281fb09 ref/querytags -sha1:0558f6b60bfbe5bd93d97d88b5b2579adbced420 ref/querytags -sha224:902ecfeb11e9af53ebca3da1ecf11fa1c9e7d516cd68b0aba2f767e4 ref/querytags -sha256:a3e167b9c5eba7638ca4e60363e1b2abbd0c888e2e9651815c975638e38f5853 ref/querytags -sha384:4af494ca0fc6433f1e7fb16b3060f1aefd9301ea7910102a58eeea2a9f507cb7d677b760b65f7331ae48230d212036c0 ref/querytags -sha512:7a124de1f0dc077a82020c8b0b7fd2adceb8ed08a2ff2cac239eee64a3399b7ecdeb96b88b81171982e4ce70ebe65eff276dfb470cc2e47819dc3ea8405a84e3 ref/querytags -salsa10:acd5c49143aea26c03f5a39202ef0f5062bc69eb6609d040c9de85e6bac73e0c9a248a0a56443f179f15e14c237199e9d1d8fba06e81af666881d05e22b1197b ref/querytags -salsa20:b8177e27d74299b55d8a1a242bf7b2a7e6f36d3d857ec41f2f1725b5cbe77c9cba7dc906ea8e51c0a0ea6404c40af80521f12c57b41f7f56bef5d0561a671512 ref/querytags -rmd128:bd153197077abb10428b99eec92561cd ref/querytags -rmd160:0fd1332861f1024ec6f075e3a642da9274e975b4 ref/querytags -rmd256:4c357b3bc3264633e8dbf3820643d868b532395b79b7ef5458df3c0e4069ba57 ref/querytags -rmd320:46f136a4b59c958518daf774ae95b492f85f78c812b4adbb9f5a9a7130e2cb32664017b74d004182 ref/querytags -tiger:6760eb0be22841f42cf78dce84eddd5cb3fe9511cd95887f ref/querytags -crc32:a4521785 ref/querytags -crc64:e339433ae2a17be1 ref/querytags -adler32:bce93020 ref/querytags -jlu32:1f5ca917 ref/querytags +md2:e7484f6025c161eab68103d4c1f87c63 ref/querytags +md4:e19acb2e465d6381adc1984a128ad4c1 ref/querytags +md5:d2e2dbe02df8e4bb75087c58db8bf722 ref/querytags +sha1:9803c2d8ac14d549e820f066f4dfde55b96a5d17 ref/querytags +sha224:36459ea6222184a3723cec17aac5e5a44902e14e056df973972a0d27 ref/querytags +sha256:5e967d548508ad98a271704f60b0d159db1abfb7c0d6e743e7a364a7c9e691a9 ref/querytags +sha384:286589c6f4e04ffa0374c8487210ba30c9fb7047a4bba9e70968bf27e62dc533ea23b7426869855c429261083d99873f ref/querytags +sha512:c6d054900153b98df17d672405b95e426824bc8ffe7fe765aeb4ccd05de81702378f70c7201419c9f1e6f11e5a3b4f0a7f1c5d443381830bf039f455d52d1ce7 ref/querytags +salsa10:cefcb1ff4ac1ed973e04c82f7cc94f9b252ab8a0fcbdbcd243aed1d2189bc9e026c34da400740cb60143898d271b392ed3128522c087b005e242b746127e403f ref/querytags +salsa20:921c3b8995ee169ca001910474648feb4585df14b418b5b3ec876502a99cb199314686118c495da8246a0ad8221f4c705fc949229370f71aaf6ef056fa6fc2d4 ref/querytags +rmd128:aa716fe1ea53b61dd204b161cc646f7d ref/querytags +rmd160:9a857b21579494490bea5ff91532e3e09f7090e4 ref/querytags +rmd256:c8170c8731c0f1d8f9057153f188ad60e585a75cc1e03e754463e47a7a73c706 ref/querytags +rmd320:510eb02c51a1ac187d809d0598b2097fa1871f76ade8be3f81d6432f1d70686c218e1505b8e97a1a ref/querytags +tiger:79d0f9f27b04ec17304e0a997900244ba5cba5215be449bf ref/querytags +crc32:b77c3ffd ref/querytags +crc64:d221dd7b9657c9e1 ref/querytags +adler32:479da40e ref/querytags +jlu32:5780d7e2 ref/querytags md2:934a02a3b98d9fa3e0134eba738d040d ref/repomd.xml md4:1e8860adfd5e9a85048cbf9e64a52ff0 ref/repomd.xml md5:5a3848231528045cd37942d9c604b10a ref/repomd.xml @@ -264,25 +264,25 @@ crc64:df5e7caef3ec1ef3 ref/repomd.xml adler32:4992241a ref/repomd.xml jlu32:3d867e81 ref/repomd.xml -md2:05919faefd6ec2e8c430e8bb926d7634 ref/showrc -md4:e5418703c641a4bab72e37c9ff62f94c ref/showrc -md5:2b477e34edad0a27060253c7f276ad7f ref/showrc -sha1:668d93da4e62c0701b74e1a525a7b68548ff7da3 ref/showrc -sha224:baf9db7cd8b4cbe26ba26f18c8fe7ac3f83c51aee305687ebec6f8a3 ref/showrc -sha256:06ecfaeb7ecdf2645609e102e95d0a98a9a3595d8db2c05f572998417dd2e16e ref/showrc -sha384:8e6cd7a733f06e80ade0bf788835b423bbadf3f824f48ee9f301bf7c62e38c2009dc5b0cafff114101c977278b410198 ref/showrc -sha512:6e7916e648e2ba491ad93c942e37f41807d26e53d75aa6551cb61d8a6f8c5d9ee7a46f5a8c5a1f9b064bd520076304c0d8951c022bfe27ff1c4ca284eef53b5c ref/showrc -salsa10:aa21950374f417f0d81a3d724d727c436485a5fbfa193f06af2903c5ac312f95262a658db328a22b383b971f1b8b34cc8a7dbf899b6112a9344c14a12a15d6dc ref/showrc -salsa20:a639379ec95c1f946705da69eb57d63471cd9b12c8988a16d298889f4cb8630318d17bf770bb74312c3461bceb600c5aa4ae02e3a40aa6130ef065c53a615b13 ref/showrc -rmd128:f2f45d6c13e609b8ff99799c82997a85 ref/showrc -rmd160:bd02aa205dfe7dc4085b52e4418371332b3e0b30 ref/showrc -rmd256:e9b6b3132323fd3716efb65d6ca5dbea4f061b61321682d9fe5177fa3856a47b ref/showrc -rmd320:c56300f5a5d171480d92047752208abf0363d3edd215a460cc6a8302bef23e0952ca15fcd38dd908 ref/showrc -tiger:d5f08ad34c4f3ab397b431a59ee5361eb144fc7e4b80d0f0 ref/showrc -crc32:849df03c ref/showrc -crc64:93f67f425db6a043 ref/showrc -adler32:2c2b23ed ref/showrc -jlu32:0e510ebd ref/showrc +md2:239148b6663487b617ff1184e9051c92 ref/showrc +md4:33d7b54d65ed6836f78fa2f4fc3a8510 ref/showrc +md5:862bc2def4e577907f28ea17d98c9bf2 ref/showrc +sha1:fa6ac80ad0e3f1bc4a4527d4a667945cf00b4666 ref/showrc +sha224:30ab63797c18eb13f5c4f57f066c3f6576727df814bdb3b6e9261277 ref/showrc +sha256:eee25e478d6f3aa9b3976b65cd947f1d46e4c57726b61e03b0775cb0885274e6 ref/showrc +sha384:4b86535429208d7132a6767f1465a2fab5b57c4c693eac4cacfb83b39419910bfaaabb0706348c49ab8985a195689c19 ref/showrc +sha512:a8edcd63fac30e6fd6025152e026639d227838012067d72b3a3ad0caab62068ebcb6c63a875ea319235e4937fa25974c18c579109263ce9f9a6db4adb5ea2588 ref/showrc +salsa10:464564c7dada3fdca2143aeb13f2adb512bf3e0ec4618f2e2951327397b8575332565415ade5058a00f8cd1b7de062931ecd5d2ad1f4181011cfbe797363c75d ref/showrc +salsa20:8719057763f30d70782ab1d8190806f17ea7664a3146ee4eea671fb1dd212da9a665df5e3760c132b0d996b41af17f26f56e5918ac349407128c6efd3df18a88 ref/showrc +rmd128:2a2c02e928ba8a3bdaa0c7aa215ac56f ref/showrc +rmd160:5c6762b568000bca9cf5678da212f574d1fec241 ref/showrc +rmd256:0d6ec50ad984a911e5e6ecd559e9e24a5921f34d51ed766c66cfe5b4b7acac9f ref/showrc +rmd320:89160c793883275c0e2413bf43e8490f74acd8a6aeea703fdf33200adf913c7d2f3d41b5605d9cc7 ref/showrc +tiger:54e8dea19acb7d8261eed8e40434ec13989910bae17c9812 ref/showrc +crc32:60e7c284 ref/showrc +crc64:6139fdc396840c47 ref/showrc +adler32:bb57cfe5 ref/showrc +jlu32:9f2f8549 ref/showrc md2:3699f451aab204004bc1a3e476e3251b ref/version md4:cd78bafb873dfa81813a597ca8de68c3 ref/version md5:36dd3060141bc10113fcab72322a864b ref/version @@ . patch -p0 <<'@@ .' Index: rpm/tests/ref/edos.qa.1 ============================================================================ $ cvs diff -u -r1.1.2.4 -r1.1.2.5 edos.qa.1 --- rpm/tests/ref/edos.qa.1 15 Oct 2008 20:08:39 -0000 1.1.2.4 +++ rpm/tests/ref/edos.qa.1 27 Apr 2010 19:45:49 -0000 1.1.2.5 @@ -1,8 +1,8 @@ gpg-pubkey-2039b291-3dbaae72 glass-1-0.noarch wheel-2-0.noarch -door-1-0.noarch +car-1-0.noarch turbo-1-0.noarch engine-1-0.noarch -car-1-0.noarch -window-0-0.noarch +window-2-0.noarch +door-1-0.noarch @@ . patch -p0 <<'@@ .' Index: rpm/tests/ref/edos.qa.2 ============================================================================ $ cvs diff -u -r1.1.2.4 -r1.1.2.5 edos.qa.2 --- rpm/tests/ref/edos.qa.2 15 Oct 2008 20:08:39 -0000 1.1.2.4 +++ rpm/tests/ref/edos.qa.2 27 Apr 2010 19:45:49 -0000 1.1.2.5 @@ -1,8 +1,8 @@ gpg-pubkey-2039b291-3dbaae72 car-1-0.noarch +window-2-0.noarch engine-2-0.noarch -tyre-1-0.noarch wheel-3-0.noarch +tyre-1-0.noarch glass-2-0.noarch -window-1-0.noarch door-2-0.noarch @@ . patch -p0 <<'@@ .' Index: rpm/tests/ref/querytags ============================================================================ $ cvs diff -u -r1.1.2.4 -r1.1.2.5 querytags --- rpm/tests/ref/querytags 11 Jan 2009 20:53:38 -0000 1.1.2.4 +++ rpm/tests/ref/querytags 27 Apr 2010 19:45:49 -0000 1.1.2.5 @@ -5,10 +5,20 @@ BLINKNEVRA 1166 argv array BLINKPKGID 1164 argv array BUILDARCHS 1089 argv array +BUILDBUILD 1538136666 argv array +BUILDBUILDPROG 1874092052 argv array +BUILDCHECK 2134611893 argv array +BUILDCHECKPROG 1217028302 argv array +BUILDCLEAN 1449149119 argv array +BUILDCLEANPROG 1120484673 argv array BUILDCPUCLOCK 1176 uint32 BUILDHOST 1007 string +BUILDINSTALL 1451186563 argv array +BUILDINSTALLPROG 1892985711 argv array BUILDMACROS 1111 argv array BUILDPLATFORMS 1183 argv array +BUILDPREP 2040269645 argv array +BUILDPREPPROG 1269005470 argv array BUILDTIME 1006 uint32 C 1054 argv array CACHECTIME 1136 uint32 @@ -55,6 +65,7 @@ FILEDEPENDSN 1144 uint32 array FILEDEPENDSX 1143 uint32 array FILEDEVICES 1095 uint32 array +FILEDIGESTALGO 5011 uint32 FILEDIGESTALGOS 1177 uint32 array FILEDIGESTS 1035 argv array FILEFLAGS 1037 uint32 array @@ . patch -p0 <<'@@ .' Index: rpm/tests/ref/showrc ============================================================================ $ cvs diff -u -r1.1.2.8 -r1.1.2.9 showrc --- rpm/tests/ref/showrc 11 Jan 2009 20:53:38 -0000 1.1.2.8 +++ rpm/tests/ref/showrc 27 Apr 2010 19:45:49 -0000 1.1.2.9 @@ -6,7 +6,7 @@ install arch : i386 install os : Linux compatible archs : i386 -compatible os's : linux +compatible os's : Linux optflags : -O2 LUA MODULES: @@ -21,6 +21,7 @@ rpmlib(ConcurrentAccess) = 4.1-1 rpmlib(ExplicitPackageProvide) = 4.0-1 rpmlib(FileDigestParameterized) = 4.4.6-1 + rpmlib(FileDigests) = 4.6.0-1 rpmlib(HeaderLoadSortsTags) = 4.0.1-1 rpmlib(HeaderTagTypeInt64) = 4.4.3-1 rpmlib(PartialHardlinkSets) = 4.0.4-1 @@ -28,51 +29,59 @@ rpmlib(PayloadIsBzip2) = 3.0.5-1 rpmlib(PayloadIsLzma) = 4.4.6-1 rpmlib(PayloadIsUstar) = 4.4.4-1 + rpmlib(PayloadIsXz) = 5.2-1 rpmlib(ScriptletInterpreterArgs) = 4.0.3-1 rpmlib(VersionedDependencies) = 3.0.3-1 Features provided by current cpuinfo (from /proc/cpuinfo): cpuinfo(acpi) + cpuinfo(aperfmperf) cpuinfo(apic) - cpuinfo(bogomips) = 4788.29 + cpuinfo(arch_perfmon) + cpuinfo(bogomips) = 5987.48 cpuinfo(bts) - cpuinfo(cache_size) = 512_KB - cpuinfo(cid) + cpuinfo(cache_size) = 4096_KB cpuinfo(clflush) cpuinfo(clflush_size) = 64 cpuinfo(cmov) - cpuinfo(cpu_MHz) = 2394.147 - cpuinfo(cpu_family) = 15 + cpuinfo(constant_tsc) + cpuinfo(cpu_MHz) = 2993.743 + cpuinfo(cpu_family) = 6 + cpuinfo(cx16) cpuinfo(cx8) cpuinfo(de) cpuinfo(dts) cpuinfo(fpu) cpuinfo(fpu_exception) cpuinfo(fxsr) - cpuinfo(ht) + cpuinfo(hypervisor) + cpuinfo(lahf_lm) + cpuinfo(lm) cpuinfo(mca) cpuinfo(mce) cpuinfo(mmx) - cpuinfo(model) = 2 + cpuinfo(model) = 15 cpuinfo(msr) cpuinfo(mtrr) + cpuinfo(nx) cpuinfo(pae) cpuinfo(pat) - cpuinfo(pbe) cpuinfo(pebs) cpuinfo(pge) + cpuinfo(pni) cpuinfo(pse) cpuinfo(pse36) + cpuinfo(sep) cpuinfo(ss) cpuinfo(sse) cpuinfo(sse2) - cpuinfo(stepping) = 9 - cpuinfo(tm) + cpuinfo(ssse3) + cpuinfo(stepping) = 6 cpuinfo(tsc) + cpuinfo(tsc_reliable) cpuinfo(up) cpuinfo(vme) cpuinfo(wp) - cpuinfo(xtpr) ======================== -14: GNUconfigure(MCs:) @@ -374,8 +383,10 @@ -14: __vcheck %{__perl} %{_rpmhome}/vcheck -14: __vsflags 0xf0000 -14: __wget /usr/bin/wget --14: __xar /usr/bin/xar +-14: __xar %{_bindir}/xar +-14: __xz /usr/bin/xz -14: _arbitrary_tags Class:Track:Trackprog:Foo:Bar:Baz +-14: _arbitrary_tags_debian Priority:Essential:Depends:Predepends:Recommends:Suggests:Enhances:Breaks -14: _arch i386 -14: _autorelocate_dcolor 0 -14: _autorelocate_path %{nil} @@ -502,12 +513,14 @@ %{nil} -14: _dependency_whiteout_caos_core glibc-common>glibc - glibc>nscd + glibc>nscd + filesystem>setup -14: _disable_shell_interpreter_deps 0 -14: _etcrpm %{_testdir} -14: _exec_prefix %{_prefix} -14: _filter_GLIBC_PRIVATE 0 -14: _gnu -gnu +-14: _helperpath %{?_install_helpers:%{_install_helpers}:} -14: _hkp_keyserver %{nil} -14: _hkp_keyserver_query %{nil} -14: _host i686-pc-linux-gnu @@ -521,8 +534,9 @@ -14: _includedir %{_prefix}/include -14: _infodir %{_prefix}/info -14: _install_file_context_path %{__file_context_path} +-14: _install_helpers %{rpmhome}/helpers -14: _install_langs all --14: _install_script_path /sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin +-14: _install_script_path %{_helperpath}/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin -14: _javadir %{_datadir}/java -14: _javadocdir %{_datadir}/javadoc -14: _keyutils_keyring process @@ -679,13 +693,13 @@ echo "Patch #%{__patch_number} (%{basename:%{__patch_file}}):" && %{uncompress:%{__patch_file}} | %{__patch} %{__patch_options} } -14: patches %{lua: for i, p in ipairs(patches) do print(p.." ") end} --14: pattern_Distepoch [A-Za-z0-9.]+ --14: pattern_Disttag [A-Za-z0-9]+ --14: pattern_Epoch [0-9]+ --14: pattern_Name [A-Za-z0-9]+[A-Za-z0-9+._-]* --14: pattern_Release [A-Za-z0-9+._]+ --14: pattern_Repotag [A-Za-z0-9]+ --14: pattern_Version [A-Za-z0-9+._]+ +-14: pattern_Distepoch ^[A-Za-z0-9.]+$ +-14: pattern_Disttag ^[A-Za-z0-9]+$ +-14: pattern_Epoch ^[0-9]+$ +-14: pattern_Name ^[A-Za-z0-9][A-Za-z0-9+._-]*$ +-14: pattern_Release ^[A-Za-z0-9+._]+$ +-14: pattern_Repotag ^[A-Za-z0-9]+$ +-14: pattern_Version ^[A-Za-z0-9+._]+$ -14: perl_archlib %(eval "`%{__perl} -V:installarchlib`"; echo $installarchlib) -14: perl_privlib %(eval "`%{__perl} -V:installprivlib`"; echo $installprivlib) -14: perl_sitearch %(eval "`%{__perl} -V:installsitearch`"; echo $installsitearch) @@ -754,4 +768,4 @@ %nil -14: with %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}} -14: without %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}} -======================== active 453 empty 0 +======================== active 457 empty 0 @@ . rm -f xar/include/config.h.in <<'@@ .' Index: xar/include/config.h.in ============================================================================ [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
