mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-24 18:03:06 +02:00
Merge branch 'glibc-update2' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-2.x into glibc-update2
This commit is contained in:
Michael Tremer
@@ -1,77 +0,0 @@
|
||||
#sbin/debugfs.reiser4
|
||||
sbin/fsck.reiser4
|
||||
#sbin/make_reiser4
|
||||
sbin/measurefs.reiser4
|
||||
sbin/mkfs.reiser4
|
||||
#usr/include/reiser4
|
||||
#usr/include/reiser4/alloc.h
|
||||
#usr/include/reiser4/backup.h
|
||||
#usr/include/reiser4/bitmap.h
|
||||
#usr/include/reiser4/factory.h
|
||||
#usr/include/reiser4/fake.h
|
||||
#usr/include/reiser4/filesystem.h
|
||||
#usr/include/reiser4/flow.h
|
||||
#usr/include/reiser4/format.h
|
||||
#usr/include/reiser4/item.h
|
||||
#usr/include/reiser4/journal.h
|
||||
#usr/include/reiser4/key.h
|
||||
#usr/include/reiser4/libreiser4.h
|
||||
#usr/include/reiser4/master.h
|
||||
#usr/include/reiser4/node.h
|
||||
#usr/include/reiser4/object.h
|
||||
#usr/include/reiser4/oid.h
|
||||
#usr/include/reiser4/place.h
|
||||
#usr/include/reiser4/plugin.h
|
||||
#usr/include/reiser4/print.h
|
||||
#usr/include/reiser4/profile.h
|
||||
#usr/include/reiser4/pset.h
|
||||
#usr/include/reiser4/semantic.h
|
||||
#usr/include/reiser4/status.h
|
||||
#usr/include/reiser4/tree.h
|
||||
#usr/include/reiser4/types.h
|
||||
#usr/include/repair
|
||||
#usr/include/repair/add_missing.h
|
||||
#usr/include/repair/alloc.h
|
||||
#usr/include/repair/backup.h
|
||||
#usr/include/repair/cleanup.h
|
||||
#usr/include/repair/disk_scan.h
|
||||
#usr/include/repair/filesystem.h
|
||||
#usr/include/repair/filter.h
|
||||
#usr/include/repair/format.h
|
||||
#usr/include/repair/item.h
|
||||
#usr/include/repair/journal.h
|
||||
#usr/include/repair/librepair.h
|
||||
#usr/include/repair/lost_found.h
|
||||
#usr/include/repair/master.h
|
||||
#usr/include/repair/node.h
|
||||
#usr/include/repair/object.h
|
||||
#usr/include/repair/oid.h
|
||||
#usr/include/repair/place.h
|
||||
#usr/include/repair/plugin.h
|
||||
#usr/include/repair/pset.h
|
||||
#usr/include/repair/repair.h
|
||||
#usr/include/repair/semantic.h
|
||||
#usr/include/repair/status.h
|
||||
#usr/include/repair/tree.h
|
||||
#usr/include/repair/twig_scan.h
|
||||
usr/lib/libreiser4-1.0.so.6
|
||||
usr/lib/libreiser4-1.0.so.6.0.0
|
||||
usr/lib/libreiser4-minimal-1.0.so.6
|
||||
usr/lib/libreiser4-minimal-1.0.so.6.0.0
|
||||
#usr/lib/libreiser4-minimal.a
|
||||
#usr/lib/libreiser4-minimal.la
|
||||
usr/lib/libreiser4-minimal.so
|
||||
#usr/lib/libreiser4.a
|
||||
#usr/lib/libreiser4.la
|
||||
usr/lib/libreiser4.so
|
||||
usr/lib/librepair-1.0.so.6
|
||||
usr/lib/librepair-1.0.so.6.0.0
|
||||
#usr/lib/librepair.a
|
||||
#usr/lib/librepair.la
|
||||
usr/lib/librepair.so
|
||||
#usr/man/man8
|
||||
#usr/man/man8/debugfs.reiser4.8
|
||||
#usr/man/man8/fsck.reiser4.8
|
||||
#usr/man/man8/measurefs.reiser4.8
|
||||
#usr/man/man8/mkfs.reiser4.8
|
||||
#usr/share/aclocal/libreiser4.m4
|
||||
@@ -82,6 +82,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) && patch -Np1 < $(DIR_SRC)/src/patches/cyrus-sasl-2.1.22-bad-elif.patch
|
||||
cd $(DIR_APP) && sed -i '/sasl_global/s/^static //' lib/client.c
|
||||
cd $(DIR_APP) && sed -i 's/cat8/man8/' saslauthd/Makefile.in
|
||||
|
||||
|
||||
40
lfs/openldap
40
lfs/openldap
@@ -24,7 +24,7 @@
|
||||
|
||||
include Config
|
||||
|
||||
VER = 2.3.20
|
||||
VER = 2.4.32
|
||||
|
||||
THISAPP = openldap-$(VER)
|
||||
DL_FILE = $(THISAPP).tgz
|
||||
@@ -32,12 +32,10 @@ DL_FROM = $(URL_IPFIRE)
|
||||
DIR_APP = $(DIR_SRC)/$(THISAPP)
|
||||
TARGET = $(DIR_INFO)/$(THISAPP)
|
||||
PROG = openldap
|
||||
PAK_VER = 2
|
||||
PAK_VER = 3
|
||||
|
||||
DEPS = ""
|
||||
|
||||
export CPPFLAGS = -D_GNU_SOURCE
|
||||
|
||||
###############################################################################
|
||||
# Top-level Rules
|
||||
###############################################################################
|
||||
@@ -46,7 +44,7 @@ objects = $(DL_FILE)
|
||||
|
||||
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||
|
||||
$(DL_FILE)_MD5 = 49d2c5b9378a7b57e1fb03948acb8e32
|
||||
$(DL_FILE)_MD5 = 6a3e85cf61860ca5e8a1eba6753dd9d0
|
||||
|
||||
install : $(TARGET)
|
||||
|
||||
@@ -79,23 +77,23 @@ $(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) && ./configure --prefix=/usr \
|
||||
--libexecdir=/usr/sbin \
|
||||
--sysconfdir=/etc \
|
||||
--localstatedir=/srv/ldap \
|
||||
--disable-debug \
|
||||
--enable-dynamic \
|
||||
--enable-crypt \
|
||||
--enable-modules \
|
||||
--enable-ldap \
|
||||
--enable-ldbm \
|
||||
--enable-dyngroup \
|
||||
--enable-dynlist \
|
||||
--enable-ppolicy \
|
||||
--enable-valsort
|
||||
cd $(DIR_APP) && make depend
|
||||
cd $(DIR_APP) && ./configure \
|
||||
--prefix=/usr \
|
||||
--libexecdir=/usr/lib \
|
||||
--sysconfdir=/etc \
|
||||
--localstatedir=/srv/ldap \
|
||||
--with-threads=posix \
|
||||
--disable-perl \
|
||||
--enable-dynamic \
|
||||
--enable-crypt \
|
||||
--enable-modules \
|
||||
--enable-rlookups \
|
||||
--enable-backends=mod \
|
||||
--enable-overlays=mod \
|
||||
--enable-sql=no \
|
||||
--enable-ndb=no \
|
||||
--disable-static
|
||||
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
|
||||
cd $(DIR_APP) && make install
|
||||
chmod -v 755 /usr/lib/libl*-2.3.so.0.2.8
|
||||
@rm -rf $(DIR_APP)
|
||||
@$(POSTBUILD)
|
||||
|
||||
4
lfs/php
4
lfs/php
@@ -24,7 +24,7 @@
|
||||
|
||||
include Config
|
||||
|
||||
VER = 5.3.14
|
||||
VER = 5.3.15
|
||||
|
||||
THISAPP = php-$(VER)
|
||||
DL_FILE = $(THISAPP).tar.bz2
|
||||
@@ -42,7 +42,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||
idn-0.1.tgz = $(DL_FROM)/idn-0.1.tgz
|
||||
Log-1.9.11.tgz = $(DL_FROM)/Log-1.9.11.tgz
|
||||
|
||||
$(DL_FILE)_MD5 = 7caac4f71e2f21426c11ac153e538392
|
||||
$(DL_FILE)_MD5 = 5cfcfd0fa4c4da7576f397073e7993cc
|
||||
idn-0.1.tgz_MD5 = ef8635ec22348325a76abd2abddca4a1
|
||||
Log-1.9.11.tgz_MD5 = fb7c648b212f12fdb5ce1ab687793513
|
||||
|
||||
|
||||
@@ -1,77 +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 = 1.0.6
|
||||
|
||||
THISAPP = reiser4progs-$(VER)
|
||||
DL_FILE = $(THISAPP).tar.bz2
|
||||
DL_FROM = $(URL_IPFIRE)
|
||||
DIR_APP = $(DIR_SRC)/$(THISAPP)
|
||||
TARGET = $(DIR_INFO)/$(THISAPP)
|
||||
|
||||
###############################################################################
|
||||
# Top-level Rules
|
||||
###############################################################################
|
||||
|
||||
objects = $(DL_FILE)
|
||||
|
||||
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||
|
||||
$(DL_FILE)_MD5 = d408cfeac40c266623bd51afa008caf6
|
||||
|
||||
install : $(TARGET)
|
||||
|
||||
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
|
||||
|
||||
download :$(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
|
||||
md5 : $(subst %,%_MD5,$(objects))
|
||||
|
||||
###############################################################################
|
||||
# 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)
|
||||
cd $(DIR_APP) && ./configure --prefix=/usr --sbindir=/sbin --enable-static
|
||||
cd $(DIR_APP) && make $(MAKETUNING)
|
||||
cd $(DIR_APP) && make install
|
||||
@rm -rf $(DIR_APP)
|
||||
@$(POSTBUILD)
|
||||
1
make.sh
1
make.sh
@@ -348,7 +348,6 @@ buildbase() {
|
||||
lfsmake2 net-tools
|
||||
lfsmake2 patch
|
||||
lfsmake2 psmisc
|
||||
lfsmake2 reiser4progs
|
||||
lfsmake2 shadow
|
||||
lfsmake2 sysklogd
|
||||
lfsmake2 sysvinit
|
||||
|
||||
21
src/patches/cyrus-sasl-2.1.22-bad-elif.patch
Normal file
21
src/patches/cyrus-sasl-2.1.22-bad-elif.patch
Normal file
@@ -0,0 +1,21 @@
|
||||
diff -up cyrus-sasl-2.1.22/plugins/digestmd5.c.elif cyrus-sasl-2.1.22/plugins/digestmd5.c
|
||||
--- cyrus-sasl-2.1.22/plugins/digestmd5.c.elif 2009-01-23 09:40:31.000000000 +0100
|
||||
+++ cyrus-sasl-2.1.22/plugins/digestmd5.c 2009-02-06 15:20:15.000000000 +0100
|
||||
@@ -2743,7 +2743,7 @@ static sasl_server_plug_t digestmd5_serv
|
||||
"DIGEST-MD5", /* mech_name */
|
||||
#ifdef WITH_RC4
|
||||
128, /* max_ssf */
|
||||
-#elif WITH_DES
|
||||
+#elif defined(WITH_DES)
|
||||
112,
|
||||
#else
|
||||
1,
|
||||
@@ -4071,7 +4071,7 @@ static sasl_client_plug_t digestmd5_clie
|
||||
"DIGEST-MD5",
|
||||
#ifdef WITH_RC4 /* mech_name */
|
||||
128, /* max ssf */
|
||||
-#elif WITH_DES
|
||||
+#elif defined(WITH_DES)
|
||||
112,
|
||||
#else
|
||||
1,
|
||||
Reference in New Issue
Block a user