webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

ipac-ng fix

Browse Source 
uClibc fix
pam-patch fix



git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@50 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2006-02-20 01:10:06 +00:00
parent 79748d6960
commit a52153e7e4
7 changed files with 77 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lfs/ipac-ng
View File

@@ -79,7 +79,7 @@ $(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)-iptables-1.3.1.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-fetchcounter.patch
# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-fetchcounter.patch
cd $(DIR_APP) && sed -i -e 's%/var/lib/ipac%/var/log/ip-acct%g' configure
cd $(DIR_APP) && chmod 755 configure
cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls --enable-default-storage=gdbm

6
lfs/uClibc
View File

@@ -35,8 +35,8 @@ include Config
VER = 0.9.26
THISAPP = uClibc-$(VER)
DL_FILE = $(THISAPP).tar.bz2
DL_FROM = http://uclibc.org/downloads
DL_FILE = $(THISAPP).tar.gz
DL_FROM = http://ipcop.ath.cx
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
@@ -49,7 +49,7 @@ objects = $(DL_FILE) gcc-3.3.1.tar.gz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
gcc-3.3.1.tar.gz = $(URL_GNU)/gcc/gcc-3.3.1.tar.gz
$(DL_FILE)_MD5 = 7212713c432dd0de6ec2140c2a6212e4
$(DL_FILE)_MD5 = b63183651a1b13456c20387ea88b018f
gcc-3.3.1.tar.gz_MD5 = 46d58197212818b5f7c403267ff24e4e
install : $(TARGET)

7
src/patches/pam-0.99.3.0-hostname.patch
View File

@@ -1,5 +1,5 @@
--- Linux-PAM-0.99.3.0/configure.in.host-name-max2005-12-12 19:56:27.000000000 +0300
+++ Linux-PAM-0.99.3.0/configure.in2006-01-28 01:31:58.000000000 +0300
--- Linux-PAM-0.99.3.0/configure.in.host-name-max 2005-12-12 19:56:27.000000000 +0300
+++ Linux-PAM-0.99.3.0/configure.in 2006-01-28 01:31:58.000000000 +0300
@@ -395,6 +395,46 @@
AC_CHECK_FUNCS(getpwnam_r getpwuid_r getgrnam_r getgrgid_r getspnam_r)
AC_CHECK_FUNCS(getgrouplist getline getdelim)
@@ -46,4 +46,5 @@
+
dnl Checks for programs/utilities
AC_CHECK_PROG(SGML2PS, sgml2ps, yes, no)
AC_CHECK_PROG(SGML2TXT, sgml2txt, yes, no)
AC_CHECK_PROG(SGML2TXT, sgml2txt, yes, no)

5
src/uClibc/sources/codesets.txt
View File

@@ -1,2 +1,3 @@
./charmaps/ASCII.pairs
./charmaps/ISO-8859-1.pairs
./charmaps/ASCII.pairs
./charmaps/ISO-8859-1.pairs

14
src/uClibc/sources/locales.txt
View File

@@ -1,7 +1,7 @@
@euro e
@cyrillic c
#---------------------------------------------------------------------------
UTF-8 yes
8-BIT yes
#---------------------------------------------------------------------------
en_US.UTF-8 UTF-8
@euro e
@cyrillic c
#---------------------------------------------------------------------------
UTF-8 yes
8-BIT yes
#---------------------------------------------------------------------------
en_US.UTF-8 UTF-8

106
src/uClibc/sources/patch-kernel.sh
View File

@@ -1,53 +1,53 @@
#! /bin/sh
# A little script I whipped up to make it easy to
# patch source trees and have sane error handling
# -Erik
#
# (c) 2002 Erik Andersen <andersen@codepoet.org>
# Set directories from arguments, or use defaults.
targetdir=${1-.}
patchdir=${2-../kernel-patches}
patchpattern=${3-*}
if [ ! -d "${targetdir}" ] ; then
echo "Aborting. '${targetdir}' is not a directory."
exit 1
fi
if [ ! -d "${patchdir}" ] ; then
echo "Aborting. '${patchdir}' is not a directory."
exit 1
fi
for i in ${patchdir}/${patchpattern} ; do
case "$i" in
*.gz)
type="gzip"; uncomp="gunzip -dc"; ;;
*.bz)
type="bzip"; uncomp="bunzip -dc"; ;;
*.bz2)
type="bzip2"; uncomp="bunzip2 -dc"; ;;
*.zip)
type="zip"; uncomp="unzip -d"; ;;
*.Z)
type="compress"; uncomp="uncompress -c"; ;;
*)
type="plaintext"; uncomp="cat"; ;;
esac
echo ""
echo "Applying ${i} using ${type}: "
${uncomp} ${i} | patch -p1 -E -d ${targetdir}
if [ $? != 0 ] ; then
echo "Patch failed! Please fix $i!"
exit 1
fi
done
# Check for rejects...
if [ "`find $targetdir/ '(' -name '*.rej' -o -name '.*.rej' ')' -print`" ] ; then
echo "Aborting. Reject files found."
exit 1
fi
# Remove backup files
find $targetdir/ '(' -name '*.orig' -o -name '.*.orig' ')' -exec rm -f {} \;
#! /bin/sh
# A little script I whipped up to make it easy to
# patch source trees and have sane error handling
# -Erik
#
# (c) 2002 Erik Andersen <andersen@codepoet.org>
# Set directories from arguments, or use defaults.
targetdir=${1-.}
patchdir=${2-../kernel-patches}
patchpattern=${3-*}
if [ ! -d "${targetdir}" ] ; then
echo "Aborting. '${targetdir}' is not a directory."
exit 1
fi
if [ ! -d "${patchdir}" ] ; then
echo "Aborting. '${patchdir}' is not a directory."
exit 1
fi
for i in ${patchdir}/${patchpattern} ; do
case "$i" in
*.gz)
type="gzip"; uncomp="gunzip -dc"; ;;
*.bz)
type="bzip"; uncomp="bunzip -dc"; ;;
*.bz2)
type="bzip2"; uncomp="bunzip2 -dc"; ;;
*.zip)
type="zip"; uncomp="unzip -d"; ;;
*.Z)
type="compress"; uncomp="uncompress -c"; ;;
*)
type="plaintext"; uncomp="cat"; ;;
esac
echo ""
echo "Applying ${i} using ${type}: "
${uncomp} ${i} | patch -p1 -E -d ${targetdir}
if [ $? != 0 ] ; then
echo "Patch failed! Please fix $i!"
exit 1
fi
done
# Check for rejects...
if [ "`find $targetdir/ '(' -name '*.rej' -o -name '.*.rej' ')' -print`" ] ; then
echo "Aborting. Reject files found."
exit 1
fi
# Remove backup files
find $targetdir/ '(' -name '*.orig' -o -name '.*.orig' ')' -exec rm -f {} \;

6
src/uClibc/sources/uClibc.config
View File

@@ -144,3 +144,9 @@ DEVEL_PREFIX="/usr"
# SUPPORT_LD_DEBUG is not set
# SUPPORT_LD_DEBUG_EARLY is not set
# UCLIBC_MJN3_ONLY is not set
#
# changes by IPFire
#
CONFIG_FEATURE_TAR_LONG_OPTIONS=y
CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y