Merge branch 'next' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x into next

Conflicts:
	doc/packages-list.txt
This commit is contained in:
Arne Fitzenreiter
2010-10-14 08:29:18 +02:00
18 changed files with 81 additions and 56 deletions

View File

@@ -30,7 +30,7 @@ THISAPP = guardian-$(VER)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = guardian
PAK_VER = 6
PAK_VER = 7
DEPS = ""

View File

@@ -24,7 +24,7 @@
include Config
VER = 0.9
VER = 20101008
THISAPP = imspector-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = imspector
PAK_VER = 1
PAK_VER = 2
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 626abf7c2b8f15d56df679ad66624575
$(DL_FILE)_MD5 = 032407bb13ccddb77328f83eded102ee
install : $(TARGET)
@@ -77,9 +77,10 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && make install
cd $(DIR_SRC)/imspector && make install
-mv /usr/etc/imspector /etc/imspector
install -v -m 755 $(DIR_CONF)/imspector/imspector.conf /etc/imspector.conf
-mv /etc/imspector/imspector /etc/imspector
install -v -m 755 $(DIR_CONF)/imspector/imspector.conf /etc/imspector.conf
install -v -m 644 $(DIR_SRC)/config/backup/includes/imspector /var/ipfire/backup/addons/includes/imspector
chmod 755 /srv/web/ipfire/cgi-bin/imspector.cgi
chown nobody:nobody -R /var/log/imspector

View File

@@ -24,7 +24,7 @@
include Config
VER = 3.5.5
VER = 3.5.6
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 = 30
PAK_VER = 31
DEPS = "cups"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 278728aeeef9db7e27fa6a2ce5b43509
$(DL_FILE)_MD5 = bf6c09ea497a166df8bd672db1d8da8f
install : $(TARGET)

View File

@@ -24,7 +24,7 @@
include Config
VER = 2.1.2
VER = 2.2.2
THISAPP = vsftpd-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = vsftpd
PAK_VER = 5
PAK_VER = 6
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 6a8c8579d50adf0d0fc07226c03bfb52
$(DL_FILE)_MD5 = 6d6bc136af14c23f8fef6f1a51f55418
install : $(TARGET)