From: ms <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Date: Thu, 23 Aug 2007 07:04:09 +0000 (+0000)
Subject: Buildfix
X-Git-Tag: v2.3-beta1~449
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=a1d042ddd6ea12ca86ff52bf5c0cba56654d79c3

Buildfix


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

diff --git a/config/rootfiles/common/logwatch b/config/rootfiles/common/logwatch
index a5b552d362..6e121536fc 100644
--- a/config/rootfiles/common/logwatch
+++ b/config/rootfiles/common/logwatch
@@ -1,33 +1,34 @@
-#etc/log.d
-#etc/log.d/conf
-#etc/log.d/conf/html
-#etc/log.d/conf/html/footer.html
-#etc/log.d/conf/html/header.html
-etc/log.d/conf/ignore.conf
-etc/log.d/conf/logfiles
-etc/log.d/conf/logwatch.conf
-etc/log.d/conf/services
-#etc/log.d/lib
-etc/log.d/lib/Logwatch.pm
-#etc/log.d/scripts
-etc/log.d/scripts/logwatch.pl
-etc/log.d/scripts/services
-#etc/log.d/scripts/shared
-etc/log.d/scripts/shared/applybinddate
-etc/log.d/scripts/shared/applyeurodate
-etc/log.d/scripts/shared/applyhttpdate
-etc/log.d/scripts/shared/applystddate
-etc/log.d/scripts/shared/applytaidate
-etc/log.d/scripts/shared/applyusdate
-etc/log.d/scripts/shared/expandrepeats
-etc/log.d/scripts/shared/hosthash
-etc/log.d/scripts/shared/hostlist
-etc/log.d/scripts/shared/multiservice
-etc/log.d/scripts/shared/onlycontains
-etc/log.d/scripts/shared/onlyhost
-etc/log.d/scripts/shared/onlyservice
-etc/log.d/scripts/shared/remove
-etc/log.d/scripts/shared/removeheaders
-etc/log.d/scripts/shared/removeservice
+#usr/share/logwatch
+#usr/share/logwatch/default.conf/html
+#usr/share/logwatch/default.conf/html
+#usr/share/logwatch/default.conf/html/footer.html
+#usr/share/logwatch/default.conf/html/header.html
+usr/share/logwatch/default.conf/ignore.conf
+usr/share/logwatch/default.conf/logfiles
+usr/share/logwatch/default.conf/logwatch.conf
+usr/share/logwatch/default.conf/services
+#usr/share/logwatch/lib
+usr/share/logwatch/lib/Logwatch.pm
+#/usr/share/logwatch/scripts
+usr/share/logwatch/scripts/logwatch.pl
+usr/share/logwatch/scripts/services
+#use/share/logwatch/scripts/shared
+use/share/logwatch/scripts/shared/applybinddate
+use/share/logwatch/scripts/shared/applyeurodate
+use/share/logwatch/scripts/shared/applyhttpdate
+use/share/logwatch/scripts/shared/applystddate
+use/share/logwatch/scripts/shared/applytaidate
+use/share/logwatch/scripts/shared/applyusdate
+use/share/logwatch/scripts/shared/expandrepeats
+use/share/logwatch/scripts/shared/hosthash
+use/share/logwatch/scripts/shared/hostlist
+use/share/logwatch/scripts/shared/multiservice
+use/share/logwatch/scripts/shared/onlycontains
+use/share/logwatch/scripts/shared/onlyhost
+use/share/logwatch/scripts/shared/onlyservice
+use/share/logwatch/scripts/shared/remove
+use/share/logwatch/scripts/shared/removeheaders
+use/share/logwatch/scripts/shared/removeservice
+use/share/logwatch/scripts/shared/multiservice
 #usr/share/man/man8/logwatch.8
 var/log/logwatch
diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index cfb87463e6..fb2c2111b6 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -154,7 +154,6 @@
 * linuxigd-0.95
 * logrotate-3.7.1
 * logwatch-7.3.6
-* logwatch_7.3.1
 * lsof-4.78
 * lzo-2.02
 * m4-1.4.4
@@ -186,7 +185,6 @@
 * nfs-utils-1.0.8
 * nmap-4.03
 * noip_updater_v1.6
-* ntfs-3g-1.0
 * ntfs-3g-1.810
 * ntp-4.2.2
 * ocaml-3.09.2
@@ -207,7 +205,6 @@
 * portmap_5beta
 * postfix-2.2.11
 * ppp-2.4.4
-* pptp-1.7.1
 * procps-3.2.6
 * psmisc-22.2
 * r8169-6.002.00
@@ -218,7 +215,6 @@
 * rrdtool-1.2.15
 * rsync-2.6.8
 * rtorrent-0.7.4
-* samba-3.0.25b
 * samba-3.0.25c
 * screen-4.0.2
 * sed-4.1.5
@@ -230,7 +226,6 @@
 * sox-12.18.1
 * spandsp-0.0.3pre24
 * squashfs3.2-r2
-* squid-2.6.STABLE13
 * squid-2.6.STABLE14
 * squid-graph-3.2
 * squidGuard-1.2.0
diff --git a/lfs/foomatic b/lfs/foomatic
index 74958bf367..bf8dd746f8 100644
--- a/lfs/foomatic
+++ b/lfs/foomatic
@@ -27,7 +27,7 @@
 include Config
 
 DATE       = 20070813
-VER        = 3.0-$(DATE)
+VER        = 3.0-20070813
 
 THISAPP    = foomatic-$(VER)
 DL_FILE    = foomatic-filters-$(VER).tar.gz
@@ -95,7 +95,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		tar zxf $(DIR_DL)/foomatic-db-$(DATE).tar.gz && \
 		tar zxf $(DIR_DL)/foomatic-db-engine-$(VER).tar.gz && \
 		tar zxf $(DIR_DL)/foomatic-db-hpijs-$(DATE).tar.gz
-	cd $(DIR_APP) && ./configure --prefix=/usr
+	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	cd $(DIR_SRC)/foomatic-db-$(DATE) && ./configure --prefix=/usr --sysconfdir=/etc