Packager finalisiert.

Cronjobs angepasst, falls die Maschine nicht zu der Zeit (meistens nachts) lief.
Erste Versionen der Tripwire und Samba-Pakete zum testen.

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

diff --git a/config/cron/crontab b/config/cron/crontab
index 2170a99cf47a1a1f628818a568af8845c407f410..e0037fe01d76bdc77b583fb8aaf91c4f4adc22b0 100644 (file)
--- a/config/cron/crontab
+++ b/config/cron/crontab
@@ -10,9 +10,9 @@ HOME=/
 */1 * * * *    test -x /usr/local/bin/run-parts && /usr/local/bin/run-parts /etc/fcron.minutely
 */5 * * * *    test -x /usr/local/bin/run-parts && /usr/local/bin/run-parts /etc/fcron.cyclic
 01 * * * *     test -x /usr/local/bin/run-parts && /usr/local/bin/run-parts /etc/fcron.hourly
-25 1 * * *     test -x /usr/local/bin/run-parts && /usr/local/bin/run-parts /etc/fcron.daily
-47 2 * * 0     test -x /usr/local/bin/run-parts && /usr/local/bin/run-parts /etc/fcron.weekly
-52 3 1 * *     test -x /usr/local/bin/run-parts && /usr/local/bin/run-parts /etc/fcron.monthly
+&nice(10),bootrun 25 1 * * *   test -x /usr/local/bin/run-parts && /usr/local/bin/run-parts /etc/fcron.daily
+&nice(10),bootrun 47 2 * * 0   test -x /usr/local/bin/run-parts && /usr/local/bin/run-parts /etc/fcron.weekly
+&nice(10),bootrun 52 3 1 * *   test -x /usr/local/bin/run-parts && /usr/local/bin/run-parts /etc/fcron.monthly
 
 # Log rotation
 01 * * * *     /usr/sbin/logrotate /etc/logrotate.conf
@@ -55,4 +55,4 @@ HOME=/
 %monthly * 3-5 * /var/ipfire/updatexlrator/autocheck/cron.monthly
 
 # Reset Dialup Statistics
-0 0 1 * *      /usr/local/bin/dialctrl.pl reset
+bootrun 0 0 1 * *      /usr/local/bin/dialctrl.pl reset

diff --git a/config/menu/60-ipfire.menu b/config/menu/60-ipfire.menu
index 673f1d845fdd06eca2d25400943228b436e69394..8b4c139501c84fe6224b83d76bad22fa2dec259f 100644 (file)
--- a/config/menu/60-ipfire.menu
+++ b/config/menu/60-ipfire.menu
@@ -1,25 +1,10 @@
-    $subipfire->{'10.pakfire'} = {'caption' => 'Pakfire',\r
-                                 'uri' => '/cgi-bin/pakfire.cgi',\r
-                                 'title' => "Pakfire",\r
-                                 'enabled' => 1,\r
-                                 };\r
-    $subipfire->{'20.asterisk'} = {'caption' => 'Asterisk',\r
-                                 'uri' => '/cgi-bin/asterisk.cgi',\r
-                                 'title' => "Asterisk",\r
-                                 'enabled' => 1,\r
-                                 };\r
-    $subipfire->{'30.samba'} = {'caption' => 'Samba',\r
-                                 'uri' => '/cgi-bin/samba.cgi',\r
-                                 'title' => "Samba",\r
-                                 'enabled' => 1,\r
-                                 };\r
-    $subipfire->{'40.tripwire'} = {'caption' => 'Tripwire',\r
-                                 'uri' => '/cgi-bin/tripwire.cgi',\r
-                                 'title' => "Tripwire",\r
-                                 'enabled' => 1,\r
-                                 };\r
-    $subipfire->{'99.help'} = {'caption' => $Lang::tr{'help'},\r
-                                 'uri' => '/cgi-bin/help.cgi',\r
-                                 'title' => "$Lang::tr{'help'}",\r
-                                 'enabled' => 1,\r
-                                 };\r
+    $subipfire->{'10.pakfire'} = {'caption' => 'Pakfire',
+                                 'uri' => '/cgi-bin/pakfire.cgi',
+                                 'title' => "Pakfire",
+                                 'enabled' => 1,
+                                 };
+    $subipfire->{'99.help'} = {'caption' => $Lang::tr{'help'},
+                                 'uri' => '/cgi-bin/help.cgi',
+                                 'title' => "$Lang::tr{'help'}",
+                                 'enabled' => 1,
+                                 };

diff --git a/config/menu/EX-samba.menu b/config/menu/EX-samba.menu
new file mode 100644 (file)
index 0000000..cade669
--- /dev/null
+++ b/config/menu/EX-samba.menu
@@ -0,0 +1,5 @@
+    $subipfire->{'30.samba'} = {'caption' => '$Lang::tr{'samba'}',
+                                 'uri' => '/cgi-bin/samba.cgi',
+                                 'title' => $Lang::tr{'samba'},
+                                 'enabled' => 1,
+                                 };

diff --git a/config/menu/EX-tripwire.menu b/config/menu/EX-tripwire.menu
new file mode 100644 (file)
index 0000000..6a23312
--- /dev/null
+++ b/config/menu/EX-tripwire.menu
@@ -0,0 +1,5 @@
+    $subipfire->{'40.tripwire'} = {'caption' => $Lang::tr{'tripwire'},
+                                 'uri' => '/cgi-bin/tripwire.cgi',
+                                 'title' => $Lang::tr{'tripwire'},
+                                 'enabled' => 1,
+                                 };

diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2
index 41eb65a7d17f24a2672e96fc0dc1f109c2d8f8a9..6f23c840186ffc17e01e1abe4a0a8a40595764dd 100644 (file)
--- a/config/rootfiles/common/stage2
+++ b/config/rootfiles/common/stage2
@@ -58,7 +58,6 @@ usr/local/bin/hddshutdown-state
 usr/local/bin/httpscert
 usr/local/bin/langcache
 usr/local/bin/makegraphs
-#usr/local/bin/packager
 usr/local/bin/qosd
 usr/local/bin/readhash
 usr/local/bin/resetusb

diff --git a/config/rootfiles/packages/samba b/config/rootfiles/packages/samba
new file mode 100644 (file)
index 0000000..6a09a92
--- /dev/null
+++ b/config/rootfiles/packages/samba
@@ -0,0 +1,617 @@
+etc/rc.d/init.d/samba
+etc/rc.d/init.d/winbind
+srv/web/ipfire/cgi-bin/samba.cgi
+srv/web/ipfire/cgi-bin/sambahlp.cgi
+var/ipfire/menu.d/EX-samba.menu
+usr/local/bin/sambactrl
+lib/libnss_winbind.so
+lib/libnss_winbind.so.2
+lib/libnss_wins.so
+lib/libnss_wins.so.2
+sbin/mount.smbfs
+usr/bin/eventlogadm
+usr/bin/findsmb
+usr/bin/net
+usr/bin/nmblookup
+usr/bin/ntlm_auth
+usr/bin/pdbedit
+usr/bin/profiles
+usr/bin/rpcclient
+usr/bin/smbcacls
+usr/bin/smbclient
+usr/bin/smbcontrol
+usr/bin/smbcquotas
+usr/bin/smbget
+usr/bin/smbmnt
+usr/bin/smbmount
+usr/bin/smbpasswd
+usr/bin/smbspool
+usr/bin/smbstatus
+usr/bin/smbtar
+usr/bin/smbtree
+usr/bin/smbumount
+usr/bin/tdbbackup
+usr/bin/tdbdump
+usr/bin/tdbtool
+usr/bin/testparm
+usr/bin/wbinfo
+#usr/include/libmsrpc.h
+#usr/include/libsmbclient.h
+usr/lib/libsmbclient.so
+usr/lib/libsmbclient.so.0
+#usr/lib/samba
+#usr/lib/samba/auth
+usr/lib/samba/auth/script.so
+#usr/lib/samba/charset
+usr/lib/samba/charset/CP437.so
+usr/lib/samba/charset/CP850.so
+usr/lib/samba/de.msg
+usr/lib/samba/en.msg
+#usr/lib/samba/fr.msg
+#usr/lib/samba/idmap
+#usr/lib/samba/it.msg
+#usr/lib/samba/ja.msg
+usr/lib/samba/libmsrpc.so
+usr/lib/samba/libsmbclient.so
+usr/lib/samba/lowcase.dat
+#usr/lib/samba/nl.msg
+usr/lib/samba/pdb
+#usr/lib/samba/pl.msg
+usr/lib/samba/rpc
+#usr/lib/samba/tr.msg
+usr/lib/samba/upcase.dat
+usr/lib/samba/valid.dat
+#usr/lib/samba/vfs
+usr/lib/samba/vfs/audit.so
+usr/lib/samba/vfs/cap.so
+usr/lib/samba/vfs/default_quota.so
+usr/lib/samba/vfs/expand_msdfs.so
+usr/lib/samba/vfs/extd_audit.so
+usr/lib/samba/vfs/fake_perms.so
+usr/lib/samba/vfs/full_audit.so
+usr/lib/samba/vfs/netatalk.so
+usr/lib/samba/vfs/readonly.so
+usr/lib/samba/vfs/recycle.so
+usr/lib/samba/vfs/shadow_copy.so
+usr/sbin/mount.cifs
+usr/sbin/nmbd
+usr/sbin/smbd
+#usr/sbin/swat
+usr/sbin/umount.cifs
+usr/sbin/winbindd
+#usr/share/man/man1/findsmb.1
+#usr/share/man/man1/log2pcap.1
+#usr/share/man/man1/nmblookup.1
+#usr/share/man/man1/ntlm_auth.1
+#usr/share/man/man1/profiles.1
+#usr/share/man/man1/rpcclient.1
+#usr/share/man/man1/smbcacls.1
+#usr/share/man/man1/smbclient.1
+#usr/share/man/man1/smbcontrol.1
+#usr/share/man/man1/smbcquotas.1
+#usr/share/man/man1/smbget.1
+#usr/share/man/man1/smbstatus.1
+#usr/share/man/man1/smbtar.1
+#usr/share/man/man1/smbtree.1
+#usr/share/man/man1/testparm.1
+#usr/share/man/man1/vfstest.1
+#usr/share/man/man1/wbinfo.1
+#usr/share/man/man5/lmhosts.5
+#usr/share/man/man5/smb.conf.5
+#usr/share/man/man5/smbgetrc.5
+#usr/share/man/man5/smbpasswd.5
+#usr/share/man/man7/libsmbclient.7
+#usr/share/man/man7/pam_winbind.7
+#usr/share/man/man7/samba.7
+#usr/share/man/man8/mount.cifs.8
+#usr/share/man/man8/net.8
+#usr/share/man/man8/nmbd.8
+#usr/share/man/man8/pdbedit.8
+#usr/share/man/man8/smbd.8
+#usr/share/man/man8/smbmnt.8
+#usr/share/man/man8/smbmount.8
+#usr/share/man/man8/smbpasswd.8
+#usr/share/man/man8/smbspool.8
+#usr/share/man/man8/smbumount.8
+#usr/share/man/man8/swat.8
+#usr/share/man/man8/tdbbackup.8
+#usr/share/man/man8/tdbdump.8
+#usr/share/man/man8/umount.cifs.8
+#usr/share/man/man8/winbindd.8
+#usr/share/samba
+#usr/share/samba/swat
+#usr/share/samba/swat/help
+#usr/share/samba/swat/help/Samba3-ByExample
+#usr/share/samba/swat/help/Samba3-ByExample/2000users.html
+#usr/share/samba/swat/help/Samba3-ByExample/Big500users.html
+#usr/share/samba/swat/help/Samba3-ByExample/DMSMig.html
+#usr/share/samba/swat/help/Samba3-ByExample/DomApps.html
+#usr/share/samba/swat/help/Samba3-ByExample/ExNetworks.html
+#usr/share/samba/swat/help/Samba3-ByExample/HA.html
+#usr/share/samba/swat/help/Samba3-ByExample/RefSection.html
+#usr/share/samba/swat/help/Samba3-ByExample/appendix.html
+#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/AccountingNetwork.png
+#usr/share/samba/swat/help/Samba3-ByExample/images/Charity-Network.png
+#usr/share/samba/swat/help/Samba3-ByExample/images/HostAnnouncment.png
+#usr/share/samba/swat/help/Samba3-ByExample/images/NullConnect.png
+#usr/share/samba/swat/help/Samba3-ByExample/images/UNIX-Samba-and-LDAP.png
+#usr/share/samba/swat/help/Samba3-ByExample/images/UserConnect.png
+#usr/share/samba/swat/help/Samba3-ByExample/images/UserMgrNT4.png
+#usr/share/samba/swat/help/Samba3-ByExample/images/WINREPRESSME-Capture.png
+#usr/share/samba/swat/help/Samba3-ByExample/images/WINREPRESSME-Capture2.png
+#usr/share/samba/swat/help/Samba3-ByExample/images/WindowsXP-NullConnection.png
+#usr/share/samba/swat/help/Samba3-ByExample/images/WindowsXP-UserConnection.png
+#usr/share/samba/swat/help/Samba3-ByExample/images/XP-screen001.png
+#usr/share/samba/swat/help/Samba3-ByExample/images/acct2net.png
+#usr/share/samba/swat/help/Samba3-ByExample/images/ch7-dual-additive-LDAP-Ok.png
+#usr/share/samba/swat/help/Samba3-ByExample/images/ch7-dual-additive-LDAP.png
+#usr/share/samba/swat/help/Samba3-ByExample/images/ch7-fail-overLDAP.png
+#usr/share/samba/swat/help/Samba3-ByExample/images/ch7-singleLDAP.png
+#usr/share/samba/swat/help/Samba3-ByExample/images/ch8-migration.png
+#usr/share/samba/swat/help/Samba3-ByExample/images/chap4-net.png
+#usr/share/samba/swat/help/Samba3-ByExample/images/chap5-net.png
+#usr/share/samba/swat/help/Samba3-ByExample/images/chap6-net.png
+#usr/share/samba/swat/help/Samba3-ByExample/images/chap7-idresol.png
+#usr/share/samba/swat/help/Samba3-ByExample/images/chap7-net-Ar.png
+#usr/share/samba/swat/help/Samba3-ByExample/images/chap7-net2-Br.png
+#usr/share/samba/swat/help/Samba3-ByExample/images/chap9-ADSDC.png
+#usr/share/samba/swat/help/Samba3-ByExample/images/chap9-SambaDC.png
+#usr/share/samba/swat/help/Samba3-ByExample/images/imc-usermanager2.png
+#usr/share/samba/swat/help/Samba3-ByExample/images/lam-config.png
+#usr/share/samba/swat/help/Samba3-ByExample/images/lam-group-members.png
+#usr/share/samba/swat/help/Samba3-ByExample/images/lam-groups.png
+#usr/share/samba/swat/help/Samba3-ByExample/images/lam-hosts.png
+#usr/share/samba/swat/help/Samba3-ByExample/images/lam-login.png
+#usr/share/samba/swat/help/Samba3-ByExample/images/lam-users.png
+#usr/share/samba/swat/help/Samba3-ByExample/images/openmag.png
+#usr/share/samba/swat/help/Samba3-ByExample/images/wxpp001.png
+#usr/share/samba/swat/help/Samba3-ByExample/images/wxpp004.png
+#usr/share/samba/swat/help/Samba3-ByExample/images/wxpp006.png
+#usr/share/samba/swat/help/Samba3-ByExample/images/wxpp007.png
+#usr/share/samba/swat/help/Samba3-ByExample/images/wxpp008.png
+#usr/share/samba/swat/help/Samba3-ByExample/index.html
+#usr/share/samba/swat/help/Samba3-ByExample/ix01.html
+#usr/share/samba/swat/help/Samba3-ByExample/kerberos.html
+#usr/share/samba/swat/help/Samba3-ByExample/ntmigration.html
+#usr/share/samba/swat/help/Samba3-ByExample/nw4migration.html
+#usr/share/samba/swat/help/Samba3-ByExample/pr01.html
+#usr/share/samba/swat/help/Samba3-ByExample/pr02.html
+#usr/share/samba/swat/help/Samba3-ByExample/pr03.html
+#usr/share/samba/swat/help/Samba3-ByExample/preface.html
+#usr/share/samba/swat/help/Samba3-ByExample/primer.html
+#usr/share/samba/swat/help/Samba3-ByExample/secure.html
+#usr/share/samba/swat/help/Samba3-ByExample/simple.html
+#usr/share/samba/swat/help/Samba3-ByExample/small.html
+#usr/share/samba/swat/help/Samba3-ByExample/unixclients.html
+#usr/share/samba/swat/help/Samba3-ByExample/upgrades.html
+#usr/share/samba/swat/help/Samba3-Developers-Guide
+#usr/share/samba/swat/help/Samba3-Developers-Guide/CodingSuggestions.html
+#usr/share/samba/swat/help/Samba3-Developers-Guide/Packaging.html
+#usr/share/samba/swat/help/Samba3-Developers-Guide/architecture.html
+#usr/share/samba/swat/help/Samba3-Developers-Guide/contributing.html
+#usr/share/samba/swat/help/Samba3-Developers-Guide/debug.html
+#usr/share/samba/swat/help/Samba3-Developers-Guide/devprinting.html
+#usr/share/samba/swat/help/Samba3-Developers-Guide/index.html
+#usr/share/samba/swat/help/Samba3-Developers-Guide/internals.html
+#usr/share/samba/swat/help/Samba3-Developers-Guide/modules.html
+#usr/share/samba/swat/help/Samba3-Developers-Guide/ntdomain.html
+#usr/share/samba/swat/help/Samba3-Developers-Guide/parsing.html
+#usr/share/samba/swat/help/Samba3-Developers-Guide/pt01.html
+#usr/share/samba/swat/help/Samba3-Developers-Guide/pt02.html
+#usr/share/samba/swat/help/Samba3-Developers-Guide/pt03.html
+#usr/share/samba/swat/help/Samba3-Developers-Guide/pt04.html
+#usr/share/samba/swat/help/Samba3-Developers-Guide/pt05.html
+#usr/share/samba/swat/help/Samba3-Developers-Guide/pwencrypt.html
+#usr/share/samba/swat/help/Samba3-Developers-Guide/rpc-plugin.html
+#usr/share/samba/swat/help/Samba3-Developers-Guide/tracing.html
+#usr/share/samba/swat/help/Samba3-Developers-Guide/unix-smb.html
+#usr/share/samba/swat/help/Samba3-Developers-Guide/vfs.html
+#usr/share/samba/swat/help/Samba3-Developers-Guide/wins.html
+#usr/share/samba/swat/help/Samba3-HOWTO
+#usr/share/samba/swat/help/Samba3-HOWTO/AccessControls.html
+#usr/share/samba/swat/help/Samba3-HOWTO/AdvancedNetworkManagement.html
+#usr/share/samba/swat/help/Samba3-HOWTO/Appendix.html
+#usr/share/samba/swat/help/Samba3-HOWTO/Backup.html
+#usr/share/samba/swat/help/Samba3-HOWTO/CUPS-printing.html
+#usr/share/samba/swat/help/Samba3-HOWTO/ChangeNotes.html
+#usr/share/samba/swat/help/Samba3-HOWTO/ClientConfig.html
+#usr/share/samba/swat/help/Samba3-HOWTO/DNSDHCP.html
+#usr/share/samba/swat/help/Samba3-HOWTO/FastStart.html
+#usr/share/samba/swat/help/Samba3-HOWTO/InterdomainTrusts.html
+#usr/share/samba/swat/help/Samba3-HOWTO/IntroSMB.html
+#usr/share/samba/swat/help/Samba3-HOWTO/NT4Migration.html
+#usr/share/samba/swat/help/Samba3-HOWTO/NetCommand.html
+#usr/share/samba/swat/help/Samba3-HOWTO/NetworkBrowsing.html
+#usr/share/samba/swat/help/Samba3-HOWTO/Other-Clients.html
+#usr/share/samba/swat/help/Samba3-HOWTO/PolicyMgmt.html
+#usr/share/samba/swat/help/Samba3-HOWTO/Portability.html
+#usr/share/samba/swat/help/Samba3-HOWTO/ProfileMgmt.html
+#usr/share/samba/swat/help/Samba3-HOWTO/SWAT.html
+#usr/share/samba/swat/help/Samba3-HOWTO/SambaHA.html
+#usr/share/samba/swat/help/Samba3-HOWTO/ServerType.html
+#usr/share/samba/swat/help/Samba3-HOWTO/StandAloneServer.html
+#usr/share/samba/swat/help/Samba3-HOWTO/TOSHpreface.html
+#usr/share/samba/swat/help/Samba3-HOWTO/VFS.html
+#usr/share/samba/swat/help/Samba3-HOWTO/bugreport.html
+#usr/share/samba/swat/help/Samba3-HOWTO/cfgsmarts.html
+#usr/share/samba/swat/help/Samba3-HOWTO/ch-ldap-tls.html
+#usr/share/samba/swat/help/Samba3-HOWTO/ch46.html
+#usr/share/samba/swat/help/Samba3-HOWTO/classicalprinting.html
+#usr/share/samba/swat/help/Samba3-HOWTO/compiling.html
+#usr/share/samba/swat/help/Samba3-HOWTO/diagnosis.html
+#usr/share/samba/swat/help/Samba3-HOWTO/domain-member.html
+#usr/share/samba/swat/help/Samba3-HOWTO/go01.html
+#usr/share/samba/swat/help/Samba3-HOWTO/gpl.html
+#usr/share/samba/swat/help/Samba3-HOWTO/groupmapping.html
+#usr/share/samba/swat/help/Samba3-HOWTO/idmapper.html
+#usr/share/samba/swat/help/Samba3-HOWTO/images
+#usr/share/samba/swat/help/Samba3-HOWTO/images/10small.png
+#usr/share/samba/swat/help/Samba3-HOWTO/images/11small.png
+#usr/share/samba/swat/help/Samba3-HOWTO/images/12small.png
+#usr/share/samba/swat/help/Samba3-HOWTO/images/13small.png
+#usr/share/samba/swat/help/Samba3-HOWTO/images/14small.png
+#usr/share/samba/swat/help/Samba3-HOWTO/images/1small.png
+#usr/share/samba/swat/help/Samba3-HOWTO/images/2small.png
+#usr/share/samba/swat/help/Samba3-HOWTO/images/3small.png
+#usr/share/samba/swat/help/Samba3-HOWTO/images/4small.png
+#usr/share/samba/swat/help/Samba3-HOWTO/images/5small.png
+#usr/share/samba/swat/help/Samba3-HOWTO/images/6small.png
+#usr/share/samba/swat/help/Samba3-HOWTO/images/7small.png
+#usr/share/samba/swat/help/Samba3-HOWTO/images/8small.png
+#usr/share/samba/swat/help/Samba3-HOWTO/images/9small.png
+#usr/share/samba/swat/help/Samba3-HOWTO/images/WME001.png
+#usr/share/samba/swat/help/Samba3-HOWTO/images/WME002.png
+#usr/share/samba/swat/help/Samba3-HOWTO/images/WME003.png
+#usr/share/samba/swat/help/Samba3-HOWTO/images/WME005.png
+#usr/share/samba/swat/help/Samba3-HOWTO/images/WME009.png
+#usr/share/samba/swat/help/Samba3-HOWTO/images/WME010.png
+#usr/share/samba/swat/help/Samba3-HOWTO/images/WME013.png
+#usr/share/samba/swat/help/Samba3-HOWTO/images/WME014.png
+#usr/share/samba/swat/help/Samba3-HOWTO/images/WXPP002.png
+#usr/share/samba/swat/help/Samba3-HOWTO/images/WXPP003.png
+#usr/share/samba/swat/help/Samba3-HOWTO/images/WXPP005.png
+#usr/share/samba/swat/help/Samba3-HOWTO/images/WXPP009.png
+#usr/share/samba/swat/help/Samba3-HOWTO/images/WXPP014.png
+#usr/share/samba/swat/help/Samba3-HOWTO/images/a_small.png
+#usr/share/samba/swat/help/Samba3-HOWTO/images/access1.png
+#usr/share/samba/swat/help/Samba3-HOWTO/images/browsing1.png
+#usr/share/samba/swat/help/Samba3-HOWTO/images/cups1.png
+#usr/share/samba/swat/help/Samba3-HOWTO/images/cups2.png
+#usr/share/samba/swat/help/Samba3-HOWTO/images/domain.png
+#usr/share/samba/swat/help/Samba3-HOWTO/images/ethereal1.png
+#usr/share/samba/swat/help/Samba3-HOWTO/images/ethereal2.png
+#usr/share/samba/swat/help/Samba3-HOWTO/images/idmap-gid2sid.png
+#usr/share/samba/swat/help/Samba3-HOWTO/images/idmap-sid2gid.png
+#usr/share/samba/swat/help/Samba3-HOWTO/images/idmap-sid2uid.png
+#usr/share/samba/swat/help/Samba3-HOWTO/images/idmap-store-gid2sid.png
+#usr/share/samba/swat/help/Samba3-HOWTO/images/idmap-uid2sid.png
+#usr/share/samba/swat/help/Samba3-HOWTO/images/idmap_winbind_no_loop.png
+#usr/share/samba/swat/help/Samba3-HOWTO/images/pdftoepsonusb.png
+#usr/share/samba/swat/help/Samba3-HOWTO/images/pdftosocket.png
+#usr/share/samba/swat/help/Samba3-HOWTO/images/trusts1.png
+#usr/share/samba/swat/help/Samba3-HOWTO/images/w2kp001.png
+#usr/share/samba/swat/help/Samba3-HOWTO/images/w2kp002.png
+#usr/share/samba/swat/help/Samba3-HOWTO/images/w2kp003.png
+#usr/share/samba/swat/help/Samba3-HOWTO/images/w2kp004.png
+#usr/share/samba/swat/help/Samba3-HOWTO/images/w2kp005.png
+#usr/share/samba/swat/help/Samba3-HOWTO/images/wxpp001.png
+#usr/share/samba/swat/help/Samba3-HOWTO/images/wxpp004.png
+#usr/share/samba/swat/help/Samba3-HOWTO/images/wxpp006.png
+#usr/share/samba/swat/help/Samba3-HOWTO/images/wxpp007.png
+#usr/share/samba/swat/help/Samba3-HOWTO/images/wxpp008.png
+#usr/share/samba/swat/help/Samba3-HOWTO/index.html
+#usr/share/samba/swat/help/Samba3-HOWTO/install.html
+#usr/share/samba/swat/help/Samba3-HOWTO/integrate-ms-networks.html
+#usr/share/samba/swat/help/Samba3-HOWTO/introduction.html
+#usr/share/samba/swat/help/Samba3-HOWTO/ix01.html
+#usr/share/samba/swat/help/Samba3-HOWTO/largefile.html
+#usr/share/samba/swat/help/Samba3-HOWTO/locking.html
+#usr/share/samba/swat/help/Samba3-HOWTO/migration.html
+#usr/share/samba/swat/help/Samba3-HOWTO/msdfs.html
+#usr/share/samba/swat/help/Samba3-HOWTO/optional.html
+#usr/share/samba/swat/help/Samba3-HOWTO/pam.html
+#usr/share/samba/swat/help/Samba3-HOWTO/passdb.html
+#usr/share/samba/swat/help/Samba3-HOWTO/pr01.html
+#usr/share/samba/swat/help/Samba3-HOWTO/pr02.html
+#usr/share/samba/swat/help/Samba3-HOWTO/pr03.html
+#usr/share/samba/swat/help/Samba3-HOWTO/problems.html
+#usr/share/samba/swat/help/Samba3-HOWTO/rights.html
+#usr/share/samba/swat/help/Samba3-HOWTO/samba-bdc.html
+#usr/share/samba/swat/help/Samba3-HOWTO/samba-pdc.html
+#usr/share/samba/swat/help/Samba3-HOWTO/securing-samba.html
+#usr/share/samba/swat/help/Samba3-HOWTO/speed.html
+#usr/share/samba/swat/help/Samba3-HOWTO/troubleshooting.html
+#usr/share/samba/swat/help/Samba3-HOWTO/type.html
+#usr/share/samba/swat/help/Samba3-HOWTO/unicode.html
+#usr/share/samba/swat/help/Samba3-HOWTO/upgrading-to-3.0.html
+#usr/share/samba/swat/help/Samba3-HOWTO/winbind.html
+#usr/share/samba/swat/help/manpages
+#usr/share/samba/swat/help/manpages/findsmb.1.html
+#usr/share/samba/swat/help/manpages/index.html
+#usr/share/samba/swat/help/manpages/libsmbclient.7.html
+#usr/share/samba/swat/help/manpages/lmhosts.5.html
+#usr/share/samba/swat/help/manpages/log2pcap.1.html
+#usr/share/samba/swat/help/manpages/mount.cifs.8.html
+#usr/share/samba/swat/help/manpages/net.8.html
+#usr/share/samba/swat/help/manpages/nmbd.8.html
+#usr/share/samba/swat/help/manpages/nmblookup.1.html
+#usr/share/samba/swat/help/manpages/ntlm_auth.1.html
+#usr/share/samba/swat/help/manpages/pam_winbind.7.html
+#usr/share/samba/swat/help/manpages/pdbedit.8.html
+#usr/share/samba/swat/help/manpages/profiles.1.html
+#usr/share/samba/swat/help/manpages/rpcclient.1.html
+#usr/share/samba/swat/help/manpages/samba.7.html
+#usr/share/samba/swat/help/manpages/smb.conf.5.html
+#usr/share/samba/swat/help/manpages/smbcacls.1.html
+#usr/share/samba/swat/help/manpages/smbclient.1.html
+#usr/share/samba/swat/help/manpages/smbcontrol.1.html
+#usr/share/samba/swat/help/manpages/smbcquotas.1.html
+#usr/share/samba/swat/help/manpages/smbd.8.html
+#usr/share/samba/swat/help/manpages/smbget.1.html
+#usr/share/samba/swat/help/manpages/smbgetrc.5.html
+#usr/share/samba/swat/help/manpages/smbmnt.8.html
+#usr/share/samba/swat/help/manpages/smbmount.8.html
+#usr/share/samba/swat/help/manpages/smbpasswd.5.html
+#usr/share/samba/swat/help/manpages/smbpasswd.8.html
+#usr/share/samba/swat/help/manpages/smbsh.1.html
+#usr/share/samba/swat/help/manpages/smbspool.8.html
+#usr/share/samba/swat/help/manpages/smbstatus.1.html
+#usr/share/samba/swat/help/manpages/smbtar.1.html
+#usr/share/samba/swat/help/manpages/smbtree.1.html
+#usr/share/samba/swat/help/manpages/smbumount.8.html
+#usr/share/samba/swat/help/manpages/swat.8.html
+#usr/share/samba/swat/help/manpages/tdbbackup.8.html
+#usr/share/samba/swat/help/manpages/tdbdump.8.html
+#usr/share/samba/swat/help/manpages/testparm.1.html
+#usr/share/samba/swat/help/manpages/umount.cifs.8.html
+#usr/share/samba/swat/help/manpages/vfstest.1.html
+#usr/share/samba/swat/help/manpages/wbinfo.1.html
+#usr/share/samba/swat/help/manpages/winbindd.8.html
+#usr/share/samba/swat/help/welcome-no-samba-doc.html
+#usr/share/samba/swat/help/welcome.html
+#usr/share/samba/swat/images
+#usr/share/samba/swat/images/globals.gif
+#usr/share/samba/swat/images/home.gif
+#usr/share/samba/swat/images/passwd.gif
+#usr/share/samba/swat/images/printers.gif
+#usr/share/samba/swat/images/samba.gif
+#usr/share/samba/swat/images/shares.gif
+#usr/share/samba/swat/images/status.gif
+#usr/share/samba/swat/images/viewconfig.gif
+#usr/share/samba/swat/images/wizard.gif
+#usr/share/samba/swat/include
+#usr/share/samba/swat/include/footer.html
+#usr/share/samba/swat/include/header.html
+#usr/share/samba/swat/js
+#usr/share/samba/swat/lang
+#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
+#usr/share/samba/swat/lang/ja/js
+#usr/share/samba/swat/lang/tr
+#usr/share/samba/swat/lang/tr/help
+#usr/share/samba/swat/lang/tr/help/welcome.html
+#usr/share/samba/swat/lang/tr/images
+#usr/share/samba/swat/lang/tr/images/globals.gif
+#usr/share/samba/swat/lang/tr/images/home.gif
+#usr/share/samba/swat/lang/tr/images/passwd.gif
+#usr/share/samba/swat/lang/tr/images/printers.gif
+#usr/share/samba/swat/lang/tr/images/samba.gif
+#usr/share/samba/swat/lang/tr/images/shares.gif
+#usr/share/samba/swat/lang/tr/images/status.gif
+#usr/share/samba/swat/lang/tr/images/viewconfig.gif
+#usr/share/samba/swat/lang/tr/include
+#usr/share/samba/swat/lang/tr/js
+#usr/share/samba/swat/using_samba
+#usr/share/samba/swat/using_samba/appa.html
+#usr/share/samba/swat/using_samba/appb.html
+#usr/share/samba/swat/using_samba/appc.html
+#usr/share/samba/swat/using_samba/appd.html
+#usr/share/samba/swat/using_samba/appe.html
+#usr/share/samba/swat/using_samba/appf.html
+#usr/share/samba/swat/using_samba/appg.html
+#usr/share/samba/swat/using_samba/ch00.html
+#usr/share/samba/swat/using_samba/ch01.html
+#usr/share/samba/swat/using_samba/ch02.html
+#usr/share/samba/swat/using_samba/ch03.html
+#usr/share/samba/swat/using_samba/ch04.html
+#usr/share/samba/swat/using_samba/ch05.html
+#usr/share/samba/swat/using_samba/ch06.html
+#usr/share/samba/swat/using_samba/ch07.html
+#usr/share/samba/swat/using_samba/ch08.html
+#usr/share/samba/swat/using_samba/ch09.html
+#usr/share/samba/swat/using_samba/ch10.html
+#usr/share/samba/swat/using_samba/ch11.html
+#usr/share/samba/swat/using_samba/ch12.html
+#usr/share/samba/swat/using_samba/figs
+#usr/share/samba/swat/using_samba/figs/sam2_0101.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0102.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0103.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0104.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0105.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0106.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0107.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0108.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0109.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0110.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0111.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0112.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0113.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0114.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0201.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0202.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0203.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0204.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0301.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0302.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0303.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0304.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0305.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0306.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0307.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0308.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0309.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0310.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0311.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0312.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0313.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0314.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0315.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0316.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0317.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0318.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0319.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0320.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0321.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0322.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0323.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0324.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0325.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0326.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0327.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0328.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0329.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0330.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0331.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0332.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0333.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0334.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0335.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0336.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0337.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0338.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0339.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0340.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0341.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0342.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0343.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0344.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0345.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0346.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0347.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0348.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0349.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0350.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0351.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0352.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0353.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0354.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0355.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0356.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0357.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0358.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0359.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0360.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0361.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0401.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0402.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0403.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0404.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0405.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0406.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0407.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0408.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0409.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0410.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0411.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0412.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0413.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0414.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0415.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0416.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0417.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0501.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0502.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0503.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0504.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0505.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0506.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0507.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0508.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0601.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0602.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0603.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0604.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0605.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0701.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0801.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0802.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0803.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0804.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0805.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0806.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0807.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0808.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0809.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0810.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0811.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0901.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0902.gif
+#usr/share/samba/swat/using_samba/figs/sam2_0903.gif
+#usr/share/samba/swat/using_samba/figs/sam2_1001.gif
+#usr/share/samba/swat/using_samba/figs/sam2_1002.gif
+#usr/share/samba/swat/using_samba/figs/sam2_1003.gif
+#usr/share/samba/swat/using_samba/figs/sam2_1004.gif
+#usr/share/samba/swat/using_samba/figs/sam2_1005.gif
+#usr/share/samba/swat/using_samba/figs/sam2_1006.gif
+#usr/share/samba/swat/using_samba/figs/sam2_1101.gif
+#usr/share/samba/swat/using_samba/figs/sam2_1102.gif
+#usr/share/samba/swat/using_samba/figs/sam2_af01.gif
+#usr/share/samba/swat/using_samba/figs/sam2_af02.gif
+#usr/share/samba/swat/using_samba/figs/sam2_af03.gif
+#usr/share/samba/swat/using_samba/figs/sam2_af04.gif
+#usr/share/samba/swat/using_samba/figs/sam2_af05.gif
+#usr/share/samba/swat/using_samba/figs/sam2_af06.gif
+#usr/share/samba/swat/using_samba/figs/sam2_af07.gif
+#usr/share/samba/swat/using_samba/inx.html
+#usr/share/samba/swat/using_samba/samba2_s.gif
+#usr/share/samba/swat/using_samba/samba2_xs.gif
+#usr/share/samba/swat/using_samba/toc.html
+#var/ipfire/samba
+var/ipfire/samba/default.global
+var/ipfire/samba/default.pdc
+var/ipfire/samba/default.printer
+var/ipfire/samba/default.settings
+var/ipfire/samba/default.shares
+var/ipfire/samba/global
+var/ipfire/samba/pdc
+var/ipfire/samba/printer
+#var/ipfire/samba/private
+#var/ipfire/samba/private/.svn
+#var/ipfire/samba/private/.svn/README.txt
+#var/ipfire/samba/private/.svn/dir-wcprops
+#var/ipfire/samba/private/.svn/empty-file
+#var/ipfire/samba/private/.svn/entries
+#var/ipfire/samba/private/.svn/format
+#var/ipfire/samba/private/.svn/prop-base
+#var/ipfire/samba/private/.svn/prop-base/secrets.tdb.svn-base
+#var/ipfire/samba/private/.svn/prop-base/smbpasswd.svn-base
+#var/ipfire/samba/private/.svn/props
+#var/ipfire/samba/private/.svn/props/secrets.tdb.svn-work
+#var/ipfire/samba/private/.svn/props/smbpasswd.svn-work
+#var/ipfire/samba/private/.svn/text-base
+#var/ipfire/samba/private/.svn/text-base/secrets.tdb.svn-base
+#var/ipfire/samba/private/.svn/text-base/smbpasswd.svn-base
+#var/ipfire/samba/private/.svn/tmp
+#var/ipfire/samba/private/.svn/tmp/prop-base
+#var/ipfire/samba/private/.svn/tmp/props
+#var/ipfire/samba/private/.svn/tmp/text-base
+#var/ipfire/samba/private/.svn/tmp/wcprops
+#var/ipfire/samba/private/.svn/wcprops
+#var/ipfire/samba/private/.svn/wcprops/secrets.tdb.svn-work
+#var/ipfire/samba/private/.svn/wcprops/smbpasswd.svn-work
+var/ipfire/samba/private/secrets.tdb
+var/ipfire/samba/private/smbpasswd
+var/ipfire/samba/settings
+var/ipfire/samba/shares
+var/ipfire/samba/smb.conf
+var/ipfire/samba/smb.conf.default
+var/lib/samba
+var/log/samba

diff --git a/config/rootfiles/packages/tripwire b/config/rootfiles/packages/tripwire
new file mode 100644 (file)
index 0000000..e7c9415
--- /dev/null
+++ b/config/rootfiles/packages/tripwire
@@ -0,0 +1,12 @@
+#etc/rc.d/init.d/tripwire
+usr/local/bin/tripwirectrl
+usr/sbin/siggen
+usr/sbin/tripwire
+usr/sbin/twadmin
+usr/sbin/twprint
+var/ipfire/tripwire/twcfg.default
+var/ipfire/tripwire/twcfg.txt
+var/ipfire/tripwire/twpol.default
+var/ipfire/tripwire/twpol.txt
+srv/web/ipfire/cgi-bin/tripwire.cgi
+var/ipfire/menu.d/EX-tripwire.menu

diff --git a/doc/language_issues.de b/doc/language_issues.de
index 4b7f8abb3b771d2fde43e1e1a39c7401f661164e..90a48aa0747f2f2f6b52e29da9d3b9a263f3acb6 100644 (file)
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -344,6 +344,7 @@ WARNING: untranslated string: trafficred
 WARNING: untranslated string: traffics
 WARNING: untranslated string: trafficsum
 WARNING: untranslated string: trafficto
+WARNING: untranslated string: tripwire
 WARNING: untranslated string: up
 WARNING: untranslated string: urlfilter background image
 WARNING: untranslated string: urlfilter log

diff --git a/doc/language_issues.en b/doc/language_issues.en
index b8a472ce90476e9964837e551d428832a5430a7b..4dc15076b807532dbcea484908c4edd17c1cda16 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -332,6 +332,7 @@ WARNING: untranslated string: pakfire configuration
 WARNING: untranslated string: red
 WARNING: untranslated string: remove x509
 WARNING: untranslated string: settingsc
+WARNING: untranslated string: tripwire
 WARNING: untranslated string: up
 WARNING: untranslated string: urlfilter background image
 WARNING: untranslated string: urlfilter log

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 1d7f79086c03e5faa9d4799d60a0dc1fc0a348b2..1f80ace15a252e4cbef7eac046adb2944b8eaa24 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -192,7 +192,6 @@
 * openssh-4.3p2
 * openssl-0.9.8d
 * openswan-2.4.8rc1
-* openswan-2.4.8rc1
 * openvpn-2.0.9
 * pam_mysql-0.7RC1
 * patch-2.5.4

diff --git a/lfs/Config b/lfs/Config
index cae476e0b0d188e77dddb18fd40e888d377d1233..552c6726b8527f1f815df535c9bdf10b9a5b6bec 100644 (file)
--- a/lfs/Config
+++ b/lfs/Config
@@ -156,5 +156,29 @@ define MD5
 endef
 
 define PAK
-       /usr/local/bin/packager $(PROG) $(VER) $(PAK_VER)
+       # 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)/update.sh /install/packages/package
+       @cp -f /usr/src/config/rootfiles/packages/$(PROG) /install/packages/package/ROOTFILES
+       @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 --bzip2 --verbose --file=/install/packages/package/files.tbz2 *
+       @cd / && rm -rf /tmp/*
+       @cd /install/packages/package && cat ROOTFILES | grep -v "#" > ROOTFILES
+       cd /install/packages/package && tar cfj ../$(PROG)-$(VER)_$(PAK_VER).ipfire \
+                       files.tbz2 install.sh uninstall.sh update.sh ROOTFILES
+       @rm -rf /install/packages/package
+       sed -e s/NAME/$(PROG)/g \
+                       -e s/VER/$(VER)/g \
+                       -e s/RELEASE/$(PAK_VER)/g \
+                       -e s/DEPS/$(DEPS)/g \
+                       -e s/DESCDE/$(DESCDE)/g \
+                       -e s/DESCEN/$(DESCEN)/g \
+                       -e s/SIZE/`ls -l \/install\/packages\/$(PROG)-$(VER)_$(PAK_VER).ipfire | awk '{ print $$5 }'`/g \
+         < /usr/src/src/pakfire/meta > /install/packages/meta-$(PROG)
 endef

diff --git a/lfs/clamav b/lfs/clamav
index 782e43a257c2b34b971517abcc642b4a40ff3043..55d0805289c677780f34492fd8354394ed7e70e2 100644 (file)
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -55,7 +55,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 md5 : $(subst %,%_MD5,$(objects))
 
 dist: 
-       @$(PAK)
+       $(PAK)
 
 ###############################################################################
 # Downloading, checking, md5sum

diff --git a/lfs/samba b/lfs/samba
index 589b220db5fa0a52752ef22f788de8c3cff11c4e..49f47cf6ac934117e4fa196c206bf666ab6accb3 100644 (file)
--- a/lfs/samba
+++ b/lfs/samba
@@ -36,6 +36,10 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = samba
 PAK_VER    = 1
 
+DESCDE     = "Samba ist ein Windows-File- und Printserver."
+DESCEN     = "Samba is a file- and printserver for Windows."
+DEPS       = cups
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################

diff --git a/make.sh b/make.sh
index 98b74d93a7563ecd420fc27f3a85672b92d5f2f2..fa6d0cb0ffe719b92b84cb595da56dc3b5bfc89c 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -646,12 +646,13 @@ ipfirepackages() {
 #  ipfiredist mldonkey
 #  ipfiredist nfs
 #  ipfiredist postfix
-#  ipfiredist samba
+  ipfiredist samba
 #  ipfiredist sox
 #  ipfiredist spamassassin
+  ipfiredist tripwire
 #  ipfiredist webcyradm
   test -d $BASEDIR/packages || mkdir $BASEDIR/packages
-  mv -f $LFS/install/packages/*.ipfire $BASEDIR/packages >> $LOGFILE 2>&1
+  mv -f $LFS/install/packages/* $BASEDIR/packages >> $LOGFILE 2>&1
   rm -rf  $BASEDIR/build/install/packages/*
 }
 

diff --git a/src/misc-progs/clamavctrl.c b/src/misc-progs/clamavctrl.c
index f1a65b9f66bd2eed110184ce1544a957e526e854..fb097b540921d7f9243500527cf2cc707e760186 100644 (file)
--- a/src/misc-progs/clamavctrl.c
+++ b/src/misc-progs/clamavctrl.c
@@ -33,7 +33,9 @@ int main(int argc, char *argv[]) {
                safe_system("ln -fs ../init.d/clamav /etc/rc.d/rc3.d/S33clamav >/dev/null 2>&1");
                safe_system("ln -fs ../init.d/clamav /etc/rc.d/rc0.d/K67clamav >/dev/null 2>&1");
                safe_system("ln -fs ../init.d/clamav /etc/rc.d/rc6.d/K67clamav >/dev/null 2>&1");
+               safe_system("/etc/rc.d/init.d/clamav start");
        } else if (strcmp(argv[1], "disable") == 0) {
+               safe_system("/etc/rc.d/init.d/clamav stop");
                safe_system("rm -f /etc/rc.d/rc*.d/*clamav >/dev/null 2>&1");
        } else {
                fprintf(stderr, "\nBad argument given.\n\nclamavctrl (start|stop|restart)\n\n");

diff --git a/src/pakfire/meta b/src/pakfire/meta
new file mode 100644 (file)
index 0000000..a2a79a3
--- /dev/null
+++ b/src/pakfire/meta
@@ -0,0 +1,9 @@
+Name: NAME
+FullName: NAME
+Version: VER
+Release: RELEASE
+Size: SIZE
+Dependencies: DEPS
+Description-de: DESCDE
+Description-en: DESCEN
+File: NAME-VER-RELEASE.ipfire

diff --git a/src/paks/clamav/install.sh b/src/paks/clamav/install.sh
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..8b756d168f2a54eb67b282ea5c5e3f22d4542d71 100644 (file)
--- a/src/paks/clamav/install.sh
+++ b/src/paks/clamav/install.sh
@@ -0,0 +1,3 @@
+tar xvfj files.tbz -C /
+
+clamavctrl enable

diff --git a/src/paks/clamav/uninstall.sh b/src/paks/clamav/uninstall.sh
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..650ea36ca85b7b0a6b1f83b6107686c4d8cd9c29 100644 (file)
--- a/src/paks/clamav/uninstall.sh
+++ b/src/paks/clamav/uninstall.sh
@@ -0,0 +1 @@
+clamavctrl disable

diff --git a/src/paks/samba/install.sh b/src/paks/samba/install.sh
new file mode 100644 (file)
index 0000000..125ce1e
--- /dev/null
+++ b/src/paks/samba/install.sh
@@ -0,0 +1 @@
+tar xvfj files.tbz -C /

diff --git a/src/paks/samba/uninstall.sh b/src/paks/samba/uninstall.sh
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/src/paks/samba/update.sh b/src/paks/samba/update.sh
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/src/paks/tripwire/install.sh b/src/paks/tripwire/install.sh
new file mode 100644 (file)
index 0000000..125ce1e
--- /dev/null
+++ b/src/paks/tripwire/install.sh
@@ -0,0 +1 @@
+tar xvfj files.tbz -C /

diff --git a/src/paks/tripwire/uninstall.sh b/src/paks/tripwire/uninstall.sh
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/src/paks/tripwire/update.sh b/src/paks/tripwire/update.sh
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/src/scripts/packager b/src/scripts/packager
deleted file mode 100644 (file)
index 83b83a1..0000000
--- a/src/scripts/packager
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-PROG="$1"
-VER="$2"
-PAK_VER="$3"
-EXT=ipfire
-
-       # 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/update.sh /install/packages/package
-       cp -f /usr/src/config/rootfiles/packages/$PROG /install/packages/package/ROOTFILES
-       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 --bzip2 --verbose --file=/install/packages/package/files.tbz2 *
-
-       cd /    && rm -rf /tmp/*
-       cd /install/packages/package && cat ROOTFILES | grep -v "#" > ROOTFILES
-       tar cfj ../$PROG-${VER}_$PAK_VER.$EXT files.tbz2 install.sh uninstall.sh update.sh ROOTFILES
-       
-       rm -rf /install/packages/package
-       exit 0