From 411afd1f4b028dc0b6434a737dc62104577ce442 Mon Sep 17 00:00:00 2001 From: ms Date: Fri, 13 Oct 2006 15:35:24 +0000 Subject: [PATCH] Zwischencommit fuer LFS. git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@320 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- lfs/{saslauthd => cyrus-sasl} | 47 ++++++++----------- lfs/libcap | 6 --- lfs/libxml2 | 6 +-- lfs/mysql | 2 +- lfs/newt | 2 +- lfs/openssl | 1 + lfs/pciutils | 32 +++++-------- lfs/pcre | 23 ++++----- lfs/slang | 26 ++++------ lfs/sources-iso | 9 +--- make.sh | 8 ++-- .../cyrus-sasl-2.1.21-openldap23-1.patch | 28 +++++++++++ .../cyrus-sasl-2.1.21-openssl98-1.patch | 44 +++++++++++++++++ 13 files changed, 133 insertions(+), 101 deletions(-) rename lfs/{saslauthd => cyrus-sasl} (81%) create mode 100644 src/patches/cyrus-sasl-2.1.21-openldap23-1.patch create mode 100644 src/patches/cyrus-sasl-2.1.21-openssl98-1.patch diff --git a/lfs/saslauthd b/lfs/cyrus-sasl similarity index 81% rename from lfs/saslauthd rename to lfs/cyrus-sasl index ea23f4cf06..815947081b 100644 --- a/lfs/saslauthd +++ b/lfs/cyrus-sasl @@ -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 -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) && 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 -ifeq "$(PASS)" "2" install -v -m700 -d /var/lib/sasl - mkdir -p /var/run/saslauthd - mkdir -p /var/state/saslauthd +else + # WITH LDAP SUPPORT AT THIS TIME + 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) diff --git a/lfs/libcap b/lfs/libcap index d078e51d19..8a7e132921 100644 --- a/lfs/libcap +++ b/lfs/libcap @@ -18,12 +18,6 @@ # Makefiles are based on LFSMake, which is # # Copyright (C) 2002 Rod Roard # # # -# 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 $ -# # ############################################################################### ############################################################################### diff --git a/lfs/libxml2 b/lfs/libxml2 index 52a39be5f1..e70afe1dca 100644 --- a/lfs/libxml2 +++ b/lfs/libxml2 @@ -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) diff --git a/lfs/mysql b/lfs/mysql index 5f87c2f2db..2700c6cfeb 100644 --- a/lfs/mysql +++ b/lfs/mysql @@ -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* . diff --git a/lfs/newt b/lfs/newt index 0921ac35fb..5a215ac5e4 100644 --- a/lfs/newt +++ b/lfs/newt @@ -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 diff --git a/lfs/openssl b/lfs/openssl index 1a507138b5..6e6ba41d76 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -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 diff --git a/lfs/pciutils b/lfs/pciutils index aea6d637b1..86d9737a52 100644 --- a/lfs/pciutils +++ b/lfs/pciutils @@ -18,12 +18,6 @@ # Makefiles are based on LFSMake, which is # # Copyright (C) 2002 Rod Roard # # # -# 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) diff --git a/lfs/pcre b/lfs/pcre index 13ad31199e..f507bd33c1 100644 --- a/lfs/pcre +++ b/lfs/pcre @@ -18,12 +18,6 @@ # Makefiles are based on LFSMake, which is # # Copyright (C) 2002 Rod Roard # # # -# 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) diff --git a/lfs/slang b/lfs/slang index 214ae403ed..036660a1cc 100644 --- a/lfs/slang +++ b/lfs/slang @@ -18,12 +18,6 @@ # Makefiles are based on LFSMake, which is # # Copyright (C) 2002 Rod Roard # # # -# 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) diff --git a/lfs/sources-iso b/lfs/sources-iso index 76a7387ede..7d1261c029 100644 --- a/lfs/sources-iso +++ b/lfs/sources-iso @@ -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/* diff --git a/make.sh b/make.sh index 56a206794c..b208075b92 100644 --- a/make.sh +++ b/make.sh @@ -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 diff --git a/src/patches/cyrus-sasl-2.1.21-openldap23-1.patch b/src/patches/cyrus-sasl-2.1.21-openldap23-1.patch new file mode 100644 index 0000000000..81949d9446 --- /dev/null +++ b/src/patches/cyrus-sasl-2.1.21-openldap23-1.patch @@ -0,0 +1,28 @@ +Submitted By: Dan Nicholson +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 diff --git a/src/patches/cyrus-sasl-2.1.21-openssl98-1.patch b/src/patches/cyrus-sasl-2.1.21-openssl98-1.patch new file mode 100644 index 0000000000..a3ec2d4c05 --- /dev/null +++ b/src/patches/cyrus-sasl-2.1.21-openssl98-1.patch @@ -0,0 +1,44 @@ +Submitted By: Dan Nicholson +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 ++#include + #include + #include + #include +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 + #include ++#include ++#include ++#include + + #include + #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 + #include ++#include + + #include + #define MD5_H /* suppress internal MD5 */ -- 2.39.2