From b6e04a4f3dedfeed2233d6359b2d13e5e0ca2be2 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Wed, 30 May 2007 08:56:22 +0000 Subject: [PATCH] Clifford Wolf: Removed nssdb package git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@8512 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/nssdb/libc_hacks.patch | 80 ---------------- package/base/nssdb/libdb4.patch | 48 ---------- package/base/nssdb/nssdb.cache | 144 ---------------------------- package/base/nssdb/nssdb.conf | 25 ----- package/base/nssdb/nssdb.desc | 47 --------- package/base/nssdb/set_errno.patch | 35 ------- 6 files changed, 379 deletions(-) delete mode 100644 package/base/nssdb/libc_hacks.patch delete mode 100644 package/base/nssdb/libdb4.patch delete mode 100644 package/base/nssdb/nssdb.cache delete mode 100644 package/base/nssdb/nssdb.conf delete mode 100644 package/base/nssdb/nssdb.desc delete mode 100644 package/base/nssdb/set_errno.patch diff --git a/package/base/nssdb/libc_hacks.patch b/package/base/nssdb/libc_hacks.patch deleted file mode 100644 index 286ff30d6..000000000 --- a/package/base/nssdb/libc_hacks.patch +++ /dev/null @@ -1,80 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/base/nssdb/libc_hacks.patch -# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./src/db-XXX.c.orig 2003-05-03 08:46:16.000000000 +0200 -+++ ./src/db-XXX.c 2003-05-03 08:46:21.000000000 +0200 -@@ -17,6 +17,10 @@ - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -+#include -+#define NOT_IN_libc -+#define _LIBC -+ - #include - #include - #include ---- ./src/db-alias.c.orig 2003-05-03 08:40:34.000000000 +0200 -+++ ./src/db-alias.c 2003-05-03 08:45:34.000000000 +0200 -@@ -18,6 +18,10 @@ - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -+#include -+#define NOT_IN_libc -+#define _LIBC -+ - #include - #include - #include ---- ./src/db-netgrp.c.orig 2003-05-03 08:46:33.000000000 +0200 -+++ ./src/db-netgrp.c 2003-05-03 08:46:39.000000000 +0200 -@@ -18,6 +18,10 @@ - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -+#include -+#define NOT_IN_libc -+#define _LIBC -+ - #include - #include - #include ---- ./src/makedb.c.orig 2003-05-03 08:47:21.000000000 +0200 -+++ ./src/makedb.c 2003-05-03 08:48:09.000000000 +0200 -@@ -18,6 +18,8 @@ - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -+#define _GNU_SOURCE -+ - #ifdef HAVE_CONFIG_H - # include - #endif ---- ./src/Makefile.in.orig 2003-05-03 08:49:38.000000000 +0200 -+++ ./src/Makefile.in 2003-05-03 08:49:49.000000000 +0200 -@@ -105,7 +105,7 @@ - - noinst_HEADERS = db-compat.h netgroup.h nss_db.h - --INCLUDES = @DB_CFLAGS@ -D_LIBC -D_GNU_SOURCE -I../intl -DLOCALEDIR=\"$(localedir)\" -+INCLUDES = @DB_CFLAGS@ -D_GNU_SOURCE -I../intl -DLOCALEDIR=\"$(localedir)\" - - - EXTRA_DIST = libnss_db.map diff --git a/package/base/nssdb/libdb4.patch b/package/base/nssdb/libdb4.patch deleted file mode 100644 index f8a1662af..000000000 --- a/package/base/nssdb/libdb4.patch +++ /dev/null @@ -1,48 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/base/nssdb/libdb4.patch -# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./configure.orig 2003-02-10 12:00:22.000000000 +0100 -+++ ./configure 2003-02-10 12:01:29.000000000 +0100 -@@ -5149,14 +5149,14 @@ - fi - - --echo $ac_n "checking for db_version in -ldb""... $ac_c" 1>&6 --echo "configure:5154: checking for db_version in -ldb" >&5 -+echo $ac_n "checking for db_version in /usr/lib/libdb-3.a""... $ac_c" 1>&6 -+echo "configure:5154: checking for db_version in /usr/lib/libdb-3.a" >&5 - ac_lib_var=`echo db'_'db_version | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-ldb $LIBS" -+LIBS="/usr/lib/libdb-3.a $LIBS" - cat > conftest.$ac_ext <&6 diff --git a/package/base/nssdb/nssdb.cache b/package/base/nssdb/nssdb.cache deleted file mode 100644 index b78197470..000000000 --- a/package/base/nssdb/nssdb.cache +++ /dev/null @@ -1,144 +0,0 @@ -[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- -[COPY] -[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. -[COPY] Please add additional copyright information _after_ the line containing -[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -[COPY] -[COPY] ROCK Linux: rock-src/package/base/nssdb/nssdb.cache -[COPY] ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf -[COPY] -[COPY] This program is free software; you can redistribute it and/or modify -[COPY] it under the terms of the GNU General Public License as published by -[COPY] the Free Software Foundation; either version 2 of the License, or -[COPY] (at your option) any later version. A copy of the GNU General Public -[COPY] License can be found at Documentation/COPYING. -[COPY] -[COPY] Many people helped and are helping developing ROCK Linux. Please -[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM -[COPY] file for details. -[COPY] -[COPY] --- ROCK-COPYRIGHT-NOTE-END --- - -[TIMESTAMP] 1168662610 Sat Jan 13 05:30:10 2007 (5) ERROR -[TIMESTAMP] 1168870207 Mon Jan 15 15:10:07 2007 (9) ERROR -[TIMESTAMP] 1168950386 Tue Jan 16 13:26:26 2007 (5) ERROR -[TIMESTAMP] 1168979749 Tue Jan 16 21:35:49 2007 (9) ERROR -[TIMESTAMP] 1169093366 Thu Jan 18 05:09:26 2007 (5) ERROR -[TIMESTAMP] 1169149960 Thu Jan 18 20:52:40 2007 (9) ERROR - -[CONFIG-ID] TRUNK-x86-reference -[ROCKVER] TRUNK - -[LOGS] 5-nssdb.err 9-nssdb.err - -[BUILDTIME] 911 (5) ERROR -[BUILDTIME] 953 (9) ERROR -[BUILDTIME] 973 (5) ERROR -[BUILDTIME] 943 (9) ERROR -[BUILDTIME] 998 (5) ERROR -[BUILDTIME] 960 (9) ERROR - - -[5-ERROR] creating cache ./config.cache -[5-ERROR] checking for a BSD compatible install... /ROCK/build/ref0111-TRUNK-x86-reference/ROCK/tools.chroot/wrapper/install -c -[5-ERROR] checking whether build environment is sane... yes -[5-ERROR] checking whether make sets ${MAKE}... yes -[5-ERROR] checking for working aclocal... found -[5-ERROR] checking for working autoconf... found -[5-ERROR] checking for working automake... found -[5-ERROR] checking for working autoheader... found -[5-ERROR] checking for working makeinfo... found -[5-ERROR] checking for gcc... gcc-40 -[5-ERROR] checking whether the C compiler (gcc-40 ) works... yes -[5-ERROR] checking whether the C compiler (gcc-40 ) is a cross-compiler... no -[5-ERROR] checking whether we are using GNU C... yes -[5-ERROR] checking whether gcc-40 accepts -g... yes -[5-ERROR] checking how to run the C preprocessor... gcc-40 -E -[5-ERROR] checking for Cygwin environment... no -[5-ERROR] checking for mingw32 environment... no -[5-ERROR] checking host system type... i386-unknown-linux-gnu -[5-ERROR] checking build system type... i386-unknown-linux-gnu -[5-ERROR] checking for ld used by GCC... ld -[5-ERROR] checking if the linker (ld) is GNU ld... yes -[5-ERROR] checking for ld option to reload object files... -r -[5-ERROR] checking for BSD-compatible nm... nm -[5-ERROR] checking whether ln -s works... yes -[5-ERROR] checking how to recognise dependant libraries... pass_all -[5-ERROR] checking for object suffix... o -[5-ERROR] checking for executable suffix... no -[5-ERROR] checking command to parse nm output... ok -[5-ERROR] checking for dlfcn.h... yes -[5-ERROR] checking for ranlib... ranlib -[5-ERROR] checking for strip... strip -[5-ERROR] checking for objdir... .libs -[5-ERROR] checking for gcc-40 option to produce PIC... -fPIC -[5-ERROR] checking if gcc-40 PIC flag -fPIC works... yes -[5-ERROR] checking if gcc-40 static flag -static works... yes -[5-ERROR] checking if gcc-40 supports -c -o file.o... yes -[5-ERROR] checking if gcc-40 supports -c -o file.lo... -[5-ERROR] checking if gcc-40 supports -fno-rtti -fno-exceptions... yes -[5-ERROR] checking whether the linker (ld) supports shared libraries... yes -[5-ERROR] checking how to hardcode library paths into programs... immediate -[5-ERROR] checking whether stripping libraries is possible... yes -[5-ERROR] checking dynamic linker characteristics... GNU/Linux ld.so -[5-ERROR] checking if libtool supports shared libraries... yes -[5-ERROR] checking whether -lc should be explicitly linked in... no -[5-ERROR] creating libtool -[5-ERROR] checking for db.h... yes -[5-ERROR] checking for db_version in /usr/lib/libdb-3.a... no -[5-ERROR] configure: error: -[5-ERROR] *** Could not find Berkeley DB library. -[5-ERROR] --- BUILD ERROR --- - -[9-ERROR] creating cache ./config.cache -[9-ERROR] checking for a BSD compatible install... /ROCK/build/ref0111-TRUNK-x86-reference/ROCK/tools.chroot/wrapper/install -c -[9-ERROR] checking whether build environment is sane... yes -[9-ERROR] checking whether make sets ${MAKE}... yes -[9-ERROR] checking for working aclocal... found -[9-ERROR] checking for working autoconf... found -[9-ERROR] checking for working automake... found -[9-ERROR] checking for working autoheader... found -[9-ERROR] checking for working makeinfo... found -[9-ERROR] checking for gcc... gcc-40 -[9-ERROR] checking whether the C compiler (gcc-40 ) works... yes -[9-ERROR] checking whether the C compiler (gcc-40 ) is a cross-compiler... no -[9-ERROR] checking whether we are using GNU C... yes -[9-ERROR] checking whether gcc-40 accepts -g... yes -[9-ERROR] checking how to run the C preprocessor... gcc-40 -E -[9-ERROR] checking for Cygwin environment... no -[9-ERROR] checking for mingw32 environment... no -[9-ERROR] checking host system type... i386-unknown-linux-gnu -[9-ERROR] checking build system type... i386-unknown-linux-gnu -[9-ERROR] checking for ld used by GCC... ld -[9-ERROR] checking if the linker (ld) is GNU ld... yes -[9-ERROR] checking for ld option to reload object files... -r -[9-ERROR] checking for BSD-compatible nm... nm -[9-ERROR] checking whether ln -s works... yes -[9-ERROR] checking how to recognise dependant libraries... pass_all -[9-ERROR] checking for object suffix... o -[9-ERROR] checking for executable suffix... no -[9-ERROR] checking command to parse nm output... ok -[9-ERROR] checking for dlfcn.h... yes -[9-ERROR] checking for ranlib... ranlib -[9-ERROR] checking for strip... strip -[9-ERROR] checking for objdir... .libs -[9-ERROR] checking for gcc-40 option to produce PIC... -fPIC -[9-ERROR] checking if gcc-40 PIC flag -fPIC works... yes -[9-ERROR] checking if gcc-40 static flag -static works... yes -[9-ERROR] checking if gcc-40 supports -c -o file.o... yes -[9-ERROR] checking if gcc-40 supports -c -o file.lo... -[9-ERROR] checking if gcc-40 supports -fno-rtti -fno-exceptions... yes -[9-ERROR] checking whether the linker (ld) supports shared libraries... yes -[9-ERROR] checking how to hardcode library paths into programs... immediate -[9-ERROR] checking whether stripping libraries is possible... yes -[9-ERROR] checking dynamic linker characteristics... GNU/Linux ld.so -[9-ERROR] checking if libtool supports shared libraries... yes -[9-ERROR] checking whether -lc should be explicitly linked in... no -[9-ERROR] creating libtool -[9-ERROR] checking for db.h... yes -[9-ERROR] checking for db_version in /usr/lib/libdb-3.a... no -[9-ERROR] configure: error: -[9-ERROR] *** Could not find Berkeley DB library. -[9-ERROR] --- BUILD ERROR --- - diff --git a/package/base/nssdb/nssdb.conf b/package/base/nssdb/nssdb.conf deleted file mode 100644 index 023bbbf19..000000000 --- a/package/base/nssdb/nssdb.conf +++ /dev/null @@ -1,25 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/base/nssdb/nssdb.conf -# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf -# -# 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 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -confopt="$confopt --with-db-include=/usr/include/db3" -hook_add postmake 3 "mkdir -p $root/var/db; cp -v db-Makefile $root/var/db/Makefile" - diff --git a/package/base/nssdb/nssdb.desc b/package/base/nssdb/nssdb.desc deleted file mode 100644 index b44f13c89..000000000 --- a/package/base/nssdb/nssdb.desc +++ /dev/null @@ -1,47 +0,0 @@ - -[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- -[COPY] -[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. -[COPY] Please add additional copyright information _after_ the line containing -[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -[COPY] -[COPY] ROCK Linux: rock-src/package/base/nssdb/nssdb.desc -[COPY] ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf -[COPY] -[COPY] This program is free software; you can redistribute it and/or modify -[COPY] it under the terms of the GNU General Public License as published by -[COPY] the Free Software Foundation; either version 2 of the License, or -[COPY] (at your option) any later version. A copy of the GNU General Public -[COPY] License can be found at Documentation/COPYING. -[COPY] -[COPY] Many people helped and are helping developing ROCK Linux. Please -[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM -[COPY] file for details. -[COPY] -[COPY] --- ROCK-COPYRIGHT-NOTE-END --- - -[I] The Berkeley DB NSS (name service switch) module - -[T] The Berkeley DB NSS module provides an alternative means for storing -[T] configuration information traditionally kept in several plain-text -[T] files in `/etc' (e.g. `/etc/passwd'). The module uses the Berkeley DB -[T] Library to store this information in several database files in -[T] `/var/db' (e.g. `/var/db/passwd.db'). Using these databases can lead -[T] to a considerable speedup if the files in `/etc' are large (e.g. on a -[T] system with a lot of accounts). - -[U] http://www.gnu.org/software/libc/ {The GLibc2 Homepage} - -[A] The GNU Project / FSF -[M] Clifford Wolf - -[C] base/system - -[L] GPL -[S] Stable -[V] 2.2.3pre1 -[P] X -?---5---9 203.400 - -[D] 2083262118 nss_db-2.2.3pre1.tar.gz ftp://sources.redhat.com/pub/glibc/releases/ - diff --git a/package/base/nssdb/set_errno.patch b/package/base/nssdb/set_errno.patch deleted file mode 100644 index 94cffc39f..000000000 --- a/package/base/nssdb/set_errno.patch +++ /dev/null @@ -1,35 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/base/nssdb/set_errno.patch -# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./src/db-open.c.orig Thu Nov 7 22:18:30 2002 -+++ ./src/db-open.c Thu Nov 7 22:19:23 2002 -@@ -22,6 +22,13 @@ - #include - #include - -+#ifndef errno -+extern int errno; -+#endif -+#ifndef __set_errno -+# define __set_errno(val) errno = (val) -+#endif -+ - #include "db-compat.h" - - #include "nss_db.h"