Geändert:

* Graphs gefixt http://bugtracker.ipfire.eu/view.php?id=8
  * src/paks/*/CONFFILES gelöscht


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

lfs/cdrom

@@ -125,7 +125,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		dd bs=1024 count=$$((`du -k -s ../cdrom|awk '{print $$1}'` + 64)) if=/dev/zero of=/install/images/$(SNAME)-install-usb-$(VERSION).$(MACHINE).iso; \
 		echo "move boot files on top of disk" && \
 		rm -rf boot && \
-		mkdosfs -n IPCOPBOOT -F 16 -I /install/images/$(SNAME)-install-usb-$(VERSION).$(MACHINE).iso && \
+		mkdosfs -n IPFIREBOOT -F 16 -I /install/images/$(SNAME)-install-usb-$(VERSION).$(MACHINE).iso && \
 		mount -t vfat -o loop /install/images/$(SNAME)-install-usb-$(VERSION).$(MACHINE).iso /install/mnt && \
 		cp -R ../cdrom/* /install/mnt && \
 		cp /install/images/cdinitrd.gz              /install/mnt/instroot.gz && \

make.sh

@@ -838,6 +838,7 @@ buildpackages() {
 ipfirepackages() {
   ipfiredist applejuice
   ipfiredist asterisk
+  ipfiredist clamav
   ipfiredist cyrusimap
   ipfiredist fetchmail
   ipfiredist gnump3d
@@ -847,7 +848,6 @@ ipfirepackages() {
   ipfiredist libxml2
   ipfiredist ntop
   ipfiredist postfix
-  ipfiredist pwlib
   ipfiredist samba
   ipfiredist xampp
   ipfiredist xinetd
@@ -1090,8 +1090,8 @@ gettoolchain)
 	;;
 paks)
 	prepareenv
-	buildpackages
-	# ipfirepackages
+	# buildpackages
+	ipfirepackages
 	;;
 update)
 	echo "Load the latest source-files:"

src/paks/asterisk/CONFFILES

@@ -1,54 +0,0 @@
-var/ipfire/asterisk
-var/ipfire/asterisk/adsi.conf
-var/ipfire/asterisk/adtranvofr.conf
-var/ipfire/asterisk/agents.conf
-var/ipfire/asterisk/alarmreceiver.conf
-var/ipfire/asterisk/alsa.conf
-var/ipfire/asterisk/asterisk.adsi
-var/ipfire/asterisk/asterisk.conf
-var/ipfire/asterisk/capi.conf
-var/ipfire/asterisk/cdr.conf
-var/ipfire/asterisk/cdr_custom.conf
-var/ipfire/asterisk/cdr_manager.conf
-var/ipfire/asterisk/cdr_odbc.conf
-var/ipfire/asterisk/cdr_pgsql.conf
-var/ipfire/asterisk/cdr_tds.conf
-var/ipfire/asterisk/codecs.conf
-var/ipfire/asterisk/dnsmgr.conf
-var/ipfire/asterisk/dundi.conf
-var/ipfire/asterisk/enum.conf
-var/ipfire/asterisk/extconfig.conf
-var/ipfire/asterisk/extensions.ael
-var/ipfire/asterisk/extensions.conf
-var/ipfire/asterisk/features.conf
-var/ipfire/asterisk/festival.conf
-var/ipfire/asterisk/iax.conf
-var/ipfire/asterisk/iaxprov.conf
-var/ipfire/asterisk/indications.conf
-var/ipfire/asterisk/logger.conf
-var/ipfire/asterisk/manager.conf
-var/ipfire/asterisk/meetme.conf
-var/ipfire/asterisk/mgcp.conf
-var/ipfire/asterisk/misdn.conf
-var/ipfire/asterisk/modem.conf
-var/ipfire/asterisk/modules.conf
-var/ipfire/asterisk/musiconhold.conf
-var/ipfire/asterisk/oh323.conf
-var/ipfire/asterisk/osp.conf
-var/ipfire/asterisk/oss.conf
-var/ipfire/asterisk/phone.conf
-var/ipfire/asterisk/privacy.conf
-var/ipfire/asterisk/queues.conf
-var/ipfire/asterisk/res_odbc.conf
-var/ipfire/asterisk/rpt.conf
-var/ipfire/asterisk/rtp.conf
-var/ipfire/asterisk/sip.conf
-var/ipfire/asterisk/sip_notify.conf
-var/ipfire/asterisk/skinny.conf
-var/ipfire/asterisk/telcordia-1.adsi
-var/ipfire/asterisk/voicemail.conf
-var/ipfire/asterisk/vpb.conf
-var/ipfire/asterisk/watchdog.conf
-var/ipfire/asterisk/zapata.conf
-var/ipfire/modules.conf.bak
-var/ipfire/zaptel.conf

src/paks/asterisk/ROOTFILES

@@ -1,20 +1,20 @@
-lib/modules/2.4.31/misc/cwain.o
-lib/modules/2.4.31/misc/pciradio.o
-lib/modules/2.4.31/misc/qozap.o
-lib/modules/2.4.31/misc/tor2.o
-lib/modules/2.4.31/misc/torisa.o
-lib/modules/2.4.31/misc/wcfxo.o
-lib/modules/2.4.31/misc/wct1xxp.o
-lib/modules/2.4.31/misc/wct4xxp.o
-lib/modules/2.4.31/misc/wctdm.o
-lib/modules/2.4.31/misc/wctdm24xxp.o
-lib/modules/2.4.31/misc/wcte11xp.o
-lib/modules/2.4.31/misc/wcusb.o
-lib/modules/2.4.31/misc/zaphfc.o
-lib/modules/2.4.31/misc/zaptel.o
-lib/modules/2.4.31/misc/ztd-eth.o
-lib/modules/2.4.31/misc/ztd-loc.o
-lib/modules/2.4.31/misc/ztdynamic.o
+lib/modules/2.4.31/misc/cwain.o.gz
+lib/modules/2.4.31/misc/pciradio.o.gz
+lib/modules/2.4.31/misc/qozap.o.gz
+lib/modules/2.4.31/misc/tor2.o.gz
+lib/modules/2.4.31/misc/torisa.o.gz
+lib/modules/2.4.31/misc/wcfxo.o.gz
+lib/modules/2.4.31/misc/wct1xxp.o.gz
+lib/modules/2.4.31/misc/wct4xxp.o.gz
+lib/modules/2.4.31/misc/wctdm.o.gz
+lib/modules/2.4.31/misc/wctdm24xxp.o.gz
+lib/modules/2.4.31/misc/wcte11xp.o.gz
+lib/modules/2.4.31/misc/wcusb.o.gz
+lib/modules/2.4.31/misc/zaphfc.o.gz
+lib/modules/2.4.31/misc/zaptel.o.gz
+lib/modules/2.4.31/misc/ztd-eth.o.gz
+lib/modules/2.4.31/misc/ztd-loc.o.gz
+lib/modules/2.4.31/misc/ztdynamic.o.gz
 sbin/ztcfg
 sbin/zttool
 #usr/include/asterisk
@@ -651,3 +651,58 @@ var/spool/asterisk/voicemail/default/1234
 var/spool/asterisk/voicemail/default/1234/INBOX
 var/spool/asterisk/voicemail/default/1234/busy.gsm
 var/spool/asterisk/voicemail/default/1234/unavail.gsm
+var/ipfire/asterisk
+var/ipfire/asterisk/adsi.conf
+var/ipfire/asterisk/adtranvofr.conf
+var/ipfire/asterisk/agents.conf
+var/ipfire/asterisk/alarmreceiver.conf
+var/ipfire/asterisk/alsa.conf
+var/ipfire/asterisk/asterisk.adsi
+var/ipfire/asterisk/asterisk.conf
+var/ipfire/asterisk/capi.conf
+var/ipfire/asterisk/cdr.conf
+var/ipfire/asterisk/cdr_custom.conf
+var/ipfire/asterisk/cdr_manager.conf
+var/ipfire/asterisk/cdr_odbc.conf
+var/ipfire/asterisk/cdr_pgsql.conf
+var/ipfire/asterisk/cdr_tds.conf
+var/ipfire/asterisk/codecs.conf
+var/ipfire/asterisk/dnsmgr.conf
+var/ipfire/asterisk/dundi.conf
+var/ipfire/asterisk/enum.conf
+var/ipfire/asterisk/extconfig.conf
+var/ipfire/asterisk/extensions.ael
+var/ipfire/asterisk/extensions.conf
+var/ipfire/asterisk/features.conf
+var/ipfire/asterisk/festival.conf
+var/ipfire/asterisk/iax.conf
+var/ipfire/asterisk/iaxprov.conf
+var/ipfire/asterisk/indications.conf
+var/ipfire/asterisk/logger.conf
+var/ipfire/asterisk/manager.conf
+var/ipfire/asterisk/meetme.conf
+var/ipfire/asterisk/mgcp.conf
+var/ipfire/asterisk/misdn.conf
+var/ipfire/asterisk/modem.conf
+var/ipfire/asterisk/modules.conf
+var/ipfire/asterisk/musiconhold.conf
+var/ipfire/asterisk/oh323.conf
+var/ipfire/asterisk/osp.conf
+var/ipfire/asterisk/oss.conf
+var/ipfire/asterisk/phone.conf
+var/ipfire/asterisk/privacy.conf
+var/ipfire/asterisk/queues.conf
+var/ipfire/asterisk/res_odbc.conf
+var/ipfire/asterisk/rpt.conf
+var/ipfire/asterisk/rtp.conf
+var/ipfire/asterisk/sip.conf
+var/ipfire/asterisk/sip_notify.conf
+var/ipfire/asterisk/skinny.conf
+var/ipfire/asterisk/telcordia-1.adsi
+var/ipfire/asterisk/voicemail.conf
+var/ipfire/asterisk/vpb.conf
+var/ipfire/asterisk/watchdog.conf
+var/ipfire/asterisk/zapata.conf
+var/ipfire/modules.conf.bak
+var/ipfire/zaptel.conf
+

src/paks/clamav/CONFFILES

@@ -1,3 +0,0 @@
-etc/clamav
-etc/clamav/clamd.conf
-etc/clamav/freshclam.conf

src/paks/clamav/ROOTFILES

@@ -3,13 +3,13 @@ usr/bin/clamdscan
 usr/bin/clamscan
 usr/bin/freshclam
 usr/bin/sigtool
-usr/include/clamav.h
-usr/lib/libclamav.a
-usr/lib/libclamav.la
+#usr/include/clamav.h
+#usr/lib/libclamav.a
+#usr/lib/libclamav.la
 usr/lib/libclamav.so
 usr/lib/libclamav.so.1
 usr/lib/libclamav.so.1.0.17
-usr/lib/pkgconfig/libclamav.pc
+#usr/lib/pkgconfig/libclamav.pc
 usr/sbin/clamd
 usr/share/clamav
 usr/share/clamav/daily.cvd
@@ -22,3 +22,6 @@ usr/share/clamav/main.cvd
 #usr/share/man/man5/freshclam.conf.5
 #usr/share/man/man8/clamav-milter.8
 #usr/share/man/man8/clamd.8
+etc/clamav
+etc/clamav/clamd.conf
+etc/clamav/freshclam.conf

src/paks/fetchmail/CONFFILES

@@ -1 +0,0 @@
-root/.fetchmailrc

src/paks/fetchmail/ROOTFILES

@@ -2,4 +2,5 @@ usr/bin/fetchmail
 usr/bin/fetchmailconf
 usr/lib/python2.3/site-packages/fetchmailconf.py
 usr/lib/python2.3/site-packages/fetchmailconf.pyc
-usr/lib/python2.3/site-packages/fetchmailconf.pyo
+usr/lib/python2.3/site-packages/fetchmailconf.pyo
+root/.fetchmailrc

src/paks/gnump3d/CONFFILES

@@ -1,3 +0,0 @@
-etc/gnump3d
-etc/gnump3d/gnump3d.conf
-etc/gnump3d/mime.types

src/paks/gnump3d/ROOTFILES

@@ -1,3 +1,6 @@
+etc/gnump3d
+etc/gnump3d/gnump3d.conf
+etc/gnump3d/mime.types
 usr/bin/gnump3d
 usr/bin/gnump3d-index
 usr/bin/gnump3d-top

src/paks/postfix/CONFFILES

@@ -1,19 +0,0 @@
-etc/aliases.db
-#etc/postfix
-etc/postfix/LICENSE
-etc/postfix/TLS_LICENSE
-etc/postfix/access
-etc/postfix/aliases
-etc/postfix/canonical
-etc/postfix/generic
-etc/postfix/header_checks
-etc/postfix/main.cf
-etc/postfix/main.cf.default
-etc/postfix/makedefs.out
-etc/postfix/master.cf
-etc/postfix/post-install
-etc/postfix/postfix-files
-etc/postfix/postfix-script
-etc/postfix/relocated
-etc/postfix/transport
-etc/postfix/virtual

src/paks/postfix/ROOTFILES

@@ -1,3 +1,22 @@
+etc/aliases.db
+#etc/postfix
+etc/postfix/LICENSE
+etc/postfix/TLS_LICENSE
+etc/postfix/access
+etc/postfix/aliases
+etc/postfix/canonical
+etc/postfix/generic
+etc/postfix/header_checks
+etc/postfix/main.cf
+etc/postfix/main.cf.default
+etc/postfix/makedefs.out
+etc/postfix/master.cf
+etc/postfix/post-install
+etc/postfix/postfix-files
+etc/postfix/postfix-script
+etc/postfix/relocated
+etc/postfix/transport
+etc/postfix/virtual
 usr/bin/mailq
 usr/bin/newaliases
 usr/lib/postfix

src/paks/sane/CONFFILES

@@ -1,58 +0,0 @@
-etc/sane.d
-etc/sane.d/abaton.conf
-etc/sane.d/agfafocus.conf
-etc/sane.d/apple.conf
-etc/sane.d/artec.conf
-etc/sane.d/artec_eplus48u.conf
-etc/sane.d/avision.conf
-etc/sane.d/bh.conf
-etc/sane.d/canon.conf
-etc/sane.d/canon630u.conf
-etc/sane.d/coolscan.conf
-etc/sane.d/coolscan2.conf
-etc/sane.d/dc210.conf
-etc/sane.d/dc240.conf
-etc/sane.d/dc25.conf
-etc/sane.d/dll.conf
-etc/sane.d/dmc.conf
-etc/sane.d/epson.conf
-etc/sane.d/fujitsu.conf
-etc/sane.d/genesys.conf
-etc/sane.d/gt68xx.conf
-etc/sane.d/hp.conf
-etc/sane.d/hp4200.conf
-etc/sane.d/hp5400.conf
-etc/sane.d/ibm.conf
-etc/sane.d/leo.conf
-etc/sane.d/lexmark.conf
-etc/sane.d/ma1509.conf
-etc/sane.d/matsushita.conf
-etc/sane.d/microtek.conf
-etc/sane.d/microtek2.conf
-etc/sane.d/mustek.conf
-etc/sane.d/mustek_usb.conf
-etc/sane.d/nec.conf
-etc/sane.d/net.conf
-etc/sane.d/pie.conf
-etc/sane.d/plustek.conf
-etc/sane.d/plustek_pp.conf
-etc/sane.d/qcam.conf
-etc/sane.d/ricoh.conf
-etc/sane.d/s9036.conf
-etc/sane.d/saned.conf
-etc/sane.d/sceptre.conf
-etc/sane.d/sharp.conf
-etc/sane.d/sm3840.conf
-etc/sane.d/snapscan.conf
-etc/sane.d/sp15c.conf
-etc/sane.d/st400.conf
-etc/sane.d/tamarack.conf
-etc/sane.d/teco1.conf
-etc/sane.d/teco2.conf
-etc/sane.d/teco3.conf
-etc/sane.d/test.conf
-etc/sane.d/u12.conf
-etc/sane.d/umax.conf
-etc/sane.d/umax1220u.conf
-etc/sane.d/umax_pp.conf
-etc/sane.d/v4l.conf

src/paks/sane/ROOTFILES

@@ -1,3 +1,61 @@
+etc/sane.d
+etc/sane.d/abaton.conf
+etc/sane.d/agfafocus.conf
+etc/sane.d/apple.conf
+etc/sane.d/artec.conf
+etc/sane.d/artec_eplus48u.conf
+etc/sane.d/avision.conf
+etc/sane.d/bh.conf
+etc/sane.d/canon.conf
+etc/sane.d/canon630u.conf
+etc/sane.d/coolscan.conf
+etc/sane.d/coolscan2.conf
+etc/sane.d/dc210.conf
+etc/sane.d/dc240.conf
+etc/sane.d/dc25.conf
+etc/sane.d/dll.conf
+etc/sane.d/dmc.conf
+etc/sane.d/epson.conf
+etc/sane.d/fujitsu.conf
+etc/sane.d/genesys.conf
+etc/sane.d/gt68xx.conf
+etc/sane.d/hp.conf
+etc/sane.d/hp4200.conf
+etc/sane.d/hp5400.conf
+etc/sane.d/ibm.conf
+etc/sane.d/leo.conf
+etc/sane.d/lexmark.conf
+etc/sane.d/ma1509.conf
+etc/sane.d/matsushita.conf
+etc/sane.d/microtek.conf
+etc/sane.d/microtek2.conf
+etc/sane.d/mustek.conf
+etc/sane.d/mustek_usb.conf
+etc/sane.d/nec.conf
+etc/sane.d/net.conf
+etc/sane.d/pie.conf
+etc/sane.d/plustek.conf
+etc/sane.d/plustek_pp.conf
+etc/sane.d/qcam.conf
+etc/sane.d/ricoh.conf
+etc/sane.d/s9036.conf
+etc/sane.d/saned.conf
+etc/sane.d/sceptre.conf
+etc/sane.d/sharp.conf
+etc/sane.d/sm3840.conf
+etc/sane.d/snapscan.conf
+etc/sane.d/sp15c.conf
+etc/sane.d/st400.conf
+etc/sane.d/tamarack.conf
+etc/sane.d/teco1.conf
+etc/sane.d/teco2.conf
+etc/sane.d/teco3.conf
+etc/sane.d/test.conf
+etc/sane.d/u12.conf
+etc/sane.d/umax.conf
+etc/sane.d/umax1220u.conf
+etc/sane.d/umax_pp.conf
+etc/sane.d/v4l.conf
 usr/bin/gamma4scanimage
 usr/bin/sane-config
 usr/bin/sane-find-scanner

src/scripts/make-packages.sh

@@ -7,7 +7,7 @@
 ## 							      ##
 ########################################################
 echo "`date -u '+%b %e %T'`: Packing $1" | tee -a $LOGFILE
-cd / && mkdir -p /paks/$1
+cd / && mkdir -p /paks/$1/ROOT
 
 ## Copy install.sh/uninstall.sh to pak-dir and make executeable
 #
@@ -15,17 +15,12 @@ cp -f /usr/src/src/paks/$1/{,un}install.sh /paks/$1
 chmod 755 /paks/$1/{,un}install.sh
 
 # This tar+untar+tar is for removing files compressed twice
-tar cfv /paks/$1/filestmp.tar --files=/usr/src/src/paks/$1/ROOTFILES --exclude='#*'
-tar cfv /paks/$1/conftmp.tar --files=/usr/src/src/paks/$1/CONFFILES --exclude='#*'
+tar -c -C / --files-from=/usr/src/src/paks/$1/ROOTFILES -f /paks/$1/filestmp.tar --exclude='#*'
+tar -x -C /paks/$1/ROOT -f /paks/$1/filestmp.tar
+rm -f /paks/$1/filestmp.tar
+cd /paks/$1/ROOT && tar zcf /paks/$1/files.tgz *
 
-mkdir -p /paks/$1/ROOT /paks/$1/CONF
-tar xfv /paks/$1/filestmp.tar -C /paks/$1/ROOT
-tar xfv /paks/$1/conftmp.tar -C /paks/$1/CONF
-rm -f /paks/$1/{files,conf}tmp.tar
-cd /paks/$1/ROOT && tar cvfz /paks/$1/files.tgz *
-cd /paks/$1/CONF && tar cvfz /paks/$1/conf.tgz *
-
-cd /paks/$1 && tar cvfz ../$2.tar.gz files.tgz conf.tgz install.sh uninstall.sh
+cd /paks/$1 && tar cvfz ../$2.tar.gz files.tgz install.sh uninstall.sh
 cd .. && md5sum $2.tar.gz > $2.tar.gz.md5
 
 rm -fr /paks/$1

src/scripts/makegraphs

@@ -503,14 +503,14 @@ sub updatefwhitsgraph {
 		"-t firewall hits over the last $interval",
 		"DEF:amount=$rrdlog/firewallhits.rrd:amount:AVERAGE",
 		"AREA:amount#6464FF:firewallhits",
-		"GPRINT:amount:MAX:   Max\\: %2.2lf %S",
-		"GPRINT:amount:AVERAGE: Avg\\: %2.2lf %S",
-		"GPRINT:amount:LAST: Current\\: %2.2lf %Shits/5 min\\n",
+		"GPRINT:amount:MAX:   $tr{'maximal'}\\: %2.2lf %S",
+		"GPRINT:amount:AVERAGE: $tr{'average'}\\: %2.2lf %S",
+		"GPRINT:amount:LAST: $tr{'current'}\\: %2.2lf %Shits/5 min\\n",
 		"DEF:portamount=$rrdlog/firewallhits.rrd:portamount:AVERAGE",
 		"AREA:portamount#FF6464:portscans",
-		"GPRINT:portamount:MAX:      Max\\: %2.2lf %S",
-		"GPRINT:portamount:AVERAGE: Avg\\: %2.2lf %S",
-		"GPRINT:portamount:LAST: Current\\: %2.2lf %Shits/5 min");
+		"GPRINT:portamount:MAX:      $tr{'maximal'}\\: %2.2lf %S",
+		"GPRINT:portamount:AVERAGE: $tr{'average'}\\: %2.2lf %S",
+		"GPRINT:portamount:LAST: $tr{'current'}\\: %2.2lf %Shits/5 min");
 	$ERROR = RRDs::error;
 	print "Error in RRD::graph for Firewallhits: $ERROR\n" if $ERROR;
 
@@ -523,14 +523,14 @@ sub updatefwhitsgraph {
 		"-t firewall hits over the last $interval",
 		"DEF:amount=$rrdlog/firewallhits.rrd:amount:AVERAGE",
 		"LINE2:amount#6464FF:firewallhits",
-		"GPRINT:amount:MAX:   Max\\: %2.2lf %S",
-		"GPRINT:amount:AVERAGE: Avg\\: %2.2lf %S",
+		"GPRINT:amount:MAX:   $tr{'maximal'}\\: %2.2lf %S",
+		"GPRINT:amount:AVERAGE: $tr{'average'}\\: %2.2lf %S",
 		"GPRINT:amount:LAST: Current\\: %2.2lf %Shits/5 min\\n",
 		"DEF:portamount=$rrdlog/firewallhits.rrd:portamount:AVERAGE",
 		"LINE2:portamount#FF6464:portscans",
-		"GPRINT:portamount:MAX:      Max\\: %2.2lf %S",
-		"GPRINT:portamount:AVERAGE: Avg\\: %2.2lf %S",
-		"GPRINT:portamount:LAST: Current\\: %2.2lf %Shits/5 min");
+		"GPRINT:portamount:MAX:      $tr{'maximal'}\\: %2.2lf %S",
+		"GPRINT:portamount:AVERAGE: $tr{'average'}\\: %2.2lf %S",
+		"GPRINT:portamount:LAST: $tr{'current'}\\: %2.2lf %Shits/5 min");
 	$ERROR = RRDs::error;
 	print "Error in RRD::graph for Firewallhits: $ERROR\n" if $ERROR;
 }
@@ -663,9 +663,9 @@ sub updatelqgraph {
 		"AREA:r0#80FF80:<30 ms",
 		"AREA:loss10#800000:Packet loss (x10)",
 		"LINE1:roundtrip#707070:",
-		"GPRINT:roundtrip:MAX:$tr{'maximal'} $tr{'linkq'}\\:%3.2lf ms",
-		"GPRINT:roundtrip:AVERAGE:$tr{'average'} $tr{'linkq'}\\:%3.2lf ms",
-		"GPRINT:roundtrip:LAST:$tr{'current'} $tr{'linkq'}\\:%3.2lf ms\\j",
+		"GPRINT:roundtrip:MAX:$tr{'maximal'}\\:%3.2lf ms",
+		"GPRINT:roundtrip:AVERAGE:$tr{'average'}\\:%3.2lf ms",
+		"GPRINT:roundtrip:LAST:$tr{'current'}\\:%3.2lf ms\\j",
 		"GPRINT:loss:MAX:$tr{'maximal'} Loss\\:%3.2lf%%",
 		"GPRINT:loss:AVERAGE:$tr{'average'} Loss\\:%3.2lf%%",
 		"GPRINT:loss:LAST:$tr{'current'} Loss\\:%3.2lf%%\\j"