Made some version updates and so on...

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

diff --git a/lfs/bash b/lfs/bash
index e64b61ee82d3a723dd85b2a460ccc2193a4cb912..cabfb79aacb1289d013f69aafe438a5860a4900e 100644 (file)
--- a/lfs/bash
+++ b/lfs/bash
@@ -37,7 +37,7 @@ TARGET     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) $(THISAPP)-fixes-6.patch $(PKG_NAME)-doc-$(VER).tar.gz
+objects = $(DL_FILE) $(THISAPP)-fixes-7.patch $(PKG_NAME)-doc-$(VER).tar.gz
 
 install : $(TARGET)
 
@@ -55,7 +55,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        
 ifeq "$(STAGE)" "toolchain" 
-       cd $(DIR_APP) && patch -Np1 < $(DIR_PATCHES)/$(THISAPP)-fixes-6.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_PATCHES)/$(THISAPP)-fixes-7.patch
        cd $(DIR_APP) && ./configure --prefix=$(TOOLS_DIR) --without-bash-malloc
        cd $(DIR_APP) && make -j $(PARALLELISM)
        cd $(DIR_APP) && make install
@@ -73,7 +73,7 @@ ifeq "$(STAGE)" "base"
        cd $(DIR_APP) && tar -xvf $(DIR_DL)/$(PKG_NAME)-doc-$(VER).tar.gz
        cd $(DIR_APP) && sed -i "s|htmldir = @htmldir@|htmldir = /usr/share/doc/$(THISAPP)|" \
                Makefile.in
-       cd $(DIR_APP) && patch -Np1 < $(DIR_PATCHES)/$(THISAPP)-fixes-6.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_PATCHES)/$(THISAPP)-fixes-7.patch
        cd $(DIR_APP) && ./configure --prefix=/usr --bindir=/bin \
                --without-bash-malloc --with-installed-readline
        cd $(DIR_APP) && make -j $(PARALLELISM)

diff --git a/lfs/collectd b/lfs/collectd
index a2ff61bce792fd35e87e6b12a30afc30da7bd9f2..070416fd330797836ec5cb0c560ec80da4c05c6b 100644 (file)
--- a/lfs/collectd
+++ b/lfs/collectd
@@ -53,7 +53,7 @@ $(patsubst %,$(DIR_DL)/%,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --localstatedir=/var \
+       cd $(DIR_APP) && ./configure --prefix=/usr --localstatedir=/var \
                --disable-{apache,apple_sensors,csv,ipvs,memcached,mysql,netlink,nginx,nut} \
                --disable-{perl,serial,snmp,tape,vserver,wireless,xmms} \
                --enable-{apcups,battery,cpu{,freq},df,disk,dns,email,entropy,exec,hddtemp} \

diff --git a/lfs/e2fsprogs b/lfs/e2fsprogs
index a4dab6457ea3841060379d864484bc9c8e06dd6d..1bb0c8233d1092308debb4f2c5482efec484b84c 100644 (file)
--- a/lfs/e2fsprogs
+++ b/lfs/e2fsprogs
@@ -25,7 +25,7 @@
 include Config
 
 PKG_NAME   = e2fsprogs
-VER        = 1.40.2
+VER        = 1.40.4
 
 THISAPP    = $(PKG_NAME)-$(VER)
 DL_FILE    = $(THISAPP).tar.gz

diff --git a/lfs/gettext b/lfs/gettext
index d9359a28ab01aa9880aaff2fbd86c198c4cdbc83..a9f14259ce978841c324ce74ffae9cd390ced64e 100644 (file)
--- a/lfs/gettext
+++ b/lfs/gettext
@@ -25,7 +25,7 @@
 include Config
 
 PKG_NAME   = gettext
-VER        = 0.16.1
+VER        = 0.17
 
 THISAPP    = $(PKG_NAME)-$(VER)
 DL_FILE    = $(THISAPP).tar.gz

diff --git a/lfs/less b/lfs/less
index 42e1fa2771448b2cbfd07e573ba456a0a14e113e..68f88918220d8c826ff0f5157aecf46954cac211 100644 (file)
--- a/lfs/less
+++ b/lfs/less
@@ -25,7 +25,7 @@
 include Config
 
 PKG_NAME   = less
-VER        = 409
+VER        = 418
 
 THISAPP    = $(PKG_NAME)-$(VER)
 DL_FILE    = $(THISAPP).tar.gz

diff --git a/lfs/man-db b/lfs/man-db
index ee4c89d64c1ca4c9e7c29c9b835605c5958b528d..75bb08318a5f44ee4b83f3ea1f6d7324a78f166c 100644 (file)
--- a/lfs/man-db
+++ b/lfs/man-db
@@ -25,7 +25,7 @@
 include Config
 
 PKG_NAME   = man-db
-VER        = 2.4.4
+VER        = 2.5.0
 
 THISAPP    = $(PKG_NAME)-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -37,7 +37,7 @@ TARGET     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) $(THISAPP)-fixes-1.patch
+objects = $(DL_FILE)
 
 install : $(TARGET)
 
@@ -53,17 +53,11 @@ $(patsubst %,$(DIR_DL)/%,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && mv man/de{_DE.88591,}
-       cd $(DIR_APP) && mv man/es{_ES.88591,}
-       cd $(DIR_APP) && mv man/it{_IT.88591,}
-       cd $(DIR_APP) && mv man/ja{_JP.eucJP,}
-       cd $(DIR_APP) && sed -i 's,\*_\*,??,' man/Makefile.in
        cd $(DIR_APP) && sed -i -e '\%\t/usr/man%d' -e '\%\t/usr/local/man%d' src/man_db.conf.in
        cd $(DIR_APP) && echo -e "#define WEB_BROWSER \"exec /usr/bin/lynx\"" >> include/manconfig.h.in
        cd $(DIR_APP) && echo -e "#define COL \"/usr/bin/col\"" >> include/manconfig.h.in
        cd $(DIR_APP) && echo -e "#define VGRIND \"/usr/bin/vgrind\"" >> include/manconfig.h.in
        cd $(DIR_APP) && echo -e "#define GRAP \"/usr/bin/grap\"" >> include/manconfig.h.in
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-fixes-1.patch
        cd $(DIR_APP) && ./configure --prefix=/usr --enable-mb-groff --disable-setuid
        cd $(DIR_APP) && make #-j $(PARALLELISM)
        cd $(DIR_APP) && make install

diff --git a/lfs/man-pages b/lfs/man-pages
index f9abb94c442688c2f72944061753b50eba78c180..6fc1ad6404bc00fc10e6df159d6ab50a05917d9d 100644 (file)
--- a/lfs/man-pages
+++ b/lfs/man-pages
@@ -25,7 +25,7 @@
 include Config
 
 PKG_NAME   = man-pages
-VER        = 2.67
+VER        = 2.74
 
 THISAPP    = $(PKG_NAME)-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2

diff --git a/lfs/parted b/lfs/parted
index 016832e8e9a2d04c58b3d294d9c445128eb1d6fd..0537bc05006be4d9e4f4fdc7f6c78939dcaf0371 100644 (file)
--- a/lfs/parted
+++ b/lfs/parted
@@ -33,11 +33,13 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
 TARGET     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
+PYPARTED   = py$(PKG_NAME)-1.8.9
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE)
+objects = $(DL_FILE) $(PYPARTED).tar.bz2
 
 install: $(TARGET)
 
@@ -52,10 +54,18 @@ $(patsubst %,$(DIR_DL)/%,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_APP) $(PYPARTED)
+       @cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && ./configure --prefix=/usr --without-readline --disable-nls \
                --disable-Werror --disable-dependency-tracking --disable-debug --with-gnu-ld
        cd $(DIR_APP) && make -j $(PARALLELISM)
        cd $(DIR_APP) && make install
-       @rm -rf $(DIR_APP)
+       
+       ### pyparted
+       #
+       cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(PYPARTED).tar.bz2
+       cd $(DIR_SRC)/$(PYPARTED) && make all install \
+               libdir=/usr/lib/python2.5/site-packages
+       
+       @rm -rf $(DIR_APP) $(PYPARTED)
        @$(POSTBUILD)

diff --git a/lfs/psmisc b/lfs/psmisc
index 29af039e501980239e4b863db2089c67240e2ca2..7a8b188d3e8e379a386ccec720e97fc7465ddf52 100644 (file)
--- a/lfs/psmisc
+++ b/lfs/psmisc
@@ -25,7 +25,7 @@
 include Config
 
 PKG_NAME   = psmisc
-VER        = 22.5
+VER        = 22.6
 
 THISAPP    = $(PKG_NAME)-$(VER)
 DL_FILE    = $(THISAPP).tar.gz

diff --git a/lfs/python b/lfs/python
index 2c69da6a653e8ad49b76a6a13d809db4a54a1d29..29a39090da797b305832d36b98d5c8be3495d0f3 100644 (file)
--- a/lfs/python
+++ b/lfs/python
@@ -35,7 +35,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
 TARGET     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
-MODULES    = "$(ICONV)"
+MODULES    = $(ICONV)
 
 ###############################################################################
 # Top-level Rules

diff --git a/lfs/readline b/lfs/readline
index c392ffb6353953fa0bbbb17890a812b628b4fe29..9b898e6e113d484aa3df7a8a1893a55728c1c489 100644 (file)
--- a/lfs/readline
+++ b/lfs/readline
@@ -37,7 +37,7 @@ TARGET     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) $(THISAPP)-fixes-4.patch
+objects = $(DL_FILE) $(THISAPP)-fixes-5.patch
 
 install : $(TARGET)
 
@@ -55,7 +55,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && sed -i '/MV.*old/d' Makefile.in
        cd $(DIR_APP) && sed -i '/{OLDSUFF}/c:' support/shlib-install
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-fixes-4.patch
+       cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-fixes-5.patch
        
        cd $(DIR_APP) && ./configure --prefix=/usr --libdir=/lib
        

diff --git a/lfs/texinfo b/lfs/texinfo
index d069e503a02e3fd9087c107fb1d1589fce93b135..c8b7b8be620812efd47d760e58a100a6df27d305 100644 (file)
--- a/lfs/texinfo
+++ b/lfs/texinfo
@@ -25,7 +25,7 @@
 include Config
 
 PKG_NAME   = texinfo
-VER        = 4.9
+VER        = 4.11
 
 THISAPP    = $(PKG_NAME)-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -37,7 +37,7 @@ TARGET     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) $(THISAPP)-multibyte-1.patch $(THISAPP)-tempfile_fix-1.patch
+objects = $(DL_FILE)
 
 install : $(TARGET)
 
@@ -61,8 +61,6 @@ ifeq "$(STAGE)" "toolchain"
 endif
 
 ifeq "$(STAGE)" "base"
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-multibyte-1.patch
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-tempfile_fix-1.patch
        cd $(DIR_APP) && ./configure --prefix=/usr
        cd $(DIR_APP) && make -j $(PARALLELISM)
        cd $(DIR_APP) && make install

diff --git a/lfs/vim b/lfs/vim
index 5730a791760afa512fcd7a3988cf978d0d766e5c..9d0e6bf2e2c4095650dacd1640c855ca8e35e5b7 100644 (file)
--- a/lfs/vim
+++ b/lfs/vim
@@ -37,7 +37,7 @@ TARGET     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) $(THISAPP)-fixes-3.patch $(THISAPP)-mandir-1.patch
+objects = $(DL_FILE) $(THISAPP)-fixes-5.patch $(THISAPP)-mandir-1.patch
 
 install : $(TARGET)
 
@@ -53,7 +53,7 @@ $(patsubst %,$(DIR_DL)/%,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -Np1 < $(DIR_PATCHES)/$(THISAPP)-fixes-3.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_PATCHES)/$(THISAPP)-fixes-5.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_PATCHES)/$(THISAPP)-mandir-1.patch
        cd $(DIR_APP) && echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h
        cd $(DIR_APP) && ./configure --prefix=/usr --enable-multibyte

diff --git a/src/rootfiles/core/parted b/src/rootfiles/core/parted
index 12185abdf05332012308419aaf165aa0d5a02e25..42a90fa62e8dfd0c7ea143bda76a8df5a8a4ea8f 100644 (file)
--- a/src/rootfiles/core/parted
+++ b/src/rootfiles/core/parted
@@ -18,6 +18,7 @@ usr/lib/libparted-1.8.so.8.0.0
 #usr/lib/libparted.la
 usr/lib/libparted.so
 #usr/lib/pkgconfig/libparted.pc
+usr/lib/python2.5/site-packages/partedmodule.so
 usr/sbin/parted
 usr/sbin/partprobe
 #usr/share/info/parted.info