Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

This commit is contained in:
Arne Fitzennreiter
2008-10-20 19:50:26 +02:00
3 changed files with 9 additions and 11 deletions

View File

@@ -64,7 +64,7 @@
* centerim-4.22.1
* clamav-0.94
* cmake-2.4.8
* collectd-4.5.1
* collectd-4.4.3
* coreutils-5.96
* cpio-2.6
* cpufrequtils-004
@@ -125,7 +125,7 @@
* hostapd-0.5.10
* hplip-2.7.10
* htop-0.8.1
* httpd-2.2.10
* httpd-2.2.6
* hwdata
* iana-etc-2.10
* icecast-2.3.1
@@ -221,8 +221,8 @@
* oinkmaster-2.0
* openldap-2.3.20
* openmailadmin-1.0.0
* openssh-5.1p1
* openssl-0.9.8i
* openssh-4.7p1
* openssl-0.9.8g
* openswan-2.6.18
* openswan-2.6.18-kmod-VER
* openvpn-2.0.9
@@ -261,7 +261,7 @@
* shadow-4.0.15
* slang-1.4.9
* smartmontools-5.36
* snort-2.6.1.5
* snort-2.6.1.4
* sox-12.18.1
* spandsp-0.0.4pre15
* squashfs3.4

View File

@@ -25,7 +25,7 @@
include Config
PKG_NAME = collectd
VER = 4.5.1
VER = 4.4.3
THISAPP = collectd-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = d85e00de03d40ca66d5eb4775e58fc1f
$(DL_FILE)_MD5 = 309b7a0b9b128a1575308773e1c43d9f
install : $(TARGET)
@@ -85,8 +85,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--enable-{interface,iptables,irq,load,logfile,memory,multimeter} \
--enable-{network,nfs,ntpd,ping,processes,rrdtool,sensors,swap,syslog} \
--enable-{tcpconns,unixsock,users,wireless} \
--with-rrdtool=/usr/share/rrdtool-1.2.15 \
--with_own_libiptc
--with-rrdtool=/usr/share/rrdtool-1.2.15
cd $(DIR_APP) && make install
cp -vf $(DIR_SRC)/config/collectd/collectd.conf /etc/
ln -f -s ../init.d/collectd /etc/rc.d/rc0.d/K50collectd

View File

@@ -95,8 +95,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && ./configure --prefix=/usr --with-ksource=/usr/src/linux \
--libdir=/lib --includedir=/usr/include --enable-libipq \
--libexecdir=/lib --bindir=/sbin \
--sbindir=/sbin --mandir=/usr/share/man \
--enable-devel
--sbindir=/sbin --mandir=/usr/share/man
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install