Changeset 1765 in ProjectBuilder

Timestamp:

Jun 1, 2013, 9:38:07 PM (12 years ago)

Author:

Bruno Cornec

Message:

• Adds support for Debian 7.0 to some projects
• latest cb commits
• mindi 2.1.5 announce

Location:

projects

Files:

• afio/pbconf/2.5/pbfilter/debian-6.0.pbf (added)
• buffer/pbconf/1.19/pbfilter/debian-6.0.pbf (added)
• casparbuster/devel/bin/cb (modified) (8 diffs)
• casparbuster/devel/etc/cb/plugins/shorewall.conf (modified) (3 diffs)
• casparbuster/devel/lib/CasparBuster/Plugin.pm (modified) (1 diff)
• mondorescue/pbconf/announces3.sql (modified) ( previous)
• mondorescue/pbconf/branches/3.0/pbfilter/debian-6.0.pbf (added)
• mondorescue/pbconf/branches/3.0/pbfilter/debian.pbf (modified) (1 diff)
• uuwl/pbconf/devel/pbfilter/debian.pbf (modified) (1 diff)

projects/casparbuster/devel/bin/cb

@@ -166 +166 @@
 pb_log(2,"%cb: ",Dumper($cb));
 
-if (defined $plugin) {
-    # Load plugins
-    cb_plugin_load();
-}
-
 my $basedir = $cb->{'basedir'}->{$appname};
 eval { $basedir =~ s/(\$ENV.+\})/$1/eeg };
@@ -184 +179 @@
 my $precmd = "";
 if (! -f $db) {
-    $precmd = "CREATE TABLE dates (id INTEGER PRIMARY KEY AUTOINCREMENT, date INTEGER, file VARCHAR[65535], machine VARCHAR[65535])";
+    $precmd = "CREATE TABLE dates (id INTEGER PRIMARY KEY AUTOINCREMENT, date INTEGER, file VARCHAR[65535], machine VARCHAR[65535], mode VARCHAR[4], uid VARCHAR[5], gid VARCHAR[5])";
 }
 
@@ -210 +205 @@
 umask(0022);
 pb_vcs_export(pb_vcs_get_uri($scheme,$basedir),$basedir,$dest);
+
+# Load all plugins plus the additional manually defined
+cb_plugin_load();
+if (defined $plugin) {
+    pb_conf_add("$basedir/plugins/$plugin") if (-f "$basedir/plugins/$plugin");
+}
 
 # Now distribute to the right machines
@@ -239 +240 @@
 
 pb_log(2,"Entering into cb_distribute with machine $machine\n");
-confess "No machine fiven to cb_distribute" if (not defined $machine);
+confess "No machine given to cb_distribute" if (not defined $machine);
 
 # Use potentially a remote account if defined
@@ -274 +275 @@
     $fullsource = "$machine/$source";
     pb_log(2,"fullsource is $fullsource\n");
-    my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,$atime,$mtime,$ctime,$blksize,$blocks) = stat("$dest/$fullsource") || die "Unable to stat $fullsource: $!";
     my $type = 'files';
     if (-d $fullsource) {
@@ -281 +281 @@
     die "ERROR: Only able to handle files or dirs with option --source\n" if ((! -d $fullsource) && (! -f $fullsource));
 
-    # We should get uid/gid from elsewhere as they're probably wrong locally
-    $cbp->{"cb.source"}->{$type}->{$source}->{'uid'} = $uid;
-    $cbp->{"cb.source"}->{$type}->{$source}->{'gid'} = $gid;
-    $cbp->{"cb.source"}->{$type}->{$source}->{'mode'} = $mode;
-    $cbp->{"cb.source"}->{$type}->{$source}->{'mtime'} = $mtime;
+    cb_fill_cbp("cb.source","$dest/$fullsource",$type,$source)
 }
 
@@ -427 +423 @@
 if (not $debug) {
     # Reminder: sudo should be configured for this account as Defaults !requiretty for this to work
-    print $chan "sudo tar -C $path -x -f $tarfile $tbextract\n";
+    print $chan "sudo tar -C $path --no-overwrite-dir -x -f $tarfile $tbextract\n";
     pb_log(0,"WARNING: $_\n") while (<$chan>);
 } else {
@@ -497 +493 @@
 return if ($targetname eq "");
 
-my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,$atime,$mtime,$ctime,$blksize,$blocks) = stat($File::Find::name);
-die "Unable to stat $File::Find::name" if (not defined $mode);
-# We should get uid/gid fro elsewhere as they're probably wrong locally
-$cbp->{"cb.full"}->{$type}->{$targetname}->{'uid'} = $uid;
-$cbp->{"cb.full"}->{$type}->{$targetname}->{'gid'} = $gid;
-$cbp->{"cb.full"}->{$type}->{$targetname}->{'mode'} = sprintf("%04o",$mode & 07777);
-$cbp->{"cb.full"}->{$type}->{$targetname}->{'mtime'} = $mtime;
-pb_log(2,"Adding $File::Find::name ($uid,$gid,$mode) to cbp\n");
-}
+cb_fill_cbp("cb.full",$File::Find::name,$type,$targetname)
+}
+
+sub cb_fill_cbp {
+
+my $k = shift;
+my $f = shift;
+my $type = shift;
+my $targetname = shift;
+
+my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,$atime,$mtime,$ctime,$blksize,$blocks) = stat($f);
+($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,$atime,$mtime,$ctime,$blksize,$blocks) = lstat($f) if (not defined $mode);
+die "Unable to stat $f" if (not defined $mode);
+# We should get uid/gid from elsewhere as they're probably wrong locally
+$cbp->{$k}->{$type}->{$targetname}->{'uid'} = $uid;
+$cbp->{$k}->{$type}->{$targetname}->{'gid'} = $gid;
+$cbp->{$k}->{$type}->{$targetname}->{'mode'} = sprintf("%04o",$mode & 07777);
+$cbp->{$k}->{$type}->{$targetname}->{'mtime'} = $mtime;
+pb_log(2,"Adding $f ($uid,$gid,$mode) to cbp\n");
+}

projects/casparbuster/devel/etc/cb/plugins/shorewall.conf

@@ -20 +20 @@
 #=cut
 #
-#cbpluginfiles shorewall = /etc/shorewall/*|root,root,0600
+cbpluginfiles shorewall = /etc/shorewall/.+|root,root,0600
 #
 #=item B<cbplugindirs>
@@ -30 +30 @@
 #
 #=cut
-#cbplugindirs shorewall = /etc/shorewall|root,root,0750
+cbplugindirs shorewall = /etc/shorewall|root,root,0750
 #
 #=item B<cbplugindirsandfiles>
@@ -40 +40 @@
 #
 #=cut
-#cbplugindirsandfiles shorewall =
+cbplugindirsandfiles shorewall =
 #
 #=item B<cbpluginpkgs>

projects/casparbuster/devel/lib/CasparBuster/Plugin.pm

@@ -64 +64 @@
 }
 closedir(DIR);
+
+my ($flist,$dlist,$dflist,$slist) = pb_conf_get_if("cbpluginfiles","cbplugindirs","cbplugindirsandfiles","cbppkgreload");
+if (defined $flist) {
+    foreach my $plugin (keys %$flist) {
+        foreach my $block (split(/;/,$flist->{$plugin})) {
+            pb_log(3,"block : $block\n");
+            my ($name,$tmp) = split(/\|/,$block);
+            ($cbp->{'files'}->{$name}->{'uid'},$cbp->{'files'}->{$name}->{'gid'},$cbp->{'files'}->{$name}->{'mode'}) = split(/\,/,$tmp);
+        }
+    }
+}
+if (defined $dlist) {
+    foreach my $plugin (keys %$dlist) {
+        foreach my $block (split(/;/,$dlist->{$plugin})) {
+            pb_log(3,"block : $block\n");
+            my ($name,$tmp) = split(/\|/,$block);
+            ($cbp->{'dirs'}->{$name}->{'uid'},$cbp->{'dirs'}->{$name}->{'gid'},$cbp->{'dirs'}->{$name}->{'mode'}) = split(/\,/,$tmp);
+        }
+    }
+}
+if (defined $dflist) {
+    foreach my $plugin (keys %$dflist) {
+        foreach my $block (split(/;/,$dflist->{$plugin})) {
+            pb_log(3,"block : $block\n");
+            my ($name,$tmp) = split(/\|/,$block);
+            ($cbp->{'dirsandfiles'}->{$name}->{'uid'},$cbp->{'dirsandfiles'}->{$name}->{'gid'},$cbp->{'dirsandfiles'}->{$name}->{'mode'}) = split(/\,/,$tmp);
+        }
+    }
+}
+if (defined $slist) {
+    foreach my $plugin (keys %$slist) {
+        foreach my $name (split(/,/,$slist->{$plugin})) {
+            $cbp->{'reload'}->{$plugin}->{'restart'} = $name;
+        }
+    }
 }
 

projects/mondorescue/pbconf/branches/3.0/pbfilter/debian.pbf

@@ -5 +5 @@
 #
 # PBDEBSTD is replaced by the Debian standard version
-filter PBDEBSTD = 3.8.0
+filter PBDEBSTD = 3.9.4
 
 # PBDEBCOMP is replaced by the Debian Compatibility value
-filter PBDEBCOMP = 7
+filter PBDEBCOMP = 9
 
 

projects/uuwl/pbconf/devel/pbfilter/debian.pbf

@@ -5 +5 @@
 #
 # PBDEBSTD is replaced by the Debian standard version
-filter PBDEBSTD = 3.8.0
+filter PBDEBSTD = 3.9.4
 
 # PBDEBCOMP is replaced by the Debian Compatibility value
-filter PBDEBCOMP = 7
+filter PBDEBCOMP = 9
 
+