[Pkg-cyrus-sasl2-commits] r26 - in /cyrus-sasl-2.1/trunk/debian/patches: 0005_dbconverter.dpatch 00list

[fabbe at users.alioth.debian.org]

Author: fabbe
Date: Thu Jul 27 14:12:26 2006
New Revision: 26

URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/?sc=1&rev=26
Log:
Patch: build dbconverter-2 utility plus Debian intergration.

Added:
    cyrus-sasl-2.1/trunk/debian/patches/0005_dbconverter.dpatch   (with props)
Modified:
    cyrus-sasl-2.1/trunk/debian/patches/00list

Added: cyrus-sasl-2.1/trunk/debian/patches/0005_dbconverter.dpatch
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/patches/0005_dbconverter.dpatch?rev=26&op=file
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/patches/0005_dbconverter.dpatch (added)
+++ cyrus-sasl-2.1/trunk/debian/patches/0005_dbconverter.dpatch Thu Jul 27 14:12:26 2006
@@ -1,0 +1,45 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0005_dbconverter.dpatch by  <fabbe at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Build the dbconverter-2 utility and change the path to the sasldb
+## DP: database file to /etc/sasldb2.
+
+ at DPATCH@
+diff -urNad trunk~/utils/Makefile.am trunk/utils/Makefile.am
+--- trunk~/utils/Makefile.am	2006-05-29 22:52:44.000000000 +0300
++++ trunk/utils/Makefile.am	2006-07-27 17:09:17.000000000 +0300
+@@ -45,10 +45,10 @@
+ all_sasl_libs = ../lib/libsasl2.la $(SASL_DB_LIB) $(LIB_SOCKET)
+ all_sasl_static_libs = ../lib/.libs/libsasl2.a $(SASL_DB_LIB) $(LIB_SOCKET) $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(SASL_KRB_LIB) $(LIB_DES) $(PLAIN_LIBS) $(SRP_LIBS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE)
+ 
+-sbin_PROGRAMS = @SASL_DB_UTILS@ @SMTPTEST_PROGRAM@ pluginviewer
++sbin_PROGRAMS = @SASL_DB_UTILS@ @SMTPTEST_PROGRAM@ pluginviewer dbconverter-2
+ EXTRA_PROGRAMS = saslpasswd2 sasldblistusers2 testsuite testsuitestatic smtptest pluginviewer
+ 
+-noinst_PROGRAMS = dbconverter-2
++#noinst_PROGRAMS = dbconverter-2
+ 
+ if NO_SASL_DB_MANS
+ man_MANS = 
+diff -urNad trunk~/utils/dbconverter-2.c trunk/utils/dbconverter-2.c
+--- trunk~/utils/dbconverter-2.c	2006-05-29 22:52:44.000000000 +0300
++++ trunk/utils/dbconverter-2.c	2006-07-27 17:09:54.000000000 +0300
+@@ -385,7 +385,7 @@
+ 
+ int main(int argc, char **argv)
+ {
+-    const char *db="/etc/sasldb";
++    const char *db="/etc/sasldb2";
+     int result;
+ 
+     if (argc > 1) {
+@@ -421,7 +421,7 @@
+     
+     printf("\nThis program will take the sasldb file specified on the\n"
+            "command line and convert it to a new sasldb file in the default\n"
+-           "location (usually /etc/sasldb). It is STRONGLY RECOMMENDED that you\n"
++           "location (usually /etc/sasldb2). It is STRONGLY RECOMMENDED that you\n"
+            "backup sasldb before allowing this program to run\n\n"
+ 	   "We are going to convert %s and our output will be in %s\n\n"
+            "Press return to continue\n", db, db_new);

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

Modified: 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=26&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/patches/00list (original)
+++ cyrus-sasl-2.1/trunk/debian/patches/00list Thu Jul 27 14:12:26 2006
@@ -2,3 +2,4 @@
 0002_testsuite
 0003_saslauthd_mdoc
 0004_missing_man_pages
+0005_dbconverter