Update samba and collectd to current versions

Included padlock patches for openssh and openssl not yet included in make
This commit is contained in:
Christian Schmidt
2008-05-24 13:12:04 +02:00
committed by Arne Fitzenreiter
parent 158c3466a1
commit 30ffe6fd96
8 changed files with 800 additions and 5 deletions

View File

@@ -25,7 +25,7 @@
include Config
PKG_NAME = collectd
VER = 4.3.0
VER = 4.4.0
THISAPP = collectd-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = ace292ba502f09379741e79561cf2c89
$(DL_FILE)_MD5 = 76ec42bf1976c1d4110443d845decca3
install : $(TARGET)
@@ -80,6 +80,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && ./configure --prefix=/usr --localstatedir=/var \
--disable-{apache,apple_sensors,csv,ipvs,mbmon,memcached,mysql} \
--disable-{netlink,nginx,nut,perl,serial,snmp,tape,vserver,wireless,xmms} \
--disable-{apple_sensors,csv,ipvs,memcached,mysql,netlink,nginx,nut} \
--disable-{perl,serial,sensors,snmp,tape,vserver,wireless,xmms} \
--enable-{apcups,battery,cpu{,freq},df,disk,dns,email,entropy,exec,hddtemp} \
--enable-{interface,iptbles,irq,load,logfile,memory,multimeter} \
--enable-{network,nfs,ntpd,ping,processes,rrdtool,swap,sensors,syslog} \

View File

@@ -70,6 +70,9 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
ifeq "$(PADLOCK)" "1"
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssh-4.7p1-padlock.patch
endif
cd $(DIR_APP) && sed -i "s/lkrb5 -ldes/lkrb5/" configure
cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc/ssh \
--libexecdir=/usr/lib/openssh --with-md5-passwords \

View File

@@ -70,6 +70,9 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
ifeq "$(PADLOCK)" "1"
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-0.9.8g-engine-padlock.patch
endif
@rm -rf /etc/ssl
cd $(DIR_APP) && sed -i -e 's/mcpu/march/' config
cd $(DIR_APP) && sed -i -e 's/-O3/-O2/' -e 's/-march=i486/-march=i586/' Configure

View File

@@ -24,7 +24,7 @@
include Config
VER = 3.0.28a
VER = 3.0.29
THISAPP = samba-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = samba
PAK_VER = 5
PAK_VER = 6
DEPS = "cups cyrus-sasl"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 59754cb0c19da6e65c42d0a163c5885a
$(DL_FILE)_MD5 = ac338e28f159e59a8d25cb1d0895cf8e
install : $(TARGET)