OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   13-Jan-2008 09:52:48
  Branch: HEAD                             Handle: 2008011308524701

  Modified files:
    openpkg-src/pwmd        pwmd.patch pwmd.spec

  Log:
    upgrading package: pwmd 1.3.4.0.3 -> 1.5.5.0.1

  Summary:
    Revision    Changes     Path
    1.5         +13 -34     openpkg-src/pwmd/pwmd.patch
    1.6         +3  -3      openpkg-src/pwmd/pwmd.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/pwmd/pwmd.patch
  ============================================================================
  $ cvs diff -u -r1.4 -r1.5 pwmd.patch
  --- openpkg-src/pwmd/pwmd.patch       26 Oct 2007 07:45:18 -0000      1.4
  +++ openpkg-src/pwmd/pwmd.patch       13 Jan 2008 08:52:47 -0000      1.5
  @@ -1,47 +1,26 @@
  -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;
  +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
  +@@ -152,8 +152,10 @@
  +     char *clientname = NULL;
  +     char *inquire = NULL;
    
   +#ifdef USE_NLS
        setlocale(LC_ALL, "");
        bindtextdomain("libpwmd", LOCALEDIR);
   +#endif
  -     timeout = -1;
    
  -     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
  +     while ((opt = getopt(argc, argv, "c:I:XT:N:D:hvP:p:s:Sd:")) != EOF) {
  +     switch (opt) {
  +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,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
  +            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_CFLAGS@ @GPG_ERROR_CFLAGS@
  +           @LIBGCRYPT_CFLAGS@ @LIBASSUAN_PTH_CFLAGS@ @GPG_ERROR_CFLAGS@
    
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/pwmd/pwmd.spec
  ============================================================================
  $ cvs diff -u -r1.5 -r1.6 pwmd.spec
  --- openpkg-src/pwmd/pwmd.spec        1 Jan 2008 15:03:19 -0000       1.5
  +++ openpkg-src/pwmd/pwmd.spec        13 Jan 2008 08:52:48 -0000      1.6
  @@ -22,8 +22,8 @@
   ##
   
   #   package version
  -%define       V_pwmd     1.3
  -%define       V_libpwmd  4.0.3
  +%define       V_pwmd     1.5
  +%define       V_libpwmd  5.0.1
   
   #   package information
   Name:         pwmd
  @@ -36,7 +36,7 @@
   Group:        System
   License:      GPL
   Version:      %{V_pwmd}.%{V_libpwmd}
  -Release:      20080101
  +Release:      20080113
   
   #   list of sources
   Source0:      http://switch.dl.sourceforge.net/bjk/pwmd-%{V_pwmd}.tar.gz
  @@ .
______________________________________________________________________
OpenPKG                                             http://openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org

Reply via email to