Einige Fixes fuer den Paketmanager.

ISA PnP aus Kernel entfernt.
Defaultconf fuer Clamav.

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

diff --git a/config/clamav/clamd.conf b/config/clamav/clamd.conf
new file mode 100644 (file)
index 0000000..2f77b6b
--- /dev/null
+++ b/config/clamav/clamd.conf
@@ -0,0 +1,10 @@
+##
+## ipfire config file for the Clam AV daemon
+##
+
+LogSyslog yes
+
+PidFile /var/run/clamd.pid
+LocalSocket /var/run/clamd
+
+ArchiveMaxFileSize 15M

diff --git a/config/clamav/freshclam.conf b/config/clamav/freshclam.conf
new file mode 100644 (file)
index 0000000..a2eae00
--- /dev/null
+++ b/config/clamav/freshclam.conf
@@ -0,0 +1,19 @@
+##
+## ipfire config file for freshclam
+##
+
+LogSyslog yes
+
+PidFile /var/run/freshclam.pid
+
+DatabaseMirror database.clamav.net
+
+ScriptedUpdates yes
+
+## Proxy settings
+#HTTPProxyServer myproxy.com
+#HTTPProxyPort 1234
+#HTTPProxyUsername myusername
+#HTTPProxyPassword mypass
+
+NotifyClamd /var/ipfire/clamav/clamd.conf

diff --git a/config/kernel/kernel.config.i586 b/config/kernel/kernel.config.i586
index a6af1fff8a6e8c2e9c247ce739e502046983aa25..b7b89b7c8f1505f047b51921c9b3a2bb3ad59790 100644 (file)
--- a/config/kernel/kernel.config.i586
+++ b/config/kernel/kernel.config.i586
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.16.50-ipfire
-# Sat May  5 09:53:31 2007
+# Sun May  6 14:35:41 2007
 #
 CONFIG_X86_32=y
 CONFIG_SEMAPHORE_SLEEPERS=y
@@ -664,7 +664,7 @@ CONFIG_PNP=y
 #
 # Protocols
 #
-CONFIG_ISAPNP=y
+# CONFIG_ISAPNP is not set
 CONFIG_PNPBIOS=y
 CONFIG_PNPBIOS_PROC_FS=y
 CONFIG_PNPACPI=y

diff --git a/config/kernel/kernel.config.i586.smp b/config/kernel/kernel.config.i586.smp
index bf120355468ba233b5eb35d6cef9842d9e0c2435..1a813b92e9925cbefe895922232ed3215d14afb2 100644 (file)
--- a/config/kernel/kernel.config.i586.smp
+++ b/config/kernel/kernel.config.i586.smp
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.16.50-ipfire
-# Sat May  5 09:54:33 2007
+# Sun May  6 14:36:07 2007
 #
 CONFIG_X86_32=y
 CONFIG_SEMAPHORE_SLEEPERS=y
@@ -670,7 +670,7 @@ CONFIG_PNP=y
 #
 # Protocols
 #
-CONFIG_ISAPNP=y
+# CONFIG_ISAPNP is not set
 CONFIG_PNPBIOS=y
 CONFIG_PNPBIOS_PROC_FS=y
 CONFIG_PNPACPI=y

diff --git a/config/menu/EX-samba.menu b/config/menu/EX-samba.menu
index cade66930d36090bfeb368a11a6602bfb493be51..6a9a1ae711c8a62852520ce3c54520e64b45f5c9 100644 (file)
--- a/config/menu/EX-samba.menu
+++ b/config/menu/EX-samba.menu
@@ -1,4 +1,4 @@
-    $subipfire->{'30.samba'} = {'caption' => '$Lang::tr{'samba'}',
+    $subipfire->{'30.samba'} = {'caption' => $Lang::tr{'samba'},
                                  'uri' => '/cgi-bin/samba.cgi',
                                  'title' => $Lang::tr{'samba'},
                                  'enabled' => 1,

diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
index bb1d59a143e3abfbf66a1229abadf2ca3f74ae35..a6a496382eeea5b8187f714fdbd118da398a4940 100644 (file)
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -65,7 +65,14 @@ var/ipfire/main
 #var/ipfire/main/settings
 var/ipfire/mbmon
 #var/ipfire/mbmon/settings
-var/ipfire/menu.d
+var/ipfire/menu.d/00-menu.main
+var/ipfire/menu.d/10-system.menu
+var/ipfire/menu.d/20-status.menu
+var/ipfire/menu.d/30-network.menu
+var/ipfire/menu.d/40-services.menu
+var/ipfire/menu.d/50-firewall.menu
+var/ipfire/menu.d/60-ipfire.menu
+var/ipfire/menu.d/70-log.menu
 var/ipfire/modem
 #var/ipfire/modem/defaults
 #var/ipfire/modem/settings

diff --git a/config/rootfiles/common/gnupg b/config/rootfiles/common/gnupg
index 9e2bf5a949e6d9a09f0ea1258b73cbd1b198601e..a8a2160a09defedb04e577db6b2e0190cb1d80cf 100644 (file)
--- a/config/rootfiles/common/gnupg
+++ b/config/rootfiles/common/gnupg
@@ -1,7 +1,7 @@
 #root/.gnupg
 root/.gnupg/gpg.conf
 root/.gnupg/pubring.gpg
-#root/.gnupg/pubring.gpg~
+root/.gnupg/pubring.gpg~
 root/.gnupg/secring.gpg
 root/.gnupg/trustdb.gpg
 usr/bin/gpg

diff --git a/lfs/Config b/lfs/Config
index 552c6726b8527f1f815df535c9bdf10b9a5b6bec..f9076896298ed1d98bd3941bbaac84dc6bcb5259 100644 (file)
--- a/lfs/Config
+++ b/lfs/Config
@@ -170,7 +170,7 @@ define PAK
        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 \
+       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 \
@@ -179,6 +179,6 @@ define PAK
                        -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 \
+                       -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 55d0805289c677780f34492fd8354394ed7e70e2..801c2885dba60898aec58ed556adb82f8c2d5589 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
@@ -80,6 +80,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/var/ipfire/clamav
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
-       chown nobody.nobody /usr/share/clamav -R
+       chown clamav.clamav /usr/share/clamav -R
+       cp -rf $(DIR_SRC)/config/clamav/* /var/ipfire/clamav/
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/pakfire b/lfs/pakfire
index 4157aa968d404a1ae6ed62f698c73dded415e692..cfd4258d59c8694c8d4b7f820bc8e50c3229dad1 100644 (file)
--- a/lfs/pakfire
+++ b/lfs/pakfire
@@ -55,5 +55,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cp -fRv $(DIR_SRC)/src/pakfire/* $(DIR_APP)
        cp -vf $(DIR_SRC)/src/pakfire/pakfire.conf $(DIR_APP)/etc/
        chown root.root $(DIR_APP) -R
+       chmod 755 $(DIR_APP)/pakfire
        -cd $(DIR_APP) && find $(DIR_APP) -name .svn -exec rm -rf {} \;
        @$(POSTBUILD)

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

diff --git a/src/paks/samba/install.sh b/src/paks/samba/install.sh
index 125ce1e0553adb5037e9acbbb9bfec6ec7d27003..ace14baf9c3608b672e13cdeff5a230742498788 100644 (file)
--- a/src/paks/samba/install.sh
+++ b/src/paks/samba/install.sh
@@ -1 +1 @@
-tar xvfj files.tbz -C /
+tar xvfj files.tbz2 -C /

diff --git a/src/paks/tripwire/install.sh b/src/paks/tripwire/install.sh
index 125ce1e0553adb5037e9acbbb9bfec6ec7d27003..ace14baf9c3608b672e13cdeff5a230742498788 100644 (file)
--- a/src/paks/tripwire/install.sh
+++ b/src/paks/tripwire/install.sh
@@ -1 +1 @@
-tar xvfj files.tbz -C /
+tar xvfj files.tbz2 -C /