p4ruby 2017.1.1599185 → 2020.1.1970474

data/ext/P4/extconf.rb

@@ -6,10 +6,19 @@ require 'mkmf'
 require 'net/ftp'
 require 'P4/version'
 require 'rbconfig'
+require 'openssl'
 
 # Set this to the main version directory we look up in ftp.perforce.com for the P4API
 # This is ignored if you specify the version on the command line.
-P4API_VERSION_DIR = 'r17.2'
+# Changed the hardcoded string so that the version is now derived from version.rb file
+#P4API_VERSION_DIR = 'r19.1'
+def p4api_version_dir
+        ver=P4::Version.split(".")
+        p4_major = ver[0].chars.last(2).join
+        p4_minor = ver[1]
+        dir = "r" + p4_major + "." + p4_minor
+end
+
 
 #==============================================================================
 # Provide platform variables in P4-specific format
@@ -102,6 +111,15 @@ def calculate_p4osver
   return ver
 end
 
+def gcc
+  @gcc ||= calculate_gcc
+end
+
+def calculate_gcc
+  gcc = RbConfig::CONFIG["GCC"]
+  return gcc
+end
+
 def uname_platform
   @uname_platform ||= calculate_uname_platform
 end
@@ -155,6 +173,13 @@ def set_platform_opts
   end
 end
 
+def set_platform_cxxflags
+  if (p4osname == 'LINUX') && (gcc == 'yes')
+    $CXXFLAGS += " -std=c++11 "
+  end
+end
+
+
 def set_platform_cppflags
   $CPPFLAGS += "-DOS_#{p4osname} "
   $CPPFLAGS += "-DOS_#{p4osname}#{p4osver} "
@@ -214,6 +239,7 @@ def set_platform_libs
         $LDFLAGS += ' -framework CoreFoundation -framework Foundation'
       end
     when 'LINUX', 'MINGW32'
+      $LDFLAGS += ' -Wl,--allow-multiple-definition'
       have_library('supc++')
   end
 end
@@ -445,13 +471,34 @@ def ftp_download_dir(version)
 end
 
 def filename
+  openssl_number = OpenSSL::OPENSSL_VERSION.split(' ')[1].to_s
+  openssl_number = openssl_number.slice(0, (openssl_number.rindex('.')))
+
   if RbConfig::CONFIG['target_os'].downcase =~ /nt|mswin|mingw/
-    'p4api.zip'
+    filename = 'p4api.zip'
+    if !openssl_number.to_s.empty?
+        case openssl_number.to_s
+            when /1.1/
+                filename = 'p4api-openssl1.1.1.zip'
+            when /1.0/
+                filename = 'p4api-openssl1.0.2.zip'
+             end
+    end
   else
-    'p4api.tgz'
+    filename = 'p4api.tgz'
+    if !openssl_number.to_s.empty?
+        case openssl_number.to_s
+            when /1.1/
+                filename = 'p4api-glibc2.3-openssl1.1.1.tgz'
+            when /1.0/
+                filename = 'p4api-glibc2.3-openssl1.0.2.tgz'
+        end
+    end
   end
+  return filename
 end
 
+
 def remote_files_matching(ftp, dir, regex)
   ftp.ls(dir.to_s).map { |entry|
     if match = entry.match(regex)
@@ -499,9 +546,8 @@ def download_api_via_ftp
   # At one point, we allowed the gem build to just find the most recent p4api build.
   # P4Ruby probably shouldn't do that by default.
   #version_dir = find_latest_version_dir(ftp)
-  version_dir = P4API_VERSION_DIR
 
-  dir = ftp_download_dir(version_dir)
+  dir = ftp_download_dir(p4api_version_dir)
   ftp.chdir(dir)
 
   puts "downloading #{filename} from #{dir} on ftp.perforce.com"
@@ -536,9 +582,11 @@ set_platform_opts
 # based solely on platform detection.
 set_platform_cppflags
 set_platform_cflags
+set_platform_cxxflags
 
 puts "$CPPFLAGS #{$CPPFLAGS}"
 puts "$CFLAGS #{$CFLAGS}"
+puts "$CXXFLAGS #{$CXXFLAGS}"
 
 # Setup additional system library definitions based on platform type before
 # we setup other libraries, in order to preserve linking order
@@ -554,15 +602,17 @@ resolve_ssl_dirs
 # If we happen to need SSL on Windows, we also need gdi32
 if RbConfig::CONFIG['target_os'].downcase =~ /mingw/
   have_library('gdi32') or raise
+  have_library('ole32') or raise
+  have_library('crypt32') or raise
 end
 
-do_ssl = have_library('crypto') and have_library('ssl')
-
-unless do_ssl
-  have_library('p4sslstub') or raise
-end
-
+have_library('crypto') or raise
+have_library('ssl') or raise
 have_library('supp') or raise
+have_library('p4script_sqlite') or raise
+have_library('p4script_curl') or raise
+have_library('p4script') or raise
+have_library('p4script_c') or raise
 have_library('rpc') or raise
 have_library('client') or raise
 
@@ -577,4 +627,4 @@ create_p4rubyconf_header(version_info, $libs)
 # don't believe we need to rely on actually.
 create_header
 
-create_makefile('P4')
+create_makefile('P4')

data/ext/P4/p4.cpp

@@ -489,6 +489,21 @@ static VALUE p4_set_ticket_file( VALUE self, VALUE path )
     return Qtrue;
 }
 
+static VALUE p4_get_trust_file( VALUE self )
+{
+    P4ClientApi *p4;
+    Data_Get_Struct( self, P4ClientApi, p4 );
+    return P4Utils::ruby_string( p4->GetTrustFile().Text() );
+}
+
+static VALUE p4_set_trust_file( VALUE self, VALUE path )
+{
+    P4ClientApi *p4;
+    Data_Get_Struct( self, P4ClientApi, p4 );
+    p4->SetTrustFile( StringValuePtr( path ) );
+    return Qtrue;
+}
+
 static VALUE p4_get_user( VALUE self )
 {
     P4ClientApi	*p4;
@@ -1181,6 +1196,14 @@ static VALUE p4msg_get_text( VALUE self )
     return e->GetText();
 }
 
+static VALUE p4msg_get_dict( VALUE self )
+{
+    P4Error *   e = 0;
+
+    Data_Get_Struct( self, P4Error, e );
+    return e->GetDict();
+}
+
 static VALUE p4msg_get_id( VALUE self )
 {
     P4Error *	e = 0;
@@ -1256,6 +1279,8 @@ void	Init_P4()
     rb_define_method( cP4, "protocol", 	RUBY_METHOD_FUNC(p4_set_protocol), 2 );
     rb_define_method( cP4, "ticket_file", RUBY_METHOD_FUNC(p4_get_ticket_file), 0 );
     rb_define_method( cP4, "ticket_file=", RUBY_METHOD_FUNC(p4_set_ticket_file), 1 );
+    rb_define_method( cP4, "trust_file", RUBY_METHOD_FUNC(p4_get_trust_file), 0 );
+    rb_define_method( cP4, "trust_file=", RUBY_METHOD_FUNC(p4_set_trust_file), 1 );
     rb_define_method( cP4, "user", 	RUBY_METHOD_FUNC(p4_get_user)    , 0 );
     rb_define_method( cP4, "user=", 	RUBY_METHOD_FUNC(p4_set_user)    , 1 );
     rb_define_method( cP4, "version", 	RUBY_METHOD_FUNC(p4_get_version) , 0 );
@@ -1355,6 +1380,7 @@ void	Init_P4()
     rb_define_method( cP4Msg, "msgid", RUBY_METHOD_FUNC(p4msg_get_id), 0);
     rb_define_method( cP4Msg, "severity", RUBY_METHOD_FUNC(p4msg_get_severity), 0);
     rb_define_method( cP4Msg, "generic", RUBY_METHOD_FUNC(p4msg_get_generic), 0);
+    rb_define_method( cP4Msg, "dictionary", RUBY_METHOD_FUNC(p4msg_get_dict), 0);
     rb_define_method( cP4Msg, "to_s", RUBY_METHOD_FUNC(p4msg_get_text), 0);
 
     //	P4::Progress class.

data/ext/P4/p4clientapi.cpp

@@ -92,9 +92,19 @@ P4ClientApi::P4ClientApi() : ui( &specMgr )
     const char *t;
 
     henv.GetTicketFile( ticketFile );
-    
+
+    if( (t = enviro->Get("P4TICKETS")) )
+	   ticketFile = t;
+
+    //
+    // Load the current trust file. Start with the default, and then
+    // override it if P4TRUST is set.
+    //
+
+    henv.GetTrustFile( trustFile );
+
     if( (t = enviro->Get("P4TICKETS")) )
-	ticketFile = t;
+        trustFile = t;
 
     //
     // Load the current P4CHARSET if set.
@@ -132,7 +142,7 @@ P4ClientApi::GetEnviroFile()
     return enviro->GetEnviroFile();
 }
 
-void 
+void
 P4ClientApi::SetApiLevel( int level )
 {
     StrBuf	b;
@@ -192,7 +202,14 @@ P4ClientApi::SetTicketFile( const char *p )
     ticketFile = p;
 }
 
-void 
+void
+P4ClientApi::SetTrustFile( const char *p )
+{
+    client.SetTrustFile( p );
+    trustFile = p;
+}
+
+void
 P4ClientApi::SetDebug( int d )
 {
     debug = d;
@@ -241,7 +258,7 @@ P4ClientApi::SetEnv( const char *var, const char *val )
 // connect to the Perforce server.
 //
 
-VALUE 
+VALUE
 P4ClientApi::Connect()
 {
     if ( P4RDB_COMMANDS )
@@ -288,7 +305,7 @@ P4ClientApi::ConnectOrReconnect()
 //
 // Disconnect session
 //
-VALUE 
+VALUE
 P4ClientApi::Disconnect()
 {
     if ( P4RDB_COMMANDS )
@@ -306,6 +323,9 @@ P4ClientApi::Disconnect()
     // Clear the specdef cache.
     specMgr.Reset();
 
+    // Clear out any results from the last command
+    ui.Reset();
+
     return Qtrue;
 }
 
@@ -322,7 +342,7 @@ P4ClientApi::Connected()
     return Qfalse;
 }
 
-void 
+void
 P4ClientApi::Tagged( int enable )
 {
     if( enable )
@@ -418,7 +438,7 @@ P4ClientApi::IsIgnored( const char *path )
 // is raised.
 //
 
-VALUE 
+VALUE
 P4ClientApi::Run( const char *cmd, int argc, char * const *argv )
 {
     // Save the entire command string for our error messages. Makes it
@@ -523,7 +543,7 @@ P4ClientApi::RunCmd( const char *cmd, ClientUser *ui, int argc, char * const *ar
 
 //
 // Parses a string supplied by the user into a hash. To do this we need
-// the specstring from the server. We try to cache those as we see them, 
+// the specstring from the server. We try to cache those as we see them,
 // but the user may not have executed any commands to allow us to cache
 // them so we may have to fetch the spec first.
 //
@@ -551,7 +571,7 @@ P4ClientApi::ParseSpec( const char * type, const char *form )
     Error e;
     VALUE v;
     v = specMgr.StringToSpec( type, form, &e );
-    
+
     if ( e.Test() )
     {
 	if( exceptionLevel )
@@ -562,7 +582,7 @@ P4ClientApi::ParseSpec( const char * type, const char *form )
 
     return v;
 }
-    
+
 
 //
 // Converts a hash supplied by the user into a string using the specstring
@@ -588,14 +608,14 @@ P4ClientApi::FormatSpec( const char * type, VALUE hash )
 	}
     }
 
-    // Got a specdef so now we can attempt to convert. 
+    // Got a specdef so now we can attempt to convert.
     StrBuf	buf;
     Error	e;
 
     specMgr.SpecToString( type, hash, buf, &e );
     if( !e.Test() )
 	return P4Utils::ruby_string( buf.Text() );
-    
+
     if( exceptionLevel )
     {
 	StrBuf m;
@@ -631,7 +651,7 @@ P4ClientApi::SpecFields( const char * type )
 
     return specMgr.SpecFields( type );
 }
-    
+
 //
 // Raises an exception or returns Qfalse on bad input
 //
@@ -697,13 +717,13 @@ P4ClientApi::Except( const char *func, const char *msg )
     StrBuf	errors;
     StrBuf	warnings;
     int		terminate = 0;
-    
+
     m << "[" << func << "] " << msg;
 
     // Now append any errors and warnings to the text
     ui.GetResults().FmtErrors( errors );
     ui.GetResults().FmtWarnings( warnings );
-    
+
     if( errors.Length() )
     {
 	m << "\n" << errors;
@@ -740,4 +760,3 @@ P4ClientApi::Except( const char *func, Error *e )
     e->Fmt( &m );
     Except( func, m.Text() );
 }
-

data/ext/P4/p4clientapi.h

@@ -85,6 +85,7 @@ public:
     void SetProg( const char *p )	{ prog = p;			}
     void SetProtocol( const char *var, const char *val );
     void SetTicketFile( const char *p );
+    void SetTrustFile( const char *p );
     void SetUser( const char *u )	{ client.SetUser( u );		}
     void SetVersion( const char *v )	{ version = v;			}
 
@@ -102,6 +103,7 @@ public:
     const StrPtr &GetPort()		{ return client.GetPort();	}
     const StrPtr &GetProg()		{ return prog;			}
     const StrPtr &GetTicketFile()	{ return ticketFile;		}
+    const StrPtr &GetTrustFile()   { return trustFile;        }
     const StrPtr &GetUser()		{ return client.GetUser();	}
     const StrPtr &GetVersion()		{ return version;		}
 
@@ -234,6 +236,7 @@ private:
     StrBuf		prog;
     StrBuf		version;
     StrBuf		ticketFile;
+    StrBuf      trustFile;
     int			depth;
     int			debug;
     int			exceptionLevel;
@@ -244,4 +247,3 @@ private:
     int			maxScanRows;
     int			maxLockTime;
 };
-

data/ext/P4/p4error.cpp

@@ -88,6 +88,21 @@ P4Error::GetText()
     return P4Utils::ruby_string( t.Text(), t.Length() );
 }
 
+VALUE
+P4Error::GetDict()
+{
+    VALUE dictHash = rb_hash_new();
+    StrDict* pDict = error.GetDict();
+    StrRef key, val;
+    // suppress -Wpointer-arith
+    for (int i=0;pDict->GetVar(i,key,val) != 0;i++) {
+      rb_hash_aset( dictHash,
+        P4Utils::ruby_string(key.Text(), key.Length()),
+        P4Utils::ruby_string(val.Text(), val.Length()));
+    }
+    return dictHash;
+}
+
 VALUE
 P4Error::Inspect()
 {

data/ext/P4/p4error.h

@@ -46,6 +46,7 @@ class P4Error
     VALUE	GetGeneric();
     VALUE	GetSeverity();
     VALUE	GetText();
+    VALUE   GetDict();
     VALUE	Inspect();
 
     // Wrap as Ruby object of class pClass

data/ext/P4/p4result.cpp

@@ -57,6 +57,7 @@ P4Result::P4Result()
     VALUE cP4	= rb_const_get_at( rb_cObject, idP4 );
     cP4Msg	= rb_const_get_at( cP4, idP4Msg );
 
+    Reset();
 }
 
 

data/ext/P4/specmgr.cpp

@@ -63,21 +63,6 @@ struct defaultspec {
             "unlocked/locked;;"
         "View;code:311;type:wlist;words:2;len:64;;"
     },
-    {
-        "changeX",
-        "Change;code:201;rq;ro;fmt:L;seq:1;len:10;;"
-        "Date;code:202;type:date;ro;fmt:R;seq:3;len:20;;"
-        "Client;code:203;ro;fmt:L;seq:2;len:32;;"
-        "User;code:204;ro;fmt:L;seq:4;len:32;;"
-        "Status;code:205;ro;fmt:R;seq:5;len:10;;"
-        "Type;code:211;seq:6;type:select;fmt:L;len:10;"
-            "val:public/restricted;;"
-        "ImportedBy;code:212;type:line;ro;fmt:L;len:32;;"
-        "Identity;code:213;type:line;;"
-        "Description;code:206;type:text;rq;;"
-        "Jobs;code:209;type:wlist;words:2;len:32;;"
-        "Files;code:210;type:llist;len:64;;"
-    },
     {
         "change",
         "Change;code:201;rq;ro;fmt:L;seq:1;len:10;;"
@@ -92,6 +77,7 @@ struct defaultspec {
         "Description;code:206;type:text;rq;seq:7;;"
         "JobStatus;code:207;fmt:I;type:select;seq:9;;"
         "Jobs;code:208;type:wlist;seq:8;len:32;;"
+        "Stream;code:214;type:line;len:64;;"
         "Files;code:210;type:llist;len:64;;"
     },
     {
@@ -115,47 +101,12 @@ struct defaultspec {
         "Stream;code:314;type:line;len:64;;"
         "StreamAtChange;code:316;type:line;len:64;;"
         "ServerID;code:315;type:line;ro;len:64;;"
-        "Type;code:318;type:select;len:10;val:writeable/readonly;;"
+        "Type;code:318;type:select;len:10;val:"
+            "writeable/readonly/graph/partitioned;;"
         "Backup;code:319;type:select;len:10;val:enable/disable;;"
         "View;code:311;type:wlist;words:2;len:64;;"
         "ChangeView;code:317;type:llist;len:64;;"
     },
-    {
-        "clientX",
-        "Client;code:301;rq;ro;seq:1;len:32;;"
-        "Update;code:302;type:date;ro;seq:2;fmt:L;len:20;;"
-        "Access;code:303;type:date;ro;seq:4;fmt:L;len:20;;"
-        "Owner;code:304;seq:3;fmt:R;len:32;;"
-        "Host;code:305;seq:5;fmt:R;len:32;;"
-        "Description;code:306;type:text;len:128;;"
-        "Root;code:307;rq;type:line;len:64;;"
-        "AltRoots;code:308;type:llist;len:64;;"
-        "Options;code:309;type:line;len:64;val:"
-            "noallwrite/allwrite,noclobber/clobber,nocompress/compress,"
-            "unlocked/locked,nomodtime/modtime,normdir/rmdir;;"
-        "SubmitOptions;code:313;type:select;fmt:L;len:25;val:"
-            "submitunchanged/submitunchanged+reopen/revertunchanged/"
-            "revertunchanged+reopen/leaveunchanged/leaveunchanged+reopen;;"
-        "LineEnd;code:310;type:select;fmt:L;len:12;val:"
-            "local/unix/mac/win/share;;"
-        "View;code:311;type:wlist;words:2;len:64;;"
-    },
-    {
-        "clientSpecing021",
-        "Client;code:301;rq;ro;len:32;;"
-        "Update;code:302;type:date;ro;len:20;;"
-        "Access;code:303;type:date;ro;len:20;;"
-        "Owner;code:304;len:32;;"
-        "Host;code:305;len:32;;"
-        "Description;code:306;type:text;len:128;;"
-        "Root;code:307;rq;type:line;len:64;;"
-        "AltRoots;code:308;type:text;len:64;;"
-        "Options;code:309;type:line;len:64;val:"
-            "noallwrite/allwrite,noclobber/clobber,nocompress/compress,"
-            "unlocked/locked,nomodtime/modtime,normdir/rmdir;;"
-        "LineEnd;code:310;type:select;len:12;val:local/unix/mac/win/share;;"
-        "View;code:311;type:wlist;words:2;len:64;;"
-    },
     {
         "depot",
         "Depot;code:251;rq;ro;len:32;;"
@@ -175,11 +126,13 @@ struct defaultspec {
         "MaxResults;code:402;type:word;len:12;;"
         "MaxScanRows;code:403;type:word;len:12;;"
         "MaxLockTime;code:407;type:word;len:12;;"
+	"MaxOpenFiles;code:413;type:word;len:12;;"
         "Timeout;code:406;type:word;len:12;;"
         "PasswordTimeout;code:409;type:word;len:12;;"
         "LdapConfig;code:410;type:line;len:128;;"
         "LdapSearchQuery;code:411;type:line;len:128;;"
         "LdapUserAttribute;code:412;type:line;len:128;;"
+	"LdapUserDNAttribute;code:414;type:line;len:128;;"
         "Subgroups;code:404;type:wlist;len:32;opt:default;;"
         "Owners;code:408;type:wlist;len:32;opt:default;;"
         "Users;code:405;type:wlist;len:32;opt:default;;"
@@ -247,36 +200,62 @@ struct defaultspec {
         "Clients;code:458;len:8;;"
         "Users;code:459;len:8;;"
         "Files;code:460;len:8;;"
+	"Repos;code:462;len:8;;"
     },
     {
         "protect",
-        "Protections;code:501;fmt:C;type:wlist;words:5;opt:default;len:64;;"
+	"SubPath;code:502;ro;len:64;;"
+	"Update;code:503;type:date;ro;fmt:L;len:20;;"
+        "Protections;code:501;fmt:C;type:wlist;words:5;opt:default;z;len:64;;"
     },
     {
         "remote",
-        "RemoteID;code:851;rq;ro;len:32;;"
+        "RemoteID;code:851;rq;ro;fmt:L;len:32;;"
         "Address;code:852;rq;type:line;len:32;;"
         "Owner;code:853;fmt:R;len:32;;"
         "RemoteUser;code:861;fmt:R;len:32;;"
         "Options;code:854;type:line;len:32;val:"
-            "unlocked/lockednocompress/compress;;"
+            "unlocked/locked,nocompress/compress,copyrcs/nocopyrcs;;"
         "Update;code:855;type:date;ro;fmt:L;len:20;;"
         "Access;code:856;type:date;ro;fmt:L;len:20;;"
         "Description;code:857;type:text;len:128;;"
         "LastFetch;code:858;fmt:L;len:10;;"
         "LastPush;code:859;fmt:L;len:10;;"
         "DepotMap;code:860;type:wlist;words:2;len:64;;"
+        "ArchiveLimits;code:862;type:wlist;words:2;len:64;;"
     },
     {
-        "specW",
-        "Fields;code:351;type:wlist;words:5;rq;;"
-        "Required;code:357;type:wlist;;"
-        "Readonly;code:358;type:wlist;;"
-        "Words;code:352;type:wlist;words:2;;"
-        "Formats;code:353;type:wlist;words:3;;"
-        "Values;code:354;type:wlist;words:2;;"
-        "Presets;code:355;type:wlist;words:2;;"
-        "Comments;code:356;type:text;;"
+        "repo",
+	"Repo;code:1001;rq;ro;len:128;;"
+	"Owner;code:1002;len:32;;"
+	"Created;code:1003;type:date;ro;fmt:L;len:20;;"
+	"Pushed;code:1004;type:date;ro;fmt:L;len:20;;"
+	"ForkedFrom;code:1005;ro;len:128;;"
+	"Description;code:1006;type:text;len:128;;"
+	"DefaultBranch;code:1007;len:32;;"
+	"MirroredFrom;code:1008;len:32;;"
+	"Options;code:1009;type:select;len:10;val:lfs/nolfs;;"
+	"GconnMirrorServerId;code:1010;len:32;;"
+    },
+    {
+        "server",
+        "ServerID;code:751;rq;ro;len:32;;"
+	"Type;code:752;rq;len:32;;"
+	"Name;code:753;type:line;len:32;;"
+	"Address;code:754;type:line;len:32;;"
+	"ExternalAddress;code:755;type:line;len:32;;"
+	"Services;code:756;rq;len:128;;"
+	"Options;code:764;type:line;len:32;val:"
+	    "nomandatory/mandatory;;"
+	"ReplicatingFrom;code:765;type:line;len:32;;"
+	"Description;code:757;type:text;len:128;;"
+	"User;code:761;type:line;len:64;;"
+	"AllowedAddresses;code:763;type:wlist;len:64;;"
+	"UpdateCachedRepos;code:766;type:wlist;len:64;;"
+	"ClientDataFilter;code:758;type:wlist;len:64;;"
+	"RevisionDataFilter;code:759;type:wlist;len:64;;"
+	"ArchiveDataFilter;code:760;type:wlist;len:64;;"
+	"DistributedConfig;code:762;type:text;len:128;;"
     },
     {
         "spec",
@@ -293,28 +272,28 @@ struct defaultspec {
         "Stream;code:701;rq;ro;len:64;;"
         "Update;code:705;type:date;ro;fmt:L;len:20;;"
         "Access;code:706;type:date;ro;fmt:L;len:20;;"
-        "Owner;code:704;len:32;;"
-        "Name;code:703;rq;type:line;len:32;;"
+        "Owner;code:704;len:32;open:isolate;;"
+        "Name;code:703;rq;type:line;len:32;open:isolate;;"
         "Parent;code:702;rq;len:64;open:isolate;;"
         "Type;code:708;rq;len:32;open:isolate;;"
-        "Description;code:709;type:text;len:128;;"
+        "Description;code:709;type:text;len:128;open:isolate;;"
         "Options;code:707;type:line;len:64;val:"
             "allsubmit/ownersubmit,unlocked/locked,"
             "toparent/notoparent,fromparent/nofromparent,"
-            "mergedown/mergeany;;"
-        "Paths;code:710;rq;type:wlist;words:2;maxwords:3;len:64;open:isolate;;"
-        "Remapped;code:711;type:wlist;words:2;len:64;open:isolate;;"
-        "Ignored;code:712;type:wlist;words:1;len:64;open:isolate;;"
+            "mergedown/mergeany;open:isolate;;"
+        "Paths;code:710;rq;type:wlist;words:2;maxwords:3;len:64;open:propagate;;"
+        "Remapped;code:711;type:wlist;words:2;len:64;open:propagate;;"
+        "Ignored;code:712;type:wlist;words:1;len:64;open:propagate;;"
         "View;code:713;type:wlist;words:2;len:64;;"
         "ChangeView;code:714;type:llist;ro;len:64;;"
     },
     {
         "triggers",
-        "Triggers;code:551;type:wlist;words:4;len:64;opt:default;"
+        "Triggers;code:551;type:wlist;words:4;len:64;opt:default;z;;"
     },
     {
        "typemap",
-        "TypeMap;code:601;type:wlist;words:2;len:64;opt:default;"
+        "TypeMap;code:601;type:wlist;words:2;len:64;opt:default;z;;"
     },
     {
         "user",
@@ -326,23 +305,10 @@ struct defaultspec {
         "FullName;code:655;fmt:R;type:line;rq;len:32;;"
         "JobView;code:656;type:line;len:64;;"
         "Password;code:657;len:32;;"
-        "AuthMethod;code:662;fmt:L;len:10;val:perforce/ldap;;"
+        "AuthMethod;code:662;fmt:L;len:10;val:"
+            "perforce/perforce+2fa/ldap/ldap+2fa;;"
         "Reviews;code:658;type:wlist;len:64;;"
     },
-    {
-        "server",
-        "ServerID;code:751;rq;ro;len:32;;"
-        "Type;code:752;rq;len:32;;"
-        "Name;code:753;type:line;len:32;;"
-        "Address;code:754;type:line;len:32;;"
-        "ExternalAddress;code:755;type:line;len:32;;"
-        "Services;code:756;rq;len:128;;"
-        "Description;code:757;type:text;len:128;;"
-        "User;code:761;type:line;len:64;;"
-        "ClientDataFilter;code:758;type:wlist;len:64;;"
-        "RevisionDataFilter;code:759;type:wlist;len:64;;"
-        "ArchiveDataFilter;code:760;type:wlist;len:64;;"
-    },
     { 0, 0 }
 };