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: 19-Jul-2010 20:16:13 Branch: HEAD Handle: 2010071918161200 Modified files: rpm/rpmdb popt.inp tag.asn tag2asn.sh Log: - asn: WIP. Summary: Revision Changes Path 1.3 +45 -45 rpm/rpmdb/popt.inp 1.3 +5 -3 rpm/rpmdb/tag.asn 1.5 +7 -2 rpm/rpmdb/tag2asn.sh ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/rpmdb/popt.inp ============================================================================ $ cvs diff -u -r1.2 -r1.3 popt.inp --- rpm/rpmdb/popt.inp 18 Jul 2010 16:13:58 -0000 1.2 +++ rpm/rpmdb/popt.inp 19 Jul 2010 18:16:12 -0000 1.3 @@ -9,15 +9,14 @@ version 1.14 release 1 summary A C library for parsing command line parameters. -description Popt is a C library for parsing command line parameters. -# Popt is a C library for parsing command line parameters. Popt was\ -# heavily influenced by the getopt() and getopt_long() functions, but it\ -# improves on them by allowing more powerful argument expansion. Popt\ -# can parse arbitrary argv[] style arrays and automatically set\ -# variables based on command line arguments. Popt allows command line\ -# arguments to be aliased via configuration files and includes utility\ -# functions for parsing arbitrary strings into argv[] arrays using\ -# shell-like rules. +description Popt is a C library for parsing command line parameters. Popt was\ +heavily influenced by the getopt() and getopt_long() functions, but it\ +improves on them by allowing more powerful argument expansion. Popt\ +can parse arbitrary argv[] style arrays and automatically set\ +variables based on command line arguments. Popt allows command line\ +arguments to be aliased via configuration files and includes utility\ +functions for parsing arbitrary strings into argv[] arrays using\ +shell-like rules. #buildtime 1207158035 -- Wed 02 Apr 2008 01:40:35 PM EDT buildtime 080402184035Z buildhost wellfleet.jbj.org @@ -247,77 +246,78 @@ filerdevs.?LAST 0 # --- filemtimes NEW -filemtimes.?LAST 1207158034 +#filemtimes.?LAST 1207158034 -- Wed Apr 2 13:40:34 2008 +filemtimes.?LAST 080402184034Z filemtimes NEW -filemtimes.?LAST 1207158034 +filemtimes.?LAST 080402184034Z filemtimes NEW -filemtimes.?LAST 1207158034 +filemtimes.?LAST 080402184034Z filemtimes NEW -filemtimes.?LAST 1207158034 +filemtimes.?LAST 080402184034Z filemtimes NEW -filemtimes.?LAST 1207158034 +filemtimes.?LAST 080402184034Z filemtimes NEW -filemtimes.?LAST 1207158033 +filemtimes.?LAST 080402184033Z filemtimes NEW -filemtimes.?LAST 1207158033 +filemtimes.?LAST 080402184033Z filemtimes NEW -filemtimes.?LAST 1207158033 +filemtimes.?LAST 080402184033Z filemtimes NEW -filemtimes.?LAST 1207158033 +filemtimes.?LAST 080402184033Z filemtimes NEW -filemtimes.?LAST 1207158033 +filemtimes.?LAST 080402184033Z filemtimes NEW -filemtimes.?LAST 1207158033 +filemtimes.?LAST 080402184033Z filemtimes NEW -filemtimes.?LAST 1207158033 +filemtimes.?LAST 080402184033Z filemtimes NEW -filemtimes.?LAST 1207158033 +filemtimes.?LAST 080402184033Z filemtimes NEW -filemtimes.?LAST 1207158033 +filemtimes.?LAST 080402184033Z filemtimes NEW -filemtimes.?LAST 1207158033 +filemtimes.?LAST 080402184033Z filemtimes NEW -filemtimes.?LAST 1207158033 +filemtimes.?LAST 080402184033Z filemtimes NEW -filemtimes.?LAST 1207158033 +filemtimes.?LAST 080402184033Z filemtimes NEW -filemtimes.?LAST 1207158033 +filemtimes.?LAST 080402184033Z filemtimes NEW -filemtimes.?LAST 1207158033 +filemtimes.?LAST 080402184033Z filemtimes NEW -filemtimes.?LAST 1207158033 +filemtimes.?LAST 080402184033Z filemtimes NEW -filemtimes.?LAST 1207158033 +filemtimes.?LAST 080402184033Z filemtimes NEW -filemtimes.?LAST 1207158033 +filemtimes.?LAST 080402184033Z filemtimes NEW -filemtimes.?LAST 1207158033 +filemtimes.?LAST 080402184033Z filemtimes NEW -filemtimes.?LAST 1207158033 +filemtimes.?LAST 080402184033Z filemtimes NEW -filemtimes.?LAST 1207158033 +filemtimes.?LAST 080402184033Z filemtimes NEW -filemtimes.?LAST 1207158033 +filemtimes.?LAST 080402184033Z filemtimes NEW -filemtimes.?LAST 1207158033 +filemtimes.?LAST 080402184033Z filemtimes NEW -filemtimes.?LAST 1207158033 +filemtimes.?LAST 080402184033Z filemtimes NEW -filemtimes.?LAST 1207158033 +filemtimes.?LAST 080402184033Z filemtimes NEW -filemtimes.?LAST 1207158033 +filemtimes.?LAST 080402184033Z filemtimes NEW -filemtimes.?LAST 1207158033 +filemtimes.?LAST 080402184033Z filemtimes NEW -filemtimes.?LAST 1207158033 +filemtimes.?LAST 080402184033Z filemtimes NEW -filemtimes.?LAST 1207158033 +filemtimes.?LAST 080402184033Z filemtimes NEW -filemtimes.?LAST 1207158033 +filemtimes.?LAST 080402184033Z filemtimes NEW -filemtimes.?LAST 1207158033 +filemtimes.?LAST 080402184033Z filemtimes NEW -filemtimes.?LAST 1207158033 +filemtimes.?LAST 080402184033Z # --- filedigests NEW filedigests.?LAST d5bf807db4c4089f36f629e00c071dac @@ . patch -p0 <<'@@ .' Index: rpm/rpmdb/tag.asn ============================================================================ $ cvs diff -u -r1.2 -r1.3 tag.asn --- rpm/rpmdb/tag.asn 18 Jul 2010 16:13:58 -0000 1.2 +++ rpm/rpmdb/tag.asn 19 Jul 2010 18:16:12 -0000 1.3 @@ -13,12 +13,14 @@ NumericString ::= [UNIVERSAL 18] IMPLICIT OCTET STRING PrintableString ::= [UNIVERSAL 19] IMPLICIT OCTET STRING TeletexString ::= [UNIVERSAL 20] IMPLICIT OCTET STRING +T61String ::= [UNIVERSAL 20] IMPLICIT OCTET STRING VideotexString ::= [UNIVERSAL 21] IMPLICIT OCTET STRING IA5String ::= [UNIVERSAL 22] IMPLICIT OCTET STRING --- UTCTime ::= [UNIVERSAL 23] IMPLICIT OCTET STRING --- GeneralizedTime ::= [UNIVERSAL 24] IMPLICIT OCTET STRING +-- UTCTime ::= [UNIVERSAL 23] IMPLICIT OCTET STRING +-- GeneralizedTime ::= [UNIVERSAL 24] IMPLICIT OCTET STRING GraphicString ::= [UNIVERSAL 25] IMPLICIT OCTET STRING VisibleString ::= [UNIVERSAL 26] IMPLICIT OCTET STRING +ISO646String ::= [UNIVERSAL 26] IMPLICIT OCTET STRING -- GeneralString ::= [UNIVERSAL 27] IMPLICIT OCTET STRING UniversalString ::= [UNIVERSAL 28] IMPLICIT OCTET STRING BMPString ::= [UNIVERSAL 30] IMPLICIT OCTET STRING @@ -132,7 +134,7 @@ Filerdevs ::= SEQUENCE OF RPM_UINT16_TYPE id-rpm-tag-Filemtimes OBJECT_IDENTIFIER ::= { id-rpm-tag 1034 } -Filemtimes ::= SEQUENCE OF RPM_UINT32_TYPE +Filemtimes ::= SEQUENCE OF RPM_UTCTIME_TYPE id-rpm-tag-Filedigests OBJECT_IDENTIFIER ::= { id-rpm-tag 1035 } Filedigests ::= SEQUENCE OF RPM_STRING_ARRAY_TYPE @@ . patch -p0 <<'@@ .' Index: rpm/rpmdb/tag2asn.sh ============================================================================ $ cvs diff -u -r1.4 -r1.5 tag2asn.sh --- rpm/rpmdb/tag2asn.sh 18 Jul 2010 16:13:58 -0000 1.4 +++ rpm/rpmdb/tag2asn.sh 19 Jul 2010 18:16:12 -0000 1.5 @@ -20,12 +20,14 @@ \nNumericString ::= [UNIVERSAL 18] IMPLICIT OCTET STRING\ \nPrintableString ::= [UNIVERSAL 19] IMPLICIT OCTET STRING\ \nTeletexString ::= [UNIVERSAL 20] IMPLICIT OCTET STRING\ +\nT61String ::= [UNIVERSAL 20] IMPLICIT OCTET STRING\ \nVideotexString ::= [UNIVERSAL 21] IMPLICIT OCTET STRING\ \nIA5String ::= [UNIVERSAL 22] IMPLICIT OCTET STRING\ -\n-- UTCTime ::= [UNIVERSAL 23] IMPLICIT OCTET STRING\ -\n-- GeneralizedTime ::= [UNIVERSAL 24] IMPLICIT OCTET STRING\ +\n-- UTCTime ::= [UNIVERSAL 23] IMPLICIT OCTET STRING\ +\n-- GeneralizedTime ::= [UNIVERSAL 24] IMPLICIT OCTET STRING\ \nGraphicString ::= [UNIVERSAL 25] IMPLICIT OCTET STRING\ \nVisibleString ::= [UNIVERSAL 26] IMPLICIT OCTET STRING\ +\nISO646String ::= [UNIVERSAL 26] IMPLICIT OCTET STRING\ \n-- GeneralString ::= [UNIVERSAL 27] IMPLICIT OCTET STRING\ \nUniversalString ::= [UNIVERSAL 28] IMPLICIT OCTET STRING\ \nBMPString ::= [UNIVERSAL 30] IMPLICIT OCTET STRING\ @@ -113,6 +115,9 @@ if (tagN == "Buildtime") { tt = "UTCTIME"; ta = ""; } + if (tagN == "Filemtimes") { + tt = "UTCTIME"; ta = "SEQUENCE OF "; + } if (tagN == "Changelogtime") { tt = "UTCTIME"; ta = "SEQUENCE OF "; } @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
