commit openldap2

22 Jun 2006

Hello community,

here is the log from the commit of package openldap2
checked in at Thu Jun 22 18:32:04 CEST 2006.

--------

--- openldap2/openldap2-client.changes	2006-05-25 00:49:57.000000000 +0200
+++ openldap2/openldap2-client.changes	2006-06-22 18:30:56.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Jun 22 14:46:58 CEST 2006 - schwab@suse.de
+
+- Don't use automake macros without using automake.
+
+-------------------------------------------------------------------
openldap2.changes: same change

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ openldap2-client.spec ++++++
--- /var/tmp/diff_new_pack.15dDxE/_old	2006-06-22 18:31:53.000000000 +0200
+++ /var/tmp/diff_new_pack.15dDxE/_new	2006-06-22 18:31:53.000000000 +0200
@@ -28,7 +28,7 @@
 %endif
 Autoreqprov:    on
 Version:        2.3.23
-Release:        1
+Release:        2
 Source:         openldap-%{version}.tar.bz2
 Source1:        openldap-rc.tgz
 Source2:        openldap-admin-guide.tar.bz2
@@ -449,6 +449,8 @@
 %endif
 
 %changelog -n openldap2-client
+* Thu Jun 22 2006 - schwab@suse.de
+- Don't use automake macros without using automake.
 * Wed May 24 2006 - rhafer@suse.de
 - Updated to Version 2.3.23
   * obsoletes the patches: libldap_ads-sasl-gssapi.dif,

openldap2.spec: same change



++++++ openldap-2.2.24.dif ++++++
--- /var/tmp/diff_new_pack.15dDxE/_old	2006-06-22 18:31:53.000000000 +0200
+++ /var/tmp/diff_new_pack.15dDxE/_new	2006-06-22 18:31:53.000000000 +0200
@@ -1,8 +1,8 @@
 Index: acinclude.m4
-===================================================================
---- acinclude.m4.orig
+================================================================================
+--- acinclude.m4
 +++ acinclude.m4
-@@ -14,3 +14,16 @@ dnl top-level directory of the distribut
+@@ -14,3 +14,16 @@
  dnl <http://www.OpenLDAP.org/license.html>.
  divert(-1)
  builtin(include, build/openldap.m4)dnl
@@ -19,46 +19,9 @@
 +     AC_DEFINE(HAVE_PTRDIFF_T,1,[Define if system has ptrdiff_t type])
 +   fi
 +])
-Index: build/top.mk
-===================================================================
---- build/top.mk.orig
-+++ build/top.mk
-@@ -37,7 +37,7 @@ libdir = @libdir@
- libexecdir = @libexecdir@
- localstatedir = @localstatedir@
- mandir = @mandir@
--moduledir = @libexecdir@$(ldap_subdir)
-+moduledir = @libexecdir@/modules
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@$(ldap_subdir)
-@@ -69,7 +69,7 @@ SHTOOL = $(top_srcdir)/build/shtool
- LIBTOOL = @LIBTOOL@
- LIBRELEASE = @OPENLDAP_LIBRELEASE@
- LIBVERSION = @OPENLDAP_LIBVERSION@
--LTVERSION = -release $(LIBRELEASE) -version-info $(LIBVERSION)
-+LTVERSION = -version-info $(LIBVERSION)
- 
- # libtool --only flag for libraries: platform specific
- NT_LTONLY_LIB = # --only-$(BUILD_LIBS_DYNAMIC)
-Index: configure.in
-===================================================================
---- configure.in.orig
-+++ configure.in
-@@ -2133,7 +2133,7 @@ if test $ol_enable_proctitle != no ; the
- 			[have_setproctitle=yes
- 			LUTIL_LIBS="$LUTIL_LIBS -lutil"],
- 			[have_setproctitle=no
--			LIBOBJS="$LIBOBJS setproctitle.o"
-+                        AC_LIBOBJ(setproctitle)
- 			LIBSRCS="$LIBSRCS setproctitle.c"])])
- 
- 	if test $have_setproctitle = yes ; then
-Index: build/openldap.m4
-===================================================================
---- build/openldap.m4.orig
+--- build/openldap.m4
 +++ build/openldap.m4
-@@ -65,7 +65,7 @@ dnl AC_VERBOSE(OpenLDAP --with-$1 $ol_wi
+@@ -65,7 +65,7 @@
  dnl
  dnl ====================================================================
  dnl
@@ -67,7 +30,7 @@
  [changequote(<<, >>)dnl 
  dnl The name to #define. 
  define(<<AC_TYPE_NAME>>, translit(sizeof_$1, [a-z *], [A-Z_P]))dnl 
-@@ -173,7 +173,7 @@ fi
+@@ -173,7 +173,7 @@
  dnl
  dnl --------------------------------------------------------------------
  dnl OpenLDAP version of STDC header check w/ EBCDIC support
@@ -76,7 +39,7 @@
  [AC_REQUIRE_CPP()dnl
  AC_REQUIRE([OL_CPP_EBCDIC])dnl
  AC_CACHE_CHECK([for ANSI C header files], ol_cv_header_stdc,
-@@ -315,27 +315,7 @@ dnl Try to locate appropriate library
+@@ -315,27 +315,7 @@
  AC_DEFUN([OL_BERKELEY_DB_LINK],
  [ol_cv_lib_db=no
  OL_BERKELEY_DB_TRY(ol_cv_db_none)
@@ -104,7 +67,7 @@
  ])
  dnl
  dnl --------------------------------------------------------------------
-@@ -1016,7 +996,7 @@ dnl ====================================
+@@ -1016,7 +996,7 @@
  dnl Early MIPS compilers (used in Ultrix 4.2) don't like
  dnl "int x; int *volatile a = &x; *a = 0;"
  dnl 	-- borrowed from PDKSH
@@ -113,7 +76,7 @@
   [AC_CACHE_CHECK(if compiler understands volatile, ol_cv_c_volatile,
      [AC_TRY_COMPILE([int x, y, z;],
        [volatile int a; int * volatile b = x ? &y : &z;
-@@ -1052,7 +1032,7 @@ fi
+@@ -1052,7 +1032,7 @@
  dnl
  dnl ====================================================================
  dnl Define sig_atomic_t if not defined in signal.h
@@ -122,7 +85,7 @@
   [AC_CACHE_CHECK(for sig_atomic_t, ol_cv_type_sig_atomic_t,
      [AC_TRY_COMPILE([#include <signal.h>], [sig_atomic_t atomic;],
  		ol_cv_type_sig_atomic_t=yes, ol_cv_type_sig_atomic_t=no)])
-@@ -1064,7 +1044,7 @@ AC_DEFUN(OL_TYPE_SIG_ATOMIC_T,
+@@ -1064,7 +1044,7 @@
  dnl
  dnl ====================================================================
  dnl Define socklen_t if not defined in sys/types.h or sys/socket.h
@@ -131,7 +94,7 @@
   [AC_CACHE_CHECK(for socklen_t, ol_cv_type_socklen_t,
      [AC_TRY_COMPILE([
  #ifdef HAVE_SYS_TYPES_H
-@@ -1083,7 +1063,7 @@ AC_DEFUN(OL_TYPE_SOCKLEN_T,
+@@ -1083,7 +1063,7 @@
  dnl
  dnl ====================================================================
  dnl Define inet_aton is available
@@ -140,7 +103,7 @@
   [AC_CACHE_CHECK([for inet_aton()], ol_cv_func_inet_aton,
      [AC_TRY_LINK([
  #ifdef HAVE_SYS_TYPES_H
-@@ -1110,7 +1090,7 @@ int rc = inet_aton( "255.255.255.255", &
+@@ -1110,7 +1090,7 @@
  dnl
  dnl ====================================================================
  dnl check no of arguments for ctime_r
@@ -149,7 +112,7 @@
   [AC_CACHE_CHECK(number of arguments of ctime_r, ol_cv_func_ctime_r_nargs,
     [AC_TRY_COMPILE([#include <time.h>],
  		[time_t ti; char *buffer; ctime_r(&ti,buffer,32);],
-@@ -1145,7 +1125,7 @@ AC_DEFUN(OL_FUNC_CTIME_R_NARGS,
+@@ -1145,7 +1125,7 @@
  dnl
  dnl --------------------------------------------------------------------
  dnl check return type of ctime_r()
@@ -158,7 +121,7 @@
   [AC_CACHE_CHECK(return type of ctime_r, ol_cv_func_ctime_r_type,
     [AC_TRY_COMPILE([#include <time.h>],
  		[extern int (ctime_r)();],
-@@ -1157,7 +1137,7 @@ AC_DEFUN(OL_FUNC_CTIME_R_TYPE,
+@@ -1157,7 +1137,7 @@
  ])dnl
  dnl ====================================================================
  dnl check no of arguments for gethostbyname_r
@@ -167,7 +130,7 @@
   [AC_CACHE_CHECK(number of arguments of gethostbyname_r,
  	ol_cv_func_gethostbyname_r_nargs,
  	[AC_TRY_COMPILE([#include <sys/types.h>
-@@ -1207,7 +1187,7 @@ AC_DEFUN(OL_FUNC_GETHOSTBYNAME_R_NARGS,
+@@ -1207,7 +1187,7 @@
  ])dnl
  dnl
  dnl check no of arguments for gethostbyaddr_r
@@ -176,7 +139,7 @@
   [AC_CACHE_CHECK(number of arguments of gethostbyaddr_r,
  	[ol_cv_func_gethostbyaddr_r_nargs],
  	[AC_TRY_COMPILE([#include <sys/types.h>
-@@ -1283,7 +1263,7 @@ AC_DEFUN([OL_SASL_COMPAT],
+@@ -1283,7 +1263,7 @@
  ])
  dnl ====================================================================
  dnl check for msg_accrights in msghdr
@@ -185,11 +148,29 @@
   [AC_CACHE_CHECK(for msg_accrights in msghdr, ol_cv_msghdr_msg_accrights,
     [AC_TRY_COMPILE([#include <sys/socket.h>],
  		[struct msghdr m; m.msg_accrightslen=0],
-Index: build/version.var
-===================================================================
---- build/version.var.orig
+--- build/top.mk
++++ build/top.mk
+@@ -37,7 +37,7 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-moduledir = @libexecdir@$(ldap_subdir)
++moduledir = @libexecdir@/modules
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@$(ldap_subdir)
+@@ -69,7 +69,7 @@
+ LIBTOOL = @LIBTOOL@
+ LIBRELEASE = @OPENLDAP_LIBRELEASE@
+ LIBVERSION = @OPENLDAP_LIBVERSION@
+-LTVERSION = -release $(LIBRELEASE) -version-info $(LIBVERSION)
++LTVERSION = -version-info $(LIBVERSION)
+ 
+ # libtool --only flag for libraries: platform specific
+ NT_LTONLY_LIB = # --only-$(BUILD_LIBS_DYNAMIC)
+--- build/version.var
 +++ build/version.var
-@@ -17,7 +17,7 @@ ol_major=2
+@@ -17,7 +17,7 @@
  ol_minor=2
  ol_patch=24
  ol_api_inc=20224
@@ -200,11 +181,31 @@
 +ol_api_revision=24
 +ol_api_age=3
  ol_release_date="2005/03/15"
-Index: servers/slapd/schema_prep.c
-===================================================================
---- servers/slapd/schema_prep.c.orig
+--- configure.in
++++ configure.in
+@@ -84,7 +84,9 @@
+ dnl		we try not to use this for much
+ AC_CANONICAL_SYSTEM
+ 
+-AM_INIT_AUTOMAKE([$OL_PACKAGE],[$OL_VERSION], [no defines])dnl
++AC_PROG_MAKE_SET
++PACKAGE=$OL_PACKAGE
++VERSION=$OL_VERSION
+ AC_SUBST(PACKAGE)dnl
+ AC_SUBST(VERSION)dnl
+ AC_DEFINE_UNQUOTED(OPENLDAP_PACKAGE,"$PACKAGE",Package)
+@@ -2133,7 +2135,7 @@
+ 			[have_setproctitle=yes
+ 			LUTIL_LIBS="$LUTIL_LIBS -lutil"],
+ 			[have_setproctitle=no
+-			LIBOBJS="$LIBOBJS setproctitle.o"
++                        AC_LIBOBJ(setproctitle)
+ 			LIBSRCS="$LIBSRCS setproctitle.c"])])
+ 
+ 	if test $have_setproctitle = yes ; then
+--- servers/slapd/schema_prep.c
 +++ servers/slapd/schema_prep.c
-@@ -894,6 +894,35 @@ static struct slap_schema_ad_map {
+@@ -894,6 +894,35 @@
  		NULL, NULL,
  		NULL, NULL, NULL, NULL, NULL,
  		offsetof(struct slap_internal_schema, si_ad_cn) },
@@ -240,7 +241,7 @@
  	{ "userPassword", "( 2.5.4.35 NAME 'userPassword' "
  			"DESC 'RFC2256/2307: password of user' "
  			"EQUALITY octetStringMatch "
-@@ -945,6 +974,24 @@ static struct slap_schema_ad_map {
+@@ -945,6 +974,24 @@
  		NULL, NULL, NULL, NULL, NULL,
  		offsetof(struct slap_internal_schema, si_ad_krbName) },
  #endif
@@ -265,11 +266,9 @@
  	{ NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0 }
  };
  
-Index: servers/slapd/slap.h
-===================================================================
---- servers/slapd/slap.h.orig
+--- servers/slapd/slap.h
 +++ servers/slapd/slap.h
-@@ -825,6 +825,9 @@ struct slap_internal_schema {
+@@ -825,6 +825,9 @@
  	AttributeDescription *si_ad_distinguishedName;
  	AttributeDescription *si_ad_name;
  	AttributeDescription *si_ad_cn;
@@ -279,7 +278,7 @@
  	AttributeDescription *si_ad_userPassword;
  	AttributeDescription *si_ad_labeledURI;
  #ifdef SLAPD_AUTHPASSWD
-@@ -833,6 +836,8 @@ struct slap_internal_schema {
+@@ -833,6 +836,8 @@
  #ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
  	AttributeDescription *si_ad_krbName;
  #endif

++++++ openldap-2.3.23.dif ++++++
--- /var/tmp/diff_new_pack.15dDxE/_old	2006-06-22 18:31:54.000000000 +0200
+++ /var/tmp/diff_new_pack.15dDxE/_new	2006-06-22 18:31:54.000000000 +0200
@@ -1,6 +1,6 @@
---- build/top.mk	2003/05/20 08:15:37	1.1
-+++ build/top.mk	2003/05/20 08:16:28
-@@ -32,7 +32,7 @@
+--- build/top.mk
++++ build/top.mk
+@@ -39,7 +39,7 @@
  libexecdir = @libexecdir@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -9,8 +9,6 @@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@$(ldap_subdir)
---- build/top.mk	2005/06/23 11:04:12	1.1
-+++ build/top.mk	2005/06/23 11:04:47
 @@ -58,7 +58,7 @@
  INSTALL_DATA = $(INSTALL) -m 644
  INSTALL_SCRIPT = $(INSTALL)
@@ -20,8 +18,21 @@
  
  LINT = lint
  5LINT = 5lint
---- servers/slapd/aclparse.c	2006/01/09 08:48:40	1.1
-+++ servers/slapd/aclparse.c	2006/01/09 08:53:52
+--- configure.in
++++ configure.in
+@@ -64,7 +64,9 @@
+ dnl		we try not to use this for much
+ AC_CANONICAL_TARGET([])
+ 
+-AM_INIT_AUTOMAKE([$OL_PACKAGE],[$OL_VERSION], [no defines])dnl
++AC_PROG_MAKE_SET
++PACKAGE=$OL_PACKAGE
++VERSION=$OL_VERSION
+ AC_SUBST(PACKAGE)dnl
+ AC_SUBST(VERSION)dnl
+ AC_DEFINE_UNQUOTED(OPENLDAP_PACKAGE,"$PACKAGE",Package)
+--- servers/slapd/aclparse.c
++++ servers/slapd/aclparse.c
 @@ -662,7 +662,7 @@
  						if ( rc != LDAP_SUCCESS ) {
  							char	buf[ SLAP_TEXT_BUFLEN ];
@@ -29,5 +40,5 @@
 -							snprintf( buf, sizeof( buf ), "%s: line %d: "
 +							snprintf( buf, sizeof( buf ), 
  								" attr \"%s\" normalization failed (%d: %s)",
+ 								fname, lineno,
  								a->acl_attrs[ 0 ].an_name.bv_val, rc, text );
- 							Debug( LDAP_DEBUG_ANY, "%s: line %d: %s.\n",




++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...


---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit-help@opensuse.org

    

root＠suse.de

tags

participants (1)