Einige Fixes fuer den Paketmanager.
authorms <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Sun, 6 May 2007 15:11:01 +0000 (15:11 +0000)
committerms <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Sun, 6 May 2007 15:11:01 +0000 (15:11 +0000)
ISA PnP aus Kernel entfernt.
Defaultconf fuer Clamav.

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

13 files changed:
config/clamav/clamd.conf [new file with mode: 0644]
config/clamav/freshclam.conf [new file with mode: 0644]
config/kernel/kernel.config.i586
config/kernel/kernel.config.i586.smp
config/menu/EX-samba.menu
config/rootfiles/common/configroot
config/rootfiles/common/gnupg
lfs/Config
lfs/clamav
lfs/pakfire
src/paks/clamav/install.sh
src/paks/samba/install.sh
src/paks/tripwire/install.sh

diff --git a/config/clamav/clamd.conf b/config/clamav/clamd.conf
new file mode 100644 (file)
index 0000000..2f77b6b
--- /dev/null
@@ -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
@@ -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
index a6af1ff..b7b89b7 100644 (file)
@@ -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
index bf12035..1a813b9 100644 (file)
@@ -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
index cade669..6a9a1ae 100644 (file)
@@ -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,
index bb1d59a..a6a4963 100644 (file)
@@ -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
index 9e2bf5a..a8a2160 100644 (file)
@@ -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
index 552c672..f907689 100644 (file)
@@ -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
index 55d0805..801c288 100644 (file)
@@ -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)
index 4157aa9..cfd4258 100644 (file)
@@ -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)
index 8b756d1..e3992d3 100644 (file)
@@ -1,3 +1,3 @@
-tar xvfj files.tbz -C /
+tar xvfj files.tbz2 -C /
 
 clamavctrl enable
index 125ce1e..ace14ba 100644 (file)
@@ -1 +1 @@
-tar xvfj files.tbz -C /
+tar xvfj files.tbz2 -C /
index 125ce1e..ace14ba 100644 (file)
@@ -1 +1 @@
-tar xvfj files.tbz -C /
+tar xvfj files.tbz2 -C /