head	1.7;
access;
symbols;
locks; strict;
comment	@# @;


1.7
date	2008.02.17.09.33.03;	author rse;	state Exp;
branches;
next	1.6;
commitid	3AonPfMN1SOsxJRs;

1.6
date	2008.01.28.18.17.24;	author rse;	state Exp;
branches;
next	1.5;
commitid	TzNeIVNFrpuc5dPs;

1.5
date	2008.01.13.08.52.47;	author rse;	state Exp;
branches;
next	1.4;
commitid	8iQyVhcneXRoreNs;

1.4
date	2007.10.26.07.45.18;	author rse;	state Exp;
branches;
next	1.3;
commitid	f5hWGR1gwtUGB4Ds;

1.3
date	2007.10.14.07.32.01;	author rse;	state Exp;
branches;
next	1.2;
commitid	XuJ68HoaflI2VwBs;

1.2
date	2007.09.30.07.51.10;	author rse;	state Exp;
branches;
next	1.1;
commitid	yNQpz6XzGs8wtJzs;

1.1
date	2007.09.04.09.51.28;	author rse;	state Exp;
branches;
next	;
commitid	AXq7qdSwEPFBYows;


desc
@@


1.7
log
@upgrading package: pwmd 1.6.5.0.2 -> 1.7.5.0.2
@
text
@Index: libpwmd-5.0.2/pwmc.c
--- libpwmd-5.0.2/pwmc.c.orig	2008-01-11 02:35:53 +0100
+++ libpwmd-5.0.2/pwmc.c	2008-01-13 09:47:32 +0100
@@@@ -152,8 +152,10 @@@@
     char *clientname = NULL;
     char *inquire = NULL;
 
+#ifdef USE_NLS
     setlocale(LC_ALL, "");
     bindtextdomain("libpwmd", LOCALEDIR);
+#endif
 
     while ((opt = getopt(argc, argv, "c:I:XT:N:D:hvP:p:s:Sd:")) != EOF) {
 	switch (opt) {
Index: pwmd-1.7/src/Makefile.am
--- pwmd-1.7/src/Makefile.am.orig	2008-01-02 01:25:17 +0100
+++ pwmd-1.7/src/Makefile.am	2008-01-13 09:47:58 +0100
@@@@ -1,7 +1,7 @@@@
 bin_PROGRAMS = pwmd
 pwmd_SOURCES = pwmd.c pwmd.h xml.c xml.h pwmd_error.c pwmd_error.h commands.c \
 	       commands.h common.h cache.c cache.h gettext.h misc.c misc.h
-pwmd_LDFLAGS = @@XML_LIBS@@ @@GLIB_LIBS@@ @@LIBGCRYPT_LIBS@@ @@GPG_ERROR_LIBS@@
+pwmd_LDADD = @@XML_LIBS@@ @@GLIB_LIBS@@ @@LIBGCRYPT_LIBS@@ @@GPG_ERROR_LIBS@@
 pwmd_CFLAGS = -DLOCALEDIR=\"${prefix}/share/locale\" @@XML_CPPFLAGS@@ @@GLIB_CFLAGS@@ \
 	      @@LIBGCRYPT_CFLAGS@@ @@LIBASSUAN_PTH_CFLAGS@@ @@GPG_ERROR_CFLAGS@@
 
@


1.6
log
@upgrading package: pwmd 1.5.5.0.1 -> 1.6.5.0.2
@
text
@d15 3
a17 3
Index: pwmd-1.6/src/Makefile.am
--- pwmd-1.6/src/Makefile.am.orig	2008-01-02 01:25:17 +0100
+++ pwmd-1.6/src/Makefile.am	2008-01-13 09:47:58 +0100
@


1.5
log
@upgrading package: pwmd 1.3.4.0.3 -> 1.5.5.0.1
@
text
@d1 3
a3 3
Index: libpwmd-5.0.1/pwmc.c
--- libpwmd-5.0.1/pwmc.c.orig	2008-01-11 02:35:53 +0100
+++ libpwmd-5.0.1/pwmc.c	2008-01-13 09:47:32 +0100
d15 3
a17 3
Index: pwmd-1.5/src/Makefile.am
--- pwmd-1.5/src/Makefile.am.orig	2008-01-02 01:25:17 +0100
+++ pwmd-1.5/src/Makefile.am	2008-01-13 09:47:58 +0100
@


1.4
log
@upgrading package: pwmd 1.2.4.0.3 -> 1.3.4.0.3
@
text
@d1 6
a6 27
Index: libpwmd-4.0.3/libpwmd.c
--- libpwmd-4.0.3/libpwmd.c.orig	2007-09-03 15:51:29 +0200
+++ libpwmd-4.0.3/libpwmd.c	2007-10-14 09:30:12 +0200
@@@@ -293,8 +293,7 @@@@
 {
 #ifndef USE_PINENTRY
     return GPG_ERR_NOT_IMPLEMENTED;
-#endif
-
+#else
     if (!pwm || pwm->pid == -1)
 	return GPG_ERR_INV_ARG;
 
@@@@ -310,6 +309,7 @@@@
 	return gpg_error_from_errno(errno);
 
     return 0;
+#endif
 }
 
 #ifdef USE_PINENTRY
Index: libpwmd-4.0.3/pwmc.c
--- libpwmd-4.0.3/pwmc.c.orig	2007-09-03 16:43:42 +0200
+++ libpwmd-4.0.3/pwmc.c	2007-10-14 09:30:12 +0200
@@@@ -131,8 +131,10 @@@@
     int outfd = -1;
     FILE *outfp = stdout;
a11 1
     timeout = -1;
d13 5
a17 4
     while ((opt = getopt(argc, argv, "T:N:D:EhvaP:t:p:s:Sd:")) != EOF) {
Index: pwmd-1.3/src/Makefile.am
--- pwmd-1.3/src/Makefile.am.orig	2007-10-11 02:25:30 +0200
+++ pwmd-1.3/src/Makefile.am	2007-10-14 09:30:25 +0200
d21 1
a21 1
 	       commands.h common.h cache.c cache.h gettext.h
d25 1
a25 1
 	      @@LIBGCRYPT_CFLAGS@@ @@LIBASSUAN_CFLAGS@@ @@GPG_ERROR_CFLAGS@@
@


1.3
log
@upgrading package: pwmd 1.1.4.0.3 -> 1.2.4.0.3
@
text
@d36 3
a38 3
Index: pwmd-1.2/src/Makefile.am
--- pwmd-1.2/src/Makefile.am.orig	2007-10-11 02:25:30 +0200
+++ pwmd-1.2/src/Makefile.am	2007-10-14 09:30:25 +0200
@


1.2
log
@upgrading package: pwmd 1.0.4.0.3 -> 1.1.4.0.3
@
text
@d3 1
a3 1
+++ libpwmd-4.0.3/libpwmd.c	2007-09-04 10:38:54 +0200
d24 1
a24 1
+++ libpwmd-4.0.3/pwmc.c	2007-09-04 10:39:12 +0200
d36 3
a38 3
Index: pwmd-1.1/src/Makefile.am
--- pwmd-1.1/src/Makefile.am.orig	2007-08-29 00:45:35 +0200
+++ pwmd-1.1/src/Makefile.am	2007-09-04 10:36:13 +0200
d42 1
a42 1
 	       commands.h common.h cache.c cache.h valgrind.h gettext.h
@


1.1
log
@first cut for a pwmd(8) package
@
text
@d36 3
a38 3
Index: pwmd-1.0/src/Makefile.am
--- pwmd-1.0/src/Makefile.am.orig	2007-08-29 00:45:35 +0200
+++ pwmd-1.0/src/Makefile.am	2007-09-04 10:36:13 +0200
@