BUILDFIXES:

* ROOTFILES überarbeitet. (Ne Menge vergessen.^^) * Packages werden nichtmehr im "build" gepackt, sondern mit dem Parameter "paks". git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@147 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
2026-04-09 18:45:54 +02:00 · 2006-05-28 17:57:38 +00:00
parent 8891c0e82c
commit 548f60a5bf
9 changed files with 216 additions and 233 deletions
--- a/lfs/pakfire
+++ b/lfs/pakfire
@@ -53,7 +53,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && chown root.root $(DIR_APP) -R && chmod 755 pakfire lib/*
 	cd /opt && mkdir -p /opt/confire/paks
 	cd /opt/confire && cp -fRv $(DIR_SRC)/src/confire/* .
-	cd /opt/confire && chown root.root /opt/confire -R && chmod 755 confire paks/*
+	cd /opt/confire && chown root.root /opt/confire -R && chmod 755 confire /opt/confire/paks -R
 	# cd $(DIR_APP) && find $(DIR_APP) -name .svn -exec rm -rf {} \;
 	# cd $(DIR_APP) && find /opt/confire -name .svn -exec rm -rf {} \;
 	@$(POSTBUILD)
--- a/make.sh
+++ b/make.sh
@@ -806,27 +806,6 @@ buildpackages() {
  ipcopmake cdrom
  cp $LFS/install/images/{*.iso,*.tgz} $BASEDIR >> $LOGFILE 2>&1

-  # Build IPFire packages
-  ipfiredist applejuice
-  ipfiredist asterisk
-  ipfiredist cyrusimap
-  ipfiredist fetchmail
-  ipfiredist gnump3d
-  ipfiredist lame
-  ipfiredist libtiff
-  ipfiredist libxml2
-  ipfiredist mc
-  ipfiredist postfix
-  ipfiredist pwlib
-  ipfiredist sane
-  ipfiredist spandsp
-  ipfiredist sudo
-  ipfiredist xampp
-  ipfiredist xinetd
-  test -d $BASEDIR/packages || mkdir $BASEDIR/packages
-  mv -f $LFS/paks/*.tar.gz $LFS/paks/*.md5 $BASEDIR/packages >> $LOGFILE 2>&1
-  rm -rf $LFS/paks
-
  # Cleanup
  stdumount
  rm -rf $BASEDIR/build/tmp/*
@@ -1071,7 +1050,7 @@ gettoolchain)
 		if [ "`md5sum $PACKAGE.tar.gz | awk '{print $1}'`" = "`cat $PACKAGE.md5 | awk '{print $1}'`" ]; then
 			echo "`date -u '+%b %e %T'`: toolchain md5 ok" | tee -a $LOGFILE
 			echo "`date -u '+%b %e %T'`: Uncompressing toolchain" | tee -a $LOGFILE
-			cd $BASEDIR && tar xvfz cache/$PACKAGE.tar.gz -C .
+			cd $BASEDIR && tar xfz cache/$PACKAGE.tar.gz -C .
 			rm -vf $BASEDIR/cache/$PACKAGE.{tar.gz,md5}
 		else
 			exiterror "$PACKAGE.md5 did not match, check downloaded package"
@@ -1089,7 +1068,7 @@ commit)
 	;;
 make)
 	echo "Do a complete compile:"	
-	./make.sh prefetch && ./make.sh build
+	./make.sh prefetch && ./make.sh gettoolchain && ./make.sh build && ./make.sh paks
 	;;
 diff)
 	echo -ne "Make a local diff to last SVN revision: "
@@ -1121,6 +1100,30 @@ sync)
 	done
 	rm -f ftplist
 	;;
+paks)
+	# Build IPFire packages
+	prepareenv
+	ipfiredist applejuice
+	ipfiredist asterisk
+	ipfiredist cyrusimap
+	ipfiredist fetchmail
+	ipfiredist gnump3d
+	ipfiredist lame
+	ipfiredist libtiff
+	ipfiredist libxml2
+	ipfiredist mc
+	ipfiredist postfix
+	ipfiredist pwlib
+	ipfiredist sane
+	ipfiredist spandsp
+	ipfiredist sudo
+	ipfiredist xampp
+	ipfiredist xinetd
+	test -d $BASEDIR/packages || mkdir $BASEDIR/packages
+	mv -f $LFS/paks/*.tar.gz $LFS/paks/*.md5 $BASEDIR/packages >> $LOGFILE 2>&1
+	rm -rf $LFS/paks
+	rm -rf $BASEDIR/build/tmp/*
+	;;
 *)
 	echo "Usage: $0 {build|changelog|check|checkclean|clean|commit|diff|dist|gettoolchain|make|newpak|prefetch|shell|sync|toolchain|update}"
 	cat doc/make.sh-usage
--- a/src/ROOTFILES.i386
+++ b/src/ROOTFILES.i386
@@ -7,7 +7,7 @@
 #usr/local/bin/g++
 #usr/local/man/man1/ccache.1
 ##
-## linux-2.4.31-ipcop
+## linux-2.4.31-ipfire
 ##
 boot/vmlinuz-2.4.31
 boot/System.map-2.4.31
@@ -811,7 +811,7 @@ lib/modules/2.4.31/modules.usbmap
 #usr/share/man/man9/z8530_tx_done.9
 #usr/share/man/man9/z8530_write_port.9
 ##
-## linux-2.4.31-smp-ipcop
+## linux-2.4.31-smp-ipfire
 ##
 boot/vmlinuz-2.4.31-smp
 boot/System.map-2.4.31-smp
@@ -21808,121 +21808,121 @@ lib/modules/2.4.31-smp/misc/CnxADSL.o.gz
 ## configroot
 ##
 var/ipfire
-#var/ipcop/alcatelusb
-#var/ipcop/auth
-#var/ipcop/auth/users
-#var/ipcop/backup
-#var/ipcop/backup/exclude.hardware
-#var/ipcop/backup/exclude.system
-#var/ipcop/backup/exclude.user
-#var/ipcop/backup/include.system
-#var/ipcop/backup/include.user
-#var/ipcop/backup/sets
-#var/ipcop/ca
-#var/ipcop/certs
-#var/ipcop/certs/index.txt
-#var/ipcop/certs/serial
-#var/ipcop/cnx_pci
-#var/ipcop/countries.pl
-#var/ipcop/crls
-#var/ipcop/ddns
-#var/ipcop/ddns/config
-#var/ipcop/ddns/ipcache
-#var/ipcop/ddns/noipsettings
-#var/ipcop/ddns/settings
-#var/ipcop/dhcp
-#var/ipcop/dhcp/advoptions
-#var/ipcop/dhcp/advoptions-list
-#var/ipcop/dhcp/fixleases
-#var/ipcop/dhcp/settings
-#var/ipcop/dhcpc
-#var/ipcop/dhcpc/dhcpcd.exe
-#var/ipcop/dmzholes
-#var/ipcop/dmzholes/config
-#var/ipcop/eagle-usb
-#var/ipcop/eciadsl
-#var/ipcop/ethernet
-#var/ipcop/ethernet/aliases
-#var/ipcop/ethernet/settings
-#var/ipcop/general-functions.pl
-#var/ipcop/header.pl
-#var/ipcop/isdn
-#var/ipcop/isdn/settings
-#var/ipcop/key
-#var/ipcop/key/ipcop.gpg
-#var/ipcop/lang.pl
-#var/ipcop/langs
-#var/ipcop/langs/bz.pl
-#var/ipcop/langs/cs.pl
-#var/ipcop/langs/da.pl
-#var/ipcop/langs/de.pl
-#var/ipcop/langs/el.pl
-#var/ipcop/langs/en.pl
-#var/ipcop/langs/es.pl
-#var/ipcop/langs/fi.pl
-#var/ipcop/langs/fr.pl
-#var/ipcop/langs/hu.pl
-#var/ipcop/langs/it.pl
-#var/ipcop/langs/la.pl
-#var/ipcop/langs/list
-#var/ipcop/langs/lt.pl
-#var/ipcop/langs/nl.pl
-#var/ipcop/langs/no.pl
-#var/ipcop/langs/pl.pl
-#var/ipcop/langs/pt.pl
-#var/ipcop/langs/ro.pl
-#var/ipcop/langs/ru.pl
-#var/ipcop/langs/so.pl
-#var/ipcop/langs/sv.pl
-#var/ipcop/langs/th.pl
-#var/ipcop/langs/tr.pl
-#var/ipcop/langs/vi.pl
-#var/ipcop/langs/zh.pl
-#var/ipcop/logging
-#var/ipcop/logging/settings
-#var/ipcop/main
-#var/ipcop/main/hosts
-#var/ipcop/main/settings
-#var/ipcop/modem
-#var/ipcop/modem/defaults
-#var/ipcop/modem/settings
-#var/ipcop/patches
-#var/ipcop/patches/available
-#var/ipcop/patches/installed
-#var/ipcop/portfw
-#var/ipcop/portfw/config
-#var/ipcop/ppp
-#var/ipcop/ppp/fake-resolv.conf
-#var/ipcop/ppp/settings
-#var/ipcop/ppp/settings-1
-#var/ipcop/ppp/settings-2
-#var/ipcop/ppp/settings-3
-#var/ipcop/ppp/settings-4
-#var/ipcop/ppp/settings-5
-#var/ipcop/proxy
-#var/ipcop/proxy/acl-1.4
-#var/ipcop/proxy/settings
-#var/ipcop/red
-#var/ipcop/remote
-#var/ipcop/remote/settings
-#var/ipcop/shaping
-#var/ipcop/shaping/config
-#var/ipcop/shaping/settings
-#var/ipcop/snort
-#var/ipcop/snort/settings
-#var/ipcop/time
-#var/ipcop/time/settings
-#var/ipcop/vpn
-#var/ipcop/vpn/caconfig
-#var/ipcop/vpn/config
-#var/ipcop/vpn/ipsec.conf
-#var/ipcop/vpn/ipsec.secrets
-#var/ipcop/vpn/settings
-#var/ipcop/wireless
-#var/ipcop/wireless/config
-#var/ipcop/wireless/settings
-#var/ipcop/xtaccess
-#var/ipcop/xtaccess/config
+#var/ipfire/alcatelusb
+#var/ipfire/auth
+#var/ipfire/auth/users
+#var/ipfire/backup
+#var/ipfire/backup/exclude.hardware
+#var/ipfire/backup/exclude.system
+#var/ipfire/backup/exclude.user
+#var/ipfire/backup/include.system
+#var/ipfire/backup/include.user
+#var/ipfire/backup/sets
+#var/ipfire/ca
+#var/ipfire/certs
+#var/ipfire/certs/index.txt
+#var/ipfire/certs/serial
+#var/ipfire/cnx_pci
+#var/ipfire/countries.pl
+#var/ipfire/crls
+#var/ipfire/ddns
+#var/ipfire/ddns/config
+#var/ipfire/ddns/ipcache
+#var/ipfire/ddns/noipsettings
+#var/ipfire/ddns/settings
+#var/ipfire/dhcp
+#var/ipfire/dhcp/advoptions
+#var/ipfire/dhcp/advoptions-list
+#var/ipfire/dhcp/fixleases
+#var/ipfire/dhcp/settings
+#var/ipfire/dhcpc
+#var/ipfire/dhcpc/dhcpcd.exe
+#var/ipfire/dmzholes
+#var/ipfire/dmzholes/config
+#var/ipfire/eagle-usb
+#var/ipfire/eciadsl
+#var/ipfire/ethernet
+#var/ipfire/ethernet/aliases
+#var/ipfire/ethernet/settings
+#var/ipfire/general-functions.pl
+#var/ipfire/header.pl
+#var/ipfire/isdn
+#var/ipfire/isdn/settings
+#var/ipfire/key
+#var/ipfire/key/ipfire.gpg
+#var/ipfire/lang.pl
+#var/ipfire/langs
+#var/ipfire/langs/bz.pl
+#var/ipfire/langs/cs.pl
+#var/ipfire/langs/da.pl
+#var/ipfire/langs/de.pl
+#var/ipfire/langs/el.pl
+#var/ipfire/langs/en.pl
+#var/ipfire/langs/es.pl
+#var/ipfire/langs/fi.pl
+#var/ipfire/langs/fr.pl
+#var/ipfire/langs/hu.pl
+#var/ipfire/langs/it.pl
+#var/ipfire/langs/la.pl
+#var/ipfire/langs/list
+#var/ipfire/langs/lt.pl
+#var/ipfire/langs/nl.pl
+#var/ipfire/langs/no.pl
+#var/ipfire/langs/pl.pl
+#var/ipfire/langs/pt.pl
+#var/ipfire/langs/ro.pl
+#var/ipfire/langs/ru.pl
+#var/ipfire/langs/so.pl
+#var/ipfire/langs/sv.pl
+#var/ipfire/langs/th.pl
+#var/ipfire/langs/tr.pl
+#var/ipfire/langs/vi.pl
+#var/ipfire/langs/zh.pl
+#var/ipfire/logging
+#var/ipfire/logging/settings
+#var/ipfire/main
+#var/ipfire/main/hosts
+#var/ipfire/main/settings
+#var/ipfire/modem
+#var/ipfire/modem/defaults
+#var/ipfire/modem/settings
+#var/ipfire/patches
+#var/ipfire/patches/available
+#var/ipfire/patches/installed
+#var/ipfire/portfw
+#var/ipfire/portfw/config
+#var/ipfire/ppp
+#var/ipfire/ppp/fake-resolv.conf
+#var/ipfire/ppp/settings
+#var/ipfire/ppp/settings-1
+#var/ipfire/ppp/settings-2
+#var/ipfire/ppp/settings-3
+#var/ipfire/ppp/settings-4
+#var/ipfire/ppp/settings-5
+#var/ipfire/proxy
+#var/ipfire/proxy/acl-1.4
+#var/ipfire/proxy/settings
+#var/ipfire/red
+#var/ipfire/remote
+#var/ipfire/remote/settings
+#var/ipfire/shaping
+#var/ipfire/shaping/config
+#var/ipfire/shaping/settings
+#var/ipfire/snort
+#var/ipfire/snort/settings
+#var/ipfire/time
+#var/ipfire/time/settings
+#var/ipfire/vpn
+#var/ipfire/vpn/caconfig
+#var/ipfire/vpn/config
+#var/ipfire/vpn/ipsec.conf
+#var/ipfire/vpn/ipsec.secrets
+#var/ipfire/vpn/settings
+#var/ipfire/wireless
+#var/ipfire/wireless/config
+#var/ipfire/wireless/settings
+#var/ipfire/xtaccess
+#var/ipfire/xtaccess/config
 ##
 ## cxacru-2003-10-05
 ##
@@ -22491,21 +22491,19 @@ sbin/mingetty
 usr/local/bin/installfcdsl
 usr/local/bin/installpackage
 usr/local/bin/iowrap
-usr/local/bin/ipcopbackup
-usr/local/bin/ipcopbkcfg
-usr/local/bin/ipcopreboot
-usr/local/bin/ipcoprscfg
+usr/local/bin/ipfirebackup
+usr/local/bin/ipfirebkcfg
+usr/local/bin/ipfirereboot
+usr/local/bin/ipfirerscfg
 usr/local/bin/ipsecctrl
 usr/local/bin/logwatch
 usr/local/bin/rebuildhosts
 usr/local/bin/restartdhcp
 usr/local/bin/restartntpd
-usr/local/bin/restartshaping
 usr/local/bin/restartsnort
 usr/local/bin/restartsquid
 usr/local/bin/restartssh
 usr/local/bin/restartsyslogd
-usr/local/bin/restartwireless
 usr/local/bin/setaliases
 usr/local/bin/setdate
 usr/local/bin/setdmzholes
@@ -26435,8 +26433,6 @@ usr/lib/perl5/site_perl/5.8.5/Archive/Tar.pm
 usr/lib/perl5/site_perl/5.8.5/Archive/Tar/Constant.pm
 usr/lib/perl5/site_perl/5.8.5/Archive/Tar/File.pm
 usr/lib/perl5/site_perl/5.8.5/i386-linux/auto/Archive
-usr/lib/perl5/site_perl/5.8.5/i386-linux/auto/Archive/Tar
-usr/lib/perl5/site_perl/5.8.5/i386-linux/auto/Archive/Tar/.packlist
 #usr/share/man/man1/ptar.1
 #usr/share/man/man1/ptardiff.1
 #usr/share/man/man3/Archive::Tar.3
@@ -26450,8 +26446,6 @@ usr/lib/perl5/site_perl/5.8.5/Archive/Zip/FAQ.pod
 usr/lib/perl5/site_perl/5.8.5/Archive/Zip/MemberRead.pm
 usr/lib/perl5/site_perl/5.8.5/Archive/Zip/MockFileHandle.pm
 usr/lib/perl5/site_perl/5.8.5/Archive/Zip/Tree.pm
-usr/lib/perl5/site_perl/5.8.5/i386-linux/auto/Archive/Zip
-usr/lib/perl5/site_perl/5.8.5/i386-linux/auto/Archive/Zip/.packlist
 #usr/share/man/man3/Archive::Zip.3
 #usr/share/man/man3/Archive::Zip::FAQ.3
 #usr/share/man/man3/Archive::Zip::MemberRead.3
@@ -26462,21 +26456,16 @@ usr/lib/perl5/site_perl/5.8.5/i386-linux/BerkeleyDB.pod
 usr/lib/perl5/site_perl/5.8.5/i386-linux/BerkeleyDB/Btree.pm
 usr/lib/perl5/site_perl/5.8.5/i386-linux/BerkeleyDB/Hash.pm
 usr/lib/perl5/site_perl/5.8.5/i386-linux/auto/BerkeleyDB
-usr/lib/perl5/site_perl/5.8.5/i386-linux/auto/BerkeleyDB/.packlist
 usr/lib/perl5/site_perl/5.8.5/i386-linux/auto/BerkeleyDB/BerkeleyDB.bs
 usr/lib/perl5/site_perl/5.8.5/i386-linux/auto/BerkeleyDB/BerkeleyDB.so
 usr/lib/perl5/site_perl/5.8.5/i386-linux/auto/BerkeleyDB/autosplit.ix
 #usr/share/man/man3/BerkeleyDB.3
 usr/lib/perl5/site_perl/5.8.5/Convert
 usr/lib/perl5/site_perl/5.8.5/Convert/TNEF.pm
-usr/lib/perl5/site_perl/5.8.5/i386-linux/auto/Convert
-usr/lib/perl5/site_perl/5.8.5/i386-linux/auto/Convert/TNEF
-usr/lib/perl5/site_perl/5.8.5/i386-linux/auto/Convert/TNEF/.packlist
 #usr/share/man/man3/Convert::TNEF.3
 usr/lib/perl5/site_perl/5.8.5/i386-linux/Convert
 usr/lib/perl5/site_perl/5.8.5/i386-linux/Convert/UUlib.pm
 usr/lib/perl5/site_perl/5.8.5/i386-linux/auto/Convert/UUlib
-usr/lib/perl5/site_perl/5.8.5/i386-linux/auto/Convert/UUlib/.packlist
 usr/lib/perl5/site_perl/5.8.5/i386-linux/auto/Convert/UUlib/UUlib.bs
 usr/lib/perl5/site_perl/5.8.5/i386-linux/auto/Convert/UUlib/UUlib.so
 #usr/share/man/man3/Convert::UUlib.3
@@ -26516,8 +26505,6 @@ usr/lib/perl5/site_perl/5.8.5/auto/Mail/Util/autosplit.ix
 usr/lib/perl5/site_perl/5.8.5/auto/Mail/Util/mailaddress.al
 usr/lib/perl5/site_perl/5.8.5/auto/Mail/Util/maildomain.al
 usr/lib/perl5/site_perl/5.8.5/auto/Mail/Util/read_mbox.al
-usr/lib/perl5/site_perl/5.8.5/i386-linux/auto/Mail
-usr/lib/perl5/site_perl/5.8.5/i386-linux/auto/Mail/.packlist
 #usr/share/man/man3/Mail::Address.3
 #usr/share/man/man3/Mail::Cap.3
 #usr/share/man/man3/Mail::Field.3
@@ -26554,8 +26541,6 @@ usr/lib/perl5/site_perl/5.8.5/MIME/Parser/Results.pm
 usr/lib/perl5/site_perl/5.8.5/MIME/Tools.pm
 usr/lib/perl5/site_perl/5.8.5/MIME/WordDecoder.pm
 usr/lib/perl5/site_perl/5.8.5/MIME/Words.pm
-usr/lib/perl5/site_perl/5.8.5/i386-linux/auto/MIME-tools
-usr/lib/perl5/site_perl/5.8.5/i386-linux/auto/MIME-tools/.packlist
 #usr/share/man/man3/MIME::Body.3
 #usr/share/man/man3/MIME::Decoder.3
 #usr/share/man/man3/MIME::Decoder::Base64.3
@@ -26596,7 +26581,6 @@ usr/lib/perl5/site_perl/5.8.5/Net/Server/Proto/UNIX.pm
 usr/lib/perl5/site_perl/5.8.5/Net/Server/SIG.pm
 usr/lib/perl5/site_perl/5.8.5/Net/Server/Single.pm
 usr/lib/perl5/site_perl/5.8.5/i386-linux/auto/Net/Server
-usr/lib/perl5/site_perl/5.8.5/i386-linux/auto/Net/Server/.packlist
 #usr/share/man/man3/Net::Server.3
 #usr/share/man/man3/Net::Server::Daemonize.3
 #usr/share/man/man3/Net::Server::Fork.3
@@ -26616,7 +26600,6 @@ usr/lib/perl5/site_perl/5.8.5/i386-linux/Unix
 usr/lib/perl5/site_perl/5.8.5/i386-linux/Unix/Syslog.pm
 usr/lib/perl5/site_perl/5.8.5/i386-linux/auto/Unix
 usr/lib/perl5/site_perl/5.8.5/i386-linux/auto/Unix/Syslog
-usr/lib/perl5/site_perl/5.8.5/i386-linux/auto/Unix/Syslog/.packlist
 usr/lib/perl5/site_perl/5.8.5/i386-linux/auto/Unix/Syslog/Syslog.bs
 usr/lib/perl5/site_perl/5.8.5/i386-linux/auto/Unix/Syslog/Syslog.so
 usr/lib/perl5/site_perl/5.8.5/i386-linux/auto/Unix/Syslog/autosplit.ix
@@ -26630,9 +26613,6 @@ usr/lib/perl5/site_perl/5.8.5/IO/ScalarArray.pm
 usr/lib/perl5/site_perl/5.8.5/IO/Stringy.pm
 usr/lib/perl5/site_perl/5.8.5/IO/Wrap.pm
 usr/lib/perl5/site_perl/5.8.5/IO/WrapTie.pm
-usr/lib/perl5/site_perl/5.8.5/i386-linux/auto/IO
-usr/lib/perl5/site_perl/5.8.5/i386-linux/auto/IO/Stringy
-usr/lib/perl5/site_perl/5.8.5/i386-linux/auto/IO/Stringy/.packlist
 #usr/share/man/man3/IO::AtomicFile.3
 #usr/share/man/man3/IO::InnerFile.3
 #usr/share/man/man3/IO::Lines.3
@@ -26654,15 +26634,9 @@ usr/bin/htop
 ## GeoIP
 ##
 usr/bin/geoip-lookup
-usr/lib/perl5/5.8.5/i686-linux/perllocal.pod
 usr/lib/perl5/site_perl/5.8.5/Geo
 usr/lib/perl5/site_perl/5.8.5/Geo/IP
 usr/lib/perl5/site_perl/5.8.5/Geo/IP/PurePerl.pm
-usr/lib/perl5/site_perl/5.8.5/i686-linux/auto
-usr/lib/perl5/site_perl/5.8.5/i686-linux/auto/Geo
-usr/lib/perl5/site_perl/5.8.5/i686-linux/auto/Geo/IP
-usr/lib/perl5/site_perl/5.8.5/i686-linux/auto/Geo/IP/PurePerl
-usr/lib/perl5/site_perl/5.8.5/i686-linux/auto/Geo/IP/PurePerl/.packlist
 usr/local/share/GeoIP
 usr/local/share/GeoIP/GeoIP.dat
 #usr/share/man/man1/geoip-lookup.1
--- a/src/paks/asterisk/CONFFILES
+++ b/src/paks/asterisk/CONFFILES
@@ -1,54 +1,54 @@
-etc/asterisk
-etc/asterisk/adsi.conf
-etc/asterisk/adtranvofr.conf
-etc/asterisk/agents.conf
-etc/asterisk/alarmreceiver.conf
-etc/asterisk/alsa.conf
-etc/asterisk/asterisk.adsi
-etc/asterisk/asterisk.conf
-etc/asterisk/capi.conf
-etc/asterisk/cdr.conf
-etc/asterisk/cdr_custom.conf
-etc/asterisk/cdr_manager.conf
-etc/asterisk/cdr_odbc.conf
-etc/asterisk/cdr_pgsql.conf
-etc/asterisk/cdr_tds.conf
-etc/asterisk/codecs.conf
-etc/asterisk/dnsmgr.conf
-etc/asterisk/dundi.conf
-etc/asterisk/enum.conf
-etc/asterisk/extconfig.conf
-etc/asterisk/extensions.ael
-etc/asterisk/extensions.conf
-etc/asterisk/features.conf
-etc/asterisk/festival.conf
-etc/asterisk/iax.conf
-etc/asterisk/iaxprov.conf
-etc/asterisk/indications.conf
-etc/asterisk/logger.conf
-etc/asterisk/manager.conf
-etc/asterisk/meetme.conf
-etc/asterisk/mgcp.conf
-etc/asterisk/misdn.conf
-etc/asterisk/modem.conf
-etc/asterisk/modules.conf
-etc/asterisk/musiconhold.conf
-etc/asterisk/oh323.conf
-etc/asterisk/osp.conf
-etc/asterisk/oss.conf
-etc/asterisk/phone.conf
-etc/asterisk/privacy.conf
-etc/asterisk/queues.conf
-etc/asterisk/res_odbc.conf
-etc/asterisk/rpt.conf
-etc/asterisk/rtp.conf
-etc/asterisk/sip.conf
-etc/asterisk/sip_notify.conf
-etc/asterisk/skinny.conf
-etc/asterisk/telcordia-1.adsi
-etc/asterisk/voicemail.conf
-etc/asterisk/vpb.conf
-etc/asterisk/watchdog.conf
-etc/asterisk/zapata.conf
-etc/modules.conf.bak
-etc/zaptel.conf
+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
--- a/src/paks/asterisk/ROOTFILES
+++ b/src/paks/asterisk/ROOTFILES
@@ -153,7 +153,7 @@ usr/lib/asterisk/modules/app_read.so
 usr/lib/asterisk/modules/app_readfile.so
 usr/lib/asterisk/modules/app_realtime.so
 usr/lib/asterisk/modules/app_record.so
-usr/lib/asterisk/modules/app_rxfax.so
+#usr/lib/asterisk/modules/app_rxfax.so
 usr/lib/asterisk/modules/app_sayunixtime.so
 usr/lib/asterisk/modules/app_segfault.so
 usr/lib/asterisk/modules/app_senddtmf.so
@@ -171,7 +171,7 @@ usr/lib/asterisk/modules/app_system.so
 usr/lib/asterisk/modules/app_talkdetect.so
 usr/lib/asterisk/modules/app_test.so
 usr/lib/asterisk/modules/app_transfer.so
-usr/lib/asterisk/modules/app_txfax.so
+#usr/lib/asterisk/modules/app_txfax.so
 usr/lib/asterisk/modules/app_txtcidname.so
 usr/lib/asterisk/modules/app_url.so
 usr/lib/asterisk/modules/app_userevent.so
--- a/src/paks/fetchmail/CONFFILES
+++ b/src/paks/fetchmail/CONFFILES
@@ -0,0 +1 @@
+root/.fetchmailrc
--- a/src/paks/fetchmail/ROOTFILES
+++ b/src/paks/fetchmail/ROOTFILES
@@ -0,0 +1,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
--- a/src/paks/xinetd/CONFFILES
+++ b/src/paks/xinetd/CONFFILES
@@ -1,2 +1,2 @@
-etc/xinetd.conf
-etc/xinetd.d
+var/ipfire/xinetd/xinetd.conf
+var/ipfire/xinetd/xinetd.d
--- a/src/scripts/make-packages.sh
+++ b/src/scripts/make-packages.sh
@@ -15,12 +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 cvf /paks/$1/filestmp.tar --files=/usr/src/src/paks/$1/ROOTFILES --exclude='#*'
-tar cvf /paks/$1/conftmp.tar  --files=/usr/src/src/paks/$1/CONFFILES --exclude='#*'
+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='#*'

 mkdir -p /paks/$1/ROOT /paks/$1/CONF
-tar xvf /paks/$1/filestmp.tar -C /paks/$1/ROOT
-tar xvf /paks/$1/conftmp.tar -C /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 *