Merge branch 'master' of ssh://peterman@people.ipfire.org/pub/git/ipfire-2.x

This commit is contained in:
Peter Pfeiffer
2009-05-15 08:08:12 +02:00
35 changed files with 207 additions and 126 deletions

View File

@@ -24,7 +24,7 @@
include Config
VER = 0.94.2
VER = 0.95.1
THISAPP = clamav-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 1181e6d62341b84708f126cc353f7ebf
$(DL_FILE)_MD5 = c802d4b372e455849cfcb0d776fc72d8
install : $(TARGET)

View File

@@ -89,7 +89,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--enable-{tcpconns,unixsock,users,wireless} \
--with-rrdtool=/usr/share/rrdtool-1.2.15
cd $(DIR_APP) && make install
cp -vf $(DIR_SRC)/config/collectd/collectd.conf /etc/
cp -vf $(DIR_SRC)/config/collectd/collectd.* /etc/
ln -f -s ../init.d/collectd /etc/rc.d/rc0.d/K50collectd
ln -f -s ../init.d/collectd /etc/rc.d/rc3.d/S21collectd
ln -f -s ../init.d/collectd /etc/rc.d/rc6.d/K50collectd

View File

@@ -24,7 +24,7 @@
include Config
VER = 0.11.4rc0
VER = 0.11.6
THISAPP = elinks-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = elinks
PAK_VER = 1
PAK_VER = 2
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 718137aa45ddb2e7137edb8fb4f646a6
$(DL_FILE)_MD5 = 463ec007b013822a82d197580117ea16
install : $(TARGET)

View File

@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = fetchmail
PAK_VER = 2
PAK_VER = 3
DEPS = ""

View File

@@ -24,7 +24,7 @@
include Config
VER = 1.6.1.2
VER = 1.6.3
THISAPP = git-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = git
PAK_VER = 5
PAK_VER = 6
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 72a9d88932190ff3523678eec88844ae
$(DL_FILE)_MD5 = a5e6165506cddd94954277cf81f44b14
install : $(TARGET)

View File

@@ -24,8 +24,8 @@
include Config
PATCHLEVEL = .21
VER = 2.6.27.21
PATCHLEVEL = .23
VER = 2.6.27.23
THISAPP = linux-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -62,7 +62,7 @@ patch-2.6.16-nath323-1.3.bz2 = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2
squashfs3.4.tar.gz = $(URL_IPFIRE)/squashfs3.4.tar.gz
reiser4-for-2.6.27.19.patch.bz2 = $(URL_IPFIRE)/reiser4-for-2.6.27.19.patch.bz2
$(DL_FILE)_MD5 = 2912af7938fae1a3f2a9a6bcf8c0009f
$(DL_FILE)_MD5 = 42db72b93641da2fe9fb0eb2ae6388d6
netfilter-layer7-v2.21.tar.gz_MD5 = 838422e7d9a06b42e682e9064e5210b5
patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138
squashfs3.4.tar.gz_MD5 = 2a4d2995ad5aa6840c95a95ffa6b1da6

View File

@@ -34,6 +34,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = perl-gettext
DEPS = ""
PAK_VER = 2
###############################################################################
# Top-level Rules

View File

@@ -24,7 +24,7 @@
include Config
VER = 2.5.5
VER = 2.5.6
THISAPP = postfix-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = postfix
PAK_VER = 3
PAK_VER = 4
DEPS = "amavisd mysql"
@@ -46,7 +46,7 @@ objects = $(DL_FILE) \
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
postfix-2.5.5.patch = $(DL_FROM)/postfix-2.5.5.patch
$(DL_FILE)_MD5 = 6b4b848bdd2239dddfc9d385e57e19ef
$(DL_FILE)_MD5 = ec2cb63b53f5f36c3ca91da8f3bc9407
postfix-2.5.5.patch_MD5 = 36cb54665d95016af4ce0cd5f85c20a8
install : $(TARGET)

View File

@@ -24,7 +24,7 @@
include Config
VER = 3.3.3
VER = 3.3.4
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 = 14
PAK_VER = 15
DEPS = "cups cyrus-sasl"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 4d5835817416d1ffa30783af45c5a9ed
$(DL_FILE)_MD5 = 1443165edb7cb3f56f1e77aec1ee3266
install : $(TARGET)

View File

@@ -34,7 +34,7 @@ TARGET = $(DIR_INFO)/$(THISAPP)
PROG = streamripper
PAK_VER = 1
DEPS = "libmad libogg libvorbis"
DEPS = "glib libmad libogg libvorbis"
###############################################################################
# Top-level Rules