[Pkg-cyrus-sasl2-commits] r18 - in /cyrus-sasl-2.1/trunk/debian/patches: 0001_versioned_symbols.dpatch 0002_testsuite.dpatch 00list

[fabbe at users.alioth.debian.org]

Author: fabbe
Date: Wed Jul 12 11:49:18 2006
New Revision: 18

URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/?sc=1&rev=18
Log:
Carry over two patches from the old package.

Added:
    cyrus-sasl-2.1/trunk/debian/patches/0001_versioned_symbols.dpatch   (with props)
    cyrus-sasl-2.1/trunk/debian/patches/0002_testsuite.dpatch   (with props)
    cyrus-sasl-2.1/trunk/debian/patches/00list

Added: cyrus-sasl-2.1/trunk/debian/patches/0001_versioned_symbols.dpatch
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/patches/0001_versioned_symbols.dpatch?rev=18&op=file
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/patches/0001_versioned_symbols.dpatch (added)
+++ cyrus-sasl-2.1/trunk/debian/patches/0001_versioned_symbols.dpatch Wed Jul 12 11:49:18 2006
@@ -1,0 +1,35 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_versioned_symbols.dpatch by  <fabbe at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Use versioned symbols for libsasl2.
+
+ at DPATCH@
+diff -urNad trunk~/lib/Makefile.am trunk/lib/Makefile.am
+--- trunk~/lib/Makefile.am	2006-05-29 22:52:46.000000000 +0300
++++ trunk/lib/Makefile.am	2006-07-12 14:38:12.000000000 +0300
+@@ -60,8 +60,8 @@
+ lib_LTLIBRARIES = libsasl2.la
+ 
+ libsasl2_la_SOURCES = $(common_sources) $(common_headers)
+-libsasl2_la_LDFLAGS = -version-info $(sasl_version)
+-libsasl2_la_DEPENDENCIES = $(LTLIBOBJS)
++libsasl2_la_LDFLAGS = -version-info $(sasl_version) -Wl,--version-script=Versions
++libsasl2_la_DEPENDENCIES = $(LTLIBOBJS) Versions
+ libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR)
+ 
+ if MACOSX
+@@ -93,6 +93,13 @@
+ 	rm -f $@
+ 	ln -s .libs/$@ $@
+ 
++Versions: $(libsasl2_la_OBJECTS)
++	rm -f $@
++	echo "SASL2 {" > $@
++	echo "  global:" >> $@
++	nm $(patsubst %.lo,%.o,$(libsasl2_la_OBJECTS)) | grep " [Tt] " | cut -d" " -f3 | sed -e 's/$$/;/' >> $@
++	echo "};" >> $@
++
+ $(SASL_STATIC_OBJS): linksrcs
+ 
+ linksrcs:

Propchange: cyrus-sasl-2.1/trunk/debian/patches/0001_versioned_symbols.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Added: cyrus-sasl-2.1/trunk/debian/patches/0002_testsuite.dpatch
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/patches/0002_testsuite.dpatch?rev=18&op=file
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/patches/0002_testsuite.dpatch (added)
+++ cyrus-sasl-2.1/trunk/debian/patches/0002_testsuite.dpatch Wed Jul 12 11:49:18 2006
@@ -1,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_testsuite_rename.dpatch by  <fabbe at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Rename the testsuite program to sasltestsuite and use /etc/sasldb2
+## DP: instead of ./sasldb as default path for the sasldb database file.
+
+ at DPATCH@
+diff -urNad trunk~/utils/testsuite.c trunk/utils/testsuite.c
+--- trunk~/utils/testsuite.c	2006-05-29 22:52:44.000000000 +0300
++++ trunk/utils/testsuite.c	2006-07-12 14:42:45.000000000 +0300
+@@ -464,9 +464,9 @@
+ 	    *len = (unsigned) strlen("sasldb");
+ 	return SASL_OK;
+     } else if (!strcmp(option, "sasldb_path")) {
+-	*result = "./sasldb";
++	*result = "/etc/sasldb2";
+ 	if (len)
+-	    *len = (unsigned) strlen("./sasldb");
++	    *len = (unsigned) strlen("/etc/sasldb2");
+ 	return SASL_OK;
+     } else if (!strcmp(option, "canon_user_plugin")) {
+ 	*result = cu_plugin;
+@@ -2925,7 +2925,7 @@
+ void usage(void)
+ {
+     printf("Usage:\n" \
+-           " testsuite [-g name] [-s seed] [-r tests] -a -M\n" \
++           " sasltestsuite [-g name] [-s seed] [-r tests] -a -M\n" \
+            "    g -- gssapi service name to use (default: host)\n" \
+ 	   "    r -- # of random tests to do (default: 25)\n" \
+ 	   "    a -- do all corruption tests (and ignores random ones unless -r specified)\n" \

Propchange: cyrus-sasl-2.1/trunk/debian/patches/0002_testsuite.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Added: cyrus-sasl-2.1/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/patches/00list?rev=18&op=file
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/patches/00list (added)
+++ cyrus-sasl-2.1/trunk/debian/patches/00list Wed Jul 12 11:49:18 2006
@@ -1,0 +1,2 @@
+0001_versioned_symbols
+0002_testsuite