webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 11:43:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'glibc-update2' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-2.x into glibc-update2

Browse Source
This commit is contained in:
Michael Tremer
2012-08-19 18:14:18 -04:00
parent fa21f636f6 11af354f26
commit b235b9b9de
62 changed files with 4930 additions and 1197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lfs/bash
View File

@@ -24,7 +24,7 @@
include Config
VER = 3.1
VER = 3.2
THISAPP = bash-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -48,8 +48,6 @@ else
EXTRA_INSTALL =
endif
EXTRA_CONFIG += --build=$(BUILDTARGET)
###############################################################################
# Top-level Rules
###############################################################################
@@ -58,7 +56,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = ef5304c4b22aaa5088972c792ed45d72
$(DL_FILE)_MD5 = 00bfa16d58e034e3c2aa27f390390d30
install : $(TARGET)
@@ -88,8 +86,11 @@ $(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) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-fixes-8.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-login.patch
for i in $$(seq 1 51); do \
cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/bash/bash32-$$(printf "%03d" "$${i}") || exit 1; \
done
cd $(DIR_APP) && ./configure $(EXTRA_CONFIG)
cd $(DIR_APP) && make $(EXTRA_MAKE)
cd $(DIR_APP) && make $(EXTRA_INSTALL) install

15
lfs/iproute2
View File

@@ -24,10 +24,10 @@
include Config
VER = 2.6.16-060323
VER = 3.4.0
THISAPP = iproute2-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FILE = $(THISAPP).tar.xz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
@@ -35,13 +35,12 @@ TARGET = $(DIR_INFO)/$(THISAPP)
###############################################################################
# Top-level Rules
###############################################################################
objects = $(DL_FILE) htb3.6-020525.tgz
objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
htb3.6-020525.tgz = $(DL_FROM)/htb3.6-020525.tgz
$(DL_FILE)_MD5 = f31d4516b35bbfeaa72c762f5959e97c
htb3.6-020525.tgz_MD5 = 3064fd8642ce6a7e155a29c5205b99d4
$(DL_FILE)_MD5 = 879d3fac4e90809598b2864ec4a0cbf8
install : $(TARGET)
@@ -70,9 +69,7 @@ $(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) && tar xfz $(DIR_DL)/htb3.6-020525.tgz *.diff
# cd $(DIR_APP) && for i in htb3*tc.diff ; do patch -Np1 < $$i; done
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && make $(MAKETUNING) SBINDIR=/sbin
cd $(DIR_APP) && make SBINDIR=/sbin install
cd $(DIR_APP) && mv -v /sbin/arpd /usr/sbin

77
lfs/ncurses
View File

@@ -24,7 +24,7 @@
include Config
VER = 5.5
VER = 5.9
THISAPP = ncurses-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -35,19 +35,26 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
#
ifeq "$(ROOT)" ""
TARGET = $(DIR_INFO)/$(THISAPP)
EXTRA_CONFIG = --prefix=/usr --with-shared \
--without-debug --enable-widec --disable-nls
EXTRA_MAKE =
EXTRA_INSTALL =
PREFIX = /usr
else
TARGET = $(DIR_INFO)/$(THISAPP)-tools
EXTRA_CONFIG = --prefix=/tools --with-shared \
--without-debug --without-ada --enable-overwrite \
--disable-nls
EXTRA_MAKE =
EXTRA_INSTALL =
PREFIX = /tools
endif
EXTRA_CONFIG += \
--prefix=$(PREFIX) \
--with-shared \
--without-debug \
--without-ada \
--with-ospeed=unsigned \
--with-chtype=long \
--enable-hard-tabs \
--enable-xmc-glitch \
--enable-colorfgbg \
--enable-overwrite \
--with-termlib=tinfo \
--disable-nls
###############################################################################
# Top-level Rules
###############################################################################
@@ -56,7 +63,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = e73c1ac10b4bfc46db43b2ddfd6244ef
$(DL_FILE)_MD5 = 8cb9c412e5f2d96bc6f459aa8c6282a1
install : $(TARGET)
@@ -86,25 +93,35 @@ $(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) && patch -Np1 -i $(DIR_SRC)/src/patches/ncurses-5.5-fixes-1.patch
cd $(DIR_APP) && ./configure $(EXTRA_CONFIG)
cd $(DIR_APP) && make $(EXTRA_MAKE) #$(MAKETUNING) # Causes an error!
cd $(DIR_APP) && make $(EXTRA_INSTALL) install
ifeq "$(ROOT)" ""
chmod -v 755 /usr/lib/*.5.5
chmod -v 644 /usr/lib/libncurses++w.a
mv -v /usr/lib/libncursesw.so.5* /lib
ln -sfv ../../lib/libncursesw.so.5 /usr/lib/libncursesw.so
cd $(DIR_APP) && for lib in curses ncurses form panel menu ; do \
rm -vf /usr/lib/lib$${lib}.so ; \
echo "INPUT(-l$${lib}w)" >/usr/lib/lib$${lib}.so ; \
ln -sfv lib$${lib}w.a /usr/lib/lib$${lib}.a ; \
cd $(DIR_APP) && mkdir -pv narrowc widec
# Build narrowc version.
cd $(DIR_APP)/narrowc && ln -svf ../configure .
cd $(DIR_APP)/narrowc && ./configure $(EXTRA_CONFIG) --with-ticlib
cd $(DIR_APP)/narrowc && make libs
cd $(DIR_APP)/narrowc && make -C progs
# Build widec version.
cd $(DIR_APP)/widec && ln -svf ../configure .
cd $(DIR_APP)/widec && ./configure $(EXTRA_CONFIG) \
--enable-widec --without-progs
cd $(DIR_APP)/widec && make libs
# Install everything.
cd $(DIR_APP) && make -C narrowc install.{libs,progs,data}
rm -vf $(PREFIX)/lib/libtinfo.*
cd $(DIR_APP) && make -C widec install.{libs,includes,man}
# don't require -ltinfo when linking with --no-add-needed
for l in $(PREFIX)/lib/libncurses{,w}.so; do \
soname=$$(basename $$(readlink $$l)); \
rm -f $$l; \
echo "INPUT($$soname -ltinfo)" > $$l; \
done
ln -sfv libncurses++w.a /usr/lib/libncurses++.a4
echo "INPUT(-lncursesw)" >/usr/lib/libcursesw.so
ln -sfv libncurses.so /usr/lib/libcurses.so
ln -sfv libncursesw.a /usr/lib/libcursesw.a
ln -sfv libncurses.a /usr/lib/libcurses.a
endif
rm -vf $(PREFIX)/lib/libcurses{,w}.so
echo "INPUT(-lncurses)" > $(PREFIX)/lib/libcurses.so
echo "INPUT(-lncursesw)" > $(PREFIX)/lib/libcursesw.so
echo "INPUT(-ltinfo)" > $(PREFIX)/lib/libtermcap.so
@rm -rf $(DIR_APP)
@$(POSTBUILD)

86
lfs/splix
View File

@@ -1,86 +0,0 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation, either version 3 of the License, or #
# (at your option) any later version. #
# #
# This program is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with this program. If not, see <http://www.gnu.org/licenses/>. #
# #
###############################################################################
###############################################################################
# Definitions
###############################################################################
include Config
VER = 2.0.0-rc2
THISAPP = splix-$(VER)
DL_FILE = $(THISAPP).tar.bz2
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = splix
PAK_VER = 2
DEPS = "cups"
###############################################################################
# Top-level Rules
###############################################################################
objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 4381ccf9a38b08012dbdc3c0f28414fd
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
download :$(patsubst %,$(DIR_DL)/%,$(objects))
md5 : $(subst %,%_MD5,$(objects))
dist:
$(PAK)
###############################################################################
# Downloading, checking, md5sum
###############################################################################
$(patsubst %,$(DIR_CHK)/%,$(objects)) :
@$(CHECK)
$(patsubst %,$(DIR_DL)/%,$(objects)) :
@$(LOAD)
$(subst %,%_MD5,$(objects)) :
@$(MD5)
###############################################################################
# Installation Details
###############################################################################
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
ifeq "$(MACHINE_TYPE)" "arm"
cd $(DIR_APP) && sed -e "s/ceill/ceil/g" -i src/*.cpp
endif
cd $(DIR_APP) && make DISABLE_JBIG=1 $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
@$(POSTBUILD)

24
lfs/zlib
View File

@@ -24,15 +24,15 @@
include Config
VER = 1.2.3
VER = 1.2.7
THISAPP = zlib-$(VER)
DL_FILE = $(THISAPP).tar.bz2
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
CFLAGS += -fPIC
CFLAGS += -fPIC -DPIC
###############################################################################
# Top-level Rules
@@ -41,7 +41,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = dee233bf288ee795ac96a98cc2e369b6
$(DL_FILE)_MD5 = 60df6a37c56e7c1366cca812414f7b85
install : $(TARGET)
@@ -70,16 +70,14 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --prefix=/usr --shared --libdir=/lib
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --prefix=/usr --shared
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
rm -v /lib/libz.so
ln -sfv ../../lib/libz.so.1.2.3 /usr/lib/libz.so
cd $(DIR_APP) && make clean
cd $(DIR_APP) && ./configure --prefix=/usr
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
chmod -v 644 /usr/lib/libz.a
mv -v /usr/lib/libz.so.$(VER) /lib/libz.so.$(VER)
ln -svf libz.so.$(VER) /lib/libz.so.1
rm -vf /usr/lib/libz.so.1
@rm -rf $(DIR_APP)
@$(POSTBUILD)