--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: kimberlite: diff for -3.3 NMU
- From: Hamish Moffatt <hamish@debian.org>
- Date: Sat, 10 Sep 2005 23:21:17 +1000
- Message-id: <E1EE5ID-0003bJ-NC@noddy.cloud.net.au>
Package: kimberlite
Version: 1.1.0-3.2
Severity: normal
Tags: patch
As part of a bug squashing party to fix g++ transition issues
( http://lists.debian.org/debian-devel-announce/2005/09/msg00004.html ),
I have made a non-maintainer upload of kimberlite. The diff between -3.2 and
-3.3 is attached.
Note that kimberlite STILL needs debhelper 1 to build. I tried to
convert to debhelper 4, but ran into trouble with the init.d scripts not
being registered properly. It appears that it's using debhelper to
install two init scripts in the package, which dh_installinit won't
do in the current version.
Given that there hasn't been a maintainer upload in 4 years, and
popcon says there are no users (and only two installations),
I suggest it could be removed. (It wasn't released in sarge either.)
Hamish
diff -u kimberlite-1.1.0/debian/changelog kimberlite-1.1.0/debian/changelog
--- kimberlite-1.1.0/debian/changelog
+++ kimberlite-1.1.0/debian/changelog
@@ -1,3 +1,18 @@
+kimberlite (1.1.0-3.3) unstable; urgency=low
+
+ * BSP NMU
+ * Fix various FTBFS errors:
+ * swig 1.3 changed command-line parameters (src/cluadmin/Makefile.am)
+ (closes: #241959)
+ * Parse errors due to use of __FUNCTION__ (src/clulib/parseconf.c,
+ src/utils/clu_config.c) (closes: #262119)
+ * Use <errno.h> (src/utils/invalidatebuffers.c) (closes: #280247)
+ * Conflicting declarations of variables (src/clulib/liblogger.c)
+ (closes: #284865).
+ * Thanks to Andreas Jochens for these patches
+
+ -- Hamish Moffatt <hamish@debian.org> Sat, 10 Sep 2005 12:33:22 +0000
+
kimberlite (1.1.0-3.2) unstable; urgency=low
* Non-maintainer upload
diff -u kimberlite-1.1.0/include/config.h.in kimberlite-1.1.0/include/config.h.in
--- kimberlite-1.1.0/include/config.h.in
+++ kimberlite-1.1.0/include/config.h.in
@@ -1,110 +1,151 @@
-/* include/config.h.in. Generated automatically from configure.in by autoheader 2.13. */
+/* include/config.h.in. Generated from configure.in by autoheader. */
-/* Define to empty if the keyword does not work. */
-#undef const
+/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
+ */
+#undef HAVE_DIRENT_H
-/* Define to `int' if <sys/types.h> doesn't define. */
-#undef gid_t
+/* Define to 1 if you have the <fcntl.h> header file. */
+#undef HAVE_FCNTL_H
-/* Define if your system has a working fnmatch function. */
+/* Define to 1 if your system has a working POSIX `fnmatch' function. */
#undef HAVE_FNMATCH
-/* Define if you have a working `mmap' system call. */
-#undef HAVE_MMAP
-
-/* Define if you have the strftime function. */
-#undef HAVE_STRFTIME
-
-/* Define if you have <sys/wait.h> that is POSIX.1 compatible. */
-#undef HAVE_SYS_WAIT_H
-
-/* Define to `long' if <sys/types.h> doesn't define. */
-#undef off_t
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-#undef pid_t
-
-/* Define as the return type of signal handlers (int or void). */
-#undef RETSIGTYPE
-
-/* Define to `unsigned' if <sys/types.h> doesn't define. */
-#undef size_t
+/* Define to 1 if you have the `gethostname' function. */
+#undef HAVE_GETHOSTNAME
-/* Define if you have the ANSI C header files. */
-#undef STDC_HEADERS
+/* Define to 1 if you have the `getpagesize' function. */
+#undef HAVE_GETPAGESIZE
-/* Define if you can safely include both <sys/time.h> and <time.h>. */
-#undef TIME_WITH_SYS_TIME
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
-/* Define if your <sys/time.h> declares struct tm. */
-#undef TM_IN_SYS_TIME
+/* Define to 1 if you have the <malloc.h> header file. */
+#undef HAVE_MALLOC_H
-/* Define to `int' if <sys/types.h> doesn't define. */
-#undef uid_t
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
-/* Define if you have the gethostname function. */
-#undef HAVE_GETHOSTNAME
+/* Define to 1 if you have a working `mmap' system call. */
+#undef HAVE_MMAP
-/* Define if you have the getpagesize function. */
-#undef HAVE_GETPAGESIZE
+/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
+#undef HAVE_NDIR_H
-/* Define if you have the regcomp function. */
+/* Define to 1 if you have the `regcomp' function. */
#undef HAVE_REGCOMP
-/* Define if you have the select function. */
+/* Define to 1 if you have the `select' function. */
#undef HAVE_SELECT
-/* Define if you have the socket function. */
+/* Define to 1 if you have the `socket' function. */
#undef HAVE_SOCKET
-/* Define if you have the strcspn function. */
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the `strcspn' function. */
#undef HAVE_STRCSPN
-/* Define if you have the strdup function. */
+/* Define to 1 if you have the `strdup' function. */
#undef HAVE_STRDUP
-/* Define if you have the strerror function. */
+/* Define to 1 if you have the `strerror' function. */
#undef HAVE_STRERROR
-/* Define if you have the strstr function. */
-#undef HAVE_STRSTR
+/* Define to 1 if you have the `strftime' function. */
+#undef HAVE_STRFTIME
-/* Define if you have the <dirent.h> header file. */
-#undef HAVE_DIRENT_H
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
-/* Define if you have the <fcntl.h> header file. */
-#undef HAVE_FCNTL_H
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
-/* Define if you have the <malloc.h> header file. */
-#undef HAVE_MALLOC_H
+/* Define to 1 if you have the `strstr' function. */
+#undef HAVE_STRSTR
-/* Define if you have the <ndir.h> header file. */
-#undef HAVE_NDIR_H
+/* Define to 1 if you have the <syslog.h> header file. */
+#undef HAVE_SYSLOG_H
-/* Define if you have the <sys/dir.h> header file. */
+/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
+ */
#undef HAVE_SYS_DIR_H
-/* Define if you have the <sys/file.h> header file. */
+/* Define to 1 if you have the <sys/file.h> header file. */
#undef HAVE_SYS_FILE_H
-/* Define if you have the <sys/ioctl.h> header file. */
+/* Define to 1 if you have the <sys/ioctl.h> header file. */
#undef HAVE_SYS_IOCTL_H
-/* Define if you have the <sys/ndir.h> header file. */
+/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
+ */
#undef HAVE_SYS_NDIR_H
-/* Define if you have the <sys/time.h> header file. */
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/time.h> header file. */
#undef HAVE_SYS_TIME_H
-/* Define if you have the <syslog.h> header file. */
-#undef HAVE_SYSLOG_H
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
+#undef HAVE_SYS_WAIT_H
-/* Define if you have the <unistd.h> header file. */
+/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* Name of package */
#undef PACKAGE
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define as the return type of signal handlers (`int' or `void'). */
+#undef RETSIGTYPE
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+#undef TIME_WITH_SYS_TIME
+
+/* Define to 1 if your <sys/time.h> declares `struct tm'. */
+#undef TM_IN_SYS_TIME
+
/* Version number of package */
#undef VERSION
+/* Define to empty if `const' does not conform to ANSI C. */
+#undef const
+
+/* Define to `int' if <sys/types.h> doesn't define. */
+#undef gid_t
+
+/* Define to `long' if <sys/types.h> does not define. */
+#undef off_t
+
+/* Define to `int' if <sys/types.h> does not define. */
+#undef pid_t
+
+/* Define to `unsigned' if <sys/types.h> does not define. */
+#undef size_t
+
+/* Define to `int' if <sys/types.h> doesn't define. */
+#undef uid_t
diff -u kimberlite-1.1.0/src/utils/invalidatebuffers.c kimberlite-1.1.0/src/utils/invalidatebuffers.c
--- kimberlite-1.1.0/src/utils/invalidatebuffers.c
+++ kimberlite-1.1.0/src/utils/invalidatebuffers.c
@@ -46,16 +46,12 @@
#include <sys/types.h>
#include <sys/ioctl.h>
#include <stdlib.h>
+#include <errno.h>
/*
* Cluster includes
*/
#include <logger.h>
-/*
- * External declarations
- */
-extern int errno;
-
/***************************************************************************
*
* Functions
diff -u kimberlite-1.1.0/aclocal.m4 kimberlite-1.1.0/aclocal.m4
--- kimberlite-1.1.0/aclocal.m4
+++ kimberlite-1.1.0/aclocal.m4
@@ -10,13 +10,11 @@
dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
dnl PARTICULAR PURPOSE.
-# lib-prefix.m4 serial 3 (gettext-0.12.2)
-dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License. As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# lib-prefix.m4 serial 4 (gettext-0.14.2)
+dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
dnl From Bruno Haible.
@@ -83,7 +81,7 @@
if test "X$additional_includedir" = "X/usr/local/include"; then
if test -n "$GCC"; then
case $host_os in
- linux*) haveit=yes;;
+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
esac
fi
fi
@@ -166,16 +164,16 @@
prefix="$acl_save_prefix"
])
-# lib-link.m4 serial 4 (gettext-0.12)
-dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License. As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# lib-link.m4 serial 6 (gettext-0.14.3)
+dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
dnl From Bruno Haible.
+AC_PREREQ(2.50)
+
dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
dnl the libraries corresponding to explicit and implicit dependencies.
dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
@@ -263,6 +261,8 @@
dnl hardcode_direct, hardcode_minus_L.
AC_DEFUN([AC_LIB_RPATH],
[
+ dnl Tell automake >= 1.10 to complain if config.rpath is missing.
+ m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS
AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
@@ -518,7 +518,7 @@
if test "X$additional_includedir" = "X/usr/local/include"; then
if test -n "$GCC"; then
case $host_os in
- linux*) haveit=yes;;
+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
esac
fi
fi
@@ -567,7 +567,7 @@
if test "X$additional_libdir" = "X/usr/local/lib"; then
if test -n "$GCC"; then
case $host_os in
- linux*) haveit=yes;;
+ linux* | gnu* | k*bsd*-gnu) haveit=yes;;
esac
fi
fi
@@ -718,13 +718,11 @@
done
])
-# lib-ld.m4 serial 2 (gettext-0.12)
+# lib-ld.m4 serial 3 (gettext-0.13)
dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License. As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
dnl Subroutines of libtool.m4,
dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
@@ -734,11 +732,12 @@
AC_DEFUN([AC_LIB_PROG_LD_GNU],
[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
- acl_cv_prog_gnu_ld=yes
-else
- acl_cv_prog_gnu_ld=no
-fi])
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+ acl_cv_prog_gnu_ld=yes ;;
+*)
+ acl_cv_prog_gnu_ld=no ;;
+esac])
with_gnu_ld=$acl_cv_prog_gnu_ld
])
@@ -808,11 +807,12 @@
# Check to see if the program is GNU ld. I'd rather use --version,
# but apparently some GNU ld's only accept -v.
# Break only if it was the GNU/non-GNU ld that we prefer.
- if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
- test "$with_gnu_ld" != no && break
- else
- test "$with_gnu_ld" != yes && break
- fi
+ case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
+ *GNU* | *'with BFD'*)
+ test "$with_gnu_ld" != no && break ;;
+ *)
+ test "$with_gnu_ld" != yes && break ;;
+ esac
fi
done
IFS="$ac_save_ifs"
only in patch2:
unchanged:
--- kimberlite-1.1.0.orig/debian/kimberlite.substvars
+++ kimberlite-1.1.0/debian/kimberlite.substvars
@@ -0,0 +1 @@
+shlibs:Depends=libc6 (>= 2.3.5-1), tcl8.3 (>= 8.3.5)
only in patch2:
unchanged:
--- kimberlite-1.1.0.orig/include/logger.h
+++ kimberlite-1.1.0/include/logger.h
@@ -47,7 +47,6 @@
* This has to be set by the process using the logging library. The
* default it LOG_WARNING, as dictated by LOGLEVEL_DFLT.
*/
-extern int loglevel;
struct log_msg {
generic_msg_hdr hdr;
only in patch2:
unchanged:
--- kimberlite-1.1.0.orig/src/cluadmin/Makefile.am
+++ kimberlite-1.1.0/src/cluadmin/Makefile.am
@@ -89,7 +89,7 @@
gcc ${CFLAGS} -c -I@top_srcdir@/include cluster_wrap.c
cluster_wrap.c: cluster.i
- swig -make_default -Sskip 0 -tcl8 -dascii -module Cluster -namespace cluster.i
+ swig -make_default -tcl8 -dascii -module Cluster -namespace cluster.i
getline.o: getline.c
gcc ${CFLAGS} -c getline.c
only in patch2:
unchanged:
--- kimberlite-1.1.0.orig/src/clulib/parseconf.c
+++ kimberlite-1.1.0/src/clulib/parseconf.c
@@ -561,7 +561,7 @@
static ulong get_checksum(void) {
ulong checksum = 0L;
if (initAlignedBufStuff() < 0) {
- fprintf(stderr, __FUNCTION__ ": Unable to init rawio support.\n");
+ fprintf(stderr, "%1: Unable to init rawio support.\n", __func__);
return(-1);
}
@@ -1195,7 +1195,7 @@
ssize_t written;
char timestamp_buffer[BUFFER_SIZE];
if (initAlignedBufStuff() < 0) {
- fprintf(stderr, __FUNCTION__ ": Unable to init rawio support.\n");
+ fprintf(stderr, "%1: Unable to init rawio support.\n", __func__);
return(-1);
}
@@ -1263,7 +1263,7 @@
CFG_status result=CFG_OK;
if (initAlignedBufStuff() < 0) {
- fprintf(stderr, __FUNCTION__ ": Unable to init rawio support.\n");
+ fprintf(stderr, "%1: Unable to init rawio support.\n", __func__);
return(-1);
}
only in patch2:
unchanged:
--- kimberlite-1.1.0.orig/src/utils/clu_config.c
+++ kimberlite-1.1.0/src/utils/clu_config.c
@@ -165,8 +165,7 @@
ssize_t res;
if (initAlignedBufStuff() < 0) {
- fprintf(stderr, __FUNCTION__
- ": Unable to init rawio support.\n");
+ fprintf(stderr, "%1: Unable to init rawio support.\n", __func__);
return(CFG_FAILED);
}
length = BUFFER_SIZE;
--- End Message ---