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

Zwischencommit fuer LFS.

Browse Source 
git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@320 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2006-10-13 15:35:24 +00:00
parent bea6ab0a05
commit 411afd1f4b
13 changed files with 133 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
lfs/saslauthd → lfs/cyrus-sasl
View File

@@ -32,7 +32,7 @@ THISAPP = cyrus-sasl-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
ifeq "$(PASS)" "1"
ifeq "$(PASS)" ""
TARGET = $(DIR_INFO)/$(THISAPP)
else
TARGET = $(DIR_INFO)/$(THISAPP)-ldap
@@ -76,35 +76,26 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
ifeq "$(PASS)" "1"
cd $(DIR_APP) && ./configure --prefix=/usr \
--sysconfdir=/etc \
--with-dblib=berkeley \
--with-dbpath=/var/lib/sasl/sasldb2 \
--with-saslauthd=/var/run/saslauthd
cd $(DIR_APP) && sed -i '/sasl_global/s/^static //' lib/client.c
cd $(DIR_APP) && sed -i 's/cat8/man8/' saslauthd/Makefile.in
ifeq "$(PASS)" ""
cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
--with-dbpath=/var/lib/sasl/sasldb2 \
--with-saslauthd=/var/run
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
install -v -m700 -d /var/lib/sasl
else
# WITH LDAP SUPPORT AT THIS TIME
cd $(DIR_APP) && ./configure --prefix=/usr \
--enable-anon --enable-plain \
--disable-krb4 --disable-otp \
--disable-cram --disable-digest \
--with-dblib=berkeley
--with-ldap=/usr \
--enable-sql \
--with-pam=/lib/security \
--with-openssl=/usr
--without-pgsql \
--with-mysql=/usr \
--sysconfdir=/var/ipfire/sasl \
--with-dbpath=/var/lib/sasl/sasldb2 \
--with-saslauthd=/var/run/saslauthd
endif
cd $(DIR_APP) && make
cd $(DIR_APP) && make install
ifeq "$(PASS)" "2"
install -v -m700 -d /var/lib/sasl
mkdir -p /var/run/saslauthd
mkdir -p /var/state/saslauthd
cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
--with-dbpath=/var/lib/sasl/sasldb2 \
--with-saslauthd=/var/run \
--with-ldap --enable-ldapdb
cd $(DIR_APP) && make -C include
cd $(DIR_APP) && make -C sasldb
cd $(DIR_APP) && make -C plugins
cd $(DIR_APP) && libtool --mode=install install plugins/libldapdb.la /usr/lib/sasl2
endif
@rm -rf $(DIR_APP)
@$(POSTBUILD)

6
lfs/libcap
View File

@@ -18,12 +18,6 @@
# Makefiles are based on LFSMake, which is #
# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com> #
# #
# Modifications by: #
# ??-12-2003 Mark Wormgoor < mark@wormgoor.com> #
# - Modified Makefile for IPCop build #
# #
# $Id: libcap,v 1.5.2.2 2005/02/05 15:38:15 gespinasse Exp $
# #
###############################################################################
###############################################################################

6
lfs/libxml2
View File

@@ -26,7 +26,7 @@
include Config
VER = 2.6.22
VER = 2.6.26
THISAPP = libxml2-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 1db8d06b4f49a665a8f47dc6d94450e6
$(DL_FILE)_MD5 = 2d8d3805041edab967368b497642f981
install : $(TARGET)
@@ -78,7 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --prefix=/usr
cd $(DIR_APP) && make
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
@$(POSTBUILD)

2
lfs/mysql
View File

@@ -91,7 +91,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--without-readline \
--with-berkeley-db \
--with-extra-charsets=all
cd $(DIR_APP) && make testdir=/tmp/mysql
cd $(DIR_APP) && make testdir=/tmp/mysql $(MAKETUNING)
cd $(DIR_APP) && make testdir=/tmp/mysql install
rm -rf /tmp/mysql
cd /usr/lib && ln -v -sf mysql/libmysqlclient{,_r}.so* .

2
lfs/newt
View File

@@ -96,7 +96,7 @@ ifeq "$(LFS_PASS)" "install"
else
cd $(DIR_APP) && RPM_OPT_FLAGS="$(CFLAGS) -DUTF8" ./configure --without-gpm-support
cd $(DIR_APP) && sed -i \
-e 's/^PYVER.*$$/PYVER = 2.3/' \
-e 's/^PYVER.*$$/PYVER = 2.4/' \
-e 's/^all:.*$$/all: _snackmodule.so/' Makefile
cd $(DIR_APP) && echo 'install-snack: _snackmodule.so' >> Makefile
cd $(DIR_APP) && echo ' install -s -m 644 _snackmodule.so $$(instroot)/$$(pythonbindir)'>> Makefile

1
lfs/openssl
View File

@@ -74,6 +74,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
@rm -rf /etc/ssl
cd $(DIR_APP) && sed -i -e 's/mcpu/march/' config
cd $(DIR_APP) && sed -i -e 's/-O3/-O2/' -e 's/-march=i486/-march=i586/' Configure
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-fix_manpages-1.patch
cd $(DIR_APP) && ./config --openssldir=/etc/ssl --prefix=/usr shared
cd $(DIR_APP) && make MANDIR=/usr/share/man

32
lfs/pciutils
View File

@@ -18,12 +18,6 @@
# Makefiles are based on LFSMake, which is #
# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com> #
# #
# Modifications by: #
# ??-12-2003 Mark Wormgoor < mark@wormgoor.com> #
# - Modified Makefile for IPCop build #
# #
# $Id: pciutils,v 1.5.2.4 2005/02/05 15:38:15 gespinasse Exp $
# #
###############################################################################
###############################################################################
@@ -32,11 +26,11 @@
include Config
VER = 2.1.11
VER = 2.2.3
THISAPP = pciutils-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_KERNEL)/software/utils/pciutils
DL_FILE = $(THISAPP).tar.bz2
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
ifeq "$(LFS_PASS)" "install"
TARGET = $(DIR_INFO)/$(THISAPP)-install
@@ -52,7 +46,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 1d40f90aaae69594790bdb8ff90b4a41
$(DL_FILE)_MD5 = 86cc20eaa0360587497a8105d33e57fc
install : $(TARGET)
@@ -81,11 +75,9 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
# fix command line overflow which did not allow for null terminator
# when using lspci -vvv (AGPx1 and AGPx2 and AGPx4) Gentoo borrowed
cd $(DIR_APP) && sed -i -e s/'rate\[8\]'/'rate\[9\]'/g lspci.c
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && sed -i 's/null ;/null 2>\&1 ;/' update-pciids.sh
ifeq "$(LFS_PASS)" "install"
cd $(DIR_APP)/lib && CFLAGS="-Os -fomit-frame-pointer" ./configure
@@ -94,11 +86,11 @@ ifeq "$(LFS_PASS)" "install"
cd $(DIR_APP) && install -m 0644 lib/libpci.a /install/lib
cd $(DIR_APP) && install -m 0644 lib/{config,header,pci}.h /install/include/pci
else
cd $(DIR_APP) && make PREFIX=/usr ROOT=/usr
cd $(DIR_APP) && make PREFIX=/usr ROOT=/usr install
-mkdir -p /usr/include/pci
cd $(DIR_APP) && install -m 0644 lib/libpci.a /usr/lib
cd $(DIR_APP) && install -m 0644 lib/{config,header,pci}.h /usr/include/pci
cd $(DIR_APP) && make PREFIX=/usr $(MAKETUNING)
cd $(DIR_APP) && make PREFIX=/usr install
cd $(DIR_APP) && install -v -m 755 -d /usr/include/pci
cd $(DIR_APP) && install -v -m 644 lib/libpci.a /usr/lib
cd $(DIR_APP) && install -v -m 644 lib/*.h /usr/include/pci
endif
@rm -rf $(DIR_APP)
@$(POSTBUILD)

23
lfs/pcre
View File

@@ -18,12 +18,6 @@
# Makefiles are based on LFSMake, which is #
# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com> #
# #
# Modifications by: #
# ??-12-2003 Mark Wormgoor < mark@wormgoor.com> #
# - Modified Makefile for IPCop build #
# #
# $Id: pcre,v 1.2.2.3 2005/09/10 17:22:31 rkerr Exp $
# #
###############################################################################
###############################################################################
@@ -32,11 +26,11 @@
include Config
VER = 4.5
VER = 6.7
THISAPP = pcre-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre
DL_FILE = $(THISAPP).tar.bz2
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
@@ -48,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = a58971177114a3b7a5da0e5a89a43c96
$(DL_FILE)_MD5 = dbbec9d178ce199e67e98c9a4f994f90
install : $(TARGET)
@@ -77,10 +71,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/pcre-4.5-CAN-2005-2491.patch
cd $(DIR_APP) && ./configure --prefix=/usr --disable-static --enable-utf8
cd $(DIR_APP) && make
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --prefix=/usr --enable-utf8
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
cd $(DIR_APP) && mv -v /usr/lib/libpcre.so.* /lib/
cd $(DIR_APP) && ln -v -sf ../../lib/libpcre.so.0 /usr/lib/libpcre.so
@rm -rf $(DIR_APP)
@$(POSTBUILD)

26
lfs/slang
View File

@@ -18,12 +18,6 @@
# Makefiles are based on LFSMake, which is #
# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com> #
# #
# Modifications by: #
# ??-12-2003 Mark Wormgoor < mark@wormgoor.com> #
# - Modified Makefile for IPCop build #
# #
# $Id: slang,v 1.7.2.3 2005/02/05 15:38:15 gespinasse Exp $
# #
###############################################################################
###############################################################################
@@ -32,11 +26,11 @@
include Config
VER = 1.4.5
VER = 2.0.6
THISAPP = slang-$(VER)-mini
THISAPP = slang-$(VER)
DL_FILE = $(THISAPP).tar.bz2
DL_FROM = http://www.uclibc.org
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
ifeq "$(LFS_PASS)" "install"
TARGET = $(DIR_INFO)/$(THISAPP)-install
@@ -52,7 +46,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 6c893e52347533225866242700a3cd07
$(DL_FILE)_MD5 = efb055000636f312d5c3de56f3c70d12
install : $(TARGET)
@@ -82,9 +76,6 @@ $(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) && sed -i 's/^#undef UTF8.*$$/#define UTF8 1/' slang.h
cd $(DIR_APP) && sed -i 's/^#undef UTF8.*$$/#define UTF8 1/' config.h
ifeq "$(LFS_PASS)" "install"
-mkdir -p /install/lib
cd $(DIR_APP) && sed -i -e 's/libslang.a:/libslang.a:\ $$(OBJS)/' Makefile
@@ -93,10 +84,11 @@ ifeq "$(LFS_PASS)" "install"
-mkdir -p /install/include/slang
cd $(DIR_APP) && install -m 0644 slang.h slcurses.h /install/include/slang
else
cd $(DIR_APP) && DESTDIR=/usr/lib CFLAGS="-Wall -fPIC $(CFLAGS)" make -e
cd $(DIR_APP) && install -m 0644 libslang.a /usr/lib
-mkdir -p /usr/include/slang
cd $(DIR_APP) && install -m 0644 slang.h slcurses.h /usr/include/slang
cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc
cd $(DIR_APP) && make
cd $(DIR_APP) && make elf
cd $(DIR_APP) && make install-elf
cd $(DIR_APP) && chmod -v 755 /usr/lib/libslang.so.2.0.6
endif
@rm -rf $(DIR_APP)
@$(POSTBUILD)

9
lfs/sources-iso
View File

@@ -49,11 +49,6 @@ install : $(DIR_INFO)/_build.packages-list.log
done
# make the sources CDROM iso
if [ "$(MACHINE)" == "i386" ]; then \
cd /install/cdrom && mkisofs -J -r -V "$(NAME)_$(VERSION)" \
. > /install/images/$(SNAME)-sources-cd-$(VERSION).$(MACHINE).iso; \
elif [ "$(MACHINE)" == "alpha" ]; then \
cd /install/cdrom && mkisofs -J -r -V "$(NAME)_$(VERSION)" \
. > /install/images/$(SNAME)-sources-cd-$(VERSION).$(MACHINE).iso; \
fi
cd /install/cdrom && mkisofs -J -r -V "$(NAME)_$(VERSION)" \
. > /install/images/$(SNAME)-sources-cd-$(VERSION).$(MACHINE).iso
rm -rf /install/cdrom/*

8
make.sh
View File

@@ -376,16 +376,16 @@ buildipfire() {
ipfiremake freetype
ipfiremake gd
ipfiremake popt
exit 1 # Bis hierhin l<>ufts :D
ipfiremake pcre
ipfiremake slang
ipfiremake newt
ipfiremake libcap
# ipfiremake libcap
ipfiremake pciutils
ipfiremake pcre
ipfiremake libxml2
ipfiremake BerkeleyDB
ipfiremake mysql
ipfiremake saslauthd PASS=1
ipfiremake cyrus-sasl
exit 1
ipfiremake openldap
ipfiremake apache2
ipfiremake php

28
src/patches/cyrus-sasl-2.1.21-openldap23-1.patch Normal file
View File

@@ -0,0 +1,28 @@
Submitted By: Dan Nicholson <dnicholson_at_linuxfromscratch_dot_org>
Date: 2006-04-25
Initial Package Version: 2.1.21
Upstream Status: Applied
Origin: Upstream CVS
$ cvs log cmulocal/openldap.m4
...
RCS file: /cvs/src/cmulocal/openldap.m4,v
Working file: cmulocal/openldap.m4
...
----------------------------
revision 1.2
date: 2006/03/13 19:16:11; author: mel; state: Exp; lines: +3 -1
Allow for OpenLDAP 2.3+
Description: Allow OpenLDAP => 2.3
diff -pur cyrus-sasl-2.1.21.orig/configure cyrus-sasl-2.1.21/configure
--- cyrus-sasl-2.1.21.orig/configure 2006-03-30 14:24:55.000000000 +0000
+++ cyrus-sasl-2.1.21/configure 2006-03-30 21:00:35.388580365 +0000
@@ -12253,6 +12253,8 @@ cat >>conftest.$ac_ext <<_ACEOF
char *__openldap_compat = "2.1.27 or better okay";
#elif LDAP_VENDOR_VERSION_MAJOR == 2 && LDAP_VENDOR_VERSION_MINOR == 2 && LDAP_VENDOR_VERSION_PATCH > 5
char *__openldap_compat = "2.2.6 or better okay";
+#elif LDAP_VENDOR_VERSION_MAJOR == 2 && LDAP_VENDOR_VERSION_MINOR > 2
+char *__openldap_compat = "2.3 or better okay"
#endif
_ACEOF

44
src/patches/cyrus-sasl-2.1.21-openssl98-1.patch Normal file
View File

@@ -0,0 +1,44 @@
Submitted By: Dan Nicholson <dnicholson_at_linuxfromscratch_dot_org>
Date: 2006-04-25
Initial Package Version: 2.1.21
Upstream Status: Applied
Origin: Upstream CVS
http://asg.web.cmu.edu/archive/message.php?mailbox=org.acs.asg.project.sasl.commits&msg=1519
http://asg.web.cmu.edu/archive/message.php?mailbox=org.acs.asg.project.sasl.commits&msg=1578
Description: Adds needed headers for plugins when compiled with OpenSSL-0.9.8
diff -pNur cyrus-sasl-2.1.21.orig/plugins/ntlm.c cyrus-sasl-2.1.21/plugins/ntlm.c
--- cyrus-sasl-2.1.21.orig/plugins/ntlm.c 2004-12-24 16:06:14.000000000 +0000
+++ cyrus-sasl-2.1.21/plugins/ntlm.c 2006-04-25 18:46:24.433487794 +0000
@@ -74,6 +74,7 @@
#endif /* WIN32 */
#include <openssl/md4.h>
+#include <openssl/md5.h>
#include <openssl/hmac.h>
#include <openssl/des.h>
#include <openssl/opensslv.h>
diff -pNur cyrus-sasl-2.1.21.orig/plugins/passdss.c cyrus-sasl-2.1.21/plugins/passdss.c
--- cyrus-sasl-2.1.21.orig/plugins/passdss.c 2004-11-27 16:17:43.000000000 +0000
+++ cyrus-sasl-2.1.21/plugins/passdss.c 2006-04-25 18:46:36.131787252 +0000
@@ -67,6 +67,9 @@
/* for digest and cipher support */
#include <openssl/evp.h>
#include <openssl/hmac.h>
+#include <openssl/md5.h>
+#include <openssl/sha.h>
+#include <openssl/dsa.h>
#include <sasl.h>
#define MD5_H /* suppress internal MD5 */
diff -pNur cyrus-sasl-2.1.21.orig/plugins/srp.c cyrus-sasl-2.1.21/plugins/srp.c
--- cyrus-sasl-2.1.21.orig/plugins/srp.c 2004-06-23 18:43:37.000000000 +0000
+++ cyrus-sasl-2.1.21/plugins/srp.c 2006-04-25 18:46:36.135785645 +0000
@@ -87,6 +87,7 @@ typedef unsigned short uint32;
/* for digest and cipher support */
#include <openssl/evp.h>
#include <openssl/hmac.h>
+#include <openssl/md5.h>
#include <sasl.h>
#define MD5_H /* suppress internal MD5 */