r885 - in trunk: . Linux-PAM exim heimdal net-tools postgresql wvstreams

bdubbs at linuxfromscratch.org bdubbs at linuxfromscratch.org
Tue Mar 22 08:05:54 PST 2005


Author: bdubbs
Date: 2005-03-22 09:05:53 -0700 (Tue, 22 Mar 2005)
New Revision: 885

Added:
   trunk/Linux-PAM/Linux-PAM-0.78-linkage-2.patch
   trunk/exim/
   trunk/exim/exim-4.43-db43-1.patch
   trunk/heimdal/heimdal-0.6.3-cracklib-1.patch
   trunk/heimdal/heimdal-0.6.3-fhs_compliance-1.patch
   trunk/net-tools/net-tools-1.60-mii-ioctl-1.patch
   trunk/postgresql/
   trunk/postgresql/postgresql-7.4.6-dsssl_fix-1.patch
   trunk/wvstreams/wvstreams-4.0.1-tcl84-1.patch
Removed:
   trunk/net-tools/net-tools-1.60-miiioctl-1.patch
Log:
Update several BLFS patches

Added: trunk/Linux-PAM/Linux-PAM-0.78-linkage-2.patch
===================================================================
--- trunk/Linux-PAM/Linux-PAM-0.78-linkage-2.patch	2005-03-22 06:05:27 UTC (rev 884)
+++ trunk/Linux-PAM/Linux-PAM-0.78-linkage-2.patch	2005-03-22 16:05:53 UTC (rev 885)
@@ -0,0 +1,66 @@
+Submitted By: DJ Lucas (dj_AT_lucasit_DOT_com)
+Date: 2004-05-03
+Initial Package Version: 0.77
+Origin: Mandrake CVS (Jim Gifford) + cracklib source
+Description: Fixes linking on PAM and updates cracklib check
+
+$LastChangedBy: dj $
+$Date: 2005-01-30 14:55:08 -0600 (Sun, 30 Jan 2005) $
+
+
+diff -Naur Linux-PAM-0.78-orig/configure.in Linux-PAM-0.78/configure.in
+--- Linux-PAM-0.78-orig/configure.in	2004-10-06 09:04:34.000000000 -0500
++++ Linux-PAM-0.78/configure.in	2005-01-30 13:53:16.856763760 -0600
+@@ -262,7 +262,7 @@
+ 
+ dnl Look for cracklib dictionary
+ AC_MSG_CHECKING(path to cracklib dictionary)
+-DICT_DIR_CANDIDATES="/usr/lib /usr/share/dict /usr/share/lib \
++DICT_DIR_CANDIDATES="/lib /usr/lib /usr/share/dict /usr/share/lib \
+   /usr/local/lib /usr/local/share/lib"
+ DICT_FILE_CANDIDATES="pw_dict cracklib_dict"
+ CRACKLIB_DICTPATH=""
+@@ -278,7 +278,7 @@
+       done
+ done
+ if test -z "$CRACKLIB_DICTPATH" ; then
+-      AC_MSG_ERROR(none found)
++      AC_MSG_RESULT(none found)
+ else
+       AC_MSG_RESULT($CRACKLIB_DICTPATH)
+ fi
+diff -Naur Linux-PAM-0.78-orig/libpam_misc/Makefile Linux-PAM-0.78/libpam_misc/Makefile
+--- Linux-PAM-0.78-orig/libpam_misc/Makefile	2004-09-28 08:49:19.000000000 -0500
++++ Linux-PAM-0.78/libpam_misc/Makefile	2005-01-30 13:52:46.445386992 -0600
+@@ -38,6 +38,8 @@
+ SLIBOBJECTS = $(addprefix static/,$(LIBOBJECTS))
+ endif
+ 
++LINKLIBS += -L../libpam -lpam
++
+ # ---------------------------------------------
+ ## rules
+ 
+diff -Naur Linux-PAM-0.78-orig/modules/pam_cracklib/pam_cracklib.c Linux-PAM-0.78/modules/pam_cracklib/pam_cracklib.c
+--- Linux-PAM-0.78-orig/modules/pam_cracklib/pam_cracklib.c	2004-09-15 07:06:17.000000000 -0500
++++ Linux-PAM-0.78/modules/pam_cracklib/pam_cracklib.c	2005-01-30 13:52:46.446386840 -0600
+@@ -49,8 +49,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <ctype.h>
+-
+-extern char *FascistCheck(char *pw, const char *dictpath);
++#include <crack.h>
+ 
+ #ifndef CRACKLIB_DICTPATH
+ #define CRACKLIB_DICTPATH "/usr/share/dict/cracklib_dict"
+diff -Naur Linux-PAM-0.78-orig/modules/pam_lastlog/Makefile Linux-PAM-0.78/modules/pam_lastlog/Makefile
+--- Linux-PAM-0.78-orig/modules/pam_lastlog/Makefile	2001-02-10 16:33:10.000000000 -0600
++++ Linux-PAM-0.78/modules/pam_lastlog/Makefile	2005-01-30 13:52:46.446386840 -0600
+@@ -15,5 +15,6 @@
+ endif
+ 
+ TITLE=pam_lastlog
++MODULE_SIMPLE_EXTRALIBS=-lutil
+ 
+ include ../Simple.Rules

Added: trunk/exim/exim-4.43-db43-1.patch
===================================================================
--- trunk/exim/exim-4.43-db43-1.patch	2005-03-22 06:05:27 UTC (rev 884)
+++ trunk/exim/exim-4.43-db43-1.patch	2005-03-22 16:05:53 UTC (rev 885)
@@ -0,0 +1,54 @@
+Submitted By:            Igor Zivkovic <igor at linuxfromscratch.org>
+Date:                    2005-01-10
+Initial Package Version: 4.43
+Upstream Status:         Not submitted.
+Origin:                  http://www.sleepycat.com/docs/ref/upgrade.4.3/toc.html
+Description:             Adds support for Berkeley DB-4.3.x.
+
+$LastChangedBy: igor $
+$Date: 2005-01-10 16:56:39 -0600 (Mon, 10 Jan 2005) $
+
+--- exim-4.43/src/exim_dbmbuild.c.orig	2005-01-10 15:16:40.841577000 +0000
++++ exim-4.43/src/exim_dbmbuild.c	2005-01-10 15:16:56.367216744 +0000
+@@ -60,7 +60,7 @@
+ 
+ #if defined(USE_DB) && defined(DB_VERSION_STRING)
+ void
+-dbfn_bdb_error_callback(const char *pfx, char *msg)
++dbfn_bdb_error_callback(const DB_ENV *dbenv, const char *pfx, const char *msg)
+ {
+ pfx = pfx;
+ printf("Berkeley DB error: %s\n", msg);
+--- exim-4.43/src/exim_dbutil.c.orig	2005-01-10 15:16:49.594246392 +0000
++++ exim-4.43/src/exim_dbutil.c	2005-01-10 15:16:56.368216592 +0000
+@@ -79,7 +79,7 @@
+ 
+ #if defined(USE_DB) && defined(DB_VERSION_STRING)
+ void
+-dbfn_bdb_error_callback(const char *pfx, char *msg)
++dbfn_bdb_error_callback(const DB_ENV *dbenv, const char *pfx, const char *msg)
+ {
+ pfx = pfx;
+ printf("Berkeley DB error: %s\n", msg);
+--- exim-4.43/src/dbfn.c.orig	2005-01-10 15:17:10.322095280 +0000
++++ exim-4.43/src/dbfn.c	2005-01-10 15:17:14.602444568 +0000
+@@ -42,7 +42,7 @@
+ 
+ #if defined(USE_DB) && defined(DB_VERSION_STRING)
+ void
+-dbfn_bdb_error_callback(const char *pfx, char *msg)
++dbfn_bdb_error_callback(const DB_ENV *dbenv, const char *pfx, const char *msg)
+ {
+ pfx = pfx;
+ log_write(0, LOG_MAIN, "Berkeley DB error: %s", msg);
+--- exim-4.43/src/dbfunctions.h.orig	2005-01-10 15:17:21.159447752 +0000
++++ exim-4.43/src/dbfunctions.h	2005-01-10 15:17:25.472792024 +0000
+@@ -22,7 +22,7 @@
+ /* Berkeley DB uses a callback function to pass back error details. */
+ 
+ #if defined(USE_DB) && defined(DB_VERSION_STRING)
+-void     dbfn_bdb_error_callback(const char *, char *);
++void     dbfn_bdb_error_callback(const DB_ENV *, const char *, const char *);
+ #endif
+ 
+ /* End of dbfunctions.h */

Added: trunk/heimdal/heimdal-0.6.3-cracklib-1.patch
===================================================================
--- trunk/heimdal/heimdal-0.6.3-cracklib-1.patch	2005-03-22 06:05:27 UTC (rev 884)
+++ trunk/heimdal/heimdal-0.6.3-cracklib-1.patch	2005-03-22 16:05:53 UTC (rev 885)
@@ -0,0 +1,98 @@
+Patch Name:              heimdal-0.6.2-cracklib-1.patch
+Submitted By:            Randy McMurchy <LFS-User_at_mcmurchy_dot_com>
+Date:                    2004-05-07
+Initial Package Version: 0.6.1
+Upstream Status:         N/A
+Origin:                  Randy McMurchy, DJ Lucas and Heimdal sample source code
+Description:             Enables kpasswd and kadmin to use the cracklib library.
+                         Cracklib must be installed using BLFS instructions. See:
+                         http://www.linuxfromscratch.org/blfs/view/cvs/postlfs/cracklib.html
+
+$LastChangedBy: randy $
+$Date: 2005-01-27 09:36:13 -0600 (Thu, 27 Jan 2005) $
+
+diff -Naur heimdal-0.6.2-orig/lib/kadm5/Makefile.in heimdal-0.6.2/lib/kadm5/Makefile.in
+--- heimdal-0.6.2-orig/lib/kadm5/Makefile.in	2004-05-06 01:52:10.000000000 +0000
++++ heimdal-0.6.2/lib/kadm5/Makefile.in	2004-05-07 15:45:14.000000000 +0000
+@@ -124,7 +124,7 @@
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ -lcrack_krb5
+ LIBTOOL = @LIBTOOL@
+ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+ LIB_NDBM = @LIB_NDBM@
+
+diff -Naur heimdal-0.6.2-orig/lib/kadm5/password_quality.c heimdal-0.6.2/lib/kadm5/password_quality.c
+--- heimdal-0.6.2-orig/lib/kadm5/password_quality.c	2000-07-05 13:14:45.000000000 +0000
++++ heimdal-0.6.2/lib/kadm5/password_quality.c	2004-05-07 15:45:14.000000000 +0000
+@@ -32,6 +32,7 @@
+  */
+ 
+ #include "kadm5_locl.h"
++#include <crack_krb5.h>
+ 
+ RCSID("$Id: heimdal-0.6.2-cracklib-1.patch,v 1.1 2004/05/08 05:59:21 tushar Exp $");
+ 
+@@ -39,21 +40,53 @@
+ #include <dlfcn.h>
+ #endif
+ 
+-static const char *
++/* The following function was inserted to utilize the cracklib library to 
++   ensure strong passwords.  The cracklib library must be patched before 
++   this function will work. For more information, see:
++   http://www.linuxfromscratch.org/blfs/view/cvs/postlfs/cracklib.html
++*/
++
++#if defined(CRACKLIB_KRB5_H) && defined(CRACKLIB_DICTPATH)
++
++static const char*
+ simple_passwd_quality (krb5_context context,
+-		       krb5_principal principal,
+-		       krb5_data *pwd)
++               krb5_principal principal,
++               krb5_data *password)
+ {
+-    if (pwd->length < 6)
+-	return "Password too short";
+-    else
+-	return NULL;
++    char *s = malloc(password->length + 1);
++    char *msg;
++    char *strings[2];
++    if(s == NULL)
++    return NULL; /* XXX */
++    strings[0] = principal->name.name_string.val[0]; /* XXX */
++    strings[1] = NULL;
++    memcpy(s, password->data, password->length);
++    s[password->length] = '\0';
++        msg = FascistCheck(s, CRACKLIB_DICTPATH, strings); /* see crack_krb5.h */
++    memset(s, 0, password->length);
++    free(s);
++    return msg;
+ }
+ 
+ typedef const char* (*passwd_quality_check_func)(krb5_context, 
+ 						 krb5_principal, 
+ 						 krb5_data*);
+ 
++#else /* CRACKLIB_H && DICTPATH */
++
++static const char *
++simple_passwd_quality (krb5_context context,
++                       krb5_principal principal,
++                       krb5_data *pwd)
++{
++    if (pwd->length < 6)
++        return "Password too short";
++    else
++        return NULL;
++}
++
++#endif /* CRACKLIB_KRB5_H && CRACKLIB_DICTPATH */
++
+ static passwd_quality_check_func passwd_quality_check = simple_passwd_quality;
+ 
+ #ifdef HAVE_DLOPEN

Added: trunk/heimdal/heimdal-0.6.3-fhs_compliance-1.patch
===================================================================
--- trunk/heimdal/heimdal-0.6.3-fhs_compliance-1.patch	2005-03-22 06:05:27 UTC (rev 884)
+++ trunk/heimdal/heimdal-0.6.3-fhs_compliance-1.patch	2005-03-22 16:05:53 UTC (rev 885)
@@ -0,0 +1,229 @@
+Patch Name:              heimdal-0.6.2-fhs-compliance-1.patch
+Submitted By:            Randy McMurchy <LFS-User_at_mcmurchy_dot_com>
+Date:                    2004-05-07
+Initial Package Version: 0.6.1
+Upstream Status:         N/A
+Origin:                  Randy McMurchy
+Description:             Changes all references of /var/heimdal to /var/lib/heimdal
+                         in source code and documentation to comply with FHS.
+
+$LastChangedBy: randy $
+$Date: 2005-01-27 09:36:13 -0600 (Thu, 27 Jan 2005) $
+
+diff -Naur heimdal-0.6.2-orig/lib/krb5/krb5.conf.5 heimdal-0.6.2/lib/krb5/krb5.conf.5
+--- heimdal-0.6.2-orig/lib/krb5/krb5.conf.5	2004-03-09 19:52:07.000000000 +0000
++++ heimdal-0.6.2/lib/krb5/krb5.conf.5	2004-05-07 15:42:05.000000000 +0000
+@@ -451,7 +451,7 @@
+ 		default_domain = foo.se
+ 	}
+ [logging]
+-	kdc = FILE:/var/heimdal/kdc.log
++	kdc = FILE:/var/lib/heimdal/kdc.log
+ 	kdc = SYSLOG:INFO
+ 	default = SYSLOG:INFO:USER
+ .Ed
+
+diff -Naur heimdal-0.6.2-orig/lib/krb5/krb5.conf.cat5 heimdal-0.6.2/lib/krb5/krb5.conf.cat5
+--- heimdal-0.6.2-orig/lib/krb5/krb5.conf.cat5	2004-05-06 01:52:29.000000000 +0000
++++ heimdal-0.6.2/lib/krb5/krb5.conf.cat5	2004-05-07 15:42:05.000000000 +0000
+@@ -456,7 +456,7 @@
+                            default_domain = foo.se
+                    }
+            [logging]
+-                   kdc = FILE:/var/heimdal/kdc.log
++                   kdc = FILE:/var/lib/heimdal/kdc.log
+                    kdc = SYSLOG:INFO
+                    default = SYSLOG:INFO:USER
+ 
+diff -Naur heimdal-0.6.2-orig/lib/hdb/hdb.h heimdal-0.6.2/lib/hdb/hdb.h
+--- heimdal-0.6.2-orig/lib/hdb/hdb.h	2000-07-08 16:03:37.000000000 +0000
++++ heimdal-0.6.2/lib/hdb/hdb.h	2004-05-07 15:42:05.000000000 +0000
+@@ -78,7 +78,7 @@
+     krb5_error_code (*destroy)(krb5_context, struct HDB*);
+ }HDB;
+ 
+-#define HDB_DB_DIR "/var/heimdal"
++#define HDB_DB_DIR "/var/lib/heimdal"
+ #define HDB_DEFAULT_DB HDB_DB_DIR "/heimdal"
+ #define HDB_DB_FORMAT_ENTRY "hdb/db-format"
+ 
+diff -Naur heimdal-0.6.2-orig/kdc/kdc.8 heimdal-0.6.2/kdc/kdc.8
+--- heimdal-0.6.2-orig/kdc/kdc.8	2003-10-21 20:06:01.000000000 +0000
++++ heimdal-0.6.2/kdc/kdc.8	2004-05-07 15:42:05.000000000 +0000
+@@ -74,7 +74,7 @@
+ .Fl -config-file= Ns Ar file
+ .Xc
+ Specifies the location of the config file, the default is
+-.Pa /var/heimdal/kdc.conf .
++.Pa /var/lib/heimdal/kdc.conf .
+ This is the only value that can't be specified in the config file.
+ .It Xo
+ .Fl p ,
+
+diff -Naur heimdal-0.6.2-orig/kadmin/kadmind.8 heimdal-0.6.2/kadmin/kadmind.8
+--- heimdal-0.6.2-orig/kadmin/kadmind.8	2003-04-06 17:47:57.000000000 +0000
++++ heimdal-0.6.2/kadmin/kadmind.8	2004-05-07 15:42:05.000000000 +0000
+@@ -88,7 +88,7 @@
+ Principals are always allowed to change their own password and list
+ their own principal.  Apart from that, doing any operation requires
+ permission explicitly added in the ACL file
+-.Pa /var/heimdal/kadmind.acl .
++.Pa /var/lib/heimdal/kadmind.acl .
+ The format of this file is:
+ .Bd -ragged
+ .Va principal
+@@ -163,7 +163,7 @@
+ .El
+ .\".Sh ENVIRONMENT
+ .Sh FILES
+-.Pa /var/heimdal/kadmind.acl
++.Pa /var/lib/heimdal/kadmind.acl
+ .Sh EXAMPLES
+ This will cause
+ .Nm
+
+diff -Naur heimdal-0.6.2-orig/doc/heimdal.info-1 heimdal-0.6.2/doc/heimdal.info-1
+--- heimdal-0.6.2-orig/doc/heimdal.info-1	2004-05-06 01:52:15.000000000 +0000
++++ heimdal-0.6.2/doc/heimdal.info-1	2004-05-07 15:42:05.000000000 +0000
+@@ -448,15 +448,15 @@
+ =====================
+ 
+ The database library will look for the database in the directory
+-`/var/heimdal', so you should probably create that directory.  Make
++`/var/lib/heimdal', so you should probably create that directory.  Make
+ sure the directory have restrictive permissions.
+ 
+-     # mkdir /var/heimdal
++     # mkdir /var/lib/heimdal
+ 
+ The keys of all the principals are stored in the database.  If you
+ choose to, these can be encrypted with a master key.  You do not have to
+ remember this key (or password), but just to enter it once and it will
+-be stored in a file (`/var/heimdal/m-key').  If you want to have a
++be stored in a file (`/var/lib/heimdal/m-key').  If you want to have a
+ master key, run `kstash' to create this master key:
+ 
+      # kstash
+@@ -599,7 +599,7 @@
+ You might need to add `kerberos-adm' to your `/etc/services' as 749/tcp.
+ 
+ Access to the administration server is controlled by an acl-file,
+-(default `/var/heimdal/kadmind.acl'.) The lines in the access file, has
++(default `/var/lib/heimdal/kadmind.acl'.) The lines in the access file, has
+ the following syntax:
+      principal       [priv1,priv2,...]       [glob-pattern]
+ 
+@@ -704,7 +704,7 @@
+ follows:
+ 
+      slave# ktutil get -p foo/admin hprop/`hostname`
+-     slave# mkdir /var/heimdal
++     slave# mkdir /var/lib/heimdal
+      slave# hpropd
+ 
+ The master will use the principal `kadmin/hprop' to authenticate to the
+@@ -751,7 +751,7 @@
+ The program that runs on the master is `ipropd-master' and all clients
+ run `ipropd-slave'.
+ 
+-Create the file `/var/heimdal/slaves' on the master containing all the
++Create the file `/var/lib/heimdal/slaves' on the master containing all the
+ slaves that the database should be propagated to.  Each line contains
+ the full name of the principal (for example
+ `iprop/hemligare.foo.se at FOO.SE').
+@@ -769,7 +769,7 @@
+ 
+ The next step is to start the `ipropd-master' process on the master
+ server.  The `ipropd-master' listens on the UNIX-socket
+-`/var/heimdal/signal' to know when changes have been made to the
++`/var/lib/heimdal/signal' to know when changes have been made to the
+ database so they can be propagated to the slaves.  There is also a
+ safety feature of testing the version number regularly (every 30
+ seconds) to see if it has been modified by some means that do not raise
+
+diff -Naur heimdal-0.6.2-orig/doc/setup.texi heimdal-0.6.2/doc/setup.texi
+--- heimdal-0.6.2-orig/doc/setup.texi	2003-10-21 21:37:56.000000000 +0000
++++ heimdal-0.6.2/doc/setup.texi	2004-05-07 15:42:05.000000000 +0000
+@@ -102,17 +102,17 @@
+ @section Creating the database
+ 
+ The database library will look for the database in the directory
+- at file{/var/heimdal}, so you should probably create that directory.
++ at file{/var/lib/heimdal}, so you should probably create that directory.
+ Make sure the directory have restrictive permissions.
+ 
+ @example
+-# mkdir /var/heimdal
++# mkdir /var/lib/heimdal
+ @end example
+ 
+ The keys of all the principals are stored in the database.  If you
+ choose to, these can be encrypted with a master key.  You do not have to
+ remember this key (or password), but just to enter it once and it will
+-be stored in a file (@file{/var/heimdal/m-key}).  If you want to have a
++be stored in a file (@file{/var/lib/heimdal/m-key}).  If you want to have a
+ master key, run @samp{kstash} to create this master key:
+ 
+ @example
+@@ -262,7 +262,7 @@
+ as 749/tcp.
+ 
+ Access to the administration server is controlled by an acl-file, (default
+- at file{/var/heimdal/kadmind.acl}.) The lines in the access file, has the
++ at file{/var/lib/heimdal/kadmind.acl}.) The lines in the access file, has the
+ following syntax:
+ @smallexample
+ principal       [priv1,priv2,...]       [glob-pattern]
+@@ -375,7 +375,7 @@
+ 
+ @example
+ slave# ktutil get -p foo/admin hprop/`hostname`
+-slave# mkdir /var/heimdal
++slave# mkdir /var/lib/heimdal
+ slave# hpropd
+ @end example
+ 
+@@ -426,7 +426,7 @@
+ The program that runs on the master is @code{ipropd-master} and all
+ clients run @code{ipropd-slave}.
+ 
+-Create the file @file{/var/heimdal/slaves} on the master containing all
++Create the file @file{/var/lib/heimdal/slaves} on the master containing all
+ the slaves that the database should be propagated to.  Each line contains
+ the full name of the principal (for example
+ @samp{iprop/hemligare.foo.se@@FOO.SE}).
+@@ -447,7 +447,7 @@
+ 
+ The next step is to start the @code{ipropd-master} process on the master
+ server.  The @code{ipropd-master} listens on the UNIX-socket
+- at file{/var/heimdal/signal} to know when changes have been made to the
++ at file{/var/lib/heimdal/signal} to know when changes have been made to the
+ database so they can be propagated to the slaves.  There is also a
+ safety feature of testing the version number regularly (every 30
+ seconds) to see if it has been modified by some means that do not raise
+
+diff -Naur heimdal-0.6.2-orig/configure.in heimdal-0.6.2/configure.in
+--- heimdal-0.6.2-orig/configure.in	2004-05-06 01:49:33.000000000 +0000
++++ heimdal-0.6.2/configure.in	2004-05-07 15:42:05.000000000 +0000
+@@ -17,7 +17,7 @@
+ AC_PREFIX_DEFAULT(/usr/heimdal)
+ 
+ test "$sysconfdir" = '${prefix}/etc' && sysconfdir='/etc'
+-test "$localstatedir" = '${prefix}/var' && localstatedir='/var/heimdal'
++test "$localstatedir" = '${prefix}/var' && localstatedir='/var/lib/heimdal'
+ 
+ AC_CANONICAL_HOST
+ CANONICAL_HOST=$host
+
+diff -Naur heimdal-0.6.2-orig/configure heimdal-0.6.2/configure
+--- heimdal-0.6.2-orig/configure	2004-05-06 01:50:34.000000000 +0000
++++ heimdal-0.6.2/configure	2004-05-07 15:42:05.000000000 +0000
+@@ -3153,7 +3153,7 @@
+ 
+ 
+ test "$sysconfdir" = '${prefix}/etc' && sysconfdir='/etc'
+-test "$localstatedir" = '${prefix}/var' && localstatedir='/var/heimdal'
++test "$localstatedir" = '${prefix}/var' && localstatedir='/var/lib/heimdal'
+ 
+ # Make sure we can run config.sub.
+ $ac_config_sub sun4 >/dev/null 2>&1 ||

Copied: trunk/net-tools/net-tools-1.60-mii-ioctl-1.patch (from rev 860, trunk/net-tools/net-tools-1.60-miiioctl-1.patch)

Deleted: trunk/net-tools/net-tools-1.60-miiioctl-1.patch
===================================================================
--- trunk/net-tools/net-tools-1.60-miiioctl-1.patch	2005-03-22 06:05:27 UTC (rev 884)
+++ trunk/net-tools/net-tools-1.60-miiioctl-1.patch	2005-03-22 16:05:53 UTC (rev 885)
@@ -1,24 +0,0 @@
-Submitted By: Jim Gifford (patches at jg555 dot com)
-Date: 2003-09-12
-Initial Package Version: 1.60
-Origin: Rawhide
-Description: Updates mii ioctls
-
-diff -Naur net-tools-1.60.orig/include/mii.h net-tools-1.60/include/mii.h
---- net-tools-1.60.orig/include/mii.h	2000-05-21 14:21:27.000000000 +0000
-+++ net-tools-1.60/include/mii.h	2003-09-12 22:47:27.000000000 +0000
-@@ -11,11 +11,9 @@
- 
- /* network interface ioctl's for MII commands */
- #ifndef SIOCGMIIPHY
--#define SIOCGMIIPHY (SIOCDEVPRIVATE)	/* Read from current PHY */
--#define SIOCGMIIREG (SIOCDEVPRIVATE+1) 	/* Read any PHY register */
--#define SIOCSMIIREG (SIOCDEVPRIVATE+2) 	/* Write any PHY register */
--#define SIOCGPARAMS (SIOCDEVPRIVATE+3) 	/* Read operational parameters */
--#define SIOCSPARAMS (SIOCDEVPRIVATE+4) 	/* Set operational parameters */
-+#define SIOCGMIIPHY 0x8947 	/* Read from current PHY */
-+#define SIOCGMIIREG 0x8948 	/* Read any PHY register */
-+#define SIOCSMIIREG 0x8949 	/* Write any PHY register */
- #endif
- 
- #include <linux/types.h>

Added: trunk/postgresql/postgresql-7.4.6-dsssl_fix-1.patch
===================================================================
--- trunk/postgresql/postgresql-7.4.6-dsssl_fix-1.patch	2005-03-22 06:05:27 UTC (rev 884)
+++ trunk/postgresql/postgresql-7.4.6-dsssl_fix-1.patch	2005-03-22 16:05:53 UTC (rev 885)
@@ -0,0 +1,26 @@
+Submitted By: Nico R. <n-roeser at gmx.net>
+Date: 2004-10-15
+Initial Package Version: 7.4.5
+Upstream Status: Not submitted - LFS Specific
+Origin: Nico R.
+Description: Allows the PostgreSQL configure script to find the DocBook DSSSL
+             Stylesheets-1.78 at the location where the BLFS book installs them.
+             This patch is marked as "LFS Specific" at the moment, because some
+             discussion is needed about the correct way to handle this problem.
+
+$LastChangedBy$
+$Date$
+
+diff -Naur postgresql-7.4.5.orig/configure postgresql-7.4.5/configure
+--- postgresql-7.4.5.orig/configure	2004-08-18 03:11:24.000000000 +0000
++++ postgresql-7.4.5/configure	2004-10-15 08:33:08.000000000 +0000
+@@ -17537,7 +17537,8 @@
+         sgml/stylesheets/docbook \
+         sgml/docbook/dsssl/modular \
+         sgml/docbook/stylesheet/dsssl/modular \
+-        sgml/docbook/dsssl-stylesheets
++        sgml/docbook/dsssl-stylesheets \
++        sgml/docbook/dsssl-stylesheets-1.78
+       do
+         pgac_candidate=$pgac_prefix/$pgac_infix/$pgac_postfix
+         if test -r "$pgac_candidate/html/docbook.dsl" \

Added: trunk/wvstreams/wvstreams-4.0.1-tcl84-1.patch
===================================================================
--- trunk/wvstreams/wvstreams-4.0.1-tcl84-1.patch	2005-03-22 06:05:27 UTC (rev 884)
+++ trunk/wvstreams/wvstreams-4.0.1-tcl84-1.patch	2005-03-22 16:05:53 UTC (rev 885)
@@ -0,0 +1,117 @@
+Submitted By: BLFS Book <blfs-book at linuxfromscratch.org>
+Date: 2005-02-09
+Initial Package Version: 3.75.0
+Upstream Status: Not submitted
+Origin: Igor Zivkovic and Randy McMurchy
+Description: Fixes Tcl-8.4.X detection
+
+$LastChangedBy: randy $
+$Date: 2005-02-09 22:20:33 -0600 (Wed, 09 Feb 2005) $
+
+diff -Naur wvstreams-4.0.1-orig/configure wvstreams-4.0.1/configure
+--- wvstreams-4.0.1-orig/configure	2004-11-18 14:15:05.000000000 +0000
++++ wvstreams-4.0.1/configure	2005-02-09 18:09:14.475593880 +0000
+@@ -8567,9 +8567,9 @@
+ if test "$with_tcl" != "no"; then
+     CPPFLAGS_save="$CPPFLAGS"
+     if test -z "$CPPFLAGS"; then
+-        CPPFLAGS="-I/usr/include/tcl8.3"
++        CPPFLAGS="-I/usr/include/tcl8.4"
+     else
+-        CPPFLAGS="$CPPFLAGS -I/usr/include/tcl8.3"
++        CPPFLAGS="$CPPFLAGS -I/usr/include/tcl8.4"
+     fi
+ 
+ 
+@@ -8724,13 +8724,13 @@
+ done
+ 
+ 
+-echo "$as_me:$LINENO: checking for TclInterpInit in -ltcl8.3" >&5
+-echo $ECHO_N "checking for TclInterpInit in -ltcl8.3... $ECHO_C" >&6
+-if test "${ac_cv_lib_tcl8_3_TclInterpInit+set}" = set; then
++echo "$as_me:$LINENO: checking for TclInterpInit in -ltcl8.4" >&5
++echo $ECHO_N "checking for TclInterpInit in -ltcl8.4... $ECHO_C" >&6
++if test "${ac_cv_lib_tcl8_4_TclInterpInit+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ltcl8.3  $LIBS"
++LIBS="-ltcl8.4  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -8774,25 +8774,25 @@
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_lib_tcl8_3_TclInterpInit=yes
++  ac_cv_lib_tcl8_4_TclInterpInit=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_tcl8_3_TclInterpInit=no
++ac_cv_lib_tcl8_4_TclInterpInit=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_tcl8_3_TclInterpInit" >&5
+-echo "${ECHO_T}$ac_cv_lib_tcl8_3_TclInterpInit" >&6
+-if test $ac_cv_lib_tcl8_3_TclInterpInit = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_tcl8_4_TclInterpInit" >&5
++echo "${ECHO_T}$ac_cv_lib_tcl8_4_TclInterpInit" >&6
++if test $ac_cv_lib_tcl8_4_TclInterpInit = yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBTCL8_3 1
++#define HAVE_LIBTCL8_4 9
+ _ACEOF
+ 
+-  LIBS="-ltcl8.3 $LIBS"
++  LIBS="-ltcl8.4 $LIBS"
+ 
+ else
+   with_tcl=no
+diff -Naur wvstreams-4.0.1-orig/configure.ac wvstreams-4.0.1/configure.ac
+--- wvstreams-4.0.1-orig/configure.ac	2004-11-18 14:15:05.000000000 +0000
++++ wvstreams-4.0.1/configure.ac	2005-02-09 18:15:18.621235328 +0000
+@@ -473,9 +473,9 @@
+ # tcl
+ if test "$with_tcl" != "no"; then
+     CPPFLAGS_save="$CPPFLAGS"
+-    WV_APPEND(CPPFLAGS, -I/usr/include/tcl8.3)
++    WV_APPEND(CPPFLAGS, -I/usr/include/tcl8.4)
+     AC_CHECK_HEADERS(tcl.h,, [with_tcl=no])
+-    AC_CHECK_LIB(tcl8.3, TclInterpInit,, [with_tcl=no])
++    AC_CHECK_LIB(tcl8.4, TclInterpInit,, [with_tcl=no])
+     if test "$with_tcl" != "no"; then
+         CPPFLAGS="$CPPFLAGS_save"
+     fi
+diff -Naur wvstreams-4.0.1-orig/include/wvautoconf.h.in wvstreams-4.0.1/include/wvautoconf.h.in
+--- wvstreams-4.0.1-orig/include/wvautoconf.h.in	2004-11-18 14:15:05.000000000 +0000
++++ wvstreams-4.0.1/include/wvautoconf.h.in	2005-02-09 18:16:42.633463528 +0000
+@@ -84,8 +84,8 @@
+ /* Define to 1 if you have the `ssl' library (-lssl). */
+ #undef HAVE_LIBSSL
+ 
+-/* Define to 1 if you have the `tcl8.3' library (-ltcl8.3). */
+-#undef HAVE_LIBTCL8_3
++/* Define to 1 if you have the `tcl8.4' library (-ltcl8.4). */
++#undef HAVE_LIBTCL8_4
+ 
+ /* Define to 1 if you have the `vorbis' library (-lvorbis). */
+ #undef HAVE_LIBVORBIS
+diff -Naur wvstreams-4.0.1-orig/vars.mk wvstreams-4.0.1/vars.mk
+--- wvstreams-4.0.1-orig/vars.mk	2004-11-18 14:15:05.000000000 +0000
++++ wvstreams-4.0.1/vars.mk	2005-02-09 18:18:23.924065016 +0000
+@@ -25,7 +25,7 @@
+ #ifneq ("$(with_swig)", "no")
+ #  ifneq ("$(with_tcl)", "no")
+ #    TARGETS += bindings/tcl
+-#    CPPFLAGS += -I/usr/include/tcl8.3
++#    CPPFLAGS += -I/usr/include/tcl8.4
+ #  endif
+ #  ifneq ("$(with_python)", "no")
+ #    TARGETS += bindings/python




More information about the patches mailing list