Changeset 166

Timestamp:

10/01/07 10:26:09 (6 years ago)

Author:

bruno

Message:

Attempt ro remove a pb on recent bash version (maybe)

Location:

devel/pb

Files:

• bin/pb (modified) (2 diffs)
• contrib/pbsetupqemu (modified) (6 diffs)

devel/pb/bin/pb

@@ -459 +459 @@
         if (($cmt eq "Sources") || ($cmt eq "VMs")) {
             $src = "$src $ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.gz";
-            $cmd = "$cmd ; ln -sf $pbpkg-$pbver.tar.gz $pbpkg-latest.tar.gz";
+            if ($cmd eq "") {
+                $cmd = "ln -sf $pbpkg-$pbver.tar.gz $pbpkg-latest.tar.gz";
+            } else {
+                $cmd = "$cmd ; ln -sf $pbpkg-$pbver.tar.gz $pbpkg-latest.tar.gz";
+            }
         }
     }
@@ -642 +646 @@
     $p = $ARGV[0] if (defined $ARGV[0]);
     print SCRIPT "echo Building packages on VM...\n";
-    print SCRIPT "pb build2pkg $p\n";
+    print SCRIPT "pb -p $ENV{'PBPROJ'} build2pkg $p\n";
     close(SCRIPT);
     chmod 0755,"$ENV{'PBDESTDIR'}/pbscript";

devel/pb/contrib/pbsetupqemu

@@ -3 +3 @@
 # Script to be used as pbscript to create a potentialy 
 # missing pb account on the QEMU VM, and adds it to sudo
+
+# Needs to be extented with the pb Distribution.pm module at the end externally
 # 
 # Needs to use root account to connect to the VM
@@ -11 +13 @@
 use strict;
 use File::Basename;
-use ProjectBuilder::Distribution qw (pb_distro_init); 
 
 my $file = "/tmp/pbkey";
@@ -38 +39 @@
 $file="/etc/shadow";
 open(PBFILE,$file) || die "Unable to open $file";
+open(PBOUT,"> $file.new") || die "Unable to open $file.new";
 while (<PBFILE>) {
     s/^pb:\!\!:/pb:*:/;
+    print PBOUT $_;
 }
 close(PBFILE);
+close(PBOUT);
+rename("$file.new",$file);
 
 # Adapt sudoers
@@ -47 +52 @@
 $found = 0;
 open(PBFILE,$file) || die "Unable to open $file";
+open(PBOUT,"> $file.new") || die "Unable to open $file.new";
 while (<PBFILE>) {
     $found = 1 if (/^pb   /);
+    s/Defaults[ \t]+requiretty//;
+    print PBOUT $_;
 }
 close(PBFILE);
-
-if ( $found == 0 ) {
-    open(PBFILE,">> $file") || die "Unable to open $file";
-    print PBFILE "pb   ALL=(ALL) NOPASSWD:ALL\n";
-}
+print PBFILE "pb   ALL=(ALL) NOPASSWD:ALL\n" if ( $found == 0 );
+close(PBOUT);
+rename("$file.new",$file);
 
 system 'su - pb -c "mkdir -p .ssh ; chmod 700 .ssh ; cp /tmp/pbkey .ssh/authorized_keys ; chmod 600 .ssh/authorized_keys"';
@@ -67 +73 @@
     if ( $dver <= 4 ) {
         # FC4
-        system "yum -y install neon newt-devel slang-devel autoconf automake libtool gcc rpm-build wget gcc-c++ docbook-utils-pdf ImageMagick man patch cdrecord mkisofs perl-DateManip ; rm -rf AppConfig-* ; wget http://search.cpan.org/CPAN/authors/id/A/AB/ABW/AppConfig-1.66.tar.gz ; tar xvfz AppConfig-1.66.tar.gz ; cd AppConfig* ; perl Makefile.PL ; make ; make install ; cd ..";
+        system "yum -y install neon newt-devel slang-devel autoconf automake libtool gcc rpm-build wget gcc-c++ docbook-utils-pdf ImageMagick man patch cdrecord mkisofs perl-DateManip ntp ; rm -rf AppConfig-* ; wget http://search.cpan.org/CPAN/authors/id/A/AB/ABW/AppConfig-1.66.tar.gz ; tar xvfz AppConfig-1.66.tar.gz ; cd AppConfig* ; perl Makefile.PL ; make ; make install ; cd ..";
     } else {
         # FC5/6/7
-        system "yum -y install neon newt-devel slang-devel autoconf automake libtool gcc rpm-build wget vim gcc-c++ docbook-utils-pdf ImageMagick man patch cdrecord mkisofs perl-AppConfig perl-DateManip";
+        system "yum -y install neon newt-devel slang-devel autoconf automake libtool gcc rpm-build wget gcc-c++ docbook-utils-pdf ImageMagick man patch cdrecord mkisofs ntp perl-AppConfig perl-DateManip";
     }
 } elsif ( $dfam eq "md" ) {
-    system "urpmi --auto-select neon newt-devel slang-devel glibc-static-devel autoconf automake libtool gcc rpm-build wget gcc-c++ docbook-utils-pdf ImageMagick man patch mindi mondo mkisofs cdrecord perl-AppConfig perl-DateManip";
+    system "urpmi --auto-select neon newt-devel slang-devel glibc-static-devel autoconf automake libtool gcc rpm-build wget gcc-c++ docbook-utils-pdf ImageMagick man patch mindi mondo mkisofs cdrecord ntp-client perl-AppConfig perl-DateManip";
 } elsif ( $dfam eq "du" ) {
-    system "apt-get install autoconf automake libtool g++ wget patch mondo groff imagemagick docbook-utils docbook2x docbook-to-man openssh-server dpkg-dev debian-builder dh-make fakeroot libnewt-dev libncurses5-dev";
+    system "apt-get install autoconf automake libtool g++ wget patch mondo groff imagemagick docbook-utils docbook2x docbook-to-man openssh-server dpkg-dev debian-builder dh-make fakeroot libnewt-dev ntp-client libncurses5-dev";
 } elsif ( $dfam eq "gen" ) {
-    system "emerge neon newt slang autoconf automake subversion libtool gcc wget vim man groff lynx grub afio buffer mindi mondo-rescue cdrecord mkisofs";
+    system "emerge neon newt slang autoconf automake subversion libtool gcc wget vim man groff lynx grub afio buffer mindi mondo-rescue cdrecord mkisofs ntp-client";
 } else {
     print "No pkg to install\n";
 }
-
-$file = "/tmp/pbpatch";
-unlink $file;
-
-open(PBFILE,"> $file") || die "Unable to open $file";
-print PBFILE << 'EOF';
---- File.pm     2007-09-29 14:55:28.000000000 +0100
-+++ File.pm.new 2007-09-29 14:55:44.000000000 +0100
-@@ -15,7 +15,7 @@
- package AppConfig::File;
- use strict;
- use warnings;
--use AppConfig;
-+use AppConfig qw(:argcount);
- use AppConfig::State;
- our $VERSION = '1.65';
-
-@@ -208,6 +208,11 @@
-
-                 my $nargs = $state->_argcount($variable);
-
-+                # Fix a bug if the variable is a hash - 1 has been created as a key
-+                if ($nargs eq AppConfig::ARGCOUNT_HASH) {
-+                    delete $state->{ VARIABLE }->{ $variable }{1};
-+                }
-+
-                 # variables prefixed '-' are reset to their default values
-                 if ($flag eq '-') {
-                     $state->_default($variable);
-
-EOF
-close(PBFILE);
 
 # Patch AppConfig 
@@ -148 +122 @@
 
 system "rm -rf project-builder-* ; wget ftp://ftp.mondorescue.org/src/project-builder-latest.tar.gz ; tar xvfz project-builder-latest.tar.gz ; cd project-builder-* ; perl Makefile.PL ; make ; make install ; cd ..";
+