Hinzugefügt:

  * Asterisk-Konfigurationsdateien fürs Webinterface.
  * Funktionierender Packager.
  * CUPS-Paket
Geändert:
  * Postfix ohne PostgreSQL

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@177 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/html/cgi-bin/asterisk.cgi/calls b/html/cgi-bin/asterisk.cgi/calls
new file mode 100644 (file)
index 0000000..99e2520
--- /dev/null
+++ b/html/cgi-bin/asterisk.cgi/calls
@@ -0,0 +1,116 @@
+#!/usr/bin/perl
+
+require '/var/ipfire/general-functions.pl';
+require "${General::swroot}/lang.pl";
+require "${General::swroot}/header.pl";
+
+&Header::showhttpheaders();
+
+my (%asterisksettings, %checked);
+
+my %cgiparams;
+
+&Header::getcgihash(\%cgiparams);
+
+$asterisksettings{'ACTION'} = '';
+
+$file = "/var/log/asterisk/cdr-csv/Master.csv";
+
+open(DATEN, "$file") or die "Can't open file: $file: $!\n";
+@datafile = <DATEN>;
+close(DATEN);
+
+&Header::openpage('asterisk', 1, '');
+
+&Header::openbigbox('100%', 'LEFT');
+
+if ($cgiparams{'ACTION'} eq $Lang::tr{'update'})
+{
+ $mday3     = $cgiparams{'day3'};
+ $mon3     = $cgiparams{'month3'};
+ $jahr3     = $cgiparams{'year3'};
+ $mday4     = $cgiparams{'day4'};
+ $mon4      = $cgiparams{'month4'};
+ $jahr4     = $cgiparams{'year4'};
+}
+else
+{
+ @datum3    = localtime(time());
+ ($sec3,$min3,$stunde3,$mday3,$mon3,$jahr3,$wday3,$yday3,$isdst3)=@datum3;
+ $jahr3     = $jahr3 + 1900;
+ $mon3      = $mon3+1;
+ if ($mon3 < 10) { $mon3 = "0$mon3"; }
+ if ($mday3 <10) { $mday3= "0$mday3";}
+ $sec4      = $sec3;
+ $min4      = $min3;
+ $stunde4   = $stunde3;
+ $mday4     = $mday3;
+ $mon4      = $mon3;
+ $jahr4     = $jahr3;
+ $wday4     = $wday3;
+ $isdst4    = $isdst3;
+}
+
+if ($errormessage) {
+       &openbox('100%', 'LEFT', $tr{'error messages'});
+       print "<FONT CLASS='base'>$errormessage&nbsp;</FONT>\n";
+       &closebox();
+}
+
+print "<FORM METHOD='POST'>\n";
+
+&Header::openbox('100%', 'LEFT', 'Filter');
+
+print <<END
+<center><table border=0><tr><td>&nbsp;</td><td width=50px>Tag:</td><td width=50px>Monat:</td><td width=50px>Jahr:</td></tr>
+<tr><td>Von: <td><input type=text name=day3 maxlength=2 size=2 value="$mday3"><td><input type=text name=month3 maxlength=2 size=2 value="$mon3"><td><input type=text name=year3 maxlength=4 size=4 value="$jahr3">
+<tr><td>Bis: <td><input type=text name=day4 maxlength=2 size=2 value="$mday4"><td><input type=text name=month4 maxlength=2 size=2 value="$mon4"><td><input type=text name=year4 maxlength=4 size=4 value="$jahr4">
+
+<tr><td colspan=2>Von oder zum Anrufer mit der ID/Nummer:<td colspan=2><input type=text name=number size=20 maxlength=100 value="$cgiparams{'number'}">
+
+<tr><td align=center colspan=4><input type=submit name='ACTION' value=$Lang::tr{'update'}>
+</table>
+END
+;
+
+&Header::closebox();
+
+&Header::openbox('100%', 'LEFT', 'Anrufe');
+print "<table border=0 width=100%>     <tr>                            <td align=center><b>Anfrufer    <td align=center><b>Angerufene  <td align=center><b>CallerID    <td align=center><b>Start des Anrufs                    <td align=center><b>Ende des Anrufs                     <td align=center><b>Dauer (in Sek.)     <td align=center><b>Status";
+print "<tr><td colspan=6>&nbsp;<!-- Platzhalter -->";
+foreach $line (reverse @datafile) {
+chomp $line;
+(@spalten) = split (/,/, $line);
+$spalten[1] =~ s/"//g;
+$spalten[2] =~ s/"//g;
+$spalten[4] =~ s/"//g;
+$spalten[10]=~ s/"//g;
+$spalten[11]=~ s/"//g;
+$spalten[13]=~ s/"//g;
+$spalten[14]=~ s/"//g;
+(@zdatum) = split (/ /, $spalten[11]);
+(@datu)   = split (/-/, $zdatum[0]);
+(@dzeit)  = split (/:/, $zdatum[1]);
+$datum1   = $datu[0].$datu[1].$datu[2];
+@datum2_1   = localtime(time());
+($sec,$min,$stunde,$mday,$mon,$jahr,$wday,$yday,$isdst)=@datum2_1;
+$jahr     = $jahr + 1900;
+$mon      = $mon+1;
+if ($mon < 10) { $mon = "0$mon"; }
+if ($mday <10) { $mday= "0$mday";}
+$datum2   = $jahr.$mon.$mday;
+$datum3_1 = $jahr3.$mon3.$mday3;
+$datum4_1 = $jahr4.$mon4.$mday4;
+$datum2          = $datum2-100;
+if ($datum1 ge $datum3_1 && $datum1 le $datum4_1 && ($cgiparams{'number'} eq '' || $cgiparams{'number'} eq $spalten[1] || $cgiparams{'number'} eq $spalten[2])) {
+print                                  "<tr bgcolor=#C0C0C0>   <td align=center><a target='_blank' href=$telline> $spalten[1]</a>      <td align=center>$spalten[2]    <td align=center>$spalten[4]    <td align=center bgcolor=#339933>$spalten[10]           <td align=center bgcolor=#339933>$spalten[11]           <td align=center>$spalten[13]           <td align=center bgcolor='#993333'><font color=white>$spalten[14]\n";}
+}
+print "</table>";
+
+&Header::closebox();
+
+print "</FORM>\n";
+
+&Header::closebigbox();
+
+&Header::closepage();

diff --git a/html/cgi-bin/asterisk.cgi/conf b/html/cgi-bin/asterisk.cgi/conf
new file mode 100644 (file)
index 0000000..aadbdb8
--- /dev/null
+++ b/html/cgi-bin/asterisk.cgi/conf
@@ -0,0 +1,161 @@
+#!/usr/bin/perl
+
+require '/var/ipfire/general-functions.pl';
+require "${General::swroot}/lang.pl";
+require "${General::swroot}/header.pl";
+
+&Header::showhttpheaders();
+
+my %cgiparams;
+
+&Header::getcgihash(\%cgiparams);
+
+&Header::openpage('asterisk', 1, '');
+
+&Header::openbigbox('100%', 'LEFT');
+
+if ($cgiparams{'ACTION'} eq $Lang::tr{'save'})
+  {
+        $conf_file = $cgiparams{'save_path'};
+        open (FILE, ">$conf_file") or die "Kann die Datei nicht speichern: $!";
+        flock (FILE, 2);
+        print FILE "$cgiparams{'textarea'}";
+        close FILE;
+        &Header::openbox('100%', 'LEFT', 'info');
+        print "$conf_file wurde gespeichert";
+        &Header::closebox();
+  }
+
+if ($cgiparams{'ACTION'} eq Bearbeiten)
+  {
+        $conf_file = $cgiparams{'conf_file'};
+  }
+
+if ($conf_file eq '') {
+       $conf_file='/etc/asterisk/extensions.conf';
+  }
+
+if ($cgiparams{'ACTION'} eq extensions)
+  {
+       $conf_file='/etc/asterisk/extensions.conf';
+  }
+
+if ($cgiparams{'ACTION'} eq sip)
+  {
+       $conf_file='/etc/asterisk/sip.conf';
+  }
+
+if ($cgiparams{'ACTION'} eq iax)
+  {
+       $conf_file='/etc/asterisk/iax.conf';
+  }
+
+
+
+
+if ($errormessage) {
+       &Header::openbox('100%', 'LEFT', $tr{'error messages'});
+       print "<FONT CLASS='base'>$errormessage&nbsp;</FONT>\n";
+       &Header::closebox();
+}
+
+$cgiparams{'ACTION'} = '';
+
+print "<FORM METHOD='POST'>\n";
+
+if ($conf_file ne '') {
+
+&Header::openbox('100%', 'LEFT', $conf_file);
+       print <<END
+               <center><table border=0> 
+                       <tr><td><textarea name="textarea" cols="100" rows="20" wrap="VIRTUAL">
+END
+;
+system("cat $conf_file");
+print <<END
+</textarea>\n 
+
+       <tr><td align=center>
+       <p><input type=text name=save_path value=$conf_file size=25>
+       <p><input type=submit name=ACTION value=$Lang::tr{'save'}>
+       </table>
+
+END
+;
+
+&Header::closebox();
+}
+
+&Header::openbox('100%', 'LEFT', 'Dateiauswahl');
+
+my $dir = '/vbar/ipfire/asterisk/';
+my @dateien;
+
+listFiles ($dir);
+
+print <<END
+<table width=100% border=0>
+<tr><td width=33% align=right>
+    <!-- Buttons -->
+       <input type=submit name=ACTION value=extensions><input type=submit name=ACTION value=sip><input type=submit name=ACTION value=iax>
+    <td width=33% align=right>
+       <center><select name=conf_file>
+END
+;
+foreach $line (sort (@dateien)) {
+$op_name =  $line;
+$op_name =~ s/$dir//g;
+print "<option value='$line'>$op_name</option>\n";
+}
+
+my $dir2 = '/home/httpd/cgi-bin/asterisk/conf/';
+my @dateien2;
+
+listFiles2 ($dir2);
+
+foreach $line2 (sort (@dateien2)) {
+$op_name2 =  $line2;
+$op_name2 =~ s/$dir2//g;
+print "<option value='$line2'>$op_name2</option>\n";
+}
+
+print "</select><input type=submit name=ACTION value=Bearbeiten></center><td width=33% align=right>&nbsp</table>";
+
+sub listFiles {
+local *DH;
+my ($item, $pfad);
+my $dir = shift;
+
+opendir (DH, $dir) or return;
+while ($item = readdir (DH)) {
+next if ( $item =~ /^\./ );
+$pfad = ( ($dir =~ /\/$/) ? ($dir . $item) : ($dir . '/'.$item) );
+push (@dateien, $pfad) if (-f $pfad);
+listFiles ($pfad) if (-d $pfad);
+}
+closedir (DH);
+}
+
+sub listFiles2 {
+local *DH2;
+my ($item2, $pfad2);
+my $dir2 = shift;
+
+opendir (DH2, $dir2) or return;
+while ($item2 = readdir (DH2)) {
+next if ( $item2 =~ /^\./ );
+$pfad2 = ( ($dir2 =~ /\/$/) ? ($dir2 . $item2) : ($dir2 . '/'.$item2) );
+push (@dateien2, $pfad2) if (-f $pfad2);
+listFiles2 ($pfad2) if (-d $pfad2);
+}
+closedir (DH2);
+}
+
+
+&Header::closebox();
+
+print "</FORM>\n";
+
+&Header::closebigbox();
+
+&Header::closepage();

diff --git a/html/cgi-bin/asterisk.cgi/status b/html/cgi-bin/asterisk.cgi/status
new file mode 100644 (file)
index 0000000..c6af9e2
--- /dev/null
+++ b/html/cgi-bin/asterisk.cgi/status
@@ -0,0 +1,147 @@
+#!/usr/bin/perl
+
+require '/var/ipcop/general-functions.pl';
+require "${General::swroot}/lang.pl";
+require "${General::swroot}/header.pl";
+
+&Header::showhttpheaders();
+
+my %asterisksettings;
+
+&Header::getcgihash(\%asterisksettings);
+
+&Header::openpage('asterisk', 1, '');
+
+&Header::openbigbox('100%', 'LEFT');
+
+if ($asterisksettings{'ACTION'} eq $Lang::tr{'save'})
+{
+
+       &General::writehash("${General::swroot}/asterisk/settings", \%asterisksettings);
+
+       if ($asterisksettings{'ENABLE_AST'} eq 'on')
+       {
+               &General::log('Asterisk is enabled');
+               system ('/bin/touch', "${General::swroot}/asterisk/enable");
+       }
+       else
+       {
+               &General::log('Asterisk is disabled');
+               unlink "${General::swroot}/asterisk/enable";
+       }
+
+       if ($asterisksettings{'ENABLE_CAPI'} eq 'on')
+       {
+               &General::log('CAPI is enabled');
+               system ('/bin/touch', "${General::swroot}/asterisk/capi");
+       }
+       else
+       {
+               &General::log('CAPI is disabled');
+               unlink "${General::swroot}/asterisk/capi";
+       }
+
+       if ($asterisksettings{'ENABLE_ZAP'} eq 'on')
+       {
+               &General::log('Zaptel is enabled');
+               system ('/bin/touch', "${General::swroot}/asterisk/zap");
+       }
+       else
+       {
+               &General::log('Zaptel is disabled');
+               unlink "${General::swroot}/asterisk/zap";
+       }
+
+       {
+       &General::writehash("${General::swroot}/asterisk/settings", \%asterisksettings);
+       }
+       
+       system("/usr/local/bin/asteriskoff >/dev/null 2>&1");
+       system("/bin/sleep 2");
+       system("/usr/local/bin/amportalconf >/dev/null 2>&1");
+       system("/usr/local/bin/asteriskmodules >/dev/null 2>&1");
+       system("/usr/local/bin/asteriskon >/dev/null 2>&1");
+       &General::log('Asterisk config changed');
+}
+
+&General::readhash("${General::swroot}/asterisk/settings", \%asterisksettings);
+
+$checked{'ENABLE_AST'}{'off'} = '';
+$checked{'ENABLE_AST'}{'on'} = '';
+$checked{'ENABLE_AST'}{$asterisksettings{'ENABLE_AST'}} = 'CHECKED';
+
+$checked{'ENABLE_CAPI'}{'off'} = '';
+$checked{'ENABLE_CAPI'}{'on'} = '';
+$checked{'ENABLE_CAPI'}{$asterisksettings{'ENABLE_CAPI'}} = 'CHECKED';
+
+$checked{'ENABLE_ZAP'}{'off'} = '';
+$checked{'ENABLE_ZAP'}{'on'} = '';
+$checked{'ENABLE_ZAP'}{$asterisksettings{'ENABLE_ZAP'}} = 'CHECKED';
+
+if ($errormessage) {
+       &Header::openbox('100%', 'LEFT', $tr{'error messages'});
+       print "<FONT CLASS='base'>$errormessage&nbsp;</FONT>\n";
+       &Header::closebox();
+}
+
+if ($message) {
+       &Header::openbox('100%', 'LEFT', 'Message');
+       print "<FONT CLASS='base'>$message&nbsp;</FONT>\n";
+       &Header::closebox();
+}
+
+print "<FORM METHOD='POST'>\n";
+
+&Header::openbox('100%', 'LEFT', 'Status:');
+       print <<END
+               <center>
+<TABLE WIDTH='100%'>
+<TR>
+       <TD WIDTH='33%' CLASS='base' ALIGN='RIGHT'><IMG SRC='/images/logoasterisk.gif' HEIGHT='100' BORDER='0' ALT='asterisk'></TD>
+       <TD WIDTH='33%' ALIGN='RIGHT'>Aktiviert:</TD>
+       <TD WIDTH='33%' ALIGN='LEFT'> <INPUT TYPE='checkbox' NAME='ENABLE_AST' $checked{'ENABLE_AST'}{'on'}></TD>
+</TR>
+<TR>
+       <TD WIDTH='33%' CLASS='base' ALIGN='RIGHT'>Load CAPI kernel modules:</TD>
+       <TD WIDTH='33%' ALIGN='RIGHT'>Aktiviert:</TD>
+       <TD WIDTH='33%' ALIGN='LEFT'> <INPUT TYPE='checkbox' NAME='ENABLE_CAPI' $checked{'ENABLE_CAPI'}{'on'}></TD>
+</TR>
+<TR>
+       <TD WIDTH='33%' CLASS='base' ALIGN='RIGHT'>Load ZAP kernel modules:</TD>
+       <TD WIDTH='33%' ALIGN='RIGHT'>Aktiviert:</TD>
+       <TD WIDTH='33%' ALIGN='LEFT'> <INPUT TYPE='checkbox' NAME='ENABLE_ZAP' $checked{'ENABLE_ZAP'}{'on'}></TD>
+</TR>
+<TR>
+       <TD WIDTH='33%'>&nbsp;</TD>
+       <TD WIDTH='33%' ALIGN='CENTER'><INPUT TYPE='submit' NAME='ACTION' VALUE='$Lang::tr{'save'}'></TD>
+       <TD WIDTH='33%'>&nbsp;</TD>
+</TR>
+
+</TABLE>
+END
+;
+
+&Header::closebox();
+
+&Header::openbox('100%', 'LEFT', 'Asterisk:');
+       print <<END
+               <center>
+<TABLE WIDTH='100%'>
+<TR>
+       <TD WIDTH='33%' CLASS='base' ALIGN='RIGHT'>&nbsp;</TD>
+       <TD WIDTH='33%' ALIGN='center'><a href="/cgi-bin/asterisk/conf.cgi">Konfiguration</TD>
+       <TD WIDTH='33%' ALIGN='LEFT'>&nbsp;</TD>
+</TR>
+<TR>
+       <TD WIDTH='33%' CLASS='base' ALIGN='RIGHT'>&nbsp;</TD>
+       <TD WIDTH='33%' ALIGN='center'><a href="/cgi-bin/asterisk/calls.cgi">Anrufe</TD>
+       <TD WIDTH='33%' ALIGN='LEFT'>&nbsp;</TD>
+</TR>
+</TABLE>
+END
+;
+&Header::closebox();
+
+&Header::closebigbox();
+
+&Header::closepage();

diff --git a/html/cgi-bin/iptables.cgi b/html/cgi-bin/iptables.cgi
index d62c84e37633a82d516eecf243ef17380cc791ee..25baef072f3e7bcfa611ad7ca170824b235209f2 100644 (file)
--- a/html/cgi-bin/iptables.cgi
+++ b/html/cgi-bin/iptables.cgi
@@ -102,3 +102,7 @@ END
 &Header::closebox();
 &Header::closebigbox();
 &Header::closepage();
+
+unlink /home/httpd/html/iptables.txt;
+unlink /home/httpd/html/iptablesmangle.txt;
+unlink /home/httpd/html/iptablesnat.txt;

diff --git a/lfs/Config b/lfs/Config
index af89c7ba8e5cb38684034866dcfacc621f5e2765..b53c96a10e53382e4ca049304927267eb6378309 100644 (file)
--- a/lfs/Config
+++ b/lfs/Config
@@ -133,19 +133,5 @@ define MD5
 endef
 
 define PAK
-       @rm -rf /install/packages/package /tmp/* /packagetmp.tar
-       cd /
-       mkdir -p  /install/packages/package
-       cp -f $(DIR_SRC)/src/paks/$(PROG)/{,un}install.sh /install/packages/package
-       cp -f $(DIR_SRC)/src/paks/$(PROG)/ROOTFILES       /install/packages/package
-       chmod 755 /install/packages/package/{,un}install.sh
-       tar --create -C / --files-from=/install/packages/package/ROOTFILES -f /packagetmp.tar --exclude='#*'
-       tar -x -C /tmp -f /packagetmp.tar
-       @rm -f /packagetmp.tar
-       @cd /tmp
-       tar zvcf /install/packages/package/files.tgz * -C /tmp
-       rm -rf /tmp/*
-       cd /install/packages/package && cat ROOTFILES | grep -v "#" > ROOTFILES && tar cfz ../$(PROG)-$(VER)-$(PAK_VER).tar.gz files.tgz install.sh uninstall.sh ROOTFILES
-       cd /install/packages && md5sum $(THISAPP)-$(PAK_VER).tar.gz > $(PROG)-$(VER)-$(PAK_VER).tar.gz.md5
-       @rm -rf /install/packages/package
+       /usr/local/bin/packager $(PROG) $(VER) $(PAK_VER)
 endef

diff --git a/lfs/cups b/lfs/cups
index eea9f8d5cb270f9fd65912869f6dca79aa5944c5..7320097936c752dda2b41c9e719b63c673a8cd85 100644 (file)
--- a/lfs/cups
+++ b/lfs/cups
@@ -33,6 +33,8 @@ DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/cups-$(VER)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = cups
+PAK_VER    = ipfire-beta1
 
 ###############################################################################
 # Top-level Rules
@@ -53,7 +55,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 md5 : $(subst %,%_MD5,$(objects))
 
 dist: 
-       make-packages.sh cups $(THISAPP)-ipfire-beta-1
+       @$(PAK)
 
 ###############################################################################
 # Downloading, checking, md5sum

diff --git a/lfs/postfix b/lfs/postfix
index 5b5829360d535d296bf9ab259dd58184e6c217fa..3a39197e89ea279e86b6059403ab8aaf64612508 100644 (file)
--- a/lfs/postfix
+++ b/lfs/postfix
@@ -78,8 +78,14 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && make -f Makefile.init makefiles \
-                               'CCARGS=-DDEF_DAEMON_DIR=\"/usr/lib/postfix\" -DDEF_MANPAGE_DIR=\"/usr/share/man\" -DUSE_TLS -DUSE_SALS_AUTH -DHAS_PGSQL -I/usr/include/openssl -DHAS_MYSQL -I/opt/lampp/include/mysql -I/usr/include/sasl -I/opt/lampp/include' \
-                               'AUXLIBS=-L/usr/lib -L/opt/lampp/lib/mysql -L/opt/lampp/lib -lmysqlclient -lz -lm -lssl -lsasl2 -lcrypto -lpq'
+                               'CCARGS=-DDEF_DAEMON_DIR=\"/usr/lib/postfix\" \
+                               -DDEF_MANPAGE_DIR=\"/usr/share/man\" \
+                               -DUSE_TLS -I/usr/include/openssl \
+                               -DUSE_SALS_AUTH -I/usr/include/sasl \
+                               -DHAS_PGSQL -I/opt/lampp/include \
+                               -DHAS_MYSQL -I/opt/lampp/include/mysql' \
+                               'AUXLIBS=-L/usr/lib -lz -lm  -lssl -lcrypto \
+                               -lmysqlclient -L/opt/lampp/lib/mysql -lsasl2 -lpq -L/opt/lampp/lib'
        cd $(DIR_APP) && make
        cd $(DIR_APP) && sh postfix-install -non-interactive
        ## Install configuration

diff --git a/lfs/xampp b/lfs/xampp
index 6aa3bf01f7c81f0900c33a4f79f0740757e01786..88daaace08c8d5a0d2a50c30b018a159ee1425de 100644 (file)
--- a/lfs/xampp
+++ b/lfs/xampp
@@ -113,6 +113,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        grep etc/python.conf /opt/lampp/etc/httpd.conf || echo -e "Include etc/python.conf" /opt/lampp/etc/httpd.conf
        chown -R nobody.nobody /opt/lampp/htdocs
        ln -fs /opt/lampp/lib/mysql/libmysqlclient.* /usr/lib
-       ln -fs /opt/lampp/lib/libpq.* /usr/lib
        ldconfig
        @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index 52799677080f8e940154076c8381960ecd7ab5bf..e986edd13133cfdc9f1cbd3d420b7b5172945a39 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -836,9 +836,13 @@ buildpackages() {
 }
 
 ipfirepackages() {
+  for i in `ls $BASEDIR/packages`; do
+       touch $BASEDIR/build/install/packages/$i.empty
+  done
   ipfiredist applejuice
   ipfiredist asterisk
   ipfiredist clamav
+  ipfiredist cups
   ipfiredist cyrusimap
   ipfiredist fetchmail
   ipfiredist gnump3d
@@ -849,10 +853,11 @@ ipfirepackages() {
   ipfiredist ntop
   ipfiredist postfix
   ipfiredist samba
-  # ipfiredist xampp
+  ipfiredist xampp
   ipfiredist xinetd
   test -d $BASEDIR/packages || mkdir $BASEDIR/packages
   mv -f $LFS/install/packages/*.{tar.gz,md5} $BASEDIR/packages >> $LOGFILE 2>&1
+  rm -rf  $BASEDIR/build/install/packages/*
 }
 
 # See what we're supposed to do

diff --git a/src/misc-progs/getipstat.c b/src/misc-progs/getipstat.c
index 808eec803c02cdea458f7ea109db0a6069a96ea3..70171a263185e88df20c8cba9cf2772797422613 100644 (file)
--- a/src/misc-progs/getipstat.c
+++ b/src/misc-progs/getipstat.c
@@ -21,6 +21,7 @@ int main(void)
        safe_system("/sbin/iptables -L -v -n > /home/httpd/html/iptables.txt");
        safe_system("/sbin/iptables -L -v -n -t nat > /home/httpd/html/iptablesnat.txt");
        safe_system("/sbin/iptables -t mangle -L -v -n > /home/httpd/html/iptablesmangle.txt");
+       safe_system("chown nobody.nobody /home/httpd/html/iptables.txt /home/httpd/html/iptablesnat.txt /home/httpd/html/iptablesmangle.txt");
        
        return 0;
 }

diff --git a/src/paks/cups/ROOTFILES b/src/paks/cups/ROOTFILES
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a901d0e4fc02ed95daa62adff3b90961dd7b0128 100644 (file)
--- a/src/paks/cups/ROOTFILES
+++ b/src/paks/cups/ROOTFILES
@@ -0,0 +1,781 @@
+#etc/rc.d/init.d/cups
+#etc/rc.d/rc0.d
+#etc/rc.d/rc0.d/K00cups
+#etc/rc.d/rc2.d
+#etc/rc.d/rc2.d/S99cups
+#etc/rc.d/rc3.d
+#etc/rc.d/rc3.d/S99cups
+#etc/rc.d/rc5.d
+#etc/rc.d/rc5.d/S99cups
+usr/bin/cancel
+usr/bin/cups-config
+usr/bin/cupstestppd
+usr/bin/disable
+usr/bin/enable
+usr/bin/lp
+usr/bin/lpoptions
+usr/bin/lppasswd
+usr/bin/lpq
+usr/bin/lpr
+usr/bin/lprm
+usr/bin/lpstat
+#usr/include/cups
+#usr/include/cups/cups.h
+#usr/include/cups/http.h
+#usr/include/cups/image.h
+#usr/include/cups/ipp.h
+#usr/include/cups/language.h
+#usr/include/cups/md5.h
+#usr/include/cups/ppd.h
+#usr/include/cups/raster.h
+#usr/lib/cups
+#usr/lib/cups/backend
+usr/lib/cups/backend/http
+usr/lib/cups/backend/ipp
+usr/lib/cups/backend/lpd
+usr/lib/cups/backend/parallel
+usr/lib/cups/backend/scsi
+usr/lib/cups/backend/serial
+usr/lib/cups/backend/smb
+usr/lib/cups/backend/socket
+usr/lib/cups/backend/usb
+#usr/lib/cups/cgi-bin
+usr/lib/cups/cgi-bin/admin.cgi
+usr/lib/cups/cgi-bin/classes.cgi
+usr/lib/cups/cgi-bin/jobs.cgi
+usr/lib/cups/cgi-bin/printers.cgi
+#usr/lib/cups/daemon
+usr/lib/cups/daemon/cups-lpd
+usr/lib/cups/daemon/cups-polld
+#usr/lib/cups/filter
+usr/lib/cups/filter/gziptoany
+usr/lib/cups/filter/hpgltops
+usr/lib/cups/filter/imagetops
+usr/lib/cups/filter/imagetoraster
+usr/lib/cups/filter/pdftops
+usr/lib/cups/filter/pstops
+usr/lib/cups/filter/rastertodymo
+usr/lib/cups/filter/rastertoepson
+usr/lib/cups/filter/rastertohp
+usr/lib/cups/filter/texttops
+#usr/lib/libcups.a
+#usr/lib/libcups.so
+usr/lib/libcups.so.2
+usr/lib/libcupsimage.a
+usr/lib/libcupsimage.so
+usr/lib/libcupsimage.so.2
+usr/sbin/accept
+usr/sbin/cupsaddsmb
+usr/sbin/cupsd
+usr/sbin/lpadmin
+usr/sbin/lpc
+usr/sbin/lpinfo
+usr/sbin/lpmove
+usr/sbin/reject
+#usr/share/cups
+#usr/share/cups/banners
+usr/share/cups/banners/classified
+usr/share/cups/banners/confidential
+usr/share/cups/banners/secret
+usr/share/cups/banners/standard
+usr/share/cups/banners/topsecret
+usr/share/cups/banners/unclassified
+#usr/share/cups/charsets
+usr/share/cups/charsets/iso-8859-1
+usr/share/cups/charsets/iso-8859-10
+usr/share/cups/charsets/iso-8859-13
+usr/share/cups/charsets/iso-8859-14
+usr/share/cups/charsets/iso-8859-15
+usr/share/cups/charsets/iso-8859-2
+usr/share/cups/charsets/iso-8859-3
+usr/share/cups/charsets/iso-8859-4
+usr/share/cups/charsets/iso-8859-5
+usr/share/cups/charsets/iso-8859-6
+usr/share/cups/charsets/iso-8859-7
+usr/share/cups/charsets/iso-8859-8
+usr/share/cups/charsets/iso-8859-9
+usr/share/cups/charsets/koi8-r
+usr/share/cups/charsets/koi8-u
+usr/share/cups/charsets/utf-8
+usr/share/cups/charsets/windows-1250
+usr/share/cups/charsets/windows-1251
+usr/share/cups/charsets/windows-1252
+usr/share/cups/charsets/windows-1253
+usr/share/cups/charsets/windows-1254
+usr/share/cups/charsets/windows-1255
+usr/share/cups/charsets/windows-1256
+usr/share/cups/charsets/windows-1257
+usr/share/cups/charsets/windows-1258
+usr/share/cups/charsets/windows-874
+#usr/share/cups/data
+usr/share/cups/data/HPGLprolog
+usr/share/cups/data/psglyphs
+usr/share/cups/data/testprint.ps
+#usr/share/cups/fonts
+usr/share/cups/fonts/Courier
+usr/share/cups/fonts/Courier-Bold
+usr/share/cups/fonts/Courier-BoldOblique
+usr/share/cups/fonts/Courier-Oblique
+usr/share/cups/fonts/Symbol
+#usr/share/cups/model
+usr/share/cups/model/deskjet.ppd
+usr/share/cups/model/deskjet2.ppd
+usr/share/cups/model/dymo.ppd
+usr/share/cups/model/epson24.ppd
+usr/share/cups/model/epson9.ppd
+usr/share/cups/model/laserjet.ppd
+usr/share/cups/model/okidat24.ppd
+usr/share/cups/model/okidata9.ppd
+usr/share/cups/model/stcolor.ppd
+usr/share/cups/model/stcolor2.ppd
+usr/share/cups/model/stphoto.ppd
+usr/share/cups/model/stphoto2.ppd
+usr/share/cups/model/zebra.ppd
+#usr/share/cups/templates
+usr/share/cups/templates/add-class.tmpl
+usr/share/cups/templates/add-printer.tmpl
+usr/share/cups/templates/admin-op.tmpl
+usr/share/cups/templates/admin.tmpl
+usr/share/cups/templates/be
+usr/share/cups/templates/be/add-class.tmpl
+usr/share/cups/templates/be/add-printer.tmpl
+usr/share/cups/templates/be/admin-op.tmpl
+usr/share/cups/templates/be/admin.tmpl
+usr/share/cups/templates/be/choose-device.tmpl
+usr/share/cups/templates/be/choose-make.tmpl
+usr/share/cups/templates/be/choose-members.tmpl
+usr/share/cups/templates/be/choose-model.tmpl
+usr/share/cups/templates/be/choose-serial.tmpl
+usr/share/cups/templates/be/choose-uri.tmpl
+usr/share/cups/templates/be/class-added.tmpl
+usr/share/cups/templates/be/class-confirm.tmpl
+usr/share/cups/templates/be/class-deleted.tmpl
+usr/share/cups/templates/be/class-modified.tmpl
+usr/share/cups/templates/be/classes.tmpl
+usr/share/cups/templates/be/config-printer.tmpl
+usr/share/cups/templates/be/config-printer2.tmpl
+usr/share/cups/templates/be/error.tmpl
+usr/share/cups/templates/be/header.tmpl
+usr/share/cups/templates/be/job-cancel.tmpl
+usr/share/cups/templates/be/job-hold.tmpl
+usr/share/cups/templates/be/job-op.tmpl
+usr/share/cups/templates/be/job-release.tmpl
+usr/share/cups/templates/be/job-restart.tmpl
+usr/share/cups/templates/be/jobs.tmpl
+usr/share/cups/templates/be/modify-class.tmpl
+usr/share/cups/templates/be/modify-printer.tmpl
+usr/share/cups/templates/be/option-boolean.tmpl
+usr/share/cups/templates/be/option-conflict.tmpl
+usr/share/cups/templates/be/option-header.tmpl
+usr/share/cups/templates/be/option-pickmany.tmpl
+usr/share/cups/templates/be/option-pickone.tmpl
+usr/share/cups/templates/be/option-trailer.tmpl
+usr/share/cups/templates/be/printer-accept.tmpl
+usr/share/cups/templates/be/printer-added.tmpl
+usr/share/cups/templates/be/printer-configured.tmpl
+usr/share/cups/templates/be/printer-confirm.tmpl
+usr/share/cups/templates/be/printer-deleted.tmpl
+usr/share/cups/templates/be/printer-modified.tmpl
+usr/share/cups/templates/be/printer-purge.tmpl
+usr/share/cups/templates/be/printer-reject.tmpl
+usr/share/cups/templates/be/printer-start.tmpl
+usr/share/cups/templates/be/printer-stop.tmpl
+usr/share/cups/templates/be/printers.tmpl
+usr/share/cups/templates/be/test-page.tmpl
+usr/share/cups/templates/be/trailer.tmpl
+usr/share/cups/templates/choose-device.tmpl
+usr/share/cups/templates/choose-make.tmpl
+usr/share/cups/templates/choose-members.tmpl
+usr/share/cups/templates/choose-model.tmpl
+usr/share/cups/templates/choose-serial.tmpl
+usr/share/cups/templates/choose-uri.tmpl
+usr/share/cups/templates/class-added.tmpl
+usr/share/cups/templates/class-confirm.tmpl
+usr/share/cups/templates/class-deleted.tmpl
+usr/share/cups/templates/class-modified.tmpl
+usr/share/cups/templates/classes.tmpl
+usr/share/cups/templates/config-printer.tmpl
+usr/share/cups/templates/config-printer2.tmpl
+#usr/share/cups/templates/de
+usr/share/cups/templates/de/add-class.tmpl
+usr/share/cups/templates/de/add-printer.tmpl
+usr/share/cups/templates/de/admin-op.tmpl
+usr/share/cups/templates/de/admin.tmpl
+usr/share/cups/templates/de/choose-device.tmpl
+usr/share/cups/templates/de/choose-make.tmpl
+usr/share/cups/templates/de/choose-members.tmpl
+usr/share/cups/templates/de/choose-model.tmpl
+usr/share/cups/templates/de/choose-serial.tmpl
+usr/share/cups/templates/de/choose-uri.tmpl
+usr/share/cups/templates/de/class-added.tmpl
+usr/share/cups/templates/de/class-confirm.tmpl
+usr/share/cups/templates/de/class-deleted.tmpl
+usr/share/cups/templates/de/class-modified.tmpl
+usr/share/cups/templates/de/classes.tmpl
+usr/share/cups/templates/de/config-printer.tmpl
+usr/share/cups/templates/de/config-printer2.tmpl
+usr/share/cups/templates/de/error.tmpl
+usr/share/cups/templates/de/header.tmpl
+usr/share/cups/templates/de/job-cancel.tmpl
+usr/share/cups/templates/de/job-hold.tmpl
+usr/share/cups/templates/de/job-op.tmpl
+usr/share/cups/templates/de/job-release.tmpl
+usr/share/cups/templates/de/job-restart.tmpl
+usr/share/cups/templates/de/jobs.tmpl
+usr/share/cups/templates/de/modify-class.tmpl
+usr/share/cups/templates/de/modify-printer.tmpl
+usr/share/cups/templates/de/option-boolean.tmpl
+usr/share/cups/templates/de/option-conflict.tmpl
+usr/share/cups/templates/de/option-header.tmpl
+usr/share/cups/templates/de/option-pickmany.tmpl
+usr/share/cups/templates/de/option-pickone.tmpl
+usr/share/cups/templates/de/option-trailer.tmpl
+usr/share/cups/templates/de/printer-accept.tmpl
+usr/share/cups/templates/de/printer-added.tmpl
+usr/share/cups/templates/de/printer-configured.tmpl
+usr/share/cups/templates/de/printer-confirm.tmpl
+usr/share/cups/templates/de/printer-deleted.tmpl
+usr/share/cups/templates/de/printer-modified.tmpl
+usr/share/cups/templates/de/printer-purge.tmpl
+usr/share/cups/templates/de/printer-reject.tmpl
+usr/share/cups/templates/de/printer-start.tmpl
+usr/share/cups/templates/de/printer-stop.tmpl
+usr/share/cups/templates/de/printers.tmpl
+usr/share/cups/templates/de/test-page.tmpl
+usr/share/cups/templates/de/trailer.tmpl
+usr/share/cups/templates/error.tmpl
+#usr/share/cups/templates/es
+usr/share/cups/templates/es/add-class.tmpl
+usr/share/cups/templates/es/add-printer.tmpl
+usr/share/cups/templates/es/admin-op.tmpl
+usr/share/cups/templates/es/admin.tmpl
+usr/share/cups/templates/es/choose-device.tmpl
+usr/share/cups/templates/es/choose-make.tmpl
+usr/share/cups/templates/es/choose-members.tmpl
+usr/share/cups/templates/es/choose-model.tmpl
+usr/share/cups/templates/es/choose-serial.tmpl
+usr/share/cups/templates/es/choose-uri.tmpl
+usr/share/cups/templates/es/class-added.tmpl
+usr/share/cups/templates/es/class-confirm.tmpl
+usr/share/cups/templates/es/class-deleted.tmpl
+usr/share/cups/templates/es/class-modified.tmpl
+usr/share/cups/templates/es/classes.tmpl
+usr/share/cups/templates/es/config-printer.tmpl
+usr/share/cups/templates/es/config-printer2.tmpl
+usr/share/cups/templates/es/error.tmpl
+usr/share/cups/templates/es/header.tmpl
+usr/share/cups/templates/es/job-cancel.tmpl
+usr/share/cups/templates/es/job-hold.tmpl
+usr/share/cups/templates/es/job-op.tmpl
+usr/share/cups/templates/es/job-release.tmpl
+usr/share/cups/templates/es/job-restart.tmpl
+usr/share/cups/templates/es/jobs.tmpl
+usr/share/cups/templates/es/modify-class.tmpl
+usr/share/cups/templates/es/modify-printer.tmpl
+usr/share/cups/templates/es/option-boolean.tmpl
+usr/share/cups/templates/es/option-conflict.tmpl
+usr/share/cups/templates/es/option-header.tmpl
+usr/share/cups/templates/es/option-pickmany.tmpl
+usr/share/cups/templates/es/option-pickone.tmpl
+usr/share/cups/templates/es/option-trailer.tmpl
+usr/share/cups/templates/es/printer-accept.tmpl
+usr/share/cups/templates/es/printer-added.tmpl
+usr/share/cups/templates/es/printer-configured.tmpl
+usr/share/cups/templates/es/printer-confirm.tmpl
+usr/share/cups/templates/es/printer-deleted.tmpl
+usr/share/cups/templates/es/printer-modified.tmpl
+usr/share/cups/templates/es/printer-purge.tmpl
+usr/share/cups/templates/es/printer-reject.tmpl
+usr/share/cups/templates/es/printer-start.tmpl
+usr/share/cups/templates/es/printer-stop.tmpl
+usr/share/cups/templates/es/printers.tmpl
+usr/share/cups/templates/es/test-page.tmpl
+usr/share/cups/templates/es/trailer.tmpl
+#usr/share/cups/templates/fr
+usr/share/cups/templates/fr/add-class.tmpl
+usr/share/cups/templates/fr/add-printer.tmpl
+usr/share/cups/templates/fr/admin-op.tmpl
+usr/share/cups/templates/fr/admin.tmpl
+usr/share/cups/templates/fr/choose-device.tmpl
+usr/share/cups/templates/fr/choose-make.tmpl
+usr/share/cups/templates/fr/choose-members.tmpl
+usr/share/cups/templates/fr/choose-model.tmpl
+usr/share/cups/templates/fr/choose-serial.tmpl
+usr/share/cups/templates/fr/choose-uri.tmpl
+usr/share/cups/templates/fr/class-added.tmpl
+usr/share/cups/templates/fr/class-confirm.tmpl
+usr/share/cups/templates/fr/class-deleted.tmpl
+usr/share/cups/templates/fr/class-modified.tmpl
+usr/share/cups/templates/fr/classes.tmpl
+usr/share/cups/templates/fr/config-printer.tmpl
+usr/share/cups/templates/fr/config-printer2.tmpl
+usr/share/cups/templates/fr/error.tmpl
+usr/share/cups/templates/fr/header.tmpl
+usr/share/cups/templates/fr/job-cancel.tmpl
+usr/share/cups/templates/fr/job-hold.tmpl
+usr/share/cups/templates/fr/job-op.tmpl
+usr/share/cups/templates/fr/job-release.tmpl
+usr/share/cups/templates/fr/job-restart.tmpl
+usr/share/cups/templates/fr/jobs.tmpl
+usr/share/cups/templates/fr/modify-class.tmpl
+usr/share/cups/templates/fr/modify-printer.tmpl
+usr/share/cups/templates/fr/option-boolean.tmpl
+usr/share/cups/templates/fr/option-conflict.tmpl
+usr/share/cups/templates/fr/option-header.tmpl
+usr/share/cups/templates/fr/option-pickmany.tmpl
+usr/share/cups/templates/fr/option-pickone.tmpl
+usr/share/cups/templates/fr/option-trailer.tmpl
+usr/share/cups/templates/fr/printer-accept.tmpl
+usr/share/cups/templates/fr/printer-added.tmpl
+usr/share/cups/templates/fr/printer-configured.tmpl
+usr/share/cups/templates/fr/printer-confirm.tmpl
+usr/share/cups/templates/fr/printer-deleted.tmpl
+usr/share/cups/templates/fr/printer-modified.tmpl
+usr/share/cups/templates/fr/printer-purge.tmpl
+usr/share/cups/templates/fr/printer-reject.tmpl
+usr/share/cups/templates/fr/printer-start.tmpl
+usr/share/cups/templates/fr/printer-stop.tmpl
+usr/share/cups/templates/fr/printers.tmpl
+usr/share/cups/templates/fr/test-page.tmpl
+usr/share/cups/templates/fr/trailer.tmpl
+usr/share/cups/templates/header.tmpl
+usr/share/cups/templates/job-cancel.tmpl
+usr/share/cups/templates/job-hold.tmpl
+usr/share/cups/templates/job-op.tmpl
+usr/share/cups/templates/job-release.tmpl
+usr/share/cups/templates/job-restart.tmpl
+usr/share/cups/templates/jobs.tmpl
+usr/share/cups/templates/modify-class.tmpl
+usr/share/cups/templates/modify-printer.tmpl
+usr/share/cups/templates/option-boolean.tmpl
+usr/share/cups/templates/option-conflict.tmpl
+usr/share/cups/templates/option-header.tmpl
+usr/share/cups/templates/option-pickmany.tmpl
+usr/share/cups/templates/option-pickone.tmpl
+usr/share/cups/templates/option-trailer.tmpl
+usr/share/cups/templates/printer-accept.tmpl
+usr/share/cups/templates/printer-added.tmpl
+usr/share/cups/templates/printer-configured.tmpl
+usr/share/cups/templates/printer-confirm.tmpl
+usr/share/cups/templates/printer-default.tmpl
+usr/share/cups/templates/printer-deleted.tmpl
+usr/share/cups/templates/printer-modified.tmpl
+usr/share/cups/templates/printer-purge.tmpl
+usr/share/cups/templates/printer-reject.tmpl
+usr/share/cups/templates/printer-start.tmpl
+usr/share/cups/templates/printer-stop.tmpl
+usr/share/cups/templates/printers.tmpl
+usr/share/cups/templates/test-page.tmpl
+usr/share/cups/templates/trailer.tmpl
+#usr/share/doc/cups
+usr/share/doc/cups/be
+usr/share/doc/cups/be/documentation.html
+usr/share/doc/cups/be/images
+usr/share/doc/cups/be/images/accept-jobs.gif
+usr/share/doc/cups/be/images/add-class.gif
+usr/share/doc/cups/be/images/add-printer.gif
+usr/share/doc/cups/be/images/cancel-job.gif
+usr/share/doc/cups/be/images/config-printer.gif
+usr/share/doc/cups/be/images/continue.gif
+usr/share/doc/cups/be/images/delete-class.gif
+usr/share/doc/cups/be/images/delete-printer.gif
+usr/share/doc/cups/be/images/hold-job.gif
+usr/share/doc/cups/be/images/manage-classes.gif
+usr/share/doc/cups/be/images/manage-jobs.gif
+usr/share/doc/cups/be/images/manage-printers.gif
+usr/share/doc/cups/be/images/modify-class.gif
+usr/share/doc/cups/be/images/modify-printer.gif
+usr/share/doc/cups/be/images/navbar.gif
+usr/share/doc/cups/be/images/print-test-page.gif
+usr/share/doc/cups/be/images/reject-jobs.gif
+usr/share/doc/cups/be/images/release-job.gif
+usr/share/doc/cups/be/images/restart-job.gif
+usr/share/doc/cups/be/images/show-active.gif
+usr/share/doc/cups/be/images/show-completed.gif
+usr/share/doc/cups/be/images/start-class.gif
+usr/share/doc/cups/be/images/start-printer.gif
+usr/share/doc/cups/be/images/stop-class.gif
+usr/share/doc/cups/be/images/stop-printer.gif
+usr/share/doc/cups/be/index.html
+usr/share/doc/cups/cmp.html
+usr/share/doc/cups/cmp.pdf
+usr/share/doc/cups/cups.css
+usr/share/doc/cups/cupsdoc.css
+#usr/share/doc/cups/de
+usr/share/doc/cups/de/documentation.html
+#usr/share/doc/cups/de/images
+usr/share/doc/cups/de/images/accept-jobs.gif
+usr/share/doc/cups/de/images/add-class.gif
+usr/share/doc/cups/de/images/add-printer.gif
+usr/share/doc/cups/de/images/cancel-job.gif
+usr/share/doc/cups/de/images/config-printer.gif
+usr/share/doc/cups/de/images/continue.gif
+usr/share/doc/cups/de/images/delete-class.gif
+usr/share/doc/cups/de/images/delete-printer.gif
+usr/share/doc/cups/de/images/hold-job.gif
+usr/share/doc/cups/de/images/manage-classes.gif
+usr/share/doc/cups/de/images/manage-jobs.gif
+usr/share/doc/cups/de/images/manage-printers.gif
+usr/share/doc/cups/de/images/modify-class.gif
+usr/share/doc/cups/de/images/modify-printer.gif
+usr/share/doc/cups/de/images/navbar.gif
+usr/share/doc/cups/de/images/print-test-page.gif
+usr/share/doc/cups/de/images/reject-jobs.gif
+usr/share/doc/cups/de/images/release-job.gif
+usr/share/doc/cups/de/images/restart-job.gif
+usr/share/doc/cups/de/images/show-active.gif
+usr/share/doc/cups/de/images/show-completed.gif
+usr/share/doc/cups/de/images/start-class.gif
+usr/share/doc/cups/de/images/start-printer.gif
+usr/share/doc/cups/de/images/stop-class.gif
+usr/share/doc/cups/de/images/stop-printer.gif
+usr/share/doc/cups/de/index.html
+usr/share/doc/cups/documentation.html
+#usr/share/doc/cups/es
+usr/share/doc/cups/es/documentation.html
+#usr/share/doc/cups/es/images
+usr/share/doc/cups/es/images/accept-jobs.gif
+usr/share/doc/cups/es/images/add-class.gif
+usr/share/doc/cups/es/images/add-printer.gif
+usr/share/doc/cups/es/images/cancel-job.gif
+usr/share/doc/cups/es/images/config-printer.gif
+usr/share/doc/cups/es/images/continue.gif
+usr/share/doc/cups/es/images/delete-class.gif
+usr/share/doc/cups/es/images/delete-printer.gif
+usr/share/doc/cups/es/images/hold-job.gif
+usr/share/doc/cups/es/images/manage-classes.gif
+usr/share/doc/cups/es/images/manage-jobs.gif
+usr/share/doc/cups/es/images/manage-printers.gif
+usr/share/doc/cups/es/images/modify-class.gif
+usr/share/doc/cups/es/images/modify-printer.gif
+usr/share/doc/cups/es/images/navbar.gif
+usr/share/doc/cups/es/images/print-test-page.gif
+usr/share/doc/cups/es/images/reject-jobs.gif
+usr/share/doc/cups/es/images/release-job.gif
+usr/share/doc/cups/es/images/restart-job.gif
+usr/share/doc/cups/es/images/set-as-default.gif
+usr/share/doc/cups/es/images/show-active.gif
+usr/share/doc/cups/es/images/show-completed.gif
+usr/share/doc/cups/es/images/start-class.gif
+usr/share/doc/cups/es/images/start-printer.gif
+usr/share/doc/cups/es/images/stop-class.gif
+usr/share/doc/cups/es/images/stop-printer.gif
+usr/share/doc/cups/es/index.html
+#usr/share/doc/cups/fr
+usr/share/doc/cups/fr/cups.css
+usr/share/doc/cups/fr/cupsdoc.css
+usr/share/doc/cups/fr/documentation.html
+#usr/share/doc/cups/fr/images
+usr/share/doc/cups/fr/images/accept-jobs.gif
+usr/share/doc/cups/fr/images/add-class.gif
+usr/share/doc/cups/fr/images/add-printer.gif
+usr/share/doc/cups/fr/images/cancel-job.gif
+usr/share/doc/cups/fr/images/config-printer.gif
+usr/share/doc/cups/fr/images/continue.gif
+usr/share/doc/cups/fr/images/delete-class.gif
+usr/share/doc/cups/fr/images/delete-printer.gif
+usr/share/doc/cups/fr/images/hold-job.gif
+usr/share/doc/cups/fr/images/manage-classes.gif
+usr/share/doc/cups/fr/images/manage-jobs.gif
+usr/share/doc/cups/fr/images/manage-printers.gif
+usr/share/doc/cups/fr/images/modify-class.gif
+usr/share/doc/cups/fr/images/modify-printer.gif
+usr/share/doc/cups/fr/images/navbar.gif
+usr/share/doc/cups/fr/images/print-test-page.gif
+usr/share/doc/cups/fr/images/reject-jobs.gif
+usr/share/doc/cups/fr/images/release-job.gif
+usr/share/doc/cups/fr/images/restart-job.gif
+usr/share/doc/cups/fr/images/show-active.gif
+usr/share/doc/cups/fr/images/show-completed.gif
+usr/share/doc/cups/fr/images/start-class.gif
+usr/share/doc/cups/fr/images/start-printer.gif
+usr/share/doc/cups/fr/images/stop-class.gif
+usr/share/doc/cups/fr/images/stop-printer.gif
+usr/share/doc/cups/fr/index.html
+usr/share/doc/cups/fr/overview.html
+usr/share/doc/cups/fr/overview.pdf
+usr/share/doc/cups/fr/sam.html
+usr/share/doc/cups/fr/sam.pdf
+usr/share/doc/cups/fr/sum.html
+usr/share/doc/cups/fr/sum.pdf
+usr/share/doc/cups/idd.html
+usr/share/doc/cups/idd.pdf
+#usr/share/doc/cups/images
+usr/share/doc/cups/images/accept-jobs.gif
+usr/share/doc/cups/images/add-class.gif
+usr/share/doc/cups/images/add-printer.gif
+usr/share/doc/cups/images/cancel-job.gif
+usr/share/doc/cups/images/classes.gif
+usr/share/doc/cups/images/config-printer.gif
+usr/share/doc/cups/images/continue.gif
+usr/share/doc/cups/images/cups-block-diagram.gif
+usr/share/doc/cups/images/cups-large.gif
+usr/share/doc/cups/images/cups-medium.gif
+usr/share/doc/cups/images/cups-small.gif
+usr/share/doc/cups/images/delete-class.gif
+usr/share/doc/cups/images/delete-printer.gif
+usr/share/doc/cups/images/hold-job.gif
+usr/share/doc/cups/images/left.gif
+usr/share/doc/cups/images/logo.gif
+usr/share/doc/cups/images/manage-classes.gif
+usr/share/doc/cups/images/manage-jobs.gif
+usr/share/doc/cups/images/manage-printers.gif
+usr/share/doc/cups/images/modify-class.gif
+usr/share/doc/cups/images/modify-printer.gif
+usr/share/doc/cups/images/navbar.gif
+usr/share/doc/cups/images/print-test-page.gif
+usr/share/doc/cups/images/printer-idle.gif
+usr/share/doc/cups/images/printer-processing.gif
+usr/share/doc/cups/images/printer-stopped.gif
+usr/share/doc/cups/images/reject-jobs.gif
+usr/share/doc/cups/images/release-job.gif
+usr/share/doc/cups/images/restart-job.gif
+usr/share/doc/cups/images/right.gif
+usr/share/doc/cups/images/set-as-default.gif
+usr/share/doc/cups/images/show-active.gif
+usr/share/doc/cups/images/show-completed.gif
+usr/share/doc/cups/images/start-class.gif
+usr/share/doc/cups/images/start-printer.gif
+usr/share/doc/cups/images/stop-class.gif
+usr/share/doc/cups/images/stop-printer.gif
+usr/share/doc/cups/index.html
+usr/share/doc/cups/ipp.html
+usr/share/doc/cups/ipp.pdf
+usr/share/doc/cups/overview.html
+usr/share/doc/cups/overview.pdf
+usr/share/doc/cups/robots.txt
+usr/share/doc/cups/sam.html
+usr/share/doc/cups/sam.pdf
+usr/share/doc/cups/sdd.html
+usr/share/doc/cups/sdd.pdf
+usr/share/doc/cups/spm.html
+usr/share/doc/cups/spm.pdf
+usr/share/doc/cups/sps.html
+usr/share/doc/cups/sps.pdf
+usr/share/doc/cups/ssr.html
+usr/share/doc/cups/ssr.pdf
+usr/share/doc/cups/stp.html
+usr/share/doc/cups/stp.pdf
+usr/share/doc/cups/sum.html
+usr/share/doc/cups/sum.pdf
+usr/share/doc/cups/svd.html
+usr/share/doc/cups/svd.pdf
+usr/share/doc/cups/translation.html
+usr/share/doc/cups/translation.pdf
+#usr/share/locale/C
+#usr/share/locale/C/cups_C
+#usr/share/locale/be/cups_be
+#usr/share/locale/cs/cups_cs
+#usr/share/locale/de/cups_de
+#usr/share/locale/en
+#usr/share/locale/en/cups_en
+#usr/share/locale/en_US
+#usr/share/locale/en_US/cups_en_US
+#usr/share/locale/es/cups_es
+#usr/share/locale/fr/cups_fr
+#usr/share/locale/he/cups_he
+#usr/share/locale/it/cups_it
+#usr/share/locale/ru_RU
+#usr/share/locale/ru_RU/cups_ru_RU
+#usr/share/locale/sv/cups_sv
+#usr/share/locale/uk/cups_uk
+#usr/share/locale/uk_UA
+#usr/share/locale/uk_UA/cups_uk_UA
+#usr/share/locale/zh_CN/cups_zh_CN
+#usr/share/man/cat1
+#usr/share/man/cat1/backend.1
+#usr/share/man/cat1/cancel.1
+#usr/share/man/cat1/cups-config.1
+#usr/share/man/cat1/cupstestppd.1
+#usr/share/man/cat1/filter.1
+#usr/share/man/cat1/lp.1
+#usr/share/man/cat1/lpoptions.1
+#usr/share/man/cat1/lppasswd.1
+#usr/share/man/cat1/lpq.1
+#usr/share/man/cat1/lpr.1
+#usr/share/man/cat1/lprm.1
+#usr/share/man/cat1/lpstat.1
+#usr/share/man/cat5
+#usr/share/man/cat5/classes.conf.5
+#usr/share/man/cat5/cupsd.conf.5
+#usr/share/man/cat5/mime.convs.5
+#usr/share/man/cat5/mime.types.5
+#usr/share/man/cat5/printers.conf.5
+#usr/share/man/cat8/accept.8
+#usr/share/man/cat8/cups-lpd.8
+#usr/share/man/cat8/cups-polld.8
+#usr/share/man/cat8/cupsaddsmb.8
+#usr/share/man/cat8/cupsd.8
+#usr/share/man/cat8/disable.8
+#usr/share/man/cat8/enable.8
+#usr/share/man/cat8/lpadmin.8
+#usr/share/man/cat8/lpc.8
+#usr/share/man/cat8/lpinfo.8
+#usr/share/man/cat8/lpmove.8
+#usr/share/man/cat8/reject.8
+#usr/share/man/es/cat1
+#usr/share/man/es/cat1/backend.1
+#usr/share/man/es/cat1/cancel.1
+#usr/share/man/es/cat1/cups-config.1
+#usr/share/man/es/cat1/cupstestppd.1
+#usr/share/man/es/cat1/filter.1
+#usr/share/man/es/cat1/lp.1
+#usr/share/man/es/cat1/lpoptions.1
+#usr/share/man/es/cat1/lppasswd.1
+#usr/share/man/es/cat1/lpq.1
+#usr/share/man/es/cat1/lpr.1
+#usr/share/man/es/cat1/lprm.1
+#usr/share/man/es/cat1/lpstat.1
+#usr/share/man/es/cat5
+#usr/share/man/es/cat5/classes.conf.5
+#usr/share/man/es/cat5/cupsd.conf.5
+#usr/share/man/es/cat5/mime.convs.5
+#usr/share/man/es/cat5/mime.types.5
+#usr/share/man/es/cat5/printers.conf.5
+#usr/share/man/es/cat8
+#usr/share/man/es/cat8/accept.8
+#usr/share/man/es/cat8/cups-lpd.8
+#usr/share/man/es/cat8/cups-polld.8
+#usr/share/man/es/cat8/cupsaddsmb.8
+#usr/share/man/es/cat8/cupsd.8
+#usr/share/man/es/cat8/disable.8
+#usr/share/man/es/cat8/enable.8
+#usr/share/man/es/cat8/lpadmin.8
+#usr/share/man/es/cat8/lpc.8
+#usr/share/man/es/cat8/lpinfo.8
+#usr/share/man/es/cat8/lpmove.8
+#usr/share/man/es/cat8/reject.8
+#usr/share/man/es/man1/backend.1
+#usr/share/man/es/man1/cancel.1
+#usr/share/man/es/man1/cups-config.1
+#usr/share/man/es/man1/cupstestppd.1
+#usr/share/man/es/man1/filter.1
+#usr/share/man/es/man1/lp.1
+#usr/share/man/es/man1/lpoptions.1
+#usr/share/man/es/man1/lppasswd.1
+#usr/share/man/es/man1/lpq.1
+#usr/share/man/es/man1/lpr.1
+#usr/share/man/es/man1/lprm.1
+#usr/share/man/es/man1/lpstat.1
+#usr/share/man/es/man5
+#usr/share/man/es/man5/classes.conf.5
+#usr/share/man/es/man5/cupsd.conf.5
+#usr/share/man/es/man5/mime.convs.5
+#usr/share/man/es/man5/mime.types.5
+#usr/share/man/es/man5/printers.conf.5
+#usr/share/man/es/man8
+#usr/share/man/es/man8/accept.8
+#usr/share/man/es/man8/cups-lpd.8
+#usr/share/man/es/man8/cups-polld.8
+#usr/share/man/es/man8/cupsaddsmb.8
+#usr/share/man/es/man8/cupsd.8
+#usr/share/man/es/man8/disable.8
+#usr/share/man/es/man8/enable.8
+#usr/share/man/es/man8/lpadmin.8
+#usr/share/man/es/man8/lpc.8
+#usr/share/man/es/man8/lpinfo.8
+#usr/share/man/es/man8/lpmove.8
+#usr/share/man/es/man8/reject.8
+#usr/share/man/fr/cat1
+#usr/share/man/fr/cat1/backend.1
+#usr/share/man/fr/cat1/cancel.1
+#usr/share/man/fr/cat1/cups-config.1
+#usr/share/man/fr/cat1/cupstestppd.1
+#usr/share/man/fr/cat1/filter.1
+#usr/share/man/fr/cat1/lp.1
+#usr/share/man/fr/cat1/lpoptions.1
+#usr/share/man/fr/cat1/lppasswd.1
+#usr/share/man/fr/cat1/lpq.1
+#usr/share/man/fr/cat1/lpr.1
+#usr/share/man/fr/cat1/lprm.1
+#usr/share/man/fr/cat1/lpstat.1
+#usr/share/man/fr/cat5
+#usr/share/man/fr/cat5/classes.conf.5
+#usr/share/man/fr/cat5/cupsd.conf.5
+#usr/share/man/fr/cat5/mime.convs.5
+#usr/share/man/fr/cat5/mime.types.5
+#usr/share/man/fr/cat5/printers.conf.5
+#usr/share/man/fr/cat8
+#usr/share/man/fr/cat8/accept.8
+#usr/share/man/fr/cat8/cups-lpd.8
+#usr/share/man/fr/cat8/cups-polld.8
+#usr/share/man/fr/cat8/cupsaddsmb.8
+#usr/share/man/fr/cat8/cupsd.8
+#usr/share/man/fr/cat8/disable.8
+#usr/share/man/fr/cat8/enable.8
+#usr/share/man/fr/cat8/lpadmin.8
+#usr/share/man/fr/cat8/lpc.8
+#usr/share/man/fr/cat8/lpinfo.8
+#usr/share/man/fr/cat8/lpmove.8
+#usr/share/man/fr/cat8/reject.8
+#usr/share/man/fr/man1/backend.1
+#usr/share/man/fr/man1/cancel.1
+#usr/share/man/fr/man1/cups-config.1
+#usr/share/man/fr/man1/cupstestppd.1
+#usr/share/man/fr/man1/filter.1
+#usr/share/man/fr/man1/lp.1
+#usr/share/man/fr/man1/lpoptions.1
+#usr/share/man/fr/man1/lppasswd.1
+#usr/share/man/fr/man1/lpq.1
+#usr/share/man/fr/man1/lpr.1
+#usr/share/man/fr/man1/lprm.1
+#usr/share/man/fr/man1/lpstat.1
+#usr/share/man/fr/man5/classes.conf.5
+#usr/share/man/fr/man5/cupsd.conf.5
+#usr/share/man/fr/man5/mime.convs.5
+#usr/share/man/fr/man5/mime.types.5
+#usr/share/man/fr/man5/printers.conf.5
+#usr/share/man/fr/man8/accept.8
+#usr/share/man/fr/man8/cups-lpd.8
+#usr/share/man/fr/man8/cups-polld.8
+#usr/share/man/fr/man8/cupsaddsmb.8
+#usr/share/man/fr/man8/cupsd.8
+#usr/share/man/fr/man8/disable.8
+#usr/share/man/fr/man8/enable.8
+#usr/share/man/fr/man8/lpadmin.8
+#usr/share/man/fr/man8/lpc.8
+#usr/share/man/fr/man8/lpinfo.8
+#usr/share/man/fr/man8/lpmove.8
+#usr/share/man/fr/man8/reject.8
+#usr/share/man/man1/backend.1
+#usr/share/man/man1/cancel.1
+#usr/share/man/man1/cups-config.1
+#usr/share/man/man1/cupstestppd.1
+#usr/share/man/man1/filter.1
+#usr/share/man/man1/lp.1
+#usr/share/man/man1/lpoptions.1
+#usr/share/man/man1/lppasswd.1
+#usr/share/man/man1/lpq.1
+#usr/share/man/man1/lpr.1
+#usr/share/man/man1/lprm.1
+#usr/share/man/man1/lpstat.1
+#usr/share/man/man5/classes.conf.5
+#usr/share/man/man5/cupsd.conf.5
+#usr/share/man/man5/mime.convs.5
+#usr/share/man/man5/mime.types.5
+#usr/share/man/man5/printers.conf.5
+#usr/share/man/man8/accept.8
+#usr/share/man/man8/cups-lpd.8
+#usr/share/man/man8/cups-polld.8
+#usr/share/man/man8/cupsaddsmb.8
+#usr/share/man/man8/cupsd.8
+#usr/share/man/man8/disable.8
+#usr/share/man/man8/enable.8
+#usr/share/man/man8/lpadmin.8
+#usr/share/man/man8/lpc.8
+#usr/share/man/man8/lpinfo.8
+#usr/share/man/man8/lpmove.8
+#usr/share/man/man8/reject.8
+#var/ipfire/cups
+var/ipfire/cups/certs
+var/ipfire/cups/classes.conf
+var/ipfire/cups/client.conf
+var/ipfire/cups/cupsd.conf
+var/ipfire/cups/interfaces
+var/ipfire/cups/mime.convs
+var/ipfire/cups/mime.types
+var/ipfire/cups/ppd
+var/ipfire/cups/printers.conf
+var/log/cups
+var/spool/cups
+var/spool/cups/tmp
\ No newline at end of file

diff --git a/src/paks/java/ROOTFILES b/src/paks/java/ROOTFILES
index 071435e37ff7e2e1c1b33e6e2ea1fe98a5da5be5..14c5dfa898ffcb69d9baf9cb48a0c35ba51e36ed 100644 (file)
--- a/src/paks/java/ROOTFILES
+++ b/src/paks/java/ROOTFILES
@@ -1,6 +1,6 @@
 usr/bin/java
-usr/java
-usr/java/bin
+#usr/java
+#usr/java/bin
 usr/java/bin/ControlPanel
 usr/java/bin/java
 usr/java/bin/java_vm
@@ -17,15 +17,15 @@ usr/java/bin/rmiregistry
 usr/java/bin/servertool
 usr/java/bin/tnameserv
 usr/java/bin/unpack200
-usr/java/javaws
+#usr/java/javaws
 usr/java/javaws/javaws
-usr/java/lib
+#usr/java/lib
 usr/java/lib/applet
-usr/java/lib/audio
+#usr/java/lib/audio
 usr/java/lib/audio/soundbank.gm
 usr/java/lib/charsets.jar
 usr/java/lib/classlist
-usr/java/lib/cmm
+#usr/java/lib/cmm
 usr/java/lib/cmm/CIEXYZ.pf
 usr/java/lib/cmm/GRAY.pf
 usr/java/lib/cmm/LINEAR_RGB.pf
@@ -33,53 +33,53 @@ usr/java/lib/cmm/PYCC.pf
 usr/java/lib/cmm/sRGB.pf
 usr/java/lib/content-types.properties
 usr/java/lib/deploy.jar
-usr/java/lib/ext
+#usr/java/lib/ext
 usr/java/lib/ext/dnsns.jar
 usr/java/lib/ext/localedata.jar
 usr/java/lib/ext/sunjce_provider.jar
 usr/java/lib/ext/sunpkcs11.jar
 usr/java/lib/flavormap.properties
-usr/java/lib/fontconfig.RedHat.2.1.bfc
-usr/java/lib/fontconfig.RedHat.2.1.properties.src
-usr/java/lib/fontconfig.RedHat.3.bfc
-usr/java/lib/fontconfig.RedHat.3.properties.src
-usr/java/lib/fontconfig.RedHat.8.0.bfc
-usr/java/lib/fontconfig.RedHat.8.0.properties.src
-usr/java/lib/fontconfig.RedHat.9.0.bfc
-usr/java/lib/fontconfig.RedHat.9.0.properties.src
-usr/java/lib/fontconfig.RedHat.bfc
-usr/java/lib/fontconfig.RedHat.properties.src
-usr/java/lib/fontconfig.SuSE.bfc
-usr/java/lib/fontconfig.SuSE.properties.src
-usr/java/lib/fontconfig.Sun.2003.bfc
-usr/java/lib/fontconfig.Sun.2003.properties.src
-usr/java/lib/fontconfig.Sun.bfc
-usr/java/lib/fontconfig.Sun.properties.src
-usr/java/lib/fontconfig.Turbo.8.0.bfc
-usr/java/lib/fontconfig.Turbo.8.0.properties.src
-usr/java/lib/fontconfig.Turbo.bfc
-usr/java/lib/fontconfig.Turbo.properties.src
-usr/java/lib/fontconfig.bfc
-usr/java/lib/fontconfig.properties.src
-usr/java/lib/fonts
-usr/java/lib/fonts/LucidaBrightDemiBold.ttf
-usr/java/lib/fonts/LucidaBrightDemiItalic.ttf
-usr/java/lib/fonts/LucidaBrightItalic.ttf
-usr/java/lib/fonts/LucidaBrightRegular.ttf
-usr/java/lib/fonts/LucidaSansDemiBold.ttf
-usr/java/lib/fonts/LucidaSansRegular.ttf
-usr/java/lib/fonts/LucidaTypewriterBold.ttf
-usr/java/lib/fonts/LucidaTypewriterRegular.ttf
-usr/java/lib/fonts/fonts.dir
-usr/java/lib/i386
+#usr/java/lib/fontconfig.RedHat.2.1.bfc
+#usr/java/lib/fontconfig.RedHat.2.1.properties.src
+#usr/java/lib/fontconfig.RedHat.3.bfc
+#usr/java/lib/fontconfig.RedHat.3.properties.src
+#usr/java/lib/fontconfig.RedHat.8.0.bfc
+#usr/java/lib/fontconfig.RedHat.8.0.properties.src
+#usr/java/lib/fontconfig.RedHat.9.0.bfc
+#usr/java/lib/fontconfig.RedHat.9.0.properties.src
+#usr/java/lib/fontconfig.RedHat.bfc
+#usr/java/lib/fontconfig.RedHat.properties.src
+#usr/java/lib/fontconfig.SuSE.bfc
+#usr/java/lib/fontconfig.SuSE.properties.src
+#usr/java/lib/fontconfig.Sun.2003.bfc
+#usr/java/lib/fontconfig.Sun.2003.properties.src
+#usr/java/lib/fontconfig.Sun.bfc
+#usr/java/lib/fontconfig.Sun.properties.src
+#usr/java/lib/fontconfig.Turbo.8.0.bfc
+#usr/java/lib/fontconfig.Turbo.8.0.properties.src
+#usr/java/lib/fontconfig.Turbo.bfc
+#usr/java/lib/fontconfig.Turbo.properties.src
+#usr/java/lib/fontconfig.bfc
+#usr/java/lib/fontconfig.properties.src
+#usr/java/lib/fonts
+#usr/java/lib/fonts/LucidaBrightDemiBold.ttf
+#usr/java/lib/fonts/LucidaBrightDemiItalic.ttf
+#usr/java/lib/fonts/LucidaBrightItalic.ttf
+#usr/java/lib/fonts/LucidaBrightRegular.ttf
+#usr/java/lib/fonts/LucidaSansDemiBold.ttf
+#usr/java/lib/fonts/LucidaSansRegular.ttf
+#usr/java/lib/fonts/LucidaTypewriterBold.ttf
+#usr/java/lib/fonts/LucidaTypewriterRegular.ttf
+#usr/java/lib/fonts/fonts.dir
+#usr/java/lib/i386
 usr/java/lib/i386/awt_robot
-usr/java/lib/i386/client
+#usr/java/lib/i386/client
 usr/java/lib/i386/client/Xusage.txt
 usr/java/lib/i386/client/classes.jsa
 usr/java/lib/i386/client/libjsig.so
 usr/java/lib/i386/client/libjvm.so
 usr/java/lib/i386/gtkhelper
-usr/java/lib/i386/headless
+#usr/java/lib/i386/headless
 usr/java/lib/i386/headless/libmawt.so
 usr/java/lib/i386/jvm.cfg
 usr/java/lib/i386/libJdbcOdbc.so
@@ -114,21 +114,21 @@ usr/java/lib/i386/librmi.so
 usr/java/lib/i386/libunpack.so
 usr/java/lib/i386/libverify.so
 usr/java/lib/i386/libzip.so
-usr/java/lib/i386/motif21
+#usr/java/lib/i386/motif21
 usr/java/lib/i386/motif21/libmawt.so
 usr/java/lib/i386/native_threads
 usr/java/lib/i386/native_threads/libhpi.so
-usr/java/lib/i386/server
+#usr/java/lib/i386/server
 usr/java/lib/i386/server/Xusage.txt
 usr/java/lib/i386/server/libjsig.so
 usr/java/lib/i386/server/libjvm.so
-usr/java/lib/i386/xawt
-usr/java/lib/i386/xawt/libmawt.so
+#usr/java/lib/i386/xawt
+#usr/java/lib/i386/xawt/libmawt.so
 usr/java/lib/im
 usr/java/lib/im/indicim.jar
 usr/java/lib/im/thaiim.jar
-usr/java/lib/images
-usr/java/lib/images/cursors
+#usr/java/lib/images
+#usr/java/lib/images/cursors
 usr/java/lib/images/cursors/cursors.properties
 usr/java/lib/images/cursors/invalid32x32.gif
 usr/java/lib/images/cursors/motif_CopyDrop32x32.gif
@@ -137,14 +137,14 @@ usr/java/lib/images/cursors/motif_LinkDrop32x32.gif
 usr/java/lib/images/cursors/motif_LinkNoDrop32x32.gif
 usr/java/lib/images/cursors/motif_MoveDrop32x32.gif
 usr/java/lib/images/cursors/motif_MoveNoDrop32x32.gif
-usr/java/lib/images/icons
+#usr/java/lib/images/icons
 usr/java/lib/images/icons/sun-java.png
 usr/java/lib/images/icons/sun-java_HighContrast.png
 usr/java/lib/images/icons/sun-java_HighContrastInverse.png
 usr/java/lib/images/icons/sun-java_LowContrast.png
-usr/java/lib/javaws
+#usr/java/lib/javaws
 usr/java/lib/javaws.jar
-usr/java/lib/javaws/Java1.5.ico
+#usr/java/lib/javaws/Java1.5.ico
 usr/java/lib/javaws/messages.properties
 usr/java/lib/javaws/messages_de.properties
 usr/java/lib/javaws/messages_es.properties
@@ -160,7 +160,7 @@ usr/java/lib/javaws/miniSplash.jpg
 usr/java/lib/jce.jar
 usr/java/lib/jsse.jar
 usr/java/lib/jvm.hprof.txt
-usr/java/lib/locale
+#usr/java/lib/locale
 usr/java/lib/locale/de
 usr/java/lib/locale/de/LC_MESSAGES
 usr/java/lib/locale/de/LC_MESSAGES/sunw_java_plugin.mo
@@ -649,13 +649,13 @@ usr/java/lib/zi/Pacific/Wake
 usr/java/lib/zi/Pacific/Wallis
 usr/java/lib/zi/WET
 usr/java/lib/zi/ZoneInfoMappings
-usr/java/licenses
-usr/java/licenses/CHANGES
-usr/java/licenses/COPYRIGHT
-usr/java/licenses/LICENSE
-usr/java/licenses/README
-usr/java/licenses/THIRDPARTYLICENSEREADME.txt
-usr/java/licenses/Welcome.html
+#usr/java/licenses
+#usr/java/licenses/CHANGES
+#usr/java/licenses/COPYRIGHT
+#usr/java/licenses/LICENSE
+#usr/java/licenses/README
+#usr/java/licenses/THIRDPARTYLICENSEREADME.txt
+#usr/java/licenses/Welcome.html
 #usr/java/man
 #usr/java/man/ja
 #usr/java/man/ja_JP.eucJP
@@ -689,13 +689,13 @@ usr/java/licenses/Welcome.html
 #usr/java/man/man1/servertool.1
 #usr/java/man/man1/tnameserv.1
 #usr/java/man/man1/unpack200.1
-usr/java/plugin
-usr/java/plugin/desktop
-usr/java/plugin/desktop/sun_java.desktop
-usr/java/plugin/desktop/sun_java.png
-usr/java/plugin/i386
-usr/java/plugin/i386/ns7
-usr/java/plugin/i386/ns7-gcc29
-usr/java/plugin/i386/ns7-gcc29/libjavaplugin_oji.so
-usr/java/plugin/i386/ns7/libjavaplugin_oji.so
+#usr/java/plugin
+#usr/java/plugin/desktop
+#usr/java/plugin/desktop/sun_java.desktop
+#usr/java/plugin/desktop/sun_java.png
+#usr/java/plugin/i386
+#usr/java/plugin/i386/ns7
+#usr/java/plugin/i386/ns7-gcc29
+#usr/java/plugin/i386/ns7-gcc29/libjavaplugin_oji.so
+#usr/java/plugin/i386/ns7/libjavaplugin_oji.so
 usr/java/version
\ No newline at end of file

diff --git a/src/paks/samba/ROOTFILES b/src/paks/samba/ROOTFILES
index 7c32234755c318986aa4bb5092b8178557379331..59afb3cd6c09263dbc4f730af8ba78d0d4d7da7b 100644 (file)
--- a/src/paks/samba/ROOTFILES
+++ b/src/paks/samba/ROOTFILES
@@ -33,10 +33,10 @@ usr/bin/wbinfo
 #usr/include/libsmbclient.h
 usr/lib/libsmbclient.so
 usr/lib/libsmbclient.so.0
-usr/lib/samba
-usr/lib/samba/auth
+#usr/lib/samba
+#usr/lib/samba/auth
 usr/lib/samba/auth/script.so
-usr/lib/samba/charset
+#usr/lib/samba/charset
 usr/lib/samba/charset/CP437.so
 usr/lib/samba/charset/CP850.so
 usr/lib/samba/de.msg
@@ -126,7 +126,7 @@ usr/share/samba/swat/help/Samba3-ByExample/ch14.html
 usr/share/samba/swat/help/Samba3-ByExample/go01.html
 usr/share/samba/swat/help/Samba3-ByExample/gpl.html
 usr/share/samba/swat/help/Samba3-ByExample/happy.html
-usr/share/samba/swat/help/Samba3-ByExample/images
+#usr/share/samba/swat/help/Samba3-ByExample/images
 usr/share/samba/swat/help/Samba3-ByExample/images/AccountingNetwork.png
 usr/share/samba/swat/help/Samba3-ByExample/images/Charity-Network.png
 usr/share/samba/swat/help/Samba3-ByExample/images/HostAnnouncment.png
@@ -544,8 +544,8 @@ usr/share/samba/swat/images/wizard.gif
 usr/share/samba/swat/include/footer.html
 usr/share/samba/swat/include/header.html
 #usr/share/samba/swat/lang
-usr/share/samba/swat/lang/ja
-usr/share/samba/swat/lang/ja/help
+#usr/share/samba/swat/lang/ja
+#usr/share/samba/swat/lang/ja/help
 usr/share/samba/swat/lang/ja/help/welcome.html
 usr/share/samba/swat/lang/ja/images
 usr/share/samba/swat/lang/ja/include

diff --git a/src/scripts/packager b/src/scripts/packager
new file mode 100644 (file)
index 0000000..2d0d370
--- /dev/null
+++ b/src/scripts/packager
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+PROG="$1"
+VER="$2"
+PAK_VER="$3"
+
+if [ -f /install/packages/$PROG-$VER-$PAK_VER.tar.gz.empty ]; then
+
+       echo -e "Package already exists."
+
+else
+
+       # Bringing the files to their right place.
+       rm -rf /install/packages/package /tmp/* /packagetmp.tar
+       mkdir -p  /install/packages/package
+       cp -f /usr/src/src/paks/$PROG/{,un}install.sh /install/packages/package
+       cp -f /usr/src/src/paks/$PROG/ROOTFILES       /install/packages/package
+       chmod 755 /install/packages/package/{,un}install.sh
+
+       cd /    && tar --create --directory=/ --files-from=/install/packages/package/ROOTFILES --file=/packagetmp.tar --exclude='#*'
+       cd /    && tar -x -C /tmp -f /packagetmp.tar
+                  rm -f /packagetmp.tar
+       cd /tmp && tar --create --gzip --verbose --file=/install/packages/package/files.tgz *
+
+       cd /    && rm -rf /tmp/*
+       cd /install/packages/package && cat ROOTFILES | grep -v "#" > ROOTFILES
+       tar cfz ../$PROG-$VER-$PAK_VER.tar.gz files.tgz install.sh uninstall.sh ROOTFILES
+
+       cd /install/packages && md5sum $PROG*.tar.gz > $PROG-$VER-$PAK_VER.tar.gz.md5
+       rm -rf /install/packages/package
+       exit 0
+fi
\ No newline at end of file